From a2377f88de39790b2324a846f9e619d78d399afc Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 10 Nov 2014 22:35:13 +0100 Subject: adding blending support (bzr r13682.1.1) --- src/live_effects/effect.cpp | 2 +- src/live_effects/lpe-mirror_symmetry.cpp | 102 ++++++++++++++++++++++++++----- src/live_effects/lpe-mirror_symmetry.h | 5 +- 3 files changed, 93 insertions(+), 16 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index fbdc78f8a..9433dec7f 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -106,7 +106,6 @@ const Util::EnumData LPETypeData[] = { {EXTRUDE, N_("Extrude"), "extrude"}, {LATTICE, N_("Lattice Deformation"), "lattice"}, {LINE_SEGMENT, N_("Line Segment"), "line_segment"}, - {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, {OFFSET, N_("Offset"), "offset"}, {PARALLEL, N_("Parallel"), "parallel"}, {PATH_LENGTH, N_("Path length"), "path_length"}, @@ -153,6 +152,7 @@ const Util::EnumData LPETypeData[] = { {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, + {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 0bb67a4a2..8877ffd9c 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -21,6 +21,7 @@ #include #include <2geom/path.h> +#include <2geom/path-intersection.h> #include <2geom/transforms.h> #include <2geom/affine.h> @@ -30,11 +31,13 @@ namespace LivePathEffect { LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), - reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L100,100") + joinPaths(_("Join the paths"), _("Join the resulting paths"), "joinPaths", &wr, this, true), + reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0") { show_orig_path = true; registerParameter( dynamic_cast(&discard_orig_path) ); + registerParameter( dynamic_cast(&joinPaths) ); registerParameter( dynamic_cast(&reflection_line) ); } @@ -55,15 +58,10 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) { using namespace Geom; - // fixme: what happens if the bbox is empty? - // fixme: this is probably wrong - Geom::Affine t = lpeitem->i2dt_affine(); - Geom::Rect bbox = *lpeitem->desktopVisualBounds(); + original_bbox(lpeitem); - Point A(bbox.left(), bbox.bottom()); - Point B(bbox.left(), bbox.top()); - A *= t; - B *= t; + Point A(boundingbox_X.max(), boundingbox_Y.max()); + Point B(boundingbox_X.max(), boundingbox_Y.min()); Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); reflection_line.set_new_value(rline, true); } @@ -77,11 +75,12 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) } std::vector path_out; - if (!discard_orig_path) { + std::vector mline(reflection_line.get_pathvector()); + + if (!discard_orig_path && !joinPaths) { path_out = path_in; } - std::vector mline(reflection_line.get_pathvector()); Geom::Point A(mline.front().initialPoint()); Geom::Point B(mline.back().finalPoint()); @@ -97,9 +96,84 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) m = m * sca; m = m * m2.inverse(); m = m * m1; - - for (int i = 0; i < static_cast(path_in.size()); ++i) { - path_out.push_back(path_in[i] * m); + + if(joinPaths){ + for (Geom::PathVector::const_iterator path_it = path_in.begin(); + path_it != path_in.end(); ++path_it) { + if (path_it->empty()){ + continue; + } + Geom::Path original; + Geom::Path mlineExpanded; + Geom::Line lineSeparation; + lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); + mlineExpanded.start( lineSeparation.pointAt(-100000)); + mlineExpanded.appendNew( lineSeparation.pointAt(100000)); + Geom::Crossings cs = crossings(*path_it, mlineExpanded); + double timeStart = 0.0; + //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line + double pos = (lineSeparation.pointAt(100000)[Geom::X]-lineSeparation.pointAt(-100000)[Geom::X])*(path_it->initialPoint()[Geom::Y]-lineSeparation.pointAt(-100000)[Geom::Y]) - (lineSeparation.pointAt(100000)[Geom::Y]-lineSeparation.pointAt(-100000)[Geom::Y])*(path_it->initialPoint()[Geom::X]-lineSeparation.pointAt(-100000)[Geom::X]); + int position = (pos < 0) ? -1 : (pos > 0); + unsigned int counter = 0; + + for(unsigned int i = 0; i < cs.size(); i++) { + double timeEnd = cs[i].ta; + Geom::Path portion = path_it->portion(timeStart, timeEnd); + if(position == -1 && i==0){ + counter++; + } + if(counter%2!=0){ + if (!discard_orig_path){ + if(i==0){ + original = portion; + } else { + original.append(portion, (Geom::Path::Stitching)1); + } + original.append(portion.reverse() * m, (Geom::Path::Stitching)1); + if (!path_it->closed()){ + path_out.push_back(original); + original.clear(); + } + } else { + path_out.push_back(portion * m); + } + } + timeStart = timeEnd; + counter++; + } + if(cs.size()!=0 && ((cs.size()%2 == 0 && position == -1)||(cs.size()%2 != 0 && position == 1))){ + Geom::Path portion = path_it->portion(timeStart, nearest_point(path_it->finalPoint(), *path_it)); + if (!discard_orig_path){ + if(!path_it->closed()){ + original = portion; + } else { + original.append(portion, (Geom::Path::Stitching)1); + } + original.append(portion.reverse() * m, (Geom::Path::Stitching)1); + if (!path_it->closed()){ + path_out.push_back(original); + original.clear(); + } + } else { + path_out.push_back(portion * m); + } + + } + if (path_it->closed() && !original.empty() && !discard_orig_path) { + original.close(); + path_out.push_back(original); + } + if(cs.size() == 0){ + path_out.push_back(*path_it); + path_out.push_back(*path_it * m); + } + } + } + + if (!joinPaths) { + for (int i = 0; i < static_cast(path_in.size()); ++i) { + path_out.push_back(path_in[i] * m); + } } return path_out; diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index a4a2b86c0..2ea8161d4 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -20,10 +20,12 @@ #include "live_effects/parameter/point.h" #include "live_effects/parameter/path.h" +#include "live_effects/lpegroupbbox.h" + namespace Inkscape { namespace LivePathEffect { -class LPEMirrorSymmetry : public Effect { +class LPEMirrorSymmetry : public Effect, GroupBBoxEffect{ public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); virtual ~LPEMirrorSymmetry(); @@ -36,6 +38,7 @@ public: private: BoolParam discard_orig_path; + BoolParam joinPaths; PathParam reflection_line; LPEMirrorSymmetry(const LPEMirrorSymmetry&); -- cgit v1.2.3 From fc813d4f7b4adb8e681abdd429bc0d9c19312ea5 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 11 Nov 2014 00:45:06 +0100 Subject: added join mode (bzr r13682.1.3) --- src/live_effects/lpe-mirror_symmetry.cpp | 47 ++++++++++---------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 8877ffd9c..67f4e3f16 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -97,7 +97,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) m = m * m2.inverse(); m = m * m1; - if(joinPaths){ + if(joinPaths && !discard_orig_path){ for (Geom::PathVector::const_iterator path_it = path_in.begin(); path_it != path_in.end(); ++path_it) { if (path_it->empty()){ @@ -123,47 +123,30 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) counter++; } if(counter%2!=0){ - if (!discard_orig_path){ - if(i==0){ - original = portion; - } else { - original.append(portion, (Geom::Path::Stitching)1); - } - original.append(portion.reverse() * m, (Geom::Path::Stitching)1); - if (!path_it->closed()){ - path_out.push_back(original); - original.clear(); - } - } else { - path_out.push_back(portion * m); + original = portion; + original.append(portion.reverse() * m, (Geom::Path::Stitching)1); + if(i!=0){ + original.close(); } + path_out.push_back(original); + original.clear(); } timeStart = timeEnd; counter++; } if(cs.size()!=0 && ((cs.size()%2 == 0 && position == -1)||(cs.size()%2 != 0 && position == 1))){ Geom::Path portion = path_it->portion(timeStart, nearest_point(path_it->finalPoint(), *path_it)); - if (!discard_orig_path){ - if(!path_it->closed()){ - original = portion; - } else { - original.append(portion, (Geom::Path::Stitching)1); - } - original.append(portion.reverse() * m, (Geom::Path::Stitching)1); - if (!path_it->closed()){ - path_out.push_back(original); - original.clear(); - } + original = portion.reverse(); + original.append(portion * m, (Geom::Path::Stitching)1); + if (!path_it->closed()){ + path_out.push_back(original); } else { - path_out.push_back(portion * m); + path_out[0].append(original.reverse(), (Geom::Path::Stitching)1); + path_out[0].close(); } - - } - if (path_it->closed() && !original.empty() && !discard_orig_path) { - original.close(); - path_out.push_back(original); + original.clear(); } - if(cs.size() == 0){ + if(cs.size() == 0 && position == -1){ path_out.push_back(*path_it); path_out.push_back(*path_it * m); } -- cgit v1.2.3 From ffad504bec2b31828f6fe10edfab5ec8ef6437fb Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 11 Nov 2014 19:59:49 +0100 Subject: Code cleanup (bzr r13682.1.4) --- src/live_effects/lpe-mirror_symmetry.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 67f4e3f16..fa588fe96 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -107,12 +107,14 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) Geom::Path mlineExpanded; Geom::Line lineSeparation; lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); - mlineExpanded.start( lineSeparation.pointAt(-100000)); - mlineExpanded.appendNew( lineSeparation.pointAt(100000)); + Geom::Point lineStart = lineSeparation.pointAt(-100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(100000.0); + mlineExpanded.start( lineStart); + mlineExpanded.appendNew( lineEnd); Geom::Crossings cs = crossings(*path_it, mlineExpanded); double timeStart = 0.0; //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (lineSeparation.pointAt(100000)[Geom::X]-lineSeparation.pointAt(-100000)[Geom::X])*(path_it->initialPoint()[Geom::Y]-lineSeparation.pointAt(-100000)[Geom::Y]) - (lineSeparation.pointAt(100000)[Geom::Y]-lineSeparation.pointAt(-100000)[Geom::Y])*(path_it->initialPoint()[Geom::X]-lineSeparation.pointAt(-100000)[Geom::X]); + double pos = (lineEnd[Geom::X]-lineStart[Geom::X])*(path_it->initialPoint()[Geom::Y]-lineStart[Geom::Y]) - (lineEnd[Geom::Y]-lineStart[Geom::Y])*(path_it->initialPoint()[Geom::X]-lineStart[Geom::X]); int position = (pos < 0) ? -1 : (pos > 0); unsigned int counter = 0; -- cgit v1.2.3 From 165025d5aa43570d3905d312632199efddd45c9a Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 13 Nov 2014 18:04:22 +0100 Subject: Fixed bugs pointed by su_v. Added inverse option to merges (bzr r13682.1.6) --- src/live_effects/lpe-mirror_symmetry.cpp | 125 +++++++++++++++++++------------ src/live_effects/lpe-mirror_symmetry.h | 6 +- src/selection-chemistry.cpp | 2 +- 3 files changed, 85 insertions(+), 48 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index fa588fe96..c21c65a3e 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -19,7 +19,7 @@ #include #include #include - +#include "helper/geom.h" #include <2geom/path.h> #include <2geom/path-intersection.h> #include <2geom/transforms.h> @@ -31,13 +31,15 @@ namespace LivePathEffect { LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), - joinPaths(_("Join the paths"), _("Join the resulting paths"), "joinPaths", &wr, this, true), + fusionPaths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusionPaths", &wr, this, true), + reverseFusion(_("Reverse fusion"), _("Reverse fusion"), "reverseFusion", &wr, this, false), reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0") { show_orig_path = true; registerParameter( dynamic_cast(&discard_orig_path) ); - registerParameter( dynamic_cast(&joinPaths) ); + registerParameter( dynamic_cast(&fusionPaths) ); + registerParameter( dynamic_cast(&reverseFusion) ); registerParameter( dynamic_cast(&reflection_line) ); } @@ -49,6 +51,8 @@ void LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) { SPLPEItem * item = const_cast(lpeitem); + std::vector mline(reflection_line.get_pathvector()); + lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); item->apply_to_clippath(item); item->apply_to_mask(item); } @@ -66,6 +70,14 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) reflection_line.set_new_value(rline, true); } +int +LPEMirrorSymmetry::pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X) +{ + //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line + double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); + return (pos < 0) ? -1 : (pos > 0); +} + std::vector LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) { @@ -73,16 +85,20 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) if ( reflection_line.get_pathvector().empty() ) { return path_in; } - + Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); std::vector path_out; - std::vector mline(reflection_line.get_pathvector()); + Geom::Path mlineExpanded; + Geom::Point lineStart = lineSeparation.pointAt(-100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(100000.0); + mlineExpanded.start( lineStart); + mlineExpanded.appendNew( lineEnd); - if (!discard_orig_path && !joinPaths) { + if (!discard_orig_path && !fusionPaths) { path_out = path_in; } - Geom::Point A(mline.front().initialPoint()); - Geom::Point B(mline.back().finalPoint()); + Geom::Point A(lineStart); + Geom::Point B(lineEnd); Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); double hyp = Geom::distance(A, B); @@ -97,65 +113,82 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) m = m * m2.inverse(); m = m * m1; - if(joinPaths && !discard_orig_path){ - for (Geom::PathVector::const_iterator path_it = path_in.begin(); - path_it != path_in.end(); ++path_it) { + if(fusionPaths && !discard_orig_path){ + for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); + path_it != original_pathv.end(); ++path_it) { if (path_it->empty()){ continue; } - Geom::Path original; - Geom::Path mlineExpanded; - Geom::Line lineSeparation; - lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); - mlineExpanded.start( lineStart); - mlineExpanded.appendNew( lineEnd); - Geom::Crossings cs = crossings(*path_it, mlineExpanded); double timeStart = 0.0; - //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (lineEnd[Geom::X]-lineStart[Geom::X])*(path_it->initialPoint()[Geom::Y]-lineStart[Geom::Y]) - (lineEnd[Geom::Y]-lineStart[Geom::Y])*(path_it->initialPoint()[Geom::X]-lineStart[Geom::X]); - int position = (pos < 0) ? -1 : (pos > 0); - unsigned int counter = 0; - + int position = 0; + bool end_open = false; + if (path_it->closed()) { + const Geom::Curve &closingline = path_it->back_closed(); + if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { + end_open = true; + } + } + Geom::Path original = (Geom::Path)(*path_it); + if(end_open && path_it->closed()){ + original.close(false); + original.appendNew( original.initialPoint() ); + original.close(true); + } + Geom::Crossings cs = crossings(original, mlineExpanded); for(unsigned int i = 0; i < cs.size(); i++) { double timeEnd = cs[i].ta; - Geom::Path portion = path_it->portion(timeStart, timeEnd); - if(position == -1 && i==0){ - counter++; + Geom::Path portion = original.portion(timeStart, timeEnd); + Geom::Point middle = portion.pointAt((double)portion.size()/2.0); + position = pointSideOfLine(lineStart, lineEnd, middle); + if(reverseFusion){ + position *= -1; } - if(counter%2!=0){ - original = portion; - original.append(portion.reverse() * m, (Geom::Path::Stitching)1); + if(position == -1){ + Geom::Path mirror = portion.reverse() * m; + mirror.setInitial(portion.finalPoint()); + portion.append(mirror); if(i!=0){ - original.close(); + portion.setFinal(portion.initialPoint()); + portion.close(); } - path_out.push_back(original); - original.clear(); + path_out.push_back(portion); } + portion.clear(); timeStart = timeEnd; - counter++; } - if(cs.size()!=0 && ((cs.size()%2 == 0 && position == -1)||(cs.size()%2 != 0 && position == 1))){ - Geom::Path portion = path_it->portion(timeStart, nearest_point(path_it->finalPoint(), *path_it)); - original = portion.reverse(); - original.append(portion * m, (Geom::Path::Stitching)1); - if (!path_it->closed()){ - path_out.push_back(original); + position = pointSideOfLine(lineStart, lineEnd, original.finalPoint()); + if(reverseFusion){ + position *= -1; + } + if(cs.size()!=0 && position == -1){ + Geom::Path portion = original.portion(timeStart, original.size()); + portion = portion.reverse(); + Geom::Path mirror = portion.reverse() * m; + mirror.setInitial(portion.finalPoint()); + portion.append(mirror); + portion = portion.reverse(); + if (!original.closed()){ + path_out.push_back(portion); } else { - path_out[0].append(original.reverse(), (Geom::Path::Stitching)1); + if(cs.size() >1 ){ + portion.setFinal(path_out[0].initialPoint()); + portion.setInitial(path_out[0].finalPoint()); + path_out[0].append(portion); + } else { + path_out.push_back(portion); + } path_out[0].close(); } - original.clear(); + portion.clear(); } if(cs.size() == 0 && position == -1){ - path_out.push_back(*path_it); - path_out.push_back(*path_it * m); + path_out.push_back(original); + path_out.push_back(original * m); } } } - if (!joinPaths) { + if (!fusionPaths || discard_orig_path) { for (int i = 0; i < static_cast(path_in.size()); ++i) { path_out.push_back(path_in[i] * m); } diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 2ea8161d4..c925f220f 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -34,12 +34,16 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); + virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); + virtual std::vector doEffect_path (std::vector const & path_in); private: BoolParam discard_orig_path; - BoolParam joinPaths; + BoolParam fusionPaths; + BoolParam reverseFusion; PathParam reflection_line; + Geom::Line lineSeparation; LPEMirrorSymmetry(const LPEMirrorSymmetry&); LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index d0ef0afea..d00e8d702 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -4186,7 +4186,7 @@ void sp_selection_unset_mask(SPDesktop *desktop, bool apply_clip_path) { for ( SPObject *child = obj->firstChild() ; child; child = child->getNext() ) { // Collect all clipped paths and masks within a single group Inkscape::XML::Node *copy = SP_OBJECT(child)->getRepr()->duplicate(xml_doc); - if(copy->attribute("inkscape:original-d")) + if(copy->attribute("inkscape:original-d") && copy->attribute("inkscape:path-effect")) { copy->setAttribute("d", copy->attribute("inkscape:original-d")); } -- cgit v1.2.3 From 2a940cb92f484630523c7d859d7048f3df6e4f6e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 13 Nov 2014 20:32:40 +0100 Subject: Six a bug on subpaths pointed by suv (bzr r13682.1.8) --- src/live_effects/lpe-mirror_symmetry.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index c21c65a3e..6fb2bfc73 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -119,6 +119,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) if (path_it->empty()){ continue; } + std::vector temp_path; double timeStart = 0.0; int position = 0; bool end_open = false; @@ -151,7 +152,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) portion.setFinal(portion.initialPoint()); portion.close(); } - path_out.push_back(portion); + temp_path.push_back(portion); } portion.clear(); timeStart = timeEnd; @@ -168,23 +169,25 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) portion.append(mirror); portion = portion.reverse(); if (!original.closed()){ - path_out.push_back(portion); + temp_path.push_back(portion); } else { if(cs.size() >1 ){ - portion.setFinal(path_out[0].initialPoint()); - portion.setInitial(path_out[0].finalPoint()); - path_out[0].append(portion); + portion.setFinal(temp_path[0].initialPoint()); + portion.setInitial(temp_path[0].finalPoint()); + temp_path[0].append(portion); } else { - path_out.push_back(portion); + temp_path.push_back(portion); } - path_out[0].close(); + temp_path[0].close(); } portion.clear(); } if(cs.size() == 0 && position == -1){ - path_out.push_back(original); - path_out.push_back(original * m); + temp_path.push_back(original); + temp_path.push_back(original * m); } + path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); + temp_path.clear(); } } -- cgit v1.2.3 From 840daf70ff3f7c2c8e9cc0fae0037befcfa18edf Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 14 Nov 2014 20:14:04 +0100 Subject: fix a crash bug applyed on groups (bzr r13708.1.1) --- src/live_effects/effect.cpp | 3 ++- src/live_effects/lpe-copy_rotate.cpp | 11 +++++++---- src/live_effects/lpe-copy_rotate.h | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index e49a15dd0..0f4bdfaaa 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -112,7 +112,6 @@ const Util::EnumData LPETypeData[] = { {PATH_LENGTH, N_("Path length"), "path_length"}, {PERP_BISECTOR, N_("Perpendicular bisector"), "perp_bisector"}, {PERSPECTIVE_PATH, N_("Perspective path"), "perspective_path"}, - {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, {RECURSIVE_SKELETON, N_("Recursive skeleton"), "recursive_skeleton"}, {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, {TEXT_LABEL, N_("Text label"), "text_label"}, @@ -153,6 +152,8 @@ const Util::EnumData LPETypeData[] = { {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, +/* 0.92 */ + {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index e466093d3..7e3f35f9d 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -76,11 +76,12 @@ LPECopyRotate::~LPECopyRotate() void LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) { - SPCurve const *curve = SP_SHAPE(lpeitem)->_curve; + using namespace Geom; - A = *(curve->first_point()); - B = *(curve->last_point()); + original_bbox(lpeitem); + Point A(boundingbox_X.min(), boundingbox_Y.middle()); + Point B(boundingbox_X.max(), boundingbox_Y.middle()); origin.param_setValue(A); dir = unit_vector(B - A); @@ -123,12 +124,14 @@ LPECopyRotate::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector((Geom::Point) origin); path.appendNew(rot_pos); - + std::cout << rot_pos << "rot\n"; + std::cout << origin << "origin\n"; PathVector pathv; pathv.push_back(path); hp_vec.push_back(pathv); } + void LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { { KnotHolderEntity *e = new CR::KnotHolderEntityStartingAngle(this); diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index ca7aa269c..c84889f57 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -16,6 +16,7 @@ #include "live_effects/effect.h" #include "live_effects/parameter/point.h" +#include "live_effects/lpegroupbbox.h" namespace Inkscape { namespace LivePathEffect { @@ -26,7 +27,7 @@ namespace CR { class KnotHolderEntityRotationAngle; } -class LPECopyRotate : public Effect { +class LPECopyRotate : public Effect, GroupBBoxEffect { public: LPECopyRotate(LivePathEffectObject *lpeobject); virtual ~LPECopyRotate(); -- cgit v1.2.3 From a5333b6abc807176319c96d66cb7111e70f4896f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 15 Nov 2014 18:29:41 +0100 Subject: ignore this commit (bzr r13682.1.9) --- src/knotholder.cpp | 6 ++ src/live_effects/effect.cpp | 8 ++- src/live_effects/effect.h | 2 + src/live_effects/lpe-bendpath.cpp | 4 +- src/live_effects/lpe-mirror_symmetry.cpp | 103 ++++++++++++++++++++++++++++++- src/live_effects/lpe-mirror_symmetry.h | 15 +++++ src/live_effects/lpegroupbbox.cpp | 12 ++++ src/ui/dialog/livepatheffect-editor.cpp | 35 ++++++++--- 8 files changed, 171 insertions(+), 14 deletions(-) diff --git a/src/knotholder.cpp b/src/knotholder.cpp index f46daa09e..28f6f5748 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -69,6 +69,12 @@ KnotHolder::KnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFun } KnotHolder::~KnotHolder() { + if(SP_IS_LPE_ITEM(item)){ + Inkscape::LivePathEffect::Effect *effect = SP_LPE_ITEM(item)->getCurrentLPE(); + if(effect){ + effect->removeHandles(); + } + } sp_object_unref(item); for (std::list::iterator i = entity.begin(); i != entity.end(); ++i) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index eb649db62..9997b1662 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -613,7 +613,7 @@ Effect::registerParameter(Parameter * param) void Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { using namespace Inkscape::LivePathEffect; - + knot_holder = knotholder; // add handles provided by the effect itself addKnotHolderEntities(knotholder, desktop, item); @@ -623,6 +623,12 @@ Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { } } +void +Effect::removeHandles(){ + if(knot_holder){ + knot_holder = NULL; + } +} /** * Return a vector of PathVectors which contain all canvas indicators for this effect. * This is the function called by external code to get all canvas indicators (effect and its parameters) diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index 7da76b267..5d715c7f2 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -101,6 +101,7 @@ public: // (but spiro lpe still needs it!) virtual LPEPathFlashType pathFlashType() const { return DEFAULT; } void addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); + void removeHandles(); std::vector getCanvasIndicators(SPLPEItem const* lpeitem); inline bool providesOwnFlashPaths() const { @@ -160,6 +161,7 @@ protected: SPLPEItem * sp_lpe_item; // these get stored in doBeforeEffect_impl, and derived classes may do as they please with them. Glib::ustring const * defaultUnit; // these get stored in doBeforeEffect_impl, and derived classes may do as they please with them. + KnotHolder *knot_holder; double current_zoom; std::vector selectedNodesPoints; SPCurve * sp_curve; diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 33171b184..968e12518 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -137,7 +137,9 @@ LPEBendPath::resetDefaults(SPItem const* item) Geom::Point start(boundingbox_X.min(), (boundingbox_Y.max()+boundingbox_Y.min())/2); Geom::Point end(boundingbox_X.max(), (boundingbox_Y.max()+boundingbox_Y.min())/2); - + std::cout << start << "start\n"; + std::cout << start << "end\n"; + std::cout << boundingbox_X.min() << "boundingbox_X.min\n"; if ( Geom::are_near(start,end) ) { end += Geom::Point(1.,0.); } diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 6fb2bfc73..dc9a94b1b 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -24,23 +24,43 @@ #include <2geom/path-intersection.h> #include <2geom/transforms.h> #include <2geom/affine.h> +#include "knot-holder-entity.h" +#include "knotholder.h" namespace Inkscape { namespace LivePathEffect { +namespace MS { + +class KnotHolderEntityCenterMirrorSymmetry : public LPEKnotHolderEntity { +public: + KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) {}; + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); + virtual Geom::Point knot_get() const; +}; + +} // namespace MS + LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), fusionPaths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusionPaths", &wr, this, true), reverseFusion(_("Reverse fusion"), _("Reverse fusion"), "reverseFusion", &wr, this, false), - reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0") + forceX(_("Force horizontal"), _("Force horizontal"), "forceX", &wr, this, false), + forceY(_("Force vertical"), _("Force vertical"), "forceY", &wr, this, false), + reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), + center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") { show_orig_path = true; registerParameter( dynamic_cast(&discard_orig_path) ); registerParameter( dynamic_cast(&fusionPaths) ); registerParameter( dynamic_cast(&reverseFusion) ); + registerParameter( dynamic_cast(&forceX) ); + registerParameter( dynamic_cast(&forceY) ); registerParameter( dynamic_cast(&reflection_line) ); + registerParameter( dynamic_cast(¢er) ); + } LPEMirrorSymmetry::~LPEMirrorSymmetry() @@ -50,9 +70,36 @@ LPEMirrorSymmetry::~LPEMirrorSymmetry() void LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) { + using namespace Geom; + SPLPEItem * item = const_cast(lpeitem); std::vector mline(reflection_line.get_pathvector()); - lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); + double dist = distance(mline[0].initialPoint(),mline[0].finalPoint()); + if( !forceX && !forceY ){ + center.param_setValue(mline[0].pointAt(0.5)); + } + Point A(0,0); + Point B(0,0); + if(forceX){ + A = Geom::Point(center[X]+(dist/2.0),center[Y]); + B = Geom::Point(center[X]-(dist/2.0),center[Y]); + } + if(forceY){ + A = Geom::Point(center[X],center[Y]+(dist/2.0)); + B = Geom::Point(center[X],center[Y]-(dist/2.0)); + } + if( forceX || forceY ){ + lineSeparation.setPoints(A,B); + Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); + reflection_line.set_new_value(rline, true); + } else { + lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); + } + //Geom::Point const q = lineSeparation.pointAt(0.5)* lpeitem->i2dt_affine().inverse(); + if(knot_holder){ + knot_holder->update_knots(); + } + //e->knot_set(q, e->knot->drag_origin * lpeitem->i2dt_affine().inverse(), (guint)1); item->apply_to_clippath(item); item->apply_to_mask(item); } @@ -200,6 +247,58 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) return path_out; } +void +LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector &hp_vec) +{ + using namespace Geom; + + PathVector pathv; + Geom::Path mlineExpanded; + Geom::Point lineStart = lineSeparation.pointAt(-100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(100000.0); + mlineExpanded.start( lineStart); + mlineExpanded.appendNew( lineEnd); + pathv.push_back(mlineExpanded); + hp_vec.push_back(pathv); +} + +void +LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { + { + KnotHolderEntity *e = new MS::KnotHolderEntityCenterMirrorSymmetry(this); + e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, + _("Adjust the center") ); + knotholder->add(e); + } + +}; + +namespace MS { + +using namespace Geom; + +void +KnotHolderEntityCenterMirrorSymmetry::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) +{ + LPEMirrorSymmetry* lpe = dynamic_cast(_effect); + + Geom::Point const s = snap_knot_position(p, state); + + lpe->center.param_setValue(s); + + // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating. + sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); +} + +Geom::Point +KnotHolderEntityCenterMirrorSymmetry::knot_get() const +{ + LPEMirrorSymmetry const *lpe = dynamic_cast(_effect); + return lpe->center; +} + +} // namespace CR + } //namespace LivePathEffect } /* namespace Inkscape */ diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index c925f220f..4b2c9aea0 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -25,6 +25,11 @@ namespace Inkscape { namespace LivePathEffect { +namespace MS { + // we need a separate namespace to avoid clashes with LPEPerpBisector + class KnotHolderEntityCenterMirrorSymmetry; +} + class LPEMirrorSymmetry : public Effect, GroupBBoxEffect{ public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); @@ -38,12 +43,22 @@ public: virtual std::vector doEffect_path (std::vector const & path_in); + /* the knotholder entity classes must be declared friends */ + friend class MS::KnotHolderEntityCenterMirrorSymmetry; + void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); + +protected: + virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector &hp_vec); + private: BoolParam discard_orig_path; BoolParam fusionPaths; BoolParam reverseFusion; + BoolParam forceX; + BoolParam forceY; PathParam reflection_line; Geom::Line lineSeparation; + PointParam center; LPEMirrorSymmetry(const LPEMirrorSymmetry&); LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp index 2a1b70a6a..78545e9c5 100644 --- a/src/live_effects/lpegroupbbox.cpp +++ b/src/live_effects/lpegroupbbox.cpp @@ -8,6 +8,7 @@ #include "live_effects/lpegroupbbox.h" #include "sp-item.h" +#include "sp-item-group.h" namespace Inkscape { namespace LivePathEffect { @@ -34,9 +35,20 @@ void GroupBBoxEffect::original_bbox(SPLPEItem const* lpeitem, bool absolute) } Geom::OptRect bbox = lpeitem->geometricBounds(transform); + std::cout << bbox->hasZeroArea() << "=AREA\n"; + if(bbox->hasZeroArea() && SP_IS_GROUP(lpeitem)){ + bbox = (Geom::OptRect)SP_GROUP(lpeitem)->bbox(transform, SPLPEItem::GEOMETRIC_BBOX); + //GSList const *items = sp_item_group_item_list(SPGroup * group); + //for ( GSList const *i = items ; i != NULL ; i = i->next ) { + // bbox.unionWith(SP_ITEM(i->data)->desktopGeometricBounds()); + //} + } + std::cout << bbox->hasZeroArea() << "=AREA222\n"; if (bbox) { boundingbox_X = (*bbox)[Geom::X]; boundingbox_Y = (*bbox)[Geom::Y]; + std::cout << boundingbox_X << "=BBOXX\n"; + std::cout << boundingbox_Y << "=BBOXY\n"; } else { boundingbox_X = Geom::Interval(); boundingbox_Y = Geom::Interval(); diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index eb3857ee7..e9c012ff5 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -292,8 +292,11 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel) effectlist_store->clear(); current_lpeitem = NULL; - if ( sel && !sel->isEmpty() ) { - SPItem *item = sel->singleItem(); + if ( sel && (sel->isEmpty() || sel->singleItem())) { + SPItem * item= SP_ITEM(current_desktop->currentRoot()); + if(!sel->isEmpty()){ + item = sel->singleItem(); + } if ( item ) { SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { @@ -422,8 +425,11 @@ void LivePathEffectEditor::onAdd() { Inkscape::Selection *sel = _getSelection(); - if ( sel && !sel->isEmpty() ) { - SPItem *item = sel->singleItem(); + if ( sel && (sel->isEmpty() || sel->singleItem())) { + SPItem * item= SP_ITEM(current_desktop->currentRoot()); + if(!sel->isEmpty()){ + item = sel->singleItem(); + } if (item) { if ( dynamic_cast(item) ) { // show effectlist dialog @@ -500,8 +506,11 @@ void LivePathEffectEditor::onRemove() { Inkscape::Selection *sel = _getSelection(); - if ( sel && !sel->isEmpty() ) { - SPItem *item = sel->singleItem(); + if ( sel && (sel->isEmpty() || sel->singleItem())) { + SPItem * item= SP_ITEM(current_desktop->currentRoot()); + if(!sel->isEmpty()){ + item = sel->singleItem(); + } SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { lpeitem->removeCurrentPathEffect(false); @@ -518,8 +527,11 @@ LivePathEffectEditor::onRemove() void LivePathEffectEditor::onUp() { Inkscape::Selection *sel = _getSelection(); - if ( sel && !sel->isEmpty() ) { - SPItem *item = sel->singleItem(); + if ( sel && (sel->isEmpty() || sel->singleItem())) { + SPItem * item= SP_ITEM(current_desktop->currentRoot()); + if(!sel->isEmpty()){ + item = sel->singleItem(); + } SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { lpeitem->upCurrentPathEffect(); @@ -535,8 +547,11 @@ void LivePathEffectEditor::onUp() void LivePathEffectEditor::onDown() { Inkscape::Selection *sel = _getSelection(); - if ( sel && !sel->isEmpty() ) { - SPItem *item = sel->singleItem(); + if ( sel && (sel->isEmpty() || sel->singleItem())) { + SPItem * item= SP_ITEM(current_desktop->currentRoot()); + if(!sel->isEmpty()){ + item = sel->singleItem(); + } SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { lpeitem->downCurrentPathEffect(); -- cgit v1.2.3 From 69ef82447f23d5ebd3abc6a5903b10bbdb1b12f4 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 15 Nov 2014 18:34:32 +0100 Subject: ignore this commit (bzr r13682.1.10) --- src/knotholder.cpp | 6 - src/live_effects/effect.cpp | 10 +- src/live_effects/effect.h | 2 - src/live_effects/lpe-bendpath.cpp | 4 +- src/live_effects/lpe-fillet-chamfer.cpp | 76 +++++-- src/live_effects/lpe-fillet-chamfer.h | 4 +- src/live_effects/lpe-mirror_symmetry.cpp | 230 ++------------------- src/live_effects/lpe-mirror_symmetry.h | 24 +-- src/live_effects/lpegroupbbox.cpp | 12 -- .../parameter/filletchamferpointarray.cpp | 32 ++- src/selection-chemistry.cpp | 2 +- src/sp-item-group.cpp | 9 +- src/ui/clipboard.cpp | 7 + src/ui/dialog/livepatheffect-editor.cpp | 35 +--- src/ui/dialog/lpe-fillet-chamfer-properties.cpp | 15 +- src/ui/dialog/lpe-fillet-chamfer-properties.h | 1 + 16 files changed, 146 insertions(+), 323 deletions(-) diff --git a/src/knotholder.cpp b/src/knotholder.cpp index 28f6f5748..f46daa09e 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -69,12 +69,6 @@ KnotHolder::KnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFun } KnotHolder::~KnotHolder() { - if(SP_IS_LPE_ITEM(item)){ - Inkscape::LivePathEffect::Effect *effect = SP_LPE_ITEM(item)->getCurrentLPE(); - if(effect){ - effect->removeHandles(); - } - } sp_object_unref(item); for (std::list::iterator i = entity.begin(); i != entity.end(); ++i) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 9997b1662..e49a15dd0 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -106,6 +106,7 @@ const Util::EnumData LPETypeData[] = { {EXTRUDE, N_("Extrude"), "extrude"}, {LATTICE, N_("Lattice Deformation"), "lattice"}, {LINE_SEGMENT, N_("Line Segment"), "line_segment"}, + {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, {OFFSET, N_("Offset"), "offset"}, {PARALLEL, N_("Parallel"), "parallel"}, {PATH_LENGTH, N_("Path length"), "path_length"}, @@ -152,7 +153,6 @@ const Util::EnumData LPETypeData[] = { {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, - {MIRROR_SYMMETRY, N_("Mirror symmetry"), "mirror_symmetry"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); @@ -613,7 +613,7 @@ Effect::registerParameter(Parameter * param) void Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { using namespace Inkscape::LivePathEffect; - knot_holder = knotholder; + // add handles provided by the effect itself addKnotHolderEntities(knotholder, desktop, item); @@ -623,12 +623,6 @@ Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { } } -void -Effect::removeHandles(){ - if(knot_holder){ - knot_holder = NULL; - } -} /** * Return a vector of PathVectors which contain all canvas indicators for this effect. * This is the function called by external code to get all canvas indicators (effect and its parameters) diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index 5d715c7f2..7da76b267 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -101,7 +101,6 @@ public: // (but spiro lpe still needs it!) virtual LPEPathFlashType pathFlashType() const { return DEFAULT; } void addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); - void removeHandles(); std::vector getCanvasIndicators(SPLPEItem const* lpeitem); inline bool providesOwnFlashPaths() const { @@ -161,7 +160,6 @@ protected: SPLPEItem * sp_lpe_item; // these get stored in doBeforeEffect_impl, and derived classes may do as they please with them. Glib::ustring const * defaultUnit; // these get stored in doBeforeEffect_impl, and derived classes may do as they please with them. - KnotHolder *knot_holder; double current_zoom; std::vector selectedNodesPoints; SPCurve * sp_curve; diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index 968e12518..33171b184 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -137,9 +137,7 @@ LPEBendPath::resetDefaults(SPItem const* item) Geom::Point start(boundingbox_X.min(), (boundingbox_Y.max()+boundingbox_Y.min())/2); Geom::Point end(boundingbox_X.max(), (boundingbox_Y.max()+boundingbox_Y.min())/2); - std::cout << start << "start\n"; - std::cout << start << "end\n"; - std::cout << boundingbox_X.min() << "boundingbox_X.min\n"; + if ( Geom::are_near(start,end) ) { end += Geom::Point(1.,0.); } diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp index c89bfbd37..78e24f0b8 100644 --- a/src/live_effects/lpe-fillet-chamfer.cpp +++ b/src/live_effects/lpe-fillet-chamfer.cpp @@ -79,7 +79,7 @@ LPEFilletChamfer::LPEFilletChamfer(LivePathEffectObject *lpeobject) : radius.param_set_range(0., infinity()); radius.param_set_increments(1, 1); radius.param_set_digits(4); - chamfer_steps.param_set_range(0, infinity()); + chamfer_steps.param_set_range(0, 999); chamfer_steps.param_set_increments(1, 1); chamfer_steps.param_set_digits(0); helper_size.param_set_range(0, infinity()); @@ -116,7 +116,7 @@ Gtk::Widget *LPEFilletChamfer::newWidget() } } else if (param->param_key == "chamfer_steps") { Inkscape::UI::Widget::Scalar *widgRegistered = Gtk::manage(dynamic_cast(widg)); - widgRegistered->signal_value_changed().connect(sigc::mem_fun(*this, &LPEFilletChamfer::chamfer)); + widgRegistered->signal_value_changed().connect(sigc::mem_fun(*this, &LPEFilletChamfer::chamferSubdivisions)); widg = widgRegistered; if (widg) { Gtk::HBox *scalarParameter = dynamic_cast(widg); @@ -153,21 +153,26 @@ Gtk::Widget *LPEFilletChamfer::newWidget() ++it; } - - Gtk::VBox *buttonsContainer = Gtk::manage(new Gtk::VBox(true, 0)); + Gtk::HBox *filletContainer = Gtk::manage(new Gtk::HBox(true, 0)); Gtk::Button *fillet = Gtk::manage(new Gtk::Button(Glib::ustring(_("Fillet")))); fillet->signal_clicked().connect(sigc::mem_fun(*this, &LPEFilletChamfer::fillet)); - buttonsContainer->pack_start(*fillet, true, true, 2); - Gtk::Button *inverse = Gtk::manage(new Gtk::Button(Glib::ustring(_("Inverse fillet")))); - inverse->signal_clicked().connect(sigc::mem_fun(*this, &LPEFilletChamfer::inverse)); - buttonsContainer->pack_start(*inverse, true, true, 2); - + filletContainer->pack_start(*fillet, true, true, 2); + Gtk::Button *inverseFillet = Gtk::manage(new Gtk::Button(Glib::ustring(_("Inverse fillet")))); + inverseFillet->signal_clicked().connect(sigc::mem_fun(*this, &LPEFilletChamfer::inverseFillet)); + filletContainer->pack_start(*inverseFillet, true, true, 2); + + Gtk::HBox *chamferContainer = Gtk::manage(new Gtk::HBox(true, 0)); Gtk::Button *chamfer = Gtk::manage(new Gtk::Button(Glib::ustring(_("Chamfer")))); chamfer->signal_clicked().connect(sigc::mem_fun(*this, &LPEFilletChamfer::chamfer)); - buttonsContainer->pack_start(*chamfer, true, true, 2); - vbox->pack_start(*buttonsContainer, true, true, 2); + chamferContainer->pack_start(*chamfer, true, true, 2); + Gtk::Button *inverseChamfer = Gtk::manage(new Gtk::Button(Glib::ustring(_("Inverse chamfer")))); + inverseChamfer->signal_clicked().connect(sigc::mem_fun(*this, &LPEFilletChamfer::inverseChamfer)); + chamferContainer->pack_start(*inverseChamfer, true, true, 2); + + vbox->pack_start(*filletContainer, true, true, 2); + vbox->pack_start(*chamferContainer, true, true, 2); return vbox; } @@ -232,17 +237,31 @@ void LPEFilletChamfer::fillet() doChangeType(path_from_piecewise(pwd2, tolerance), 1); } -void LPEFilletChamfer::inverse() +void LPEFilletChamfer::inverseFillet() { Piecewise > const &pwd2 = fillet_chamfer_values.get_pwd2(); doChangeType(path_from_piecewise(pwd2, tolerance), 2); } +void LPEFilletChamfer::chamferSubdivisions() +{ + fillet_chamfer_values.set_chamfer_steps(chamfer_steps); + Piecewise > const &pwd2 = fillet_chamfer_values.get_pwd2(); + doChangeType(path_from_piecewise(pwd2, tolerance), chamfer_steps + 5000); +} + void LPEFilletChamfer::chamfer() { - fillet_chamfer_values.set_chamfer_steps(chamfer_steps + 3); + fillet_chamfer_values.set_chamfer_steps(chamfer_steps); Piecewise > const &pwd2 = fillet_chamfer_values.get_pwd2(); - doChangeType(path_from_piecewise(pwd2, tolerance), chamfer_steps + 3); + doChangeType(path_from_piecewise(pwd2, tolerance), chamfer_steps + 3000); +} + +void LPEFilletChamfer::inverseChamfer() +{ + fillet_chamfer_values.set_chamfer_steps(chamfer_steps); + Piecewise > const &pwd2 = fillet_chamfer_values.get_pwd2(); + doChangeType(path_from_piecewise(pwd2, tolerance), chamfer_steps + 4000); } void LPEFilletChamfer::refreshKnots() @@ -333,6 +352,13 @@ void LPEFilletChamfer::doChangeType(std::vector const& original_path toggle = false; } if (toggle) { + if(type >= 5000){ + if(filletChamferData[counter][Y] >= 3000 && filletChamferData[counter][Y] < 4000){ + type = type - 2000; + } else if (filletChamferData[counter][Y] >= 4000 && filletChamferData[counter][Y] < 5000){ + type = type - 1000; + } + } result.push_back(Point(filletChamferData[counter][X], type)); } else { result.push_back(filletChamferData[counter]); @@ -552,8 +578,8 @@ LPEFilletChamfer::doEffect_path(std::vector const &path_in) } else { type = std::abs(filletChamferData[counter + 1][Y]); } - if (type >= 3) { - unsigned int chamferSubs = type-2; + if (type >= 3000 && type < 4000) { + unsigned int chamferSubs = type-2999; Geom::Path path_chamfer; path_chamfer.start(path_out.finalPoint()); if((is_straight_curve(*curve_it1) && is_straight_curve(*curve_it2Fixed) && method != FM_BEZIER )|| method == FM_ARC){ @@ -567,6 +593,22 @@ LPEFilletChamfer::doEffect_path(std::vector const &path_in) path_out.appendNew(chamferStep); } path_out.appendNew(endArcPoint); + } else if (type >= 4000 && type < 5000) { + unsigned int chamferSubs = type-3999; + Geom::Path path_chamfer; + path_chamfer.start(path_out.finalPoint()); + if((is_straight_curve(*curve_it1) && is_straight_curve(*curve_it2Fixed) && method != FM_BEZIER )|| method == FM_ARC){ + ccwToggle = ccwToggle?0:1; + path_chamfer.appendNew(rx, ry, angleArc, 0, ccwToggle, endArcPoint); + }else{ + path_chamfer.appendNew(inverseHandle1, inverseHandle2, endArcPoint); + } + double chamfer_stepsTime = 1.0/chamferSubs; + for(unsigned int i = 1; i < chamferSubs; i++){ + Geom::Point chamferStep = path_chamfer.pointAt(chamfer_stepsTime * i); + path_out.appendNew(chamferStep); + } + path_out.appendNew(endArcPoint); } else if (type == 2) { if((is_straight_curve(*curve_it1) && is_straight_curve(*curve_it2Fixed) && method != FM_BEZIER )|| method == FM_ARC){ ccwToggle = ccwToggle?0:1; @@ -574,7 +616,7 @@ LPEFilletChamfer::doEffect_path(std::vector const &path_in) }else{ path_out.appendNew(inverseHandle1, inverseHandle2, endArcPoint); } - } else { + } else if (type == 1){ if((is_straight_curve(*curve_it1) && is_straight_curve(*curve_it2Fixed) && method != FM_BEZIER )|| method == FM_ARC){ path_out.appendNew(rx, ry, angleArc, 0, ccwToggle, endArcPoint); } else { diff --git a/src/live_effects/lpe-fillet-chamfer.h b/src/live_effects/lpe-fillet-chamfer.h index e3589197c..0d6a1ff17 100644 --- a/src/live_effects/lpe-fillet-chamfer.h +++ b/src/live_effects/lpe-fillet-chamfer.h @@ -56,8 +56,10 @@ public: void toggleHide(); void toggleFlexFixed(); void chamfer(); + void chamferSubdivisions(); + void inverseChamfer(); void fillet(); - void inverse(); + void inverseFillet(); void updateFillet(); void doUpdateFillet(std::vector const& original_pathv, double power); void doChangeType(std::vector const& original_pathv, int type); diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index dc9a94b1b..0bb67a4a2 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -19,48 +19,23 @@ #include #include #include -#include "helper/geom.h" + #include <2geom/path.h> -#include <2geom/path-intersection.h> #include <2geom/transforms.h> #include <2geom/affine.h> -#include "knot-holder-entity.h" -#include "knotholder.h" namespace Inkscape { namespace LivePathEffect { -namespace MS { - -class KnotHolderEntityCenterMirrorSymmetry : public LPEKnotHolderEntity { -public: - KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; -}; - -} // namespace MS - LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), - fusionPaths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusionPaths", &wr, this, true), - reverseFusion(_("Reverse fusion"), _("Reverse fusion"), "reverseFusion", &wr, this, false), - forceX(_("Force horizontal"), _("Force horizontal"), "forceX", &wr, this, false), - forceY(_("Force vertical"), _("Force vertical"), "forceY", &wr, this, false), - reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), - center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") + reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L100,100") { show_orig_path = true; registerParameter( dynamic_cast(&discard_orig_path) ); - registerParameter( dynamic_cast(&fusionPaths) ); - registerParameter( dynamic_cast(&reverseFusion) ); - registerParameter( dynamic_cast(&forceX) ); - registerParameter( dynamic_cast(&forceY) ); registerParameter( dynamic_cast(&reflection_line) ); - registerParameter( dynamic_cast(¢er) ); - } LPEMirrorSymmetry::~LPEMirrorSymmetry() @@ -70,36 +45,7 @@ LPEMirrorSymmetry::~LPEMirrorSymmetry() void LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) { - using namespace Geom; - SPLPEItem * item = const_cast(lpeitem); - std::vector mline(reflection_line.get_pathvector()); - double dist = distance(mline[0].initialPoint(),mline[0].finalPoint()); - if( !forceX && !forceY ){ - center.param_setValue(mline[0].pointAt(0.5)); - } - Point A(0,0); - Point B(0,0); - if(forceX){ - A = Geom::Point(center[X]+(dist/2.0),center[Y]); - B = Geom::Point(center[X]-(dist/2.0),center[Y]); - } - if(forceY){ - A = Geom::Point(center[X],center[Y]+(dist/2.0)); - B = Geom::Point(center[X],center[Y]-(dist/2.0)); - } - if( forceX || forceY ){ - lineSeparation.setPoints(A,B); - Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); - reflection_line.set_new_value(rline, true); - } else { - lineSeparation.setPoints(mline[0].initialPoint(),mline[0].finalPoint()); - } - //Geom::Point const q = lineSeparation.pointAt(0.5)* lpeitem->i2dt_affine().inverse(); - if(knot_holder){ - knot_holder->update_knots(); - } - //e->knot_set(q, e->knot->drag_origin * lpeitem->i2dt_affine().inverse(), (guint)1); item->apply_to_clippath(item); item->apply_to_mask(item); } @@ -109,22 +55,19 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) { using namespace Geom; - original_bbox(lpeitem); + // fixme: what happens if the bbox is empty? + // fixme: this is probably wrong + Geom::Affine t = lpeitem->i2dt_affine(); + Geom::Rect bbox = *lpeitem->desktopVisualBounds(); - Point A(boundingbox_X.max(), boundingbox_Y.max()); - Point B(boundingbox_X.max(), boundingbox_Y.min()); + Point A(bbox.left(), bbox.bottom()); + Point B(bbox.left(), bbox.top()); + A *= t; + B *= t; Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); reflection_line.set_new_value(rline, true); } -int -LPEMirrorSymmetry::pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X) -{ - //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); - return (pos < 0) ? -1 : (pos > 0); -} - std::vector LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) { @@ -132,20 +75,15 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) if ( reflection_line.get_pathvector().empty() ) { return path_in; } - Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); - std::vector path_out; - Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); - mlineExpanded.start( lineStart); - mlineExpanded.appendNew( lineEnd); - if (!discard_orig_path && !fusionPaths) { + std::vector path_out; + if (!discard_orig_path) { path_out = path_in; } - Geom::Point A(lineStart); - Geom::Point B(lineEnd); + std::vector mline(reflection_line.get_pathvector()); + Geom::Point A(mline.front().initialPoint()); + Geom::Point B(mline.back().finalPoint()); Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); double hyp = Geom::distance(A, B); @@ -159,146 +97,14 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) m = m * sca; m = m * m2.inverse(); m = m * m1; - - if(fusionPaths && !discard_orig_path){ - for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); - path_it != original_pathv.end(); ++path_it) { - if (path_it->empty()){ - continue; - } - std::vector temp_path; - double timeStart = 0.0; - int position = 0; - bool end_open = false; - if (path_it->closed()) { - const Geom::Curve &closingline = path_it->back_closed(); - if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { - end_open = true; - } - } - Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it->closed()){ - original.close(false); - original.appendNew( original.initialPoint() ); - original.close(true); - } - Geom::Crossings cs = crossings(original, mlineExpanded); - for(unsigned int i = 0; i < cs.size(); i++) { - double timeEnd = cs[i].ta; - Geom::Path portion = original.portion(timeStart, timeEnd); - Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = pointSideOfLine(lineStart, lineEnd, middle); - if(reverseFusion){ - position *= -1; - } - if(position == -1){ - Geom::Path mirror = portion.reverse() * m; - mirror.setInitial(portion.finalPoint()); - portion.append(mirror); - if(i!=0){ - portion.setFinal(portion.initialPoint()); - portion.close(); - } - temp_path.push_back(portion); - } - portion.clear(); - timeStart = timeEnd; - } - position = pointSideOfLine(lineStart, lineEnd, original.finalPoint()); - if(reverseFusion){ - position *= -1; - } - if(cs.size()!=0 && position == -1){ - Geom::Path portion = original.portion(timeStart, original.size()); - portion = portion.reverse(); - Geom::Path mirror = portion.reverse() * m; - mirror.setInitial(portion.finalPoint()); - portion.append(mirror); - portion = portion.reverse(); - if (!original.closed()){ - temp_path.push_back(portion); - } else { - if(cs.size() >1 ){ - portion.setFinal(temp_path[0].initialPoint()); - portion.setInitial(temp_path[0].finalPoint()); - temp_path[0].append(portion); - } else { - temp_path.push_back(portion); - } - temp_path[0].close(); - } - portion.clear(); - } - if(cs.size() == 0 && position == -1){ - temp_path.push_back(original); - temp_path.push_back(original * m); - } - path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); - temp_path.clear(); - } - } - - if (!fusionPaths || discard_orig_path) { - for (int i = 0; i < static_cast(path_in.size()); ++i) { - path_out.push_back(path_in[i] * m); - } - } - return path_out; -} - -void -LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector &hp_vec) -{ - using namespace Geom; - - PathVector pathv; - Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); - mlineExpanded.start( lineStart); - mlineExpanded.appendNew( lineEnd); - pathv.push_back(mlineExpanded); - hp_vec.push_back(pathv); -} - -void -LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { - { - KnotHolderEntity *e = new MS::KnotHolderEntityCenterMirrorSymmetry(this); - e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, - _("Adjust the center") ); - knotholder->add(e); + for (int i = 0; i < static_cast(path_in.size()); ++i) { + path_out.push_back(path_in[i] * m); } -}; - -namespace MS { - -using namespace Geom; - -void -KnotHolderEntityCenterMirrorSymmetry::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) -{ - LPEMirrorSymmetry* lpe = dynamic_cast(_effect); - - Geom::Point const s = snap_knot_position(p, state); - - lpe->center.param_setValue(s); - - // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating. - sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); -} - -Geom::Point -KnotHolderEntityCenterMirrorSymmetry::knot_get() const -{ - LPEMirrorSymmetry const *lpe = dynamic_cast(_effect); - return lpe->center; + return path_out; } -} // namespace CR - } //namespace LivePathEffect } /* namespace Inkscape */ diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 4b2c9aea0..a4a2b86c0 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -20,17 +20,10 @@ #include "live_effects/parameter/point.h" #include "live_effects/parameter/path.h" -#include "live_effects/lpegroupbbox.h" - namespace Inkscape { namespace LivePathEffect { -namespace MS { - // we need a separate namespace to avoid clashes with LPEPerpBisector - class KnotHolderEntityCenterMirrorSymmetry; -} - -class LPEMirrorSymmetry : public Effect, GroupBBoxEffect{ +class LPEMirrorSymmetry : public Effect { public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); virtual ~LPEMirrorSymmetry(); @@ -39,26 +32,11 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); - virtual std::vector doEffect_path (std::vector const & path_in); - /* the knotholder entity classes must be declared friends */ - friend class MS::KnotHolderEntityCenterMirrorSymmetry; - void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); - -protected: - virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector &hp_vec); - private: BoolParam discard_orig_path; - BoolParam fusionPaths; - BoolParam reverseFusion; - BoolParam forceX; - BoolParam forceY; PathParam reflection_line; - Geom::Line lineSeparation; - PointParam center; LPEMirrorSymmetry(const LPEMirrorSymmetry&); LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp index 78545e9c5..2a1b70a6a 100644 --- a/src/live_effects/lpegroupbbox.cpp +++ b/src/live_effects/lpegroupbbox.cpp @@ -8,7 +8,6 @@ #include "live_effects/lpegroupbbox.h" #include "sp-item.h" -#include "sp-item-group.h" namespace Inkscape { namespace LivePathEffect { @@ -35,20 +34,9 @@ void GroupBBoxEffect::original_bbox(SPLPEItem const* lpeitem, bool absolute) } Geom::OptRect bbox = lpeitem->geometricBounds(transform); - std::cout << bbox->hasZeroArea() << "=AREA\n"; - if(bbox->hasZeroArea() && SP_IS_GROUP(lpeitem)){ - bbox = (Geom::OptRect)SP_GROUP(lpeitem)->bbox(transform, SPLPEItem::GEOMETRIC_BBOX); - //GSList const *items = sp_item_group_item_list(SPGroup * group); - //for ( GSList const *i = items ; i != NULL ; i = i->next ) { - // bbox.unionWith(SP_ITEM(i->data)->desktopGeometricBounds()); - //} - } - std::cout << bbox->hasZeroArea() << "=AREA222\n"; if (bbox) { boundingbox_X = (*bbox)[Geom::X]; boundingbox_Y = (*bbox)[Geom::Y]; - std::cout << boundingbox_X << "=BBOXX\n"; - std::cout << boundingbox_Y << "=BBOXY\n"; } else { boundingbox_X = Geom::Interval(); boundingbox_Y = Geom::Interval(); diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp index cf9ef3132..4e2be6e88 100644 --- a/src/live_effects/parameter/filletchamferpointarray.cpp +++ b/src/live_effects/parameter/filletchamferpointarray.cpp @@ -723,7 +723,7 @@ FilletChamferPointArrayParamKnotHolderEntity( void FilletChamferPointArrayParamKnotHolderEntity::knot_set(Point const &p, Point const &/*origin*/, - guint /*state*/) + guint state) { using namespace Geom; @@ -733,7 +733,7 @@ void FilletChamferPointArrayParamKnotHolderEntity::knot_set(Point const &p, /// @todo how about item transforms??? Piecewise > const &pwd2 = _pparam->get_pwd2(); //todo: add snapping - //Geom::Point const s = snap_knot_position(p, state); + Geom::Point const s = snap_knot_position(p, state); double t = nearest_point(p, pwd2[_index]); if (t == 1) { t = 0.9999; @@ -777,13 +777,21 @@ void FilletChamferPointArrayParamKnotHolderEntity::knot_click(guint state) }else{ using namespace Geom; int type = (int)_pparam->_vector.at(_index)[Y]; - + if (type >=3000 && type < 4000){ + type = 3; + } + if (type >=4000 && type < 5000){ + type = 4; + } switch(type){ case 1: type = 2; break; case 2: - type = _pparam->chamfer_steps; + type = _pparam->chamfer_steps + 3000; + break; + case 3: + type = _pparam->chamfer_steps + 4000; break; default: type = 1; @@ -793,8 +801,12 @@ void FilletChamferPointArrayParamKnotHolderEntity::knot_click(guint state) _pparam->param_set_and_write_new_value(_pparam->_vector); sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false); const gchar *tip; - if (type >= 3) { - tip = _("Chamfer: Ctrl+Click toogle type, " + if (type >=3000 && type < 4000){ + tip = _("Chamfer: Ctrl+Click toogle type, " + "Shift+Click open dialog, " + "Ctrl+Alt+Click reset"); + } else if (type >=4000 && type < 5000) { + tip = _("Inverse Chamfer: Ctrl+Click toogle type, " "Shift+Click open dialog, " "Ctrl+Alt+Click reset"); } else if (type == 2) { @@ -850,8 +862,12 @@ void FilletChamferPointArrayParam::addKnotHolderEntities(KnotHolder *knotholder, continue; } const gchar *tip; - if (_vector[i][Y] >= 3) { - tip = _("Chamfer: Ctrl+Click toogle type, " + if (_vector[i][Y] >=3000 && _vector[i][Y] < 4000){ + tip = _("Chamfer: Ctrl+Click toogle type, " + "Shift+Click open dialog, " + "Ctrl+Alt+Click reset"); + } else if (_vector[i][Y] >=4000 && _vector[i][Y] < 5000) { + tip = _("Inverse Chamfer: Ctrl+Click toogle type, " "Shift+Click open dialog, " "Ctrl+Alt+Click reset"); } else if (_vector[i][Y] == 2) { diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index d00e8d702..ffa149cee 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -1643,7 +1643,7 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine cons item->doWriteTransform(item->getRepr(), move, &move, compensate); } else if (prefs_unmoved) { - //if (SP_IS_USE(sp_use_get_original(SP_USE(item)))) + //if (dynamic_cast(sp_use_get_original(dynamic_cast(item)))) // clone_move = Geom::identity(); Geom::Affine move = result * clone_move; item->doWriteTransform(item->getRepr(), move, &t, compensate); diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp index 613ace5c1..992bca631 100644 --- a/src/sp-item-group.cpp +++ b/src/sp-item-group.cpp @@ -662,8 +662,13 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p, bo { if ( hasChildren() ) { for (SPObject *o = firstChild() ; o ; o = o->getNext() ) { - SPItem *item = dynamic_cast(o); - if ( item ) { + if ( SPDefs *defs = dynamic_cast(o) ) { // select symbols from defs, ignore clips, masks, patterns + for (SPObject *defschild = defs->firstChild() ; defschild ; defschild = defschild->getNext() ) { + SPGroup *defsgroup = dynamic_cast(defschild); + if (defsgroup) + defsgroup->scaleChildItemsRec(sc, p, false); + } + } else if ( SPItem *item = dynamic_cast(o) ) { SPGroup *group = dynamic_cast(item); if (group && !dynamic_cast(item)) { /* Using recursion breaks clipping because transforms are applied diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 931a295d8..153ed9830 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -330,6 +330,13 @@ void ClipboardManagerImpl::copySymbol(Inkscape::XML::Node* symbol, gchar const* use->setAttribute("xlink:href", id.c_str() ); // Set a default style in rather than so it can be changed. use->setAttribute("style", style ); + + Inkscape::XML::Node *nv_repr = sp_desktop_namedview(inkscape_active_desktop())->getRepr(); + gdouble scale_units = Inkscape::Util::Quantity::convert(1, nv_repr->attribute("inkscape:document-units"), "px"); + gchar *transform_str = sp_svg_transform_write(Geom::Scale(scale_units, scale_units)); + use->setAttribute("transform", transform_str); + g_free(transform_str); + _root->appendChild(use); // This min and max sets offsets, we don't have any so set to zero. diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp index e9c012ff5..eb3857ee7 100644 --- a/src/ui/dialog/livepatheffect-editor.cpp +++ b/src/ui/dialog/livepatheffect-editor.cpp @@ -292,11 +292,8 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel) effectlist_store->clear(); current_lpeitem = NULL; - if ( sel && (sel->isEmpty() || sel->singleItem())) { - SPItem * item= SP_ITEM(current_desktop->currentRoot()); - if(!sel->isEmpty()){ - item = sel->singleItem(); - } + if ( sel && !sel->isEmpty() ) { + SPItem *item = sel->singleItem(); if ( item ) { SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { @@ -425,11 +422,8 @@ void LivePathEffectEditor::onAdd() { Inkscape::Selection *sel = _getSelection(); - if ( sel && (sel->isEmpty() || sel->singleItem())) { - SPItem * item= SP_ITEM(current_desktop->currentRoot()); - if(!sel->isEmpty()){ - item = sel->singleItem(); - } + if ( sel && !sel->isEmpty() ) { + SPItem *item = sel->singleItem(); if (item) { if ( dynamic_cast(item) ) { // show effectlist dialog @@ -506,11 +500,8 @@ void LivePathEffectEditor::onRemove() { Inkscape::Selection *sel = _getSelection(); - if ( sel && (sel->isEmpty() || sel->singleItem())) { - SPItem * item= SP_ITEM(current_desktop->currentRoot()); - if(!sel->isEmpty()){ - item = sel->singleItem(); - } + if ( sel && !sel->isEmpty() ) { + SPItem *item = sel->singleItem(); SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { lpeitem->removeCurrentPathEffect(false); @@ -527,11 +518,8 @@ LivePathEffectEditor::onRemove() void LivePathEffectEditor::onUp() { Inkscape::Selection *sel = _getSelection(); - if ( sel && (sel->isEmpty() || sel->singleItem())) { - SPItem * item= SP_ITEM(current_desktop->currentRoot()); - if(!sel->isEmpty()){ - item = sel->singleItem(); - } + if ( sel && !sel->isEmpty() ) { + SPItem *item = sel->singleItem(); SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { lpeitem->upCurrentPathEffect(); @@ -547,11 +535,8 @@ void LivePathEffectEditor::onUp() void LivePathEffectEditor::onDown() { Inkscape::Selection *sel = _getSelection(); - if ( sel && (sel->isEmpty() || sel->singleItem())) { - SPItem * item= SP_ITEM(current_desktop->currentRoot()); - if(!sel->isEmpty()){ - item = sel->singleItem(); - } + if ( sel && !sel->isEmpty() ) { + SPItem *item = sel->singleItem(); SPLPEItem *lpeitem = dynamic_cast(item); if ( lpeitem ) { lpeitem->downCurrentPathEffect(); diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp index e55c9f8df..55a19fc51 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.cpp +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.cpp @@ -79,12 +79,15 @@ FilletChamferPropertiesDialog::FilletChamferPropertiesDialog() _fillet_chamfer_type_inverse_fillet.set_group(_fillet_chamfer_type_group); _fillet_chamfer_type_chamfer.set_label(_("Chamfer")); _fillet_chamfer_type_chamfer.set_group(_fillet_chamfer_type_group); + _fillet_chamfer_type_inverse_chamfer.set_label(_("Inverse chamfer")); + _fillet_chamfer_type_inverse_chamfer.set_group(_fillet_chamfer_type_group); mainVBox->pack_start(_layout_table, true, true, 4); mainVBox->pack_start(_fillet_chamfer_type_fillet, true, true, 4); mainVBox->pack_start(_fillet_chamfer_type_inverse_fillet, true, true, 4); mainVBox->pack_start(_fillet_chamfer_type_chamfer, true, true, 4); + mainVBox->pack_start(_fillet_chamfer_type_inverse_chamfer, true, true, 4); // Buttons _close_button.set_use_stock(true); @@ -158,8 +161,10 @@ void FilletChamferPropertiesDialog::_apply() d_width = 1; } else if (_fillet_chamfer_type_inverse_fillet.get_active() == true) { d_width = 2; + } else if (_fillet_chamfer_type_inverse_chamfer.get_active() == true) { + d_width = _fillet_chamfer_chamfer_subdivisions.get_value() + 4000; } else { - d_width = _fillet_chamfer_chamfer_subdivisions.get_value() + 3; + d_width = _fillet_chamfer_chamfer_subdivisions.get_value() + 3000; } if (_flexible) { if (d_pos > 99.99999 || d_pos < 0) { @@ -229,8 +234,12 @@ void FilletChamferPropertiesDialog::_set_knot_point(Geom::Point knotpoint) _fillet_chamfer_type_fillet.set_active(true); } else if (knotpoint.y() == 2) { _fillet_chamfer_type_inverse_fillet.set_active(true); - } else if (knotpoint.y() >= 3) { - _fillet_chamfer_chamfer_subdivisions.set_value(knotpoint.y() - 3); + } else if (knotpoint.y() >= 3000 && knotpoint.y() < 4000) { + _fillet_chamfer_chamfer_subdivisions.set_value(knotpoint.y() - 3000); + _fillet_chamfer_type_chamfer.set_active(true); + } else if (knotpoint.y() >= 4000 && knotpoint.y() < 5000) { + _fillet_chamfer_chamfer_subdivisions.set_value(knotpoint.y() - 4000); + _fillet_chamfer_type_inverse_chamfer.set_active(true); } } diff --git a/src/ui/dialog/lpe-fillet-chamfer-properties.h b/src/ui/dialog/lpe-fillet-chamfer-properties.h index ec87addc5..3807e98c8 100644 --- a/src/ui/dialog/lpe-fillet-chamfer-properties.h +++ b/src/ui/dialog/lpe-fillet-chamfer-properties.h @@ -47,6 +47,7 @@ protected: Gtk::RadioButton _fillet_chamfer_type_fillet; Gtk::RadioButton _fillet_chamfer_type_inverse_fillet; Gtk::RadioButton _fillet_chamfer_type_chamfer; + Gtk::RadioButton _fillet_chamfer_type_inverse_chamfer; Gtk::Label _fillet_chamfer_chamfer_subdivisions_label; Gtk::SpinButton _fillet_chamfer_chamfer_subdivisions; -- cgit v1.2.3 From 015ec174f96c7e0aa96f4bab17a2895b62f4c24c Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 16 Nov 2014 20:47:41 +0100 Subject: 360 auto degree calculation check (bzr r13708.1.2) --- src/live_effects/lpe-copy_rotate.cpp | 52 +++++++----------------------------- src/live_effects/lpe-copy_rotate.h | 2 +- 2 files changed, 10 insertions(+), 44 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 7e3f35f9d..51787e292 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -38,12 +38,6 @@ public: virtual Geom::Point knot_get() const; }; -class KnotHolderEntityRotationAngle : public LPEKnotHolderEntity { -public: - KnotHolderEntityRotationAngle(LPECopyRotate *effect) : LPEKnotHolderEntity(effect) {}; - virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); - virtual Geom::Point knot_get() const; -}; } // namespace CR @@ -52,6 +46,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0), rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), + copiesTo360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copiesTo360", &wr, this, true), origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), dist_angle_handle(100) { @@ -59,6 +54,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : _provides_knotholder_entities = true; // register all your parameters here, so Inkscape knows which parameters this effect has: + registerParameter( dynamic_cast(&copiesTo360) ); registerParameter( dynamic_cast(&starting_angle) ); registerParameter( dynamic_cast(&rotation_angle) ); registerParameter( dynamic_cast(&num_copies) ); @@ -82,6 +78,7 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) Point A(boundingbox_X.min(), boundingbox_Y.middle()); Point B(boundingbox_X.max(), boundingbox_Y.middle()); + Point C(boundingbox_X.middle(), boundingbox_Y.middle()); origin.param_setValue(A); dir = unit_vector(B - A); @@ -96,7 +93,11 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p // I first suspected the minus sign to be a bug in 2geom but it is // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; - rot_pos = origin + dir * Rotate(-deg_to_rad(starting_angle + rotation_angle)) * dist_angle_handle; + double rotation_angle_end = rotation_angle; + if(copiesTo360){ + rotation_angle_end = 360.0/(double)num_copies; + } + rot_pos = origin + dir * Rotate(-deg_to_rad(starting_angle + rotation_angle_end)) * dist_angle_handle; A = pwd2_in.firstValue(); B = pwd2_in.lastValue(); @@ -108,7 +109,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p for (int i = 0; i < num_copies; ++i) { // I first suspected the minus sign to be a bug in 2geom but it is // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle * i)); + Rotate rot(-deg_to_rad(rotation_angle_end * i)); Affine t = pre * rot * Translate(origin); output.concat(pwd2_in * t); } @@ -124,8 +125,6 @@ LPECopyRotate::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector((Geom::Point) origin); path.appendNew(rot_pos); - std::cout << rot_pos << "rot\n"; - std::cout << origin << "origin\n"; PathVector pathv; pathv.push_back(path); hp_vec.push_back(pathv); @@ -139,12 +138,6 @@ void LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *des _("Adjust the starting angle") ); knotholder->add(e); } - { - KnotHolderEntity *e = new CR::KnotHolderEntityRotationAngle(this); - e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, - _("Adjust the rotation angle") ); - knotholder->add(e); - } }; namespace CR { @@ -171,26 +164,6 @@ KnotHolderEntityStartingAngle::knot_set(Geom::Point const &p, Geom::Point const sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); } -void -KnotHolderEntityRotationAngle::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) -{ - LPECopyRotate* lpe = dynamic_cast(_effect); - - Geom::Point const s = snap_knot_position(p, state); - - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - lpe->rotation_angle.param_set_value(rad_to_deg(-angle_between(lpe->dir, s - lpe->origin)) - lpe->starting_angle); - if (state & GDK_SHIFT_MASK) { - lpe->dist_angle_handle = L2(lpe->B - lpe->A); - } else { - lpe->dist_angle_handle = L2(p - lpe->origin); - } - - // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating. - sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); -} - Geom::Point KnotHolderEntityStartingAngle::knot_get() const { @@ -198,13 +171,6 @@ KnotHolderEntityStartingAngle::knot_get() const return lpe->start_pos; } -Geom::Point -KnotHolderEntityRotationAngle::knot_get() const -{ - LPECopyRotate const *lpe = dynamic_cast(_effect); - return lpe->rot_pos; -} - } // namespace CR diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index c84889f57..123c92cdd 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,6 @@ public: /* the knotholder entity classes must be declared friends */ friend class CR::KnotHolderEntityStartingAngle; - friend class CR::KnotHolderEntityRotationAngle; void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); protected: @@ -48,6 +47,7 @@ private: ScalarParam starting_angle; ScalarParam rotation_angle; ScalarParam num_copies; + BoolParam copiesTo360; PointParam origin; -- cgit v1.2.3 From e7bb1921ce0a29a94fe03c321ad409e7d407611d Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 17 Nov 2014 23:27:28 +0100 Subject: adding knot improvements pointed by su_v (bzr r13682.1.13) --- src/live_effects/lpe-mirror_symmetry.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 4024ff83e..1205476a4 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -80,10 +80,10 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) SPLPEItem * item = const_cast(lpeitem); std::vector mline(reflection_line.get_pathvector()); - Point A = mline[0].initialPoint(); - Point B = mline[0].finalPoint(); - Point C = mline[0].pointAt(0.5); + Point A(boundingbox_X.max(), boundingbox_Y.max()); + Point B(boundingbox_X.max(), boundingbox_Y.min()); double dist = distance(A,B); + Point C = mline[0].pointAt(0.5); if(mode == MT_X){ A = Geom::Point(center[X]+(dist/2.0),center[Y]); B = Geom::Point(center[X]-(dist/2.0),center[Y]); @@ -96,7 +96,19 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); reflection_line.set_new_value(rline, true); } else { - center.param_setValue(C); + A = mline[0].initialPoint(); + B = mline[0].finalPoint(); + lineSeparation.setPoints(A,B); + Geom::Rotate rot = Geom::Rotate(lineSeparation.angle()); + Geom::Translate trans = Geom::Translate(center); + A = Geom::Point(center[X],center[Y]+(dist/2.0)); + B = Geom::Point(center[X],center[Y]-(dist/2.0)); + Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); + rline *= rot; + rline *= trans; + reflection_line.set_new_value(rline, true); + A = mline[0].initialPoint(); + B = mline[0].finalPoint(); } lineSeparation.setPoints(A,B); if(knot_holder){ -- cgit v1.2.3 From b619510d9fc49fdfa636f50487acc5fea773afc9 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 18 Nov 2014 00:08:09 +0100 Subject: adding knot improvements pointed by su_v (bzr r13682.1.15) --- src/live_effects/lpe-mirror_symmetry.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 1205476a4..bc5dc747d 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -83,7 +83,6 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) Point A(boundingbox_X.max(), boundingbox_Y.max()); Point B(boundingbox_X.max(), boundingbox_Y.min()); double dist = distance(A,B); - Point C = mline[0].pointAt(0.5); if(mode == MT_X){ A = Geom::Point(center[X]+(dist/2.0),center[Y]); B = Geom::Point(center[X]-(dist/2.0),center[Y]); @@ -93,27 +92,29 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) B = Geom::Point(center[X],center[Y]-(dist/2.0)); } if( mode == MT_X || mode == MT_Y ){ - Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); - reflection_line.set_new_value(rline, true); + Geom::Path path; + path.start( A ); + path.appendNew( B ); + reflection_line.set_new_value(path.toPwSb(), true); } else { A = mline[0].initialPoint(); B = mline[0].finalPoint(); + Point C = mline[0].pointAt(0.5); lineSeparation.setPoints(A,B); Geom::Rotate rot = Geom::Rotate(lineSeparation.angle()); Geom::Translate trans = Geom::Translate(center); A = Geom::Point(center[X],center[Y]+(dist/2.0)); B = Geom::Point(center[X],center[Y]-(dist/2.0)); - Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); - rline *= rot; - rline *= trans; - reflection_line.set_new_value(rline, true); + Geom::Path path; + path.start( B ); + path.appendNew( A ); + path *= Geom::Affine(rot); + path *= Geom::Affine(trans); + reflection_line.set_new_value(path.toPwSb(), true); A = mline[0].initialPoint(); B = mline[0].finalPoint(); } lineSeparation.setPoints(A,B); - if(knot_holder){ - knot_holder->update_knots(); - } item->apply_to_clippath(item); item->apply_to_mask(item); } @@ -129,6 +130,8 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) Point B(boundingbox_X.max(), boundingbox_Y.min()); Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); reflection_line.set_new_value(rline, true); + Point C = rline[0].pointAt(0.5); + center.param_setValue(C); } int -- cgit v1.2.3 From 806baa5e2a2a7f7720e7fc32fa66e5055a66f765 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 18 Nov 2014 20:00:50 +0100 Subject: adding knot improvements pointed by su_v (bzr r13682.1.17) --- src/live_effects/lpe-mirror_symmetry.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index bc5dc747d..2e34f2f6b 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -79,7 +79,6 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) using namespace Geom; SPLPEItem * item = const_cast(lpeitem); - std::vector mline(reflection_line.get_pathvector()); Point A(boundingbox_X.max(), boundingbox_Y.max()); Point B(boundingbox_X.max(), boundingbox_Y.min()); double dist = distance(A,B); @@ -97,22 +96,23 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) path.appendNew( B ); reflection_line.set_new_value(path.toPwSb(), true); } else { + std::vector mline(reflection_line.get_pathvector()); A = mline[0].initialPoint(); B = mline[0].finalPoint(); - Point C = mline[0].pointAt(0.5); lineSeparation.setPoints(A,B); + //Point C(boundingbox_X.max(), boundingbox_Y.middle()); Geom::Rotate rot = Geom::Rotate(lineSeparation.angle()); - Geom::Translate trans = Geom::Translate(center); + //Geom::Translate trans = Geom::Translate(center - C); A = Geom::Point(center[X],center[Y]+(dist/2.0)); B = Geom::Point(center[X],center[Y]-(dist/2.0)); Geom::Path path; - path.start( B ); - path.appendNew( A ); + path.start( A ); + path.appendNew( B ); path *= Geom::Affine(rot); - path *= Geom::Affine(trans); + //path *= Geom::Affine(trans); reflection_line.set_new_value(path.toPwSb(), true); - A = mline[0].initialPoint(); - B = mline[0].finalPoint(); + A = path.initialPoint(); + B = path.finalPoint(); } lineSeparation.setPoints(A,B); item->apply_to_clippath(item); @@ -128,9 +128,11 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) Point A(boundingbox_X.max(), boundingbox_Y.max()); Point B(boundingbox_X.max(), boundingbox_Y.min()); - Piecewise > rline = Piecewise >(D2(Linear(A[X], B[X]), Linear(A[Y], B[Y]))); - reflection_line.set_new_value(rline, true); - Point C = rline[0].pointAt(0.5); + Point C(boundingbox_X.max(), boundingbox_Y.middle()); + Geom::Path path; + path.start( A ); + path.appendNew( B ); + reflection_line.set_new_value(path.toPwSb(), true); center.param_setValue(C); } @@ -152,8 +154,8 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); std::vector path_out; Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); + Geom::Point lineStart = lineSeparation.pointAt(100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(-100000.0); mlineExpanded.start( lineStart); mlineExpanded.appendNew( lineEnd); @@ -271,8 +273,8 @@ LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector PathVector pathv; Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); + Geom::Point lineStart = lineSeparation.pointAt(100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(-100000.0); mlineExpanded.start( lineStart); mlineExpanded.appendNew( lineEnd); pathv.push_back(mlineExpanded); -- cgit v1.2.3 From c287e23597d25cd743b44b48388a09151b18cdfc Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 21 Nov 2014 11:49:26 +0100 Subject: added knot improvements pointed by su_v (bzr r13682.1.19) --- src/live_effects/lpe-mirror_symmetry.cpp | 81 +++++++++++++++++--------------- src/live_effects/lpe-mirror_symmetry.h | 1 + 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 2e34f2f6b..b0a4831f5 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -79,42 +79,48 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) using namespace Geom; SPLPEItem * item = const_cast(lpeitem); - Point A(boundingbox_X.max(), boundingbox_Y.max()); - Point B(boundingbox_X.max(), boundingbox_Y.min()); - double dist = distance(A,B); - if(mode == MT_X){ - A = Geom::Point(center[X]+(dist/2.0),center[Y]); - B = Geom::Point(center[X]-(dist/2.0),center[Y]); - } + Point A(boundingbox_X.max(), boundingbox_Y.min()); + Point B(boundingbox_X.max(), boundingbox_Y.max()); + Point C(boundingbox_X.max(), boundingbox_Y.middle()); if(mode == MT_Y){ - A = Geom::Point(center[X],center[Y]+(dist/2.0)); - B = Geom::Point(center[X],center[Y]-(dist/2.0)); + A = Geom::Point(boundingbox_X.min(),center[Y]); + B = Geom::Point(boundingbox_X.max(),center[Y]); + } + if(mode == MT_X){ + A = Geom::Point(center[X],boundingbox_Y.min()); + B = Geom::Point(center[X],boundingbox_Y.max()); } if( mode == MT_X || mode == MT_Y ){ Geom::Path path; path.start( A ); path.appendNew( B ); reflection_line.set_new_value(path.toPwSb(), true); - } else { - std::vector mline(reflection_line.get_pathvector()); - A = mline[0].initialPoint(); - B = mline[0].finalPoint(); lineSeparation.setPoints(A,B); - //Point C(boundingbox_X.max(), boundingbox_Y.middle()); - Geom::Rotate rot = Geom::Rotate(lineSeparation.angle()); - //Geom::Translate trans = Geom::Translate(center - C); - A = Geom::Point(center[X],center[Y]+(dist/2.0)); - B = Geom::Point(center[X],center[Y]-(dist/2.0)); - Geom::Path path; - path.start( A ); - path.appendNew( B ); - path *= Geom::Affine(rot); - //path *= Geom::Affine(trans); - reflection_line.set_new_value(path.toPwSb(), true); - A = path.initialPoint(); - B = path.finalPoint(); + center.param_setValue(path.pointAt(0.5)); + if(knot_holder){ + knot_holder->update_knots(); + } + } else if( mode == MT_FREE) { + std::vector mline(reflection_line.get_pathvector()); + if(!are_near(previousCenter,center, 0.01)){ + Geom::Point trans = center - mline[0].pointAt(0.5); + mline[0] *= Geom::Affine(1,0,0,1,trans[X],trans[Y]); + A = mline[0].initialPoint(); + B = mline[0].finalPoint(); + reflection_line.set_new_value(mline[0].toPwSb(), true); + lineSeparation.setPoints(A,B); + } else { + center.param_setValue(mline[0].pointAt(0.5)); + A = mline[0].initialPoint(); + B = mline[0].finalPoint(); + lineSeparation.setPoints(A,B); + if(knot_holder){ + knot_holder->update_knots(); + } + } + previousCenter = center; } - lineSeparation.setPoints(A,B); + item->apply_to_clippath(item); item->apply_to_mask(item); } @@ -126,14 +132,15 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) original_bbox(lpeitem); - Point A(boundingbox_X.max(), boundingbox_Y.max()); - Point B(boundingbox_X.max(), boundingbox_Y.min()); + Point A(boundingbox_X.max(), boundingbox_Y.min()); + Point B(boundingbox_X.max(), boundingbox_Y.max()); Point C(boundingbox_X.max(), boundingbox_Y.middle()); Geom::Path path; path.start( A ); path.appendNew( B ); reflection_line.set_new_value(path.toPwSb(), true); center.param_setValue(C); + previousCenter = center; } int @@ -154,8 +161,8 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); std::vector path_out; Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(-100000.0); + Geom::Point lineStart = lineSeparation.pointAt(-100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(100000.0); mlineExpanded.start( lineStart); mlineExpanded.appendNew( lineEnd); @@ -210,7 +217,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) if(reverseFusion){ position *= -1; } - if(position == -1){ + if(position == 1){ Geom::Path mirror = portion.reverse() * m; mirror.setInitial(portion.finalPoint()); portion.append(mirror); @@ -227,7 +234,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) if(reverseFusion){ position *= -1; } - if(cs.size()!=0 && position == -1){ + if(cs.size()!=0 && position == 1){ Geom::Path portion = original.portion(timeStart, original.size()); portion = portion.reverse(); Geom::Path mirror = portion.reverse() * m; @@ -248,7 +255,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) } portion.clear(); } - if(cs.size() == 0 && position == -1){ + if(cs.size() == 0 && position == 1){ temp_path.push_back(original); temp_path.push_back(original * m); } @@ -273,8 +280,8 @@ LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector PathVector pathv; Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(-100000.0); + Geom::Point lineStart = lineSeparation.pointAt(-100000.0); + Geom::Point lineEnd = lineSeparation.pointAt(100000.0); mlineExpanded.start( lineStart); mlineExpanded.appendNew( lineEnd); pathv.push_back(mlineExpanded); @@ -300,9 +307,7 @@ void KnotHolderEntityCenterMirrorSymmetry::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) { LPEMirrorSymmetry* lpe = dynamic_cast(_effect); - Geom::Point const s = snap_knot_position(p, state); - lpe->center.param_setValue(s); // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating. diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 4a5ea4755..8c6c49c7d 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -64,6 +64,7 @@ private: BoolParam reverseFusion; PathParam reflection_line; Geom::Line lineSeparation; + Geom::Point previousCenter; PointParam center; LPEMirrorSymmetry(const LPEMirrorSymmetry&); -- cgit v1.2.3 From 04abdf45fdd7a96b13c09a2a7aabbca95ba9ebb9 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 2 Dec 2014 19:36:49 +0100 Subject: adding fussion improvements (bzr r13708.1.3) --- src/live_effects/lpe-copy_rotate.cpp | 122 +++++++++++++++++++++++++++++++++-- src/live_effects/lpe-copy_rotate.h | 1 + 2 files changed, 116 insertions(+), 7 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 51787e292..e0855d452 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -47,6 +47,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copiesTo360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copiesTo360", &wr, this, true), + fusionPaths(_("Fusioned paths"), _("Fusion paths"), "fusionPaths", &wr, this, true), origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), dist_angle_handle(100) { @@ -55,6 +56,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : // register all your parameters here, so Inkscape knows which parameters this effect has: registerParameter( dynamic_cast(&copiesTo360) ); + registerParameter( dynamic_cast(&fusionPaths) ); registerParameter( dynamic_cast(&starting_angle) ); registerParameter( dynamic_cast(&rotation_angle) ); registerParameter( dynamic_cast(&num_copies) ); @@ -106,14 +108,120 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); - for (int i = 0; i < num_copies; ++i) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * i)); - Affine t = pre * rot * Translate(origin); - output.concat(pwd2_in * t); + if(fusionPaths){ + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(-starting_angle)); + Rotate rot2(-deg_to_rad(rotation_angle_end-starting_angle)); + //Affine t = pre * rot * Translate(origin); + Geom::Path mlineExpanded; + Geom::Point lineStart(0,0); + Geom::Point lineStart[Geom::X] = cos(rot) * 100000.0; + Geom::Point lineStart[Geom::Y] = sin(rot) * 100000.0; + Geom::Point lineEnd(0,0); + Geom::Point lineEnd[Geom::X] = cos(rot2) * 100000.0; + Geom::Point lineEnd[Geom::Y] = sin(rot2) * 100000.0; + mlineExpanded.start( lineStart); + mlineExpanded.appendNew( origin); + mlineExpanded.appendNew( lineEnd); + PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); + for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { + if (path_it->empty()){ + continue; + } + std::vector temp_path; + double timeStart = 0.0; + int position = 0; + bool end_open = false; + if (path_it->closed()) { + const Geom::Curve &closingline = path_it->back_closed(); + if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { + end_open = true; + } + } + Geom::Path original = (Geom::Path)(*path_it); + if(end_open && path_it->closed()){ + original.close(false); + original.appendNew( original.initialPoint() ); + original.close(true); + } + Geom::Crossings cs = crossings(original, mlineExpanded); + for(unsigned int i = 0; i < cs.size(); i++) { + double timeEnd = cs[i].ta; + Geom::Path portion = original.portion(timeStart, timeEnd); + Geom::Point middle = portion.pointAt((double)portion.size()/2.0); + position = pointSideOfLine(lineStart, lineEnd, middle); + Geom::line middleLine; + middleLine->setPoints(origin,middle); + if(middleLine.angle > rot && middleLine < rot2){ + Geom::Path kaleidoscope; + for (int j = 0; j < num_copies; ++j) { + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(rotation_angle_end * j)); + Affine t = pre * rot * Translate(origin); + kaleidoscope = portion.reverse() * t); + kaleidoscope.setInitial(portion.finalPoint()); + portion.append(kaleidoscope); + } + if(i!=0){ + portion.setFinal(portion.initialPoint()); + portion.close(); + } + temp_path.push_back(portion); + } + portion.clear(); + timeStart = timeEnd; + } + Geom::line middleLine; + middleLine->setPoints(origin,original.finalPoint()); + if(cs.size()!=0 && middleLine.angle > rot && middleLine < rot2){ + Geom::Path portion = original.portion(timeStart, original.size()); + portion = portion.reverse(); + + Geom::Path kaleidoscope; + for (int i = 0; i < num_copies; ++i) { + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(rotation_angle_end * i)); + Affine t = pre * rot * Translate(origin); + kaleidoscope = portion.reverse() * t); + kaleidoscope.setInitial(portion.finalPoint()); + portion.append(kaleidoscope); + } + portion = portion.reverse(); + if (!original.closed()){ + temp_path.push_back(portion); + } else { + if(cs.size() >1 ){ + portion.setFinal(temp_path[0].initialPoint()); + portion.setInitial(temp_path[0].finalPoint()); + temp_path[0].append(portion); + } else { + temp_path.push_back(portion); + } + temp_path[0].close(); + } + portion.clear(); + } + if(cs.size() == 0 && position == 1){ + temp_path.push_back(original); + temp_path.push_back(original * m); + } + path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); + temp_path.clear(); + } + output = path_out.toPwSb(); + } else { + for (int i = 0; i < num_copies; ++i) { + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(rotation_angle_end * i)); + Affine t = pre * rot * Translate(origin); + output.concat(pwd2_in * t); + } + } } - return output; } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 123c92cdd..735de2300 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -48,6 +48,7 @@ private: ScalarParam rotation_angle; ScalarParam num_copies; BoolParam copiesTo360; + BoolParam fusionPaths; PointParam origin; -- cgit v1.2.3 From 9a944b9317cbe94fb7c3c9f976da9ceffedeadf7 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 5 Dec 2014 21:20:55 +0100 Subject: adding fussion improvements (bzr r13708.1.5) --- src/live_effects/lpe-copy_rotate.cpp | 153 ++++++++++++++++++----------------- 1 file changed, 78 insertions(+), 75 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 553f273fe..7e3e65f23 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -17,11 +17,14 @@ #include "live_effects/lpe-copy_rotate.h" #include "sp-shape.h" #include "display/curve.h" - +#include <2geom/path.h> +#include <2geom/path-intersection.h> +#include <2geom/sbasis-to-bezier.h> #include <2geom/path.h> #include <2geom/transforms.h> #include <2geom/d2-sbasis.h> #include <2geom/angle.h> +#include #include "knot-holder-entity.h" #include "knotholder.h" @@ -110,60 +113,57 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(fusionPaths){ - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(-starting_angle)); - Rotate rot2(-deg_to_rad(rotation_angle_end-starting_angle)); - //Affine t = pre * rot * Translate(origin); - Geom::Path mlineExpanded; - Geom::Point lineStart(0,0); - Geom::Point lineStart[Geom::X] = cos(rot) * 100000.0; - Geom::Point lineStart[Geom::Y] = sin(rot) * 100000.0; - Geom::Point lineEnd(0,0); - Geom::Point lineEnd[Geom::X] = cos(rot2) * 100000.0; - Geom::Point lineEnd[Geom::Y] = sin(rot2) * 100000.0; - mlineExpanded.start( lineStart); - mlineExpanded.appendNew( origin); - mlineExpanded.appendNew( lineEnd); - PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); - for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { - if (path_it->empty()){ - continue; - } - std::vector temp_path; - double timeStart = 0.0; - int position = 0; - bool end_open = false; - if (path_it->closed()) { - const Geom::Curve &closingline = path_it->back_closed(); - if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { - end_open = true; - } - } - Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it->closed()){ - original.close(false); - original.appendNew( original.initialPoint() ); - original.close(true); + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + std::vector path_out; + PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in * t, 0.1), 0.001); + for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { + if (path_it->empty()){ + continue; + } + bool end_open = false; + std::vector temp_path; + double timeStart = 0.0; + int position = 0; + if (path_it->closed()) { + const Geom::Curve &closingline = path_it->back_closed(); + if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { + end_open = true; } - Geom::Crossings cs = crossings(original, mlineExpanded); + } + Geom::Path original = (Geom::Path)(*path_it); + if(end_open && path_it2->closed()){ + original.close(false); + original.appendNew( original.initialPoint() ); + original.close(true); + } + //for (int i = 0; i < num_copies; ++i) { + double rotAngle = -deg_to_rad(rotation_angle_end-starting_angle); + Rotate rot(rotAngle * i); + Affine t = pre * rot * Translate(origin); + Geom::Point lineEnd(0,0); + lineEnd[Geom::X] = cos((rotAngle * i) - rotAngle/2.0) * 100000.0; + lineEnd[Geom::Y] = sin((rotAngle * i) - rotAngle/2.0) * 100000.0; + Geom::Path kline; + kline.start((Geom::Point)origin); + kline.appendNew(lineEnd); + Geom::Crossings cs = crossings(original, kline); for(unsigned int i = 0; i < cs.size(); i++) { double timeEnd = cs[i].ta; Geom::Path portion = original.portion(timeStart, timeEnd); Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = pointSideOfLine(lineStart, lineEnd, middle); - Geom::line middleLine; - middleLine->setPoints(origin,middle); - if(middleLine.angle > rot && middleLine < rot2){ - Geom::Path kaleidoscope; - for (int j = 0; j < num_copies; ++j) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * j)); + position = pointSideOfLine((Geom::Point)origin, lineEnd, middle); + if(reverseFusion){ + position *= -1; + } + if(position == 1){ + for (int i = 0; i < num_copies; ++i) { + double rotAngle = -deg_to_rad(rotation_angle_end-starting_angle); + Rotate rot(rotAngle * i); Affine t = pre * rot * Translate(origin); - kaleidoscope = portion.reverse() * t); - kaleidoscope.setInitial(portion.finalPoint()); - portion.append(kaleidoscope); + Geom::Path kaleidoscope = portion * t; + mirror.setInitial(portion.finalPoint()); + portion.append(mirror); } if(i!=0){ portion.setFinal(portion.initialPoint()); @@ -174,23 +174,20 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p portion.clear(); timeStart = timeEnd; } - Geom::line middleLine; - middleLine->setPoints(origin,original.finalPoint()); - if(cs.size()!=0 && middleLine.angle > rot && middleLine < rot2){ - Geom::Path portion = original.portion(timeStart, original.size()); - portion = portion.reverse(); - - Geom::Path kaleidoscope; + position = pointSideOfLine((Geom::Point)origin, lineEnd, original.finalPoint()); + if(reverseFusion){ + position *= -1; + } + if(cs.size()!=0 && position == 1){ for (int i = 0; i < num_copies; ++i) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * i)); + double rotAngle = -deg_to_rad(rotation_angle_end-starting_angle); + Rotate rot(rotAngle * i); Affine t = pre * rot * Translate(origin); - kaleidoscope = portion.reverse() * t); + Geom::Path portion = original.portion(timeStart, original.size()); + Geom::Path kaleidoscope = portion * t; kaleidoscope.setInitial(portion.finalPoint()); portion.append(kaleidoscope); } - portion = portion.reverse(); if (!original.closed()){ temp_path.push_back(portion); } else { @@ -205,22 +202,28 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p } portion.clear(); } - if(cs.size() == 0 && position == 1){ - temp_path.push_back(original); - temp_path.push_back(original * m); - } - path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); - temp_path.clear(); } - output = path_out.toPwSb(); - } else { - for (int i = 0; i < num_copies; ++i) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * i)); - Affine t = pre * rot * Translate(origin); - output.concat(pwd2_in * t); + if(cs.size() == 0 && position == 1){ + for (int i = 0; i < num_copies; ++i) { + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(rotation_angle_end * i)); + Affine t = pre * rot * Translate(origin); + temp_path.push_back((Geom::Path)(*path_it) * t); + } } + path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); + temp_path.clear(); + if(path_out.size() > 0){ + output.concat(paths_to_pw(path_out)); + } + } else { + for (int i = 0; i < num_copies; ++i) { + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(rotation_angle_end * i)); + Affine t = pre * rot * Translate(origin); + output.concat(pwd2_in * t); } } return output; -- cgit v1.2.3 From 6c067ce093126cf23d9b038011b2effa1390fd07 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 26 Dec 2014 23:57:43 +0100 Subject: warping into a layer (bzr r13682.1.21) --- src/live_effects/lpe-mirror_symmetry.cpp | 17 +++++++++++++++++ src/live_effects/lpe-mirror_symmetry.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index b0a4831f5..8df2eb176 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -55,6 +55,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), fusionPaths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusionPaths", &wr, this, true), reverseFusion(_("Reverse fusion"), _("Reverse fusion"), "reverseFusion", &wr, this, false), + reflectionFromPage(_("Use page as relecion base"), _("Use page as relecion base"), "reflectionFromPage", &wr, this, false), reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") { @@ -64,6 +65,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : registerParameter( &discard_orig_path); registerParameter( &fusionPaths); registerParameter( &reverseFusion); + registerParameter( &reflectionFromPage); registerParameter( &reflection_line); registerParameter( ¢er); @@ -73,6 +75,21 @@ LPEMirrorSymmetry::~LPEMirrorSymmetry() { } +void LPEMirrorSymmetry::doOnApply(SPLPEItem const* lpeitem) +{ + SPDocument *doc = lpeitem->document(); + Inkscape::XML::Document *xml_doc = doc->getReprDoc(); + sp_selection_group_impl(GSList *p, group, xml_doc, doc); + Inkscape::XML::Node *group = xml_doc->createElement("svg:g"); + group->setAttribute("inkscape:groupmode", "layer"); + sp_selection_group_impl(p, group, xml_doc, doc); + gchar *href = g_strdup_printf("#%s", this->lpeobject_href); + SP_LPE_ITEM(group)->addPathEffect(href, true); + lpeitem->removeCurrentPathEffect(false) + g_free(href); + Inkscape::GC::release(group); +} + void LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) { diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 8c6c49c7d..6e9e7dd1a 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -44,6 +44,8 @@ public: virtual void doOnApply (SPLPEItem const* lpeitem); + virtual void doOnApply(SPLPEItem const* lpeitem); + virtual void doBeforeEffect (SPLPEItem const* lpeitem); virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); @@ -62,6 +64,7 @@ private: BoolParam discard_orig_path; BoolParam fusionPaths; BoolParam reverseFusion; + BoolParam reflectionFromPage; PathParam reflection_line; Geom::Line lineSeparation; Geom::Point previousCenter; -- cgit v1.2.3 From 1d1ec291d89846be2dbd5ce1466b58baeb743994 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 17 Jan 2015 18:14:04 +0100 Subject: adding Kaleidoscope (bzr r13708.1.8) --- src/live_effects/lpe-copy_rotate.cpp | 164 +++++++++++++++-------------------- src/live_effects/lpe-copy_rotate.h | 6 +- 2 files changed, 73 insertions(+), 97 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 7e3e65f23..1eb1f22f2 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -50,7 +50,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copiesTo360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copiesTo360", &wr, this, true), - fusionPaths(_("Fusioned paths"), _("Fusion paths"), "fusionPaths", &wr, this, true), + kaleidoscope(_("kaleidoscope"), _("kaleidoscope"), "kaleidoscope", &wr, this, true), origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), dist_angle_handle(100) @@ -60,7 +60,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : // register all your parameters here, so Inkscape knows which parameters this effect has: registerParameter( dynamic_cast(&copiesTo360) ); - registerParameter( dynamic_cast(&fusionPaths) ); + registerParameter( dynamic_cast(&kaleidoscope) ); registerParameter( dynamic_cast(&starting_angle) ); registerParameter( dynamic_cast(&rotation_angle) ); registerParameter( dynamic_cast(&num_copies) ); @@ -91,6 +91,58 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) dist_angle_handle = L2(B - A); } +void +LPECopyRotate::split(std::vector &path_in,Geom:Path divider,bool start){ + double timeStart = 0.0; + for (Geom::PathVector::const_iterator path_it = path_in.begin(); path_it != path_in.end(); ++path_it) { + if (path_it->empty()){ + continue; + } + Geom::Path original = path_it; + std::vector temp_path; + Geom::Crossings cs = crossings(original, divider); + for(unsigned int i = 0; i < cs.size(); i++) { + double timeEnd = cs[i].ta; + Geom::Path portion = original.portion(timeStart, timeEnd); + Geom::Point middle = portion.pointAt((double)portion.size()/2.0); + position = pointSideOfLine(divider.initialPoint(), divider.finalPoint(), middle); + if(position == 1 || (!start && position== -1)){ + temp_path.push_back(portion); + } + portion.clear(); + timeStart = timeEnd; + } + position = pointSideOfLine(divider.initialPoint(), divider.finalPoint(), original.finalPoint()); + if(cs.size()!=0 && (position == 1 || (!start && position== -1))){ + Geom::Path portion = original.portion(timeStart, original.size()); + temp_path.push_back(portion); + portion.clear(); + } + } + path_in = temp_path; +} + +void +LPECopyRotate::setKaleidoscope(std::vector &path_in){ + Geom::Point lineStart(0,0); + lineStart[Geom::X] = cos(starting_angle) * 100000.0; + lineStart[Geom::Y] = sin(starting_angle) * 100000.0; + Geom::Point lineEnd(0,0); + lineEnd[Geom::X] = cos(starting_angle + rotAngle) * 100000.0; + lineEnd[Geom::Y] = sin(starting_angle + rotAngle) * 100000.0; + Geom::Path klineA; + klineA.start(origin); + klineA.appendNew(lineStart); + path_in = split(path_in,klineA,true); + Geom::Path klineB; + klineB.start(origin); + klineB.appendNew(lineEnd); + path_in = split(path_in,klineB,false); + for (int i = 0; i < num_copies; ++i) { + + } +} + Geom::Piecewise > LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & pwd2_in) { @@ -100,7 +152,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; double rotation_angle_end = rotation_angle; - if(copiesTo360){ + if(copiesTo360 || kaleidoscope){ rotation_angle_end = 360.0/(double)num_copies; } rot_pos = origin + dir * Rotate(-deg_to_rad(starting_angle + rotation_angle_end)) * dist_angle_handle; @@ -112,19 +164,14 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); - if(fusionPaths){ - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) + if(kaleidoscope){ std::vector path_out; + std::vector tmp_path; PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in * t, 0.1), 0.001); for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { if (path_it->empty()){ continue; } - bool end_open = false; - std::vector temp_path; - double timeStart = 0.0; - int position = 0; if (path_it->closed()) { const Geom::Curve &closingline = path_it->back_closed(); if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { @@ -137,94 +184,19 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.appendNew( original.initialPoint() ); original.close(true); } - //for (int i = 0; i < num_copies; ++i) { - double rotAngle = -deg_to_rad(rotation_angle_end-starting_angle); - Rotate rot(rotAngle * i); - Affine t = pre * rot * Translate(origin); - Geom::Point lineEnd(0,0); - lineEnd[Geom::X] = cos((rotAngle * i) - rotAngle/2.0) * 100000.0; - lineEnd[Geom::Y] = sin((rotAngle * i) - rotAngle/2.0) * 100000.0; - Geom::Path kline; - kline.start((Geom::Point)origin); - kline.appendNew(lineEnd); - Geom::Crossings cs = crossings(original, kline); - for(unsigned int i = 0; i < cs.size(); i++) { - double timeEnd = cs[i].ta; - Geom::Path portion = original.portion(timeStart, timeEnd); - Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = pointSideOfLine((Geom::Point)origin, lineEnd, middle); - if(reverseFusion){ - position *= -1; - } - if(position == 1){ - for (int i = 0; i < num_copies; ++i) { - double rotAngle = -deg_to_rad(rotation_angle_end-starting_angle); - Rotate rot(rotAngle * i); - Affine t = pre * rot * Translate(origin); - Geom::Path kaleidoscope = portion * t; - mirror.setInitial(portion.finalPoint()); - portion.append(mirror); - } - if(i!=0){ - portion.setFinal(portion.initialPoint()); - portion.close(); - } - temp_path.push_back(portion); - } - portion.clear(); - timeStart = timeEnd; - } - position = pointSideOfLine((Geom::Point)origin, lineEnd, original.finalPoint()); - if(reverseFusion){ - position *= -1; - } - if(cs.size()!=0 && position == 1){ - for (int i = 0; i < num_copies; ++i) { - double rotAngle = -deg_to_rad(rotation_angle_end-starting_angle); - Rotate rot(rotAngle * i); - Affine t = pre * rot * Translate(origin); - Geom::Path portion = original.portion(timeStart, original.size()); - Geom::Path kaleidoscope = portion * t; - kaleidoscope.setInitial(portion.finalPoint()); - portion.append(kaleidoscope); - } - if (!original.closed()){ - temp_path.push_back(portion); - } else { - if(cs.size() >1 ){ - portion.setFinal(temp_path[0].initialPoint()); - portion.setInitial(temp_path[0].finalPoint()); - temp_path[0].append(portion); - } else { - temp_path.push_back(portion); - } - temp_path[0].close(); - } - portion.clear(); - } - } - if(cs.size() == 0 && position == 1){ - for (int i = 0; i < num_copies; ++i) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * i)); - Affine t = pre * rot * Translate(origin); - temp_path.push_back((Geom::Path)(*path_it) * t); - } - } - path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); - temp_path.clear(); - if(path_out.size() > 0){ - output.concat(paths_to_pw(path_out)); - } + tmp_path.push_back(original); + setKaleidoscope(tmp_path); + path_out.push_back(tmp_path); + tmp_path.clear(); + } + output = path_out.toPwSb(); } else { for (int i = 0; i < num_copies; ++i) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * i)); - Affine t = pre * rot * Translate(origin); - output.concat(pwd2_in * t); - } + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + Rotate rot(-deg_to_rad(rotation_angle_end * i)); + Affine t = pre * rot * Translate(origin); + output.concat(pwd2_in * t); } return output; } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 735de2300..d0ad2d6ec 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -36,6 +36,10 @@ public: virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > const & pwd2_in); + virtual void kaleidoscope(std::vector &path_in); + + virtual void split(std::vector &path_in,Geom:Path divider,bool start); + /* the knotholder entity classes must be declared friends */ friend class CR::KnotHolderEntityStartingAngle; void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); @@ -48,7 +52,7 @@ private: ScalarParam rotation_angle; ScalarParam num_copies; BoolParam copiesTo360; - BoolParam fusionPaths; + BoolParam setKaleidoscope; PointParam origin; -- cgit v1.2.3 From 8deff8fb8acbbfa8c56db9d6e34b93523872a25b Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 21 Jan 2015 00:13:00 +0100 Subject: fixing knots (bzr r13708.1.10) --- src/live_effects/lpe-copy_rotate.cpp | 236 ++++++++++++++++++++++++----------- src/live_effects/lpe-copy_rotate.h | 19 ++- 2 files changed, 179 insertions(+), 76 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 1eb1f22f2..20e08a7d8 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -24,7 +24,8 @@ #include <2geom/transforms.h> #include <2geom/d2-sbasis.h> #include <2geom/angle.h> -#include +#include <2geom/line.h> +#include #include "knot-holder-entity.h" #include "knotholder.h" @@ -41,30 +42,35 @@ public: virtual Geom::Point knot_get() const; }; +class KnotHolderEntityRotationAngle : public LPEKnotHolderEntity { +public: + KnotHolderEntityRotationAngle(LPECopyRotate *effect) : LPEKnotHolderEntity(effect) {}; + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); + virtual Geom::Point knot_get() const; +}; } // namespace CR LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : Effect(lpeobject), + origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0), rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copiesTo360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copiesTo360", &wr, this, true), - kaleidoscope(_("kaleidoscope"), _("kaleidoscope"), "kaleidoscope", &wr, this, true), - - origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), - dist_angle_handle(100) + kaleidoscope(_("kaleidoscope"), _("kaleidoscope"), "kaleidoscope", &wr, this, false), + dist_angle_handle(100.0) { show_orig_path = true; _provides_knotholder_entities = true; // register all your parameters here, so Inkscape knows which parameters this effect has: - registerParameter( dynamic_cast(&copiesTo360) ); - registerParameter( dynamic_cast(&kaleidoscope) ); - registerParameter( dynamic_cast(&starting_angle) ); - registerParameter( dynamic_cast(&rotation_angle) ); - registerParameter( dynamic_cast(&num_copies) ); - registerParameter( dynamic_cast(&origin) ); + registerParameter(&copiesTo360); + registerParameter(&kaleidoscope); + registerParameter(&starting_angle); + registerParameter(&rotation_angle); + registerParameter(&num_copies); + registerParameter(&origin); num_copies.param_make_integer(true); num_copies.param_set_range(0, 1000); @@ -79,65 +85,117 @@ void LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) { using namespace Geom; - original_bbox(lpeitem); - Point A(boundingbox_X.min(), boundingbox_Y.middle()); - Point B(boundingbox_X.max(), boundingbox_Y.middle()); - Point C(boundingbox_X.middle(), boundingbox_Y.middle()); - origin.param_setValue(A); + A = Point(boundingbox_X.min(), boundingbox_Y.middle()); + B = Point(boundingbox_X.middle(), boundingbox_Y.middle()); + origin.param_set_value(A); + dist_angle_handle = L2(B - A); + dir = unit_vector(B - A); +} + +void +LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) +{ + using namespace Geom; + original_bbox(lpeitem); + if( kaleidoscope || copiesTo360 ){ + rotation_angle.param_set_value(360.0/(double)num_copies); + } + A = Point(boundingbox_X.min(), boundingbox_Y.middle()); + B = Point(boundingbox_X.middle(), boundingbox_Y.middle()); dir = unit_vector(B - A); - dist_angle_handle = L2(B - A); + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; + rot_pos = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * dist_angle_handle; + if( kaleidoscope || copiesTo360 ){ + rot_pos = origin; + } + SPLPEItem * item = const_cast(lpeitem); + item->apply_to_clippath(item); + item->apply_to_mask(item); +} + +bool +LPECopyRotate::side(Geom::Point p1, Geom::Point p2, Geom::Point p) +{ + using Geom::X; + using Geom::Y; + return (p2[Y] - p1[Y])*(p[X] - p1[X]) + (-p2[X] + p1[X])*(p[Y] - p1[Y]) >= 0; +} + +bool +LPECopyRotate::pointInTriangle(Geom::Point p, Geom::Point p1, Geom::Point p2, Geom::Point p3) +{ + using Geom::X; + using Geom::Y; + double denominator = (p1[X]*(p2[Y] - p3[Y]) + p1[Y]*(p3[X] - p2[X]) + p2[X]*p3[Y] - p2[Y]*p3[X]); + double t1 = (p[X]*(p3[Y] - p1[Y]) + p[Y]*(p1[X] - p3[X]) - p1[X]*p3[Y] + p1[Y]*p3[X]) / denominator; + double t2 = (p[X]*(p2[Y] - p1[Y]) + p[Y]*(p1[X] - p2[X]) - p1[X]*p2[Y] + p1[Y]*p2[X]) / -denominator; + double s = t1 + t2; + + return 0 <= t1 && t1 <= 1 && 0 <= t2 && t2 <= 1 && s <= 1; } void -LPECopyRotate::split(std::vector &path_in,Geom:Path divider,bool start){ +LPECopyRotate::split(std::vector &path_in,Geom::Path divider){ double timeStart = 0.0; + std::vector temp_path; for (Geom::PathVector::const_iterator path_it = path_in.begin(); path_it != path_in.end(); ++path_it) { if (path_it->empty()){ continue; } - Geom::Path original = path_it; - std::vector temp_path; + Geom::Path original = *path_it; + int position = 0; Geom::Crossings cs = crossings(original, divider); for(unsigned int i = 0; i < cs.size(); i++) { double timeEnd = cs[i].ta; Geom::Path portion = original.portion(timeStart, timeEnd); - Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = pointSideOfLine(divider.initialPoint(), divider.finalPoint(), middle); - if(position == 1 || (!start && position== -1)){ + Geom::Point sideChecker = portion.pointAt(portion.size()-0.001); + position = side(divider.initialPoint(), divider.finalPoint(), sideChecker); + if(num_copies > 2){ + position = pointInTriangle(sideChecker, divider.initialPoint(), divider[0].finalPoint(), divider.finalPoint()); + } + std::cout << position << "\n"; + if(position == true){ temp_path.push_back(portion); } portion.clear(); timeStart = timeEnd; } - position = pointSideOfLine(divider.initialPoint(), divider.finalPoint(), original.finalPoint()); - if(cs.size()!=0 && (position == 1 || (!start && position== -1))){ + position = side(divider.initialPoint(), divider.finalPoint(), original.finalPoint()); + if(num_copies > 2){ + position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider.finalPoint()); + } + if(cs.size()!=0 && position == true){ Geom::Path portion = original.portion(timeStart, original.size()); - temp_path.push_back(portion); + if (!original.closed()){ + temp_path.push_back(portion); + } else { + if(cs.size() > 1 && temp_path[0].size() > 0 ){ + portion.setFinal(temp_path[0].initialPoint()); + portion.append(temp_path[0]); + temp_path[0]=portion; + } else { + temp_path.push_back(portion); + } + //temp_path[0].close(); + } portion.clear(); } + if(cs.size()==0){ + temp_path.push_back(original); + } } path_in = temp_path; } void LPECopyRotate::setKaleidoscope(std::vector &path_in){ - Geom::Point lineStart(0,0); - lineStart[Geom::X] = cos(starting_angle) * 100000.0; - lineStart[Geom::Y] = sin(starting_angle) * 100000.0; - Geom::Point lineEnd(0,0); - lineEnd[Geom::X] = cos(starting_angle + rotAngle) * 100000.0; - lineEnd[Geom::Y] = sin(starting_angle + rotAngle) * 100000.0; - Geom::Path klineA; - klineA.start(origin); - klineA.appendNew(lineStart); - path_in = split(path_in,klineA,true); - Geom::Path klineB; - klineB.start(origin); - klineB.appendNew(lineEnd); - path_in = split(path_in,klineB,false); + + split(path_in,hp); for (int i = 0; i < num_copies; ++i) { } @@ -148,30 +206,21 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p { using namespace Geom; - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; - double rotation_angle_end = rotation_angle; - if(copiesTo360 || kaleidoscope){ - rotation_angle_end = 360.0/(double)num_copies; + if(num_copies == 1){ + return pwd2_in; } - rot_pos = origin + dir * Rotate(-deg_to_rad(starting_angle + rotation_angle_end)) * dist_angle_handle; - - A = pwd2_in.firstValue(); - B = pwd2_in.lastValue(); - dir = unit_vector(B - A); Piecewise > output; - Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(kaleidoscope){ std::vector path_out; std::vector tmp_path; - PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in * t, 0.1), 0.001); + PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { if (path_it->empty()){ continue; } + bool end_open = false; if (path_it->closed()) { const Geom::Curve &closingline = path_it->back_closed(); if (!are_near(closingline.initialPoint(), closingline.finalPoint())) { @@ -179,24 +228,25 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p } } Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it2->closed()){ + if(end_open && path_it->closed()){ original.close(false); original.appendNew( original.initialPoint() ); original.close(true); } tmp_path.push_back(original); setKaleidoscope(tmp_path); - path_out.push_back(tmp_path); + path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } - output = path_out.toPwSb(); + if(path_out.size()>0){ + output = paths_to_pw(path_out); + } } else { for (int i = 0; i < num_copies; ++i) { - // I first suspected the minus sign to be a bug in 2geom but it is - // likely due to SVG's choice of coordinate system orientation (max) - Rotate rot(-deg_to_rad(rotation_angle_end * i)); - Affine t = pre * rot * Translate(origin); - output.concat(pwd2_in * t); + Rotate rot(-deg_to_rad(rotation_angle * i)); + Affine t = pre * rot * Translate(origin); + output.concat(pwd2_in * t); + } } return output; } @@ -205,21 +255,40 @@ void LPECopyRotate::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector &hp_vec) { using namespace Geom; - - Path path(start_pos); - path.appendNew((Geom::Point) origin); - path.appendNew(rot_pos); - PathVector pathv; - pathv.push_back(path); + hp_vec.clear(); + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double sizeDivider = Geom::distance(origin,bbox) + diagonal + 20; + Geom::Point lineStart = origin + dir * Rotate(-deg_to_rad(starting_angle)) * sizeDivider; + Geom::Point lineEnd = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * sizeDivider; + hp.start(lineStart); + hp.appendNew((Geom::Point)origin); + hp.appendNew(lineEnd); + Geom::PathVector pathv; + pathv.push_back(hp); hp_vec.push_back(pathv); } +void +LPECopyRotate::resetDefaults(SPItem const* item) +{ + Effect::resetDefaults(item); + original_bbox(SP_LPE_ITEM(item)); + hp.clear(); +} -void LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { +void +LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { { KnotHolderEntity *e = new CR::KnotHolderEntityStartingAngle(this); e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, - _("Adjust the starting angle") ); + _("Adjust the starting angle")); + knotholder->add(e); + } + { + KnotHolderEntity *e = new CR::KnotHolderEntityRotationAngle(this); + e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, + _("Adjust the rotation angle")); knotholder->add(e); } }; @@ -248,6 +317,26 @@ KnotHolderEntityStartingAngle::knot_set(Geom::Point const &p, Geom::Point const sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); } +void +KnotHolderEntityRotationAngle::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) +{ + LPECopyRotate* lpe = dynamic_cast(_effect); + + Geom::Point const s = snap_knot_position(p, state); + + // I first suspected the minus sign to be a bug in 2geom but it is + // likely due to SVG's choice of coordinate system orientation (max) + lpe->rotation_angle.param_set_value(rad_to_deg(-angle_between(lpe->dir, s - lpe->origin)) - lpe->starting_angle); + if (state & GDK_SHIFT_MASK) { + lpe->dist_angle_handle = L2(lpe->B - lpe->A); + } else { + lpe->dist_angle_handle = L2(p - lpe->origin); + } + + // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating. + sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); +} + Geom::Point KnotHolderEntityStartingAngle::knot_get() const { @@ -255,9 +344,14 @@ KnotHolderEntityStartingAngle::knot_get() const return lpe->start_pos; } -} // namespace CR - +Geom::Point +KnotHolderEntityRotationAngle::knot_get() const +{ + LPECopyRotate const *lpe = dynamic_cast(_effect); + return lpe->rot_pos; +} +} // namespace CR /* ######################## */ diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index d0ad2d6ec..209118925 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -36,29 +36,38 @@ public: virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > const & pwd2_in); - virtual void kaleidoscope(std::vector &path_in); + virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void split(std::vector &path_in,Geom:Path divider,bool start); + virtual void setKaleidoscope(std::vector &path_in); + + virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); + + virtual bool side(Geom::Point p1, Geom::Point p2, Geom::Point p); + + virtual void split(std::vector &path_in,Geom::Path divider); + + virtual void resetDefaults(SPItem const* item); /* the knotholder entity classes must be declared friends */ friend class CR::KnotHolderEntityStartingAngle; + friend class CR::KnotHolderEntityRotationAngle; void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); protected: virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector &hp_vec); private: + PointParam origin; ScalarParam starting_angle; ScalarParam rotation_angle; ScalarParam num_copies; BoolParam copiesTo360; - BoolParam setKaleidoscope; - - PointParam origin; + BoolParam kaleidoscope; Geom::Point A; Geom::Point B; Geom::Point dir; + Geom::Path hp; Geom::Point start_pos; Geom::Point rot_pos; -- cgit v1.2.3 From 41368054b3da78b13a049d0020d0eeb4d8a6798d Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 24 Jan 2015 10:58:06 +0100 Subject: Added the remove for outer staff to kaleidoscope (bzr r13708.1.12) --- src/live_effects/lpe-copy_rotate.cpp | 131 ++++++++++++++++++----------------- src/live_effects/lpe-copy_rotate.h | 5 +- 2 files changed, 71 insertions(+), 65 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 20e08a7d8..1c01e2aaf 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -89,7 +89,7 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) A = Point(boundingbox_X.min(), boundingbox_Y.middle()); B = Point(boundingbox_X.middle(), boundingbox_Y.middle()); - origin.param_set_value(A); + origin.param_setValue(A); dist_angle_handle = L2(B - A); dir = unit_vector(B - A); } @@ -102,7 +102,10 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) original_bbox(lpeitem); if( kaleidoscope || copiesTo360 ){ rotation_angle.param_set_value(360.0/(double)num_copies); - } + } + if(dist_angle_handle < 1.0){ + dist_angle_handle = 1.0; + } A = Point(boundingbox_X.min(), boundingbox_Y.middle()); B = Point(boundingbox_X.middle(), boundingbox_Y.middle()); dir = unit_vector(B - A); @@ -118,17 +121,18 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) item->apply_to_mask(item); } -bool -LPECopyRotate::side(Geom::Point p1, Geom::Point p2, Geom::Point p) +int +LPECopyRotate::pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X) { - using Geom::X; - using Geom::Y; - return (p2[Y] - p1[Y])*(p[X] - p1[X]) + (-p2[X] + p1[X])*(p[Y] - p1[Y]) >= 0; + //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line + double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); + return (pos < 0) ? -1 : (pos > 0); } bool LPECopyRotate::pointInTriangle(Geom::Point p, Geom::Point p1, Geom::Point p2, Geom::Point p3) { + //http://totologic.blogspot.com.es/2014/01/accurate-point-in-triangle-test.html using Geom::X; using Geom::Y; double denominator = (p1[X]*(p2[Y] - p3[Y]) + p1[Y]*(p3[X] - p2[X]) + p2[X]*p3[Y] - p2[Y]*p3[X]); @@ -140,62 +144,60 @@ LPECopyRotate::pointInTriangle(Geom::Point p, Geom::Point p1, Geom::Point p2, Ge } void -LPECopyRotate::split(std::vector &path_in,Geom::Path divider){ +LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ + std::vector tmp_path; double timeStart = 0.0; - std::vector temp_path; - for (Geom::PathVector::const_iterator path_it = path_in.begin(); path_it != path_in.end(); ++path_it) { - if (path_it->empty()){ - continue; - } - Geom::Path original = *path_it; - int position = 0; - Geom::Crossings cs = crossings(original, divider); - for(unsigned int i = 0; i < cs.size(); i++) { - double timeEnd = cs[i].ta; - Geom::Path portion = original.portion(timeStart, timeEnd); - Geom::Point sideChecker = portion.pointAt(portion.size()-0.001); - position = side(divider.initialPoint(), divider.finalPoint(), sideChecker); - if(num_copies > 2){ - position = pointInTriangle(sideChecker, divider.initialPoint(), divider[0].finalPoint(), divider.finalPoint()); - } - std::cout << position << "\n"; - if(position == true){ - temp_path.push_back(portion); - } - portion.clear(); - timeStart = timeEnd; - } - position = side(divider.initialPoint(), divider.finalPoint(), original.finalPoint()); + Geom::Path original = path_on[0]; + int position = 0; + Geom::Crossings cs = crossings(original,divider); + std::vector crossed; + for(unsigned int i = 0; i < cs.size(); i++) { + crossed.push_back(cs[i].ta); + } + std::sort (crossed.begin(), crossed.end()); + for(unsigned int i = 0; i < crossed.size(); i++) { + double timeEnd = crossed[i]; + Geom::Path portionOriginal = original.portion(timeStart,timeEnd); + Geom::Point sideChecker = portionOriginal.pointAt(0.001); + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), sideChecker); if(num_copies > 2){ - position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider.finalPoint()); + position = pointInTriangle(sideChecker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } - if(cs.size()!=0 && position == true){ - Geom::Path portion = original.portion(timeStart, original.size()); - if (!original.closed()){ - temp_path.push_back(portion); + if(position == 1){ + tmp_path.push_back(portionOriginal); + } + portionOriginal.clear(); + timeStart = timeEnd; + } + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); + if(num_copies > 2){ + position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + } + if(cs.size() > 0 && position == 1){ + Geom::Path portionOriginal = original.portion(timeStart, original.size()); + if (!original.closed()){ + tmp_path.push_back(portionOriginal); + } else { + if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ){ + portionOriginal.setFinal(tmp_path[0].initialPoint()); + portionOriginal.append(tmp_path[0]); + tmp_path[0] = portionOriginal; } else { - if(cs.size() > 1 && temp_path[0].size() > 0 ){ - portion.setFinal(temp_path[0].initialPoint()); - portion.append(temp_path[0]); - temp_path[0]=portion; - } else { - temp_path.push_back(portion); - } - //temp_path[0].close(); + tmp_path.push_back(portionOriginal); } - portion.clear(); - } - if(cs.size()==0){ - temp_path.push_back(original); + //temp_path[0].close(); } + portionOriginal.clear(); + } + if(cs.size()==0 && position == 1){ + tmp_path.push_back(original); } - path_in = temp_path; + path_on = tmp_path; } void -LPECopyRotate::setKaleidoscope(std::vector &path_in){ - - split(path_in,hp); +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider){ + split(path_on,divider); for (int i = 0; i < num_copies; ++i) { } @@ -210,6 +212,16 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p return pwd2_in; } + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double sizeDivider = Geom::distance(origin,bbox) + (diagonal * 2); + Geom::Point lineStart = origin + dir * Rotate(-deg_to_rad(starting_angle)) * sizeDivider; + Geom::Point lineEnd = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * sizeDivider; + //Note:: beter way to do this + //Whith AppendNew have problems whith the crossing order + Geom::Path divider = Geom::Path(lineStart); + divider.appendNew((Geom::Point)origin); + divider.appendNew(lineEnd); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(kaleidoscope){ @@ -234,7 +246,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path); + setKaleidoscope(tmp_path,divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } @@ -256,14 +268,10 @@ LPECopyRotate::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector((Geom::Point)origin); - hp.appendNew(lineEnd); + hp.appendNew(origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * dist_angle_handle); Geom::PathVector pathv; pathv.push_back(hp); hp_vec.push_back(pathv); @@ -274,7 +282,6 @@ LPECopyRotate::resetDefaults(SPItem const* item) { Effect::resetDefaults(item); original_bbox(SP_LPE_ITEM(item)); - hp.clear(); } void diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 209118925..78e3b1950 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,11 +38,11 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setKaleidoscope(std::vector &path_in); + virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); - virtual bool side(Geom::Point p1, Geom::Point p2, Geom::Point p); + virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); virtual void split(std::vector &path_in,Geom::Path divider); @@ -67,7 +67,6 @@ private: Geom::Point A; Geom::Point B; Geom::Point dir; - Geom::Path hp; Geom::Point start_pos; Geom::Point rot_pos; -- cgit v1.2.3 From d1a09f4fd642b79542401c6e4eb83e79369c0f9b Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 24 Jan 2015 11:08:58 +0100 Subject: added missing header from a merge (bzr r13708.1.14) --- src/live_effects/lpe-copy_rotate.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 35b5c1eb2..d1022dbc2 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -13,7 +13,8 @@ #include #include - +#include <2geom/path-intersection.h> +#include <2geom/sbasis-to-bezier.h> #include "live_effects/lpe-copy_rotate.h" #include <2geom/path.h> #include <2geom/transforms.h> @@ -191,8 +192,13 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ void LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider){ split(path_on,divider); - for (int i = 0; i < num_copies; ++i) { - + for (Geom::PathVector::const_iterator path_it = path_on.begin(); path_it != path_on.end(); ++path_it) { + if (path_it->empty()){ + continue; + } + for (int i = 0; i < num_copies; ++i) { + + } } } -- cgit v1.2.3 From 8d82767ca9ff65622eac487afd6aeba78713add5 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 24 Jan 2015 12:40:19 +0100 Subject: reverting to non wroken branch (bzr r13708.1.15) --- po/sk.po | 14534 +++++++++++---------------------- src/live_effects/lpe-copy_rotate.cpp | 7 +- 2 files changed, 4770 insertions(+), 9771 deletions(-) diff --git a/po/sk.po b/po/sk.po index 05e10aacf..0646af233 100755 --- a/po/sk.po +++ b/po/sk.po @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-01-13 09:00+0100\n" -"PO-Revision-Date: 2015-01-24 00:37+0200\n" +"POT-Creation-Date: 2014-08-14 23:05-0700\n" +"PO-Revision-Date: 2014-11-03 14:33+0200\n" "Last-Translator: Ivan Masár \n" -"Language-Team: Slovak \n" +"Language-Team: x\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,1971 +41,6 @@ msgstr "Tvorba a úprava obrázkov Scalable Vector Graphics" msgid "New Drawing" msgstr "Nová kresba" -#: ../share/filters/filters.svg.h:2 -msgid "Smart Jelly" -msgstr "Inteligentné želé" - -#: ../share/filters/filters.svg.h:3 ../share/filters/filters.svg.h:7 -#: ../share/filters/filters.svg.h:15 ../share/filters/filters.svg.h:31 -#: ../share/filters/filters.svg.h:35 ../share/filters/filters.svg.h:107 -#: ../share/filters/filters.svg.h:139 ../share/filters/filters.svg.h:143 -#: ../share/filters/filters.svg.h:147 ../share/filters/filters.svg.h:151 -#: ../share/filters/filters.svg.h:163 ../share/filters/filters.svg.h:171 -#: ../share/filters/filters.svg.h:219 ../share/filters/filters.svg.h:227 -#: ../share/filters/filters.svg.h:283 ../share/filters/filters.svg.h:299 -#: ../share/filters/filters.svg.h:303 ../share/filters/filters.svg.h:551 -#: ../share/filters/filters.svg.h:555 ../share/filters/filters.svg.h:559 -#: ../share/filters/filters.svg.h:563 ../share/filters/filters.svg.h:567 -#: ../src/extension/internal/filter/bevels.h:63 -#: ../src/extension/internal/filter/bevels.h:144 -#: ../src/extension/internal/filter/bevels.h:228 -msgid "Bevels" -msgstr "Vrstvenie" - -#: ../share/filters/filters.svg.h:4 -msgid "Same as Matte jelly but with more controls" -msgstr "Rovnaké ako matné želé, ale s viacerými parametrami" - -#: ../share/filters/filters.svg.h:6 -msgid "Metal Casting" -msgstr "Odlievanie kovu" - -#: ../share/filters/filters.svg.h:8 -msgid "Smooth drop-like bevel with metallic finish" -msgstr "Hladké akoby vrhané vrstvenie s kovovým finišom" - -#: ../share/filters/filters.svg.h:10 -msgid "Apparition" -msgstr "Prízrak" - -#: ../share/filters/filters.svg.h:11 ../share/filters/filters.svg.h:323 -#: ../share/filters/filters.svg.h:655 -#: ../src/extension/internal/filter/blurs.h:63 -#: ../src/extension/internal/filter/blurs.h:132 -#: ../src/extension/internal/filter/blurs.h:201 -#: ../src/extension/internal/filter/blurs.h:267 -#: ../src/extension/internal/filter/blurs.h:351 -msgid "Blurs" -msgstr "Rozostrenia" - -#: ../share/filters/filters.svg.h:12 -msgid "Edges are partly feathered out" -msgstr "Okraje sú čiastočne rozmazané" - -#: ../share/filters/filters.svg.h:14 -msgid "Jigsaw Piece" -msgstr "Kúsok skladačky" - -#: ../share/filters/filters.svg.h:16 -msgid "Low, sharp bevel" -msgstr "Nízke, ostré vrstvenie" - -#: ../share/filters/filters.svg.h:18 -msgid "Rubber Stamp" -msgstr "Pečiatka" - -#: ../share/filters/filters.svg.h:19 ../share/filters/filters.svg.h:43 -#: ../share/filters/filters.svg.h:47 ../share/filters/filters.svg.h:51 -#: ../share/filters/filters.svg.h:59 ../share/filters/filters.svg.h:63 -#: ../share/filters/filters.svg.h:95 ../share/filters/filters.svg.h:99 -#: ../share/filters/filters.svg.h:103 ../share/filters/filters.svg.h:287 -#: ../share/filters/filters.svg.h:291 ../share/filters/filters.svg.h:331 -#: ../share/filters/filters.svg.h:335 ../share/filters/filters.svg.h:339 -#: ../share/filters/filters.svg.h:391 ../share/filters/filters.svg.h:407 -#: ../share/filters/filters.svg.h:451 ../share/filters/filters.svg.h:455 -#: ../share/filters/filters.svg.h:459 ../share/filters/filters.svg.h:475 -#: ../share/filters/filters.svg.h:487 ../share/filters/filters.svg.h:583 -#: ../share/filters/filters.svg.h:643 ../share/filters/filters.svg.h:683 -#: ../share/filters/filters.svg.h:687 ../share/filters/filters.svg.h:691 -#: ../share/filters/filters.svg.h:695 ../share/filters/filters.svg.h:699 -#: ../share/filters/filters.svg.h:703 ../share/filters/filters.svg.h:707 -#: ../share/filters/filters.svg.h:711 ../share/filters/filters.svg.h:715 -#: ../share/filters/filters.svg.h:723 -#: ../src/extension/internal/filter/overlays.h:80 -msgid "Overlays" -msgstr "Prekrytia" - -#: ../share/filters/filters.svg.h:20 -msgid "Random whiteouts inside" -msgstr "Náhodné biele miesta vnútri" - -#: ../share/filters/filters.svg.h:22 -#, fuzzy -msgid "Ink Bleed" -msgstr "Krvavý atrament" - -#: ../share/filters/filters.svg.h:23 ../share/filters/filters.svg.h:27 -#: ../share/filters/filters.svg.h:115 ../share/filters/filters.svg.h:431 -msgid "Protrusions" -msgstr "Výčnelky" - -#: ../share/filters/filters.svg.h:24 -msgid "Inky splotches underneath the object" -msgstr "Atramentové špliechance pod objektom" - -#: ../share/filters/filters.svg.h:26 -msgid "Fire" -msgstr "Oheň" - -#: ../share/filters/filters.svg.h:28 -msgid "Edges of object are on fire" -msgstr "Okraje objektu sú zapálené" - -#: ../share/filters/filters.svg.h:30 -msgid "Bloom" -msgstr "Kvitnutie" - -#: ../share/filters/filters.svg.h:32 -msgid "Soft, cushion-like bevel with matte highlights" -msgstr "Mäkké vankúšovité vrstvenie s matným zvýraznením" - -#: ../share/filters/filters.svg.h:34 -msgid "Ridged Border" -msgstr "Nárožný okraj" - -#: ../share/filters/filters.svg.h:36 -msgid "Ridged border with inner bevel" -msgstr "Nárožný okraj s vnútorným vrstvením" - -#: ../share/filters/filters.svg.h:38 -msgid "Ripple" -msgstr "Vlna" - -#: ../share/filters/filters.svg.h:39 ../share/filters/filters.svg.h:123 -#: ../share/filters/filters.svg.h:315 ../share/filters/filters.svg.h:319 -#: ../share/filters/filters.svg.h:327 ../share/filters/filters.svg.h:363 -#: ../share/filters/filters.svg.h:443 ../share/filters/filters.svg.h:519 -#: ../share/filters/filters.svg.h:635 -#: ../src/extension/internal/filter/distort.h:96 -#: ../src/extension/internal/filter/distort.h:205 -msgid "Distort" -msgstr "Deformácie" - -#: ../share/filters/filters.svg.h:40 -msgid "Horizontal rippling of edges" -msgstr "Vodorovné zvlnenie okrajov" - -#: ../share/filters/filters.svg.h:42 -msgid "Speckle" -msgstr "Škvrny" - -#: ../share/filters/filters.svg.h:44 -msgid "Fill object with sparse translucent specks" -msgstr "Riedko vyplniť objekt priesvitnými škvrnami" - -#: ../share/filters/filters.svg.h:46 -msgid "Oil Slick" -msgstr "Ropná škvrna" - -#: ../share/filters/filters.svg.h:48 -msgid "Rainbow-colored semitransparent oily splotches" -msgstr "Dúhovo sfarbené polopriesvitné olejové špliechance" - -#: ../share/filters/filters.svg.h:50 -msgid "Frost" -msgstr "Mráz" - -#: ../share/filters/filters.svg.h:52 -msgid "Flake-like white splotches" -msgstr "Vločkovité biele špliechance" - -#: ../share/filters/filters.svg.h:54 -msgid "Leopard Fur" -msgstr "Leopardia koža" - -#: ../share/filters/filters.svg.h:55 ../share/filters/filters.svg.h:175 -#: ../share/filters/filters.svg.h:179 ../share/filters/filters.svg.h:183 -#: ../share/filters/filters.svg.h:191 ../share/filters/filters.svg.h:211 -#: ../share/filters/filters.svg.h:239 ../share/filters/filters.svg.h:243 -#: ../share/filters/filters.svg.h:247 ../share/filters/filters.svg.h:255 -#: ../share/filters/filters.svg.h:387 ../share/filters/filters.svg.h:395 -#: ../share/filters/filters.svg.h:399 ../share/filters/filters.svg.h:403 -msgid "Materials" -msgstr "Materiály" - -#: ../share/filters/filters.svg.h:56 -msgid "Leopard spots (loses object's own color)" -msgstr "Leopardie škvrny (stráca sa vlastná farba objektu)" - -#: ../share/filters/filters.svg.h:58 -msgid "Zebra" -msgstr "Zebra" - -#: ../share/filters/filters.svg.h:60 -msgid "Irregular vertical dark stripes (loses object's own color)" -msgstr "Nepravidelné zvislé tmavé prúžky (stráca sa vlastná farba objektu)" - -#: ../share/filters/filters.svg.h:62 -msgid "Clouds" -msgstr "Oblaky" - -#: ../share/filters/filters.svg.h:64 -msgid "Airy, fluffy, sparse white clouds" -msgstr "Vzdušné, páperovité biele oblaky" - -#: ../share/filters/filters.svg.h:66 -#: ../src/extension/internal/bitmap/sharpen.cpp:38 -msgid "Sharpen" -msgstr "Zaostriť" - -#: ../share/filters/filters.svg.h:67 ../share/filters/filters.svg.h:71 -#: ../share/filters/filters.svg.h:87 ../share/filters/filters.svg.h:295 -#: ../share/filters/filters.svg.h:415 -#: ../src/extension/internal/filter/image.h:62 -msgid "Image Effects" -msgstr "Obrazové efekty" - -#: ../share/filters/filters.svg.h:68 -msgid "Sharpen edges and boundaries within the object, force=0.15" -msgstr "Zaostriť hrany a hranice v rámci objektu, sila=0.15" - -#: ../share/filters/filters.svg.h:70 -msgid "Sharpen More" -msgstr "Viac zaostriť" - -#: ../share/filters/filters.svg.h:72 -msgid "Sharpen edges and boundaries within the object, force=0.3" -msgstr "Zaostriť hrany a hranice v rámci objektu, sila=0.3" - -#: ../share/filters/filters.svg.h:74 -msgid "Oil painting" -msgstr "Olejomaľba" - -#: ../share/filters/filters.svg.h:75 ../share/filters/filters.svg.h:79 -#: ../share/filters/filters.svg.h:83 ../share/filters/filters.svg.h:447 -#: ../share/filters/filters.svg.h:495 ../share/filters/filters.svg.h:499 -#: ../share/filters/filters.svg.h:503 ../share/filters/filters.svg.h:507 -#: ../share/filters/filters.svg.h:515 ../share/filters/filters.svg.h:659 -#: ../share/filters/filters.svg.h:663 ../share/filters/filters.svg.h:667 -#: ../share/filters/filters.svg.h:671 ../share/filters/filters.svg.h:675 -#: ../share/filters/filters.svg.h:679 ../share/filters/filters.svg.h:719 -#: ../share/filters/filters.svg.h:803 ../share/filters/filters.svg.h:815 -#: ../src/extension/internal/filter/paint.h:113 -#: ../src/extension/internal/filter/paint.h:244 -#: ../src/extension/internal/filter/paint.h:363 -#: ../src/extension/internal/filter/paint.h:507 -#: ../src/extension/internal/filter/paint.h:602 -#: ../src/extension/internal/filter/paint.h:725 -#: ../src/extension/internal/filter/paint.h:877 -#: ../src/extension/internal/filter/paint.h:981 -msgid "Image Paint and Draw" -msgstr "Maľovanie a kreslenie obrázka" - -#: ../share/filters/filters.svg.h:76 -msgid "Simulate oil painting style" -msgstr "Simulovať olejomaľbu" - -#. Pencil -#: ../share/filters/filters.svg.h:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:424 -#: ../src/ui/dialog/inkscape-preferences.cpp:417 -msgid "Pencil" -msgstr "Ceruzka" - -#: ../share/filters/filters.svg.h:80 -msgid "Detect color edges and retrace them in grayscale" -msgstr "Zistiť farebné hrany v objekte a vektorizovať ich v odtieňoch šedej" - -#: ../share/filters/filters.svg.h:82 -msgid "Blueprint" -msgstr "Návrh" - -#: ../share/filters/filters.svg.h:84 -msgid "Detect color edges and retrace them in blue" -msgstr "Zistiť farebné hrany v objekte a vektorizovať ich v modrej" - -#: ../share/filters/filters.svg.h:86 -msgid "Age" -msgstr "VekUhol" - -#: ../share/filters/filters.svg.h:88 -msgid "Imitate aged photograph" -msgstr "Imitovať zostarnutú fotografiu" - -#: ../share/filters/filters.svg.h:90 -msgid "Organic" -msgstr "Organické" - -#: ../share/filters/filters.svg.h:91 ../share/filters/filters.svg.h:119 -#: ../share/filters/filters.svg.h:127 ../share/filters/filters.svg.h:187 -#: ../share/filters/filters.svg.h:195 ../share/filters/filters.svg.h:199 -#: ../share/filters/filters.svg.h:251 ../share/filters/filters.svg.h:259 -#: ../share/filters/filters.svg.h:263 ../share/filters/filters.svg.h:355 -#: ../share/filters/filters.svg.h:359 ../share/filters/filters.svg.h:367 -#: ../share/filters/filters.svg.h:371 ../share/filters/filters.svg.h:375 -#: ../share/filters/filters.svg.h:379 ../share/filters/filters.svg.h:383 -#: ../share/filters/filters.svg.h:439 ../share/filters/filters.svg.h:467 -#: ../share/filters/filters.svg.h:491 ../share/filters/filters.svg.h:531 -msgid "Textures" -msgstr "Textúry" - -#: ../share/filters/filters.svg.h:92 -msgid "Bulging, knotty, slick 3D surface" -msgstr "Vydutý, hrčovitý, hladký 3D povrch" - -#: ../share/filters/filters.svg.h:94 -msgid "Barbed Wire" -msgstr "Ostnatý drôt" - -#: ../share/filters/filters.svg.h:96 -msgid "Gray bevelled wires with drop shadows" -msgstr "Šedé vrstvené drôty s vrhanými tieňmi" - -#: ../share/filters/filters.svg.h:98 -msgid "Swiss Cheese" -msgstr "Švajčiarsky syr" - -#: ../share/filters/filters.svg.h:100 -msgid "Random inner-bevel holes" -msgstr "Náhodné diery s vnútorným vrstvením" - -#: ../share/filters/filters.svg.h:102 -msgid "Blue Cheese" -msgstr "Modrý syr" - -#: ../share/filters/filters.svg.h:104 -msgid "Marble-like bluish speckles" -msgstr "Mramorové modrasté škvrny" - -#: ../share/filters/filters.svg.h:106 -msgid "Button" -msgstr "Tlačidlo" - -#: ../share/filters/filters.svg.h:108 -msgid "Soft bevel, slightly depressed middle" -msgstr "Jemné vrstvenie, dnu mierne preliačené" - -#: ../share/filters/filters.svg.h:110 -msgid "Inset" -msgstr "Posunúť dnu" - -#: ../share/filters/filters.svg.h:111 ../share/filters/filters.svg.h:267 -#: ../share/filters/filters.svg.h:343 ../share/filters/filters.svg.h:435 -#: ../share/filters/filters.svg.h:811 -#: ../src/extension/internal/filter/shadows.h:81 -msgid "Shadows and Glows" -msgstr "Tiene a žiary" - -#: ../share/filters/filters.svg.h:112 -msgid "Shadowy outer bevel" -msgstr "Tienisté vonkajšie vrstvenie" - -#: ../share/filters/filters.svg.h:114 -msgid "Dripping" -msgstr "Kvapkanie" - -#: ../share/filters/filters.svg.h:116 -msgid "Random paint streaks downwards" -msgstr "Náhodné ťahy farbou smerom dolu" - -#: ../share/filters/filters.svg.h:118 -msgid "Jam Spread" -msgstr "Rozmazaný džem" - -#: ../share/filters/filters.svg.h:120 -msgid "Glossy clumpy jam spread" -msgstr "Lesklý zhlukovitý rozmazaný džem" - -#: ../share/filters/filters.svg.h:122 -msgid "Pixel Smear" -msgstr "Rozmazanie pixelov" - -#: ../share/filters/filters.svg.h:124 -msgid "Van Gogh painting effect for bitmaps" -msgstr "Efekt Van Goghovej maľby pre bitmapy" - -#: ../share/filters/filters.svg.h:126 -msgid "Cracked Glass" -msgstr "Popraskané sklo" - -#: ../share/filters/filters.svg.h:128 -msgid "Under a cracked glass" -msgstr "Pod popraskaným sklom" - -#: ../share/filters/filters.svg.h:130 -msgid "Bubbly Bumps" -msgstr "Bublinové hrče" - -#: ../share/filters/filters.svg.h:131 ../share/filters/filters.svg.h:307 -#: ../share/filters/filters.svg.h:311 ../share/filters/filters.svg.h:347 -#: ../share/filters/filters.svg.h:351 ../share/filters/filters.svg.h:419 -#: ../share/filters/filters.svg.h:423 ../share/filters/filters.svg.h:463 -#: ../share/filters/filters.svg.h:471 ../share/filters/filters.svg.h:479 -#: ../share/filters/filters.svg.h:483 ../share/filters/filters.svg.h:511 -#: ../share/filters/filters.svg.h:535 ../share/filters/filters.svg.h:539 -#: ../share/filters/filters.svg.h:543 ../share/filters/filters.svg.h:547 -#: ../share/filters/filters.svg.h:571 ../share/filters/filters.svg.h:579 -#: ../share/filters/filters.svg.h:595 ../share/filters/filters.svg.h:599 -#: ../share/filters/filters.svg.h:603 ../share/filters/filters.svg.h:607 -#: ../share/filters/filters.svg.h:611 ../share/filters/filters.svg.h:615 -#: ../share/filters/filters.svg.h:619 ../share/filters/filters.svg.h:623 -#: ../share/filters/filters.svg.h:799 ../share/filters/filters.svg.h:807 -#: ../src/extension/internal/filter/bumps.h:142 -#: ../src/extension/internal/filter/bumps.h:362 -msgid "Bumps" -msgstr "Hrče" - -#: ../share/filters/filters.svg.h:132 -msgid "Flexible bubbles effect with some displacement" -msgstr "Efekt flexibilných bublín s určitým posunutím" - -#: ../share/filters/filters.svg.h:134 -msgid "Glowing Bubble" -msgstr "Žiariaca bublina" - -#: ../share/filters/filters.svg.h:135 ../share/filters/filters.svg.h:155 -#: ../share/filters/filters.svg.h:159 ../share/filters/filters.svg.h:203 -#: ../share/filters/filters.svg.h:207 ../share/filters/filters.svg.h:215 -#: ../share/filters/filters.svg.h:223 -msgid "Ridges" -msgstr "Nárožia" - -#: ../share/filters/filters.svg.h:136 -msgid "Bubble effect with refraction and glow" -msgstr "Efekt bubliny s refrakciou a žiarou" - -#: ../share/filters/filters.svg.h:138 -msgid "Neon" -msgstr "Neón" - -#: ../share/filters/filters.svg.h:140 -msgid "Neon light effect" -msgstr "Efekt neónového svetla" - -#: ../share/filters/filters.svg.h:142 -msgid "Molten Metal" -msgstr "Roztavený kov" - -#: ../share/filters/filters.svg.h:144 -msgid "Melting parts of object together, with a glossy bevel and a glow" -msgstr "Roztopenie častí objektu dohromady s lesklým vrstvením a žiarou" - -#: ../share/filters/filters.svg.h:146 -msgid "Pressed Steel" -msgstr "Lisovaná oceľ" - -#: ../share/filters/filters.svg.h:148 -msgid "Pressed metal with a rolled edge" -msgstr "Lisovaná oceľ s valcovaným okrajom" - -#: ../share/filters/filters.svg.h:150 -msgid "Matte Bevel" -msgstr "Matné vrstvenie" - -#: ../share/filters/filters.svg.h:152 -msgid "Soft, pastel-colored, blurry bevel" -msgstr "Jemné pastelovo sfarbené rozmazané vrstvenie" - -#: ../share/filters/filters.svg.h:154 -msgid "Thin Membrane" -msgstr "Tenká membrána" - -#: ../share/filters/filters.svg.h:156 -msgid "Thin like a soap membrane" -msgstr "Tenká ako mydlová membrána" - -#: ../share/filters/filters.svg.h:158 -msgid "Matte Ridge" -msgstr "Matný hrebeň" - -#: ../share/filters/filters.svg.h:160 -msgid "Soft pastel ridge" -msgstr "Mäkké pastelové nárožie" - -#: ../share/filters/filters.svg.h:162 -msgid "Glowing Metal" -msgstr "Žiariaci kov" - -#: ../share/filters/filters.svg.h:164 -msgid "Glowing metal texture" -msgstr "Žiariaca kovová textúra" - -#: ../share/filters/filters.svg.h:166 -msgid "Leaves" -msgstr "Listy" - -#: ../share/filters/filters.svg.h:167 ../share/filters/filters.svg.h:235 -#: ../share/filters/filters.svg.h:271 ../share/filters/filters.svg.h:639 -#: ../share/extensions/pathscatter.inx.h:1 -msgid "Scatter" -msgstr "Roztrúsenie" - -#: ../share/filters/filters.svg.h:168 -msgid "Leaves on the ground in Fall, or living foliage" -msgstr "Listy na zemi na jeseň alebo živý porast" - -#: ../share/filters/filters.svg.h:170 -#: ../src/extension/internal/filter/paint.h:339 -msgid "Translucent" -msgstr "Priesvitnosť" - -#: ../share/filters/filters.svg.h:172 -msgid "Illuminated translucent plastic or glass effect" -msgstr "Osvetlený priesvitný plastový alebo sklenený efekt" - -#: ../share/filters/filters.svg.h:174 -msgid "Iridescent Beeswax" -msgstr "Perleťový včelí vosk" - -#: ../share/filters/filters.svg.h:176 -msgid "Waxy texture which keeps its iridescence through color fill change" -msgstr "Vosková textúra, ktorá si ponecháva perleťovosť zmenou farebnej výplne" - -#: ../share/filters/filters.svg.h:178 -msgid "Eroded Metal" -msgstr "Erodovaný kov" - -#: ../share/filters/filters.svg.h:180 -msgid "Eroded metal texture with ridges, grooves, holes and bumps" -msgstr "Erodovaná kovová textúra s nárožím, ryhami, dierami a hrčami" - -#: ../share/filters/filters.svg.h:182 -msgid "Cracked Lava" -msgstr "Popraskaná láva" - -#: ../share/filters/filters.svg.h:184 -msgid "A volcanic texture, a little like leather" -msgstr "Vulkanická textúra, trochu podobná koži" - -#: ../share/filters/filters.svg.h:186 -msgid "Bark" -msgstr "Kôra" - -#: ../share/filters/filters.svg.h:188 -msgid "Bark texture, vertical; use with deep colors" -msgstr "Textúra kôry, zvislá; použite s hlbokými farbami" - -#: ../share/filters/filters.svg.h:190 -msgid "Lizard Skin" -msgstr "Jašteričia koža" - -#: ../share/filters/filters.svg.h:192 -msgid "Stylized reptile skin texture" -msgstr "Štylizovaná textúra kože plaza" - -#: ../share/filters/filters.svg.h:194 -msgid "Stone Wall" -msgstr "Kamenný múr" - -#: ../share/filters/filters.svg.h:196 -msgid "Stone wall texture to use with not too saturated colors" -msgstr "Textúra kamenného múru na použitie s nie príliš nasýtenými farbami" - -#: ../share/filters/filters.svg.h:198 -msgid "Silk Carpet" -msgstr "Hodvábny koberec" - -#: ../share/filters/filters.svg.h:200 -msgid "Silk carpet texture, horizontal stripes" -msgstr "Textúra hodvábneho koberca, vodorovné prúžky" - -#: ../share/filters/filters.svg.h:202 -msgid "Refractive Gel A" -msgstr "Refraktívny gél A" - -#: ../share/filters/filters.svg.h:204 -msgid "Gel effect with light refraction" -msgstr "Gélový efekt s refrakciou svetla" - -#: ../share/filters/filters.svg.h:206 -msgid "Refractive Gel B" -msgstr "Refraktívny gél B" - -#: ../share/filters/filters.svg.h:208 -msgid "Gel effect with strong refraction" -msgstr "Gélový efekt so silnou refrakciou" - -#: ../share/filters/filters.svg.h:210 -msgid "Metallized Paint" -msgstr "Metalizovaná farba" - -#: ../share/filters/filters.svg.h:212 -msgid "" -"Metallized effect with a soft lighting, slightly translucent at the edges" -msgstr "Metalizovaný efekt s jemným osvetlením, na okrajoch mierne priesvitný" - -#: ../share/filters/filters.svg.h:214 -msgid "Dragee" -msgstr "Dražé" - -#: ../share/filters/filters.svg.h:216 -msgid "Gel Ridge with a pearlescent look" -msgstr "Gélové nárožie s perličkovým výzorom" - -#: ../share/filters/filters.svg.h:218 -msgid "Raised Border" -msgstr "Vyvýšený okraj" - -#: ../share/filters/filters.svg.h:220 -msgid "Strongly raised border around a flat surface" -msgstr "Silne zdvihnutý okraj okolo plochého povrchu" - -#: ../share/filters/filters.svg.h:222 -msgid "Metallized Ridge" -msgstr "Metalizované nárožie" - -#: ../share/filters/filters.svg.h:224 -msgid "Gel Ridge metallized at its top" -msgstr "Gélové nárožie navrchu metalizované" - -#: ../share/filters/filters.svg.h:226 -msgid "Fat Oil" -msgstr "Tučný olej" - -#: ../share/filters/filters.svg.h:228 -msgid "Fat oil with some adjustable turbulence" -msgstr "Tučný olej s prispôsobiteľnou turbulenciou" - -#: ../share/filters/filters.svg.h:230 -msgid "Black Hole" -msgstr "Čierna diera" - -#: ../share/filters/filters.svg.h:231 ../share/filters/filters.svg.h:275 -#: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 -#: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 -#: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 -#: ../src/filter-enums.cpp:32 -#: ../src/filter-enums.cpp:31 -msgid "Morphology" -msgstr "Morfológia" - -#: ../share/filters/filters.svg.h:232 -msgid "Creates a black light inside and outside" -msgstr "Vytvára čierne svetlo dnu a vonku" - -#: ../share/filters/filters.svg.h:234 -msgid "Cubes" -msgstr "Kocky" - -#: ../share/filters/filters.svg.h:236 -msgid "Scattered cubes; adjust the Morphology primitive to vary size" -msgstr "" -"Roztrúsené kocky; nastavením primitívy Morfológia môžete meniť ich veľkosť" - -#: ../share/filters/filters.svg.h:238 -msgid "Peel Off" -msgstr "Olupovanie" - -#: ../share/filters/filters.svg.h:240 -msgid "Peeling painting on a wall" -msgstr "Olupujúca sa farba na stene" - -#: ../share/filters/filters.svg.h:242 -msgid "Gold Splatter" -msgstr "Zlatý špliechanec" - -#: ../share/filters/filters.svg.h:244 -msgid "Splattered cast metal, with golden highlights" -msgstr "Kovové špliechance so zlatým zvýraznením" - -#: ../share/filters/filters.svg.h:246 -msgid "Gold Paste" -msgstr "Zlatá pasta" - -#: ../share/filters/filters.svg.h:248 -msgid "Fat pasted cast metal, with golden highlights" -msgstr "Tučne prilepený kov so zlatým zvýraznením" - -#: ../share/filters/filters.svg.h:250 -msgid "Crumpled Plastic" -msgstr "Pokrčený plast" - -#: ../share/filters/filters.svg.h:252 -msgid "Crumpled matte plastic, with melted edge" -msgstr "Pokrčený matný plast s roztaveným okrajom" - -#: ../share/filters/filters.svg.h:254 -msgid "Enamel Jewelry" -msgstr "Smaltované klenoty" - -#: ../share/filters/filters.svg.h:256 -msgid "Slightly cracked enameled texture" -msgstr "Mierne popraskaná smaltovaná textúra" - -#: ../share/filters/filters.svg.h:258 -msgid "Rough Paper" -msgstr "Drsný papier" - -#: ../share/filters/filters.svg.h:260 -msgid "Aquarelle paper effect which can be used for pictures as for objects" -msgstr "" -"Efekt akvarelového papiera, ktorý možno použiť na obrázky ako na objekty" - -#: ../share/filters/filters.svg.h:262 -msgid "Rough and Glossy" -msgstr "Drsná a lesklá" - -#: ../share/filters/filters.svg.h:264 -msgid "" -"Crumpled glossy paper effect which can be used for pictures as for objects" -msgstr "" -"Efekt pokrčeného lesklého papiera, ktorý možno použiť na obrázky ako na " -"objekty" - -#: ../share/filters/filters.svg.h:266 -msgid "In and Out" -msgstr "Dnu a von" - -#: ../share/filters/filters.svg.h:268 -msgid "Inner colorized shadow, outer black shadow" -msgstr "Vnútorný vyfarbený tieň, vonkajší čierny tieň" - -#: ../share/filters/filters.svg.h:270 -msgid "Air Spray" -msgstr "Sprej" - -#: ../share/filters/filters.svg.h:272 -msgid "Convert to small scattered particles with some thickness" -msgstr "Previesť na malé roztrúsené častice s určitou hrúbkou" - -#: ../share/filters/filters.svg.h:274 -msgid "Warm Inside" -msgstr "Teplo vnútri" - -#: ../share/filters/filters.svg.h:276 -msgid "Blurred colorized contour, filled inside" -msgstr "Rozostrené zafarbené obrysy, vnútri vyplnené" - -#: ../share/filters/filters.svg.h:278 -msgid "Cool Outside" -msgstr "Chladno vonku" - -#: ../share/filters/filters.svg.h:280 -msgid "Blurred colorized contour, empty inside" -msgstr "Rozostrená zafarbená textúra, vnútri prázdna" - -#: ../share/filters/filters.svg.h:282 -msgid "Electronic Microscopy" -msgstr "Elektrónová mikroskopia" - -#: ../share/filters/filters.svg.h:284 -msgid "" -"Bevel, crude light, discoloration and glow like in electronic microscopy" -msgstr "" -"Vrstvenie, hrubé svetlo, odfarbenie a žiara ako pri elektrónovej mikroskopii" - -#: ../share/filters/filters.svg.h:286 -msgid "Tartan" -msgstr "Tartan" - -#: ../share/filters/filters.svg.h:288 -msgid "Checkered tartan pattern" -msgstr "Kockovaný vzor tartan" - -#: ../share/filters/filters.svg.h:290 -msgid "Shaken Liquid" -msgstr "Roztrasená tekutina" - -#: ../share/filters/filters.svg.h:292 -msgid "Colorizable filling with flow inside like transparency" -msgstr "Zafarbiteľná výplň s priesvitným tokom dnu" - -#: ../share/filters/filters.svg.h:294 -msgid "Soft Focus Lens" -msgstr "Šošovka mäkkého zaostrenia" - -#: ../share/filters/filters.svg.h:296 -msgid "Glowing image content without blurring it" -msgstr "Žiarenie obsahu obrázka bez toho, aby bol rozmazaný" - -#: ../share/filters/filters.svg.h:298 -msgid "Stained Glass" -msgstr "Vitráž" - -#: ../share/filters/filters.svg.h:300 -msgid "Illuminated stained glass effect" -msgstr "Efekt osvietenej vitraje" - -#: ../share/filters/filters.svg.h:302 -msgid "Dark Glass" -msgstr "Tmavé sklo" - -#: ../share/filters/filters.svg.h:304 -msgid "Illuminated glass effect with light coming from beneath" -msgstr "Efekt osvieteného skla, svetlo prichádza zospodu" - -#: ../share/filters/filters.svg.h:306 -msgid "HSL Bumps Alpha" -msgstr "HSL hrče, priesvitnosť" - -#: ../share/filters/filters.svg.h:308 -msgid "Same as HSL Bumps but with transparent highlights" -msgstr "Rovnaké ako HSL hrče, ale s priesvitným zvýraznením" - -#: ../share/filters/filters.svg.h:310 -msgid "Bubbly Bumps Alpha" -msgstr "Bublinové hrče, priesvitnosť" - -#: ../share/filters/filters.svg.h:312 -msgid "Same as Bubbly Bumps but with transparent highlights" -msgstr "Rovnaké ako Bublinové hrče, ale s priesvitným zvýraznením" - -#: ../share/filters/filters.svg.h:314 ../share/filters/filters.svg.h:362 -msgid "Torn Edges" -msgstr "Roztrhané hrany" - -#: ../share/filters/filters.svg.h:316 ../share/filters/filters.svg.h:364 -msgid "" -"Displace the outside of shapes and pictures without altering their content" -msgstr "Posunúť vonkajšok tvarov a obrázkov bez zmeny ich obsahu" - -#: ../share/filters/filters.svg.h:318 -msgid "Roughen Inside" -msgstr "Zdrsnenie vovnútri" - -#: ../share/filters/filters.svg.h:320 -msgid "Roughen all inside shapes" -msgstr "Zdrsniť všetky vnútorné tvary" - -#: ../share/filters/filters.svg.h:322 -msgid "Evanescent" -msgstr "Zanikajúce" - -#: ../share/filters/filters.svg.h:324 -msgid "" -"Blur the contents of objects, preserving the outline and adding progressive " -"transparency at edges" -msgstr "" -"Rozostriť obsah objektu so zachovaním obrysu a pridaním postupnej " -"priesvitnosti na okrajoch" - -#: ../share/filters/filters.svg.h:326 -msgid "Chalk and Sponge" -msgstr "Krieda a špongia" - -#: ../share/filters/filters.svg.h:328 -msgid "Low turbulence gives sponge look and high turbulence chalk" -msgstr "Slabá turbulencia dáva špongiovitý vzhľad a vysoká turbulencia kriedový" - -#: ../share/filters/filters.svg.h:330 -msgid "People" -msgstr "Ľudia" - -#: ../share/filters/filters.svg.h:332 -msgid "Colorized blotches, like a crowd of people" -msgstr "Farebné škvrny ako dav ľudí" - -#: ../share/filters/filters.svg.h:334 -msgid "Scotland" -msgstr "Škótsko" - -#: ../share/filters/filters.svg.h:336 -msgid "Colorized mountain tops out of the fog" -msgstr "Farebné vrcholky hôr vystupujúce z hmly" - -#: ../share/filters/filters.svg.h:338 -msgid "Garden of Delights" -msgstr "Záhrada potešení" - -#: ../share/filters/filters.svg.h:340 -msgid "" -"Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of Delights" -msgstr "" -"Fantasmagorické turbulentné chumáče ako Záhrada potešení od Hieronyma Boscha" - -#: ../share/filters/filters.svg.h:342 -msgid "Cutout Glow" -msgstr "Žiara výrezu" - -#: ../share/filters/filters.svg.h:344 -msgid "In and out glow with a possible offset and colorizable flood" -msgstr "Vnútorná a vonkajšia žiara s možným posunutím a zafarbiteľnou výplňou" - -#: ../share/filters/filters.svg.h:346 -msgid "Dark Emboss" -msgstr "Tmavý reliéf" - -#: ../share/filters/filters.svg.h:348 -msgid "Emboss effect : 3D relief where white is replaced by black" -msgstr "Efekt reliéfu: 3D reliéf kde je biela nahradená čiernou" - -#: ../share/filters/filters.svg.h:350 -msgid "Bubbly Bumps Matte" -msgstr "Bublinové hrče, matné" - -#: ../share/filters/filters.svg.h:352 -msgid "Same as Bubbly Bumps but with a diffuse light instead of a specular one" -msgstr "Rovnaké ako Bublinové hrče ale s difúznym svetlom namiesto zrkadlového" - -#: ../share/filters/filters.svg.h:354 -msgid "Blotting Paper" -msgstr "Pijavý papier" - -#: ../share/filters/filters.svg.h:356 -msgid "Inkblot on blotting paper" -msgstr "Atramentové škvrny na pijaku" - -#: ../share/filters/filters.svg.h:358 -msgid "Wax Print" -msgstr "Voskový odtlačok" - -#: ../share/filters/filters.svg.h:360 -msgid "Wax print on tissue texture" -msgstr "Voskový odtlačok na textúre tkaniva" - -#: ../share/filters/filters.svg.h:366 -msgid "Watercolor" -msgstr "Vodové farby" - -#: ../share/filters/filters.svg.h:368 -msgid "Cloudy watercolor effect" -msgstr "Efekt oblačných vodových farieb" - -#: ../share/filters/filters.svg.h:370 -msgid "Felt" -msgstr "Plsť" - -#: ../share/filters/filters.svg.h:372 -msgid "" -"Felt like texture with color turbulence and slightly darker at the edges" -msgstr "Páperovitá textúra s turbulenciou farieb mierne tmavšia na okrajoch" - -#: ../share/filters/filters.svg.h:374 -msgid "Ink Paint" -msgstr "Atramentová farba" - -#: ../share/filters/filters.svg.h:376 -msgid "Ink paint on paper with some turbulent color shift" -msgstr "Atramentová maľba na papieri s turbulentným farebným posunom" - -#: ../share/filters/filters.svg.h:378 -msgid "Tinted Rainbow" -msgstr "Sfarbená dúha" - -#: ../share/filters/filters.svg.h:380 -msgid "Smooth rainbow colors melted along the edges and colorizable" -msgstr "Jemné dúhové farby prelínajúce sa na okrajoch a sfarbiteľné" - -#: ../share/filters/filters.svg.h:382 -msgid "Melted Rainbow" -msgstr "Roztopená dúha" - -#: ../share/filters/filters.svg.h:384 -msgid "Smooth rainbow colors slightly melted along the edges" -msgstr "Jemné dúhové farby mierne sa prelínajúce na okrajoch" - -#: ../share/filters/filters.svg.h:386 -#, fuzzy -msgid "Flex Metal" -msgstr "Roztavený kov" - -#: ../share/filters/filters.svg.h:388 -msgid "Bright, polished uneven metal casting, colorizable" -msgstr "Jasný vyleštený nerovnomerný kovový odliatok, sfarbiteľný" - -#: ../share/filters/filters.svg.h:390 -msgid "Wavy Tartan" -msgstr "Vlnitý tartan" - -#: ../share/filters/filters.svg.h:392 -msgid "Tartan pattern with a wavy displacement and bevel around the edges" -msgstr "Vzor tartan s vlnitým posunutím a vrstvením na okrajoch" - -#: ../share/filters/filters.svg.h:394 -msgid "3D Marble" -msgstr "3D mramor" - -#: ../share/filters/filters.svg.h:396 -msgid "3D warped marble texture" -msgstr "3D deformovaná textúra mramoru" - -#: ../share/filters/filters.svg.h:398 -msgid "3D Wood" -msgstr "3D drevo" - -#: ../share/filters/filters.svg.h:400 -msgid "3D warped, fibered wood texture" -msgstr "3D deformovaná textúra vláknitého dreva" - -#: ../share/filters/filters.svg.h:402 -msgid "3D Mother of Pearl" -msgstr "3D perleť" - -#: ../share/filters/filters.svg.h:404 -msgid "3D warped, iridescent pearly shell texture" -msgstr "3D deformovaná perleťová textúra lastúry" - -#: ../share/filters/filters.svg.h:406 -msgid "Tiger Fur" -msgstr "Tigria koža" - -#: ../share/filters/filters.svg.h:408 -msgid "Tiger fur pattern with folds and bevel around the edges" -msgstr "Vzor tigrej kože so záhybmi a vrstvením na okrajoch" - -#: ../share/filters/filters.svg.h:410 -msgid "Black Light" -msgstr "Čierne svetlo" - -#: ../share/filters/filters.svg.h:411 ../share/filters/filters.svg.h:575 -#: ../share/filters/filters.svg.h:587 ../share/filters/filters.svg.h:627 -#: ../share/filters/filters.svg.h:631 ../share/filters/filters.svg.h:819 -#: ../share/filters/filters.svg.h:827 ../share/filters/filters.svg.h:831 -#: ../src/extension/internal/bitmap/colorize.cpp:52 -#: ../src/extension/internal/filter/bumps.h:101 -#: ../src/extension/internal/filter/bumps.h:321 -#: ../src/extension/internal/filter/bumps.h:328 -#: ../src/extension/internal/filter/color.h:82 -#: ../src/extension/internal/filter/color.h:164 -#: ../src/extension/internal/filter/color.h:171 -#: ../src/extension/internal/filter/color.h:262 -#: ../src/extension/internal/filter/color.h:340 -#: ../src/extension/internal/filter/color.h:347 -#: ../src/extension/internal/filter/color.h:437 -#: ../src/extension/internal/filter/color.h:532 -#: ../src/extension/internal/filter/color.h:654 -#: ../src/extension/internal/filter/color.h:751 -#: ../src/extension/internal/filter/color.h:830 -#: ../src/extension/internal/filter/color.h:921 -#: ../src/extension/internal/filter/color.h:1049 -#: ../src/extension/internal/filter/color.h:1119 -#: ../src/extension/internal/filter/color.h:1212 -#: ../src/extension/internal/filter/color.h:1324 -#: ../src/extension/internal/filter/color.h:1429 -#: ../src/extension/internal/filter/color.h:1505 -#: ../src/extension/internal/filter/color.h:1609 -#: ../src/extension/internal/filter/color.h:1616 -#: ../src/extension/internal/filter/morphology.h:194 -#: ../src/extension/internal/filter/overlays.h:73 -#: ../src/extension/internal/filter/paint.h:99 -#: ../src/extension/internal/filter/paint.h:713 -#: ../src/extension/internal/filter/paint.h:717 -#: ../src/extension/internal/filter/shadows.h:73 -#: ../src/extension/internal/filter/transparency.h:345 -#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:830 -#: ../src/ui/dialog/clonetiler.cpp:981 -#: ../src/ui/dialog/document-properties.cpp:157 -#: ../share/extensions/color_HSL_adjust.inx.h:20 -#: ../share/extensions/color_blackandwhite.inx.h:3 -#: ../share/extensions/color_brighter.inx.h:2 -#: ../share/extensions/color_custom.inx.h:15 -#: ../share/extensions/color_darker.inx.h:2 -#: ../share/extensions/color_desaturate.inx.h:2 -#: ../share/extensions/color_grayscale.inx.h:2 -#: ../share/extensions/color_lesshue.inx.h:2 -#: ../share/extensions/color_lesslight.inx.h:2 -#: ../share/extensions/color_lesssaturation.inx.h:2 -#: ../share/extensions/color_morehue.inx.h:2 -#: ../share/extensions/color_morelight.inx.h:2 -#: ../share/extensions/color_moresaturation.inx.h:2 -#: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 -#: ../share/extensions/color_removeblue.inx.h:2 -#: ../share/extensions/color_removegreen.inx.h:2 -#: ../share/extensions/color_removered.inx.h:2 -#: ../share/extensions/color_replace.inx.h:6 -#: ../share/extensions/color_rgbbarrel.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:19 -#: ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/clonetiler.cpp:832 -#: ../src/ui/dialog/clonetiler.cpp:983 -msgid "Color" -msgstr "Farba" - -#: ../share/filters/filters.svg.h:412 -msgid "Light areas turn to black" -msgstr "Svetlé oblasti zmenené na čierne" - -#: ../share/filters/filters.svg.h:414 -msgid "Film Grain" -msgstr "Filmové zrno" - -#: ../share/filters/filters.svg.h:416 -msgid "Adds a small scale graininess" -msgstr "Pridáva zrnitosť v malej miere" - -#: ../share/filters/filters.svg.h:418 -msgid "Plaster Color" -msgstr "Farba omietky" - -#: ../share/filters/filters.svg.h:420 -msgid "Colored plaster emboss effect" -msgstr "Reliéfny efekt farebnej omietky" - -#: ../share/filters/filters.svg.h:422 -msgid "Velvet Bumps" -msgstr "Zamatové hrče" - -#: ../share/filters/filters.svg.h:424 -msgid "Gives Smooth Bumps velvet like" -msgstr "Dáva jemné akoby zamatové hrče" - -#: ../share/filters/filters.svg.h:426 -msgid "Comics Cream" -msgstr "Komiksový krém" - -#: ../share/filters/filters.svg.h:427 ../share/filters/filters.svg.h:727 -#: ../share/filters/filters.svg.h:731 ../share/filters/filters.svg.h:735 -#: ../share/filters/filters.svg.h:739 ../share/filters/filters.svg.h:743 -#: ../share/filters/filters.svg.h:747 ../share/filters/filters.svg.h:751 -#: ../share/filters/filters.svg.h:755 ../share/filters/filters.svg.h:759 -#: ../share/filters/filters.svg.h:763 ../share/filters/filters.svg.h:767 -#: ../share/filters/filters.svg.h:771 ../share/filters/filters.svg.h:775 -#: ../share/filters/filters.svg.h:779 ../share/filters/filters.svg.h:783 -#: ../share/filters/filters.svg.h:787 ../share/filters/filters.svg.h:791 -#: ../share/filters/filters.svg.h:795 -msgid "Non realistic 3D shaders" -msgstr "Nerealistické 3D tieňovanie" - -#: ../share/filters/filters.svg.h:428 -msgid "Comics shader with creamy waves transparency" -msgstr "Komiksové tieňovanie s priesvitnosťou krémových vĺn" - -#: ../share/filters/filters.svg.h:430 -msgid "Chewing Gum" -msgstr "Žuvačka" - -#: ../share/filters/filters.svg.h:432 -msgid "" -"Creates colorizable blotches which smoothly flow over the edges of the lines " -"at their crossings" -msgstr "" -"Vytvorí vyfarbiteľné škvrny, ktoré hladko pretekajú cez okraj čiar na ich " -"priesečníkoch" - -#: ../share/filters/filters.svg.h:434 -msgid "Dark And Glow" -msgstr "Tma a žiara" - -#: ../share/filters/filters.svg.h:436 -msgid "Darkens the edge with an inner blur and adds a flexible glow" -msgstr "Stmaví okraj s vnútorným rozostrením a pridá flexibilnú žiaru" - -#: ../share/filters/filters.svg.h:438 -msgid "Warped Rainbow" -msgstr "Posunutá dúha" - -#: ../share/filters/filters.svg.h:440 -msgid "Smooth rainbow colors warped along the edges and colorizable" -msgstr "Jemné dúhové farby posunuté po okrajoch a vyfarbiteľné" - -#: ../share/filters/filters.svg.h:442 -msgid "Rough and Dilate" -msgstr "Drsné a rozšírené" - -#: ../share/filters/filters.svg.h:444 -msgid "Create a turbulent contour around" -msgstr "Vytvorí turbulentnú kontúru" - -#: ../share/filters/filters.svg.h:446 -msgid "Old Postcard" -msgstr "Stará pohľadnica" - -#: ../share/filters/filters.svg.h:448 -msgid "Slightly posterize and draw edges like on old printed postcards" -msgstr "" -"Jemná posterizácia a nakreslenie okrajov aké majú staré tlačené fotografie" - -#: ../share/filters/filters.svg.h:450 -msgid "Dots Transparency" -msgstr "Bodová priesvitnosť" - -#: ../share/filters/filters.svg.h:452 -msgid "Gives a pointillist HSL sensitive transparency" -msgstr "Dáva pointillistickú priesvitnosť citlivú na HSL" - -#: ../share/filters/filters.svg.h:454 -msgid "Canvas Transparency" -msgstr "Plátnová priesvitnosť" - -#: ../share/filters/filters.svg.h:456 -msgid "Gives a canvas like HSL sensitive transparency." -msgstr "Dáva priesvitnosť citlivú na HSL podobnú plátnu." - -#: ../share/filters/filters.svg.h:458 -msgid "Smear Transparency" -msgstr "Rozmazaná priesvitnosť" - -#: ../share/filters/filters.svg.h:460 -msgid "" -"Paint objects with a transparent turbulence which turns around color edges" -msgstr "" -"Vymaľovať objekty priesvitnou turbulenciou, ktorá sa zatáča okolo okrajov " -"farieb" - -#: ../share/filters/filters.svg.h:462 -msgid "Thick Paint" -msgstr "Hrubá farba" - -#: ../share/filters/filters.svg.h:464 -msgid "Thick painting effect with turbulence" -msgstr "Efekt hrubej maľby s turbulenciou" - -#: ../share/filters/filters.svg.h:466 -msgid "Burst" -msgstr "Popraskaná" - -#: ../share/filters/filters.svg.h:468 -msgid "Burst balloon texture crumpled and with holes" -msgstr "Popraskaná zmačkaná textúra s dierami" - -#: ../share/filters/filters.svg.h:470 -msgid "Embossed Leather" -msgstr "Reliéfna koža" - -#: ../share/filters/filters.svg.h:472 -msgid "" -"Combine a HSL edges detection bump with a leathery or woody and colorizable " -"texture" -msgstr "" -"Kombinácia HSL detekcie hrán s koženou alebo drevenou zafarbiteľnou textúrou" - -#: ../share/filters/filters.svg.h:474 -msgid "Carnaval" -msgstr "Karneval" - -#: ../share/filters/filters.svg.h:476 -msgid "White splotches evocating carnaval masks" -msgstr "Biele špliechance evokujúce karnevalové masky" - -#: ../share/filters/filters.svg.h:478 -msgid "Plastify" -msgstr "Plastifikovať" - -#: ../share/filters/filters.svg.h:480 -msgid "" -"HSL edges detection bump with a wavy reflective surface effect and variable " -"crumple" -msgstr "" -"Kombinácia HSL detekcie hrán s efektom vlnitého reflektívneho povrchu a " -"variabilného pokrčenia" - -#: ../share/filters/filters.svg.h:482 -msgid "Plaster" -msgstr "Sadra" - -#: ../share/filters/filters.svg.h:484 -msgid "" -"Combine a HSL edges detection bump with a matte and crumpled surface effect" -msgstr "Kombinácia HSL detekcie hrán s efektom matného a pokrčeného povrchu" - -#: ../share/filters/filters.svg.h:486 -msgid "Rough Transparency" -msgstr "Hrubá priesvitnosť" - -#: ../share/filters/filters.svg.h:488 -msgid "Adds a turbulent transparency which displaces pixels at the same time" -msgstr "Pridáva turbulentnú priesvitnosť, ktorá zároveň posúva pixle" - -#: ../share/filters/filters.svg.h:490 -msgid "Gouache" -msgstr "Kvaš" - -#: ../share/filters/filters.svg.h:492 -msgid "Partly opaque water color effect with bleed" -msgstr "Efekt čiastočne nepriesvitných vodových farieb so spadávkou" - -#: ../share/filters/filters.svg.h:494 -msgid "Alpha Engraving" -msgstr "Alfa rytina" - -#: ../share/filters/filters.svg.h:496 -msgid "Gives a transparent engraving effect with rough line and filling" -msgstr "Dáva efekt priesvitnej rytiny s hrubými obrysmi a výplňou" - -#: ../share/filters/filters.svg.h:498 -msgid "Alpha Draw Liquid" -msgstr "Alfa kresba, tekutá" - -#: ../share/filters/filters.svg.h:500 -msgid "Gives a transparent fluid drawing effect with rough line and filling" -msgstr "Dáva efekt priesvitnej tekutiny s hrubými obrysmi a výplňou" - -#: ../share/filters/filters.svg.h:502 -msgid "Liquid Drawing" -msgstr "Tekutá kresba" - -#: ../share/filters/filters.svg.h:504 -msgid "Gives a fluid and wavy expressionist drawing effect to images" -msgstr "Dáva obrázkom efekt tekutiny a vlnitej expresionistickej kresby" - -#: ../share/filters/filters.svg.h:506 -msgid "Marbled Ink" -msgstr "Mramorový atrament" - -#: ../share/filters/filters.svg.h:508 -msgid "Marbled transparency effect which conforms to image detected edges" -msgstr "" -"Efekt mramorovej priesvitnosti, ktorý zodpovedá zisteným hranám na obrázku" - -#: ../share/filters/filters.svg.h:510 -msgid "Thick Acrylic" -msgstr "Hrubá akrylová" - -#: ../share/filters/filters.svg.h:512 -msgid "Thick acrylic paint texture with high texture depth" -msgstr "Hrubá akrylová textúra kresby s vysokou hĺbkou textúry" - -#: ../share/filters/filters.svg.h:514 -msgid "Alpha Engraving B" -msgstr "Alfa rytina B" - -#: ../share/filters/filters.svg.h:516 -msgid "" -"Gives a controllable roughness engraving effect to bitmaps and materials" -msgstr "Dáva bitmapám a materiálom efekt rytiny s ovládateľnou hrubosťou" - -#: ../share/filters/filters.svg.h:518 -msgid "Lapping" -msgstr "Lapovanie" - -#: ../share/filters/filters.svg.h:520 -msgid "Something like a water noise" -msgstr "Niečo ako vodný šum" - -#: ../share/filters/filters.svg.h:522 -msgid "Monochrome Transparency" -msgstr "Jednofarebná priesvitnosť" - -#: ../share/filters/filters.svg.h:523 ../share/filters/filters.svg.h:527 -#: ../share/filters/filters.svg.h:647 ../share/filters/filters.svg.h:651 -#: ../share/filters/filters.svg.h:823 -#: ../src/extension/internal/filter/transparency.h:70 -#: ../src/extension/internal/filter/transparency.h:141 -#: ../src/extension/internal/filter/transparency.h:215 -#: ../src/extension/internal/filter/transparency.h:288 -#: ../src/extension/internal/filter/transparency.h:350 -msgid "Fill and Transparency" -msgstr "Výplň a priesvitnosť" - -#: ../share/filters/filters.svg.h:524 -msgid "Convert to a colorizable transparent positive or negative" -msgstr "Previesť na zafarbiteľný priesvitný pozitív alebo negatív" - -#: ../share/filters/filters.svg.h:526 -msgid "Saturation Map" -msgstr "Mapa sýtosti" - -#: ../share/filters/filters.svg.h:528 -msgid "" -"Creates an approximative semi-transparent and colorizable image of the " -"saturation levels" -msgstr "" -"Vytvorí aproximatívny polopriesvitný a zafarbiteľný obraz úrovní sýtosti" - -#: ../share/filters/filters.svg.h:530 -msgid "Riddled" -msgstr "Prederavený" - -#: ../share/filters/filters.svg.h:532 -msgid "Riddle the surface and add bump to images" -msgstr "Prederaviť povrch a pridať obrazu hrče" - -#: ../share/filters/filters.svg.h:534 -msgid "Wrinkled Varnish" -msgstr "Vrásčitá glazúra" - -#: ../share/filters/filters.svg.h:536 -msgid "Thick glossy and translucent paint texture with high depth" -msgstr "Hrubá lesklá a priesvitná textúra kresby s vysokou hĺbkou textúry" - -#: ../share/filters/filters.svg.h:538 -msgid "Canvas Bumps" -msgstr "Hrče plátna" - -#: ../share/filters/filters.svg.h:540 -msgid "Canvas texture with an HSL sensitive height map" -msgstr "Textúra plátna s výškovou mapou citlivou na HSL" - -#: ../share/filters/filters.svg.h:542 -msgid "Canvas Bumps Matte" -msgstr "Hrče plátna, matné" - -#: ../share/filters/filters.svg.h:544 -msgid "Same as Canvas Bumps but with a diffuse light instead of a specular one" -msgstr "Rovnaké ako Hrče plátna ale s difúznym svetlom namiesto zrkadlového" - -#: ../share/filters/filters.svg.h:546 -msgid "Canvas Bumps Alpha" -msgstr "Hrče plátna, priesvitnosť" - -#: ../share/filters/filters.svg.h:548 -msgid "Same as Canvas Bumps but with transparent highlights" -msgstr "Rovnaké ako Hrče plátna, ale s priesvitným zvýraznením" - -#: ../share/filters/filters.svg.h:550 -msgid "Bright Metal" -msgstr "Svetlý kov" - -#: ../share/filters/filters.svg.h:552 -msgid "Bright metallic effect for any color" -msgstr "Jasný kovový efekt pre ľubovoľnú farbu" - -#: ../share/filters/filters.svg.h:554 -msgid "Deep Colors Plastic" -msgstr "Plast s hlbokými farbami" - -#: ../share/filters/filters.svg.h:556 -msgid "Transparent plastic with deep colors" -msgstr "Priesvitný plast s hlbokými farbami" - -#: ../share/filters/filters.svg.h:558 -msgid "Melted Jelly Matte" -msgstr "Roztopené želé, matné" - -#: ../share/filters/filters.svg.h:560 -msgid "Matte bevel with blurred edges" -msgstr "Matné vrstvenie s rozostrenými okrajmi" - -#: ../share/filters/filters.svg.h:562 -msgid "Melted Jelly" -msgstr "Roztopené želé" - -#: ../share/filters/filters.svg.h:564 -msgid "Glossy bevel with blurred edges" -msgstr "Lesklé vrstvenie s rozostrenými okrajmi" - -#: ../share/filters/filters.svg.h:566 -msgid "Combined Lighting" -msgstr "Kombinované osvetlenie" - -#: ../share/filters/filters.svg.h:568 -#: ../src/extension/internal/filter/bevels.h:231 -msgid "Basic specular bevel to use for building textures" -msgstr "Základné zrkadlové vrstvenie na zostavovanie textúr" - -#: ../share/filters/filters.svg.h:570 -msgid "Tinfoil" -msgstr "Staniol" - -#: ../share/filters/filters.svg.h:572 -msgid "Metallic foil effect combining two lighting types and variable crumple" -msgstr "" -"Efekt kovovej fólie kombinujúci dva typy osvetlenia a variabilné pokrčenie" - -#: ../share/filters/filters.svg.h:574 -msgid "Soft Colors" -msgstr "Mäkké farby" - -#: ../share/filters/filters.svg.h:576 -msgid "Adds a colorizable edges glow inside objects and pictures" -msgstr "Pridáva dovnútra objektov a obrázkov vyfarbiteľnú žiaru" - -#: ../share/filters/filters.svg.h:578 -msgid "Relief Print" -msgstr "Reliéfny odtlačok" - -#: ../share/filters/filters.svg.h:580 -msgid "Bumps effect with a bevel, color flood and complex lighting" -msgstr "Efekt hŕč s vrstvením, vyplnením farbou a komplexným osvetlením" - -#: ../share/filters/filters.svg.h:582 -msgid "Growing Cells" -msgstr "Rastúce bunky" - -#: ../share/filters/filters.svg.h:584 -msgid "Random rounded living cells like fill" -msgstr "Vyplnenie náhodnými okrúhlymi akoby živými bunkami" - -#: ../share/filters/filters.svg.h:586 -msgid "Fluorescence" -msgstr "Fluorescencia" - -#: ../share/filters/filters.svg.h:588 -msgid "Oversaturate colors which can be fluorescent in real world" -msgstr "Presýtiť farby, ktoré môžu byť v skutočnom svete fluorescentné" - -#: ../share/filters/filters.svg.h:590 -msgid "Pixellize" -msgstr "Pixelizovať" - -#: ../share/filters/filters.svg.h:591 -msgid "Pixel tools" -msgstr "Nástroje na prácu s pixlami" - -#: ../share/filters/filters.svg.h:592 -msgid "Reduce or remove antialiasing around shapes" -msgstr "Znížiť alebo vypnúť prekladanie okolo tvarov." - -#: ../share/filters/filters.svg.h:594 -msgid "Basic Diffuse Bump" -msgstr "Základný difúzny reliéf" - -#: ../share/filters/filters.svg.h:596 -msgid "Matte emboss effect" -msgstr "Matný reliéfny efekt" - -#: ../share/filters/filters.svg.h:598 -msgid "Basic Specular Bump" -msgstr "Základné nerovnosti s odrazom" - -#: ../share/filters/filters.svg.h:600 -msgid "Specular emboss effect" -msgstr "Reliéfny efekt s odrazom" - -#: ../share/filters/filters.svg.h:602 -msgid "Basic Two Lights Bump" -msgstr "Základné nerovnosti s dvomi svetlami" - -#: ../share/filters/filters.svg.h:604 -msgid "Two types of lighting emboss effect" -msgstr "Dva typy reliéfneho efektu s osvetlením" - -#: ../share/filters/filters.svg.h:606 -msgid "Linen Canvas" -msgstr "Ľanové plátno" - -#: ../share/filters/filters.svg.h:608 ../share/filters/filters.svg.h:616 -msgid "Painting canvas emboss effect" -msgstr "Reliéfny efekt maliarskeho plátna" - -#: ../share/filters/filters.svg.h:610 -msgid "Plasticine" -msgstr "Plastelína" - -#: ../share/filters/filters.svg.h:612 -msgid "Matte modeling paste emboss effect" -msgstr "Reliéfny efekt matnej modelíny" - -#: ../share/filters/filters.svg.h:614 -msgid "Rough Canvas Painting" -msgstr "Hrubá maľba na plátno" - -#: ../share/filters/filters.svg.h:618 -msgid "Paper Bump" -msgstr "Papierový reliéf" - -#: ../share/filters/filters.svg.h:620 -msgid "Paper like emboss effect" -msgstr "Reliéfny efekt podobný papieru" - -#: ../share/filters/filters.svg.h:622 -msgid "Jelly Bump" -msgstr "Gélové nerovnosti" - -#: ../share/filters/filters.svg.h:624 -msgid "Convert pictures to thick jelly" -msgstr "Previesť obrázky na husté želé" - -#: ../share/filters/filters.svg.h:626 -msgid "Blend Opposites" -msgstr "Zmiešať protiklady" - -#: ../share/filters/filters.svg.h:628 -msgid "Blend an image with its hue opposite" -msgstr "Zmieša obrázok a jeho odtieňový opak" - -#: ../share/filters/filters.svg.h:630 -msgid "Hue to White" -msgstr "Odtieň na bielu" - -#: ../share/filters/filters.svg.h:632 -msgid "Fades hue progressively to white" -msgstr "Postupne mení odtieň do biela" - -#: ../share/filters/filters.svg.h:634 -#: ../src/extension/internal/bitmap/swirl.cpp:37 -msgid "Swirl" -msgstr "Vírenie" - -#: ../share/filters/filters.svg.h:636 -msgid "" -"Paint objects with a transparent turbulence which wraps around color edges" -msgstr "" -"Vymaľovať objekty priesvitnou turbulenciou, ktorá sa zatáča okolo okrajov " -"farieb" - -#: ../share/filters/filters.svg.h:638 -msgid "Pointillism" -msgstr "Pointillizmus" - -#: ../share/filters/filters.svg.h:640 -msgid "Gives a turbulent pointillist HSL sensitive transparency" -msgstr "Dáva turbulentnú pointillistickú priesvitnosť citlivú na HSL" - -#: ../share/filters/filters.svg.h:642 -#, fuzzy -msgid "Silhouette Marbled" -msgstr "Silueta" - -#: ../share/filters/filters.svg.h:644 -msgid "Basic noise transparency texture" -msgstr "Základná textúra šumovej priesvitnosti" - -#: ../share/filters/filters.svg.h:646 -msgid "Fill Background" -msgstr "Vyplniť pozadie" - -#: ../share/filters/filters.svg.h:648 -msgid "Adds a colorizable opaque background" -msgstr "Pridá vyfarbiteľné nepriehľadné pozadie" - -#: ../share/filters/filters.svg.h:650 -msgid "Flatten Transparency" -msgstr "Sploštiť priesvitnosť" - -#: ../share/filters/filters.svg.h:652 -msgid "Adds a white opaque background" -msgstr "Pridá biele nepriehľadné pozadie" - -#: ../share/filters/filters.svg.h:654 -#, fuzzy -msgid "Blur Double" -msgstr "Režim rozostrenia" - -#: ../share/filters/filters.svg.h:656 -msgid "" -"Overlays two copies with different blur amounts and modifiable blend and " -"composite" -msgstr "" -"Preloží dve kópie s rôznymi rozostreniami a nastaveteľným premiešaním a " -"zložením" - -#: ../share/filters/filters.svg.h:658 -msgid "Image Drawing Basic" -msgstr "Základné kreslenie obrázka" - -#: ../share/filters/filters.svg.h:660 -msgid "Enhance and redraw color edges in 1 bit black and white" -msgstr "Rozšíri a prekreslí okraje farieb 1-bitovou čiernou a bielou" - -#: ../share/filters/filters.svg.h:662 -msgid "Poster Draw" -msgstr "Posterová kresba" - -#: ../share/filters/filters.svg.h:664 -msgid "Enhance and redraw edges around posterized areas" -msgstr "Zvýrazniť a prekresliť okraje okolo posterizovaných oblastí" - -#: ../share/filters/filters.svg.h:666 -msgid "Cross Noise Poster" -msgstr "Posterizácia šumom" - -#: ../share/filters/filters.svg.h:668 -msgid "Overlay with a small scale screen like noise" -msgstr "Prekrytie s šumom podobným ako na obrazovke v malej miere" - -#: ../share/filters/filters.svg.h:670 -msgid "Cross Noise Poster B" -msgstr "Posterizácia šumom B" - -#: ../share/filters/filters.svg.h:672 -msgid "Adds a small scale screen like noise locally" -msgstr "Lokálne pridá šum podobný ako na obrazovke v malej miere" - -#: ../share/filters/filters.svg.h:674 -msgid "Poster Color Fun" -msgstr "Plagátové zafarbenie" - -#: ../share/filters/filters.svg.h:678 -msgid "Poster Rough" -msgstr "Hrubá posterizácia" - -#: ../share/filters/filters.svg.h:680 -msgid "Adds roughness to one of the two channels of the Poster paint filter" -msgstr "Pridá hrubosť do jedného z dvoch kanálov fitra „Posterová maľba“" - -#: ../share/filters/filters.svg.h:682 -msgid "Alpha Monochrome Cracked" -msgstr "Alfa monochromatický, popraskaný" - -#: ../share/filters/filters.svg.h:684 ../share/filters/filters.svg.h:688 -#: ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 -#: ../share/filters/filters.svg.h:708 ../share/filters/filters.svg.h:712 -msgid "Basic noise fill texture; adjust color in Flood" -msgstr "Základná textúra šumovej výplne; vo Vyplnení nastavte farbu" - -#: ../share/filters/filters.svg.h:686 -msgid "Alpha Turbulent" -msgstr "Alfa turbulentné" - -#: ../share/filters/filters.svg.h:690 -msgid "Colorize Turbulent" -msgstr "Vyfarbenie turbulentné" - -#: ../share/filters/filters.svg.h:694 -msgid "Cross Noise B" -msgstr "Šum B" - -#: ../share/filters/filters.svg.h:696 -msgid "Adds a small scale crossy graininess" -msgstr "Pridáva zrnitosť v malej miere" - -#: ../share/filters/filters.svg.h:698 -msgid "Cross Noise" -msgstr "Šum" - -#: ../share/filters/filters.svg.h:700 -msgid "Adds a small scale screen like graininess" -msgstr "Pridáva zrnitosť v malej miere" - -#: ../share/filters/filters.svg.h:702 -msgid "Duotone Turbulent" -msgstr "Dvojtónové turbulencie" - -#: ../share/filters/filters.svg.h:706 -msgid "Light Eraser Cracked" -msgstr "Svetlá guma, popraskaná" - -#: ../share/filters/filters.svg.h:710 -msgid "Poster Turbulent" -msgstr "Posterizácia turbulentná" - -#: ../share/filters/filters.svg.h:714 -msgid "Tartan Smart" -msgstr "Tartan" - -#: ../share/filters/filters.svg.h:716 -msgid "Highly configurable checkered tartan pattern" -msgstr "Vysoko konfigurovateľný kockovaný vzor tartan" - -#: ../share/filters/filters.svg.h:718 -msgid "Light Contour" -msgstr "Svetlé obrysy" - -#: ../share/filters/filters.svg.h:720 -msgid "Uses vertical specular light to draw lines" -msgstr "Použije vertikálne odrazené svetlo na kresbu čiar" - -#: ../share/filters/filters.svg.h:722 -msgid "Liquid" -msgstr "Tekutina" - -#: ../share/filters/filters.svg.h:724 -msgid "Colorizable filling with liquid transparency" -msgstr "Zafarbiteľná výplň s tekutou priesvitnosťou" - -#: ../share/filters/filters.svg.h:726 -msgid "Aluminium" -msgstr "Hliník" - -#: ../share/filters/filters.svg.h:728 -msgid "Aluminium effect with sharp brushed reflections" -msgstr "Efekt odrazu od ostro brúseného hliníka" - -#: ../share/filters/filters.svg.h:730 -msgid "Comics" -msgstr "Komiks" - -#: ../share/filters/filters.svg.h:732 -msgid "Comics cartoon drawing effect" -msgstr "Efekt komiksového kreslenia" - -#: ../share/filters/filters.svg.h:734 -msgid "Comics Draft" -msgstr "Komiksový náčrt" - -#: ../share/filters/filters.svg.h:736 ../share/filters/filters.svg.h:768 -msgid "Draft painted cartoon shading with a glassy look" -msgstr "Náčrt maľovaného komiksového tieňovania so skleneným vzhľadom" - -#: ../share/filters/filters.svg.h:738 -msgid "Comics Fading" -msgstr "Komiksové prelínanie" - -#: ../share/filters/filters.svg.h:740 -msgid "Cartoon paint style with some fading at the edges" -msgstr "Komiksový štýl maľby na okrajoch do stratena" - -#: ../share/filters/filters.svg.h:742 -msgid "Brushed Metal" -msgstr "Brúsený kov" - -#: ../share/filters/filters.svg.h:744 -msgid "Satiny metal surface effect" -msgstr "Efekt zamatovo brúseného kovu" - -#: ../share/filters/filters.svg.h:746 -msgid "Opaline" -msgstr "Opálový" - -#: ../share/filters/filters.svg.h:748 -msgid "Contouring version of smooth shader" -msgstr "Kontúrujúca verzia hladkého tieňovania" - -#: ../share/filters/filters.svg.h:750 -msgid "Chrome" -msgstr "Chróm" - -#: ../share/filters/filters.svg.h:752 -msgid "Bright chrome effect" -msgstr "Efekt svetlého chrómovania" - -#: ../share/filters/filters.svg.h:754 -msgid "Deep Chrome" -msgstr "Hlboké chrómovanie" - -#: ../share/filters/filters.svg.h:756 -msgid "Dark chrome effect" -msgstr "Efekt tmavého chrómovania" - -#: ../share/filters/filters.svg.h:758 -msgid "Emboss Shader" -msgstr "Reliéfne tieňovanie" - -#: ../share/filters/filters.svg.h:760 -msgid "Combination of satiny and emboss effect" -msgstr "Kombinácia efektov saténu a reliéfu" - -#: ../share/filters/filters.svg.h:762 -msgid "Sharp Metal" -msgstr "Ostrý kov" - -#: ../share/filters/filters.svg.h:764 -msgid "Chrome effect with darkened edges" -msgstr "Efekt chrómovania s tmavými hranami" - -#: ../share/filters/filters.svg.h:766 -msgid "Brush Draw" -msgstr "Kreslenie štetcom" - -#: ../share/filters/filters.svg.h:770 -msgid "Chrome Emboss" -msgstr "Chrómovaný reliéf" - -#: ../share/filters/filters.svg.h:772 -msgid "Embossed chrome effect" -msgstr "Efekt chrómovaného reliéfu" - -#: ../share/filters/filters.svg.h:774 -msgid "Contour Emboss" -msgstr "Reliéf obrysov" - -#: ../share/filters/filters.svg.h:776 -msgid "Satiny and embossed contour effect" -msgstr "Efekt vyrazeného a brúseného kovu" - -#: ../share/filters/filters.svg.h:778 -msgid "Sharp Deco" -msgstr "Ostré deco" - -#: ../share/filters/filters.svg.h:780 -msgid "Unrealistic reflections with sharp edges" -msgstr "Nerealistické odrazy s ostrými okrajmi" - -#: ../share/filters/filters.svg.h:782 -#, fuzzy -msgid "Deep Metal" -msgstr "Roztavený kov" - -#: ../share/filters/filters.svg.h:784 -msgid "Deep and dark metal shading" -msgstr "Hlboké a tmavé kovové tieňovanie" - -#: ../share/filters/filters.svg.h:786 -msgid "Aluminium Emboss" -msgstr "Hliníkový reliéf" - -#: ../share/filters/filters.svg.h:788 -msgid "Satiny aluminium effect with embossing" -msgstr "Jemne brúsený hliník s vyrazeným vzorom" - -#: ../share/filters/filters.svg.h:790 -msgid "Refractive Glass" -msgstr "Refraktívne sklo" - -#: ../share/filters/filters.svg.h:792 -msgid "Double reflection through glass with some refraction" -msgstr "Dvojitý odraz cez sklo s trochou refrakcie" - -#: ../share/filters/filters.svg.h:794 -msgid "Frosted Glass" -msgstr "Zamrznuté sklo" - -#: ../share/filters/filters.svg.h:796 -msgid "Satiny glass effect" -msgstr "Efekt hodvábneho skla" - -#: ../share/filters/filters.svg.h:798 -msgid "Bump Engraving" -msgstr "Rytina" - -#: ../share/filters/filters.svg.h:800 -msgid "Carving emboss effect" -msgstr "Efekt vystúpenej rezby" - -#: ../share/filters/filters.svg.h:802 -msgid "Chromolitho Alternate" -msgstr "Chromolitografia, alternatívna" - -#: ../share/filters/filters.svg.h:804 -msgid "Old chromolithographic effect" -msgstr "Efekt starej chromolitografie" - -#: ../share/filters/filters.svg.h:806 -#, fuzzy -msgid "Convoluted Bump" -msgstr "Pokrútený bump" - -#: ../share/filters/filters.svg.h:808 -msgid "Convoluted emboss effect" -msgstr "Pokrútený efekt vystúpenia" - -#: ../share/filters/filters.svg.h:810 -msgid "Emergence" -msgstr "Vznik" - -#: ../share/filters/filters.svg.h:812 -msgid "Cut out, add inner shadow and colorize some parts of an image" -msgstr "Vystrihnúť, pridať vnútorný tieň a zafarbiť niektoré časti obrázka" - -#: ../share/filters/filters.svg.h:814 -msgid "Litho" -msgstr "Lito" - -#: ../share/filters/filters.svg.h:816 -msgid "Create a two colors lithographic effect" -msgstr "Vytvoriť dvojfarebný litografický efekt" - -#: ../share/filters/filters.svg.h:818 -msgid "Paint Channels" -msgstr "Vymaľovať farebné kanály" - -#: ../share/filters/filters.svg.h:820 -msgid "Colorize separately the three color channels" -msgstr "Oddelené vyfarbenie troch farebných kanálov" - -#: ../share/filters/filters.svg.h:822 -msgid "Posterized Light Eraser" -msgstr "Posterizovaná svetlá guma" - -#: ../share/filters/filters.svg.h:824 -msgid "Create a semi transparent posterized image" -msgstr "Vytvoriť priesvitný posterizovaný obraz" - -#: ../share/filters/filters.svg.h:826 -msgid "Trichrome" -msgstr "Trojfarebnosť" - -#: ../share/filters/filters.svg.h:828 -msgid "Like Duochrome but with three colors" -msgstr "Ako dvojtónové, ale s tromi farbami" - -#: ../share/filters/filters.svg.h:830 -msgid "Simulate CMY" -msgstr "Simulovať CMY" - -#: ../share/filters/filters.svg.h:832 -msgid "Render Cyan, Magenta and Yellow channels with a colorizable background" -msgstr "" -"Vykreslenie azúrového, purpurového a žltého kanálu s vyfarbiteľným pozadím" - -#: ../share/filters/filters.svg.h:834 -#, fuzzy -msgid "Contouring table" -msgstr "Diskrétne obrysy" - -#: ../share/filters/filters.svg.h:836 -msgid "Blurred multiple contours for objects" -msgstr "Rozostrené viacnásobné obrysy objektov" - -#: ../share/filters/filters.svg.h:838 -msgid "Posterized Blur" -msgstr "Posterizované rozostrenie" - -#: ../share/filters/filters.svg.h:840 -msgid "Converts blurred contour to posterized steps" -msgstr "Prevádza rozostrené obrysy na posterizované kroky" - -#: ../share/filters/filters.svg.h:842 -msgid "Contouring discrete" -msgstr "Diskrétne obrysy" - -#: ../share/filters/filters.svg.h:844 -msgid "Sharp multiple contour for objects" -msgstr "Ostré viacnásobné obrysy objektov" - #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:2 msgctxt "Palette" @@ -2376,19 +411,19 @@ msgstr "plátno (#FAF0E6)" #: ../share/palettes/palettes.h:61 msgctxt "Palette" msgid "bisque (#FFE4C4)" -msgstr "čistý porcelán (#FFE4C4)" +msgstr "čistý porcelán" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:62 msgctxt "Palette" msgid "darkorange (#FF8C00)" -msgstr "tmavooranžová (#FF8C00)" +msgstr "tmavooranžová" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:63 msgctxt "Palette" msgid "burlywood (#DEB887)" -msgstr "drevená hnedá (#DEB887)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:64 @@ -2418,7 +453,7 @@ msgstr "mandľová biela (#FFEBCD)" #: ../share/palettes/palettes.h:68 msgctxt "Palette" msgid "papayawhip (#FFEFD5)" -msgstr "papájový krém (#FFEFD5)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:69 @@ -2736,13 +771,13 @@ msgstr "tmavotyrkysová (#00CED1)" #: ../share/palettes/palettes.h:121 msgctxt "Palette" msgid "cadetblue (#5F9EA0)" -msgstr "červenomodrá (#5F9EA0)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:122 msgctxt "Palette" msgid "powderblue (#B0E0E6)" -msgstr "prášková modrá (#B0E0E6)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:123 @@ -2754,19 +789,19 @@ msgstr "bledomodrá (#ADD8E6)" #: ../share/palettes/palettes.h:124 msgctxt "Palette" msgid "deepskyblue (#00BFFF)" -msgstr "hlboká modrá obloha (#00BFFF)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:125 msgctxt "Palette" msgid "skyblue (#87CEEB)" -msgstr "modrá obloha (#87CEEB)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:126 msgctxt "Palette" msgid "lightskyblue (#87CEFA)" -msgstr "svetlá modrá obloha (#87CEFA)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:127 @@ -2778,13 +813,13 @@ msgstr "oceľovomodrá (#4682B4)" #: ../share/palettes/palettes.h:128 msgctxt "Palette" msgid "aliceblue (#F0F8FF)" -msgstr "modrá (alice) (#F0F8FF)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:129 msgctxt "Palette" msgid "dodgerblue (#1E90FF)" -msgstr "modrá (dodger) (#1E90FF)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:130 @@ -2856,7 +891,7 @@ msgstr "modrá (#0000FF)" #: ../share/palettes/palettes.h:141 msgctxt "Palette" msgid "ghostwhite (#F8F8FF)" -msgstr "biela (ghost white) (#F8F8FF)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:142 @@ -2886,7 +921,7 @@ msgstr "stredne fialová (#9370DB)" #: ../share/palettes/palettes.h:146 msgctxt "Palette" msgid "blueviolet (#8A2BE2)" -msgstr "modrofialová (#8A2BE2)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:147 @@ -2898,25 +933,25 @@ msgstr "indigová (#4B0082)" #: ../share/palettes/palettes.h:148 msgctxt "Palette" msgid "darkorchid (#9932CC)" -msgstr "tmavá orchidea (#9932CC)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:149 msgctxt "Palette" msgid "darkviolet (#9400D3)" -msgstr "tmavofialová (#9400D3)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:150 msgctxt "Palette" msgid "mediumorchid (#BA55D3)" -msgstr "stredná orchideová (#BA55D3)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:151 msgctxt "Palette" msgid "thistle (#D8BFD8)" -msgstr "bodliaková (#D8BFD8)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:152 @@ -2940,49 +975,49 @@ msgstr "purpurová (#800080)" #: ../share/palettes/palettes.h:155 msgctxt "Palette" msgid "darkmagenta (#8B008B)" -msgstr "tmavá purpurová (#8B008B)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:156 msgctxt "Palette" msgid "magenta (#FF00FF)" -msgstr "purpurová (#FF00FF)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:157 msgctxt "Palette" msgid "orchid (#DA70D6)" -msgstr "orchideová (#DA70D6)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:158 msgctxt "Palette" msgid "mediumvioletred (#C71585)" -msgstr "stredne fialovočervená (#C71585)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:159 msgctxt "Palette" msgid "deeppink (#FF1493)" -msgstr "hlboká ružová (#FF1493)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:160 msgctxt "Palette" msgid "hotpink (#FF69B4)" -msgstr "horúca ružová (#FF69B4)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:161 msgctxt "Palette" msgid "lavenderblush (#FFF0F5)" -msgstr "rumencová levanduľa (#FFF0F5)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:162 msgctxt "Palette" msgid "palevioletred (#DB7093)" -msgstr "bledá fialovočervená (#DB7093)" +msgstr "" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:163 @@ -3138,7 +1173,7 @@ msgstr "Šarlátovočervená 3" #: ../share/palettes/palettes.h:188 msgctxt "Palette" msgid "Snowy White" -msgstr "Snehovobiela" +msgstr "Snehovo biela" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:189 @@ -3180,171 +1215,7 @@ msgstr "Hliník 6" #: ../share/palettes/palettes.h:195 msgctxt "Palette" msgid "Jet Black" -msgstr "Uhľovočierna" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:1" -msgstr "Prúžky 1:1" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:1 white" -msgstr "Prúžky 1:1 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:1.5" -msgstr "Prúžky 1:1.5" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:1.5 white" -msgstr "Prúžky 1:1.5 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:2" -msgstr "Prúžky 1:2" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:2 white" -msgstr "Prúžky 1:2 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:3" -msgstr "Prúžky 1:3" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:3 white" -msgstr "Prúžky 1:3 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:4" -msgstr "Prúžky 1:4" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:4 white" -msgstr "Prúžky 1:4 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:5" -msgstr "Prúžky 1:5" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:5 white" -msgstr "Prúžky 1:5 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:8" -msgstr "Prúžky 1:8" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:8 white" -msgstr "Prúžky 1:8 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:10" -msgstr "Prúžky 1:10" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:10 white" -msgstr "Prúžky 1:10 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:16" -msgstr "Prúžky 1:16" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:16 white" -msgstr "Prúžky 1:16 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:32" -msgstr "Prúžky 1:32" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:32 white" -msgstr "Prúžky 1:32 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 1:64" -msgstr "Prúžky 1:64" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 2:1" -msgstr "Prúžky 2:1" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 2:1 white" -msgstr "Prúžky 2:1 biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 4:1" -msgstr "Prúžky 4:1" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Stripes 4:1 white" -msgstr "Prúžky 4:1 bielewhite" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Checkerboard" -msgstr "Šachovnica" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Checkerboard white" -msgstr "Šachovnica biela" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Packed circles" -msgstr "Výplň kružnicami" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Polka dots, small" -msgstr "Polka, malé bodky" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Polka dots, small white" -msgstr "Polka, malé biele bodky" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Polka dots, medium" -msgstr "Polka, stredné bodky" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Polka dots, medium white" -msgstr "Polka, stredné biele bodky" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Polka dots, large" -msgstr "Polka, veľké bodky" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Polka dots, large white" -msgstr "Polka, veľké biele bodky" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Wavy" -msgstr "Vlnité" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Wavy white" -msgstr "Vlnité biele" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Camouflage" -msgstr "Kamufláž" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Ermine" -msgstr "Hermelín" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Sand (bitmap)" -msgstr "Piesok (bitmapa)" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Cloth (bitmap)" -msgstr "Látka (bitmapa)" - -#: ../share/patterns/patterns.svg.h:1 -msgid "Old paint (bitmap)" -msgstr "Stará farba (bitmapa)" +msgstr "Tryskovo čierna" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:2 @@ -3353,9 +1224,7 @@ msgid "AIGA Symbol Signs" msgstr "Symboly AIGA" #. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 -#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 msgctxt "Symbol" msgid "Telephone" msgstr "Telefón" @@ -3385,9 +1254,7 @@ msgid "Cashier" msgstr "Pokladňa" #. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 -#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 msgctxt "Symbol" msgid "First Aid" msgstr "Prvá pomoc" @@ -3420,13 +1287,13 @@ msgstr "Eskalátor" #: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 msgctxt "Symbol" msgid "Escalator Down" -msgstr "Eskalátor dolu" +msgstr "Eskalátor - dolu" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 msgctxt "Symbol" msgid "Escalator Up" -msgstr "Eskalátor hore" +msgstr "Eskalátor - hore" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 @@ -3438,13 +1305,13 @@ msgstr "Schody" #: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 msgctxt "Symbol" msgid "Stairs Down" -msgstr "Schody dolu" +msgstr "Schody - dolu" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 msgctxt "Symbol" msgid "Stairs Up" -msgstr "Schody hore" +msgstr "Schody - hore" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 @@ -3471,7 +1338,9 @@ msgid "Toilets" msgstr "Toalety" #. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 +#: ../share/symbols/symbols.h:227 msgctxt "Symbol" msgid "Nursery" msgstr "Škôlka" @@ -3489,9 +1358,9 @@ msgid "Waiting Room" msgstr "Čakáreň" #. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 -#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 +#: ../share/symbols/symbols.h:308 msgctxt "Symbol" msgid "Information" msgstr "Informácie" @@ -3509,13 +1378,17 @@ msgid "Air Transportation" msgstr "Letecká doprava" #. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 +#: ../share/symbols/symbols.h:318 msgctxt "Symbol" msgid "Heliport" msgstr "Heliport" #. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 +#: ../share/symbols/symbols.h:314 msgctxt "Symbol" msgid "Taxi" msgstr "Taxi" @@ -3545,13 +1418,17 @@ msgid "Water Transportation" msgstr "Lodná doprava" #. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 +#: ../share/symbols/symbols.h:316 msgctxt "Symbol" msgid "Car Rental" msgstr "Požičovňa áut" #. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 +#: ../share/symbols/symbols.h:228 msgctxt "Symbol" msgid "Restaurant" msgstr "Reštaurácia" @@ -3578,13 +1455,13 @@ msgstr "Obchody" #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 msgctxt "Symbol" msgid "Barber Shop - Beauty Salon" -msgstr "Holičský salón - kozmetika" +msgstr "Kaderníctvo - kozmetika" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 msgctxt "Symbol" msgid "Barber Shop" -msgstr "Holičstvo" +msgstr "Kaderníctvo" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 @@ -3602,7 +1479,7 @@ msgstr "Predaj lístkov" #: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 msgctxt "Symbol" msgid "Baggage Check In" -msgstr "Odovzdanie batožiny" +msgstr "Príjem batožiny" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 @@ -3620,7 +1497,7 @@ msgstr "Clo" #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 msgctxt "Symbol" msgid "Immigration" -msgstr "Prisťahovalectvo" +msgstr "Imigrácia" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 @@ -3647,12 +1524,12 @@ msgid "No Smoking" msgstr "Zákaz fajčenia" #. Symbols: ./AigaSymbols.svg -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 -#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 +#: ../share/symbols/symbols.h:325 msgctxt "Symbol" msgid "Parking" -msgstr "" +msgstr "Parkovanie" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 @@ -3664,7 +1541,7 @@ msgstr "Zákaz parkovania" #: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 msgctxt "Symbol" msgid "No Dogs" -msgstr "Zákaz psov" +msgstr "Zákaz vstupu psov" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 @@ -3673,7 +1550,9 @@ msgid "No Entry" msgstr "Zákaz vstupu" #. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 +#: ../share/symbols/symbols.h:218 msgctxt "Symbol" msgid "Exit" msgstr "Východ" @@ -3694,19 +1573,19 @@ msgstr "Šípka vpravo" #: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 msgctxt "Symbol" msgid "Forward and Right Arrow" -msgstr "Šípka dopredu a vpravo" +msgstr "Šípka vpred a vpravo" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 msgctxt "Symbol" msgid "Up Arrow" -msgstr "Šípka hore" +msgstr "Šípka nahor" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 msgctxt "Symbol" msgid "Forward and Left Arrow" -msgstr "Šípka dopredu a vľavo" +msgstr "Šípka vpred a vľavo" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 @@ -3718,19 +1597,19 @@ msgstr "Šípka vľavo" #: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 msgctxt "Symbol" msgid "Left and Down Arrow" -msgstr "Šípka vľavo a dolu" +msgstr "Šípka vľavo a nadol" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 msgctxt "Symbol" msgid "Down Arrow" -msgstr "Šípka dolu" +msgstr "Šípka nadol" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 msgctxt "Symbol" msgid "Right and Down Arrow" -msgstr "Šípka vpravo a dolu" +msgstr "Šípka vpravo a nadol" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 @@ -3760,7 +1639,7 @@ msgstr "Slovné bubliny" #: ../share/symbols/symbols.h:134 msgctxt "Symbol" msgid "Thought Balloon" -msgstr "Myšlienková bublina" +msgstr "Myšlienkové bubliny" #. Symbols: ./BalloonSymbols.svg #: ../share/symbols/symbols.h:135 @@ -3778,13 +1657,13 @@ msgstr "Zaoblená bublina" #: ../share/symbols/symbols.h:137 msgctxt "Symbol" msgid "Squared Balloon" -msgstr "Hranatá bublina" +msgstr "Obdĺžniková bublina" #. Symbols: ./BalloonSymbols.svg #: ../share/symbols/symbols.h:138 msgctxt "Symbol" msgid "Over the Phone" -msgstr "Cez telefón" +msgstr "Telefonicky" #. Symbols: ./BalloonSymbols.svg #: ../share/symbols/symbols.h:139 @@ -3796,7 +1675,7 @@ msgstr "Hip bublina" #: ../share/symbols/symbols.h:140 msgctxt "Symbol" msgid "Circle Balloon" -msgstr "Elipsová bublina" +msgstr "Kružnicová bublina" #. Symbols: ./BalloonSymbols.svg #: ../share/symbols/symbols.h:141 @@ -3808,7 +1687,7 @@ msgstr "Bublina zvolania" #: ../share/symbols/symbols.h:142 msgctxt "Symbol" msgid "Flow Chart Shapes" -msgstr "Tvary vývojových diagramov" +msgstr "Zložky vývojových diagramov" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:143 @@ -3922,13 +1801,13 @@ msgstr "Zoradenie" #: ../share/symbols/symbols.h:161 msgctxt "Symbol" msgid "Connector" -msgstr "Spojnica" +msgstr "Konektor" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:162 msgctxt "Symbol" msgid "Off-Page Connector" -msgstr "Spojnica mimo strany" +msgstr "Spojenie mimo strany" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:163 @@ -3946,7 +1825,7 @@ msgstr "Komunikačné spojenie" #: ../share/symbols/symbols.h:165 msgctxt "Symbol" msgid "Collate" -msgstr "Usporiadanie" +msgstr "Usporiadať" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:166 @@ -3976,7 +1855,7 @@ msgstr "Magnetický disk (databáza)" #: ../share/symbols/symbols.h:170 msgctxt "Symbol" msgid "Magnetic Drum (Direct Access)" -msgstr "Magnetické bubon (priamy prístup)" +msgstr "Magnetický bubon (priamy prístup)" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:171 @@ -4060,7 +1939,7 @@ msgstr "Hradlo AND" #: ../share/symbols/symbols.h:184 msgctxt "Symbol" msgid "Buffer" -msgstr "Medzipamäť" +msgstr "Buffer" #. Symbols: ./LogicSymbols.svg #: ../share/symbols/symbols.h:185 @@ -4072,319 +1951,1097 @@ msgstr "Hradlo NOT" #: ../share/symbols/symbols.h:186 msgctxt "Symbol" msgid "Buffer Small" -msgstr "Medzipamäť (malá)" +msgstr "Malý buffer" #. Symbols: ./LogicSymbols.svg #: ../share/symbols/symbols.h:187 msgctxt "Symbol" msgid "Not Gate Small" -msgstr "Hradlo NOT (malé)" +msgstr "Malé hradlo NOT" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:188 msgctxt "Symbol" -msgid "United States National Park Service Map Symbols" -msgstr "Symbol mapy Služba národných parkov USA" +msgid "Map Symbols" +msgstr "Symboly na mape" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:189 msgctxt "Symbol" -msgid "Airport" -msgstr "Letisko" +msgid "Bed and Breakfast" +msgstr "Bed and Breakfast" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:190 msgctxt "Symbol" -msgid "Amphitheatre" -msgstr "Amfiteáter" +msgid "Youth Hostel" +msgstr "Hostel pre mládež" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:191 msgctxt "Symbol" -msgid "Bicycle Trail" -msgstr "Cyklotrasa" +msgid "Shelter" +msgstr "Prístrešie" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:192 msgctxt "Symbol" -msgid "Boat Launch" -msgstr "Spustenie člnu na vodu" +msgid "Motel" +msgstr "Motel" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:193 msgctxt "Symbol" -msgid "Boat Tour" -msgstr "Výlet loďou" +msgid "Hotel" +msgstr "Hotel" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:194 msgctxt "Symbol" -msgid "Bus Stop" -msgstr "Autobusová zastávka" +msgid "Hostel" +msgstr "Hostel" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:195 msgctxt "Symbol" -msgid "Campfire" -msgstr "Táborák" +msgid "Chalet" +msgstr "Chata alpského typu" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:196 msgctxt "Symbol" -msgid "Campground" -msgstr "Táborisko" +msgid "Caravan Park" +msgstr "Parkovanie karavanov" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:197 msgctxt "Symbol" -msgid "CanoeAccess" -msgstr "Prístup pre kánoe" +msgid "Camping" +msgstr "Kemping" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:198 msgctxt "Symbol" -msgid "Crosscountry Ski Trail" -msgstr "Bežkárska trasa" +msgid "Alpine Hut" +msgstr "Horská chata" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:199 msgctxt "Symbol" -msgid "Downhill Skiing" -msgstr "Zjazdové lyžovanie" +msgid "Bench or Park" +msgstr "Lavička alebo park" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:200 msgctxt "Symbol" -msgid "Drinking Water" -msgstr "Pitná voda" +msgid "Playground" +msgstr "Detské ihrisko" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:201 msgctxt "Symbol" -msgid "Fishing" -msgstr "Rybolov" +msgid "Fountain" +msgstr "Fontána" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:202 msgctxt "Symbol" -msgid "Food Service" -msgstr "Stravovacie služby" +msgid "Library" +msgstr "Knižnica" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:203 msgctxt "Symbol" -msgid "Four Wheel Drive Road" -msgstr "Cesta pre štvorkolky" +msgid "Town Hall" +msgstr "Radnica" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:204 msgctxt "Symbol" -msgid "Gas Station" -msgstr "Čerpacia stanica" +msgid "Court" +msgstr "Súd" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:205 msgctxt "Symbol" -msgid "Golfing" -msgstr "Golf" +msgid "Fire Station / House" +msgstr "Požiarna stanica" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:206 +msgctxt "Symbol" +msgid "Police Station" +msgstr "Policajná stanica" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:207 +msgctxt "Symbol" +msgid "Prison" +msgstr "Väznica" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:208 +msgctxt "Symbol" +msgid "Post Office" +msgstr "Pošta" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:209 +msgctxt "Symbol" +msgid "Public Building" +msgstr "Verejná budova" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:210 +msgctxt "Symbol" +msgid "Recycling" +msgstr "Recyklovanie" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:211 +msgctxt "Symbol" +msgid "Survey Point" +msgstr "Výhľad" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:212 +msgctxt "Symbol" +msgid "Toll Booth" +msgstr "Mýtna búdka" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:213 +msgctxt "Symbol" +msgid "Lift Gate" +msgstr "Zdvíhacie vráta" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:214 +msgctxt "Symbol" +msgid "Steps" +msgstr "Kroky" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:215 +msgctxt "Symbol" +msgid "Stile" +msgstr "Turniket" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:216 +msgctxt "Symbol" +msgid "Kissing Gate" +msgstr "Bozkávacia brána" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:217 +msgctxt "Symbol" +msgid "Gate" +msgstr "Brána" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:219 +msgctxt "Symbol" +msgid "Entrance" +msgstr "Vchod" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:220 +msgctxt "Symbol" +msgid "Cycle Barrier" +msgstr "Bariéra proti cyklistom" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:221 +msgctxt "Symbol" +msgid "Cattle Grid" +msgstr "Mriežka proti pohybu dobytka" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:222 +msgctxt "Symbol" +msgid "Bollard" +msgstr "Piloty" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:223 +msgctxt "Symbol" +msgid "University" +msgstr "Univerzita" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:224 +msgctxt "Symbol" +msgid "High/Secondary School" +msgstr "Stredná škola" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:225 +msgctxt "Symbol" +msgid "School" +msgstr "Škola" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:226 +msgctxt "Symbol" +msgid "Kindergarten" +msgstr "Materská škola" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:229 +msgctxt "Symbol" +msgid "Pub" +msgstr "Krčma" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:230 +msgctxt "Symbol" +msgid "Desserts/Cakes Shop" +msgstr "Cukrovinky" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:231 +msgctxt "Symbol" +msgid "Fast Food" +msgstr "Fast food" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:232 +msgctxt "Symbol" +msgid "Public Tap/Water" +msgstr "Verejná studňa/kohútik" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:233 +msgctxt "Symbol" +msgid "Cafe" +msgstr "Kaviareň" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:234 +msgctxt "Symbol" +msgid "Beer Garden" +msgstr "Pivná záhradka" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:235 +msgctxt "Symbol" +msgid "Wine Bar" +msgstr "Vináreň" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:236 +msgctxt "Symbol" +msgid "Opticians/Eye Doctors" +msgstr "Optika/očný lekár" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:237 +msgctxt "Symbol" +msgid "Dentist" +msgstr "Zubár" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:238 +msgctxt "Symbol" +msgid "Veterinarian" +msgstr "Veterinárny lekár" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:239 +msgctxt "Symbol" +msgid "Drugs Dispensary" +msgstr "Výdaj liekov" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:240 +msgctxt "Symbol" +msgid "Pharmacy" +msgstr "Lekáreň" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:241 msgctxt "Symbol" -msgid "Horseback Riding" -msgstr "Jazda na koni" +msgid "Accident & Emergency" +msgstr "Úrazy a pohotovosť" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:242 msgctxt "Symbol" msgid "Hospital" msgstr "Nemocnica" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:243 msgctxt "Symbol" -msgid "Ice Skating" -msgstr "Korčuľovanie" +msgid "Doctors" +msgstr "Lekári" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:244 msgctxt "Symbol" -msgid "Litter Receptacle" -msgstr "Nádoba na odpad" +msgid "Scrub Land" +msgstr "Scrub" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:245 msgctxt "Symbol" -msgid "Lodging" -msgstr "Ubytovanie" +msgid "Swamp" +msgstr "Močiar" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:246 msgctxt "Symbol" -msgid "Marina" -msgstr "Prístav" +msgid "Hills" +msgstr "Kopce" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:247 msgctxt "Symbol" -msgid "Motorbike Trail" -msgstr "Cesta pre motorky" +msgid "Grass Land" +msgstr "Trávnatá krajina" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:248 msgctxt "Symbol" -msgid "Radiator Water" -msgstr "Voda do chladiča" +msgid "Deciduous Forest" +msgstr "Listnatý les" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:249 msgctxt "Symbol" -msgid "Recycling" -msgstr "Recyklácia" +msgid "Mixed Forest" +msgstr "Zmiešaný les" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:250 msgctxt "Symbol" -msgid "Pets On Leash" -msgstr "Zvieratá na vodítku" +msgid "Coniferous Forest" +msgstr "Ihličnatý les" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:251 msgctxt "Symbol" -msgid "Picnic Area" -msgstr "Piknik" +msgid "Church or Place of Worship" +msgstr "Kostol alebo miesto uctievania" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:252 msgctxt "Symbol" -msgid "Post Office" -msgstr "Pošta" +msgid "Bank" +msgstr "Banka" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:253 msgctxt "Symbol" -msgid "Ranger Station" -msgstr "Chata horskej služby" +msgid "Power Lines" +msgstr "Elektrické vedenie" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:254 msgctxt "Symbol" -msgid "RV Campground" -msgstr "Kemping rekreačných vozidiel" +msgid "Watch Tower" +msgstr "Rozhľadňa" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:255 msgctxt "Symbol" -msgid "Restrooms" -msgstr "Toalety" +msgid "Transmitter" +msgstr "Vysielač" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:256 msgctxt "Symbol" -msgid "Sailing" -msgstr "Plachtenie" +msgid "Village" +msgstr "Dedina" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:257 msgctxt "Symbol" -msgid "Sanitary Disposal Station" -msgstr "Stanica sanitárnej likvidácie" +msgid "Town" +msgstr "Mesto" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:258 msgctxt "Symbol" -msgid "Scuba Diving" -msgstr "Potápanie" +msgid "Hamlet" +msgstr "Samota" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:259 msgctxt "Symbol" -msgid "Self Guided Trail" -msgstr "Chodník bez sprievodcu" +msgid "City" +msgstr "Mesto" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:260 msgctxt "Symbol" -msgid "Shelter" -msgstr "Prístrešok" +msgid "Peak" +msgstr "Vrchol" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:261 +msgctxt "Symbol" +msgid "Mountain Pass" +msgstr "Horské sedlo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:262 msgctxt "Symbol" -msgid "Showers" -msgstr "Sprchy" +msgid "Mine" +msgstr "Baňa" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:263 msgctxt "Symbol" -msgid "Sledding" -msgstr "Sánkovanie" +msgid "Military Complex" +msgstr "Vojenská základňa" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:264 msgctxt "Symbol" -msgid "SnowmobileTrail" -msgstr "Trasa pre snežné skútre" +msgid "Embassy" +msgstr "Veľvyslanectvo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:265 msgctxt "Symbol" -msgid "Stable" -msgstr "Stajne" +msgid "Toy Shop" +msgstr "Hračkárstvo" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:266 msgctxt "Symbol" -msgid "Store" +msgid "Supermarket" +msgstr "Supermarket" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:267 +msgctxt "Symbol" +msgid "Jewlers" +msgstr "Klenotníctvo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:268 +msgctxt "Symbol" +msgid "Hairdressers" +msgstr "Kaderníctvo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:269 +msgctxt "Symbol" +msgid "Greengrocer" +msgstr "Zelenina" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:270 +msgctxt "Symbol" +msgid "Gift Shop" +msgstr "Suveníry" + +# TODO: check +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:271 +msgctxt "Symbol" +msgid "Garden Center" +msgstr "Záhradkárske potreby" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:272 +msgctxt "Symbol" +msgid "Florist" +msgstr "Kvetinárstvo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:273 +msgctxt "Symbol" +msgid "Fish Monger" +msgstr "Predajňa rýb" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:274 +msgctxt "Symbol" +msgid "Real Estate" +msgstr "Realitná kancelária" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:275 +msgctxt "Symbol" +msgid "Hardware / DIY" +msgstr "Železiarstvo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:276 +msgctxt "Symbol" +msgid "Shop" msgstr "Obchod" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:277 +msgctxt "Symbol" +msgid "Confectioner" +msgstr "Cukráreň" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:278 +msgctxt "Symbol" +msgid "Computer Shop" +msgstr "Obchod s výpočtovou technikou" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:279 msgctxt "Symbol" -msgid "Swimming" -msgstr "Plávanie" +msgid "Clothing" +msgstr "Oblečenie" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:280 msgctxt "Symbol" -msgid "Emergency Telephone" -msgstr "Núdzový telefón" +msgid "Mechanic" +msgstr "Mechanik" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:281 msgctxt "Symbol" -msgid "Trailhead" -msgstr "Začiatok trasy" +msgid "Car Dealer" +msgstr "Predajňa áut" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:282 msgctxt "Symbol" -msgid "Wheelchair Accessible" -msgstr "Bezbariérový prístup" +msgid "Butcher" +msgstr "Mäsiar" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290 +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:283 +msgctxt "Symbol" +msgid "Meat Shop" +msgstr "Mäsiarstvo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:284 +msgctxt "Symbol" +msgid "Bicycle Shop" +msgstr "Predajňa bicyklov" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:285 +msgctxt "Symbol" +msgid "Baker" +msgstr "Pekáreň" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:286 +msgctxt "Symbol" +msgid "Off License / Liquor Store" +msgstr "Obchod s liehovinami" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:287 msgctxt "Symbol" msgid "Wind Surfing" msgstr "Windsurfing" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:288 +msgctxt "Symbol" +msgid "Tennis" +msgstr "Tenis" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:289 +msgctxt "Symbol" +msgid "Outdoor Pool" +msgstr "Vonkajší bazén" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:290 +msgctxt "Symbol" +msgid "Indoor Pool" +msgstr "Krytý bazén" + +#. Symbols: ./MapSymbols.svg #: ../share/symbols/symbols.h:291 msgctxt "Symbol" -msgid "Blank" -msgstr "Prázdne" +msgid "Skiing" +msgstr "Lyžovanie" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:292 +msgctxt "Symbol" +msgid "Sailing" +msgstr "Plachtenie" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:293 +msgctxt "Symbol" +msgid "Leisure Center" +msgstr "Centrum voľného času" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:294 +msgctxt "Symbol" +msgid "Ice Skating" +msgstr "Korčuľovanie" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:295 +msgctxt "Symbol" +msgid "Equine Sports" +msgstr "Konské športy" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:296 +msgctxt "Symbol" +msgid "Rock Climbing" +msgstr "Horolezectvo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:297 +msgctxt "Symbol" +msgid "Gym" +msgstr "Telocvičňa" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:298 +msgctxt "Symbol" +msgid "Golf" +msgstr "Golf" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:299 +msgctxt "Symbol" +msgid "Diving" +msgstr "Potápanie" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:300 +msgctxt "Symbol" +msgid "Archery" +msgstr "Lukostreľba" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:301 +msgctxt "Symbol" +msgid "Zoo" +msgstr "Zoo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:302 +msgctxt "Symbol" +msgid "Wreck" +msgstr "Vrak" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:303 +#, fuzzy +msgctxt "Symbol" +msgid "Water Wheel" +msgstr "Vodné koleso" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:304 +msgctxt "Symbol" +msgid "Point of Interest" +msgstr "Bod záujmu" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:305 +msgctxt "Symbol" +msgid "Theater" +msgstr "Divadlo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:306 +msgctxt "Symbol" +msgid "Park / Picnic Area" +msgstr "Park / Oblasť na piknik" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:307 +msgctxt "Symbol" +msgid "Monument" +msgstr "Pamätihodnosť" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:309 +msgctxt "Symbol" +msgid "Beach" +msgstr "Pláž" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:310 +msgctxt "Symbol" +msgid "Battle Location" +msgstr "Miesto konania bitky" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:311 +msgctxt "Symbol" +msgid "Archaeology / Ruins" +msgstr "Archeológia / zrúcaniny" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:312 +msgctxt "Symbol" +msgid "Walking" +msgstr "Chôdza" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:313 +msgctxt "Symbol" +msgid "Train" +msgstr "Vlak" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:315 +msgctxt "Symbol" +msgid "Underground Rail" +msgstr "Podzemná železnica" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:317 +msgctxt "Symbol" +msgid "Bike Rental" +msgstr "Požičovňa bicyklov" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:319 +msgctxt "Symbol" +msgid "Carpool" +msgstr "Spolujazda" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:320 +msgctxt "Symbol" +msgid "Flood Gate" +msgstr "Stavidlo" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:321 +msgctxt "Symbol" +msgid "Shipping" +msgstr "Preprava" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:322 +msgctxt "Symbol" +msgid "Disabled Parking" +msgstr "Parkovanie pre hendikepovaných" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:323 +msgctxt "Symbol" +msgid "Paid Parking" +msgstr "Platené parkovanie" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:324 +msgctxt "Symbol" +msgid "Bike Parking" +msgstr "Parkovanie bicyklov" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:326 +msgctxt "Symbol" +msgid "Marina" +msgstr "Prístav" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:327 +msgctxt "Symbol" +msgid "Fuel Station" +msgstr "Čerpacia stanica" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:328 +msgctxt "Symbol" +msgid "Bus Stop" +msgstr "Autobusová zastávka" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:329 +msgctxt "Symbol" +msgid "Bus Station" +msgstr "Autobusová stanica" + +#. Symbols: ./MapSymbols.svg +#: ../share/symbols/symbols.h:330 +msgctxt "Symbol" +msgid "Airport" +msgstr "Letisko" #: ../share/templates/templates.h:1 -msgid "CD Label 120mmx120mm " -msgstr "" +msgid "A4 Landscape Page" +msgstr "Stránka A4 na šírku" + +#: ../share/templates/templates.h:1 +msgid "Empty A4 landscape sheet" +msgstr "Prázdny list A4 na šírku" + +#: ../share/templates/templates.h:1 +msgid "A4 paper sheet empty landscape" +msgstr "Prázdny list papiera A4 na šírku" + +#: ../share/templates/templates.h:1 +msgid "A4 Page" +msgstr "Stránka A4" + +#: ../share/templates/templates.h:1 +msgid "Empty A4 sheet" +msgstr "Prázdny list A4" + +#: ../share/templates/templates.h:1 +msgid "A4 paper sheet empty" +msgstr "Prázdny list papiera A4" + +#: ../share/templates/templates.h:1 +msgid "Black Opaque" +msgstr "Čierny matný" + +#: ../share/templates/templates.h:1 +msgid "Empty black page" +msgstr "Prázdna čierna stránka" + +#: ../share/templates/templates.h:1 +msgid "black opaque empty" +msgstr "čierna matná prázdna" + +#: ../share/templates/templates.h:1 +msgid "White Opaque" +msgstr "Biela matná" + +#: ../share/templates/templates.h:1 +msgid "Empty white page" +msgstr "prázdna biela matná stránka" + +#: ../share/templates/templates.h:1 +msgid "white opaque empty" +msgstr "prázdna biela matná" + +#: ../share/templates/templates.h:1 +msgid "Business Card 85x54mm" +msgstr "Vizitka 85x54 mm" + +#: ../share/templates/templates.h:1 +msgid "Empty business card template." +msgstr "Prázdna šablóna vizitky." + +#: ../share/templates/templates.h:1 +msgid "business card empty 85x54" +msgstr "prázdna vizitka 85x54" + +#: ../share/templates/templates.h:1 +msgid "Business Card 90x50mm" +msgstr "Vizitka 90x50 mm" + +#: ../share/templates/templates.h:1 +msgid "business card empty 90x50" +msgstr "prázdna vizitka 90x50" + +#: ../share/templates/templates.h:1 +msgid "CD Cover 300dpi" +msgstr "Obal na CD 300 dpi" + +#: ../share/templates/templates.h:1 +msgid "Empty CD box cover." +msgstr "Prázdny obal CD." + +#: ../share/templates/templates.h:1 +msgid "CD cover disc disk 300dpi box" +msgstr "obal disku CD 300 dpi" + +#: ../share/templates/templates.h:1 +msgid "CD Label 120x120 " +msgstr "Obal CD 120x120" #: ../share/templates/templates.h:1 msgid "Simple CD Label template with disc's pattern." -msgstr "Jednoduchá šablóna obalu CD so vzorom disku." +msgstr "Šablóna jednoduchého obalu CD so vzorom disku." #: ../share/templates/templates.h:1 msgid "CD label 120x120 disc disk" -msgstr "Obal CD 120x120" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD Cover Regular 300dpi " +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD covers." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD cover regular 300dpi" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD Cover Slim 300dpi " +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD slim covers." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD cover slim 300dpi" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD Cover Superslim 300dpi " +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD superslim covers." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD cover superslim 300dpi" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD Cover Ultraslim 300dpi " +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Template for both-sides DVD ultraslim covers." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "DVD cover ultraslim 300dpi" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Desktop 1024x768" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Empty desktop size sheet" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "desktop 1024x768 wallpaper" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Desktop 1600x1200" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "desktop 1600x1200 wallpaper" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Desktop 640x480" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "desktop 640x480 wallpaper" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Desktop 800x600" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "desktop 800x600 wallpaper" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Fontforge Glyph" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "font fontforge glyph 1000x1000" +msgstr "" + +#: ../share/templates/templates.h:1 +#, fuzzy +msgid "Icon 16x16" +msgstr "16x16" + +#: ../share/templates/templates.h:1 +msgid "Small 16x16 icon template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "icon 16x16 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Icon 32x32" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "32x32 icon template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "icon 32x32 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Icon 48x48" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "48x48 icon template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "icon 48x48 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Icon 64x64" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "64x64 icon template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "icon 64x64 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +#, fuzzy +msgid "Letter Landscape" +msgstr "_Krajinka" + +#: ../share/templates/templates.h:1 +msgid "Standard letter landscape sheet - 792x612" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "letter landscape 792x612 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +#, fuzzy +msgid "Letter" +msgstr "Písmeno:" + +#: ../share/templates/templates.h:1 +msgid "Standard letter sheet - 612x792" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "letter 612x792 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +#, fuzzy +msgid "No Borders" +msgstr "Poradie" + +#: ../share/templates/templates.h:1 +msgid "Empty sheet with no borders" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "no borders empty" +msgstr "" #: ../share/templates/templates.h:1 #, fuzzy @@ -4401,9 +3058,70 @@ msgid "no layers empty" msgstr "Zmeniť krytie vrstvy" #: ../share/templates/templates.h:1 -msgid "LaTeX Beamer" +msgid "Video HDTV 1920x1080" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "HDTV video template for 1920x1080 resolution." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "HDTV video empty 1920x1080" msgstr "" +#: ../share/templates/templates.h:1 +msgid "Video NTSC 720x486" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "NTSC video template for 720x486 resolution." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "NTSC video empty 720x486" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Video PAL 728x576" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "PAL video template for 728x576 resolution." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "PAL video empty 728x576" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Web Banner 468x60" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Empty 468x60 web banner template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "web banner 468x60 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Web Banner 728x90" +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "Empty 728x90 web banner template." +msgstr "" + +#: ../share/templates/templates.h:1 +msgid "web banner 728x90 empty" +msgstr "" + +#: ../share/templates/templates.h:1 +#, fuzzy +msgid "LaTeX Beamer" +msgstr "Tlač LaTeX" + #: ../share/templates/templates.h:1 msgid "LaTeX beamer template with helping grid." msgstr "" @@ -4413,241 +3131,200 @@ msgid "LaTex LaTeX latex grid beamer" msgstr "" #: ../share/templates/templates.h:1 +#, fuzzy msgid "Typography Canvas" -msgstr "Typografické plátno" +msgstr "1 - nastavenie typografického plátna" #: ../share/templates/templates.h:1 msgid "Empty typography canvas with helping guidelines." -msgstr "Prázdne typografické plátno s pomocnými vodidlami." +msgstr "" #: ../share/templates/templates.h:1 +#, fuzzy msgid "guidelines typography canvas" -msgstr "vodidlá typografického plátna" +msgstr "1 - nastavenie typografického plátna" #. 3D box -#: ../src/box3d.cpp:260 ../src/box3d.cpp:1314 -#: ../src/ui/dialog/inkscape-preferences.cpp:407 -#: ../src/box3d.cpp:1313 -#: ../src/ui/dialog/inkscape-preferences.cpp:400 +#: ../src/box3d.cpp:259 ../src/box3d.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:398 msgid "3D Box" msgstr "Kváder" -#: ../src/color-profile.cpp:853 +#: ../src/color-profile.cpp:852 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "Adresár farebných profilov (%s) je nedostupný." -#: ../src/color-profile.cpp:912 ../src/color-profile.cpp:929 +#: ../src/color-profile.cpp:911 ../src/color-profile.cpp:928 msgid "(invalid UTF-8 string)" msgstr "(neplatný UTF-8 reťazec)" -#: ../src/color-profile.cpp:914 -#, fuzzy -msgctxt "Profile name" +#: ../src/color-profile.cpp:913 ../src/filter-enums.cpp:121 +#: ../src/live_effects/lpe-ruler.cpp:32 +#: ../src/ui/dialog/filter-effects-dialog.cpp:549 +#: ../src/ui/dialog/inkscape-preferences.cpp:332 +#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 +#: ../src/ui/dialog/inkscape-preferences.cpp:1837 +#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 +#: ../src/ui/dialog/input.cpp:1571 ../src/ui/dialog/input.cpp:1625 +#: ../src/verbs.cpp:2349 ../src/widgets/gradient-toolbar.cpp:1112 +#: ../src/widgets/pencil-toolbar.cpp:155 +#: ../src/widgets/stroke-marker-selector.cpp:388 +#: ../share/extensions/gcodetools_area.inx.h:48 +#: ../share/extensions/gcodetools_dxf_points.inx.h:20 +#: ../share/extensions/gcodetools_engraving.inx.h:26 +#: ../share/extensions/gcodetools_graffiti.inx.h:37 +#: ../share/extensions/gcodetools_lathe.inx.h:41 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 +#: ../share/extensions/grid_polar.inx.h:4 +#: ../share/extensions/guides_creator.inx.h:24 +#: ../share/extensions/plotter.inx.h:15 ../share/extensions/scour.inx.h:18 msgid "None" msgstr "Žiadny" -#: ../src/context-fns.cpp:33 ../src/context-fns.cpp:62 -#: ../src/context-fns.cpp:36 -#: ../src/context-fns.cpp:65 +#: ../src/context-fns.cpp:36 ../src/context-fns.cpp:65 msgid "Current layer is hidden. Unhide it to be able to draw on it." msgstr "" "Aktuálna vrstva je skrytá. Zobrazte ju, aby ste na ňu mohli kresliť." -#: ../src/context-fns.cpp:39 ../src/context-fns.cpp:68 -#: ../src/context-fns.cpp:42 -#: ../src/context-fns.cpp:71 +#: ../src/context-fns.cpp:42 ../src/context-fns.cpp:71 msgid "Current layer is locked. Unlock it to be able to draw on it." msgstr "" "Aktuálna vrstva je zamknutá. Odomknite ju, aby ste na ňu mohli " "kresliť." -#: ../src/desktop-events.cpp:236 #: ../src/desktop-events.cpp:225 msgid "Create guide" msgstr "Vytvoriť vodidlo" -#: ../src/desktop-events.cpp:492 #: ../src/desktop-events.cpp:471 msgid "Move guide" msgstr "Posunúť vodidlo" -#: ../src/desktop-events.cpp:499 ../src/desktop-events.cpp:557 +#: ../src/desktop-events.cpp:478 ../src/desktop-events.cpp:536 #: ../src/ui/dialog/guides.cpp:138 -#: ../src/desktop-events.cpp:478 -#: ../src/desktop-events.cpp:536 msgid "Delete guide" msgstr "Zmazať vodidlo" -#: ../src/desktop-events.cpp:537 #: ../src/desktop-events.cpp:516 #, c-format msgid "Guideline: %s" msgstr "Vodidlo: %s" -#: ../src/desktop.cpp:873 -#: ../src/desktop.cpp:881 +#: ../src/desktop.cpp:880 msgid "No previous zoom." msgstr "Žiadne predchádzajúce zobrazenie." -#: ../src/desktop.cpp:894 -#: ../src/desktop.cpp:902 +#: ../src/desktop.cpp:901 msgid "No next zoom." msgstr "Žiadne nasledujúce zobrazenie." -#: ../src/display/canvas-axonomgrid.cpp:353 ../src/display/canvas-grid.cpp:693 -#: ../src/display/canvas-axonomgrid.cpp:317 +#: ../src/display/canvas-axonomgrid.cpp:317 ../src/display/canvas-grid.cpp:693 msgid "Grid _units:" msgstr "_Jednotky mriežky:" -#: ../src/display/canvas-axonomgrid.cpp:355 ../src/display/canvas-grid.cpp:695 -#: ../src/display/canvas-axonomgrid.cpp:319 +#: ../src/display/canvas-axonomgrid.cpp:319 ../src/display/canvas-grid.cpp:695 msgid "_Origin X:" msgstr "_Začiatok X:" -#: ../src/display/canvas-axonomgrid.cpp:355 ../src/display/canvas-grid.cpp:695 -#: ../src/ui/dialog/inkscape-preferences.cpp:746 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 -#: ../src/display/canvas-axonomgrid.cpp:319 -#: ../src/ui/dialog/inkscape-preferences.cpp:734 -#: ../src/ui/dialog/inkscape-preferences.cpp:759 +#: ../src/display/canvas-axonomgrid.cpp:319 ../src/display/canvas-grid.cpp:695 +#: ../src/ui/dialog/inkscape-preferences.cpp:737 +#: ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "X coordinate of grid origin" msgstr "X súradnica začiatku mriežky" -#: ../src/display/canvas-axonomgrid.cpp:358 ../src/display/canvas-grid.cpp:698 -#: ../src/display/canvas-axonomgrid.cpp:321 -#: ../src/display/canvas-grid.cpp:697 +#: ../src/display/canvas-axonomgrid.cpp:321 ../src/display/canvas-grid.cpp:697 msgid "O_rigin Y:" msgstr "Z_ačiatok Y:" -#: ../src/display/canvas-axonomgrid.cpp:358 ../src/display/canvas-grid.cpp:698 -#: ../src/ui/dialog/inkscape-preferences.cpp:747 -#: ../src/ui/dialog/inkscape-preferences.cpp:772 -#: ../src/display/canvas-axonomgrid.cpp:321 -#: ../src/display/canvas-grid.cpp:697 -#: ../src/ui/dialog/inkscape-preferences.cpp:735 -#: ../src/ui/dialog/inkscape-preferences.cpp:760 +#: ../src/display/canvas-axonomgrid.cpp:321 ../src/display/canvas-grid.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:738 +#: ../src/ui/dialog/inkscape-preferences.cpp:763 msgid "Y coordinate of grid origin" msgstr "Y súradnica začiatku mriežky" -#: ../src/display/canvas-axonomgrid.cpp:361 ../src/display/canvas-grid.cpp:704 -#: ../src/display/canvas-axonomgrid.cpp:323 -#: ../src/display/canvas-grid.cpp:701 +#: ../src/display/canvas-axonomgrid.cpp:323 ../src/display/canvas-grid.cpp:701 msgid "Spacing _Y:" msgstr "Rozostup _Y:" -#: ../src/display/canvas-axonomgrid.cpp:361 -#: ../src/ui/dialog/inkscape-preferences.cpp:775 #: ../src/display/canvas-axonomgrid.cpp:323 -#: ../src/ui/dialog/inkscape-preferences.cpp:763 +#: ../src/ui/dialog/inkscape-preferences.cpp:766 msgid "Base length of z-axis" msgstr "Základná dĺžka osi z" -#: ../src/display/canvas-axonomgrid.cpp:364 -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/widgets/box3d-toolbar.cpp:302 #: ../src/display/canvas-axonomgrid.cpp:325 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 #: ../src/widgets/box3d-toolbar.cpp:299 msgid "Angle X:" msgstr "Uhol X:" -#: ../src/display/canvas-axonomgrid.cpp:364 -#: ../src/ui/dialog/inkscape-preferences.cpp:778 #: ../src/display/canvas-axonomgrid.cpp:325 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Angle of x-axis" msgstr "Uhol osi x" -#: ../src/display/canvas-axonomgrid.cpp:366 -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/widgets/box3d-toolbar.cpp:381 #: ../src/display/canvas-axonomgrid.cpp:327 -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:770 #: ../src/widgets/box3d-toolbar.cpp:378 msgid "Angle Z:" msgstr "Uhol Z:" -#: ../src/display/canvas-axonomgrid.cpp:366 -#: ../src/ui/dialog/inkscape-preferences.cpp:779 #: ../src/display/canvas-axonomgrid.cpp:327 -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:770 msgid "Angle of z-axis" msgstr "Uhol osi z" -#: ../src/display/canvas-axonomgrid.cpp:370 ../src/display/canvas-grid.cpp:709 -#: ../src/display/canvas-axonomgrid.cpp:331 -#: ../src/display/canvas-grid.cpp:705 +#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 msgid "Minor grid line _color:" msgstr "Farba _vedľajšej čiary mriežky:" -#: ../src/display/canvas-axonomgrid.cpp:370 ../src/display/canvas-grid.cpp:709 -#: ../src/ui/dialog/inkscape-preferences.cpp:730 -#: ../src/display/canvas-axonomgrid.cpp:331 -#: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:718 +#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:721 msgid "Minor grid line color" msgstr "Farba vedľajšej čiary mriežky" -#: ../src/display/canvas-axonomgrid.cpp:370 ../src/display/canvas-grid.cpp:709 -#: ../src/display/canvas-axonomgrid.cpp:331 -#: ../src/display/canvas-grid.cpp:705 +#: ../src/display/canvas-axonomgrid.cpp:331 ../src/display/canvas-grid.cpp:705 msgid "Color of the minor grid lines" msgstr "Farba vedľajších čiar mriežky" -#: ../src/display/canvas-axonomgrid.cpp:375 ../src/display/canvas-grid.cpp:714 -#: ../src/display/canvas-axonomgrid.cpp:336 -#: ../src/display/canvas-grid.cpp:710 +#: ../src/display/canvas-axonomgrid.cpp:336 ../src/display/canvas-grid.cpp:710 msgid "Ma_jor grid line color:" msgstr "Farba _hlavnej čiary mriežky:" -#: ../src/display/canvas-axonomgrid.cpp:375 ../src/display/canvas-grid.cpp:714 -#: ../src/ui/dialog/inkscape-preferences.cpp:732 -#: ../src/display/canvas-axonomgrid.cpp:336 -#: ../src/display/canvas-grid.cpp:710 -#: ../src/ui/dialog/inkscape-preferences.cpp:720 +#: ../src/display/canvas-axonomgrid.cpp:336 ../src/display/canvas-grid.cpp:710 +#: ../src/ui/dialog/inkscape-preferences.cpp:723 msgid "Major grid line color" msgstr "Farba hlavnej čiary mriežky" -#: ../src/display/canvas-axonomgrid.cpp:376 ../src/display/canvas-grid.cpp:715 -#: ../src/display/canvas-axonomgrid.cpp:337 -#: ../src/display/canvas-grid.cpp:711 +#: ../src/display/canvas-axonomgrid.cpp:337 ../src/display/canvas-grid.cpp:711 msgid "Color of the major (highlighted) grid lines" msgstr "Farba hlavných (zvýraznených) čiar mriežky" -#: ../src/display/canvas-axonomgrid.cpp:380 ../src/display/canvas-grid.cpp:719 -#: ../src/display/canvas-axonomgrid.cpp:341 -#: ../src/display/canvas-grid.cpp:715 +#: ../src/display/canvas-axonomgrid.cpp:341 ../src/display/canvas-grid.cpp:715 msgid "_Major grid line every:" msgstr "_Hlavná čiara mriežky každých:" -#: ../src/display/canvas-axonomgrid.cpp:380 ../src/display/canvas-grid.cpp:719 -#: ../src/display/canvas-axonomgrid.cpp:341 -#: ../src/display/canvas-grid.cpp:715 +#: ../src/display/canvas-axonomgrid.cpp:341 ../src/display/canvas-grid.cpp:715 msgid "lines" msgstr "čiary" -#: ../src/display/canvas-grid.cpp:64 #: ../src/display/canvas-grid.cpp:63 msgid "Rectangular grid" msgstr "Pravouhlá mriežka" -#: ../src/display/canvas-grid.cpp:65 #: ../src/display/canvas-grid.cpp:64 msgid "Axonometric grid" msgstr "Axonometrická mriežka" -#: ../src/display/canvas-grid.cpp:250 #: ../src/display/canvas-grid.cpp:275 msgid "Create new grid" msgstr "Vytvoriť novú mriežku" -#: ../src/display/canvas-grid.cpp:316 #: ../src/display/canvas-grid.cpp:341 msgid "_Enabled" msgstr "_Zapnuté" -#: ../src/display/canvas-grid.cpp:317 #: ../src/display/canvas-grid.cpp:342 msgid "" "Determines whether to snap to this grid or not. Can be 'on' for invisible " @@ -4656,12 +3333,10 @@ msgstr "" "Určuje, či sa má prichytávať k tejto mriežke alebo nie. Môže byť „zapnuté“ " "pre neviditeľné mriežky." -#: ../src/display/canvas-grid.cpp:321 #: ../src/display/canvas-grid.cpp:346 msgid "Snap to visible _grid lines only" msgstr "Prichytávať iba k viditeľným _vodidlám" -#: ../src/display/canvas-grid.cpp:322 #: ../src/display/canvas-grid.cpp:347 msgid "" "When zoomed out, not all grid lines will be displayed. Only the visible ones " @@ -4670,12 +3345,10 @@ msgstr "" "Pri oddialení nebudú zobrazené všetky čiary mriežky. Prichytávať sa bude iba " "k viditeľným." -#: ../src/display/canvas-grid.cpp:326 #: ../src/display/canvas-grid.cpp:351 msgid "_Visible" msgstr "_Viditeľné" -#: ../src/display/canvas-grid.cpp:327 #: ../src/display/canvas-grid.cpp:352 msgid "" "Determines whether the grid is displayed or not. Objects are still snapped " @@ -4684,31 +3357,24 @@ msgstr "" "Určuje, či sa mriežka zobrazuje alebo nie. Objekty sa budú prichytávať aj k " "neviditeľným mriežkam." -#: ../src/display/canvas-grid.cpp:701 #: ../src/display/canvas-grid.cpp:699 msgid "Spacing _X:" msgstr "Rozostup _X:" -#: ../src/display/canvas-grid.cpp:701 -#: ../src/ui/dialog/inkscape-preferences.cpp:752 #: ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:740 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 msgid "Distance between vertical grid lines" msgstr "Vzdialenosť medzi zvislými čiarami mriežky" -#: ../src/display/canvas-grid.cpp:704 -#: ../src/ui/dialog/inkscape-preferences.cpp:753 #: ../src/display/canvas-grid.cpp:701 -#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:744 msgid "Distance between horizontal grid lines" msgstr "Vzdialenosť medzi vodorovnými čiarami mriežky" -#: ../src/display/canvas-grid.cpp:736 #: ../src/display/canvas-grid.cpp:732 msgid "_Show dots instead of lines" msgstr "_Zobraziť body namiesto čiar" -#: ../src/display/canvas-grid.cpp:737 #: ../src/display/canvas-grid.cpp:733 msgid "If set, displays dots at gridpoints instead of gridlines" msgstr "" @@ -4860,13 +3526,11 @@ msgstr "Stred ohraničenia" msgid "Bounding box side midpoint" msgstr "Stred strany ohraničenia" -#: ../src/display/snap-indicator.cpp:196 ../src/ui/tool/node.cpp:1505 -#: ../src/ui/tool/node.cpp:1319 +#: ../src/display/snap-indicator.cpp:196 ../src/ui/tool/node.cpp:1319 msgid "Smooth node" msgstr "Hladký uzol" -#: ../src/display/snap-indicator.cpp:199 ../src/ui/tool/node.cpp:1504 -#: ../src/ui/tool/node.cpp:1318 +#: ../src/display/snap-indicator.cpp:199 ../src/ui/tool/node.cpp:1318 msgid "Cusp node" msgstr "Hrotový uzol" @@ -4911,8 +3575,9 @@ msgid "Corner" msgstr "Roh" #: ../src/display/snap-indicator.cpp:234 +#, fuzzy msgid "Text anchor" -msgstr "Ukotvenie textu" +msgstr "Písmo textu" #: ../src/display/snap-indicator.cpp:237 msgid "Multiple of grid spacing" @@ -4922,25 +3587,22 @@ msgstr "Násobok rozostupov mriežky" msgid " to " msgstr " na " -#: ../src/document.cpp:544 -#: ../src/document.cpp:541 +#: ../src/document.cpp:542 #, c-format msgid "New document %d" msgstr "Nový dokument %d" -#: ../src/document.cpp:549 -#: ../src/document.cpp:546 -#, c-format +#: ../src/document.cpp:547 +#, fuzzy, c-format msgid "Memory document %d" msgstr "Pamäťový dokument %d" -#: ../src/document.cpp:578 -#: ../src/document.cpp:575 +#: ../src/document.cpp:576 +#, fuzzy msgid "Memory document %1" -msgstr "Pamäťový dokument %1" +msgstr "Pamäťový dokument %d" -#: ../src/document.cpp:839 -#: ../src/document.cpp:786 +#: ../src/document.cpp:788 #, c-format msgid "Unnamed document %d" msgstr "Dokument bez názvu %d" @@ -4950,13 +3612,11 @@ msgid "[Unchanged]" msgstr "[Bez zmeny]" #. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2465 -#: ../src/verbs.cpp:2386 +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2386 msgid "_Undo" msgstr "_Vrátiť" -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2467 -#: ../src/verbs.cpp:2388 +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2388 msgid "_Redo" msgstr "_Opakovať vrátené" @@ -4984,14 +3644,12 @@ msgstr " popis: " msgid " (No preferences)" msgstr " (bez preferencií)" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2239 -#: ../src/verbs.cpp:2160 +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2160 +#, fuzzy msgid "Extensions" -msgstr "Rozšírenia" +msgstr "Rozšíre_nia" -#. \FIXME change this #. This is some filler text, needs to change before relase -#: ../src/extension/error-file.cpp:53 #: ../src/extension/error-file.cpp:52 msgid "" "One or more extensions failed to loadJedno alebo viac rozšírení sa nepodarilo " -"načítať\n" +"Jedno alebo viac rozšírení sa " +"nepodarilo načítať\n" "\n" "Rozšírenia, ktoré sa nepodarilo načítať boli vynechané. Inkscape bude " "pokračovať v normálnom behu ale tieto rozšírenia nebudú dostupné. " "Podrobnosti o riešení tohto problému zistíte pomocou chybového záznamu, " "ktorý nájdete tu: " -#: ../src/extension/error-file.cpp:67 #: ../src/extension/error-file.cpp:66 msgid "Show dialog on startup" msgstr "Zobrazovať úvodný dialóg" @@ -5021,7 +3678,7 @@ msgstr "„%s“ pracuje, prosím čakajte..." #. static int i = 0; #. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; -#: ../src/extension/extension.cpp:271 +#: ../src/extension/extension.cpp:266 msgid "" " This is caused by an improper .inx file for this extension. An improper ." "inx file could have been caused by a faulty installation of Inkscape." @@ -5029,70 +3686,70 @@ msgstr "" " Toto spôsobil nesprávny .inx súbor tohto rozšírenia. Nesprávny .inx súbor " "mohla spôsobiť chybná inštalácia Inkscape." -#: ../src/extension/extension.cpp:281 +#: ../src/extension/extension.cpp:276 msgid "the extension is designed for Windows only." msgstr "" -#: ../src/extension/extension.cpp:286 +#: ../src/extension/extension.cpp:281 msgid "an ID was not defined for it." msgstr "ID preň nebol definovaný." -#: ../src/extension/extension.cpp:290 +#: ../src/extension/extension.cpp:285 msgid "there was no name defined for it." msgstr "názov preň nebol definovaný." -#: ../src/extension/extension.cpp:294 +#: ../src/extension/extension.cpp:289 msgid "the XML description of it got lost." msgstr "jeho XML popis sa stratil." -#: ../src/extension/extension.cpp:298 +#: ../src/extension/extension.cpp:293 msgid "no implementation was defined for the extension." msgstr "pre rozšírenie nebola definovaná implementácia." #. std::cout << "Failed: " << *(_deps[i]) << std::endl; -#: ../src/extension/extension.cpp:305 +#: ../src/extension/extension.cpp:300 msgid "a dependency was not met." msgstr "nebola splnená závislosť." -#: ../src/extension/extension.cpp:325 +#: ../src/extension/extension.cpp:320 msgid "Extension \"" msgstr "Rozšírenie „" -#: ../src/extension/extension.cpp:325 +#: ../src/extension/extension.cpp:320 msgid "\" failed to load because " msgstr "“ sa nepodarilo načítať, lebo " -#: ../src/extension/extension.cpp:674 +#: ../src/extension/extension.cpp:669 #, c-format msgid "Could not create extension error log file '%s'" msgstr "Nepodarilo sa vytvoriť súbor so záznamom „%s“ pre rozšírenie" -#: ../src/extension/extension.cpp:782 +#: ../src/extension/extension.cpp:777 #: ../share/extensions/webslicer_create_rect.inx.h:2 msgid "Name:" msgstr "Názov:" -#: ../src/extension/extension.cpp:783 +#: ../src/extension/extension.cpp:778 msgid "ID:" msgstr "ID:" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:779 msgid "State:" msgstr "Stav:" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:779 msgid "Loaded" msgstr "načítaný" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:779 msgid "Unloaded" msgstr "odobraný z pamäte" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:779 msgid "Deactivated" msgstr "deaktivovaný" -#: ../src/extension/extension.cpp:824 +#: ../src/extension/extension.cpp:819 msgid "" "Currently there is no help available for this Extension. Please look on the " "Inkscape website or ask on the mailing lists if you have questions regarding " @@ -5102,7 +3759,7 @@ msgstr "" "sa tohto rozšírenia, prosím, hľadajte na stránke Inkscape alebo sa spýtajte " "v konferencii." -#: ../src/extension/implementation/script.cpp:1057 +#: ../src/extension/implementation/script.cpp:1037 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5133,14 +3790,12 @@ msgstr "Adaptívny prah" #: ../src/extension/internal/bitmap/raise.cpp:42 #: ../src/extension/internal/bitmap/sample.cpp:41 #: ../src/extension/internal/bluredge.cpp:138 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:63 #: ../src/ui/dialog/object-attributes.cpp:68 #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/widgets/calligraphy-toolbar.cpp:430 #: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 #: ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/foldablebox.inx.h:2 -#, fuzzy msgid "Width:" msgstr "Šírka:" @@ -5351,9 +4006,68 @@ msgstr "Použiť na zvolené bitmapy štylizáciu uhlíkom" msgid "Colorize" msgstr "Vyfarbiť" +#: ../src/extension/internal/bitmap/colorize.cpp:52 +#: ../src/extension/internal/filter/bumps.h:101 +#: ../src/extension/internal/filter/bumps.h:321 +#: ../src/extension/internal/filter/bumps.h:328 +#: ../src/extension/internal/filter/color.h:82 +#: ../src/extension/internal/filter/color.h:164 +#: ../src/extension/internal/filter/color.h:171 +#: ../src/extension/internal/filter/color.h:262 +#: ../src/extension/internal/filter/color.h:340 +#: ../src/extension/internal/filter/color.h:347 +#: ../src/extension/internal/filter/color.h:437 +#: ../src/extension/internal/filter/color.h:532 +#: ../src/extension/internal/filter/color.h:654 +#: ../src/extension/internal/filter/color.h:751 +#: ../src/extension/internal/filter/color.h:830 +#: ../src/extension/internal/filter/color.h:921 +#: ../src/extension/internal/filter/color.h:1049 +#: ../src/extension/internal/filter/color.h:1119 +#: ../src/extension/internal/filter/color.h:1212 +#: ../src/extension/internal/filter/color.h:1324 +#: ../src/extension/internal/filter/color.h:1429 +#: ../src/extension/internal/filter/color.h:1505 +#: ../src/extension/internal/filter/color.h:1609 +#: ../src/extension/internal/filter/color.h:1616 +#: ../src/extension/internal/filter/morphology.h:194 +#: ../src/extension/internal/filter/overlays.h:73 +#: ../src/extension/internal/filter/paint.h:99 +#: ../src/extension/internal/filter/paint.h:713 +#: ../src/extension/internal/filter/paint.h:717 +#: ../src/extension/internal/filter/shadows.h:73 +#: ../src/extension/internal/filter/transparency.h:345 +#: ../src/filter-enums.cpp:66 ../src/ui/dialog/clonetiler.cpp:832 +#: ../src/ui/dialog/clonetiler.cpp:983 +#: ../src/ui/dialog/document-properties.cpp:157 +#: ../share/extensions/color_HSL_adjust.inx.h:20 +#: ../share/extensions/color_blackandwhite.inx.h:3 +#: ../share/extensions/color_brighter.inx.h:2 +#: ../share/extensions/color_custom.inx.h:15 +#: ../share/extensions/color_darker.inx.h:2 +#: ../share/extensions/color_desaturate.inx.h:2 +#: ../share/extensions/color_grayscale.inx.h:2 +#: ../share/extensions/color_lesshue.inx.h:2 +#: ../share/extensions/color_lesslight.inx.h:2 +#: ../share/extensions/color_lesssaturation.inx.h:2 +#: ../share/extensions/color_morehue.inx.h:2 +#: ../share/extensions/color_morelight.inx.h:2 +#: ../share/extensions/color_moresaturation.inx.h:2 +#: ../share/extensions/color_negative.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_removeblue.inx.h:2 +#: ../share/extensions/color_removegreen.inx.h:2 +#: ../share/extensions/color_removered.inx.h:2 +#: ../share/extensions/color_replace.inx.h:6 +#: ../share/extensions/color_rgbbarrel.inx.h:2 +#: ../share/extensions/interp_att_g.inx.h:19 +msgid "Color" +msgstr "Farba" + #: ../src/extension/internal/bitmap/colorize.cpp:58 msgid "Colorize selected bitmap(s) with specified color, using given opacity" -msgstr "Vyfarbiť zvolené bitmapy určenou farbou, s použitím danej priesvitnosti" +msgstr "" +"Vyfarbiť zvolené bitmapy určenou farbou, s použitím danej priesvitnosti" #: ../src/extension/internal/bitmap/contrast.cpp:40 #: ../src/extension/internal/filter/color.h:1114 @@ -5376,23 +4090,27 @@ msgstr "Orezať" #: ../src/extension/internal/bitmap/crop.cpp:68 msgid "Top (px):" -msgstr "Vrch (px):" +msgstr "" #: ../src/extension/internal/bitmap/crop.cpp:69 +#, fuzzy msgid "Bottom (px):" -msgstr "Spodok (px):" +msgstr "Dolu:" #: ../src/extension/internal/bitmap/crop.cpp:70 +#, fuzzy msgid "Left (px):" -msgstr "Vľavo (px):" +msgstr "Posunutie (px):" #: ../src/extension/internal/bitmap/crop.cpp:71 +#, fuzzy msgid "Right (px):" -msgstr "Vpravo (px):" +msgstr "Vpravo:" #: ../src/extension/internal/bitmap/crop.cpp:77 -msgid "Crop selected bitmap(s)" -msgstr "Orezať zvolené bitmapy" +#, fuzzy +msgid "Crop selected bitmap(s)." +msgstr "Rozostriť zvolené bitmapy" #: ../src/extension/internal/bitmap/cycleColormap.cpp:37 msgid "Cycle Colormap" @@ -5450,7 +4168,6 @@ msgid "Equalize selected bitmap(s); histogram equalization" msgstr "Ekvalizovať vybrané bitmapy; ekvalizácia podľa histogramu" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 -#: ../src/filter-enums.cpp:29 #: ../src/filter-enums.cpp:28 msgid "Gaussian Blur" msgstr "Gausovské rozostrenie" @@ -5582,23 +4299,21 @@ msgstr "Štylizovať zvolené bitmapy, aby vyzerali ako olejomaľba" #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/blurs.h:333 #: ../src/extension/internal/filter/transparency.h:279 -#: ../src/ui/dialog/clonetiler.cpp:838 ../src/ui/dialog/clonetiler.cpp:991 +#: ../src/ui/dialog/clonetiler.cpp:840 ../src/ui/dialog/clonetiler.cpp:993 #: ../src/widgets/tweak-toolbar.cpp:334 #: ../share/extensions/interp_att_g.inx.h:16 -#: ../src/ui/dialog/clonetiler.cpp:840 -#: ../src/ui/dialog/clonetiler.cpp:993 msgid "Opacity" msgstr "Krytie" #: ../src/extension/internal/bitmap/opacity.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:2884 -#: ../src/ui/dialog/objects.cpp:1621 ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "Krytie:" #: ../src/extension/internal/bitmap/opacity.cpp:46 -msgid "Modify opacity channel(s) of selected bitmap(s)" -msgstr "Zmeniť kanál priesvitnosti zvolených bitmáp" +msgid "Modify opacity channel(s) of selected bitmap(s)." +msgstr "Zmeniť kanál priesvitnosti zvolených bitmáp." #: ../src/extension/internal/bitmap/raise.cpp:40 msgid "Raise" @@ -5611,7 +4326,8 @@ msgstr "Zvýšený" #: ../src/extension/internal/bitmap/raise.cpp:50 msgid "" "Alter lightness the edges of selected bitmap(s) to create a raised appearance" -msgstr "Zmeniť svetlosť hrán zvolených bitmáp, aby sa vytvoril zdvihnutý vzhľad" +msgstr "" +"Zmeniť svetlosť hrán zvolených bitmáp, aby sa vytvoril zdvihnutý vzhľad" #: ../src/extension/internal/bitmap/reduceNoise.cpp:40 msgid "Reduce Noise" @@ -5662,6 +4378,10 @@ msgstr "Farebné odtiene" msgid "Shade selected bitmap(s) simulating distant light source" msgstr "Vytvoriť odtiene zvolených bitmáp simuláciou vzdialeného zdroja svetla" +#: ../src/extension/internal/bitmap/sharpen.cpp:38 +msgid "Sharpen" +msgstr "Zaostriť" + #: ../src/extension/internal/bitmap/sharpen.cpp:47 msgid "Sharpen selected bitmap(s)" msgstr "Zaostrí zvolené objekty" @@ -5689,6 +4409,10 @@ msgstr "" "Náhodne rozmiestniť pixely v zvolených bitmapách v rámci daného polomeru od " "pôvodnej polohy" +#: ../src/extension/internal/bitmap/swirl.cpp:37 +msgid "Swirl" +msgstr "Vírenie" + #: ../src/extension/internal/bitmap/swirl.cpp:39 msgid "Degrees:" msgstr "Stupňov:" @@ -5704,7 +4428,6 @@ msgstr "Prah" #: ../src/extension/internal/bitmap/threshold.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:46 -#: ../src/widgets/paintbucket-toolbar.cpp:148 #: ../src/widgets/paintbucket-toolbar.cpp:146 msgid "Threshold:" msgstr "Prah:" @@ -5786,9 +4509,8 @@ msgstr "PostScript úroveň 2" #: ../src/extension/internal/cairo-ps-out.cpp:333 #: ../src/extension/internal/cairo-ps-out.cpp:372 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 -#: ../src/extension/internal/emf-inout.cpp:3569 -#: ../src/extension/internal/wmf-inout.cpp:3144 -#: ../src/extension/internal/wmf-inout.cpp:3143 +#: ../src/extension/internal/emf-inout.cpp:3550 +#: ../src/extension/internal/wmf-inout.cpp:3141 msgid "Convert texts to paths" msgstr "Konvertovať texty na cesty" @@ -5810,14 +4532,16 @@ msgstr "Rozlíšenie pre rasterizáciu (dpi):" #: ../src/extension/internal/cairo-ps-out.cpp:337 #: ../src/extension/internal/cairo-ps-out.cpp:376 +#, fuzzy msgid "Output page size" -msgstr "Veľkosť výstupnej stránky" +msgstr "Nastaviť veľkosť stránky:" #: ../src/extension/internal/cairo-ps-out.cpp:338 #: ../src/extension/internal/cairo-ps-out.cpp:377 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255 +#, fuzzy msgid "Use document's page size" -msgstr "Použiť veľkosť stránky dokumentu" +msgstr "Nastaviť veľkosť stránky:" #: ../src/extension/internal/cairo-ps-out.cpp:339 #: ../src/extension/internal/cairo-ps-out.cpp:378 @@ -5886,169 +4610,157 @@ msgid "PDF+LaTeX: Omit text in PDF, and create LaTeX file" msgstr "PDF+LaTeX: Vynechať text v PDF a vytvoriť súbor LaTeX" #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:254 +#, fuzzy msgid "Output page size:" -msgstr "Veľkosť výstupnej stránky:" +msgstr "Nastaviť veľkosť stránky:" -#: ../src/extension/internal/cdr-input.cpp:116 +#: ../src/extension/internal/cdr-input.cpp:102 #: ../src/extension/internal/pdfinput/pdf-input.cpp:87 -#: ../src/extension/internal/vsd-input.cpp:116 +#: ../src/extension/internal/vsd-input.cpp:101 msgid "Select page:" msgstr "Zvoľte stránku:" #. Display total number of pages -#: ../src/extension/internal/cdr-input.cpp:128 +#: ../src/extension/internal/cdr-input.cpp:114 #: ../src/extension/internal/pdfinput/pdf-input.cpp:106 -#: ../src/extension/internal/vsd-input.cpp:128 +#: ../src/extension/internal/vsd-input.cpp:113 #, c-format msgid "out of %i" msgstr "z %i" -#: ../src/extension/internal/cdr-input.cpp:165 -#: ../src/extension/internal/vsd-input.cpp:165 -#: ../src/extension/internal/cdr-input.cpp:159 -#: ../src/extension/internal/vsd-input.cpp:159 +#: ../src/extension/internal/cdr-input.cpp:145 +#: ../src/extension/internal/vsd-input.cpp:144 +#, fuzzy msgid "Page Selector" -msgstr "Výber stránky" +msgstr "Výber" -#: ../src/extension/internal/cdr-input.cpp:300 -#: ../src/extension/internal/cdr-input.cpp:294 +#: ../src/extension/internal/cdr-input.cpp:274 msgid "Corel DRAW Input" msgstr "Vstup Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:305 -#: ../src/extension/internal/cdr-input.cpp:299 +#: ../src/extension/internal/cdr-input.cpp:279 msgid "Corel DRAW 7-X4 files (*.cdr)" msgstr "Corel DRAW 7-X4 súbory (*.cdr)" -#: ../src/extension/internal/cdr-input.cpp:306 -#: ../src/extension/internal/cdr-input.cpp:300 +#: ../src/extension/internal/cdr-input.cpp:280 msgid "Open files saved in Corel DRAW 7-X4" msgstr "Otvoriť súbory uložené v Corel DRAW 7-X4" -#: ../src/extension/internal/cdr-input.cpp:313 -#: ../src/extension/internal/cdr-input.cpp:307 +#: ../src/extension/internal/cdr-input.cpp:287 msgid "Corel DRAW templates input" msgstr "Vstup Corel DRAW šablón" -#: ../src/extension/internal/cdr-input.cpp:318 -#: ../src/extension/internal/cdr-input.cpp:312 +#: ../src/extension/internal/cdr-input.cpp:292 +#, fuzzy msgid "Corel DRAW 7-13 template files (*.cdt)" -msgstr "Corel DRAW 7-13 súbory šablón (*.cdt)" +msgstr "Corel DRAW 7-13 súbory šablón (.cdt)" -#: ../src/extension/internal/cdr-input.cpp:319 -#: ../src/extension/internal/cdr-input.cpp:313 +#: ../src/extension/internal/cdr-input.cpp:293 msgid "Open files saved in Corel DRAW 7-13" msgstr "Otvoriť súbory uložené v Corel DRAW 7-13" -#: ../src/extension/internal/cdr-input.cpp:326 -#: ../src/extension/internal/cdr-input.cpp:320 +#: ../src/extension/internal/cdr-input.cpp:300 msgid "Corel DRAW Compressed Exchange files input" msgstr "Vstup Corel DRAW Compressed Exchange súbory" -#: ../src/extension/internal/cdr-input.cpp:331 -#: ../src/extension/internal/cdr-input.cpp:325 +#: ../src/extension/internal/cdr-input.cpp:305 +#, fuzzy msgid "Corel DRAW Compressed Exchange files (*.ccx)" -msgstr "Corel DRAW Compressed Exchange (*.ccx)" +msgstr "Corel DRAW Compressed Exchange súbory (.ccx)" -#: ../src/extension/internal/cdr-input.cpp:332 -#: ../src/extension/internal/cdr-input.cpp:326 +#: ../src/extension/internal/cdr-input.cpp:306 msgid "Open compressed exchange files saved in Corel DRAW" msgstr "Open compressed exchange súbory uložené v Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:339 -#: ../src/extension/internal/cdr-input.cpp:333 +#: ../src/extension/internal/cdr-input.cpp:313 msgid "Corel DRAW Presentation Exchange files input" msgstr "Vstup Corel DRAW Presentation Exchange súbory" -#: ../src/extension/internal/cdr-input.cpp:344 -#: ../src/extension/internal/cdr-input.cpp:338 +#: ../src/extension/internal/cdr-input.cpp:318 +#, fuzzy msgid "Corel DRAW Presentation Exchange files (*.cmx)" -msgstr "Corel DRAW Presentation Exchange (*.cmx)" +msgstr "Corel DRAW Presentation Exchange súbory (.cmx)" -#: ../src/extension/internal/cdr-input.cpp:345 -#: ../src/extension/internal/cdr-input.cpp:339 +#: ../src/extension/internal/cdr-input.cpp:319 msgid "Open presentation exchange files saved in Corel DRAW" msgstr "Open presentation exchange súbory uložené v Corel DRAW" -#: ../src/extension/internal/emf-inout.cpp:3553 +#: ../src/extension/internal/emf-inout.cpp:3534 msgid "EMF Input" msgstr "Vstup EMF" -#: ../src/extension/internal/emf-inout.cpp:3558 +#: ../src/extension/internal/emf-inout.cpp:3539 msgid "Enhanced Metafiles (*.emf)" msgstr "Rozšírené Metasúbory (*.wmf)" -#: ../src/extension/internal/emf-inout.cpp:3559 +#: ../src/extension/internal/emf-inout.cpp:3540 msgid "Enhanced Metafiles" msgstr "Rozšírené metasúbory" -#: ../src/extension/internal/emf-inout.cpp:3567 +#: ../src/extension/internal/emf-inout.cpp:3548 msgid "EMF Output" msgstr "Výstup EMF" -#: ../src/extension/internal/emf-inout.cpp:3570 -#: ../src/extension/internal/wmf-inout.cpp:3145 -#: ../src/extension/internal/wmf-inout.cpp:3144 +#: ../src/extension/internal/emf-inout.cpp:3551 +#: ../src/extension/internal/wmf-inout.cpp:3142 msgid "Map Unicode to Symbol font" -msgstr "Mapovať Unicode na písmo Symbol" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3571 -#: ../src/extension/internal/wmf-inout.cpp:3146 -#: ../src/extension/internal/wmf-inout.cpp:3145 +#: ../src/extension/internal/emf-inout.cpp:3552 +#: ../src/extension/internal/wmf-inout.cpp:3143 msgid "Map Unicode to Wingdings" -msgstr "Mapovať Unicode na Wingdings" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3572 -#: ../src/extension/internal/wmf-inout.cpp:3147 -#: ../src/extension/internal/wmf-inout.cpp:3146 +#: ../src/extension/internal/emf-inout.cpp:3553 +#: ../src/extension/internal/wmf-inout.cpp:3144 msgid "Map Unicode to Zapf Dingbats" -msgstr "Mapovať Unicode na Zapf Dingbats" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3573 -#: ../src/extension/internal/wmf-inout.cpp:3148 -#: ../src/extension/internal/wmf-inout.cpp:3147 +#: ../src/extension/internal/emf-inout.cpp:3554 +#: ../src/extension/internal/wmf-inout.cpp:3145 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" -msgstr "Používať pre konvertované znaky MS Unicode PUA (0xF020-0xF0FF)" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3574 -#: ../src/extension/internal/wmf-inout.cpp:3149 -#: ../src/extension/internal/wmf-inout.cpp:3148 +#: ../src/extension/internal/emf-inout.cpp:3555 +#: ../src/extension/internal/wmf-inout.cpp:3146 msgid "Compensate for PPT font bug" -msgstr "Kompenzovať chybu v písmach PPT" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3575 -#: ../src/extension/internal/wmf-inout.cpp:3150 -#: ../src/extension/internal/wmf-inout.cpp:3149 +#: ../src/extension/internal/emf-inout.cpp:3556 +#: ../src/extension/internal/wmf-inout.cpp:3147 msgid "Convert dashed/dotted lines to single lines" -msgstr "Konvertovať čiarkované/bodkované čiary na súvislé čiary" +msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3576 -#: ../src/extension/internal/wmf-inout.cpp:3151 -#: ../src/extension/internal/wmf-inout.cpp:3150 +#: ../src/extension/internal/emf-inout.cpp:3557 +#: ../src/extension/internal/wmf-inout.cpp:3148 +#, fuzzy msgid "Convert gradients to colored polygon series" -msgstr "Konvertovať farebné prechody na série farebných mnohouholníkov" +msgstr "Zmeniť farbu priehradky farebného prechodu" -#: ../src/extension/internal/emf-inout.cpp:3577 +#: ../src/extension/internal/emf-inout.cpp:3558 +#, fuzzy msgid "Use native rectangular linear gradients" -msgstr "Použiť natívne pravouhlé lineárne farebné prechody" +msgstr "Vytvoriť lineárny farebný prechod" -#: ../src/extension/internal/emf-inout.cpp:3578 +#: ../src/extension/internal/emf-inout.cpp:3559 msgid "Map all fill patterns to standard EMF hatches" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3579 +#: ../src/extension/internal/emf-inout.cpp:3560 +#, fuzzy msgid "Ignore image rotations" -msgstr "Ignorovať rotácie obrazu" +msgstr "Počiatok rotácie" -#: ../src/extension/internal/emf-inout.cpp:3583 +#: ../src/extension/internal/emf-inout.cpp:3564 msgid "Enhanced Metafile (*.emf)" msgstr "Rozšírený Metasúbor (*.wmf)" -#: ../src/extension/internal/emf-inout.cpp:3584 +#: ../src/extension/internal/emf-inout.cpp:3565 msgid "Enhanced Metafile" msgstr "Rozšírený Metasúbor" #: ../src/extension/internal/filter/bevels.h:53 +#, fuzzy msgid "Diffuse Light" msgstr "Difúzne osvetlenie" @@ -6057,26 +4769,30 @@ msgstr "Difúzne osvetlenie" #: ../src/extension/internal/filter/bevels.h:219 #: ../src/extension/internal/filter/paint.h:89 #: ../src/extension/internal/filter/paint.h:340 +#, fuzzy msgid "Smoothness" -msgstr "Hladkosť" +msgstr "Hladkosť:" #: ../src/extension/internal/filter/bevels.h:56 #: ../src/extension/internal/filter/bevels.h:137 #: ../src/extension/internal/filter/bevels.h:221 +#, fuzzy msgid "Elevation (°)" -msgstr "Výškový uhol (°)" +msgstr "Výškový uhol (°):" #: ../src/extension/internal/filter/bevels.h:57 #: ../src/extension/internal/filter/bevels.h:138 #: ../src/extension/internal/filter/bevels.h:222 +#, fuzzy msgid "Azimuth (°)" -msgstr "Azimut (°)" +msgstr "Azimut (°):" #: ../src/extension/internal/filter/bevels.h:58 #: ../src/extension/internal/filter/bevels.h:139 #: ../src/extension/internal/filter/bevels.h:223 +#, fuzzy msgid "Lighting color" -msgstr "Farba osvetlenia" +msgstr "Farba blesku" #: ../src/extension/internal/filter/bevels.h:62 #: ../src/extension/internal/filter/bevels.h:143 @@ -6129,15 +4845,21 @@ msgstr "Farba osvetlenia" #: ../src/extension/internal/filter/transparency.h:214 #: ../src/extension/internal/filter/transparency.h:287 #: ../src/extension/internal/filter/transparency.h:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1751 msgid "Filters" msgstr "Filtre" +#: ../src/extension/internal/filter/bevels.h:63 +#: ../src/extension/internal/filter/bevels.h:144 +#: ../src/extension/internal/filter/bevels.h:228 +msgid "Bevels" +msgstr "Vrstvenie" + #: ../src/extension/internal/filter/bevels.h:66 msgid "Basic diffuse bevel to use for building textures" msgstr "Základné difúzne vrstvenie použiteľné na zostavovanie textúr" #: ../src/extension/internal/filter/bevels.h:133 +#, fuzzy msgid "Matte Jelly" msgstr "Matné želé" @@ -6145,40 +4867,58 @@ msgstr "Matné želé" #: ../src/extension/internal/filter/bevels.h:220 #: ../src/extension/internal/filter/blurs.h:187 #: ../src/extension/internal/filter/color.h:74 +#, fuzzy msgid "Brightness" -msgstr "Jas" +msgstr "Jas:" #: ../src/extension/internal/filter/bevels.h:147 msgid "Bulging, matte jelly covering" msgstr "Pokrytie vydutým matným želé" #: ../src/extension/internal/filter/bevels.h:217 +#, fuzzy msgid "Specular Light" msgstr "Zrkadlové osvetlenie" +#: ../src/extension/internal/filter/bevels.h:231 +msgid "Basic specular bevel to use for building textures" +msgstr "Základné zrkadlové vrstvenie na zostavovanie textúr" + #: ../src/extension/internal/filter/blurs.h:56 #: ../src/extension/internal/filter/blurs.h:189 #: ../src/extension/internal/filter/blurs.h:329 #: ../src/extension/internal/filter/distort.h:73 +#, fuzzy msgid "Horizontal blur" -msgstr "Vodorovné rozostrenie" +msgstr "Vodorovné rozostrenie:" #: ../src/extension/internal/filter/blurs.h:57 #: ../src/extension/internal/filter/blurs.h:190 #: ../src/extension/internal/filter/blurs.h:330 #: ../src/extension/internal/filter/distort.h:74 +#, fuzzy msgid "Vertical blur" -msgstr "Zvislé rozostrenie" +msgstr "Zvislé rozostrenie:" #: ../src/extension/internal/filter/blurs.h:58 +#, fuzzy msgid "Blur content only" -msgstr "Rozostriť iba obsah" +msgstr "Rozostriť obsah" + +#: ../src/extension/internal/filter/blurs.h:63 +#: ../src/extension/internal/filter/blurs.h:132 +#: ../src/extension/internal/filter/blurs.h:201 +#: ../src/extension/internal/filter/blurs.h:267 +#: ../src/extension/internal/filter/blurs.h:351 +msgid "Blurs" +msgstr "Rozostrenia" #: ../src/extension/internal/filter/blurs.h:66 msgid "Simple vertical and horizontal blur effect" msgstr "Jednoduchý efekt zvislého a vodorovného rozostrenia" #: ../src/extension/internal/filter/blurs.h:125 +#, fuzzy msgid "Clean Edges" msgstr "Čisté okraje" @@ -6187,8 +4927,9 @@ msgstr "Čisté okraje" #: ../src/extension/internal/filter/paint.h:237 #: ../src/extension/internal/filter/paint.h:336 #: ../src/extension/internal/filter/paint.h:341 +#, fuzzy msgid "Strength" -msgstr "Sila" +msgstr "Sila:" #: ../src/extension/internal/filter/blurs.h:135 msgid "" @@ -6204,13 +4945,15 @@ msgid "Cross Blur" msgstr "Gausovské rozostrenie" #: ../src/extension/internal/filter/blurs.h:188 +#, fuzzy msgid "Fading" -msgstr "Prechod" +msgstr "Tieňovanie" #: ../src/extension/internal/filter/blurs.h:191 #: ../src/extension/internal/filter/textures.h:74 +#, fuzzy msgid "Blend:" -msgstr "Zmiešať:" +msgstr "Zmiešať" #: ../src/extension/internal/filter/blurs.h:192 #: ../src/extension/internal/filter/blurs.h:339 @@ -6224,7 +4967,6 @@ msgstr "Zmiešať:" #: ../src/extension/internal/filter/color.h:1602 #: ../src/extension/internal/filter/paint.h:705 #: ../src/extension/internal/filter/transparency.h:63 -#: ../src/filter-enums.cpp:55 #: ../src/filter-enums.cpp:54 msgid "Darken" msgstr "Stmaviť" @@ -6242,9 +4984,7 @@ msgstr "Stmaviť" #: ../src/extension/internal/filter/color.h:1594 #: ../src/extension/internal/filter/paint.h:703 #: ../src/extension/internal/filter/transparency.h:62 -#: ../src/filter-enums.cpp:54 ../src/ui/dialog/input.cpp:382 -#: ../src/filter-enums.cpp:53 -#, fuzzy +#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:382 msgid "Screen" msgstr "Tieniť" @@ -6262,7 +5002,6 @@ msgstr "Tieniť" #: ../src/extension/internal/filter/color.h:1601 #: ../src/extension/internal/filter/paint.h:701 #: ../src/extension/internal/filter/transparency.h:60 -#: ../src/filter-enums.cpp:53 #: ../src/filter-enums.cpp:52 msgid "Multiply" msgstr "Násobiť" @@ -6278,14 +5017,14 @@ msgstr "Násobiť" #: ../src/extension/internal/filter/color.h:1593 #: ../src/extension/internal/filter/paint.h:704 #: ../src/extension/internal/filter/transparency.h:64 -#: ../src/filter-enums.cpp:56 #: ../src/filter-enums.cpp:55 msgid "Lighten" msgstr "Zosvetliť" #: ../src/extension/internal/filter/blurs.h:204 +#, fuzzy msgid "Combine vertical and horizontal blur" -msgstr "Kombinovať zvislé a vodorovné rozostrenie" +msgstr "Jednoduchý efekt zvislého a vodorovného rozostrenia" #: ../src/extension/internal/filter/blurs.h:260 msgid "Feather" @@ -6306,8 +5045,9 @@ msgstr "Mimo gamutu!" #: ../src/extension/internal/filter/paint.h:235 #: ../src/extension/internal/filter/paint.h:342 #: ../src/extension/internal/filter/paint.h:346 +#, fuzzy msgid "Dilatation" -msgstr "Dilatácia" +msgstr "Dilatácia:" #: ../src/extension/internal/filter/blurs.h:332 #: ../src/extension/internal/filter/distort.h:76 @@ -6318,8 +5058,9 @@ msgstr "Dilatácia" #: ../src/extension/internal/filter/paint.h:347 #: ../src/extension/internal/filter/transparency.h:208 #: ../src/extension/internal/filter/transparency.h:282 +#, fuzzy msgid "Erosion" -msgstr "Erózia" +msgstr "Erózia:" #: ../src/extension/internal/filter/blurs.h:336 #: ../src/extension/internal/filter/color.h:1205 @@ -6330,8 +5071,9 @@ msgstr "Farba pozadia" #: ../src/extension/internal/filter/blurs.h:337 #: ../src/extension/internal/filter/bumps.h:129 +#, fuzzy msgid "Blend type:" -msgstr "Typ zmiešania:" +msgstr "Typ konca:" #: ../src/extension/internal/filter/blurs.h:338 #: ../src/extension/internal/filter/bumps.h:130 @@ -6348,16 +5090,14 @@ msgstr "Typ zmiešania:" #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:653 -#: ../src/filter-enums.cpp:51 -#: ../src/ui/dialog/inkscape-preferences.cpp:641 -#, fuzzy +#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:644 msgid "Normal" msgstr "Normálne" #: ../src/extension/internal/filter/blurs.h:344 +#, fuzzy msgid "Blend to background" -msgstr "Zmiešanie na pozadie" +msgstr "Odtieň na pozadie" #: ../src/extension/internal/filter/blurs.h:354 msgid "Blur eroded by white or transparency" @@ -6370,14 +5110,15 @@ msgstr "Hrče" #: ../src/extension/internal/filter/bumps.h:84 #: ../src/extension/internal/filter/bumps.h:313 +#, fuzzy msgid "Image simplification" -msgstr "Zjednodušenie obrazu" +msgstr "Neplatný pracovný adresár: %s" #: ../src/extension/internal/filter/bumps.h:85 #: ../src/extension/internal/filter/bumps.h:314 #, fuzzy msgid "Bump simplification" -msgstr "Zjednodušenie" +msgstr "Prah zjednodušenia" #: ../src/extension/internal/filter/bumps.h:87 #: ../src/extension/internal/filter/bumps.h:316 @@ -6391,11 +5132,7 @@ msgstr "Hrče" #: ../src/extension/internal/filter/color.h:637 #: ../src/extension/internal/filter/color.h:821 #: ../src/extension/internal/filter/transparency.h:132 -#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:193 -#: ../src/widgets/sp-color-icc-selector.cpp:330 -#: ../src/widgets/sp-color-scales.cpp:415 -#: ../src/widgets/sp-color-scales.cpp:416 -#: ../src/filter-enums.cpp:127 +#: ../src/filter-enums.cpp:127 ../src/ui/tools/flood-tool.cpp:193 #: ../src/widgets/sp-color-icc-selector.cpp:355 #: ../src/widgets/sp-color-scales.cpp:429 #: ../src/widgets/sp-color-scales.cpp:430 @@ -6408,11 +5145,7 @@ msgstr "Červená" #: ../src/extension/internal/filter/color.h:638 #: ../src/extension/internal/filter/color.h:822 #: ../src/extension/internal/filter/transparency.h:133 -#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:194 -#: ../src/widgets/sp-color-icc-selector.cpp:331 -#: ../src/widgets/sp-color-scales.cpp:418 -#: ../src/widgets/sp-color-scales.cpp:419 -#: ../src/filter-enums.cpp:128 +#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:194 #: ../src/widgets/sp-color-icc-selector.cpp:356 #: ../src/widgets/sp-color-scales.cpp:432 #: ../src/widgets/sp-color-scales.cpp:433 @@ -6425,11 +5158,7 @@ msgstr "Zelená" #: ../src/extension/internal/filter/color.h:639 #: ../src/extension/internal/filter/color.h:823 #: ../src/extension/internal/filter/transparency.h:134 -#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:195 -#: ../src/widgets/sp-color-icc-selector.cpp:332 -#: ../src/widgets/sp-color-scales.cpp:421 -#: ../src/widgets/sp-color-scales.cpp:422 -#: ../src/filter-enums.cpp:129 +#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:195 #: ../src/widgets/sp-color-icc-selector.cpp:357 #: ../src/widgets/sp-color-scales.cpp:435 #: ../src/widgets/sp-color-scales.cpp:436 @@ -6442,23 +5171,25 @@ msgid "Bump from background" msgstr "Odtieň na pozadie" #: ../src/extension/internal/filter/bumps.h:94 +#, fuzzy msgid "Lighting type:" -msgstr "Typ osvetlenia:" +msgstr " typ: " #: ../src/extension/internal/filter/bumps.h:95 +#, fuzzy msgid "Specular" -msgstr "Spekulárne" +msgstr "Spekulárny exponent" #: ../src/extension/internal/filter/bumps.h:96 +#, fuzzy msgid "Diffuse" -msgstr "Difúzne" +msgstr "Difúzne osvetlenie" #: ../src/extension/internal/filter/bumps.h:98 #: ../src/extension/internal/filter/bumps.h:329 #: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199 -#: ../src/widgets/rect-toolbar.cpp:335 +#: ../src/widgets/rect-toolbar.cpp:331 #: ../share/extensions/interp_att_g.inx.h:11 -#: ../src/widgets/rect-toolbar.cpp:332 msgid "Height" msgstr "Výška" @@ -6471,36 +5202,36 @@ msgstr "Výška" #: ../src/extension/internal/filter/paint.h:592 #: ../src/extension/internal/filter/paint.h:707 #: ../src/ui/tools/flood-tool.cpp:198 -#: ../src/widgets/sp-color-icc-selector.cpp:341 -#: ../src/widgets/sp-color-scales.cpp:447 -#: ../src/widgets/sp-color-scales.cpp:448 ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 #: ../src/widgets/sp-color-icc-selector.cpp:366 #: ../src/widgets/sp-color-scales.cpp:461 -#: ../src/widgets/sp-color-scales.cpp:462 +#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:318 +#: ../share/extensions/color_randomize.inx.h:5 msgid "Lightness" msgstr "Jas" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 +#, fuzzy msgid "Precision" -msgstr "Presnosť" +msgstr "Presnosť:" #: ../src/extension/internal/filter/bumps.h:103 +#, fuzzy msgid "Light source" -msgstr "Zdroj svetla" +msgstr "Zdroj svetla:" #: ../src/extension/internal/filter/bumps.h:104 +#, fuzzy msgid "Light source:" msgstr "Zdroj svetla:" #: ../src/extension/internal/filter/bumps.h:105 +#, fuzzy msgid "Distant" -msgstr "Vzdialený" +msgstr "Deformácie" #: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Point" msgstr "bod" @@ -6509,8 +5240,9 @@ msgid "Spot" msgstr "" #: ../src/extension/internal/filter/bumps.h:109 +#, fuzzy msgid "Distant light options" -msgstr "Možnosti vzdialeného osvetlenia" +msgstr "Vzdialené osvetlenie" #: ../src/extension/internal/filter/bumps.h:110 #: ../src/extension/internal/filter/bumps.h:332 @@ -6531,18 +5263,21 @@ msgstr "Bodové osvetlenie" #: ../src/extension/internal/filter/bumps.h:113 #: ../src/extension/internal/filter/bumps.h:117 +#, fuzzy msgid "X location" -msgstr "Umiestnenie X" +msgstr " umiestnenie: " #: ../src/extension/internal/filter/bumps.h:114 #: ../src/extension/internal/filter/bumps.h:118 +#, fuzzy msgid "Y location" -msgstr "Umiestnenie Y" +msgstr " umiestnenie: " #: ../src/extension/internal/filter/bumps.h:115 #: ../src/extension/internal/filter/bumps.h:119 +#, fuzzy msgid "Z location" -msgstr "Umiestnenie Z" +msgstr " umiestnenie: " #: ../src/extension/internal/filter/bumps.h:116 #, fuzzy @@ -6550,34 +5285,45 @@ msgid "Spot light options" msgstr "Miestne osvetlenie" #: ../src/extension/internal/filter/bumps.h:120 +#, fuzzy msgid "X target" -msgstr "Cieľ X" +msgstr "Cieľ:" #: ../src/extension/internal/filter/bumps.h:121 +#, fuzzy msgid "Y target" -msgstr "Cieľ Y" +msgstr "Cieľ:" #: ../src/extension/internal/filter/bumps.h:122 +#, fuzzy msgid "Z target" -msgstr "Cieľ Z" +msgstr "Cieľ:" #: ../src/extension/internal/filter/bumps.h:123 +#, fuzzy msgid "Specular exponent" msgstr "Zrkadlový exponent" #: ../src/extension/internal/filter/bumps.h:124 +#, fuzzy msgid "Cone angle" msgstr "Uhol kužeľa" #: ../src/extension/internal/filter/bumps.h:127 +#, fuzzy msgid "Image color" -msgstr "Farbu obrázka" +msgstr "Vložiť farbu" #: ../src/extension/internal/filter/bumps.h:128 #, fuzzy msgid "Color bump" msgstr "Farba 1" +#: ../src/extension/internal/filter/bumps.h:142 +#: ../src/extension/internal/filter/bumps.h:362 +msgid "Bumps" +msgstr "Hrče" + #: ../src/extension/internal/filter/bumps.h:145 msgid "All purposes bump filter" msgstr "" @@ -6594,9 +5340,7 @@ msgstr "_Pozadie:" #: ../src/extension/internal/filter/bumps.h:322 #: ../src/extension/internal/filter/transparency.h:57 -#: ../src/filter-enums.cpp:30 ../src/sp-image.cpp:518 -#: ../src/filter-enums.cpp:29 -#: ../src/sp-image.cpp:517 +#: ../src/filter-enums.cpp:29 ../src/sp-image.cpp:517 msgid "Image" msgstr "Obrázok" @@ -6637,12 +5381,12 @@ msgid "Revert bump" msgstr "_Vrátiť" #: ../src/extension/internal/filter/bumps.h:352 +#, fuzzy msgid "Transparency type:" -msgstr "Typ priesvitnosti:" +msgstr "Priesvitná" #: ../src/extension/internal/filter/bumps.h:353 #: ../src/extension/internal/filter/morphology.h:176 -#: ../src/filter-enums.cpp:91 #: ../src/filter-enums.cpp:90 msgid "Atop" msgstr "Navrch" @@ -6650,7 +5394,6 @@ msgstr "Navrch" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 #: ../src/extension/internal/filter/morphology.h:174 -#: ../src/filter-enums.cpp:89 #: ../src/filter-enums.cpp:88 msgid "In" msgstr "Dnu" @@ -6665,8 +5408,9 @@ msgstr "Briliantový lesk" #: ../src/extension/internal/filter/color.h:75 #: ../src/extension/internal/filter/color.h:1417 +#, fuzzy msgid "Over-saturation" -msgstr "Presýtenie" +msgstr "Presýtenie:" #: ../src/extension/internal/filter/color.h:77 #: ../src/extension/internal/filter/color.h:161 @@ -6683,58 +5427,57 @@ msgid "Brightness filter" msgstr "Filter jasu" #: ../src/extension/internal/filter/color.h:152 +#, fuzzy msgid "Channel Painting" -msgstr "Maľovanie kanálov" +msgstr "Olejomaľba" #: ../src/extension/internal/filter/color.h:156 #: ../src/extension/internal/filter/color.h:257 -#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:952 +#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:65 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 #: ../src/ui/tools/flood-tool.cpp:197 -#: ../src/widgets/sp-color-icc-selector.cpp:337 -#: ../src/widgets/sp-color-icc-selector.cpp:342 -#: ../src/widgets/sp-color-scales.cpp:444 -#: ../src/widgets/sp-color-scales.cpp:445 ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 -#: ../src/filter-enums.cpp:65 -#: ../src/ui/dialog/inkscape-preferences.cpp:940 #: ../src/widgets/sp-color-icc-selector.cpp:362 #: ../src/widgets/sp-color-icc-selector.cpp:367 #: ../src/widgets/sp-color-scales.cpp:458 -#: ../src/widgets/sp-color-scales.cpp:459 +#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:302 +#: ../share/extensions/color_randomize.inx.h:4 msgid "Saturation" msgstr "Sýtosť" #: ../src/extension/internal/filter/color.h:160 #: ../src/extension/internal/filter/transparency.h:135 -#: ../src/filter-enums.cpp:131 ../src/ui/tools/flood-tool.cpp:199 -#: ../src/filter-enums.cpp:130 +#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:199 msgid "Alpha" msgstr "Alfa" #: ../src/extension/internal/filter/color.h:174 +#, fuzzy msgid "Replace RGB by any color" -msgstr "Nahradiť RGB akoukoľvek farbou" +msgstr "Nahradiť odtieň dvoma farbami" #: ../src/extension/internal/filter/color.h:254 +#, fuzzy msgid "Color Shift" -msgstr "Posun farieb" +msgstr "Farebné odtiene" #: ../src/extension/internal/filter/color.h:256 +#, fuzzy msgid "Shift (°)" -msgstr "Posun (°)" +msgstr "Posun (°):" #: ../src/extension/internal/filter/color.h:265 msgid "Rotate and desaturate hue" msgstr "Otočiť a odsýtiť odtieň" #: ../src/extension/internal/filter/color.h:321 +#, fuzzy msgid "Harsh light" -msgstr "Ostré svetlo" +msgstr "Ostré svetlo:" #: ../src/extension/internal/filter/color.h:322 +#, fuzzy msgid "Normal light" -msgstr "Normálne svetlo" +msgstr "Normálne svetlo:" #: ../src/extension/internal/filter/color.h:323 msgid "Duotone" @@ -6754,54 +5497,48 @@ msgstr "Zmiešanie 2:" msgid "Blend image or object with a flood color" msgstr "Zmiešať obrázok alebo objekt s farbou výplne" -#: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:23 -#: ../src/filter-enums.cpp:22 +#: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:22 msgid "Component Transfer" msgstr "Prenos zložky" -#: ../src/extension/internal/filter/color.h:427 ../src/filter-enums.cpp:110 -#: ../src/filter-enums.cpp:109 +#: ../src/extension/internal/filter/color.h:427 ../src/filter-enums.cpp:109 msgid "Identity" msgstr "Identita" #: ../src/extension/internal/filter/color.h:428 -#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:111 +#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:110 #: ../src/ui/dialog/filter-effects-dialog.cpp:1050 -#: ../src/filter-enums.cpp:110 msgid "Table" msgstr "Tabuľka" #: ../src/extension/internal/filter/color.h:429 -#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:112 +#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:111 #: ../src/ui/dialog/filter-effects-dialog.cpp:1053 -#: ../src/filter-enums.cpp:111 msgid "Discrete" msgstr "Diskrétne" -#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:113 -#: ../src/live_effects/lpe-interpolate_points.cpp:25 -#: ../src/live_effects/lpe-powerstroke.cpp:194 -#: ../src/filter-enums.cpp:112 +#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:112 #: ../src/live_effects/lpe-powerstroke.cpp:188 msgid "Linear" msgstr "Lineárne" -#: ../src/extension/internal/filter/color.h:431 ../src/filter-enums.cpp:114 -#: ../src/filter-enums.cpp:113 +#: ../src/extension/internal/filter/color.h:431 ../src/filter-enums.cpp:113 msgid "Gamma" msgstr "Gama" #: ../src/extension/internal/filter/color.h:440 +#, fuzzy msgid "Basic component transfer structure" -msgstr "Základná zložka prechodovej štruktúry" +msgstr "Základná textúra šumovej priesvitnosti" #: ../src/extension/internal/filter/color.h:509 msgid "Duochrome" msgstr "Dvojtónové" #: ../src/extension/internal/filter/color.h:513 +#, fuzzy msgid "Fluorescence level" -msgstr "Úroveň fluorescencie" +msgstr "Úroveň fluorescencie:" #: ../src/extension/internal/filter/color.h:514 msgid "Swap:" @@ -6836,14 +5573,11 @@ msgid "Convert luminance values to a duochrome palette" msgstr "Previesť hodnoty svetlosti na dvojtónovú paletu" #: ../src/extension/internal/filter/color.h:634 +#, fuzzy msgid "Extract Channel" -msgstr "Extrahovať kanál" +msgstr "Kanál krytia" #: ../src/extension/internal/filter/color.h:640 -#: ../src/widgets/sp-color-icc-selector.cpp:344 -#: ../src/widgets/sp-color-icc-selector.cpp:349 -#: ../src/widgets/sp-color-scales.cpp:469 -#: ../src/widgets/sp-color-scales.cpp:470 #: ../src/widgets/sp-color-icc-selector.cpp:369 #: ../src/widgets/sp-color-icc-selector.cpp:374 #: ../src/widgets/sp-color-scales.cpp:483 @@ -6852,10 +5586,6 @@ msgid "Cyan" msgstr "Azúrová" #: ../src/extension/internal/filter/color.h:641 -#: ../src/widgets/sp-color-icc-selector.cpp:345 -#: ../src/widgets/sp-color-icc-selector.cpp:350 -#: ../src/widgets/sp-color-scales.cpp:472 -#: ../src/widgets/sp-color-scales.cpp:473 #: ../src/widgets/sp-color-icc-selector.cpp:370 #: ../src/widgets/sp-color-icc-selector.cpp:375 #: ../src/widgets/sp-color-scales.cpp:486 @@ -6864,44 +5594,40 @@ msgid "Magenta" msgstr "Fialová" #: ../src/extension/internal/filter/color.h:642 -#: ../src/widgets/sp-color-icc-selector.cpp:346 -#: ../src/widgets/sp-color-icc-selector.cpp:351 -#: ../src/widgets/sp-color-scales.cpp:475 -#: ../src/widgets/sp-color-scales.cpp:476 #: ../src/widgets/sp-color-icc-selector.cpp:371 #: ../src/widgets/sp-color-icc-selector.cpp:376 #: ../src/widgets/sp-color-scales.cpp:489 #: ../src/widgets/sp-color-scales.cpp:490 -#, fuzzy msgid "Yellow" msgstr "Žltá" #: ../src/extension/internal/filter/color.h:644 +#, fuzzy msgid "Background blend mode:" -msgstr "Farba zmiešania pozadia:" +msgstr "Farba pozadia:" #: ../src/extension/internal/filter/color.h:649 +#, fuzzy msgid "Channel to alpha" -msgstr "Kanál na priesvitnosť" +msgstr "Svetlosť na priesvitnosť" #: ../src/extension/internal/filter/color.h:657 +#, fuzzy msgid "Extract color channel as a transparent image" -msgstr "Extrahovať farebný kanál ako priesvitný obrázok" +msgstr "Extrahovať určený kanál z obrázka" #: ../src/extension/internal/filter/color.h:740 +#, fuzzy msgid "Fade to Black or White" -msgstr "Prechod do čiernej alebo bielej" +msgstr "Čierna a biela" #: ../src/extension/internal/filter/color.h:743 +#, fuzzy msgid "Fade to:" -msgstr "Do stratena:" +msgstr "Do stratena:" #: ../src/extension/internal/filter/color.h:744 -#: ../src/ui/widget/selected-style.cpp:274 -#: ../src/widgets/sp-color-icc-selector.cpp:347 -#: ../src/widgets/sp-color-scales.cpp:478 -#: ../src/widgets/sp-color-scales.cpp:479 -#: ../src/ui/widget/selected-style.cpp:261 +#: ../src/ui/widget/selected-style.cpp:257 #: ../src/widgets/sp-color-icc-selector.cpp:372 #: ../src/widgets/sp-color-scales.cpp:492 #: ../src/widgets/sp-color-scales.cpp:493 @@ -6909,16 +5635,17 @@ msgid "Black" msgstr "Čierna" #: ../src/extension/internal/filter/color.h:745 -#: ../src/ui/widget/selected-style.cpp:270 -#: ../src/ui/widget/selected-style.cpp:257 +#: ../src/ui/widget/selected-style.cpp:253 msgid "White" msgstr "Biela" #: ../src/extension/internal/filter/color.h:754 +#, fuzzy msgid "Fade to black or white" -msgstr "Prechod do čiernej alebo bielej" +msgstr "Iba čierna a biela" #: ../src/extension/internal/filter/color.h:819 +#, fuzzy msgid "Greyscale" msgstr "Odtiene šedej" @@ -6933,30 +5660,34 @@ msgid "Customize greyscale components" msgstr "Prispôsobiť zložky stupňov šedej" #: ../src/extension/internal/filter/color.h:905 -#: ../src/ui/widget/selected-style.cpp:266 -#: ../src/ui/widget/selected-style.cpp:253 +#: ../src/ui/widget/selected-style.cpp:249 msgid "Invert" msgstr "Invertovať" #: ../src/extension/internal/filter/color.h:907 +#, fuzzy msgid "Invert channels:" -msgstr "Invertovať kanály:" +msgstr "Invertovať odtieň" #: ../src/extension/internal/filter/color.h:908 +#, fuzzy msgid "No inversion" -msgstr "Bez inverzie" +msgstr "Nové v tejto verzii" #: ../src/extension/internal/filter/color.h:909 +#, fuzzy msgid "Red and blue" -msgstr "Červená a modrá" +msgstr "chrobák pridaná modrá" #: ../src/extension/internal/filter/color.h:910 +#, fuzzy msgid "Red and green" -msgstr "Červená a zelená" +msgstr "žeriav pridaná zelená" #: ../src/extension/internal/filter/color.h:911 +#, fuzzy msgid "Green and blue" -msgstr "Zelená a modrá" +msgstr "Zelený kanál" #: ../src/extension/internal/filter/color.h:913 #, fuzzy @@ -6968,32 +5699,34 @@ msgid "Invert hue" msgstr "Invertovať odtieň" #: ../src/extension/internal/filter/color.h:915 +#, fuzzy msgid "Invert lightness" -msgstr "Invertovať svetlosť" +msgstr "Invertovať obrázok" #: ../src/extension/internal/filter/color.h:916 +#, fuzzy msgid "Invert transparency" -msgstr "Invertovať priesvitnosť" +msgstr "Rozmazaná priesvitnosť" #: ../src/extension/internal/filter/color.h:924 msgid "Manage hue, lightness and transparency inversions" msgstr "Nastaviť inverzie odtieňa, jasu a priesvitnosti" #: ../src/extension/internal/filter/color.h:1042 +#, fuzzy msgid "Lights" -msgstr "Svetlá" +msgstr "Svetlá:" #: ../src/extension/internal/filter/color.h:1043 +#, fuzzy msgid "Shadows" -msgstr "Tiene" +msgstr "Tiene:" #: ../src/extension/internal/filter/color.h:1044 -#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 -#: ../src/live_effects/effect.cpp:110 +#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:32 +#: ../src/live_effects/effect.cpp:95 #: ../src/ui/dialog/filter-effects-dialog.cpp:1047 #: ../src/widgets/gradient-toolbar.cpp:1156 -#: ../src/filter-enums.cpp:32 -#: ../src/live_effects/effect.cpp:95 msgid "Offset" msgstr "Posun" @@ -7006,16 +5739,18 @@ msgid "Lightness-Contrast" msgstr "Jas-kontrast" #: ../src/extension/internal/filter/color.h:1122 +#, fuzzy msgid "Modify lightness and contrast separately" -msgstr "Meniť svetlosť a kontrast oddelene" +msgstr "Zmeniť svetlá a tiene oddelene" #: ../src/extension/internal/filter/color.h:1190 msgid "Nudge RGB" msgstr "" #: ../src/extension/internal/filter/color.h:1194 +#, fuzzy msgid "Red offset" -msgstr "Posun červenej" +msgstr "Posun vzorky" #: ../src/extension/internal/filter/color.h:1195 #: ../src/extension/internal/filter/color.h:1198 @@ -7034,16 +5769,19 @@ msgstr "X" #: ../src/extension/internal/filter/color.h:1311 #: ../src/extension/internal/filter/color.h:1314 #: ../src/ui/dialog/input.cpp:1616 +#, fuzzy msgid "Y" -msgstr "Y" +msgstr "Y:" #: ../src/extension/internal/filter/color.h:1197 +#, fuzzy msgid "Green offset" -msgstr "Posun zelenej" +msgstr "Posun vzorky" #: ../src/extension/internal/filter/color.h:1200 +#, fuzzy msgid "Blue offset" -msgstr "Posun modrej" +msgstr "Akú hodnotu nastaviť:" #: ../src/extension/internal/filter/color.h:1215 msgid "" @@ -7056,30 +5794,34 @@ msgid "Nudge CMY" msgstr "" #: ../src/extension/internal/filter/color.h:1306 +#, fuzzy msgid "Cyan offset" -msgstr "Posun azúrovej" +msgstr "Posun vzorky" #: ../src/extension/internal/filter/color.h:1309 +#, fuzzy msgid "Magenta offset" -msgstr "Posun purpurovej" +msgstr "Tangenciálne posunutie:" #: ../src/extension/internal/filter/color.h:1312 +#, fuzzy msgid "Yellow offset" -msgstr "Posun žltej" +msgstr "Posun vzorky" #: ../src/extension/internal/filter/color.h:1327 msgid "" "Nudge CMY channels separately and blend them to different types of " "backgrounds" -msgstr "Posunúť kanály CMY nezávisle a zmiešať ich do rozličných typov pozadí" +msgstr "" #: ../src/extension/internal/filter/color.h:1408 msgid "Quadritone fantasy" msgstr "Štovrtónové fantasy" #: ../src/extension/internal/filter/color.h:1410 +#, fuzzy msgid "Hue distribution (°)" -msgstr "Rozdelenie odtieňa (°)" +msgstr "Rozdelenie odtieňa (°):" #: ../src/extension/internal/filter/color.h:1411 #: ../share/extensions/svgcalendar.inx.h:19 @@ -7091,8 +5833,9 @@ msgid "Replace hue by two colors" msgstr "Nahradiť odtieň dvoma farbami" #: ../src/extension/internal/filter/color.h:1496 +#, fuzzy msgid "Hue rotation (°)" -msgstr "Otočenie odtieňa (°)" +msgstr "Otočenie odtieňa (°):" #: ../src/extension/internal/filter/color.h:1499 msgid "Moonarize" @@ -7111,20 +5854,23 @@ msgid "Enhance hue" msgstr "Rozšíriť odtieň" #: ../src/extension/internal/filter/color.h:1588 +#, fuzzy msgid "Phosphorescence" -msgstr "Fosforeskovanie" +msgstr "Prítomnosť" #: ../src/extension/internal/filter/color.h:1589 +#, fuzzy msgid "Colored nights" -msgstr "Farebné noci" +msgstr "Farebné odtiene" #: ../src/extension/internal/filter/color.h:1590 msgid "Hue to background" msgstr "Odtieň na pozadie" #: ../src/extension/internal/filter/color.h:1592 +#, fuzzy msgid "Global blend:" -msgstr "Globálne zmiešanie:" +msgstr "Pridá globálne ohnutie šrafovania" #: ../src/extension/internal/filter/color.h:1598 msgid "Glow" @@ -7135,12 +5881,14 @@ msgid "Glow blend:" msgstr "Zmiešanie žiary:" #: ../src/extension/internal/filter/color.h:1604 +#, fuzzy msgid "Local light" -msgstr "Lokálne osvetlenie" +msgstr "Lokálne osvetlenie:" #: ../src/extension/internal/filter/color.h:1605 +#, fuzzy msgid "Global light" -msgstr "Globálne osvetlenie" +msgstr "Globálne osvetlenie:" #: ../src/extension/internal/filter/color.h:1608 msgid "Hue distribution (°):" @@ -7155,21 +5903,20 @@ msgstr "" "pohybom odtieňa" #: ../src/extension/internal/filter/distort.h:67 +#, fuzzy msgid "Felt Feather" -msgstr "Plstené pero" +msgstr "Pero" #: ../src/extension/internal/filter/distort.h:71 #: ../src/extension/internal/filter/morphology.h:175 -#: ../src/filter-enums.cpp:90 #: ../src/filter-enums.cpp:89 msgid "Out" msgstr "Von" #: ../src/extension/internal/filter/distort.h:77 #: ../src/extension/internal/filter/textures.h:75 -#: ../src/ui/widget/selected-style.cpp:132 -#: ../src/ui/widget/style-swatch.cpp:128 #: ../src/ui/widget/selected-style.cpp:131 +#: ../src/ui/widget/style-swatch.cpp:128 msgid "Stroke:" msgstr "Ťah:" @@ -7181,30 +5928,31 @@ msgstr "Široký" #: ../src/extension/internal/filter/distort.h:80 #: ../src/extension/internal/filter/textures.h:78 +#, fuzzy msgid "Narrow" -msgstr "Úzky" +msgstr "úzky" #: ../src/extension/internal/filter/distort.h:81 msgid "No fill" -msgstr "Bez výplne" +msgstr "bez výplne" #: ../src/extension/internal/filter/distort.h:83 +#, fuzzy msgid "Turbulence:" -msgstr "Turbulencia:" +msgstr "Turbulencia" #: ../src/extension/internal/filter/distort.h:84 #: ../src/extension/internal/filter/distort.h:193 #: ../src/extension/internal/filter/overlays.h:61 #: ../src/extension/internal/filter/paint.h:692 +#, fuzzy msgid "Fractal noise" msgstr "Fraktálový šum" #: ../src/extension/internal/filter/distort.h:85 #: ../src/extension/internal/filter/distort.h:194 #: ../src/extension/internal/filter/overlays.h:62 -#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:36 -#: ../src/filter-enums.cpp:145 -#: ../src/filter-enums.cpp:35 +#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:35 #: ../src/filter-enums.cpp:144 msgid "Turbulence" msgstr "Turbulencia" @@ -7213,41 +5961,51 @@ msgstr "Turbulencia" #: ../src/extension/internal/filter/distort.h:196 #: ../src/extension/internal/filter/paint.h:93 #: ../src/extension/internal/filter/paint.h:695 +#, fuzzy msgid "Horizontal frequency" -msgstr "Vodorovná frekvencia" +msgstr "Vodorovná frekvencia:" #: ../src/extension/internal/filter/distort.h:88 #: ../src/extension/internal/filter/distort.h:197 #: ../src/extension/internal/filter/paint.h:94 #: ../src/extension/internal/filter/paint.h:696 +#, fuzzy msgid "Vertical frequency" -msgstr "Zvislá frekvencia" +msgstr "Zvislá frekvencia:" #: ../src/extension/internal/filter/distort.h:89 #: ../src/extension/internal/filter/distort.h:198 #: ../src/extension/internal/filter/paint.h:95 #: ../src/extension/internal/filter/paint.h:697 +#, fuzzy msgid "Complexity" -msgstr "Zložitosť" +msgstr "Zložitosť:" #: ../src/extension/internal/filter/distort.h:90 #: ../src/extension/internal/filter/distort.h:199 #: ../src/extension/internal/filter/paint.h:96 #: ../src/extension/internal/filter/paint.h:698 +#, fuzzy msgid "Variation" -msgstr "Variácia" +msgstr "Variácia:" #: ../src/extension/internal/filter/distort.h:91 #: ../src/extension/internal/filter/distort.h:200 +#, fuzzy msgid "Intensity" -msgstr "Intenzita" +msgstr "Intenzita:" + +#: ../src/extension/internal/filter/distort.h:96 +#: ../src/extension/internal/filter/distort.h:205 +msgid "Distort" +msgstr "Deformácie" #: ../src/extension/internal/filter/distort.h:99 +#, fuzzy msgid "Blur and displace edges of shapes and pictures" -msgstr "Rozostriť a presunúť okraje objektov a obrázkov" +msgstr "Pridáva dovnútra objektov a obrázkov vyfarbiteľnú žiaru" #: ../src/extension/internal/filter/distort.h:190 -#: ../src/live_effects/effect.cpp:140 msgid "Roughen" msgstr "Zdrsniť" @@ -7275,6 +6033,7 @@ msgid "Null external module directory name. Filters will not be loaded." msgstr "Prázdny názov adresára externých modulov. Filtre nebudú načítané." #: ../src/extension/internal/filter/image.h:49 +#, fuzzy msgid "Edge Detect" msgstr "Detekcia hrán" @@ -7286,21 +6045,28 @@ msgstr "Detegovať:" #: ../src/extension/internal/filter/image.h:52 #: ../src/ui/dialog/template-load-tab.cpp:105 #: ../src/ui/dialog/template-load-tab.cpp:142 +#, fuzzy msgid "All" -msgstr "Všetky" +msgstr "všetky" #: ../src/extension/internal/filter/image.h:53 +#, fuzzy msgid "Vertical lines" -msgstr "Zvislé čiary" +msgstr "Zvislý polomer" #: ../src/extension/internal/filter/image.h:54 +#, fuzzy msgid "Horizontal lines" -msgstr "Vodorovné čiary" +msgstr "Vodorovný polomer" #: ../src/extension/internal/filter/image.h:57 msgid "Invert colors" msgstr "Invertovať farby" +#: ../src/extension/internal/filter/image.h:62 +msgid "Image Effects" +msgstr "Obrazové efekty" + #: ../src/extension/internal/filter/image.h:65 msgid "Detect color edges in object" msgstr "Zistiť farebné hrany v objekte" @@ -7311,29 +6077,31 @@ msgstr "Hladké priesečníky" #: ../src/extension/internal/filter/morphology.h:61 #: ../src/extension/internal/filter/shadows.h:66 +#, fuzzy msgid "Inner" -msgstr "Vnútorný" +msgstr "Vnútorná žiara" #: ../src/extension/internal/filter/morphology.h:62 #: ../src/extension/internal/filter/shadows.h:65 msgid "Outer" -msgstr "Vonkajší" +msgstr "Vonkajšia žiara" #: ../src/extension/internal/filter/morphology.h:63 +#, fuzzy msgid "Open" -msgstr "Otvoriť" +msgstr "_Otvoriť..." #: ../src/extension/internal/filter/morphology.h:65 #: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 -#: ../src/widgets/rect-toolbar.cpp:318 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/rect-toolbar.cpp:314 ../src/widgets/spray-toolbar.cpp:116 #: ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/interp_att_g.inx.h:10 -#: ../src/widgets/rect-toolbar.cpp:315 msgid "Width" msgstr "Šírka" #: ../src/extension/internal/filter/morphology.h:69 #: ../src/extension/internal/filter/morphology.h:190 +#, fuzzy msgid "Antialiasing" msgstr "Antialiasing" @@ -7341,6 +6109,12 @@ msgstr "Antialiasing" msgid "Blur content" msgstr "Rozostriť obsah" +#: ../src/extension/internal/filter/morphology.h:76 +#: ../src/extension/internal/filter/morphology.h:203 +#: ../src/filter-enums.cpp:31 +msgid "Morphology" +msgstr "Morfológia" + #: ../src/extension/internal/filter/morphology.h:79 msgid "Smooth edges and angles of shapes" msgstr "Hladké hrany a uhly tvarov" @@ -7350,88 +6124,100 @@ msgid "Outline" msgstr "Obrys" #: ../src/extension/internal/filter/morphology.h:170 +#, fuzzy msgid "Fill image" -msgstr "Vyplniť obrázok" +msgstr "Všetky obrázky" #: ../src/extension/internal/filter/morphology.h:171 +#, fuzzy msgid "Hide image" -msgstr "Skryť obrázok" +msgstr "Skryť vrstvu" #: ../src/extension/internal/filter/morphology.h:172 +#, fuzzy msgid "Composite type:" -msgstr "Kompozitný typ:" +msgstr "Kombinovať" #: ../src/extension/internal/filter/morphology.h:173 -#: ../src/filter-enums.cpp:88 #: ../src/filter-enums.cpp:87 msgid "Over" msgstr "Cez" #: ../src/extension/internal/filter/morphology.h:177 -#: ../src/filter-enums.cpp:92 #: ../src/filter-enums.cpp:91 msgid "XOR" msgstr "XOR" #: ../src/extension/internal/filter/morphology.h:179 #: ../src/ui/dialog/layer-properties.cpp:185 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:59 msgid "Position:" msgstr "Poloha:" #: ../src/extension/internal/filter/morphology.h:180 +#, fuzzy msgid "Inside" -msgstr "Vnútri" +msgstr "2. strana" #: ../src/extension/internal/filter/morphology.h:181 +#, fuzzy msgid "Outside" -msgstr "Vonku" +msgstr "Posunúť _von" #: ../src/extension/internal/filter/morphology.h:182 +#, fuzzy msgid "Overlayed" -msgstr "Prekryté" +msgstr "Prekrytia" #: ../src/extension/internal/filter/morphology.h:184 +#, fuzzy msgid "Width 1" -msgstr "Šírka 1" +msgstr "Šírka:" #: ../src/extension/internal/filter/morphology.h:185 +#, fuzzy msgid "Dilatation 1" -msgstr "Dilatácia 1" +msgstr "Dilatácia:" #: ../src/extension/internal/filter/morphology.h:186 +#, fuzzy msgid "Erosion 1" -msgstr "Erózia 1" +msgstr "Erózia:" #: ../src/extension/internal/filter/morphology.h:187 +#, fuzzy msgid "Width 2" -msgstr "Šírka 2" +msgstr "Šírka:" #: ../src/extension/internal/filter/morphology.h:188 +#, fuzzy msgid "Dilatation 2" -msgstr "Dilatácia 2" +msgstr "Dilatácia:" #: ../src/extension/internal/filter/morphology.h:189 +#, fuzzy msgid "Erosion 2" -msgstr "Erózia 2" +msgstr "Erózia:" #: ../src/extension/internal/filter/morphology.h:191 msgid "Smooth" msgstr "Hladké" #: ../src/extension/internal/filter/morphology.h:195 +#, fuzzy msgid "Fill opacity:" -msgstr "Krytie výplne:" +msgstr "Krytie výplne (%):" #: ../src/extension/internal/filter/morphology.h:196 +#, fuzzy msgid "Stroke opacity:" -msgstr "Krytie ťahu:" +msgstr "Krytie ťahu (%):" #: ../src/extension/internal/filter/morphology.h:206 msgid "Adds a colorizable outline" msgstr "Pridáva vyfarbiteľný obrys" #: ../src/extension/internal/filter/overlays.h:56 +#, fuzzy msgid "Noise Fill" msgstr "Výplň šumom" @@ -7492,16 +6278,22 @@ msgid "Erosion:" msgstr "Erózia:" #: ../src/extension/internal/filter/overlays.h:72 +#, fuzzy msgid "Noise color" -msgstr "Farba šumu" +msgstr "Nová farba" + +#: ../src/extension/internal/filter/overlays.h:80 +msgid "Overlays" +msgstr "Prekrytia" #: ../src/extension/internal/filter/overlays.h:83 msgid "Basic noise fill and transparency texture" msgstr "Základná výplň šumom a textúra priesvitnosti" #: ../src/extension/internal/filter/paint.h:71 +#, fuzzy msgid "Chromolitho" -msgstr "Chromolitografia" +msgstr "Chromolitografia, vlastné" #: ../src/extension/internal/filter/paint.h:75 #: ../share/extensions/jessyInk_keyBindings.inx.h:16 @@ -7514,16 +6306,18 @@ msgstr "Zmiešanie kreslenia:" #: ../src/extension/internal/filter/paint.h:84 msgid "Dented" -msgstr "S preliačinami" +msgstr "" #: ../src/extension/internal/filter/paint.h:88 #: ../src/extension/internal/filter/paint.h:699 +#, fuzzy msgid "Noise reduction" -msgstr "Redukcia šumu" +msgstr "Redukcia šumu:" #: ../src/extension/internal/filter/paint.h:91 +#, fuzzy msgid "Grain" -msgstr "Zrno" +msgstr "Režim zrna" #: ../src/extension/internal/filter/paint.h:92 msgid "Grain mode" @@ -7532,25 +6326,39 @@ msgstr "Režim zrna" #: ../src/extension/internal/filter/paint.h:97 #: ../src/extension/internal/filter/transparency.h:207 #: ../src/extension/internal/filter/transparency.h:281 +#, fuzzy msgid "Expansion" -msgstr "Expanzia" +msgstr "Expanzia:" #: ../src/extension/internal/filter/paint.h:100 msgid "Grain blend:" msgstr "Zmiešanie zrna:" +#: ../src/extension/internal/filter/paint.h:113 +#: ../src/extension/internal/filter/paint.h:244 +#: ../src/extension/internal/filter/paint.h:363 +#: ../src/extension/internal/filter/paint.h:507 +#: ../src/extension/internal/filter/paint.h:602 +#: ../src/extension/internal/filter/paint.h:725 +#: ../src/extension/internal/filter/paint.h:877 +#: ../src/extension/internal/filter/paint.h:981 +msgid "Image Paint and Draw" +msgstr "Maľovanie a kreslenie obrázka" + #: ../src/extension/internal/filter/paint.h:116 msgid "Chromo effect with customizable edge drawing and graininess" msgstr "Chromatický efekt s prispôsobiteľným kreslením hrán a zrnitosťou" #: ../src/extension/internal/filter/paint.h:232 +#, fuzzy msgid "Cross Engraving" msgstr "Rytina" #: ../src/extension/internal/filter/paint.h:234 #: ../src/extension/internal/filter/paint.h:337 +#, fuzzy msgid "Clean-up" -msgstr "Vyčistiť" +msgstr "Vyčistiť:" #: ../src/extension/internal/filter/paint.h:238 #: ../share/extensions/measure.inx.h:11 @@ -7562,47 +6370,54 @@ msgid "Convert image to an engraving made of vertical and horizontal lines" msgstr "Previesť obrázok na rytinu vytvorenú zo zvislých a vodorovných čiar" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:1003 -#: ../src/widgets/desktop-widget.cpp:1996 #: ../src/ui/dialog/align-and-distribute.cpp:1004 +#: ../src/widgets/desktop-widget.cpp:1996 msgid "Drawing" msgstr "Kresba" -#. 0.91 #: ../src/extension/internal/filter/paint.h:335 #: ../src/extension/internal/filter/paint.h:496 #: ../src/extension/internal/filter/paint.h:590 -#: ../src/extension/internal/filter/paint.h:976 -#: ../src/live_effects/effect.cpp:151 ../src/splivarot.cpp:2212 +#: ../src/extension/internal/filter/paint.h:976 ../src/splivarot.cpp:2212 msgid "Simplify" msgstr "Zjednodušiť" #: ../src/extension/internal/filter/paint.h:338 #: ../src/extension/internal/filter/paint.h:709 +#, fuzzy msgid "Erase" -msgstr "Vymazať" +msgstr "Vymazať:" + +#: ../src/extension/internal/filter/paint.h:339 +msgid "Translucent" +msgstr "Priesvitnosť" #: ../src/extension/internal/filter/paint.h:344 +#, fuzzy msgid "Melt" -msgstr "Roztopiť" +msgstr "Roztopiť:" #: ../src/extension/internal/filter/paint.h:350 #: ../src/extension/internal/filter/paint.h:712 +#, fuzzy msgid "Fill color" -msgstr "Farba výplne" +msgstr "Jednoduchá farba:" #: ../src/extension/internal/filter/paint.h:351 #: ../src/extension/internal/filter/paint.h:714 +#, fuzzy msgid "Image on fill" -msgstr "Obrázok výplne" +msgstr "Súbor obrázka" #: ../src/extension/internal/filter/paint.h:354 +#, fuzzy msgid "Stroke color" -msgstr "Farba ťahu" +msgstr "Nastaviť farbu ťahu" #: ../src/extension/internal/filter/paint.h:355 +#, fuzzy msgid "Image on stroke" -msgstr "Obrázok ťahu" +msgstr "Ťah vzorky" #: ../src/extension/internal/filter/paint.h:366 msgid "Convert images to duochrome drawings" @@ -7610,7 +6425,7 @@ msgstr "Previesť obrázky na dvojtónové kresby" #: ../src/extension/internal/filter/paint.h:494 msgid "Electrize" -msgstr "Elektrizovať" +msgstr "" #: ../src/extension/internal/filter/paint.h:497 #: ../src/extension/internal/filter/paint.h:852 @@ -7620,39 +6435,45 @@ msgstr "Typ efektu:" #: ../src/extension/internal/filter/paint.h:501 #: ../src/extension/internal/filter/paint.h:860 #: ../src/extension/internal/filter/paint.h:975 +#, fuzzy msgid "Levels" -msgstr "Úrovne" +msgstr "Úrovne:" #: ../src/extension/internal/filter/paint.h:510 msgid "Electro solarization effects" msgstr "Efekt elektrosolarizácie" #: ../src/extension/internal/filter/paint.h:584 +#, fuzzy msgid "Neon Draw" -msgstr "Neónová kresba" +msgstr "Neónová kresba, vlastné" #: ../src/extension/internal/filter/paint.h:586 +#, fuzzy msgid "Line type:" -msgstr "Typ čiar:" +msgstr " typ: " #: ../src/extension/internal/filter/paint.h:587 +#, fuzzy msgid "Smoothed" -msgstr "Vyhladné" +msgstr "Hladké" #: ../src/extension/internal/filter/paint.h:588 +#, fuzzy msgid "Contrasted" -msgstr "Kontrastné" +msgstr "Kontrast" #: ../src/extension/internal/filter/paint.h:591 -#: ../src/live_effects/lpe-jointype.cpp:51 +#, fuzzy msgid "Line width" -msgstr "Šírka čiary" +msgstr "Šírka čiary:" #: ../src/extension/internal/filter/paint.h:593 #: ../src/extension/internal/filter/paint.h:861 #: ../src/ui/widget/filter-effect-chooser.cpp:25 +#, fuzzy msgid "Blend mode:" -msgstr "Režim zmiešania:" +msgstr "_Režim zmiešania:" #: ../src/extension/internal/filter/paint.h:605 msgid "Posterize and draw smooth lines around color shapes" @@ -7807,6 +6628,10 @@ msgstr "Jednoduchá farba:" msgid "Use object's color" msgstr "Použiť pomenované farby" +#: ../src/extension/internal/filter/shadows.h:81 +msgid "Shadows and Glows" +msgstr "Tiene a žiary" + #: ../src/extension/internal/filter/shadows.h:84 msgid "Colorizable Drop shadow" msgstr "Vyfarbiteľný vrhaný tieň" @@ -7875,7 +6700,6 @@ msgid "Inkblot on tissue or rough paper" msgstr "Atramentové škvrny na tkanive alebo drsnom papieri" #: ../src/extension/internal/filter/transparency.h:53 -#: ../src/filter-enums.cpp:21 #: ../src/filter-enums.cpp:20 msgid "Blend" msgstr "Zmiešať" @@ -7885,7 +6709,6 @@ msgid "Source:" msgstr "Zdroj:" #: ../src/extension/internal/filter/transparency.h:56 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1591 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1551 msgid "Background" msgstr "Pozadie" @@ -7893,13 +6716,20 @@ msgstr "Pozadie" #: ../src/extension/internal/filter/transparency.h:59 #: ../src/ui/dialog/filter-effects-dialog.cpp:2839 #: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:132 ../src/widgets/spray-toolbar.cpp:186 +#: ../src/widgets/pencil-toolbar.cpp:127 ../src/widgets/spray-toolbar.cpp:186 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 #: ../share/extensions/triangle.inx.h:8 -#: ../src/widgets/pencil-toolbar.cpp:127 msgid "Mode:" msgstr "Režim:" +#: ../src/extension/internal/filter/transparency.h:70 +#: ../src/extension/internal/filter/transparency.h:141 +#: ../src/extension/internal/filter/transparency.h:215 +#: ../src/extension/internal/filter/transparency.h:288 +#: ../src/extension/internal/filter/transparency.h:350 +msgid "Fill and Transparency" +msgstr "Výplň a priesvitnosť" + #: ../src/extension/internal/filter/transparency.h:73 msgid "Blend objects with background images or with themselves" msgstr "Zmiešať objekty s pozadím alebo s nimi samými" @@ -7944,110 +6774,87 @@ msgstr "Výrez" msgid "Repaint anything visible monochrome" msgstr "Premaľovať všetko viditeľné monochromaticky" -#: ../src/extension/internal/gdkpixbuf-input.cpp:183 #: ../src/extension/internal/gdkpixbuf-input.cpp:184 -#, c-format #, fuzzy, c-format msgid "%s bitmap image import" msgstr "Vynechať bitmapový obrázok" -#: ../src/extension/internal/gdkpixbuf-input.cpp:190 #: ../src/extension/internal/gdkpixbuf-input.cpp:191 msgid "Image Import Type:" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:190 #: ../src/extension/internal/gdkpixbuf-input.cpp:191 msgid "" "Embed results in stand-alone, larger SVG files. Link references a file " "outside this SVG document and all files must be moved together." msgstr "" "Vloženie má za následok samostatný, väčší súbor SVG. Odkazovať vloží odkaz " -"na súbor mimo tohto dokumentu SVG a všetky súbory je potrebné presúvať " -"spolu." +"na súbor mimo tohto dokumentu SVG a všetky súbory je potrebné presúvať spolu." -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 -#: ../src/ui/dialog/inkscape-preferences.cpp:1456 #: ../src/extension/internal/gdkpixbuf-input.cpp:192 -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 +#: ../src/ui/dialog/inkscape-preferences.cpp:1447 #, fuzzy msgid "Embed" msgstr "vkladať" -#: ../src/extension/internal/gdkpixbuf-input.cpp:192 ../src/sp-anchor.cpp:119 -#: ../src/ui/dialog/inkscape-preferences.cpp:1456 -#: ../src/extension/internal/gdkpixbuf-input.cpp:193 -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 +#: ../src/extension/internal/gdkpixbuf-input.cpp:193 ../src/sp-anchor.cpp:119 +#: ../src/ui/dialog/inkscape-preferences.cpp:1447 #, fuzzy msgid "Link" msgstr "Spojenie:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #: ../src/extension/internal/gdkpixbuf-input.cpp:196 #, fuzzy msgid "Image DPI:" msgstr "Obrázok" -#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #: ../src/extension/internal/gdkpixbuf-input.cpp:196 msgid "" "Take information from file or use default bitmap import resolution as " "defined in the preferences." msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 #: ../src/extension/internal/gdkpixbuf-input.cpp:197 #, fuzzy msgid "From file" msgstr "Načítať zo súboru" -#: ../src/extension/internal/gdkpixbuf-input.cpp:197 #: ../src/extension/internal/gdkpixbuf-input.cpp:198 #, fuzzy msgid "Default import resolution" msgstr "Štandardné rozlíšenie pre export:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #: ../src/extension/internal/gdkpixbuf-input.cpp:201 #, fuzzy msgid "Image Rendering Mode:" msgstr "Vykresľovanie" -#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #: ../src/extension/internal/gdkpixbuf-input.cpp:201 msgid "" "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " "not work in all browsers.)" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 #: ../src/extension/internal/gdkpixbuf-input.cpp:202 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1454 #, fuzzy msgid "None (auto)" msgstr "Žiaden (predvolené)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:202 -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 #: ../src/extension/internal/gdkpixbuf-input.cpp:203 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1454 msgid "Smooth (optimizeQuality)" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:203 -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 #: ../src/extension/internal/gdkpixbuf-input.cpp:204 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1454 msgid "Blocky (optimizeSpeed)" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:206 #: ../src/extension/internal/gdkpixbuf-input.cpp:207 msgid "Hide the dialog next time and always apply the same actions." msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:206 #: ../src/extension/internal/gdkpixbuf-input.cpp:207 msgid "Don't ask again" msgstr "" @@ -8064,39 +6871,32 @@ msgstr "GIMP Gradient (*.ggr)" msgid "Gradients used in GIMP" msgstr "Farebné prechody použité v GIMP" -#: ../src/extension/internal/grid.cpp:212 ../src/ui/widget/panel.cpp:118 -#: ../src/extension/internal/grid.cpp:210 -#: ../src/ui/widget/panel.cpp:117 +#: ../src/extension/internal/grid.cpp:210 ../src/ui/widget/panel.cpp:117 msgid "Grid" msgstr "Mriežka" -#: ../src/extension/internal/grid.cpp:214 #: ../src/extension/internal/grid.cpp:212 msgid "Line Width:" msgstr "Šírka čiary:" -#: ../src/extension/internal/grid.cpp:215 #: ../src/extension/internal/grid.cpp:213 msgid "Horizontal Spacing:" msgstr "Vodorovné rozostupy:" -#: ../src/extension/internal/grid.cpp:216 #: ../src/extension/internal/grid.cpp:214 msgid "Vertical Spacing:" msgstr "Zvislé rozostupy:" -#: ../src/extension/internal/grid.cpp:217 #: ../src/extension/internal/grid.cpp:215 msgid "Horizontal Offset:" msgstr "Vodorovný posun:" -#: ../src/extension/internal/grid.cpp:218 #: ../src/extension/internal/grid.cpp:216 msgid "Vertical Offset:" msgstr "Zvislý posun:" -#: ../src/extension/internal/grid.cpp:222 -#: ../src/ui/dialog/inkscape-preferences.cpp:1477 +#: ../src/extension/internal/grid.cpp:220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1468 #: ../share/extensions/draw_from_triangle.inx.h:58 #: ../share/extensions/eqtexsvg.inx.h:4 #: ../share/extensions/foldablebox.inx.h:9 @@ -8118,27 +6918,20 @@ msgstr "Zvislý posun:" #: ../share/extensions/render_barcode_qrcode.inx.h:18 #: ../share/extensions/render_gear_rack.inx.h:5 #: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:4 -#: ../share/extensions/seamless_pattern.inx.h:5 #: ../share/extensions/spirograph.inx.h:10 #: ../share/extensions/svgcalendar.inx.h:38 #: ../share/extensions/triangle.inx.h:14 #: ../share/extensions/wireframe_sphere.inx.h:8 -#: ../src/extension/internal/grid.cpp:220 -#: ../src/ui/dialog/inkscape-preferences.cpp:1465 msgid "Render" msgstr "Vykresliť" -#: ../src/extension/internal/grid.cpp:223 -#: ../src/ui/dialog/document-properties.cpp:155 -#: ../src/ui/dialog/inkscape-preferences.cpp:787 -#: ../src/widgets/toolbox.cpp:1825 #: ../src/extension/internal/grid.cpp:221 -#: ../src/ui/dialog/inkscape-preferences.cpp:775 +#: ../src/ui/dialog/document-properties.cpp:155 +#: ../src/ui/dialog/inkscape-preferences.cpp:778 #: ../src/widgets/toolbox.cpp:1826 msgid "Grids" msgstr "Mriežky" -#: ../src/extension/internal/grid.cpp:226 #: ../src/extension/internal/grid.cpp:224 msgid "Draw a path which is a grid" msgstr "Kresliť cestu, ktorá je mriežkou" @@ -8280,27 +7073,27 @@ msgctxt "PDF input precision" msgid "very fine" msgstr "veľmi jemný" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:901 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:877 msgid "PDF Input" msgstr "Vstup PDF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:906 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:882 msgid "Adobe PDF (*.pdf)" msgstr "Adobe PDF (*.pdf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:907 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:883 msgid "Adobe Portable Document Format" msgstr "Adobe Portable Document Format" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:914 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:890 msgid "AI Input" msgstr "Výstup AI" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:919 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:895 msgid "Adobe Illustrator 9.0 and above (*.ai)" msgstr "Adobe Illustrator 9.0 a novší (*.ai)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:920 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:896 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" msgstr "Otvoriť súbory uložené v Adobe Illustrator 9.0 alebo novšom" @@ -8380,125 +7173,106 @@ msgstr "Komprimované čisté SVG (*.svgz)" msgid "Scalable Vector Graphics format compressed with GZip" msgstr "Scalable Vector Graphics formát komprimovaný pomocou GZip" -#: ../src/extension/internal/vsd-input.cpp:301 -#: ../src/extension/internal/vsd-input.cpp:295 +#: ../src/extension/internal/vsd-input.cpp:274 #, fuzzy msgid "VSD Input" msgstr "Vstup PDF" -#: ../src/extension/internal/vsd-input.cpp:306 -#: ../src/extension/internal/vsd-input.cpp:300 +#: ../src/extension/internal/vsd-input.cpp:279 #, fuzzy msgid "Microsoft Visio Diagram (*.vsd)" msgstr "Diagram Dia (*.dia)" -#: ../src/extension/internal/vsd-input.cpp:307 -#: ../src/extension/internal/vsd-input.cpp:301 +#: ../src/extension/internal/vsd-input.cpp:280 msgid "File format used by Microsoft Visio 6 and later" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:314 -#: ../src/extension/internal/vsd-input.cpp:308 +#: ../src/extension/internal/vsd-input.cpp:287 #, fuzzy msgid "VDX Input" msgstr "Vstup DXF" -#: ../src/extension/internal/vsd-input.cpp:319 -#: ../src/extension/internal/vsd-input.cpp:313 +#: ../src/extension/internal/vsd-input.cpp:292 #, fuzzy msgid "Microsoft Visio XML Diagram (*.vdx)" msgstr "Microsoft XAML (*.xaml)" -#: ../src/extension/internal/vsd-input.cpp:320 -#: ../src/extension/internal/vsd-input.cpp:314 +#: ../src/extension/internal/vsd-input.cpp:293 msgid "File format used by Microsoft Visio 2010 and later" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:327 -#: ../src/extension/internal/vsd-input.cpp:321 +#: ../src/extension/internal/vsd-input.cpp:300 #, fuzzy msgid "VSDM Input" msgstr "Vstup EMF" -#: ../src/extension/internal/vsd-input.cpp:332 -#: ../src/extension/internal/vsd-input.cpp:326 +#: ../src/extension/internal/vsd-input.cpp:305 msgid "Microsoft Visio 2013 drawing (*.vsdm)" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:333 -#: ../src/extension/internal/vsd-input.cpp:346 -#: ../src/extension/internal/vsd-input.cpp:327 -#: ../src/extension/internal/vsd-input.cpp:340 +#: ../src/extension/internal/vsd-input.cpp:306 +#: ../src/extension/internal/vsd-input.cpp:319 msgid "File format used by Microsoft Visio 2013 and later" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:340 -#: ../src/extension/internal/vsd-input.cpp:334 +#: ../src/extension/internal/vsd-input.cpp:313 #, fuzzy msgid "VSDX Input" msgstr "Vstup DXF" -#: ../src/extension/internal/vsd-input.cpp:345 -#: ../src/extension/internal/vsd-input.cpp:339 +#: ../src/extension/internal/vsd-input.cpp:318 msgid "Microsoft Visio 2013 drawing (*.vsdx)" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3128 -#: ../src/extension/internal/wmf-inout.cpp:3127 +#: ../src/extension/internal/wmf-inout.cpp:3125 msgid "WMF Input" msgstr "Vstup WMF" -#: ../src/extension/internal/wmf-inout.cpp:3133 -#: ../src/extension/internal/wmf-inout.cpp:3132 +#: ../src/extension/internal/wmf-inout.cpp:3130 msgid "Windows Metafiles (*.wmf)" msgstr "Windows Metasúbory (*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3134 -#: ../src/extension/internal/wmf-inout.cpp:3133 +#: ../src/extension/internal/wmf-inout.cpp:3131 msgid "Windows Metafiles" msgstr "Windows Metasúbory" -#: ../src/extension/internal/wmf-inout.cpp:3142 -#: ../src/extension/internal/wmf-inout.cpp:3141 +#: ../src/extension/internal/wmf-inout.cpp:3139 #, fuzzy msgid "WMF Output" msgstr "Výstup EMF" -#: ../src/extension/internal/wmf-inout.cpp:3152 -#: ../src/extension/internal/wmf-inout.cpp:3151 +#: ../src/extension/internal/wmf-inout.cpp:3149 msgid "Map all fill patterns to standard WMF hatches" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3156 +#: ../src/extension/internal/wmf-inout.cpp:3153 #: ../share/extensions/wmf_input.inx.h:2 #: ../share/extensions/wmf_output.inx.h:2 -#: ../src/extension/internal/wmf-inout.cpp:3155 msgid "Windows Metafile (*.wmf)" msgstr "Windows Metasúbor (*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3157 -#: ../src/extension/internal/wmf-inout.cpp:3156 +#: ../src/extension/internal/wmf-inout.cpp:3154 #, fuzzy msgid "Windows Metafile" msgstr "Windows Metasúbory" -#: ../src/extension/internal/wpg-input.cpp:144 +#: ../src/extension/internal/wpg-input.cpp:129 msgid "WPG Input" msgstr "Vstup WPG" -#: ../src/extension/internal/wpg-input.cpp:149 +#: ../src/extension/internal/wpg-input.cpp:134 msgid "WordPerfect Graphics (*.wpg)" msgstr "WordPerfect Graphics (*.wpg)" -#: ../src/extension/internal/wpg-input.cpp:150 +#: ../src/extension/internal/wpg-input.cpp:135 msgid "Vector graphics format used by Corel WordPerfect" msgstr "Formát vektorovej grafiky používaný v Corel WordPerfect" -#: ../src/extension/prefdialog.cpp:276 +#: ../src/extension/prefdialog.cpp:272 msgid "Live preview" msgstr "Živý náhľad" -#: ../src/extension/prefdialog.cpp:276 +#: ../src/extension/prefdialog.cpp:272 msgid "Is the effect previewed live on canvas?" msgstr "Prejavia sa nastavenia efektov na živom plátne?" @@ -8506,47 +7280,48 @@ msgstr "Prejavia sa nastavenia efektov na živom plátne?" msgid "Format autodetect failed. The file is being opened as SVG." msgstr "Autodetekcia formátu zlyhala. Súbor bude otvorený ako SVG." -#: ../src/file.cpp:183 +#: ../src/file.cpp:181 msgid "default.svg" msgstr "default.sk.svg" -#: ../src/file.cpp:322 +#: ../src/file.cpp:320 msgid "Broken links have been changed to point to existing files." msgstr "Nefunkčné odkazy boli nasmerované na existujúce súbory." -#: ../src/file.cpp:333 ../src/file.cpp:1249 +#: ../src/file.cpp:331 ../src/file.cpp:1247 #, c-format msgid "Failed to load the requested file %s" msgstr "Nepodarilo sa načítať požadovaný súbor %s" -#: ../src/file.cpp:359 +#: ../src/file.cpp:357 msgid "Document not saved yet. Cannot revert." msgstr "" "Dokument ešte nie je uložený, preto nie je možný návrat k uloženej verzii." -#: ../src/file.cpp:365 +#: ../src/file.cpp:363 #, fuzzy msgid "Changes will be lost! Are you sure you want to reload document %1?" msgstr "" "Všetky zmeny sa stratia! Ste si istý, že chcete znovu načítať dokument %s?" -#: ../src/file.cpp:391 +#: ../src/file.cpp:389 msgid "Document reverted." msgstr "Dokument bol obnovený z uloženej verzie." -#: ../src/file.cpp:393 +#: ../src/file.cpp:391 msgid "Document not reverted." msgstr "Dokument nebol obnovený z uloženej verzie." -#: ../src/file.cpp:543 +#: ../src/file.cpp:541 msgid "Select file to open" msgstr "Voľba súboru na otvorenie" -#: ../src/file.cpp:625 +#: ../src/file.cpp:623 +#, fuzzy msgid "Clean up document" -msgstr "Vyčistí dokument" +msgstr "Uloží dokument" -#: ../src/file.cpp:632 +#: ../src/file.cpp:630 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." @@ -8554,11 +7329,11 @@ msgstr[0] "Odstránená %i nepoužitá definícia z <defs>." msgstr[1] "Odstránené %i nepoužité definície z <defs>." msgstr[2] "Odstránených %i nepoužitých definícií z <defs>." -#: ../src/file.cpp:637 +#: ../src/file.cpp:635 msgid "No unused definitions in <defs>." msgstr "V <defs> neboli nájdené nepoužité definície." -#: ../src/file.cpp:669 +#: ../src/file.cpp:667 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8567,12 +7342,12 @@ msgstr "" "Nenašlo sa rozšírenie Inkscape pre uloženie dokumentu (%s). Mohla to " "spôsobiť neznáma prípona súboru." -#: ../src/file.cpp:670 ../src/file.cpp:678 ../src/file.cpp:686 -#: ../src/file.cpp:692 ../src/file.cpp:697 +#: ../src/file.cpp:668 ../src/file.cpp:676 ../src/file.cpp:684 +#: ../src/file.cpp:690 ../src/file.cpp:695 msgid "Document not saved." msgstr "Dokument nebol uložený." -#: ../src/file.cpp:677 +#: ../src/file.cpp:675 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." @@ -8580,342 +7355,277 @@ msgstr "" "Súbor %s je chránený proti zápisu. Prosím, odstráňte ochranu proti zápisu a " "skúste to znova." -#: ../src/file.cpp:685 +#: ../src/file.cpp:683 #, c-format msgid "File %s could not be saved." msgstr "Súbor %s nie je uložený." -#: ../src/file.cpp:715 ../src/file.cpp:717 +#: ../src/file.cpp:713 ../src/file.cpp:715 msgid "Document saved." msgstr "Dokument bol uložený." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:860 ../src/file.cpp:1408 +#: ../src/file.cpp:858 ../src/file.cpp:1406 #, fuzzy msgid "drawing" msgstr "kresba%s" -#: ../src/file.cpp:865 +#: ../src/file.cpp:863 #, fuzzy msgid "drawing-%1" msgstr "kresba%s" -#: ../src/file.cpp:882 +#: ../src/file.cpp:880 msgid "Select file to save a copy to" msgstr "Voľba súboru na uloženie kópie" -#: ../src/file.cpp:884 +#: ../src/file.cpp:882 msgid "Select file to save to" msgstr "Voľba súboru na uloženie" -#: ../src/file.cpp:989 ../src/file.cpp:991 +#: ../src/file.cpp:987 ../src/file.cpp:989 msgid "No changes need to be saved." msgstr "Nie je potrebné uložiť žiadne zmeny." -#: ../src/file.cpp:1010 +#: ../src/file.cpp:1008 msgid "Saving document..." msgstr "Ukladá sa dokument..." -#: ../src/file.cpp:1246 ../src/ui/dialog/inkscape-preferences.cpp:1450 +#: ../src/file.cpp:1244 ../src/ui/dialog/inkscape-preferences.cpp:1441 #: ../src/ui/dialog/ocaldialogs.cpp:1244 -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 msgid "Import" msgstr "Importovať" -#: ../src/file.cpp:1296 +#: ../src/file.cpp:1294 msgid "Select file to import" msgstr "Voľba súboru na importovanie" -#: ../src/file.cpp:1429 +#: ../src/file.cpp:1427 msgid "Select file to export to" msgstr "Voľba súboru na exportovanie" -#: ../src/file.cpp:1682 +#: ../src/file.cpp:1680 #, fuzzy msgid "Import Clip Art" msgstr "Import/export" -#: ../src/filter-enums.cpp:22 #: ../src/filter-enums.cpp:21 msgid "Color Matrix" msgstr "Matica farieb" -#: ../src/filter-enums.cpp:24 #: ../src/filter-enums.cpp:23 msgid "Composite" msgstr "Kombinovať" -#: ../src/filter-enums.cpp:25 #: ../src/filter-enums.cpp:24 msgid "Convolve Matrix" msgstr "Konvolučná matica" -#: ../src/filter-enums.cpp:26 #: ../src/filter-enums.cpp:25 msgid "Diffuse Lighting" msgstr "Difúzne osvetlenie" -#: ../src/filter-enums.cpp:27 #: ../src/filter-enums.cpp:26 msgid "Displacement Map" msgstr "Mapa posunutia" -#: ../src/filter-enums.cpp:28 #: ../src/filter-enums.cpp:27 msgid "Flood" msgstr "Vyplnenie" -#: ../src/filter-enums.cpp:31 ../share/extensions/text_merge.inx.h:1 -#: ../src/filter-enums.cpp:30 +#: ../src/filter-enums.cpp:30 ../share/extensions/text_merge.inx.h:1 msgid "Merge" msgstr "Zlúčiť" -#: ../src/filter-enums.cpp:34 #: ../src/filter-enums.cpp:33 msgid "Specular Lighting" msgstr "Zrkadlové osvetlenie" -#: ../src/filter-enums.cpp:35 #: ../src/filter-enums.cpp:34 msgid "Tile" msgstr "Dláždiť" -#: ../src/filter-enums.cpp:41 #: ../src/filter-enums.cpp:40 msgid "Source Graphic" msgstr "Zdrojová grafika" -#: ../src/filter-enums.cpp:42 #: ../src/filter-enums.cpp:41 msgid "Source Alpha" msgstr "Zdrojová alfa" -#: ../src/filter-enums.cpp:43 #: ../src/filter-enums.cpp:42 msgid "Background Image" msgstr "Obrázok na pozadí" -#: ../src/filter-enums.cpp:44 #: ../src/filter-enums.cpp:43 msgid "Background Alpha" msgstr "Alfa pozadia" -#: ../src/filter-enums.cpp:45 #: ../src/filter-enums.cpp:44 msgid "Fill Paint" msgstr "Farba výplne" -#: ../src/filter-enums.cpp:46 #: ../src/filter-enums.cpp:45 msgid "Stroke Paint" msgstr "Farba ťahu" #. New in Compositing and Blending Level 1 -#: ../src/filter-enums.cpp:58 #: ../src/filter-enums.cpp:57 #, fuzzy msgid "Overlay" msgstr "Prekrytia" -#: ../src/filter-enums.cpp:59 #: ../src/filter-enums.cpp:58 #, fuzzy msgid "Color Dodge" msgstr "Iba farba" -#: ../src/filter-enums.cpp:60 #: ../src/filter-enums.cpp:59 #, fuzzy msgid "Color Burn" msgstr "Panely farieb" -#: ../src/filter-enums.cpp:61 #: ../src/filter-enums.cpp:60 #, fuzzy msgid "Hard Light" msgstr "Ostré svetlo:" -#: ../src/filter-enums.cpp:62 #: ../src/filter-enums.cpp:61 #, fuzzy msgid "Soft Light" msgstr "Miestne osvetlenie" -#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:88 ../src/splivarot.cpp:94 -#: ../src/filter-enums.cpp:62 +#: ../src/filter-enums.cpp:62 ../src/splivarot.cpp:88 ../src/splivarot.cpp:94 msgid "Difference" msgstr "Rozdiel" -#: ../src/filter-enums.cpp:64 ../src/splivarot.cpp:100 -#: ../src/filter-enums.cpp:63 +#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:100 msgid "Exclusion" msgstr "Vylúčenie" -#: ../src/filter-enums.cpp:65 ../src/ui/tools/flood-tool.cpp:196 -#: ../src/widgets/sp-color-icc-selector.cpp:336 -#: ../src/widgets/sp-color-icc-selector.cpp:340 -#: ../src/widgets/sp-color-scales.cpp:441 -#: ../src/widgets/sp-color-scales.cpp:442 ../src/widgets/tweak-toolbar.cpp:286 -#: ../share/extensions/color_randomize.inx.h:3 -#: ../src/filter-enums.cpp:64 +#: ../src/filter-enums.cpp:64 ../src/ui/tools/flood-tool.cpp:196 #: ../src/widgets/sp-color-icc-selector.cpp:361 #: ../src/widgets/sp-color-icc-selector.cpp:365 #: ../src/widgets/sp-color-scales.cpp:455 -#: ../src/widgets/sp-color-scales.cpp:456 +#: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:286 +#: ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "Odtieň" -#: ../src/filter-enums.cpp:68 #: ../src/filter-enums.cpp:67 msgid "Luminosity" msgstr "" -#: ../src/filter-enums.cpp:78 #: ../src/filter-enums.cpp:77 msgid "Matrix" msgstr "Matica" -#: ../src/filter-enums.cpp:79 #: ../src/filter-enums.cpp:78 msgid "Saturate" msgstr "Nasýtiť" -#: ../src/filter-enums.cpp:80 #: ../src/filter-enums.cpp:79 msgid "Hue Rotate" msgstr "Otočiť odtieň" -#: ../src/filter-enums.cpp:81 #: ../src/filter-enums.cpp:80 msgid "Luminance to Alpha" msgstr "Svetlosť na priesvitnosť" #. File -#: ../src/filter-enums.cpp:87 ../src/verbs.cpp:2431 +#: ../src/filter-enums.cpp:86 ../src/verbs.cpp:2352 #: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 -#: ../src/filter-enums.cpp:86 -#: ../src/verbs.cpp:2352 msgid "Default" msgstr "Štandardné" #. New CSS -#: ../src/filter-enums.cpp:95 #: ../src/filter-enums.cpp:94 #, fuzzy msgid "Clear" msgstr "_Zmazať" -#: ../src/filter-enums.cpp:96 #: ../src/filter-enums.cpp:95 #, fuzzy msgid "Copy" msgstr "_Kopírovať" -#: ../src/filter-enums.cpp:97 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1611 -#: ../src/filter-enums.cpp:96 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1571 +#: ../src/filter-enums.cpp:96 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1571 msgid "Destination" msgstr "Cieľ" -#: ../src/filter-enums.cpp:98 #: ../src/filter-enums.cpp:97 #, fuzzy msgid "Destination Over" msgstr "Cieľ" -#: ../src/filter-enums.cpp:99 #: ../src/filter-enums.cpp:98 #, fuzzy msgid "Destination In" msgstr "Cieľ" -#: ../src/filter-enums.cpp:100 #: ../src/filter-enums.cpp:99 #, fuzzy msgid "Destination Out" msgstr "Cieľ" -#: ../src/filter-enums.cpp:101 #: ../src/filter-enums.cpp:100 #, fuzzy msgid "Destination Atop" msgstr "Cieľ" -#: ../src/filter-enums.cpp:102 #: ../src/filter-enums.cpp:101 #, fuzzy msgid "Lighter" msgstr "Zosvetliť" -#: ../src/filter-enums.cpp:104 #: ../src/filter-enums.cpp:103 msgid "Arithmetic" msgstr "Aritmetika" -#: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:546 -#: ../src/filter-enums.cpp:119 -#: ../src/selection-chemistry.cpp:535 +#: ../src/filter-enums.cpp:119 ../src/selection-chemistry.cpp:535 msgid "Duplicate" msgstr "Duplikovať" -#: ../src/filter-enums.cpp:121 #: ../src/filter-enums.cpp:120 msgid "Wrap" msgstr "Zalamovanie" -#: ../src/filter-enums.cpp:122 -#: ../src/filter-enums.cpp:121 -#, fuzzy -msgctxt "Convolve matrix, edge mode" -msgid "None" -msgstr "Žiadny" - -#: ../src/filter-enums.cpp:137 #: ../src/filter-enums.cpp:136 msgid "Erode" msgstr "Erodovať" -#: ../src/filter-enums.cpp:138 #: ../src/filter-enums.cpp:137 msgid "Dilate" msgstr "Dilatovať" -#: ../src/filter-enums.cpp:144 #: ../src/filter-enums.cpp:143 msgid "Fractal Noise" msgstr "Fraktálový šum" -#: ../src/filter-enums.cpp:151 #: ../src/filter-enums.cpp:150 msgid "Distant Light" msgstr "Vzdialené osvetlenie" -#: ../src/filter-enums.cpp:152 #: ../src/filter-enums.cpp:151 msgid "Point Light" msgstr "Bodové osvetlenie" -#: ../src/filter-enums.cpp:153 #: ../src/filter-enums.cpp:152 msgid "Spot Light" msgstr "Miestne osvetlenie" -#: ../src/gradient-chemistry.cpp:1579 #: ../src/gradient-chemistry.cpp:1580 #, fuzzy msgid "Invert gradient colors" msgstr "Invertovať farebný prechod" -#: ../src/gradient-chemistry.cpp:1605 #: ../src/gradient-chemistry.cpp:1606 #, fuzzy msgid "Reverse gradient" msgstr "Invertovať farebný prechod" -#: ../src/gradient-chemistry.cpp:1619 ../src/widgets/gradient-selector.cpp:227 -#: ../src/gradient-chemistry.cpp:1620 -#: ../src/widgets/gradient-selector.cpp:245 +#: ../src/gradient-chemistry.cpp:1620 ../src/widgets/gradient-selector.cpp:245 #, fuzzy msgid "Delete swatch" msgstr "Zmazať priehradku" @@ -8971,40 +7681,31 @@ msgstr "lineárny farebný prechod - koniec" msgid "Added patch row or column" msgstr "" -#: ../src/gradient-drag.cpp:799 #: ../src/gradient-drag.cpp:797 msgid "Merge gradient handles" msgstr "Zlúčiť úchopy farebného prechodu" -#. we did an undoable action -#: ../src/gradient-drag.cpp:1105 #: ../src/gradient-drag.cpp:1104 msgid "Move gradient handle" msgstr "Posunúť úchop farebného prechodu" -#: ../src/gradient-drag.cpp:1164 ../src/widgets/gradient-vector.cpp:827 -#: ../src/gradient-drag.cpp:1163 -#: ../src/widgets/gradient-vector.cpp:847 +#: ../src/gradient-drag.cpp:1163 ../src/widgets/gradient-vector.cpp:847 msgid "Delete gradient stop" msgstr "Zmazať priehradku farebného prechodu" -#: ../src/gradient-drag.cpp:1427 #: ../src/gradient-drag.cpp:1426 #, c-format msgid "" "%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl" "+Alt to delete stop" msgstr "" -"%s %d pre: %s%s; ťahanie s Ctrl prichytáva k posunu, s " -"Ctrl+Alt zmaže priehradku" +"%s %d pre: %s%s; ťahanie s Ctrl prichytáva k posunu, s Ctrl+Alt zmaže priehradku" -#: ../src/gradient-drag.cpp:1431 ../src/gradient-drag.cpp:1438 -#: ../src/gradient-drag.cpp:1430 -#: ../src/gradient-drag.cpp:1437 +#: ../src/gradient-drag.cpp:1430 ../src/gradient-drag.cpp:1437 msgid " (stroke)" msgstr " (ťah)" -#: ../src/gradient-drag.cpp:1435 #: ../src/gradient-drag.cpp:1434 #, c-format msgid "" @@ -9014,7 +7715,6 @@ msgstr "" "%s pre: %s%s; ťahanie s Ctrl prichytáva k uhlu, s Ctrl+Alt " "zachová uhol, s Ctrl+Shift zmena mierky okolo stredu" -#: ../src/gradient-drag.cpp:1443 #: ../src/gradient-drag.cpp:1442 msgid "" "Radial gradient center and focus; drag with Shift to " @@ -9023,7 +7723,6 @@ msgstr "" "Stred a ohnisko radiálneho farebného prechodu; ťahanie so " "Shift oddelí ohnisko" -#: ../src/gradient-drag.cpp:1446 #: ../src/gradient-drag.cpp:1445 #, c-format msgid "" @@ -9033,8 +7732,7 @@ msgid_plural "" "Gradient point shared by %d gradients; drag with Shift to " "separate" msgstr[0] "" -"Bod prechodu zdieľa %d farebný prechod; ťahanie so Shift " -"oddelí" +"Bod prechodu zdieľa %d farebný prechod; ťahanie so Shift oddelí" msgstr[1] "" "Bod prechodu zdieľajú %d farebné prechody; ťahanie so Shift " "oddelí" @@ -9042,111 +7740,352 @@ msgstr[2] "" "Bod prechodu zdieľa %d farebných prechodov; ťahanie so Shift " "oddelí" -#: ../src/gradient-drag.cpp:2378 #: ../src/gradient-drag.cpp:2377 msgid "Move gradient handle(s)" msgstr "Posunúť úchop farebného prechodu" -#: ../src/gradient-drag.cpp:2414 #: ../src/gradient-drag.cpp:2413 msgid "Move gradient mid stop(s)" msgstr "Posunúť priehradku farebného prechodu" -#: ../src/gradient-drag.cpp:2703 #: ../src/gradient-drag.cpp:2702 msgid "Delete gradient stop(s)" msgstr "Zmazať priehradku farebného prechodu" -#: ../src/inkscape.cpp:246 #: ../src/inkscape.cpp:344 #, fuzzy msgid "Autosave failed! Cannot create directory %1." msgstr "Nie je možné vytvoriť adresár profilu %s." -#: ../src/inkscape.cpp:255 #: ../src/inkscape.cpp:353 #, fuzzy msgid "Autosave failed! Cannot open directory %1." msgstr "Nie je možné vytvoriť adresár profilu %s." -#: ../src/inkscape.cpp:271 #: ../src/inkscape.cpp:369 msgid "Autosaving documents..." msgstr "Automaticky sa ukladá dokument..." -#: ../src/inkscape.cpp:339 #: ../src/inkscape.cpp:442 msgid "Autosave failed! Could not find inkscape extension to save document." msgstr "" "Automatické uloženie sa nepodarilo! Rozšírenie Inkscape na uloženie " "dokumentu nebolo nájdené." -#: ../src/inkscape.cpp:342 ../src/inkscape.cpp:349 -#: ../src/inkscape.cpp:445 -#: ../src/inkscape.cpp:452 +#: ../src/inkscape.cpp:445 ../src/inkscape.cpp:452 #, c-format msgid "Autosave failed! File %s could not be saved." msgstr "Automatické uloženie sa nepodarilo. Súbor %s nebolo možné uložiť.." -#: ../src/inkscape.cpp:364 #: ../src/inkscape.cpp:467 msgid "Autosave complete." msgstr "Automatické uloženie dokončené." -#: ../src/inkscape.cpp:622 #: ../src/inkscape.cpp:715 msgid "Untitled document" msgstr "Dokument bez názvu" #. Show nice dialog box -#: ../src/inkscape.cpp:654 #: ../src/inkscape.cpp:747 msgid "Inkscape encountered an internal error and will close now.\n" msgstr "Vyskytla sa interná chyba a program Inkscape bude teraz ukončený.\n" -#: ../src/inkscape.cpp:655 #: ../src/inkscape.cpp:748 msgid "" "Automatic backups of unsaved documents were done to the following " "locations:\n" msgstr "Automatické zálohovanie neuložených dokumentov bolo vykonané do:\n" -#: ../src/inkscape.cpp:656 #: ../src/inkscape.cpp:749 msgid "Automatic backup of the following documents failed:\n" msgstr "Nepodarilo sa automaticky zálohovať nasledujúce dokumenty:\n" -#: ../src/knot.cpp:346 +#: ../src/interface.cpp:748 +#, fuzzy +msgctxt "Interface setup" +msgid "Default" +msgstr "Štandardné" + +#: ../src/interface.cpp:748 +msgid "Default interface setup" +msgstr "Štandardné rozloženie rozhrania" + +#: ../src/interface.cpp:749 +#, fuzzy +msgctxt "Interface setup" +msgid "Custom" +msgstr "Vlastná" + +#: ../src/interface.cpp:749 +#, fuzzy +msgid "Setup for custom task" +msgstr "Nastaviť vlastnú úlohu" + +# TODO: check +#: ../src/interface.cpp:750 +#, fuzzy +msgctxt "Interface setup" +msgid "Wide" +msgstr "Široký" + +#: ../src/interface.cpp:750 +msgid "Setup for widescreen work" +msgstr "Nastavenie na prácu na širokouhlej obrazovke" + +#: ../src/interface.cpp:862 +#, c-format +msgid "Verb \"%s\" Unknown" +msgstr "Sloveso „%s“ neznáme" + +#: ../src/interface.cpp:901 +msgid "Open _Recent" +msgstr "Otvoriť ne_dávne" + +#: ../src/interface.cpp:1009 ../src/interface.cpp:1095 +#: ../src/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:528 +msgid "Drop color" +msgstr "Vynechať farbu" + +#: ../src/interface.cpp:1048 ../src/interface.cpp:1158 +msgid "Drop color on gradient" +msgstr "Pustiť farbu na farebný prechod" + +#: ../src/interface.cpp:1211 +msgid "Could not parse SVG data" +msgstr "Nie je možné analyzovať SVG dáta" + +#: ../src/interface.cpp:1250 +msgid "Drop SVG" +msgstr "Vypustiť SVG" + +#: ../src/interface.cpp:1263 +#, fuzzy +msgid "Drop Symbol" +msgstr "Vynechať farbu" + +#: ../src/interface.cpp:1294 +msgid "Drop bitmap image" +msgstr "Vynechať bitmapový obrázok" + +#: ../src/interface.cpp:1386 +#, c-format +msgid "" +"A file named \"%s\" already exists. Do " +"you want to replace it?\n" +"\n" +"The file already exists in \"%s\". Replacing it will overwrite its contents." +msgstr "" +"Súbor s názvom „%s“ už existuje. " +"Želáte si ho nahradiť?\n" +"\n" +"Súbor už existuje v „%s“. Jeho nahradením prepíšete jeho súčasný obsah." + +#: ../src/interface.cpp:1392 ../src/ui/dialog/export.cpp:1302 +#: ../src/widgets/desktop-widget.cpp:1122 +#: ../src/widgets/desktop-widget.cpp:1184 +msgid "_Cancel" +msgstr "_Zrušiť" + +#: ../src/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21 +#: ../share/extensions/web-transmit-att.inx.h:19 +msgid "Replace" +msgstr "Nahradiť" + +#: ../src/interface.cpp:1464 +msgid "Go to parent" +msgstr "O stupeň vyššie" + +#. TRANSLATORS: #%1 is the id of the group e.g. , not a number. +#: ../src/interface.cpp:1505 +#, fuzzy +msgid "Enter group #%1" +msgstr "Zadajte skupinu #%s" + +#. Item dialog +#: ../src/interface.cpp:1641 ../src/verbs.cpp:2849 +msgid "_Object Properties..." +msgstr "Vlastnosti objektu..." + +#: ../src/interface.cpp:1650 +msgid "_Select This" +msgstr "_Vybrať toto" + +#: ../src/interface.cpp:1661 +#, fuzzy +msgid "Select Same" +msgstr "Zvoľte stránku:" + +#. Select same fill and stroke +#: ../src/interface.cpp:1671 +#, fuzzy +msgid "Fill and Stroke" +msgstr "Výp_lň a ťah" + +#. Select same fill color +#: ../src/interface.cpp:1678 +#, fuzzy +msgid "Fill Color" +msgstr "Jednoduchá farba:" + +#. Select same stroke color +#: ../src/interface.cpp:1685 +#, fuzzy +msgid "Stroke Color" +msgstr "Nastaviť farbu ťahu" + +#. Select same stroke style +#: ../src/interface.cpp:1692 +#, fuzzy +msgid "Stroke Style" +msgstr "Štýl ť_ahu" + +#. Select same stroke style +#: ../src/interface.cpp:1699 +#, fuzzy +msgid "Object type" +msgstr "Typ objektu:" + +#. Move to layer +#: ../src/interface.cpp:1706 +#, fuzzy +msgid "_Move to layer ..." +msgstr "Znížiť vrstvu" + +#. Create link +#: ../src/interface.cpp:1716 +#, fuzzy +msgid "Create _Link" +msgstr "Vytvoriť odkaz" + +#. Set mask +#: ../src/interface.cpp:1739 +msgid "Set Mask" +msgstr "Nastaviť masku" + +#. Release mask +#: ../src/interface.cpp:1750 +msgid "Release Mask" +msgstr "Uvoľniť masku" + +#. Set Clip +#: ../src/interface.cpp:1761 +#, fuzzy +msgid "Set Cl_ip" +msgstr "Nastaviť orezanie" + +#. Release Clip +#: ../src/interface.cpp:1772 +#, fuzzy +msgid "Release C_lip" +msgstr "Uvoľniť orezanie" + +#. Group +#: ../src/interface.cpp:1783 ../src/verbs.cpp:2486 +msgid "_Group" +msgstr "_Zoskupiť" + +#: ../src/interface.cpp:1854 +msgid "Create link" +msgstr "Vytvoriť odkaz" + +#. Ungroup +#: ../src/interface.cpp:1885 ../src/verbs.cpp:2488 +msgid "_Ungroup" +msgstr "Z_rušiť zoskupenie" + +#. Link dialog +#: ../src/interface.cpp:1910 +#, fuzzy +msgid "Link _Properties..." +msgstr "Nastavenie odkazu" + +#. Select item +#: ../src/interface.cpp:1916 +msgid "_Follow Link" +msgstr "_Nasledovať odkaz" + +#. Reset transformations +#: ../src/interface.cpp:1922 +msgid "_Remove Link" +msgstr "Odst_rániť odkaz" + +#: ../src/interface.cpp:1953 +#, fuzzy +msgid "Remove link" +msgstr "Odst_rániť odkaz" + +#. Image properties +#: ../src/interface.cpp:1964 +#, fuzzy +msgid "Image _Properties..." +msgstr "Vlastnosti o_brázka" + +#. Edit externally +#: ../src/interface.cpp:1970 +msgid "Edit Externally..." +msgstr "Upraviť externe..." + +#. Trace Bitmap +#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) +#: ../src/interface.cpp:1979 ../src/verbs.cpp:2549 +msgid "_Trace Bitmap..." +msgstr "_Vektorizovať bitmapu..." + +#. Trace Pixel Art +#: ../src/interface.cpp:1988 +msgid "Trace Pixel Art" +msgstr "" + +#: ../src/interface.cpp:1998 +#, fuzzy +msgctxt "Context menu" +msgid "Embed Image" +msgstr "Vkladať obrázky" + +#: ../src/interface.cpp:2009 +#, fuzzy +msgctxt "Context menu" +msgid "Extract Image..." +msgstr "Extrahovať obrázok" + +#. Item dialog +#. Fill and Stroke dialog +#: ../src/interface.cpp:2154 ../src/interface.cpp:2174 ../src/verbs.cpp:2812 +msgid "_Fill and Stroke..." +msgstr "Výp_lň a ťah..." + +#. Edit Text dialog +#: ../src/interface.cpp:2180 ../src/verbs.cpp:2831 +msgid "_Text and Font..." +msgstr "Text a pís_mo..." + +#. Spellcheck dialog +#: ../src/interface.cpp:2186 ../src/verbs.cpp:2839 +msgid "Check Spellin_g..." +msgstr "_Skontrolovať pravopis..." + #: ../src/knot.cpp:332 msgid "Node or handle drag canceled." msgstr "Ťahanie uzla alebo úchopu zrušené." -#: ../src/knotholder.cpp:170 #: ../src/knotholder.cpp:158 msgid "Change handle" msgstr "Zmeniť úchop" -#: ../src/knotholder.cpp:257 #: ../src/knotholder.cpp:237 msgid "Move handle" msgstr "Posunúť úchop" #. TRANSLATORS: This refers to the pattern that's inside the object -#: ../src/knotholder.cpp:276 ../src/knotholder.cpp:298 -#: ../src/knotholder.cpp:256 -#: ../src/knotholder.cpp:278 +#: ../src/knotholder.cpp:256 ../src/knotholder.cpp:278 msgid "Move the pattern fill inside the object" msgstr "Presunúť vzorku výplne dovnútra objektu" -#: ../src/knotholder.cpp:280 ../src/knotholder.cpp:302 -#: ../src/knotholder.cpp:260 -#: ../src/knotholder.cpp:282 +#: ../src/knotholder.cpp:260 ../src/knotholder.cpp:282 msgid "Scale the pattern fill; uniformly if with Ctrl" msgstr "Zmeniť mierku vzorky výplne; rovnomerne s Ctrl" -#: ../src/knotholder.cpp:284 ../src/knotholder.cpp:306 -#: ../src/knotholder.cpp:264 -#: ../src/knotholder.cpp:286 +#: ../src/knotholder.cpp:264 ../src/knotholder.cpp:286 msgid "Rotate the pattern fill; with Ctrl to snap angle" msgstr "Otočiť vzorku výplne; s Ctrl prichytávanie k uhlu" @@ -9186,10 +8125,9 @@ msgstr "Položka doku, ktorá „vlastní“ tento úchop" #. Name #: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:191 -#: ../src/widgets/text-toolbar.cpp:1405 +#: ../src/widgets/text-toolbar.cpp:1416 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 -#: ../src/widgets/text-toolbar.cpp:1418 msgid "Orientation" msgstr "Orientácia" @@ -9202,10 +8140,11 @@ msgid "Resizable" msgstr "Meniteľná veľkosť" #: ../src/libgdl/gdl-dock-item.c:315 +#, fuzzy msgid "If set, the dock item can be resized when docked in a GtkPanel widget" msgstr "" "Ak je voľba nastavená, položka doku môže meniť veľkosť, keď je ukotvená v " -"ovládacom prvku GtkPanel" +"paneli" #: ../src/libgdl/gdl-dock-item.c:322 msgid "Item behavior" @@ -9331,14 +8270,11 @@ msgstr "" "názov ovládač." #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:1002 +#: ../src/ui/dialog/align-and-distribute.cpp:1003 #: ../src/ui/dialog/document-properties.cpp:153 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1537 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 #: ../src/widgets/desktop-widget.cpp:1992 -#: ../share/extensions/empty_page.inx.h:1 #: ../share/extensions/voronoi2svg.inx.h:9 -#: ../src/ui/dialog/align-and-distribute.cpp:1003 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 msgid "Page" msgstr "Stránka" @@ -9347,12 +8283,8 @@ msgid "The index of the current page" msgstr "Index aktuálnej stránky" #: ../src/libgdl/gdl-dock-object.c:125 -#: ../src/live_effects/parameter/originalpatharray.cpp:86 -#: ../src/ui/dialog/inkscape-preferences.cpp:1511 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 #: ../src/ui/widget/page-sizer.cpp:258 -#: ../src/widgets/gradient-selector.cpp:140 -#: ../src/widgets/sp-xmlview-attr-list.cpp:49 -#: ../src/ui/dialog/inkscape-preferences.cpp:1499 #: ../src/widgets/gradient-selector.cpp:158 #: ../src/widgets/sp-xmlview-attr-list.cpp:54 msgid "Name" @@ -9481,18 +8413,22 @@ msgid "Whether the placeholder is standing in for a floating toplevel dock" msgstr "Či vyhradené miesto vyhradené pre plávajúci dok najvyššej úrovne" #: ../src/libgdl/gdl-dock-placeholder.c:189 +#, fuzzy msgid "X Coordinate" msgstr "Súradnica X" #: ../src/libgdl/gdl-dock-placeholder.c:190 +#, fuzzy msgid "X coordinate for dock when floating" msgstr "Súradnica X doku pri plávaní" #: ../src/libgdl/gdl-dock-placeholder.c:196 +#, fuzzy msgid "Y Coordinate" msgstr "Súradnica Y" #: ../src/libgdl/gdl-dock-placeholder.c:197 +#, fuzzy msgid "Y coordinate for dock when floating" msgstr "Súradnica Y doku pri plávaní" @@ -9518,10 +8454,8 @@ msgstr "Stalo sa niečo čudné pri zisťovaní umiestnenia potomka %p od rodič msgid "Dockitem which 'owns' this tablabel" msgstr "Položka doku, ktorá „vlastní“ tento názov záložky" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:642 -#: ../src/ui/dialog/inkscape-preferences.cpp:685 -#: ../src/ui/dialog/inkscape-preferences.cpp:630 -#: ../src/ui/dialog/inkscape-preferences.cpp:673 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:633 +#: ../src/ui/dialog/inkscape-preferences.cpp:676 msgid "Floating" msgstr "Plávajúci" @@ -9562,339 +8496,183 @@ msgstr "Súradnica Y plávajúceho doku" msgid "Dock #%d" msgstr "Ukotvenie #%d" -#: ../src/libnrtype/FontFactory.cpp:618 -#: ../src/libnrtype/FontFactory.cpp:617 +#: ../src/libnrtype/FontFactory.cpp:767 msgid "Ignoring font without family that will crash Pango" msgstr "Ignoruje sa písmo bez rodiny, ktoré by spôsobilo pád Panga" -#: ../src/live_effects/effect.cpp:99 #: ../src/live_effects/effect.cpp:84 msgid "doEffect stack test" msgstr "test zásobníka doEffect" -#: ../src/live_effects/effect.cpp:100 #: ../src/live_effects/effect.cpp:85 msgid "Angle bisector" msgstr "Rozdelenie uhla" #. TRANSLATORS: boolean operations -#: ../src/live_effects/effect.cpp:102 #: ../src/live_effects/effect.cpp:87 msgid "Boolops" msgstr "Booleovské operácie" -#: ../src/live_effects/effect.cpp:103 #: ../src/live_effects/effect.cpp:88 msgid "Circle (by center and radius)" msgstr "Kružnica (podľa stredu a polomeru)" -#: ../src/live_effects/effect.cpp:104 #: ../src/live_effects/effect.cpp:89 msgid "Circle by 3 points" msgstr "Kruh 3 bodov" -#: ../src/live_effects/effect.cpp:105 #: ../src/live_effects/effect.cpp:90 msgid "Dynamic stroke" msgstr "Dynamický ťah" -#: ../src/live_effects/effect.cpp:106 ../share/extensions/extrude.inx.h:1 -#: ../src/live_effects/effect.cpp:91 +#: ../src/live_effects/effect.cpp:91 ../share/extensions/extrude.inx.h:1 msgid "Extrude" msgstr "Extrudovať" -#: ../src/live_effects/effect.cpp:107 #: ../src/live_effects/effect.cpp:92 msgid "Lattice Deformation" msgstr "Šalátová deformácia" -#: ../src/live_effects/effect.cpp:108 #: ../src/live_effects/effect.cpp:93 msgid "Line Segment" msgstr "Segment úsečky" -#: ../src/live_effects/effect.cpp:109 #: ../src/live_effects/effect.cpp:94 msgid "Mirror symmetry" msgstr "Zrkadlová symetria" -#: ../src/live_effects/effect.cpp:111 #: ../src/live_effects/effect.cpp:96 msgid "Parallel" msgstr "Rovnobežne" -#: ../src/live_effects/effect.cpp:112 #: ../src/live_effects/effect.cpp:97 msgid "Path length" msgstr "Dĺžka cesty" -#: ../src/live_effects/effect.cpp:113 #: ../src/live_effects/effect.cpp:98 msgid "Perpendicular bisector" msgstr "Kolmé delenie" -#: ../src/live_effects/effect.cpp:114 #: ../src/live_effects/effect.cpp:99 msgid "Perspective path" msgstr "Perspektíva cesty" -#: ../src/live_effects/effect.cpp:115 #: ../src/live_effects/effect.cpp:100 msgid "Rotate copies" msgstr "Otáčať kópie" -#: ../src/live_effects/effect.cpp:116 #: ../src/live_effects/effect.cpp:101 msgid "Recursive skeleton" msgstr "Rekurzívna kostra" -#: ../src/live_effects/effect.cpp:117 #: ../src/live_effects/effect.cpp:102 msgid "Tangent to curve" msgstr "Dotyčnica krivky" -#: ../src/live_effects/effect.cpp:118 #: ../src/live_effects/effect.cpp:103 msgid "Text label" msgstr "Textový štítok" #. 0.46 -#: ../src/live_effects/effect.cpp:121 #: ../src/live_effects/effect.cpp:106 msgid "Bend" msgstr "Ohnúť" -#: ../src/live_effects/effect.cpp:122 #: ../src/live_effects/effect.cpp:107 msgid "Gears" msgstr "Ozubenie" -#: ../src/live_effects/effect.cpp:123 #: ../src/live_effects/effect.cpp:108 msgid "Pattern Along Path" msgstr "Vzorka pozdĺž cesty" #. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG -#: ../src/live_effects/effect.cpp:124 #: ../src/live_effects/effect.cpp:109 msgid "Stitch Sub-Paths" msgstr "Zošiť podcesty" #. 0.47 -#: ../src/live_effects/effect.cpp:126 #: ../src/live_effects/effect.cpp:111 msgid "VonKoch" msgstr "VonKoch" -#: ../src/live_effects/effect.cpp:127 #: ../src/live_effects/effect.cpp:112 msgid "Knot" msgstr "Uzol" -#: ../src/live_effects/effect.cpp:128 #: ../src/live_effects/effect.cpp:113 msgid "Construct grid" msgstr "Zostrojiť mriežku" -#: ../src/live_effects/effect.cpp:129 #: ../src/live_effects/effect.cpp:114 msgid "Spiro spline" msgstr "Špirálová drážka" -#: ../src/live_effects/effect.cpp:130 #: ../src/live_effects/effect.cpp:115 msgid "Envelope Deformation" msgstr "Obálková deformácia" -#: ../src/live_effects/effect.cpp:131 #: ../src/live_effects/effect.cpp:116 msgid "Interpolate Sub-Paths" msgstr "Interpolácia podciest" -#: ../src/live_effects/effect.cpp:132 #: ../src/live_effects/effect.cpp:117 msgid "Hatches (rough)" msgstr "Šrafovanie (hrubé)" -#: ../src/live_effects/effect.cpp:133 #: ../src/live_effects/effect.cpp:118 msgid "Sketch" msgstr "Skica" -#: ../src/live_effects/effect.cpp:134 #: ../src/live_effects/effect.cpp:119 msgid "Ruler" msgstr "Pravítko" -#. 0.91 #. 0.49 -#: ../src/live_effects/effect.cpp:136 #: ../src/live_effects/effect.cpp:121 #, fuzzy msgid "Power stroke" msgstr "Ťah vzorky" -#: ../src/live_effects/effect.cpp:137 -#: ../src/live_effects/effect.cpp:122 -#: ../src/selection-chemistry.cpp:2837 +#: ../src/live_effects/effect.cpp:122 ../src/selection-chemistry.cpp:2835 +#, fuzzy msgid "Clone original path" -msgstr "Klonovať pôvodnú cestu" - -#. EXPERIMENTAL -#: ../src/live_effects/effect.cpp:139 -#: ../src/live_effects/lpe-show_handles.cpp:26 -msgid "Show handles" -msgstr "" - -#: ../src/live_effects/effect.cpp:141 ../src/widgets/pencil-toolbar.cpp:109 -msgid "BSpline" -msgstr "" - -#: ../src/live_effects/effect.cpp:142 -msgid "Join type" -msgstr "" - -#: ../src/live_effects/effect.cpp:143 -msgid "Taper stroke" -msgstr "" - -#. Ponyscape -#: ../src/live_effects/effect.cpp:145 -msgid "Attach path" -msgstr "" - -#: ../src/live_effects/effect.cpp:146 -msgid "Fill between strokes" -msgstr "" - -#: ../src/live_effects/effect.cpp:147 ../src/selection-chemistry.cpp:2926 -msgid "Fill between many" -msgstr "" - -#: ../src/live_effects/effect.cpp:148 -msgid "Ellipse by 5 points" -msgstr "" - -#: ../src/live_effects/effect.cpp:149 -msgid "Bounding Box" -msgstr "" - -#: ../src/live_effects/effect.cpp:152 -msgid "Lattice Deformation 2" -msgstr "" - -#: ../src/live_effects/effect.cpp:153 -msgid "Perspective/Envelope" -msgstr "" - -#: ../src/live_effects/effect.cpp:154 -msgid "Fillet/Chamfer" -msgstr "" - -#: ../src/live_effects/effect.cpp:155 -msgid "Interpolate points" -msgstr "" +msgstr "Nahradiť písmo" -#: ../src/live_effects/effect.cpp:362 #: ../src/live_effects/effect.cpp:284 msgid "Is visible?" msgstr "Je viditeľný?" -#: ../src/live_effects/effect.cpp:362 #: ../src/live_effects/effect.cpp:284 msgid "" "If unchecked, the effect remains applied to the object but is temporarily " "disabled on canvas" msgstr "" -"Ak nie je voľba nastavená, efekt zostane použitý na objekte, ale je dočasne " -"vypnutý na plátne." - -#: ../src/live_effects/effect.cpp:384 -#: ../src/live_effects/effect.cpp:305 -msgid "No effect" -msgstr "Žiadny efekt" - -#: ../src/live_effects/effect.cpp:492 -#: ../src/live_effects/effect.cpp:352 -#, c-format -msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" -msgstr "Prosím, uveďte parameter cesty pre LPE „%s“ pomocou %d kliknutí myši" - -#: ../src/live_effects/effect.cpp:759 -#: ../src/live_effects/effect.cpp:624 -#, c-format -msgid "Editing parameter %s." -msgstr "Úprava parametra %s." - -#: ../src/live_effects/effect.cpp:764 -#: ../src/live_effects/effect.cpp:629 -msgid "None of the applied path effect's parameters can be edited on-canvas." -msgstr "Žiadny z použitých parametrov cesty nie je možné upravovať na plátne." - -#: ../src/live_effects/lpe-attach-path.cpp:29 -msgid "Start path:" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:29 -msgid "Path to attach to the start of this path" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:30 -msgid "Start path position:" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:30 -msgid "Position to attach path start to" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:31 -msgid "Start path curve start:" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:31 -#: ../src/live_effects/lpe-attach-path.cpp:35 -msgid "Starting curve" -msgstr "" - -#. , true -#: ../src/live_effects/lpe-attach-path.cpp:32 -msgid "Start path curve end:" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:32 -#: ../src/live_effects/lpe-attach-path.cpp:36 -msgid "Ending curve" -msgstr "" - -#. , true -#: ../src/live_effects/lpe-attach-path.cpp:33 -msgid "End path:" -msgstr "" - -#: ../src/live_effects/lpe-attach-path.cpp:33 -msgid "Path to attach to the end of this path" -msgstr "" +"Ak nie je voľba nastavená, efekt zostane použitý na objekte, ale je dočasne " +"vypnutý na plátne." -#: ../src/live_effects/lpe-attach-path.cpp:34 -msgid "End path position:" -msgstr "" +#: ../src/live_effects/effect.cpp:305 +msgid "No effect" +msgstr "Žiadny efekt" -#: ../src/live_effects/lpe-attach-path.cpp:34 -msgid "Position to attach path end to" -msgstr "" +#: ../src/live_effects/effect.cpp:352 +#, c-format +msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" +msgstr "Prosím, uveďte parameter cesty pre LPE „%s“ pomocou %d kliknutí myši" -#: ../src/live_effects/lpe-attach-path.cpp:35 -msgid "End path curve start:" -msgstr "" +#: ../src/live_effects/effect.cpp:624 +#, c-format +msgid "Editing parameter %s." +msgstr "Úprava parametra %s." -#. , true -#: ../src/live_effects/lpe-attach-path.cpp:36 -msgid "End path curve end:" -msgstr "" +#: ../src/live_effects/effect.cpp:629 +msgid "None of the applied path effect's parameters can be edited on-canvas." +msgstr "Žiadny z použitých parametrov cesty nie je možné upravovať na plátne." #: ../src/live_effects/lpe-bendpath.cpp:53 +#, fuzzy msgid "Bend path:" -msgstr "Ohnúť cestu:" +msgstr "Ohnúť cestu" #: ../src/live_effects/lpe-bendpath.cpp:53 msgid "Path along which to bend the original path" @@ -9902,10 +8680,8 @@ msgstr "Cesta, pozdĺž ktorej sa má ohnúť pôvodná cesta" #: ../src/live_effects/lpe-bendpath.cpp:54 #: ../src/live_effects/lpe-patternalongpath.cpp:62 -#: ../src/ui/dialog/export.cpp:289 ../src/ui/dialog/transformation.cpp:78 +#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/transformation.cpp:80 #: ../src/ui/widget/page-sizer.cpp:236 -#: ../src/ui/dialog/export.cpp:290 -#: ../src/ui/dialog/transformation.cpp:80 msgid "_Width:" msgstr "_Šírka:" @@ -9914,121 +8690,73 @@ msgid "Width of the path" msgstr "Šírka cesty" #: ../src/live_effects/lpe-bendpath.cpp:55 +#, fuzzy msgid "W_idth in units of length" -msgstr "Ší_rka v jednotkách dĺžky" +msgstr "Šírka v jednotkách dĺžky" #: ../src/live_effects/lpe-bendpath.cpp:55 msgid "Scale the width of the path in units of its length" msgstr "Zmeniť mierku šírky cesty v jednotkách jej dĺžky" #: ../src/live_effects/lpe-bendpath.cpp:56 +#, fuzzy msgid "_Original path is vertical" -msgstr "Pôv_odná cesta je zvisle" +msgstr "Pôvodná cesta je zvisle" #: ../src/live_effects/lpe-bendpath.cpp:56 msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "Otáča originál o 90 stupňov predtým, než ho ohne pozdĺž cesty" -#: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 -#: ../src/live_effects/lpe-fill-between-many.cpp:25 -#: ../src/live_effects/lpe-fill-between-strokes.cpp:23 +#, fuzzy msgid "Linked path:" -msgstr "Spojená cesta:" +msgstr "Pripojiť k ceste" -#: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 -#: ../src/live_effects/lpe-fill-between-strokes.cpp:23 +#, fuzzy msgid "Path from which to take the original path data" -msgstr "Cesta, z ktorej vziať dáta pôvodnej cesty" - -#: ../src/live_effects/lpe-bounding-box.cpp:25 -msgid "Visual Bounds" -msgstr "" - -#: ../src/live_effects/lpe-bounding-box.cpp:25 -msgid "Uses the visual bounding box" -msgstr "" - -#. initialise your parameters here: -#. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, -#. Geom::Point(100,100)), -#: ../src/live_effects/lpe-bspline.cpp:60 -msgid "Steps with CTRL:" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:60 -msgid "Change number of steps with CTRL pressed" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:61 -msgid "Ignore cusp nodes" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:61 -msgid "Change ignoring cusp nodes" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:62 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:57 -msgid "Change only selected nodes" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:63 -msgid "Show helper paths" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:64 -msgid "Change weight:" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:64 -msgid "Change weight of the effect" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:291 -msgid "Default weight" -msgstr "" - -#: ../src/live_effects/lpe-bspline.cpp:296 -msgid "Make cusp" -msgstr "" +msgstr "Cesta, pozdĺž ktorej sa má ohnúť pôvodná cesta" #: ../src/live_effects/lpe-constructgrid.cpp:27 +#, fuzzy msgid "Size _X:" -msgstr "Veľkosť _X:" +msgstr "Veľkosť X" #: ../src/live_effects/lpe-constructgrid.cpp:27 msgid "The size of the grid in X direction." msgstr "Veľkosť mriežky v smere X." #: ../src/live_effects/lpe-constructgrid.cpp:28 +#, fuzzy msgid "Size _Y:" -msgstr "Veľkosť _Y:" +msgstr "Veľkosť Y" #: ../src/live_effects/lpe-constructgrid.cpp:28 msgid "The size of the grid in Y direction." msgstr "Veľkosť mriežky v smere Y." #: ../src/live_effects/lpe-curvestitch.cpp:41 +#, fuzzy msgid "Stitch path:" -msgstr "Zošiť cestu:" +msgstr "Zošiť cestu" #: ../src/live_effects/lpe-curvestitch.cpp:41 msgid "The path that will be used as stitch." msgstr "Cesta, ktorá sa použije ako steh." #: ../src/live_effects/lpe-curvestitch.cpp:42 +#, fuzzy msgid "N_umber of paths:" -msgstr "_Počet ciest:" +msgstr "Počet ciest" #: ../src/live_effects/lpe-curvestitch.cpp:42 msgid "The number of paths that will be generated." msgstr "Počet ciest, ktoré sa vygenerujú." #: ../src/live_effects/lpe-curvestitch.cpp:43 +#, fuzzy msgid "Sta_rt edge variance:" -msgstr "Va_riácia počiatočnej hrany:" +msgstr "Variácia počiatočnej hrany" #: ../src/live_effects/lpe-curvestitch.cpp:43 msgid "" @@ -10039,8 +8767,9 @@ msgstr "" "a von vodiacej cesty" #: ../src/live_effects/lpe-curvestitch.cpp:44 +#, fuzzy msgid "Sta_rt spacing variance:" -msgstr "Počiatočná va_riácia rozostupov:" +msgstr "Počiatočná variácia rozostupov" #: ../src/live_effects/lpe-curvestitch.cpp:44 msgid "" @@ -10051,8 +8780,9 @@ msgstr "" "pozdĺž vodiacej cesty" #: ../src/live_effects/lpe-curvestitch.cpp:45 +#, fuzzy msgid "End ed_ge variance:" -msgstr "_Variácia koncovej hrany:" +msgstr "Variácia koncovej hrany" #: ../src/live_effects/lpe-curvestitch.cpp:45 msgid "" @@ -10063,8 +8793,9 @@ msgstr "" "von vodiacej cesty" #: ../src/live_effects/lpe-curvestitch.cpp:46 +#, fuzzy msgid "End spa_cing variance:" -msgstr "Konečná variá_cia rozostupov:" +msgstr "Konečná variácia rozostupov" #: ../src/live_effects/lpe-curvestitch.cpp:46 msgid "" @@ -10075,72 +8806,72 @@ msgstr "" "pozdĺž vodiacej cesty" #: ../src/live_effects/lpe-curvestitch.cpp:47 +#, fuzzy msgid "Scale _width:" -msgstr "Šírka _mierky:" +msgstr "Šírka mierky" #: ../src/live_effects/lpe-curvestitch.cpp:47 msgid "Scale the width of the stitch path" msgstr "Zmena mierky šírky zošitej cesty" #: ../src/live_effects/lpe-curvestitch.cpp:48 +#, fuzzy msgid "Scale _width relative to length" -msgstr "_Zmena mierky relatívne k dĺžke" +msgstr "Zmena mierky relatívne k dĺžke" #: ../src/live_effects/lpe-curvestitch.cpp:48 msgid "Scale the width of the stitch path relative to its length" msgstr "Zmena mierky šírky zošitej cesty relatívne k jej dĺžke" -#: ../src/live_effects/lpe-ellipse_5pts.cpp:77 -msgid "Five points required for constructing an ellipse" -msgstr "" - -#: ../src/live_effects/lpe-ellipse_5pts.cpp:162 -msgid "No ellipse found for specified points" -msgstr "" - #: ../src/live_effects/lpe-envelope.cpp:31 +#, fuzzy msgid "Top bend path:" -msgstr "Vrchná cesta pre ohyb:" +msgstr "Vrchná cesta pre ohyb" #: ../src/live_effects/lpe-envelope.cpp:31 msgid "Top path along which to bend the original path" msgstr "Vrchná cesta, pozdĺž ktorej sa má ohnúť pôvodná cesta" #: ../src/live_effects/lpe-envelope.cpp:32 +#, fuzzy msgid "Right bend path:" -msgstr "Pravá cesta pre ohyb:" +msgstr "Pravá cesta pre ohyb" #: ../src/live_effects/lpe-envelope.cpp:32 msgid "Right path along which to bend the original path" msgstr "Pravá cesta, pozdĺž ktorej sa má ohnúť pôvodná cesta" #: ../src/live_effects/lpe-envelope.cpp:33 +#, fuzzy msgid "Bottom bend path:" -msgstr "Spodná cesta pre ohyb:" +msgstr "Spodná cesta pre ohyb" #: ../src/live_effects/lpe-envelope.cpp:33 msgid "Bottom path along which to bend the original path" msgstr "Spodná cesta, pozdĺž ktorej sa má ohnúť pôvodná cesta" #: ../src/live_effects/lpe-envelope.cpp:34 +#, fuzzy msgid "Left bend path:" -msgstr "Ľavá cesta pre ohyb:" +msgstr "Ľavá cesta pre ohyb" #: ../src/live_effects/lpe-envelope.cpp:34 msgid "Left path along which to bend the original path" msgstr "Ľavá cesta, pozdĺž ktorej sa má ohnúť pôvodná cesta" #: ../src/live_effects/lpe-envelope.cpp:35 -msgid "_Enable left & right paths" -msgstr "" +#, fuzzy +msgid "E_nable left & right paths" +msgstr "Zapnúť ľavé a pravé cesty" #: ../src/live_effects/lpe-envelope.cpp:35 msgid "Enable the left and right deformation paths" msgstr "Zapnúť ľavé a pravé deformačné cesty" #: ../src/live_effects/lpe-envelope.cpp:36 +#, fuzzy msgid "_Enable top & bottom paths" -msgstr "Zapnúť vrchné a spodné c_esty" +msgstr "Zapnúť vrchné a spodné cesty" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "Enable the top and bottom deformation paths" @@ -10154,139 +8885,19 @@ msgstr "Smer" msgid "Defines the direction and magnitude of the extrusion" msgstr "Definuje smer a veľkosť vysunutia" -#: ../src/live_effects/lpe-fill-between-many.cpp:25 -msgid "Paths from which to take the original path data" -msgstr "" - -#: ../src/live_effects/lpe-fill-between-strokes.cpp:24 -msgid "Second path:" -msgstr "" - -#: ../src/live_effects/lpe-fill-between-strokes.cpp:24 -msgid "Second path from which to take the original path data" -msgstr "" - -#: ../src/live_effects/lpe-fill-between-strokes.cpp:25 -msgid "Reverse Second" -msgstr "" - -#: ../src/live_effects/lpe-fill-between-strokes.cpp:25 -msgid "Reverses the second path order" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:42 -#: ../share/extensions/render_barcode_qrcode.inx.h:5 -#, fuzzy -msgid "Auto" -msgstr "Automatické ukladanie" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:43 -msgid "Force arc" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:44 -msgid "Force bezier" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:54 -msgid "Fillet point" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:55 -msgid "Hide knots" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:56 -msgid "Ignore 0 radius knots" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:58 -msgid "Flexible radius size (%)" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:59 -msgid "Use knots distance instead radius" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:60 -#: ../src/live_effects/lpe-ruler.cpp:42 -#: ../share/extensions/foldablebox.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:9 -#: ../share/extensions/layout_nup.inx.h:3 -#: ../share/extensions/printing_marks.inx.h:11 -msgid "Unit:" -msgstr "Jednotka:" - -#. initialise your parameters here: -#: ../src/live_effects/lpe-fillet-chamfer.cpp:60 -#: ../src/live_effects/lpe-roughen.cpp:39 ../src/live_effects/lpe-ruler.cpp:42 -#: ../src/widgets/ruler.cpp:201 -msgid "Unit" -msgstr "Jednotka" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:61 -msgid "Method:" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:61 -msgid "Fillets methods" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:62 -msgid "Radius (unit or %):" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:62 -msgid "Radius, in unit or %" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:63 -msgid "Chamfer steps:" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:63 -msgid "Chamfer steps" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:65 -msgid "Helper size with direction:" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:65 -msgid "Helper size with direction" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:157 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 -msgid "Fillet" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:161 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 -msgid "Inverse fillet" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:166 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:80 -msgid "Chamfer" -msgstr "" - -#: ../src/live_effects/lpe-fillet-chamfer.cpp:170 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:82 -msgid "Inverse chamfer" -msgstr "" - #: ../src/live_effects/lpe-gears.cpp:214 +#, fuzzy msgid "_Teeth:" -msgstr "_Zuby:" +msgstr "Zuby" #: ../src/live_effects/lpe-gears.cpp:214 msgid "The number of teeth" msgstr "Počet zubov" #: ../src/live_effects/lpe-gears.cpp:215 +#, fuzzy msgid "_Phi:" -msgstr "_Fí:" +msgstr "fí" #: ../src/live_effects/lpe-gears.cpp:215 msgid "" @@ -10297,24 +8908,27 @@ msgstr "" "kontakte.." #: ../src/live_effects/lpe-interpolate.cpp:31 +#, fuzzy msgid "Trajectory:" -msgstr "Trajektória:" +msgstr "Trajektória" #: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Path along which intermediate steps are created." msgstr "Cesta, pozdĺž ktorej sa majú vytvoriť medzikroky." #: ../src/live_effects/lpe-interpolate.cpp:32 +#, fuzzy msgid "Steps_:" -msgstr "Kroky_:" +msgstr "Kroky" #: ../src/live_effects/lpe-interpolate.cpp:32 msgid "Determines the number of steps from start to end path." msgstr "Určuje počet krokov od začiatku po koniec cesty." #: ../src/live_effects/lpe-interpolate.cpp:33 +#, fuzzy msgid "E_quidistant spacing" -msgstr "_Rovnomerné rozostupy" +msgstr "Rovnomerné rozostupy" #: ../src/live_effects/lpe-interpolate.cpp:33 msgid "" @@ -10326,441 +8940,69 @@ msgstr "" "konštantné. Aj je vypnutá, vzdialenosť závisí na umiestnení uzlov na " "trajektórii cesty." -#: ../src/live_effects/lpe-interpolate_points.cpp:26 -#: ../src/live_effects/lpe-powerstroke.cpp:195 -#: ../src/live_effects/lpe-powerstroke.cpp:189 -msgid "CubicBezierFit" -msgstr "" - -#: ../src/live_effects/lpe-interpolate_points.cpp:27 -#: ../src/live_effects/lpe-powerstroke.cpp:196 -#: ../src/live_effects/lpe-powerstroke.cpp:190 -msgid "CubicBezierJohan" -msgstr "" - -#: ../src/live_effects/lpe-interpolate_points.cpp:28 -#: ../src/live_effects/lpe-powerstroke.cpp:197 -#: ../src/live_effects/lpe-powerstroke.cpp:191 -msgid "SpiroInterpolator" -msgstr "" - -#: ../src/live_effects/lpe-interpolate_points.cpp:29 -#: ../src/live_effects/lpe-powerstroke.cpp:198 -#: ../src/live_effects/lpe-powerstroke.cpp:192 -msgid "Centripetal Catmull-Rom" -msgstr "" - -#: ../src/live_effects/lpe-interpolate_points.cpp:37 -#: ../src/live_effects/lpe-powerstroke.cpp:240 -#: ../src/live_effects/lpe-powerstroke.cpp:234 -msgid "Interpolator type:" -msgstr "Typ interpolácie:" - -#: ../src/live_effects/lpe-interpolate_points.cpp:38 -#: ../src/live_effects/lpe-powerstroke.cpp:240 -#: ../src/live_effects/lpe-powerstroke.cpp:234 -msgid "" -"Determines which kind of interpolator will be used to interpolate between " -"stroke width along the path" -msgstr "" -"Určuje, ktorý druh interpolácie sa použije na interpolovanie medzi šírkou " -"ťahu pozdĺž cesty" - -#: ../src/live_effects/lpe-jointype.cpp:31 -#: ../src/live_effects/lpe-powerstroke.cpp:227 -#: ../src/live_effects/lpe-taperstroke.cpp:63 -#: ../src/live_effects/lpe-powerstroke.cpp:221 -msgid "Beveled" -msgstr "Vrstvenie" - -#: ../src/live_effects/lpe-jointype.cpp:32 -#: ../src/live_effects/lpe-jointype.cpp:40 -#: ../src/live_effects/lpe-powerstroke.cpp:228 -#: ../src/live_effects/lpe-taperstroke.cpp:64 -#: ../src/widgets/star-toolbar.cpp:536 -#: ../src/live_effects/lpe-powerstroke.cpp:222 -#: ../src/widgets/star-toolbar.cpp:534 -msgid "Rounded" -msgstr "Zaoblené" - -#: ../src/live_effects/lpe-jointype.cpp:33 -#: ../src/live_effects/lpe-powerstroke.cpp:231 -#: ../src/live_effects/lpe-taperstroke.cpp:66 -#: ../src/live_effects/lpe-powerstroke.cpp:225 -#, fuzzy -msgid "Miter" -msgstr "Ostrý spoj" - -#: ../src/live_effects/lpe-jointype.cpp:34 -#: ../src/live_effects/lpe-taperstroke.cpp:65 -#: ../src/widgets/gradient-toolbar.cpp:1115 -msgid "Reflected" -msgstr "Odrazený" - -#. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well -#: ../src/live_effects/lpe-jointype.cpp:35 -#: ../src/live_effects/lpe-powerstroke.cpp:230 -#: ../src/live_effects/lpe-powerstroke.cpp:224 -msgid "Extrapolated arc" -msgstr "Extrapolovaný oblúk" - -#: ../src/live_effects/lpe-jointype.cpp:39 -#: ../src/live_effects/lpe-powerstroke.cpp:210 -#: ../src/live_effects/lpe-powerstroke.cpp:204 -msgid "Butt" -msgstr "" - -# TODO: check -#: ../src/live_effects/lpe-jointype.cpp:41 -#: ../src/live_effects/lpe-powerstroke.cpp:211 -#: ../src/live_effects/lpe-powerstroke.cpp:205 -msgid "Square" -msgstr "Štvorcový" - -#: ../src/live_effects/lpe-jointype.cpp:42 -#: ../src/live_effects/lpe-powerstroke.cpp:213 -#: ../src/live_effects/lpe-powerstroke.cpp:207 -msgid "Peak" -msgstr "Vrchol" - -#: ../src/live_effects/lpe-jointype.cpp:43 -msgid "Leaned" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:51 -msgid "Thickness of the stroke" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:52 -msgid "Line cap" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:52 -msgid "The end shape of the stroke" -msgstr "" - -#. Join type -#. TRANSLATORS: The line join style specifies the shape to be used at the -#. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-jointype.cpp:53 -#: ../src/live_effects/lpe-powerstroke.cpp:243 -#: ../src/widgets/stroke-style.cpp:227 -#: ../src/live_effects/lpe-powerstroke.cpp:237 -msgid "Join:" -msgstr "Spoj:" - -#: ../src/live_effects/lpe-jointype.cpp:53 -#: ../src/live_effects/lpe-powerstroke.cpp:243 -#: ../src/live_effects/lpe-powerstroke.cpp:237 -#, fuzzy -msgid "Determines the shape of the path's corners" -msgstr "Určuje počet krokov od začiatku po koniec cesty." - -#: ../src/live_effects/lpe-jointype.cpp:54 -msgid "Start path lean" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:55 -msgid "End path lean" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:56 -#: ../src/live_effects/lpe-powerstroke.cpp:244 -#: ../src/live_effects/lpe-taperstroke.cpp:79 -#: ../src/live_effects/lpe-powerstroke.cpp:238 -#, fuzzy -msgid "Miter limit:" -msgstr "Limit ostrosti rohu:" - -#: ../src/live_effects/lpe-jointype.cpp:56 -msgid "Maximum length of the miter join (in units of stroke width)" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:57 -msgid "Force miter" -msgstr "" - -#: ../src/live_effects/lpe-jointype.cpp:57 -msgid "Overrides the miter limit and forces a join." -msgstr "" - #. initialise your parameters here: -#: ../src/live_effects/lpe-knot.cpp:351 #: ../src/live_effects/lpe-knot.cpp:350 +#, fuzzy msgid "Fi_xed width:" -msgstr "_Pevná šírka:" +msgstr "Pevná šírka" -#: ../src/live_effects/lpe-knot.cpp:351 #: ../src/live_effects/lpe-knot.cpp:350 msgid "Size of hidden region of lower string" msgstr "Veľkosť skrytej oblasti spodného reťazca" -#: ../src/live_effects/lpe-knot.cpp:352 #: ../src/live_effects/lpe-knot.cpp:351 +#, fuzzy msgid "_In units of stroke width" -msgstr "_V jednotkách šírky ťahu" +msgstr "V jednotkách šírky ťahu" -#: ../src/live_effects/lpe-knot.cpp:352 #: ../src/live_effects/lpe-knot.cpp:351 msgid "Consider 'Interruption width' as a ratio of stroke width" msgstr "Považovať „Šírku prerušenia“ v pomere k šírke ťahu" -#: ../src/live_effects/lpe-knot.cpp:353 #: ../src/live_effects/lpe-knot.cpp:352 +#, fuzzy msgid "St_roke width" -msgstr "Ší_rka ťahu" +msgstr "Šírka ťahu" -#: ../src/live_effects/lpe-knot.cpp:353 #: ../src/live_effects/lpe-knot.cpp:352 msgid "Add the stroke width to the interruption size" msgstr "Pridať šírku ťahu k šírke prerušenia" -#: ../src/live_effects/lpe-knot.cpp:354 #: ../src/live_effects/lpe-knot.cpp:353 +#, fuzzy msgid "_Crossing path stroke width" -msgstr "_Zmeniť šírku pretínajúcej cesty" +msgstr "Zmeniť šírku pretínajúcej cesty" -#: ../src/live_effects/lpe-knot.cpp:354 #: ../src/live_effects/lpe-knot.cpp:353 msgid "Add crossed stroke width to the interruption size" msgstr "Pridať šírku pretínajúceho ťahu k šírke prerušenia" -#: ../src/live_effects/lpe-knot.cpp:355 #: ../src/live_effects/lpe-knot.cpp:354 +#, fuzzy msgid "S_witcher size:" -msgstr "_Veľkosť prepínača:" +msgstr "Veľkosť prepínača" -#: ../src/live_effects/lpe-knot.cpp:355 #: ../src/live_effects/lpe-knot.cpp:354 msgid "Orientation indicator/switcher size" msgstr "Indikátor orientácie/veľkosť prepínača" -#: ../src/live_effects/lpe-knot.cpp:356 #: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossing Signs" msgstr "Značky pretínania" -#: ../src/live_effects/lpe-knot.cpp:356 #: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossings signs" msgstr "Značky pretínania" -#: ../src/live_effects/lpe-knot.cpp:627 #: ../src/live_effects/lpe-knot.cpp:622 msgid "Drag to select a crossing, click to flip it" msgstr "Ťahaním vyberte pretnutie, kliknutím ho obrátite" #. / @todo Is this the right verb? -#: ../src/live_effects/lpe-knot.cpp:665 #: ../src/live_effects/lpe-knot.cpp:660 msgid "Change knot crossing" msgstr "Zmeniť pretínanie uzlov" -#. initialise your parameters here: -#: ../src/live_effects/lpe-lattice2.cpp:47 -msgid "Control handle 0:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:47 -msgid "Control handle 0 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:48 -msgid "Control handle 1:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:48 -msgid "Control handle 1 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:49 -msgid "Control handle 2:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:49 -msgid "Control handle 2 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:50 -msgid "Control handle 3:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:50 -msgid "Control handle 3 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:51 -msgid "Control handle 4:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:51 -msgid "Control handle 4 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:52 -msgid "Control handle 5:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:52 -msgid "Control handle 5 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:53 -msgid "Control handle 6:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:53 -msgid "Control handle 6 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:54 -msgid "Control handle 7:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:54 -msgid "Control handle 7 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:55 -msgid "Control handle 8x9:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:55 -msgid "Control handle 8x9 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:56 -msgid "Control handle 10x11:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:56 -msgid "Control handle 10x11 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:57 -msgid "Control handle 12:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:57 -msgid "Control handle 12 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:58 -msgid "Control handle 13:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:58 -msgid "Control handle 13 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:59 -msgid "Control handle 14:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:59 -msgid "Control handle 14 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:60 -msgid "Control handle 15:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:60 -msgid "Control handle 15 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:61 -msgid "Control handle 16:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:61 -msgid "Control handle 16 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:62 -msgid "Control handle 17:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:62 -msgid "Control handle 17 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:63 -msgid "Control handle 18:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:63 -msgid "Control handle 18 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:64 -msgid "Control handle 19:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:64 -msgid "Control handle 19 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:65 -msgid "Control handle 20x21:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:65 -msgid "Control handle 20x21 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:66 -msgid "Control handle 22x23:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:66 -msgid "Control handle 22x23 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:67 -msgid "Control handle 24x26:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:67 -msgid "Control handle 24x26 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:68 -msgid "Control handle 25x27:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:68 -msgid "Control handle 25x27 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:69 -msgid "Control handle 28x30:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:69 -msgid "Control handle 28x30 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:70 -msgid "Control handle 29x31:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:70 -msgid "Control handle 29x31 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:71 -msgid "Control handle 32x33x34x35:" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:71 -msgid "Control handle 32x33x34x35 - Ctrl+Alt+Click to reset" -msgstr "" - -#: ../src/live_effects/lpe-lattice2.cpp:221 -msgid "Reset grid" -msgstr "" - #: ../src/live_effects/lpe-patternalongpath.cpp:50 #: ../share/extensions/pathalongpath.inx.h:10 msgid "Single" @@ -10782,16 +9024,18 @@ msgid "Repeated, stretched" msgstr "Opakovaná, natiahnutá" #: ../src/live_effects/lpe-patternalongpath.cpp:59 +#, fuzzy msgid "Pattern source:" -msgstr "Zdroj vzorky:" +msgstr "Zdroj vzorky" #: ../src/live_effects/lpe-patternalongpath.cpp:59 msgid "Path to put along the skeleton path" msgstr "Cesta, ktorú umiestniť pozdĺž kostrovej cesty" #: ../src/live_effects/lpe-patternalongpath.cpp:60 +#, fuzzy msgid "Pattern copies:" -msgstr "Kópie vzorky:" +msgstr "Kópie vzorky" #: ../src/live_effects/lpe-patternalongpath.cpp:60 msgid "How many pattern copies to place along the skeleton path" @@ -10802,16 +9046,18 @@ msgid "Width of the pattern" msgstr "Šírka vzorky" #: ../src/live_effects/lpe-patternalongpath.cpp:63 +#, fuzzy msgid "Wid_th in units of length" -msgstr "Šírka v jedno_tkách dĺžky" +msgstr "Šírka v jednotkách dĺžky" #: ../src/live_effects/lpe-patternalongpath.cpp:64 msgid "Scale the width of the pattern in units of its length" msgstr "Zmeniť mierku šírky vzorky v jednotkách jej šírky ťahu" #: ../src/live_effects/lpe-patternalongpath.cpp:66 +#, fuzzy msgid "Spa_cing:" -msgstr "_Rozostupy:" +msgstr "Rozostup:" #: ../src/live_effects/lpe-patternalongpath.cpp:68 #, no-c-format @@ -10823,170 +9069,189 @@ msgstr "" "na -90 % šírky vzorky." #: ../src/live_effects/lpe-patternalongpath.cpp:70 +#, fuzzy msgid "No_rmal offset:" -msgstr "No_rmálny posun:" +msgstr "Normálny posun:" #: ../src/live_effects/lpe-patternalongpath.cpp:71 +#, fuzzy msgid "Tan_gential offset:" -msgstr "Tan_genciálne posunutie:" +msgstr "Tangenciálne posunutie:" #: ../src/live_effects/lpe-patternalongpath.cpp:72 +#, fuzzy msgid "Offsets in _unit of pattern size" -msgstr "Pos_unutie v jednotkách veľkosti vzorky" +msgstr "Posunutie v jednotkách veľkosti vzorky" #: ../src/live_effects/lpe-patternalongpath.cpp:73 msgid "" "Spacing, tangential and normal offset are expressed as a ratio of width/" "height" msgstr "" -"Rozostupy, tangenciálne a normálne posunutie sa vyjadrujú ako pomer " -"šírky/výšky" +"Rozostupy, tangenciálne a normálne posunutie sa vyjadrujú ako pomer šírky/" +"výšky" #: ../src/live_effects/lpe-patternalongpath.cpp:75 +#, fuzzy msgid "Pattern is _vertical" -msgstr "Vzorka je _vertikálne" +msgstr "Vzorka je vertikálne" #: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "Rotate pattern 90 deg before applying" msgstr "Pre použitím otočiť vzorku o 90 stupňov" #: ../src/live_effects/lpe-patternalongpath.cpp:77 +#, fuzzy msgid "_Fuse nearby ends:" -msgstr "_Spojiť blízke konce:" +msgstr "Spojiť blízke konce" #: ../src/live_effects/lpe-patternalongpath.cpp:77 msgid "Fuse ends closer than this number. 0 means don't fuse." msgstr "Spojiť konce, ktoré sú bližšie ako táto hodnota. 0 znamená nespájať." -#: ../src/live_effects/lpe-perspective-envelope.cpp:37 -#: ../share/extensions/perspective.inx.h:1 -msgid "Perspective" -msgstr "Perspektíva" - -#: ../src/live_effects/lpe-perspective-envelope.cpp:38 -msgid "Envelope deformation" -msgstr "" - -#. initialise your parameters here: -#: ../src/live_effects/lpe-perspective-envelope.cpp:46 -msgid "Type" -msgstr "Typ" - -#: ../src/live_effects/lpe-perspective-envelope.cpp:46 -msgid "Select the type of deformation" -msgstr "" - -#: ../src/live_effects/lpe-perspective-envelope.cpp:47 -msgid "Top Left" -msgstr "" - -#: ../src/live_effects/lpe-perspective-envelope.cpp:47 -msgid "Top Left - Ctrl+Alt+Click to reset" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:189 +#, fuzzy +msgid "CubicBezierFit" +msgstr "Bézier" -#: ../src/live_effects/lpe-perspective-envelope.cpp:48 -msgid "Top Right" +#: ../src/live_effects/lpe-powerstroke.cpp:190 +msgid "CubicBezierJohan" msgstr "" -#: ../src/live_effects/lpe-perspective-envelope.cpp:48 -msgid "Top Right - Ctrl+Alt+Click to reset" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:191 +#, fuzzy +msgid "SpiroInterpolator" +msgstr "Interpolácia" -#: ../src/live_effects/lpe-perspective-envelope.cpp:49 -msgid "Down Left" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:203 +#, fuzzy +msgid "Butt" +msgstr "Tlačidlo" -#: ../src/live_effects/lpe-perspective-envelope.cpp:49 -msgid "Down Left - Ctrl+Alt+Click to reset" -msgstr "" +# TODO: check +#: ../src/live_effects/lpe-powerstroke.cpp:204 +msgid "Square" +msgstr "Štvorcový" -#: ../src/live_effects/lpe-perspective-envelope.cpp:50 -msgid "Down Right" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:205 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 +#, fuzzy +msgid "Round" +msgstr "Zaoblené" -#: ../src/live_effects/lpe-perspective-envelope.cpp:50 -msgid "Down Right - Ctrl+Alt+Click to reset" +#: ../src/live_effects/lpe-powerstroke.cpp:206 +msgid "Peak" msgstr "" -#: ../src/live_effects/lpe-perspective-envelope.cpp:257 -msgid "Handles:" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:207 +#, fuzzy +msgid "Zero width" +msgstr "Šírka pera" -#: ../src/live_effects/lpe-powerstroke.cpp:193 -msgid "CubicBezierSmooth" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:220 +#, fuzzy +msgid "Beveled" +msgstr "Vrstvenie" -#: ../src/live_effects/lpe-powerstroke.cpp:212 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 -#: ../src/live_effects/lpe-powerstroke.cpp:206 -msgid "Round" +#: ../src/live_effects/lpe-powerstroke.cpp:221 +#: ../src/widgets/star-toolbar.cpp:534 +msgid "Rounded" msgstr "Zaoblené" -#: ../src/live_effects/lpe-powerstroke.cpp:214 -#: ../src/live_effects/lpe-powerstroke.cpp:208 -msgid "Zero width" -msgstr "Nulová šírka" +#: ../src/live_effects/lpe-powerstroke.cpp:222 +#, fuzzy +msgid "Extrapolated" +msgstr "Interpolácia" + +#: ../src/live_effects/lpe-powerstroke.cpp:223 +#, fuzzy +msgid "Miter" +msgstr "Ostrý spoj" -#: ../src/live_effects/lpe-powerstroke.cpp:232 +#: ../src/live_effects/lpe-powerstroke.cpp:224 #: ../src/widgets/pencil-toolbar.cpp:103 -#: ../src/live_effects/lpe-powerstroke.cpp:226 msgid "Spiro" msgstr "Špirála" -#: ../src/live_effects/lpe-powerstroke.cpp:238 -#: ../src/live_effects/lpe-powerstroke.cpp:232 -msgid "Offset points" -msgstr "Body posunutia" +#: ../src/live_effects/lpe-powerstroke.cpp:226 +msgid "Extrapolated arc" +msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:239 #: ../src/live_effects/lpe-powerstroke.cpp:233 +#, fuzzy +msgid "Offset points" +msgstr "Posun cesty" + +#: ../src/live_effects/lpe-powerstroke.cpp:234 +#, fuzzy msgid "Sort points" -msgstr "Body zoradenia" +msgstr "Orientačné body" -#: ../src/live_effects/lpe-powerstroke.cpp:239 -#: ../src/live_effects/lpe-powerstroke.cpp:233 +#: ../src/live_effects/lpe-powerstroke.cpp:234 msgid "Sort offset points according to their time value along the curve" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:241 -#: ../share/extensions/fractalize.inx.h:3 #: ../src/live_effects/lpe-powerstroke.cpp:235 +#, fuzzy +msgid "Interpolator type:" +msgstr "Interpolovať štýl" + +#: ../src/live_effects/lpe-powerstroke.cpp:235 +msgid "" +"Determines which kind of interpolator will be used to interpolate between " +"stroke width along the path" +msgstr "" + +#: ../src/live_effects/lpe-powerstroke.cpp:236 +#: ../share/extensions/fractalize.inx.h:3 msgid "Smoothness:" msgstr "Hladkosť:" -#: ../src/live_effects/lpe-powerstroke.cpp:241 -#: ../src/live_effects/lpe-powerstroke.cpp:235 +#: ../src/live_effects/lpe-powerstroke.cpp:236 msgid "" "Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear " "interpolation, 1 = smooth" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:242 -#: ../src/live_effects/lpe-powerstroke.cpp:236 +#: ../src/live_effects/lpe-powerstroke.cpp:237 #, fuzzy msgid "Start cap:" msgstr "Začiatok:" -#: ../src/live_effects/lpe-powerstroke.cpp:242 -#: ../src/live_effects/lpe-powerstroke.cpp:236 +#: ../src/live_effects/lpe-powerstroke.cpp:237 #, fuzzy msgid "Determines the shape of the path's start" msgstr "Určuje počet krokov od začiatku po koniec cesty." -#: ../src/live_effects/lpe-powerstroke.cpp:244 -#: ../src/widgets/stroke-style.cpp:278 +#. Join type +#. TRANSLATORS: The line join style specifies the shape to be used at the +#. corners of paths. It can be "miter", "round" or "bevel". +#: ../src/live_effects/lpe-powerstroke.cpp:238 +#: ../src/widgets/stroke-style.cpp:227 +msgid "Join:" +msgstr "Spoj:" + #: ../src/live_effects/lpe-powerstroke.cpp:238 +#, fuzzy +msgid "Determines the shape of the path's corners" +msgstr "Určuje počet krokov od začiatku po koniec cesty." + +#: ../src/live_effects/lpe-powerstroke.cpp:239 +#, fuzzy +msgid "Miter limit:" +msgstr "Limit ostrosti rohu:" + +#: ../src/live_effects/lpe-powerstroke.cpp:239 +#: ../src/widgets/stroke-style.cpp:278 msgid "Maximum length of the miter (in units of stroke width)" msgstr "Maximálna dĺžka ostrosti rohu (v jednotkách šírky ťahu)" -#: ../src/live_effects/lpe-powerstroke.cpp:245 -#: ../src/live_effects/lpe-powerstroke.cpp:239 +#: ../src/live_effects/lpe-powerstroke.cpp:240 #, fuzzy msgid "End cap:" msgstr "Oblé zakončenie" -#: ../src/live_effects/lpe-powerstroke.cpp:245 -#: ../src/live_effects/lpe-powerstroke.cpp:239 +#: ../src/live_effects/lpe-powerstroke.cpp:240 #, fuzzy msgid "Determines the shape of the path's end" msgstr "Určuje počet krokov od začiatku po koniec cesty." @@ -11001,8 +9266,9 @@ msgid "Variation of distance between hatches, in %." msgstr "Variácia vzdialenosti medzi šrafovaním v %" #: ../src/live_effects/lpe-rough-hatches.cpp:226 +#, fuzzy msgid "Growth:" -msgstr "Rast:" +msgstr "Rast" #: ../src/live_effects/lpe-rough-hatches.cpp:226 msgid "Growth of distance between hatches." @@ -11010,8 +9276,9 @@ msgstr "Nárast vzdialenosti medzi šrafovaním" #. FIXME: top/bottom names are inverted in the UI/svg and in the code!! #: ../src/live_effects/lpe-rough-hatches.cpp:228 +#, fuzzy msgid "Half-turns smoothness: 1st side, in:" -msgstr "Hladkosť polotáčok: 1. strana, dnu:" +msgstr "Hladkosť polotáčok: 1. strana, dnu" #: ../src/live_effects/lpe-rough-hatches.cpp:228 msgid "" @@ -11022,8 +9289,9 @@ msgstr "" "1=štandardná" #: ../src/live_effects/lpe-rough-hatches.cpp:229 +#, fuzzy msgid "1st side, out:" -msgstr "1. strana, von:" +msgstr "1. strana, von" #: ../src/live_effects/lpe-rough-hatches.cpp:229 msgid "" @@ -11034,8 +9302,9 @@ msgstr "" "1=štandardná" #: ../src/live_effects/lpe-rough-hatches.cpp:230 +#, fuzzy msgid "2nd side, in:" -msgstr "2. strana, dnu:" +msgstr "2. strana, dnu" #: ../src/live_effects/lpe-rough-hatches.cpp:230 msgid "" @@ -11046,8 +9315,9 @@ msgstr "" "1=štandardná" #: ../src/live_effects/lpe-rough-hatches.cpp:231 +#, fuzzy msgid "2nd side, out:" -msgstr "2. strana, von:" +msgstr "2. strana, von" #: ../src/live_effects/lpe-rough-hatches.cpp:231 msgid "" @@ -11058,8 +9328,9 @@ msgstr "" "1=štandardná" #: ../src/live_effects/lpe-rough-hatches.cpp:232 +#, fuzzy msgid "Magnitude jitter: 1st side:" -msgstr "Variácia magnitúdy: 1. strana:" +msgstr "Variácia magnitúdy: 1. strana" #: ../src/live_effects/lpe-rough-hatches.cpp:232 msgid "Randomly moves 'bottom' half-turns to produce magnitude variations." @@ -11068,16 +9339,18 @@ msgstr "Náhodne posúva „spodné“ polotáčky aby sa dosiahla variácia mag #: ../src/live_effects/lpe-rough-hatches.cpp:233 #: ../src/live_effects/lpe-rough-hatches.cpp:235 #: ../src/live_effects/lpe-rough-hatches.cpp:237 +#, fuzzy msgid "2nd side:" -msgstr "2. strana:" +msgstr "2. strana" #: ../src/live_effects/lpe-rough-hatches.cpp:233 msgid "Randomly moves 'top' half-turns to produce magnitude variations." msgstr "Náhodne posúva „vrchné“ polotáčky aby sa dosiahla variácia magnitúdy." #: ../src/live_effects/lpe-rough-hatches.cpp:234 +#, fuzzy msgid "Parallelism jitter: 1st side:" -msgstr "Variácia paralelizmu: 1. strana:" +msgstr "Variácia paralelizmu: 1. strana" #: ../src/live_effects/lpe-rough-hatches.cpp:234 msgid "" @@ -11096,8 +9369,9 @@ msgstr "" "hranicu." #: ../src/live_effects/lpe-rough-hatches.cpp:236 +#, fuzzy msgid "Variance: 1st side:" -msgstr "Variácia: 1. strana:" +msgstr "Variácia: 1. strana" #: ../src/live_effects/lpe-rough-hatches.cpp:236 msgid "Randomness of 'bottom' half-turns smoothness" @@ -11125,16 +9399,18 @@ msgid "Add a global bend to the hatches (slower)" msgstr "Pridanie globálneho ohnutia šrafovania (pomalšie)" #: ../src/live_effects/lpe-rough-hatches.cpp:241 +#, fuzzy msgid "Thickness: at 1st side:" -msgstr "Hrúbka: 1. strana:" +msgstr "Hrúbka: 1. strana" #: ../src/live_effects/lpe-rough-hatches.cpp:241 msgid "Width at 'bottom' half-turns" msgstr "Šírka v „spodných“ polotáčkach" #: ../src/live_effects/lpe-rough-hatches.cpp:242 +#, fuzzy msgid "At 2nd side:" -msgstr "na 2. strane:" +msgstr "na 2. strane" #: ../src/live_effects/lpe-rough-hatches.cpp:242 msgid "Width at 'top' half-turns" @@ -11142,16 +9418,18 @@ msgstr "Šírka vo „vrchných“ polotáčkach" #. #: ../src/live_effects/lpe-rough-hatches.cpp:244 +#, fuzzy msgid "From 2nd to 1st side:" -msgstr "z 2. na 1. stranu:" +msgstr "z 2. na 1. stranu" #: ../src/live_effects/lpe-rough-hatches.cpp:244 msgid "Width from 'top' to 'bottom'" -msgstr "Šírka od „vrchu“ po „spodok“:" +msgstr "Šírka od „vrchu“ po „spodok“" #: ../src/live_effects/lpe-rough-hatches.cpp:245 +#, fuzzy msgid "From 1st to 2nd side:" -msgstr "z 1. na 2. stranu:" +msgstr "z 1. na 2. stranu" #: ../src/live_effects/lpe-rough-hatches.cpp:245 msgid "Width from 'bottom' to 'top'" @@ -11178,68 +9456,6 @@ msgstr "" "Relatívna poloha k referenčnému bodu definuje smer a množstvo globálneho " "ohnutia" -#: ../src/live_effects/lpe-roughen.cpp:30 ../share/extensions/addnodes.inx.h:4 -msgid "By number of segments" -msgstr "Podľa počtu úsekov" - -#: ../src/live_effects/lpe-roughen.cpp:31 -msgid "By max. segment size" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:40 -msgid "Method" -msgstr "Metóda" - -#: ../src/live_effects/lpe-roughen.cpp:40 -msgid "Division method" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:42 -msgid "Max. segment size" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:44 -msgid "Number of segments" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:46 -msgid "Max. displacement in X" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:48 -msgid "Max. displacement in Y" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:50 -msgid "Global randomize" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:52 -#: ../share/extensions/radiusrand.inx.h:5 -msgid "Shift nodes" -msgstr "Posunúť uzly" - -#: ../src/live_effects/lpe-roughen.cpp:54 -#: ../share/extensions/radiusrand.inx.h:6 -msgid "Shift node handles" -msgstr "Posunúť úchopy uzlov" - -#: ../src/live_effects/lpe-roughen.cpp:103 -msgid "Roughen unit" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:111 -msgid "Add nodes Subdivide each segment" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:120 -msgid "Jitter nodes Move nodes/handles" -msgstr "" - -#: ../src/live_effects/lpe-roughen.cpp:129 -msgid "Extra roughen Add a extra layer of rough" -msgstr "" - #: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/restack.inx.h:12 #: ../share/extensions/text_extract.inx.h:8 #: ../share/extensions/text_merge.inx.h:8 @@ -11256,192 +9472,131 @@ msgstr "Pravá" msgid "Both" msgstr "Obe" -#: ../src/live_effects/lpe-ruler.cpp:32 -msgctxt "Border mark" -msgid "None" -msgstr "Žiadna" - -#: ../src/live_effects/lpe-ruler.cpp:33 ../src/widgets/arc-toolbar.cpp:328 -#: ../src/widgets/arc-toolbar.cpp:326 +#: ../src/live_effects/lpe-ruler.cpp:33 ../src/widgets/arc-toolbar.cpp:326 msgid "Start" msgstr "Začiatok" -#: ../src/live_effects/lpe-ruler.cpp:34 ../src/widgets/arc-toolbar.cpp:341 -#: ../src/widgets/arc-toolbar.cpp:339 +#: ../src/live_effects/lpe-ruler.cpp:34 ../src/widgets/arc-toolbar.cpp:339 msgid "End" msgstr "Koniec" #: ../src/live_effects/lpe-ruler.cpp:41 +#, fuzzy msgid "_Mark distance:" -msgstr "_Vzdialenosť značiek:" +msgstr "Vzdialenosť značiek" #: ../src/live_effects/lpe-ruler.cpp:41 msgid "Distance between successive ruler marks" msgstr "Vzdialenosť medzi po sebe idúcimi značkami pravítka" +#: ../src/live_effects/lpe-ruler.cpp:42 +#: ../share/extensions/foldablebox.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:9 +#: ../share/extensions/layout_nup.inx.h:3 +#: ../share/extensions/printing_marks.inx.h:11 +msgid "Unit:" +msgstr "Jednotka:" + +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:201 +msgid "Unit" +msgstr "Jednotka" + #: ../src/live_effects/lpe-ruler.cpp:43 +#, fuzzy msgid "Ma_jor length:" -msgstr "Dĺžka _hlavných:" +msgstr "Dĺžka hlavných" #: ../src/live_effects/lpe-ruler.cpp:43 msgid "Length of major ruler marks" msgstr "Dĺžka hlavných značiek pravítka" #: ../src/live_effects/lpe-ruler.cpp:44 +#, fuzzy msgid "Mino_r length:" -msgstr "Dĺžka _vedľajších:" +msgstr "Dĺžka vedľajších" #: ../src/live_effects/lpe-ruler.cpp:44 msgid "Length of minor ruler marks" msgstr "Dĺžka vedľajších značiek pravítka" #: ../src/live_effects/lpe-ruler.cpp:45 +#, fuzzy msgid "Major steps_:" -msgstr "Hlavné kroky_:" +msgstr "Hlavné kroky" #: ../src/live_effects/lpe-ruler.cpp:45 msgid "Draw a major mark every ... steps" msgstr "Nakresliť hlavnú značku každých ... krokov" #: ../src/live_effects/lpe-ruler.cpp:46 +#, fuzzy msgid "Shift marks _by:" -msgstr "Posunúť značky _o:" +msgstr "Posunúť značky o" #: ../src/live_effects/lpe-ruler.cpp:46 msgid "Shift marks by this many steps" msgstr "Posunúť značky o toľkoto krokov" #: ../src/live_effects/lpe-ruler.cpp:47 +#, fuzzy msgid "Mark direction:" -msgstr "Smer značky:" +msgstr "Smer značky" #: ../src/live_effects/lpe-ruler.cpp:47 msgid "Direction of marks (when viewing along the path from start to end)" msgstr "Smer značiek (pri pohľade pozdĺž cesty od začiatku po koniec)" #: ../src/live_effects/lpe-ruler.cpp:48 +#, fuzzy msgid "_Offset:" -msgstr "P_osun:" +msgstr "Posun:" #: ../src/live_effects/lpe-ruler.cpp:48 msgid "Offset of first mark" msgstr "Posunutie prvej značky" #: ../src/live_effects/lpe-ruler.cpp:49 +#, fuzzy msgid "Border marks:" -msgstr "Okrajové značky:" +msgstr "Okrajové značky" #: ../src/live_effects/lpe-ruler.cpp:49 msgid "Choose whether to draw marks at the beginning and end of the path" msgstr "Vyberte či kresliť značky na začiatku alebo na konci cesty" -#: ../src/live_effects/lpe-show_handles.cpp:25 -msgid "Show nodes" -msgstr "" - -#: ../src/live_effects/lpe-show_handles.cpp:27 -msgid "Show path" -msgstr "" - -#: ../src/live_effects/lpe-show_handles.cpp:28 -msgid "Scale nodes and handles" -msgstr "" - -#: ../src/live_effects/lpe-show_handles.cpp:29 -#: ../src/ui/tool/multi-path-manipulator.cpp:779 -#: ../src/ui/tool/multi-path-manipulator.cpp:782 -#: ../src/ui/tool/multi-path-manipulator.cpp:768 -#: ../src/ui/tool/multi-path-manipulator.cpp:771 -msgid "Rotate nodes" -msgstr "Otáčať uzly" - -#: ../src/live_effects/lpe-show_handles.cpp:55 -msgid "" -"The \"show handles\" path effect will remove any custom style on the object " -"you are applying it to. If this is not what you want, click Cancel." -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:29 -msgid "Steps:" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:29 -msgid "Change number of simplify steps " -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:30 -msgid "Roughly threshold:" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:31 -msgid "Helper size:" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:31 -msgid "Helper size" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:32 -msgid "Helper nodes" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:32 -msgid "Show helper nodes" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:34 -msgid "Helper handles" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:34 -msgid "Show helper handles" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:36 -msgid "Paths separately" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:36 -msgid "Simplifying paths (separately)" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:38 -msgid "Just coalesce" -msgstr "" - -#: ../src/live_effects/lpe-simplify.cpp:38 -msgid "Simplify just coalesce" -msgstr "" - #. initialise your parameters here: #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), #: ../src/live_effects/lpe-sketch.cpp:38 +#, fuzzy msgid "Strokes:" -msgstr "Ťahy:" +msgstr "Ťahy" #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Draw that many approximating strokes" msgstr "Nakresliť toľko aproximujúcich ťahov" #: ../src/live_effects/lpe-sketch.cpp:39 +#, fuzzy msgid "Max stroke length:" -msgstr "Max. dĺžka ťahu:" +msgstr "Max. dĺžka ťahu" #: ../src/live_effects/lpe-sketch.cpp:40 msgid "Maximum length of approximating strokes" msgstr "Maximálna dĺžka aproximujúcich ťahov" #: ../src/live_effects/lpe-sketch.cpp:41 +#, fuzzy msgid "Stroke length variation:" -msgstr "Variácia dĺžky ťahu:" +msgstr "Variácia dĺžky ťahu" #: ../src/live_effects/lpe-sketch.cpp:42 msgid "Random variation of stroke length (relative to maximum length)" msgstr "Náhodná variácia dĺžky ťahu (relatívne k jeho max. dĺžke)" #: ../src/live_effects/lpe-sketch.cpp:43 +#, fuzzy msgid "Max. overlap:" -msgstr "Max. prekryv:" +msgstr "Max. prelínanie" #: ../src/live_effects/lpe-sketch.cpp:44 msgid "How much successive strokes should overlap (relative to maximum length)" @@ -11449,16 +9604,18 @@ msgstr "" "O koľko sa majú po sebe idúce ťahy prelínať (relatívne k maximálnej dĺžke)" #: ../src/live_effects/lpe-sketch.cpp:45 +#, fuzzy msgid "Overlap variation:" -msgstr "Variácia prekryvu:" +msgstr "Variácia prelínania" #: ../src/live_effects/lpe-sketch.cpp:46 msgid "Random variation of overlap (relative to maximum overlap)" msgstr "Náhodná variácia prelínania (vzhľadom k maximálnemu prelínaniu)" #: ../src/live_effects/lpe-sketch.cpp:47 +#, fuzzy msgid "Max. end tolerance:" -msgstr "Max. koncová tolerancia:" +msgstr "Max. koncová tolerancia" #: ../src/live_effects/lpe-sketch.cpp:48 msgid "" @@ -11469,32 +9626,36 @@ msgstr "" "(relatívne k maximálnej dĺžke)" #: ../src/live_effects/lpe-sketch.cpp:49 +#, fuzzy msgid "Average offset:" -msgstr "Priemerný posun:" +msgstr "Priemerný posun" #: ../src/live_effects/lpe-sketch.cpp:50 msgid "Average distance each stroke is away from the original path" msgstr "Priemerná vzdialenosť medzi každým z ťahov a pôvodnou cestou" #: ../src/live_effects/lpe-sketch.cpp:51 +#, fuzzy msgid "Max. tremble:" -msgstr "Max. chvenie:" +msgstr "Max. chvenie" #: ../src/live_effects/lpe-sketch.cpp:52 msgid "Maximum tremble magnitude" msgstr "Max. amplitúda chvenia" #: ../src/live_effects/lpe-sketch.cpp:53 +#, fuzzy msgid "Tremble frequency:" -msgstr "Frekvencia chvenia:" +msgstr "Frekvencia chvenia" #: ../src/live_effects/lpe-sketch.cpp:54 msgid "Average number of tremble periods in a stroke" msgstr "Priemerný počet periód chvenia v ťahu" #: ../src/live_effects/lpe-sketch.cpp:56 +#, fuzzy msgid "Construction lines:" -msgstr "Konštrukčné čiary:" +msgstr "Konštrukčné čiary" #: ../src/live_effects/lpe-sketch.cpp:57 msgid "How many construction lines (tangents) to draw" @@ -11514,28 +9675,32 @@ msgstr "" "Mierka vzťahu zakrivenia a dĺžky konštrukčných čiar (skúste 5*posunutie)" #: ../src/live_effects/lpe-sketch.cpp:60 +#, fuzzy msgid "Max. length:" -msgstr "Max. dĺžka:" +msgstr "Max. dĺžka" #: ../src/live_effects/lpe-sketch.cpp:60 msgid "Maximum length of construction lines" msgstr "Maximálna dĺžka konštrukčných čiar" #: ../src/live_effects/lpe-sketch.cpp:61 +#, fuzzy msgid "Length variation:" -msgstr "Variácia dĺžky:" +msgstr "Variácia dĺžky" #: ../src/live_effects/lpe-sketch.cpp:61 msgid "Random variation of the length of construction lines" msgstr "Náhodná variácia dĺžky konštrukčných čiar" #: ../src/live_effects/lpe-sketch.cpp:62 +#, fuzzy msgid "Placement randomness:" -msgstr "Náhodnosť umiestnenia:" +msgstr "Náhodnosť umiestnenia" #: ../src/live_effects/lpe-sketch.cpp:62 msgid "0: evenly distributed construction lines, 1: purely random placement" -msgstr "0: rovnomerne rozdelené konštrukčné čiary, 1: čisto náhodné umiestnenie" +msgstr "" +"0: rovnomerne rozdelené konštrukčné čiary, 1: čisto náhodné umiestnenie" #: ../src/live_effects/lpe-sketch.cpp:64 msgid "k_min:" @@ -11553,83 +9718,28 @@ msgstr "k_max" msgid "max curvature" msgstr "max. zakrivenie" -#: ../src/live_effects/lpe-taperstroke.cpp:67 -#, fuzzy -msgid "Extrapolated" -msgstr "Interpolácia" - -#: ../src/live_effects/lpe-taperstroke.cpp:74 -#: ../share/extensions/edge3d.inx.h:5 -msgid "Stroke width:" -msgstr "Šírka ťahu:" - -#: ../src/live_effects/lpe-taperstroke.cpp:74 -msgid "The (non-tapered) width of the path" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:75 -msgid "Start offset:" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:75 -msgid "Taper distance from path start" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:76 -msgid "End offset:" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:76 -msgid "The ending position of the taper" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:77 -msgid "Taper smoothing:" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:77 -msgid "Amount of smoothing to apply to the tapers" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:78 -msgid "Join type:" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:78 -msgid "Join type for non-smooth nodes" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:79 -msgid "Limit for miter joins" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:536 -msgid "Start point of the taper" -msgstr "" - -#: ../src/live_effects/lpe-taperstroke.cpp:540 -msgid "End point of the taper" -msgstr "" - #: ../src/live_effects/lpe-vonkoch.cpp:46 +#, fuzzy msgid "N_r of generations:" -msgstr "_Počet generácií:" +msgstr "Počet generácií" #: ../src/live_effects/lpe-vonkoch.cpp:46 msgid "Depth of the recursion --- keep low!!" msgstr "Hĺbka rekurzie --- iba nízke čísla!" #: ../src/live_effects/lpe-vonkoch.cpp:47 +#, fuzzy msgid "Generating path:" -msgstr "Generujúca cesta:" +msgstr "Generujúca cesta" #: ../src/live_effects/lpe-vonkoch.cpp:47 msgid "Path whose segments define the iterated transforms" msgstr "Cesty, ktorej úseky definujú iterované transformácie" #: ../src/live_effects/lpe-vonkoch.cpp:48 +#, fuzzy msgid "_Use uniform transforms only" -msgstr "Po_užívať iba uniformné transformácie" +msgstr "Používať iba uniformné transformácie" #: ../src/live_effects/lpe-vonkoch.cpp:48 msgid "" @@ -11640,8 +9750,9 @@ msgstr "" "(inak definujú všeobecnú transformáciu)" #: ../src/live_effects/lpe-vonkoch.cpp:49 +#, fuzzy msgid "Dra_w all generations" -msgstr "_Vykresliť všetky generácie" +msgstr "Vykresliť všetky generácie" #: ../src/live_effects/lpe-vonkoch.cpp:49 msgid "If unchecked, draw only the last generation" @@ -11649,8 +9760,9 @@ msgstr "Ak nie je voľba nastavená, vykreslí sa iba posledná generácia" #. ,draw_boxes(_("Display boxes"), _("Display boxes instead of paths only"), "draw_boxes", &wr, this, true) #: ../src/live_effects/lpe-vonkoch.cpp:51 +#, fuzzy msgid "Reference segment:" -msgstr "Referenčný segment:" +msgstr "Referenčný segment" #: ../src/live_effects/lpe-vonkoch.cpp:51 msgid "The reference segment. Defaults to the horizontal midline of the bbox." @@ -11660,8 +9772,9 @@ msgstr "Referenčný segment. Štandardne stred vodorovnej čiary ohraničenia." #. refB(_("Ref End"), _("Right side middle of the reference box"), "refB", &wr, this), #. FIXME: a path is used here instead of 2 points to work around path/point param incompatibility bug. #: ../src/live_effects/lpe-vonkoch.cpp:55 +#, fuzzy msgid "_Max complexity:" -msgstr "_Maximálna komplexnosť:" +msgstr "Maximálna komplexnosť" #: ../src/live_effects/lpe-vonkoch.cpp:55 msgid "Disable effect if the output is too complex" @@ -11675,82 +9788,16 @@ msgstr "Zmeniť parameter bool" msgid "Change enumeration parameter" msgstr "Zmeniť parameter vymenovania" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 -msgid "" -"Chamfer: Ctrl+Click toggle type, Shift+Click open " -"dialog, Ctrl+Alt+Click reset" -msgstr "" - -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 -msgid "" -"Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " -"open dialog, Ctrl+Alt+Click reset" -msgstr "" - -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 -msgid "" -"Inverse Fillet: Ctrl+Click toggle type, Shift+Click " -"open dialog, Ctrl+Alt+Click reset" -msgstr "" - -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:794 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:855 -msgid "" -"Fillet: Ctrl+Click toggle type, Shift+Click open " -"dialog, Ctrl+Alt+Click reset" -msgstr "" - #: ../src/live_effects/parameter/originalpath.cpp:71 -#: ../src/live_effects/parameter/originalpatharray.cpp:159 msgid "Link to path" msgstr "Pripojiť k ceste" #: ../src/live_effects/parameter/originalpath.cpp:83 +#, fuzzy msgid "Select original" -msgstr "Vybrať originál" - -#: ../src/live_effects/parameter/originalpatharray.cpp:94 -#: ../src/widgets/gradient-toolbar.cpp:1202 -msgid "Reverse" -msgstr "Obrátiť smer" - -#: ../src/live_effects/parameter/originalpatharray.cpp:134 -#: ../src/live_effects/parameter/originalpatharray.cpp:319 -#: ../src/live_effects/parameter/path.cpp:475 -msgid "Link path parameter to path" -msgstr "Pripojiť parameter cesty k ceste" - -#: ../src/live_effects/parameter/originalpatharray.cpp:171 -msgid "Remove Path" -msgstr "" - -#: ../src/live_effects/parameter/originalpatharray.cpp:183 -#: ../src/ui/dialog/objects.cpp:1847 -msgid "Move Down" -msgstr "" - -#: ../src/live_effects/parameter/originalpatharray.cpp:195 -#: ../src/ui/dialog/objects.cpp:1862 -msgid "Move Up" -msgstr "" - -#: ../src/live_effects/parameter/originalpatharray.cpp:235 -msgid "Move path up" -msgstr "" - -#: ../src/live_effects/parameter/originalpatharray.cpp:265 -msgid "Move path down" -msgstr "" - -#: ../src/live_effects/parameter/originalpatharray.cpp:283 -msgid "Remove path" -msgstr "" +msgstr "Vybrať _originál" -#: ../src/live_effects/parameter/parameter.cpp:168 -#: ../src/live_effects/parameter/parameter.cpp:147 +#: ../src/live_effects/parameter/parameter.cpp:141 msgid "Change scalar parameter" msgstr "Zmeniť skalárny parameter" @@ -11767,55 +9814,50 @@ msgid "Paste path" msgstr "Vložiť cestu" #: ../src/live_effects/parameter/path.cpp:200 +#, fuzzy msgid "Link to path on clipboard" -msgstr "Odkaz na cestu do schránky" +msgstr "V schránke nič nie je." #: ../src/live_effects/parameter/path.cpp:443 msgid "Paste path parameter" msgstr "Vložiť parameter cesty" +#: ../src/live_effects/parameter/path.cpp:475 +msgid "Link path parameter to path" +msgstr "Pripojiť parameter cesty k ceste" + #: ../src/live_effects/parameter/point.cpp:89 -#: ../src/live_effects/parameter/pointreseteable.cpp:103 msgid "Change point parameter" msgstr "Zmeniť parameter bodu" -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:229 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:241 msgid "" "Stroke width control point: drag to alter the stroke width. Ctrl" -"+click adds a control point, Ctrl+Alt+click deletes it, Shift" -"+click launches width dialog." +"+click adds a control point, Ctrl+Alt+click deletes it." msgstr "" #: ../src/live_effects/parameter/random.cpp:134 msgid "Change random parameter" msgstr "Zmeniť parameter random" -#: ../src/live_effects/parameter/text.cpp:101 #: ../src/live_effects/parameter/text.cpp:100 msgid "Change text parameter" msgstr "Zmeniť parameter text" -#: ../src/live_effects/parameter/togglebutton.cpp:112 -msgid "Change togglebutton parameter" -msgstr "" +#: ../src/live_effects/parameter/unit.cpp:80 +msgid "Change unit parameter" +msgstr "Zmeniť parameter jednotka" -#: ../src/live_effects/parameter/transformedpoint.cpp:98 #: ../src/live_effects/parameter/vector.cpp:99 msgid "Change vector parameter" msgstr "Zmeniť parameter vector" -#: ../src/live_effects/parameter/unit.cpp:80 -msgid "Change unit parameter" -msgstr "Zmeniť parameter jednotka" - -#: ../src/main-cmdlineact.cpp:49 #: ../src/main-cmdlineact.cpp:50 #, c-format msgid "Unable to find verb ID '%s' specified on the command line.\n" msgstr "Nepodarilo sa nájsť ID slovesa „%s“ zadaného na príkazovom riadku.\n" -#: ../src/main-cmdlineact.cpp:60 #: ../src/main-cmdlineact.cpp:61 #, c-format msgid "Unable to find node ID: '%s'\n" @@ -11855,8 +9897,10 @@ msgstr "Exportovať dokument do png súboru" #: ../src/main.cpp:325 msgid "" "Resolution for exporting to bitmap and for rasterization of filters in PS/" -"EPS/PDF (default 96)" +"EPS/PDF (default 90)" msgstr "" +"Rozlíšenie na export do bitmapy a na rasterizáciu filtrov v PS/EPS/PDF " +"(predvolená hodnota 90)" #: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" @@ -11919,8 +9963,7 @@ msgid "The ID of the object to export" msgstr "ID exportovaného objektu" #: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1514 -#: ../src/ui/dialog/inkscape-preferences.cpp:1502 +#: ../src/ui/dialog/inkscape-preferences.cpp:1505 msgid "ID" msgstr "ID:" @@ -12028,14 +10071,16 @@ msgstr "" msgid "" "Query the X coordinate of the drawing or, if specified, of the object with --" "query-id" -msgstr "Pýtať sa na X súradnicu kresby alebo ak je zadané, objektu s --query-id" +msgstr "" +"Pýtať sa na X súradnicu kresby alebo ak je zadané, objektu s --query-id" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:456 msgid "" "Query the Y coordinate of the drawing or, if specified, of the object with --" "query-id" -msgstr "Pýtať sa na Y súradnicu kresby alebo ak je zadané, objektu s --query-id" +msgstr "" +"Pýtať sa na Y súradnicu kresby alebo ak je zadané, objektu s --query-id" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:462 @@ -12121,48 +10166,38 @@ msgstr "" msgid "_File" msgstr "_Súbor" -#. Tag -#: ../src/menus-skeleton.h:17 ../src/verbs.cpp:2726 +#: ../src/menus-skeleton.h:17 msgid "_New" msgstr "_Nové" #. " \n" #. " \n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2713 ../src/verbs.cpp:2721 -#: ../src/menus-skeleton.h:45 -#: ../src/verbs.cpp:2634 -#: ../src/verbs.cpp:2640 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2634 ../src/verbs.cpp:2640 msgid "_Edit" msgstr "_Upraviť" -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2477 -#: ../src/menus-skeleton.h:55 -#: ../src/verbs.cpp:2398 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2398 msgid "Paste Si_ze" msgstr "Vložiť v_eľkosť" #: ../src/menus-skeleton.h:65 -#: ../src/menus-skeleton.h:67 msgid "Clo_ne" msgstr "Klo_novať" #: ../src/menus-skeleton.h:79 -#: ../src/menus-skeleton.h:81 +#, fuzzy msgid "Select Sa_me" -msgstr "Vybrať _rovnaké" +msgstr "Zvoľte stránku:" #: ../src/menus-skeleton.h:97 -#: ../src/menus-skeleton.h:99 msgid "_View" msgstr "_Zobraziť" #: ../src/menus-skeleton.h:98 -#: ../src/menus-skeleton.h:100 msgid "_Zoom" msgstr "_Zmena mierky" #: ../src/menus-skeleton.h:114 -#: ../src/menus-skeleton.h:116 msgid "_Display mode" msgstr "_Zobrazovací režim" @@ -12170,197 +10205,278 @@ msgstr "_Zobrazovací režim" #. " \n" #. " \n" #: ../src/menus-skeleton.h:123 -#: ../src/menus-skeleton.h:125 +#, fuzzy msgid "_Color display mode" -msgstr "Režim zobrazenia _farieb" +msgstr "_Zobrazovací režim" #. Better location in menu needs to be found #. " \n" #. " \n" #: ../src/menus-skeleton.h:136 -#: ../src/menus-skeleton.h:138 +#, fuzzy msgid "Sh_ow/Hide" -msgstr "Z_obraziť/skryť" +msgstr "Zobraziť/skryť" #. Not quite ready to be in the menus. #. " \n" #: ../src/menus-skeleton.h:156 -#: ../src/menus-skeleton.h:158 msgid "_Layer" msgstr "_Vrstva" #: ../src/menus-skeleton.h:180 -#: ../src/menus-skeleton.h:182 msgid "_Object" msgstr "_Objekt" -#: ../src/menus-skeleton.h:191 -#: ../src/menus-skeleton.h:190 +#: ../src/menus-skeleton.h:188 msgid "Cli_p" msgstr "_Orezať" -#: ../src/menus-skeleton.h:195 -#: ../src/menus-skeleton.h:194 +#: ../src/menus-skeleton.h:192 msgid "Mas_k" msgstr "Mas_ka" -#: ../src/menus-skeleton.h:199 -#: ../src/menus-skeleton.h:198 +#: ../src/menus-skeleton.h:196 msgid "Patter_n" msgstr "_Vzorka" -#: ../src/menus-skeleton.h:223 -#: ../src/menus-skeleton.h:222 +#: ../src/menus-skeleton.h:220 msgid "_Path" msgstr "_Cesta" -#: ../src/menus-skeleton.h:251 ../src/ui/dialog/find.cpp:77 -#: ../src/ui/dialog/text-edit.cpp:71 -#: ../src/menus-skeleton.h:250 +#: ../src/menus-skeleton.h:248 ../src/ui/dialog/find.cpp:77 +#: ../src/ui/dialog/text-edit.cpp:72 msgid "_Text" msgstr "_Text" -#: ../src/menus-skeleton.h:269 -#: ../src/menus-skeleton.h:268 +#: ../src/menus-skeleton.h:266 msgid "Filter_s" msgstr "_Filtre" -#: ../src/menus-skeleton.h:275 -#: ../src/menus-skeleton.h:274 +#: ../src/menus-skeleton.h:272 msgid "Exte_nsions" msgstr "Rozšíre_nia" -#: ../src/menus-skeleton.h:281 -#: ../src/menus-skeleton.h:280 +#: ../src/menus-skeleton.h:278 msgid "_Help" msgstr "_Pomocník" -#: ../src/menus-skeleton.h:285 -#: ../src/menus-skeleton.h:284 +#: ../src/menus-skeleton.h:282 msgid "Tutorials" msgstr "Návody" -#: ../src/path-chemistry.cpp:54 +#: ../src/object-edit.cpp:439 +msgid "" +"Adjust the horizontal rounding radius; with Ctrl to make the " +"vertical radius the same" +msgstr "" +"Nastaviť polomer vodorovného zaoblenia; s Ctrl to isté pre " +"zvislý polomer" + +#: ../src/object-edit.cpp:444 +msgid "" +"Adjust the vertical rounding radius; with Ctrl to make the " +"horizontal radius the same" +msgstr "" +"Nastaviť polomer zvislého zaoblenia; s Ctrl to isté pre " +"vodorovný polomer" + +#: ../src/object-edit.cpp:449 ../src/object-edit.cpp:454 +msgid "" +"Adjust the width and height of the rectangle; with Ctrl to " +"lock ratio or stretch in one dimension only" +msgstr "" +"Doladiť šírku a výšku obdĺžnika; s Ctrl zamknúť pomer alebo " +"natiahnuť iba v jednom rozmere" + +#: ../src/object-edit.cpp:689 ../src/object-edit.cpp:693 +#: ../src/object-edit.cpp:697 ../src/object-edit.cpp:701 +msgid "" +"Resize box in X/Y direction; with Shift along the Z axis; with " +"Ctrl to constrain to the directions of edges or diagonals" +msgstr "" +"Zmeniť veľkosť obdĺžnika v smere X/Y; so Shift na osi Z; s Ctrl obmedziť na smery hrán alebo diagonál" + +#: ../src/object-edit.cpp:705 ../src/object-edit.cpp:709 +#: ../src/object-edit.cpp:713 ../src/object-edit.cpp:717 +msgid "" +"Resize box along the Z axis; with Shift in X/Y direction; with " +"Ctrl to constrain to the directions of edges or diagonals" +msgstr "" +"Zmeniť veľkosť obdĺžnika na osi Z; so Shift v smere X/Y; s Ctrl obmedziť na smery hrán alebo diagonál" + +#: ../src/object-edit.cpp:721 +msgid "Move the box in perspective" +msgstr "Posunúť kváder v perspektíve" + +#: ../src/object-edit.cpp:948 +msgid "Adjust ellipse width, with Ctrl to make circle" +msgstr "Doladiť šírku elipsy, s Ctrl sa vytvorí kružnica" + +#: ../src/object-edit.cpp:952 +msgid "Adjust ellipse height, with Ctrl to make circle" +msgstr "Doladiť výšku elipsy, s Ctrl sa vytvorí kružnica" + +#: ../src/object-edit.cpp:956 +msgid "" +"Position the start point of the arc or segment; with Ctrl to " +"snap angle; drag inside the ellipse for arc, outside for " +"segment" +msgstr "" +"Poloha počiatočného bodu oblúku alebo segmentu; s Ctrl " +"prichytávanie k uhlu; ťahanie vnútri elipsy urobí oblúk, mimo " +"urobí segment" + +#: ../src/object-edit.cpp:961 +msgid "" +"Position the end point of the arc or segment; with Ctrl to " +"snap angle; drag inside the ellipse for arc, outside for " +"segment" +msgstr "" +"Určiť polohu koncového bodu oblúku alebo segmentu; s Ctrl " +"prichytávanie k uhlu; ťahanie vnútri elipsy urobí oblúk, mimo " +"urobí segment" + +#: ../src/object-edit.cpp:1101 +msgid "" +"Adjust the tip radius of the star or polygon; with Shift to " +"round; with Alt to randomize" +msgstr "" +"Nastaviť polomer vrchola hviezdy alebo mnohouholníka; s Ctrl " +"zaoblenie; s Alt znáhodnenie" + +#: ../src/object-edit.cpp:1109 +msgid "" +"Adjust the base radius of the star; with Ctrl to keep star " +"rays radial (no skew); with Shift to round; with Alt to " +"randomize" +msgstr "" +"Nastaviť polomer základne hviezdy; s Ctrl udržiavať lúče " +"hviezdy radiálne (bez skosenia); so Shift zaoblenie; s Alt " +"znáhodnenie" + +#: ../src/object-edit.cpp:1299 +msgid "" +"Roll/unroll the spiral from inside; with Ctrl to snap angle; " +"with Alt to converge/diverge" +msgstr "" +"Zbaliť/rozbaliť špirálu zvnútra; s Ctrl prichytávanie k uhlu; " +"s Alt konvergovať/divergovať" + +#: ../src/object-edit.cpp:1303 +#, fuzzy +msgid "" +"Roll/unroll the spiral from outside; with Ctrl to snap angle; " +"with Shift to scale/rotate; with Alt to lock radius" +msgstr "" +"Zbaliť/rozbaliť špirálu zvonka; s Ctrl prichytávanie k uhlu; " +"so Shift zmena mierky/otáčanie" + +#: ../src/object-edit.cpp:1348 +msgid "Adjust the offset distance" +msgstr "Prispôsobiť vzdialenosť posunu" + +#: ../src/object-edit.cpp:1384 +msgid "Drag to resize the flowed text frame" +msgstr "Ťahaním zmeníte veľkosť rámca textového toku" + #: ../src/path-chemistry.cpp:53 msgid "Select object(s) to combine." msgstr "Vyberte objekty, ktoré sa majú skombinovať." -#: ../src/path-chemistry.cpp:58 #: ../src/path-chemistry.cpp:57 msgid "Combining paths..." msgstr "Kombinovanie ciest..." -#: ../src/path-chemistry.cpp:174 -#: ../src/path-chemistry.cpp:171 +#: ../src/path-chemistry.cpp:170 msgid "Combine" msgstr "Kombinovať" -#: ../src/path-chemistry.cpp:181 -#: ../src/path-chemistry.cpp:178 +#: ../src/path-chemistry.cpp:177 msgid "No path(s) to combine in the selection." msgstr "Výber neobsahuje cesty, ktoré je možné kombinovať." -#: ../src/path-chemistry.cpp:193 -#: ../src/path-chemistry.cpp:190 +#: ../src/path-chemistry.cpp:189 msgid "Select path(s) to break apart." msgstr "Vyberte cestu, ktorá sa má rozdeliť na časti." -#: ../src/path-chemistry.cpp:197 -#: ../src/path-chemistry.cpp:194 +#: ../src/path-chemistry.cpp:193 msgid "Breaking apart paths..." msgstr "Rozdeľovanie ciest na časti..." -#: ../src/path-chemistry.cpp:287 -#: ../src/path-chemistry.cpp:285 +#: ../src/path-chemistry.cpp:284 msgid "Break apart" msgstr "Rozdeliť na časti" -#: ../src/path-chemistry.cpp:289 -#: ../src/path-chemistry.cpp:287 +#: ../src/path-chemistry.cpp:286 msgid "No path(s) to break apart in the selection." msgstr "Vo výbere nie sú objekty, ktoré je možné rozdeliť na časti." -#: ../src/path-chemistry.cpp:299 -#: ../src/path-chemistry.cpp:297 +#: ../src/path-chemistry.cpp:296 msgid "Select object(s) to convert to path." msgstr "Vyberte objekt, ktorá sa má konvertovať na cestu." -#: ../src/path-chemistry.cpp:305 -#: ../src/path-chemistry.cpp:303 +#: ../src/path-chemistry.cpp:302 msgid "Converting objects to paths..." msgstr "Konvertovanie objektov na cesty..." -#: ../src/path-chemistry.cpp:327 -#: ../src/path-chemistry.cpp:325 +#: ../src/path-chemistry.cpp:324 msgid "Object to path" msgstr "Objekt na cestu" -#: ../src/path-chemistry.cpp:329 -#: ../src/path-chemistry.cpp:327 +#: ../src/path-chemistry.cpp:326 msgid "No objects to convert to path in the selection." msgstr "Vo výbere nie sú objekty, ktoré je možné konvertovať na cesty." -#: ../src/path-chemistry.cpp:618 -#: ../src/path-chemistry.cpp:604 +#: ../src/path-chemistry.cpp:603 msgid "Select path(s) to reverse." msgstr "Vyberte cestu, ktorej smer sa má obrátiť." -#: ../src/path-chemistry.cpp:627 -#: ../src/path-chemistry.cpp:613 +#: ../src/path-chemistry.cpp:612 msgid "Reversing paths..." msgstr "Obrátenie smeru ciest..." -#: ../src/path-chemistry.cpp:662 -#: ../src/path-chemistry.cpp:648 +#: ../src/path-chemistry.cpp:647 msgid "Reverse path" msgstr "Obrátiť smer cesty" -#: ../src/path-chemistry.cpp:664 -#: ../src/path-chemistry.cpp:650 +#: ../src/path-chemistry.cpp:649 msgid "No paths to reverse in the selection." msgstr "Výber neobsahuje cesty, ktorých smer možno obrátiť." -#: ../src/persp3d.cpp:333 #: ../src/persp3d.cpp:293 msgid "Toggle vanishing point" msgstr "Prepnúť spojnicu" -#: ../src/persp3d.cpp:344 #: ../src/persp3d.cpp:304 msgid "Toggle multiple vanishing points" msgstr "Prepnúť viacero spojníc" -#: ../src/preferences-skeleton.h:102 #: ../src/preferences-skeleton.h:101 msgid "Dip pen" msgstr "Brko" -#: ../src/preferences-skeleton.h:103 #: ../src/preferences-skeleton.h:102 msgid "Marker" msgstr "Značkovadlo" -#: ../src/preferences-skeleton.h:104 #: ../src/preferences-skeleton.h:103 msgid "Brush" msgstr "Štetec" -#: ../src/preferences-skeleton.h:105 #: ../src/preferences-skeleton.h:104 msgid "Wiggly" msgstr "Krútivé" -#: ../src/preferences-skeleton.h:106 #: ../src/preferences-skeleton.h:105 msgid "Splotchy" msgstr "Machule" -#: ../src/preferences-skeleton.h:107 #: ../src/preferences-skeleton.h:106 msgid "Tracing" msgstr "Obrysové" -#: ../src/preferences.cpp:136 #: ../src/preferences.cpp:134 msgid "" "Inkscape will run with default settings, and new settings will not be saved. " @@ -12371,7 +10487,6 @@ msgstr "" #. the creation failed #. _reportError(Glib::ustring::compose(_("Cannot create profile directory %1."), #. Glib::filename_to_utf8(_prefs_dir)), not_saved); -#: ../src/preferences.cpp:151 #: ../src/preferences.cpp:149 #, c-format msgid "Cannot create profile directory %s." @@ -12380,7 +10495,6 @@ msgstr "Nie je možné vytvoriť adresár profilu %s." #. The profile dir is not actually a directory #. _reportError(Glib::ustring::compose(_("%1 is not a valid directory."), #. Glib::filename_to_utf8(_prefs_dir)), not_saved); -#: ../src/preferences.cpp:169 #: ../src/preferences.cpp:167 #, c-format msgid "%s is not a valid directory." @@ -12389,31 +10503,26 @@ msgstr "%s nie je platný adresár." #. The write failed. #. _reportError(Glib::ustring::compose(_("Failed to create the preferences file %1."), #. Glib::filename_to_utf8(_prefs_filename)), not_saved); -#: ../src/preferences.cpp:180 #: ../src/preferences.cpp:178 #, c-format msgid "Failed to create the preferences file %s." msgstr "Nepodarilo sa vytvoriť súbor s nastavením %s." -#: ../src/preferences.cpp:216 #: ../src/preferences.cpp:214 #, c-format msgid "The preferences file %s is not a regular file." msgstr "Súbor s nastavením %s nie je obyčajný súbor." -#: ../src/preferences.cpp:226 #: ../src/preferences.cpp:224 #, c-format msgid "The preferences file %s could not be read." msgstr "Súbor s nastavením %s nebolo možné prečítať." -#: ../src/preferences.cpp:237 #: ../src/preferences.cpp:235 #, c-format msgid "The preferences file %s is not a valid XML document." msgstr "Súbor nastavení %s nie je platný XML dokument." -#: ../src/preferences.cpp:246 #: ../src/preferences.cpp:244 #, c-format msgid "The file %s is not a valid Inkscape preferences file." @@ -12537,8 +10646,7 @@ msgstr "Vzťah" msgid "A related resource" msgstr "_Režim zmiešania:" -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1870 -#: ../src/ui/dialog/inkscape-preferences.cpp:1854 +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1857 msgid "Language:" msgstr "Jazyk:" @@ -12589,8 +10697,7 @@ msgstr "Prispievatelia" #, fuzzy msgid "An entity responsible for making contributions to the resource" msgstr "" -"Názvy entít zodpovedných za vytvorenie príspevkov do obsahu tohoto " -"dokumentu." +"Názvy entít zodpovedných za vytvorenie príspevkov do obsahu tohoto dokumentu." #. TRANSLATORS: URL to a page that defines the license for the document #: ../src/rdf.cpp:289 @@ -12619,78 +10726,59 @@ msgstr "XML fragment časti „License“ v RDF." msgid "Fixup broken links" msgstr "" -#: ../src/selection-chemistry.cpp:406 #: ../src/selection-chemistry.cpp:396 msgid "Delete text" msgstr "Zmazať text" -#: ../src/selection-chemistry.cpp:414 #: ../src/selection-chemistry.cpp:404 msgid "Nothing was deleted." msgstr "Nič nebolo zmazané." -#: ../src/selection-chemistry.cpp:433 +#: ../src/selection-chemistry.cpp:423 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 -#: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:974 +#: ../src/ui/dialog/swatches.cpp:278 ../src/ui/tools/text-tool.cpp:974 #: ../src/widgets/eraser-toolbar.cpp:93 #: ../src/widgets/gradient-toolbar.cpp:1178 #: ../src/widgets/gradient-toolbar.cpp:1192 #: ../src/widgets/gradient-toolbar.cpp:1206 #: ../src/widgets/node-toolbar.cpp:401 -#: ../src/selection-chemistry.cpp:423 -#: ../src/ui/dialog/swatches.cpp:278 msgid "Delete" msgstr "Zmazať" -#: ../src/selection-chemistry.cpp:461 #: ../src/selection-chemistry.cpp:451 msgid "Select object(s) to duplicate." msgstr "Vyberte objekt, ktorý sa má duplikovať." -#: ../src/selection-chemistry.cpp:572 #: ../src/selection-chemistry.cpp:560 msgid "Delete all" msgstr "Zmazať všetky" -#: ../src/selection-chemistry.cpp:763 #: ../src/selection-chemistry.cpp:750 msgid "Select some objects to group." msgstr "Vyberte nejaké objekty, ktoré sa majú zoskupiť." -#: ../src/selection-chemistry.cpp:778 -#: ../src/selection-chemistry.cpp:765 -#, fuzzy -msgctxt "Verb" +#: ../src/selection-chemistry.cpp:765 ../src/sp-item-group.cpp:329 msgid "Group" msgstr "Zoskupiť" -#: ../src/selection-chemistry.cpp:801 #: ../src/selection-chemistry.cpp:788 msgid "Select a group to ungroup." msgstr "Vyberte skupinu na odstránenie zoskupenia." -#: ../src/selection-chemistry.cpp:816 #: ../src/selection-chemistry.cpp:803 msgid "No groups to ungroup in the selection." msgstr "Vo výbere nie sú objekty, ktorým je možné zrušiť zoskupenie." -#: ../src/selection-chemistry.cpp:874 ../src/sp-item-group.cpp:571 -#: ../src/selection-chemistry.cpp:861 -#: ../src/sp-item-group.cpp:562 +#: ../src/selection-chemistry.cpp:861 ../src/sp-item-group.cpp:562 msgid "Ungroup" msgstr "Zrušiť zoskupenie" -#: ../src/selection-chemistry.cpp:956 #: ../src/selection-chemistry.cpp:942 msgid "Select object(s) to raise." msgstr "Vyberte objekty, ktoré sa majú presunúť vyššie." -#: ../src/selection-chemistry.cpp:962 ../src/selection-chemistry.cpp:1019 -#: ../src/selection-chemistry.cpp:1047 ../src/selection-chemistry.cpp:1109 -#: ../src/selection-chemistry.cpp:948 -#: ../src/selection-chemistry.cpp:1004 -#: ../src/selection-chemistry.cpp:1032 -#: ../src/selection-chemistry.cpp:1093 +#: ../src/selection-chemistry.cpp:948 ../src/selection-chemistry.cpp:1004 +#: ../src/selection-chemistry.cpp:1032 ../src/selection-chemistry.cpp:1093 msgid "" "You cannot raise/lower objects from different groups or layers." msgstr "" @@ -12698,279 +10786,223 @@ msgstr "" "vrstiev." #. TRANSLATORS: "Raise" means "to raise an object" in the undo history -#: ../src/selection-chemistry.cpp:1003 #: ../src/selection-chemistry.cpp:988 #, fuzzy msgctxt "Undo action" msgid "Raise" msgstr "Presunúť vyššie" -#: ../src/selection-chemistry.cpp:1011 #: ../src/selection-chemistry.cpp:996 msgid "Select object(s) to raise to top." msgstr "Vyberte objekt, ktorý sa má presunúť na vrchol." -#: ../src/selection-chemistry.cpp:1034 #: ../src/selection-chemistry.cpp:1019 msgid "Raise to top" msgstr "Presunúť na vrch" -#: ../src/selection-chemistry.cpp:1041 #: ../src/selection-chemistry.cpp:1026 msgid "Select object(s) to lower." msgstr "Vyberte objekt, ktorý sa má presunúť nižšie." #. TRANSLATORS: "Lower" means "to lower an object" in the undo history -#: ../src/selection-chemistry.cpp:1093 #: ../src/selection-chemistry.cpp:1077 #, fuzzy msgctxt "Undo action" msgid "Lower" msgstr "Presunúť nižšie" -#: ../src/selection-chemistry.cpp:1101 #: ../src/selection-chemistry.cpp:1085 msgid "Select object(s) to lower to bottom." msgstr "Vyberte objekt, ktorý sa má presunúť dole." -#: ../src/selection-chemistry.cpp:1136 #: ../src/selection-chemistry.cpp:1120 msgid "Lower to bottom" msgstr "Presunúť na spodok" -#: ../src/selection-chemistry.cpp:1146 #: ../src/selection-chemistry.cpp:1130 msgid "Nothing to undo." msgstr "Nie je čo vrátiť späť." -#: ../src/selection-chemistry.cpp:1157 #: ../src/selection-chemistry.cpp:1141 msgid "Nothing to redo." msgstr "Nie je čo opakovať." -#: ../src/selection-chemistry.cpp:1229 #: ../src/selection-chemistry.cpp:1208 msgid "Paste" msgstr "Vložiť" -#: ../src/selection-chemistry.cpp:1237 #: ../src/selection-chemistry.cpp:1216 msgid "Paste style" msgstr "Vložiť štýl" -#: ../src/selection-chemistry.cpp:1247 #: ../src/selection-chemistry.cpp:1226 msgid "Paste live path effect" msgstr "Vložiť efekt živej cesty" -#: ../src/selection-chemistry.cpp:1269 #: ../src/selection-chemistry.cpp:1248 msgid "Select object(s) to remove live path effects from." msgstr "Vyberte objekt(y), z ktorého sa má odstrániť efekt živej cesty." -#: ../src/selection-chemistry.cpp:1281 #: ../src/selection-chemistry.cpp:1260 msgid "Remove live path effect" msgstr "Odstrániť efekt živej cesty" -#: ../src/selection-chemistry.cpp:1292 #: ../src/selection-chemistry.cpp:1271 msgid "Select object(s) to remove filters from." msgstr "Vyberte objekt(y), z ktorého sa odstránia filtre." -#: ../src/selection-chemistry.cpp:1302 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1678 #: ../src/selection-chemistry.cpp:1281 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1678 msgid "Remove filter" msgstr "Odstrániť filter" -#: ../src/selection-chemistry.cpp:1311 #: ../src/selection-chemistry.cpp:1290 msgid "Paste size" msgstr "Vložiť veľkosť" -#: ../src/selection-chemistry.cpp:1320 #: ../src/selection-chemistry.cpp:1299 msgid "Paste size separately" msgstr "Vložiť veľkosť oddelene" -#: ../src/selection-chemistry.cpp:1330 #: ../src/selection-chemistry.cpp:1309 msgid "Select object(s) to move to the layer above." msgstr "Vyberte objekt, ktorý sa má posunúť o vrstvu vyššie." -#: ../src/selection-chemistry.cpp:1356 #: ../src/selection-chemistry.cpp:1335 msgid "Raise to next layer" msgstr "Presunúť do nasledujúcej vrstvy" -#: ../src/selection-chemistry.cpp:1363 #: ../src/selection-chemistry.cpp:1342 msgid "No more layers above." msgstr "Neexistuje vyššia vrstva." -#: ../src/selection-chemistry.cpp:1375 #: ../src/selection-chemistry.cpp:1354 msgid "Select object(s) to move to the layer below." msgstr "Vyberte objekt, ktorý sa má posunúť o vrstvu nižšie." -#: ../src/selection-chemistry.cpp:1401 #: ../src/selection-chemistry.cpp:1380 msgid "Lower to previous layer" msgstr "Presunúť do predchádzajúcej vrstvy" -#: ../src/selection-chemistry.cpp:1408 #: ../src/selection-chemistry.cpp:1387 msgid "No more layers below." msgstr "Neexistuje nižšia vrstva." -#: ../src/selection-chemistry.cpp:1420 #: ../src/selection-chemistry.cpp:1399 #, fuzzy msgid "Select object(s) to move." msgstr "Vyberte objekt, ktorý sa má presunúť nižšie." -#: ../src/selection-chemistry.cpp:1437 ../src/verbs.cpp:2656 -#: ../src/selection-chemistry.cpp:1416 -#: ../src/verbs.cpp:2577 +#: ../src/selection-chemistry.cpp:1416 ../src/verbs.cpp:2577 #, fuzzy msgid "Move selection to layer" msgstr "Presunie výber o úroveň _vyššie" #. An SVG element cannot have a transform. We could change 'x' and 'y' in response #. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1527 ../src/seltrans.cpp:388 -#: ../src/selection-chemistry.cpp:1503 +#: ../src/selection-chemistry.cpp:1503 ../src/seltrans.cpp:388 msgid "Cannot transform an embedded SVG." msgstr "" -#: ../src/selection-chemistry.cpp:1698 -#: ../src/selection-chemistry.cpp:1649 +#: ../src/selection-chemistry.cpp:1647 msgid "Remove transform" msgstr "Odstrániť transformáciu" -#: ../src/selection-chemistry.cpp:1805 -#: ../src/selection-chemistry.cpp:1752 +#: ../src/selection-chemistry.cpp:1750 #, fuzzy msgid "Rotate 90° CCW" msgstr "Otočiť o 90° proti smeru hodinových ručičiek" -#: ../src/selection-chemistry.cpp:1805 -#: ../src/selection-chemistry.cpp:1752 +#: ../src/selection-chemistry.cpp:1750 #, fuzzy msgid "Rotate 90° CW" msgstr "Otočiť o 90° v smere hodinových ručičiek" -#: ../src/selection-chemistry.cpp:1826 ../src/seltrans.cpp:483 -#: ../src/ui/dialog/transformation.cpp:893 -#: ../src/selection-chemistry.cpp:1773 +#: ../src/selection-chemistry.cpp:1771 ../src/seltrans.cpp:483 #: ../src/ui/dialog/transformation.cpp:894 msgid "Rotate" msgstr "Otočiť" -#: ../src/selection-chemistry.cpp:2214 -#: ../src/selection-chemistry.cpp:2144 +#: ../src/selection-chemistry.cpp:2142 msgid "Rotate by pixels" msgstr "Otáčať po pixeloch" -#: ../src/selection-chemistry.cpp:2244 ../src/seltrans.cpp:480 -#: ../src/ui/dialog/transformation.cpp:868 -#: ../share/extensions/interp_att_g.inx.h:12 -#: ../src/selection-chemistry.cpp:2174 +#: ../src/selection-chemistry.cpp:2172 ../src/seltrans.cpp:480 #: ../src/ui/dialog/transformation.cpp:869 +#: ../share/extensions/interp_att_g.inx.h:12 msgid "Scale" msgstr "Zmena mierky" -#: ../src/selection-chemistry.cpp:2269 -#: ../src/selection-chemistry.cpp:2199 +#: ../src/selection-chemistry.cpp:2197 msgid "Scale by whole factor" msgstr "Zmeniť mierku o celé číslo" -#: ../src/selection-chemistry.cpp:2284 -#: ../src/selection-chemistry.cpp:2214 +#: ../src/selection-chemistry.cpp:2212 msgid "Move vertically" msgstr "Presunúť zvisle" -#: ../src/selection-chemistry.cpp:2287 -#: ../src/selection-chemistry.cpp:2217 +#: ../src/selection-chemistry.cpp:2215 msgid "Move horizontally" msgstr "Presunúť vodorovne" -#: ../src/selection-chemistry.cpp:2290 ../src/selection-chemistry.cpp:2316 -#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:806 -#: ../src/selection-chemistry.cpp:2220 -#: ../src/selection-chemistry.cpp:2246 -#: ../src/ui/dialog/transformation.cpp:807 +#: ../src/selection-chemistry.cpp:2218 ../src/selection-chemistry.cpp:2244 +#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:807 msgid "Move" msgstr "Presunúť" -#: ../src/selection-chemistry.cpp:2310 -#: ../src/selection-chemistry.cpp:2240 +#: ../src/selection-chemistry.cpp:2238 msgid "Move vertically by pixels" msgstr "Posunúť zvisle po pixeloch" -#: ../src/selection-chemistry.cpp:2313 -#: ../src/selection-chemistry.cpp:2243 +#: ../src/selection-chemistry.cpp:2241 msgid "Move horizontally by pixels" msgstr "Posunúť vodorovne po pixeloch" -#: ../src/selection-chemistry.cpp:2445 -#: ../src/selection-chemistry.cpp:2375 +#: ../src/selection-chemistry.cpp:2373 msgid "The selection has no applied path effect." msgstr "Na výber nie je použitý žiadny efekt cesty." -#: ../src/selection-chemistry.cpp:2617 ../src/ui/dialog/clonetiler.cpp:2223 -#: ../src/selection-chemistry.cpp:2544 -#: ../src/ui/dialog/clonetiler.cpp:2218 +#: ../src/selection-chemistry.cpp:2542 ../src/ui/dialog/clonetiler.cpp:2218 msgid "Select an object to clone." msgstr "Vyberte objekt, ktorý sa má klonovať." -#: ../src/selection-chemistry.cpp:2653 -#: ../src/selection-chemistry.cpp:2580 +#: ../src/selection-chemistry.cpp:2578 #, fuzzy msgctxt "Action" msgid "Clone" msgstr "Klonované" -#: ../src/selection-chemistry.cpp:2669 -#: ../src/selection-chemistry.cpp:2596 +#: ../src/selection-chemistry.cpp:2594 msgid "Select clones to relink." msgstr "Vyberte klony, ktoré sa majú znova pripojiť." -#: ../src/selection-chemistry.cpp:2676 -#: ../src/selection-chemistry.cpp:2603 +#: ../src/selection-chemistry.cpp:2601 msgid "Copy an object to clipboard to relink clones to." msgstr "" "Skopírujte do schránky objekt, ku ktorému sa majú znova pripojiť " "klony." -#: ../src/selection-chemistry.cpp:2699 -#: ../src/selection-chemistry.cpp:2627 +#: ../src/selection-chemistry.cpp:2625 msgid "No clones to relink in the selection." msgstr "Vo výbere nie sú žiadne klony." -#: ../src/selection-chemistry.cpp:2702 -#: ../src/selection-chemistry.cpp:2630 +#: ../src/selection-chemistry.cpp:2628 msgid "Relink clone" msgstr "Znovu pripojiť klon" -#: ../src/selection-chemistry.cpp:2716 -#: ../src/selection-chemistry.cpp:2644 +#: ../src/selection-chemistry.cpp:2642 msgid "Select clones to unlink." msgstr "Vyberte klony, ktoré sa majú odpojiť." -#: ../src/selection-chemistry.cpp:2772 -#: ../src/selection-chemistry.cpp:2698 +#: ../src/selection-chemistry.cpp:2696 msgid "No clones to unlink in the selection." msgstr "Vo výbere nie sú klony, ktoré je možné odpojiť." -#: ../src/selection-chemistry.cpp:2776 -#: ../src/selection-chemistry.cpp:2702 +#: ../src/selection-chemistry.cpp:2700 msgid "Unlink clone" msgstr "Odpojiť klon" -#: ../src/selection-chemistry.cpp:2789 -#: ../src/selection-chemistry.cpp:2715 +#: ../src/selection-chemistry.cpp:2713 msgid "" "Select a clone to go to its original. Select a linked offset " "to go to its source. Select a text on path to go to the path. Select " @@ -12981,8 +11013,7 @@ msgstr "" "dostanete k jeho ceste. Vybraním textového toku sa dostanete k jeho " "rámcu." -#: ../src/selection-chemistry.cpp:2837 -#: ../src/selection-chemistry.cpp:2748 +#: ../src/selection-chemistry.cpp:2746 msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" @@ -12990,234 +11021,190 @@ msgstr "" "Nebolo možné nájsť objekt, ktorý treba vybrať (osirotený klon, posun, " "text na ceste, textový tok?)" -#: ../src/selection-chemistry.cpp:2843 -#: ../src/selection-chemistry.cpp:2754 +#: ../src/selection-chemistry.cpp:2752 msgid "" "The object you're trying to select is not visible (it is in <" "defs>)" msgstr "" "Objekt, ktorý sa pokúšate vybrať nie je viditeľný (je v <defs>)" -#: ../src/selection-chemistry.cpp:2932 -msgid "Select path(s) to fill." -msgstr "" +#: ../src/selection-chemistry.cpp:2797 +#, fuzzy +msgid "Select one path to clone." +msgstr "Vyberte objekt, ktorý sa má klonovať." + +#: ../src/selection-chemistry.cpp:2801 +#, fuzzy +msgid "Select one path to clone." +msgstr "Vyberte objekt, ktorý sa má klonovať." -#: ../src/selection-chemistry.cpp:2950 -#: ../src/selection-chemistry.cpp:2859 +#: ../src/selection-chemistry.cpp:2857 msgid "Select object(s) to convert to marker." msgstr "Vyberte objekt(y), ktorý sa má konvertovať na zakončenie čiary." -#: ../src/selection-chemistry.cpp:3025 -#: ../src/selection-chemistry.cpp:2926 +#: ../src/selection-chemistry.cpp:2924 msgid "Objects to marker" msgstr "Objekty na zakončenie čiary" -#: ../src/selection-chemistry.cpp:3050 -#: ../src/selection-chemistry.cpp:2950 +#: ../src/selection-chemistry.cpp:2948 msgid "Select object(s) to convert to guides." msgstr "Vyberte objekty, ktoré sa majú konvertovať na vodidlá." -#: ../src/selection-chemistry.cpp:3073 -#: ../src/selection-chemistry.cpp:2973 +#: ../src/selection-chemistry.cpp:2971 msgid "Objects to guides" msgstr "Objekty na vodidlá" -#: ../src/selection-chemistry.cpp:3109 -#: ../src/selection-chemistry.cpp:3009 +#: ../src/selection-chemistry.cpp:3007 #, fuzzy msgid "Select objects to convert to symbol." msgstr "Vyberte objekt(y), ktorý sa má konvertovať na zakončenie čiary." -#: ../src/selection-chemistry.cpp:3212 -#: ../src/selection-chemistry.cpp:3115 +#: ../src/selection-chemistry.cpp:3113 msgid "Group to symbol" msgstr "" -#: ../src/selection-chemistry.cpp:3231 -#: ../src/selection-chemistry.cpp:3134 +#: ../src/selection-chemistry.cpp:3132 #, fuzzy msgid "Select a symbol to extract objects from." msgstr "" -"Vyberte objekt s výplňou vzorkou, z ktorého sa bude extrahovať " -"objekt." +"Vyberte objekt s výplňou vzorkou, z ktorého sa bude extrahovať objekt." -#: ../src/selection-chemistry.cpp:3240 -#: ../src/selection-chemistry.cpp:3143 +#: ../src/selection-chemistry.cpp:3141 msgid "Select only one symbol in Symbol dialog to convert to group." msgstr "" -#: ../src/selection-chemistry.cpp:3298 -#: ../src/selection-chemistry.cpp:3201 +#: ../src/selection-chemistry.cpp:3199 msgid "Group from symbol" msgstr "" -#: ../src/selection-chemistry.cpp:3316 -#: ../src/selection-chemistry.cpp:3219 +#: ../src/selection-chemistry.cpp:3217 msgid "Select object(s) to convert to pattern." msgstr "Vyberte objekt, ktorý sa má konvertovať na vzor." -#: ../src/selection-chemistry.cpp:3415 -#: ../src/selection-chemistry.cpp:3309 +#: ../src/selection-chemistry.cpp:3307 msgid "Objects to pattern" msgstr "Objekty do vzorky" -#: ../src/selection-chemistry.cpp:3431 -#: ../src/selection-chemistry.cpp:3325 +#: ../src/selection-chemistry.cpp:3323 msgid "Select an object with pattern fill to extract objects from." msgstr "" -"Vyberte objekt s výplňou vzorkou, z ktorého sa bude extrahovať " -"objekt." +"Vyberte objekt s výplňou vzorkou, z ktorého sa bude extrahovať objekt." -#: ../src/selection-chemistry.cpp:3492 -#: ../src/selection-chemistry.cpp:3380 +#: ../src/selection-chemistry.cpp:3378 msgid "No pattern fills in the selection." msgstr "Výber neobsahuje objekt s výplňou vzorkou." -#: ../src/selection-chemistry.cpp:3495 -#: ../src/selection-chemistry.cpp:3383 +#: ../src/selection-chemistry.cpp:3381 msgid "Pattern to objects" msgstr "Vzorka pre objekty" -#: ../src/selection-chemistry.cpp:3586 -#: ../src/selection-chemistry.cpp:3474 +#: ../src/selection-chemistry.cpp:3472 msgid "Select object(s) to make a bitmap copy." msgstr "Vyberte objekt na vytvorenie bitmapovej kópie." -#: ../src/selection-chemistry.cpp:3590 -#: ../src/selection-chemistry.cpp:3478 +#: ../src/selection-chemistry.cpp:3476 msgid "Rendering bitmap..." msgstr "Vykresľuje sa bitmapa..." -#: ../src/selection-chemistry.cpp:3777 -#: ../src/selection-chemistry.cpp:3657 +#: ../src/selection-chemistry.cpp:3655 msgid "Create bitmap" msgstr "Vytvoriť bitmapu" -#: ../src/selection-chemistry.cpp:3802 ../src/selection-chemistry.cpp:3921 -#: ../src/selection-chemistry.cpp:3689 +#: ../src/selection-chemistry.cpp:3687 msgid "Select object(s) to create clippath or mask from." msgstr "" "Vyberte objekty, z ktorých sa má vytvoriť orezávacia cesta alebo " "maska." -#: ../src/selection-chemistry.cpp:3895 -msgid "Create Clip Group" -msgstr "" - -#: ../src/selection-chemistry.cpp:3924 -#: ../src/selection-chemistry.cpp:3692 +#: ../src/selection-chemistry.cpp:3690 msgid "Select mask object and object(s) to apply clippath or mask to." msgstr "" "Vyberte objekt masky a objekty, na ktoré sa má použiť orezávacia " "cesta alebo maska." -#: ../src/selection-chemistry.cpp:4105 -#: ../src/selection-chemistry.cpp:3875 +#: ../src/selection-chemistry.cpp:3873 msgid "Set clipping path" msgstr "Nastaviť orezávaciu cestu" -#: ../src/selection-chemistry.cpp:4107 -#: ../src/selection-chemistry.cpp:3877 +#: ../src/selection-chemistry.cpp:3875 msgid "Set mask" msgstr "Nastaviť masku" -#: ../src/selection-chemistry.cpp:4122 -#: ../src/selection-chemistry.cpp:3892 +#: ../src/selection-chemistry.cpp:3890 msgid "Select object(s) to remove clippath or mask from." msgstr "" "Vybrať objekt, z ktorého sa odstráni orezávacia cesta alebo maska." -#: ../src/selection-chemistry.cpp:4242 -#: ../src/selection-chemistry.cpp:4003 +#: ../src/selection-chemistry.cpp:4001 msgid "Release clipping path" msgstr "Uvoľniť orezávaciu cestu" -#: ../src/selection-chemistry.cpp:4244 -#: ../src/selection-chemistry.cpp:4005 +#: ../src/selection-chemistry.cpp:4003 msgid "Release mask" msgstr "Uvoľniť masku" -#: ../src/selection-chemistry.cpp:4263 -#: ../src/selection-chemistry.cpp:4024 +#: ../src/selection-chemistry.cpp:4022 msgid "Select object(s) to fit canvas to." msgstr "Vyberte objekt(y), ktorým sa má prispôsobiť plátno." #. Fit Page -#: ../src/selection-chemistry.cpp:4283 ../src/verbs.cpp:2992 -#: ../src/selection-chemistry.cpp:4044 -#: ../src/verbs.cpp:2905 +#: ../src/selection-chemistry.cpp:4042 ../src/verbs.cpp:2905 msgid "Fit Page to Selection" msgstr "Veľkosť strany podľa výberu" -#: ../src/selection-chemistry.cpp:4312 ../src/verbs.cpp:2994 -#: ../src/selection-chemistry.cpp:4073 -#: ../src/verbs.cpp:2907 +#: ../src/selection-chemistry.cpp:4071 ../src/verbs.cpp:2907 msgid "Fit Page to Drawing" msgstr "Veľkosť strany podľa kresby" -#: ../src/selection-chemistry.cpp:4333 ../src/verbs.cpp:2996 -#: ../src/selection-chemistry.cpp:4094 -#: ../src/verbs.cpp:2909 +#: ../src/selection-chemistry.cpp:4092 ../src/verbs.cpp:2909 msgid "Fit Page to Selection or Drawing" msgstr "Veľkosť strany podľa výberu alebo kresby" -#: ../src/selection-describer.cpp:138 #: ../src/selection-describer.cpp:128 msgid "root" msgstr "koreň" -#: ../src/selection-describer.cpp:140 ../src/widgets/ege-paint-def.cpp:66 +#: ../src/selection-describer.cpp:130 ../src/widgets/ege-paint-def.cpp:66 #: ../src/widgets/ege-paint-def.cpp:90 -#: ../src/selection-describer.cpp:130 msgid "none" msgstr "žiadne" -#: ../src/selection-describer.cpp:152 #: ../src/selection-describer.cpp:142 #, c-format msgid "layer %s" msgstr "vrstve %s" -#: ../src/selection-describer.cpp:154 #: ../src/selection-describer.cpp:144 #, c-format msgid "layer %s" msgstr "vrstva %s" -#: ../src/selection-describer.cpp:165 #: ../src/selection-describer.cpp:155 #, c-format msgid "%s" msgstr "%s" -#: ../src/selection-describer.cpp:175 #: ../src/selection-describer.cpp:165 #, c-format msgid " in %s" msgstr " vo %s" -#: ../src/selection-describer.cpp:177 #: ../src/selection-describer.cpp:167 #, fuzzy msgid " hidden in definitions" msgstr "Zabrániť zdieľaniu definícií farebných prechodov" -#: ../src/selection-describer.cpp:179 #: ../src/selection-describer.cpp:169 #, c-format msgid " in group %s (%s)" msgstr " v skupine %s (%s)" -#: ../src/selection-describer.cpp:181 #: ../src/selection-describer.cpp:171 -#, c-format #, fuzzy, c-format msgid " in unnamed group (%s)" msgstr " v skupine %s (%s)" -#: ../src/selection-describer.cpp:183 #: ../src/selection-describer.cpp:173 -#, c-format #, fuzzy, c-format msgid " in %i parent (%s)" msgid_plural " in %i parents (%s)" @@ -13225,9 +11212,7 @@ msgstr[0] " v %i rodičovi (%s)" msgstr[1] " v %i rodičoch (%s)" msgstr[2] " v %i rodičoch (%s)" -#: ../src/selection-describer.cpp:186 #: ../src/selection-describer.cpp:176 -#, c-format #, fuzzy, c-format msgid " in %i layer" msgid_plural " in %i layers" @@ -13235,35 +11220,28 @@ msgstr[0] " v %i vrstve" msgstr[1] " v %i vrstvách" msgstr[2] " v %i vrstvách" -#: ../src/selection-describer.cpp:198 #: ../src/selection-describer.cpp:187 #, fuzzy msgid "Convert symbol to group to edit" msgstr "Konvertovať ťah na cestu" -#: ../src/selection-describer.cpp:202 #: ../src/selection-describer.cpp:191 msgid "Remove from symbols tray to edit symbol" msgstr "" -#: ../src/selection-describer.cpp:208 #: ../src/selection-describer.cpp:195 msgid "Use Shift+D to look up original" msgstr "Použite Shift+D na vyhľadanie originálu" -#: ../src/selection-describer.cpp:214 #: ../src/selection-describer.cpp:199 msgid "Use Shift+D to look up path" msgstr "Použite Shift+D na vyhľadanie cesty" -#: ../src/selection-describer.cpp:220 #: ../src/selection-describer.cpp:203 msgid "Use Shift+D to look up frame" msgstr "Použite Shift+D na vyhľadanie rámca" -#: ../src/selection-describer.cpp:236 #: ../src/selection-describer.cpp:215 -#, c-format #, fuzzy, c-format msgid "%i objects selected of type %s" msgid_plural "%i objects selected of types %s" @@ -13271,9 +11249,7 @@ msgstr[0] "%i objekt vybraný" msgstr[1] "%i objekty vybrané" msgstr[2] "%i objektov vybraných" -#: ../src/selection-describer.cpp:246 #: ../src/selection-describer.cpp:225 -#, c-format #, fuzzy, c-format msgid "; %d filtered object " msgid_plural "; %d filtered objects " @@ -13321,8 +11297,7 @@ msgstr "" "Stred otáčania a skosenia: ťahaním zmeníte jeho polohu; zmena mierky " "so Shift tiež používa tento stred" -#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:981 -#: ../src/ui/dialog/transformation.cpp:982 +#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:982 msgid "Skew" msgstr "Skosenie" @@ -13345,24 +11320,24 @@ msgstr "Zmena mierky: %0.2f%% x %0.2f%%; s Ctrl zamknutie pomeru" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1199 +#: ../src/seltrans.cpp:1192 #, c-format msgid "Skew: %0.2f°; with Ctrl to snap angle" msgstr "Skosenie: %0.2f°; s Ctrl prichytávanie k uhlu" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1274 +#: ../src/seltrans.cpp:1267 #, c-format msgid "Rotate: %0.2f°; with Ctrl to snap angle" msgstr "Otáčanie: %0.2f°; s Ctrl prichytávanie k uhlu" -#: ../src/seltrans.cpp:1311 +#: ../src/seltrans.cpp:1304 #, c-format msgid "Move center to %s, %s" msgstr "Presunúť stred do %s, %s" -#: ../src/seltrans.cpp:1465 +#: ../src/seltrans.cpp:1458 #, c-format msgid "" "Move by %s, %s; with Ctrl to restrict to horizontal/vertical; " @@ -13372,14 +11347,11 @@ msgstr "" "Shift potlačenie prichytávania" #: ../src/shortcuts.cpp:226 -#, c-format #, fuzzy, c-format msgid "Keyboard directory (%s) is unavailable." msgstr "Adresár paliet (%s) je nedostupný." -#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1298 -#: ../src/ui/dialog/export.cpp:1332 -#: ../src/ui/dialog/export.cpp:1299 +#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1299 #: ../src/ui/dialog/export.cpp:1333 msgid "Select a filename for exporting" msgstr "Voľba súboru pre export" @@ -13399,35 +11371,27 @@ msgstr "" msgid "without URI" msgstr "odkaz bez URI" -#: ../src/sp-ellipse.cpp:373 #: ../src/sp-ellipse.cpp:374 #, fuzzy msgid "Segment" msgstr "Segment úsečky" -#: ../src/sp-ellipse.cpp:375 #: ../src/sp-ellipse.cpp:376 msgid "Arc" msgstr "" #. Ellipse -#: ../src/sp-ellipse.cpp:378 ../src/sp-ellipse.cpp:385 -#: ../src/ui/dialog/inkscape-preferences.cpp:412 -#: ../src/widgets/pencil-toolbar.cpp:163 -#: ../src/sp-ellipse.cpp:379 -#: ../src/sp-ellipse.cpp:386 -#: ../src/ui/dialog/inkscape-preferences.cpp:405 +#: ../src/sp-ellipse.cpp:379 ../src/sp-ellipse.cpp:386 +#: ../src/ui/dialog/inkscape-preferences.cpp:403 #: ../src/widgets/pencil-toolbar.cpp:158 msgid "Ellipse" msgstr "Elipsa" -#: ../src/sp-ellipse.cpp:382 #: ../src/sp-ellipse.cpp:383 msgid "Circle" msgstr "Kruh" #. TRANSLATORS: "Flow region" is an area where text is allowed to flow -#: ../src/sp-flowregion.cpp:195 #: ../src/sp-flowregion.cpp:192 #, fuzzy msgid "Flow Region" @@ -13437,32 +11401,27 @@ msgstr "Oblasť toku" #. * flow excluded region. flowRegionExclude in SVG 1.2: see #. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and #. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegionExclude-elem. -#: ../src/sp-flowregion.cpp:348 #: ../src/sp-flowregion.cpp:342 #, fuzzy msgid "Flow Excluded Region" msgstr "Výnimka z oblasti toku" -#: ../src/sp-flowtext.cpp:290 #: ../src/sp-flowtext.cpp:289 #, fuzzy msgid "Flowed Text" msgstr "Textový tok" -#: ../src/sp-flowtext.cpp:292 #: ../src/sp-flowtext.cpp:291 #, fuzzy msgid "Linked Flowed Text" msgstr "Textový tok" -#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:375 +#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:353 #: ../src/ui/tools/text-tool.cpp:1566 -#: ../src/sp-text.cpp:341 msgid " [truncated]" msgstr " [orezané]" #: ../src/sp-flowtext.cpp:300 -#, c-format #, fuzzy, c-format msgid "(%d character%s)" msgid_plural "(%d characters%s)" @@ -13470,26 +11429,22 @@ msgstr[0] "Vložiť znak Unicode" msgstr[1] "Vložiť znak Unicode" msgstr[2] "Vložiť znak Unicode" -#: ../src/sp-guide.cpp:242 #: ../src/sp-guide.cpp:303 +#, fuzzy msgid "Create Guides Around the Page" -msgstr "Vytvorí vodidlá okolo stránky" +msgstr "Vodidlá okolo stránky" -#: ../src/sp-guide.cpp:254 ../src/verbs.cpp:2549 -#: ../src/sp-guide.cpp:315 -#: ../src/verbs.cpp:2470 +#: ../src/sp-guide.cpp:315 ../src/verbs.cpp:2470 #, fuzzy msgid "Delete All Guides" msgstr "Zmazať vodidlo" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:434 #: ../src/sp-guide.cpp:475 #, fuzzy msgid "Deleted" msgstr "Zmazať" -#: ../src/sp-guide.cpp:443 #: ../src/sp-guide.cpp:484 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " @@ -13498,88 +11453,65 @@ msgstr "" "Shift+ťahaním otočíte, Ctrl+ťahaním posuniete počiatok, " "pomocou Del zmažete" -#: ../src/sp-guide.cpp:447 #: ../src/sp-guide.cpp:488 #, c-format msgid "vertical, at %s" msgstr "zvislé, na %s" -#: ../src/sp-guide.cpp:450 #: ../src/sp-guide.cpp:491 #, c-format msgid "horizontal, at %s" msgstr "vodorovné, na %s" -#: ../src/sp-guide.cpp:455 #: ../src/sp-guide.cpp:496 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "na %d stupňoch, cez (%s,%s)" -#: ../src/sp-image.cpp:526 #: ../src/sp-image.cpp:525 msgid "embedded" msgstr "vložený" -#: ../src/sp-image.cpp:534 #: ../src/sp-image.cpp:533 -#, c-format #, fuzzy, c-format msgid "[bad reference]: %s" msgstr "Nastavenia hviezdy" -#: ../src/sp-image.cpp:535 #: ../src/sp-image.cpp:534 -#, c-format #, fuzzy, c-format msgid "%d × %d: %s" msgstr "Obrázok %d × %d: %s" -#: ../src/sp-item-group.cpp:332 -#: ../src/sp-item-group.cpp:329 -msgid "Group" -msgstr "Zoskupiť" - -#: ../src/sp-item-group.cpp:338 ../src/sp-switch.cpp:82 -#: ../src/sp-item-group.cpp:335 -#, c-format +#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 #, fuzzy, c-format msgid "of %d object" msgstr "Zoskupenie %d objektu" -#: ../src/sp-item-group.cpp:338 ../src/sp-switch.cpp:82 -#: ../src/sp-item-group.cpp:335 -#, c-format +#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 #, fuzzy, c-format msgid "of %d objects" msgstr "Zoskupenie %d objektu" -#: ../src/sp-item.cpp:1051 ../src/verbs.cpp:214 -#: ../src/sp-item.cpp:1035 -#: ../src/verbs.cpp:213 +#: ../src/sp-item.cpp:961 ../src/verbs.cpp:213 msgid "Object" msgstr "Objekt" -#: ../src/sp-item.cpp:1063 -#: ../src/sp-item.cpp:1052 +#: ../src/sp-item.cpp:978 #, c-format msgid "%s; clipped" msgstr "%s; orezané" -#: ../src/sp-item.cpp:1069 -#: ../src/sp-item.cpp:1058 +#: ../src/sp-item.cpp:984 #, c-format msgid "%s; masked" msgstr "%s; maskované" -#: ../src/sp-item.cpp:1079 -#: ../src/sp-item.cpp:1068 +#: ../src/sp-item.cpp:994 #, c-format msgid "%s; filtered (%s)" msgstr "%s; odfiltrované (%s)" -#: ../src/sp-item.cpp:1081 -#: ../src/sp-item.cpp:1070 +#: ../src/sp-item.cpp:996 #, c-format msgid "%s; filtered" msgstr "%s; odfiltrované" @@ -13588,7 +11520,6 @@ msgstr "%s; odfiltrované" msgid "Line" msgstr "Úsečka" -#: ../src/sp-lpe-item.cpp:260 #: ../src/sp-lpe-item.cpp:262 msgid "An exception occurred during execution of the Path Effect." msgstr "Počas vykonávania Efektu cesty sa vyskytla výnimka." @@ -13622,19 +11553,16 @@ msgid "Path" msgstr "Cesta" #: ../src/sp-path.cpp:95 -#, c-format #, fuzzy, c-format msgid ", path effect: %s" msgstr "Aktivovať efekt živej cesty" #: ../src/sp-path.cpp:98 -#, c-format #, fuzzy, c-format msgid "%i node%s" msgstr "Spojiť uzly" #: ../src/sp-path.cpp:98 -#, c-format #, fuzzy, c-format msgid "%i nodes%s" msgstr "Spojiť uzly" @@ -13648,36 +11576,30 @@ msgid "Polyline" msgstr "Lomená čiara" #. Rectangle -#: ../src/sp-rect.cpp:163 ../src/ui/dialog/inkscape-preferences.cpp:402 -#: ../src/ui/dialog/inkscape-preferences.cpp:395 +#: ../src/sp-rect.cpp:163 ../src/ui/dialog/inkscape-preferences.cpp:393 msgid "Rectangle" msgstr "Obdĺžnik" #. Spiral -#: ../src/sp-spiral.cpp:230 ../src/ui/dialog/inkscape-preferences.cpp:420 +#: ../src/sp-spiral.cpp:230 ../src/ui/dialog/inkscape-preferences.cpp:411 #: ../share/extensions/gcodetools_area.inx.h:11 -#: ../src/ui/dialog/inkscape-preferences.cpp:413 msgid "Spiral" msgstr "Špirála" #. TRANSLATORS: since turn count isn't an integer, please adjust the #. string as needed to deal with an localized plural forms. #: ../src/sp-spiral.cpp:236 -#, c-format #, fuzzy, c-format msgid "with %3f turns" msgstr "Špirála s %3f otočeniami" #. Star -#: ../src/sp-star.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:416 -#: ../src/widgets/star-toolbar.cpp:471 -#: ../src/ui/dialog/inkscape-preferences.cpp:409 +#: ../src/sp-star.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:407 #: ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "Hviezda" -#: ../src/sp-star.cpp:257 ../src/widgets/star-toolbar.cpp:464 -#: ../src/widgets/star-toolbar.cpp:462 +#: ../src/sp-star.cpp:257 ../src/widgets/star-toolbar.cpp:462 msgid "Polygon" msgstr "Mnohouholník" @@ -13685,13 +11607,11 @@ msgstr "Mnohouholník" #. make calls to ngettext because the pluralization may be different #. for various numbers >=3. The singular form is used as the index. #: ../src/sp-star.cpp:264 -#, c-format #, fuzzy, c-format msgid "with %d vertex" msgstr "Hviezda s %d vrcholom" #: ../src/sp-star.cpp:264 -#, c-format #, fuzzy, c-format msgid "with %d vertices" msgstr "Hviezda s %d vrcholom" @@ -13700,7 +11620,7 @@ msgstr "Hviezda s %d vrcholom" msgid "Conditional Group" msgstr "" -#: ../src/sp-text.cpp:359 ../src/verbs.cpp:348 +#: ../src/sp-text.cpp:326 ../src/verbs.cpp:328 #: ../share/extensions/lorem_ipsum.inx.h:8 #: ../share/extensions/replace_font.inx.h:11 #: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 @@ -13712,22 +11632,20 @@ msgstr "" #: ../share/extensions/text_sentencecase.inx.h:2 #: ../share/extensions/text_titlecase.inx.h:2 #: ../share/extensions/text_uppercase.inx.h:2 -#: ../src/sp-text.cpp:325 -#: ../src/verbs.cpp:328 -#, fuzzy msgid "Text" msgstr "Text" -#: ../src/sp-text.cpp:379 -#: ../src/sp-text.cpp:345 -#, c-format +#. TRANSLATORS: For description of font with no name. +#: ../src/sp-text.cpp:343 +msgid "<no name found>" +msgstr "<názov nebol nájdený>" + +#: ../src/sp-text.cpp:357 #, fuzzy, c-format msgid "on path%s (%s, %s)" msgstr "Text na ceste%s (%s, %s)" -#: ../src/sp-text.cpp:380 -#: ../src/sp-text.cpp:346 -#, c-format +#: ../src/sp-text.cpp:358 #, fuzzy, c-format msgid "%s (%s, %s)" msgstr "Text%s (%s, %s)" @@ -13741,36 +11659,29 @@ msgstr "Naklonované znakové dáta%s%s" msgid " from " msgstr " od " -#: ../src/sp-tref.cpp:252 ../src/sp-use.cpp:278 -#: ../src/sp-use.cpp:262 +#: ../src/sp-tref.cpp:252 ../src/sp-use.cpp:262 msgid "[orphaned]" msgstr "" -#: ../src/sp-tspan.cpp:218 #: ../src/sp-tspan.cpp:217 #, fuzzy msgid "Text Span" msgstr "Písmo textu" -#: ../src/sp-use.cpp:243 #: ../src/sp-use.cpp:227 msgid "Symbol" msgstr "" -#: ../src/sp-use.cpp:245 #: ../src/sp-use.cpp:230 #, fuzzy msgid "Clone" msgstr "Klonované" -#: ../src/sp-use.cpp:253 ../src/sp-use.cpp:255 -#: ../src/sp-use.cpp:237 -#: ../src/sp-use.cpp:239 +#: ../src/sp-use.cpp:237 ../src/sp-use.cpp:239 #, c-format msgid "called %s" msgstr "" -#: ../src/sp-use.cpp:255 #: ../src/sp-use.cpp:239 #, fuzzy msgid "Unnamed Symbol" @@ -13778,14 +11689,11 @@ msgstr "Nepomenovaný" #. TRANSLATORS: Used for statusbar description for long chains: #. * "Clone of: Clone of: ... in Layer 1". -#: ../src/sp-use.cpp:264 #: ../src/sp-use.cpp:248 msgid "..." msgstr "..." -#: ../src/sp-use.cpp:273 #: ../src/sp-use.cpp:257 -#, c-format #, fuzzy, c-format msgid "of: %s" msgstr "Chyby" @@ -13928,8 +11836,7 @@ msgstr "" msgid "The flowed text(s) must be visible in order to be put on a path." msgstr "Textový tok musí byť viditeľný aby ho bolo možné dať na cestu." -#: ../src/text-chemistry.cpp:185 ../src/verbs.cpp:2571 -#: ../src/verbs.cpp:2492 +#: ../src/text-chemistry.cpp:185 ../src/verbs.cpp:2492 msgid "Put text on path" msgstr "Umiestniť text na cestu" @@ -13941,8 +11848,7 @@ msgstr "Vybrať text a cestu na odstránenie z cesty." msgid "No texts-on-paths in the selection." msgstr "Výber neobsahuje text na ceste." -#: ../src/text-chemistry.cpp:221 ../src/verbs.cpp:2573 -#: ../src/verbs.cpp:2494 +#: ../src/text-chemistry.cpp:221 ../src/verbs.cpp:2494 msgid "Remove text from path" msgstr "Odstráni text z cesty" @@ -13994,6 +11900,169 @@ msgstr "Vo výbere nie je textový tok, ktorý je možné konvertovať." msgid "You cannot edit cloned character data." msgstr "Nemôžete upravovať klonované znakové dáta." +#: ../src/tools-switch.cpp:91 +#, fuzzy +msgid "" +"Click to Select and Transform objects, Drag to select many " +"objects." +msgstr "Kliknutím vyberte uzly, ťahaním preskupte." + +#: ../src/tools-switch.cpp:92 +#, fuzzy +msgid "Modify selected path points (nodes) directly." +msgstr "Zjednoduší vybrané cesty (odstráni nadbytočné uzly)" + +#: ../src/tools-switch.cpp:93 +msgid "To tweak a path by pushing, select it and drag over it." +msgstr "Cestu doladíte tlačením tak, že ju vyberiete a ťaháte ponad ňu myšou." + +#: ../src/tools-switch.cpp:94 +#, fuzzy +msgid "" +"Drag, click or click and scroll to spray the selected " +"objects." +msgstr "" +"Ťahaním, kliknutím alebo posunutím nasprejujete vybrané " +"objekty." + +#: ../src/tools-switch.cpp:95 +msgid "" +"Drag to create a rectangle. Drag controls to round corners and " +"resize. Click to select." +msgstr "" +"Ťahaním vytvoríte obdĺžnik. Ťahaním ovládacích prvkov zaoblíte " +"rohy a zmeníte veľkosť. Kliknutím vyberiete." + +#: ../src/tools-switch.cpp:96 +msgid "" +"Drag to create a 3D box. Drag controls to resize in " +"perspective. Click to select (with Ctrl+Alt for single faces)." +msgstr "" +"Ťahaním vytvoríte kváder. Ťahaním úchopov meníte veľkosť v " +"perspektívnom pohľade (pomocou Ctrl+Alt len pre samostatné steny)." + +#: ../src/tools-switch.cpp:97 +msgid "" +"Drag to create an ellipse. Drag controls to make an arc or " +"segment. Click to select." +msgstr "" +"Ťahaním vytvoríte elipsu. Ťahaním úchopov vytvoríte oblúk " +"alebo segment. Kliknutím vyberiete." + +#: ../src/tools-switch.cpp:98 +msgid "" +"Drag to create a star. Drag controls to edit the star shape. " +"Click to select." +msgstr "" +"Ťahaním vytvoríte hviezdu. Ťahaním úchopov upravíte tvar " +"hviezdy. Kliknutím vyberiete." + +#: ../src/tools-switch.cpp:99 +msgid "" +"Drag to create a spiral. Drag controls to edit the spiral " +"shape. Click to select." +msgstr "" +"Ťahaním vytvoríte špirálu. Ťahaním úchopov upravíte tvar " +"špirály. Kliknutím vyberiete." + +#: ../src/tools-switch.cpp:100 +msgid "" +"Drag to create a freehand line. Shift appends to selected " +"path, Alt activates sketch mode." +msgstr "" +"Ťahaním vytvoríte čiaru voľnou rukou. Začnite kresliť so stlačeným " +"Shift pre pokračovanie vo vybranej ceste, Alt aktivuje režim " +"skicy." + +#: ../src/tools-switch.cpp:101 +msgid "" +"Click or click and drag to start a path; with Shift to " +"append to selected path. Ctrl+click to create single dots (straight " +"line modes only)." +msgstr "" +"Kliknutím alebo kliknutím a ťahaním začnete cestu; pomocou " +"Shift pridáte k vybranej ceste. Ctrl+kliknutím vytvoríte " +"jednotlivé bodky (iba režimy priamych čiar)." + +#: ../src/tools-switch.cpp:102 +msgid "" +"Drag to draw a calligraphic stroke; with Ctrl to track a guide " +"path. Arrow keys adjust width (left/right) and angle (up/down)." +msgstr "" +"Ťahaním vytvoríte kaligrafický ťah; pomocou Ctrl sledujete " +"vodidlo. Šípky vľavo/vpravo dolaďujú šírku, nahor/" +"nadol upravujú uhol." + +#: ../src/tools-switch.cpp:103 ../src/ui/tools/text-tool.cpp:1593 +msgid "" +"Click to select or create text, drag to create flowed text; " +"then type." +msgstr "" +"Kliknutím vyberiete alebo vytvoríte text, ťahaním vytvoríte " +"textový tok; potom píšte." + +#: ../src/tools-switch.cpp:104 +msgid "" +"Drag or double click to create a gradient on selected objects, " +"drag handles to adjust gradients." +msgstr "" +"Ťahaním alebo dvojitým kliknutím vytvoríte farebný prechod na " +"vybraných objektoch. Ťahaním úchopov doladíte farebný prechod." + +#: ../src/tools-switch.cpp:105 +#, fuzzy +msgid "" +"Drag or double click to create a mesh on selected objects, " +"drag handles to adjust meshes." +msgstr "" +"Ťahaním alebo dvojitým kliknutím vytvoríte farebný prechod na " +"vybraných objektoch. Ťahaním úchopov doladíte farebný prechod." + +#: ../src/tools-switch.cpp:106 +msgid "" +"Click or drag around an area to zoom in, Shift+click to " +"zoom out." +msgstr "" +"Kliknutím alebo ťahaním oblasti priblížite, Shift" +"+kliknutím oddialite." + +#: ../src/tools-switch.cpp:107 +msgid "Drag to measure the dimensions of objects." +msgstr "Potiahnutím odmeráte rozmery objektu." + +#: ../src/tools-switch.cpp:108 ../src/ui/tools/dropper-tool.cpp:285 +msgid "" +"Click to set fill, Shift+click to set stroke; drag to " +"average color in area; with Alt to pick inverse color; Ctrl+C " +"to copy the color under mouse to clipboard" +msgstr "" +"Kliknutie nastaví farbu výplne, Shift+kliknutie nastaví farbu " +"ťahu; kliknutie a ťahanie vyberie priemernú farbu oblasti; s Alt výber inverznej farby; Ctrl+C skopíruje farbu pod kurzorom do " +"schránky" + +#: ../src/tools-switch.cpp:109 +msgid "Click and drag between shapes to create a connector." +msgstr "Kliknutím a ťahaním medzi tvarmi vytvoríte konektor." + +#: ../src/tools-switch.cpp:110 +msgid "" +"Click to paint a bounded area, Shift+click to union the new " +"fill with the current selection, Ctrl+click to change the clicked " +"object's fill and stroke to the current setting." +msgstr "" +"Kliknutím vyfarbíte ohraničenú oblasť, Shift+kliknutím " +"zjednotíte novú výplň s aktuálnym výberom, Ctrl+kliknutím zmeníte " +"výplň a ťah objektu, na ktorý klikáte na aktuálne nastavenie." + +#: ../src/tools-switch.cpp:111 +msgid "Drag to erase." +msgstr "Ťahaním vymazať." + +#: ../src/tools-switch.cpp:112 +msgid "Choose a subtool from the toolbar" +msgstr "Vyberte podnástroj z panelu nástrojov" + #: ../src/trace/potrace/inkscape-potrace.cpp:512 #: ../src/trace/potrace/inkscape-potrace.cpp:575 #, fuzzy @@ -14046,54 +12115,41 @@ msgid "Trace: Done. %ld nodes created" msgstr "Vektorizácia: Dokončená. Vytvorených %ld uzlov" #. check whether something is selected -#: ../src/ui/clipboard.cpp:262 #: ../src/ui/clipboard.cpp:261 msgid "Nothing was copied." msgstr "Nič nebolo skopírované." -#: ../src/ui/clipboard.cpp:382 ../src/ui/clipboard.cpp:594 -#: ../src/ui/clipboard.cpp:623 -#: ../src/ui/clipboard.cpp:374 -#: ../src/ui/clipboard.cpp:583 +#: ../src/ui/clipboard.cpp:374 ../src/ui/clipboard.cpp:583 #: ../src/ui/clipboard.cpp:612 msgid "Nothing on the clipboard." msgstr "V schránke nič nie je." -#: ../src/ui/clipboard.cpp:440 #: ../src/ui/clipboard.cpp:432 msgid "Select object(s) to paste style to." msgstr "Vyberte objekt, na ktorý sa má vložiť štýl." -#: ../src/ui/clipboard.cpp:451 ../src/ui/clipboard.cpp:468 -#: ../src/ui/clipboard.cpp:443 -#: ../src/ui/clipboard.cpp:460 +#: ../src/ui/clipboard.cpp:443 ../src/ui/clipboard.cpp:460 msgid "No style on the clipboard." msgstr "V schránke nie je štýl." -#: ../src/ui/clipboard.cpp:493 #: ../src/ui/clipboard.cpp:485 msgid "Select object(s) to paste size to." msgstr "Vyberte objekt, na ktorý sa má vložiť veľkosť." -#: ../src/ui/clipboard.cpp:500 #: ../src/ui/clipboard.cpp:492 msgid "No size on the clipboard." msgstr "V schránke nie je veľkosť." -#: ../src/ui/clipboard.cpp:556 #: ../src/ui/clipboard.cpp:545 msgid "Select object(s) to paste live path effect to." msgstr "Vyberte objekt(y), na ktorý sa má vložiť efekt živej cesty." #. no_effect: -#: ../src/ui/clipboard.cpp:581 #: ../src/ui/clipboard.cpp:570 msgid "No effect on the clipboard." msgstr "V schránke nie je efekt." -#: ../src/ui/clipboard.cpp:600 ../src/ui/clipboard.cpp:637 -#: ../src/ui/clipboard.cpp:589 -#: ../src/ui/clipboard.cpp:626 +#: ../src/ui/clipboard.cpp:589 ../src/ui/clipboard.cpp:626 msgid "Clipboard does not contain a path." msgstr "Schránka neobsahuje cestu." @@ -14137,20 +12193,18 @@ msgstr "about.svg" #. TRANSLATORS: Put here your name (and other national contributors') #. one per line in the form of: name surname (email). Use \n for newline. -#: ../src/ui/dialog/aboutbox.cpp:426 +#: ../src/ui/dialog/aboutbox.cpp:416 msgid "translator-credits" msgstr "" "Ivan Masár (helix84@centrum.sk)\n" "Zdenko Podobný (zdpo@mailbox.sk)" #: ../src/ui/dialog/align-and-distribute.cpp:171 -#: ../src/ui/dialog/align-and-distribute.cpp:851 #: ../src/ui/dialog/align-and-distribute.cpp:852 msgid "Align" msgstr "Zarovnať" #: ../src/ui/dialog/align-and-distribute.cpp:341 -#: ../src/ui/dialog/align-and-distribute.cpp:852 #: ../src/ui/dialog/align-and-distribute.cpp:853 msgid "Distribute" msgstr "Rozmiestniť" @@ -14177,292 +12231,222 @@ msgctxt "Gap" msgid "_V:" msgstr "Zvislá medzera:" -#: ../src/ui/dialog/align-and-distribute.cpp:467 -#: ../src/ui/dialog/align-and-distribute.cpp:854 -#: ../src/widgets/connector-toolbar.cpp:411 #: ../src/ui/dialog/align-and-distribute.cpp:468 #: ../src/ui/dialog/align-and-distribute.cpp:855 +#: ../src/widgets/connector-toolbar.cpp:411 msgid "Remove overlaps" msgstr "Odstrániť presahy" -#: ../src/ui/dialog/align-and-distribute.cpp:498 -#: ../src/widgets/connector-toolbar.cpp:240 #: ../src/ui/dialog/align-and-distribute.cpp:499 +#: ../src/widgets/connector-toolbar.cpp:240 msgid "Arrange connector network" msgstr "Rozmiestniť sieť konektorov" -#: ../src/ui/dialog/align-and-distribute.cpp:591 #: ../src/ui/dialog/align-and-distribute.cpp:592 #, fuzzy msgid "Exchange Positions" msgstr "Znáhodniť pozície" -#: ../src/ui/dialog/align-and-distribute.cpp:625 #: ../src/ui/dialog/align-and-distribute.cpp:626 msgid "Unclump" msgstr "Rozptýliť" -#: ../src/ui/dialog/align-and-distribute.cpp:697 #: ../src/ui/dialog/align-and-distribute.cpp:698 msgid "Randomize positions" msgstr "Znáhodniť pozície" -#: ../src/ui/dialog/align-and-distribute.cpp:800 #: ../src/ui/dialog/align-and-distribute.cpp:801 msgid "Distribute text baselines" msgstr "Rozložiť základne textu" -#: ../src/ui/dialog/align-and-distribute.cpp:823 #: ../src/ui/dialog/align-and-distribute.cpp:824 msgid "Align text baselines" msgstr "Zarovnanie základní textu" -#: ../src/ui/dialog/align-and-distribute.cpp:853 #: ../src/ui/dialog/align-and-distribute.cpp:854 #, fuzzy msgid "Rearrange" msgstr "Rozmiestniť" -#: ../src/ui/dialog/align-and-distribute.cpp:855 -#: ../src/widgets/toolbox.cpp:1727 #: ../src/ui/dialog/align-and-distribute.cpp:856 #: ../src/widgets/toolbox.cpp:1728 msgid "Nodes" msgstr "Uzly" -#: ../src/ui/dialog/align-and-distribute.cpp:869 #: ../src/ui/dialog/align-and-distribute.cpp:870 msgid "Relative to: " msgstr "Relatívne k: " -#: ../src/ui/dialog/align-and-distribute.cpp:870 #: ../src/ui/dialog/align-and-distribute.cpp:871 #, fuzzy msgid "_Treat selection as group: " msgstr "Pracovať s výberom ako so skupinou:" #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:876 ../src/verbs.cpp:3024 -#: ../src/verbs.cpp:3025 -#: ../src/ui/dialog/align-and-distribute.cpp:877 -#: ../src/verbs.cpp:2937 +#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:2937 #: ../src/verbs.cpp:2938 msgid "Align right edges of objects to the left edge of the anchor" msgstr "Zarovnať pravé strany objektov k ľavej strane ukotvenia" -#: ../src/ui/dialog/align-and-distribute.cpp:879 ../src/verbs.cpp:3026 -#: ../src/verbs.cpp:3027 -#: ../src/ui/dialog/align-and-distribute.cpp:880 -#: ../src/verbs.cpp:2939 +#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:2939 #: ../src/verbs.cpp:2940 msgid "Align left edges" msgstr "Zarovnať ľavé strany" -#: ../src/ui/dialog/align-and-distribute.cpp:882 ../src/verbs.cpp:3028 -#: ../src/verbs.cpp:3029 -#: ../src/ui/dialog/align-and-distribute.cpp:883 -#: ../src/verbs.cpp:2941 +#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:2941 #: ../src/verbs.cpp:2942 msgid "Center on vertical axis" msgstr "Centrovať na zvislej osi" -#: ../src/ui/dialog/align-and-distribute.cpp:885 ../src/verbs.cpp:3030 -#: ../src/verbs.cpp:3031 -#: ../src/ui/dialog/align-and-distribute.cpp:886 -#: ../src/verbs.cpp:2943 +#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:2943 #: ../src/verbs.cpp:2944 msgid "Align right sides" msgstr "Zarovnať pravé strany" -#: ../src/ui/dialog/align-and-distribute.cpp:888 ../src/verbs.cpp:3032 -#: ../src/verbs.cpp:3033 -#: ../src/ui/dialog/align-and-distribute.cpp:889 -#: ../src/verbs.cpp:2945 +#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:2945 #: ../src/verbs.cpp:2946 msgid "Align left edges of objects to the right edge of the anchor" msgstr "Zarovnať ľavé strany objektov k pravej strane ukotvenia" -#: ../src/ui/dialog/align-and-distribute.cpp:891 ../src/verbs.cpp:3034 -#: ../src/verbs.cpp:3035 -#: ../src/ui/dialog/align-and-distribute.cpp:892 -#: ../src/verbs.cpp:2947 +#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:2947 #: ../src/verbs.cpp:2948 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "Zarovnať spodky objektov k vrchnej strane ukotvenia" -#: ../src/ui/dialog/align-and-distribute.cpp:894 ../src/verbs.cpp:3036 -#: ../src/verbs.cpp:3037 -#: ../src/ui/dialog/align-and-distribute.cpp:895 -#: ../src/verbs.cpp:2949 +#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:2949 #: ../src/verbs.cpp:2950 msgid "Align top edges" msgstr "Zarovnať vrchné strany" -#: ../src/ui/dialog/align-and-distribute.cpp:897 ../src/verbs.cpp:3038 -#: ../src/verbs.cpp:3039 -#: ../src/ui/dialog/align-and-distribute.cpp:898 -#: ../src/verbs.cpp:2951 +#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:2951 #: ../src/verbs.cpp:2952 msgid "Center on horizontal axis" msgstr "Centrovať na vodorovnej osi" -#: ../src/ui/dialog/align-and-distribute.cpp:900 ../src/verbs.cpp:3040 -#: ../src/verbs.cpp:3041 -#: ../src/ui/dialog/align-and-distribute.cpp:901 -#: ../src/verbs.cpp:2953 +#: ../src/ui/dialog/align-and-distribute.cpp:901 ../src/verbs.cpp:2953 #: ../src/verbs.cpp:2954 msgid "Align bottom edges" msgstr "Zarovnať spodné strany" -#: ../src/ui/dialog/align-and-distribute.cpp:903 ../src/verbs.cpp:3042 -#: ../src/verbs.cpp:3043 -#: ../src/ui/dialog/align-and-distribute.cpp:904 -#: ../src/verbs.cpp:2955 +#: ../src/ui/dialog/align-and-distribute.cpp:904 ../src/verbs.cpp:2955 #: ../src/verbs.cpp:2956 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "Zarovnať vrchné strany objektov k spodku ukotvenia" -#: ../src/ui/dialog/align-and-distribute.cpp:908 #: ../src/ui/dialog/align-and-distribute.cpp:909 msgid "Align baseline anchors of texts horizontally" msgstr "Zarovnanie ukotvení základní textu vodorovne" -#: ../src/ui/dialog/align-and-distribute.cpp:911 #: ../src/ui/dialog/align-and-distribute.cpp:912 msgid "Align baselines of texts" msgstr "Zarovnanie ukotvení základní textu" -#: ../src/ui/dialog/align-and-distribute.cpp:916 #: ../src/ui/dialog/align-and-distribute.cpp:917 msgid "Make horizontal gaps between objects equal" msgstr "Rovnomerne vodorovne rozmiestniť objekty" -#: ../src/ui/dialog/align-and-distribute.cpp:920 #: ../src/ui/dialog/align-and-distribute.cpp:921 msgid "Distribute left edges equidistantly" msgstr "Rovnomerne rozmiestniť ľavé strany objektov" -#: ../src/ui/dialog/align-and-distribute.cpp:923 #: ../src/ui/dialog/align-and-distribute.cpp:924 msgid "Distribute centers equidistantly horizontally" msgstr "Rovnomerne vodorovne rozmiestniť stredy objektov" -#: ../src/ui/dialog/align-and-distribute.cpp:926 #: ../src/ui/dialog/align-and-distribute.cpp:927 msgid "Distribute right edges equidistantly" msgstr "Rovnomerne rozmiestniť pravé strany objektov" -#: ../src/ui/dialog/align-and-distribute.cpp:930 #: ../src/ui/dialog/align-and-distribute.cpp:931 msgid "Make vertical gaps between objects equal" msgstr "Rovnomerne zvislo rozmiestniť objekty" -#: ../src/ui/dialog/align-and-distribute.cpp:934 #: ../src/ui/dialog/align-and-distribute.cpp:935 msgid "Distribute top edges equidistantly" msgstr "Zvislo rozmiestniť vrchné strany" -#: ../src/ui/dialog/align-and-distribute.cpp:937 #: ../src/ui/dialog/align-and-distribute.cpp:938 msgid "Distribute centers equidistantly vertically" msgstr "Rovnomerne zvislo rozmiestniť stredy objektov" -#: ../src/ui/dialog/align-and-distribute.cpp:940 #: ../src/ui/dialog/align-and-distribute.cpp:941 msgid "Distribute bottom edges equidistantly" msgstr "Rovnomerne rozmiestniť dolné strany objektov" -#: ../src/ui/dialog/align-and-distribute.cpp:945 #: ../src/ui/dialog/align-and-distribute.cpp:946 msgid "Distribute baseline anchors of texts horizontally" msgstr "Rozmiestniť ukotvenia základní textu vodorovne" -#: ../src/ui/dialog/align-and-distribute.cpp:948 #: ../src/ui/dialog/align-and-distribute.cpp:949 msgid "Distribute baselines of texts vertically" msgstr "Rozmiestniť ukotvenia základní textu zvisle" -#: ../src/ui/dialog/align-and-distribute.cpp:954 -#: ../src/widgets/connector-toolbar.cpp:373 #: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/widgets/connector-toolbar.cpp:373 msgid "Nicely arrange selected connector network" msgstr "Pekne rozmiestniť zvolenú sieť konektorov" -#: ../src/ui/dialog/align-and-distribute.cpp:957 #: ../src/ui/dialog/align-and-distribute.cpp:958 msgid "Exchange positions of selected objects - selection order" msgstr "Vymeniť polohy vybraných objektov - poradie výberu" -#: ../src/ui/dialog/align-and-distribute.cpp:960 #: ../src/ui/dialog/align-and-distribute.cpp:961 msgid "Exchange positions of selected objects - stacking order" msgstr "Vymeniť polohy vybraných objektov - poradie skladania na seba" -#: ../src/ui/dialog/align-and-distribute.cpp:963 #: ../src/ui/dialog/align-and-distribute.cpp:964 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "" "Vymeniť polohy vybraných objektov - otočenie v smere hodinových ručičiek" -#: ../src/ui/dialog/align-and-distribute.cpp:968 #: ../src/ui/dialog/align-and-distribute.cpp:969 msgid "Randomize centers in both dimensions" msgstr "Znáhodniť stredy v oboch rozmeroch" -#: ../src/ui/dialog/align-and-distribute.cpp:971 #: ../src/ui/dialog/align-and-distribute.cpp:972 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "Rozptýliť objekty: pokúsiť sa o rovnomerné vzdialenosti medzi hranami" -#: ../src/ui/dialog/align-and-distribute.cpp:976 #: ../src/ui/dialog/align-and-distribute.cpp:977 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" -msgstr "Posunúť objekty tak málo ako sa dá, aby sa ich ohraničenia neprekrývali" +msgstr "" +"Posunúť objekty tak málo ako sa dá, aby sa ich ohraničenia neprekrývali" -#: ../src/ui/dialog/align-and-distribute.cpp:984 #: ../src/ui/dialog/align-and-distribute.cpp:985 msgid "Align selected nodes to a common horizontal line" msgstr "Zarovnať vybrané uzly na spoločnú vodorovnú čiaru" -#: ../src/ui/dialog/align-and-distribute.cpp:987 #: ../src/ui/dialog/align-and-distribute.cpp:988 msgid "Align selected nodes to a common vertical line" msgstr "Zarovnať vybrané uzly na spoločnú zvislú čiaru" -#: ../src/ui/dialog/align-and-distribute.cpp:990 #: ../src/ui/dialog/align-and-distribute.cpp:991 msgid "Distribute selected nodes horizontally" msgstr "Vodorovne rozmiestniť vybrané uzly" -#: ../src/ui/dialog/align-and-distribute.cpp:993 #: ../src/ui/dialog/align-and-distribute.cpp:994 msgid "Distribute selected nodes vertically" msgstr "Zvislo rozmiestniť vybrané uzly" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:998 #: ../src/ui/dialog/align-and-distribute.cpp:999 msgid "Last selected" msgstr "Naposledy zvolené" -#: ../src/ui/dialog/align-and-distribute.cpp:999 #: ../src/ui/dialog/align-and-distribute.cpp:1000 msgid "First selected" msgstr "Prvé zvolené" -#: ../src/ui/dialog/align-and-distribute.cpp:1000 #: ../src/ui/dialog/align-and-distribute.cpp:1001 msgid "Biggest object" msgstr "Najväčší objekt" -#: ../src/ui/dialog/align-and-distribute.cpp:1001 #: ../src/ui/dialog/align-and-distribute.cpp:1002 msgid "Smallest object" msgstr "Najmenší objekt" -#: ../src/ui/dialog/align-and-distribute.cpp:1004 #: ../src/ui/dialog/align-and-distribute.cpp:1005 #, fuzzy msgid "Selection Area" @@ -14487,458 +12471,366 @@ msgstr "Uložiť" msgid "Add profile" msgstr "Pridať filter" -#: ../src/ui/dialog/clonetiler.cpp:110 #: ../src/ui/dialog/clonetiler.cpp:112 msgid "_Symmetry" msgstr "_Symetria" #. TRANSLATORS: "translation" means "shift" / "displacement" here. -#: ../src/ui/dialog/clonetiler.cpp:122 #: ../src/ui/dialog/clonetiler.cpp:124 msgid "P1: simple translation" msgstr "P1: jednoduché posunutie" -#: ../src/ui/dialog/clonetiler.cpp:123 #: ../src/ui/dialog/clonetiler.cpp:125 msgid "P2: 180° rotation" msgstr "P2: 180° rotácie" -#: ../src/ui/dialog/clonetiler.cpp:124 #: ../src/ui/dialog/clonetiler.cpp:126 msgid "PM: reflection" msgstr "PM: odraz" #. TRANSLATORS: "glide reflection" is a reflection and a translation combined. #. For more info, see http://mathforum.org/sum95/suzanne/symsusan.html -#: ../src/ui/dialog/clonetiler.cpp:127 #: ../src/ui/dialog/clonetiler.cpp:129 msgid "PG: glide reflection" msgstr "PG: posun s odrazom" -#: ../src/ui/dialog/clonetiler.cpp:128 #: ../src/ui/dialog/clonetiler.cpp:130 msgid "CM: reflection + glide reflection" msgstr "CM: posun + posun s odrazom" -#: ../src/ui/dialog/clonetiler.cpp:129 #: ../src/ui/dialog/clonetiler.cpp:131 msgid "PMM: reflection + reflection" msgstr "PMM: odraz + odraz" -#: ../src/ui/dialog/clonetiler.cpp:130 #: ../src/ui/dialog/clonetiler.cpp:132 msgid "PMG: reflection + 180° rotation" msgstr "PMG: odraz + 180° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:131 #: ../src/ui/dialog/clonetiler.cpp:133 msgid "PGG: glide reflection + 180° rotation" msgstr "PGG: kĺzavý odraz + 180° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:132 #: ../src/ui/dialog/clonetiler.cpp:134 msgid "CMM: reflection + reflection + 180° rotation" msgstr "CMM: odraz + odraz + 180° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:133 #: ../src/ui/dialog/clonetiler.cpp:135 msgid "P4: 90° rotation" msgstr "P4: 90° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:134 #: ../src/ui/dialog/clonetiler.cpp:136 msgid "P4M: 90° rotation + 45° reflection" msgstr "P4M: 90° rotácia + 45° odraz" -#: ../src/ui/dialog/clonetiler.cpp:135 #: ../src/ui/dialog/clonetiler.cpp:137 msgid "P4G: 90° rotation + 90° reflection" msgstr "P4G: 90° rotácia + 90° odraz" -#: ../src/ui/dialog/clonetiler.cpp:136 #: ../src/ui/dialog/clonetiler.cpp:138 msgid "P3: 120° rotation" msgstr "P3: 120° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:137 #: ../src/ui/dialog/clonetiler.cpp:139 msgid "P31M: reflection + 120° rotation, dense" msgstr "P31M: odraz + 120° rotácia, hustý" -#: ../src/ui/dialog/clonetiler.cpp:138 #: ../src/ui/dialog/clonetiler.cpp:140 msgid "P3M1: reflection + 120° rotation, sparse" msgstr "P3M1: odraz + 120° rotácia, riedky" -#: ../src/ui/dialog/clonetiler.cpp:139 #: ../src/ui/dialog/clonetiler.cpp:141 msgid "P6: 60° rotation" msgstr "P6: 60° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:140 #: ../src/ui/dialog/clonetiler.cpp:142 msgid "P6M: reflection + 60° rotation" msgstr "P6M: odraz + 60° rotácia" -#: ../src/ui/dialog/clonetiler.cpp:160 #: ../src/ui/dialog/clonetiler.cpp:162 msgid "Select one of the 17 symmetry groups for the tiling" msgstr "Vyberte jednu zo 17 skupín symetrie pre dláždenie" -#: ../src/ui/dialog/clonetiler.cpp:178 #: ../src/ui/dialog/clonetiler.cpp:180 msgid "S_hift" msgstr "_Posun" #. TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount -#: ../src/ui/dialog/clonetiler.cpp:188 #: ../src/ui/dialog/clonetiler.cpp:190 #, no-c-format msgid "Shift X:" msgstr "Posun X:" -#: ../src/ui/dialog/clonetiler.cpp:196 #: ../src/ui/dialog/clonetiler.cpp:198 #, no-c-format msgid "Horizontal shift per row (in % of tile width)" msgstr "Horizontálny posun na riadok (v % šírky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:204 #: ../src/ui/dialog/clonetiler.cpp:206 #, no-c-format msgid "Horizontal shift per column (in % of tile width)" msgstr "Horizontálny posun na stĺpec (v % šírky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:210 #: ../src/ui/dialog/clonetiler.cpp:212 msgid "Randomize the horizontal shift by this percentage" msgstr "Znáhodniť horizontálny posun o túto percentuálnu hodnotu" #. TRANSLATORS: "shift" means: the tiles will be shifted (offset) vertically by this amount -#: ../src/ui/dialog/clonetiler.cpp:220 #: ../src/ui/dialog/clonetiler.cpp:222 #, no-c-format msgid "Shift Y:" msgstr "Posun Y:" -#: ../src/ui/dialog/clonetiler.cpp:228 #: ../src/ui/dialog/clonetiler.cpp:230 #, no-c-format msgid "Vertical shift per row (in % of tile height)" msgstr "Horizontálny posun na stĺpec (v % výšky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:236 #: ../src/ui/dialog/clonetiler.cpp:238 #, no-c-format msgid "Vertical shift per column (in % of tile height)" msgstr "Horizontálny posun na riadok (v % výšky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:243 #: ../src/ui/dialog/clonetiler.cpp:245 msgid "Randomize the vertical shift by this percentage" msgstr "Znáhodniť vertikálny posun o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:251 ../src/ui/dialog/clonetiler.cpp:397 -#: ../src/ui/dialog/clonetiler.cpp:253 -#: ../src/ui/dialog/clonetiler.cpp:399 +#: ../src/ui/dialog/clonetiler.cpp:253 ../src/ui/dialog/clonetiler.cpp:399 msgid "Exponent:" msgstr "Exponent:" -#: ../src/ui/dialog/clonetiler.cpp:258 #: ../src/ui/dialog/clonetiler.cpp:260 msgid "Whether rows are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "" "Či sú odstupy riadkov rovnomerné (1), konvergujú (<1) alebo divergujú (>1)" -#: ../src/ui/dialog/clonetiler.cpp:265 #: ../src/ui/dialog/clonetiler.cpp:267 msgid "Whether columns are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "" "Či sú odstupy stĺpcov rovnomerné (1), konvergujú (<1) alebo divergujú (>1)" #. TRANSLATORS: "Alternate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:273 ../src/ui/dialog/clonetiler.cpp:437 -#: ../src/ui/dialog/clonetiler.cpp:513 ../src/ui/dialog/clonetiler.cpp:586 -#: ../src/ui/dialog/clonetiler.cpp:632 ../src/ui/dialog/clonetiler.cpp:759 -#: ../src/ui/dialog/clonetiler.cpp:275 -#: ../src/ui/dialog/clonetiler.cpp:439 -#: ../src/ui/dialog/clonetiler.cpp:515 -#: ../src/ui/dialog/clonetiler.cpp:588 -#: ../src/ui/dialog/clonetiler.cpp:634 -#: ../src/ui/dialog/clonetiler.cpp:761 +#: ../src/ui/dialog/clonetiler.cpp:275 ../src/ui/dialog/clonetiler.cpp:439 +#: ../src/ui/dialog/clonetiler.cpp:515 ../src/ui/dialog/clonetiler.cpp:588 +#: ../src/ui/dialog/clonetiler.cpp:634 ../src/ui/dialog/clonetiler.cpp:761 msgid "Alternate:" msgstr "Striedať:" -#: ../src/ui/dialog/clonetiler.cpp:279 #: ../src/ui/dialog/clonetiler.cpp:281 msgid "Alternate the sign of shifts for each row" msgstr "Striedať znamienko posunu pre každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:284 #: ../src/ui/dialog/clonetiler.cpp:286 msgid "Alternate the sign of shifts for each column" msgstr "Striedať znamienko posunu pre každý stĺpec" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:291 ../src/ui/dialog/clonetiler.cpp:455 -#: ../src/ui/dialog/clonetiler.cpp:531 -#: ../src/ui/dialog/clonetiler.cpp:293 -#: ../src/ui/dialog/clonetiler.cpp:457 +#: ../src/ui/dialog/clonetiler.cpp:293 ../src/ui/dialog/clonetiler.cpp:457 #: ../src/ui/dialog/clonetiler.cpp:533 msgid "Cumulate:" msgstr "Kumulovať:" -#: ../src/ui/dialog/clonetiler.cpp:297 #: ../src/ui/dialog/clonetiler.cpp:299 msgid "Cumulate the shifts for each row" msgstr "Kumulovať posunutia pre každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:302 #: ../src/ui/dialog/clonetiler.cpp:304 msgid "Cumulate the shifts for each column" msgstr "Kumulovať posunutia pre každý stĺpec" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:309 #: ../src/ui/dialog/clonetiler.cpp:311 msgid "Exclude tile:" msgstr "Vynechať dlaždicu:" -#: ../src/ui/dialog/clonetiler.cpp:315 #: ../src/ui/dialog/clonetiler.cpp:317 msgid "Exclude tile height in shift" msgstr "Vynechať výšku dlaždice pri posunutí" -#: ../src/ui/dialog/clonetiler.cpp:320 #: ../src/ui/dialog/clonetiler.cpp:322 msgid "Exclude tile width in shift" msgstr "Vynechať šírku dlaždice pri posunutí" -#: ../src/ui/dialog/clonetiler.cpp:329 #: ../src/ui/dialog/clonetiler.cpp:331 msgid "Sc_ale" msgstr "Mierk_a" -#: ../src/ui/dialog/clonetiler.cpp:337 #: ../src/ui/dialog/clonetiler.cpp:339 msgid "Scale X:" msgstr "Zmena mierky X:" -#: ../src/ui/dialog/clonetiler.cpp:345 #: ../src/ui/dialog/clonetiler.cpp:347 #, no-c-format msgid "Horizontal scale per row (in % of tile width)" msgstr "Vodorovná hodnota mierky na riadok (v % šírky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:353 #: ../src/ui/dialog/clonetiler.cpp:355 #, no-c-format msgid "Horizontal scale per column (in % of tile width)" msgstr "Vodorovná hodnota mierky na stĺpec (v % šírky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:359 #: ../src/ui/dialog/clonetiler.cpp:361 msgid "Randomize the horizontal scale by this percentage" msgstr "Znáhodniť horizontálnu mierku o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:367 #: ../src/ui/dialog/clonetiler.cpp:369 msgid "Scale Y:" msgstr "Zmena mierky Y:" -#: ../src/ui/dialog/clonetiler.cpp:375 #: ../src/ui/dialog/clonetiler.cpp:377 #, no-c-format msgid "Vertical scale per row (in % of tile height)" msgstr "Zvislá hodnota mierky na riadok (v % výšky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:383 #: ../src/ui/dialog/clonetiler.cpp:385 #, no-c-format msgid "Vertical scale per column (in % of tile height)" msgstr "Zvislá hodnota mierky na stĺpec (v % výšky dlaždice)" -#: ../src/ui/dialog/clonetiler.cpp:389 #: ../src/ui/dialog/clonetiler.cpp:391 msgid "Randomize the vertical scale by this percentage" msgstr "Znáhodniť vertikálnu mierku o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:403 #: ../src/ui/dialog/clonetiler.cpp:405 msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "" "Či je riadky menia mierku rovnomerne (1), konvergujú (<1) alebo divergujú " "(>1)" -#: ../src/ui/dialog/clonetiler.cpp:409 #: ../src/ui/dialog/clonetiler.cpp:411 msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "" "Či je stĺpce menia mierku rovnomerne (1), konvergujú (<1) alebo divergujú " "(>1)" -#: ../src/ui/dialog/clonetiler.cpp:417 #: ../src/ui/dialog/clonetiler.cpp:419 msgid "Base:" msgstr "Základ:" -#: ../src/ui/dialog/clonetiler.cpp:423 ../src/ui/dialog/clonetiler.cpp:429 -#: ../src/ui/dialog/clonetiler.cpp:425 -#: ../src/ui/dialog/clonetiler.cpp:431 +#: ../src/ui/dialog/clonetiler.cpp:425 ../src/ui/dialog/clonetiler.cpp:431 msgid "" "Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" msgstr "" "Základ logaritmickej špirály: nepoužitý (0), konverguje (<1) alebo diverguje " "(>1)" -#: ../src/ui/dialog/clonetiler.cpp:443 #: ../src/ui/dialog/clonetiler.cpp:445 msgid "Alternate the sign of scales for each row" msgstr "Striedať znamienko mierky pre každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:448 #: ../src/ui/dialog/clonetiler.cpp:450 msgid "Alternate the sign of scales for each column" msgstr "Striedať znamienko mierky pre každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:461 #: ../src/ui/dialog/clonetiler.cpp:463 msgid "Cumulate the scales for each row" msgstr "Kumulovanie mierky pre každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:466 #: ../src/ui/dialog/clonetiler.cpp:468 msgid "Cumulate the scales for each column" msgstr "Kumulovanie mierky pre každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:475 #: ../src/ui/dialog/clonetiler.cpp:477 msgid "_Rotation" msgstr "_Rotácia" -#: ../src/ui/dialog/clonetiler.cpp:483 #: ../src/ui/dialog/clonetiler.cpp:485 msgid "Angle:" msgstr "Uhol:" -#: ../src/ui/dialog/clonetiler.cpp:491 #: ../src/ui/dialog/clonetiler.cpp:493 #, no-c-format msgid "Rotate tiles by this angle for each row" msgstr "Otáčať dlaždice o tento uhol každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:499 #: ../src/ui/dialog/clonetiler.cpp:501 #, no-c-format msgid "Rotate tiles by this angle for each column" msgstr "Otáčať dlaždice o tento uhol každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:505 #: ../src/ui/dialog/clonetiler.cpp:507 msgid "Randomize the rotation angle by this percentage" msgstr "Znáhodniť uhol otáčania o túto hodnotu v percentách" -#: ../src/ui/dialog/clonetiler.cpp:519 #: ../src/ui/dialog/clonetiler.cpp:521 msgid "Alternate the rotation direction for each row" msgstr "Striedať smer otáčania každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:524 #: ../src/ui/dialog/clonetiler.cpp:526 msgid "Alternate the rotation direction for each column" msgstr "Striedať smer otáčania každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:537 #: ../src/ui/dialog/clonetiler.cpp:539 msgid "Cumulate the rotation for each row" msgstr "Kumulovanie otáčania každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:542 #: ../src/ui/dialog/clonetiler.cpp:544 msgid "Cumulate the rotation for each column" msgstr "Kumulovanie otáčania každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:551 #: ../src/ui/dialog/clonetiler.cpp:553 msgid "_Blur & opacity" msgstr "_Rozostrenie a krytie" -#: ../src/ui/dialog/clonetiler.cpp:560 #: ../src/ui/dialog/clonetiler.cpp:562 msgid "Blur:" msgstr "Rozostrenie:" -#: ../src/ui/dialog/clonetiler.cpp:566 #: ../src/ui/dialog/clonetiler.cpp:568 msgid "Blur tiles by this percentage for each row" msgstr "Rozostriť dlaždice o túto hodnotu v percentách pre každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:572 #: ../src/ui/dialog/clonetiler.cpp:574 msgid "Blur tiles by this percentage for each column" msgstr "Rozostriť dlaždice o túto hodnotu v percentách pre každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:578 #: ../src/ui/dialog/clonetiler.cpp:580 msgid "Randomize the tile blur by this percentage" msgstr "Znáhodniť rozostrenie dlaždice o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:592 #: ../src/ui/dialog/clonetiler.cpp:594 msgid "Alternate the sign of blur change for each row" msgstr "Striedať znamienka zmeny rozostrenia pre každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:597 #: ../src/ui/dialog/clonetiler.cpp:599 msgid "Alternate the sign of blur change for each column" msgstr "Striedať znamienka zmeny rozostrenia pre každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:606 #: ../src/ui/dialog/clonetiler.cpp:608 msgid "Opacity:" msgstr "Krytie:" -#: ../src/ui/dialog/clonetiler.cpp:612 #: ../src/ui/dialog/clonetiler.cpp:614 msgid "Decrease tile opacity by this percentage for each row" msgstr "Znížiť krytie dlaždíc o túto percentuálnu hodnotu každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:618 #: ../src/ui/dialog/clonetiler.cpp:620 msgid "Decrease tile opacity by this percentage for each column" msgstr "Znížiť krytie dlaždíc o túto percentuálnu hodnotu každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:624 #: ../src/ui/dialog/clonetiler.cpp:626 msgid "Randomize the tile opacity by this percentage" msgstr "Znáhodniť krytie dlaždíc o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:638 #: ../src/ui/dialog/clonetiler.cpp:640 msgid "Alternate the sign of opacity change for each row" msgstr "Striedať znamienko zmeny krytia každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:643 #: ../src/ui/dialog/clonetiler.cpp:645 msgid "Alternate the sign of opacity change for each column" msgstr "Striedať znamienko zmeny krytia každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:651 #: ../src/ui/dialog/clonetiler.cpp:653 msgid "Co_lor" msgstr "_Farba" -#: ../src/ui/dialog/clonetiler.cpp:661 #: ../src/ui/dialog/clonetiler.cpp:663 msgid "Initial color: " msgstr "Počiatočná farba:" -#: ../src/ui/dialog/clonetiler.cpp:665 #: ../src/ui/dialog/clonetiler.cpp:667 msgid "Initial color of tiled clones" msgstr "Počiatočná farba dlaždicových klonov" -#: ../src/ui/dialog/clonetiler.cpp:665 #: ../src/ui/dialog/clonetiler.cpp:667 msgid "" "Initial color for clones (works only if the original has unset fill or " @@ -14946,87 +12838,70 @@ msgid "" msgstr "" "Počiatočná farba klonov (funguje iba ak originál nemá nastavenú výplň a ťah)" -#: ../src/ui/dialog/clonetiler.cpp:680 #: ../src/ui/dialog/clonetiler.cpp:682 msgid "H:" msgstr "H:" -#: ../src/ui/dialog/clonetiler.cpp:686 #: ../src/ui/dialog/clonetiler.cpp:688 msgid "Change the tile hue by this percentage for each row" msgstr "Zmeniť odtieň dlaždice o túto percentuálnu hodnotu každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:692 #: ../src/ui/dialog/clonetiler.cpp:694 msgid "Change the tile hue by this percentage for each column" msgstr "Zmeniť odtieň dlaždice o túto percentuálnu hodnotu každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:698 #: ../src/ui/dialog/clonetiler.cpp:700 msgid "Randomize the tile hue by this percentage" msgstr "Znáhodniť odtieň dlaždice o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:707 #: ../src/ui/dialog/clonetiler.cpp:709 msgid "S:" msgstr "S:" -#: ../src/ui/dialog/clonetiler.cpp:713 #: ../src/ui/dialog/clonetiler.cpp:715 msgid "Change the color saturation by this percentage for each row" msgstr "Zmeniť sýtosť farby o túto percentuálnu hodnotu každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:719 #: ../src/ui/dialog/clonetiler.cpp:721 msgid "Change the color saturation by this percentage for each column" msgstr "Zmeniť sýtosť farby o túto percentuálnu hodnotu každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:725 #: ../src/ui/dialog/clonetiler.cpp:727 msgid "Randomize the color saturation by this percentage" msgstr "Znáhodniť sýtosť farby o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:733 #: ../src/ui/dialog/clonetiler.cpp:735 msgid "L:" msgstr "L:" -#: ../src/ui/dialog/clonetiler.cpp:739 #: ../src/ui/dialog/clonetiler.cpp:741 msgid "Change the color lightness by this percentage for each row" msgstr "Zmeniť svetlosť farby o túto percentuálnu hodnotu každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:745 #: ../src/ui/dialog/clonetiler.cpp:747 msgid "Change the color lightness by this percentage for each column" msgstr "Zmeniť svetlosť farby o túto percentuálnu hodnotu každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:751 #: ../src/ui/dialog/clonetiler.cpp:753 msgid "Randomize the color lightness by this percentage" msgstr "Znáhodniť svetlosť farby o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:765 #: ../src/ui/dialog/clonetiler.cpp:767 msgid "Alternate the sign of color changes for each row" msgstr "Striedať znamienko zmeny farby každý riadok" -#: ../src/ui/dialog/clonetiler.cpp:770 #: ../src/ui/dialog/clonetiler.cpp:772 msgid "Alternate the sign of color changes for each column" msgstr "Striedať znamienko zmeny farby každý stĺpec" -#: ../src/ui/dialog/clonetiler.cpp:778 #: ../src/ui/dialog/clonetiler.cpp:780 msgid "_Trace" msgstr "_Vektorizácia" -#: ../src/ui/dialog/clonetiler.cpp:790 #: ../src/ui/dialog/clonetiler.cpp:792 msgid "Trace the drawing under the tiles" msgstr "Vektorizovať kresbu pod dlaždicami" -#: ../src/ui/dialog/clonetiler.cpp:794 #: ../src/ui/dialog/clonetiler.cpp:796 msgid "" "For each clone, pick a value from the drawing in that clone's location and " @@ -15035,131 +12910,106 @@ msgstr "" "Pre každý klon vyberte hodnotu z kresby v mieste tohto klonu a použite ju na " "klon" -#: ../src/ui/dialog/clonetiler.cpp:813 #: ../src/ui/dialog/clonetiler.cpp:815 msgid "1. Pick from the drawing:" msgstr "1. Zvoľte z kresby:" -#: ../src/ui/dialog/clonetiler.cpp:831 #: ../src/ui/dialog/clonetiler.cpp:833 msgid "Pick the visible color and opacity" msgstr "Vybrať viditeľnú farbu a krytie" -#: ../src/ui/dialog/clonetiler.cpp:839 #: ../src/ui/dialog/clonetiler.cpp:841 msgid "Pick the total accumulated opacity" msgstr "Zvoľte celkové akumulované krytie" -#: ../src/ui/dialog/clonetiler.cpp:846 #: ../src/ui/dialog/clonetiler.cpp:848 msgid "R" msgstr "R" -#: ../src/ui/dialog/clonetiler.cpp:847 #: ../src/ui/dialog/clonetiler.cpp:849 msgid "Pick the Red component of the color" msgstr "Zvoľte Červenú farebnú zložku" -#: ../src/ui/dialog/clonetiler.cpp:854 #: ../src/ui/dialog/clonetiler.cpp:856 msgid "G" msgstr "G" -#: ../src/ui/dialog/clonetiler.cpp:855 #: ../src/ui/dialog/clonetiler.cpp:857 msgid "Pick the Green component of the color" msgstr "Zvoľte Zelenú farebnú zložku" -#: ../src/ui/dialog/clonetiler.cpp:862 #: ../src/ui/dialog/clonetiler.cpp:864 msgid "B" msgstr "B" -#: ../src/ui/dialog/clonetiler.cpp:863 #: ../src/ui/dialog/clonetiler.cpp:865 msgid "Pick the Blue component of the color" msgstr "Zvoľte Modrú farebnú zložku" -#: ../src/ui/dialog/clonetiler.cpp:870 #: ../src/ui/dialog/clonetiler.cpp:872 msgctxt "Clonetiler color hue" msgid "H" msgstr "H" -#: ../src/ui/dialog/clonetiler.cpp:871 #: ../src/ui/dialog/clonetiler.cpp:873 msgid "Pick the hue of the color" msgstr "Vybrať odtieň farby" -#: ../src/ui/dialog/clonetiler.cpp:878 #: ../src/ui/dialog/clonetiler.cpp:880 msgctxt "Clonetiler color saturation" msgid "S" msgstr "S" -#: ../src/ui/dialog/clonetiler.cpp:879 #: ../src/ui/dialog/clonetiler.cpp:881 msgid "Pick the saturation of the color" msgstr "Zvoľte sýtosť farby" -#: ../src/ui/dialog/clonetiler.cpp:886 #: ../src/ui/dialog/clonetiler.cpp:888 msgctxt "Clonetiler color lightness" msgid "L" msgstr "L" -#: ../src/ui/dialog/clonetiler.cpp:887 #: ../src/ui/dialog/clonetiler.cpp:889 msgid "Pick the lightness of the color" msgstr "Zvoľte svetlosť farby" -#: ../src/ui/dialog/clonetiler.cpp:897 #: ../src/ui/dialog/clonetiler.cpp:899 msgid "2. Tweak the picked value:" msgstr "2. Dolaďte zvolenú hodnotu:" -#: ../src/ui/dialog/clonetiler.cpp:914 #: ../src/ui/dialog/clonetiler.cpp:916 msgid "Gamma-correct:" msgstr "Korekcia gama:" -#: ../src/ui/dialog/clonetiler.cpp:918 #: ../src/ui/dialog/clonetiler.cpp:920 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "" "Posunutie stredného rozsahu zvolených hodnôt nahor (>0) alebo nadol (<0)" -#: ../src/ui/dialog/clonetiler.cpp:925 #: ../src/ui/dialog/clonetiler.cpp:927 msgid "Randomize:" msgstr "Náhodnosť:" -#: ../src/ui/dialog/clonetiler.cpp:929 #: ../src/ui/dialog/clonetiler.cpp:931 msgid "Randomize the picked value by this percentage" msgstr "Znáhodniť zvolenú hodnotu o túto percentuálnu hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:936 #: ../src/ui/dialog/clonetiler.cpp:938 msgid "Invert:" msgstr "Invertovať:" -#: ../src/ui/dialog/clonetiler.cpp:940 #: ../src/ui/dialog/clonetiler.cpp:942 msgid "Invert the picked value" msgstr "Invertovať zvolenú hodnotu" -#: ../src/ui/dialog/clonetiler.cpp:946 #: ../src/ui/dialog/clonetiler.cpp:948 msgid "3. Apply the value to the clones':" msgstr "3. Použiť hodnotu na klony:" -#: ../src/ui/dialog/clonetiler.cpp:961 #: ../src/ui/dialog/clonetiler.cpp:963 msgid "Presence" msgstr "Prítomnosť" -#: ../src/ui/dialog/clonetiler.cpp:964 #: ../src/ui/dialog/clonetiler.cpp:966 msgid "" "Each clone is created with the probability determined by the picked value in " @@ -15168,19 +13018,16 @@ msgstr "" "Každý klon je vytvorený s pravdepodobnosťou danou zvolenou hodnotou v danom " "bode" -#: ../src/ui/dialog/clonetiler.cpp:971 #: ../src/ui/dialog/clonetiler.cpp:973 msgid "Size" msgstr "Veľkosť" -#: ../src/ui/dialog/clonetiler.cpp:974 #: ../src/ui/dialog/clonetiler.cpp:976 msgid "Each clone's size is determined by the picked value in that point" msgstr "" "Veľkosť každého klonu určená pravdepodobnosťou danou zvolenou hodnotou v " "danom bode" -#: ../src/ui/dialog/clonetiler.cpp:984 #: ../src/ui/dialog/clonetiler.cpp:986 msgid "" "Each clone is painted by the picked color (the original must have unset fill " @@ -15188,59 +13035,48 @@ msgid "" msgstr "" "Každý klon je natretý zvolenou farbou (originál musel byť bez výplne a ťahu)" -#: ../src/ui/dialog/clonetiler.cpp:994 #: ../src/ui/dialog/clonetiler.cpp:996 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "" "Krytie každého klonu určená pravdepodobnosťou danou zvolenou hodnotou v " "danom bode" -#: ../src/ui/dialog/clonetiler.cpp:1042 #: ../src/ui/dialog/clonetiler.cpp:1044 msgid "How many rows in the tiling" msgstr "Koľko riadkov dlaždíc" -#: ../src/ui/dialog/clonetiler.cpp:1072 #: ../src/ui/dialog/clonetiler.cpp:1074 msgid "How many columns in the tiling" msgstr "Koľko stĺpcov dlaždíc" -#: ../src/ui/dialog/clonetiler.cpp:1117 #: ../src/ui/dialog/clonetiler.cpp:1119 msgid "Width of the rectangle to be filled" msgstr "Šírka obdĺžnika, ktorý sa má vyplniť" -#: ../src/ui/dialog/clonetiler.cpp:1150 #: ../src/ui/dialog/clonetiler.cpp:1152 msgid "Height of the rectangle to be filled" msgstr "Výška obdĺžnika, ktorý sa má vyplniť" -#: ../src/ui/dialog/clonetiler.cpp:1167 #: ../src/ui/dialog/clonetiler.cpp:1169 msgid "Rows, columns: " msgstr "Riadkov, stĺpcov: " -#: ../src/ui/dialog/clonetiler.cpp:1168 #: ../src/ui/dialog/clonetiler.cpp:1170 msgid "Create the specified number of rows and columns" msgstr "Vytvoriť určený počet riadkov a stĺpcov" -#: ../src/ui/dialog/clonetiler.cpp:1177 #: ../src/ui/dialog/clonetiler.cpp:1179 msgid "Width, height: " msgstr "Šírka, výška: " -#: ../src/ui/dialog/clonetiler.cpp:1178 #: ../src/ui/dialog/clonetiler.cpp:1180 msgid "Fill the specified width and height with the tiling" msgstr "Vyplniť určenú šírku a výšku dlaždicami" -#: ../src/ui/dialog/clonetiler.cpp:1199 #: ../src/ui/dialog/clonetiler.cpp:1201 msgid "Use saved size and position of the tile" msgstr "Použiť uloženú veľkosť a pozíciu dlaždice" -#: ../src/ui/dialog/clonetiler.cpp:1202 #: ../src/ui/dialog/clonetiler.cpp:1204 msgid "" "Pretend that the size and position of the tile are the same as the last time " @@ -15249,12 +13085,10 @@ msgstr "" "Predstierať, že veľkosť a poloha oblasti dlaždíc sú rovnaké ako pri " "poslednom dláždení (ak bolo) namiesto použitia súčasných hodnôt" -#: ../src/ui/dialog/clonetiler.cpp:1236 #: ../src/ui/dialog/clonetiler.cpp:1238 msgid " _Create " msgstr " _Vytvoriť " -#: ../src/ui/dialog/clonetiler.cpp:1238 #: ../src/ui/dialog/clonetiler.cpp:1240 msgid "Create and tile the clones of the selection" msgstr "Vytvoriť a vydláždiť klony výberu" @@ -15264,85 +13098,70 @@ msgstr "Vytvoriť a vydláždiť klony výberu" #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1258 #: ../src/ui/dialog/clonetiler.cpp:1260 msgid " _Unclump " msgstr " _Rozptýliť " -#: ../src/ui/dialog/clonetiler.cpp:1259 #: ../src/ui/dialog/clonetiler.cpp:1261 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" "Rozptýliť klony, aby sa zabránilo ich zomknutiu; je možné použiť opakovanie" -#: ../src/ui/dialog/clonetiler.cpp:1265 #: ../src/ui/dialog/clonetiler.cpp:1267 msgid " Re_move " msgstr " O_dstrániť " -#: ../src/ui/dialog/clonetiler.cpp:1266 #: ../src/ui/dialog/clonetiler.cpp:1268 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" "Odstrániť existujúce dlaždicové klony vybraného objektu (iba súrodencov)" -#: ../src/ui/dialog/clonetiler.cpp:1283 #: ../src/ui/dialog/clonetiler.cpp:1284 msgid " R_eset " msgstr " O_bnoviť " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1285 #: ../src/ui/dialog/clonetiler.cpp:1286 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" msgstr "Znulovať zmeny posunutia, mierky, otočenia a farby v dialógu" -#: ../src/ui/dialog/clonetiler.cpp:1358 #: ../src/ui/dialog/clonetiler.cpp:1359 msgid "Nothing selected." msgstr "Nič nebolo vybrané." -#: ../src/ui/dialog/clonetiler.cpp:1364 #: ../src/ui/dialog/clonetiler.cpp:1365 msgid "More than one object selected." msgstr "Vybraný viac ako jeden objekt." -#: ../src/ui/dialog/clonetiler.cpp:1371 #: ../src/ui/dialog/clonetiler.cpp:1372 #, c-format msgid "Object has %d tiled clones." msgstr "Objekt má %d dlaždicových klonov." -#: ../src/ui/dialog/clonetiler.cpp:1376 #: ../src/ui/dialog/clonetiler.cpp:1377 msgid "Object has no tiled clones." msgstr "Objekt nemá dlaždicové klony." -#: ../src/ui/dialog/clonetiler.cpp:2100 #: ../src/ui/dialog/clonetiler.cpp:2097 msgid "Select one object whose tiled clones to unclump." msgstr "" "Vyberte jeden objekt, ktorého dlaždicové klony sa majú rozptýliť." -#: ../src/ui/dialog/clonetiler.cpp:2122 #: ../src/ui/dialog/clonetiler.cpp:2119 msgid "Unclump tiled clones" msgstr "Rozptýliť dlaždicové klony" -#: ../src/ui/dialog/clonetiler.cpp:2151 #: ../src/ui/dialog/clonetiler.cpp:2148 msgid "Select one object whose tiled clones to remove." msgstr "" "Vyberte jeden objekt, ktorého dlaždicové klony sa majú odstrániť." -#: ../src/ui/dialog/clonetiler.cpp:2176 #: ../src/ui/dialog/clonetiler.cpp:2171 msgid "Delete tiled clones" msgstr "Zmazať dlaždicové klony" -#: ../src/ui/dialog/clonetiler.cpp:2229 #: ../src/ui/dialog/clonetiler.cpp:2224 msgid "" "If you want to clone several objects, group them and clone the " @@ -15351,28 +13170,23 @@ msgstr "" "Ak chcete klonovať niekoľko objektov, zoskupte ich a vyklonujte " "skupinu." -#: ../src/ui/dialog/clonetiler.cpp:2238 #: ../src/ui/dialog/clonetiler.cpp:2233 msgid "Creating tiled clones..." msgstr "Vytvárajú sa dlaždicové klony..." -#: ../src/ui/dialog/clonetiler.cpp:2651 -#: ../src/ui/dialog/clonetiler.cpp:2645 +#: ../src/ui/dialog/clonetiler.cpp:2640 msgid "Create tiled clones" msgstr "Vytvoriť dlaždicové klony" -#: ../src/ui/dialog/clonetiler.cpp:2884 -#: ../src/ui/dialog/clonetiler.cpp:2878 +#: ../src/ui/dialog/clonetiler.cpp:2873 msgid "Per row:" msgstr "Na riadok:" -#: ../src/ui/dialog/clonetiler.cpp:2902 -#: ../src/ui/dialog/clonetiler.cpp:2896 +#: ../src/ui/dialog/clonetiler.cpp:2891 msgid "Per column:" msgstr "Na stĺpec:" -#: ../src/ui/dialog/clonetiler.cpp:2910 -#: ../src/ui/dialog/clonetiler.cpp:2904 +#: ../src/ui/dialog/clonetiler.cpp:2899 msgid "Randomize:" msgstr "Znáhodniť:" @@ -15404,12 +13218,10 @@ msgstr "Nastaviť farbu ťahu na žiadnu" msgid "Set fill color to none" msgstr "Nastaviť farbu výplne na žiadnu" -#: ../src/ui/dialog/color-item.cpp:702 #: ../src/ui/dialog/color-item.cpp:700 msgid "Set stroke color from swatch" msgstr "Nastaviť farbu ťahu zo vzorkovníka" -#: ../src/ui/dialog/color-item.cpp:702 #: ../src/ui/dialog/color-item.cpp:700 msgid "Set fill color from swatch" msgstr "Nastaviť farbu výplne zo vzorkovníka" @@ -15510,8 +13322,8 @@ msgid "Color of the page border" msgstr "Farba okraja stránky" #: ../src/ui/dialog/document-properties.cpp:117 -msgid "Display _units:" -msgstr "" +msgid "Default _units:" +msgstr "Štandardné _jednotky:" #. --------------------------------------------------------------- #. General snap options @@ -15690,13 +13502,11 @@ msgid "Remove selected grid." msgstr "Odstrániť vybranú mriežku." #: ../src/ui/dialog/document-properties.cpp:154 -#: ../src/widgets/toolbox.cpp:1834 #: ../src/widgets/toolbox.cpp:1835 msgid "Guides" msgstr "Vodidlá" -#: ../src/ui/dialog/document-properties.cpp:156 ../src/verbs.cpp:2827 -#: ../src/verbs.cpp:2744 +#: ../src/ui/dialog/document-properties.cpp:156 ../src/verbs.cpp:2744 msgid "Snap" msgstr "Prichytávanie" @@ -15741,8 +13551,7 @@ msgstr "Rôzne" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:3008 -#: ../src/verbs.cpp:2921 +#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:2921 msgid "Link Color Profile" msgstr "Pripojiť farebný profil" @@ -15791,8 +13600,7 @@ msgstr "" #: ../src/ui/dialog/document-properties.cpp:763 #: ../src/ui/dialog/document-properties.cpp:852 -#: ../src/ui/widget/selected-style.cpp:356 -#: ../src/ui/widget/selected-style.cpp:343 +#: ../src/ui/widget/selected-style.cpp:339 msgid "Remove" msgstr "Odstrániť" @@ -15872,66 +13680,53 @@ msgstr "Odstrániť skript" msgid "Edit embedded script" msgstr "Odstrániť skript" -#: ../src/ui/dialog/document-properties.cpp:1434 #: ../src/ui/dialog/document-properties.cpp:1429 msgid "Creation" msgstr "Vytvorenie" -#: ../src/ui/dialog/document-properties.cpp:1435 #: ../src/ui/dialog/document-properties.cpp:1430 msgid "Defined grids" msgstr "Definované mriežky" -#: ../src/ui/dialog/document-properties.cpp:1682 #: ../src/ui/dialog/document-properties.cpp:1677 msgid "Remove grid" msgstr "Odstrániť mriežku" -#: ../src/ui/dialog/document-properties.cpp:1770 -msgid "Changed default display unit" -msgstr "" +#: ../src/ui/dialog/document-properties.cpp:1756 +#, fuzzy +msgid "Changed document unit" +msgstr "Dokument bez názvu %d" -#: ../src/ui/dialog/export.cpp:151 ../src/verbs.cpp:2879 -#: ../src/ui/dialog/export.cpp:152 -#: ../src/verbs.cpp:2796 +#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2796 msgid "_Page" msgstr "_Stránka" -#: ../src/ui/dialog/export.cpp:151 ../src/verbs.cpp:2883 -#: ../src/ui/dialog/export.cpp:152 -#: ../src/verbs.cpp:2800 +#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2800 msgid "_Drawing" msgstr "_Kresba" -#: ../src/ui/dialog/export.cpp:151 ../src/verbs.cpp:2885 -#: ../src/ui/dialog/export.cpp:152 -#: ../src/verbs.cpp:2802 +#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2802 msgid "_Selection" msgstr "_Výber" -#: ../src/ui/dialog/export.cpp:151 #: ../src/ui/dialog/export.cpp:152 msgid "_Custom" msgstr "_Vlastné" -#: ../src/ui/dialog/export.cpp:169 ../src/widgets/measure-toolbar.cpp:99 +#: ../src/ui/dialog/export.cpp:170 ../src/widgets/measure-toolbar.cpp:99 #: ../src/widgets/measure-toolbar.cpp:107 #: ../share/extensions/render_gears.inx.h:6 -#: ../src/ui/dialog/export.cpp:170 msgid "Units:" msgstr "Jednotky:" -#: ../src/ui/dialog/export.cpp:171 #: ../src/ui/dialog/export.cpp:172 msgid "_Export As..." msgstr "_Exportovať ako..." -#: ../src/ui/dialog/export.cpp:174 #: ../src/ui/dialog/export.cpp:175 msgid "B_atch export all selected objects" msgstr "Dávkový export všetkých vybr_aných objektov" -#: ../src/ui/dialog/export.cpp:174 #: ../src/ui/dialog/export.cpp:175 msgid "" "Export each selected object into its own PNG file, using export hints if any " @@ -15940,112 +13735,87 @@ msgstr "" "Exportovať každý vybraný objekt do samostatného PNG súboru, s použitím " "pokynov k exportu, ak existujú (pozor, prepisuje bez pýtania!)" -#: ../src/ui/dialog/export.cpp:176 #: ../src/ui/dialog/export.cpp:177 msgid "Hide a_ll except selected" msgstr "Skryť _všetky okrem vybraných" -#: ../src/ui/dialog/export.cpp:176 #: ../src/ui/dialog/export.cpp:177 msgid "In the exported image, hide all objects except those that are selected" msgstr "" "V exportovanom obrázku skryť všetky objekty okrem tých, ktoré sú vybrané" -#: ../src/ui/dialog/export.cpp:177 #: ../src/ui/dialog/export.cpp:178 msgid "Close when complete" msgstr "Po dokončení zatvoriť" -#: ../src/ui/dialog/export.cpp:177 #: ../src/ui/dialog/export.cpp:178 msgid "Once the export completes, close this dialog" msgstr "Keď sa export dokončí, toto dialógové okno sa zatvorí" -#: ../src/ui/dialog/export.cpp:179 #: ../src/ui/dialog/export.cpp:180 msgid "_Export" msgstr "_Exportovať" -#: ../src/ui/dialog/export.cpp:197 #: ../src/ui/dialog/export.cpp:198 msgid "Export area" msgstr "Oblasť exportu" -#: ../src/ui/dialog/export.cpp:236 #: ../src/ui/dialog/export.cpp:237 msgid "_x0:" msgstr "_x0:" -#: ../src/ui/dialog/export.cpp:240 #: ../src/ui/dialog/export.cpp:241 msgid "x_1:" msgstr "x_1:" -#: ../src/ui/dialog/export.cpp:244 #: ../src/ui/dialog/export.cpp:245 msgid "Wid_th:" msgstr "Ší_rka:" -#: ../src/ui/dialog/export.cpp:248 #: ../src/ui/dialog/export.cpp:249 msgid "_y0:" msgstr "_y0:" -#: ../src/ui/dialog/export.cpp:252 #: ../src/ui/dialog/export.cpp:253 msgid "y_1:" msgstr "y_1:" -#: ../src/ui/dialog/export.cpp:256 #: ../src/ui/dialog/export.cpp:257 msgid "Hei_ght:" msgstr "_Výška:" -#: ../src/ui/dialog/export.cpp:271 #: ../src/ui/dialog/export.cpp:272 msgid "Image size" msgstr "Veľkosť obrázka" -#: ../src/ui/dialog/export.cpp:289 ../src/ui/dialog/export.cpp:300 -#: ../src/ui/dialog/export.cpp:290 -#: ../src/ui/dialog/export.cpp:301 +#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/export.cpp:301 msgid "pixels at" msgstr "bodov na" -#: ../src/ui/dialog/export.cpp:295 #: ../src/ui/dialog/export.cpp:296 msgid "dp_i" msgstr "dp_i" -#: ../src/ui/dialog/export.cpp:300 ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/dialog/export.cpp:301 ../src/ui/dialog/transformation.cpp:82 #: ../src/ui/widget/page-sizer.cpp:237 -#: ../src/ui/dialog/export.cpp:301 -#: ../src/ui/dialog/transformation.cpp:82 msgid "_Height:" msgstr "_Výška:" -#: ../src/ui/dialog/export.cpp:308 -#: ../src/ui/dialog/inkscape-preferences.cpp:1443 -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 -#: ../src/ui/dialog/inkscape-preferences.cpp:1471 #: ../src/ui/dialog/export.cpp:309 -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 -#: ../src/ui/dialog/inkscape-preferences.cpp:1459 +#: ../src/ui/dialog/inkscape-preferences.cpp:1434 +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 +#: ../src/ui/dialog/inkscape-preferences.cpp:1462 msgid "dpi" msgstr "dpi" -#: ../src/ui/dialog/export.cpp:316 #: ../src/ui/dialog/export.cpp:317 msgid "_Filename" msgstr "_Názov súboru" -#: ../src/ui/dialog/export.cpp:358 #: ../src/ui/dialog/export.cpp:359 msgid "Export the bitmap file with these settings" msgstr "Exportovať súbor bitmapy s týmito nastaveniami" -#: ../src/ui/dialog/export.cpp:611 #: ../src/ui/dialog/export.cpp:612 #, c-format msgid "B_atch export %d selected object" @@ -16054,104 +13824,76 @@ msgstr[0] "Dávkový export %d vybr_aného objektu" msgstr[1] "Dávkový export %d vybr_aných objektov" msgstr[2] "Dávkový export %d vybr_aných objektov" -#: ../src/ui/dialog/export.cpp:927 #: ../src/ui/dialog/export.cpp:928 msgid "Export in progress" msgstr "Prebieha export" -#: ../src/ui/dialog/export.cpp:1017 #: ../src/ui/dialog/export.cpp:1018 msgid "No items selected." msgstr "Neboli vybrané žiadne položky." -#: ../src/ui/dialog/export.cpp:1021 ../src/ui/dialog/export.cpp:1023 -#: ../src/ui/dialog/export.cpp:1022 -#: ../src/ui/dialog/export.cpp:1024 +#: ../src/ui/dialog/export.cpp:1022 ../src/ui/dialog/export.cpp:1024 msgid "Exporting %1 files" msgstr "Exportuje sa %1 súborov" -#: ../src/ui/dialog/export.cpp:1063 ../src/ui/dialog/export.cpp:1065 -#: ../src/ui/dialog/export.cpp:1064 -#: ../src/ui/dialog/export.cpp:1066 +#: ../src/ui/dialog/export.cpp:1064 ../src/ui/dialog/export.cpp:1066 #, c-format msgid "Exporting file %s..." msgstr "Exportuje sa súbor %s..." -#: ../src/ui/dialog/export.cpp:1074 ../src/ui/dialog/export.cpp:1165 -#: ../src/ui/dialog/export.cpp:1075 -#: ../src/ui/dialog/export.cpp:1166 +#: ../src/ui/dialog/export.cpp:1075 ../src/ui/dialog/export.cpp:1166 #, c-format msgid "Could not export to filename %s.\n" msgstr "Nebolo možné exportovať do súboru s názvom %s.\n" -#: ../src/ui/dialog/export.cpp:1077 #: ../src/ui/dialog/export.cpp:1078 #, c-format msgid "Could not export to filename %s." msgstr "Nebolo možné exportovať do súboru s názvom %s." -#: ../src/ui/dialog/export.cpp:1092 #: ../src/ui/dialog/export.cpp:1093 #, c-format msgid "Successfully exported %d files from %d selected items." -msgstr "Úspešne exportovaných %d súborov z %d vybraných položiek." +msgstr "" +"Úspešne exportovaných %d súborov z %d vybraných položiek." -#: ../src/ui/dialog/export.cpp:1103 #: ../src/ui/dialog/export.cpp:1104 msgid "You have to enter a filename." msgstr "Musíte zadať názov súboru." -#: ../src/ui/dialog/export.cpp:1104 #: ../src/ui/dialog/export.cpp:1105 msgid "You have to enter a filename" msgstr "Musíte zadať názov súboru" -#: ../src/ui/dialog/export.cpp:1118 #: ../src/ui/dialog/export.cpp:1119 msgid "The chosen area to be exported is invalid." msgstr "Oblasť zvolená na export nie je platná." -#: ../src/ui/dialog/export.cpp:1119 #: ../src/ui/dialog/export.cpp:1120 msgid "The chosen area to be exported is invalid" msgstr "Zvolená oblasť pre export nie je platná" -#: ../src/ui/dialog/export.cpp:1134 #: ../src/ui/dialog/export.cpp:1135 #, c-format msgid "Directory %s does not exist or is not a directory.\n" msgstr "Adresár %s neexistuje alebo to nie je adresár.\n" #. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image -#: ../src/ui/dialog/export.cpp:1148 ../src/ui/dialog/export.cpp:1150 -#: ../src/ui/dialog/export.cpp:1149 -#: ../src/ui/dialog/export.cpp:1151 +#: ../src/ui/dialog/export.cpp:1149 ../src/ui/dialog/export.cpp:1151 msgid "Exporting %1 (%2 x %3)" msgstr "Exportuje sa %1 (%2 x %3)" -#: ../src/ui/dialog/export.cpp:1176 #: ../src/ui/dialog/export.cpp:1177 #, c-format msgid "Drawing exported to %s." msgstr "Kresba exportovaná do %s." -#: ../src/ui/dialog/export.cpp:1180 #: ../src/ui/dialog/export.cpp:1181 msgid "Export aborted." msgstr "Export zrušený." -#: ../src/ui/dialog/export.cpp:1301 ../src/ui/interface.cpp:1392 -#: ../src/widgets/desktop-widget.cpp:1122 -#: ../src/widgets/desktop-widget.cpp:1184 -#: ../src/interface.cpp:1392 -#: ../src/ui/dialog/export.cpp:1302 -msgid "_Cancel" -msgstr "_Zrušiť" - -#: ../src/ui/dialog/export.cpp:1302 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2437 ../src/widgets/desktop-widget.cpp:1123 -#: ../src/ui/dialog/export.cpp:1303 -#: ../src/verbs.cpp:2358 +#: ../src/ui/dialog/export.cpp:1303 ../src/ui/dialog/input.cpp:1082 +#: ../src/verbs.cpp:2358 ../src/widgets/desktop-widget.cpp:1123 msgid "_Save" msgstr "_Uložiť" @@ -16159,8 +13901,8 @@ msgstr "_Uložiť" msgid "Information" msgstr "Informácie" -#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:310 -#: ../src/verbs.cpp:329 ../share/extensions/color_HSL_adjust.inx.h:11 +#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:290 +#: ../src/verbs.cpp:309 ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_custom.inx.h:7 #: ../share/extensions/color_randomize.inx.h:6 #: ../share/extensions/dots.inx.h:7 @@ -16205,8 +13947,6 @@ msgstr "Informácie" #: ../share/extensions/web-transmit-att.inx.h:23 #: ../share/extensions/webslicer_create_group.inx.h:11 #: ../share/extensions/webslicer_export.inx.h:6 -#: ../src/verbs.cpp:290 -#: ../src/verbs.cpp:309 msgid "Help" msgstr "Pomocník" @@ -16215,30 +13955,18 @@ msgid "Parameters" msgstr "Parametre" #. Fill in the template -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:415 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:376 msgid "No preview" msgstr "Bez náhľadu" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:519 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:480 msgid "too large for preview" msgstr "príliš veľké pre náhľad" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:605 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:565 msgid "Enable preview" msgstr "Zapnúť náhľad" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:755 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:768 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:772 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:775 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:783 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:799 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:814 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:282 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:413 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:715 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:728 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:732 @@ -16246,106 +13974,83 @@ msgstr "Zapnúť náhľad" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:743 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:759 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:774 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:282 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:413 msgid "All Files" msgstr "Všetky súbory" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:796 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:811 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:283 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:740 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:756 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:771 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:283 msgid "All Inkscape Files" msgstr "Všetky súbory Inkscape" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:787 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:803 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:817 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:284 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:747 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:763 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:777 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:284 msgid "All Images" msgstr "Všetky obrázky" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:790 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:806 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:820 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:285 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:750 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:766 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:285 msgid "All Vectors" msgstr "Všetky vektory" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:793 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:809 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:823 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:753 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:769 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:783 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 msgid "All Bitmaps" msgstr "Všetky bitmapy" #. ###### File options #. ###### Do we want the .xxx extension automatically added? -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1042 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1002 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1560 msgid "Append filename extension automatically" msgstr "Automaticky pridávať rozšírenie názvu súboru" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1215 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1468 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1175 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1428 msgid "Guess from extension" msgstr "Hádať podľa prípony" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1487 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1447 msgid "Left edge of source" msgstr "Ľavý okraj zdroja" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1488 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1448 msgid "Top edge of source" msgstr "Vrchný okraj zdroja" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1489 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1449 msgid "Right edge of source" msgstr "Pravý okraj zdroja" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1490 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1450 msgid "Bottom edge of source" msgstr "Spodný okraj zdroja" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1491 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1451 msgid "Source width" msgstr "Šírka zdroja" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1492 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1452 msgid "Source height" msgstr "Výška zdroja" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1493 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1453 msgid "Destination width" msgstr "Šírka cieľa" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1494 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1454 msgid "Destination height" msgstr "Výška cieľa" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1495 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1455 msgid "Resolution (dots per inch)" msgstr "Rozlíšenie (v bodoch na palec)" @@ -16354,37 +14059,30 @@ msgstr "Rozlíšenie (v bodoch na palec)" #. ## EXTRA WIDGET -- SOURCE SIDE #. ######################################### #. ##### Export options buttons/spinners, etc -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1533 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1493 msgid "Document" msgstr "Dokument" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1541 ../src/verbs.cpp:176 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 ../src/verbs.cpp:175 #: ../src/widgets/desktop-widget.cpp:2000 #: ../share/extensions/printing_marks.inx.h:18 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 -#: ../src/verbs.cpp:175 msgid "Selection" msgstr "Výber" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1505 #, fuzzy msgctxt "Export dialog" msgid "Custom" msgstr "Vlastná" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1565 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1525 msgid "Source" msgstr "Zdroj" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1585 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 msgid "Cairo" msgstr "Cairo" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1588 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1548 msgid "Antialias" msgstr "Antialiasing" @@ -16428,13 +14126,6 @@ msgstr "" "zložky vstupu sa odovzdá na výstup- Posledný stĺpec nezávisí na vstupných " "farbách, je možné ho použiť na nastavenie konštantnej hodnoty zložky." -#: ../src/ui/dialog/filter-effects-dialog.cpp:549 -#: ../share/extensions/grid_polar.inx.h:4 -#, fuzzy -msgctxt "Label" -msgid "None" -msgstr "Žiadny" - #: ../src/ui/dialog/filter-effects-dialog.cpp:656 msgid "Image File" msgstr "Súbor obrázka" @@ -16671,7 +14362,6 @@ msgid "R:" msgstr "Rx:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2848 -#: ../src/widgets/sp-color-icc-selector.cpp:334 #: ../src/widgets/sp-color-icc-selector.cpp:359 #, fuzzy msgid "G:" @@ -16848,7 +14538,8 @@ msgstr "Mierka povrchu:" msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" -msgstr "Táto hodnota znásobuje výšky bumpmapy definovanej vstupným alfa kanálom" +msgstr "" +"Táto hodnota znásobuje výšky bumpmapy definovanej vstupným alfa kanálom" #: ../src/ui/dialog/filter-effects-dialog.cpp:2873 #: ../src/ui/dialog/filter-effects-dialog.cpp:2906 @@ -17025,8 +14716,7 @@ msgstr "" "sa použije na obrázok. Bežné efekty, ktoré sa tvoria pomocou konvolučných " "matíc sú rozostrenie, zaostrenie, reliéf a detekcia hrán. Hoci pomocou tejto " "primitívy filtra je možné vytvoriť gaussovské rozostrenie, špecializovaná " -"primitáva pre gaussovské rozostrenie je rýchlejšia a nezávislá od " -"rozlíšenia." +"primitáva pre gaussovské rozostrenie je rýchlejšia a nezávislá od rozlíšenia." #: ../src/ui/dialog/filter-effects-dialog.cpp:2968 msgid "" @@ -17351,8 +15041,7 @@ msgstr "Špirály" msgid "Search spirals" msgstr "Hľadať špirály" -#: ../src/ui/dialog/find.cpp:102 ../src/widgets/toolbox.cpp:1735 -#: ../src/widgets/toolbox.cpp:1736 +#: ../src/ui/dialog/find.cpp:102 ../src/widgets/toolbox.cpp:1736 msgid "Paths" msgstr "Cesty" @@ -17427,14 +15116,12 @@ msgstr "Nahradiť" msgid "Replace all matches" msgstr "Nahradiť všetky písma týmto:" -#: ../src/ui/dialog/find.cpp:797 #: ../src/ui/dialog/find.cpp:775 #, fuzzy msgid "Nothing to replace" msgstr "Nie je čo opakovať." #. TRANSLATORS: "%s" is replaced with "exact" or "partial" when this string is displayed -#: ../src/ui/dialog/find.cpp:838 #: ../src/ui/dialog/find.cpp:816 #, c-format msgid "%d object found (out of %d), %s match." @@ -17443,18 +15130,15 @@ msgstr[0] "%d objekt nájdený (z %d), %s zhoda." msgstr[1] "%d objekty nájdené (z %d ), %s zhoda." msgstr[2] "%d objektov nájdených (z %d ), %s zhoda." -#: ../src/ui/dialog/find.cpp:841 #: ../src/ui/dialog/find.cpp:819 msgid "exact" msgstr "presná" -#: ../src/ui/dialog/find.cpp:841 #: ../src/ui/dialog/find.cpp:819 msgid "partial" msgstr "čiastočná" #. TRANSLATORS: "%1" is replaced with the number of matches -#: ../src/ui/dialog/find.cpp:844 #: ../src/ui/dialog/find.cpp:822 #, fuzzy msgid "%1 match replaced" @@ -17464,7 +15148,6 @@ msgstr[1] "Nahradiť" msgstr[2] "Nahradiť" #. TRANSLATORS: "%1" is replaced with the number of matches -#: ../src/ui/dialog/find.cpp:848 #: ../src/ui/dialog/find.cpp:826 #, fuzzy msgid "%1 object found" @@ -17473,30 +15156,25 @@ msgstr[0] "Bez objektov" msgstr[1] "Bez objektov" msgstr[2] "Bez objektov" -#: ../src/ui/dialog/find.cpp:862 #: ../src/ui/dialog/find.cpp:837 #, fuzzy msgid "Replace text or property" msgstr "_Vlastnosti vodidla" -#: ../src/ui/dialog/find.cpp:866 #: ../src/ui/dialog/find.cpp:841 #, fuzzy msgid "Nothing found" msgstr "Nie je čo vrátiť späť." -#: ../src/ui/dialog/find.cpp:871 #: ../src/ui/dialog/find.cpp:846 msgid "No objects found" msgstr "Bez objektov" -#: ../src/ui/dialog/find.cpp:892 #: ../src/ui/dialog/find.cpp:867 #, fuzzy msgid "Select an object type" msgstr "Duplikuje vybrané objekty." -#: ../src/ui/dialog/find.cpp:910 #: ../src/ui/dialog/find.cpp:885 #, fuzzy msgid "Select a property" @@ -18255,94 +15933,79 @@ msgstr "Pridať text" msgid "Arrange in a grid" msgstr "Rozmiestniť do mriežky" -#: ../src/ui/dialog/grid-arrange-tab.cpp:578 +#: ../src/ui/dialog/grid-arrange-tab.cpp:589 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 #: ../src/widgets/desktop-widget.cpp:666 ../src/widgets/node-toolbar.cpp:581 -#: ../src/ui/dialog/grid-arrange-tab.cpp:589 msgid "X:" msgstr "X:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:578 #: ../src/ui/dialog/grid-arrange-tab.cpp:589 #, fuzzy msgid "Horizontal spacing between columns." msgstr "Vodorovné rozostupy medzi stĺpcami (jednotky px)" -#: ../src/ui/dialog/grid-arrange-tab.cpp:579 +#: ../src/ui/dialog/grid-arrange-tab.cpp:590 #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:76 #: ../src/widgets/desktop-widget.cpp:676 ../src/widgets/node-toolbar.cpp:599 -#: ../src/ui/dialog/grid-arrange-tab.cpp:590 msgid "Y:" msgstr "Y:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:579 #: ../src/ui/dialog/grid-arrange-tab.cpp:590 #, fuzzy msgid "Vertical spacing between rows." msgstr "Zvislé rozostupy medzi riadkami (jednotky px)" -#: ../src/ui/dialog/grid-arrange-tab.cpp:626 #: ../src/ui/dialog/grid-arrange-tab.cpp:637 #, fuzzy msgid "_Rows:" msgstr "Riadky:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:635 #: ../src/ui/dialog/grid-arrange-tab.cpp:646 msgid "Number of rows" msgstr "Počet riadkov" -#: ../src/ui/dialog/grid-arrange-tab.cpp:639 #: ../src/ui/dialog/grid-arrange-tab.cpp:650 #, fuzzy msgid "Equal _height" msgstr "Rovnaká výška:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:650 #: ../src/ui/dialog/grid-arrange-tab.cpp:661 msgid "If not set, each row has the height of the tallest object in it" msgstr "Ak nie je nastavené, každý rad má výšku najvyššieho objektu v ňom" #. #### Number of columns #### -#: ../src/ui/dialog/grid-arrange-tab.cpp:666 #: ../src/ui/dialog/grid-arrange-tab.cpp:677 #, fuzzy msgid "_Columns:" msgstr "Stĺpce:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:675 #: ../src/ui/dialog/grid-arrange-tab.cpp:686 msgid "Number of columns" msgstr "Počet stĺpcov" -#: ../src/ui/dialog/grid-arrange-tab.cpp:679 #: ../src/ui/dialog/grid-arrange-tab.cpp:690 #, fuzzy msgid "Equal _width" msgstr "Rovnaká šírka:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:689 #: ../src/ui/dialog/grid-arrange-tab.cpp:700 msgid "If not set, each column has the width of the widest object in it" msgstr "Ak nie je nastavené, každý stĺpec má šírku najširšieho objektu v ňom" #. Anchor selection widget -#: ../src/ui/dialog/grid-arrange-tab.cpp:700 #: ../src/ui/dialog/grid-arrange-tab.cpp:711 #, fuzzy msgid "Alignment:" msgstr "Zarovnanie" #. #### Radio buttons to control spacing manually or to fit selection bbox #### -#: ../src/ui/dialog/grid-arrange-tab.cpp:709 #: ../src/ui/dialog/grid-arrange-tab.cpp:720 #, fuzzy msgid "_Fit into selection box" msgstr "Prispôsobiť hranici výberu" -#: ../src/ui/dialog/grid-arrange-tab.cpp:716 #: ../src/ui/dialog/grid-arrange-tab.cpp:727 #, fuzzy msgid "_Set spacing:" @@ -18389,13 +16052,11 @@ msgstr "_Vlastnosti vodidla" msgid "Guideline" msgstr "Vodidlo" -#: ../src/ui/dialog/guides.cpp:311 #: ../src/ui/dialog/guides.cpp:310 #, c-format msgid "Guideline ID: %s" msgstr "ID vodidla: %s" -#: ../src/ui/dialog/guides.cpp:317 #: ../src/ui/dialog/guides.cpp:316 #, c-format msgid "Current: %s" @@ -18424,29 +16085,29 @@ msgstr "Výber" msgid "Selection only or whole document" msgstr "Iba výber alebo celý dokument" -#: ../src/ui/dialog/inkscape-preferences.cpp:183 +#: ../src/ui/dialog/inkscape-preferences.cpp:181 msgid "Show selection cue" msgstr "Zobraziť označenie výberu" -#: ../src/ui/dialog/inkscape-preferences.cpp:184 +#: ../src/ui/dialog/inkscape-preferences.cpp:182 msgid "" "Whether selected objects display a selection cue (the same as in selector)" msgstr "" "Či označené objekty budú zobrazovať znak výberu (rovnako ako pri Výbere)" -#: ../src/ui/dialog/inkscape-preferences.cpp:190 +#: ../src/ui/dialog/inkscape-preferences.cpp:188 msgid "Enable gradient editing" msgstr "Zapnúť úpravu farebného prechodu" -#: ../src/ui/dialog/inkscape-preferences.cpp:191 +#: ../src/ui/dialog/inkscape-preferences.cpp:189 msgid "Whether selected objects display gradient editing controls" msgstr "Či označené objekty budú zobrazovať ovládacie prvky farebného prechodu" -#: ../src/ui/dialog/inkscape-preferences.cpp:196 +#: ../src/ui/dialog/inkscape-preferences.cpp:194 msgid "Conversion to guides uses edges instead of bounding box" msgstr "Konverzia na vodidlá využíva okraje namiesto ohraničenia" -#: ../src/ui/dialog/inkscape-preferences.cpp:197 +#: ../src/ui/dialog/inkscape-preferences.cpp:195 msgid "" "Converting an object to guides places these along the object's true edges " "(imitating the object's shape), not along the bounding box" @@ -18454,25 +16115,25 @@ msgstr "" "Konverzia objektu na na vodidlá ich umiestňuje pozdĺž skutočných hrán " "objektu (imitujúc tvar objektu), nie pozdĺž ohraničenia objektu" -#: ../src/ui/dialog/inkscape-preferences.cpp:204 +#: ../src/ui/dialog/inkscape-preferences.cpp:202 #, fuzzy msgid "Ctrl+click _dot size:" msgstr "Ctrl+kliknutie na veľkosť bodu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:204 +#: ../src/ui/dialog/inkscape-preferences.cpp:202 msgid "times current stroke width" msgstr "krát aktuálna šírka ťahu" -#: ../src/ui/dialog/inkscape-preferences.cpp:205 +#: ../src/ui/dialog/inkscape-preferences.cpp:203 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" msgstr "" "Veľkosť bodov vytvorených Ctrl+kliknutím (vzhľadom na súčasnú šírku ťahu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:220 +#: ../src/ui/dialog/inkscape-preferences.cpp:218 msgid "No objects selected to take the style from." msgstr "Neboli vybrané objekty, z ktorých sa ma vziať štýl." -#: ../src/ui/dialog/inkscape-preferences.cpp:229 +#: ../src/ui/dialog/inkscape-preferences.cpp:227 msgid "" "More than one object selected. Cannot take style from multiple " "objects." @@ -18480,29 +16141,24 @@ msgstr "" "Bol vybraný viac ako jeden objekt. Nie je možné zobrať štýl z " "viacerých objektov." -#: ../src/ui/dialog/inkscape-preferences.cpp:265 -#: ../src/ui/dialog/inkscape-preferences.cpp:262 +#: ../src/ui/dialog/inkscape-preferences.cpp:260 #, fuzzy msgid "Style of new objects" msgstr "Štýl nového obdĺžnika" -#: ../src/ui/dialog/inkscape-preferences.cpp:267 -#: ../src/ui/dialog/inkscape-preferences.cpp:264 +#: ../src/ui/dialog/inkscape-preferences.cpp:262 msgid "Last used style" msgstr "Posledný použitý štýl" -#: ../src/ui/dialog/inkscape-preferences.cpp:269 -#: ../src/ui/dialog/inkscape-preferences.cpp:266 +#: ../src/ui/dialog/inkscape-preferences.cpp:264 msgid "Apply the style you last set on an object" msgstr "Použiť štýl, ktorý bol naposledy nastavený na objekte" -#: ../src/ui/dialog/inkscape-preferences.cpp:274 -#: ../src/ui/dialog/inkscape-preferences.cpp:271 +#: ../src/ui/dialog/inkscape-preferences.cpp:269 msgid "This tool's own style:" msgstr "Vlastný štýl tohoto nástroja:" -#: ../src/ui/dialog/inkscape-preferences.cpp:278 -#: ../src/ui/dialog/inkscape-preferences.cpp:275 +#: ../src/ui/dialog/inkscape-preferences.cpp:273 msgid "" "Each tool may store its own style to apply to the newly created objects. Use " "the button below to set it." @@ -18511,78 +16167,64 @@ msgstr "" "Tlačidlom dole ho nastavíte." #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:282 -#: ../src/ui/dialog/inkscape-preferences.cpp:279 +#: ../src/ui/dialog/inkscape-preferences.cpp:277 msgid "Take from selection" msgstr "Zobrať z výberu" -#: ../src/ui/dialog/inkscape-preferences.cpp:291 -#: ../src/ui/dialog/inkscape-preferences.cpp:284 +#: ../src/ui/dialog/inkscape-preferences.cpp:282 msgid "This tool's style of new objects" msgstr "Štýl nových objektov vytvorených týmto nástrojom:" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 -#: ../src/ui/dialog/inkscape-preferences.cpp:291 +#: ../src/ui/dialog/inkscape-preferences.cpp:289 msgid "Remember the style of the (first) selected object as this tool's style" msgstr "Pamätať si štýl (prvého) zvoleného objektu ako štýl tohoto nástroja" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 -#: ../src/ui/dialog/inkscape-preferences.cpp:296 +#: ../src/ui/dialog/inkscape-preferences.cpp:294 msgid "Tools" msgstr "Nástroje" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 -#: ../src/ui/dialog/inkscape-preferences.cpp:299 +#: ../src/ui/dialog/inkscape-preferences.cpp:297 #, fuzzy msgid "Bounding box to use" msgstr "Použiť ohraničenie:" -#: ../src/ui/dialog/inkscape-preferences.cpp:307 -#: ../src/ui/dialog/inkscape-preferences.cpp:300 +#: ../src/ui/dialog/inkscape-preferences.cpp:298 msgid "Visual bounding box" msgstr "Vizuálne ohraničenie" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 -#: ../src/ui/dialog/inkscape-preferences.cpp:302 +#: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This bounding box includes stroke width, markers, filter margins, etc." msgstr "" "Do tohto ohraničenia patrí šírka ťahu, zakončenia čiar, okraje filtrov atď." -#: ../src/ui/dialog/inkscape-preferences.cpp:310 -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:301 msgid "Geometric bounding box" msgstr "Geometrické ohraničenie" -#: ../src/ui/dialog/inkscape-preferences.cpp:312 -#: ../src/ui/dialog/inkscape-preferences.cpp:305 +#: ../src/ui/dialog/inkscape-preferences.cpp:303 msgid "This bounding box includes only the bare path" msgstr "Do tohto ohraničenia patrí iba samotná cesta" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 -#: ../src/ui/dialog/inkscape-preferences.cpp:307 +#: ../src/ui/dialog/inkscape-preferences.cpp:305 #, fuzzy msgid "Conversion to guides" msgstr "Konvertovať na vodidlá:" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 -#: ../src/ui/dialog/inkscape-preferences.cpp:308 +#: ../src/ui/dialog/inkscape-preferences.cpp:306 msgid "Keep objects after conversion to guides" msgstr "Ponechať objekty po konverzii na vodidlá" -#: ../src/ui/dialog/inkscape-preferences.cpp:317 -#: ../src/ui/dialog/inkscape-preferences.cpp:310 +#: ../src/ui/dialog/inkscape-preferences.cpp:308 msgid "" "When converting an object to guides, don't delete the object after the " "conversion" msgstr "Pri konverzii objektov na vodidlá nemazať objekt po konverzii" -#: ../src/ui/dialog/inkscape-preferences.cpp:318 -#: ../src/ui/dialog/inkscape-preferences.cpp:311 +#: ../src/ui/dialog/inkscape-preferences.cpp:309 msgid "Treat groups as a single object" msgstr "Pracovať so skupinami ako s jednotlivým objektom" -#: ../src/ui/dialog/inkscape-preferences.cpp:320 -#: ../src/ui/dialog/inkscape-preferences.cpp:313 +#: ../src/ui/dialog/inkscape-preferences.cpp:311 msgid "" "Treat groups as a single object during conversion to guides rather than " "converting each child separately" @@ -18590,134 +16232,103 @@ msgstr "" "Pracovať so skupinami ako s jednotlivým objektom počas konverzie na vodidlá " "na rozdiel od samostatnej konverzie každého členského objektu" -#: ../src/ui/dialog/inkscape-preferences.cpp:322 -#: ../src/ui/dialog/inkscape-preferences.cpp:315 +#: ../src/ui/dialog/inkscape-preferences.cpp:313 msgid "Average all sketches" msgstr "Spriemerovať všetky skice" -#: ../src/ui/dialog/inkscape-preferences.cpp:323 -#: ../src/ui/dialog/inkscape-preferences.cpp:316 +#: ../src/ui/dialog/inkscape-preferences.cpp:314 msgid "Width is in absolute units" msgstr "Šírka je v absolútnych jednotkách" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 -#: ../src/ui/dialog/inkscape-preferences.cpp:317 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Select new path" msgstr "Vybrať novú cestu" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 -#: ../src/ui/dialog/inkscape-preferences.cpp:318 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Don't attach connectors to text objects" msgstr "Nepripájať konektory na textové objekty" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:328 -#: ../src/ui/dialog/inkscape-preferences.cpp:321 +#: ../src/ui/dialog/inkscape-preferences.cpp:319 msgid "Selector" msgstr "Výber" -#: ../src/ui/dialog/inkscape-preferences.cpp:333 -#: ../src/ui/dialog/inkscape-preferences.cpp:326 +#: ../src/ui/dialog/inkscape-preferences.cpp:324 #, fuzzy msgid "When transforming, show" msgstr "Počas transformácie zobraziť:" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 -#: ../src/ui/dialog/inkscape-preferences.cpp:327 +#: ../src/ui/dialog/inkscape-preferences.cpp:325 msgid "Objects" msgstr "Objekty" -#: ../src/ui/dialog/inkscape-preferences.cpp:336 -#: ../src/ui/dialog/inkscape-preferences.cpp:329 +#: ../src/ui/dialog/inkscape-preferences.cpp:327 msgid "Show the actual objects when moving or transforming" msgstr "Zobraziť samotné objekty pri pohybe alebo transformácii" -#: ../src/ui/dialog/inkscape-preferences.cpp:337 -#: ../src/ui/dialog/inkscape-preferences.cpp:330 +#: ../src/ui/dialog/inkscape-preferences.cpp:328 msgid "Box outline" msgstr "Obrys poľa" -#: ../src/ui/dialog/inkscape-preferences.cpp:339 -#: ../src/ui/dialog/inkscape-preferences.cpp:332 +#: ../src/ui/dialog/inkscape-preferences.cpp:330 msgid "Show only a box outline of the objects when moving or transforming" msgstr "Zobraziť iba obrys poľa objektu pri pohybe alebo transformácii" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 -#: ../src/ui/dialog/inkscape-preferences.cpp:333 +#: ../src/ui/dialog/inkscape-preferences.cpp:331 #, fuzzy msgid "Per-object selection cue" msgstr "Označenie zvoleného objektu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:341 #: ../src/ui/dialog/inkscape-preferences.cpp:334 -#, fuzzy -msgctxt "Selection cue" -msgid "None" -msgstr "Žiadny" - -#: ../src/ui/dialog/inkscape-preferences.cpp:343 -#: ../src/ui/dialog/inkscape-preferences.cpp:336 msgid "No per-object selection indication" msgstr "Žiadna indikácia pre zvolený objekt" -#: ../src/ui/dialog/inkscape-preferences.cpp:344 -#: ../src/ui/dialog/inkscape-preferences.cpp:337 +#: ../src/ui/dialog/inkscape-preferences.cpp:335 msgid "Mark" msgstr "Značka" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 -#: ../src/ui/dialog/inkscape-preferences.cpp:339 +#: ../src/ui/dialog/inkscape-preferences.cpp:337 msgid "Each selected object has a diamond mark in the top left corner" msgstr "Každý vybraný objekt bude označený diamantom v ľavom hornom roku" -#: ../src/ui/dialog/inkscape-preferences.cpp:347 -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:338 msgid "Box" msgstr "Ohraničenie" -#: ../src/ui/dialog/inkscape-preferences.cpp:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:342 +#: ../src/ui/dialog/inkscape-preferences.cpp:340 msgid "Each selected object displays its bounding box" msgstr "Každý zvolený objekt zobrazí svoje ohraničenie" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:352 -#: ../src/ui/dialog/inkscape-preferences.cpp:345 +#: ../src/ui/dialog/inkscape-preferences.cpp:343 msgid "Node" msgstr "Uzol" -#: ../src/ui/dialog/inkscape-preferences.cpp:355 -#: ../src/ui/dialog/inkscape-preferences.cpp:348 +#: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Path outline" msgstr "Obrys cesty" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:347 msgid "Path outline color" msgstr "Farba obrysu cesty" -#: ../src/ui/dialog/inkscape-preferences.cpp:357 -#: ../src/ui/dialog/inkscape-preferences.cpp:350 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Selects the color used for showing the path outline" msgstr "Vyberá farbu, ktorá sa použije na zobrazenie obrysu cesty" -#: ../src/ui/dialog/inkscape-preferences.cpp:358 -#: ../src/ui/dialog/inkscape-preferences.cpp:351 +#: ../src/ui/dialog/inkscape-preferences.cpp:349 msgid "Always show outline" msgstr "Vždy zobraziť obrys" -#: ../src/ui/dialog/inkscape-preferences.cpp:359 -#: ../src/ui/dialog/inkscape-preferences.cpp:352 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgid "Show outlines for all paths, not only invisible paths" msgstr "Zobrazovať obrysy všetkých ciest, nie len neviditeľných ciest" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 -#: ../src/ui/dialog/inkscape-preferences.cpp:353 +#: ../src/ui/dialog/inkscape-preferences.cpp:351 msgid "Update outline when dragging nodes" msgstr "Aktualizovať obrys pri ťahaní uzlov" -#: ../src/ui/dialog/inkscape-preferences.cpp:361 -#: ../src/ui/dialog/inkscape-preferences.cpp:354 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "" "Update the outline when dragging or transforming nodes; if this is off, the " "outline will only update when completing a drag" @@ -18725,13 +16336,11 @@ msgstr "" "Aktualizovať obrys pri ťahaní alebo transformácii uzlov; ak je táto voľba " "vypnutá, obrys sa aktualizuje oba po dokončení ťahania" -#: ../src/ui/dialog/inkscape-preferences.cpp:362 -#: ../src/ui/dialog/inkscape-preferences.cpp:355 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 msgid "Update paths when dragging nodes" msgstr "Aktualizovať cesty pri ťahaní uzlov" -#: ../src/ui/dialog/inkscape-preferences.cpp:363 -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:354 msgid "" "Update paths when dragging or transforming nodes; if this is off, paths will " "only be updated when completing a drag" @@ -18739,13 +16348,11 @@ msgstr "" "Aktualizovať cesty pri ťahaní alebo transformácii uzlov; ak je táto voľba " "vypnutá, obrys sa aktualizuje oba po dokončení ťahania" -#: ../src/ui/dialog/inkscape-preferences.cpp:364 -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:355 msgid "Show path direction on outlines" msgstr "Zobraziť smer ciest na obrysoch" -#: ../src/ui/dialog/inkscape-preferences.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:358 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "" "Visualize the direction of selected paths by drawing small arrows in the " "middle of each outline segment" @@ -18753,34 +16360,28 @@ msgstr "" "Vizualizovať smer vybraných ciest nakreslením malých šípok v strede každého " "segmentu obrysu" -#: ../src/ui/dialog/inkscape-preferences.cpp:366 -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:357 msgid "Show temporary path outline" msgstr "Zobraziť dočasný obrys cesty" -#: ../src/ui/dialog/inkscape-preferences.cpp:367 -#: ../src/ui/dialog/inkscape-preferences.cpp:360 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "When hovering over a path, briefly flash its outline" msgstr "Keď sa myš nachádza nad cestou, jej obrys má krátko zablikať" -#: ../src/ui/dialog/inkscape-preferences.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:361 +#: ../src/ui/dialog/inkscape-preferences.cpp:359 msgid "Show temporary outline for selected paths" msgstr "Zobraziť dočasný obrys vybraných ciest" -#: ../src/ui/dialog/inkscape-preferences.cpp:369 -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/inkscape-preferences.cpp:360 msgid "Show temporary outline even when a path is selected for editing" msgstr "Zobraziť dočasný obrys aj keď je cesta vybraná a úpravu" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:362 #, fuzzy msgid "_Flash time:" msgstr "Čas blikania" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:362 msgid "" "Specifies how long the path outline will be visible after a mouse-over (in " "milliseconds); specify 0 to have the outline shown until mouse leaves the " @@ -18789,28 +16390,23 @@ msgstr "" "Určuje ako dlho bude obrys cesty viditeľný po prechode myšou (v " "milisekundách). Hodnota 0 zobrazuje obrys až pokým myš neopustí cestu." -#: ../src/ui/dialog/inkscape-preferences.cpp:372 -#: ../src/ui/dialog/inkscape-preferences.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:363 msgid "Editing preferences" msgstr "Úprava nastavení" -#: ../src/ui/dialog/inkscape-preferences.cpp:373 -#: ../src/ui/dialog/inkscape-preferences.cpp:366 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Show transform handles for single nodes" msgstr "Zobraziť transformačné úchopy aj pre jeden uzol" -#: ../src/ui/dialog/inkscape-preferences.cpp:374 -#: ../src/ui/dialog/inkscape-preferences.cpp:367 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Show transform handles even when only a single node is selected" msgstr "Zobraziť transformačné úchopy aj ak je vybraný iba jediný uzol" -#: ../src/ui/dialog/inkscape-preferences.cpp:375 -#: ../src/ui/dialog/inkscape-preferences.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "Deleting nodes preserves shape" msgstr "Odstránenie uzlov zachová tvar" -#: ../src/ui/dialog/inkscape-preferences.cpp:376 -#: ../src/ui/dialog/inkscape-preferences.cpp:369 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 msgid "" "Move handles next to deleted nodes to resemble original shape; hold Ctrl to " "get the other behavior" @@ -18819,41 +16415,34 @@ msgstr "" "stlačením Ctrl docielite opačné správanie" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:379 -#: ../src/ui/dialog/inkscape-preferences.cpp:372 +#: ../src/ui/dialog/inkscape-preferences.cpp:370 msgid "Tweak" msgstr "Doladenie" -#: ../src/ui/dialog/inkscape-preferences.cpp:380 -#: ../src/ui/dialog/inkscape-preferences.cpp:373 +#: ../src/ui/dialog/inkscape-preferences.cpp:371 #, fuzzy msgid "Object paint style" msgstr "Stred objektu" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:385 +#: ../src/ui/dialog/inkscape-preferences.cpp:376 #: ../src/widgets/desktop-widget.cpp:631 -#: ../src/ui/dialog/inkscape-preferences.cpp:378 msgid "Zoom" msgstr "Lupa" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:390 ../src/verbs.cpp:2761 -#: ../src/ui/dialog/inkscape-preferences.cpp:383 -#: ../src/verbs.cpp:2678 +#: ../src/ui/dialog/inkscape-preferences.cpp:381 ../src/verbs.cpp:2678 #, fuzzy msgctxt "ContextVerb" msgid "Measure" msgstr "Mierka" -#: ../src/ui/dialog/inkscape-preferences.cpp:392 -#: ../src/ui/dialog/inkscape-preferences.cpp:385 +#: ../src/ui/dialog/inkscape-preferences.cpp:383 #, fuzzy msgid "Ignore first and last points" msgstr "Ignorovať tieto voľby a použiť pokyny k exportu?" -#: ../src/ui/dialog/inkscape-preferences.cpp:393 -#: ../src/ui/dialog/inkscape-preferences.cpp:386 +#: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "" "The start and end of the measurement tool's control line will not be " "considered for calculating lengths. Only lengths between actual curve " @@ -18861,18 +16450,20 @@ msgid "" msgstr "" #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:396 -#: ../src/ui/dialog/inkscape-preferences.cpp:389 +#: ../src/ui/dialog/inkscape-preferences.cpp:387 msgid "Shapes" msgstr "Tvary" -#: ../src/ui/dialog/inkscape-preferences.cpp:428 -#: ../src/ui/dialog/inkscape-preferences.cpp:421 +#. Pencil +#: ../src/ui/dialog/inkscape-preferences.cpp:415 +msgid "Pencil" +msgstr "Ceruzka" + +#: ../src/ui/dialog/inkscape-preferences.cpp:419 msgid "Sketch mode" msgstr "Režim skice" -#: ../src/ui/dialog/inkscape-preferences.cpp:430 -#: ../src/ui/dialog/inkscape-preferences.cpp:423 +#: ../src/ui/dialog/inkscape-preferences.cpp:421 msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" @@ -18881,20 +16472,17 @@ msgstr "" "urobených skíc namiesto spriemerovania starého výsledku s novou skicou" #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:433 +#: ../src/ui/dialog/inkscape-preferences.cpp:424 #: ../src/ui/dialog/input.cpp:1485 -#: ../src/ui/dialog/inkscape-preferences.cpp:426 msgid "Pen" msgstr "Pero" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:439 -#: ../src/ui/dialog/inkscape-preferences.cpp:432 +#: ../src/ui/dialog/inkscape-preferences.cpp:430 msgid "Calligraphy" msgstr "Kaligrafická čiara" -#: ../src/ui/dialog/inkscape-preferences.cpp:443 -#: ../src/ui/dialog/inkscape-preferences.cpp:436 +#: ../src/ui/dialog/inkscape-preferences.cpp:434 msgid "" "If on, pen width is in absolute units (px) independent of zoom; otherwise " "pen width depends on zoom so that it looks the same at any zoom" @@ -18903,8 +16491,7 @@ msgstr "" "na mierke zobrazenia; inak hrúbka pera závisí na mierke zobrazenia tak, že " "je rovnaká pri každej mierke" -#: ../src/ui/dialog/inkscape-preferences.cpp:445 -#: ../src/ui/dialog/inkscape-preferences.cpp:438 +#: ../src/ui/dialog/inkscape-preferences.cpp:436 msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" @@ -18913,129 +16500,111 @@ msgstr "" "predchádzajúci výber)" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2753 -#: ../src/ui/dialog/inkscape-preferences.cpp:441 -#: ../src/verbs.cpp:2670 +#: ../src/ui/dialog/inkscape-preferences.cpp:439 ../src/verbs.cpp:2670 #, fuzzy msgctxt "ContextVerb" msgid "Text" msgstr "Text" -#: ../src/ui/dialog/inkscape-preferences.cpp:453 -#: ../src/ui/dialog/inkscape-preferences.cpp:446 +#: ../src/ui/dialog/inkscape-preferences.cpp:444 msgid "Show font samples in the drop-down list" msgstr "Zobrazovať vzorky písiem v roletovom menu" -#: ../src/ui/dialog/inkscape-preferences.cpp:454 -#: ../src/ui/dialog/inkscape-preferences.cpp:447 +#: ../src/ui/dialog/inkscape-preferences.cpp:445 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "" "Zobrazovať vzorky písiem spolu s názvami písiem v roletovom menu v Textovom " "paneli" -#: ../src/ui/dialog/inkscape-preferences.cpp:456 -#: ../src/ui/dialog/inkscape-preferences.cpp:449 +#: ../src/ui/dialog/inkscape-preferences.cpp:447 #, fuzzy msgid "Show font substitution warning dialog" msgstr "Zobraziť tlačidlá zatvoriť na dialógoch" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 -#: ../src/ui/dialog/inkscape-preferences.cpp:450 +#: ../src/ui/dialog/inkscape-preferences.cpp:448 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Pixel" msgstr "bod" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Pica" msgstr "pica" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Millimeter" msgstr "milimeter" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Centimeter" msgstr "centimeter" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Inch" msgstr "palec" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:451 msgid "Em square" msgstr "em štvorec" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:463 -#: ../src/ui/dialog/inkscape-preferences.cpp:456 +#: ../src/ui/dialog/inkscape-preferences.cpp:454 #, fuzzy msgid "Text units" msgstr "Písmo textu" -#: ../src/ui/dialog/inkscape-preferences.cpp:465 -#: ../src/ui/dialog/inkscape-preferences.cpp:458 +#: ../src/ui/dialog/inkscape-preferences.cpp:456 #, fuzzy msgid "Text size unit type:" msgstr "Text: Zmeniť štýl písma" -#: ../src/ui/dialog/inkscape-preferences.cpp:466 -#: ../src/ui/dialog/inkscape-preferences.cpp:459 +#: ../src/ui/dialog/inkscape-preferences.cpp:457 msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:467 -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 msgid "Always output text size in pixels (px)" msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:459 +msgid "" +"Always convert the text size units above into pixels (px) before saving to " +"file" +msgstr "" + #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:473 -#: ../src/ui/dialog/inkscape-preferences.cpp:466 +#: ../src/ui/dialog/inkscape-preferences.cpp:464 msgid "Spray" msgstr "Sprej" #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:478 -#: ../src/ui/dialog/inkscape-preferences.cpp:471 +#: ../src/ui/dialog/inkscape-preferences.cpp:469 msgid "Eraser" msgstr "Guma" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:482 -#: ../src/ui/dialog/inkscape-preferences.cpp:475 +#: ../src/ui/dialog/inkscape-preferences.cpp:473 msgid "Paint Bucket" msgstr "Vedro s farbou" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:487 -#: ../src/widgets/gradient-selector.cpp:134 -#: ../src/widgets/gradient-selector.cpp:302 -#: ../src/ui/dialog/inkscape-preferences.cpp:480 +#: ../src/ui/dialog/inkscape-preferences.cpp:478 #: ../src/widgets/gradient-selector.cpp:152 #: ../src/widgets/gradient-selector.cpp:320 msgid "Gradient" msgstr "Lineárny prechod" -#: ../src/ui/dialog/inkscape-preferences.cpp:489 -#: ../src/ui/dialog/inkscape-preferences.cpp:482 +#: ../src/ui/dialog/inkscape-preferences.cpp:480 msgid "Prevent sharing of gradient definitions" msgstr "Zabrániť zdieľaniu definícií farebných prechodov" -#: ../src/ui/dialog/inkscape-preferences.cpp:491 -#: ../src/ui/dialog/inkscape-preferences.cpp:484 +#: ../src/ui/dialog/inkscape-preferences.cpp:482 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " @@ -19046,45 +16615,38 @@ msgstr "" "povolené, takže úprava jedného objektu môže ovplyvniť ostatné objekty, ktoré " "používajú rovnaký farebný prechod" -#: ../src/ui/dialog/inkscape-preferences.cpp:492 -#: ../src/ui/dialog/inkscape-preferences.cpp:485 +#: ../src/ui/dialog/inkscape-preferences.cpp:483 #, fuzzy msgid "Use legacy Gradient Editor" msgstr "Editor prechodov" -#: ../src/ui/dialog/inkscape-preferences.cpp:494 -#: ../src/ui/dialog/inkscape-preferences.cpp:487 +#: ../src/ui/dialog/inkscape-preferences.cpp:485 msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:497 -#: ../src/ui/dialog/inkscape-preferences.cpp:490 +#: ../src/ui/dialog/inkscape-preferences.cpp:488 #, fuzzy msgid "Linear gradient _angle:" msgstr "Výplň lineárnym farebným prechodom" -#: ../src/ui/dialog/inkscape-preferences.cpp:498 -#: ../src/ui/dialog/inkscape-preferences.cpp:491 +#: ../src/ui/dialog/inkscape-preferences.cpp:489 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:502 -#: ../src/ui/dialog/inkscape-preferences.cpp:495 +#: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "Dropper" msgstr "Pipeta" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:507 -#: ../src/ui/dialog/inkscape-preferences.cpp:500 +#: ../src/ui/dialog/inkscape-preferences.cpp:498 msgid "Connector" msgstr "Konektor" -#: ../src/ui/dialog/inkscape-preferences.cpp:510 -#: ../src/ui/dialog/inkscape-preferences.cpp:503 +#: ../src/ui/dialog/inkscape-preferences.cpp:501 msgid "If on, connector attachment points will not be shown for text objects" msgstr "" "Ak je voľba zapnutá, spojovacie body konektora sa nezobrazia pre textové " @@ -19092,427 +16654,343 @@ msgstr "" #. LPETool #. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:515 -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:506 #, fuzzy msgid "LPE Tool" msgstr "Nástroj efektov cesty" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Interface" msgstr "Rozhranie" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "System default" msgstr "Štandardné hodnoty systému" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Albanian (sq)" msgstr "albánčina (sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Amharic (am)" msgstr "amharčina (am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Arabic (ar)" msgstr "arabčina (ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Armenian (hy)" msgstr "arménčina (hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Azerbaijani (az)" msgstr "azerbajdžančina (az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Basque (eu)" msgstr "baskičtina (eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Belarusian (be)" msgstr "bieloruština (be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Bulgarian (bg)" msgstr "bulharčina (bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Bengali (bn)" msgstr "bengálčina (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 #, fuzzy msgid "Bengali/Bangladesh (bn_BD)" msgstr "bengálčina (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Breton (br)" msgstr "bretónčina (br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Catalan (ca)" msgstr "katalánčina (ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Valencian Catalan (ca@valencia)" msgstr "valencijčina (ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Chinese/China (zh_CN)" msgstr "čínština (Čína) (zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Chinese/Taiwan (zh_TW)" msgstr "čínština (Taiwan) (zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Croatian (hr)" msgstr "chorvátčina (hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Czech (cs)" msgstr "čeština (cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Danish (da)" msgstr "dánčina (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Dutch (nl)" msgstr "holandčina (nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Dzongkha (dz)" msgstr "dzongkä (dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "German (de)" msgstr "nemčina (de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Greek (el)" msgstr "gréčtina (el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "English (en)" msgstr "angličtina (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "English/Australia (en_AU)" msgstr "angličtina (Austrália) (en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "English/Canada (en_CA)" msgstr "angličtina (Kanada) (en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "English/Great Britain (en_GB)" msgstr "angličtina (Spojené kráľovstvo) (en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Pig Latin (en_US@piglatin)" msgstr "pig latin (en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Esperanto (eo)" msgstr "esperanto (eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Estonian (et)" msgstr "estónčina (et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Farsi (fa)" msgstr "perzština (fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Finnish (fi)" msgstr "fínčina (fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "French (fr)" msgstr "francúzština (fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Irish (ga)" msgstr "írčina (ga)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Galician (gl)" msgstr "galícijčina (gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Hebrew (he)" msgstr "hebrejčina (he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Hungarian (hu)" msgstr "maďarčina (hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Indonesian (id)" msgstr "indonézština (id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Italian (it)" msgstr "taliančina (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Japanese (ja)" msgstr "japončina (ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Khmer (km)" msgstr "khmérčina (km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Kinyarwanda (rw)" msgstr "rwandčina (rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Korean (ko)" msgstr "kórejčina (ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Lithuanian (lt)" msgstr "litovčina (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 #, fuzzy msgid "Latvian (lv)" msgstr "litovčina (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Macedonian (mk)" msgstr "macedónčina (mk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Mongolian (mn)" msgstr "mongolčina (mn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Nepali (ne)" msgstr "nepálčina (ne)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Norwegian Bokmål (nb)" msgstr "nórsky bokmål (nb)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Norwegian Nynorsk (nn)" msgstr "nórsky nynorsk (nn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Panjabi (pa)" msgstr "pandžábčina (pa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Polish (pl)" msgstr "poľština (pl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Portuguese (pt)" msgstr "portugalčina (pt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Portuguese/Brazil (pt_BR)" msgstr "portugalčina (Brazília) (pt_BR)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Romanian (ro)" msgstr "rumunčina (ro)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Russian (ru)" msgstr "ruština (ru)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Serbian (sr)" msgstr "srbčina (sr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Serbian in Latin script (sr@latin)" msgstr "srbčina v latinke (sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Slovak (sk)" msgstr "slovenčina (sk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Slovenian (sl)" msgstr "slovinčina (sl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Spanish (es)" msgstr "španielčina (es)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Spanish/Mexico (es_MX)" msgstr "španielčina (Mexiko) (es_MX)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "Swedish (sv)" msgstr "švédčina (sv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 -#: ../src/ui/dialog/inkscape-preferences.cpp:529 -msgid "Telugu (te)" +#: ../src/ui/dialog/inkscape-preferences.cpp:527 +msgid "Telugu (te_IN)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "Thai (th)" msgstr "thajčina (th)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "Turkish (tr)" msgstr "turečtina (tr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "Ukrainian (uk)" msgstr "ukrajinčina (uk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "Vietnamese (vi)" msgstr "vietnamčina (vi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:568 -#: ../src/ui/dialog/inkscape-preferences.cpp:561 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Language (requires restart):" msgstr "Jazyk (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:569 -#: ../src/ui/dialog/inkscape-preferences.cpp:562 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Set the language for menus and number formats" msgstr "Nastaviť jazyk menu a formát čísel" -#: ../src/ui/dialog/inkscape-preferences.cpp:572 -#: ../src/ui/dialog/inkscape-preferences.cpp:657 -#: ../src/ui/dialog/inkscape-preferences.cpp:565 -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:563 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 msgid "Large" msgstr "veľký" -#: ../src/ui/dialog/inkscape-preferences.cpp:572 -#: ../src/ui/dialog/inkscape-preferences.cpp:657 -#: ../src/ui/dialog/inkscape-preferences.cpp:565 -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:563 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 msgid "Small" msgstr "malý" -#: ../src/ui/dialog/inkscape-preferences.cpp:572 -#: ../src/ui/dialog/inkscape-preferences.cpp:565 +#: ../src/ui/dialog/inkscape-preferences.cpp:563 msgid "Smaller" msgstr "Menší" -#: ../src/ui/dialog/inkscape-preferences.cpp:576 -#: ../src/ui/dialog/inkscape-preferences.cpp:569 +#: ../src/ui/dialog/inkscape-preferences.cpp:567 msgid "Toolbox icon size:" msgstr "Veľkosť ikon panelu nástrojov:" -#: ../src/ui/dialog/inkscape-preferences.cpp:577 -#: ../src/ui/dialog/inkscape-preferences.cpp:570 +#: ../src/ui/dialog/inkscape-preferences.cpp:568 msgid "Set the size for the tool icons (requires restart)" msgstr "Nastavenie veľkosti ikon nástrojov (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:580 -#: ../src/ui/dialog/inkscape-preferences.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:571 msgid "Control bar icon size:" msgstr "Veľkosť ikon ovládacieho panelu nástrojov:" -#: ../src/ui/dialog/inkscape-preferences.cpp:581 -#: ../src/ui/dialog/inkscape-preferences.cpp:574 +#: ../src/ui/dialog/inkscape-preferences.cpp:572 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "Nastaviť veľkosť ikon ovládacieho panelu nástrojov (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:584 -#: ../src/ui/dialog/inkscape-preferences.cpp:577 +#: ../src/ui/dialog/inkscape-preferences.cpp:575 msgid "Secondary toolbar icon size:" msgstr "Veľkosť ikon sekundárneho panelu nástrojov:" -#: ../src/ui/dialog/inkscape-preferences.cpp:585 -#: ../src/ui/dialog/inkscape-preferences.cpp:578 +#: ../src/ui/dialog/inkscape-preferences.cpp:576 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" -msgstr "Nastaviť veľkosť ikon v sekundárnom paneli nástrojov (vyžaduje reštart)" +msgstr "" +"Nastaviť veľkosť ikon v sekundárnom paneli nástrojov (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:588 -#: ../src/ui/dialog/inkscape-preferences.cpp:581 +#: ../src/ui/dialog/inkscape-preferences.cpp:579 msgid "Work-around color sliders not drawing" msgstr "Obídenie chyby nefungujúcich posuvníkov farieb:" -#: ../src/ui/dialog/inkscape-preferences.cpp:590 -#: ../src/ui/dialog/inkscape-preferences.cpp:583 +#: ../src/ui/dialog/inkscape-preferences.cpp:581 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" @@ -19520,19 +16998,16 @@ msgstr "" "Ak je táto voľba zapnutá, Inkscape sa pokúsi pri vykresľovaní posuvníkov " "obísť chyby vykresľovania v niektorých témach GTK" -#: ../src/ui/dialog/inkscape-preferences.cpp:595 -#: ../src/ui/dialog/inkscape-preferences.cpp:588 +#: ../src/ui/dialog/inkscape-preferences.cpp:586 msgid "Clear list" msgstr "Vyčistiť zoznam" -#: ../src/ui/dialog/inkscape-preferences.cpp:598 -#: ../src/ui/dialog/inkscape-preferences.cpp:591 +#: ../src/ui/dialog/inkscape-preferences.cpp:589 #, fuzzy msgid "Maximum documents in Open _Recent:" msgstr "Max. počet Nedávnych dokumentov:" -#: ../src/ui/dialog/inkscape-preferences.cpp:599 -#: ../src/ui/dialog/inkscape-preferences.cpp:592 +#: ../src/ui/dialog/inkscape-preferences.cpp:590 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" @@ -19540,14 +17015,12 @@ msgstr "" "Nastavenie maximálnej dĺžky zoznamu naposledy otvorených súborov v ponuke " "Súbor alebo vyčistenie zoznamu" -#: ../src/ui/dialog/inkscape-preferences.cpp:602 -#: ../src/ui/dialog/inkscape-preferences.cpp:595 +#: ../src/ui/dialog/inkscape-preferences.cpp:593 #, fuzzy msgid "_Zoom correction factor (in %):" msgstr "Koeficient korekcie zmeny mierky (in %):" -#: ../src/ui/dialog/inkscape-preferences.cpp:603 -#: ../src/ui/dialog/inkscape-preferences.cpp:596 +#: ../src/ui/dialog/inkscape-preferences.cpp:594 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " @@ -19557,11 +17030,11 @@ msgstr "" "skutočnej dĺžke. Táto informácia sa použije pri zmene mierky na 1:1, 1:2 " "atď. a na zobrazovanie objektov v ich skutočnej veľkosti." -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:597 msgid "Enable dynamic relayout for incomplete sections" msgstr "Zapnúť dynamickú zmenu rozloženia neúplných častí" -#: ../src/ui/dialog/inkscape-preferences.cpp:608 +#: ../src/ui/dialog/inkscape-preferences.cpp:599 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" @@ -19570,179 +17043,138 @@ msgstr "" "nie sú celkom dokončené" #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:611 -#: ../src/ui/dialog/inkscape-preferences.cpp:599 +#: ../src/ui/dialog/inkscape-preferences.cpp:602 #, fuzzy msgid "Show filter primitives infobox (requires restart)" msgstr "Zobraziť informačná dialóg primitív filtra" -#: ../src/ui/dialog/inkscape-preferences.cpp:613 -#: ../src/ui/dialog/inkscape-preferences.cpp:601 +#: ../src/ui/dialog/inkscape-preferences.cpp:604 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" msgstr "" -"Zobrazovať ikony a popisy primitív filtra dostupných v dialógu efektov " -"filtra" +"Zobrazovať ikony a popisy primitív filtra dostupných v dialógu efektov filtra" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 -#: ../src/ui/dialog/inkscape-preferences.cpp:624 -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#: ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/inkscape-preferences.cpp:607 +#: ../src/ui/dialog/inkscape-preferences.cpp:615 #, fuzzy msgid "Icons only" msgstr "Iba farba" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 -#: ../src/ui/dialog/inkscape-preferences.cpp:624 -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#: ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/inkscape-preferences.cpp:607 +#: ../src/ui/dialog/inkscape-preferences.cpp:615 #, fuzzy msgid "Text only" msgstr "Písmo textu" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 -#: ../src/ui/dialog/inkscape-preferences.cpp:624 -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#: ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/inkscape-preferences.cpp:607 +#: ../src/ui/dialog/inkscape-preferences.cpp:615 #, fuzzy msgid "Icons and text" msgstr "Dnu a von" -#: ../src/ui/dialog/inkscape-preferences.cpp:621 -#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:612 #, fuzzy msgid "Dockbar style (requires restart):" msgstr "Jazyk (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 -#: ../src/ui/dialog/inkscape-preferences.cpp:610 +#: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:629 -#: ../src/ui/dialog/inkscape-preferences.cpp:617 +#: ../src/ui/dialog/inkscape-preferences.cpp:620 #, fuzzy msgid "Switcher style (requires restart):" msgstr "(vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:630 -#: ../src/ui/dialog/inkscape-preferences.cpp:618 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:634 -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "Save and restore window geometry for each document" msgstr "Uložiť a obnoviť geometriu okna pre každý dokument" -#: ../src/ui/dialog/inkscape-preferences.cpp:635 -#: ../src/ui/dialog/inkscape-preferences.cpp:623 +#: ../src/ui/dialog/inkscape-preferences.cpp:626 msgid "Remember and use last window's geometry" msgstr "Zapamätať si a použiť poslednú geometriu okien" -#: ../src/ui/dialog/inkscape-preferences.cpp:636 -#: ../src/ui/dialog/inkscape-preferences.cpp:624 +#: ../src/ui/dialog/inkscape-preferences.cpp:627 msgid "Don't save window geometry" msgstr "Neukladať geometriu okien" -#: ../src/ui/dialog/inkscape-preferences.cpp:638 -#: ../src/ui/dialog/inkscape-preferences.cpp:626 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 msgid "Save and restore dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:639 -#: ../src/ui/dialog/inkscape-preferences.cpp:675 -#: ../src/ui/dialog/inkscape-preferences.cpp:627 -#: ../src/ui/dialog/inkscape-preferences.cpp:663 +#: ../src/ui/dialog/inkscape-preferences.cpp:630 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Don't save dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:641 -#: ../src/ui/dialog/inkscape-preferences.cpp:683 -#: ../src/ui/dialog/inkscape-preferences.cpp:629 -#: ../src/ui/dialog/inkscape-preferences.cpp:671 +#: ../src/ui/dialog/inkscape-preferences.cpp:632 +#: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "Dockable" msgstr "Ukotviteľné" -#: ../src/ui/dialog/inkscape-preferences.cpp:645 -#: ../src/ui/dialog/inkscape-preferences.cpp:633 +#: ../src/ui/dialog/inkscape-preferences.cpp:636 msgid "Native open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:646 -#: ../src/ui/dialog/inkscape-preferences.cpp:634 +#: ../src/ui/dialog/inkscape-preferences.cpp:637 msgid "GTK open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:636 +#: ../src/ui/dialog/inkscape-preferences.cpp:639 msgid "Dialogs are hidden in taskbar" msgstr "Dialógy sú skryté v paneli úloh" -#: ../src/ui/dialog/inkscape-preferences.cpp:649 -#: ../src/ui/dialog/inkscape-preferences.cpp:637 +#: ../src/ui/dialog/inkscape-preferences.cpp:640 #, fuzzy msgid "Save and restore documents viewport" msgstr "Uložiť a obnoviť geometriu okna pre každý dokument" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:638 +#: ../src/ui/dialog/inkscape-preferences.cpp:641 msgid "Zoom when window is resized" msgstr "Zmena mierky zobrazenia pri zmene veľkosti okna" -#: ../src/ui/dialog/inkscape-preferences.cpp:651 -#: ../src/ui/dialog/inkscape-preferences.cpp:639 +#: ../src/ui/dialog/inkscape-preferences.cpp:642 msgid "Show close button on dialogs" msgstr "Zobraziť tlačidlá zatvoriť na dialógoch" -#: ../src/ui/dialog/inkscape-preferences.cpp:652 -#: ../src/ui/dialog/inkscape-preferences.cpp:640 -#, fuzzy -msgctxt "Dialog on top" -msgid "None" -msgstr "Žiadny" - -#: ../src/ui/dialog/inkscape-preferences.cpp:654 -#: ../src/ui/dialog/inkscape-preferences.cpp:642 +#: ../src/ui/dialog/inkscape-preferences.cpp:645 msgid "Aggressive" msgstr "Agresívne" -#: ../src/ui/dialog/inkscape-preferences.cpp:657 -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 #, fuzzy msgid "Maximized" msgstr "Optimalizované" -#: ../src/ui/dialog/inkscape-preferences.cpp:661 -#: ../src/ui/dialog/inkscape-preferences.cpp:649 +#: ../src/ui/dialog/inkscape-preferences.cpp:652 #, fuzzy msgid "Default window size:" msgstr "Štandardné nastavenie mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:662 -#: ../src/ui/dialog/inkscape-preferences.cpp:650 +#: ../src/ui/dialog/inkscape-preferences.cpp:653 #, fuzzy msgid "Set the default window size" msgstr "Vytvoriť predvolený farebný prechod" -#: ../src/ui/dialog/inkscape-preferences.cpp:665 -#: ../src/ui/dialog/inkscape-preferences.cpp:653 +#: ../src/ui/dialog/inkscape-preferences.cpp:656 #, fuzzy msgid "Saving window geometry (size and position)" msgstr "Uložiť geometriu okien (veľkosť a polohu):" -#: ../src/ui/dialog/inkscape-preferences.cpp:667 -#: ../src/ui/dialog/inkscape-preferences.cpp:655 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 msgid "Let the window manager determine placement of all windows" msgstr "Nechať správcu okien určiť umiestnenie všetkých okien" -#: ../src/ui/dialog/inkscape-preferences.cpp:669 -#: ../src/ui/dialog/inkscape-preferences.cpp:657 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" @@ -19750,8 +17182,7 @@ msgstr "" "Pamätať si a používať poslednú geometriu okna (ukladá geometriu v " "používateľských nastaveniach)" -#: ../src/ui/dialog/inkscape-preferences.cpp:671 -#: ../src/ui/dialog/inkscape-preferences.cpp:659 +#: ../src/ui/dialog/inkscape-preferences.cpp:662 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" @@ -19759,99 +17190,82 @@ msgstr "" "Uložiť a obnoviť geometriu okna pre každý dokument (ukladá geometriu v " "dokumente)" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 -#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:664 #, fuzzy msgid "Saving dialogs status" msgstr "Zobrazovať úvodný dialóg" -#: ../src/ui/dialog/inkscape-preferences.cpp:677 -#: ../src/ui/dialog/inkscape-preferences.cpp:665 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:681 -#: ../src/ui/dialog/inkscape-preferences.cpp:669 +#: ../src/ui/dialog/inkscape-preferences.cpp:672 #, fuzzy msgid "Dialog behavior (requires restart)" msgstr "Správanie dialógov (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:687 -#: ../src/ui/dialog/inkscape-preferences.cpp:675 +#: ../src/ui/dialog/inkscape-preferences.cpp:678 #, fuzzy msgid "Desktop integration" msgstr "Cieľ" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 -#: ../src/ui/dialog/inkscape-preferences.cpp:677 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "Use Windows like open and save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 -#: ../src/ui/dialog/inkscape-preferences.cpp:679 +#: ../src/ui/dialog/inkscape-preferences.cpp:682 msgid "Use GTK open and save dialogs " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:695 -#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 msgid "Dialogs on top:" msgstr "Dialógy na vrchu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:698 -#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:689 msgid "Dialogs are treated as regular windows" msgstr "Dialógy sa považujú za bežné okná" -#: ../src/ui/dialog/inkscape-preferences.cpp:700 -#: ../src/ui/dialog/inkscape-preferences.cpp:688 +#: ../src/ui/dialog/inkscape-preferences.cpp:691 msgid "Dialogs stay on top of document windows" msgstr "Dialógy zostávajú na vrchu okien dokumentov" -#: ../src/ui/dialog/inkscape-preferences.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:690 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Same as Normal but may work better with some window managers" msgstr "" "To isté ako Normálne, ale môže lepšie fungovať s niektorými správcami okien" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:693 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 #, fuzzy msgid "Dialog Transparency" msgstr "Priesvitnosť dialógu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:707 -#: ../src/ui/dialog/inkscape-preferences.cpp:695 +#: ../src/ui/dialog/inkscape-preferences.cpp:698 #, fuzzy msgid "_Opacity when focused:" msgstr "Krytie pri zameraní:" -#: ../src/ui/dialog/inkscape-preferences.cpp:709 -#: ../src/ui/dialog/inkscape-preferences.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:700 #, fuzzy msgid "Opacity when _unfocused:" msgstr "Krytie keď nie je zamerané:" -#: ../src/ui/dialog/inkscape-preferences.cpp:711 -#: ../src/ui/dialog/inkscape-preferences.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 #, fuzzy msgid "_Time of opacity change animation:" msgstr "Trvanie animácie zmeny krytia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:714 -#: ../src/ui/dialog/inkscape-preferences.cpp:702 +#: ../src/ui/dialog/inkscape-preferences.cpp:705 #, fuzzy msgid "Miscellaneous" msgstr "Rôzne:" -#: ../src/ui/dialog/inkscape-preferences.cpp:717 -#: ../src/ui/dialog/inkscape-preferences.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:708 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "Či je možné okná dialógov skryť v pracovných úlohách správcu okien" -#: ../src/ui/dialog/inkscape-preferences.cpp:720 -#: ../src/ui/dialog/inkscape-preferences.cpp:708 +#: ../src/ui/dialog/inkscape-preferences.cpp:711 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " @@ -19861,165 +17275,132 @@ msgstr "" "zobrazená rovnaká oblasť (toto je štandard, ktorý je možné zmeniť v " "ktoromkoľvek okne pomocou lupy nad posuvníkmi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:722 -#: ../src/ui/dialog/inkscape-preferences.cpp:710 +#: ../src/ui/dialog/inkscape-preferences.cpp:713 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:724 -#: ../src/ui/dialog/inkscape-preferences.cpp:712 +#: ../src/ui/dialog/inkscape-preferences.cpp:715 msgid "Whether dialog windows have a close button (requires restart)" msgstr "Či dialógové okná majú tlačidlo „zatvoriť“ (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:725 -#: ../src/ui/dialog/inkscape-preferences.cpp:713 +#: ../src/ui/dialog/inkscape-preferences.cpp:716 msgid "Windows" msgstr "Okná" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:728 -#: ../src/ui/dialog/inkscape-preferences.cpp:716 +#: ../src/ui/dialog/inkscape-preferences.cpp:719 msgid "Line color when zooming out" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:731 -#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/ui/dialog/inkscape-preferences.cpp:722 #, fuzzy msgid "The gridlines will be shown in minor grid line color" msgstr "" "Ak je voľba nastavená, pri oddialení sa čiary mriežky zobrazia bežnou farbou " "namiesto použitia farby hlavnej čiary mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:733 -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:724 #, fuzzy msgid "The gridlines will be shown in major grid line color" msgstr "" "Ak je voľba nastavená, pri oddialení sa čiary mriežky zobrazia bežnou farbou " "namiesto použitia farby hlavnej čiary mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:735 -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:726 msgid "Default grid settings" msgstr "Štandardné nastavenie mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:741 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 -#: ../src/ui/dialog/inkscape-preferences.cpp:729 -#: ../src/ui/dialog/inkscape-preferences.cpp:754 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 +#: ../src/ui/dialog/inkscape-preferences.cpp:757 msgid "Grid units:" msgstr "Jednotky mriežky:" -#: ../src/ui/dialog/inkscape-preferences.cpp:746 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 -#: ../src/ui/dialog/inkscape-preferences.cpp:734 -#: ../src/ui/dialog/inkscape-preferences.cpp:759 +#: ../src/ui/dialog/inkscape-preferences.cpp:737 +#: ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "Origin X:" msgstr "Začiatok X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:747 -#: ../src/ui/dialog/inkscape-preferences.cpp:772 -#: ../src/ui/dialog/inkscape-preferences.cpp:735 -#: ../src/ui/dialog/inkscape-preferences.cpp:760 +#: ../src/ui/dialog/inkscape-preferences.cpp:738 +#: ../src/ui/dialog/inkscape-preferences.cpp:763 msgid "Origin Y:" msgstr "Začiatok Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:752 -#: ../src/ui/dialog/inkscape-preferences.cpp:740 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 msgid "Spacing X:" msgstr "Rozostup X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:753 -#: ../src/ui/dialog/inkscape-preferences.cpp:775 -#: ../src/ui/dialog/inkscape-preferences.cpp:741 -#: ../src/ui/dialog/inkscape-preferences.cpp:763 +#: ../src/ui/dialog/inkscape-preferences.cpp:744 +#: ../src/ui/dialog/inkscape-preferences.cpp:766 msgid "Spacing Y:" msgstr "Rozostup Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:755 -#: ../src/ui/dialog/inkscape-preferences.cpp:756 -#: ../src/ui/dialog/inkscape-preferences.cpp:780 -#: ../src/ui/dialog/inkscape-preferences.cpp:781 -#: ../src/ui/dialog/inkscape-preferences.cpp:743 -#: ../src/ui/dialog/inkscape-preferences.cpp:744 -#: ../src/ui/dialog/inkscape-preferences.cpp:768 -#: ../src/ui/dialog/inkscape-preferences.cpp:769 +#: ../src/ui/dialog/inkscape-preferences.cpp:746 +#: ../src/ui/dialog/inkscape-preferences.cpp:747 +#: ../src/ui/dialog/inkscape-preferences.cpp:771 +#: ../src/ui/dialog/inkscape-preferences.cpp:772 #, fuzzy msgid "Minor grid line color:" msgstr "Farba _hlavnej čiary mriežky:" -#: ../src/ui/dialog/inkscape-preferences.cpp:756 -#: ../src/ui/dialog/inkscape-preferences.cpp:781 -#: ../src/ui/dialog/inkscape-preferences.cpp:744 -#: ../src/ui/dialog/inkscape-preferences.cpp:769 +#: ../src/ui/dialog/inkscape-preferences.cpp:747 +#: ../src/ui/dialog/inkscape-preferences.cpp:772 msgid "Color used for normal grid lines" msgstr "Farba pre bežné čiary mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:757 -#: ../src/ui/dialog/inkscape-preferences.cpp:758 -#: ../src/ui/dialog/inkscape-preferences.cpp:782 -#: ../src/ui/dialog/inkscape-preferences.cpp:783 -#: ../src/ui/dialog/inkscape-preferences.cpp:745 -#: ../src/ui/dialog/inkscape-preferences.cpp:746 -#: ../src/ui/dialog/inkscape-preferences.cpp:770 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 +#: ../src/ui/dialog/inkscape-preferences.cpp:748 +#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:773 +#: ../src/ui/dialog/inkscape-preferences.cpp:774 msgid "Major grid line color:" msgstr "Farba hlavnej čiary mriežky:" -#: ../src/ui/dialog/inkscape-preferences.cpp:758 -#: ../src/ui/dialog/inkscape-preferences.cpp:783 -#: ../src/ui/dialog/inkscape-preferences.cpp:746 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 +#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:774 msgid "Color used for major (highlighted) grid lines" msgstr "Farba hlavných (zvýraznených) čiar mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:760 -#: ../src/ui/dialog/inkscape-preferences.cpp:785 -#: ../src/ui/dialog/inkscape-preferences.cpp:748 -#: ../src/ui/dialog/inkscape-preferences.cpp:773 +#: ../src/ui/dialog/inkscape-preferences.cpp:751 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 msgid "Major grid line every:" msgstr "Hlavná čiara mriežky každých:" -#: ../src/ui/dialog/inkscape-preferences.cpp:761 -#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:752 msgid "Show dots instead of lines" msgstr "Zobraziť body namiesto čiar" -#: ../src/ui/dialog/inkscape-preferences.cpp:762 -#: ../src/ui/dialog/inkscape-preferences.cpp:750 +#: ../src/ui/dialog/inkscape-preferences.cpp:753 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "" "Ak je voľba nastavená, zobrazí bodky priesečníkov mriežky namiesto čiar " "mriežky" -#: ../src/ui/dialog/inkscape-preferences.cpp:843 -#: ../src/ui/dialog/inkscape-preferences.cpp:831 +#: ../src/ui/dialog/inkscape-preferences.cpp:834 #, fuzzy msgid "Input/Output" msgstr "Výstup" -#: ../src/ui/dialog/inkscape-preferences.cpp:846 -#: ../src/ui/dialog/inkscape-preferences.cpp:834 +#: ../src/ui/dialog/inkscape-preferences.cpp:837 msgid "Use current directory for \"Save As ...\"" msgstr "Použiť aktuálny adresár pre „Uložiť ako...“" -#: ../src/ui/dialog/inkscape-preferences.cpp:848 +#: ../src/ui/dialog/inkscape-preferences.cpp:839 +#, fuzzy msgid "" -"When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " -"will always open in the directory where the currently open document is; when " -"it's off, each will open in the directory where you last saved a file using " -"it" +"When this option is on, the \"Save as...\" and \"Save a Copy\" dialogs will " +"always open in the directory where the currently open document is; when it's " +"off, each will open in the directory where you last saved a file using it" msgstr "" +"Keď je táto voľba zapnutá, v dialógu „Uložiť ako...“ sa vždy otvorí adresár, " +"kde sa nachádza aktuálny dokument. Keď je vypnutá, otvorí sa adresár, kde sa " +"nachádza posledný súbor, ktorý ste týmto dialógom uložili" -#: ../src/ui/dialog/inkscape-preferences.cpp:850 -#: ../src/ui/dialog/inkscape-preferences.cpp:838 +#: ../src/ui/dialog/inkscape-preferences.cpp:841 msgid "Add label comments to printing output" msgstr "Pridať komentár na štítku na tlačový výstup" -#: ../src/ui/dialog/inkscape-preferences.cpp:852 -#: ../src/ui/dialog/inkscape-preferences.cpp:840 +#: ../src/ui/dialog/inkscape-preferences.cpp:843 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" @@ -20027,14 +17408,12 @@ msgstr "" "Ak je voľba zapnutá, komentár (štítok) označí vykreslený výstup objektu v " "hrubom výstupe pre tlač" -#: ../src/ui/dialog/inkscape-preferences.cpp:854 -#: ../src/ui/dialog/inkscape-preferences.cpp:842 +#: ../src/ui/dialog/inkscape-preferences.cpp:845 #, fuzzy msgid "Add default metadata to new documents" msgstr "Štandardné metadáta, ktoré sa použijú pre nové dokumenty:" -#: ../src/ui/dialog/inkscape-preferences.cpp:856 -#: ../src/ui/dialog/inkscape-preferences.cpp:844 +#: ../src/ui/dialog/inkscape-preferences.cpp:847 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." @@ -20042,19 +17421,16 @@ msgstr "" "Pridať predvolené metadáta do nových dokumentov. Predvolené metadáta je " "možné nastaviť vo Vlastnosti dokumentu -> Metadáta." -#: ../src/ui/dialog/inkscape-preferences.cpp:860 -#: ../src/ui/dialog/inkscape-preferences.cpp:848 +#: ../src/ui/dialog/inkscape-preferences.cpp:851 msgid "_Grab sensitivity:" msgstr "Citlivosť _zachytenia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:860 -#: ../src/ui/dialog/inkscape-preferences.cpp:848 +#: ../src/ui/dialog/inkscape-preferences.cpp:851 #, fuzzy msgid "pixels (requires restart)" msgstr "(vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:861 -#: ../src/ui/dialog/inkscape-preferences.cpp:849 +#: ../src/ui/dialog/inkscape-preferences.cpp:852 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" @@ -20062,47 +17438,37 @@ msgstr "" "Ako blízko na obrazovke musíte byť, aby ste boli schopný zachytiť objekt " "myšou (v pixloch)" -#: ../src/ui/dialog/inkscape-preferences.cpp:863 -#: ../src/ui/dialog/inkscape-preferences.cpp:851 +#: ../src/ui/dialog/inkscape-preferences.cpp:854 msgid "_Click/drag threshold:" msgstr "Prah _kliknutia/ťahania:" -#: ../src/ui/dialog/inkscape-preferences.cpp:863 -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 -#: ../src/ui/dialog/inkscape-preferences.cpp:1219 -#: ../src/ui/dialog/inkscape-preferences.cpp:851 -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:854 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 +#: ../src/ui/dialog/inkscape-preferences.cpp:1200 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "pixels" msgstr "bodov" -#: ../src/ui/dialog/inkscape-preferences.cpp:864 -#: ../src/ui/dialog/inkscape-preferences.cpp:852 +#: ../src/ui/dialog/inkscape-preferences.cpp:855 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" "Maximálne ťahanie myšou, (v bodoch), ktoré je považované za kliknutie a nie " "za ťahanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:867 -#: ../src/ui/dialog/inkscape-preferences.cpp:855 +#: ../src/ui/dialog/inkscape-preferences.cpp:858 msgid "_Handle size:" msgstr "_Veľkosť úchopu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:868 -#: ../src/ui/dialog/inkscape-preferences.cpp:856 +#: ../src/ui/dialog/inkscape-preferences.cpp:859 msgid "Set the relative size of node handles" msgstr "Nastaviť relatívnu veľkosť úchopov uzlov" -#: ../src/ui/dialog/inkscape-preferences.cpp:870 -#: ../src/ui/dialog/inkscape-preferences.cpp:858 +#: ../src/ui/dialog/inkscape-preferences.cpp:861 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "Použiť zariadenie citlivé na prítlak (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:872 -#: ../src/ui/dialog/inkscape-preferences.cpp:860 +#: ../src/ui/dialog/inkscape-preferences.cpp:863 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " @@ -20112,30 +17478,25 @@ msgstr "" "Vypnite túto voľbu iba ak máte problém s tabletom (stále ho však môžete " "používať ako myš)." -#: ../src/ui/dialog/inkscape-preferences.cpp:874 -#: ../src/ui/dialog/inkscape-preferences.cpp:862 +#: ../src/ui/dialog/inkscape-preferences.cpp:865 msgid "Switch tool based on tablet device (requires restart)" msgstr "Zmeniť nástroj na podľa tabletu (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:876 -#: ../src/ui/dialog/inkscape-preferences.cpp:864 +#: ../src/ui/dialog/inkscape-preferences.cpp:867 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "Zmeniť nástroj pri použití rôznych nástrojov tabletu (pero, guma, myš)" -#: ../src/ui/dialog/inkscape-preferences.cpp:877 -#: ../src/ui/dialog/inkscape-preferences.cpp:865 +#: ../src/ui/dialog/inkscape-preferences.cpp:868 msgid "Input devices" msgstr "Vstupné zariadenia" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:880 -#: ../src/ui/dialog/inkscape-preferences.cpp:868 +#: ../src/ui/dialog/inkscape-preferences.cpp:871 msgid "Use named colors" msgstr "Použiť pomenované farby" -#: ../src/ui/dialog/inkscape-preferences.cpp:881 -#: ../src/ui/dialog/inkscape-preferences.cpp:869 +#: ../src/ui/dialog/inkscape-preferences.cpp:872 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" @@ -20143,28 +17504,23 @@ msgstr "" "Ak je voľba nastavená, vypíše CSS názov farby ak existuje (napr. „red“ alebo " "„magenta“) namiesto jej číselnej hodnoty." -#: ../src/ui/dialog/inkscape-preferences.cpp:883 -#: ../src/ui/dialog/inkscape-preferences.cpp:871 +#: ../src/ui/dialog/inkscape-preferences.cpp:874 msgid "XML formatting" msgstr "Formátovanie XML" -#: ../src/ui/dialog/inkscape-preferences.cpp:885 -#: ../src/ui/dialog/inkscape-preferences.cpp:873 +#: ../src/ui/dialog/inkscape-preferences.cpp:876 msgid "Inline attributes" msgstr "Inline atribúty" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 -#: ../src/ui/dialog/inkscape-preferences.cpp:874 +#: ../src/ui/dialog/inkscape-preferences.cpp:877 msgid "Put attributes on the same line as the element tag" msgstr "Dať atribúty na rovnaký riadok ako značku elementu" -#: ../src/ui/dialog/inkscape-preferences.cpp:889 -#: ../src/ui/dialog/inkscape-preferences.cpp:877 +#: ../src/ui/dialog/inkscape-preferences.cpp:880 msgid "_Indent, spaces:" msgstr "Odsaden_ie, medzery:" -#: ../src/ui/dialog/inkscape-preferences.cpp:889 -#: ../src/ui/dialog/inkscape-preferences.cpp:877 +#: ../src/ui/dialog/inkscape-preferences.cpp:880 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" @@ -20172,49 +17528,40 @@ msgstr "" "Počet medzier, ktoré sa použijú na odsadenie vnorených prvkov. 0 znamená bez " "odsadenia." -#: ../src/ui/dialog/inkscape-preferences.cpp:891 -#: ../src/ui/dialog/inkscape-preferences.cpp:879 +#: ../src/ui/dialog/inkscape-preferences.cpp:882 msgid "Path data" msgstr "Údaje cesty" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:885 msgid "Absolute" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:885 #, fuzzy msgid "Relative" msgstr "Relatívne k: " -#: ../src/ui/dialog/inkscape-preferences.cpp:894 -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 -#: ../src/ui/dialog/inkscape-preferences.cpp:882 -#: ../src/ui/dialog/inkscape-preferences.cpp:1172 +#: ../src/ui/dialog/inkscape-preferences.cpp:885 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "Optimized" msgstr "Optimalizované" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:889 msgid "Path string format:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:889 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " "relative coordinates)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:900 -#: ../src/ui/dialog/inkscape-preferences.cpp:888 +#: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "Force repeat commands" msgstr "Vynútiť opakovanie príkazov" -#: ../src/ui/dialog/inkscape-preferences.cpp:901 -#: ../src/ui/dialog/inkscape-preferences.cpp:889 +#: ../src/ui/dialog/inkscape-preferences.cpp:892 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" @@ -20222,28 +17569,23 @@ msgstr "" "Vynútiť opakovanie rovnakého príkazu (napr. výstup „L 1,2 L 3,4“ namiesto „L " "1,2 3,4“)" -#: ../src/ui/dialog/inkscape-preferences.cpp:903 -#: ../src/ui/dialog/inkscape-preferences.cpp:891 +#: ../src/ui/dialog/inkscape-preferences.cpp:894 msgid "Numbers" msgstr "Čísla" -#: ../src/ui/dialog/inkscape-preferences.cpp:906 -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 msgid "_Numeric precision:" msgstr "Čísel_ná presnosť:" -#: ../src/ui/dialog/inkscape-preferences.cpp:906 -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 msgid "Significant figures of the values written to the SVG file" msgstr "Významné čísla hodnôt zapísané do súboru SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:909 -#: ../src/ui/dialog/inkscape-preferences.cpp:897 +#: ../src/ui/dialog/inkscape-preferences.cpp:900 msgid "Minimum _exponent:" msgstr "Minimálny _exponent:" -#: ../src/ui/dialog/inkscape-preferences.cpp:909 -#: ../src/ui/dialog/inkscape-preferences.cpp:897 +#: ../src/ui/dialog/inkscape-preferences.cpp:900 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -20253,22 +17595,17 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:914 -#: ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "Improper Attributes Actions" msgstr "Činnosť v prípade nesprávnych atribútov" -#: ../src/ui/dialog/inkscape-preferences.cpp:916 -#: ../src/ui/dialog/inkscape-preferences.cpp:924 -#: ../src/ui/dialog/inkscape-preferences.cpp:932 -#: ../src/ui/dialog/inkscape-preferences.cpp:904 -#: ../src/ui/dialog/inkscape-preferences.cpp:912 -#: ../src/ui/dialog/inkscape-preferences.cpp:920 +#: ../src/ui/dialog/inkscape-preferences.cpp:907 +#: ../src/ui/dialog/inkscape-preferences.cpp:915 +#: ../src/ui/dialog/inkscape-preferences.cpp:923 msgid "Print warnings" msgstr "Vypisovať upozornenia" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 -#: ../src/ui/dialog/inkscape-preferences.cpp:905 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." @@ -20276,52 +17613,43 @@ msgstr "" "Vypisovať upozornenia ak sa zistia neplatné alebo neužitočné atribúty. " "Databázové súbory sa nachádzajú v inkscape_data_dir/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:918 -#: ../src/ui/dialog/inkscape-preferences.cpp:906 +#: ../src/ui/dialog/inkscape-preferences.cpp:909 msgid "Remove attributes" msgstr "Odstrániť atribúty" -#: ../src/ui/dialog/inkscape-preferences.cpp:919 -#: ../src/ui/dialog/inkscape-preferences.cpp:907 +#: ../src/ui/dialog/inkscape-preferences.cpp:910 msgid "Delete invalid or non-useful attributes from element tag" msgstr "Zmazať neplatné alebo neužitočné atribúty zo značky" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:922 -#: ../src/ui/dialog/inkscape-preferences.cpp:910 +#: ../src/ui/dialog/inkscape-preferences.cpp:913 msgid "Inappropriate Style Properties Actions" msgstr "Činnosť v prípade nevhodného štýlu" -#: ../src/ui/dialog/inkscape-preferences.cpp:925 -#: ../src/ui/dialog/inkscape-preferences.cpp:913 +#: ../src/ui/dialog/inkscape-preferences.cpp:916 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." msgstr "" "Vypisovať upozornenia ak sa nájdu vlastnosti nevhodného štýlu (napr. \"font-" -"family\" na ). Databázové súbory sa nachádzajú v " -"inkscape_data_dir/attributes." +"family\" na ). Databázové súbory sa nachádzajú v inkscape_data_dir/" +"attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:926 -#: ../src/ui/dialog/inkscape-preferences.cpp:934 -#: ../src/ui/dialog/inkscape-preferences.cpp:914 -#: ../src/ui/dialog/inkscape-preferences.cpp:922 +#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 msgid "Remove style properties" msgstr "Odstrániť vlastnosti štýlu" -#: ../src/ui/dialog/inkscape-preferences.cpp:927 -#: ../src/ui/dialog/inkscape-preferences.cpp:915 +#: ../src/ui/dialog/inkscape-preferences.cpp:918 msgid "Delete inappropriate style properties" msgstr "Odstrániť nevhodné vlastnosti štýlu" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:930 -#: ../src/ui/dialog/inkscape-preferences.cpp:918 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "Non-useful Style Properties Actions" msgstr "Činnosť v prípade neužitočných vlastností štýlu" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 -#: ../src/ui/dialog/inkscape-preferences.cpp:921 +#: ../src/ui/dialog/inkscape-preferences.cpp:924 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " @@ -20330,26 +17658,22 @@ msgid "" msgstr "" "Vypisovať upozornenia ak sa nájdu nadbytočné vlastnosti štýlu (napr. ak má " "vlastnosť predvolenú hodnota a nezdedí inú hodnotu alebo ak je hodnota je " -"rovnaká ako by zdedila). Databázové súbory sa nachádzajú v " -"inkscape_data_dir/attributes." +"rovnaká ako by zdedila). Databázové súbory sa nachádzajú v inkscape_data_dir/" +"attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:935 -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:926 msgid "Delete redundant style properties" msgstr "Odstrániť nadbytočné vlastnosti štýlu" -#: ../src/ui/dialog/inkscape-preferences.cpp:937 -#: ../src/ui/dialog/inkscape-preferences.cpp:925 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 msgid "Check Attributes and Style Properties on" msgstr "Skontrolovať atribúty a vlastnosti štýlu pri" -#: ../src/ui/dialog/inkscape-preferences.cpp:939 -#: ../src/ui/dialog/inkscape-preferences.cpp:927 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Reading" msgstr "čítaní" -#: ../src/ui/dialog/inkscape-preferences.cpp:940 -#: ../src/ui/dialog/inkscape-preferences.cpp:928 +#: ../src/ui/dialog/inkscape-preferences.cpp:931 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" @@ -20357,13 +17681,11 @@ msgstr "" "Skontrolovať atribúty a vlastnosti štýlu pri čítaní súborov SVG (vrátane " "interných súborov Inkscape, čo spomalí spúšťanie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:941 -#: ../src/ui/dialog/inkscape-preferences.cpp:929 +#: ../src/ui/dialog/inkscape-preferences.cpp:932 msgid "Editing" msgstr "upravovaní" -#: ../src/ui/dialog/inkscape-preferences.cpp:942 -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:933 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" @@ -20371,49 +17693,40 @@ msgstr "" "Skontrolovať atribúty a vlastnosti štýlu pri upravovaní súborov SVG (vrátane " "interných súborov Inkscape, čo spomalí spúšťanie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 -#: ../src/ui/dialog/inkscape-preferences.cpp:931 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "Writing" msgstr "zapisovaní" -#: ../src/ui/dialog/inkscape-preferences.cpp:944 -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:935 msgid "Check attributes and style properties on writing out SVG files" msgstr "Skontrolovať atribúty a vlastnosti štýlu pri zapisovaní súborov SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:946 -#: ../src/ui/dialog/inkscape-preferences.cpp:934 +#: ../src/ui/dialog/inkscape-preferences.cpp:937 msgid "SVG output" msgstr "Výstup SVG" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:952 -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Perceptual" msgstr "Perceptuálny" -#: ../src/ui/dialog/inkscape-preferences.cpp:952 -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Relative Colorimetric" msgstr "Relatívny kolorimetrický" -#: ../src/ui/dialog/inkscape-preferences.cpp:952 -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Absolute Colorimetric" msgstr "Absolútna kolorimetrická" -#: ../src/ui/dialog/inkscape-preferences.cpp:956 -#: ../src/ui/dialog/inkscape-preferences.cpp:944 +#: ../src/ui/dialog/inkscape-preferences.cpp:947 msgid "(Note: Color management has been disabled in this build)" msgstr "(Pozn.: Správa farieb bola v tomto zostavení vypnutá)" -#: ../src/ui/dialog/inkscape-preferences.cpp:960 -#: ../src/ui/dialog/inkscape-preferences.cpp:948 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "Display adjustment" msgstr "Nastavenie displeja" -#: ../src/ui/dialog/inkscape-preferences.cpp:970 -#: ../src/ui/dialog/inkscape-preferences.cpp:958 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" @@ -20422,139 +17735,111 @@ msgstr "" "ICC profil použitý na kalibráciu výstupu displeja.\n" "Prehľadané adresáre: %s" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 -#: ../src/ui/dialog/inkscape-preferences.cpp:959 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "Display profile:" msgstr "Zobrazovací profil:" -#: ../src/ui/dialog/inkscape-preferences.cpp:976 -#: ../src/ui/dialog/inkscape-preferences.cpp:964 +#: ../src/ui/dialog/inkscape-preferences.cpp:967 msgid "Retrieve profile from display" msgstr "Získať profil z displeja" -#: ../src/ui/dialog/inkscape-preferences.cpp:979 -#: ../src/ui/dialog/inkscape-preferences.cpp:967 +#: ../src/ui/dialog/inkscape-preferences.cpp:970 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "" "Získať profil z tých, ktoré sú pripojené k displeju prostredníctvom XICC" -#: ../src/ui/dialog/inkscape-preferences.cpp:981 -#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:972 msgid "Retrieve profiles from those attached to displays" msgstr "Získať profil z tých, ktoré sú pripojené k displejom" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 msgid "Display rendering intent:" msgstr "Zobrazovací zámer displeja:" -#: ../src/ui/dialog/inkscape-preferences.cpp:987 -#: ../src/ui/dialog/inkscape-preferences.cpp:975 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "The rendering intent to use to calibrate display output" msgstr "Vykresľovací zámer, ktorý sa má použiť na kalibráciu výstupu displeja" -#: ../src/ui/dialog/inkscape-preferences.cpp:989 -#: ../src/ui/dialog/inkscape-preferences.cpp:977 +#: ../src/ui/dialog/inkscape-preferences.cpp:980 msgid "Proofing" msgstr "Kontrola" -#: ../src/ui/dialog/inkscape-preferences.cpp:991 -#: ../src/ui/dialog/inkscape-preferences.cpp:979 +#: ../src/ui/dialog/inkscape-preferences.cpp:982 msgid "Simulate output on screen" msgstr "Simulovať výstup na obrazovku" -#: ../src/ui/dialog/inkscape-preferences.cpp:993 -#: ../src/ui/dialog/inkscape-preferences.cpp:981 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "Simulates output of target device" msgstr "Simulovať výstup na cieľové zariadenie" -#: ../src/ui/dialog/inkscape-preferences.cpp:995 -#: ../src/ui/dialog/inkscape-preferences.cpp:983 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "Mark out of gamut colors" msgstr "Vyznačiť farby mimo gamut" -#: ../src/ui/dialog/inkscape-preferences.cpp:997 -#: ../src/ui/dialog/inkscape-preferences.cpp:985 +#: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "Highlights colors that are out of gamut for the target device" msgstr "Zvýrazní farby, ktoré sú na cieľovom zariadení mimo gamut" -#: ../src/ui/dialog/inkscape-preferences.cpp:1009 -#: ../src/ui/dialog/inkscape-preferences.cpp:997 +#: ../src/ui/dialog/inkscape-preferences.cpp:1000 msgid "Out of gamut warning color:" msgstr "Farba varovania mimo gamut:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1010 -#: ../src/ui/dialog/inkscape-preferences.cpp:998 +#: ../src/ui/dialog/inkscape-preferences.cpp:1001 msgid "Selects the color used for out of gamut warning" msgstr "Určuje farbu, ktorá sa použije pre upozornenie mimo gamut" -#: ../src/ui/dialog/inkscape-preferences.cpp:1012 -#: ../src/ui/dialog/inkscape-preferences.cpp:1000 +#: ../src/ui/dialog/inkscape-preferences.cpp:1003 msgid "Device profile:" msgstr "Profil zariadenia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1013 -#: ../src/ui/dialog/inkscape-preferences.cpp:1001 +#: ../src/ui/dialog/inkscape-preferences.cpp:1004 msgid "The ICC profile to use to simulate device output" msgstr "ICC profil, ktorý sa má použiť na simuláciu cieľového zariadenia" -#: ../src/ui/dialog/inkscape-preferences.cpp:1016 -#: ../src/ui/dialog/inkscape-preferences.cpp:1004 +#: ../src/ui/dialog/inkscape-preferences.cpp:1007 msgid "Device rendering intent:" msgstr "Zobrazovací zámer zariadenia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1017 -#: ../src/ui/dialog/inkscape-preferences.cpp:1005 +#: ../src/ui/dialog/inkscape-preferences.cpp:1008 msgid "The rendering intent to use to calibrate device output" msgstr "Vykresľovací zámer, ktorý sa má použiť na kalibráciu výstupu displeja" -#: ../src/ui/dialog/inkscape-preferences.cpp:1019 -#: ../src/ui/dialog/inkscape-preferences.cpp:1007 +#: ../src/ui/dialog/inkscape-preferences.cpp:1010 msgid "Black point compensation" msgstr "Kompenzácia čierneho bodu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1021 -#: ../src/ui/dialog/inkscape-preferences.cpp:1009 +#: ../src/ui/dialog/inkscape-preferences.cpp:1012 msgid "Enables black point compensation" msgstr "Zapína kompenzáciu čierneho bodu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 -#: ../src/ui/dialog/inkscape-preferences.cpp:1011 +#: ../src/ui/dialog/inkscape-preferences.cpp:1014 msgid "Preserve black" msgstr "Zachovať čiernu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1030 -#: ../src/ui/dialog/inkscape-preferences.cpp:1018 +#: ../src/ui/dialog/inkscape-preferences.cpp:1021 msgid "(LittleCMS 1.15 or later required)" msgstr "(Vyžaduje sa LittleCMS 1.15)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1032 -#: ../src/ui/dialog/inkscape-preferences.cpp:1020 +#: ../src/ui/dialog/inkscape-preferences.cpp:1023 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "Zachovávať K kanál pri transformáciách CMYK -> CMYK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1046 -#: ../src/widgets/sp-color-icc-selector.cpp:449 -#: ../src/widgets/sp-color-icc-selector.cpp:741 -#: ../src/ui/dialog/inkscape-preferences.cpp:1034 +#: ../src/ui/dialog/inkscape-preferences.cpp:1037 #: ../src/widgets/sp-color-icc-selector.cpp:474 #: ../src/widgets/sp-color-icc-selector.cpp:766 msgid "" msgstr "<žiadne>" -#: ../src/ui/dialog/inkscape-preferences.cpp:1091 -#: ../src/ui/dialog/inkscape-preferences.cpp:1079 +#: ../src/ui/dialog/inkscape-preferences.cpp:1082 msgid "Color management" msgstr "Správa farieb" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1094 -#: ../src/ui/dialog/inkscape-preferences.cpp:1082 +#: ../src/ui/dialog/inkscape-preferences.cpp:1085 msgid "Enable autosave (requires restart)" msgstr "Zapnúť automatické ukladanie (vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1095 -#: ../src/ui/dialog/inkscape-preferences.cpp:1083 +#: ../src/ui/dialog/inkscape-preferences.cpp:1086 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" @@ -20562,14 +17847,12 @@ msgstr "" "Automatické ukladanie aktuálneho dokumentu na disk v danom intervale, čím sa " "minimalizuje strata pri havárii programu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1101 -#: ../src/ui/dialog/inkscape-preferences.cpp:1089 +#: ../src/ui/dialog/inkscape-preferences.cpp:1092 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "A_dresár na automatické ukladanie:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1101 -#: ../src/ui/dialog/inkscape-preferences.cpp:1089 +#: ../src/ui/dialog/inkscape-preferences.cpp:1092 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " @@ -20578,25 +17861,21 @@ msgstr "" "absolútna cesta (začínajúca znakom / na unixových systémoch alebo písmenom " "jednotky ako napríklad C: vo Windows)." -#: ../src/ui/dialog/inkscape-preferences.cpp:1103 -#: ../src/ui/dialog/inkscape-preferences.cpp:1091 +#: ../src/ui/dialog/inkscape-preferences.cpp:1094 msgid "_Interval (in minutes):" msgstr "_Interval (v minútach):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1103 -#: ../src/ui/dialog/inkscape-preferences.cpp:1091 +#: ../src/ui/dialog/inkscape-preferences.cpp:1094 msgid "Interval (in minutes) at which document will be autosaved" msgstr "" "Nastavuje interval (v minútach), v ktorom sa bude dokument automaticky " "ukladať na disk" -#: ../src/ui/dialog/inkscape-preferences.cpp:1105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1093 +#: ../src/ui/dialog/inkscape-preferences.cpp:1096 msgid "_Maximum number of autosaves:" msgstr "_Max. počet automatických uložení:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1093 +#: ../src/ui/dialog/inkscape-preferences.cpp:1096 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -20615,18 +17894,15 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1120 -#: ../src/ui/dialog/inkscape-preferences.cpp:1108 +#: ../src/ui/dialog/inkscape-preferences.cpp:1111 msgid "Autosave" msgstr "Automatické ukladanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1124 -#: ../src/ui/dialog/inkscape-preferences.cpp:1112 +#: ../src/ui/dialog/inkscape-preferences.cpp:1115 msgid "Open Clip Art Library _Server Name:" msgstr "Názov _servera Open Clip Art Library:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1125 -#: ../src/ui/dialog/inkscape-preferences.cpp:1113 +#: ../src/ui/dialog/inkscape-preferences.cpp:1116 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" @@ -20634,45 +17910,37 @@ msgstr "" "Názov WebDAV servera Open Clip Art Library. Využíva ho funkcia Import/Export " "do OCAL." -#: ../src/ui/dialog/inkscape-preferences.cpp:1127 -#: ../src/ui/dialog/inkscape-preferences.cpp:1115 +#: ../src/ui/dialog/inkscape-preferences.cpp:1118 msgid "Open Clip Art Library _Username:" msgstr "Po_užívateľské meno do Open Clip Art Library:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1128 -#: ../src/ui/dialog/inkscape-preferences.cpp:1116 +#: ../src/ui/dialog/inkscape-preferences.cpp:1119 msgid "The username used to log into Open Clip Art Library" msgstr "" "Používateľské meno, ktoré používate pre prihlásenie sa do knižnice Open Clip " "Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1130 -#: ../src/ui/dialog/inkscape-preferences.cpp:1118 +#: ../src/ui/dialog/inkscape-preferences.cpp:1121 msgid "Open Clip Art Library _Password:" msgstr "_Heslo do Open Clip Art Library:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1131 -#: ../src/ui/dialog/inkscape-preferences.cpp:1119 +#: ../src/ui/dialog/inkscape-preferences.cpp:1122 msgid "The password used to log into Open Clip Art Library" msgstr "Heslo, ktoré používate pre prihlásenie sa do knižnice Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1132 -#: ../src/ui/dialog/inkscape-preferences.cpp:1120 +#: ../src/ui/dialog/inkscape-preferences.cpp:1123 msgid "Open Clip Art" msgstr "Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 -#: ../src/ui/dialog/inkscape-preferences.cpp:1125 +#: ../src/ui/dialog/inkscape-preferences.cpp:1128 msgid "Behavior" msgstr "Správanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1141 -#: ../src/ui/dialog/inkscape-preferences.cpp:1129 +#: ../src/ui/dialog/inkscape-preferences.cpp:1132 msgid "_Simplification threshold:" msgstr "_Prah zjednodušenia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1142 -#: ../src/ui/dialog/inkscape-preferences.cpp:1130 +#: ../src/ui/dialog/inkscape-preferences.cpp:1133 msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " "this command several times in quick succession, it will act more and more " @@ -20682,56 +17950,45 @@ msgstr "" "tento príkaz niekoľkokrát rýchlo za sebou, bude sa správať viac a viac " "agresívne; vyvolanie po pauze obnoví štandardný prah." -#: ../src/ui/dialog/inkscape-preferences.cpp:1144 -#: ../src/ui/dialog/inkscape-preferences.cpp:1132 +#: ../src/ui/dialog/inkscape-preferences.cpp:1135 msgid "Color stock markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1136 msgid "Color custom markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1146 -#: ../src/ui/dialog/inkscape-preferences.cpp:1356 -#: ../src/ui/dialog/inkscape-preferences.cpp:1134 -#: ../src/ui/dialog/inkscape-preferences.cpp:1344 +#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1347 msgid "Update marker color when object color changes" msgstr "" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1149 -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1140 msgid "Select in all layers" msgstr "Vybrať vo všetkých vrstvách" -#: ../src/ui/dialog/inkscape-preferences.cpp:1150 -#: ../src/ui/dialog/inkscape-preferences.cpp:1138 +#: ../src/ui/dialog/inkscape-preferences.cpp:1141 msgid "Select only within current layer" msgstr "Vyberať len v aktuálnej vrstve" -#: ../src/ui/dialog/inkscape-preferences.cpp:1151 -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1142 msgid "Select in current layer and sublayers" msgstr "Vyberať v aktuálnej vrstve a podvrstvách" -#: ../src/ui/dialog/inkscape-preferences.cpp:1152 -#: ../src/ui/dialog/inkscape-preferences.cpp:1140 +#: ../src/ui/dialog/inkscape-preferences.cpp:1143 msgid "Ignore hidden objects and layers" msgstr "Ignorovať skryté objekty a vrstvy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1153 -#: ../src/ui/dialog/inkscape-preferences.cpp:1141 +#: ../src/ui/dialog/inkscape-preferences.cpp:1144 msgid "Ignore locked objects and layers" msgstr "Ignorovať zamknuté objekty a vrstvy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1154 -#: ../src/ui/dialog/inkscape-preferences.cpp:1142 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgid "Deselect upon layer change" msgstr "Zrušiť výber pri zmene vrstvy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1157 -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" @@ -20739,27 +17996,23 @@ msgstr "" "Odznačením tejto voľby umožníte zachovať aktuálny výber objektov aj po zmene " "aktuálnej vrstvy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 -#: ../src/ui/dialog/inkscape-preferences.cpp:1147 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Ctrl+A, Tab, Shift+Tab" -#: ../src/ui/dialog/inkscape-preferences.cpp:1161 -#: ../src/ui/dialog/inkscape-preferences.cpp:1149 +#: ../src/ui/dialog/inkscape-preferences.cpp:1152 msgid "Make keyboard selection commands work on objects in all layers" msgstr "" "Nech príkazy výberu pomocou klávesnice fungujú na objektoch vo všetkých " "vrstvách" -#: ../src/ui/dialog/inkscape-preferences.cpp:1163 -#: ../src/ui/dialog/inkscape-preferences.cpp:1151 +#: ../src/ui/dialog/inkscape-preferences.cpp:1154 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "" "Nech príkazy výberu pomocou klávesnice fungujú na objektoch iba z aktuálnej " "vrstvy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 -#: ../src/ui/dialog/inkscape-preferences.cpp:1153 +#: ../src/ui/dialog/inkscape-preferences.cpp:1156 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" @@ -20767,8 +18020,7 @@ msgstr "" "Nech príkazy výberu pomocou klávesnice fungujú na objektoch iba z aktuálnej " "vrstvy a jej podvrstiev" -#: ../src/ui/dialog/inkscape-preferences.cpp:1167 -#: ../src/ui/dialog/inkscape-preferences.cpp:1155 +#: ../src/ui/dialog/inkscape-preferences.cpp:1158 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" @@ -20776,8 +18028,7 @@ msgstr "" "Odznačením tejto voľby umožníte výber objektov, ktoré sú skryté (buď samé " "alebo tým, že sú v skrytej skupine či vrstve)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 -#: ../src/ui/dialog/inkscape-preferences.cpp:1157 +#: ../src/ui/dialog/inkscape-preferences.cpp:1160 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" @@ -20785,92 +18036,72 @@ msgstr "" "Odznačením tejto voľby umožníte výber objektov, ktoré sú zamknuté (buď samé " "alebo tým, že sú v zamknutej skupine či vrstve)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1171 -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1162 msgid "Wrap when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 -#: ../src/ui/dialog/inkscape-preferences.cpp:1161 +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 msgid "Alt+Scroll Wheel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 -#: ../src/ui/dialog/inkscape-preferences.cpp:1163 +#: ../src/ui/dialog/inkscape-preferences.cpp:1166 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1177 -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 +#: ../src/ui/dialog/inkscape-preferences.cpp:1168 msgid "Selecting" msgstr "Výber" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1180 -#: ../src/widgets/select-toolbar.cpp:572 -#: ../src/ui/dialog/inkscape-preferences.cpp:1168 +#: ../src/ui/dialog/inkscape-preferences.cpp:1171 #: ../src/widgets/select-toolbar.cpp:570 msgid "Scale stroke width" msgstr "Zmeniť mierku šírky ťahu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "Scale rounded corners in rectangles" msgstr "Zmeniť mierku zaoblených rohov v pravouholníkoch" -#: ../src/ui/dialog/inkscape-preferences.cpp:1182 -#: ../src/ui/dialog/inkscape-preferences.cpp:1170 +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "Transform gradients" msgstr "Transformácia prechodov" -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 -#: ../src/ui/dialog/inkscape-preferences.cpp:1171 +#: ../src/ui/dialog/inkscape-preferences.cpp:1174 msgid "Transform patterns" msgstr "Transformácia vzoriek" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "Preserved" msgstr "Zachované" -#: ../src/ui/dialog/inkscape-preferences.cpp:1188 -#: ../src/widgets/select-toolbar.cpp:573 -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1179 #: ../src/widgets/select-toolbar.cpp:571 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "Keď sa mení mierka objektov, rovnakou mierou sa mení aj šírka ťahu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1190 -#: ../src/widgets/select-toolbar.cpp:584 -#: ../src/ui/dialog/inkscape-preferences.cpp:1178 +#: ../src/ui/dialog/inkscape-preferences.cpp:1181 #: ../src/widgets/select-toolbar.cpp:582 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" "Keď sa mení mierka pravouholníkov, rovnakou mierou sa mení aj polomer " "zaokrúhlenia rohov" -#: ../src/ui/dialog/inkscape-preferences.cpp:1192 -#: ../src/widgets/select-toolbar.cpp:595 -#: ../src/ui/dialog/inkscape-preferences.cpp:1180 +#: ../src/ui/dialog/inkscape-preferences.cpp:1183 #: ../src/widgets/select-toolbar.cpp:593 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "Presúvať prechody (vo výplni a ťahu) spolu s objektami" -#: ../src/ui/dialog/inkscape-preferences.cpp:1194 -#: ../src/widgets/select-toolbar.cpp:606 -#: ../src/ui/dialog/inkscape-preferences.cpp:1182 +#: ../src/ui/dialog/inkscape-preferences.cpp:1185 #: ../src/widgets/select-toolbar.cpp:604 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "Presúvať vzorky (vo výplni a ťahu) spolu s objektami" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 #, fuzzy msgid "Store transformation" msgstr "Uložiť transformáciu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1188 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" @@ -20878,24 +18109,20 @@ msgstr "" "Ak je možné, tak použiť transformáciu na objekt bez pridania atribútu " "transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 -#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 msgid "Always store transformation as a transform= attribute on objects" msgstr "Vždy uložiť transformáciu ako atribút objektu transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1192 msgid "Transforms" msgstr "Transformácie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 #, fuzzy msgid "Mouse _wheel scrolls by:" msgstr "Koliesko myši posúva o:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1206 -#: ../src/ui/dialog/inkscape-preferences.cpp:1194 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" @@ -20903,30 +18130,25 @@ msgstr "" "Jeden pohyb kolieskom myši posunie o túto vzdialenosť v bodoch (vodorovne s " "klávesom Shift)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 msgid "Ctrl+arrows" msgstr "Ctrl+šípky" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1200 #, fuzzy msgid "Sc_roll by:" msgstr "Posúvanie o:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1210 -#: ../src/ui/dialog/inkscape-preferences.cpp:1198 +#: ../src/ui/dialog/inkscape-preferences.cpp:1201 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "Stlačením Ctrl+šípok posuniete o túto vzdialenosť (v pixeloch)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 -#: ../src/ui/dialog/inkscape-preferences.cpp:1200 +#: ../src/ui/dialog/inkscape-preferences.cpp:1203 #, fuzzy msgid "_Acceleration:" msgstr "Zrýchlenie:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1213 -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1204 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" @@ -20934,19 +18156,16 @@ msgstr "" "Stlačením a držaním Ctrl+šípok pozvoľna zvýšite rýchlosť posunu (0 znamená " "žiadne zrýchlenie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1214 -#: ../src/ui/dialog/inkscape-preferences.cpp:1202 +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 msgid "Autoscrolling" msgstr "Automatické posúvanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 -#: ../src/ui/dialog/inkscape-preferences.cpp:1204 +#: ../src/ui/dialog/inkscape-preferences.cpp:1207 #, fuzzy msgid "_Speed:" msgstr "Rýchlosť:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" @@ -20954,15 +18173,13 @@ msgstr "" "Ako rýchlo sa bude posúvať plátno, keď budete ťahať za okraj plátna (0 vypne " "automatické posúvanie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1219 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 #, fuzzy msgid "_Threshold:" msgstr "Prah:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 -#: ../src/ui/dialog/inkscape-preferences.cpp:1208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1211 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" @@ -20976,13 +18193,11 @@ msgstr "" #. _page_scrolling.add_line( false, "", _scroll_space, "", #. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)")); #. -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 -#: ../src/ui/dialog/inkscape-preferences.cpp:1214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1217 msgid "Mouse wheel zooms by default" msgstr "Koliesko myši štandardne mení mierku" -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" @@ -20991,30 +18206,25 @@ msgstr "" "Ctrl posúvate plátno; ak je voľba vypnutá, meníte mierku s Ctrl a posúvate " "bez Ctrl" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Scrolling" msgstr "Posúvanie" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1232 -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1223 msgid "Enable snap indicator" msgstr "Zapnúť indikátor prichytávania" -#: ../src/ui/dialog/inkscape-preferences.cpp:1234 -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "Po prichytení je na prichytenom bode nakreslený symbol" -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 -#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 #, fuzzy msgid "_Delay (in ms):" msgstr "Oneskorenie (v ms):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "" "Postpone snapping as long as the mouse is moving, and then wait an " "additional fraction of a second. This additional delay is specified here. " @@ -21024,27 +18234,23 @@ msgstr "" "zlomok sekundy. Tu sa uvádza toto dodatočné oneskorenie. Ak ho nastavíte na " "nulu alebo veľmi malé číslo, prichytávanie bude okamžité." -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 +#: ../src/ui/dialog/inkscape-preferences.cpp:1231 msgid "Only snap the node closest to the pointer" msgstr "Pokúsiť sa prichytiť iba k uzlu najbližšie pri kurzore" -#: ../src/ui/dialog/inkscape-preferences.cpp:1242 -#: ../src/ui/dialog/inkscape-preferences.cpp:1230 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "" "Pokúsiť sa prichytiť iba k uzlu, ktorý je na začiatku najbližšie pri kurzore " "myši" -#: ../src/ui/dialog/inkscape-preferences.cpp:1245 -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1236 #, fuzzy msgid "_Weight factor:" msgstr "Váha:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1246 -#: ../src/ui/dialog/inkscape-preferences.cpp:1234 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 msgid "" "When multiple snap solutions are found, then Inkscape can either prefer the " "closest transformation (when set to 0), or prefer the node that was " @@ -21055,13 +18261,11 @@ msgstr "" "uzol, ktorý bol na začiatku najbližšie k ukazovateľu (ak je hodnota " "nastavená na 1)." -#: ../src/ui/dialog/inkscape-preferences.cpp:1248 -#: ../src/ui/dialog/inkscape-preferences.cpp:1236 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "Prichytávať kurzor myši pri ťahaní ohraničeného uzla" -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +#: ../src/ui/dialog/inkscape-preferences.cpp:1241 msgid "" "When dragging a knot along a constraint line, then snap the position of the " "mouse pointer instead of snapping the projection of the knot onto the " @@ -21070,20 +18274,17 @@ msgstr "" "Pri ťahaní uzla po ohraničenej čiare prichytiť polohu kurzora myši namiesto " "prichytávania projekcie uzla na ohraničenú čiaru." -#: ../src/ui/dialog/inkscape-preferences.cpp:1252 -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 msgid "Snapping" msgstr "Prichytávanie" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1257 -#: ../src/ui/dialog/inkscape-preferences.cpp:1245 +#: ../src/ui/dialog/inkscape-preferences.cpp:1248 #, fuzzy msgid "_Arrow keys move by:" msgstr "Šípky (klávesy) posunú o:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 -#: ../src/ui/dialog/inkscape-preferences.cpp:1246 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 #, fuzzy msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" @@ -21092,39 +18293,33 @@ msgstr "" "vzdialenosť (v pixeloch)" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1261 -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1252 #, fuzzy msgid "> and < _scale by:" msgstr "> a < zmenia mierku o:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1262 -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 #, fuzzy msgid "Pressing > or < scales selection up or down by this increment" msgstr "" "Stlačením > alebo < zmenšíte/zväčšíte výber o takýto prírastok (v pixeloch)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 -#: ../src/ui/dialog/inkscape-preferences.cpp:1252 +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 #, fuzzy msgid "_Inset/Outset by:" msgstr "Posun dnu/von o:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1265 -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1256 #, fuzzy msgid "Inset and Outset commands displace the path by this distance" msgstr "" "Príkazy Posun dnu a Posun von posunú cestu o takúto vzdialenosť (v pixeloch)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 -#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "Compass-like display of angles" msgstr "Zobrazenie uhlov ako na kompase" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 -#: ../src/ui/dialog/inkscape-preferences.cpp:1256 +#: ../src/ui/dialog/inkscape-preferences.cpp:1259 msgid "" "When on, angles are displayed with 0 at north, 0 to 360 range, positive " "clockwise; otherwise with 0 at east, -180 to 180 range, positive " @@ -21134,26 +18329,16 @@ msgstr "" "kladný smer v smere otáčania hodinových ručičiek; inak s 0 na východe, v " "rozsahu -180 až 180, kladný smer proti smeru otáčania hodinových ručičiek" -#: ../src/ui/dialog/inkscape-preferences.cpp:1270 -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 -#, fuzzy -msgctxt "Rotation angle" -msgid "None" -msgstr "Žiadny" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 -#: ../src/ui/dialog/inkscape-preferences.cpp:1262 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 #, fuzzy msgid "_Rotation snaps every:" msgstr "Krok rotácie:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 -#: ../src/ui/dialog/inkscape-preferences.cpp:1262 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "degrees" msgstr "stup." -#: ../src/ui/dialog/inkscape-preferences.cpp:1275 -#: ../src/ui/dialog/inkscape-preferences.cpp:1263 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" @@ -21161,33 +18346,26 @@ msgstr "" "Otáčanie so stlačeným Ctrl prichytáva každých toľkoto stupňov; tiež, " "stlačenie [ alebo ] otáča o toľkoto" -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1267 msgid "Relative snapping of guideline angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 #, fuzzy msgid "_Zoom in/out by:" msgstr "Priblížiť/oddialiť o:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 -#: ../src/ui/dialog/objects.cpp:1622 -#: ../src/ui/widget/filter-effect-chooser.cpp:27 -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 msgid "%" msgstr "%" -#: ../src/ui/dialog/inkscape-preferences.cpp:1281 -#: ../src/ui/dialog/inkscape-preferences.cpp:1269 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" @@ -21195,56 +18373,45 @@ msgstr "" "Kliknutie nástroja Zmena mierky, klávesy +/-, kliknutie stredným tlačidlom " "menia zobrazenie o takýto násobok" -#: ../src/ui/dialog/inkscape-preferences.cpp:1282 -#: ../src/ui/dialog/inkscape-preferences.cpp:1270 -#, fuzzy +#: ../src/ui/dialog/inkscape-preferences.cpp:1273 msgid "Steps" msgstr "Kroky" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1285 -#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +#: ../src/ui/dialog/inkscape-preferences.cpp:1276 msgid "Move in parallel" msgstr "sa posúvajú paralelne" -#: ../src/ui/dialog/inkscape-preferences.cpp:1287 -#: ../src/ui/dialog/inkscape-preferences.cpp:1275 +#: ../src/ui/dialog/inkscape-preferences.cpp:1278 msgid "Stay unmoved" msgstr "zostanú nepohnuté" -#: ../src/ui/dialog/inkscape-preferences.cpp:1289 -#: ../src/ui/dialog/inkscape-preferences.cpp:1277 +#: ../src/ui/dialog/inkscape-preferences.cpp:1280 msgid "Move according to transform" msgstr "sa posúvajú podľa transformácie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1291 -#: ../src/ui/dialog/inkscape-preferences.cpp:1279 +#: ../src/ui/dialog/inkscape-preferences.cpp:1282 msgid "Are unlinked" msgstr "sa odpoja" -#: ../src/ui/dialog/inkscape-preferences.cpp:1293 -#: ../src/ui/dialog/inkscape-preferences.cpp:1281 +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "Are deleted" msgstr "sú zmazané" -#: ../src/ui/dialog/inkscape-preferences.cpp:1296 -#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +#: ../src/ui/dialog/inkscape-preferences.cpp:1287 #, fuzzy msgid "Moving original: clones and linked offsets" msgstr "Keď sa posunie originál, jeho klony a prepojené posuny:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1298 -#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Clones are translated by the same vector as their original" msgstr "Klony sú posunuté rovnakým vektorom ako ich originál" -#: ../src/ui/dialog/inkscape-preferences.cpp:1300 -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "Clones preserve their positions when their original is moved" msgstr "Klony si zachovajú svoju pozíciu, keď sa originál premiestni" -#: ../src/ui/dialog/inkscape-preferences.cpp:1302 -#: ../src/ui/dialog/inkscape-preferences.cpp:1290 +#: ../src/ui/dialog/inkscape-preferences.cpp:1293 msgid "" "Each clone moves according to the value of its transform= attribute; for " "example, a rotated clone will move in a different direction than its original" @@ -21252,35 +18419,29 @@ msgstr "" "Každý klon sa posúva podľa hodnoty jeho atribútu transform=. Napríklad " "otočený klon sa posunie iným smerom ako jeho originál." -#: ../src/ui/dialog/inkscape-preferences.cpp:1303 -#: ../src/ui/dialog/inkscape-preferences.cpp:1291 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 #, fuzzy msgid "Deleting original: clones" msgstr "Pri duplikovaní originálu+klonov:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1305 -#: ../src/ui/dialog/inkscape-preferences.cpp:1293 +#: ../src/ui/dialog/inkscape-preferences.cpp:1296 msgid "Orphaned clones are converted to regular objects" msgstr "Osirotené klony sa skonvertujú na regulárne objekty" -#: ../src/ui/dialog/inkscape-preferences.cpp:1307 -#: ../src/ui/dialog/inkscape-preferences.cpp:1295 +#: ../src/ui/dialog/inkscape-preferences.cpp:1298 msgid "Orphaned clones are deleted along with their original" msgstr "Osirotené klony sú odstránené spolu so svojím originálom" -#: ../src/ui/dialog/inkscape-preferences.cpp:1309 -#: ../src/ui/dialog/inkscape-preferences.cpp:1297 +#: ../src/ui/dialog/inkscape-preferences.cpp:1300 #, fuzzy msgid "Duplicating original+clones/linked offset" msgstr "Pri duplikovaní originálu+klonov:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1311 -#: ../src/ui/dialog/inkscape-preferences.cpp:1299 +#: ../src/ui/dialog/inkscape-preferences.cpp:1302 msgid "Relink duplicated clones" msgstr "Znovu pripojiť duplicitné klony" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 -#: ../src/ui/dialog/inkscape-preferences.cpp:1301 +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -21291,175 +18452,144 @@ msgstr "" "originálu namiesto originálu:" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 -#: ../src/ui/dialog/inkscape-preferences.cpp:1304 +#: ../src/ui/dialog/inkscape-preferences.cpp:1307 msgid "Clones" msgstr "Klony" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1319 -#: ../src/ui/dialog/inkscape-preferences.cpp:1307 +#: ../src/ui/dialog/inkscape-preferences.cpp:1310 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" "Pri použití zmien použiť najvrchnejší vybraný objekt ako orezávaciu cestu " "alebo masku" -#: ../src/ui/dialog/inkscape-preferences.cpp:1321 -#: ../src/ui/dialog/inkscape-preferences.cpp:1309 +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" "Odznačte túto voľbu, aby sa použil spodný vybraný objekt ako orezávacia " "cesta alebo maska" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 -#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1313 msgid "Remove clippath/mask object after applying" msgstr "Odstrániť objekt orezávacej cesty/masky po použití" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 -#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" msgstr "" "Po použití odstráni z kresby objekt použitý ako orezávacia cesta či maska" -#: ../src/ui/dialog/inkscape-preferences.cpp:1326 -#: ../src/ui/dialog/inkscape-preferences.cpp:1314 +#: ../src/ui/dialog/inkscape-preferences.cpp:1317 #, fuzzy msgid "Before applying" msgstr "Pred použitím orezávacej cesty/masky:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1328 -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "Do not group clipped/masked objects" msgstr "Nezoskupovať orezávané/maskované objekty" -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 -#: ../src/ui/dialog/inkscape-preferences.cpp:1317 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 #, fuzzy msgid "Put every clipped/masked object in its own group" msgstr "Vložiť každý orezávaný/maskovaný objekt do vlastnej skupiny" -#: ../src/ui/dialog/inkscape-preferences.cpp:1330 -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1321 msgid "Put all clipped/masked objects into one group" msgstr "Vložiť všetky orezávané/maskované objekty do jednej skupiny" -#: ../src/ui/dialog/inkscape-preferences.cpp:1333 -#: ../src/ui/dialog/inkscape-preferences.cpp:1321 +#: ../src/ui/dialog/inkscape-preferences.cpp:1324 msgid "Apply clippath/mask to every object" msgstr "Použiť orezávaciu cestu/masku na každý objekt" -#: ../src/ui/dialog/inkscape-preferences.cpp:1336 -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1327 msgid "Apply clippath/mask to groups containing single object" msgstr "Použiť orezávaciu cestu/masku na skupinu obsahujúcu jediný objekt" -#: ../src/ui/dialog/inkscape-preferences.cpp:1339 -#: ../src/ui/dialog/inkscape-preferences.cpp:1327 +#: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "Apply clippath/mask to group containing all objects" msgstr "Použiť orezávaciu cestu/masku na skupinu obsahujúcu všetky objekty" -#: ../src/ui/dialog/inkscape-preferences.cpp:1341 -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +#: ../src/ui/dialog/inkscape-preferences.cpp:1332 #, fuzzy msgid "After releasing" msgstr "Po uvoľnení orezávacej cesty/masky:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1343 -#: ../src/ui/dialog/inkscape-preferences.cpp:1331 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 msgid "Ungroup automatically created groups" msgstr "Zrušiť automaticky vytvorené zoskupenia" -#: ../src/ui/dialog/inkscape-preferences.cpp:1345 -#: ../src/ui/dialog/inkscape-preferences.cpp:1333 +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 msgid "Ungroup groups created when setting clip/mask" msgstr "Zrušiť zoskupenie skupín pri nastavení orezania/masky" -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 -#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1338 msgid "Clippaths and masks" msgstr "Orezávacie cesty a masky:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1350 -#: ../src/ui/dialog/inkscape-preferences.cpp:1338 +#: ../src/ui/dialog/inkscape-preferences.cpp:1341 #, fuzzy msgid "Stroke Style Markers" msgstr "Štýl ť_ahu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1352 -#: ../src/ui/dialog/inkscape-preferences.cpp:1354 -#: ../src/ui/dialog/inkscape-preferences.cpp:1340 -#: ../src/ui/dialog/inkscape-preferences.cpp:1342 +#: ../src/ui/dialog/inkscape-preferences.cpp:1343 +#: ../src/ui/dialog/inkscape-preferences.cpp:1345 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1358 +#: ../src/ui/dialog/inkscape-preferences.cpp:1349 #: ../share/extensions/hershey.inx.h:27 -#: ../src/ui/dialog/inkscape-preferences.cpp:1346 #, fuzzy msgid "Markers" msgstr "Značkovadlo" -#: ../src/ui/dialog/inkscape-preferences.cpp:1361 -#: ../src/ui/dialog/inkscape-preferences.cpp:1349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1352 #, fuzzy msgid "Document cleanup" msgstr "Dokument" -#: ../src/ui/dialog/inkscape-preferences.cpp:1362 -#: ../src/ui/dialog/inkscape-preferences.cpp:1364 -#: ../src/ui/dialog/inkscape-preferences.cpp:1350 -#: ../src/ui/dialog/inkscape-preferences.cpp:1352 +#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1355 msgid "Remove unused swatches when doing a document cleanup" msgstr "" #. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1356 #, fuzzy msgid "Cleanup" msgstr "Vyčistiť:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 -#: ../src/ui/dialog/inkscape-preferences.cpp:1361 +#: ../src/ui/dialog/inkscape-preferences.cpp:1364 #, fuzzy msgid "Number of _Threads:" msgstr "Počet vlákien:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 -#: ../src/ui/dialog/inkscape-preferences.cpp:1909 -#: ../src/ui/dialog/inkscape-preferences.cpp:1361 -#: ../src/ui/dialog/inkscape-preferences.cpp:1893 +#: ../src/ui/dialog/inkscape-preferences.cpp:1364 +#: ../src/ui/dialog/inkscape-preferences.cpp:1896 msgid "(requires restart)" msgstr "(vyžaduje reštart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 -#: ../src/ui/dialog/inkscape-preferences.cpp:1362 +#: ../src/ui/dialog/inkscape-preferences.cpp:1365 #, fuzzy msgid "Configure number of processors/threads to use when rendering filters" msgstr "" "Nastaviť počet procesorov/vlákien, ktoré sa použijú na vykresľovanie " "gaussovského rozostrenia" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1369 #, fuzzy msgid "Rendering _cache size:" msgstr "Vykresľovanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1369 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1369 msgid "" "Set the amount of memory per document which can be used to store rendered " "parts of the drawing for later reuse; set to zero to disable caching" @@ -21467,51 +18597,38 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1381 -#: ../src/ui/dialog/inkscape-preferences.cpp:1405 -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1372 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "Best quality (slowest)" msgstr "Najlepšia kvalita (najpomalšie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 -#: ../src/ui/dialog/inkscape-preferences.cpp:1407 -#: ../src/ui/dialog/inkscape-preferences.cpp:1371 -#: ../src/ui/dialog/inkscape-preferences.cpp:1395 +#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Better quality (slower)" msgstr "Lepšia kvalita (pomalšie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 -#: ../src/ui/dialog/inkscape-preferences.cpp:1409 -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 -#: ../src/ui/dialog/inkscape-preferences.cpp:1397 +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Average quality" msgstr "Stredná kvalita" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 -#: ../src/ui/dialog/inkscape-preferences.cpp:1411 -#: ../src/ui/dialog/inkscape-preferences.cpp:1375 -#: ../src/ui/dialog/inkscape-preferences.cpp:1399 +#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Lower quality (faster)" msgstr "Nižšia kvalita (rýchlejšie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1389 -#: ../src/ui/dialog/inkscape-preferences.cpp:1413 -#: ../src/ui/dialog/inkscape-preferences.cpp:1377 -#: ../src/ui/dialog/inkscape-preferences.cpp:1401 +#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1404 msgid "Lowest quality (fastest)" msgstr "Najnižšia kvalita (rýchlejšie)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1392 -#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1383 #, fuzzy msgid "Gaussian blur quality for display" msgstr "Kvalita zobrazenia gaussovského rozostrenia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 -#: ../src/ui/dialog/inkscape-preferences.cpp:1418 -#: ../src/ui/dialog/inkscape-preferences.cpp:1382 -#: ../src/ui/dialog/inkscape-preferences.cpp:1406 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" @@ -21519,274 +18636,218 @@ msgstr "" "Najlepšia kvalita, ale pri veľkom priblížení môže byť zobrazenie veľmi " "pomalé (export bitmáp používa vždy najlepšiu kvalitu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 -#: ../src/ui/dialog/inkscape-preferences.cpp:1420 -#: ../src/ui/dialog/inkscape-preferences.cpp:1384 -#: ../src/ui/dialog/inkscape-preferences.cpp:1408 +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1411 msgid "Better quality, but slower display" msgstr "Lepšia kvalita, ale pomalšie zobrazovanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 -#: ../src/ui/dialog/inkscape-preferences.cpp:1386 -#: ../src/ui/dialog/inkscape-preferences.cpp:1410 +#: ../src/ui/dialog/inkscape-preferences.cpp:1389 +#: ../src/ui/dialog/inkscape-preferences.cpp:1413 msgid "Average quality, acceptable display speed" msgstr "Priemerná kvalita, prijateľná rýchlosť zobrazovania" -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 -#: ../src/ui/dialog/inkscape-preferences.cpp:1424 -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 -#: ../src/ui/dialog/inkscape-preferences.cpp:1412 +#: ../src/ui/dialog/inkscape-preferences.cpp:1391 +#: ../src/ui/dialog/inkscape-preferences.cpp:1415 msgid "Lower quality (some artifacts), but display is faster" msgstr "" "Nižšia kvalita (môžu sa vyskytnúť artefakty), ale zobrazovanie je rýchlejšie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1402 -#: ../src/ui/dialog/inkscape-preferences.cpp:1426 -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 -#: ../src/ui/dialog/inkscape-preferences.cpp:1414 +#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "Najnižšia kvalita (značné artefakty), ale najrýchlejšie zobrazovanie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1416 -#: ../src/ui/dialog/inkscape-preferences.cpp:1404 +#: ../src/ui/dialog/inkscape-preferences.cpp:1407 #, fuzzy msgid "Filter effects quality for display" msgstr "Kvalita zobrazenia efektov filtra:" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1428 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 #: ../src/ui/dialog/print.cpp:232 -#: ../src/ui/dialog/inkscape-preferences.cpp:1416 msgid "Rendering" msgstr "Vykresľovanie" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1434 ../src/verbs.cpp:157 +#: ../src/ui/dialog/inkscape-preferences.cpp:1425 ../src/verbs.cpp:156 #: ../src/widgets/calligraphy-toolbar.cpp:626 -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 -#: ../src/verbs.cpp:156 #, fuzzy msgid "Edit" msgstr "_Upraviť" -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 -#: ../src/ui/dialog/inkscape-preferences.cpp:1423 +#: ../src/ui/dialog/inkscape-preferences.cpp:1426 msgid "Automatically reload bitmaps" msgstr "Automaticky znova načítavať bitmapy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1437 -#: ../src/ui/dialog/inkscape-preferences.cpp:1425 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Automatically reload linked images when file is changed on disk" msgstr "" "Zapína automatické znovunačítavanie odkazovaných obrázkov, keď sa na disku " "zmenia" -#: ../src/ui/dialog/inkscape-preferences.cpp:1439 -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 +#: ../src/ui/dialog/inkscape-preferences.cpp:1430 #, fuzzy msgid "_Bitmap editor:" msgstr "Editor bitmáp:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1441 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 #: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:55 #: ../share/extensions/print_win32_vector.inx.h:2 -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 msgid "Export" msgstr "Export" -#: ../src/ui/dialog/inkscape-preferences.cpp:1443 -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 +#: ../src/ui/dialog/inkscape-preferences.cpp:1434 #, fuzzy msgid "Default export _resolution:" msgstr "Štandardné rozlíšenie pre export:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#: ../src/ui/dialog/inkscape-preferences.cpp:1435 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "Štandardné rozlíšenie bitmapy (v bodoch na palec) v exportnom dialógu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1445 +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 #: ../src/ui/dialog/xml-tree.cpp:912 -#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "Create" msgstr "Vytvoriť" -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 #, fuzzy msgid "Resolution for Create Bitmap _Copy:" msgstr "Rozlíšenie pre Vytvoriť bitmapovú kópiu:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1448 -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1439 msgid "Resolution used by the Create Bitmap Copy command" msgstr "Rozlíšenie, ktoré použije príkaz Vytvoriť bitmapovú kópiu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 -#: ../src/ui/dialog/inkscape-preferences.cpp:1439 +#: ../src/ui/dialog/inkscape-preferences.cpp:1442 msgid "Ask about linking and scaling when importing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1453 -#: ../src/ui/dialog/inkscape-preferences.cpp:1441 +#: ../src/ui/dialog/inkscape-preferences.cpp:1444 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1459 -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 +#: ../src/ui/dialog/inkscape-preferences.cpp:1450 #, fuzzy msgid "Bitmap link:" msgstr "Editor bitmáp:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1466 -#: ../src/ui/dialog/inkscape-preferences.cpp:1454 +#: ../src/ui/dialog/inkscape-preferences.cpp:1457 msgid "Bitmap scale (image-rendering):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1471 -#: ../src/ui/dialog/inkscape-preferences.cpp:1459 +#: ../src/ui/dialog/inkscape-preferences.cpp:1462 #, fuzzy msgid "Default _import resolution:" msgstr "Štandardné rozlíšenie pre export:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1472 -#: ../src/ui/dialog/inkscape-preferences.cpp:1460 +#: ../src/ui/dialog/inkscape-preferences.cpp:1463 #, fuzzy msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "Štandardné rozlíšenie bitmapy (v bodoch na palec) v exportnom dialógu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1473 -#: ../src/ui/dialog/inkscape-preferences.cpp:1461 +#: ../src/ui/dialog/inkscape-preferences.cpp:1464 #, fuzzy msgid "Override file resolution" msgstr "Štandardné rozlíšenie pre export:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1475 -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 +#: ../src/ui/dialog/inkscape-preferences.cpp:1466 #, fuzzy msgid "Use default bitmap resolution in favor of information from file" msgstr "Štandardné rozlíšenie bitmapy (v bodoch na palec) v exportnom dialógu" #. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1467 +#: ../src/ui/dialog/inkscape-preferences.cpp:1470 #, fuzzy msgid "Images in Outline Mode" msgstr "Nakreslí okolo obrys" -#: ../src/ui/dialog/inkscape-preferences.cpp:1480 -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#: ../src/ui/dialog/inkscape-preferences.cpp:1471 msgid "" "When active will render images while in outline mode instead of a red box " "with an x. This is useful for manual tracing." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1482 -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#: ../src/ui/dialog/inkscape-preferences.cpp:1473 msgid "Bitmaps" msgstr "Bitmapy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1494 -#: ../src/ui/dialog/inkscape-preferences.cpp:1482 +#: ../src/ui/dialog/inkscape-preferences.cpp:1485 msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added seperately to " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1497 -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 +#: ../src/ui/dialog/inkscape-preferences.cpp:1488 msgid "Shortcut file:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1491 #: ../src/ui/dialog/template-load-tab.cpp:48 -#: ../src/ui/dialog/inkscape-preferences.cpp:1488 #, fuzzy msgid "Search:" msgstr "Hľadať" -#: ../src/ui/dialog/inkscape-preferences.cpp:1512 -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1503 msgid "Shortcut" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1513 +#: ../src/ui/dialog/inkscape-preferences.cpp:1504 #: ../src/ui/widget/page-sizer.cpp:260 -#: ../src/ui/dialog/inkscape-preferences.cpp:1501 msgid "Description" msgstr "Popis" -#: ../src/ui/dialog/inkscape-preferences.cpp:1568 +#: ../src/ui/dialog/inkscape-preferences.cpp:1559 #: ../src/ui/dialog/pixelartdialog.cpp:296 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:699 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:698 #: ../src/ui/dialog/tracedialog.cpp:813 #: ../src/ui/widget/preferences-widget.cpp:749 -#: ../src/ui/dialog/inkscape-preferences.cpp:1556 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:698 msgid "Reset" msgstr "Obnoviť " -#: ../src/ui/dialog/inkscape-preferences.cpp:1568 -#: ../src/ui/dialog/inkscape-preferences.cpp:1556 +#: ../src/ui/dialog/inkscape-preferences.cpp:1559 msgid "" "Remove all your customized keyboard shortcuts, and revert to the shortcuts " "in the shortcut file listed above" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1572 -#: ../src/ui/dialog/inkscape-preferences.cpp:1560 +#: ../src/ui/dialog/inkscape-preferences.cpp:1563 #, fuzzy msgid "Import ..." msgstr "_Importovať..." -#: ../src/ui/dialog/inkscape-preferences.cpp:1572 -#: ../src/ui/dialog/inkscape-preferences.cpp:1560 +#: ../src/ui/dialog/inkscape-preferences.cpp:1563 msgid "Import custom keyboard shortcuts from a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1575 -#: ../src/ui/dialog/inkscape-preferences.cpp:1563 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 #, fuzzy msgid "Export ..." msgstr "_Exportovať ako..." -#: ../src/ui/dialog/inkscape-preferences.cpp:1575 -#: ../src/ui/dialog/inkscape-preferences.cpp:1563 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 #, fuzzy msgid "Export custom keyboard shortcuts to a file" msgstr "Exportovať dokument do PS súboru" -#: ../src/ui/dialog/inkscape-preferences.cpp:1585 -#: ../src/ui/dialog/inkscape-preferences.cpp:1573 +#: ../src/ui/dialog/inkscape-preferences.cpp:1576 msgid "Keyboard Shortcuts" msgstr "" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1748 -#: ../src/ui/dialog/inkscape-preferences.cpp:1736 +#: ../src/ui/dialog/inkscape-preferences.cpp:1739 msgid "Misc" msgstr "Rôzne" -#: ../src/ui/dialog/inkscape-preferences.cpp:1850 -#: ../src/ui/dialog/inkscape-preferences.cpp:1834 -#, fuzzy -msgctxt "Spellchecker language" -msgid "None" -msgstr "Žiadny" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1871 -#: ../src/ui/dialog/inkscape-preferences.cpp:1855 +#: ../src/ui/dialog/inkscape-preferences.cpp:1858 msgid "Set the main spell check language" msgstr "Nastaviť hlavný jazyk kontroly pravopisu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1874 -#: ../src/ui/dialog/inkscape-preferences.cpp:1858 +#: ../src/ui/dialog/inkscape-preferences.cpp:1861 msgid "Second language:" msgstr "Druhý jazyk:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1875 -#: ../src/ui/dialog/inkscape-preferences.cpp:1859 +#: ../src/ui/dialog/inkscape-preferences.cpp:1862 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" @@ -21794,13 +18855,11 @@ msgstr "" "Nastaviť druhý jazyk kontroly pravopisu; kontrola sa zastaví iba na slovách " "nenájdených v ŽIADNOM z vybraných jazykov" -#: ../src/ui/dialog/inkscape-preferences.cpp:1878 -#: ../src/ui/dialog/inkscape-preferences.cpp:1862 +#: ../src/ui/dialog/inkscape-preferences.cpp:1865 msgid "Third language:" msgstr "Tretí jazyk:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1879 -#: ../src/ui/dialog/inkscape-preferences.cpp:1863 +#: ../src/ui/dialog/inkscape-preferences.cpp:1866 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" @@ -21808,39 +18867,32 @@ msgstr "" "Nastaviť tretí jazyk kontroly pravopisu; kontrola sa zastaví iba na slovách " "nenájdených v ŽIADNOM z vybraných jazykov" -#: ../src/ui/dialog/inkscape-preferences.cpp:1881 -#: ../src/ui/dialog/inkscape-preferences.cpp:1865 +#: ../src/ui/dialog/inkscape-preferences.cpp:1868 msgid "Ignore words with digits" msgstr "Ignorovať slová s číslicami" -#: ../src/ui/dialog/inkscape-preferences.cpp:1883 -#: ../src/ui/dialog/inkscape-preferences.cpp:1867 +#: ../src/ui/dialog/inkscape-preferences.cpp:1870 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "Ignorovať slová obsahujúce číslice ako napr. „R2D2“" -#: ../src/ui/dialog/inkscape-preferences.cpp:1885 -#: ../src/ui/dialog/inkscape-preferences.cpp:1869 +#: ../src/ui/dialog/inkscape-preferences.cpp:1872 msgid "Ignore words in ALL CAPITALS" msgstr "Ignorovať slová VEĽKÝMI PÍSMENAMI" -#: ../src/ui/dialog/inkscape-preferences.cpp:1887 -#: ../src/ui/dialog/inkscape-preferences.cpp:1871 +#: ../src/ui/dialog/inkscape-preferences.cpp:1874 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "Ignorovať slová písané veľkými písmenami ako „IUPAC“" -#: ../src/ui/dialog/inkscape-preferences.cpp:1889 -#: ../src/ui/dialog/inkscape-preferences.cpp:1873 +#: ../src/ui/dialog/inkscape-preferences.cpp:1876 msgid "Spellcheck" msgstr "Kontrola pravopisu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1909 -#: ../src/ui/dialog/inkscape-preferences.cpp:1893 +#: ../src/ui/dialog/inkscape-preferences.cpp:1896 #, fuzzy msgid "Latency _skew:" msgstr "Posun času:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1910 -#: ../src/ui/dialog/inkscape-preferences.cpp:1894 +#: ../src/ui/dialog/inkscape-preferences.cpp:1897 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" @@ -21848,13 +18900,11 @@ msgstr "" "O koľko sú hodiny udalosti posunuté od skutočného času (na niektorých " "systémoch 0,9766)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1912 -#: ../src/ui/dialog/inkscape-preferences.cpp:1896 +#: ../src/ui/dialog/inkscape-preferences.cpp:1899 msgid "Pre-render named icons" msgstr "Predvykresliť pomenované ikony" -#: ../src/ui/dialog/inkscape-preferences.cpp:1914 -#: ../src/ui/dialog/inkscape-preferences.cpp:1898 +#: ../src/ui/dialog/inkscape-preferences.cpp:1901 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" @@ -21863,113 +18913,93 @@ msgstr "" "používateľského rozhrania. Toto slúži na obídenie chyby v GTK+ upozorneniach " "pomenovaných ikon" -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 -#: ../src/ui/dialog/inkscape-preferences.cpp:1906 +#: ../src/ui/dialog/inkscape-preferences.cpp:1909 msgid "System info" msgstr "Informácie o systéme" -#: ../src/ui/dialog/inkscape-preferences.cpp:1926 -#: ../src/ui/dialog/inkscape-preferences.cpp:1910 +#: ../src/ui/dialog/inkscape-preferences.cpp:1913 msgid "User config: " msgstr "Používateľská konfigurácia: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1926 -#: ../src/ui/dialog/inkscape-preferences.cpp:1910 +#: ../src/ui/dialog/inkscape-preferences.cpp:1913 msgid "Location of users configuration" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1930 -#: ../src/ui/dialog/inkscape-preferences.cpp:1914 +#: ../src/ui/dialog/inkscape-preferences.cpp:1917 #, fuzzy msgid "User preferences: " msgstr "Nastavenia gumy" -#: ../src/ui/dialog/inkscape-preferences.cpp:1930 -#: ../src/ui/dialog/inkscape-preferences.cpp:1914 +#: ../src/ui/dialog/inkscape-preferences.cpp:1917 #, fuzzy msgid "Location of the users preferences file" msgstr "Nepodarilo sa vytvoriť súbor s nastavením %s." -#: ../src/ui/dialog/inkscape-preferences.cpp:1934 -#: ../src/ui/dialog/inkscape-preferences.cpp:1918 +#: ../src/ui/dialog/inkscape-preferences.cpp:1921 #, fuzzy msgid "User extensions: " msgstr "Hádať podľa prípony" -#: ../src/ui/dialog/inkscape-preferences.cpp:1934 -#: ../src/ui/dialog/inkscape-preferences.cpp:1918 +#: ../src/ui/dialog/inkscape-preferences.cpp:1921 #, fuzzy msgid "Location of the users extensions" msgstr "Informácie o rozšíreniach Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1938 -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 +#: ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "User cache: " msgstr "Vyrovnávacia pamäť používateľa:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1938 -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 +#: ../src/ui/dialog/inkscape-preferences.cpp:1925 #, fuzzy msgid "Location of users cache" msgstr "Umiestnenie pozdĺž krivky" -#: ../src/ui/dialog/inkscape-preferences.cpp:1946 -#: ../src/ui/dialog/inkscape-preferences.cpp:1930 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "Temporary files: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1946 -#: ../src/ui/dialog/inkscape-preferences.cpp:1930 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "Location of the temporary files used for autosave" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1950 -#: ../src/ui/dialog/inkscape-preferences.cpp:1934 +#: ../src/ui/dialog/inkscape-preferences.cpp:1937 #, fuzzy msgid "Inkscape data: " msgstr "Príručka Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1950 -#: ../src/ui/dialog/inkscape-preferences.cpp:1934 +#: ../src/ui/dialog/inkscape-preferences.cpp:1937 #, fuzzy msgid "Location of Inkscape data" msgstr "Informácie o rozšíreniach Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1954 -#: ../src/ui/dialog/inkscape-preferences.cpp:1938 +#: ../src/ui/dialog/inkscape-preferences.cpp:1941 #, fuzzy msgid "Inkscape extensions: " msgstr "Informácie o rozšíreniach Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1954 -#: ../src/ui/dialog/inkscape-preferences.cpp:1938 +#: ../src/ui/dialog/inkscape-preferences.cpp:1941 #, fuzzy msgid "Location of the Inkscape extensions" msgstr "Informácie o rozšíreniach Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1963 -#: ../src/ui/dialog/inkscape-preferences.cpp:1947 +#: ../src/ui/dialog/inkscape-preferences.cpp:1950 msgid "System data: " msgstr "Údaje systému:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1963 -#: ../src/ui/dialog/inkscape-preferences.cpp:1947 +#: ../src/ui/dialog/inkscape-preferences.cpp:1950 msgid "Locations of system data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1987 -#: ../src/ui/dialog/inkscape-preferences.cpp:1971 +#: ../src/ui/dialog/inkscape-preferences.cpp:1974 msgid "Icon theme: " msgstr "Téma ikon: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1987 -#: ../src/ui/dialog/inkscape-preferences.cpp:1971 +#: ../src/ui/dialog/inkscape-preferences.cpp:1974 #, fuzzy msgid "Locations of icon themes" msgstr "Umiestnenie pozdĺž krivky" -#: ../src/ui/dialog/inkscape-preferences.cpp:1989 -#: ../src/ui/dialog/inkscape-preferences.cpp:1973 +#: ../src/ui/dialog/inkscape-preferences.cpp:1976 msgid "System" msgstr "Systém" @@ -22009,11 +19039,6 @@ msgstr "Hardvér" msgid "Link:" msgstr "Spojenie:" -#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 -#: ../src/ui/dialog/input.cpp:1571 -msgid "None" -msgstr "Žiadny" - #: ../src/ui/dialog/input.cpp:758 msgid "Axes count:" msgstr "Počet osí:" @@ -22068,17 +19093,10 @@ msgid "Y tilt" msgstr "" #: ../src/ui/dialog/input.cpp:1616 -#: ../src/widgets/sp-color-wheel-selector.cpp:32 #: ../src/widgets/sp-color-wheel-selector.cpp:59 msgid "Wheel" msgstr "Koleso" -#: ../src/ui/dialog/input.cpp:1625 -#, fuzzy -msgctxt "Input device axe" -msgid "None" -msgstr "Žiadny" - #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "Názov vrstvy:" @@ -22105,9 +19123,7 @@ msgstr "Premenovať vrstvu" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:354 -#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:195 -#: ../src/verbs.cpp:2368 -#: ../src/verbs.cpp:194 +#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 #: ../src/verbs.cpp:2289 msgid "Layer" msgstr "Vrstva" @@ -22143,8 +19159,6 @@ msgid "Move to Layer" msgstr "Znížiť vrstvu" #: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:120 -#: ../src/ui/dialog/transformation.cpp:112 #: ../src/ui/dialog/transformation.cpp:114 msgid "_Move" msgstr "_Presunúť" @@ -22165,15 +19179,11 @@ msgstr "Zamknúť vrstvu" msgid "Unlock layer" msgstr "Odomknúť vrstvu" -#: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:845 -#: ../src/verbs.cpp:1438 -#: ../src/verbs.cpp:1405 +#: ../src/ui/dialog/layers.cpp:624 ../src/verbs.cpp:1405 msgid "Toggle layer solo" msgstr "Zobraziť/skryť ostatné vrstvy" -#: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:848 -#: ../src/verbs.cpp:1462 -#: ../src/verbs.cpp:1429 +#: ../src/ui/dialog/layers.cpp:627 ../src/verbs.cpp:1429 #, fuzzy msgid "Lock other layers" msgstr "Zamknúť vrstvu" @@ -22233,25 +19243,19 @@ msgstr "Presunie aktuálnu vrstvu o úroveň vyššie" msgid "Lower the current path effect" msgstr "Presunie aktuálnu vrstvu o úroveň nižšie" -#: ../src/ui/dialog/livepatheffect-editor.cpp:312 #: ../src/ui/dialog/livepatheffect-editor.cpp:313 msgid "Unknown effect is applied" msgstr "Je použitý neznámy efekt" -#: ../src/ui/dialog/livepatheffect-editor.cpp:315 #: ../src/ui/dialog/livepatheffect-editor.cpp:316 #, fuzzy msgid "Click button to add an effect" msgstr "Tekuté komiksové tieňovanie štetcom" -#: ../src/ui/dialog/livepatheffect-editor.cpp:330 #: ../src/ui/dialog/livepatheffect-editor.cpp:329 msgid "Click add button to convert clone" msgstr "" -#: ../src/ui/dialog/livepatheffect-editor.cpp:335 -#: ../src/ui/dialog/livepatheffect-editor.cpp:339 -#: ../src/ui/dialog/livepatheffect-editor.cpp:348 #: ../src/ui/dialog/livepatheffect-editor.cpp:334 #: ../src/ui/dialog/livepatheffect-editor.cpp:338 #: ../src/ui/dialog/livepatheffect-editor.cpp:346 @@ -22259,92 +19263,43 @@ msgstr "" msgid "Select a path or shape" msgstr "Položka nie je cesta alebo tvar" -#: ../src/ui/dialog/livepatheffect-editor.cpp:344 #: ../src/ui/dialog/livepatheffect-editor.cpp:342 msgid "Only one item can be selected" msgstr "je možné vybrať iba jednu položku" -#: ../src/ui/dialog/livepatheffect-editor.cpp:376 #: ../src/ui/dialog/livepatheffect-editor.cpp:374 msgid "Unknown effect" msgstr "Neznámy efekt" -#: ../src/ui/dialog/livepatheffect-editor.cpp:452 #: ../src/ui/dialog/livepatheffect-editor.cpp:450 msgid "Create and apply path effect" msgstr "Vytvoriť a použiť efekt cesty" -#: ../src/ui/dialog/livepatheffect-editor.cpp:492 #: ../src/ui/dialog/livepatheffect-editor.cpp:485 #, fuzzy msgid "Create and apply Clone original path effect" msgstr "Vytvoriť a použiť efekt cesty" -#: ../src/ui/dialog/livepatheffect-editor.cpp:514 #: ../src/ui/dialog/livepatheffect-editor.cpp:505 msgid "Remove path effect" msgstr "Odstrániť efekt cesty" -#: ../src/ui/dialog/livepatheffect-editor.cpp:532 #: ../src/ui/dialog/livepatheffect-editor.cpp:522 msgid "Move path effect up" msgstr "Presunúť efekt cesty vyššie" -#: ../src/ui/dialog/livepatheffect-editor.cpp:549 #: ../src/ui/dialog/livepatheffect-editor.cpp:538 msgid "Move path effect down" msgstr "Presunúť efekt cesty nižšie" -#: ../src/ui/dialog/livepatheffect-editor.cpp:588 #: ../src/ui/dialog/livepatheffect-editor.cpp:577 msgid "Activate path effect" msgstr "Aktivovať efekt živej cesty" -#: ../src/ui/dialog/livepatheffect-editor.cpp:588 #: ../src/ui/dialog/livepatheffect-editor.cpp:577 msgid "Deactivate path effect" msgstr "Deaktivovať efekt živej cesty" -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:57 -msgid "Radius (pixels):" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:69 -msgid "Chamfer subdivisions:" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:144 -msgid "Modify Fillet-Chamfer" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:145 -msgid "_Modify" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:210 -msgid "Radius" -msgstr "Polomer" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:212 -msgid "Radius approximated" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:215 -msgid "Knot distance" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:222 -msgid "Position (%):" -msgstr "" - -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:225 -msgid "%1 (%2):" -msgstr "" - -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:119 -msgid "Modify Node Position" -msgstr "" - #: ../src/ui/dialog/memory.cpp:96 msgid "Heap" msgstr "Halda" @@ -22393,13 +19348,11 @@ msgstr "" msgid "Log capture stopped." msgstr "" -#: ../src/ui/dialog/new-from-template.cpp:27 #: ../src/ui/dialog/new-from-template.cpp:24 #, fuzzy msgid "Create from template" msgstr "Vytvorenie špirály" -#: ../src/ui/dialog/new-from-template.cpp:29 #: ../src/ui/dialog/new-from-template.cpp:26 msgid "New From Template" msgstr "" @@ -22502,9 +19455,7 @@ msgid "Check to make the object insensitive (not selectable by mouse)" msgstr "Zaškrtnutím znecitlivíte objekt (nebude sa dať vybrať myšou)" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2711 -#: ../src/verbs.cpp:2717 -#: ../src/verbs.cpp:2632 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2632 #: ../src/verbs.cpp:2638 msgid "_Set" msgstr "_Nastaviť" @@ -22559,126 +19510,59 @@ msgstr "Skryť objekt" msgid "Unhide object" msgstr "Odkryť objekt" -#: ../src/ui/dialog/objects.cpp:875 -msgid "Unhide objects" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:875 -msgid "Hide objects" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:895 -msgid "Lock objects" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:895 -msgid "Unlock objects" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:907 -msgid "Layer to group" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:907 -msgid "Group to layer" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1105 -msgid "Moved objects" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1354 ../src/ui/dialog/tags.cpp:875 -#: ../src/ui/dialog/tags.cpp:882 -msgid "Rename object" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1461 -msgid "Set object highlight color" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1471 -msgid "Set object opacity" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1504 -msgid "Set object blend mode" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1560 -msgid "Set object blur" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1802 -msgid "Add layer..." -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1817 -msgid "Remove object" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1832 -msgid "Move To Bottom" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1877 -msgid "Move To Top" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1892 -msgid "Collapse All" -msgstr "" - -#: ../src/ui/dialog/objects.cpp:1974 -msgid "Select Highlight Color" -msgstr "" - #: ../src/ui/dialog/ocaldialogs.cpp:715 msgid "Clipart found" msgstr "" #: ../src/ui/dialog/ocaldialogs.cpp:764 +#, fuzzy msgid "Downloading image..." -msgstr "Sťahuje sa obrázok..." +msgstr "Vykresľuje sa bitmapa..." #: ../src/ui/dialog/ocaldialogs.cpp:912 +#, fuzzy msgid "Could not download image" -msgstr "Nepodarilo sa stiahnuť obrázok" +msgstr "Nebolo možné nájsť súbor: %s" #: ../src/ui/dialog/ocaldialogs.cpp:922 msgid "Clipart downloaded successfully" -msgstr "Clipart bol úspešne stiahnutý" +msgstr "" #: ../src/ui/dialog/ocaldialogs.cpp:936 +#, fuzzy msgid "Could not download thumbnail file" -msgstr "Nepodarilo sa stiahnuť súbor s náhľadom" +msgstr "Nebolo možné nájsť súbor: %s" #: ../src/ui/dialog/ocaldialogs.cpp:1011 +#, fuzzy msgid "No description" -msgstr "Bez popisu" +msgstr " popis: " #: ../src/ui/dialog/ocaldialogs.cpp:1079 +#, fuzzy msgid "Searching clipart..." -msgstr "Hľadá sa clipart..." +msgstr "Obrátenie smeru ciest..." #: ../src/ui/dialog/ocaldialogs.cpp:1099 ../src/ui/dialog/ocaldialogs.cpp:1120 +#, fuzzy msgid "Could not connect to the Open Clip Art Library" -msgstr "Nepodarilo sa pripojiť do Open Clip Art Library" +msgstr "Exportuje dokument alebo do Open Clip Art Library" #: ../src/ui/dialog/ocaldialogs.cpp:1145 +#, fuzzy msgid "Could not parse search results" -msgstr "Nepodarilo sa analyzovať výsledky hľadania" +msgstr "Nie je možné analyzovať SVG dáta" #: ../src/ui/dialog/ocaldialogs.cpp:1177 +#, fuzzy msgid "No clipart named %1 was found." -msgstr "Nebol nájdený clipart s názvom %1." +msgstr "Zo schránky" #: ../src/ui/dialog/ocaldialogs.cpp:1179 msgid "" "Please make sure all keywords are spelled correctly, or try again with " "different keywords." msgstr "" -"Prosím, uistite sa, či ste napísali všetky kľúčové slová správne alebo " -"skúste vyhľadať iné kľúčové slová." #: ../src/ui/dialog/ocaldialogs.cpp:1231 msgid "Search" @@ -22697,16 +19581,18 @@ msgid "Favors connections that are part of a long curve" msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:204 +#, fuzzy msgid "_Islands (weight):" -msgstr "" +msgstr "Výška čiary:" #: ../src/ui/dialog/pixelartdialog.cpp:207 msgid "Avoid single disconnected pixels" msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:209 +#, fuzzy msgid "A constant vote value" -msgstr "" +msgstr "obmedzený uhol" #: ../src/ui/dialog/pixelartdialog.cpp:219 msgid "Sparse pixels (window _radius):" @@ -22733,28 +19619,31 @@ msgid "Heuristics" msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:266 +#, fuzzy msgid "_Voronoi diagram" -msgstr "_Voroného diagram" +msgstr "Voronoiov vzor" #: ../src/ui/dialog/pixelartdialog.cpp:267 msgid "Output composed of straight lines" -msgstr "Výstup zostavený z rovných čiar" +msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:273 +#, fuzzy msgid "Convert to _B-spline curves" -msgstr "Konvertovať krivky _B-spline" +msgstr "Konvertovať na pomlčky" #: ../src/ui/dialog/pixelartdialog.cpp:274 msgid "Preserve staircasing artifacts" -msgstr "Zachovať schodovité artefakty" +msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:281 +#, fuzzy msgid "_Smooth curves" -msgstr "_Hladké krivky" +msgstr "Hladké rohy" #: ../src/ui/dialog/pixelartdialog.cpp:282 msgid "The Kopf-Lischinski algorithm" -msgstr "Algoritmus Kopf-Lischinski" +msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:289 msgid "Output" @@ -22762,6 +19651,7 @@ msgstr "Výstup" #: ../src/ui/dialog/pixelartdialog.cpp:297 #: ../src/ui/dialog/tracedialog.cpp:814 +#, fuzzy msgid "Reset all settings to defaults" msgstr "Nastaviť všetky hodnoty na štandardné" @@ -22776,6 +19666,13 @@ msgid "Execute the trace" msgstr "Vykonať vektorizáciu" #: ../src/ui/dialog/pixelartdialog.cpp:388 +msgid "" +"Image looks too big. Process may take a while and is wise to save your " +"document before continue.\n" +"\n" +"Continue the procedure (without saving)?" +msgstr "" + #: ../src/ui/dialog/pixelartdialog.cpp:422 msgid "" "Image looks too big. Process may take a while and it is wise to save your " @@ -22785,114 +19682,81 @@ msgid "" msgstr "" #: ../src/ui/dialog/pixelartdialog.cpp:499 +#, fuzzy msgid "Trace pixel art" -msgstr "Vektorizovať sprite" - -#: ../src/ui/dialog/polar-arrange-tab.cpp:41 -msgctxt "Polar arrange tab" -msgid "Y coordinate of the center" -msgstr "" - -#: ../src/ui/dialog/polar-arrange-tab.cpp:42 -msgctxt "Polar arrange tab" -msgid "X coordinate of the center" -msgstr "" - -#: ../src/ui/dialog/polar-arrange-tab.cpp:43 -msgctxt "Polar arrange tab" -msgid "Y coordinate of the radius" -msgstr "" - -#: ../src/ui/dialog/polar-arrange-tab.cpp:44 -msgctxt "Polar arrange tab" -msgid "X coordinate of the radius" -msgstr "" - -#: ../src/ui/dialog/polar-arrange-tab.cpp:45 -msgctxt "Polar arrange tab" -msgid "Starting angle" -msgstr "" - -#: ../src/ui/dialog/polar-arrange-tab.cpp:46 -msgctxt "Polar arrange tab" -msgid "End angle" -msgstr "" +msgstr "bodov na" -#: ../src/ui/dialog/polar-arrange-tab.cpp:48 #: ../src/ui/dialog/polar-arrange-tab.cpp:43 +#, fuzzy msgctxt "Polar arrange tab" msgid "Anchor point:" -msgstr "Bod ukotvenia:" +msgstr "Orientačné body" -#: ../src/ui/dialog/polar-arrange-tab.cpp:52 #: ../src/ui/dialog/polar-arrange-tab.cpp:47 +#, fuzzy msgctxt "Polar arrange tab" msgid "Object's bounding box:" -msgstr "Ohraničenia objektu:" +msgstr "ohraničenia" -#: ../src/ui/dialog/polar-arrange-tab.cpp:59 #: ../src/ui/dialog/polar-arrange-tab.cpp:54 +#, fuzzy msgctxt "Polar arrange tab" msgid "Object's rotational center" msgstr "Stred otáčania objektu" -#: ../src/ui/dialog/polar-arrange-tab.cpp:64 #: ../src/ui/dialog/polar-arrange-tab.cpp:59 +#, fuzzy msgctxt "Polar arrange tab" msgid "Arrange on:" -msgstr "Rozmiestniť na:" +msgstr "Rozmiestniť" -#: ../src/ui/dialog/polar-arrange-tab.cpp:68 #: ../src/ui/dialog/polar-arrange-tab.cpp:63 +#, fuzzy msgctxt "Polar arrange tab" msgid "First selected circle/ellipse/arc" -msgstr "Prvá zvolená kružnica/elipsa/oblúk" +msgstr "Vytvorenie kruhov, elíps a oblúkov" -#: ../src/ui/dialog/polar-arrange-tab.cpp:73 #: ../src/ui/dialog/polar-arrange-tab.cpp:68 +#, fuzzy msgctxt "Polar arrange tab" msgid "Last selected circle/ellipse/arc" -msgstr "Posledná zvolená kružnica/elipsa/oblúk" +msgstr "Posledná zvolená farba" -#: ../src/ui/dialog/polar-arrange-tab.cpp:78 #: ../src/ui/dialog/polar-arrange-tab.cpp:73 +#, fuzzy msgctxt "Polar arrange tab" msgid "Parameterized:" -msgstr "Parametrizované:" +msgstr "Parametre" -#: ../src/ui/dialog/polar-arrange-tab.cpp:83 #: ../src/ui/dialog/polar-arrange-tab.cpp:78 #, fuzzy -msgctxt "Polar arrange tab" msgid "Center X/Y:" -msgstr "Stred X/Y:" +msgstr "Stred" -#: ../src/ui/dialog/polar-arrange-tab.cpp:105 #: ../src/ui/dialog/polar-arrange-tab.cpp:91 #, fuzzy -msgctxt "Polar arrange tab" msgid "Radius X/Y:" -msgstr "Polomer X/Y:" +msgstr "Polomer:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:127 #: ../src/ui/dialog/polar-arrange-tab.cpp:104 +#, fuzzy msgid "Angle X/Y:" -msgstr "Uhol X/Y:" +msgstr "Uhol X:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:150 #: ../src/ui/dialog/polar-arrange-tab.cpp:118 +#, fuzzy msgid "Rotate objects" -msgstr "Otáčať objekty" +msgstr "Otáčať uzly" -#: ../src/ui/dialog/polar-arrange-tab.cpp:338 #: ../src/ui/dialog/polar-arrange-tab.cpp:306 +#, fuzzy msgid "Couldn't find an ellipse in selection" -msgstr "V tomto výbere neboli nájdené žiadne elipsy." +msgstr "V tomto dokumente/výbere neboli nájdené žiadne písma." -#: ../src/ui/dialog/polar-arrange-tab.cpp:403 #: ../src/ui/dialog/polar-arrange-tab.cpp:371 +#, fuzzy msgid "Arrange on ellipse" -msgstr "Rozmiestniť na elipse" +msgstr "Vytvoriť elipsu" #: ../src/ui/dialog/print.cpp:111 msgid "Could not open temporary PNG for bitmap printing" @@ -22989,416 +19853,343 @@ msgstr "Prebieha kontrola..." msgid "Fix spelling" msgstr "Opraviť pravopis" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:139 #: ../src/ui/dialog/svg-fonts-dialog.cpp:138 msgid "Set SVG Font attribute" msgstr "Nastaviť atribút písma SVG" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:197 #: ../src/ui/dialog/svg-fonts-dialog.cpp:196 msgid "Adjust kerning value" msgstr "Doladiť hodnotu kerningu" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:387 #: ../src/ui/dialog/svg-fonts-dialog.cpp:386 msgid "Family Name:" msgstr "Názov rodiny:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:397 #: ../src/ui/dialog/svg-fonts-dialog.cpp:396 msgid "Set width:" msgstr "Nastaviť šírku:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:456 #: ../src/ui/dialog/svg-fonts-dialog.cpp:455 msgid "glyph" msgstr "graféma" #. SPGlyph* glyph = -#: ../src/ui/dialog/svg-fonts-dialog.cpp:488 #: ../src/ui/dialog/svg-fonts-dialog.cpp:487 msgid "Add glyph" msgstr "Pridať grafému" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:522 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:564 #: ../src/ui/dialog/svg-fonts-dialog.cpp:521 #: ../src/ui/dialog/svg-fonts-dialog.cpp:563 msgid "Select a path to define the curves of a glyph" msgstr "Vybrať cestu na definíciu kriviek grafémy." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:530 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:572 #: ../src/ui/dialog/svg-fonts-dialog.cpp:529 #: ../src/ui/dialog/svg-fonts-dialog.cpp:571 msgid "The selected object does not have a path description." msgstr "Zvolený objekt nemá popis cesty." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:537 #: ../src/ui/dialog/svg-fonts-dialog.cpp:536 msgid "No glyph selected in the SVGFonts dialog." msgstr "V dialógu SVGFonts nebola vybraná žiadna graféma." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:548 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:587 #: ../src/ui/dialog/svg-fonts-dialog.cpp:547 #: ../src/ui/dialog/svg-fonts-dialog.cpp:586 msgid "Set glyph curves" msgstr "Nastaviť krivky grafémy" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:607 #: ../src/ui/dialog/svg-fonts-dialog.cpp:606 msgid "Reset missing-glyph" msgstr "Obnoviť chýbajúcu grafému" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:623 #: ../src/ui/dialog/svg-fonts-dialog.cpp:622 msgid "Edit glyph name" msgstr "Upraviť názov grafémy" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:637 #: ../src/ui/dialog/svg-fonts-dialog.cpp:636 msgid "Set glyph unicode" msgstr "Nastaviť kód Unicode grafémy" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:649 #: ../src/ui/dialog/svg-fonts-dialog.cpp:648 msgid "Remove font" msgstr "Odstrániť písmo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:666 #: ../src/ui/dialog/svg-fonts-dialog.cpp:665 msgid "Remove glyph" msgstr "Odstrániť grafému" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:683 #: ../src/ui/dialog/svg-fonts-dialog.cpp:682 msgid "Remove kerning pair" msgstr "Odstrániť kerningovú dvojicu" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:693 #: ../src/ui/dialog/svg-fonts-dialog.cpp:692 msgid "Missing Glyph:" msgstr "Chýbajúca graféma:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:697 #: ../src/ui/dialog/svg-fonts-dialog.cpp:696 msgid "From selection..." msgstr "Z výberu..." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:710 #: ../src/ui/dialog/svg-fonts-dialog.cpp:709 msgid "Glyph name" msgstr "Názov grafémy" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:711 #: ../src/ui/dialog/svg-fonts-dialog.cpp:710 msgid "Matching string" msgstr "Zodpovedajúci reťazec" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:714 #: ../src/ui/dialog/svg-fonts-dialog.cpp:713 msgid "Add Glyph" msgstr "Pridať grafému" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:721 #: ../src/ui/dialog/svg-fonts-dialog.cpp:720 msgid "Get curves from selection..." msgstr "Prevziať krivky z výberu..." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:770 #: ../src/ui/dialog/svg-fonts-dialog.cpp:769 msgid "Add kerning pair" msgstr "Pridať kerningovú dvojicu" #. Kerning Setup: -#: ../src/ui/dialog/svg-fonts-dialog.cpp:778 #: ../src/ui/dialog/svg-fonts-dialog.cpp:777 msgid "Kerning Setup" msgstr "Nastavenie kerningu" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:780 #: ../src/ui/dialog/svg-fonts-dialog.cpp:779 msgid "1st Glyph:" msgstr "1. graféma:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:782 #: ../src/ui/dialog/svg-fonts-dialog.cpp:781 msgid "2nd Glyph:" msgstr "2. graféma:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:785 #: ../src/ui/dialog/svg-fonts-dialog.cpp:784 msgid "Add pair" msgstr "Pridať dvojicu" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:797 #: ../src/ui/dialog/svg-fonts-dialog.cpp:796 msgid "First Unicode range" msgstr "Prvý rozsah Unicode" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:798 #: ../src/ui/dialog/svg-fonts-dialog.cpp:797 msgid "Second Unicode range" msgstr "Druhý rozsah Unicode" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:805 #: ../src/ui/dialog/svg-fonts-dialog.cpp:804 msgid "Kerning value:" msgstr "Hodnota kerningu:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:863 #: ../src/ui/dialog/svg-fonts-dialog.cpp:862 msgid "Set font family" msgstr "Nastaviť rodinu písma" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:872 #: ../src/ui/dialog/svg-fonts-dialog.cpp:871 msgid "font" msgstr "písmo" #. select_font(font); -#: ../src/ui/dialog/svg-fonts-dialog.cpp:887 #: ../src/ui/dialog/svg-fonts-dialog.cpp:886 msgid "Add font" msgstr "Pridať písmo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:913 ../src/ui/dialog/text-edit.cpp:69 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:912 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:912 ../src/ui/dialog/text-edit.cpp:70 msgid "_Font" msgstr "_Písmo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:921 #: ../src/ui/dialog/svg-fonts-dialog.cpp:920 msgid "_Global Settings" msgstr "_Globálne nastavenia" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:922 #: ../src/ui/dialog/svg-fonts-dialog.cpp:921 msgid "_Glyphs" msgstr "_Grafémy" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:923 #: ../src/ui/dialog/svg-fonts-dialog.cpp:922 msgid "_Kerning" msgstr "_Kerning" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:930 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:931 #: ../src/ui/dialog/svg-fonts-dialog.cpp:929 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:930 msgid "Sample Text" msgstr "Vzorový text" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:935 #: ../src/ui/dialog/svg-fonts-dialog.cpp:934 msgid "Preview Text:" msgstr "Náhľad textu:" -#: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:370 -#: ../src/ui/tools/gradient-tool.cpp:468 -#: ../src/widgets/gradient-vector.cpp:794 -#: ../src/ui/dialog/swatches.cpp:203 -#: ../src/ui/tools/gradient-tool.cpp:367 +#: ../src/ui/dialog/swatches.cpp:203 ../src/ui/tools/gradient-tool.cpp:367 #: ../src/ui/tools/gradient-tool.cpp:465 #: ../src/widgets/gradient-vector.cpp:814 msgid "Add gradient stop" msgstr "Pridať priehradku farebného prechodu" #. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:257 #: ../src/ui/dialog/swatches.cpp:258 msgid "Set fill" msgstr "Nastaviť výplň" #. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:265 #: ../src/ui/dialog/swatches.cpp:266 msgid "Set stroke" msgstr "Nastaviť ťah" -#: ../src/ui/dialog/swatches.cpp:286 #: ../src/ui/dialog/swatches.cpp:287 msgid "Edit..." msgstr "Upraviť..." -#: ../src/ui/dialog/swatches.cpp:298 #: ../src/ui/dialog/swatches.cpp:299 msgid "Convert" msgstr "Konvertovať" -#: ../src/ui/dialog/swatches.cpp:542 #: ../src/ui/dialog/swatches.cpp:543 #, c-format msgid "Palettes directory (%s) is unavailable." msgstr "Adresár paliet (%s) je nedostupný." #. ******************* Symbol Sets ************************ -#: ../src/ui/dialog/symbols.cpp:139 +#: ../src/ui/dialog/symbols.cpp:127 msgid "Symbol set: " -msgstr "Množina symbolov:" +msgstr "" #. Fill in later -#: ../src/ui/dialog/symbols.cpp:148 ../src/ui/dialog/symbols.cpp:149 +#: ../src/ui/dialog/symbols.cpp:136 ../src/ui/dialog/symbols.cpp:137 +#, fuzzy msgid "Current Document" -msgstr "Aktuálny dokument" +msgstr "Vytlačí dokument" -#: ../src/ui/dialog/symbols.cpp:216 +#: ../src/ui/dialog/symbols.cpp:204 +#, fuzzy msgid "Add Symbol from the current document." -msgstr "Pridať symbol z aktuálneho dokumentu." +msgstr "Prepne viditeľnosť iba na aktuálnu vrstvu alebo na všetky vrstvy" -#: ../src/ui/dialog/symbols.cpp:225 +#: ../src/ui/dialog/symbols.cpp:213 +#, fuzzy msgid "Remove Symbol from the current document." -msgstr "Odstrániť symbol z aktuálneho dokumentu." +msgstr "Upraviť priehradky farebného prechodu" -#: ../src/ui/dialog/symbols.cpp:239 +#: ../src/ui/dialog/symbols.cpp:227 +#, fuzzy msgid "Display more icons in row." -msgstr "Zobraziť viac ikon v riadku." +msgstr "Zobraziť meracie informácie" -#: ../src/ui/dialog/symbols.cpp:248 +#: ../src/ui/dialog/symbols.cpp:236 +#, fuzzy msgid "Display fewer icons in row." -msgstr "Zobraziť menej ikon v riadku." +msgstr "Zobraziť meracie informácie" -#: ../src/ui/dialog/symbols.cpp:258 +#: ../src/ui/dialog/symbols.cpp:246 msgid "Toggle 'fit' symbols in icon space." msgstr "" -#: ../src/ui/dialog/symbols.cpp:270 +#: ../src/ui/dialog/symbols.cpp:258 msgid "Make symbols smaller by zooming out." msgstr "" -#: ../src/ui/dialog/symbols.cpp:280 +#: ../src/ui/dialog/symbols.cpp:268 msgid "Make symbols bigger by zooming in." msgstr "" -#: ../src/ui/dialog/symbols.cpp:641 -#: ../src/ui/dialog/symbols.cpp:640 +#: ../src/ui/dialog/symbols.cpp:622 +#, fuzzy msgid "Unnamed Symbols" -msgstr "Nepomenované sybmoly" - -#: ../src/ui/dialog/tags.cpp:293 ../src/ui/dialog/tags.cpp:591 -#: ../src/ui/dialog/tags.cpp:705 -msgid "Remove from selection set" -msgstr "" - -#: ../src/ui/dialog/tags.cpp:449 -msgid "Items" -msgstr "" - -#: ../src/ui/dialog/tags.cpp:688 -msgid "Add selection to set" -msgstr "" - -#: ../src/ui/dialog/tags.cpp:846 -msgid "Moved sets" -msgstr "" - -#: ../src/ui/dialog/tags.cpp:1016 -msgid "Add a new selection set" -msgstr "" - -#: ../src/ui/dialog/tags.cpp:1025 -msgid "Remove Item/Set" -msgstr "" +msgstr "Použiť pomenované farby" -#: ../src/ui/dialog/template-widget.cpp:37 +#: ../src/ui/dialog/template-widget.cpp:36 +#, fuzzy msgid "More info" -msgstr "Ďalšie info" +msgstr "Viac jasu" -#: ../src/ui/dialog/template-widget.cpp:39 +#: ../src/ui/dialog/template-widget.cpp:38 +#, fuzzy msgid "no template selected" -msgstr "nebola vybraná žiadna šablóna" +msgstr "Neboli vybrané žiadne položky." -#: ../src/ui/dialog/template-widget.cpp:123 +#: ../src/ui/dialog/template-widget.cpp:119 +#, fuzzy msgid "Path: " msgstr "Cesta:" -#: ../src/ui/dialog/template-widget.cpp:126 +#: ../src/ui/dialog/template-widget.cpp:122 +#, fuzzy msgid "Description: " -msgstr "Popis:" +msgstr "Popis" -#: ../src/ui/dialog/template-widget.cpp:128 +#: ../src/ui/dialog/template-widget.cpp:124 +#, fuzzy msgid "Keywords: " -msgstr "Kľúčové slová:" +msgstr "Kľúčové slová" -#: ../src/ui/dialog/template-widget.cpp:135 +#: ../src/ui/dialog/template-widget.cpp:131 msgid "By: " msgstr "" -#: ../src/ui/dialog/text-edit.cpp:72 +#: ../src/ui/dialog/text-edit.cpp:73 msgid "Set as _default" msgstr "Nastaviť ako pre_dvolené" -#: ../src/ui/dialog/text-edit.cpp:86 +#: ../src/ui/dialog/text-edit.cpp:87 msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "AaBbCcIiPpQqžšťď12368$€¢?.;/()" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1333 -#: ../src/widgets/text-toolbar.cpp:1334 -#: ../src/widgets/text-toolbar.cpp:1346 -#: ../src/widgets/text-toolbar.cpp:1347 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1344 +#: ../src/widgets/text-toolbar.cpp:1345 msgid "Align left" msgstr "Zarovnanie doľava" -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1341 -#: ../src/widgets/text-toolbar.cpp:1342 -#: ../src/widgets/text-toolbar.cpp:1354 -#: ../src/widgets/text-toolbar.cpp:1355 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1352 +#: ../src/widgets/text-toolbar.cpp:1353 msgid "Align center" msgstr "Zarovnanie stredu" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1349 -#: ../src/widgets/text-toolbar.cpp:1350 -#: ../src/widgets/text-toolbar.cpp:1362 -#: ../src/widgets/text-toolbar.cpp:1363 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1360 +#: ../src/widgets/text-toolbar.cpp:1361 msgid "Align right" msgstr "Zarovnanie doprava" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1358 -#: ../src/widgets/text-toolbar.cpp:1371 +#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1369 msgid "Justify (only flowed text)" msgstr "Do bloku (iba textový tok)" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1393 -#: ../src/widgets/text-toolbar.cpp:1406 +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1404 msgid "Horizontal text" msgstr "Vodorovný text" -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1400 -#: ../src/widgets/text-toolbar.cpp:1413 +#: ../src/ui/dialog/text-edit.cpp:110 ../src/widgets/text-toolbar.cpp:1411 msgid "Vertical text" msgstr "Zvislý text" -#: ../src/ui/dialog/text-edit.cpp:129 ../src/ui/dialog/text-edit.cpp:130 +#: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 msgid "Spacing between lines (percent of font size)" msgstr "Rozstupy medzi čiarami (v percentách veľkosti písma)" -#: ../src/ui/dialog/text-edit.cpp:146 +#: ../src/ui/dialog/text-edit.cpp:147 +#, fuzzy msgid "Text path offset" -msgstr "Posun cesty s textom" +msgstr "Prispôsobiť posun" -#: ../src/ui/dialog/text-edit.cpp:586 ../src/ui/dialog/text-edit.cpp:660 +#: ../src/ui/dialog/text-edit.cpp:588 ../src/ui/dialog/text-edit.cpp:662 #: ../src/ui/tools/text-tool.cpp:1455 -#: ../src/ui/dialog/text-edit.cpp:587 -#: ../src/ui/dialog/text-edit.cpp:661 msgid "Set text style" msgstr "Nastaviť štýl textu" #: ../src/ui/dialog/tile.cpp:36 +#, fuzzy msgctxt "Arrange dialog" msgid "Rectangular grid" msgstr "Pravouhlá mriežka" #: ../src/ui/dialog/tile.cpp:37 +#, fuzzy msgctxt "Arrange dialog" msgid "Polar Coordinates" -msgstr "Polárne súradnice" +msgstr "Trilineárne súradnice" #: ../src/ui/dialog/tile.cpp:40 +#, fuzzy msgctxt "Arrange dialog" msgid "_Arrange" -msgstr "_Rozmiestniť" +msgstr "Rozmiestniť" #: ../src/ui/dialog/tile.cpp:42 msgid "Arrange selected objects" @@ -23410,8 +20201,9 @@ msgstr "Rozmiestniť zvolené objekty" #. # begin single scan #. brightness #: ../src/ui/dialog/tracedialog.cpp:508 +#, fuzzy msgid "_Brightness cutoff" -msgstr "_Orezanie jasu" +msgstr "Orezanie jasu" #: ../src/ui/dialog/tracedialog.cpp:512 msgid "Trace by a given brightness level" @@ -23428,8 +20220,9 @@ msgstr "Jediný sken: vytvorí cestu" #. canny edge detection #. TRANSLATORS: "Canny" is the name of the inventor of this edge detection method #: ../src/ui/dialog/tracedialog.cpp:534 +#, fuzzy msgid "_Edge detection" -msgstr "D_etekcia hrán" +msgstr "Detekcia hrán" #: ../src/ui/dialog/tracedialog.cpp:538 msgid "Trace with optimal edge detection by J. Canny's algorithm" @@ -23440,16 +20233,18 @@ msgid "Brightness cutoff for adjacent pixels (determines edge thickness)" msgstr "Rozdiel jasu susedných pixelov (určuje hrúbku hrany)" #: ../src/ui/dialog/tracedialog.cpp:559 +#, fuzzy msgid "T_hreshold:" -msgstr "_Prah:" +msgstr "Prah:" #. quantization #. TRANSLATORS: Color Quantization: the process of reducing the number #. of colors in an image by selecting an optimized set of representative #. colors and then re-applying this reduced set to the original image. #: ../src/ui/dialog/tracedialog.cpp:571 +#, fuzzy msgid "Color _quantization" -msgstr "_Kvantizácia farieb" +msgstr "Kvantizácia farieb" #: ../src/ui/dialog/tracedialog.cpp:575 msgid "Trace along the boundaries of reduced colors" @@ -23460,13 +20255,15 @@ msgid "The number of reduced colors" msgstr "Počet redukovaných farieb" #: ../src/ui/dialog/tracedialog.cpp:586 +#, fuzzy msgid "_Colors:" -msgstr "_Farby:" +msgstr "Farby:" #. swap black and white #: ../src/ui/dialog/tracedialog.cpp:594 +#, fuzzy msgid "_Invert image" -msgstr "_Invertovať obrázok" +msgstr "Invertovať obrázok" #: ../src/ui/dialog/tracedialog.cpp:599 msgid "Invert black and white regions" @@ -23475,32 +20272,36 @@ msgstr "Invertovať biele a čierne oblasti" #. # end single scan #. # begin multiple scan #: ../src/ui/dialog/tracedialog.cpp:609 +#, fuzzy msgid "B_rightness steps" -msgstr "_Stupne jasu" +msgstr "Stupňov jasu" #: ../src/ui/dialog/tracedialog.cpp:613 msgid "Trace the given number of brightness levels" msgstr "Vektorizovať daný počet stupňov jasu" #: ../src/ui/dialog/tracedialog.cpp:621 +#, fuzzy msgid "Sc_ans:" -msgstr "_Skenov:" +msgstr "Skenov:" #: ../src/ui/dialog/tracedialog.cpp:625 msgid "The desired number of scans" msgstr "Požadovaný počet skenov" #: ../src/ui/dialog/tracedialog.cpp:630 +#, fuzzy msgid "Co_lors" -msgstr "_Farby" +msgstr "_Farba" #: ../src/ui/dialog/tracedialog.cpp:634 msgid "Trace the given number of reduced colors" msgstr "Vektorizovať daný počet redukovaných farieb" #: ../src/ui/dialog/tracedialog.cpp:639 +#, fuzzy msgid "_Grays" -msgstr "Š_edé" +msgstr "Šedé" #: ../src/ui/dialog/tracedialog.cpp:643 msgid "Same as Colors, but the result is converted to grayscale" @@ -23508,8 +20309,9 @@ msgstr "Rovnaké ako Farby, ale výsledok je skonvertovaný na odtiene šedej" #. TRANSLATORS: "Smooth" is a verb here #: ../src/ui/dialog/tracedialog.cpp:649 +#, fuzzy msgid "S_mooth" -msgstr "_Hladké" +msgstr "Hladké" #: ../src/ui/dialog/tracedialog.cpp:653 msgid "Apply Gaussian blur to the bitmap before tracing" @@ -23517,8 +20319,9 @@ msgstr "Použiť na bitmapu pred vektorizáciou gaussovské rozostrenie" #. TRANSLATORS: "Stack" is a verb here #: ../src/ui/dialog/tracedialog.cpp:657 +#, fuzzy msgid "Stac_k scans" -msgstr "Nas_kladať skeny na seba" +msgstr "Naskladať skeny na seba" #: ../src/ui/dialog/tracedialog.cpp:661 msgid "" @@ -23529,8 +20332,9 @@ msgstr "" "medzerami)" #: ../src/ui/dialog/tracedialog.cpp:665 +#, fuzzy msgid "Remo_ve background" -msgstr "_Odstrániť pozadie" +msgstr "Odstrániť pozadie" #. TRANSLATORS: "Layer" refers to one of the stacked paths in the multiscan #: ../src/ui/dialog/tracedialog.cpp:670 @@ -23544,14 +20348,16 @@ msgstr "Viaceré skeny: vytvorí skupinu ciest" #. # end multiple scan #. ## end mode page #: ../src/ui/dialog/tracedialog.cpp:684 +#, fuzzy msgid "_Mode" -msgstr "Reži_m" +msgstr "Režim" #. ## begin option page #. # potrace parameters #: ../src/ui/dialog/tracedialog.cpp:690 +#, fuzzy msgid "Suppress _speckles" -msgstr "_Potlačiť škvrny" +msgstr "Potlačiť škvrny" #: ../src/ui/dialog/tracedialog.cpp:692 msgid "Ignore small spots (speckles) in the bitmap" @@ -23562,12 +20368,14 @@ msgid "Speckles of up to this many pixels will be suppressed" msgstr "Do akej veľkosti škvrny budú tieto potlačené" #: ../src/ui/dialog/tracedialog.cpp:703 +#, fuzzy msgid "S_ize:" -msgstr "_Veľkosť:" +msgstr "Veľkosť:" #: ../src/ui/dialog/tracedialog.cpp:708 +#, fuzzy msgid "Smooth _corners" -msgstr "_Vyhladiť rohy" +msgstr "Hladké rohy" #: ../src/ui/dialog/tracedialog.cpp:710 msgid "Smooth out sharp corners of the trace" @@ -23578,8 +20386,9 @@ msgid "Increase this to smooth corners more" msgstr "Zväčšením hodnoty dostanete hladšie hrany" #: ../src/ui/dialog/tracedialog.cpp:726 +#, fuzzy msgid "Optimize p_aths" -msgstr "Optim_alizovať cesty" +msgstr "Optimalizovať cesty" #: ../src/ui/dialog/tracedialog.cpp:729 msgid "Try to optimize paths by joining adjacent Bezier curve segments" @@ -23596,13 +20405,15 @@ msgstr "" "optimalizáciou" #: ../src/ui/dialog/tracedialog.cpp:739 +#, fuzzy msgid "To_lerance:" -msgstr "To_lerancia:" +msgstr "Tolerancia:" #. ## end option page #: ../src/ui/dialog/tracedialog.cpp:753 +#, fuzzy msgid "O_ptions" -msgstr "_Možnosti" +msgstr "Možnosti" #. ### credits #: ../src/ui/dialog/tracedialog.cpp:757 @@ -23626,20 +20437,23 @@ msgstr "Poďakovanie" #. #### begin right panel #. ## SIOX #: ../src/ui/dialog/tracedialog.cpp:774 +#, fuzzy msgid "SIOX _foreground selection" -msgstr "SIOX výber _popredia" +msgstr "SIOX výber popredia" #: ../src/ui/dialog/tracedialog.cpp:777 msgid "Cover the area you want to select as the foreground" msgstr "Pokryte oblasť, ktorú chcete vybrať ako popredie" #: ../src/ui/dialog/tracedialog.cpp:782 +#, fuzzy msgid "Live Preview" msgstr "Živý náhľad" #: ../src/ui/dialog/tracedialog.cpp:788 +#, fuzzy msgid "_Update" -msgstr "Akt_ualizácia" +msgstr "Aktualizácia" #. I guess it's correct to call the "intermediate bitmap" a preview of the trace #: ../src/ui/dialog/tracedialog.cpp:796 @@ -23654,53 +20468,41 @@ msgstr "" msgid "Preview" msgstr "Náhľad" -#: ../src/ui/dialog/transformation.cpp:74 -#: ../src/ui/dialog/transformation.cpp:84 #: ../src/ui/dialog/transformation.cpp:76 #: ../src/ui/dialog/transformation.cpp:86 msgid "_Horizontal:" msgstr "_Vodorovný:" -#: ../src/ui/dialog/transformation.cpp:74 #: ../src/ui/dialog/transformation.cpp:76 msgid "Horizontal displacement (relative) or position (absolute)" msgstr "Vodorovný posun (relatívny) alebo poloha (absolútna)" -#: ../src/ui/dialog/transformation.cpp:76 -#: ../src/ui/dialog/transformation.cpp:86 #: ../src/ui/dialog/transformation.cpp:78 #: ../src/ui/dialog/transformation.cpp:88 msgid "_Vertical:" msgstr "_Zvislý:" -#: ../src/ui/dialog/transformation.cpp:76 #: ../src/ui/dialog/transformation.cpp:78 msgid "Vertical displacement (relative) or position (absolute)" msgstr "Zvislý posun (relatívny) alebo poloha (absolútna)" -#: ../src/ui/dialog/transformation.cpp:78 #: ../src/ui/dialog/transformation.cpp:80 msgid "Horizontal size (absolute or percentage of current)" msgstr "Vodorovná veľkosť (absolútna alebo percentuálna oproti súčasnej)" -#: ../src/ui/dialog/transformation.cpp:80 #: ../src/ui/dialog/transformation.cpp:82 msgid "Vertical size (absolute or percentage of current)" msgstr "Zvislá veľkosť (absolútna alebo percentuálna oproti súčasnej)" -#: ../src/ui/dialog/transformation.cpp:82 #: ../src/ui/dialog/transformation.cpp:84 msgid "A_ngle:" msgstr "_Uhol:" -#: ../src/ui/dialog/transformation.cpp:82 -#: ../src/ui/dialog/transformation.cpp:1103 #: ../src/ui/dialog/transformation.cpp:84 #: ../src/ui/dialog/transformation.cpp:1104 msgid "Rotation angle (positive = counterclockwise)" msgstr "Uhol otáčania (kladný = proti smeru hodinových ručičiek)" -#: ../src/ui/dialog/transformation.cpp:84 #: ../src/ui/dialog/transformation.cpp:86 msgid "" "Horizontal skew angle (positive = counterclockwise), or absolute " @@ -23709,7 +20511,6 @@ msgstr "" "Uhol vodorovného skosenia (kladný = proti smeru otáčania hodinových " "ručičiek) alebo absolútne posunutie alebo percentuálne posunutie" -#: ../src/ui/dialog/transformation.cpp:86 #: ../src/ui/dialog/transformation.cpp:88 msgid "" "Vertical skew angle (positive = counterclockwise), or absolute displacement, " @@ -23718,42 +20519,34 @@ msgstr "" "Uhol zvislého skosenia (kladný = proti smeru otáčania hodinových ručičiek) " "alebo absolútne posunutie alebo percentuálne posunutie" -#: ../src/ui/dialog/transformation.cpp:89 #: ../src/ui/dialog/transformation.cpp:91 msgid "Transformation matrix element A" msgstr "Prvok A transformačnej matice" -#: ../src/ui/dialog/transformation.cpp:90 #: ../src/ui/dialog/transformation.cpp:92 msgid "Transformation matrix element B" msgstr "Prvok B transformačnej matice" -#: ../src/ui/dialog/transformation.cpp:91 #: ../src/ui/dialog/transformation.cpp:93 msgid "Transformation matrix element C" msgstr "Prvok C transformačnej matice" -#: ../src/ui/dialog/transformation.cpp:92 #: ../src/ui/dialog/transformation.cpp:94 msgid "Transformation matrix element D" msgstr "Prvok D transformačnej matice" -#: ../src/ui/dialog/transformation.cpp:93 #: ../src/ui/dialog/transformation.cpp:95 msgid "Transformation matrix element E" msgstr "Prvok E transformačnej matice" -#: ../src/ui/dialog/transformation.cpp:94 #: ../src/ui/dialog/transformation.cpp:96 msgid "Transformation matrix element F" msgstr "Prvok F transformačnej matice" -#: ../src/ui/dialog/transformation.cpp:99 #: ../src/ui/dialog/transformation.cpp:101 msgid "Rela_tive move" msgstr "Rela_tívny posun" -#: ../src/ui/dialog/transformation.cpp:99 #: ../src/ui/dialog/transformation.cpp:101 msgid "" "Add the specified relative displacement to the current position; otherwise, " @@ -23762,22 +20555,19 @@ msgstr "" "Pridať určený relatívny posun k súčasnej polohe; inak priamo upravovať " "súčasnú absolútnu polohu" -#: ../src/ui/dialog/transformation.cpp:100 #: ../src/ui/dialog/transformation.cpp:102 +#, fuzzy msgid "_Scale proportionally" -msgstr "Zmena mierky _so zachovaním pomeru" +msgstr "Zmena mierky so zachovaním pomeru" -#: ../src/ui/dialog/transformation.cpp:100 #: ../src/ui/dialog/transformation.cpp:102 msgid "Preserve the width/height ratio of the scaled objects" msgstr "Zachovať pomer šírky a výšky objektov, ktorým sa mení mierka" -#: ../src/ui/dialog/transformation.cpp:101 #: ../src/ui/dialog/transformation.cpp:103 msgid "Apply to each _object separately" msgstr "Použiť na každý _objekt zvlášť" -#: ../src/ui/dialog/transformation.cpp:101 #: ../src/ui/dialog/transformation.cpp:103 msgid "" "Apply the scale/rotate/skew to each selected object separately; otherwise, " @@ -23786,12 +20576,10 @@ msgstr "" "Použiť zmenu mierky/otočenie/skosenie na každý vybraný objekt zvlášť; inak " "transformovať výber ako celok" -#: ../src/ui/dialog/transformation.cpp:102 #: ../src/ui/dialog/transformation.cpp:104 msgid "Edit c_urrent matrix" msgstr "Upravovať _aktuálnu maticu" -#: ../src/ui/dialog/transformation.cpp:102 #: ../src/ui/dialog/transformation.cpp:104 msgid "" "Edit the current transform= matrix; otherwise, post-multiply transform= by " @@ -23800,53 +20588,40 @@ msgstr "" "Upravovať súčasnú maticu transform=; inak vynásobí súčasnú transform= maticu " "touto maticou" -#: ../src/ui/dialog/transformation.cpp:115 #: ../src/ui/dialog/transformation.cpp:117 msgid "_Scale" msgstr "_Zmeniť mierku" -#: ../src/ui/dialog/transformation.cpp:118 #: ../src/ui/dialog/transformation.cpp:120 msgid "_Rotate" msgstr "_Otočiť" -#: ../src/ui/dialog/transformation.cpp:121 #: ../src/ui/dialog/transformation.cpp:123 msgid "Ske_w" msgstr "_Skosiť" -#: ../src/ui/dialog/transformation.cpp:124 #: ../src/ui/dialog/transformation.cpp:126 msgid "Matri_x" msgstr "_Matica" -#: ../src/ui/dialog/transformation.cpp:148 #: ../src/ui/dialog/transformation.cpp:150 msgid "Reset the values on the current tab to defaults" msgstr "Nastaviť hodnoty v súčasnej záložke na štandardné" -#: ../src/ui/dialog/transformation.cpp:155 #: ../src/ui/dialog/transformation.cpp:157 msgid "Apply transformation to selection" msgstr "Použiť transformáciu na výber" -#: ../src/ui/dialog/transformation.cpp:331 #: ../src/ui/dialog/transformation.cpp:332 +#, fuzzy msgid "Rotate in a counterclockwise direction" msgstr "Otočenie proti smeru hodinových ručičiek" -#: ../src/ui/dialog/transformation.cpp:337 #: ../src/ui/dialog/transformation.cpp:338 +#, fuzzy msgid "Rotate in a clockwise direction" msgstr "Otočenie v smere hodinových ručičiek" -#: ../src/ui/dialog/transformation.cpp:907 -#: ../src/ui/dialog/transformation.cpp:918 -#: ../src/ui/dialog/transformation.cpp:932 -#: ../src/ui/dialog/transformation.cpp:951 -#: ../src/ui/dialog/transformation.cpp:962 -#: ../src/ui/dialog/transformation.cpp:972 -#: ../src/ui/dialog/transformation.cpp:996 #: ../src/ui/dialog/transformation.cpp:908 #: ../src/ui/dialog/transformation.cpp:919 #: ../src/ui/dialog/transformation.cpp:933 @@ -23857,13 +20632,12 @@ msgstr "Otočenie v smere hodinových ručičiek" msgid "Transform matrix is singular, not used." msgstr "" -#: ../src/ui/dialog/transformation.cpp:1011 #: ../src/ui/dialog/transformation.cpp:1012 msgid "Edit transformation matrix" msgstr "Upraviť transformačnú maticu" -#: ../src/ui/dialog/transformation.cpp:1110 #: ../src/ui/dialog/transformation.cpp:1111 +#, fuzzy msgid "Rotation angle (positive = clockwise)" msgstr "Uhol otáčania (kladný = proti smeru hodinových ručičiek)" @@ -23970,472 +20744,24 @@ msgstr "Zmazať uzol" msgid "Change attribute" msgstr "Zmeniť atribút" -#: ../src/ui/interface.cpp:748 -#: ../src/interface.cpp:748 -msgctxt "Interface setup" -msgid "Default" -msgstr "Štandardné" - -#: ../src/ui/interface.cpp:748 -#: ../src/interface.cpp:748 -msgid "Default interface setup" -msgstr "Štandardné rozloženie rozhrania" - -#: ../src/ui/interface.cpp:749 -#: ../src/interface.cpp:749 -msgctxt "Interface setup" -msgid "Custom" -msgstr "Vlastné" - -#: ../src/ui/interface.cpp:749 -#: ../src/interface.cpp:749 -msgid "Setup for custom task" -msgstr "Nastaviť na vlastnú úlohu" - -# TODO: check -#: ../src/ui/interface.cpp:750 -#: ../src/interface.cpp:750 -msgctxt "Interface setup" -msgid "Wide" -msgstr "Široké" - -#: ../src/ui/interface.cpp:750 -#: ../src/interface.cpp:750 -msgid "Setup for widescreen work" -msgstr "Nastavenie na prácu na širokouhlej obrazovke" - -#: ../src/ui/interface.cpp:862 -#: ../src/interface.cpp:862 -#, c-format -msgid "Verb \"%s\" Unknown" -msgstr "Sloveso „%s“ neznáme" - -#: ../src/ui/interface.cpp:901 -#: ../src/interface.cpp:901 -msgid "Open _Recent" -msgstr "Otvoriť ne_dávne" - -#: ../src/ui/interface.cpp:1009 ../src/ui/interface.cpp:1095 -#: ../src/ui/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:544 -#: ../src/interface.cpp:1009 -#: ../src/interface.cpp:1095 -#: ../src/interface.cpp:1198 -#: ../src/ui/widget/selected-style.cpp:532 -msgid "Drop color" -msgstr "Vynechať farbu" - -#: ../src/ui/interface.cpp:1048 ../src/ui/interface.cpp:1158 -#: ../src/interface.cpp:1048 -#: ../src/interface.cpp:1158 -msgid "Drop color on gradient" -msgstr "Pustiť farbu na farebný prechod" - -#: ../src/ui/interface.cpp:1211 -#: ../src/interface.cpp:1211 -msgid "Could not parse SVG data" -msgstr "Nie je možné analyzovať SVG dáta" - -#: ../src/ui/interface.cpp:1250 -#: ../src/interface.cpp:1250 -msgid "Drop SVG" -msgstr "Vynechať SVG" - -#: ../src/ui/interface.cpp:1263 -#: ../src/interface.cpp:1263 -msgid "Drop Symbol" -msgstr "Vynechať symbol" - -#: ../src/ui/interface.cpp:1294 -#: ../src/interface.cpp:1294 -msgid "Drop bitmap image" -msgstr "Vynechať bitmapový obrázok" - -#: ../src/ui/interface.cpp:1386 -#: ../src/interface.cpp:1386 -#, c-format -msgid "" -"A file named \"%s\" already exists. Do " -"you want to replace it?\n" -"\n" -"The file already exists in \"%s\". Replacing it will overwrite its contents." -msgstr "" -"Súbor s názvom „%s“ už existuje. Želáte si " -"ho nahradiť?\n" -"\n" -"Súbor už existuje v „%s“. Jeho nahradením prepíšete jeho súčasný obsah." - -#: ../src/ui/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21 -#: ../share/extensions/web-transmit-att.inx.h:19 -#: ../src/interface.cpp:1393 -msgid "Replace" -msgstr "Nahradiť" - -#: ../src/ui/interface.cpp:1464 -#: ../src/interface.cpp:1464 -msgid "Go to parent" -msgstr "O stupeň vyššie" - -#. TRANSLATORS: #%1 is the id of the group e.g. , not a number. -#: ../src/ui/interface.cpp:1505 -#: ../src/interface.cpp:1505 -msgid "Enter group #%1" -msgstr "Zadajte skupinu #%1" - -#. Item dialog -#: ../src/ui/interface.cpp:1641 ../src/verbs.cpp:2932 -#: ../src/interface.cpp:1641 -#: ../src/verbs.cpp:2849 -msgid "_Object Properties..." -msgstr "Vlastnosti _objektu..." - -#: ../src/ui/interface.cpp:1650 -#: ../src/interface.cpp:1650 -msgid "_Select This" -msgstr "_Vybrať toto" - -#: ../src/ui/interface.cpp:1661 -#: ../src/interface.cpp:1661 -msgid "Select Same" -msgstr "Vybrať rovnaké" - -#. Select same fill and stroke -#: ../src/ui/interface.cpp:1671 -#: ../src/interface.cpp:1671 -msgid "Fill and Stroke" -msgstr "Výplň a ťah" - -#. Select same fill color -#: ../src/ui/interface.cpp:1678 -#: ../src/interface.cpp:1678 -msgid "Fill Color" -msgstr "Farba výplne" - -#. Select same stroke color -#: ../src/ui/interface.cpp:1685 -#: ../src/interface.cpp:1685 -msgid "Stroke Color" -msgstr "Farba ťahu" - -#. Select same stroke style -#: ../src/ui/interface.cpp:1692 -#: ../src/interface.cpp:1692 -msgid "Stroke Style" -msgstr "Štýl ťahu" - -#. Select same stroke style -#: ../src/ui/interface.cpp:1699 -#: ../src/interface.cpp:1699 -msgid "Object type" -msgstr "Typ objektu" - -#. Move to layer -#: ../src/ui/interface.cpp:1706 -#: ../src/interface.cpp:1706 -msgid "_Move to layer ..." -msgstr "_Presunúť do vrstvy..." - -#. Create link -#: ../src/ui/interface.cpp:1716 -#: ../src/interface.cpp:1716 -msgid "Create _Link" -msgstr "Vytvoriť _odkaz" - -#. Set mask -#: ../src/ui/interface.cpp:1739 -#: ../src/interface.cpp:1739 -msgid "Set Mask" -msgstr "Nastaviť masku" - -#. Release mask -#: ../src/ui/interface.cpp:1750 -#: ../src/interface.cpp:1750 -msgid "Release Mask" -msgstr "Uvoľniť masku" - -#. SSet Clip Group -#: ../src/ui/interface.cpp:1761 -msgid "Create Clip G_roup" -msgstr "" - -#. Set Clip -#: ../src/ui/interface.cpp:1768 -#: ../src/interface.cpp:1761 -msgid "Set Cl_ip" -msgstr "Nastaviť _orezanie" - -#. Release Clip -#: ../src/ui/interface.cpp:1779 -#: ../src/interface.cpp:1772 -msgid "Release C_lip" -msgstr "Uvoľniť o_rezanie" - -#. Group -#: ../src/ui/interface.cpp:1790 ../src/verbs.cpp:2565 -#: ../src/interface.cpp:1783 -#: ../src/verbs.cpp:2486 -msgid "_Group" -msgstr "_Zoskupiť" - -#: ../src/ui/interface.cpp:1861 -#: ../src/interface.cpp:1854 -msgid "Create link" -msgstr "Vytvoriť odkaz" - -#. Ungroup -#: ../src/ui/interface.cpp:1896 ../src/verbs.cpp:2567 -#: ../src/interface.cpp:1885 -#: ../src/verbs.cpp:2488 -msgid "_Ungroup" -msgstr "Z_rušiť zoskupenie" - -#. Link dialog -#: ../src/ui/interface.cpp:1921 -#: ../src/interface.cpp:1910 -msgid "Link _Properties..." -msgstr "Nastavenie _odkazu..." - -#. Select item -#: ../src/ui/interface.cpp:1927 -#: ../src/interface.cpp:1916 -msgid "_Follow Link" -msgstr "_Nasledovať odkaz" - -#. Reset transformations -#: ../src/ui/interface.cpp:1933 -#: ../src/interface.cpp:1922 -msgid "_Remove Link" -msgstr "Odst_rániť odkaz" - -#: ../src/ui/interface.cpp:1964 -#: ../src/interface.cpp:1953 -msgid "Remove link" -msgstr "Odstrániť odkaz" - -#. Image properties -#: ../src/ui/interface.cpp:1975 -#: ../src/interface.cpp:1964 -msgid "Image _Properties..." -msgstr "Vlastnosti o_brázka..." - -#. Edit externally -#: ../src/ui/interface.cpp:1981 -#: ../src/interface.cpp:1970 -msgid "Edit Externally..." -msgstr "Upraviť externe..." - -#. Trace Bitmap -#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/ui/interface.cpp:1990 ../src/verbs.cpp:2628 -#: ../src/interface.cpp:1979 -#: ../src/verbs.cpp:2549 -msgid "_Trace Bitmap..." -msgstr "_Vektorizovať bitmapu..." - -#. Trace Pixel Art -#: ../src/ui/interface.cpp:1999 -#: ../src/interface.cpp:1988 -msgid "Trace Pixel Art" -msgstr "Vektorizovať sprite" - -#: ../src/ui/interface.cpp:2009 -#: ../src/interface.cpp:1998 -msgctxt "Context menu" -msgid "Embed Image" -msgstr "Vkladať obrázky" - -#: ../src/ui/interface.cpp:2020 -#: ../src/interface.cpp:2009 -msgctxt "Context menu" -msgid "Extract Image..." -msgstr "Extrahovať obrázok..." - -#. Item dialog -#. Fill and Stroke dialog -#: ../src/ui/interface.cpp:2165 ../src/ui/interface.cpp:2185 -#: ../src/verbs.cpp:2895 -#: ../src/interface.cpp:2154 -#: ../src/interface.cpp:2174 -#: ../src/verbs.cpp:2812 -msgid "_Fill and Stroke..." -msgstr "Výp_lň a ťah..." - -#. Edit Text dialog -#: ../src/ui/interface.cpp:2191 ../src/verbs.cpp:2914 -#: ../src/interface.cpp:2180 -#: ../src/verbs.cpp:2831 -msgid "_Text and Font..." -msgstr "Text a pís_mo..." - -#. Spellcheck dialog -#: ../src/ui/interface.cpp:2197 ../src/verbs.cpp:2922 -#: ../src/interface.cpp:2186 -#: ../src/verbs.cpp:2839 -msgid "Check Spellin_g..." -msgstr "_Skontrolovať pravopis..." - -#: ../src/ui/object-edit.cpp:456 -#: ../src/object-edit.cpp:439 -msgid "" -"Adjust the horizontal rounding radius; with Ctrl to make the " -"vertical radius the same" -msgstr "" -"Nastaviť polomer vodorovného zaoblenia; s Ctrl to isté pre " -"zvislý polomer" - -#: ../src/ui/object-edit.cpp:461 -#: ../src/object-edit.cpp:444 -msgid "" -"Adjust the vertical rounding radius; with Ctrl to make the " -"horizontal radius the same" -msgstr "" -"Nastaviť polomer zvislého zaoblenia; s Ctrl to isté pre " -"vodorovný polomer" - -#: ../src/ui/object-edit.cpp:466 ../src/ui/object-edit.cpp:471 -#: ../src/object-edit.cpp:449 -#: ../src/object-edit.cpp:454 -msgid "" -"Adjust the width and height of the rectangle; with Ctrl to " -"lock ratio or stretch in one dimension only" -msgstr "" -"Doladiť šírku a výšku obdĺžnika; s Ctrl zamknúť pomer alebo " -"natiahnuť iba v jednom rozmere" - -#: ../src/ui/object-edit.cpp:718 ../src/ui/object-edit.cpp:722 -#: ../src/ui/object-edit.cpp:726 ../src/ui/object-edit.cpp:730 -#: ../src/object-edit.cpp:689 -#: ../src/object-edit.cpp:693 -#: ../src/object-edit.cpp:697 -#: ../src/object-edit.cpp:701 -msgid "" -"Resize box in X/Y direction; with Shift along the Z axis; with " -"Ctrl to constrain to the directions of edges or diagonals" -msgstr "" -"Zmeniť veľkosť obdĺžnika v smere X/Y; so Shift na osi Z; s " -"Ctrl obmedziť na smery hrán alebo diagonál" - -#: ../src/ui/object-edit.cpp:734 ../src/ui/object-edit.cpp:738 -#: ../src/ui/object-edit.cpp:742 ../src/ui/object-edit.cpp:746 -#: ../src/object-edit.cpp:705 -#: ../src/object-edit.cpp:709 -#: ../src/object-edit.cpp:713 -#: ../src/object-edit.cpp:717 -msgid "" -"Resize box along the Z axis; with Shift in X/Y direction; with " -"Ctrl to constrain to the directions of edges or diagonals" -msgstr "" -"Zmeniť veľkosť obdĺžnika na osi Z; so Shift v smere X/Y; s " -"Ctrl obmedziť na smery hrán alebo diagonál" - -#: ../src/ui/object-edit.cpp:750 -#: ../src/object-edit.cpp:721 -msgid "Move the box in perspective" -msgstr "Posunúť kváder v perspektíve" - -#: ../src/ui/object-edit.cpp:989 -#: ../src/object-edit.cpp:948 -msgid "Adjust ellipse width, with Ctrl to make circle" -msgstr "Doladiť šírku elipsy, s Ctrl sa vytvorí kružnica" - -#: ../src/ui/object-edit.cpp:993 -#: ../src/object-edit.cpp:952 -msgid "Adjust ellipse height, with Ctrl to make circle" -msgstr "Doladiť výšku elipsy, s Ctrl sa vytvorí kružnica" - -#: ../src/ui/object-edit.cpp:997 -#: ../src/object-edit.cpp:956 -msgid "" -"Position the start point of the arc or segment; with Ctrl to " -"snap angle; drag inside the ellipse for arc, outside for " -"segment" -msgstr "" -"Poloha počiatočného bodu oblúku alebo segmentu; s Ctrl " -"prichytávanie k uhlu; ťahanie vnútri elipsy urobí oblúk, mimo " -"urobí segment" - -#: ../src/ui/object-edit.cpp:1002 -#: ../src/object-edit.cpp:961 -msgid "" -"Position the end point of the arc or segment; with Ctrl to " -"snap angle; drag inside the ellipse for arc, outside for " -"segment" -msgstr "" -"Určiť polohu koncového bodu oblúku alebo segmentu; s Ctrl " -"prichytávanie k uhlu; ťahanie vnútri elipsy urobí oblúk, mimo " -"urobí segment" - -#: ../src/ui/object-edit.cpp:1148 -#: ../src/object-edit.cpp:1101 -msgid "" -"Adjust the tip radius of the star or polygon; with Shift to " -"round; with Alt to randomize" -msgstr "" -"Nastaviť polomer vrchola hviezdy alebo mnohouholníka; s Ctrl " -"zaoblenie; s Alt znáhodnenie" - -#: ../src/ui/object-edit.cpp:1156 -#: ../src/object-edit.cpp:1109 -msgid "" -"Adjust the base radius of the star; with Ctrl to keep star " -"rays radial (no skew); with Shift to round; with Alt to " -"randomize" -msgstr "" -"Nastaviť polomer základne hviezdy; s Ctrl udržiavať lúče " -"hviezdy radiálne (bez skosenia); so Shift zaoblenie; s Alt " -"znáhodnenie" - -#: ../src/ui/object-edit.cpp:1351 -#: ../src/object-edit.cpp:1299 -msgid "" -"Roll/unroll the spiral from inside; with Ctrl to snap angle; " -"with Alt to converge/diverge" -msgstr "" -"Zbaliť/rozbaliť špirálu zvnútra; s Ctrl prichytávanie k uhlu; " -"s Alt konvergovať/divergovať" - -#: ../src/ui/object-edit.cpp:1355 -#: ../src/object-edit.cpp:1303 -#, fuzzy -msgid "" -"Roll/unroll the spiral from outside; with Ctrl to snap angle; " -"with Shift to scale/rotate; with Alt to lock radius" -msgstr "" -"Zbaliť/rozbaliť špirálu zvonka; s Ctrl prichytávanie k uhlu; " -"so Shift zmena mierky/otáčanie" - -#: ../src/ui/object-edit.cpp:1402 -#: ../src/object-edit.cpp:1348 -msgid "Adjust the offset distance" -msgstr "Prispôsobiť vzdialenosť posunu" - -#: ../src/ui/object-edit.cpp:1439 -#: ../src/object-edit.cpp:1384 -msgid "Drag to resize the flowed text frame" -msgstr "Ťahaním zmeníte veľkosť rámca textového toku" - -#: ../src/ui/tool/curve-drag-point.cpp:119 #: ../src/ui/tool/curve-drag-point.cpp:100 msgid "Drag curve" msgstr "Ťahať krivku" -#: ../src/ui/tool/curve-drag-point.cpp:176 #: ../src/ui/tool/curve-drag-point.cpp:157 msgid "Add node" msgstr "Pridať uzol" -#: ../src/ui/tool/curve-drag-point.cpp:186 #: ../src/ui/tool/curve-drag-point.cpp:167 msgctxt "Path segment tip" msgid "Shift: click to toggle segment selection" msgstr "Shift: kliknutie prepína výber segmentu" -#: ../src/ui/tool/curve-drag-point.cpp:190 #: ../src/ui/tool/curve-drag-point.cpp:171 msgctxt "Path segment tip" msgid "Ctrl+Alt: click to insert a node" msgstr "Ctrl+Alt: kliknutím vložíte uzol" -#: ../src/ui/tool/curve-drag-point.cpp:194 #: ../src/ui/tool/curve-drag-point.cpp:175 msgctxt "Path segment tip" msgid "" @@ -24445,7 +20771,6 @@ msgstr "" "Segment úsečky: ťahaním prevediete na bézierov segment, dvojitým " "kliknutím vložíte uzol, kliknutím vyberiete (ďalšie: Shift, Ctrl+Alt)" -#: ../src/ui/tool/curve-drag-point.cpp:198 #: ../src/ui/tool/curve-drag-point.cpp:179 msgctxt "Path segment tip" msgid "" @@ -24459,8 +20784,7 @@ msgstr "" msgid "Retract handles" msgstr "Stiahnuť úchopy" -#: ../src/ui/tool/multi-path-manipulator.cpp:315 ../src/ui/tool/node.cpp:296 -#: ../src/ui/tool/node.cpp:270 +#: ../src/ui/tool/multi-path-manipulator.cpp:315 ../src/ui/tool/node.cpp:270 msgid "Change node type" msgstr "Zmeniť typ uzla" @@ -24477,8 +20801,9 @@ msgid "Add nodes" msgstr "Pridať uzly" #: ../src/ui/tool/multi-path-manipulator.cpp:339 +#, fuzzy msgid "Add extremum nodes" -msgstr "Pridať uzly extrémov" +msgstr "Pridať uzly" #: ../src/ui/tool/multi-path-manipulator.cpp:346 msgid "Duplicate nodes" @@ -24498,101 +20823,84 @@ msgstr "Rozdeliť uzly" msgid "Delete nodes" msgstr "Zmazať uzly" -#: ../src/ui/tool/multi-path-manipulator.cpp:768 #: ../src/ui/tool/multi-path-manipulator.cpp:757 msgid "Move nodes" msgstr "Posúvať uzly" -#: ../src/ui/tool/multi-path-manipulator.cpp:771 #: ../src/ui/tool/multi-path-manipulator.cpp:760 msgid "Move nodes horizontally" msgstr "Posúvať uzly vodorovne" -#: ../src/ui/tool/multi-path-manipulator.cpp:775 #: ../src/ui/tool/multi-path-manipulator.cpp:764 msgid "Move nodes vertically" msgstr "Posúvať uzly zvisle" -#: ../src/ui/tool/multi-path-manipulator.cpp:786 -#: ../src/ui/tool/multi-path-manipulator.cpp:792 +#: ../src/ui/tool/multi-path-manipulator.cpp:768 +#: ../src/ui/tool/multi-path-manipulator.cpp:771 +msgid "Rotate nodes" +msgstr "Otáčať uzly" + #: ../src/ui/tool/multi-path-manipulator.cpp:775 #: ../src/ui/tool/multi-path-manipulator.cpp:781 msgid "Scale nodes uniformly" msgstr "Zmeniť mierku uzlov rovnomerne" -#: ../src/ui/tool/multi-path-manipulator.cpp:789 #: ../src/ui/tool/multi-path-manipulator.cpp:778 msgid "Scale nodes" msgstr "Zmeniť mierku uzlov" -#: ../src/ui/tool/multi-path-manipulator.cpp:796 #: ../src/ui/tool/multi-path-manipulator.cpp:785 msgid "Scale nodes horizontally" msgstr "Zmeniť mierku uzlov vodorovne" -#: ../src/ui/tool/multi-path-manipulator.cpp:800 #: ../src/ui/tool/multi-path-manipulator.cpp:789 msgid "Scale nodes vertically" msgstr "Zmeniť mierku uzlov zvisle" -#: ../src/ui/tool/multi-path-manipulator.cpp:804 #: ../src/ui/tool/multi-path-manipulator.cpp:793 +#, fuzzy msgid "Skew nodes horizontally" msgstr "Zmeniť mierku uzlov vodorovne" -#: ../src/ui/tool/multi-path-manipulator.cpp:808 #: ../src/ui/tool/multi-path-manipulator.cpp:797 +#, fuzzy msgid "Skew nodes vertically" msgstr "Zmeniť mierku uzlov zvisle" -#: ../src/ui/tool/multi-path-manipulator.cpp:812 #: ../src/ui/tool/multi-path-manipulator.cpp:801 msgid "Flip nodes horizontally" msgstr "Preklopiť uzly vodorovne" -#: ../src/ui/tool/multi-path-manipulator.cpp:815 #: ../src/ui/tool/multi-path-manipulator.cpp:804 msgid "Flip nodes vertically" msgstr "Preklopiť uzly zvisle" -#: ../src/ui/tool/node.cpp:271 #: ../src/ui/tool/node.cpp:245 msgid "Cusp node handle" msgstr "Úchop hrotového uzla" -#: ../src/ui/tool/node.cpp:272 #: ../src/ui/tool/node.cpp:246 msgid "Smooth node handle" msgstr "Úchop hladkého uzla" -#: ../src/ui/tool/node.cpp:273 #: ../src/ui/tool/node.cpp:247 msgid "Symmetric node handle" msgstr "Úchop symetrického uzla" -#: ../src/ui/tool/node.cpp:274 #: ../src/ui/tool/node.cpp:248 msgid "Auto-smooth node handle" msgstr "Úchop auto-hladkého uzla" -#: ../src/ui/tool/node.cpp:493 #: ../src/ui/tool/node.cpp:432 msgctxt "Path handle tip" msgid "more: Shift, Ctrl, Alt" msgstr "ďalšie: Shift, Ctrl, Alt" -#: ../src/ui/tool/node.cpp:495 -msgctxt "Path handle tip" -msgid "more: Ctrl" -msgstr "" - -#: ../src/ui/tool/node.cpp:497 #: ../src/ui/tool/node.cpp:434 msgctxt "Path handle tip" msgid "more: Ctrl, Alt" msgstr "ďalšie: Ctrl, Alt" -#: ../src/ui/tool/node.cpp:503 #: ../src/ui/tool/node.cpp:440 #, c-format msgctxt "Path handle tip" @@ -24603,7 +20911,6 @@ msgstr "" "Shift+Ctrl+Alt: zachovať dĺžku a prichytávať uhol otáčania k " "prírastkom %g° počas otáčania oboch páčok" -#: ../src/ui/tool/node.cpp:508 #: ../src/ui/tool/node.cpp:445 #, c-format msgctxt "Path handle tip" @@ -24612,19 +20919,16 @@ msgid "" msgstr "" "Ctrl+Alt: zachovať dĺžku a prichytávať uhol otáčania k prírastkom %g°" -#: ../src/ui/tool/node.cpp:514 #: ../src/ui/tool/node.cpp:451 msgctxt "Path handle tip" msgid "Shift+Alt: preserve handle length and rotate both handles" msgstr "Shift+Alt: zachová dĺžku úchopu a otáča obomi úchopmi" -#: ../src/ui/tool/node.cpp:517 #: ../src/ui/tool/node.cpp:454 msgctxt "Path handle tip" msgid "Alt: preserve handle length while dragging" msgstr "Alt: zachovať dĺžku počas ťahania" -#: ../src/ui/tool/node.cpp:524 #: ../src/ui/tool/node.cpp:461 #, c-format msgctxt "Path handle tip" @@ -24635,12 +20939,6 @@ msgstr "" "Shift+Ctrl: prichytáva uhol otáčania k prírastkom %g° a otáča obomi " "úchopmi" -#: ../src/ui/tool/node.cpp:528 -msgctxt "Path handle tip" -msgid "Ctrl: Move handle by his actual steps in BSpline Live Effect" -msgstr "" - -#: ../src/ui/tool/node.cpp:531 #: ../src/ui/tool/node.cpp:465 #, c-format msgctxt "Path handle tip" @@ -24648,83 +20946,60 @@ msgid "Ctrl: snap rotation angle to %g° increments, click to retract" msgstr "" "Ctrl: prichytávať uhol otáčania k prírastkom %g°, kliknutím stiahnuť" -#: ../src/ui/tool/node.cpp:536 #: ../src/ui/tool/node.cpp:470 msgctxt "Path hande tip" msgid "Shift: rotate both handles by the same angle" msgstr "Shift: otáčať oba úchopy o rovnaký uhol" -#: ../src/ui/tool/node.cpp:539 -msgctxt "Path hande tip" -msgid "Shift: move handle" -msgstr "" - -#: ../src/ui/tool/node.cpp:546 ../src/ui/tool/node.cpp:550 #: ../src/ui/tool/node.cpp:477 #, c-format msgctxt "Path handle tip" msgid "Auto node handle: drag to convert to smooth node (%s)" msgstr "Auto úchop uzla: ťahaním prevediete na hladký uzol (%s)" -#: ../src/ui/tool/node.cpp:553 +#: ../src/ui/tool/node.cpp:480 #, c-format msgctxt "Path handle tip" -msgid "BSpline node handle: Shift to drag, double click to reset (%s)" -msgstr "" +msgid "%s: drag to shape the segment (%s)" +msgstr "%s: ťahaním zmeníte tvar úseku (%s)" -#: ../src/ui/tool/node.cpp:573 #: ../src/ui/tool/node.cpp:500 #, c-format msgctxt "Path handle tip" msgid "Move handle by %s, %s; angle %.2f°, length %s" msgstr "Posunúť úchop o %s, %s; uhol %.2f°, dĺžka %s" -#: ../src/ui/tool/node.cpp:1447 #: ../src/ui/tool/node.cpp:1270 msgctxt "Path node tip" msgid "Shift: drag out a handle, click to toggle selection" msgstr "Shift: vytiahne úchop, kliknutím prepína výber" -#: ../src/ui/tool/node.cpp:1449 #: ../src/ui/tool/node.cpp:1272 msgctxt "Path node tip" msgid "Shift: click to toggle selection" msgstr "Shift: kliknutie prepína výber" -#: ../src/ui/tool/node.cpp:1454 #: ../src/ui/tool/node.cpp:1277 msgctxt "Path node tip" msgid "Ctrl+Alt: move along handle lines, click to delete node" msgstr "Ctrl+Alt: posúvanie pozdĺž čiar páčok, kliknutím zmažete uzol" -#: ../src/ui/tool/node.cpp:1457 #: ../src/ui/tool/node.cpp:1280 msgctxt "Path node tip" msgid "Ctrl: move along axes, click to change node type" msgstr "Ctrl: posúvanie pozdĺž osí, kliknutím zmeníte typ uzla" -#: ../src/ui/tool/node.cpp:1461 #: ../src/ui/tool/node.cpp:1284 msgctxt "Path node tip" msgid "Alt: sculpt nodes" msgstr "Alt: tesanie uzlov" -#: ../src/ui/tool/node.cpp:1469 #: ../src/ui/tool/node.cpp:1292 #, c-format msgctxt "Path node tip" msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" msgstr "%s: ťahaním zmeníte tvar cesty (ďalšie: Shift, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1472 -#, c-format -msgctxt "Path node tip" -msgid "" -"BSpline node: %g weight, drag to shape the path (more: Shift, Ctrl, " -"Alt)" -msgstr "" - -#: ../src/ui/tool/node.cpp:1475 #: ../src/ui/tool/node.cpp:1295 #, c-format msgctxt "Path node tip" @@ -24735,7 +21010,6 @@ msgstr "" "%s: ťahaním zmeníte tvar cesty, kliknutím prepnete medzi úchopmi na " "zmenu mierky a otáčanie (ďalšie: Shift, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1479 #: ../src/ui/tool/node.cpp:1298 #, c-format msgctxt "Path node tip" @@ -24746,60 +21020,44 @@ msgstr "" "%s: ťahaním zmeníte tvar cesty, kliknutím vyberiete iba tento uzol " "(ďalšie: Shift, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1482 -msgctxt "Path node tip" -msgid "" -"BSpline node: drag to shape the path, click to select only this node " -"(more: Shift, Ctrl, Alt)" -msgstr "" - -#: ../src/ui/tool/node.cpp:1495 #: ../src/ui/tool/node.cpp:1309 #, c-format msgctxt "Path node tip" msgid "Move node by %s, %s" msgstr "Posunúť uzol o %s, %s" -#: ../src/ui/tool/node.cpp:1506 #: ../src/ui/tool/node.cpp:1320 msgid "Symmetric node" msgstr "Symetrický uzol" -#: ../src/ui/tool/node.cpp:1507 #: ../src/ui/tool/node.cpp:1321 msgid "Auto-smooth node" msgstr "Auto-hladký uzol" # TODO: check -#: ../src/ui/tool/path-manipulator.cpp:836 #: ../src/ui/tool/path-manipulator.cpp:821 msgid "Scale handle" msgstr "Úchop na zmenu mierky" -#: ../src/ui/tool/path-manipulator.cpp:860 #: ../src/ui/tool/path-manipulator.cpp:845 msgid "Rotate handle" msgstr "Úchop na otáčanie" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1524 -#: ../src/widgets/node-toolbar.cpp:397 #: ../src/ui/tool/path-manipulator.cpp:1384 +#: ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Zmazať uzol" -#: ../src/ui/tool/path-manipulator.cpp:1532 #: ../src/ui/tool/path-manipulator.cpp:1392 msgid "Cycle node type" msgstr "Zmeniť typ uzla" # TODO: check -#: ../src/ui/tool/path-manipulator.cpp:1547 #: ../src/ui/tool/path-manipulator.cpp:1407 msgid "Drag handle" msgstr "Úchop ťahania" -#: ../src/ui/tool/path-manipulator.cpp:1556 #: ../src/ui/tool/path-manipulator.cpp:1416 msgid "Retract handle" msgstr "Stiahnuť úchop" @@ -24922,197 +21180,12 @@ msgctxt "Transform handle tip" msgid "Rotation center: drag to change the origin of transforms" msgstr "Stred otáčania: ťahaním zmeníte počiatok transformácií" -#: ../src/ui/tools-switch.cpp:95 -#: ../src/tools-switch.cpp:91 -#, fuzzy -msgid "" -"Click to Select and Transform objects, Drag to select many " -"objects." -msgstr "Kliknutím vyberte uzly, ťahaním preskupte." - -#: ../src/ui/tools-switch.cpp:96 -#: ../src/tools-switch.cpp:92 -#, fuzzy -msgid "Modify selected path points (nodes) directly." -msgstr "Zjednoduší vybrané cesty (odstráni nadbytočné uzly)" - -#: ../src/ui/tools-switch.cpp:97 -#: ../src/tools-switch.cpp:93 -msgid "To tweak a path by pushing, select it and drag over it." -msgstr "Cestu doladíte tlačením tak, že ju vyberiete a ťaháte ponad ňu myšou." - -#: ../src/ui/tools-switch.cpp:98 -#: ../src/tools-switch.cpp:94 -#, fuzzy -msgid "" -"Drag, click or click and scroll to spray the selected " -"objects." -msgstr "" -"Ťahaním, kliknutím alebo posunutím nasprejujete vybrané " -"objekty." - -#: ../src/ui/tools-switch.cpp:99 -#: ../src/tools-switch.cpp:95 -msgid "" -"Drag to create a rectangle. Drag controls to round corners and " -"resize. Click to select." -msgstr "" -"Ťahaním vytvoríte obdĺžnik. Ťahaním ovládacích prvkov zaoblíte " -"rohy a zmeníte veľkosť. Kliknutím vyberiete." - -#: ../src/ui/tools-switch.cpp:100 -#: ../src/tools-switch.cpp:96 -msgid "" -"Drag to create a 3D box. Drag controls to resize in " -"perspective. Click to select (with Ctrl+Alt for single faces)." -msgstr "" -"Ťahaním vytvoríte kváder. Ťahaním úchopov meníte veľkosť v " -"perspektívnom pohľade (pomocou Ctrl+Alt len pre samostatné steny)." - -#: ../src/ui/tools-switch.cpp:101 -#: ../src/tools-switch.cpp:97 -msgid "" -"Drag to create an ellipse. Drag controls to make an arc or " -"segment. Click to select." -msgstr "" -"Ťahaním vytvoríte elipsu. Ťahaním úchopov vytvoríte oblúk " -"alebo segment. Kliknutím vyberiete." - -#: ../src/ui/tools-switch.cpp:102 -#: ../src/tools-switch.cpp:98 -msgid "" -"Drag to create a star. Drag controls to edit the star shape. " -"Click to select." -msgstr "" -"Ťahaním vytvoríte hviezdu. Ťahaním úchopov upravíte tvar " -"hviezdy. Kliknutím vyberiete." - -#: ../src/ui/tools-switch.cpp:103 -#: ../src/tools-switch.cpp:99 -msgid "" -"Drag to create a spiral. Drag controls to edit the spiral " -"shape. Click to select." -msgstr "" -"Ťahaním vytvoríte špirálu. Ťahaním úchopov upravíte tvar " -"špirály. Kliknutím vyberiete." - -#: ../src/ui/tools-switch.cpp:104 -#: ../src/tools-switch.cpp:100 -msgid "" -"Drag to create a freehand line. Shift appends to selected " -"path, Alt activates sketch mode." -msgstr "" -"Ťahaním vytvoríte čiaru voľnou rukou. Začnite kresliť so stlačeným " -"Shift pre pokračovanie vo vybranej ceste, Alt aktivuje režim " -"skicy." - -#: ../src/ui/tools-switch.cpp:105 -#: ../src/tools-switch.cpp:101 -msgid "" -"Click or click and drag to start a path; with Shift to " -"append to selected path. Ctrl+click to create single dots (straight " -"line modes only)." -msgstr "" -"Kliknutím alebo kliknutím a ťahaním začnete cestu; pomocou " -"Shift pridáte k vybranej ceste. Ctrl+kliknutím vytvoríte " -"jednotlivé bodky (iba režimy priamych čiar)." - -#: ../src/ui/tools-switch.cpp:106 -#: ../src/tools-switch.cpp:102 -msgid "" -"Drag to draw a calligraphic stroke; with Ctrl to track a guide " -"path. Arrow keys adjust width (left/right) and angle (up/down)." -msgstr "" -"Ťahaním vytvoríte kaligrafický ťah; pomocou Ctrl sledujete " -"vodidlo. Šípky vľavo/vpravo dolaďujú šírku, " -"nahor/nadol upravujú uhol." - -#: ../src/ui/tools-switch.cpp:107 ../src/ui/tools/text-tool.cpp:1593 -#: ../src/tools-switch.cpp:103 -msgid "" -"Click to select or create text, drag to create flowed text; " -"then type." -msgstr "" -"Kliknutím vyberiete alebo vytvoríte text, ťahaním vytvoríte " -"textový tok; potom píšte." - -#: ../src/ui/tools-switch.cpp:108 -#: ../src/tools-switch.cpp:104 -msgid "" -"Drag or double click to create a gradient on selected objects, " -"drag handles to adjust gradients." -msgstr "" -"Ťahaním alebo dvojitým kliknutím vytvoríte farebný prechod na " -"vybraných objektoch. Ťahaním úchopov doladíte farebný prechod." - -#: ../src/ui/tools-switch.cpp:109 -#: ../src/tools-switch.cpp:105 -#, fuzzy -msgid "" -"Drag or double click to create a mesh on selected objects, " -"drag handles to adjust meshes." -msgstr "" -"Ťahaním alebo dvojitým kliknutím vytvoríte farebný prechod na " -"vybraných objektoch. Ťahaním úchopov doladíte farebný prechod." - -#: ../src/ui/tools-switch.cpp:110 -#: ../src/tools-switch.cpp:106 -msgid "" -"Click or drag around an area to zoom in, Shift+click to " -"zoom out." -msgstr "" -"Kliknutím alebo ťahaním oblasti priblížite, " -"Shift+kliknutím oddialite." - -#: ../src/ui/tools-switch.cpp:111 -#: ../src/tools-switch.cpp:107 -msgid "Drag to measure the dimensions of objects." -msgstr "Potiahnutím odmeráte rozmery objektu." - -#: ../src/ui/tools-switch.cpp:112 ../src/ui/tools/dropper-tool.cpp:285 -#: ../src/tools-switch.cpp:108 -msgid "" -"Click to set fill, Shift+click to set stroke; drag to " -"average color in area; with Alt to pick inverse color; Ctrl+C " -"to copy the color under mouse to clipboard" -msgstr "" -"Kliknutie nastaví farbu výplne, Shift+kliknutie nastaví farbu " -"ťahu; kliknutie a ťahanie vyberie priemernú farbu oblasti; s " -"Alt výber inverznej farby; Ctrl+C skopíruje farbu pod kurzorom " -"do schránky" - -#: ../src/ui/tools-switch.cpp:113 -#: ../src/tools-switch.cpp:109 -msgid "Click and drag between shapes to create a connector." -msgstr "Kliknutím a ťahaním medzi tvarmi vytvoríte konektor." - -#: ../src/ui/tools-switch.cpp:114 -#: ../src/tools-switch.cpp:110 -msgid "" -"Click to paint a bounded area, Shift+click to union the new " -"fill with the current selection, Ctrl+click to change the clicked " -"object's fill and stroke to the current setting." -msgstr "" -"Kliknutím vyfarbíte ohraničenú oblasť, Shift+kliknutím " -"zjednotíte novú výplň s aktuálnym výberom, Ctrl+kliknutím zmeníte " -"výplň a ťah objektu, na ktorý klikáte na aktuálne nastavenie." - -#: ../src/ui/tools-switch.cpp:115 -#: ../src/tools-switch.cpp:111 -msgid "Drag to erase." -msgstr "Ťahaním vymazať." - -#: ../src/ui/tools-switch.cpp:116 -#: ../src/tools-switch.cpp:112 -msgid "Choose a subtool from the toolbar" -msgstr "Vyberte podnástroj z panelu nástrojov" - #: ../src/ui/tools/arc-tool.cpp:252 msgid "" "Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle" msgstr "" -"Ctrl: vytvoriť kruh alebo celočíselnú elipsu, prichytávať uhol " -"oblúka/úseku" +"Ctrl: vytvoriť kruh alebo celočíselnú elipsu, prichytávať uhol oblúka/" +"úseku" #: ../src/ui/tools/arc-tool.cpp:253 ../src/ui/tools/rect-tool.cpp:289 msgid "Shift: draw around the starting point" @@ -25260,24 +21333,28 @@ msgid "Visible Colors" msgstr "Viditeľné farby" #: ../src/ui/tools/flood-tool.cpp:210 +#, fuzzy msgctxt "Flood autogap" msgid "None" -msgstr "Žiadna" +msgstr "Žiadny" #: ../src/ui/tools/flood-tool.cpp:211 +#, fuzzy msgctxt "Flood autogap" msgid "Small" -msgstr "Malá" +msgstr "malý" #: ../src/ui/tools/flood-tool.cpp:212 +#, fuzzy msgctxt "Flood autogap" msgid "Medium" -msgstr "Stredná" +msgstr "stredný" #: ../src/ui/tools/flood-tool.cpp:213 +#, fuzzy msgctxt "Flood autogap" msgid "Large" -msgstr "Veľká" +msgstr "veľký" #: ../src/ui/tools/flood-tool.cpp:435 msgid "Too much inset, the result is empty." @@ -25332,29 +21409,24 @@ msgstr "" "dotykom" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:557 -#: ../src/ui/tools/freehand-base.cpp:517 +#: ../src/ui/tools/freehand-base.cpp:518 msgid "Path is closed." msgstr "Cesta je uzatvorená." #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:572 -#: ../src/ui/tools/freehand-base.cpp:532 +#: ../src/ui/tools/freehand-base.cpp:533 msgid "Closing path." msgstr "Uzatváranie cesty." -#: ../src/ui/tools/freehand-base.cpp:709 -#: ../src/ui/tools/freehand-base.cpp:634 +#: ../src/ui/tools/freehand-base.cpp:635 msgid "Draw path" msgstr "Kresliť cestu" -#: ../src/ui/tools/freehand-base.cpp:862 -#: ../src/ui/tools/freehand-base.cpp:791 +#: ../src/ui/tools/freehand-base.cpp:792 msgid "Creating single dot" msgstr "Tvorba jednotlivého bodu" -#: ../src/ui/tools/freehand-base.cpp:863 -#: ../src/ui/tools/freehand-base.cpp:792 +#: ../src/ui/tools/freehand-base.cpp:793 msgid "Create single dot" msgstr "Vytvoriť jednotlivý bod" @@ -25392,14 +21464,14 @@ msgid "" msgid_plural "" "One handle merging %d stops (drag with Shift to separate) selected" msgstr[0] "" -"Vybraný jeden úchop spájajúci %d priehradku (oddelíte ťahaním so " -"Shift)" +"Vybraný jeden úchop spájajúci %d priehradku (oddelíte ťahaním so Shift)" msgstr[1] "" -"Vybraný jeden úchop spájajúci %d priehradky (oddelíte ťahaním so " -"Shift)" +"Vybraný jeden úchop spájajúci %d priehradky (oddelíte ťahaním so Shift)" msgstr[2] "" -"Vybraný jeden úchop spájajúci %d priehradiek (oddelíte ťahaním so " -"Shift)" +"Vybraný jeden úchop spájajúci %d priehradiek (oddelíte ťahaním so Shift)" #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) #: ../src/ui/tools/gradient-tool.cpp:148 @@ -25426,33 +21498,27 @@ msgstr[2] "" "Žiaden z %d úchopov farebných prechodov nebol vybraný na %d vybraných " "objektoch" -#: ../src/ui/tools/gradient-tool.cpp:443 #: ../src/ui/tools/gradient-tool.cpp:440 msgid "Simplify gradient" msgstr "Zjednodušiť farebný prechod" -#: ../src/ui/tools/gradient-tool.cpp:519 #: ../src/ui/tools/gradient-tool.cpp:516 msgid "Create default gradient" msgstr "Vytvoriť predvolený farebný prechod" -#: ../src/ui/tools/gradient-tool.cpp:578 ../src/ui/tools/mesh-tool.cpp:570 -#: ../src/ui/tools/gradient-tool.cpp:575 +#: ../src/ui/tools/gradient-tool.cpp:575 ../src/ui/tools/mesh-tool.cpp:570 msgid "Draw around handles to select them" msgstr "Kreslením okolo úchopov ich vyberiete" -#: ../src/ui/tools/gradient-tool.cpp:701 #: ../src/ui/tools/gradient-tool.cpp:698 msgid "Ctrl: snap gradient angle" msgstr "Ctrl: prichytávať uhol farebného prechodu" -#: ../src/ui/tools/gradient-tool.cpp:702 #: ../src/ui/tools/gradient-tool.cpp:699 msgid "Shift: draw gradient around the starting point" msgstr "Shift: ťahať farebný prechod okolo štartovacieho bodu" -#: ../src/ui/tools/gradient-tool.cpp:956 ../src/ui/tools/mesh-tool.cpp:993 -#: ../src/ui/tools/gradient-tool.cpp:953 +#: ../src/ui/tools/gradient-tool.cpp:953 ../src/ui/tools/mesh-tool.cpp:993 #, c-format msgid "Gradient for %d object; with Ctrl to snap angle" msgid_plural "Gradient for %d objects; with Ctrl to snap angle" @@ -25463,19 +21529,16 @@ msgstr[1] "" msgstr[2] "" "Farebný prechod pre %d objektov; s Ctrl prichytávanie k uhlu" -#: ../src/ui/tools/gradient-tool.cpp:960 ../src/ui/tools/mesh-tool.cpp:997 -#: ../src/ui/tools/gradient-tool.cpp:957 +#: ../src/ui/tools/gradient-tool.cpp:957 ../src/ui/tools/mesh-tool.cpp:997 msgid "Select objects on which to create gradient." msgstr "Vyberte objekty, na ktorých sa má vytvoriť farebný prechod." -#: ../src/ui/tools/lpe-tool.cpp:206 #: ../src/ui/tools/lpe-tool.cpp:207 msgid "Choose a construction tool from the toolbar." msgstr "Vyberte z panelu nástrojov konštrukčný nástroj." #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:132 ../src/ui/tools/mesh-tool.cpp:143 -#, c-format #, fuzzy, c-format msgid " out of %d mesh handle" msgid_plural " out of %d mesh handles" @@ -25484,7 +21547,6 @@ msgstr[1] " z %d úchopov farebného prechodu" msgstr[2] " z %d úchopov farebného prechodu" #: ../src/ui/tools/mesh-tool.cpp:150 -#, c-format #, fuzzy, c-format msgid "%d mesh handle selected out of %d" msgid_plural "%d mesh handles selected out of %d" @@ -25494,7 +21556,6 @@ msgstr[2] "Vybraných %d z %d úchopov farebných prechodov" #. TRANSLATORS: The plural refers to number of selected objects #: ../src/ui/tools/mesh-tool.cpp:157 -#, c-format #, fuzzy, c-format msgid "No mesh handles selected out of %d on %d selected object" msgid_plural "No mesh handles selected out of %d on %d selected objects" @@ -25549,8 +21610,7 @@ msgstr "Ctrl: zlomiť uhol" msgid "FIXMEShift: draw mesh around the starting point" msgstr "Shift: kresliť okolo štartovacieho bodu" -#: ../src/ui/tools/node-tool.cpp:612 -#: ../src/ui/tools/node-tool.cpp:594 +#: ../src/ui/tools/node-tool.cpp:598 msgctxt "Node tool tip" msgid "" "Shift: drag to add nodes to the selection, click to toggle object " @@ -25559,14 +21619,12 @@ msgstr "" "Shift: ťahaním pridáte uzly do výberu, kliknutím prepnete výber " "objektu" -#: ../src/ui/tools/node-tool.cpp:616 -#: ../src/ui/tools/node-tool.cpp:598 +#: ../src/ui/tools/node-tool.cpp:602 msgctxt "Node tool tip" msgid "Shift: drag to add nodes to the selection" msgstr "Shift: ťahaním pridáte uzly do výberu" -#: ../src/ui/tools/node-tool.cpp:628 -#: ../src/ui/tools/node-tool.cpp:610 +#: ../src/ui/tools/node-tool.cpp:614 #, c-format msgid "%u of %u node selected." msgid_plural "%u of %u nodes selected." @@ -25574,8 +21632,7 @@ msgstr[0] "%u zo %u uzlov zvolených." msgstr[1] "%u zo %u uzlov zvolených." msgstr[2] "%u zo %u uzlov zvolených." -#: ../src/ui/tools/node-tool.cpp:634 -#: ../src/ui/tools/node-tool.cpp:616 +#: ../src/ui/tools/node-tool.cpp:620 #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click to edit only this object (more: Shift)" @@ -25583,76 +21640,55 @@ msgstr "" "%s Ťahaním vyberiete uzly, kliknutím upravíte iba tento objekt (ďalšie: " "Shift)" -#: ../src/ui/tools/node-tool.cpp:640 -#: ../src/ui/tools/node-tool.cpp:622 +#: ../src/ui/tools/node-tool.cpp:626 #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click clear the selection" msgstr "%s Ťahaním vyberiete uzly, kliknutím vyčistíte výber" -#: ../src/ui/tools/node-tool.cpp:649 -#: ../src/ui/tools/node-tool.cpp:631 +#: ../src/ui/tools/node-tool.cpp:635 msgctxt "Node tool tip" msgid "Drag to select nodes, click to edit only this object" msgstr "Ťahaním vyberiete uzly, kliknutím upravíte iba tento objekt" -#: ../src/ui/tools/node-tool.cpp:652 -#: ../src/ui/tools/node-tool.cpp:634 +#: ../src/ui/tools/node-tool.cpp:638 msgctxt "Node tool tip" msgid "Drag to select nodes, click to clear the selection" msgstr "Ťahaním vyberiete uzly, kliknutím vyčistíte výber" -#: ../src/ui/tools/node-tool.cpp:657 -#: ../src/ui/tools/node-tool.cpp:639 +#: ../src/ui/tools/node-tool.cpp:643 msgctxt "Node tool tip" msgid "Drag to select objects to edit, click to edit this object (more: Shift)" msgstr "" "Ťahaním vyberiete objekty na úpravu, kliknutím upravíte tento objekt " "(ďalšie: Shift)" -#: ../src/ui/tools/node-tool.cpp:660 -#: ../src/ui/tools/node-tool.cpp:642 +#: ../src/ui/tools/node-tool.cpp:646 msgctxt "Node tool tip" msgid "Drag to select objects to edit" msgstr "Ťahaním vyberiete objekty na úpravu" -#: ../src/ui/tools/pen-tool.cpp:233 ../src/ui/tools/pencil-tool.cpp:466 -#: ../src/ui/tools/pen-tool.cpp:186 -#: ../src/ui/tools/pencil-tool.cpp:465 +#: ../src/ui/tools/pen-tool.cpp:186 ../src/ui/tools/pencil-tool.cpp:465 msgid "Drawing cancelled" msgstr "Kreslenie zrušené" -#: ../src/ui/tools/pen-tool.cpp:469 ../src/ui/tools/pencil-tool.cpp:204 -#: ../src/ui/tools/pen-tool.cpp:407 -#: ../src/ui/tools/pencil-tool.cpp:203 +#: ../src/ui/tools/pen-tool.cpp:407 ../src/ui/tools/pencil-tool.cpp:203 msgid "Continuing selected path" msgstr "Pokračovanie vybranej cesty" -#: ../src/ui/tools/pen-tool.cpp:479 ../src/ui/tools/pencil-tool.cpp:212 -#: ../src/ui/tools/pen-tool.cpp:417 -#: ../src/ui/tools/pencil-tool.cpp:211 +#: ../src/ui/tools/pen-tool.cpp:417 ../src/ui/tools/pencil-tool.cpp:211 msgid "Creating new path" msgstr "Tvorba novej cesty" -#: ../src/ui/tools/pen-tool.cpp:481 ../src/ui/tools/pencil-tool.cpp:215 -#: ../src/ui/tools/pen-tool.cpp:419 -#: ../src/ui/tools/pencil-tool.cpp:214 +#: ../src/ui/tools/pen-tool.cpp:419 ../src/ui/tools/pencil-tool.cpp:214 msgid "Appending to selected path" msgstr "Pripojiť k zvolenej ceste" -#: ../src/ui/tools/pen-tool.cpp:646 #: ../src/ui/tools/pen-tool.cpp:576 msgid "Click or click and drag to close and finish the path." msgstr "" "Kliknutím alebo kliknutím a ťahaním zatvoriť a dokončiť cestu." -#: ../src/ui/tools/pen-tool.cpp:648 -msgid "" -"Click or click and drag to close and finish the path. Shift" -"+Click make a cusp node" -msgstr "" - -#: ../src/ui/tools/pen-tool.cpp:660 #: ../src/ui/tools/pen-tool.cpp:586 msgid "" "Click or click and drag to continue the path from this point." @@ -25660,13 +21696,6 @@ msgstr "" "Kliknutím alebo kliknutím a ťahaním pokračovať v ceste z tohto " "bodu." -#: ../src/ui/tools/pen-tool.cpp:662 -msgid "" -"Click or click and drag to continue the path from this point. " -"Shift+Click make a cusp node" -msgstr "" - -#: ../src/ui/tools/pen-tool.cpp:2036 #: ../src/ui/tools/pen-tool.cpp:1211 #, c-format msgid "" @@ -25676,7 +21705,6 @@ msgstr "" "Úsek krivky: uhol %3.2f°, vzdialenosť %s; s Ctrl na " "prichytávanie k uhlu; Enter na ukončenie cesty" -#: ../src/ui/tools/pen-tool.cpp:2037 #: ../src/ui/tools/pen-tool.cpp:1212 #, c-format msgid "" @@ -25686,21 +21714,6 @@ msgstr "" "Úsek čiary: uhol %3.2f°, vzdialenosť %s; s Ctrl na " "prichytávanie k uhlu; Enter na ukončenie cesty" -#: ../src/ui/tools/pen-tool.cpp:2040 -#, c-format -msgid "" -"Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" -msgstr "" - -#: ../src/ui/tools/pen-tool.cpp:2041 -#, c-format -msgid "" -"Line segment: angle %3.2f°, distance %s; with Shift+Click " -"make a cusp node, Enter to finish the path" -msgstr "" - -#: ../src/ui/tools/pen-tool.cpp:2058 #: ../src/ui/tools/pen-tool.cpp:1228 #, c-format msgid "" @@ -25710,7 +21723,6 @@ msgstr "" "Úchop krivky: uhol %3.2f°, dĺžka %s; s Ctrl prichytávanie " "k uhlu" -#: ../src/ui/tools/pen-tool.cpp:2082 #: ../src/ui/tools/pen-tool.cpp:1250 #, c-format msgid "" @@ -25720,7 +21732,6 @@ msgstr "" "Úchop krivky, symetrický: uhol %3.2f°, dĺžka %s; s Ctrl " "na prichytávanie k uhlu; so Shift na posun iba tohto úchopu" -#: ../src/ui/tools/pen-tool.cpp:2083 #: ../src/ui/tools/pen-tool.cpp:1251 #, c-format msgid "" @@ -25730,33 +21741,27 @@ msgstr "" "Úchop krivky: uhol %3.2f°, dĺžka %s; s Ctrl na " "prichytávanie k uhlu; so Shift na posun iba tohto úchopu" -#: ../src/ui/tools/pen-tool.cpp:2217 #: ../src/ui/tools/pen-tool.cpp:1294 msgid "Drawing finished" msgstr "Kreslenie ukončené" -#: ../src/ui/tools/pencil-tool.cpp:316 #: ../src/ui/tools/pencil-tool.cpp:315 msgid "Release here to close and finish the path." msgstr "Uvoľnením tu zatvoríte a dokončíte cestu." -#: ../src/ui/tools/pencil-tool.cpp:322 #: ../src/ui/tools/pencil-tool.cpp:321 msgid "Drawing a freehand path" msgstr "Kreslenie cesty voľnou rukou" -#: ../src/ui/tools/pencil-tool.cpp:327 #: ../src/ui/tools/pencil-tool.cpp:326 msgid "Drag to continue the path from this point." msgstr "ťahaním pokračujte v ceste z tohto bodu." #. Write curves to object -#: ../src/ui/tools/pencil-tool.cpp:412 #: ../src/ui/tools/pencil-tool.cpp:411 msgid "Finishing freehand" msgstr "Dokončenie kreslenia voľnou rukou" -#: ../src/ui/tools/pencil-tool.cpp:515 #: ../src/ui/tools/pencil-tool.cpp:514 msgid "" "Sketch mode: holding Alt interpolates between sketched paths. " @@ -25765,7 +21770,6 @@ msgstr "" "Režim skice: držaním Alt interpoluje medzi naskicovanými " "cestami. Uvoľnením Alt dokončíte." -#: ../src/ui/tools/pencil-tool.cpp:542 #: ../src/ui/tools/pencil-tool.cpp:541 msgid "Finishing freehand sketch" msgstr "Dokončenie skice voľnou rukou" @@ -25839,7 +21843,6 @@ msgstr "Presun zrušený." msgid "Selection canceled." msgstr "Výber zrušený." -#: ../src/ui/tools/select-tool.cpp:653 #: ../src/ui/tools/select-tool.cpp:642 msgid "" "Draw over objects to select them; release Alt to switch to " @@ -25848,7 +21851,6 @@ msgstr "" "Kreslenie cez objekty ich vyberie; pustenie Alt prepne na " "výber pomocou gumovej pásky" -#: ../src/ui/tools/select-tool.cpp:655 #: ../src/ui/tools/select-tool.cpp:644 msgid "" "Drag around objects to select them; press Alt to switch to " @@ -25857,29 +21859,24 @@ msgstr "" "Kreslenie okolo objektov ich vyberie; pustenie Alt prepne na " "výber dotykom" -#: ../src/ui/tools/select-tool.cpp:950 #: ../src/ui/tools/select-tool.cpp:932 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "" "Ctrl: kliknutie vyberá v skupinách, ťahanie posúva vodorovne/zvisle" -#: ../src/ui/tools/select-tool.cpp:951 #: ../src/ui/tools/select-tool.cpp:933 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" "Shift: kliknutie prepína výber, ťahanie vyberie pomocou gumovej pásky" -#: ../src/ui/tools/select-tool.cpp:952 #: ../src/ui/tools/select-tool.cpp:934 #, fuzzy msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" msgstr "" -"Alt: kliknutie - výber pod; ťahanie posúva vybrané alebo výber " -"dotykom" +"Alt: kliknutie - výber pod; ťahanie posúva vybrané alebo výber dotykom" -#: ../src/ui/tools/select-tool.cpp:1160 #: ../src/ui/tools/select-tool.cpp:1142 msgid "Selected object is not a group. Cannot enter." msgstr "Zvolený objekt nie je skupina. Nie je možné doňho vstúpiť." @@ -25917,7 +21914,6 @@ msgid "Nothing selected" msgstr "Nič nebolo vybrané." #: ../src/ui/tools/spray-tool.cpp:199 -#, c-format #, fuzzy, c-format msgid "" "%s. Drag, click or click and scroll to spray copies of the initial " @@ -25927,7 +21923,6 @@ msgstr "" "výberu" #: ../src/ui/tools/spray-tool.cpp:202 -#, c-format #, fuzzy, c-format msgid "" "%s. Drag, click or click and scroll to spray clones of the initial " @@ -25937,7 +21932,6 @@ msgstr "" "výberu" #: ../src/ui/tools/spray-tool.cpp:205 -#, c-format #, fuzzy, c-format msgid "" "%s. Drag, click or click and scroll to spray in a single path of the " @@ -25946,22 +21940,18 @@ msgstr "" "%s. Ťahaním, kliknutím alebo posúvaním sprejujete jedinú cestu " "prvotného výberu" -#: ../src/ui/tools/spray-tool.cpp:664 #: ../src/ui/tools/spray-tool.cpp:656 msgid "Nothing selected! Select objects to spray." msgstr "Nič nie je vybrané! Zvoľte objekty, ktoré chcete sprejovať." -#: ../src/ui/tools/spray-tool.cpp:739 ../src/widgets/spray-toolbar.cpp:166 -#: ../src/ui/tools/spray-tool.cpp:731 +#: ../src/ui/tools/spray-tool.cpp:731 ../src/widgets/spray-toolbar.cpp:166 msgid "Spray with copies" msgstr "Sprejovanie s kópiami" -#: ../src/ui/tools/spray-tool.cpp:743 ../src/widgets/spray-toolbar.cpp:173 -#: ../src/ui/tools/spray-tool.cpp:735 +#: ../src/ui/tools/spray-tool.cpp:735 ../src/widgets/spray-toolbar.cpp:173 msgid "Spray with clones" msgstr "Sprejovanie s klonmi" -#: ../src/ui/tools/spray-tool.cpp:747 #: ../src/ui/tools/spray-tool.cpp:739 msgid "Spray in single path" msgstr "Sprejovať jedinú cestu" @@ -26115,7 +22105,6 @@ msgid "Paste text" msgstr "Vložiť text" #: ../src/ui/tools/text-tool.cpp:1583 -#, c-format #, fuzzy, c-format msgid "" "Type or edit flowed text (%d character%s); Enter to start new " @@ -26134,7 +22123,6 @@ msgstr[2] "" "odstavec." #: ../src/ui/tools/text-tool.cpp:1585 -#, c-format #, fuzzy, c-format msgid "Type or edit text (%d character%s); Enter to start new line." msgid_plural "" @@ -26150,8 +22138,7 @@ msgstr[2] "" msgid "Type text" msgstr "Napísať text" -#: ../src/ui/tools/tool-base.cpp:705 -#: ../src/ui/tools/tool-base.cpp:704 +#: ../src/ui/tools/tool-base.cpp:703 #, fuzzy msgid "Space+mouse move to pan canvas" msgstr "Medzerník+ťahanie myšou posúva plátno" @@ -26177,8 +22164,8 @@ msgstr "%s. Ťahaním alebo kliknutím posuniete náhodne." #, c-format msgid "%s. Drag or click to scale down; with Shift to scale up." msgstr "" -"%s. Ťahaním alebo kliknutím zmenšíte; s klávesom Shift " -"zväčšíte." +"%s. Ťahaním alebo kliknutím zmenšíte; s klávesom Shift zväčšíte." #: ../src/ui/tools/tweak-tool.cpp:198 #, c-format @@ -26193,8 +22180,8 @@ msgstr "" #, c-format msgid "%s. Drag or click to duplicate; with Shift, delete." msgstr "" -"%s. Ťahaním alebo kliknutím duplikujete; s klávesom Shift " -"zmažete." +"%s. Ťahaním alebo kliknutím duplikujete; s klávesom Shift zmažete." #: ../src/ui/tools/tweak-tool.cpp:214 #, c-format @@ -26238,82 +22225,62 @@ msgstr "" "%s. Ťahaním alebo kliknutím zvýšite rozostrenie; s klávesom Shift " "znížite." -#: ../src/ui/tools/tweak-tool.cpp:1205 #: ../src/ui/tools/tweak-tool.cpp:1193 msgid "Nothing selected! Select objects to tweak." msgstr "Nič nie je vybrané! Zvoľte objekty, ktoré chcete doladiť." -#: ../src/ui/tools/tweak-tool.cpp:1239 #: ../src/ui/tools/tweak-tool.cpp:1227 msgid "Move tweak" msgstr "Doladenie pohybu" -#: ../src/ui/tools/tweak-tool.cpp:1243 #: ../src/ui/tools/tweak-tool.cpp:1231 msgid "Move in/out tweak" msgstr "Doladenie posunu dnu/von" -#: ../src/ui/tools/tweak-tool.cpp:1247 #: ../src/ui/tools/tweak-tool.cpp:1235 msgid "Move jitter tweak" msgstr "Doladenie variácie pohybu" -#: ../src/ui/tools/tweak-tool.cpp:1251 #: ../src/ui/tools/tweak-tool.cpp:1239 msgid "Scale tweak" msgstr "Doladenie mierky" -#: ../src/ui/tools/tweak-tool.cpp:1255 #: ../src/ui/tools/tweak-tool.cpp:1243 msgid "Rotate tweak" msgstr "Doladenie otočenia" -#: ../src/ui/tools/tweak-tool.cpp:1259 #: ../src/ui/tools/tweak-tool.cpp:1247 msgid "Duplicate/delete tweak" msgstr "Doladenie duplikovania/zmazania" -#: ../src/ui/tools/tweak-tool.cpp:1263 #: ../src/ui/tools/tweak-tool.cpp:1251 msgid "Push path tweak" msgstr "Doladenie tlačenia cesty" -#: ../src/ui/tools/tweak-tool.cpp:1267 #: ../src/ui/tools/tweak-tool.cpp:1255 msgid "Shrink/grow path tweak" msgstr "Doladenie zmenšenia/zväčšenia cesty" -#: ../src/ui/tools/tweak-tool.cpp:1271 #: ../src/ui/tools/tweak-tool.cpp:1259 msgid "Attract/repel path tweak" msgstr "Doladenie priťahovania/odpudzovania cesty" -#: ../src/ui/tools/tweak-tool.cpp:1275 #: ../src/ui/tools/tweak-tool.cpp:1263 msgid "Roughen path tweak" msgstr "Doladenie zdrsnenia cesty" -#: ../src/ui/tools/tweak-tool.cpp:1279 #: ../src/ui/tools/tweak-tool.cpp:1267 msgid "Color paint tweak" msgstr "Doladenie maľovaním" -#: ../src/ui/tools/tweak-tool.cpp:1283 #: ../src/ui/tools/tweak-tool.cpp:1271 msgid "Color jitter tweak" msgstr "Doladenie variabilnosti farieb" -#: ../src/ui/tools/tweak-tool.cpp:1287 #: ../src/ui/tools/tweak-tool.cpp:1275 msgid "Blur tweak" msgstr "Doladenie rozostrenia" -#: ../src/ui/widget/filter-effect-chooser.cpp:26 -#, fuzzy -msgid "_Blur:" -msgstr "Rozostrenie:" - -#: ../src/ui/widget/filter-effect-chooser.cpp:29 #: ../src/ui/widget/filter-effect-chooser.cpp:27 #, fuzzy msgid "Blur (%)" @@ -26343,26 +22310,19 @@ msgstr "Proprietárna" msgid "MetadataLicence|Other" msgstr "Iná" -#: ../src/ui/widget/object-composite-settings.cpp:47 -#: ../src/ui/widget/selected-style.cpp:1119 -#: ../src/ui/widget/selected-style.cpp:1120 #: ../src/ui/widget/object-composite-settings.cpp:67 -#: ../src/ui/widget/selected-style.cpp:1099 -#: ../src/ui/widget/selected-style.cpp:1100 +#: ../src/ui/widget/selected-style.cpp:1095 +#: ../src/ui/widget/selected-style.cpp:1096 msgid "Opacity (%)" msgstr "Krytie (%)" -#: ../src/ui/widget/object-composite-settings.cpp:159 #: ../src/ui/widget/object-composite-settings.cpp:180 msgid "Change blur" msgstr "Zmeniť rozostrenie" -#: ../src/ui/widget/object-composite-settings.cpp:199 -#: ../src/ui/widget/selected-style.cpp:943 -#: ../src/ui/widget/selected-style.cpp:1245 #: ../src/ui/widget/object-composite-settings.cpp:220 -#: ../src/ui/widget/selected-style.cpp:931 -#: ../src/ui/widget/selected-style.cpp:1227 +#: ../src/ui/widget/selected-style.cpp:927 +#: ../src/ui/widget/selected-style.cpp:1221 msgid "Change opacity" msgstr "Zmeniť krytie" @@ -26443,112 +22403,94 @@ msgstr "" "Zmeniť veľkosť stránky podľa súčasného výberu alebo celej kresby ak nie je " "nič vybrané" -#: ../src/ui/widget/page-sizer.cpp:489 #: ../src/ui/widget/page-sizer.cpp:488 msgid "Set page size" msgstr "Nastaviť veľkosť stránky:" -#: ../src/ui/widget/panel.cpp:117 #: ../src/ui/widget/panel.cpp:116 msgid "List" msgstr "Zoznam" -#: ../src/ui/widget/panel.cpp:140 #: ../src/ui/widget/panel.cpp:139 msgctxt "Swatches" msgid "Size" msgstr "Veľkosť" -#: ../src/ui/widget/panel.cpp:144 #: ../src/ui/widget/panel.cpp:143 msgctxt "Swatches height" msgid "Tiny" msgstr "drobný" -#: ../src/ui/widget/panel.cpp:145 #: ../src/ui/widget/panel.cpp:144 msgctxt "Swatches height" msgid "Small" msgstr "malý" -#: ../src/ui/widget/panel.cpp:146 #: ../src/ui/widget/panel.cpp:145 msgctxt "Swatches height" msgid "Medium" msgstr "stredný" -#: ../src/ui/widget/panel.cpp:147 #: ../src/ui/widget/panel.cpp:146 msgctxt "Swatches height" msgid "Large" msgstr "veľký" -#: ../src/ui/widget/panel.cpp:148 #: ../src/ui/widget/panel.cpp:147 msgctxt "Swatches height" msgid "Huge" msgstr "Odtieň" -#: ../src/ui/widget/panel.cpp:170 #: ../src/ui/widget/panel.cpp:169 msgctxt "Swatches" msgid "Width" msgstr "Šírka" -#: ../src/ui/widget/panel.cpp:174 #: ../src/ui/widget/panel.cpp:173 msgctxt "Swatches width" msgid "Narrower" msgstr "užší" -#: ../src/ui/widget/panel.cpp:175 #: ../src/ui/widget/panel.cpp:174 msgctxt "Swatches width" msgid "Narrow" msgstr "úzky" -#: ../src/ui/widget/panel.cpp:176 #: ../src/ui/widget/panel.cpp:175 msgctxt "Swatches width" msgid "Medium" msgstr "stredný" # TODO: check -#: ../src/ui/widget/panel.cpp:177 #: ../src/ui/widget/panel.cpp:176 msgctxt "Swatches width" msgid "Wide" msgstr "Široký" # TODO: check -#: ../src/ui/widget/panel.cpp:178 #: ../src/ui/widget/panel.cpp:177 msgctxt "Swatches width" msgid "Wider" msgstr "Širší" -#: ../src/ui/widget/panel.cpp:208 #: ../src/ui/widget/panel.cpp:207 #, fuzzy msgctxt "Swatches" msgid "Border" msgstr "Poradie" -#: ../src/ui/widget/panel.cpp:212 #: ../src/ui/widget/panel.cpp:211 #, fuzzy msgctxt "Swatches border" msgid "None" msgstr "Žiadny" -#: ../src/ui/widget/panel.cpp:213 #: ../src/ui/widget/panel.cpp:212 msgctxt "Swatches border" msgid "Solid" msgstr "" # TODO: check -#: ../src/ui/widget/panel.cpp:214 #: ../src/ui/widget/panel.cpp:213 #, fuzzy msgctxt "Swatches border" @@ -26556,7 +22498,6 @@ msgid "Wide" msgstr "Široký" #. TRANSLATORS: "Wrap" indicates how colour swatches are displayed -#: ../src/ui/widget/panel.cpp:245 #: ../src/ui/widget/panel.cpp:244 msgctxt "Swatches" msgid "Wrap" @@ -26619,392 +22560,284 @@ msgstr "" "môcť byť zmenená veľkosť jeho zobrazenia bez straty kvality; všetky objekty " "budú vykreslené tak ako sú práve zobrazené." -#: ../src/ui/widget/selected-style.cpp:131 -#: ../src/ui/widget/style-swatch.cpp:127 #: ../src/ui/widget/selected-style.cpp:130 +#: ../src/ui/widget/style-swatch.cpp:127 msgid "Fill:" msgstr "Výplň:" -#: ../src/ui/widget/selected-style.cpp:133 #: ../src/ui/widget/selected-style.cpp:132 msgid "O:" msgstr "O:" -#: ../src/ui/widget/selected-style.cpp:178 #: ../src/ui/widget/selected-style.cpp:177 msgid "N/A" msgstr "N/A" -#: ../src/ui/widget/selected-style.cpp:181 -#: ../src/ui/widget/selected-style.cpp:1112 -#: ../src/ui/widget/selected-style.cpp:1113 -#: ../src/widgets/gradient-toolbar.cpp:162 #: ../src/ui/widget/selected-style.cpp:180 -#: ../src/ui/widget/selected-style.cpp:1092 -#: ../src/ui/widget/selected-style.cpp:1093 +#: ../src/ui/widget/selected-style.cpp:1088 +#: ../src/ui/widget/selected-style.cpp:1089 +#: ../src/widgets/gradient-toolbar.cpp:162 msgid "Nothing selected" msgstr "Nič nebolo vybrané" -#: ../src/ui/widget/selected-style.cpp:184 -#: ../src/ui/widget/selected-style.cpp:183 +#: ../src/ui/widget/selected-style.cpp:182 +#: ../src/ui/widget/style-swatch.cpp:320 #, fuzzy -msgctxt "Fill" +msgctxt "Fill and stroke" msgid "None" msgstr "žiadna" -#: ../src/ui/widget/selected-style.cpp:186 #: ../src/ui/widget/selected-style.cpp:185 -#, fuzzy -msgctxt "Stroke" -msgid "None" -msgstr "žiadna" - -#: ../src/ui/widget/selected-style.cpp:190 -#: ../src/ui/widget/style-swatch.cpp:321 -#: ../src/ui/widget/selected-style.cpp:189 #: ../src/ui/widget/style-swatch.cpp:322 #, fuzzy msgctxt "Fill and stroke" msgid "No fill" msgstr "bez výplne" -#: ../src/ui/widget/selected-style.cpp:190 -#: ../src/ui/widget/style-swatch.cpp:321 -#: ../src/ui/widget/selected-style.cpp:189 +#: ../src/ui/widget/selected-style.cpp:185 #: ../src/ui/widget/style-swatch.cpp:322 #, fuzzy msgctxt "Fill and stroke" msgid "No stroke" msgstr "bez ťahu" -#: ../src/ui/widget/selected-style.cpp:192 -#: ../src/ui/widget/style-swatch.cpp:300 ../src/widgets/paint-selector.cpp:234 -#: ../src/ui/widget/selected-style.cpp:191 -#: ../src/ui/widget/style-swatch.cpp:301 -#: ../src/widgets/paint-selector.cpp:242 +#: ../src/ui/widget/selected-style.cpp:187 +#: ../src/ui/widget/style-swatch.cpp:301 ../src/widgets/paint-selector.cpp:242 msgid "Pattern" msgstr "Vzorka" -#: ../src/ui/widget/selected-style.cpp:195 -#: ../src/ui/widget/style-swatch.cpp:302 -#: ../src/ui/widget/selected-style.cpp:194 +#: ../src/ui/widget/selected-style.cpp:190 #: ../src/ui/widget/style-swatch.cpp:303 msgid "Pattern fill" msgstr "Vzorka výplne" -#: ../src/ui/widget/selected-style.cpp:195 -#: ../src/ui/widget/style-swatch.cpp:302 -#: ../src/ui/widget/selected-style.cpp:194 +#: ../src/ui/widget/selected-style.cpp:190 #: ../src/ui/widget/style-swatch.cpp:303 msgid "Pattern stroke" msgstr "Ťah vzorky" -#: ../src/ui/widget/selected-style.cpp:197 -#: ../src/ui/widget/selected-style.cpp:196 +#: ../src/ui/widget/selected-style.cpp:192 msgid "L" msgstr "L:" -#: ../src/ui/widget/selected-style.cpp:200 -#: ../src/ui/widget/style-swatch.cpp:294 -#: ../src/ui/widget/selected-style.cpp:199 +#: ../src/ui/widget/selected-style.cpp:195 #: ../src/ui/widget/style-swatch.cpp:295 msgid "Linear gradient fill" msgstr "Výplň lineárnym farebným prechodom" -#: ../src/ui/widget/selected-style.cpp:200 -#: ../src/ui/widget/style-swatch.cpp:294 -#: ../src/ui/widget/selected-style.cpp:199 +#: ../src/ui/widget/selected-style.cpp:195 #: ../src/ui/widget/style-swatch.cpp:295 msgid "Linear gradient stroke" msgstr "Ťah lineárnym prechodom" -#: ../src/ui/widget/selected-style.cpp:207 -#: ../src/ui/widget/selected-style.cpp:206 +#: ../src/ui/widget/selected-style.cpp:202 msgid "R" msgstr "R" -#: ../src/ui/widget/selected-style.cpp:210 -#: ../src/ui/widget/style-swatch.cpp:298 -#: ../src/ui/widget/selected-style.cpp:209 +#: ../src/ui/widget/selected-style.cpp:205 #: ../src/ui/widget/style-swatch.cpp:299 msgid "Radial gradient fill" msgstr "Výplň radiálnym farebným prechodom" -#: ../src/ui/widget/selected-style.cpp:210 -#: ../src/ui/widget/style-swatch.cpp:298 -#: ../src/ui/widget/selected-style.cpp:209 +#: ../src/ui/widget/selected-style.cpp:205 #: ../src/ui/widget/style-swatch.cpp:299 msgid "Radial gradient stroke" msgstr "Ťah radiálnym farebným prechodom" -#: ../src/ui/widget/selected-style.cpp:218 -msgid "M" -msgstr "" - -#: ../src/ui/widget/selected-style.cpp:221 -msgid "Mesh gradient fill" -msgstr "" - -#: ../src/ui/widget/selected-style.cpp:221 -msgid "Mesh gradient stroke" -msgstr "" - -#: ../src/ui/widget/selected-style.cpp:229 -#: ../src/ui/widget/selected-style.cpp:216 +#: ../src/ui/widget/selected-style.cpp:212 msgid "Different" msgstr "Rozdielne" -#: ../src/ui/widget/selected-style.cpp:232 -#: ../src/ui/widget/selected-style.cpp:219 +#: ../src/ui/widget/selected-style.cpp:215 msgid "Different fills" msgstr "Rozdielne výplne" -#: ../src/ui/widget/selected-style.cpp:232 -#: ../src/ui/widget/selected-style.cpp:219 +#: ../src/ui/widget/selected-style.cpp:215 msgid "Different strokes" msgstr "Rozdielne ťahy" -#: ../src/ui/widget/selected-style.cpp:234 -#: ../src/ui/widget/style-swatch.cpp:324 -#: ../src/ui/widget/selected-style.cpp:221 +#: ../src/ui/widget/selected-style.cpp:217 #: ../src/ui/widget/style-swatch.cpp:325 msgid "Unset" msgstr "Zrušiť" #. TRANSLATORS COMMENT: unset is a verb here -#: ../src/ui/widget/selected-style.cpp:237 -#: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:575 -#: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:709 -#: ../src/ui/widget/selected-style.cpp:224 -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:563 -#: ../src/ui/widget/style-swatch.cpp:327 -#: ../src/widgets/fill-style.cpp:712 +#: ../src/ui/widget/selected-style.cpp:220 +#: ../src/ui/widget/selected-style.cpp:278 +#: ../src/ui/widget/selected-style.cpp:559 +#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 msgid "Unset fill" msgstr "Zrušiť výplň" -#: ../src/ui/widget/selected-style.cpp:237 -#: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:591 -#: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:709 -#: ../src/ui/widget/selected-style.cpp:224 -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:579 -#: ../src/ui/widget/style-swatch.cpp:327 -#: ../src/widgets/fill-style.cpp:712 +#: ../src/ui/widget/selected-style.cpp:220 +#: ../src/ui/widget/selected-style.cpp:278 +#: ../src/ui/widget/selected-style.cpp:575 +#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 msgid "Unset stroke" msgstr "Zrušiť ťah" -#: ../src/ui/widget/selected-style.cpp:240 -#: ../src/ui/widget/selected-style.cpp:227 +#: ../src/ui/widget/selected-style.cpp:223 msgid "Flat color fill" msgstr "Výplň jednoduchou farbou" -#: ../src/ui/widget/selected-style.cpp:240 -#: ../src/ui/widget/selected-style.cpp:227 +#: ../src/ui/widget/selected-style.cpp:223 msgid "Flat color stroke" msgstr "Ťah jednoduchou farbou" #. TRANSLATOR COMMENT: A means "Averaged" -#: ../src/ui/widget/selected-style.cpp:243 -#: ../src/ui/widget/selected-style.cpp:230 +#: ../src/ui/widget/selected-style.cpp:226 msgid "a" msgstr "a" -#: ../src/ui/widget/selected-style.cpp:246 -#: ../src/ui/widget/selected-style.cpp:233 +#: ../src/ui/widget/selected-style.cpp:229 msgid "Fill is averaged over selected objects" msgstr "Výplň sa spriemeruje na vybraných objektoch" -#: ../src/ui/widget/selected-style.cpp:246 -#: ../src/ui/widget/selected-style.cpp:233 +#: ../src/ui/widget/selected-style.cpp:229 msgid "Stroke is averaged over selected objects" msgstr "Ťah sa spriemeruje na vybraných objektoch" #. TRANSLATOR COMMENT: M means "Multiple" -#: ../src/ui/widget/selected-style.cpp:249 -#: ../src/ui/widget/selected-style.cpp:236 +#: ../src/ui/widget/selected-style.cpp:232 msgid "m" msgstr "m" -#: ../src/ui/widget/selected-style.cpp:252 -#: ../src/ui/widget/selected-style.cpp:239 +#: ../src/ui/widget/selected-style.cpp:235 msgid "Multiple selected objects have the same fill" msgstr "Viaceré vybrané objekty majú rovnakú výplň" -#: ../src/ui/widget/selected-style.cpp:252 -#: ../src/ui/widget/selected-style.cpp:239 +#: ../src/ui/widget/selected-style.cpp:235 msgid "Multiple selected objects have the same stroke" msgstr "Viaceré vybrané objekty majú rovnaký ťah" -#: ../src/ui/widget/selected-style.cpp:254 -#: ../src/ui/widget/selected-style.cpp:241 +#: ../src/ui/widget/selected-style.cpp:237 msgid "Edit fill..." msgstr "Upraviť výplň..." -#: ../src/ui/widget/selected-style.cpp:254 -#: ../src/ui/widget/selected-style.cpp:241 +#: ../src/ui/widget/selected-style.cpp:237 msgid "Edit stroke..." msgstr "Upraviť ťah..." -#: ../src/ui/widget/selected-style.cpp:258 -#: ../src/ui/widget/selected-style.cpp:245 +#: ../src/ui/widget/selected-style.cpp:241 msgid "Last set color" msgstr "Posledná nastavená farba" -#: ../src/ui/widget/selected-style.cpp:262 -#: ../src/ui/widget/selected-style.cpp:249 +#: ../src/ui/widget/selected-style.cpp:245 msgid "Last selected color" msgstr "Posledná zvolená farba" -#: ../src/ui/widget/selected-style.cpp:278 -#: ../src/ui/widget/selected-style.cpp:265 +#: ../src/ui/widget/selected-style.cpp:261 msgid "Copy color" msgstr "Kopírovať farbu" -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:269 +#: ../src/ui/widget/selected-style.cpp:265 msgid "Paste color" msgstr "Vložiť farbu" -#: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:868 -#: ../src/ui/widget/selected-style.cpp:273 -#: ../src/ui/widget/selected-style.cpp:856 +#: ../src/ui/widget/selected-style.cpp:269 +#: ../src/ui/widget/selected-style.cpp:852 msgid "Swap fill and stroke" msgstr "Vymeniť výplň a ťah navzájom" -#: ../src/ui/widget/selected-style.cpp:290 -#: ../src/ui/widget/selected-style.cpp:600 -#: ../src/ui/widget/selected-style.cpp:609 -#: ../src/ui/widget/selected-style.cpp:277 -#: ../src/ui/widget/selected-style.cpp:588 -#: ../src/ui/widget/selected-style.cpp:597 +#: ../src/ui/widget/selected-style.cpp:273 +#: ../src/ui/widget/selected-style.cpp:584 +#: ../src/ui/widget/selected-style.cpp:593 msgid "Make fill opaque" msgstr "Urobiť výplň nepriesvitnou" -#: ../src/ui/widget/selected-style.cpp:290 -#: ../src/ui/widget/selected-style.cpp:277 +#: ../src/ui/widget/selected-style.cpp:273 msgid "Make stroke opaque" msgstr "Urobiť ťah nepriesvitným" -#: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:557 ../src/widgets/fill-style.cpp:508 -#: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:545 -#: ../src/widgets/fill-style.cpp:510 +#: ../src/ui/widget/selected-style.cpp:282 +#: ../src/ui/widget/selected-style.cpp:541 ../src/widgets/fill-style.cpp:510 msgid "Remove fill" msgstr "Odstrániť výplň" -#: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:566 ../src/widgets/fill-style.cpp:508 -#: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:554 -#: ../src/widgets/fill-style.cpp:510 +#: ../src/ui/widget/selected-style.cpp:282 +#: ../src/ui/widget/selected-style.cpp:550 ../src/widgets/fill-style.cpp:510 msgid "Remove stroke" msgstr "Odstrániť ťah" -#: ../src/ui/widget/selected-style.cpp:621 -#: ../src/ui/widget/selected-style.cpp:609 +#: ../src/ui/widget/selected-style.cpp:605 msgid "Apply last set color to fill" msgstr "Použiť poslednú nastavenú farbu na výplň" -#: ../src/ui/widget/selected-style.cpp:633 -#: ../src/ui/widget/selected-style.cpp:621 +#: ../src/ui/widget/selected-style.cpp:617 msgid "Apply last set color to stroke" msgstr "Použiť poslednú nastavenú farbu na ťah" -#: ../src/ui/widget/selected-style.cpp:644 -#: ../src/ui/widget/selected-style.cpp:632 +#: ../src/ui/widget/selected-style.cpp:628 msgid "Apply last selected color to fill" msgstr "Použiť poslednú zvolenú farbu na výplň" -#: ../src/ui/widget/selected-style.cpp:655 -#: ../src/ui/widget/selected-style.cpp:643 +#: ../src/ui/widget/selected-style.cpp:639 msgid "Apply last selected color to stroke" msgstr "Použiť poslednú zvolenú farbu na ťah" -#: ../src/ui/widget/selected-style.cpp:681 -#: ../src/ui/widget/selected-style.cpp:669 +#: ../src/ui/widget/selected-style.cpp:665 msgid "Invert fill" msgstr "Invertovať výplň" -#: ../src/ui/widget/selected-style.cpp:705 -#: ../src/ui/widget/selected-style.cpp:693 +#: ../src/ui/widget/selected-style.cpp:689 msgid "Invert stroke" msgstr "Invertovať ťah" -#: ../src/ui/widget/selected-style.cpp:717 -#: ../src/ui/widget/selected-style.cpp:705 +#: ../src/ui/widget/selected-style.cpp:701 msgid "White fill" msgstr "Biela výplň" -#: ../src/ui/widget/selected-style.cpp:729 -#: ../src/ui/widget/selected-style.cpp:717 +#: ../src/ui/widget/selected-style.cpp:713 msgid "White stroke" msgstr "Biely ťah" -#: ../src/ui/widget/selected-style.cpp:741 -#: ../src/ui/widget/selected-style.cpp:729 +#: ../src/ui/widget/selected-style.cpp:725 msgid "Black fill" msgstr "Čierna výplň" -#: ../src/ui/widget/selected-style.cpp:753 -#: ../src/ui/widget/selected-style.cpp:741 +#: ../src/ui/widget/selected-style.cpp:737 msgid "Black stroke" msgstr "Čierny ťah" -#: ../src/ui/widget/selected-style.cpp:796 -#: ../src/ui/widget/selected-style.cpp:784 +#: ../src/ui/widget/selected-style.cpp:780 msgid "Paste fill" msgstr "Vložiť výplň" -#: ../src/ui/widget/selected-style.cpp:814 -#: ../src/ui/widget/selected-style.cpp:802 +#: ../src/ui/widget/selected-style.cpp:798 msgid "Paste stroke" msgstr "Vložiť ťah" -#: ../src/ui/widget/selected-style.cpp:970 -#: ../src/ui/widget/selected-style.cpp:958 +#: ../src/ui/widget/selected-style.cpp:954 msgid "Change stroke width" msgstr "Zmeniť šírku ťahu" -#: ../src/ui/widget/selected-style.cpp:1073 -#: ../src/ui/widget/selected-style.cpp:1053 +#: ../src/ui/widget/selected-style.cpp:1049 msgid ", drag to adjust" msgstr ", ťahaním dolaďte" -#: ../src/ui/widget/selected-style.cpp:1158 -#: ../src/ui/widget/selected-style.cpp:1138 +#: ../src/ui/widget/selected-style.cpp:1134 #, c-format msgid "Stroke width: %.5g%s%s" msgstr "Šírka ťahu: %.5g%s%s" -#: ../src/ui/widget/selected-style.cpp:1162 -#: ../src/ui/widget/selected-style.cpp:1142 +#: ../src/ui/widget/selected-style.cpp:1138 msgid " (averaged)" msgstr " (priemer)" -#: ../src/ui/widget/selected-style.cpp:1188 -#: ../src/ui/widget/selected-style.cpp:1170 +#: ../src/ui/widget/selected-style.cpp:1166 msgid "0 (transparent)" msgstr "0 (priesvitný)" -#: ../src/ui/widget/selected-style.cpp:1212 -#: ../src/ui/widget/selected-style.cpp:1194 +#: ../src/ui/widget/selected-style.cpp:1190 msgid "100% (opaque)" msgstr "100% (nepriesvitný)" -#: ../src/ui/widget/selected-style.cpp:1386 -#: ../src/ui/widget/selected-style.cpp:1368 +#: ../src/ui/widget/selected-style.cpp:1362 #, fuzzy msgid "Adjust alpha" msgstr "Doladiť odtieň" -#: ../src/ui/widget/selected-style.cpp:1388 -#: ../src/ui/widget/selected-style.cpp:1370 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1364 #, fuzzy, c-format msgid "" "Adjusting alpha: was %.3g, now %.3g (diff %.3g); with Ctrlsvetlosti: bola %.3g, teraz %.3g (rozdiel %.3g); s " "Shift doladenie sýtosti, bez modifikátorov doladenie odtieňa" -#: ../src/ui/widget/selected-style.cpp:1392 -#: ../src/ui/widget/selected-style.cpp:1374 +#: ../src/ui/widget/selected-style.cpp:1368 msgid "Adjust saturation" msgstr "Doladiť sýtosť" -#: ../src/ui/widget/selected-style.cpp:1394 -#: ../src/ui/widget/selected-style.cpp:1376 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1370 #, fuzzy, c-format msgid "" "Adjusting saturation: was %.3g, now %.3g (diff %.3g); with " @@ -27031,14 +22861,11 @@ msgstr "" "Doladenie sýtosti: bola %.3g, teraz %.3g (rozdiel %.3g); s " "Ctrl doladenie svetlosti, bez modifikátorov doladenie odtieňa" -#: ../src/ui/widget/selected-style.cpp:1398 -#: ../src/ui/widget/selected-style.cpp:1380 +#: ../src/ui/widget/selected-style.cpp:1374 msgid "Adjust lightness" msgstr "Doladiť jas" -#: ../src/ui/widget/selected-style.cpp:1400 -#: ../src/ui/widget/selected-style.cpp:1382 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1376 #, fuzzy, c-format msgid "" "Adjusting lightness: was %.3g, now %.3g (diff %.3g); with " @@ -27048,14 +22875,11 @@ msgstr "" "Doladenie svetlosti: bola %.3g, teraz %.3g (rozdiel %.3g); s " "Shift doladenie sýtosti, bez modifikátorov doladenie odtieňa" -#: ../src/ui/widget/selected-style.cpp:1404 -#: ../src/ui/widget/selected-style.cpp:1386 +#: ../src/ui/widget/selected-style.cpp:1380 msgid "Adjust hue" msgstr "Doladiť odtieň" -#: ../src/ui/widget/selected-style.cpp:1406 -#: ../src/ui/widget/selected-style.cpp:1388 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1382 #, fuzzy, c-format msgid "" "Adjusting hue: was %.3g, now %.3g (diff %.3g); with Shiftodtieňa: bol %.3g, teraz %.3g (rozdiel %.3g); s " "Shift doladenie sýtosti, s Ctrl doladenie svetlosti" -#: ../src/ui/widget/selected-style.cpp:1524 -#: ../src/ui/widget/selected-style.cpp:1538 -#: ../src/ui/widget/selected-style.cpp:1506 -#: ../src/ui/widget/selected-style.cpp:1520 +#: ../src/ui/widget/selected-style.cpp:1500 +#: ../src/ui/widget/selected-style.cpp:1514 msgid "Adjust stroke width" msgstr "Nastaviť šírku ťahu" -#: ../src/ui/widget/selected-style.cpp:1525 -#: ../src/ui/widget/selected-style.cpp:1507 +#: ../src/ui/widget/selected-style.cpp:1501 #, c-format msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" msgstr "" @@ -27085,65 +22906,47 @@ msgctxt "Sliders" msgid "Link" msgstr "Spojiť" -#: ../src/ui/widget/style-swatch.cpp:292 #: ../src/ui/widget/style-swatch.cpp:293 msgid "L Gradient" msgstr "L farebný prechod" -#: ../src/ui/widget/style-swatch.cpp:296 #: ../src/ui/widget/style-swatch.cpp:297 msgid "R Gradient" msgstr "R farebný prechod" -#: ../src/ui/widget/style-swatch.cpp:312 #: ../src/ui/widget/style-swatch.cpp:313 #, c-format msgid "Fill: %06x/%.3g" msgstr "Výplň: %06x/%.3g" -#: ../src/ui/widget/style-swatch.cpp:314 #: ../src/ui/widget/style-swatch.cpp:315 #, c-format msgid "Stroke: %06x/%.3g" msgstr "Ťah: %06x/%.3g" -#: ../src/ui/widget/style-swatch.cpp:319 -#: ../src/ui/widget/style-swatch.cpp:320 -#, fuzzy -msgctxt "Fill and stroke" -msgid "None" -msgstr "žiadna" - -#: ../src/ui/widget/style-swatch.cpp:346 #: ../src/ui/widget/style-swatch.cpp:347 #, c-format msgid "Stroke width: %.5g%s" msgstr "Šírka ťahu: %.5g%s" -#: ../src/ui/widget/style-swatch.cpp:362 #: ../src/ui/widget/style-swatch.cpp:363 #, c-format msgid "O: %2.0f" msgstr "" -#: ../src/ui/widget/style-swatch.cpp:367 #: ../src/ui/widget/style-swatch.cpp:368 -#, c-format #, fuzzy, c-format msgid "Opacity: %2.1f %%" msgstr "Krytie: %.3g" -#: ../src/vanishing-point.cpp:133 #: ../src/vanishing-point.cpp:132 msgid "Split vanishing points" msgstr "Rozdeliť spojnice" -#: ../src/vanishing-point.cpp:178 #: ../src/vanishing-point.cpp:177 msgid "Merge vanishing points" msgstr "Zlúčiť spojnice" -#: ../src/vanishing-point.cpp:244 #: ../src/vanishing-point.cpp:243 msgid "3D box: Move vanishing point" msgstr "Kváder: Presunúť spojnicu" @@ -27190,8 +22993,7 @@ msgid_plural "" "shared by %d boxes; drag with Shift to separate selected box" "(es)" msgstr[0] "" -"Bod prechodu zdieľa %d farebný prechod; ťahanie so Shift " -"oddelí" +"Bod prechodu zdieľa %d farebný prechod; ťahanie so Shift oddelí" msgstr[1] "" "Bod prechodu zdieľajú %d farebné prechody; ťahanie so Shift " "oddelí" @@ -27199,341 +23001,257 @@ msgstr[2] "" "Bod prechodu zdieľa %d farebných prechodov; ťahanie so Shift " "oddelí" -#: ../src/verbs.cpp:138 #: ../src/verbs.cpp:137 msgid "File" msgstr "Súbor" -#: ../src/verbs.cpp:233 ../share/extensions/interp_att_g.inx.h:22 -msgid "Tag" -msgstr "Značka" - -#: ../src/verbs.cpp:252 #: ../src/verbs.cpp:232 #, fuzzy msgid "Context" msgstr "Kontrast" -#: ../src/verbs.cpp:271 ../src/verbs.cpp:2302 +#: ../src/verbs.cpp:251 ../src/verbs.cpp:2223 #: ../share/extensions/jessyInk_view.inx.h:1 #: ../share/extensions/polyhedron_3d.inx.h:26 -#: ../src/verbs.cpp:251 -#: ../src/verbs.cpp:2223 msgid "View" msgstr "Zobraziť" -#: ../src/verbs.cpp:291 #: ../src/verbs.cpp:271 #, fuzzy msgid "Dialog" msgstr "Pripnúť dialóg" -#: ../src/verbs.cpp:1260 #: ../src/verbs.cpp:1227 msgid "Switch to next layer" msgstr "Prepnúť do nasledujúcej vrstvy" -#: ../src/verbs.cpp:1261 #: ../src/verbs.cpp:1228 msgid "Switched to next layer." msgstr "Prepnuté do nasledujúcej vrstvy." -#: ../src/verbs.cpp:1263 #: ../src/verbs.cpp:1230 msgid "Cannot go past last layer." msgstr "Nie je možné prejsť za poslednú vrstvu." -#: ../src/verbs.cpp:1272 #: ../src/verbs.cpp:1239 msgid "Switch to previous layer" msgstr "Prepnúť do predchádzajúcej vrstvy" -#: ../src/verbs.cpp:1273 #: ../src/verbs.cpp:1240 msgid "Switched to previous layer." msgstr "Prepnuté do predchádzajúcej vrstvy." -#: ../src/verbs.cpp:1275 #: ../src/verbs.cpp:1242 msgid "Cannot go before first layer." msgstr "Nie je možné prejsť pred prvú vrstvu." -#: ../src/verbs.cpp:1296 ../src/verbs.cpp:1393 ../src/verbs.cpp:1429 -#: ../src/verbs.cpp:1435 ../src/verbs.cpp:1459 ../src/verbs.cpp:1474 -#: ../src/verbs.cpp:1263 -#: ../src/verbs.cpp:1360 -#: ../src/verbs.cpp:1396 -#: ../src/verbs.cpp:1402 -#: ../src/verbs.cpp:1426 -#: ../src/verbs.cpp:1441 +#: ../src/verbs.cpp:1263 ../src/verbs.cpp:1360 ../src/verbs.cpp:1396 +#: ../src/verbs.cpp:1402 ../src/verbs.cpp:1426 ../src/verbs.cpp:1441 msgid "No current layer." msgstr "Neexistuje aktuálna vrstva." -#: ../src/verbs.cpp:1325 ../src/verbs.cpp:1329 -#: ../src/verbs.cpp:1292 -#: ../src/verbs.cpp:1296 +#: ../src/verbs.cpp:1292 ../src/verbs.cpp:1296 #, c-format msgid "Raised layer %s." msgstr "Vrstva %s presunutá vyššie." -#: ../src/verbs.cpp:1326 #: ../src/verbs.cpp:1293 msgid "Layer to top" msgstr "Vrstvu na vrch" -#: ../src/verbs.cpp:1330 #: ../src/verbs.cpp:1297 msgid "Raise layer" msgstr "Zdvihnúť vrstvu" -#: ../src/verbs.cpp:1333 ../src/verbs.cpp:1337 -#: ../src/verbs.cpp:1300 -#: ../src/verbs.cpp:1304 +#: ../src/verbs.cpp:1300 ../src/verbs.cpp:1304 #, c-format msgid "Lowered layer %s." msgstr "Vrstva %s presunutá nižšie." -#: ../src/verbs.cpp:1334 #: ../src/verbs.cpp:1301 msgid "Layer to bottom" msgstr "Vrstvu na spodok" -#: ../src/verbs.cpp:1338 #: ../src/verbs.cpp:1305 msgid "Lower layer" msgstr "Znížiť vrstvu" -#: ../src/verbs.cpp:1347 #: ../src/verbs.cpp:1314 msgid "Cannot move layer any further." msgstr "Vrstvu nie je možné posunúť ďalej." -#: ../src/verbs.cpp:1361 ../src/verbs.cpp:1380 -#: ../src/verbs.cpp:1328 -#: ../src/verbs.cpp:1347 +#: ../src/verbs.cpp:1328 ../src/verbs.cpp:1347 #, c-format msgid "%s copy" msgstr "kópia %s" -#: ../src/verbs.cpp:1388 #: ../src/verbs.cpp:1355 msgid "Duplicate layer" msgstr "Duplikovať vrstvu" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1391 #: ../src/verbs.cpp:1358 msgid "Duplicated layer." msgstr "Duplikovaná vrstva" -#: ../src/verbs.cpp:1424 #: ../src/verbs.cpp:1391 msgid "Delete layer" msgstr "Odstrániť vrstvu" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1427 #: ../src/verbs.cpp:1394 msgid "Deleted layer." msgstr "Vrstva odstránená." -#: ../src/verbs.cpp:1444 #: ../src/verbs.cpp:1411 #, fuzzy msgid "Show all layers" msgstr "Vybrať vo všetkých vrstvách" -#: ../src/verbs.cpp:1449 #: ../src/verbs.cpp:1416 #, fuzzy msgid "Hide all layers" msgstr "Skryť vrstvu" -#: ../src/verbs.cpp:1454 #: ../src/verbs.cpp:1421 #, fuzzy msgid "Lock all layers" msgstr "Vybrať vo všetkých vrstvách" -#: ../src/verbs.cpp:1468 #: ../src/verbs.cpp:1435 #, fuzzy msgid "Unlock all layers" msgstr "Odomknúť vrstvu" -#: ../src/verbs.cpp:1552 #: ../src/verbs.cpp:1519 msgid "Flip horizontally" msgstr "Preklopiť vodorovne" -#: ../src/verbs.cpp:1557 #: ../src/verbs.cpp:1524 msgid "Flip vertically" msgstr "Preklopiť zvisle" -#: ../src/verbs.cpp:1614 ../src/verbs.cpp:2727 -msgid "Create new selection set" -msgstr "" - #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language #. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2184 #: ../src/verbs.cpp:2105 msgid "tutorial-basic.svg" msgstr "tutorial-basic.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2188 #: ../src/verbs.cpp:2109 msgid "tutorial-shapes.svg" msgstr "tutorial-shapes.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2192 #: ../src/verbs.cpp:2113 msgid "tutorial-advanced.svg" msgstr "tutorial-advanced.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2196 #: ../src/verbs.cpp:2117 msgid "tutorial-tracing.svg" msgstr "tutorial-tracing.sk.svg" -#: ../src/verbs.cpp:2199 #: ../src/verbs.cpp:2120 #, fuzzy msgid "tutorial-tracing-pixelart.svg" msgstr "tutorial-tracing.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2203 #: ../src/verbs.cpp:2124 msgid "tutorial-calligraphy.svg" msgstr "tutorial-calligraphy.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2207 #: ../src/verbs.cpp:2128 msgid "tutorial-interpolate.svg" msgstr "tutorial-interpolate.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2211 #: ../src/verbs.cpp:2132 msgid "tutorial-elements.svg" msgstr "tutorial-elements.sk.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2215 #: ../src/verbs.cpp:2136 msgid "tutorial-tips.svg" msgstr "tutorial-tips.sk.svg" -#: ../src/verbs.cpp:2401 ../src/verbs.cpp:3000 -#: ../src/verbs.cpp:2322 -#: ../src/verbs.cpp:2913 +#: ../src/verbs.cpp:2322 ../src/verbs.cpp:2913 msgid "Unlock all objects in the current layer" msgstr "Odomknúť všetky objekty v aktuálnej vrstve" -#: ../src/verbs.cpp:2405 ../src/verbs.cpp:3002 -#: ../src/verbs.cpp:2326 -#: ../src/verbs.cpp:2915 +#: ../src/verbs.cpp:2326 ../src/verbs.cpp:2915 msgid "Unlock all objects in all layers" msgstr "Odomknúť všetky objekty vo všetkých vrstvách" -#: ../src/verbs.cpp:2409 ../src/verbs.cpp:3004 -#: ../src/verbs.cpp:2330 -#: ../src/verbs.cpp:2917 +#: ../src/verbs.cpp:2330 ../src/verbs.cpp:2917 msgid "Unhide all objects in the current layer" msgstr "Odkryť všetky objekty v aktuálnej vrstve" -#: ../src/verbs.cpp:2413 ../src/verbs.cpp:3006 -#: ../src/verbs.cpp:2334 -#: ../src/verbs.cpp:2919 +#: ../src/verbs.cpp:2334 ../src/verbs.cpp:2919 msgid "Unhide all objects in all layers" msgstr "Odkryť všetky objekty vo všetkých vrstvách" -#: ../src/verbs.cpp:2428 -#: ../src/verbs.cpp:2349 -#, fuzzy -msgctxt "Verb" -msgid "None" -msgstr "Žiadny" - -#: ../src/verbs.cpp:2428 #: ../src/verbs.cpp:2349 msgid "Does nothing" msgstr "Nerobí nič" -#: ../src/verbs.cpp:2431 #: ../src/verbs.cpp:2352 msgid "Create new document from the default template" msgstr "Vytvorí nový dokument zo štandardnej šablóny" -#: ../src/verbs.cpp:2433 #: ../src/verbs.cpp:2354 msgid "_Open..." msgstr "_Otvoriť..." -#: ../src/verbs.cpp:2434 #: ../src/verbs.cpp:2355 msgid "Open an existing document" msgstr "Otvorí existujúci dokument" -#: ../src/verbs.cpp:2435 #: ../src/verbs.cpp:2356 msgid "Re_vert" msgstr "_Vrátiť" -#: ../src/verbs.cpp:2436 #: ../src/verbs.cpp:2357 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "Načíta poslednú uloženú verziu dokumentu (zmeny budú stratené)" -#: ../src/verbs.cpp:2437 #: ../src/verbs.cpp:2358 msgid "Save document" msgstr "Uloží dokument" -#: ../src/verbs.cpp:2439 #: ../src/verbs.cpp:2360 msgid "Save _As..." msgstr "Uložiť ako..." -#: ../src/verbs.cpp:2440 #: ../src/verbs.cpp:2361 msgid "Save document under a new name" msgstr "Uloží dokument pod novým názvom" -#: ../src/verbs.cpp:2441 #: ../src/verbs.cpp:2362 msgid "Save a Cop_y..." msgstr "Uložiť kópiu..." -#: ../src/verbs.cpp:2442 #: ../src/verbs.cpp:2363 msgid "Save a copy of the document under a new name" msgstr "Uloží kópiu dokumentu pod novým názvom" -#: ../src/verbs.cpp:2443 #: ../src/verbs.cpp:2364 msgid "_Print..." msgstr "_Tlačiť..." -#: ../src/verbs.cpp:2443 #: ../src/verbs.cpp:2364 msgid "Print document" msgstr "Vytlačí dokument" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2446 #: ../src/verbs.cpp:2367 +#, fuzzy msgid "Clean _up document" -msgstr "Vyčistiť dok_ument" +msgstr "Nebolo možné nastaviť dokument" -#: ../src/verbs.cpp:2446 #: ../src/verbs.cpp:2367 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" @@ -27542,177 +23260,144 @@ msgstr "" "Odstráni nepotrebné definície (ako farebné prechody alebo orezávacie cesty) " "zo sekcie <defs> dokumentu" -#: ../src/verbs.cpp:2448 #: ../src/verbs.cpp:2369 msgid "_Import..." msgstr "_Importovať..." -#: ../src/verbs.cpp:2449 #: ../src/verbs.cpp:2370 msgid "Import a bitmap or SVG image into this document" msgstr "Importuje bitmapu alebo SVG obrázok do dokumentu" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2451 #: ../src/verbs.cpp:2372 #, fuzzy msgid "Import Clip Art..." msgstr "_Importovať..." -#: ../src/verbs.cpp:2452 #: ../src/verbs.cpp:2373 #, fuzzy msgid "Import clipart from Open Clip Art Library" msgstr "Importovať z knižnice Open Clip Art" #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2454 #: ../src/verbs.cpp:2375 msgid "N_ext Window" msgstr "Nasl_edujúce okno" -#: ../src/verbs.cpp:2455 #: ../src/verbs.cpp:2376 msgid "Switch to the next document window" msgstr "Prepne do nasledujúceho okna" -#: ../src/verbs.cpp:2456 #: ../src/verbs.cpp:2377 msgid "P_revious Window" msgstr "Predchádzajúce okno" -#: ../src/verbs.cpp:2457 #: ../src/verbs.cpp:2378 msgid "Switch to the previous document window" msgstr "Prepne do predchádzajúceho okna dokumentu" -#: ../src/verbs.cpp:2458 #: ../src/verbs.cpp:2379 msgid "_Close" msgstr "_Zatvoriť" -#: ../src/verbs.cpp:2459 #: ../src/verbs.cpp:2380 msgid "Close this document window" msgstr "Zatvorí toto okno dokumentu" -#: ../src/verbs.cpp:2460 #: ../src/verbs.cpp:2381 msgid "_Quit" msgstr "_Koniec" -#: ../src/verbs.cpp:2460 #: ../src/verbs.cpp:2381 msgid "Quit Inkscape" msgstr "Ukončí Inkscape" -#: ../src/verbs.cpp:2461 #: ../src/verbs.cpp:2382 #, fuzzy msgid "_Templates..." msgstr "Vzorkovník..." -#: ../src/verbs.cpp:2462 #: ../src/verbs.cpp:2383 #, fuzzy msgid "Create new project from template" msgstr "Vytvorí nový dokument zo štandardnej šablóny" -#: ../src/verbs.cpp:2465 #: ../src/verbs.cpp:2386 msgid "Undo last action" msgstr "Vrátiť poslednú činnosť" -#: ../src/verbs.cpp:2468 #: ../src/verbs.cpp:2389 msgid "Do again the last undone action" msgstr "Zopakuje poslednú vrátenú činnosť" -#: ../src/verbs.cpp:2469 #: ../src/verbs.cpp:2390 msgid "Cu_t" msgstr "Vys_trihnúť" -#: ../src/verbs.cpp:2470 #: ../src/verbs.cpp:2391 msgid "Cut selection to clipboard" msgstr "Vystrihne výber do schránky" -#: ../src/verbs.cpp:2471 #: ../src/verbs.cpp:2392 msgid "_Copy" msgstr "_Kopírovať" -#: ../src/verbs.cpp:2472 #: ../src/verbs.cpp:2393 msgid "Copy selection to clipboard" msgstr "Skopíruje výber do schránky" -#: ../src/verbs.cpp:2473 #: ../src/verbs.cpp:2394 msgid "_Paste" msgstr "_Vložiť" -#: ../src/verbs.cpp:2474 #: ../src/verbs.cpp:2395 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "Vloží objekty zo schránky na miesto pod kurzorom myši alebo vloží text" -#: ../src/verbs.cpp:2475 #: ../src/verbs.cpp:2396 msgid "Paste _Style" msgstr "Vložiť š_týl" -#: ../src/verbs.cpp:2476 #: ../src/verbs.cpp:2397 msgid "Apply the style of the copied object to selection" msgstr "Použije štýl kopírovaných objektov na výber" -#: ../src/verbs.cpp:2478 #: ../src/verbs.cpp:2399 msgid "Scale selection to match the size of the copied object" msgstr "Zmení mierku výberu aby sa zhodoval s veľkosťou kopírovaného objektu" -#: ../src/verbs.cpp:2479 #: ../src/verbs.cpp:2400 msgid "Paste _Width" msgstr "Vložiť _šírku" -#: ../src/verbs.cpp:2480 #: ../src/verbs.cpp:2401 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" "Zmení mierku výberu vodorovne aby sa zhodoval s šírkou kopírovaného objektu" -#: ../src/verbs.cpp:2481 #: ../src/verbs.cpp:2402 msgid "Paste _Height" msgstr "Vložiť _výšku" -#: ../src/verbs.cpp:2482 #: ../src/verbs.cpp:2403 msgid "Scale selection vertically to match the height of the copied object" msgstr "" "Zmení mierku výberu zvisle aby sa zhodoval s výškou kopírovaného objektu" -#: ../src/verbs.cpp:2483 #: ../src/verbs.cpp:2404 msgid "Paste Size Separately" msgstr "Vložiť veľkosť samostatne" -#: ../src/verbs.cpp:2484 #: ../src/verbs.cpp:2405 msgid "Scale each selected object to match the size of the copied object" msgstr "" "Zmení mierku každého vybraného objektu aby sa zhodoval s veľkosťou " "kopírovaného objektu" -#: ../src/verbs.cpp:2485 #: ../src/verbs.cpp:2406 msgid "Paste Width Separately" msgstr "Vložiť šírku samostatne" -#: ../src/verbs.cpp:2486 #: ../src/verbs.cpp:2407 msgid "" "Scale each selected object horizontally to match the width of the copied " @@ -27721,12 +23406,10 @@ msgstr "" "Zmení mierku každého zvoleného objektu vodorovne, aby sa zhodoval s šírkou " "kopírovaného objektu" -#: ../src/verbs.cpp:2487 #: ../src/verbs.cpp:2408 msgid "Paste Height Separately" msgstr "Vložiť výšku samostatne" -#: ../src/verbs.cpp:2488 #: ../src/verbs.cpp:2409 msgid "" "Scale each selected object vertically to match the height of the copied " @@ -27735,82 +23418,67 @@ msgstr "" "Zmení mierku každého zvoleného objektu zvisle, aby sa zhodoval s výškou " "kopírovaného objektu" -#: ../src/verbs.cpp:2489 #: ../src/verbs.cpp:2410 msgid "Paste _In Place" msgstr "Vložiť na m_iesto" -#: ../src/verbs.cpp:2490 #: ../src/verbs.cpp:2411 msgid "Paste objects from clipboard to the original location" msgstr "Prilepí objekty zo schránky na pôvodné umiestnenie" -#: ../src/verbs.cpp:2491 #: ../src/verbs.cpp:2412 msgid "Paste Path _Effect" msgstr "Vložiť _efekt cesty" -#: ../src/verbs.cpp:2492 #: ../src/verbs.cpp:2413 msgid "Apply the path effect of the copied object to selection" msgstr "Použije efekt cesty kopírovaných objektov na výber" -#: ../src/verbs.cpp:2493 #: ../src/verbs.cpp:2414 msgid "Remove Path _Effect" msgstr "Odstrániť _efekt cesty" -#: ../src/verbs.cpp:2494 #: ../src/verbs.cpp:2415 msgid "Remove any path effects from selected objects" msgstr "Odstrániť všetky efekty cesty z vybraných objektov" -#: ../src/verbs.cpp:2495 #: ../src/verbs.cpp:2416 +#, fuzzy msgid "_Remove Filters" -msgstr "Odst_rániť filtre" +msgstr "Odstrániť filtre" -#: ../src/verbs.cpp:2496 #: ../src/verbs.cpp:2417 msgid "Remove any filters from selected objects" msgstr "Odstráni všetky filtre z vybraných objektov" -#: ../src/verbs.cpp:2497 #: ../src/verbs.cpp:2418 msgid "_Delete" msgstr "_Zmazať" -#: ../src/verbs.cpp:2498 #: ../src/verbs.cpp:2419 msgid "Delete selection" msgstr "Zmaže výber" -#: ../src/verbs.cpp:2499 #: ../src/verbs.cpp:2420 msgid "Duplic_ate" msgstr "_Duplikovať" -#: ../src/verbs.cpp:2500 #: ../src/verbs.cpp:2421 msgid "Duplicate selected objects" msgstr "Duplikuje vybrané objekty" -#: ../src/verbs.cpp:2501 #: ../src/verbs.cpp:2422 msgid "Create Clo_ne" msgstr "Vytvoriť klo_n" -#: ../src/verbs.cpp:2502 #: ../src/verbs.cpp:2423 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "Vytvorí klon (kópiu prepojenú na originá) objektu" -#: ../src/verbs.cpp:2503 #: ../src/verbs.cpp:2424 msgid "Unlin_k Clone" msgstr "Odpojiť _klon" -#: ../src/verbs.cpp:2504 #: ../src/verbs.cpp:2425 msgid "" "Cut the selected clones' links to the originals, turning them into " @@ -27818,376 +23486,321 @@ msgid "" msgstr "" "Preťať prepojenia klonu na jeho originál, čím sa stane samostatným objektom" -#: ../src/verbs.cpp:2505 #: ../src/verbs.cpp:2426 msgid "Relink to Copied" msgstr "Znova pripojiť skopírované" -#: ../src/verbs.cpp:2506 #: ../src/verbs.cpp:2427 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "" "Znova pripojí skopírované klony k objektu, ktorý je momentálne v schránke" -#: ../src/verbs.cpp:2507 #: ../src/verbs.cpp:2428 msgid "Select _Original" msgstr "Vybrať _originál" -#: ../src/verbs.cpp:2508 #: ../src/verbs.cpp:2429 msgid "Select the object to which the selected clone is linked" msgstr "Vyberie objekt, na ktorý je klon prepojený" -#: ../src/verbs.cpp:2509 #: ../src/verbs.cpp:2430 #, fuzzy msgid "Clone original path (LPE)" msgstr "Nahradiť písmo" -#: ../src/verbs.cpp:2510 #: ../src/verbs.cpp:2431 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" msgstr "" -#: ../src/verbs.cpp:2511 #: ../src/verbs.cpp:2432 msgid "Objects to _Marker" msgstr "Objekty na _zakončenie čiary" -#: ../src/verbs.cpp:2512 #: ../src/verbs.cpp:2433 msgid "Convert selection to a line marker" msgstr "Konvertovať výber na zakončenie čiary" -#: ../src/verbs.cpp:2513 #: ../src/verbs.cpp:2434 msgid "Objects to Gu_ides" msgstr "Objekty na _vodidlá" -#: ../src/verbs.cpp:2514 #: ../src/verbs.cpp:2435 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" msgstr "Previesť vybrané objekty na zbierku vodidiel zarovnaných po hranách" -#: ../src/verbs.cpp:2515 #: ../src/verbs.cpp:2436 msgid "Objects to Patter_n" msgstr "O_bjekty na vzorku" -#: ../src/verbs.cpp:2516 #: ../src/verbs.cpp:2437 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "Skonvertuje výber na obdĺžnik vyplnený vzorkou" -#: ../src/verbs.cpp:2517 #: ../src/verbs.cpp:2438 msgid "Pattern to _Objects" msgstr "Vzorku na _objekty" -#: ../src/verbs.cpp:2518 #: ../src/verbs.cpp:2439 msgid "Extract objects from a tiled pattern fill" msgstr "Extrahuje objekty z dláždenej vzorkovej výplne" -#: ../src/verbs.cpp:2519 #: ../src/verbs.cpp:2440 msgid "Group to Symbol" msgstr "" -#: ../src/verbs.cpp:2520 #: ../src/verbs.cpp:2441 #, fuzzy msgid "Convert group to a symbol" msgstr "Konvertovať ťah na cestu" -#: ../src/verbs.cpp:2521 #: ../src/verbs.cpp:2442 msgid "Symbol to Group" msgstr "" -#: ../src/verbs.cpp:2522 #: ../src/verbs.cpp:2443 msgid "Extract group from a symbol" msgstr "" -#: ../src/verbs.cpp:2523 #: ../src/verbs.cpp:2444 msgid "Clea_r All" msgstr "Všetko z_mazať" -#: ../src/verbs.cpp:2524 #: ../src/verbs.cpp:2445 msgid "Delete all objects from document" msgstr "Zmaže všetky objekty z dokumentu" -#: ../src/verbs.cpp:2525 #: ../src/verbs.cpp:2446 msgid "Select Al_l" msgstr "Vybrať _všetko" -#: ../src/verbs.cpp:2526 #: ../src/verbs.cpp:2447 msgid "Select all objects or all nodes" msgstr "Vyberie všetky objekty alebo všetky uzly" -#: ../src/verbs.cpp:2527 #: ../src/verbs.cpp:2448 msgid "Select All in All La_yers" msgstr "Vybrať všetky vo všetkých v_rstvách" -#: ../src/verbs.cpp:2528 #: ../src/verbs.cpp:2449 msgid "Select all objects in all visible and unlocked layers" msgstr "Vyberie všetky objekty vo všetkých viditeľných a nezamknutých vrstvách" -#: ../src/verbs.cpp:2529 #: ../src/verbs.cpp:2450 +#, fuzzy msgid "Fill _and Stroke" -msgstr "Výplň _a ťah" +msgstr "Výp_lň a ťah" -#: ../src/verbs.cpp:2530 #: ../src/verbs.cpp:2451 +#, fuzzy msgid "" "Select all objects with the same fill and stroke as the selected objects" -msgstr "Vyberie všetky objekty s rovnakou výplňou a ťahom ako vybrané objekty" +msgstr "" +"Vyberte objekt s výplňou vzorkou, z ktorého sa bude extrahovať objekt." -#: ../src/verbs.cpp:2531 #: ../src/verbs.cpp:2452 +#, fuzzy msgid "_Fill Color" -msgstr "_Farba výplne:" +msgstr "Jednoduchá farba:" -#: ../src/verbs.cpp:2532 #: ../src/verbs.cpp:2453 +#, fuzzy msgid "Select all objects with the same fill as the selected objects" -msgstr "Vyberie všetky objekty s rovnakou výplňou ako vybrané objekty" +msgstr "" +"Vyberte objekt s výplňou vzorkou, z ktorého sa bude extrahovať objekt." -#: ../src/verbs.cpp:2533 #: ../src/verbs.cpp:2454 +#, fuzzy msgid "_Stroke Color" -msgstr "F_arba ťahu" +msgstr "Nastaviť farbu ťahu" -#: ../src/verbs.cpp:2534 #: ../src/verbs.cpp:2455 +#, fuzzy msgid "Select all objects with the same stroke as the selected objects" -msgstr "Vyberie všetky objekty s rovnakým ťahom ako vybrané objekty" +msgstr "" +"Zmení mierku každého vybraného objektu aby sa zhodoval s veľkosťou " +"kopírovaného objektu" -#: ../src/verbs.cpp:2535 #: ../src/verbs.cpp:2456 +#, fuzzy msgid "Stroke St_yle" -msgstr "Š_týl ťahu" +msgstr "Štýl ť_ahu" -#: ../src/verbs.cpp:2536 #: ../src/verbs.cpp:2457 +#, fuzzy msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " "selected objects" msgstr "" -"Zmení mierku každého objektu s rovnakým štýlom ťahu (šírka, čiarkovanie, " -"zakončenia) ako majú vybrané objekty" +"Zmení mierku každého vybraného objektu aby sa zhodoval s veľkosťou " +"kopírovaného objektu" -#: ../src/verbs.cpp:2537 #: ../src/verbs.cpp:2458 +#, fuzzy msgid "_Object Type" -msgstr "Typ _objektu" +msgstr "Typ objektu:" -#: ../src/verbs.cpp:2538 #: ../src/verbs.cpp:2459 +#, fuzzy msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " "etc) as the selected objects" msgstr "" -"Zmení mierku každého objektu s rovnakým typom objektu (obdĺžnik, oblúk, " -"text, cesta, bitmapa) ako majú vybrané objekty" +"Zmení mierku každého vybraného objektu aby sa zhodoval s veľkosťou " +"kopírovaného objektu" -#: ../src/verbs.cpp:2539 #: ../src/verbs.cpp:2460 msgid "In_vert Selection" msgstr "In_vertovať výber" -#: ../src/verbs.cpp:2540 #: ../src/verbs.cpp:2461 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "Invertuje výber (zruší súčasný výber a vyberie všetko ostatné)" -#: ../src/verbs.cpp:2541 #: ../src/verbs.cpp:2462 msgid "Invert in All Layers" msgstr "Invertovať vo všetkých vrstvách" -#: ../src/verbs.cpp:2542 #: ../src/verbs.cpp:2463 msgid "Invert selection in all visible and unlocked layers" msgstr "Invertuje výber vo všetkých viditeľných a odomknutých vrstvách" -#: ../src/verbs.cpp:2543 #: ../src/verbs.cpp:2464 msgid "Select Next" msgstr "Vybrať nasledovný" -#: ../src/verbs.cpp:2544 #: ../src/verbs.cpp:2465 msgid "Select next object or node" msgstr "Vyberie nasledovný objekt alebo uzol" -#: ../src/verbs.cpp:2545 #: ../src/verbs.cpp:2466 msgid "Select Previous" msgstr "Vybrať predchádzajúci" -#: ../src/verbs.cpp:2546 #: ../src/verbs.cpp:2467 msgid "Select previous object or node" msgstr "Vyberie predchádzajúci objekt alebo uzol" -#: ../src/verbs.cpp:2547 #: ../src/verbs.cpp:2468 msgid "D_eselect" msgstr "Odzn_ačiť" -#: ../src/verbs.cpp:2548 #: ../src/verbs.cpp:2469 msgid "Deselect any selected objects or nodes" msgstr "Zruší výber zvolených objektov" -#: ../src/verbs.cpp:2550 #: ../src/verbs.cpp:2471 +#, fuzzy msgid "Delete all the guides in the document" -msgstr "Zmaže všetky vodidlá v dokumente" +msgstr "Zmaže všetky objekty z dokumentu" -#: ../src/verbs.cpp:2551 #: ../src/verbs.cpp:2472 +#, fuzzy msgid "Create _Guides Around the Page" -msgstr "Vytvoriť _vodidlá okolo stránky" +msgstr "_Vodidlá okolo stránky" -#: ../src/verbs.cpp:2552 #: ../src/verbs.cpp:2473 msgid "Create four guides aligned with the page borders" msgstr "Vytvorí štyri vodidlá zarovnané s okrajmi stránky" -#: ../src/verbs.cpp:2553 #: ../src/verbs.cpp:2474 msgid "Next path effect parameter" msgstr "Ďalší parameter efektu cesty" -#: ../src/verbs.cpp:2554 #: ../src/verbs.cpp:2475 msgid "Show next editable path effect parameter" msgstr "Zobraziť ďalší upraviteľný parameter efektu cesty" #. Selection -#: ../src/verbs.cpp:2557 #: ../src/verbs.cpp:2478 msgid "Raise to _Top" msgstr "_Presunúť na vrchol" -#: ../src/verbs.cpp:2558 #: ../src/verbs.cpp:2479 msgid "Raise selection to top" msgstr "Presunie výber na najvyššiu úroveň" -#: ../src/verbs.cpp:2559 #: ../src/verbs.cpp:2480 msgid "Lower to _Bottom" msgstr "P_resunúť výber na spodok" -#: ../src/verbs.cpp:2560 #: ../src/verbs.cpp:2481 msgid "Lower selection to bottom" msgstr "Presunie výber na najnižšiu úroveň" -#: ../src/verbs.cpp:2561 #: ../src/verbs.cpp:2482 msgid "_Raise" msgstr "P_resunúť vyššie" -#: ../src/verbs.cpp:2562 #: ../src/verbs.cpp:2483 msgid "Raise selection one step" msgstr "Presunie výber o jednu úroveň vyššie" -#: ../src/verbs.cpp:2563 #: ../src/verbs.cpp:2484 msgid "_Lower" msgstr "Presu_núť nižšie" -#: ../src/verbs.cpp:2564 #: ../src/verbs.cpp:2485 msgid "Lower selection one step" msgstr "Presunie výber o jednu úroveň nižšie" -#: ../src/verbs.cpp:2566 #: ../src/verbs.cpp:2487 msgid "Group selected objects" msgstr "Zoskupí zvolené objekty" -#: ../src/verbs.cpp:2568 #: ../src/verbs.cpp:2489 msgid "Ungroup selected groups" msgstr "Zruší zoskupenie výberu" -#: ../src/verbs.cpp:2570 #: ../src/verbs.cpp:2491 msgid "_Put on Path" msgstr "Umiestniť na _cestu" -#: ../src/verbs.cpp:2572 #: ../src/verbs.cpp:2493 msgid "_Remove from Path" msgstr "Odst_rániť z cesty" -#: ../src/verbs.cpp:2574 #: ../src/verbs.cpp:2495 msgid "Remove Manual _Kerns" msgstr "Odstrániť manuálny „_kerning“" #. TRANSLATORS: "glyph": An image used in the visual representation of characters; #. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2577 #: ../src/verbs.cpp:2498 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "Odstráni manuálny kerning a rotácie symbolov z textového objektu" -#: ../src/verbs.cpp:2579 #: ../src/verbs.cpp:2500 msgid "_Union" msgstr "Z_jednotenie" -#: ../src/verbs.cpp:2580 #: ../src/verbs.cpp:2501 msgid "Create union of selected paths" msgstr "Vytvorí zjednotenie zvolených ciest" -#: ../src/verbs.cpp:2581 #: ../src/verbs.cpp:2502 msgid "_Intersection" msgstr "Pr_ienik" -#: ../src/verbs.cpp:2582 #: ../src/verbs.cpp:2503 msgid "Create intersection of selected paths" msgstr "Vytvorí prienik zvolených ciest" -#: ../src/verbs.cpp:2583 #: ../src/verbs.cpp:2504 msgid "_Difference" msgstr "Roz_diel" -#: ../src/verbs.cpp:2584 #: ../src/verbs.cpp:2505 msgid "Create difference of selected paths (bottom minus top)" msgstr "Vytvorí rozdiel zvolených ciest (nižší objekt mínus vyšší)" -#: ../src/verbs.cpp:2585 #: ../src/verbs.cpp:2506 msgid "E_xclusion" msgstr "_Vylúčenie" -#: ../src/verbs.cpp:2586 #: ../src/verbs.cpp:2507 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " @@ -28196,24 +23809,20 @@ msgstr "" "Vytvorí „zvláštne alebo“ (XOR) vybraných ciest (časti, ktoré patria iba " "jednej ceste)" -#: ../src/verbs.cpp:2587 #: ../src/verbs.cpp:2508 msgid "Di_vision" msgstr "Ro_zdelenie" -#: ../src/verbs.cpp:2588 #: ../src/verbs.cpp:2509 msgid "Cut the bottom path into pieces" msgstr "Rozdelí spodnú cestu na časti" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2591 #: ../src/verbs.cpp:2512 msgid "Cut _Path" msgstr "Orezať _cestu" -#: ../src/verbs.cpp:2592 #: ../src/verbs.cpp:2513 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "Oreže ťah spodnej cesty na časti, odstráni výplň" @@ -28221,32 +23830,26 @@ msgstr "Oreže ťah spodnej cesty na časti, odstráni výplň" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2596 #: ../src/verbs.cpp:2517 msgid "Outs_et" msgstr "Posunúť _von" -#: ../src/verbs.cpp:2597 #: ../src/verbs.cpp:2518 msgid "Outset selected paths" msgstr "Posunie zvolené cesty smerom von" -#: ../src/verbs.cpp:2599 #: ../src/verbs.cpp:2520 msgid "O_utset Path by 1 px" msgstr "Pos_unúť zvolené cesty o 1 bod von" -#: ../src/verbs.cpp:2600 #: ../src/verbs.cpp:2521 msgid "Outset selected paths by 1 px" msgstr "Posunie zvolené cesty o 1 bod von" -#: ../src/verbs.cpp:2602 #: ../src/verbs.cpp:2523 msgid "O_utset Path by 10 px" msgstr "Posunúť zvolené cesty von o 10 bodov" -#: ../src/verbs.cpp:2603 #: ../src/verbs.cpp:2524 msgid "Outset selected paths by 10 px" msgstr "Pos_unie zvolené cesty von o 10 bodov" @@ -28254,402 +23857,345 @@ msgstr "Pos_unie zvolené cesty von o 10 bodov" #. TRANSLATORS: "inset": contract a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2607 #: ../src/verbs.cpp:2528 msgid "I_nset" msgstr "Posu_núť dnu" -#: ../src/verbs.cpp:2608 #: ../src/verbs.cpp:2529 msgid "Inset selected paths" msgstr "Posunie zvolené cesty dnu" -#: ../src/verbs.cpp:2610 #: ../src/verbs.cpp:2531 msgid "I_nset Path by 1 px" msgstr "Posunúť zvolené cesty dnu o _1 bod" -#: ../src/verbs.cpp:2611 #: ../src/verbs.cpp:2532 msgid "Inset selected paths by 1 px" msgstr "Posunie zvolené cesty dnu o 1 bod" -#: ../src/verbs.cpp:2613 #: ../src/verbs.cpp:2534 msgid "I_nset Path by 10 px" msgstr "Posunúť zvolené cesty dnu o 1_0 bodov" -#: ../src/verbs.cpp:2614 #: ../src/verbs.cpp:2535 msgid "Inset selected paths by 10 px" msgstr "Posunie zvolené cesty dnu o 10 bodov" -#: ../src/verbs.cpp:2616 #: ../src/verbs.cpp:2537 msgid "D_ynamic Offset" msgstr "D_ynamický posun" -#: ../src/verbs.cpp:2616 #: ../src/verbs.cpp:2537 msgid "Create a dynamic offset object" msgstr "Vytvorí dynamický posun objektu" -#: ../src/verbs.cpp:2618 #: ../src/verbs.cpp:2539 msgid "_Linked Offset" msgstr "_Prepojený posun" -#: ../src/verbs.cpp:2619 #: ../src/verbs.cpp:2540 msgid "Create a dynamic offset object linked to the original path" msgstr "Vytvorí dynamický posun objektu prepojený na originálnu cestu" -#: ../src/verbs.cpp:2621 #: ../src/verbs.cpp:2542 msgid "_Stroke to Path" msgstr "Ťah na ce_stu" -#: ../src/verbs.cpp:2622 #: ../src/verbs.cpp:2543 msgid "Convert selected object's stroke to paths" msgstr "Skonvertuje ťah zvoleného objektu na cestu" -#: ../src/verbs.cpp:2623 #: ../src/verbs.cpp:2544 msgid "Si_mplify" msgstr "Zj_ednodušiť" -#: ../src/verbs.cpp:2624 #: ../src/verbs.cpp:2545 msgid "Simplify selected paths (remove extra nodes)" msgstr "Zjednoduší vybrané cesty (odstráni nadbytočné uzly)" -#: ../src/verbs.cpp:2625 #: ../src/verbs.cpp:2546 msgid "_Reverse" msgstr "_Obrátiť smer" -#: ../src/verbs.cpp:2626 #: ../src/verbs.cpp:2547 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" "Obráti smer zvolených ciest (vhodné pre preklápanie značiek zakončenia čiar)" -#: ../src/verbs.cpp:2629 #: ../src/verbs.cpp:2550 msgid "Create one or more paths from a bitmap by tracing it" msgstr "Vytvorí jednu alebo viac ciest z bitmapy jej vektorizáciou" -#: ../src/verbs.cpp:2630 #: ../src/verbs.cpp:2551 +#, fuzzy msgid "Trace Pixel Art..." -msgstr "Vektorizovať sprite..." +msgstr "_Vektorizovať bitmapu..." -#: ../src/verbs.cpp:2631 #: ../src/verbs.cpp:2552 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" msgstr "" -#: ../src/verbs.cpp:2632 #: ../src/verbs.cpp:2553 +#, fuzzy msgid "Make a _Bitmap Copy" -msgstr "Vytvoriť _bitmapovú kópiu" +msgstr "Vytvoriť bit_mapovú kópiu" -#: ../src/verbs.cpp:2633 #: ../src/verbs.cpp:2554 msgid "Export selection to a bitmap and insert it into document" msgstr "Exportuje výber do bitmapy alebo vložiť do dokumentu" -#: ../src/verbs.cpp:2634 #: ../src/verbs.cpp:2555 msgid "_Combine" msgstr "_Kombinovať" -#: ../src/verbs.cpp:2635 #: ../src/verbs.cpp:2556 msgid "Combine several paths into one" msgstr "Skombinuje niekoľko ciest do jednej" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2638 #: ../src/verbs.cpp:2559 msgid "Break _Apart" msgstr "_Rozdeliť na časti" -#: ../src/verbs.cpp:2639 #: ../src/verbs.cpp:2560 msgid "Break selected paths into subpaths" msgstr "Rozdelí vybrané cesty na podcesty" -#: ../src/verbs.cpp:2640 #: ../src/verbs.cpp:2561 +#, fuzzy msgid "_Arrange..." -msgstr "_Rozmiestniť…" +msgstr "Rozmiestniť" -#: ../src/verbs.cpp:2641 #: ../src/verbs.cpp:2562 +#, fuzzy msgid "Arrange selected objects in a table or circle" -msgstr "Rozmiestni zvolené objekty do vzoru mriežky (tabuľky) alebo kruhu" +msgstr "Rozmiestni zvolené objekty do vzoru mriežky (tabuľky)" #. Layer -#: ../src/verbs.cpp:2643 #: ../src/verbs.cpp:2564 msgid "_Add Layer..." msgstr "_Nová vrstva..." -#: ../src/verbs.cpp:2644 #: ../src/verbs.cpp:2565 msgid "Create a new layer" msgstr "Vytvorí novú vrstvu" -#: ../src/verbs.cpp:2645 #: ../src/verbs.cpp:2566 msgid "Re_name Layer..." msgstr "Preme_novať vrstvu..." -#: ../src/verbs.cpp:2646 #: ../src/verbs.cpp:2567 msgid "Rename the current layer" msgstr "Premenuje aktuálnu vrstvu" -#: ../src/verbs.cpp:2647 #: ../src/verbs.cpp:2568 msgid "Switch to Layer Abov_e" msgstr "Prepnúť do nasledujúcej vrstvy" -#: ../src/verbs.cpp:2648 #: ../src/verbs.cpp:2569 msgid "Switch to the layer above the current" msgstr "Prepne do nasledujúcej vrstvy v dokumente" -#: ../src/verbs.cpp:2649 #: ../src/verbs.cpp:2570 msgid "Switch to Layer Belo_w" msgstr "Prepnúť do nasledujúcej vrstvy" -#: ../src/verbs.cpp:2650 #: ../src/verbs.cpp:2571 msgid "Switch to the layer below the current" msgstr "Prepne do nasledujúcej vrstvy v dokumente" -#: ../src/verbs.cpp:2651 #: ../src/verbs.cpp:2572 msgid "Move Selection to Layer Abo_ve" msgstr "Presunie výber o úroveň _vyššie" -#: ../src/verbs.cpp:2652 #: ../src/verbs.cpp:2573 msgid "Move selection to the layer above the current" msgstr "Presunie výber do predchádzajúcej vrstvy" -#: ../src/verbs.cpp:2653 #: ../src/verbs.cpp:2574 msgid "Move Selection to Layer Bel_ow" msgstr "Presunúť výber o úroveň _nižšie" -#: ../src/verbs.cpp:2654 #: ../src/verbs.cpp:2575 msgid "Move selection to the layer below the current" msgstr "Presunie výber do nasledovnej vrstvy" -#: ../src/verbs.cpp:2655 #: ../src/verbs.cpp:2576 #, fuzzy msgid "Move Selection to Layer..." -msgstr "Presunie výber o úroveň _vyššie…" +msgstr "Presunie výber o úroveň _vyššie" -#: ../src/verbs.cpp:2657 #: ../src/verbs.cpp:2578 msgid "Layer to _Top" msgstr "Umiestniť vrs_tvu navrch" -#: ../src/verbs.cpp:2658 #: ../src/verbs.cpp:2579 msgid "Raise the current layer to the top" msgstr "Presunie aktuálnu vrstvu navrch" -#: ../src/verbs.cpp:2659 #: ../src/verbs.cpp:2580 msgid "Layer to _Bottom" msgstr "Umiestniť vrstvu _naspodok" -#: ../src/verbs.cpp:2660 #: ../src/verbs.cpp:2581 msgid "Lower the current layer to the bottom" msgstr "Presunie aktuálnu vrstvu naspodok" -#: ../src/verbs.cpp:2661 #: ../src/verbs.cpp:2582 msgid "_Raise Layer" msgstr "_Zdvihnúť vrstvu" -#: ../src/verbs.cpp:2662 #: ../src/verbs.cpp:2583 msgid "Raise the current layer" msgstr "Presunie aktuálnu vrstvu o úroveň vyššie" -#: ../src/verbs.cpp:2663 #: ../src/verbs.cpp:2584 msgid "_Lower Layer" msgstr "Z_nížiť vrstvu" -#: ../src/verbs.cpp:2664 #: ../src/verbs.cpp:2585 msgid "Lower the current layer" msgstr "Presunie aktuálnu vrstvu o úroveň nižšie" -#: ../src/verbs.cpp:2665 #: ../src/verbs.cpp:2586 +#, fuzzy msgid "D_uplicate Current Layer" -msgstr "D_uplikovať aktuálnu vrstvu" +msgstr "Duplikovať aktuálnu vrstvu" -#: ../src/verbs.cpp:2666 #: ../src/verbs.cpp:2587 msgid "Duplicate an existing layer" msgstr "Duplikovať existujúcu vrstvu" -#: ../src/verbs.cpp:2667 #: ../src/verbs.cpp:2588 msgid "_Delete Current Layer" msgstr "O_dstrániť aktuálnu vrstvu" -#: ../src/verbs.cpp:2668 #: ../src/verbs.cpp:2589 msgid "Delete the current layer" msgstr "Odstráni aktuálnu vrstvu" -#: ../src/verbs.cpp:2669 #: ../src/verbs.cpp:2590 msgid "_Show/hide other layers" msgstr "_Zobraziť/skryť iné vrstvy" -#: ../src/verbs.cpp:2670 #: ../src/verbs.cpp:2591 msgid "Solo the current layer" msgstr "Prepne viditeľnosť iba na aktuálnu vrstvu alebo na všetky vrstvy" -#: ../src/verbs.cpp:2671 #: ../src/verbs.cpp:2592 +#, fuzzy msgid "_Show all layers" -msgstr "_Zobraziť všetky vrstvy" +msgstr "Vybrať vo všetkých vrstvách" -#: ../src/verbs.cpp:2672 #: ../src/verbs.cpp:2593 +#, fuzzy msgid "Show all the layers" -msgstr "Zobrazí všetky vrstvy" +msgstr "_Zobraziť/skryť iné vrstvy" -#: ../src/verbs.cpp:2673 #: ../src/verbs.cpp:2594 +#, fuzzy msgid "_Hide all layers" -msgstr "_Skryť všetky vrstvy" +msgstr "Skryť vrstvu" -#: ../src/verbs.cpp:2674 #: ../src/verbs.cpp:2595 +#, fuzzy msgid "Hide all the layers" -msgstr "Skryje všetky vrstvy" +msgstr "Skryť vrstvu" -#: ../src/verbs.cpp:2675 #: ../src/verbs.cpp:2596 +#, fuzzy msgid "_Lock all layers" -msgstr "_Zamknúť všetky vrstvy" +msgstr "Vybrať vo všetkých vrstvách" -#: ../src/verbs.cpp:2676 #: ../src/verbs.cpp:2597 +#, fuzzy msgid "Lock all the layers" -msgstr "Zamkne všetky vrstvy" +msgstr "_Zobraziť/skryť iné vrstvy" -#: ../src/verbs.cpp:2677 #: ../src/verbs.cpp:2598 +#, fuzzy msgid "Lock/Unlock _other layers" -msgstr "Zamknúť/odomknúť _ostatné vrstvy" +msgstr "Zamknúť alebo odomknúť aktuálnu vrstvu" -#: ../src/verbs.cpp:2678 #: ../src/verbs.cpp:2599 +#, fuzzy msgid "Lock all the other layers" -msgstr "Zamknúť všetky ostatné vrstvy" +msgstr "_Zobraziť/skryť iné vrstvy" -#: ../src/verbs.cpp:2679 #: ../src/verbs.cpp:2600 +#, fuzzy msgid "_Unlock all layers" -msgstr "_Odomknúť všetky vrstvy" +msgstr "Odomknúť vrstvu" -#: ../src/verbs.cpp:2680 #: ../src/verbs.cpp:2601 +#, fuzzy msgid "Unlock all the layers" -msgstr "Odomkne všetky vrstvy" +msgstr "_Zobraziť/skryť iné vrstvy" -#: ../src/verbs.cpp:2681 #: ../src/verbs.cpp:2602 +#, fuzzy msgid "_Lock/Unlock Current Layer" -msgstr "Zamknúť/odomknúť aktuá_lnu vrstvu" +msgstr "Zamknúť alebo odomknúť aktuálnu vrstvu" -#: ../src/verbs.cpp:2682 #: ../src/verbs.cpp:2603 +#, fuzzy msgid "Toggle lock on current layer" -msgstr "Prepne zamknutie na aktuálnej vrstve" +msgstr "Prepne viditeľnosť iba na aktuálnu vrstvu alebo na všetky vrstvy" -#: ../src/verbs.cpp:2683 #: ../src/verbs.cpp:2604 +#, fuzzy msgid "_Show/hide Current Layer" -msgstr "_Zobraziť/skryť aktuálnu vrstvu" +msgstr "_Zobraziť/skryť iné vrstvy" -#: ../src/verbs.cpp:2684 #: ../src/verbs.cpp:2605 +#, fuzzy msgid "Toggle visibility of current layer" -msgstr "Prepne viditeľnosť aktuálnej vrstvy" +msgstr "Prepne viditeľnosť iba na aktuálnu vrstvu alebo na všetky vrstvy" #. Object -#: ../src/verbs.cpp:2687 #: ../src/verbs.cpp:2608 +#, fuzzy msgid "Rotate _90° CW" -msgstr "Otočiť o +_90°" +msgstr "Otočiť o +_90 stupňov" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2690 #: ../src/verbs.cpp:2611 msgid "Rotate selection 90° clockwise" msgstr "Otočí výber 90° v smere hodinových ručičiek" -#: ../src/verbs.cpp:2691 #: ../src/verbs.cpp:2612 +#, fuzzy msgid "Rotate 9_0° CCW" -msgstr "Otočiť o -_90°" +msgstr "Otočiť o -_90 stupňov" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2694 #: ../src/verbs.cpp:2615 msgid "Rotate selection 90° counter-clockwise" msgstr "Otočí výber 90° proti smeru hodinových ručičiek" -#: ../src/verbs.cpp:2695 #: ../src/verbs.cpp:2616 msgid "Remove _Transformations" msgstr "Odstrániť _transformáciu" -#: ../src/verbs.cpp:2696 #: ../src/verbs.cpp:2617 msgid "Remove transformations from object" msgstr "Odstráni transformácie z objektu" -#: ../src/verbs.cpp:2697 #: ../src/verbs.cpp:2618 msgid "_Object to Path" msgstr "_Objekt na cestu" -#: ../src/verbs.cpp:2698 #: ../src/verbs.cpp:2619 msgid "Convert selected object to path" msgstr "Skonvertuje zvolený objekt na cestu" -#: ../src/verbs.cpp:2699 #: ../src/verbs.cpp:2620 msgid "_Flow into Frame" msgstr "_Tok textu do rámca" -#: ../src/verbs.cpp:2700 #: ../src/verbs.cpp:2621 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " @@ -28658,68 +24204,54 @@ msgstr "" "Umiestni text do rámca (cesta alebo tvar), čím sa vytvorí textový tok " "spojený s rámcom objektu" -#: ../src/verbs.cpp:2701 #: ../src/verbs.cpp:2622 msgid "_Unflow" msgstr "Zr_ušiť tok textu" -#: ../src/verbs.cpp:2702 #: ../src/verbs.cpp:2623 msgid "Remove text from frame (creates a single-line text object)" msgstr "Odstráni text z rámca (vytvorí objekt s jediným riadkom textu)" -#: ../src/verbs.cpp:2703 #: ../src/verbs.cpp:2624 msgid "_Convert to Text" msgstr "_Konvertovať na text" -#: ../src/verbs.cpp:2704 #: ../src/verbs.cpp:2625 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "Skonvertuje textový tok na bežný textový objekt (zachová vzhľad)" -#: ../src/verbs.cpp:2706 #: ../src/verbs.cpp:2627 msgid "Flip _Horizontal" msgstr "Preklopiť v_odorovne" -#: ../src/verbs.cpp:2706 #: ../src/verbs.cpp:2627 msgid "Flip selected objects horizontally" msgstr "Preklopí vybrané objekty vodorovne" -#: ../src/verbs.cpp:2709 #: ../src/verbs.cpp:2630 msgid "Flip _Vertical" msgstr "Preklopiť z_visle" -#: ../src/verbs.cpp:2709 #: ../src/verbs.cpp:2630 msgid "Flip selected objects vertically" msgstr "Preklopí vybrané objekty zvisle" -#: ../src/verbs.cpp:2712 #: ../src/verbs.cpp:2633 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "Použije masku na výber (použije najvrchnejší objekt ako masku)" -#: ../src/verbs.cpp:2714 #: ../src/verbs.cpp:2635 msgid "Edit mask" msgstr "Upraviť masku" -#: ../src/verbs.cpp:2715 ../src/verbs.cpp:2723 -#: ../src/verbs.cpp:2636 -#: ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2636 ../src/verbs.cpp:2642 msgid "_Release" msgstr "_Uvoľniť" -#: ../src/verbs.cpp:2716 #: ../src/verbs.cpp:2637 msgid "Remove mask from selection" msgstr "Odstráni masku z výberu" -#: ../src/verbs.cpp:2718 #: ../src/verbs.cpp:2639 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" @@ -28727,856 +24259,717 @@ msgstr "" "Použije orezávaciu cestu na výber (použije najvrchnejší objekt ako " "orezávaciu cestu)" -#: ../src/verbs.cpp:2719 -msgid "Create Cl_ip Group" -msgstr "" - -#: ../src/verbs.cpp:2720 -msgid "Creates a clip group using the selected objects as a base" -msgstr "" - -#: ../src/verbs.cpp:2722 #: ../src/verbs.cpp:2641 msgid "Edit clipping path" msgstr "Upraviť orezávaciu cestu" -#: ../src/verbs.cpp:2724 #: ../src/verbs.cpp:2643 msgid "Remove clipping path from selection" msgstr "Odstráni orezávaciu cestu z výberu" #. Tools -#: ../src/verbs.cpp:2729 #: ../src/verbs.cpp:2646 +#, fuzzy msgctxt "ContextVerb" msgid "Select" msgstr "Vybrať" -#: ../src/verbs.cpp:2730 #: ../src/verbs.cpp:2647 msgid "Select and transform objects" msgstr "Výber a transformácia objektov" -#: ../src/verbs.cpp:2731 #: ../src/verbs.cpp:2648 +#, fuzzy msgctxt "ContextVerb" msgid "Node Edit" msgstr "Upraviť uzol" -#: ../src/verbs.cpp:2732 #: ../src/verbs.cpp:2649 msgid "Edit paths by nodes" msgstr "Upraviť uzly cesty" -#: ../src/verbs.cpp:2733 #: ../src/verbs.cpp:2650 +#, fuzzy msgctxt "ContextVerb" msgid "Tweak" -msgstr "Doladiť" +msgstr "Doladenie" -#: ../src/verbs.cpp:2734 #: ../src/verbs.cpp:2651 msgid "Tweak objects by sculpting or painting" msgstr "Doladiť objekty sochárstvom alebo maľovaním" -#: ../src/verbs.cpp:2735 #: ../src/verbs.cpp:2652 +#, fuzzy msgctxt "ContextVerb" msgid "Spray" -msgstr "Sprejovať" +msgstr "Sprej" -#: ../src/verbs.cpp:2736 #: ../src/verbs.cpp:2653 msgid "Spray objects by sculpting or painting" msgstr "Sprejovať objekty sochárstvom alebo maľovaním" -#: ../src/verbs.cpp:2737 #: ../src/verbs.cpp:2654 +#, fuzzy msgctxt "ContextVerb" msgid "Rectangle" msgstr "Obdĺžnik" -#: ../src/verbs.cpp:2738 #: ../src/verbs.cpp:2655 msgid "Create rectangles and squares" msgstr "Vytvorenie obdĺžnikov a štvorcov" -#: ../src/verbs.cpp:2739 #: ../src/verbs.cpp:2656 +#, fuzzy msgctxt "ContextVerb" msgid "3D Box" msgstr "Kváder" -#: ../src/verbs.cpp:2740 #: ../src/verbs.cpp:2657 msgid "Create 3D boxes" msgstr "Vytvoriť kvádre" -#: ../src/verbs.cpp:2741 #: ../src/verbs.cpp:2658 +#, fuzzy msgctxt "ContextVerb" msgid "Ellipse" msgstr "Elipsa" -#: ../src/verbs.cpp:2742 #: ../src/verbs.cpp:2659 msgid "Create circles, ellipses, and arcs" msgstr "Vytvorenie kruhov, elíps a oblúkov" -#: ../src/verbs.cpp:2743 #: ../src/verbs.cpp:2660 +#, fuzzy msgctxt "ContextVerb" msgid "Star" msgstr "Hviezda" -#: ../src/verbs.cpp:2744 #: ../src/verbs.cpp:2661 msgid "Create stars and polygons" msgstr "Vytvorenie hviezd a mnohouholníkov" -#: ../src/verbs.cpp:2745 #: ../src/verbs.cpp:2662 +#, fuzzy msgctxt "ContextVerb" msgid "Spiral" msgstr "Špirála" -#: ../src/verbs.cpp:2746 #: ../src/verbs.cpp:2663 msgid "Create spirals" msgstr "Vytvorenie špirál" -#: ../src/verbs.cpp:2747 #: ../src/verbs.cpp:2664 +#, fuzzy msgctxt "ContextVerb" msgid "Pencil" msgstr "Ceruzka" -#: ../src/verbs.cpp:2748 #: ../src/verbs.cpp:2665 msgid "Draw freehand lines" msgstr "Kreslenie voľnou rukou" -#: ../src/verbs.cpp:2749 #: ../src/verbs.cpp:2666 +#, fuzzy msgctxt "ContextVerb" msgid "Pen" msgstr "Pero" -#: ../src/verbs.cpp:2750 #: ../src/verbs.cpp:2667 msgid "Draw Bezier curves and straight lines" msgstr "Kreslenie bézierovych čiar a priamych čiar" -#: ../src/verbs.cpp:2751 #: ../src/verbs.cpp:2668 +#, fuzzy msgctxt "ContextVerb" msgid "Calligraphy" msgstr "Kaligrafická čiara" -#: ../src/verbs.cpp:2752 #: ../src/verbs.cpp:2669 msgid "Draw calligraphic or brush strokes" msgstr "Kresliť kaligrafický ťah alebo ťah štetca" -#: ../src/verbs.cpp:2754 #: ../src/verbs.cpp:2671 msgid "Create and edit text objects" msgstr "Vytvorenie a úprava textových objektov" -#: ../src/verbs.cpp:2755 #: ../src/verbs.cpp:2672 +#, fuzzy msgctxt "ContextVerb" msgid "Gradient" -msgstr "Farebný prechod" +msgstr "Lineárny prechod" -#: ../src/verbs.cpp:2756 #: ../src/verbs.cpp:2673 msgid "Create and edit gradients" msgstr "Vytvorenie a úprava farebných prechodov" -#: ../src/verbs.cpp:2757 #: ../src/verbs.cpp:2674 msgctxt "ContextVerb" msgid "Mesh" -msgstr "Sieťka" +msgstr "" -#: ../src/verbs.cpp:2758 #: ../src/verbs.cpp:2675 +#, fuzzy msgid "Create and edit meshes" -msgstr "Vytvorenie a úprava sieťok" +msgstr "Vytvorenie a úprava farebných prechodov" -#: ../src/verbs.cpp:2759 #: ../src/verbs.cpp:2676 +#, fuzzy msgctxt "ContextVerb" msgid "Zoom" -msgstr "Zmena mierky" +msgstr "Lupa" -#: ../src/verbs.cpp:2760 #: ../src/verbs.cpp:2677 msgid "Zoom in or out" msgstr "Priblížiť alebo oddialiť" -#: ../src/verbs.cpp:2762 #: ../src/verbs.cpp:2679 +#, fuzzy msgid "Measurement tool" -msgstr "Nástroj na meranie" +msgstr "Typ merania:" -#: ../src/verbs.cpp:2763 #: ../src/verbs.cpp:2680 +#, fuzzy msgctxt "ContextVerb" msgid "Dropper" msgstr "Pipeta" -#: ../src/verbs.cpp:2764 ../src/widgets/sp-color-notebook.cpp:396 -#: ../src/verbs.cpp:2681 -#: ../src/widgets/sp-color-notebook.cpp:411 +#: ../src/verbs.cpp:2681 ../src/widgets/sp-color-notebook.cpp:411 msgid "Pick colors from image" msgstr "Vybrať farby z obrázka" -#: ../src/verbs.cpp:2765 #: ../src/verbs.cpp:2682 +#, fuzzy msgctxt "ContextVerb" msgid "Connector" msgstr "Konektor" -#: ../src/verbs.cpp:2766 #: ../src/verbs.cpp:2683 msgid "Create diagram connectors" msgstr "Vytvoriť konektory diagramu" -#: ../src/verbs.cpp:2767 #: ../src/verbs.cpp:2684 +#, fuzzy msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "Vedro s farbou" -#: ../src/verbs.cpp:2768 #: ../src/verbs.cpp:2685 msgid "Fill bounded areas" msgstr "Vyplniť ohraničené oblasti" -#: ../src/verbs.cpp:2769 #: ../src/verbs.cpp:2686 +#, fuzzy msgctxt "ContextVerb" msgid "LPE Edit" msgstr "Upraviť efekty cesty" -#: ../src/verbs.cpp:2770 #: ../src/verbs.cpp:2687 msgid "Edit Path Effect parameters" msgstr "Upraviť parametre efektu cesty" -#: ../src/verbs.cpp:2771 #: ../src/verbs.cpp:2688 +#, fuzzy msgctxt "ContextVerb" msgid "Eraser" msgstr "Guma" -#: ../src/verbs.cpp:2772 #: ../src/verbs.cpp:2689 msgid "Erase existing paths" msgstr "Zmazať existujúce cesty" -#: ../src/verbs.cpp:2773 #: ../src/verbs.cpp:2690 +#, fuzzy msgctxt "ContextVerb" msgid "LPE Tool" msgstr "Nástroj efektov cesty" -#: ../src/verbs.cpp:2774 #: ../src/verbs.cpp:2691 msgid "Do geometric constructions" msgstr "Vytvárať geometrické konštrukcie" #. Tool prefs -#: ../src/verbs.cpp:2776 #: ../src/verbs.cpp:2693 msgid "Selector Preferences" msgstr "Nastavenie Výberu" -#: ../src/verbs.cpp:2777 #: ../src/verbs.cpp:2694 msgid "Open Preferences for the Selector tool" msgstr "Otvorí Nastavenia pre nástroj Výber" -#: ../src/verbs.cpp:2778 #: ../src/verbs.cpp:2695 msgid "Node Tool Preferences" msgstr "Nastavenie nástroja s uzlami" -#: ../src/verbs.cpp:2779 #: ../src/verbs.cpp:2696 msgid "Open Preferences for the Node tool" msgstr "Otvorí Nastavenia pre nástroj Uzol" -#: ../src/verbs.cpp:2780 #: ../src/verbs.cpp:2697 msgid "Tweak Tool Preferences" msgstr "Nastavenie nástroja Ladenie" -#: ../src/verbs.cpp:2781 #: ../src/verbs.cpp:2698 msgid "Open Preferences for the Tweak tool" msgstr "Otvorí Nastavenia pre nástroj Ladenie" -#: ../src/verbs.cpp:2782 #: ../src/verbs.cpp:2699 msgid "Spray Tool Preferences" msgstr "Nastavenia nástroja Sprej" -#: ../src/verbs.cpp:2783 #: ../src/verbs.cpp:2700 msgid "Open Preferences for the Spray tool" msgstr "Otvorí Nastavenia pre nástroj Sprej" -#: ../src/verbs.cpp:2784 #: ../src/verbs.cpp:2701 msgid "Rectangle Preferences" msgstr "Nastavenia obdĺžnika" -#: ../src/verbs.cpp:2785 #: ../src/verbs.cpp:2702 msgid "Open Preferences for the Rectangle tool" msgstr "Otvorí Nastavenia pre nástroj Obdĺžnik" -#: ../src/verbs.cpp:2786 #: ../src/verbs.cpp:2703 msgid "3D Box Preferences" msgstr "Nastavenia kvádra" -#: ../src/verbs.cpp:2787 #: ../src/verbs.cpp:2704 msgid "Open Preferences for the 3D Box tool" msgstr "Otvorí Nastavenia pre nástroj Kváder" -#: ../src/verbs.cpp:2788 #: ../src/verbs.cpp:2705 msgid "Ellipse Preferences" msgstr "Nastavenia elipsy" -#: ../src/verbs.cpp:2789 #: ../src/verbs.cpp:2706 msgid "Open Preferences for the Ellipse tool" msgstr "Otvorí Nastavenia pre nástroj Elipsa" -#: ../src/verbs.cpp:2790 #: ../src/verbs.cpp:2707 msgid "Star Preferences" msgstr "Nastavenia hviezdy" -#: ../src/verbs.cpp:2791 #: ../src/verbs.cpp:2708 msgid "Open Preferences for the Star tool" msgstr "Otvorí Nastavenia pre nástroj Hviezda" -#: ../src/verbs.cpp:2792 #: ../src/verbs.cpp:2709 msgid "Spiral Preferences" msgstr "Nastavenia špirály" -#: ../src/verbs.cpp:2793 #: ../src/verbs.cpp:2710 msgid "Open Preferences for the Spiral tool" msgstr "Otvorí Nastavenia pre nástroj Špirála" -#: ../src/verbs.cpp:2794 #: ../src/verbs.cpp:2711 msgid "Pencil Preferences" msgstr "Nastavenia ceruzky" -#: ../src/verbs.cpp:2795 #: ../src/verbs.cpp:2712 msgid "Open Preferences for the Pencil tool" msgstr "Otvorí Nastavenia pre nástroj Ceruzka" -#: ../src/verbs.cpp:2796 #: ../src/verbs.cpp:2713 msgid "Pen Preferences" msgstr "Nastavenia pera" -#: ../src/verbs.cpp:2797 #: ../src/verbs.cpp:2714 msgid "Open Preferences for the Pen tool" msgstr "Otvorí Nastavenia pre nástroj Pero" -#: ../src/verbs.cpp:2798 #: ../src/verbs.cpp:2715 msgid "Calligraphic Preferences" msgstr "Nastavenia kaligrafickej čiary" -#: ../src/verbs.cpp:2799 #: ../src/verbs.cpp:2716 msgid "Open Preferences for the Calligraphy tool" msgstr "Otvorí Nastavenia pre nástroj Kaligrafické pero" -#: ../src/verbs.cpp:2800 #: ../src/verbs.cpp:2717 msgid "Text Preferences" msgstr "Nastavenie textu" -#: ../src/verbs.cpp:2801 #: ../src/verbs.cpp:2718 msgid "Open Preferences for the Text tool" msgstr "Otvorí Nastavenia pre nástroj Text" -#: ../src/verbs.cpp:2802 #: ../src/verbs.cpp:2719 msgid "Gradient Preferences" msgstr "Nastavenia Farebného prechodu" -#: ../src/verbs.cpp:2803 #: ../src/verbs.cpp:2720 msgid "Open Preferences for the Gradient tool" msgstr "Otvorí Nastavenia pre nástroj Farebný prechod" -#: ../src/verbs.cpp:2804 #: ../src/verbs.cpp:2721 +#, fuzzy msgid "Mesh Preferences" -msgstr "Nastavenia sieťky" +msgstr "Nastavenia gumy" -#: ../src/verbs.cpp:2805 #: ../src/verbs.cpp:2722 +#, fuzzy msgid "Open Preferences for the Mesh tool" -msgstr "Otvorí Nastavenia nástroja Sieťka" +msgstr "Otvorí Nastavenia nástroja Guma" -#: ../src/verbs.cpp:2806 #: ../src/verbs.cpp:2723 msgid "Zoom Preferences" msgstr "Nastavenie zmeny mierky zobrazenia" -#: ../src/verbs.cpp:2807 #: ../src/verbs.cpp:2724 msgid "Open Preferences for the Zoom tool" msgstr "Otvorí Nastavenia pre nástroj Zmena mierky" -#: ../src/verbs.cpp:2808 #: ../src/verbs.cpp:2725 +#, fuzzy msgid "Measure Preferences" -msgstr "Nastavenia merania" +msgstr "Nastavenia gumy" -#: ../src/verbs.cpp:2809 #: ../src/verbs.cpp:2726 +#, fuzzy msgid "Open Preferences for the Measure tool" -msgstr "Otvorí Nastavenia nástroja na meranie" +msgstr "Otvorí Nastavenia nástroja Guma" -#: ../src/verbs.cpp:2810 #: ../src/verbs.cpp:2727 msgid "Dropper Preferences" msgstr "Nastavenie kvapkadla" -#: ../src/verbs.cpp:2811 #: ../src/verbs.cpp:2728 msgid "Open Preferences for the Dropper tool" msgstr "Otvorí Nastavenia pre nástroj Kvapkadlo" -#: ../src/verbs.cpp:2812 #: ../src/verbs.cpp:2729 msgid "Connector Preferences" msgstr "Nastavenie pre nástroj Konektor" -#: ../src/verbs.cpp:2813 #: ../src/verbs.cpp:2730 msgid "Open Preferences for the Connector tool" msgstr "Otvorí Nastavenia pre nástroj Konektor" -#: ../src/verbs.cpp:2814 #: ../src/verbs.cpp:2731 msgid "Paint Bucket Preferences" msgstr "Nastavenia Vedra s farbou" -#: ../src/verbs.cpp:2815 #: ../src/verbs.cpp:2732 msgid "Open Preferences for the Paint Bucket tool" msgstr "Otvorí Nastavenia pre nástroj Vedro s farbou" -#: ../src/verbs.cpp:2816 #: ../src/verbs.cpp:2733 msgid "Eraser Preferences" msgstr "Nastavenia gumy" -#: ../src/verbs.cpp:2817 #: ../src/verbs.cpp:2734 msgid "Open Preferences for the Eraser tool" msgstr "Otvorí Nastavenia nástroja Guma" -#: ../src/verbs.cpp:2818 #: ../src/verbs.cpp:2735 msgid "LPE Tool Preferences" msgstr "Nastavenie nástroja efektov cesty" -#: ../src/verbs.cpp:2819 #: ../src/verbs.cpp:2736 msgid "Open Preferences for the LPETool tool" msgstr "Otvorí Nastavenie nástroja efektov cesty" #. Zoom/View -#: ../src/verbs.cpp:2821 #: ../src/verbs.cpp:2738 msgid "Zoom In" msgstr "Priblížiť" -#: ../src/verbs.cpp:2821 #: ../src/verbs.cpp:2738 msgid "Zoom in" msgstr "Priblíži zobrazenie" -#: ../src/verbs.cpp:2822 #: ../src/verbs.cpp:2739 msgid "Zoom Out" msgstr "Oddialiť" -#: ../src/verbs.cpp:2822 #: ../src/verbs.cpp:2739 msgid "Zoom out" msgstr "Oddiali zobrazenie" -#: ../src/verbs.cpp:2823 #: ../src/verbs.cpp:2740 msgid "_Rulers" msgstr "_Pravítka" -#: ../src/verbs.cpp:2823 #: ../src/verbs.cpp:2740 msgid "Show or hide the canvas rulers" msgstr "Zobrazí alebo skryje pravítka plátna" -#: ../src/verbs.cpp:2824 #: ../src/verbs.cpp:2741 msgid "Scroll_bars" msgstr "Po_suvníky" -#: ../src/verbs.cpp:2824 #: ../src/verbs.cpp:2741 msgid "Show or hide the canvas scrollbars" msgstr "Zobrazí alebo skryje posuvníky plátna" -#: ../src/verbs.cpp:2825 #: ../src/verbs.cpp:2742 +#, fuzzy msgid "Page _Grid" -msgstr "_Mriežka stránky" +msgstr "_Šírka strany" -#: ../src/verbs.cpp:2825 #: ../src/verbs.cpp:2742 +#, fuzzy msgid "Show or hide the page grid" -msgstr "Zobrazí alebo skryje mriežku stránky" +msgstr "Zobrazí alebo skrje mriežku" -#: ../src/verbs.cpp:2826 #: ../src/verbs.cpp:2743 msgid "G_uides" msgstr "_Vodidlá" -#: ../src/verbs.cpp:2826 #: ../src/verbs.cpp:2743 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "Zobrazí alebo skryje vodidlá (vodidlo vytvoríte ťahaním z pravítka)" -#: ../src/verbs.cpp:2827 #: ../src/verbs.cpp:2744 msgid "Enable snapping" msgstr "Zapnúť prichytávanie" -#: ../src/verbs.cpp:2828 #: ../src/verbs.cpp:2745 +#, fuzzy msgid "_Commands Bar" -msgstr "_Panel príkazov" +msgstr "Panel príkazov" -#: ../src/verbs.cpp:2828 #: ../src/verbs.cpp:2745 msgid "Show or hide the Commands bar (under the menu)" msgstr "Zobrazí alebo skryje Panel príkazov (pod ponukou)" -#: ../src/verbs.cpp:2829 #: ../src/verbs.cpp:2746 +#, fuzzy msgid "Sn_ap Controls Bar" -msgstr "P_anel Ovládacích prvkov prichytávania" +msgstr "Panel Ovládacích prvkov prichytávania" -#: ../src/verbs.cpp:2829 #: ../src/verbs.cpp:2746 msgid "Show or hide the snapping controls" msgstr "Zobrazí alebo skryje ovládanie prichytávania" -#: ../src/verbs.cpp:2830 #: ../src/verbs.cpp:2747 +#, fuzzy msgid "T_ool Controls Bar" -msgstr "Panel _Ovládanie nástrojov" +msgstr "Panel Ovládanie nástrojov" -#: ../src/verbs.cpp:2830 #: ../src/verbs.cpp:2747 msgid "Show or hide the Tool Controls bar" msgstr "Zobrazí alebo skryje panel pre ovládanie nástrojov" -#: ../src/verbs.cpp:2831 #: ../src/verbs.cpp:2748 msgid "_Toolbox" msgstr "_Panel nástrojov" -#: ../src/verbs.cpp:2831 #: ../src/verbs.cpp:2748 msgid "Show or hide the main toolbox (on the left)" msgstr "Zobrazí alebo skryje hlavný panel nástrojov (vľavo)" -#: ../src/verbs.cpp:2832 #: ../src/verbs.cpp:2749 msgid "_Palette" msgstr "_Paleta" -#: ../src/verbs.cpp:2832 #: ../src/verbs.cpp:2749 msgid "Show or hide the color palette" msgstr "Zobrazí alebo skryje paletu farieb" -#: ../src/verbs.cpp:2833 #: ../src/verbs.cpp:2750 msgid "_Statusbar" msgstr "_Stavový riadok" -#: ../src/verbs.cpp:2833 #: ../src/verbs.cpp:2750 msgid "Show or hide the statusbar (at the bottom of the window)" msgstr "Zobrazí alebo skryje stavový panel (naspodku okna)" -#: ../src/verbs.cpp:2834 #: ../src/verbs.cpp:2751 msgid "Nex_t Zoom" msgstr "Nasledujúca ve_ľkosť" -#: ../src/verbs.cpp:2834 #: ../src/verbs.cpp:2751 msgid "Next zoom (from the history of zooms)" msgstr "" "Nasledujúca veľkosť mierky zobrazenia (podľa histórie zmien mierky " "zobrazenia)" -#: ../src/verbs.cpp:2836 #: ../src/verbs.cpp:2753 msgid "Pre_vious Zoom" msgstr "Predchádzajúca veľkosť" -#: ../src/verbs.cpp:2836 #: ../src/verbs.cpp:2753 msgid "Previous zoom (from the history of zooms)" msgstr "" "Predchádzajúca veľkosť mierky zobrazenia (podľa histórie zmien mierky " "zobrazenia)" -#: ../src/verbs.cpp:2838 #: ../src/verbs.cpp:2755 msgid "Zoom 1:_1" msgstr "Mierka 1:_1" -#: ../src/verbs.cpp:2838 #: ../src/verbs.cpp:2755 msgid "Zoom to 1:1" msgstr "Mierka 1:1" -#: ../src/verbs.cpp:2840 #: ../src/verbs.cpp:2757 msgid "Zoom 1:_2" msgstr "Mierka 1:_2" -#: ../src/verbs.cpp:2840 #: ../src/verbs.cpp:2757 msgid "Zoom to 1:2" msgstr "Mierka 1:2" -#: ../src/verbs.cpp:2842 #: ../src/verbs.cpp:2759 msgid "_Zoom 2:1" msgstr "_Mierka 2:1" -#: ../src/verbs.cpp:2842 #: ../src/verbs.cpp:2759 msgid "Zoom to 2:1" msgstr "Mierka 2:1" -#: ../src/verbs.cpp:2845 #: ../src/verbs.cpp:2762 msgid "_Fullscreen" msgstr "Na _celú obrazovku" -#: ../src/verbs.cpp:2845 ../src/verbs.cpp:2847 -#: ../src/verbs.cpp:2762 -#: ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2762 ../src/verbs.cpp:2764 msgid "Stretch this document window to full screen" msgstr "Roztiahne okno tohoto dokumentu na celú obrazovku" -#: ../src/verbs.cpp:2847 #: ../src/verbs.cpp:2764 +#, fuzzy msgid "Fullscreen & Focus Mode" -msgstr "Režim celej obrazovky a zamerania" +msgstr "Prepnúť režim _zamerania" -#: ../src/verbs.cpp:2850 #: ../src/verbs.cpp:2767 msgid "Toggle _Focus Mode" msgstr "Prepnúť režim _zamerania" -#: ../src/verbs.cpp:2850 #: ../src/verbs.cpp:2767 msgid "Remove excess toolbars to focus on drawing" -msgstr "Odstrániť nadbytočné panely nástroje aby sa dalo sústrediť na kreslenie" +msgstr "" +"Odstrániť nadbytočné panely nástroje aby sa dalo sústrediť na kreslenie" -#: ../src/verbs.cpp:2852 #: ../src/verbs.cpp:2769 msgid "Duplic_ate Window" msgstr "Duplikov_ať okno" -#: ../src/verbs.cpp:2852 #: ../src/verbs.cpp:2769 msgid "Open a new window with the same document" msgstr "Otvorí nové okno s rovnakým dokumentom" -#: ../src/verbs.cpp:2854 #: ../src/verbs.cpp:2771 msgid "_New View Preview" msgstr "_Nové zobrazenie náhľadu" -#: ../src/verbs.cpp:2855 #: ../src/verbs.cpp:2772 msgid "New View Preview" msgstr "Nové zobrazenie náhľadu" #. "view_new_preview" -#: ../src/verbs.cpp:2857 ../src/verbs.cpp:2865 -#: ../src/verbs.cpp:2774 -#: ../src/verbs.cpp:2782 +#: ../src/verbs.cpp:2774 ../src/verbs.cpp:2782 msgid "_Normal" msgstr "_Normálne" -#: ../src/verbs.cpp:2858 #: ../src/verbs.cpp:2775 msgid "Switch to normal display mode" msgstr "Prepne do normálneho zobrazovacieho režimu" -#: ../src/verbs.cpp:2859 #: ../src/verbs.cpp:2776 msgid "No _Filters" msgstr "Žiadne _filtre" -#: ../src/verbs.cpp:2860 #: ../src/verbs.cpp:2777 msgid "Switch to normal display without filters" msgstr "Prepne do normálneho zobrazovacieho režimu bez filtrov" -#: ../src/verbs.cpp:2861 #: ../src/verbs.cpp:2778 msgid "_Outline" msgstr "_Obrys" -#: ../src/verbs.cpp:2862 #: ../src/verbs.cpp:2779 msgid "Switch to outline (wireframe) display mode" msgstr "Prepne do režimu zobrazovania obrysov (drôtený model)" #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), #. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2863 ../src/verbs.cpp:2871 -#: ../src/verbs.cpp:2780 -#: ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2780 ../src/verbs.cpp:2788 msgid "_Toggle" msgstr "_Prepnutie" -#: ../src/verbs.cpp:2864 #: ../src/verbs.cpp:2781 msgid "Toggle between normal and outline display modes" msgstr "Prepína medzi normálnym režimom a zobrazením obrysov" -#: ../src/verbs.cpp:2866 #: ../src/verbs.cpp:2783 +#, fuzzy msgid "Switch to normal color display mode" -msgstr "Prepne do normálneho zobrazovacieho režimu farieb" +msgstr "Prepne do normálneho zobrazovacieho režimu" -#: ../src/verbs.cpp:2867 #: ../src/verbs.cpp:2784 msgid "_Grayscale" msgstr "_Odtiene šedej" -#: ../src/verbs.cpp:2868 #: ../src/verbs.cpp:2785 msgid "Switch to grayscale display mode" msgstr "Prepne do zobrazovacieho režimu odtieňov šedej" -#: ../src/verbs.cpp:2872 #: ../src/verbs.cpp:2789 msgid "Toggle between normal and grayscale color display modes" msgstr "Prepína medzi normálnym režimom a zobrazením v odtieňoch šedej" -#: ../src/verbs.cpp:2874 #: ../src/verbs.cpp:2791 msgid "Color-managed view" msgstr "Zobrazenie so správou farieb" -#: ../src/verbs.cpp:2875 #: ../src/verbs.cpp:2792 msgid "Toggle color-managed display for this document window" msgstr "Prepne zobrazenie so správou farieb tohto okna dokumentu" -#: ../src/verbs.cpp:2877 #: ../src/verbs.cpp:2794 msgid "Ico_n Preview..." msgstr "Náhľad iko_ny..." -#: ../src/verbs.cpp:2878 #: ../src/verbs.cpp:2795 msgid "Open a window to preview objects at different icon resolutions" msgstr "Otvorí okno pre náhľad objektov pri rozličných rozlíšeniach ikon" -#: ../src/verbs.cpp:2880 #: ../src/verbs.cpp:2797 msgid "Zoom to fit page in window" msgstr "Zmení veľkosť mierky zobrazenia tak, aby sa strana zmestila do okna" -#: ../src/verbs.cpp:2881 #: ../src/verbs.cpp:2798 msgid "Page _Width" msgstr "_Šírka strany" -#: ../src/verbs.cpp:2882 #: ../src/verbs.cpp:2799 msgid "Zoom to fit page width in window" msgstr "Zmení veľkosť mierky zobrazenia podľa šírky strany" -#: ../src/verbs.cpp:2884 #: ../src/verbs.cpp:2801 msgid "Zoom to fit drawing in window" msgstr "Zmení veľkosť mierky zobrazenia tak, aby sa kresba zmestila do okna" -#: ../src/verbs.cpp:2886 #: ../src/verbs.cpp:2803 msgid "Zoom to fit selection in window" msgstr "Zmení veľkosť mierky zobrazenia tak, aby sa výber zmestil do okna" #. Dialogs -#: ../src/verbs.cpp:2889 #: ../src/verbs.cpp:2806 +#, fuzzy msgid "P_references..." -msgstr "_Nastavenia" +msgstr "Nastavenia" -#: ../src/verbs.cpp:2890 #: ../src/verbs.cpp:2807 msgid "Edit global Inkscape preferences" msgstr "Upravovať globálne nastavenia Inkscape" -#: ../src/verbs.cpp:2891 #: ../src/verbs.cpp:2808 msgid "_Document Properties..." msgstr "_Vlastnosti dokumentu..." -#: ../src/verbs.cpp:2892 #: ../src/verbs.cpp:2809 msgid "Edit properties of this document (to be saved with the document)" msgstr "Upravovať vlastnosti dokumentu (uložia sa s dokumentom)" -#: ../src/verbs.cpp:2893 #: ../src/verbs.cpp:2810 msgid "Document _Metadata..." msgstr "_Metadáta dokumentu..." -#: ../src/verbs.cpp:2894 #: ../src/verbs.cpp:2811 msgid "Edit document metadata (to be saved with the document)" msgstr "Upravovať metadáta dokumentu (uložia sa s dokumentom)" -#: ../src/verbs.cpp:2896 #: ../src/verbs.cpp:2813 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " @@ -29586,144 +24979,119 @@ msgstr "" "vlastnosti výplne a ťahu objektov..." #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2898 #: ../src/verbs.cpp:2815 +#, fuzzy msgid "Gl_yphs..." -msgstr "Grafém_y..." +msgstr "Grafémy..." -#: ../src/verbs.cpp:2899 #: ../src/verbs.cpp:2816 msgid "Select characters from a glyphs palette" msgstr "Vybrať znaky zo vzorkovníka grafém" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2902 #: ../src/verbs.cpp:2819 msgid "S_watches..." msgstr "Vzorkovník..." -#: ../src/verbs.cpp:2903 #: ../src/verbs.cpp:2820 msgid "Select colors from a swatches palette" msgstr "Nastaviť farby zo vzorkovníka" -#: ../src/verbs.cpp:2904 #: ../src/verbs.cpp:2821 msgid "S_ymbols..." -msgstr "S_ymboly..." +msgstr "" -#: ../src/verbs.cpp:2905 #: ../src/verbs.cpp:2822 +#, fuzzy msgid "Select symbol from a symbols palette" -msgstr "Vybrať symbol z palety symbolov" +msgstr "Nastaviť farby zo vzorkovníka" -#: ../src/verbs.cpp:2906 #: ../src/verbs.cpp:2823 msgid "Transfor_m..." msgstr "Transfor_mácia..." -#: ../src/verbs.cpp:2907 #: ../src/verbs.cpp:2824 msgid "Precisely control objects' transformations" msgstr "Vykonať precízne transformácie objektov" -#: ../src/verbs.cpp:2908 #: ../src/verbs.cpp:2825 msgid "_Align and Distribute..." msgstr "Z_arovnanie a umiestnenie..." -#: ../src/verbs.cpp:2909 #: ../src/verbs.cpp:2826 msgid "Align and distribute objects" msgstr "Zarovná a rozmiestni objekty" -#: ../src/verbs.cpp:2910 #: ../src/verbs.cpp:2827 msgid "_Spray options..." msgstr "Možnosti _spreja..." -#: ../src/verbs.cpp:2911 #: ../src/verbs.cpp:2828 msgid "Some options for the spray" msgstr "Zobraziť možnosti Spreja" -#: ../src/verbs.cpp:2912 #: ../src/verbs.cpp:2829 msgid "Undo _History..." msgstr "_História vrátení..." -#: ../src/verbs.cpp:2913 #: ../src/verbs.cpp:2830 msgid "Undo History" msgstr "História vrátení" -#: ../src/verbs.cpp:2915 #: ../src/verbs.cpp:2832 msgid "View and select font family, font size and other text properties" msgstr "Zobraziť a vybrať rodinu písma, veľkosť písma a iné vlastnosti textu" -#: ../src/verbs.cpp:2916 #: ../src/verbs.cpp:2833 msgid "_XML Editor..." msgstr "_XML editor..." -#: ../src/verbs.cpp:2917 #: ../src/verbs.cpp:2834 msgid "View and edit the XML tree of the document" msgstr "Zobraziť a upravovať XML strom dokumentu" -#: ../src/verbs.cpp:2918 #: ../src/verbs.cpp:2835 +#, fuzzy msgid "_Find/Replace..." -msgstr "Nájsť a nahr_radiť..." +msgstr "Nájsť a nahr_radiť text..." -#: ../src/verbs.cpp:2919 #: ../src/verbs.cpp:2836 msgid "Find objects in document" msgstr "Vyhľadá objekty v dokumente" -#: ../src/verbs.cpp:2920 #: ../src/verbs.cpp:2837 msgid "Find and _Replace Text..." msgstr "Nájsť a nahr_radiť text..." -#: ../src/verbs.cpp:2921 #: ../src/verbs.cpp:2838 msgid "Find and replace text in document" msgstr "Vyhľadá a nahradí text v dokumente" -#: ../src/verbs.cpp:2923 #: ../src/verbs.cpp:2840 msgid "Check spelling of text in document" msgstr "Skontrolovať pravopis textu v dokumente" -#: ../src/verbs.cpp:2924 #: ../src/verbs.cpp:2841 msgid "_Messages..." msgstr "Sprá_vy..." -#: ../src/verbs.cpp:2925 #: ../src/verbs.cpp:2842 msgid "View debug messages" msgstr "Zobrazí ladiace informácie" -#: ../src/verbs.cpp:2926 #: ../src/verbs.cpp:2843 msgid "Show/Hide D_ialogs" msgstr "Zobraziť/skryť d_ialógy" -#: ../src/verbs.cpp:2927 #: ../src/verbs.cpp:2844 msgid "Show or hide all open dialogs" msgstr "Zobrazí alebo skryje všetky aktívne dialógy" -#: ../src/verbs.cpp:2928 #: ../src/verbs.cpp:2845 msgid "Create Tiled Clones..." msgstr "Vytvoriť dlaždicové klony..." -#: ../src/verbs.cpp:2929 #: ../src/verbs.cpp:2846 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " @@ -29732,146 +25100,111 @@ msgstr "" "Vytvoriť viaceré klony vybraného objektu a zoradiť ich do vzoru alebo " "rozptýliť" -#: ../src/verbs.cpp:2930 #: ../src/verbs.cpp:2847 +#, fuzzy msgid "_Object attributes..." -msgstr "Atribúty _objektu..." +msgstr "Vlastnosti objektu..." -#: ../src/verbs.cpp:2931 #: ../src/verbs.cpp:2848 +#, fuzzy msgid "Edit the object attributes..." -msgstr "Upraviť atribúty objektu..." +msgstr "Nastaviť atribút" -#: ../src/verbs.cpp:2933 #: ../src/verbs.cpp:2850 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "Upravovať ID, stav zamknutý alebo viditeľný a iné vlastnosti objektu" -#: ../src/verbs.cpp:2934 #: ../src/verbs.cpp:2851 msgid "_Input Devices..." msgstr "Vstupné _zariadenia..." -#: ../src/verbs.cpp:2935 #: ../src/verbs.cpp:2852 msgid "Configure extended input devices, such as a graphics tablet" msgstr "Konfigurovať rozšírené vstupné zariadenia ako grafický tablet" -#: ../src/verbs.cpp:2936 #: ../src/verbs.cpp:2853 msgid "_Extensions..." msgstr "_Rozšírenia..." -#: ../src/verbs.cpp:2937 #: ../src/verbs.cpp:2854 msgid "Query information about extensions" msgstr "Získať informácie o rozšíreniach" -#: ../src/verbs.cpp:2938 #: ../src/verbs.cpp:2855 msgid "Layer_s..." msgstr "Vr_stvy..." -#: ../src/verbs.cpp:2939 #: ../src/verbs.cpp:2856 msgid "View Layers" msgstr "Zobrazí vrstvy" -#: ../src/verbs.cpp:2940 -msgid "Object_s..." -msgstr "" - -#: ../src/verbs.cpp:2941 -msgid "View Objects" -msgstr "" - -#: ../src/verbs.cpp:2942 -msgid "Selection se_ts..." -msgstr "" - -#: ../src/verbs.cpp:2943 -msgid "View Tags" -msgstr "" - -#: ../src/verbs.cpp:2944 #: ../src/verbs.cpp:2857 +#, fuzzy msgid "Path E_ffects ..." -msgstr "E_fekty ciest..." +msgstr "Editor efektov ciest..." -#: ../src/verbs.cpp:2945 #: ../src/verbs.cpp:2858 msgid "Manage, edit, and apply path effects" msgstr "Spravovať, tvoriť a používať efekty cesty" -#: ../src/verbs.cpp:2946 #: ../src/verbs.cpp:2859 +#, fuzzy msgid "Filter _Editor..." -msgstr "_Editor filtrov..." +msgstr "Editor filtrov..." -#: ../src/verbs.cpp:2947 #: ../src/verbs.cpp:2860 msgid "Manage, edit, and apply SVG filters" msgstr "Spravovať, tvoriť a používať efekty SVG" -#: ../src/verbs.cpp:2948 #: ../src/verbs.cpp:2861 msgid "SVG Font Editor..." msgstr "Editor SVG písiem..." -#: ../src/verbs.cpp:2949 #: ../src/verbs.cpp:2862 msgid "Edit SVG fonts" msgstr "Spravovať SVG písma" -#: ../src/verbs.cpp:2950 #: ../src/verbs.cpp:2863 msgid "Print Colors..." msgstr "Farby v tlači..." -#: ../src/verbs.cpp:2951 #: ../src/verbs.cpp:2864 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" "Vyberte, ktoré farebné oddelenia vykresľovať v režime Náhľad farieb v tlači" -#: ../src/verbs.cpp:2952 #: ../src/verbs.cpp:2865 +#, fuzzy msgid "_Export PNG Image..." -msgstr "_Exportovať obrázok PNG..." +msgstr "Extrahovať obrázok" -#: ../src/verbs.cpp:2953 #: ../src/verbs.cpp:2866 +#, fuzzy msgid "Export this document or a selection as a PNG image" -msgstr "Exportuje tento dokument alebo výber ako obrázok PNG" +msgstr "Exportuje dokument alebo výber ako bitmapový obrázok" #. Help -#: ../src/verbs.cpp:2955 #: ../src/verbs.cpp:2868 msgid "About E_xtensions" msgstr "O _rozšíreniach" -#: ../src/verbs.cpp:2956 #: ../src/verbs.cpp:2869 msgid "Information on Inkscape extensions" msgstr "Informácie o rozšíreniach Inkscape" -#: ../src/verbs.cpp:2957 #: ../src/verbs.cpp:2870 msgid "About _Memory" msgstr "O _pamäti" -#: ../src/verbs.cpp:2958 #: ../src/verbs.cpp:2871 msgid "Memory usage information" msgstr "Informácie o využití pamäte" -#: ../src/verbs.cpp:2959 #: ../src/verbs.cpp:2872 msgid "_About Inkscape" msgstr "_O Inkscape" -#: ../src/verbs.cpp:2960 #: ../src/verbs.cpp:2873 msgid "Inkscape version, authors, license" msgstr "Verzia, autori, licencia Inkscape" @@ -29879,394 +25212,328 @@ msgstr "Verzia, autori, licencia Inkscape" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2965 #: ../src/verbs.cpp:2878 msgid "Inkscape: _Basic" msgstr "Inkscape: _Základy" -#: ../src/verbs.cpp:2966 #: ../src/verbs.cpp:2879 msgid "Getting started with Inkscape" msgstr "Úvod do Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2967 #: ../src/verbs.cpp:2880 msgid "Inkscape: _Shapes" msgstr "Inkscape: _Tvary" -#: ../src/verbs.cpp:2968 #: ../src/verbs.cpp:2881 msgid "Using shape tools to create and edit shapes" msgstr "Používanie nástrojov na tvorbu a úpravu tvarov" -#: ../src/verbs.cpp:2969 #: ../src/verbs.cpp:2882 msgid "Inkscape: _Advanced" msgstr "Inkscape: _Pokročilé" -#: ../src/verbs.cpp:2970 #: ../src/verbs.cpp:2883 msgid "Advanced Inkscape topics" msgstr "Pokročilé témy Inkscape" #. "tutorial_advanced" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2972 #: ../src/verbs.cpp:2885 msgid "Inkscape: T_racing" msgstr "Inkscape: _Vektorizácia" -#: ../src/verbs.cpp:2973 #: ../src/verbs.cpp:2886 msgid "Using bitmap tracing" msgstr "Používanie vektorizácie bitmáp" #. "tutorial_tracing" -#: ../src/verbs.cpp:2974 #: ../src/verbs.cpp:2887 +#, fuzzy msgid "Inkscape: Tracing Pixel Art" -msgstr "Inkscape: _Vektorizácia spritov" +msgstr "Inkscape: _Vektorizácia" -#: ../src/verbs.cpp:2975 #: ../src/verbs.cpp:2888 msgid "Using Trace Pixel Art dialog" -msgstr "Používanie dialógu vektorizácie spritov" +msgstr "" -#: ../src/verbs.cpp:2976 #: ../src/verbs.cpp:2889 msgid "Inkscape: _Calligraphy" msgstr "Inkscape: _Kaligrafia" -#: ../src/verbs.cpp:2977 #: ../src/verbs.cpp:2890 msgid "Using the Calligraphy pen tool" msgstr "Používanie kaligrafického pera" -#: ../src/verbs.cpp:2978 #: ../src/verbs.cpp:2891 msgid "Inkscape: _Interpolate" msgstr "Inkscape: _Interpolácia" -#: ../src/verbs.cpp:2979 #: ../src/verbs.cpp:2892 msgid "Using the interpolate extension" msgstr "Používa sa rozšírenie Interpolácia" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2980 #: ../src/verbs.cpp:2893 msgid "_Elements of Design" msgstr "_Prvky návrhu" -#: ../src/verbs.cpp:2981 #: ../src/verbs.cpp:2894 msgid "Principles of design in the tutorial form" msgstr "Princípy návrhu vo forme návodu" #. "tutorial_design" -#: ../src/verbs.cpp:2982 #: ../src/verbs.cpp:2895 msgid "_Tips and Tricks" msgstr "_Tipy a triky" -#: ../src/verbs.cpp:2983 #: ../src/verbs.cpp:2896 msgid "Miscellaneous tips and tricks" msgstr "Rôzne tipy a triky" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2986 #: ../src/verbs.cpp:2899 +#, fuzzy msgid "Previous Exte_nsion" -msgstr "Predošlé rozšíre_nie" +msgstr "Predošlé rozšírenie" -#: ../src/verbs.cpp:2987 #: ../src/verbs.cpp:2900 msgid "Repeat the last extension with the same settings" msgstr "Zopakovať posledný efekt rozšírenia s rovnakými nastaveniami" -#: ../src/verbs.cpp:2988 #: ../src/verbs.cpp:2901 +#, fuzzy msgid "_Previous Extension Settings..." -msgstr "Nastavenia _predošlého rozšírenia..." +msgstr "Nastavenia predošlého rozšírenia..." -#: ../src/verbs.cpp:2989 #: ../src/verbs.cpp:2902 msgid "Repeat the last extension with new settings" msgstr "Zopakovať posledný efekt rozšírenia s novými nastaveniami" -#: ../src/verbs.cpp:2993 #: ../src/verbs.cpp:2906 msgid "Fit the page to the current selection" msgstr "Veľkosť strany podľa aktuálneho výberu" -#: ../src/verbs.cpp:2995 #: ../src/verbs.cpp:2908 msgid "Fit the page to the drawing" msgstr "Veľkosť strany podľa kresby" -#: ../src/verbs.cpp:2997 #: ../src/verbs.cpp:2910 msgid "" "Fit the page to the current selection or the drawing if there is no selection" -msgstr "Prispôsobiť stránku súčasnému výberu alebo kresbe ak nie je nič vybrané" +msgstr "" +"Prispôsobiť stránku súčasnému výberu alebo kresbe ak nie je nič vybrané" #. LockAndHide -#: ../src/verbs.cpp:2999 #: ../src/verbs.cpp:2912 msgid "Unlock All" msgstr "Odomknúť všetko" -#: ../src/verbs.cpp:3001 #: ../src/verbs.cpp:2914 msgid "Unlock All in All Layers" msgstr "Odomknúť všetko vo všetkých v_rstvách" -#: ../src/verbs.cpp:3003 #: ../src/verbs.cpp:2916 msgid "Unhide All" msgstr "Odkryť všetko" -#: ../src/verbs.cpp:3005 #: ../src/verbs.cpp:2918 msgid "Unhide All in All Layers" msgstr "Odkryť všetko vo všetkých vrstvách" -#: ../src/verbs.cpp:3009 #: ../src/verbs.cpp:2922 msgid "Link an ICC color profile" msgstr "Pripojiť farebný profil ICC" -#: ../src/verbs.cpp:3010 #: ../src/verbs.cpp:2923 msgid "Remove Color Profile" msgstr "Odstrániť farebný profil" -#: ../src/verbs.cpp:3011 #: ../src/verbs.cpp:2924 msgid "Remove a linked ICC color profile" msgstr "Odstrániť farebný profil ICC" -#: ../src/verbs.cpp:3014 #: ../src/verbs.cpp:2927 +#, fuzzy msgid "Add External Script" -msgstr "Pridať externý skript" +msgstr "Pridať externý skript..." -#: ../src/verbs.cpp:3014 #: ../src/verbs.cpp:2927 +#, fuzzy msgid "Add an external script" -msgstr "Pridať externý skript" +msgstr "Pridať externý skript..." -#: ../src/verbs.cpp:3016 #: ../src/verbs.cpp:2929 +#, fuzzy msgid "Add Embedded Script" -msgstr "Pridať vnorený skript" +msgstr "Pridať externý skript..." -#: ../src/verbs.cpp:3016 #: ../src/verbs.cpp:2929 +#, fuzzy msgid "Add an embedded script" -msgstr "Pridať vnorený skript" +msgstr "Pridať externý skript..." -#: ../src/verbs.cpp:3018 #: ../src/verbs.cpp:2931 +#, fuzzy msgid "Edit Embedded Script" -msgstr "Upraviť vnorený skript" +msgstr "Odstrániť skript" -#: ../src/verbs.cpp:3018 #: ../src/verbs.cpp:2931 +#, fuzzy msgid "Edit an embedded script" -msgstr "Upraviť vnorený skript" +msgstr "Odstrániť skript" -#: ../src/verbs.cpp:3020 #: ../src/verbs.cpp:2933 +#, fuzzy msgid "Remove External Script" msgstr "Odstrániť externý skript" -#: ../src/verbs.cpp:3020 #: ../src/verbs.cpp:2933 +#, fuzzy msgid "Remove an external script" msgstr "Odstrániť externý skript" -#: ../src/verbs.cpp:3022 #: ../src/verbs.cpp:2935 +#, fuzzy msgid "Remove Embedded Script" -msgstr "Odstrániť vnorený skript" +msgstr "Odstrániť skript" -#: ../src/verbs.cpp:3022 #: ../src/verbs.cpp:2935 +#, fuzzy msgid "Remove an embedded script" -msgstr "Odstrániť vnorený skript" +msgstr "Odstrániť skript" -#: ../src/verbs.cpp:3044 ../src/verbs.cpp:3045 -#: ../src/verbs.cpp:2957 -#: ../src/verbs.cpp:2958 +#: ../src/verbs.cpp:2957 ../src/verbs.cpp:2958 +#, fuzzy msgid "Center on horizontal and vertical axis" -msgstr "Centrovať na vodorovnej a zvislej osi" +msgstr "Centrovať na vodorovnej osi" -#: ../src/widgets/arc-toolbar.cpp:132 #: ../src/widgets/arc-toolbar.cpp:131 msgid "Arc: Change start/end" msgstr "Oblúk: Zmeniť začiatok/koniec" -#: ../src/widgets/arc-toolbar.cpp:198 #: ../src/widgets/arc-toolbar.cpp:197 msgid "Arc: Change open/closed" msgstr "Oblúk: Zmeniť otvorený/zatvorený" -#: ../src/widgets/arc-toolbar.cpp:289 ../src/widgets/arc-toolbar.cpp:319 -#: ../src/widgets/rect-toolbar.cpp:261 ../src/widgets/rect-toolbar.cpp:300 +#: ../src/widgets/arc-toolbar.cpp:288 ../src/widgets/arc-toolbar.cpp:317 +#: ../src/widgets/rect-toolbar.cpp:258 ../src/widgets/rect-toolbar.cpp:296 #: ../src/widgets/spiral-toolbar.cpp:214 ../src/widgets/spiral-toolbar.cpp:238 -#: ../src/widgets/star-toolbar.cpp:384 ../src/widgets/star-toolbar.cpp:446 -#: ../src/widgets/arc-toolbar.cpp:288 -#: ../src/widgets/arc-toolbar.cpp:317 -#: ../src/widgets/rect-toolbar.cpp:259 -#: ../src/widgets/rect-toolbar.cpp:297 -#: ../src/widgets/star-toolbar.cpp:383 -#: ../src/widgets/star-toolbar.cpp:444 +#: ../src/widgets/star-toolbar.cpp:383 ../src/widgets/star-toolbar.cpp:444 msgid "New:" msgstr "Nový:" #. FIXME: implement averaging of all parameters for multiple selected #. gtk_label_set_markup(GTK_LABEL(l), _("Average:")); -#: ../src/widgets/arc-toolbar.cpp:292 ../src/widgets/arc-toolbar.cpp:303 -#: ../src/widgets/rect-toolbar.cpp:269 ../src/widgets/rect-toolbar.cpp:287 +#: ../src/widgets/arc-toolbar.cpp:291 ../src/widgets/arc-toolbar.cpp:302 +#: ../src/widgets/rect-toolbar.cpp:266 ../src/widgets/rect-toolbar.cpp:284 #: ../src/widgets/spiral-toolbar.cpp:216 ../src/widgets/spiral-toolbar.cpp:227 -#: ../src/widgets/star-toolbar.cpp:386 -#: ../src/widgets/arc-toolbar.cpp:291 -#: ../src/widgets/arc-toolbar.cpp:302 -#: ../src/widgets/rect-toolbar.cpp:267 -#: ../src/widgets/rect-toolbar.cpp:285 #: ../src/widgets/star-toolbar.cpp:385 msgid "Change:" msgstr "Zmeniť:" -#: ../src/widgets/arc-toolbar.cpp:328 #: ../src/widgets/arc-toolbar.cpp:326 msgid "Start:" msgstr "Začiatok:" -#: ../src/widgets/arc-toolbar.cpp:329 #: ../src/widgets/arc-toolbar.cpp:327 msgid "The angle (in degrees) from the horizontal to the arc's start point" msgstr "Uhol (v stupňoch) z vodorovného počiatočného bodu oblúka" -#: ../src/widgets/arc-toolbar.cpp:341 #: ../src/widgets/arc-toolbar.cpp:339 msgid "End:" msgstr "Koniec:" -#: ../src/widgets/arc-toolbar.cpp:342 #: ../src/widgets/arc-toolbar.cpp:340 msgid "The angle (in degrees) from the horizontal to the arc's end point" msgstr "Uhol (v stupňoch) z vodorovného koncového bodu oblúka" -#: ../src/widgets/arc-toolbar.cpp:358 #: ../src/widgets/arc-toolbar.cpp:356 msgid "Closed arc" msgstr "Zatvorený oblúk" -#: ../src/widgets/arc-toolbar.cpp:359 #: ../src/widgets/arc-toolbar.cpp:357 msgid "Switch to segment (closed shape with two radii)" msgstr "Prepnúť na segment (uzavretý tvar s dvoma polomermi)" -#: ../src/widgets/arc-toolbar.cpp:365 #: ../src/widgets/arc-toolbar.cpp:363 msgid "Open Arc" msgstr "Otvorený oblúk" -#: ../src/widgets/arc-toolbar.cpp:366 #: ../src/widgets/arc-toolbar.cpp:364 msgid "Switch to arc (unclosed shape)" msgstr "Prepnúť na oblúk (nezatvorený tvar)" -#: ../src/widgets/arc-toolbar.cpp:389 #: ../src/widgets/arc-toolbar.cpp:387 msgid "Make whole" msgstr "Vytvoriť celok" -#: ../src/widgets/arc-toolbar.cpp:390 #: ../src/widgets/arc-toolbar.cpp:388 msgid "Make the shape a whole ellipse, not arc or segment" msgstr "Vytvoriť tvar celej elipsy, nie oblúk alebo segment" #. TODO: use the correct axis here, too -#: ../src/widgets/box3d-toolbar.cpp:233 #: ../src/widgets/box3d-toolbar.cpp:232 msgid "3D Box: Change perspective (angle of infinite axis)" msgstr "Kváder: Zmeniť perspektívu (uhol nekonečnej osi)" -#: ../src/widgets/box3d-toolbar.cpp:302 #: ../src/widgets/box3d-toolbar.cpp:299 msgid "Angle in X direction" msgstr "Uhol v smere X" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:304 #: ../src/widgets/box3d-toolbar.cpp:301 msgid "Angle of PLs in X direction" msgstr "Uhol paralel v smere X" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:326 #: ../src/widgets/box3d-toolbar.cpp:323 msgid "State of VP in X direction" msgstr "Stav spojnice v smere X" -#: ../src/widgets/box3d-toolbar.cpp:327 #: ../src/widgets/box3d-toolbar.cpp:324 msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" msgstr "" "Prepnúť spojnicu v smere X medzi „konečným“ a „nekonečným“ (=rovnobežné)" -#: ../src/widgets/box3d-toolbar.cpp:342 #: ../src/widgets/box3d-toolbar.cpp:339 msgid "Angle in Y direction" msgstr "Uhol v smere Y" -#: ../src/widgets/box3d-toolbar.cpp:342 #: ../src/widgets/box3d-toolbar.cpp:339 msgid "Angle Y:" msgstr "Uhol Y:" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:344 #: ../src/widgets/box3d-toolbar.cpp:341 msgid "Angle of PLs in Y direction" msgstr "Uhol paralel v smere Y" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:365 #: ../src/widgets/box3d-toolbar.cpp:362 msgid "State of VP in Y direction" msgstr "Stav spojnice v smere Y" -#: ../src/widgets/box3d-toolbar.cpp:366 #: ../src/widgets/box3d-toolbar.cpp:363 msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" msgstr "" "Prepnúť spojnicu v smere Y medzi „konečným“ a „nekonečným“ (=rovnobežné)" -#: ../src/widgets/box3d-toolbar.cpp:381 #: ../src/widgets/box3d-toolbar.cpp:378 msgid "Angle in Z direction" msgstr "Uhol v smere Z" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:383 #: ../src/widgets/box3d-toolbar.cpp:380 msgid "Angle of PLs in Z direction" msgstr "Uhol paralel v smere Z" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:404 #: ../src/widgets/box3d-toolbar.cpp:401 msgid "State of VP in Z direction" msgstr "Stav spojnice v smere Z" -#: ../src/widgets/box3d-toolbar.cpp:405 #: ../src/widgets/box3d-toolbar.cpp:402 msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" msgstr "" @@ -30290,13 +25557,12 @@ msgstr "(hrúbka vlasu)" #. Scale #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:275 +#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:269 #: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 #: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 #: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 #: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 #: ../src/widgets/tweak-toolbar.cpp:350 -#: ../src/widgets/pencil-toolbar.cpp:269 msgid "(default)" msgstr "(štandardné)" @@ -30405,7 +25671,8 @@ msgstr "Fixácie:" msgid "" "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " "fixed angle)" -msgstr "Správanie uhlov (0 = hrot je vždy kolmý na smer ťahu, 100 = pevný uhol)" +msgstr "" +"Správanie uhlov (0 = hrot je vždy kolmý na smer ťahu, 100 = pevný uhol)" #. Cap Rounding #: ../src/widgets/calligraphy-toolbar.cpp:494 @@ -30552,12 +25819,14 @@ msgid "Choose a preset" msgstr "Vyberte predvoľbu" #: ../src/widgets/calligraphy-toolbar.cpp:622 +#, fuzzy msgid "Add/Edit Profile" -msgstr "Pridať/upraviť profil" +msgstr "Pripojiť profil" #: ../src/widgets/calligraphy-toolbar.cpp:623 +#, fuzzy msgid "Add or edit calligraphic profile" -msgstr "Pridať alebo upraviť kaligrafický profil" +msgstr "Zmeniť kaligrafický profil" #: ../src/widgets/connector-toolbar.cpp:120 msgid "Set connector type: orthogonal" @@ -30673,58 +25942,64 @@ msgstr "" "použite Výber (šípku) na ich presun a transformáciu." #: ../src/widgets/desktop-widget.cpp:828 +#, fuzzy msgid "grayscale" -msgstr "odtiene šedej" +msgstr "Odtiene šedej" #: ../src/widgets/desktop-widget.cpp:829 +#, fuzzy msgid ", grayscale" -msgstr ", odtiene šedej" +msgstr "Odtiene šedej" #: ../src/widgets/desktop-widget.cpp:830 +#, fuzzy msgid "print colors preview" -msgstr "náhľad farieb v tlači" +msgstr "_Náhľad farieb v tlači" #: ../src/widgets/desktop-widget.cpp:831 +#, fuzzy msgid ", print colors preview" -msgstr ", náhľad farieb v tlači" +msgstr "_Náhľad farieb v tlači" #: ../src/widgets/desktop-widget.cpp:832 +#, fuzzy msgid "outline" -msgstr "obrys" +msgstr "Obrys" #: ../src/widgets/desktop-widget.cpp:833 +#, fuzzy msgid "no filters" -msgstr "žiadne filtre" +msgstr "Žiadne _filtre" #: ../src/widgets/desktop-widget.cpp:860 -#, c-format +#, fuzzy, c-format msgid "%s%s: %d (%s%s) - Inkscape" -msgstr "%s%s: %d (%s%s) - Inkscape" +msgstr "%s: %d - Inkscape" #: ../src/widgets/desktop-widget.cpp:862 ../src/widgets/desktop-widget.cpp:866 -#, c-format +#, fuzzy, c-format msgid "%s%s: %d (%s) - Inkscape" -msgstr "%s%s: %d (%s) - Inkscape" +msgstr "%s: %d - Inkscape" #: ../src/widgets/desktop-widget.cpp:868 -#, c-format +#, fuzzy, c-format msgid "%s%s: %d - Inkscape" -msgstr "%s%s: %d - Inkscape" +msgstr "%s: %d - Inkscape" #: ../src/widgets/desktop-widget.cpp:874 -#, c-format +#, fuzzy, c-format msgid "%s%s (%s%s) - Inkscape" -msgstr "%s%s (%s%s) - Inkscape" +msgstr "%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:876 ../src/widgets/desktop-widget.cpp:880 -#, c-format +#, fuzzy, c-format msgid "%s%s (%s) - Inkscape" -msgstr "%s%s (%s) - Inkscape" +msgstr "%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:882 -#, c-format +#, fuzzy, c-format msgid "%s%s - Inkscape" -msgstr "%s%s - Inkscape" +msgstr "%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:1051 msgid "Color-managed display is enabled in this window" @@ -30753,25 +26028,26 @@ msgid "Close _without saving" msgstr "Zatvoriť _bez uloženia" #: ../src/widgets/desktop-widget.cpp:1167 -#, c-format +#, fuzzy, c-format msgid "" "The file \"%s\" was saved with a " "format that may cause data loss!\n" "\n" "Do you want to save this file as Inkscape SVG?" msgstr "" -"Súbor „%s“ bol uložený vo formáte, ktorý " -"môže spôsobiť stratu dát!\n" +"Súbor „%s“ bol uložený vo formáte " +"(%s), ktorý môže spôsobiť stratu dát!\n" "\n" "Chcete uložiť tento súbor ako Inkscape SVG?" #: ../src/widgets/desktop-widget.cpp:1179 +#, fuzzy msgid "_Save as Inkscape SVG" -msgstr "_Uložiť ako Inkscape SVG" +msgstr "_Uložiť ako SVG" #: ../src/widgets/desktop-widget.cpp:1392 msgid "Note:" -msgstr "Pozn.:" +msgstr "" #: ../src/widgets/dropper-toolbar.cpp:90 msgid "Pick opacity" @@ -30823,113 +26099,99 @@ msgstr "Vystrihnúť z objektov" msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "Šírka gumy (v pomere k ploche viditeľného plátna)" -#: ../src/widgets/fill-style.cpp:360 #: ../src/widgets/fill-style.cpp:362 msgid "Change fill rule" msgstr "Zmeniť pravidlo výplne" -#: ../src/widgets/fill-style.cpp:445 ../src/widgets/fill-style.cpp:524 -#: ../src/widgets/fill-style.cpp:447 -#: ../src/widgets/fill-style.cpp:526 +#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 msgid "Set fill color" msgstr "Nastaviť farbu výplne" -#: ../src/widgets/fill-style.cpp:445 ../src/widgets/fill-style.cpp:524 -#: ../src/widgets/fill-style.cpp:447 -#: ../src/widgets/fill-style.cpp:526 +#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 msgid "Set stroke color" msgstr "Nastaviť farbu ťahu" -#: ../src/widgets/fill-style.cpp:622 #: ../src/widgets/fill-style.cpp:625 msgid "Set gradient on fill" msgstr "Lineárny prechod výplne" -#: ../src/widgets/fill-style.cpp:622 #: ../src/widgets/fill-style.cpp:625 msgid "Set gradient on stroke" msgstr "Nastaviť farebný prechod ťahu" -#: ../src/widgets/fill-style.cpp:682 #: ../src/widgets/fill-style.cpp:685 msgid "Set pattern on fill" msgstr "Nastaviť vzorku výplne" -#: ../src/widgets/fill-style.cpp:683 #: ../src/widgets/fill-style.cpp:686 msgid "Set pattern on stroke" msgstr "Nastaviť vzorku ťahu" -#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:947 -#: ../src/widgets/text-toolbar.cpp:1259 -#: ../src/widgets/font-selector.cpp:134 -#: ../src/widgets/text-toolbar.cpp:958 -#: ../src/widgets/text-toolbar.cpp:1272 +#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:956 +#: ../src/widgets/text-toolbar.cpp:1270 +#, fuzzy msgid "Font size" -msgstr "Veľkosť písma" +msgstr "Veľkosť písma:" #. Family frame -#: ../src/widgets/font-selector.cpp:134 #: ../src/widgets/font-selector.cpp:148 msgid "Font family" msgstr "Rodina písma" #. Style frame -#: ../src/widgets/font-selector.cpp:179 -#: ../src/widgets/font-selector.cpp:193 +#: ../src/widgets/font-selector.cpp:192 msgctxt "Font selector" msgid "Style" msgstr "Štýl" -#: ../src/widgets/font-selector.cpp:211 -#: ../src/widgets/font-selector.cpp:225 +#: ../src/widgets/font-selector.cpp:224 +#, fuzzy msgid "Face" -msgstr "Tvar" +msgstr "Strany" -#: ../src/widgets/font-selector.cpp:240 ../share/extensions/dots.inx.h:3 -#: ../src/widgets/font-selector.cpp:254 +#: ../src/widgets/font-selector.cpp:253 ../share/extensions/dots.inx.h:3 msgid "Font size:" -msgstr "Veľkosť písma" +msgstr "Veľkosť písma:" -#: ../src/widgets/gradient-selector.cpp:196 #: ../src/widgets/gradient-selector.cpp:214 +#, fuzzy msgid "Create a duplicate gradient" -msgstr "Vytvoriť duplicitný farebný prechod" +msgstr "Vytvorenie a úprava farebných prechodov" -#: ../src/widgets/gradient-selector.cpp:212 #: ../src/widgets/gradient-selector.cpp:230 +#, fuzzy msgid "Edit gradient" -msgstr "Upraviť farebný prechod" +msgstr "Radiálny farebný prechod" -#: ../src/widgets/gradient-selector.cpp:288 -#: ../src/widgets/paint-selector.cpp:236 #: ../src/widgets/gradient-selector.cpp:306 #: ../src/widgets/paint-selector.cpp:244 msgid "Swatch" msgstr "Vzorkovník" -#: ../src/widgets/gradient-selector.cpp:338 #: ../src/widgets/gradient-selector.cpp:356 +#, fuzzy msgid "Rename gradient" -msgstr "Premenovať farebný prechod" +msgstr "Lineárny farebný prechod" #: ../src/widgets/gradient-toolbar.cpp:156 #: ../src/widgets/gradient-toolbar.cpp:169 #: ../src/widgets/gradient-toolbar.cpp:756 #: ../src/widgets/gradient-toolbar.cpp:1094 +#, fuzzy msgid "No gradient" -msgstr "Bez farebného prechodu" +msgstr "Posunúť farebné prechody" #: ../src/widgets/gradient-toolbar.cpp:175 +#, fuzzy msgid "Multiple gradients" -msgstr "Viaceré farebné prechody" +msgstr "Posunúť farebné prechody" #: ../src/widgets/gradient-toolbar.cpp:676 +#, fuzzy msgid "Multiple stops" -msgstr "Viaceré priehradky" +msgstr "Viaceré štýly" #: ../src/widgets/gradient-toolbar.cpp:774 -#: ../src/widgets/gradient-vector.cpp:609 #: ../src/widgets/gradient-vector.cpp:629 msgid "No stops in gradient" msgstr "V prechode nie sú priehradky" @@ -30939,18 +26201,19 @@ msgid "Assign gradient to object" msgstr "Priradiť farebný prechod objektu" #: ../src/widgets/gradient-toolbar.cpp:949 +#, fuzzy msgid "Set gradient repeat" -msgstr "Nastaviť opakovanie farebného prechodu" +msgstr "Nastaviť farebný prechod ťahu" #: ../src/widgets/gradient-toolbar.cpp:987 -#: ../src/widgets/gradient-vector.cpp:720 #: ../src/widgets/gradient-vector.cpp:740 msgid "Change gradient stop offset" msgstr "Zmeniť posun priehradky farebného prechodu" #: ../src/widgets/gradient-toolbar.cpp:1034 +#, fuzzy msgid "linear" -msgstr "lineárny" +msgstr "Lineárne" #: ../src/widgets/gradient-toolbar.cpp:1034 msgid "Create linear gradient" @@ -30958,72 +26221,73 @@ msgstr "Vytvoriť lineárny farebný prechod" #: ../src/widgets/gradient-toolbar.cpp:1038 msgid "radial" -msgstr "radiálny" +msgstr "" #: ../src/widgets/gradient-toolbar.cpp:1038 msgid "Create radial (elliptic or circular) gradient" msgstr "Vytvoriť radiálny (eliptický alebo kruhový) farebný prechod" #: ../src/widgets/gradient-toolbar.cpp:1041 -#: ../src/widgets/mesh-toolbar.cpp:207 #: ../src/widgets/mesh-toolbar.cpp:211 msgid "New:" -msgstr "Nový:" +msgstr "" #: ../src/widgets/gradient-toolbar.cpp:1064 -#: ../src/widgets/mesh-toolbar.cpp:230 #: ../src/widgets/mesh-toolbar.cpp:234 +#, fuzzy msgid "fill" -msgstr "výplň" +msgstr "bez výplne" #: ../src/widgets/gradient-toolbar.cpp:1064 -#: ../src/widgets/mesh-toolbar.cpp:230 #: ../src/widgets/mesh-toolbar.cpp:234 msgid "Create gradient in the fill" msgstr "Vytvoriť farebný prechod vo výplni" #: ../src/widgets/gradient-toolbar.cpp:1068 -#: ../src/widgets/mesh-toolbar.cpp:234 #: ../src/widgets/mesh-toolbar.cpp:238 +#, fuzzy msgid "stroke" -msgstr "ťah" +msgstr "Ťah:" #: ../src/widgets/gradient-toolbar.cpp:1068 -#: ../src/widgets/mesh-toolbar.cpp:234 #: ../src/widgets/mesh-toolbar.cpp:238 msgid "Create gradient in the stroke" msgstr "Vytvoriť farebný prechod v ťahu" #: ../src/widgets/gradient-toolbar.cpp:1071 -#: ../src/widgets/mesh-toolbar.cpp:237 #: ../src/widgets/mesh-toolbar.cpp:241 +#, fuzzy msgid "on:" -msgstr "na:" +msgstr "pre" #: ../src/widgets/gradient-toolbar.cpp:1096 msgid "Select" msgstr "Vybrať" #: ../src/widgets/gradient-toolbar.cpp:1096 +#, fuzzy msgid "Choose a gradient" -msgstr "Vyberte farebný prechod" +msgstr "Vyberte predvoľbu" #: ../src/widgets/gradient-toolbar.cpp:1097 +#, fuzzy msgid "Select:" -msgstr "Vybrať:" +msgstr "Vybrať" -#: ../src/widgets/gradient-toolbar.cpp:1112 -msgctxt "Gradient repeat type" -msgid "None" -msgstr "Žiadny" +#: ../src/widgets/gradient-toolbar.cpp:1115 +#, fuzzy +msgid "Reflected" +msgstr "odrazené" #: ../src/widgets/gradient-toolbar.cpp:1118 +#, fuzzy msgid "Direct" -msgstr "Priamy" +msgstr "priame" #: ../src/widgets/gradient-toolbar.cpp:1120 +#, fuzzy msgid "Repeat" -msgstr "Opakovať" +msgstr "Opakovať:" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute #: ../src/widgets/gradient-toolbar.cpp:1122 @@ -31033,9 +26297,9 @@ msgid "" "(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " "directions (spreadMethod=\"reflect\")" msgstr "" -"Či vyplniť hladkou farbou za koncom vektorov farebných prechodov " -"(spreadMethod=\"pad\") alebo opakovať farebný prechod v rovnakom smere " -"(spreadMethod=\"repeat\") alebo opakovať prechod striedavo v opačnom smere " +"Či vyplniť hladkou farbou konce vektorov farebných prechodov (spreadMethod=" +"\"pad\"), alebo opakovať farebných prechod v tom istom smere (spreadMethod=" +"\"repeat\"), alebo opakovať prechod v alternatívnom opačnom smere " "(spreadMethod=\"reflect\")" #: ../src/widgets/gradient-toolbar.cpp:1127 @@ -31043,103 +26307,105 @@ msgid "Repeat:" msgstr "Opakovať:" #: ../src/widgets/gradient-toolbar.cpp:1141 +#, fuzzy msgid "No stops" -msgstr "Bez priehradiek" +msgstr "bez ťahu" #: ../src/widgets/gradient-toolbar.cpp:1143 +#, fuzzy msgid "Stops" -msgstr "Priehradky" +msgstr "Za_staviť" #: ../src/widgets/gradient-toolbar.cpp:1143 +#, fuzzy msgid "Select a stop for the current gradient" -msgstr "Vyberte priehradku aktuálneho farebného prechodu" +msgstr "Upraviť priehradky farebného prechodu" #: ../src/widgets/gradient-toolbar.cpp:1144 +#, fuzzy msgid "Stops:" -msgstr "Priehradky:" +msgstr "Za_staviť" #. Label #: ../src/widgets/gradient-toolbar.cpp:1156 -#: ../src/widgets/gradient-vector.cpp:906 #: ../src/widgets/gradient-vector.cpp:926 +#, fuzzy msgctxt "Gradient" msgid "Offset:" msgstr "Posun:" #: ../src/widgets/gradient-toolbar.cpp:1156 +#, fuzzy msgid "Offset of selected stop" -msgstr "Posunie zvolenej priehradky" +msgstr "Posunie zvolené cesty smerom von" #: ../src/widgets/gradient-toolbar.cpp:1174 #: ../src/widgets/gradient-toolbar.cpp:1175 +#, fuzzy msgid "Insert new stop" -msgstr "Vložiť novú priehradku" +msgstr "Vložiť uzol" #: ../src/widgets/gradient-toolbar.cpp:1188 #: ../src/widgets/gradient-toolbar.cpp:1189 -#: ../src/widgets/gradient-vector.cpp:888 #: ../src/widgets/gradient-vector.cpp:908 msgid "Delete stop" msgstr "Zmazať priehradku" +#: ../src/widgets/gradient-toolbar.cpp:1202 +#, fuzzy +msgid "Reverse" +msgstr "_Obrátiť smer" + #: ../src/widgets/gradient-toolbar.cpp:1203 +#, fuzzy msgid "Reverse the direction of the gradient" -msgstr "Obrátiť smer farebného prechodu" +msgstr "Upraviť priehradky farebného prechodu" #: ../src/widgets/gradient-toolbar.cpp:1217 +#, fuzzy msgid "Link gradients" -msgstr "Spojiť farebné prechody" +msgstr "Lineárny farebný prechod" #: ../src/widgets/gradient-toolbar.cpp:1218 msgid "Link gradients to change all related gradients" -msgstr "Spojením farebných prechodov zmeniť všetky súvisiace farebné prechody" +msgstr "" -#: ../src/widgets/gradient-vector.cpp:312 -#: ../src/widgets/paint-selector.cpp:947 -#: ../src/widgets/stroke-marker-selector.cpp:154 #: ../src/widgets/gradient-vector.cpp:332 #: ../src/widgets/paint-selector.cpp:922 +#: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "Žiadny dokument nebol zvolený" -#: ../src/widgets/gradient-vector.cpp:316 #: ../src/widgets/gradient-vector.cpp:336 msgid "No gradients in document" msgstr "V dokumente nie je prechod" -#: ../src/widgets/gradient-vector.cpp:320 #: ../src/widgets/gradient-vector.cpp:340 msgid "No gradient selected" msgstr "Žiadny prechod nebol zvolený" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:883 #: ../src/widgets/gradient-vector.cpp:903 msgid "Add stop" msgstr "Pridať priehradku" -#: ../src/widgets/gradient-vector.cpp:886 #: ../src/widgets/gradient-vector.cpp:906 msgid "Add another control stop to gradient" msgstr "Pridať ďalšiu riadiacu priehradku do prechodu" -#: ../src/widgets/gradient-vector.cpp:891 #: ../src/widgets/gradient-vector.cpp:911 msgid "Delete current control stop from gradient" msgstr "Zmazať aktuálnu priehradku z prechodu" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:959 #: ../src/widgets/gradient-vector.cpp:979 msgid "Stop Color" msgstr "Farba priehradky" -#: ../src/widgets/gradient-vector.cpp:987 #: ../src/widgets/gradient-vector.cpp:1007 msgid "Gradient editor" msgstr "Editor prechodov" -#: ../src/widgets/gradient-vector.cpp:1324 #: ../src/widgets/gradient-vector.cpp:1307 msgid "Change gradient stop color" msgstr "Zmeniť farbu priehradky farebného prechodu" @@ -31160,32 +26426,26 @@ msgstr "Otvorený koniec" msgid "Open both" msgstr "Otvoriť obe" -#: ../src/widgets/lpe-toolbar.cpp:301 #: ../src/widgets/lpe-toolbar.cpp:298 msgid "All inactive" msgstr "Všetky neaktívne" -#: ../src/widgets/lpe-toolbar.cpp:302 #: ../src/widgets/lpe-toolbar.cpp:299 msgid "No geometric tool is active" msgstr "Nie je aktívny žiadny geometrický nástroj" -#: ../src/widgets/lpe-toolbar.cpp:335 #: ../src/widgets/lpe-toolbar.cpp:332 msgid "Show limiting bounding box" msgstr "Zobraziť limitné ohraničenie" -#: ../src/widgets/lpe-toolbar.cpp:336 #: ../src/widgets/lpe-toolbar.cpp:333 msgid "Show bounding box (used to cut infinite lines)" msgstr "Zobraziť ohraničenie (používa sa na orezanie nekonečných čiar)" -#: ../src/widgets/lpe-toolbar.cpp:347 #: ../src/widgets/lpe-toolbar.cpp:344 msgid "Get limiting bounding box from selection" msgstr "Zistiť z výberu limitné ohraničenie" -#: ../src/widgets/lpe-toolbar.cpp:348 #: ../src/widgets/lpe-toolbar.cpp:345 msgid "" "Set limiting bounding box (used to cut infinite lines) to the bounding box " @@ -31194,50 +26454,41 @@ msgstr "" "Nastaviť limitné ohraničenie (používa sa na orezanie nekonečných čiar) na " "ohraničenie aktuálneho výberu" -#: ../src/widgets/lpe-toolbar.cpp:360 #: ../src/widgets/lpe-toolbar.cpp:357 msgid "Choose a line segment type" msgstr "Vyberte typ čiarového segmentu" -#: ../src/widgets/lpe-toolbar.cpp:376 #: ../src/widgets/lpe-toolbar.cpp:373 msgid "Display measuring info" msgstr "Zobraziť meracie informácie" -#: ../src/widgets/lpe-toolbar.cpp:377 #: ../src/widgets/lpe-toolbar.cpp:374 msgid "Display measuring info for selected items" msgstr "Zobraziť meracie informácie o vybraných položkách" #. Add the units menu. -#: ../src/widgets/lpe-toolbar.cpp:387 ../src/widgets/node-toolbar.cpp:613 -#: ../src/widgets/paintbucket-toolbar.cpp:168 -#: ../src/widgets/rect-toolbar.cpp:379 ../src/widgets/select-toolbar.cpp:538 -#: ../src/widgets/lpe-toolbar.cpp:384 +#: ../src/widgets/lpe-toolbar.cpp:384 ../src/widgets/node-toolbar.cpp:613 #: ../src/widgets/paintbucket-toolbar.cpp:166 -#: ../src/widgets/rect-toolbar.cpp:376 -#: ../src/widgets/select-toolbar.cpp:536 +#: ../src/widgets/rect-toolbar.cpp:375 ../src/widgets/select-toolbar.cpp:536 msgid "Units" msgstr "Jednotky" -#: ../src/widgets/lpe-toolbar.cpp:397 #: ../src/widgets/lpe-toolbar.cpp:394 msgid "Open LPE dialog" msgstr "Otvoriť dialóg Živých ciest" -#: ../src/widgets/lpe-toolbar.cpp:398 #: ../src/widgets/lpe-toolbar.cpp:395 msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "Otvoriť dialóg Živých ciest (na numerické prispôsobenie parametrov)" -#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1262 -#: ../src/widgets/text-toolbar.cpp:1275 +#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1273 msgid "Font Size" msgstr "Veľkosť písma" #: ../src/widgets/measure-toolbar.cpp:86 +#, fuzzy msgid "Font Size:" -msgstr "Veľkosť písma:" +msgstr "Veľkosť písma" #: ../src/widgets/measure-toolbar.cpp:87 msgid "The font size to be used in the measurement labels" @@ -31248,88 +26499,85 @@ msgstr "" msgid "The units to be used for the measurements" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:200 #: ../src/widgets/mesh-toolbar.cpp:204 +#, fuzzy msgid "normal" -msgstr "normálne" +msgstr "Normálne" -#: ../src/widgets/mesh-toolbar.cpp:200 #: ../src/widgets/mesh-toolbar.cpp:204 +#, fuzzy msgid "Create mesh gradient" -msgstr "Vytvoriť sieťkový farebný prechod" +msgstr "Vytvoriť lineárny farebný prechod" -#: ../src/widgets/mesh-toolbar.cpp:204 #: ../src/widgets/mesh-toolbar.cpp:208 msgid "conical" -msgstr "kužeľový" +msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:204 #: ../src/widgets/mesh-toolbar.cpp:208 +#, fuzzy msgid "Create conical gradient" -msgstr "Vytvoriť kužeľový farebný prechod" +msgstr "Vytvoriť lineárny farebný prechod" -#: ../src/widgets/mesh-toolbar.cpp:259 #: ../src/widgets/mesh-toolbar.cpp:263 msgid "Rows" -msgstr "Riadky" +msgstr "Riad" -#: ../src/widgets/mesh-toolbar.cpp:259 +#: ../src/widgets/mesh-toolbar.cpp:263 #: ../share/extensions/guides_creator.inx.h:5 #: ../share/extensions/layout_nup.inx.h:12 -#: ../src/widgets/mesh-toolbar.cpp:263 +#, fuzzy msgid "Rows:" msgstr "Riadky:" -#: ../src/widgets/mesh-toolbar.cpp:259 #: ../src/widgets/mesh-toolbar.cpp:263 +#, fuzzy msgid "Number of rows in new mesh" -msgstr "Počet riadkov v novej sieťke" +msgstr "Počet riadkov" -#: ../src/widgets/mesh-toolbar.cpp:275 #: ../src/widgets/mesh-toolbar.cpp:279 +#, fuzzy msgid "Columns" -msgstr "Stĺpce" +msgstr "Stĺpce:" -#: ../src/widgets/mesh-toolbar.cpp:275 -#: ../share/extensions/guides_creator.inx.h:4 #: ../src/widgets/mesh-toolbar.cpp:279 +#: ../share/extensions/guides_creator.inx.h:4 +#, fuzzy msgid "Columns:" msgstr "Stĺpce:" -#: ../src/widgets/mesh-toolbar.cpp:275 #: ../src/widgets/mesh-toolbar.cpp:279 +#, fuzzy msgid "Number of columns in new mesh" -msgstr "Počet stĺpcov v novej sieťke" +msgstr "Počet stĺpcov" -#: ../src/widgets/mesh-toolbar.cpp:289 #: ../src/widgets/mesh-toolbar.cpp:293 +#, fuzzy msgid "Edit Fill" -msgstr "Upraviť výplň" +msgstr "Upraviť výplň..." -#: ../src/widgets/mesh-toolbar.cpp:290 #: ../src/widgets/mesh-toolbar.cpp:294 +#, fuzzy msgid "Edit fill mesh" -msgstr "Upraviť výplň sieťky" +msgstr "Upraviť výplň..." -#: ../src/widgets/mesh-toolbar.cpp:301 #: ../src/widgets/mesh-toolbar.cpp:305 +#, fuzzy msgid "Edit Stroke" -msgstr "Upraviť ťah" +msgstr "Upraviť ťah..." -#: ../src/widgets/mesh-toolbar.cpp:302 #: ../src/widgets/mesh-toolbar.cpp:306 +#, fuzzy msgid "Edit stroke mesh" -msgstr "Upraviť ťah sieťky" +msgstr "Upraviť ťah..." -#: ../src/widgets/mesh-toolbar.cpp:313 ../src/widgets/node-toolbar.cpp:521 -#: ../src/widgets/mesh-toolbar.cpp:317 +#: ../src/widgets/mesh-toolbar.cpp:317 ../src/widgets/node-toolbar.cpp:521 msgid "Show Handles" msgstr "Zobraziť úchopy" -#: ../src/widgets/mesh-toolbar.cpp:314 #: ../src/widgets/mesh-toolbar.cpp:318 +#, fuzzy msgid "Show side and tensor handles" -msgstr "Zobraziť bočné a tenzorové úchopy" +msgstr "Zobraziť úchopy na transformáciu uzlov" #: ../src/widgets/node-toolbar.cpp:341 msgid "Insert node" @@ -31344,52 +26592,64 @@ msgid "Insert" msgstr "Vložiť" #: ../src/widgets/node-toolbar.cpp:356 +#, fuzzy msgid "Insert node at min X" -msgstr "Vložiť uzol v min. X" +msgstr "Vložiť uzol" #: ../src/widgets/node-toolbar.cpp:357 +#, fuzzy msgid "Insert new nodes at min X into selected segments" -msgstr "Vložiť nové uzly v min. X do vybraných segmentov" +msgstr "Vložiť nové uzly do vybraných segmentov" #: ../src/widgets/node-toolbar.cpp:360 +#, fuzzy msgid "Insert min X" -msgstr "Vložiť min. X" +msgstr "Vložiť uzol" #: ../src/widgets/node-toolbar.cpp:366 +#, fuzzy msgid "Insert node at max X" -msgstr "Vložiť uzol v max. X" +msgstr "Vložiť uzol" #: ../src/widgets/node-toolbar.cpp:367 +#, fuzzy msgid "Insert new nodes at max X into selected segments" -msgstr "Vložiť nové uzly v max. X do vybraných segmentov" +msgstr "Vložiť nové uzly do vybraných segmentov" #: ../src/widgets/node-toolbar.cpp:370 +#, fuzzy msgid "Insert max X" -msgstr "Vložiť max. X" +msgstr "Vložiť" #: ../src/widgets/node-toolbar.cpp:376 +#, fuzzy msgid "Insert node at min Y" -msgstr "Vložiť uzol v max. Y" +msgstr "Vložiť uzol" #: ../src/widgets/node-toolbar.cpp:377 +#, fuzzy msgid "Insert new nodes at min Y into selected segments" -msgstr "Vložiť nové uzly v min. Y do vybraných segmentov" +msgstr "Vložiť nové uzly do vybraných segmentov" #: ../src/widgets/node-toolbar.cpp:380 +#, fuzzy msgid "Insert min Y" -msgstr "Vložiť min. Y" +msgstr "Vložiť uzol" #: ../src/widgets/node-toolbar.cpp:386 +#, fuzzy msgid "Insert node at max Y" -msgstr "Vložiť uzol v max. Y" +msgstr "Vložiť uzol" #: ../src/widgets/node-toolbar.cpp:387 +#, fuzzy msgid "Insert new nodes at max Y into selected segments" -msgstr "Vložiť nové uzly v max. Y do vybraných segmentov" +msgstr "Vložiť nové uzly do vybraných segmentov" #: ../src/widgets/node-toolbar.cpp:390 +#, fuzzy msgid "Insert max Y" -msgstr "Vložiť max. Y" +msgstr "Vložiť" #: ../src/widgets/node-toolbar.cpp:398 msgid "Delete selected nodes" @@ -31523,37 +26783,27 @@ msgstr "Súradnica Y:" msgid "Y coordinate of selected node(s)" msgstr "Súradnica Y vybraných uzlov" -#: ../src/widgets/paint-selector.cpp:222 #: ../src/widgets/paint-selector.cpp:234 msgid "No paint" msgstr "Bez farby" -#: ../src/widgets/paint-selector.cpp:224 #: ../src/widgets/paint-selector.cpp:236 msgid "Flat color" msgstr "Jednoduchá farba:" -#: ../src/widgets/paint-selector.cpp:226 #: ../src/widgets/paint-selector.cpp:238 msgid "Linear gradient" msgstr "Lineárny farebný prechod" -#: ../src/widgets/paint-selector.cpp:228 #: ../src/widgets/paint-selector.cpp:240 msgid "Radial gradient" msgstr "Radiálny farebný prechod" -#: ../src/widgets/paint-selector.cpp:231 -msgid "Mesh gradient" -msgstr "" - -#: ../src/widgets/paint-selector.cpp:238 #: ../src/widgets/paint-selector.cpp:246 msgid "Unset paint (make it undefined so it can be inherited)" msgstr "Zrušiť nastavenie farby (zruší definíciu aby mohla byť zdedená)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty -#: ../src/widgets/paint-selector.cpp:255 #: ../src/widgets/paint-selector.cpp:263 msgid "" "Any path self-intersections or subpaths create holes in the fill (fill-rule: " @@ -31563,54 +26813,48 @@ msgstr "" "evenodd)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty -#: ../src/widgets/paint-selector.cpp:266 #: ../src/widgets/paint-selector.cpp:274 msgid "" "Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" msgstr "" "Výplň je pevná ak nie je podcesta v opačne orientovaná (fill-rule: nonzero)" -#: ../src/widgets/paint-selector.cpp:600 #: ../src/widgets/paint-selector.cpp:590 +#, fuzzy msgid "No objects" -msgstr "Žiadne objekty" +msgstr "Prichytávanie k objektom" -#: ../src/widgets/paint-selector.cpp:611 #: ../src/widgets/paint-selector.cpp:601 +#, fuzzy msgid "Multiple styles" -msgstr "Viaceré štýly" +msgstr "Viaceré štýly" -#: ../src/widgets/paint-selector.cpp:622 #: ../src/widgets/paint-selector.cpp:612 +#, fuzzy msgid "Paint is undefined" -msgstr "Farba je nedefinovaná" +msgstr "Farba je nedefinovaná" -#: ../src/widgets/paint-selector.cpp:633 #: ../src/widgets/paint-selector.cpp:623 +#, fuzzy msgid "No paint" -msgstr "Bez farby" +msgstr "Krytie:" -#: ../src/widgets/paint-selector.cpp:704 #: ../src/widgets/paint-selector.cpp:694 +#, fuzzy msgid "Flat color" -msgstr "Jednoduchá farba" +msgstr "Jednoduchá farba:" #. sp_gradient_selector_set_mode(SP_GRADIENT_SELECTOR(gsel), SP_GRADIENT_SELECTOR_MODE_LINEAR); -#: ../src/widgets/paint-selector.cpp:773 #: ../src/widgets/paint-selector.cpp:758 +#, fuzzy msgid "Linear gradient" -msgstr "Lineárny farebný prechod" +msgstr "Lineárny farebný prechod" -#: ../src/widgets/paint-selector.cpp:776 #: ../src/widgets/paint-selector.cpp:761 +#, fuzzy msgid "Radial gradient" -msgstr "Radiálny farebný prechod" - -#: ../src/widgets/paint-selector.cpp:781 -msgid "Mesh gradient" -msgstr "" +msgstr "Radiálny farebný prechod" -#: ../src/widgets/paint-selector.cpp:1080 #: ../src/widgets/paint-selector.cpp:1055 msgid "" "Use the Node tool to adjust position, scale, and rotation of the " @@ -31621,32 +26865,28 @@ msgstr "" "plátne. Použite Objekt > Vzorka > Objekty na vzorku na " "vytvorenie nového vzoru z výberu." -#: ../src/widgets/paint-selector.cpp:1093 #: ../src/widgets/paint-selector.cpp:1068 +#, fuzzy msgid "Pattern fill" -msgstr "Výplň vzorkou" +msgstr "Vzorka výplne" -#: ../src/widgets/paint-selector.cpp:1187 #: ../src/widgets/paint-selector.cpp:1162 +#, fuzzy msgid "Swatch fill" -msgstr "Výplň vzorkovníkom" +msgstr "Výplň vzorkovníka" -#: ../src/widgets/paintbucket-toolbar.cpp:135 #: ../src/widgets/paintbucket-toolbar.cpp:133 msgid "Fill by" msgstr "Vyplniť čím" -#: ../src/widgets/paintbucket-toolbar.cpp:136 #: ../src/widgets/paintbucket-toolbar.cpp:134 msgid "Fill by:" msgstr "Vyplniť čím:" -#: ../src/widgets/paintbucket-toolbar.cpp:148 #: ../src/widgets/paintbucket-toolbar.cpp:146 msgid "Fill Threshold" msgstr "Prah výplne" -#: ../src/widgets/paintbucket-toolbar.cpp:149 #: ../src/widgets/paintbucket-toolbar.cpp:147 msgid "" "The maximum allowed difference between the clicked pixel and the neighboring " @@ -31655,44 +26895,34 @@ msgstr "" "Maximálny povolený rozdiel medzi pixelom, na ktorý sa kliklo a susednými " "pixelmi, ktoré sa majú počítať do výplne" -#: ../src/widgets/paintbucket-toolbar.cpp:176 #: ../src/widgets/paintbucket-toolbar.cpp:174 msgid "Grow/shrink by" msgstr "Zväčšiť/zmenšiť o" -#: ../src/widgets/paintbucket-toolbar.cpp:176 #: ../src/widgets/paintbucket-toolbar.cpp:174 msgid "Grow/shrink by:" msgstr "Zväčšiť/zmenšiť o:" -#: ../src/widgets/paintbucket-toolbar.cpp:177 #: ../src/widgets/paintbucket-toolbar.cpp:175 msgid "" "The amount to grow (positive) or shrink (negative) the created fill path" msgstr "" -"O koľko zväčšiť (kladné číslo) alebo zmenšiť (záporné) vytvorenú cestu " -"výplne" +"O koľko zväčšiť (kladné číslo) alebo zmenšiť (záporné) vytvorenú cestu výplne" -#: ../src/widgets/paintbucket-toolbar.cpp:202 #: ../src/widgets/paintbucket-toolbar.cpp:200 msgid "Close gaps" msgstr "Zatvoriť medzery" -#: ../src/widgets/paintbucket-toolbar.cpp:203 #: ../src/widgets/paintbucket-toolbar.cpp:201 msgid "Close gaps:" msgstr "Blízke medzery:" -#: ../src/widgets/paintbucket-toolbar.cpp:214 -#: ../src/widgets/pencil-toolbar.cpp:299 ../src/widgets/spiral-toolbar.cpp:289 -#: ../src/widgets/star-toolbar.cpp:566 #: ../src/widgets/paintbucket-toolbar.cpp:212 -#: ../src/widgets/pencil-toolbar.cpp:293 +#: ../src/widgets/pencil-toolbar.cpp:293 ../src/widgets/spiral-toolbar.cpp:289 #: ../src/widgets/star-toolbar.cpp:564 msgid "Defaults" msgstr "Štandardné" -#: ../src/widgets/paintbucket-toolbar.cpp:215 #: ../src/widgets/paintbucket-toolbar.cpp:213 msgid "" "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " @@ -31713,97 +26943,66 @@ msgstr "Tvorba Bézierovej cesty" msgid "Create Spiro path" msgstr "Vytvorenie špirály" -#: ../src/widgets/pencil-toolbar.cpp:110 -msgid "Create BSpline path" -msgstr "" - -#: ../src/widgets/pencil-toolbar.cpp:116 #: ../src/widgets/pencil-toolbar.cpp:111 msgid "Zigzag" msgstr "Cikcak" -#: ../src/widgets/pencil-toolbar.cpp:117 #: ../src/widgets/pencil-toolbar.cpp:112 msgid "Create a sequence of straight line segments" msgstr "Vytvoriť postupnosť priamych úsečiek" -#: ../src/widgets/pencil-toolbar.cpp:123 #: ../src/widgets/pencil-toolbar.cpp:118 msgid "Paraxial" msgstr "Paraxiálna" -#: ../src/widgets/pencil-toolbar.cpp:124 #: ../src/widgets/pencil-toolbar.cpp:119 msgid "Create a sequence of paraxial line segments" msgstr "Vytvoriť postupnosť paraxiálnych úsečiek" -#: ../src/widgets/pencil-toolbar.cpp:132 #: ../src/widgets/pencil-toolbar.cpp:127 msgid "Mode of new lines drawn by this tool" msgstr "Režim nových čiar nakreslených týmto nástrojom" -#: ../src/widgets/pencil-toolbar.cpp:160 -#: ../src/widgets/pencil-toolbar.cpp:155 -msgctxt "Freehand shape" -msgid "None" -msgstr "Žiadny" - -#: ../src/widgets/pencil-toolbar.cpp:161 #: ../src/widgets/pencil-toolbar.cpp:156 msgid "Triangle in" msgstr "Trojuholník dnu" -#: ../src/widgets/pencil-toolbar.cpp:162 #: ../src/widgets/pencil-toolbar.cpp:157 msgid "Triangle out" msgstr "Trojuholník von" -#: ../src/widgets/pencil-toolbar.cpp:164 #: ../src/widgets/pencil-toolbar.cpp:159 msgid "From clipboard" msgstr "Zo schránky" -#: ../src/widgets/pencil-toolbar.cpp:165 -msgid "Last applied" -msgstr "" - -#: ../src/widgets/pencil-toolbar.cpp:190 ../src/widgets/pencil-toolbar.cpp:191 -#: ../src/widgets/pencil-toolbar.cpp:184 -#: ../src/widgets/pencil-toolbar.cpp:185 +#: ../src/widgets/pencil-toolbar.cpp:184 ../src/widgets/pencil-toolbar.cpp:185 msgid "Shape:" msgstr "Tvar:" -#: ../src/widgets/pencil-toolbar.cpp:190 #: ../src/widgets/pencil-toolbar.cpp:184 msgid "Shape of new paths drawn by this tool" msgstr "Tvar nových čiar nakreslených týmto nástrojom" -#: ../src/widgets/pencil-toolbar.cpp:275 #: ../src/widgets/pencil-toolbar.cpp:269 msgid "(many nodes, rough)" msgstr "(veľa uzlov, drsné)" -#: ../src/widgets/pencil-toolbar.cpp:275 #: ../src/widgets/pencil-toolbar.cpp:269 msgid "(few nodes, smooth)" msgstr "(málo uzlov, hladké)" -#: ../src/widgets/pencil-toolbar.cpp:278 #: ../src/widgets/pencil-toolbar.cpp:272 msgid "Smoothing:" msgstr "Vyhladzovanie:" -#: ../src/widgets/pencil-toolbar.cpp:278 #: ../src/widgets/pencil-toolbar.cpp:272 msgid "Smoothing: " msgstr "Vyhladzovanie:" -#: ../src/widgets/pencil-toolbar.cpp:279 #: ../src/widgets/pencil-toolbar.cpp:273 msgid "How much smoothing (simplifying) is applied to the line" msgstr "Aké množstvo vyhladzovania (zjednodušenia) cesty sa použije" -#: ../src/widgets/pencil-toolbar.cpp:300 #: ../src/widgets/pencil-toolbar.cpp:294 msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " @@ -31812,130 +27011,116 @@ msgstr "" "Nastaviť parametre tvaru na štandardné hodnoty (použite Nastavenia Inkscape " "> Nástroje na zmenu štandardných hodnôt)" -#: ../src/widgets/rect-toolbar.cpp:124 #: ../src/widgets/rect-toolbar.cpp:122 msgid "Change rectangle" msgstr "Zmena obdĺžnika" -#: ../src/widgets/rect-toolbar.cpp:318 -#: ../src/widgets/rect-toolbar.cpp:315 +#: ../src/widgets/rect-toolbar.cpp:314 msgid "W:" msgstr "W:" -#: ../src/widgets/rect-toolbar.cpp:318 -#: ../src/widgets/rect-toolbar.cpp:315 +#: ../src/widgets/rect-toolbar.cpp:314 msgid "Width of rectangle" msgstr "Šírka obdĺžnika" -#: ../src/widgets/rect-toolbar.cpp:335 -#: ../src/widgets/rect-toolbar.cpp:332 -#, fuzzy +#: ../src/widgets/rect-toolbar.cpp:331 msgid "H:" msgstr "Vodorovná medzera:" -#: ../src/widgets/rect-toolbar.cpp:335 -#: ../src/widgets/rect-toolbar.cpp:332 +#: ../src/widgets/rect-toolbar.cpp:331 msgid "Height of rectangle" msgstr "Výška obdĺžnika" -#: ../src/widgets/rect-toolbar.cpp:349 ../src/widgets/rect-toolbar.cpp:364 -#: ../src/widgets/rect-toolbar.cpp:346 -#: ../src/widgets/rect-toolbar.cpp:361 +#: ../src/widgets/rect-toolbar.cpp:345 ../src/widgets/rect-toolbar.cpp:360 msgid "not rounded" msgstr "nezaoblený" -#: ../src/widgets/rect-toolbar.cpp:352 -#: ../src/widgets/rect-toolbar.cpp:349 +#: ../src/widgets/rect-toolbar.cpp:348 msgid "Horizontal radius" msgstr "Vodorovný polomer" -#: ../src/widgets/rect-toolbar.cpp:352 -#: ../src/widgets/rect-toolbar.cpp:349 +#: ../src/widgets/rect-toolbar.cpp:348 msgid "Rx:" msgstr "Rx:" -#: ../src/widgets/rect-toolbar.cpp:352 -#: ../src/widgets/rect-toolbar.cpp:349 +#: ../src/widgets/rect-toolbar.cpp:348 msgid "Horizontal radius of rounded corners" msgstr "Vodorovný polomer zaokrúhlenia rohov" -#: ../src/widgets/rect-toolbar.cpp:367 -#: ../src/widgets/rect-toolbar.cpp:364 +#: ../src/widgets/rect-toolbar.cpp:363 msgid "Vertical radius" msgstr "Zvislý polomer" -#: ../src/widgets/rect-toolbar.cpp:367 -#: ../src/widgets/rect-toolbar.cpp:364 +#: ../src/widgets/rect-toolbar.cpp:363 msgid "Ry:" msgstr "Ry:" -#: ../src/widgets/rect-toolbar.cpp:367 -#: ../src/widgets/rect-toolbar.cpp:364 +#: ../src/widgets/rect-toolbar.cpp:363 msgid "Vertical radius of rounded corners" msgstr "Zvislý polomer zaokrúhlenia rohov" -#: ../src/widgets/rect-toolbar.cpp:386 -#: ../src/widgets/rect-toolbar.cpp:383 +#: ../src/widgets/rect-toolbar.cpp:382 msgid "Not rounded" msgstr "Nezaoblený" -#: ../src/widgets/rect-toolbar.cpp:387 -#: ../src/widgets/rect-toolbar.cpp:384 +#: ../src/widgets/rect-toolbar.cpp:383 msgid "Make corners sharp" msgstr "Vytvoriť ostré rohy" #: ../src/widgets/ruler.cpp:192 +#, fuzzy msgid "The orientation of the ruler" -msgstr "Orientácia pravítka" +msgstr "Orientácia dokujúcej položky" #: ../src/widgets/ruler.cpp:202 +#, fuzzy msgid "Unit of the ruler" -msgstr "Jednotka pravítka" +msgstr "Šírka vzorky" #: ../src/widgets/ruler.cpp:209 msgid "Lower" -msgstr "Dolná" +msgstr "Presunúť nižšie" #: ../src/widgets/ruler.cpp:210 +#, fuzzy msgid "Lower limit of ruler" -msgstr "Dolná hranica pravítka" +msgstr "Presunúť do predchádzajúcej vrstvy" #: ../src/widgets/ruler.cpp:219 +#, fuzzy msgid "Upper" -msgstr "Horná" +msgstr "Pipeta" #: ../src/widgets/ruler.cpp:220 msgid "Upper limit of ruler" -msgstr "Horná hranica pravítka" +msgstr "" #: ../src/widgets/ruler.cpp:230 +#, fuzzy msgid "Position of mark on the ruler" -msgstr "Umiestnenie značky na pravítku" +msgstr "Umiestnenie pozdĺž krivky" #: ../src/widgets/ruler.cpp:239 +#, fuzzy msgid "Max Size" -msgstr "Max. veľkosť" +msgstr "Veľkosť" #: ../src/widgets/ruler.cpp:240 msgid "Maximum size of the ruler" -msgstr "Max. veľkosť pravítka" +msgstr "" -#: ../src/widgets/select-toolbar.cpp:262 #: ../src/widgets/select-toolbar.cpp:260 msgid "Transform by toolbar" msgstr "Transformácia podľa panelu nástrojov" -#: ../src/widgets/select-toolbar.cpp:341 #: ../src/widgets/select-toolbar.cpp:339 msgid "Now stroke width is scaled when objects are scaled." msgstr "Teraz sa mení mierka šírky ťahu pri zmene mierky objektov." -#: ../src/widgets/select-toolbar.cpp:343 #: ../src/widgets/select-toolbar.cpp:341 msgid "Now stroke width is not scaled when objects are scaled." msgstr "Teraz sa nemení mierka šírky ťahu pri zmene mierky objektov." -#: ../src/widgets/select-toolbar.cpp:354 #: ../src/widgets/select-toolbar.cpp:352 msgid "" "Now rounded rectangle corners are scaled when rectangles are " @@ -31944,7 +27129,6 @@ msgstr "" "Teraz sa mierka zaoblených rohov obdĺžnika mení pri zmene mierky " "obdĺžnika." -#: ../src/widgets/select-toolbar.cpp:356 #: ../src/widgets/select-toolbar.cpp:354 msgid "" "Now rounded rectangle corners are not scaled when rectangles " @@ -31953,7 +27137,6 @@ msgstr "" "Teraz sa mierka zaoblených rohov obdĺžnika nemení pri zmene mierky " "obdĺžnika." -#: ../src/widgets/select-toolbar.cpp:367 #: ../src/widgets/select-toolbar.cpp:365 msgid "" "Now gradients are transformed along with their objects when " @@ -31962,7 +27145,6 @@ msgstr "" "Teraz sú aj farebné prechody transformované pri transformácii " "svojich objektov (posunutie, zmena mierky, otočenie a skosenie)." -#: ../src/widgets/select-toolbar.cpp:369 #: ../src/widgets/select-toolbar.cpp:367 msgid "" "Now gradients remain fixed when objects are transformed " @@ -31971,7 +27153,6 @@ msgstr "" "Teraz farebné prechody zostávajú fixované pri transformácii " "svojich objektov (posunutie, zmena mierky, otočenie a skosenie)." -#: ../src/widgets/select-toolbar.cpp:380 #: ../src/widgets/select-toolbar.cpp:378 msgid "" "Now patterns are transformed along with their objects when " @@ -31980,7 +27161,6 @@ msgstr "" "Teraz sú vzorky tiež transformované pri transformácii svojich " "objektov (posunutie, zmena mierky, otočenie a skosenie)." -#: ../src/widgets/select-toolbar.cpp:382 #: ../src/widgets/select-toolbar.cpp:380 msgid "" "Now patterns remain fixed when objects are transformed (moved, " @@ -31990,95 +27170,78 @@ msgstr "" "objektov (posunutie, zmena mierky, otočenie a skosenie)." #. four spinbuttons -#: ../src/widgets/select-toolbar.cpp:500 #: ../src/widgets/select-toolbar.cpp:498 msgctxt "Select toolbar" msgid "X position" msgstr "Poloha X" -#: ../src/widgets/select-toolbar.cpp:500 #: ../src/widgets/select-toolbar.cpp:498 msgctxt "Select toolbar" msgid "X:" msgstr "X:" -#: ../src/widgets/select-toolbar.cpp:502 #: ../src/widgets/select-toolbar.cpp:500 msgid "Horizontal coordinate of selection" msgstr "Vodorovné súradnice výberu" -#: ../src/widgets/select-toolbar.cpp:506 #: ../src/widgets/select-toolbar.cpp:504 msgctxt "Select toolbar" msgid "Y position" msgstr "Poloha Y" -#: ../src/widgets/select-toolbar.cpp:506 #: ../src/widgets/select-toolbar.cpp:504 msgctxt "Select toolbar" msgid "Y:" msgstr "Y:" -#: ../src/widgets/select-toolbar.cpp:508 #: ../src/widgets/select-toolbar.cpp:506 msgid "Vertical coordinate of selection" msgstr "Zvislé súradnice výberu" -#: ../src/widgets/select-toolbar.cpp:512 #: ../src/widgets/select-toolbar.cpp:510 msgctxt "Select toolbar" msgid "Width" msgstr "Šírka" -#: ../src/widgets/select-toolbar.cpp:512 #: ../src/widgets/select-toolbar.cpp:510 msgctxt "Select toolbar" msgid "W:" msgstr "Š:" -#: ../src/widgets/select-toolbar.cpp:514 #: ../src/widgets/select-toolbar.cpp:512 msgid "Width of selection" msgstr "Šírka výberu" -#: ../src/widgets/select-toolbar.cpp:521 #: ../src/widgets/select-toolbar.cpp:519 msgid "Lock width and height" msgstr "Zamknúť šírku a výšku" -#: ../src/widgets/select-toolbar.cpp:522 #: ../src/widgets/select-toolbar.cpp:520 msgid "When locked, change both width and height by the same proportion" msgstr "V zamknutom stave meniť šírku a výšku v rovnakom pomere" -#: ../src/widgets/select-toolbar.cpp:531 #: ../src/widgets/select-toolbar.cpp:529 msgctxt "Select toolbar" msgid "Height" msgstr "Výška" -#: ../src/widgets/select-toolbar.cpp:531 #: ../src/widgets/select-toolbar.cpp:529 msgctxt "Select toolbar" msgid "H:" msgstr "V:" -#: ../src/widgets/select-toolbar.cpp:533 #: ../src/widgets/select-toolbar.cpp:531 msgid "Height of selection" msgstr "Výška výberu" -#: ../src/widgets/select-toolbar.cpp:583 #: ../src/widgets/select-toolbar.cpp:581 msgid "Scale rounded corners" msgstr "Zmeniť mierku zaoblených rohov" -#: ../src/widgets/select-toolbar.cpp:594 #: ../src/widgets/select-toolbar.cpp:592 msgid "Move gradients" msgstr "Posunúť farebné prechody" -#: ../src/widgets/select-toolbar.cpp:605 #: ../src/widgets/select-toolbar.cpp:603 msgid "Move patterns" msgstr "Posunúť vzory" @@ -32087,42 +27250,31 @@ msgstr "Posunúť vzory" msgid "Set attribute" msgstr "Nastaviť atribút" -#: ../src/widgets/sp-color-icc-selector.cpp:234 #: ../src/widgets/sp-color-icc-selector.cpp:257 msgid "CMS" msgstr "CMS" -#: ../src/widgets/sp-color-icc-selector.cpp:330 -#: ../src/widgets/sp-color-scales.cpp:414 #: ../src/widgets/sp-color-icc-selector.cpp:355 #: ../src/widgets/sp-color-scales.cpp:428 msgid "_R:" msgstr "_R:" #. TYPE_RGB_16 -#: ../src/widgets/sp-color-icc-selector.cpp:331 -#: ../src/widgets/sp-color-scales.cpp:417 #: ../src/widgets/sp-color-icc-selector.cpp:356 #: ../src/widgets/sp-color-scales.cpp:431 msgid "_G:" msgstr "_G:" -#: ../src/widgets/sp-color-icc-selector.cpp:332 -#: ../src/widgets/sp-color-scales.cpp:420 #: ../src/widgets/sp-color-icc-selector.cpp:357 #: ../src/widgets/sp-color-scales.cpp:434 msgid "_B:" msgstr "_B:" -#: ../src/widgets/sp-color-icc-selector.cpp:334 #: ../src/widgets/sp-color-icc-selector.cpp:359 msgid "Gray" msgstr "Šedá" #. TYPE_GRAY_16 -#: ../src/widgets/sp-color-icc-selector.cpp:336 -#: ../src/widgets/sp-color-icc-selector.cpp:340 -#: ../src/widgets/sp-color-scales.cpp:440 #: ../src/widgets/sp-color-icc-selector.cpp:361 #: ../src/widgets/sp-color-icc-selector.cpp:365 #: ../src/widgets/sp-color-scales.cpp:454 @@ -32130,9 +27282,6 @@ msgid "_H:" msgstr "_H:" #. TYPE_HSV_16 -#: ../src/widgets/sp-color-icc-selector.cpp:337 -#: ../src/widgets/sp-color-icc-selector.cpp:342 -#: ../src/widgets/sp-color-scales.cpp:443 #: ../src/widgets/sp-color-icc-selector.cpp:362 #: ../src/widgets/sp-color-icc-selector.cpp:367 #: ../src/widgets/sp-color-scales.cpp:457 @@ -32140,16 +27289,11 @@ msgid "_S:" msgstr "_S:" #. TYPE_HLS_16 -#: ../src/widgets/sp-color-icc-selector.cpp:341 -#: ../src/widgets/sp-color-scales.cpp:446 #: ../src/widgets/sp-color-icc-selector.cpp:366 #: ../src/widgets/sp-color-scales.cpp:460 msgid "_L:" msgstr "_L:" -#: ../src/widgets/sp-color-icc-selector.cpp:344 -#: ../src/widgets/sp-color-icc-selector.cpp:349 -#: ../src/widgets/sp-color-scales.cpp:468 #: ../src/widgets/sp-color-icc-selector.cpp:369 #: ../src/widgets/sp-color-icc-selector.cpp:374 #: ../src/widgets/sp-color-scales.cpp:482 @@ -32158,47 +27302,32 @@ msgstr "_C:" #. TYPE_CMYK_16 #. TYPE_CMY_16 -#: ../src/widgets/sp-color-icc-selector.cpp:345 -#: ../src/widgets/sp-color-icc-selector.cpp:350 -#: ../src/widgets/sp-color-scales.cpp:471 #: ../src/widgets/sp-color-icc-selector.cpp:370 #: ../src/widgets/sp-color-icc-selector.cpp:375 #: ../src/widgets/sp-color-scales.cpp:485 msgid "_M:" msgstr "_M:" -#: ../src/widgets/sp-color-icc-selector.cpp:346 -#: ../src/widgets/sp-color-icc-selector.cpp:351 -#: ../src/widgets/sp-color-scales.cpp:474 #: ../src/widgets/sp-color-icc-selector.cpp:371 #: ../src/widgets/sp-color-icc-selector.cpp:376 #: ../src/widgets/sp-color-scales.cpp:488 msgid "_Y:" msgstr "_Y:" -#: ../src/widgets/sp-color-icc-selector.cpp:347 -#: ../src/widgets/sp-color-scales.cpp:477 #: ../src/widgets/sp-color-icc-selector.cpp:372 #: ../src/widgets/sp-color-scales.cpp:491 msgid "_K:" msgstr "_K:" -#: ../src/widgets/sp-color-icc-selector.cpp:430 #: ../src/widgets/sp-color-icc-selector.cpp:455 msgid "Fix" msgstr "Opraviť" -#: ../src/widgets/sp-color-icc-selector.cpp:433 #: ../src/widgets/sp-color-icc-selector.cpp:458 msgid "Fix RGB fallback to match icc-color() value." msgstr "Opraviť, aby sa RGB štandardne zhodovalo s hodnotou icc-color()." #. Label -#: ../src/widgets/sp-color-icc-selector.cpp:536 -#: ../src/widgets/sp-color-scales.cpp:423 -#: ../src/widgets/sp-color-scales.cpp:449 -#: ../src/widgets/sp-color-scales.cpp:480 -#: ../src/widgets/sp-color-wheel-selector.cpp:111 #: ../src/widgets/sp-color-icc-selector.cpp:561 #: ../src/widgets/sp-color-scales.cpp:437 #: ../src/widgets/sp-color-scales.cpp:463 @@ -32207,16 +27336,6 @@ msgstr "Opraviť, aby sa RGB štandardne zhodovalo s hodnotou icc-color()." msgid "_A:" msgstr "_A:" -#: ../src/widgets/sp-color-icc-selector.cpp:547 -#: ../src/widgets/sp-color-icc-selector.cpp:560 -#: ../src/widgets/sp-color-scales.cpp:424 -#: ../src/widgets/sp-color-scales.cpp:425 -#: ../src/widgets/sp-color-scales.cpp:450 -#: ../src/widgets/sp-color-scales.cpp:451 -#: ../src/widgets/sp-color-scales.cpp:481 -#: ../src/widgets/sp-color-scales.cpp:482 -#: ../src/widgets/sp-color-wheel-selector.cpp:137 -#: ../src/widgets/sp-color-wheel-selector.cpp:166 #: ../src/widgets/sp-color-icc-selector.cpp:572 #: ../src/widgets/sp-color-icc-selector.cpp:585 #: ../src/widgets/sp-color-scales.cpp:438 @@ -32230,58 +27349,47 @@ msgstr "_A:" msgid "Alpha (opacity)" msgstr "Alfa (krytie)" -#: ../src/widgets/sp-color-notebook.cpp:370 #: ../src/widgets/sp-color-notebook.cpp:385 msgid "Color Managed" msgstr "Správa farieb" -#: ../src/widgets/sp-color-notebook.cpp:377 #: ../src/widgets/sp-color-notebook.cpp:392 msgid "Out of gamut!" msgstr "Mimo gamutu!" -#: ../src/widgets/sp-color-notebook.cpp:384 #: ../src/widgets/sp-color-notebook.cpp:399 msgid "Too much ink!" msgstr "Príliš veľa atramentu!" #. Create RGBA entry and color preview -#: ../src/widgets/sp-color-notebook.cpp:401 #: ../src/widgets/sp-color-notebook.cpp:416 msgid "RGBA_:" msgstr "RGBA_:" -#: ../src/widgets/sp-color-notebook.cpp:409 #: ../src/widgets/sp-color-notebook.cpp:424 msgid "Hexadecimal RGBA value of the color" msgstr "Hexadecimálna RGBA hodnota farby" -#: ../src/widgets/sp-color-scales.cpp:53 #: ../src/widgets/sp-color-scales.cpp:80 msgid "RGB" msgstr "RGB" -#: ../src/widgets/sp-color-scales.cpp:53 #: ../src/widgets/sp-color-scales.cpp:80 msgid "HSL" msgstr "HSL" -#: ../src/widgets/sp-color-scales.cpp:53 #: ../src/widgets/sp-color-scales.cpp:80 msgid "CMYK" msgstr "CMYK" -#: ../src/widgets/sp-color-selector.cpp:42 #: ../src/widgets/sp-color-selector.cpp:64 msgid "Unnamed" msgstr "Nepomenovaný" -#: ../src/widgets/sp-xmlview-attr-list.cpp:59 #: ../src/widgets/sp-xmlview-attr-list.cpp:64 msgid "Value" msgstr "Hodnota" -#: ../src/widgets/sp-xmlview-content.cpp:151 #: ../src/widgets/sp-xmlview-content.cpp:179 msgid "Type text in a text node" msgstr "Napísať text do textového uzla" @@ -32370,8 +27478,7 @@ msgstr "Vnútorný polomer:" msgid "Radius of the innermost revolution (relative to the spiral size)" msgstr "Polomer najvnútornejšej revolúcie (relatívne k veľkosti špirály)" -#: ../src/widgets/spiral-toolbar.cpp:290 ../src/widgets/star-toolbar.cpp:567 -#: ../src/widgets/star-toolbar.cpp:565 +#: ../src/widgets/spiral-toolbar.cpp:290 ../src/widgets/star-toolbar.cpp:565 msgid "" "Reset shape parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" @@ -32405,6 +27512,7 @@ msgid "Focus:" msgstr "Zaostrenie:" #: ../src/widgets/spray-toolbar.cpp:132 +#, fuzzy msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "0 nasprejuje bod. Zväčšením hodnoty zväčšíte polomer kruhu." @@ -32418,16 +27526,19 @@ msgid "(maximum scatter)" msgstr "(maximálny rozptyl)" #: ../src/widgets/spray-toolbar.cpp:148 +#, fuzzy msgctxt "Spray tool" msgid "Scatter" msgstr "Roztrúsenie" #: ../src/widgets/spray-toolbar.cpp:148 +#, fuzzy msgctxt "Spray tool" msgid "Scatter:" -msgstr "Roztrúsenie:" +msgstr "Roztrúsenie" #: ../src/widgets/spray-toolbar.cpp:148 +#, fuzzy msgid "Increase to scatter sprayed objects" msgstr "Zväčšením rozptýlite sprejované objekty." @@ -32465,15 +27576,17 @@ msgid "Amount" msgstr "Množstvo" #: ../src/widgets/spray-toolbar.cpp:209 +#, fuzzy msgid "Adjusts the number of items sprayed per click" msgstr "" -"Toto nastavenie ovplyvňuje počet položiek sprejovaných jedným kliknutím." +"Toto nastavenie ovplyvňuje počet sprejovaných položiek jedným kliknutím." #: ../src/widgets/spray-toolbar.cpp:225 +#, fuzzy msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" -"Použiť tlak vstupného zariadenia na zmenu množstva sprejovaných objektov" +"Použiť tlak vstupného zariadenia na zmenu množstva sprejovaných objektov." #: ../src/widgets/spray-toolbar.cpp:235 msgid "(high rotation variation)" @@ -32488,260 +27601,215 @@ msgid "Rotation:" msgstr "Otočenie:" #: ../src/widgets/spray-toolbar.cpp:240 -#, no-c-format +#, fuzzy, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " "than the original object" msgstr "" "Variácia otočenia sprejovaných objektov. 0% znamená rovnaké otočenie ako " -"pôvodný objekt" +"pôvodný objekt." #: ../src/widgets/spray-toolbar.cpp:253 msgid "(high scale variation)" msgstr "(vysoká variácia mierky)" #: ../src/widgets/spray-toolbar.cpp:256 +#, fuzzy msgctxt "Spray tool" msgid "Scale" msgstr "Zmena mierky" #: ../src/widgets/spray-toolbar.cpp:256 +#, fuzzy msgctxt "Spray tool" msgid "Scale:" msgstr "Mierka:" #: ../src/widgets/spray-toolbar.cpp:258 -#, no-c-format +#, fuzzy, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " "the original object" msgstr "" "Variácia mierky sprejovaných objektov. 0% znamená rovnaká mierka ako pôvodný " -"objekt" +"objekt." -#: ../src/widgets/star-toolbar.cpp:103 #: ../src/widgets/star-toolbar.cpp:102 msgid "Star: Change number of corners" msgstr "Hviezda: Zmeniť počet rohov" -#: ../src/widgets/star-toolbar.cpp:156 #: ../src/widgets/star-toolbar.cpp:155 msgid "Star: Change spoke ratio" msgstr "Hviezda: Zmeniť pomer lúčov" -#: ../src/widgets/star-toolbar.cpp:201 #: ../src/widgets/star-toolbar.cpp:200 msgid "Make polygon" msgstr "Vytvoriť mnohouholník" -#: ../src/widgets/star-toolbar.cpp:201 #: ../src/widgets/star-toolbar.cpp:200 msgid "Make star" msgstr "Vytvoriť hviezdu" -#: ../src/widgets/star-toolbar.cpp:240 #: ../src/widgets/star-toolbar.cpp:239 msgid "Star: Change rounding" msgstr "Hviezda: Zmeniť zaoblenie" -#: ../src/widgets/star-toolbar.cpp:280 #: ../src/widgets/star-toolbar.cpp:279 msgid "Star: Change randomization" msgstr "Hviezda: Zmeniť náhodnosť" -#: ../src/widgets/star-toolbar.cpp:465 #: ../src/widgets/star-toolbar.cpp:463 msgid "Regular polygon (with one handle) instead of a star" msgstr "Pravidelný mnohouholník (s jedným úchopom) namiesto hviezdy" -#: ../src/widgets/star-toolbar.cpp:472 #: ../src/widgets/star-toolbar.cpp:470 msgid "Star instead of a regular polygon (with one handle)" msgstr "Hviezda namiesto pravidelného mnohouholníka (s jedným úchopom)" -#: ../src/widgets/star-toolbar.cpp:493 #: ../src/widgets/star-toolbar.cpp:491 msgid "triangle/tri-star" msgstr "trojuholník/trojcípa hviezda" -#: ../src/widgets/star-toolbar.cpp:493 #: ../src/widgets/star-toolbar.cpp:491 msgid "square/quad-star" msgstr "štvorec/štvorcípa hviezda" -#: ../src/widgets/star-toolbar.cpp:493 #: ../src/widgets/star-toolbar.cpp:491 msgid "pentagon/five-pointed star" msgstr "päťuholník/päťcípa hviezda" -#: ../src/widgets/star-toolbar.cpp:493 #: ../src/widgets/star-toolbar.cpp:491 msgid "hexagon/six-pointed star" msgstr "šesťuholník/šesťcípa hviezda" -#: ../src/widgets/star-toolbar.cpp:496 #: ../src/widgets/star-toolbar.cpp:494 msgid "Corners" msgstr "Rohy" -#: ../src/widgets/star-toolbar.cpp:496 #: ../src/widgets/star-toolbar.cpp:494 msgid "Corners:" msgstr "Rohy:" -#: ../src/widgets/star-toolbar.cpp:496 #: ../src/widgets/star-toolbar.cpp:494 msgid "Number of corners of a polygon or star" msgstr "Počet rohov mnohouholníka alebo hviezdy" -#: ../src/widgets/star-toolbar.cpp:509 #: ../src/widgets/star-toolbar.cpp:507 msgid "thin-ray star" msgstr "hviezda s tenkými lúčmi" -#: ../src/widgets/star-toolbar.cpp:509 #: ../src/widgets/star-toolbar.cpp:507 msgid "pentagram" msgstr "päťuholník" -#: ../src/widgets/star-toolbar.cpp:509 #: ../src/widgets/star-toolbar.cpp:507 msgid "hexagram" msgstr "šesťuholník" -#: ../src/widgets/star-toolbar.cpp:509 #: ../src/widgets/star-toolbar.cpp:507 msgid "heptagram" msgstr "sedemuholník" -#: ../src/widgets/star-toolbar.cpp:509 #: ../src/widgets/star-toolbar.cpp:507 msgid "octagram" msgstr "osemuholník" -#: ../src/widgets/star-toolbar.cpp:509 #: ../src/widgets/star-toolbar.cpp:507 msgid "regular polygon" msgstr "pravidelný mnohouholník" -#: ../src/widgets/star-toolbar.cpp:512 #: ../src/widgets/star-toolbar.cpp:510 msgid "Spoke ratio" msgstr "Pomer lúčov" -#: ../src/widgets/star-toolbar.cpp:512 #: ../src/widgets/star-toolbar.cpp:510 msgid "Spoke ratio:" msgstr "Koeficient lúčov:" #. TRANSLATORS: Tip radius of a star is the distance from the center to the farthest handle. #. Base radius is the same for the closest handle. -#: ../src/widgets/star-toolbar.cpp:515 #: ../src/widgets/star-toolbar.cpp:513 msgid "Base radius to tip radius ratio" msgstr "Koeficient polomeru základne k polomeru vrcholu" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "stretched" msgstr "natiahnutý" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "twisted" msgstr "skrútený" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "slightly pinched" msgstr "(mierne zúžené)" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "NOT rounded" msgstr "NIE zaoblené" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "slightly rounded" msgstr "mierne zaoblené" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "visibly rounded" msgstr "viditeľne zaoblené" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "well rounded" msgstr "dosť zaoblené" -#: ../src/widgets/star-toolbar.cpp:533 #: ../src/widgets/star-toolbar.cpp:531 msgid "amply rounded" msgstr "hojne zaoblené" -#: ../src/widgets/star-toolbar.cpp:533 ../src/widgets/star-toolbar.cpp:548 -#: ../src/widgets/star-toolbar.cpp:531 -#: ../src/widgets/star-toolbar.cpp:546 +#: ../src/widgets/star-toolbar.cpp:531 ../src/widgets/star-toolbar.cpp:546 msgid "blown up" msgstr "nafúknutý" -#: ../src/widgets/star-toolbar.cpp:536 #: ../src/widgets/star-toolbar.cpp:534 msgid "Rounded:" msgstr "Zaoblenie:" -#: ../src/widgets/star-toolbar.cpp:536 #: ../src/widgets/star-toolbar.cpp:534 msgid "How much rounded are the corners (0 for sharp)" msgstr "Aké okrúhle sú rohy (0 sú ostré)" -#: ../src/widgets/star-toolbar.cpp:548 #: ../src/widgets/star-toolbar.cpp:546 msgid "NOT randomized" msgstr "NIE náhodné" -#: ../src/widgets/star-toolbar.cpp:548 #: ../src/widgets/star-toolbar.cpp:546 msgid "slightly irregular" msgstr "mierne nepravidelné" -#: ../src/widgets/star-toolbar.cpp:548 #: ../src/widgets/star-toolbar.cpp:546 msgid "visibly randomized" msgstr "viditeľne náhodné" -#: ../src/widgets/star-toolbar.cpp:548 #: ../src/widgets/star-toolbar.cpp:546 msgid "strongly randomized" msgstr "veľmi náhodné" -#: ../src/widgets/star-toolbar.cpp:551 #: ../src/widgets/star-toolbar.cpp:549 msgid "Randomized" msgstr "Náhodné" -#: ../src/widgets/star-toolbar.cpp:551 #: ../src/widgets/star-toolbar.cpp:549 msgid "Randomized:" msgstr "Náhodnosť:" -#: ../src/widgets/star-toolbar.cpp:551 #: ../src/widgets/star-toolbar.cpp:549 msgid "Scatter randomly the corners and angles" msgstr "Náhodne rozptýliť rohy a uhly" -#: ../src/widgets/stroke-marker-selector.cpp:388 -msgctxt "Marker" -msgid "None" -msgstr "Žiadna" - #: ../src/widgets/stroke-style.cpp:192 msgid "Stroke width" msgstr "Šírka ťahu" #: ../src/widgets/stroke-style.cpp:194 +#, fuzzy msgctxt "Stroke width" msgid "_Width:" msgstr "_Šírka:" @@ -32768,8 +27836,9 @@ msgid "Bevel join" msgstr "Zrazený spoj" #: ../src/widgets/stroke-style.cpp:280 +#, fuzzy msgid "Miter _limit:" -msgstr "_Limit ostrosti rohu:" +msgstr "Limit ostrosti rohu:" #. Cap type #. TRANSLATORS: cap type specifies the shape for the ends of lines @@ -32805,8 +27874,9 @@ msgstr "Typ čiary:" #. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes #. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. #: ../src/widgets/stroke-style.cpp:352 +#, fuzzy msgid "Markers:" -msgstr "Značky:" +msgstr "Značkovadlo" #: ../src/widgets/stroke-style.cpp:358 msgid "Start Markers are drawn on the first node of a path or shape" @@ -32828,16 +27898,14 @@ msgstr "Koncové značky sa kreslia na poslednom uzle cesty alebo tvaru" msgid "Set markers" msgstr "Nastaviť zakončenia čiar" -#: ../src/widgets/stroke-style.cpp:1030 ../src/widgets/stroke-style.cpp:1114 -#: ../src/widgets/stroke-style.cpp:1032 -#: ../src/widgets/stroke-style.cpp:1117 +#: ../src/widgets/stroke-style.cpp:1024 ../src/widgets/stroke-style.cpp:1109 msgid "Set stroke style" msgstr "Nastaviť štýl ťahu" -#: ../src/widgets/stroke-style.cpp:1202 -#: ../src/widgets/stroke-style.cpp:1205 +#: ../src/widgets/stroke-style.cpp:1197 +#, fuzzy msgid "Set marker color" -msgstr "Nastaviť farbu značky" +msgstr "Nastaviť farbu ťahu" #: ../src/widgets/swatch-selector.cpp:137 msgid "Change swatch color" @@ -32851,501 +27919,415 @@ msgstr "Text: Zmeniť rodinu písma" msgid "Text: Change font size" msgstr "Text: Zmeniť veľkosť písma" -#: ../src/widgets/text-toolbar.cpp:269 #: ../src/widgets/text-toolbar.cpp:271 msgid "Text: Change font style" msgstr "Text: Zmeniť štýl písma" -#: ../src/widgets/text-toolbar.cpp:347 #: ../src/widgets/text-toolbar.cpp:349 msgid "Text: Change superscript or subscript" msgstr "Text: Prepnúť horný alebo dolný index" -#: ../src/widgets/text-toolbar.cpp:489 #: ../src/widgets/text-toolbar.cpp:494 msgid "Text: Change alignment" msgstr "Text: Zmeniť zarovnanie" -#: ../src/widgets/text-toolbar.cpp:532 #: ../src/widgets/text-toolbar.cpp:537 msgid "Text: Change line-height" msgstr "Text: Zmeniť výšku riadka" -#: ../src/widgets/text-toolbar.cpp:580 #: ../src/widgets/text-toolbar.cpp:586 msgid "Text: Change word-spacing" msgstr "Text: Zmeniť rozostupy medzi slovami" -#: ../src/widgets/text-toolbar.cpp:620 #: ../src/widgets/text-toolbar.cpp:627 msgid "Text: Change letter-spacing" msgstr "Text: Zmeniť rozostupy medzi písmenami" -#: ../src/widgets/text-toolbar.cpp:658 #: ../src/widgets/text-toolbar.cpp:667 msgid "Text: Change dx (kern)" msgstr "Text: Zmeniť dx (kerning)" -#: ../src/widgets/text-toolbar.cpp:692 #: ../src/widgets/text-toolbar.cpp:701 msgid "Text: Change dy" msgstr "Text: Zmeniť dy" -#: ../src/widgets/text-toolbar.cpp:727 #: ../src/widgets/text-toolbar.cpp:736 msgid "Text: Change rotate" msgstr "Text: Zmeniť otočenie" -#: ../src/widgets/text-toolbar.cpp:774 #: ../src/widgets/text-toolbar.cpp:784 msgid "Text: Change orientation" msgstr "Text: Zmeniť orientáciu" -#: ../src/widgets/text-toolbar.cpp:1210 -#: ../src/widgets/text-toolbar.cpp:1223 +#: ../src/widgets/text-toolbar.cpp:1221 msgid "Font Family" msgstr "Rodina písma" -#: ../src/widgets/text-toolbar.cpp:1211 -#: ../src/widgets/text-toolbar.cpp:1224 +#: ../src/widgets/text-toolbar.cpp:1222 msgid "Select Font Family (Alt-X to access)" msgstr "Vybrať rodinu písma (prístup pomocou Alt+X)" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1221 -#: ../src/widgets/text-toolbar.cpp:1234 +#: ../src/widgets/text-toolbar.cpp:1232 msgid "Select all text with this font-family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1225 -#: ../src/widgets/text-toolbar.cpp:1238 +#: ../src/widgets/text-toolbar.cpp:1236 msgid "Font not found on system" msgstr "Písmo na tomto systéme nebolo nájdené" -#: ../src/widgets/text-toolbar.cpp:1284 -#: ../src/widgets/text-toolbar.cpp:1297 +#: ../src/widgets/text-toolbar.cpp:1295 +#, fuzzy msgid "Font Style" -msgstr "Štýl písma" +msgstr "Veľkosť písma" -#: ../src/widgets/text-toolbar.cpp:1285 -#: ../src/widgets/text-toolbar.cpp:1298 +#: ../src/widgets/text-toolbar.cpp:1296 +#, fuzzy msgid "Font style" -msgstr "Štýl písma" +msgstr "Veľkosť písma" #. Name -#: ../src/widgets/text-toolbar.cpp:1302 -#: ../src/widgets/text-toolbar.cpp:1315 +#: ../src/widgets/text-toolbar.cpp:1313 msgid "Toggle Superscript" msgstr "Prepnúť horný index" #. Label -#: ../src/widgets/text-toolbar.cpp:1303 -#: ../src/widgets/text-toolbar.cpp:1316 +#: ../src/widgets/text-toolbar.cpp:1314 msgid "Toggle superscript" msgstr "Prepnúť horný index" #. Name -#: ../src/widgets/text-toolbar.cpp:1315 -#: ../src/widgets/text-toolbar.cpp:1328 +#: ../src/widgets/text-toolbar.cpp:1326 msgid "Toggle Subscript" msgstr "Prepnúť dolný index" #. Label -#: ../src/widgets/text-toolbar.cpp:1316 -#: ../src/widgets/text-toolbar.cpp:1329 +#: ../src/widgets/text-toolbar.cpp:1327 msgid "Toggle subscript" msgstr "Prepnúť dolný index" -#: ../src/widgets/text-toolbar.cpp:1357 -#: ../src/widgets/text-toolbar.cpp:1370 +#: ../src/widgets/text-toolbar.cpp:1368 msgid "Justify" msgstr "Zarovnanie do bloku" #. Name -#: ../src/widgets/text-toolbar.cpp:1364 -#: ../src/widgets/text-toolbar.cpp:1377 +#: ../src/widgets/text-toolbar.cpp:1375 msgid "Alignment" msgstr "Zarovnanie" #. Label -#: ../src/widgets/text-toolbar.cpp:1365 -#: ../src/widgets/text-toolbar.cpp:1378 +#: ../src/widgets/text-toolbar.cpp:1376 msgid "Text alignment" msgstr "Zarovnanie textu" -#: ../src/widgets/text-toolbar.cpp:1392 -#: ../src/widgets/text-toolbar.cpp:1405 +#: ../src/widgets/text-toolbar.cpp:1403 msgid "Horizontal" msgstr "Vodorovné" -#: ../src/widgets/text-toolbar.cpp:1399 -#: ../src/widgets/text-toolbar.cpp:1412 +#: ../src/widgets/text-toolbar.cpp:1410 msgid "Vertical" msgstr "Zvislé" #. Label -#: ../src/widgets/text-toolbar.cpp:1406 -#: ../src/widgets/text-toolbar.cpp:1419 +#: ../src/widgets/text-toolbar.cpp:1417 msgid "Text orientation" msgstr "Orientácia textu" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1429 -#: ../src/widgets/text-toolbar.cpp:1442 +#: ../src/widgets/text-toolbar.cpp:1440 msgid "Smaller spacing" msgstr "Menšie rozostupy" -#: ../src/widgets/text-toolbar.cpp:1429 ../src/widgets/text-toolbar.cpp:1460 -#: ../src/widgets/text-toolbar.cpp:1491 -#: ../src/widgets/text-toolbar.cpp:1442 -#: ../src/widgets/text-toolbar.cpp:1473 -#: ../src/widgets/text-toolbar.cpp:1504 +#: ../src/widgets/text-toolbar.cpp:1440 ../src/widgets/text-toolbar.cpp:1471 +#: ../src/widgets/text-toolbar.cpp:1502 +#, fuzzy msgctxt "Text tool" msgid "Normal" msgstr "Normálne" -#: ../src/widgets/text-toolbar.cpp:1429 -#: ../src/widgets/text-toolbar.cpp:1442 +#: ../src/widgets/text-toolbar.cpp:1440 msgid "Larger spacing" msgstr "Väčšie rozostupy" #. name -#: ../src/widgets/text-toolbar.cpp:1434 -#: ../src/widgets/text-toolbar.cpp:1447 +#: ../src/widgets/text-toolbar.cpp:1445 msgid "Line Height" msgstr "Výška riadka" #. label -#: ../src/widgets/text-toolbar.cpp:1435 -#: ../src/widgets/text-toolbar.cpp:1448 +#: ../src/widgets/text-toolbar.cpp:1446 msgid "Line:" msgstr "Riadok:" #. short label -#: ../src/widgets/text-toolbar.cpp:1436 -#: ../src/widgets/text-toolbar.cpp:1449 +#: ../src/widgets/text-toolbar.cpp:1447 msgid "Spacing between lines (times font size)" msgstr "Rozostupy medzi riadkami (krát veľkosť písma)" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1460 ../src/widgets/text-toolbar.cpp:1491 -#: ../src/widgets/text-toolbar.cpp:1473 -#: ../src/widgets/text-toolbar.cpp:1504 +#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502 msgid "Negative spacing" msgstr "Záporné rozostupy" -#: ../src/widgets/text-toolbar.cpp:1460 ../src/widgets/text-toolbar.cpp:1491 -#: ../src/widgets/text-toolbar.cpp:1473 -#: ../src/widgets/text-toolbar.cpp:1504 +#: ../src/widgets/text-toolbar.cpp:1471 ../src/widgets/text-toolbar.cpp:1502 msgid "Positive spacing" msgstr "Kladné rozostupy" #. name -#: ../src/widgets/text-toolbar.cpp:1465 -#: ../src/widgets/text-toolbar.cpp:1478 +#: ../src/widgets/text-toolbar.cpp:1476 msgid "Word spacing" msgstr "Rozostupy medzi slovami" #. label -#: ../src/widgets/text-toolbar.cpp:1466 -#: ../src/widgets/text-toolbar.cpp:1479 +#: ../src/widgets/text-toolbar.cpp:1477 msgid "Word:" msgstr "Slovo:" #. short label -#: ../src/widgets/text-toolbar.cpp:1467 -#: ../src/widgets/text-toolbar.cpp:1480 +#: ../src/widgets/text-toolbar.cpp:1478 msgid "Spacing between words (px)" msgstr "Rozostupy medzi slovami (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1496 -#: ../src/widgets/text-toolbar.cpp:1509 +#: ../src/widgets/text-toolbar.cpp:1507 msgid "Letter spacing" msgstr "Rozostupy medzi písmenami" #. label -#: ../src/widgets/text-toolbar.cpp:1497 -#: ../src/widgets/text-toolbar.cpp:1510 +#: ../src/widgets/text-toolbar.cpp:1508 msgid "Letter:" msgstr "Písmeno:" #. short label -#: ../src/widgets/text-toolbar.cpp:1498 -#: ../src/widgets/text-toolbar.cpp:1511 +#: ../src/widgets/text-toolbar.cpp:1509 msgid "Spacing between letters (px)" msgstr "Rozostupy medzi písmenami (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1527 -#: ../src/widgets/text-toolbar.cpp:1540 +#: ../src/widgets/text-toolbar.cpp:1538 msgid "Kerning" msgstr "Kerning" #. label -#: ../src/widgets/text-toolbar.cpp:1528 -#: ../src/widgets/text-toolbar.cpp:1541 +#: ../src/widgets/text-toolbar.cpp:1539 msgid "Kern:" msgstr "Kerning:" #. short label -#: ../src/widgets/text-toolbar.cpp:1529 -#: ../src/widgets/text-toolbar.cpp:1542 +#: ../src/widgets/text-toolbar.cpp:1540 msgid "Horizontal kerning (px)" msgstr "Horizontálny kerning (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1558 -#: ../src/widgets/text-toolbar.cpp:1571 +#: ../src/widgets/text-toolbar.cpp:1569 msgid "Vertical Shift" msgstr "Zvislé posunutie" #. label -#: ../src/widgets/text-toolbar.cpp:1559 -#: ../src/widgets/text-toolbar.cpp:1572 +#: ../src/widgets/text-toolbar.cpp:1570 msgid "Vert:" msgstr "Vert:" #. short label -#: ../src/widgets/text-toolbar.cpp:1560 -#: ../src/widgets/text-toolbar.cpp:1573 +#: ../src/widgets/text-toolbar.cpp:1571 msgid "Vertical shift (px)" msgstr "Zvislé posunutie (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1589 -#: ../src/widgets/text-toolbar.cpp:1602 +#: ../src/widgets/text-toolbar.cpp:1600 msgid "Letter rotation" msgstr "Otočenie písmen" #. label -#: ../src/widgets/text-toolbar.cpp:1590 -#: ../src/widgets/text-toolbar.cpp:1603 +#: ../src/widgets/text-toolbar.cpp:1601 msgid "Rot:" msgstr "Otoč:" #. short label -#: ../src/widgets/text-toolbar.cpp:1591 -#: ../src/widgets/text-toolbar.cpp:1604 +#: ../src/widgets/text-toolbar.cpp:1602 msgid "Character rotation (degrees)" msgstr "Otočenie znaku (stupne)" -#: ../src/widgets/toolbox.cpp:181 #: ../src/widgets/toolbox.cpp:182 msgid "Color/opacity used for color tweaking" msgstr "Farba/krytie použité pre ladenie farieb" -#: ../src/widgets/toolbox.cpp:189 #: ../src/widgets/toolbox.cpp:190 msgid "Style of new stars" msgstr "Štýl nových hviezd" -#: ../src/widgets/toolbox.cpp:191 #: ../src/widgets/toolbox.cpp:192 msgid "Style of new rectangles" msgstr "Štýl nového obdĺžnika" -#: ../src/widgets/toolbox.cpp:193 #: ../src/widgets/toolbox.cpp:194 msgid "Style of new 3D boxes" msgstr "Štýl nového kvádra" -#: ../src/widgets/toolbox.cpp:195 #: ../src/widgets/toolbox.cpp:196 msgid "Style of new ellipses" msgstr "Štýl nových elíps" -#: ../src/widgets/toolbox.cpp:197 #: ../src/widgets/toolbox.cpp:198 msgid "Style of new spirals" msgstr "Štýl nových špirál" -#: ../src/widgets/toolbox.cpp:199 #: ../src/widgets/toolbox.cpp:200 msgid "Style of new paths created by Pencil" msgstr "Štýl nových ciest vytvorených Ceruzkou" -#: ../src/widgets/toolbox.cpp:201 #: ../src/widgets/toolbox.cpp:202 msgid "Style of new paths created by Pen" msgstr "Štýl nových ciest vytvorených Perom" -#: ../src/widgets/toolbox.cpp:203 #: ../src/widgets/toolbox.cpp:204 msgid "Style of new calligraphic strokes" msgstr "Štýl nového kaligrafického ťahu" -#: ../src/widgets/toolbox.cpp:205 ../src/widgets/toolbox.cpp:207 -#: ../src/widgets/toolbox.cpp:206 -#: ../src/widgets/toolbox.cpp:208 +#: ../src/widgets/toolbox.cpp:206 ../src/widgets/toolbox.cpp:208 msgid "TBD" msgstr "" -#: ../src/widgets/toolbox.cpp:219 #: ../src/widgets/toolbox.cpp:220 msgid "Style of Paint Bucket fill objects" msgstr "Štýl výplne objektov pomocou Vedra s farbou" -#: ../src/widgets/toolbox.cpp:1681 #: ../src/widgets/toolbox.cpp:1682 msgid "Bounding box" msgstr "Ohraničenie" -#: ../src/widgets/toolbox.cpp:1681 #: ../src/widgets/toolbox.cpp:1682 +#, fuzzy msgid "Snap bounding boxes" -msgstr "Prichytávať ohraničeniu" +msgstr "Prichytávať k rohom ohraničenia" -#: ../src/widgets/toolbox.cpp:1690 #: ../src/widgets/toolbox.cpp:1691 msgid "Bounding box edges" msgstr "Okraje ohraničenia" -#: ../src/widgets/toolbox.cpp:1690 #: ../src/widgets/toolbox.cpp:1691 msgid "Snap to edges of a bounding box" msgstr "Prichytávať k okrajom ohraničenia" -#: ../src/widgets/toolbox.cpp:1699 #: ../src/widgets/toolbox.cpp:1700 msgid "Bounding box corners" msgstr "Rohy ohraničenia" -#: ../src/widgets/toolbox.cpp:1699 #: ../src/widgets/toolbox.cpp:1700 msgid "Snap bounding box corners" msgstr "Prichytávať k rohom ohraničenia" -#: ../src/widgets/toolbox.cpp:1708 #: ../src/widgets/toolbox.cpp:1709 msgid "BBox Edge Midpoints" msgstr "Stredy hrán ohraničenia" -#: ../src/widgets/toolbox.cpp:1708 #: ../src/widgets/toolbox.cpp:1709 +#, fuzzy msgid "Snap midpoints of bounding box edges" msgstr "Prichytávať k stredom okrajov ohraničenia" -#: ../src/widgets/toolbox.cpp:1718 #: ../src/widgets/toolbox.cpp:1719 msgid "BBox Centers" msgstr "Stredy ohraničení" -#: ../src/widgets/toolbox.cpp:1718 #: ../src/widgets/toolbox.cpp:1719 +#, fuzzy msgid "Snapping centers of bounding boxes" msgstr "Prichytávanie k stredom okrajov ohraničenia" -#: ../src/widgets/toolbox.cpp:1727 #: ../src/widgets/toolbox.cpp:1728 +#, fuzzy msgid "Snap nodes, paths, and handles" -msgstr "Prichytávať uzly, cesty a úchopy" +msgstr "Prichytávať uzly alebo úchopy" -#: ../src/widgets/toolbox.cpp:1735 #: ../src/widgets/toolbox.cpp:1736 msgid "Snap to paths" msgstr "Prichytávať k cestám" -#: ../src/widgets/toolbox.cpp:1744 #: ../src/widgets/toolbox.cpp:1745 msgid "Path intersections" msgstr "Priesečníky ciest" -#: ../src/widgets/toolbox.cpp:1744 #: ../src/widgets/toolbox.cpp:1745 msgid "Snap to path intersections" msgstr "Prichytávať k priesečníkom ciest" -#: ../src/widgets/toolbox.cpp:1753 #: ../src/widgets/toolbox.cpp:1754 msgid "To nodes" msgstr "K uzlom" -#: ../src/widgets/toolbox.cpp:1753 #: ../src/widgets/toolbox.cpp:1754 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1762 #: ../src/widgets/toolbox.cpp:1763 msgid "Smooth nodes" msgstr "Hladké uzly" -#: ../src/widgets/toolbox.cpp:1762 #: ../src/widgets/toolbox.cpp:1763 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:1771 #: ../src/widgets/toolbox.cpp:1772 msgid "Line Midpoints" msgstr "Stredy úsečiek" -#: ../src/widgets/toolbox.cpp:1771 #: ../src/widgets/toolbox.cpp:1772 +#, fuzzy msgid "Snap midpoints of line segments" msgstr "Prichytávať k stredom úsečiek" -#: ../src/widgets/toolbox.cpp:1780 #: ../src/widgets/toolbox.cpp:1781 +#, fuzzy msgid "Others" msgstr "Ďalšie" -#: ../src/widgets/toolbox.cpp:1780 #: ../src/widgets/toolbox.cpp:1781 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" -"Prichytávať k iným bodom (stredy, východiská vodidiel, úchopy farebných " -"prechodov atď.)" -#: ../src/widgets/toolbox.cpp:1788 #: ../src/widgets/toolbox.cpp:1789 msgid "Object Centers" msgstr "Stredy objektov" -#: ../src/widgets/toolbox.cpp:1788 #: ../src/widgets/toolbox.cpp:1789 +#, fuzzy msgid "Snap centers of objects" msgstr "Prichytávať k stredom objektov" -#: ../src/widgets/toolbox.cpp:1797 #: ../src/widgets/toolbox.cpp:1798 msgid "Rotation Centers" msgstr "Stredy _rotácie" -#: ../src/widgets/toolbox.cpp:1797 #: ../src/widgets/toolbox.cpp:1798 +#, fuzzy msgid "Snap an item's rotation center" msgstr "Prichytávať k stredom otáčania objektov" -#: ../src/widgets/toolbox.cpp:1806 #: ../src/widgets/toolbox.cpp:1807 msgid "Text baseline" msgstr "Základňa textu" -#: ../src/widgets/toolbox.cpp:1806 #: ../src/widgets/toolbox.cpp:1807 +#, fuzzy msgid "Snap text anchors and baselines" -msgstr "Zarovnanie ukotvenia a základní textu" +msgstr "Zarovnanie základní textu" -#: ../src/widgets/toolbox.cpp:1816 #: ../src/widgets/toolbox.cpp:1817 msgid "Page border" msgstr "Okraj stránky" -#: ../src/widgets/toolbox.cpp:1816 #: ../src/widgets/toolbox.cpp:1817 msgid "Snap to the page border" msgstr "Prichytávať k okraju stránky" -#: ../src/widgets/toolbox.cpp:1825 #: ../src/widgets/toolbox.cpp:1826 msgid "Snap to grids" msgstr "Prichytávať k mriežkam" -#: ../src/widgets/toolbox.cpp:1834 #: ../src/widgets/toolbox.cpp:1835 +#, fuzzy msgid "Snap guides" msgstr "Prichytávať k vodidlám" @@ -33558,11 +28540,12 @@ msgid "Use the pressure of the input device to alter the force of tweak action" msgstr "Použiť tlak vstupného zariadenia na zmenu sily činnosti ladenia" #: ../share/extensions/convert2dashes.py:93 +#, fuzzy msgid "" "The selected object is not a path.\n" "Try using the procedure Path->Object to Path." msgstr "" -"Vybraný objekt nie je cesta.\n" +"Prvý vybraný objekt nie je cesta.\n" "Skúste použiť postup Cesta -> Objekt na cestu." #: ../share/extensions/dimension.py:109 @@ -33571,7 +28554,8 @@ msgstr "Duplikuje vybrané objekty." #: ../share/extensions/dimension.py:134 msgid "Unable to process this object. Try changing it into a path first." -msgstr "Nie je možné spracovať tento objekt. Skúste ho najskôr zmeniť na cestu." +msgstr "" +"Nie je možné spracovať tento objekt. Skúste ho najskôr zmeniť na cestu." #. report to the Inkscape console using errormsg #: ../share/extensions/draw_from_triangle.py:180 @@ -33606,7 +28590,6 @@ msgstr "Polobvod (px): " msgid "Area (px^2): " msgstr "Plocha (px^2):" -#: ../share/extensions/dxf_input.py:512 #: ../share/extensions/dxf_input.py:504 #, python-format msgid "" @@ -33629,9 +28612,9 @@ msgid "" msgstr "" #: ../share/extensions/dxf_outlines.py:341 -#, python-format +#, fuzzy, python-format msgid "Warning: Layer '%s' not found!" -msgstr "" +msgstr "Vrstvu na vrch" #: ../share/extensions/embedimage.py:84 msgid "" @@ -33673,8 +28656,9 @@ msgid "Unable to find image data." msgstr "Problém pri hľadaní obrazových údajov." #: ../share/extensions/extrude.py:43 +#, fuzzy msgid "Need at least 2 paths selected" -msgstr "" +msgstr "Vybrať všetky vrstvy ak nič nie je vybrané" #: ../share/extensions/funcplot.py:48 msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" @@ -33685,8 +28669,9 @@ msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" msgstr "" #: ../share/extensions/funcplot.py:315 +#, fuzzy msgid "Please select a rectangle" -msgstr "Prosím, vyberte obdĺžnik" +msgstr "Duplikuje vybrané objekty." #: ../share/extensions/gcodetools.py:3321 #: ../share/extensions/gcodetools.py:4526 @@ -33698,8 +28683,11 @@ msgstr "" "Nie sú vybrané žiadne cesty! Skúša sa aplikácia na všetky dostupné cesty." #: ../share/extensions/gcodetools.py:3324 -msgid "Nothing is selected. Please select something." -msgstr "Nič nebolo vybrané. Prosím, vyberte niečo." +#, fuzzy +msgid "Noting is selected. Please select something." +msgstr "" +"Nič nebolo vybrané. Prosím, vyberte niečo na konverziu bodu vŕtania " +"(dxfpoint) alebo odstráňte označenie bodu." #: ../share/extensions/gcodetools.py:3864 msgid "" @@ -33733,6 +28721,7 @@ msgstr "Vrstva „%s“ obsahuje viac ako jednu skupinu orientačných bodov" #: ../share/extensions/gcodetools.py:4078 #: ../share/extensions/gcodetools.py:4080 +#, fuzzy msgid "" "Orientation points are wrong! (if there are two orientation points they " "should not be the same. If there are three orientation points they should " @@ -33751,13 +28740,13 @@ msgstr "" "bude poškodený!" #: ../share/extensions/gcodetools.py:4263 -#, python-format +#, fuzzy, python-format msgid "" "Warning! Found bad graffiti reference point in '%s' layer. Resulting Gcode " "could be corrupt!" msgstr "" -"Upozornenie. Nájdené chybné orientačné body graffitov vo vrstve „%s“. " -"Výsledný Gcode bude poškodený!" +"Upozornenie. Nájdené chybné orientačné body vo vrstve „%s“. Výsledný Gcode " +"bude poškodený!" #. xgettext:no-pango-format #: ../share/extensions/gcodetools.py:4284 @@ -33803,8 +28792,8 @@ msgstr "" #, python-format msgid "Warning! Tool has parameter that default tool has not ( '%s': '%s' )." msgstr "" -"Upozornenie! Nástroj má parameter, ktorý predvolený nástroj nemá ( „%s“: „%" -"s“ )." +"Upozornenie! Nástroj má parameter, ktorý predvolený nástroj nemá ( „%s“: " +"„%s“ )." #: ../share/extensions/gcodetools.py:4388 #, python-format @@ -33821,6 +28810,7 @@ msgstr "" #: ../share/extensions/gcodetools.py:4553 #: ../share/extensions/gcodetools.py:4708 +#, fuzzy msgid "" "Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl" "+Shift+G) and Object to Path (Ctrl+Shift+C)!" @@ -33829,11 +28819,12 @@ msgstr "" "zoskupenie (Ctrl+Shift+G) a Objekt na cestu (Ctrl+Shift+C)!" #: ../share/extensions/gcodetools.py:4667 +#, fuzzy msgid "" -"Nothing is selected. Please select something to convert to drill point " +"Noting is selected. Please select something to convert to drill point " "(dxfpoint) or clear point sign." msgstr "" -"Nič nebolo vybrané. Prosím, vyberte niečo na konverziu na bod vŕtania " +"Nič nebolo vybrané. Prosím, vyberte niečo na konverziu bodu vŕtania " "(dxfpoint) alebo odstráňte označenie bodu." #: ../share/extensions/gcodetools.py:4750 @@ -33855,23 +28846,23 @@ msgid "Warning: omitting non-path" msgstr "Upozornenie: vynecháva sa entita, ktorá nie je cestou" #: ../share/extensions/gcodetools.py:5511 +#, fuzzy msgid "Please select at least one path to engrave and run again." -msgstr "" -"Vyberte aspoň 1 cestu na vykonanie vytvorenie reliéfu a skúste to znova." +msgstr "Vyberte najmenej 1 cestu na vykonanie booleovského zjednotenia." #: ../share/extensions/gcodetools.py:5519 msgid "Unknown unit selected. mm assumed" msgstr "Vybraná neznáma jednotka. predpokladajú sa mm." #: ../share/extensions/gcodetools.py:5540 -#, python-format +#, fuzzy, python-format msgid "Tool '%s' has no shape. 45 degree cone assumed!" -msgstr "Nástroj „%s“ nemá žiaden tvar! Predpokladá sa 45° kužeľ!" +msgstr "Nástroj „%s“ nemá žiaden tvar!" #: ../share/extensions/gcodetools.py:5611 #: ../share/extensions/gcodetools.py:5616 msgid "csp_normalised_normal error. See log." -msgstr "Chyba csp_normalised_normal. Pozri záznam." +msgstr "" #: ../share/extensions/gcodetools.py:5804 msgid "No need to engrave sharp angles." @@ -33882,8 +28873,7 @@ msgid "" "Active layer already has orientation points! Remove them or select another " "layer!" msgstr "" -"Aktívna vrstva už má orientačné body! Odstráňte ich alebo vyberte inú " -"vrstvu!" +"Aktívna vrstva už má orientačné body! Odstráňte ich alebo vyberte inú vrstvu!" #: ../share/extensions/gcodetools.py:5893 msgid "Active layer already has a tool! Remove it or select another layer!" @@ -33918,15 +28908,14 @@ msgid "Lathe X and Z axis remap should be the same. Exiting..." msgstr "Premapovanie osí X a Z sústruhu by malo byť rovnaké. Ukončuje sa..." #: ../share/extensions/gcodetools.py:6662 -#, python-format +#, fuzzy, python-format msgid "" "Select one of the action tabs - Path to Gcode, Area, Engraving, DXF points, " "Orientation, Offset, Lathe or Tools library.\n" " Current active tab id is %s" msgstr "" "Vyberte aspoň jednu z aktívnych záložiek - Cesta k Gcode, Rytina, Body DXF, " -"Orientácia, Posunutie, Sústruh alebo Knižnica nástrojov\n" -" Id momentálne aktívnej karty je %s" +"Orientácia, Posunutie, Sústruh alebo Knižnica nástrojov" #: ../share/extensions/gcodetools.py:6668 msgid "" @@ -33951,59 +28940,61 @@ msgid "" msgstr "" #: ../share/extensions/generate_voronoi.py:36 +#, fuzzy msgid "Python version is: " -msgstr "Verzia Pythonu je:" +msgstr "Konvertovať na vodidlá:" #: ../share/extensions/generate_voronoi.py:94 +#, fuzzy msgid "Please select an object" -msgstr "Prosím, vyberte objekt" +msgstr "Duplikuje vybrané objekty." #: ../share/extensions/gimp_xcf.py:39 msgid "Gimp must be installed and set in your path variable." -msgstr "GIMP musí byť nainštalovaný a nastavený v premennej prostredia PATH." +msgstr "" #: ../share/extensions/gimp_xcf.py:43 msgid "An error occurred while processing the XCF file." -msgstr "Vyskytla sa chyba počas spracovania súboru XCF." +msgstr "" #: ../share/extensions/gimp_xcf.py:177 +#, fuzzy msgid "This extension requires at least one non empty layer." -msgstr "Toto rozšírenie vyžaduje aspoň jednu neprázdnu vrstvu." +msgstr "Toto rozšírenie vyžaduje, aby bola vybraná aspoň jedna cesta." #: ../share/extensions/guillotine.py:250 msgid "The sliced bitmaps have been saved as:" -msgstr "Rozrezané bitmapy boli uložené ako:" +msgstr "" #: ../share/extensions/hpgl_decoder.py:43 +#, fuzzy msgid "Movements" -msgstr "Posuny" +msgstr "Posunúť farebné prechody" #: ../share/extensions/hpgl_decoder.py:44 +#, fuzzy msgid "Pen #" -msgstr "Č. pera" +msgstr "Hmotnosť pera" #. issue error if no hpgl data found #: ../share/extensions/hpgl_input.py:58 +#, fuzzy msgid "No HPGL data found." -msgstr "Neboli nájdené žiadne dáta HPGL" +msgstr "Nezaoblený" #: ../share/extensions/hpgl_input.py:66 msgid "" "The HPGL data contained unknown (unsupported) commands, there is a " "possibility that the drawing is missing some content." msgstr "" -"Dáta HPGL obsahovali neznáme (nepodporované) príkazy. Existuje možnosť, že " -"časť kresby chýba." #. issue error if no paths found #: ../share/extensions/hpgl_output.py:58 msgid "" "No paths where found. Please convert all objects you want to save into paths." msgstr "" -"Neboli nájdené žiadne cesty. Prosím, preveďte na cesty všetky objekty, ktoré " -"chcete uložiť." -#: ../share/extensions/inkex.py:116 +#: ../share/extensions/inkex.py:109 #, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " @@ -34015,35 +29006,34 @@ msgid "" "%s" msgstr "" "inkex.py vyžaduje fantastický lxml wrapper pre libxml2 a teda toto " -"rozšírenie. Prosím, stiahnite a nainštalujte jeho najnovšiu verziu z " -"http://cheeseshop.python.org/pypi/lxml/ alebo prostredníctvom vášho správcu " +"rozšírenie. Prosím, stiahnite a nainštalujte jeho najnovšiu verziu z http://" +"cheeseshop.python.org/pypi/lxml/ alebo prostredníctvom vášho správcu " "balíčkov príkazom ako: sudo apt-get install python-lxml\n" "\n" "Technické podrobnosti:\n" "%s" -#: ../share/extensions/inkex.py:169 -#, python-format +#: ../share/extensions/inkex.py:162 +#, fuzzy, python-format msgid "Unable to open specified file: %s" -msgstr "Nie je možné otvoriť uvedený súbor: %s" +msgstr "" +"Nie je možné zapisovať do uvedeného súboru|\n" +"%s" -#: ../share/extensions/inkex.py:178 -#, python-format +#: ../share/extensions/inkex.py:171 +#, fuzzy, python-format msgid "Unable to open object member file: %s" -msgstr "Nebolo možné otvoriť súbor člena objektu: %s" +msgstr "nebolo možné nájsť zakončenie čiary: %s" -#: ../share/extensions/inkex.py:283 +#: ../share/extensions/inkex.py:276 #, python-format msgid "No matching node for expression: %s" msgstr "Výrazu „%s“ nezodpovedá žiadny uzol" -#: ../share/extensions/inkex.py:313 -msgid "SVG Width not set correctly! Assuming width = 100" -msgstr "Šírka SVG nebola správne nastavená. Predpokladá sa šírka 100." - #: ../share/extensions/interp_att_g.py:167 +#, fuzzy msgid "There is no selection to interpolate" -msgstr "" +msgstr "Presunie výber na najvyššiu úroveň" #: ../share/extensions/jessyInk_autoTexts.py:45 #: ../share/extensions/jessyInk_effects.py:50 @@ -34064,10 +29054,11 @@ msgid "" msgstr "" #: ../share/extensions/jessyInk_autoTexts.py:48 +#, fuzzy msgid "" "To assign an effect, please select an object.\n" "\n" -msgstr "" +msgstr "Duplikuje vybrané objekty." #: ../share/extensions/jessyInk_autoTexts.py:54 msgid "" @@ -34104,48 +29095,47 @@ msgid "JessyInk script installed." msgstr "" #: ../share/extensions/jessyInk_summary.py:83 +#, fuzzy msgid "" "\n" "Master slide:" -msgstr "" -"\n" -"Hlavná snímka:" +msgstr "Hlavná snímka" #: ../share/extensions/jessyInk_summary.py:89 msgid "" "\n" "Slide {0!s}:" msgstr "" -"\n" -"Snímka {0!s}:" #: ../share/extensions/jessyInk_summary.py:94 +#, fuzzy msgid "{0}Layer name: {1}" -msgstr "{0}Názov vrstvy: {1}" +msgstr "Názov vrstvy:" #: ../share/extensions/jessyInk_summary.py:102 msgid "{0}Transition in: {1} ({2!s} s)" -msgstr "{0}Prechod do: {1} ({2!s} s)" +msgstr "" #: ../share/extensions/jessyInk_summary.py:104 +#, fuzzy msgid "{0}Transition in: {1}" -msgstr "{0}Prechod do: {1}" +msgstr "Prechodový efekt" #: ../share/extensions/jessyInk_summary.py:111 msgid "{0}Transition out: {1} ({2!s} s)" -msgstr "{0}Prechod z: {1} ({2!s} s)" +msgstr "" #: ../share/extensions/jessyInk_summary.py:113 +#, fuzzy msgid "{0}Transition out: {1}" -msgstr "{0}Prechod z: {1}" +msgstr "Efekt prechodu von" #: ../share/extensions/jessyInk_summary.py:120 +#, fuzzy msgid "" "\n" "{0}Auto-texts:" -msgstr "" -"\n" -"{0}Auto-texty:" +msgstr "Auto-texty" #: ../share/extensions/jessyInk_summary.py:123 msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"." @@ -34172,32 +29162,35 @@ msgid "{0}\tObject \"{1}\"" msgstr "" #: ../share/extensions/jessyInk_summary.py:179 +#, fuzzy msgid " will appear" -msgstr " sa objaví" +msgstr "Vyplniť ohraničenú oblasť" #: ../share/extensions/jessyInk_summary.py:181 msgid " will disappear" -msgstr " zmizne" +msgstr "" #: ../share/extensions/jessyInk_summary.py:184 msgid " using effect \"{0}\"" -msgstr " pomocou efektu „{0}“" +msgstr "" #: ../share/extensions/jessyInk_summary.py:187 msgid " in {0!s} s" -msgstr " o {0!s} s" +msgstr "" #: ../share/extensions/jessyInk_transitions.py:55 +#, fuzzy msgid "Layer not found.\n" -msgstr "Vrstva nenájdená.\n" +msgstr "Vrstvu na vrch" #: ../share/extensions/jessyInk_transitions.py:57 msgid "More than one layer with this name found.\n" -msgstr "Nájdená viac ako jedna vrstva s týmto názvom.\n" +msgstr "" #: ../share/extensions/jessyInk_transitions.py:70 +#, fuzzy msgid "Please enter a layer name.\n" -msgstr "Prosím, zadajte názov vrstvy.\n" +msgstr "Musíte zadať názov súboru" #: ../share/extensions/jessyInk_video.py:54 #: ../share/extensions/jessyInk_video.py:59 @@ -34207,8 +29200,11 @@ msgid "" msgstr "" #: ../share/extensions/jessyInk_view.py:75 +#, fuzzy msgid "More than one object selected. Please select only one object.\n" -msgstr "Bol vybraný viac ako jeden objekt. Prosím, vyberte iba jeden objekt.\n" +msgstr "" +"Bol vybraný viac ako jeden objekt. Nie je možné zobrať štýl z " +"viacerých objektov." #: ../share/extensions/jessyInk_view.py:79 msgid "" @@ -34227,18 +29223,19 @@ msgid "unable to locate marker: %s" msgstr "nebolo možné nájsť zakončenie čiary: %s" #: ../share/extensions/measure.py:50 +#, fuzzy msgid "" "Failed to import the numpy modules. These modules are required by this " "extension. Please install them and try again. On a Debian-like system this " "can be done with the command, sudo apt-get install python-numpy." msgstr "" -"Nepodarilo sa importovať moduly numpy. Toto rozšírenie vyžaduje tieto " -"moduly. Prosím, nainštalujte ich a skúste to znova. Na systéme Debian sa to " -"robí príkazom sudo apt-get install python-numpy." +"Nepodarilo sa importovať moduly numpy alebo numpy.linalg. Toto rozšírenie " +"vyžaduje tieto moduly. Prosím, nainštalujte ich a skúste to znova. Na " +"systéme Debian sa to robí príkazom sudo apt-get install python-numpy." #: ../share/extensions/measure.py:112 msgid "Area is zero, cannot calculate Center of Mass" -msgstr "Plocha je nulová, nie je možné vypočítať ťažisko" +msgstr "" #: ../share/extensions/pathalongpath.py:208 #: ../share/extensions/pathscatter.py:228 @@ -34368,7 +29365,8 @@ msgstr "Skúste vybrať „Stranovo definované“ v záložke „Súbor modelu msgid "" "Face Data Not Found. Ensure file contains face data, and check the file is " "imported as \"Face-Specified\" under the \"Model File\" tab.\n" -msgstr "Údaje o stenách neboli nájdené. Uistite sa, že súbor obsahuje údaje o " +msgstr "" +"Údaje o stenách neboli nájdené. Uistite sa, že súbor obsahuje údaje o " "stenách a skontrolujte či je súbor importovaný ako „Stranovo definované“ v " "záložke „Súbor modelu“.\n" @@ -34381,35 +29379,35 @@ msgid "sorry, this will run only on Windows, exiting..." msgstr "" #: ../share/extensions/print_win32_vector.py:179 +#, fuzzy msgid "Failed to open default printer" -msgstr "Nepodarilo sa otvoriť predvolená tlačiareň" +msgstr "Nepodarilo sa nastaviť CairoRenderContext" #: ../share/extensions/render_barcode_datamatrix.py:202 msgid "Unrecognised DataMatrix size" -msgstr "Nerozpoznaná veľkosť DataMatrix" +msgstr "" #. we have an invalid bit value #: ../share/extensions/render_barcode_datamatrix.py:643 msgid "Invalid bit value, this is a bug!" -msgstr "Neplatná bitová hodnota, toto je chyba!" +msgstr "" #. abort if converting blank text #: ../share/extensions/render_barcode_datamatrix.py:678 msgid "Please enter an input string" -msgstr "Prosím, zadajte vstupný reťazec" +msgstr "" #. abort if converting blank text #: ../share/extensions/render_barcode_qrcode.py:1054 +#, fuzzy msgid "Please enter an input text" -msgstr "Musíte zadať vstupný text" +msgstr "Musíte zadať názov súboru" #: ../share/extensions/replace_font.py:133 msgid "" "Couldn't find anything using that font, please ensure the spelling and " "spacing is correct." msgstr "" -"Nenašlo sa nič používajúce toto písmo. Prosím, skontrolujte, či je pravopis " -"a rozostup správny." #: ../share/extensions/replace_font.py:140 #: ../share/extensions/svg_and_media_zip_output.py:193 @@ -34433,20 +29431,21 @@ msgstr "" "%s" #: ../share/extensions/replace_font.py:196 +#, fuzzy msgid "There was nothing selected" msgstr "Nič nebolo vybrané" #: ../share/extensions/replace_font.py:244 msgid "Please enter a search string in the find box." -msgstr "Prosím, zadajte hľadaný reťazec do vyhľadávacieho poľa." +msgstr "" #: ../share/extensions/replace_font.py:248 msgid "Please enter a replacement font in the replace with box." -msgstr "Prosím, zadajte náhradné písmo do poľa nahradenia." +msgstr "" #: ../share/extensions/replace_font.py:253 msgid "Please enter a replacement font in the replace all box." -msgstr "Prosím, zadajte náhradné písmo do poľa nahradenia všetkých výskytov." +msgstr "" #: ../share/extensions/summersnight.py:44 msgid "" @@ -34463,8 +29462,9 @@ msgstr "Nebolo možné nájsť súbor: %s" #: ../share/extensions/svgcalendar.py:266 #: ../share/extensions/svgcalendar.py:288 +#, fuzzy msgid "You must select a correct system encoding." -msgstr "Musíte vybrať správne kódovanie systému." +msgstr "Musíte vybrať aspoň dva prvky." #: ../share/extensions/uniconv-ext.py:56 #: ../share/extensions/uniconv_output.py:122 @@ -34472,8 +29472,9 @@ msgid "You need to install the UniConvertor software.\n" msgstr "Musíte si nainštalovať sofvér UniConvertor.\n" #: ../share/extensions/voronoi2svg.py:215 +#, fuzzy msgid "Please select objects!" -msgstr "Prosím, vyberte objekty!" +msgstr "Duplikuje vybrané objekty." #: ../share/extensions/web-set-att.py:58 #: ../share/extensions/web-transmit-att.py:54 @@ -34484,43 +29485,42 @@ msgstr "Musíte vybrať aspoň dva prvky." msgid "" "You must create and select some \"Slicer rectangles\" before trying to group." msgstr "" -"Musíte vytvoriť a vybrať nejaké „Obdĺžnikové výrezy“ predtým, než sa " -"pokúsite o zoskupenie." #: ../share/extensions/webslicer_create_group.py:72 msgid "" "You must to select some \"Slicer rectangles\" or other \"Layout groups\"." msgstr "" -"Musíte vybrať nejaké „Obdĺžnikové výrezy“ alebo iné „Skupiny usporiadania“." #: ../share/extensions/webslicer_create_group.py:76 #, python-format msgid "Oops... The element \"%s\" is not in the Web Slicer layer" -msgstr "Ups... Prvok „%s“ nie je vo vrstve Výrezov pre web" +msgstr "" #: ../share/extensions/webslicer_export.py:57 msgid "You must give a directory to export the slices." -msgstr "Musíte zadať adresár, kam exportovať výrezy." +msgstr "Musíte poskytnúť priečinok na export výrezov." #: ../share/extensions/webslicer_export.py:69 -#, python-format +#, fuzzy, python-format msgid "Can't create \"%s\"." -msgstr "Nie je možné vytvoriť „%s“." +msgstr "" +"Nie je možné vytvoriť súbor %s.\n" +"%s" #: ../share/extensions/webslicer_export.py:70 -#, python-format +#, fuzzy, python-format msgid "Error: %s" -msgstr "Chyba: %s" +msgstr "Chyby" #: ../share/extensions/webslicer_export.py:73 -#, python-format +#, fuzzy, python-format msgid "The directory \"%s\" does not exists." -msgstr "Adresár „%s“ neexistuje." +msgstr "Vytvoriť adresár ak neexistuje" #: ../share/extensions/webslicer_export.py:102 #, python-format msgid "You have more than one element with \"%s\" html-id." -msgstr "Máte viac než jeden prvok html-id „%s“." +msgstr "" #: ../share/extensions/webslicer_export.py:332 msgid "You must install the ImageMagick to get JPG and GIF." @@ -34530,7 +29530,7 @@ msgstr "Na podporu JPG a GIF potrebujete mať nainštalovaný ImageMagick." #. lines of longitude are odd : abort #: ../share/extensions/wireframe_sphere.py:116 msgid "Please enter an even number of lines of longitude." -msgstr "Prosím, zadajte párny počet riadkov zemepisnej dĺžky." +msgstr "" #. vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 #: ../share/extensions/addnodes.inx.h:1 @@ -34545,6 +29545,10 @@ msgstr "Metóda delenia:" msgid "By max. segment length" msgstr "Podľa max. dĺžky úseku (px)" +#: ../share/extensions/addnodes.inx.h:4 +msgid "By number of segments" +msgstr "Podľa počtu úsekov" + #: ../share/extensions/addnodes.inx.h:5 msgid "Maximum segment length (px):" msgstr "Maximálna dĺžka úseku (px):" @@ -34593,94 +29597,112 @@ msgid "Cleans the cruft out of Adobe Illustrator SVGs before opening" msgstr "Vyčistiť zbytočnosti z Adobe Illustrator SVG pred otvorením" #: ../share/extensions/ccx_input.inx.h:1 +#, fuzzy msgid "Corel DRAW Compressed Exchange files input (UC)" -msgstr "Corel DRAW Compressed Exchange (UC)" +msgstr "Vstup Corel DRAW Compressed Exchange súbory" #: ../share/extensions/ccx_input.inx.h:2 +#, fuzzy msgid "Corel DRAW Compressed Exchange files (UC) (*.ccx)" -msgstr "Corel DRAW Compressed Exchange (UC) (*.ccx)" +msgstr "Corel DRAW Compressed Exchange súbory (.ccx)" #: ../share/extensions/ccx_input.inx.h:3 +#, fuzzy msgid "Open compressed exchange files saved in Corel DRAW (UC)" -msgstr "Open compressed exchange súbory uložené v Corel DRAW (UC)" +msgstr "Open compressed exchange súbory uložené v Corel DRAW" #: ../share/extensions/cdr_input.inx.h:1 +#, fuzzy msgid "Corel DRAW Input (UC)" -msgstr "Vstup Corel DRAW (UC)" +msgstr "Vstup Corel DRAW" #: ../share/extensions/cdr_input.inx.h:2 +#, fuzzy msgid "Corel DRAW 7-X4 files (UC) (*.cdr)" -msgstr "Corel DRAW 7-X4 (UC) (*.cdr)" +msgstr "Corel DRAW 7-X4 súbory (*.cdr)" #: ../share/extensions/cdr_input.inx.h:3 +#, fuzzy msgid "Open files saved in Corel DRAW 7-X4 (UC)" -msgstr "Otvoriť súbory uložené v Corel DRAW 7-X4 (UC)" +msgstr "Otvoriť súbory uložené v Corel DRAW 7-X4" #: ../share/extensions/cdt_input.inx.h:1 +#, fuzzy msgid "Corel DRAW templates input (UC)" -msgstr "Vstup šablón Corel DRAW (UC)" +msgstr "Vstup Corel DRAW šablón" #: ../share/extensions/cdt_input.inx.h:2 +#, fuzzy msgid "Corel DRAW 7-13 template files (UC) (*.cdt)" -msgstr "Corel DRAW 7-13 súbory šablón (UC) (*.cdt)" +msgstr "Corel DRAW 7-13 súbory šablón (.cdt)" #: ../share/extensions/cdt_input.inx.h:3 +#, fuzzy msgid "Open files saved in Corel DRAW 7-13 (UC)" -msgstr "Otvoriť súbory uložené v Corel DRAW 7-13 (UC)" +msgstr "Otvoriť súbory uložené v Corel DRAW 7-13" #: ../share/extensions/cgm_input.inx.h:1 msgid "Computer Graphics Metafile files input" -msgstr "Vstup súborov Computer Graphics Metafile" +msgstr "Vstup Computer Graphics Metafile súbory" #: ../share/extensions/cgm_input.inx.h:2 +#, fuzzy msgid "Computer Graphics Metafile files (*.cgm)" -msgstr "Computer Graphics Metafile (.cgm)" +msgstr "Computer Graphics Metafile súbory (.cgm)" #: ../share/extensions/cgm_input.inx.h:3 msgid "Open Computer Graphics Metafile files" -msgstr "Open Computer Graphics Metafile" +msgstr "Open Computer Graphics Metafile súbory" #: ../share/extensions/cmx_input.inx.h:1 +#, fuzzy msgid "Corel DRAW Presentation Exchange files input (UC)" -msgstr "Corel DRAW Presentation Exchange (UC)" +msgstr "Vstup Corel DRAW Presentation Exchange súbory" #: ../share/extensions/cmx_input.inx.h:2 +#, fuzzy msgid "Corel DRAW Presentation Exchange files (UC) (*.cmx)" -msgstr "Corel DRAW Presentation Exchange (UC) (*.cmx)" +msgstr "Corel DRAW Presentation Exchange súbory (.cmx)" #: ../share/extensions/cmx_input.inx.h:3 +#, fuzzy msgid "Open presentation exchange files saved in Corel DRAW (UC)" -msgstr "Open presentation exchange súbory uložené v Corel DRAW (UC)" +msgstr "Open presentation exchange súbory uložené v Corel DRAW" #: ../share/extensions/color_HSL_adjust.inx.h:1 +#, fuzzy msgid "HSL Adjust" msgstr "Doladiť HSB" #: ../share/extensions/color_HSL_adjust.inx.h:3 +#, fuzzy msgid "Hue (°)" -msgstr "Odtieň (°)" +msgstr "Otočenie odtieňa (°):" #: ../share/extensions/color_HSL_adjust.inx.h:4 +#, fuzzy msgid "Random hue" -msgstr "Náhodný odtieň" +msgstr "Náhodný strom" #: ../share/extensions/color_HSL_adjust.inx.h:6 -#, no-c-format +#, fuzzy, no-c-format msgid "Saturation (%)" -msgstr "Sýtosť (%)" +msgstr "Sýtosť:" #: ../share/extensions/color_HSL_adjust.inx.h:7 +#, fuzzy msgid "Random saturation" -msgstr "Náhodná sýtosť" +msgstr "Doladiť sýtosť" #: ../share/extensions/color_HSL_adjust.inx.h:9 -#, no-c-format +#, fuzzy, no-c-format msgid "Lightness (%)" -msgstr "Jas (%)" +msgstr "Jas:" #: ../share/extensions/color_HSL_adjust.inx.h:10 +#, fuzzy msgid "Random lightness" -msgstr "Náhodný jas" +msgstr "Jas:" #: ../share/extensions/color_HSL_adjust.inx.h:13 #, no-c-format @@ -34708,9 +29730,10 @@ msgid "Brighter" msgstr "Svetlejšia" #: ../share/extensions/color_custom.inx.h:1 +#, fuzzy msgctxt "Custom color extension" msgid "Custom" -msgstr "Vlastné" +msgstr "Vlastná" #: ../share/extensions/color_custom.inx.h:3 msgid "Red Function:" @@ -34843,16 +29866,17 @@ msgid "Convert to Dashes" msgstr "Konvertovať na pomlčky" #: ../share/extensions/dhw_input.inx.h:1 +#, fuzzy msgid "DHW file input" -msgstr "Vstup súboru DHW" +msgstr "Vstup Windows Metasúbor" #: ../share/extensions/dhw_input.inx.h:2 msgid "ACECAD Digimemo File (*.dhw)" -msgstr "ACECAD Digimemo (*.dhw)" +msgstr "" #: ../share/extensions/dhw_input.inx.h:3 msgid "Open files from ACECAD Digimemo" -msgstr "Otvoriť súbory z ACECAD Digimemo" +msgstr "" #: ../share/extensions/dia.inx.h:1 msgid "Dia Input" @@ -34872,7 +29896,7 @@ msgid "" "In order to import Dia files, Dia itself must be installed. You can get Dia " "at http://live.gnome.org/Dia" msgstr "" -"Aby sa dali importovať súbory Dia, musí byť nainštalovaný samotný Dia. " +"Aby sa dali importovať súbory Dia, musí byť nainštalovaný samotný Dia. " "Môžete ho stiahnuť na http://live.gnome.org/Dia" #: ../share/extensions/dia.inx.h:4 @@ -34896,8 +29920,8 @@ msgid "Y Offset:" msgstr "Posun Y:" #: ../share/extensions/dimension.inx.h:4 -msgid "Bounding box type:" -msgstr "" +msgid "Bounding box type :" +msgstr "Typ ohraničenia:" #: ../share/extensions/dimension.inx.h:5 msgid "Geometric" @@ -34941,8 +29965,8 @@ msgstr "" "Toto rozšírenie nahradí uzly výberu očíslovanými bodkami s nasledovnými " "voľbami:\n" " * Veľkosť písma: veľkosť označení čísla uzla (20px, 12pt, ...).\n" -" * Ceľkosť bodky: priemer bodiek umiestnených na uzloch ciest (10px, 2mm, " -"...).\n" +" * Ceľkosť bodky: priemer bodiek umiestnených na uzloch ciest (10px, " +"2mm, ...).\n" " * Počiatočné číslo bodky: prvé číslo v poradí pridelené prvému uzlu " "cesty.\n" " * Krok: Krok v číslovaní medzi dvomi uzlami." @@ -35156,20 +30180,21 @@ msgid "DXF Input" msgstr "Vstup DXF" #: ../share/extensions/dxf_input.inx.h:3 -msgid "Method of Scaling:" -msgstr "" +msgid "Use automatic scaling to size A4" +msgstr "Použiť automatickú zmenu mierku na A4" #: ../share/extensions/dxf_input.inx.h:4 -msgid "Manual scale factor:" -msgstr "" +#, fuzzy +msgid "Or, use manual scale factor:" +msgstr "alebo použiť manuálnu mierku" #: ../share/extensions/dxf_input.inx.h:5 msgid "Manual x-axis origin (mm):" -msgstr "Manuálny počiatok osi X (mm):" +msgstr "" #: ../share/extensions/dxf_input.inx.h:6 msgid "Manual y-axis origin (mm):" -msgstr "Manuálny počiatok osi Y (mm):" +msgstr "" #: ../share/extensions/dxf_input.inx.h:7 msgid "Gcodetools compatible point import" @@ -35177,31 +30202,36 @@ msgstr "Import bodov kompatibilný s Gcodetools" #: ../share/extensions/dxf_input.inx.h:8 #: ../share/extensions/render_barcode_qrcode.inx.h:16 +#, fuzzy msgid "Character encoding:" -msgstr "Kódovanie znakov:" +msgstr "Kódovanie znakov" #: ../share/extensions/dxf_input.inx.h:9 +#, fuzzy msgid "Text Font:" -msgstr "Písmo textu:" +msgstr "Písmo textu" #: ../share/extensions/dxf_input.inx.h:11 +#, fuzzy msgid "" "- AutoCAD Release 13 and newer.\n" -"- for manual scaling, assume dxf drawing is in mm.\n" -"- assume svg drawing is in pixels, at 96 dpi.\n" +"- assume dxf drawing is in mm.\n" +"- assume svg drawing is in pixels, at 90 dpi.\n" "- scale factor and origin apply only to manual scaling.\n" -"- 'Automatic scaling' will fit the width of an A4 page.\n" -"- 'Read from file' uses the variable $MEASUREMENT.\n" "- layers are preserved only on File->Open, not Import.\n" "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." msgstr "" +"- AutoCAD Release 13 a novší.\n" +"- predpokládá, že DXF kresba je v mm.\n" +"- predpokladá, že SVG kresba je v pixloch pri 90 dpi.\n" +"- vrstvy sa zachovajú iba pri Súbor->Otvoriť, nie pri Importovať.\n" +"- obmedzená podpora BLOCKS, ak to potrebujete použite namiesto toho AutoCAD " +"Explode Blocks." -#: ../share/extensions/dxf_input.inx.h:19 #: ../share/extensions/dxf_input.inx.h:17 msgid "AutoCAD DXF R13 (*.dxf)" msgstr "AutoCAD DXF R13 (*.dxf)" -#: ../share/extensions/dxf_input.inx.h:20 #: ../share/extensions/dxf_input.inx.h:18 msgid "Import AutoCAD's Document Exchange Format" msgstr "Importovať Document Exchange Format AutoCADu" @@ -35219,20 +30249,22 @@ msgid "use LWPOLYLINE type of line output" msgstr "použiť typ výstupu čiar LWPOLYLINE" #: ../share/extensions/dxf_outlines.inx.h:5 -msgid "Base unit:" -msgstr "" +msgid "Base unit" +msgstr "Základná jednotka" #: ../share/extensions/dxf_outlines.inx.h:6 -msgid "Character Encoding:" -msgstr "" +msgid "Character Encoding" +msgstr "Kódovanie znakov" #: ../share/extensions/dxf_outlines.inx.h:7 -msgid "Layer export selection:" -msgstr "" +#, fuzzy +msgid "Layer export selection" +msgstr "Zmaže výber" #: ../share/extensions/dxf_outlines.inx.h:8 -msgid "Layer match name:" -msgstr "" +#, fuzzy +msgid "Layer match name" +msgstr "Názov vrstvy:" #: ../share/extensions/dxf_outlines.inx.h:9 msgid "pt" @@ -35284,8 +30316,9 @@ msgid "ft" msgstr "st" #: ../share/extensions/dxf_outlines.inx.h:17 +#, fuzzy msgid "Latin 1" -msgstr "Latin 1" +msgstr "Satén" #: ../share/extensions/dxf_outlines.inx.h:18 msgid "CP 1250" @@ -35300,22 +30333,25 @@ msgid "UTF 8" msgstr "UTF 8" #: ../share/extensions/dxf_outlines.inx.h:21 +#, fuzzy msgid "All (default)" -msgstr "Všetky (štandardné)" +msgstr "(štandardné)" #: ../share/extensions/dxf_outlines.inx.h:22 +#, fuzzy msgid "Visible only" -msgstr "Iba viditeľné" +msgstr "Viditeľné farby" #: ../share/extensions/dxf_outlines.inx.h:23 msgid "By name match" -msgstr "Podľa zhody názvu" +msgstr "" #: ../share/extensions/dxf_outlines.inx.h:25 +#, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " -"(96 px = 1 in).\n" +"(90 px = 1 in).\n" "- Supported element types\n" " - paths (lines and splines)\n" " - rectangles\n" @@ -35327,10 +30363,19 @@ msgid "" "- You can choose to export all layers, only visible ones or by name match " "(case insensitive and use comma ',' as separator)" msgstr "" +"- Formát AutoCAD Release 13.\n" +"- predpokladá, že SVG kresba je v pixloch pri 90 dpi.\n" +"- predpokladá, že DXF kresba je v mm.\n" +"- sú podporované iba elementy line a spline.\n" +"- voľba ROBO-Master je špecializovaná krivka, ktorú dokážu prečítať iba " +"prehliadače ROBO-Master a AutoDesk, nie Inkscape.\n" +"- Výstup LWPOLYLINE je viacnásobne spojená lomená čiara, pri jej vypnutí sa " +"použije stará verzia výstupu LINE." #: ../share/extensions/dxf_outlines.inx.h:34 +#, fuzzy msgid "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" -msgstr "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" +msgstr "Desktop Cutting Plotter (R13) (*.dxf)" #: ../share/extensions/dxf_output.inx.h:1 msgid "DXF Output" @@ -35339,8 +30384,8 @@ msgstr "Výstup DXF" #: ../share/extensions/dxf_output.inx.h:2 msgid "pstoedit must be installed to run; see http://www.pstoedit.net/pstoedit" msgstr "" -"Pre spustenie je potrebné mať nainštalovaný pstoedit; pozri " -"http://www.pstoedit.net/pstoedit" +"Pre spustenie je potrebné mať nainštalovaný pstoedit; pozri http://www." +"pstoedit.net/pstoedit" #: ../share/extensions/dxf_output.inx.h:3 msgid "AutoCAD DXF R12 (*.dxf)" @@ -35366,6 +30411,10 @@ msgstr "Odtiene:" msgid "Only black and white:" msgstr "Iba čierna a biela:" +#: ../share/extensions/edge3d.inx.h:5 +msgid "Stroke width:" +msgstr "Šírka ťahu:" + #: ../share/extensions/edge3d.inx.h:6 msgid "Blur stdDeviation:" msgstr "Štd. odchýlka rozostrenia:" @@ -35388,106 +30437,36 @@ msgid "Embed only selected images" msgstr "Vkladať iba vybrané obrázky" #: ../share/extensions/embedselectedimages.inx.h:1 +#, fuzzy msgid "Embed Selected Images" -msgstr "Vkladať vybrané obrázky" - -#: ../share/extensions/empty_business_card.inx.h:1 -msgid "Business Card" -msgstr "" - -#: ../share/extensions/empty_business_card.inx.h:2 -msgid "Business card size:" -msgstr "" - -#: ../share/extensions/empty_desktop.inx.h:1 -msgid "Desktop" -msgstr "" - -#: ../share/extensions/empty_desktop.inx.h:2 -msgid "Desktop size:" -msgstr "" - -#. Maximum size is '16k' -#: ../share/extensions/empty_desktop.inx.h:4 -#: ../share/extensions/empty_generic.inx.h:2 -#: ../share/extensions/empty_video.inx.h:4 -msgid "Custom Width:" -msgstr "" - -#: ../share/extensions/empty_desktop.inx.h:5 -#: ../share/extensions/empty_generic.inx.h:3 -#: ../share/extensions/empty_video.inx.h:5 -msgid "Custom Height:" -msgstr "" - -#: ../share/extensions/empty_dvd_cover.inx.h:1 -msgid "DVD Cover" -msgstr "" - -#: ../share/extensions/empty_dvd_cover.inx.h:2 -msgid "DVD spine width:" -msgstr "" - -#: ../share/extensions/empty_dvd_cover.inx.h:3 -msgid "DVD cover bleed (mm):" -msgstr "" - -#: ../share/extensions/empty_generic.inx.h:1 -msgid "Generic Canvas" -msgstr "" - -#: ../share/extensions/empty_generic.inx.h:4 -msgid "SVG Unit:" -msgstr "" - -#: ../share/extensions/empty_generic.inx.h:5 -msgid "Canvas background:" -msgstr "" - -#: ../share/extensions/empty_generic.inx.h:6 -#: ../share/extensions/empty_page.inx.h:5 -msgid "Hide border" -msgstr "" - -#: ../share/extensions/empty_icon.inx.h:1 -msgid "Icon" -msgstr "" +msgstr "Vkladať iba vybrané obrázky" -#: ../share/extensions/empty_icon.inx.h:2 -msgid "Icon size:" +#: ../share/extensions/empty_page.inx.h:1 +msgid "Empty Page" msgstr "" #: ../share/extensions/empty_page.inx.h:2 +#, fuzzy msgid "Page size:" -msgstr "Veľkosť stránky:" +msgstr "_Veľkosť stránky:" #: ../share/extensions/empty_page.inx.h:3 msgid "Page orientation:" msgstr "Orientácia stránky:" -#: ../share/extensions/empty_page.inx.h:4 -msgid "Page background:" -msgstr "" - -#: ../share/extensions/empty_video.inx.h:1 -msgid "Video Screen" -msgstr "" - -#: ../share/extensions/empty_video.inx.h:2 -msgid "Video size:" -msgstr "" - #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" msgstr "Vstup EPS" #: ../share/extensions/eqtexsvg.inx.h:1 +#, fuzzy msgid "LaTeX" -msgstr "LaTeX" +msgstr "Tlač LaTeX" #: ../share/extensions/eqtexsvg.inx.h:2 +#, fuzzy msgid "LaTeX input: " -msgstr "Vstup LaTeX:" +msgstr "Tlač LaTeX" #: ../share/extensions/eqtexsvg.inx.h:3 msgid "Additional packages (comma-separated): " @@ -35625,8 +30604,8 @@ msgstr "Používať polárne súradnice" msgid "" "When set, Isotropic scaling uses smallest of width/xrange or height/yrange" msgstr "" -"Keď je nastavená, izotropická zmena mierky používa minimum z pomeru " -"šírka/rozsah x alebo výška/rozsah y" +"Keď je nastavená, izotropická zmena mierky používa minimum z pomeru šírka/" +"rozsah x alebo výška/rozsah y" #: ../share/extensions/funcplot.inx.h:12 #: ../share/extensions/param_curves.inx.h:13 @@ -35697,8 +30676,9 @@ msgid "First derivative:" msgstr "Prvá derivácia:" #: ../share/extensions/funcplot.inx.h:34 +#, fuzzy msgid "Clip with rectangle" -msgstr "Orezať obdĺžnikom" +msgstr "Šírka obdĺžnika" #: ../share/extensions/funcplot.inx.h:35 #: ../share/extensions/param_curves.inx.h:28 @@ -35739,6 +30719,7 @@ msgstr "" #: ../share/extensions/gcodetools_path_to_gcode.inx.h:36 #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:18 #: ../share/extensions/gcodetools_tools_library.inx.h:13 +#, fuzzy msgid "" "Gcodetools plug-in: converts paths to Gcode (using circular interpolation), " "makes offset paths and engraves sharp corners using cone cutters. This plug-" @@ -35753,9 +30734,9 @@ msgstr "" "kužeľosečiek. Tento zásuvný modul vypočíta Gcode ciest pomocou kruhovej " "interpolácie alebo lineárneho pohybu ak treba. Návody, príručky a podporu " "nájdete na anglickom fóre podpory: \thttp://www.cnc-club.ru/gcodetools a " -"ruskom fóre podpory: http://www.cnc-club.ru/gcodetoolsru Autori: Nick " +"ruskom fóre podpory: \thttp://www.cnc-club.ru/gcodetoolsru Autori: Nick " "Drobchenko, Vladimir Kalyaev, John Brooker, Henry Nicolas. Gcodetools ver. " -"1.7" +"1.6.01" #: ../share/extensions/gcodetools_about.inx.h:5 #: ../share/extensions/gcodetools_area.inx.h:55 @@ -35785,7 +30766,7 @@ msgstr "Šírka oblasti:" #: ../share/extensions/gcodetools_area.inx.h:4 msgid "Area tool overlap (0..0.9):" -msgstr "Prekryv nástroja oblasti (0..0.9):" +msgstr "" #: ../share/extensions/gcodetools_area.inx.h:5 msgid "" @@ -35802,32 +30783,37 @@ msgstr "" "oblasti“ rovná „1/2 D“, vytvorí sa iba jeden posun." #: ../share/extensions/gcodetools_area.inx.h:6 +#, fuzzy msgid "Fill area" -msgstr "Vyplniť oblasť" +msgstr "Vyplniť ohraničenú oblasť" #: ../share/extensions/gcodetools_area.inx.h:7 +#, fuzzy msgid "Area fill angle" -msgstr "Uhol vyplnenia oblasti" +msgstr "Ľavý uhol:" #: ../share/extensions/gcodetools_area.inx.h:8 msgid "Area fill shift" -msgstr "Posun vyplnenia oblasti" +msgstr "" #: ../share/extensions/gcodetools_area.inx.h:9 +#, fuzzy msgid "Filling method" -msgstr "Metóda výplne" +msgstr "Metóda delenia:" #: ../share/extensions/gcodetools_area.inx.h:10 msgid "Zig zag" -msgstr "Cikcak" +msgstr "" #: ../share/extensions/gcodetools_area.inx.h:12 +#, fuzzy msgid "Area artifacts" msgstr "Artefakty oblasti" #: ../share/extensions/gcodetools_area.inx.h:13 +#, fuzzy msgid "Artifact diameter:" -msgstr "Priemer artefaktu:" +msgstr "Priemer oblasti:" #: ../share/extensions/gcodetools_area.inx.h:14 msgid "Action:" @@ -35864,8 +30850,9 @@ msgstr "Cesta k Gcode" #: ../share/extensions/gcodetools_area.inx.h:20 #: ../share/extensions/gcodetools_lathe.inx.h:13 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:2 +#, fuzzy msgid "Biarc interpolation tolerance:" -msgstr "Tolerancia bioblúkovej interpolácie:" +msgstr "Krokov interpolácie" #: ../share/extensions/gcodetools_area.inx.h:21 #: ../share/extensions/gcodetools_lathe.inx.h:14 @@ -35882,8 +30869,9 @@ msgstr "" #: ../share/extensions/gcodetools_area.inx.h:23 #: ../share/extensions/gcodetools_lathe.inx.h:16 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:5 +#, fuzzy msgid "Depth function:" -msgstr "Funkcia hĺbky:" +msgstr "Funkcia červenej:" #: ../share/extensions/gcodetools_area.inx.h:24 #: ../share/extensions/gcodetools_lathe.inx.h:17 @@ -36065,24 +31053,15 @@ msgstr "Vytvoriť súbor záznamu" msgid "Full path to log file:" msgstr "Plná cesta k súboru záznamu:" -#: ../share/extensions/gcodetools_area.inx.h:48 -#: ../share/extensions/gcodetools_dxf_points.inx.h:20 -#: ../share/extensions/gcodetools_engraving.inx.h:26 -#: ../share/extensions/gcodetools_graffiti.inx.h:37 -#: ../share/extensions/gcodetools_lathe.inx.h:41 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 -msgctxt "GCode postprocessor" -msgid "None" -msgstr "Žiadny" - #: ../share/extensions/gcodetools_area.inx.h:49 #: ../share/extensions/gcodetools_dxf_points.inx.h:21 #: ../share/extensions/gcodetools_engraving.inx.h:27 #: ../share/extensions/gcodetools_graffiti.inx.h:38 #: ../share/extensions/gcodetools_lathe.inx.h:42 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:31 +#, fuzzy msgid "Parameterize Gcode" -msgstr "Parameterizovať Gcode" +msgstr "Parametre" #: ../share/extensions/gcodetools_area.inx.h:50 #: ../share/extensions/gcodetools_dxf_points.inx.h:22 @@ -36091,7 +31070,7 @@ msgstr "Parameterizovať Gcode" #: ../share/extensions/gcodetools_lathe.inx.h:43 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:32 msgid "Flip y axis and parameterize Gcode" -msgstr "Prevrátiť os X a parameterizovať Gcode" +msgstr "" #: ../share/extensions/gcodetools_area.inx.h:51 #: ../share/extensions/gcodetools_dxf_points.inx.h:23 @@ -36100,7 +31079,7 @@ msgstr "Prevrátiť os X a parameterizovať Gcode" #: ../share/extensions/gcodetools_lathe.inx.h:44 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:33 msgid "Round all values to 4 digits" -msgstr "Zaokrúhliť všetky hodnoty na 4 cifry" +msgstr "Zaokrúhiť všetky hodnoty na 4 cifry" #: ../share/extensions/gcodetools_area.inx.h:52 #: ../share/extensions/gcodetools_dxf_points.inx.h:24 @@ -36109,7 +31088,7 @@ msgstr "Zaokrúhliť všetky hodnoty na 4 cifry" #: ../share/extensions/gcodetools_lathe.inx.h:45 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:34 msgid "Fast pre-penetrate" -msgstr "Rýchla predpenetrácia" +msgstr "" #: ../share/extensions/gcodetools_check_for_updates.inx.h:1 msgid "Check for updates" @@ -36142,8 +31121,8 @@ msgid "" msgstr "" "Previesť vybrané objekty na body vŕtania (ako robí zásuvný modul " "dxf_import). Môžete tiež uložiť pôvodný tvar. Použije sa iba počiatočný bod " -"každej krivky. Môžete tiež ručne vybrať objekt, otvoriť editor XML " -"(Shift+Ctrl+X) a pridať alebo odstrániť značku XML „dxfpoint“ s ľubovoľnou " +"každej krivky. Môžete tiež ručne vybrať objekt, otvoriť editor XML (Shift" +"+Ctrl+X) a pridať alebo odstrániť značku XML „dxfpoint“ s ľubovoľnou " "hodnotou." #: ../share/extensions/gcodetools_dxf_points.inx.h:5 @@ -36167,12 +31146,13 @@ msgid "Smooth convex corners between this value and 180 degrees:" msgstr "" #: ../share/extensions/gcodetools_engraving.inx.h:3 +#, fuzzy msgid "Maximum distance for engraving (mm/inch):" -msgstr "Maximálna vzdialenosť rytiny (mm/inch):" +msgstr "Maximálna vzdialenosť rytiny:" #: ../share/extensions/gcodetools_engraving.inx.h:4 msgid "Accuracy factor (2 low to 10 high):" -msgstr "Koeficient presnosti (2 nízka až 10 vysoká):" +msgstr "" #: ../share/extensions/gcodetools_engraving.inx.h:5 #, fuzzy @@ -36197,15 +31177,17 @@ msgstr "" #: ../share/extensions/gcodetools_graffiti.inx.h:1 msgid "Graffiti" -msgstr "Graffiti" +msgstr "" #: ../share/extensions/gcodetools_graffiti.inx.h:2 +#, fuzzy msgid "Maximum segment length:" -msgstr "Maximálna dĺžka úseku:" +msgstr "Maximálna dĺžka úseku (px):" #: ../share/extensions/gcodetools_graffiti.inx.h:3 +#, fuzzy msgid "Minimal connector radius:" -msgstr "Minimálny polomer konektora:" +msgstr "Minimálny oblúkový polomer:" #: ../share/extensions/gcodetools_graffiti.inx.h:4 #, fuzzy @@ -36463,7 +31445,7 @@ msgstr "" #: ../share/extensions/generate_voronoi.inx.h:1 msgid "Voronoi Pattern" -msgstr "Voroného vzor" +msgstr "Voronoiov vzor" #: ../share/extensions/generate_voronoi.inx.h:3 msgid "Average size of cell (px):" @@ -36483,8 +31465,8 @@ msgid "" "join of the pattern at the edges. Use a negative border to reduce the size " "of the pattern and get an empty border." msgstr "" -"Vytvoriť náhodný vzor z Voroného buniek. Vzor bude dostupný v dialógu Výplň " -"a ťah. Musíte vybrať objekt alebo skupinu.\n" +"Vytvoriť náhodný vzor z Voronojovych buniek. Vzor bude dostupný v dialógu " +"Výplň a ťah. Musíte vybrať objekt alebo skupinu.\n" "\n" "Ak má okraj šírku nula, vzorka bude na hranách nespojitá. Použite kladnú " "veľkosť okraja, najlepšie väčšiu ako veľkosť bunky na vytvorenie hladkých " @@ -36508,10 +31490,12 @@ msgid "Save Background" msgstr "Uložiť pozadie:" #: ../share/extensions/gimp_xcf.inx.h:6 +#, fuzzy msgid "File Resolution:" -msgstr "Rozlíšenie súboru:" +msgstr "Rozlíšenie:" #: ../share/extensions/gimp_xcf.inx.h:8 +#, fuzzy msgid "" "This extension exports the document to Gimp XCF format according to the " "following options:\n" @@ -36532,7 +31516,6 @@ msgstr "" "(pamätajte, že predvolená mriežka Inkscape je pri zobrazení v Gimpe veľmi " "úzka).\n" " * Uložiť pozadie: pridať pozadie dokumentu na každú prevedenú vrstvu.\n" -" * Rozlíšenie súboru: rozlíšenie súboru XCF v DPI.\n" "\n" "Každá vrstva prvej úrovne sa prevedie na vrstvu Gimp. Podvrstvy sa spoja a " "prevedú s ich vlastnou rodičovskou vrstvou prvej úrovne na jedinú vrstvu " @@ -36553,7 +31536,7 @@ msgstr "Hrúbka okraja (px):" #: ../share/extensions/grid_cartesian.inx.h:3 msgid "X Axis" -msgstr "Os X" +msgstr "os X" #: ../share/extensions/grid_cartesian.inx.h:4 msgid "Major X Divisions:" @@ -36593,7 +31576,7 @@ msgstr "Hrúbka podvedľajšieho rozdelenia X (px):" #: ../share/extensions/grid_cartesian.inx.h:13 msgid "Y Axis" -msgstr "Os Y" +msgstr "os Y" #: ../share/extensions/grid_cartesian.inx.h:14 msgid "Major Y Divisions:" @@ -36632,40 +31615,48 @@ msgid "Subminor Y Division Thickness (px):" msgstr "Hrúbka podvedľajšieho rozdelenia Y (px):" #: ../share/extensions/grid_isometric.inx.h:1 +#, fuzzy msgid "Isometric Grid" -msgstr "Izometrická mriežka" +msgstr "Axonometrická mriežka" #: ../share/extensions/grid_isometric.inx.h:2 +#, fuzzy msgid "X Divisions [x2]:" -msgstr "Rozdelenia X [x2]:" +msgstr "Hlavné rozdelenie X:" #: ../share/extensions/grid_isometric.inx.h:3 msgid "Y Divisions [x2] [> 1/2 X Div]:" -msgstr "Rozdelenia Y [x2] [> 1/2 rozd. X]:" +msgstr "" #: ../share/extensions/grid_isometric.inx.h:4 +#, fuzzy msgid "Division Spacing (px):" -msgstr "Medzery hlavného rozdelenia (px):" +msgstr "Medzery hlavného rozdelenia X (px):" #: ../share/extensions/grid_isometric.inx.h:5 +#, fuzzy msgid "Subdivisions per Major Division:" -msgstr "Podrozdelení na hlavné rozdelenie:" +msgstr "Podrozdelení na hlavné rozdelenie X:" #: ../share/extensions/grid_isometric.inx.h:6 +#, fuzzy msgid "Subsubdivs per Subdivision:" -msgstr "Podpodrozdelení na podrozdelenie:" +msgstr "Podpodrozdelení na podrozdelenie X:" #: ../share/extensions/grid_isometric.inx.h:7 +#, fuzzy msgid "Major Division Thickness (px):" -msgstr "Hrúbka hlavného rozdelenia (px):" +msgstr "Hlavné rozdelenie X (px):" #: ../share/extensions/grid_isometric.inx.h:8 +#, fuzzy msgid "Minor Division Thickness (px):" -msgstr "Hrúbka vedľajšieho rozdelenia (px):" +msgstr "Hlavné rozdelenie X (px):" #: ../share/extensions/grid_isometric.inx.h:9 +#, fuzzy msgid "Subminor Division Thickness (px):" -msgstr "Hrúbka podvedľajšieho rozdelenia (px):" +msgstr "Hrúbka podvedľajšieho rozdelenia X (px):" #: ../share/extensions/grid_polar.inx.h:1 msgid "Polar Grid" @@ -36752,12 +31743,14 @@ msgid "Guides creator" msgstr "Tvorba vodidiel" #: ../share/extensions/guides_creator.inx.h:2 +#, fuzzy msgid "Regular guides" -msgstr "Obyčajné vodidlá" +msgstr "Pravouhlá mriežka" #: ../share/extensions/guides_creator.inx.h:3 +#, fuzzy msgid "Guides preset:" -msgstr "Prednast. vodidiel:" +msgstr "Tvorba vodidiel" #: ../share/extensions/guides_creator.inx.h:6 msgid "Start from edges" @@ -36780,28 +31773,34 @@ msgid "Rule-of-third" msgstr "Pravidlo tretín" #: ../share/extensions/guides_creator.inx.h:11 +#, fuzzy msgid "Diagonal guides" -msgstr "Diagonálne vodidlá" +msgstr "Prichytávať k vodidlám" #: ../share/extensions/guides_creator.inx.h:12 +#, fuzzy msgid "Upper left corner" -msgstr "Ľavý horný roh" +msgstr "roh stránky" #: ../share/extensions/guides_creator.inx.h:13 +#, fuzzy msgid "Upper right corner" -msgstr "Pravý horný roh" +msgstr "roh stránky" #: ../share/extensions/guides_creator.inx.h:14 +#, fuzzy msgid "Lower left corner" -msgstr "Ľavý dolný roh" +msgstr "Presunie aktuálnu vrstvu o úroveň nižšie" #: ../share/extensions/guides_creator.inx.h:15 +#, fuzzy msgid "Lower right corner" -msgstr "Pravý dolný roh" +msgstr "Presunie aktuálnu vrstvu o úroveň nižšie" #: ../share/extensions/guides_creator.inx.h:16 +#, fuzzy msgid "Margins" -msgstr "Okraje" +msgstr "ohraničenie diela" #: ../share/extensions/guides_creator.inx.h:17 msgid "Margins preset:" @@ -36837,11 +31836,6 @@ msgstr "Ľavý uhol:" msgid "Right book page" msgstr "Pravý uhol:" -#: ../share/extensions/guides_creator.inx.h:24 -msgctxt "Margin" -msgid "None" -msgstr "Žiadny" - #: ../share/extensions/guillotine.inx.h:1 msgid "Guillotine" msgstr "Gilotína" @@ -36871,8 +31865,9 @@ msgid "Hershey Text" msgstr "Umelecký text" #: ../share/extensions/hershey.inx.h:2 +#, fuzzy msgid "Render Text" -msgstr "Vykresliť text" +msgstr "Vykresliť" #: ../share/extensions/hershey.inx.h:3 #: ../share/extensions/render_alphabetsoup.inx.h:2 @@ -37007,6 +32002,7 @@ msgid "" msgstr "" #: ../share/extensions/hershey.inx.h:36 +#, fuzzy msgid "About..." msgstr "O aplikácii" @@ -37030,8 +32026,9 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_input.inx.h:1 +#, fuzzy msgid "HPGL Input" -msgstr "Vstup HPGL" +msgstr "Vstup WPG" #: ../share/extensions/hpgl_input.inx.h:2 msgid "" @@ -37043,8 +32040,9 @@ msgstr "" #: ../share/extensions/hpgl_input.inx.h:3 #: ../share/extensions/hpgl_output.inx.h:4 #: ../share/extensions/plotter.inx.h:23 +#, fuzzy msgid "Resolution X (dpi):" -msgstr "Rozlíšenie X (DPI):" +msgstr "Rozlíšenie (dpi)" #: ../share/extensions/hpgl_input.inx.h:4 #: ../share/extensions/hpgl_output.inx.h:5 @@ -37057,8 +32055,9 @@ msgstr "" #: ../share/extensions/hpgl_input.inx.h:5 #: ../share/extensions/hpgl_output.inx.h:6 #: ../share/extensions/plotter.inx.h:25 +#, fuzzy msgid "Resolution Y (dpi):" -msgstr "Rozlíšenie Y (DPI):" +msgstr "Rozlíšenie (dpi)" #: ../share/extensions/hpgl_input.inx.h:6 #: ../share/extensions/hpgl_output.inx.h:7 @@ -37099,13 +32098,15 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:3 #: ../share/extensions/plotter.inx.h:22 +#, fuzzy msgid "Plotter Settings " -msgstr "Nastavenia plotra" +msgstr "Nastavenia importu PDF" #: ../share/extensions/hpgl_output.inx.h:8 #: ../share/extensions/plotter.inx.h:27 +#, fuzzy msgid "Pen number:" -msgstr "Číslo pera:" +msgstr "Číslo pera" #: ../share/extensions/hpgl_output.inx.h:9 #: ../share/extensions/plotter.inx.h:28 @@ -37115,7 +32116,7 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:10 #: ../share/extensions/plotter.inx.h:29 msgid "Pen force (g):" -msgstr "Sila pera (g):" +msgstr "" #: ../share/extensions/hpgl_output.inx.h:11 #: ../share/extensions/plotter.inx.h:30 @@ -37137,8 +32138,9 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_output.inx.h:14 +#, fuzzy msgid "Rotation (°, Clockwise):" -msgstr "Otočenie (°, v smere hodinových ručičiek):" +msgstr "Otočenie v smere hodinových ručičiek" #: ../share/extensions/hpgl_output.inx.h:15 #: ../share/extensions/plotter.inx.h:34 @@ -37147,8 +32149,9 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:16 #: ../share/extensions/plotter.inx.h:35 +#, fuzzy msgid "Mirror X axis" -msgstr "Zrkadlovo otočiť os X" +msgstr "Zrkadlovo otočiť os Y" #: ../share/extensions/hpgl_output.inx.h:17 #: ../share/extensions/plotter.inx.h:36 @@ -37157,6 +32160,7 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:18 #: ../share/extensions/plotter.inx.h:37 +#, fuzzy msgid "Mirror Y axis" msgstr "Zrkadlovo otočiť os Y" @@ -37167,8 +32171,9 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:20 #: ../share/extensions/plotter.inx.h:39 +#, fuzzy msgid "Center zero point" -msgstr "Centrovať nulový bod" +msgstr "Centrovať čiary" #: ../share/extensions/hpgl_output.inx.h:21 #: ../share/extensions/plotter.inx.h:40 @@ -37196,8 +32201,9 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:25 #: ../share/extensions/plotter.inx.h:44 +#, fuzzy msgid "Tool offset (mm):" -msgstr "Horizontálny posun (mm):" +msgstr "Horizontálny posun (px):" #: ../share/extensions/hpgl_output.inx.h:26 #: ../share/extensions/plotter.inx.h:45 @@ -37221,8 +32227,9 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:29 #: ../share/extensions/plotter.inx.h:48 +#, fuzzy msgid "Curve flatness:" -msgstr "Plochosť krivky:" +msgstr "Plochosť:" #: ../share/extensions/hpgl_output.inx.h:30 #: ../share/extensions/plotter.inx.h:49 @@ -37233,8 +32240,9 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:31 #: ../share/extensions/plotter.inx.h:50 +#, fuzzy msgid "Auto align" -msgstr "Automaticky zarovnať" +msgstr "Zarovnať" #: ../share/extensions/hpgl_output.inx.h:32 #: ../share/extensions/plotter.inx.h:51 @@ -37252,24 +32260,27 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_output.inx.h:35 +#, fuzzy msgid "Export an HP Graphics Language file" msgstr "Exportovať do súboru HP Graphics Language" #: ../share/extensions/ink2canvas.inx.h:1 +#, fuzzy msgid "Convert to html5 canvas" -msgstr "Konvertovať na plátno HTML5" +msgstr "Konvertovať na pomlčky" #: ../share/extensions/ink2canvas.inx.h:2 msgid "HTML 5 canvas (*.html)" -msgstr "Plátno HTML 5 (*.html)" +msgstr "" #: ../share/extensions/ink2canvas.inx.h:3 msgid "HTML 5 canvas code" -msgstr "Kód plátna HTML5" +msgstr "" #: ../share/extensions/inkscape_follow_link.inx.h:1 +#, fuzzy msgid "Follow Link" -msgstr "Nasledovať odkaz" +msgstr "_Nasledovať odkaz" #: ../share/extensions/inkscape_help_askaquestion.inx.h:1 msgid "Ask Us a Question" @@ -37409,6 +32420,10 @@ msgstr "Celé číslo" msgid "Float Number" msgstr "Desatinné číslo" +#: ../share/extensions/interp_att_g.inx.h:22 +msgid "Tag" +msgstr "Značka" + #: ../share/extensions/interp_att_g.inx.h:23 #: ../share/extensions/polyhedron_3d.inx.h:33 msgid "Style" @@ -37475,8 +32490,7 @@ msgid "" "details." msgstr "" "Toto rozšírenie vám umožňuje inštalovať, aktualizovať a odstraňovať auto-" -"texty prezentácie JessyInk. Podrobnosti nájdete na " -"code.google.com/p/jessyink" +"texty prezentácie JessyInk. Podrobnosti nájdete na code.google.com/p/jessyink" #: ../share/extensions/jessyInk_autoTexts.inx.h:10 #: ../share/extensions/jessyInk_effects.inx.h:15 @@ -37568,8 +32582,8 @@ msgid "" "more details." msgstr "" "Toto rozšírenie vám umožňuje exportovať prezentáciu JessyInk po vytvorení " -"exportnej vrstvy vo vašom prehliadači. Podrobnosti nájdete na " -"code.google.com/p/jessyink" +"exportnej vrstvy vo vašom prehliadači. Podrobnosti nájdete na code.google." +"com/p/jessyink" #: ../share/extensions/jessyInk_export.inx.h:9 msgid "JessyInk zipped pdf or png output (*.zip)" @@ -37594,8 +32608,8 @@ msgid "" "jessyink for more details." msgstr "" "Toto rozšírenie vám umožňuje inštalovať alebo aktualizovať skript JessyInk " -"na prevedenie súboru SVG na prezentáciu. Podrobnosti nájdete na " -"code.google.com/p/jessyink" +"na prevedenie súboru SVG na prezentáciu. Podrobnosti nájdete na code.google." +"com/p/jessyink" #: ../share/extensions/jessyInk_keyBindings.inx.h:1 msgid "Key bindings" @@ -37829,8 +32843,8 @@ msgid "" "com/p/jessyink for more details." msgstr "" "Toto rozšírenie vám umožňuje zistiť informácie o skripte JessyInk, efektoch " -"a prechodoch obsiahnutých v súbore SVG. Podrobnosti nájdete na " -"code.google.com/p/jessyink" +"a prechodoch obsiahnutých v súbore SVG. Podrobnosti nájdete na code.google." +"com/p/jessyink" #: ../share/extensions/jessyInk_transitions.inx.h:1 msgid "Transitions" @@ -38283,7 +33297,6 @@ msgid "Fixed Angle" msgstr "Uhol pera" #: ../share/extensions/measure.inx.h:18 -#, no-c-format #, fuzzy, no-c-format msgid "" "This effect measures the length, area, or center-of-mass of the selected " @@ -38476,6 +33489,10 @@ msgstr "" "cesta. Vzorka je najvrchnejší objekt výberu. Skupiny ciest/tvarov/klonov sú " "povolené." +#: ../share/extensions/pathscatter.inx.h:1 +msgid "Scatter" +msgstr "Roztrúsenie" + #: ../share/extensions/pathscatter.inx.h:3 msgid "Follow path orientation" msgstr "Sledovať orientáciu cesty" @@ -38598,6 +33615,10 @@ msgstr "Spadávka (pl):" msgid "Note: Bond Weight # calculations are a best-guess estimate." msgstr "Pozn.: Výpočty # hmotnosti väzby sú najlepšie odhady." +#: ../share/extensions/perspective.inx.h:1 +msgid "Perspective" +msgstr "Perspektíva" + #: ../share/extensions/pixelsnap.inx.h:1 msgid "PixelSnap" msgstr "PrichytávaniePixlov" @@ -38677,12 +33698,6 @@ msgstr "Hardvér" msgid "Hardware (DSR/DTR + RTS/CTS)" msgstr "" -#: ../share/extensions/plotter.inx.h:15 -#, fuzzy -msgctxt "Flow control" -msgid "None" -msgstr "Žiadny" - #: ../share/extensions/plotter.inx.h:16 msgid "HPGL" msgstr "" @@ -39029,6 +34044,14 @@ msgstr "Maximálne posunutie X (v px):" msgid "Maximum displacement in Y (px):" msgstr "Maximálne posunutie Y (v px):" +#: ../share/extensions/radiusrand.inx.h:5 +msgid "Shift nodes" +msgstr "Posunúť uzly" + +#: ../share/extensions/radiusrand.inx.h:6 +msgid "Shift node handles" +msgstr "Posunúť úchopy uzlov" + #: ../share/extensions/radiusrand.inx.h:7 msgid "Use normal distribution" msgstr "Použiť normálne rozdelenie" @@ -39089,6 +34112,11 @@ msgstr "" msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" msgstr "Podrobnosti nájdete na http://www.denso-wave.com/qrcode/index-e.html" +#: ../share/extensions/render_barcode_qrcode.inx.h:5 +#, fuzzy +msgid "Auto" +msgstr "Automatické ukladanie" + #: ../share/extensions/render_barcode_qrcode.inx.h:6 msgid "" "With \"Auto\", the size of the barcode depends on the length of the text and " @@ -39381,12 +34409,6 @@ msgstr "Priestor" msgid "Tab" msgstr "Tabulátor" -#: ../share/extensions/scour.inx.h:18 -#, fuzzy -msgctxt "Indent" -msgid "None" -msgstr "Žiadny" - #: ../share/extensions/scour.inx.h:19 #, fuzzy msgid "Ids" @@ -39480,34 +34502,6 @@ msgstr "Optimalizované SVG (*.svg)" msgid "Scalable Vector Graphics" msgstr "Scalable Vector Graphic" -#: ../share/extensions/seamless_pattern.inx.h:1 -msgid "Seamless Pattern" -msgstr "" - -#: ../share/extensions/seamless_pattern.inx.h:2 -msgid "Custom Width (px):" -msgstr "" - -#: ../share/extensions/seamless_pattern.inx.h:3 -msgid "Custom Height (px):" -msgstr "" - -#: ../share/extensions/seamless_pattern.inx.h:4 -msgid "This extension overwrite current document" -msgstr "" - -#: ../share/extensions/seamless_pattern_procedural.inx.h:1 -msgid "Seamless Pattern Procedural" -msgstr "" - -#: ../share/extensions/seamless_pattern_procedural.inx.h:2 -msgid "Custom Width (px.):" -msgstr "" - -#: ../share/extensions/seamless_pattern_procedural.inx.h:3 -msgid "Custom Height (px.):" -msgstr "" - #: ../share/extensions/setup_typography_canvas.inx.h:1 msgid "1 - Setup Typography Canvas" msgstr "1 - nastavenie typografického plátna" @@ -40033,7 +35027,7 @@ msgstr "Zo strany c a uhlov a, b" #: ../share/extensions/voronoi2svg.inx.h:1 #, fuzzy msgid "Voronoi Diagram" -msgstr "Voroného diagram" +msgstr "Voronoiov vzor" #: ../share/extensions/voronoi2svg.inx.h:3 msgid "Type of diagram:" @@ -40057,11 +35051,11 @@ msgstr "Odmietnuť pozvanie" #: ../share/extensions/voronoi2svg.inx.h:7 #, fuzzy msgid "Voronoi and Delaunay" -msgstr "Voroného a Delaunayov" +msgstr "Voronoiov vzor" #: ../share/extensions/voronoi2svg.inx.h:8 msgid "Options for Voronoi diagram" -msgstr "Možnosti Voroného diagramu" +msgstr "Možnosti pre Voronoiov diagram" #: ../share/extensions/voronoi2svg.inx.h:10 #, fuzzy @@ -40073,8 +35067,8 @@ msgid "" "Select a set of objects. Their centroids will be used as the sites of the " "Voronoi diagram. Text objects are not handled." msgstr "" -"Vyberte množinu objektov. Ich ťažiská sa použijú ako základné body Voroného " -"diagramu. Textové objekty sa ignorujú." +"Vyberte množinu objektov. Ich ťažiská sa použijú ako základné body " +"Voronoiovho diagramu. Textové objekty sa ignorujú." #: ../share/extensions/web-set-att.inx.h:1 msgid "Set Attributes" @@ -40300,7 +35294,7 @@ msgstr "" #: ../share/extensions/webslicer_create_group.inx.h:14 msgid "Slicer" -msgstr "Výrezy" +msgstr "Rozrezanie" #: ../share/extensions/webslicer_create_rect.inx.h:1 msgid "Create a slicer rectangle" diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index d1022dbc2..3103d8293 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -192,12 +192,17 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ void LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider){ split(path_on,divider); + Geom::Affine pre = Geom::Translate(-origin) * Geom::Rotate(-Geom::deg_to_rad(starting_angle)); for (Geom::PathVector::const_iterator path_it = path_on.begin(); path_it != path_on.end(); ++path_it) { if (path_it->empty()){ continue; } for (int i = 0; i < num_copies; ++i) { - + Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * i)); + Geom::Affine t = pre * rot * Geom::Translate(origin); + Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); + Geom::Path append = *path_it * sca * t; + path_on.push_back(append); } } } -- cgit v1.2.3 From 2218eee67d0032e118cb711b7c612f7b580a6294 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 24 Jan 2015 18:11:22 +0100 Subject: Kaleidoscope check (bzr r13708.1.16) --- src/live_effects/lpe-copy_rotate.cpp | 70 +++++++++++++++++++++++++++++------- src/live_effects/lpe-copy_rotate.h | 2 +- 2 files changed, 59 insertions(+), 13 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 3103d8293..6c16c6194 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -94,9 +94,18 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if( kaleidoscope || copiesTo360 ){ + if(kaleidoscope || copiesTo360 ){ rotation_angle.param_set_value(360.0/(double)num_copies); } + if(kaleidoscope){ + num_copies.param_set_increments(2,2); + if((int)num_copies%2 !=0){ + num_copies.param_set_value(num_copies+1); + } + } else { + num_copies.param_set_increments(1,1); + } + if(dist_angle_handle < 1.0){ dist_angle_handle = 1.0; } @@ -190,21 +199,58 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider){ +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, double sizeDivider){ split(path_on,divider); - Geom::Affine pre = Geom::Translate(-origin) * Geom::Rotate(-Geom::deg_to_rad(starting_angle)); + std::vector tmp_path; + Geom::Affine pre = Geom::Translate(-origin); for (Geom::PathVector::const_iterator path_it = path_on.begin(); path_it != path_on.end(); ++path_it) { - if (path_it->empty()){ - continue; - } - for (int i = 0; i < num_copies; ++i) { - Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * i)); - Geom::Affine t = pre * rot * Geom::Translate(origin); + Geom::Path original = *path_it; + if (path_it->empty()){ + continue; + } + std::vector tmp_path2; + Geom::Path appendPath = original; + for (int i = 0; i < num_copies; ++i) { + Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * (i))); + Geom::Affine m = pre * rot * Geom::Translate(origin); + if(i%2 != 0){ + Geom::Point A = (Geom::Point)origin; + Geom::Point B = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle*i)+starting_angle)) * sizeDivider; + Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); + double hyp = Geom::distance(A, B); + double c = (B[0] - A[0]) / hyp; // cos(alpha) + double s = (B[1] - A[1]) / hyp; // sin(alpha) + + Geom::Affine m2(c, -s, s, c, 0.0, 0.0); Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); - Geom::Path append = *path_it * sca * t; - path_on.push_back(append); + + Geom::Affine tmpM = m1.inverse() * m2; + m = tmpM; + m = m * sca; + m = m * m2.inverse(); + m = m * m1; + } else { + appendPath = original; } + appendPath *= m; + if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.finalPoint())){ + tmp_path2[tmp_path2.size()-1].append(appendPath.reverse()); + } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.initialPoint())){ + tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); + tmp_path2[tmp_path2.size()-1].append(appendPath); + tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); + } else { + tmp_path2.push_back(appendPath); + } + if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),tmp_path2[tmp_path2.size()-1].initialPoint())){ + tmp_path2[tmp_path2.size()-1].close(); + } + } + tmp_path.insert(tmp_path.end(), tmp_path2.begin(), tmp_path2.end()); + tmp_path2.clear(); } + path_on = tmp_path; + tmp_path.clear(); } Geom::Piecewise > @@ -250,7 +296,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path,divider); + setKaleidoscope(tmp_path,divider,sizeDivider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 78e3b1950..bdbc61d07 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,7 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider); + virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); -- cgit v1.2.3 From bccbad7c2400905a823f9241294fa62e90c9a6a3 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 18 Mar 2015 21:41:04 +0100 Subject: fix to trunk (bzr r13682.1.24) --- src/knotholder.cpp | 11 ++------ src/live_effects/effect.cpp | 9 +----- src/live_effects/effect.h | 1 - src/live_effects/lpe-mirror_symmetry.cpp | 47 ++++++++++---------------------- src/live_effects/lpe-mirror_symmetry.h | 2 +- 5 files changed, 19 insertions(+), 51 deletions(-) diff --git a/src/knotholder.cpp b/src/knotholder.cpp index de1b88b2c..6d39fa5fa 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -68,14 +68,9 @@ KnotHolder::KnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFun sizeUpdatedConn = ControlManager::getManager().connectCtrlSizeChanged(sigc::mem_fun(*this, &KnotHolder::updateControlSizes)); } -KnotHolder::~KnotHolder() { - if(SP_IS_LPE_ITEM(item)){ - Inkscape::LivePathEffect::Effect *effect = SP_LPE_ITEM(item)->getCurrentLPE(); - if(effect){ - effect->removeHandles(); - } - } - sp_object_unref(item); +KnotHolder::~KnotHolder() +{ + sp_object_unref(item); for (std::list::iterator i = entity.begin(); i != entity.end(); ++i) { diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 5cff0f352..042bac523 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -373,7 +373,6 @@ Effect::Effect(LivePathEffectObject *lpeobject) registerParameter( dynamic_cast(&is_visible) ); is_visible.widget_is_visible = false; current_zoom = 0.0; - knot_holder = NULL; } Effect::~Effect() @@ -620,7 +619,7 @@ Effect::registerParameter(Parameter * param) void Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { using namespace Inkscape::LivePathEffect; - knot_holder = knotholder; + // add handles provided by the effect itself addKnotHolderEntities(knotholder, desktop, item); @@ -630,12 +629,6 @@ Effect::addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { } } -void -Effect::removeHandles(){ - if(knot_holder){ - knot_holder = NULL; - } -} /** * Return a vector of PathVectors which contain all canvas indicators for this effect. * This is the function called by external code to get all canvas indicators (effect and its parameters) diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index bfce7b7dd..ac1f0b8dc 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -101,7 +101,6 @@ public: // (but spiro lpe still needs it!) virtual LPEPathFlashType pathFlashType() const { return DEFAULT; } void addHandles(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); - void removeHandles(); std::vector getCanvasIndicators(SPLPEItem const* lpeitem); inline bool providesOwnFlashPaths() const { diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index f39b92e58..e549ad697 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -27,7 +27,6 @@ #include "knot-holder-entity.h" #include "knotholder.h" - namespace Inkscape { namespace LivePathEffect { @@ -43,9 +42,12 @@ namespace MS { class KnotHolderEntityCenterMirrorSymmetry : public LPEKnotHolderEntity { public: - KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) {}; + KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) {this->knoth = effect->knoth;}; + virtual ~KnotHolderEntityCenterMirrorSymmetry() { this->knoth = NULL;} virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual Geom::Point knot_get() const; +private: + KnotHolder *knoth; }; } // namespace MS @@ -56,19 +58,19 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), fusionPaths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusionPaths", &wr, this, true), reverseFusion(_("Reverse fusion"), _("Reverse fusion"), "reverseFusion", &wr, this, false), - fixedReflectionLine(_("Fixed reflection line"), _("Fixed reflection line"), "fixedReflectionLine", &wr, this, false), reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), - center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") + center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring"), + knoth(NULL) { show_orig_path = true; + registerParameter(&mode); registerParameter( &discard_orig_path); registerParameter( &fusionPaths); registerParameter( &reverseFusion); - registerParameter( &distanceToX); - registerParameter( &distanceToY); registerParameter( &reflection_line); registerParameter( ¢er); + } LPEMirrorSymmetry::~LPEMirrorSymmetry() @@ -81,7 +83,6 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) using namespace Geom; SPLPEItem * item = const_cast(lpeitem); - SPObject *subitem = static_cast(item); Point A(boundingbox_X.max(), boundingbox_Y.min()); Point B(boundingbox_X.max(), boundingbox_Y.max()); Point C(boundingbox_X.max(), boundingbox_Y.middle()); @@ -93,15 +94,15 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) A = Geom::Point(center[X],boundingbox_Y.min()); B = Geom::Point(center[X],boundingbox_Y.max()); } - if( mode == MT_X || mode == MT_Y || mode == MT_FIXED_X || mode == MT_FIXED_Y ){ + if( mode == MT_X || mode == MT_Y ){ Geom::Path path; path.start( A ); path.appendNew( B ); reflection_line.set_new_value(path.toPwSb(), true); lineSeparation.setPoints(A,B); center.param_setValue(path.pointAt(0.5)); - if(knot_holder){ - knot_holder->update_knots(); + if(knoth){ + knoth->update_knots(); } } else if( mode == MT_FREE) { std::vector mline(reflection_line.get_pathvector()); @@ -117,8 +118,8 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) A = mline[0].initialPoint(); B = mline[0].finalPoint(); lineSeparation.setPoints(A,B); - if(knot_holder){ - knot_holder->update_knots(); + if(knoth){ + knoth->update_knots(); } } previousCenter = center; @@ -133,27 +134,6 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) { using namespace Geom; - /* - SPDocument *doc = lpeitem->document; - Inkscape::XML::Document *xml_doc = doc->getReprDoc(); - Inkscape::XML::Node *group = xml_doc->createElement("svg:g"); - group->setAttribute("inkscape:groupmode", "layer"); - SPLPEItem* item = const_cast(lpeitem); - Inkscape::XML::Node *current = item->getRepr(); - gint topmost = current->position(); - Inkscape::XML::Node *top_current = current->parent(); - Inkscape::XML::Node *spnew = current->duplicate(xml_doc); - sp_repr_unparent(current); - group->appendChild(spnew); - Inkscape::GC::release(spnew); - top_current->appendChild(group); - group->setPosition(topmost + 1); - gchar *href = g_strdup_printf("#%s", item->getCurrentLPE()->getRepr()->attribute("id")); - SP_LPE_ITEM(group)->addPathEffect(href, true); - item->removeCurrentPathEffect(false); - g_free(href); - Inkscape::GC::release(group); - */ original_bbox(lpeitem); Point A(boundingbox_X.max(), boundingbox_Y.min()); @@ -315,6 +295,7 @@ LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector void LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { { + knoth = knotholder; KnotHolderEntity *e = new MS::KnotHolderEntityCenterMirrorSymmetry(this); e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _("Adjust the center") ); diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index c18fb265d..97d641bcc 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -62,11 +62,11 @@ private: BoolParam discard_orig_path; BoolParam fusionPaths; BoolParam reverseFusion; - BoolParam fixedReflectionLine; PathParam reflection_line; Geom::Line lineSeparation; Geom::Point previousCenter; PointParam center; + KnotHolder *knoth; LPEMirrorSymmetry(const LPEMirrorSymmetry&); LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); -- cgit v1.2.3 From b21958f914e82435e935bb732b64cdf3f685c3f1 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 28 Mar 2015 14:57:06 +0100 Subject: adding rotation transform (bzr r13708.1.20) --- src/live_effects/lpe-copy_rotate.cpp | 18 ++++++++++++++++++ src/live_effects/lpe-copy_rotate.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 63d6b8bfa..5474bfb70 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -89,6 +89,24 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) dir = unit_vector(B - A); } +void +LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) +{ + if(postmul->isRotation()){ + Geom::Point rot = (Geom::Rotate)postmul::vector(); + coord angle = rad_to_deg(atan2(rot)); + starting_angle.param_setValue(starting_angle + angle); + starting_angle.param_update_default(starting_angle + angle); + rotation_angle.param_setValue(rotation_angle + angle); + rotation_angle.param_update_default(rotation_angle + angle); + } + // cycle through all parameters. Most parameters will not need transformation, but path and point params do. + + for (std::vector::iterator it = param_vector.begin(); it != param_vector.end(); ++it) { + Parameter * param = *it; + param->param_transform_multiply(postmul, set); + } +} void LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index bdbc61d07..d0a5b004b 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -48,6 +48,8 @@ public: virtual void resetDefaults(SPItem const* item); + virtual void transform_multiply(Geom::Affine const& postmul, bool set); + /* the knotholder entity classes must be declared friends */ friend class CR::KnotHolderEntityStartingAngle; friend class CR::KnotHolderEntityRotationAngle; -- cgit v1.2.3 From 2763fbcc2619a390e5f81c2887b1f8f312eb5e65 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 28 Mar 2015 22:04:40 +0100 Subject: Allow rotate copies whithout distorsion in kaleidoscope shapes (bzr r13708.1.22) --- src/live_effects/lpe-copy_rotate.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 5474bfb70..2e87133b3 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -92,13 +92,10 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) void LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) { - if(postmul->isRotation()){ - Geom::Point rot = (Geom::Rotate)postmul::vector(); - coord angle = rad_to_deg(atan2(rot)); - starting_angle.param_setValue(starting_angle + angle); - starting_angle.param_update_default(starting_angle + angle); - rotation_angle.param_setValue(rotation_angle + angle); - rotation_angle.param_update_default(rotation_angle + angle); + if(kaleidoscope){ + Geom::Coord angle = Geom::rad_to_deg(atan(-postmul[1]/postmul[0])); + angle += starting_angle; + starting_angle.param_set_value(angle); } // cycle through all parameters. Most parameters will not need transformation, but path and point params do. -- cgit v1.2.3 From 1973e31feb91e5a2bbdd1c3e36b20d1681123447 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 9 Apr 2015 21:01:46 +0200 Subject: astyle copy-rotate LPE (bzr r13708.1.25) --- src/live_effects/lpe-copy_rotate.cpp | 77 +++++++++++++++++++----------------- src/live_effects/lpe-copy_rotate.h | 6 +-- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 2e87133b3..bb331b37a 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -65,7 +65,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : registerParameter(&rotation_angle); registerParameter(&num_copies); registerParameter(&origin); - + num_copies.param_make_integer(true); num_copies.param_set_range(0, 1000); } @@ -92,13 +92,13 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) void LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) { - if(kaleidoscope){ + if(kaleidoscope) { Geom::Coord angle = Geom::rad_to_deg(atan(-postmul[1]/postmul[0])); angle += starting_angle; starting_angle.param_set_value(angle); } // cycle through all parameters. Most parameters will not need transformation, but path and point params do. - + for (std::vector::iterator it = param_vector.begin(); it != param_vector.end(); ++it) { Parameter * param = *it; param->param_transform_multiply(postmul, set); @@ -110,19 +110,19 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if(kaleidoscope || copiesTo360 ){ + if(kaleidoscope || copiesTo360 ) { rotation_angle.param_set_value(360.0/(double)num_copies); } - if(kaleidoscope){ + if(kaleidoscope) { num_copies.param_set_increments(2,2); - if((int)num_copies%2 !=0){ + if((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); } } else { num_copies.param_set_increments(1,1); } - if(dist_angle_handle < 1.0){ + if(dist_angle_handle < 1.0) { dist_angle_handle = 1.0; } A = Point(boundingbox_X.min(), boundingbox_Y.middle()); @@ -132,7 +132,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; rot_pos = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * dist_angle_handle; - if( kaleidoscope || copiesTo360 ){ + if( kaleidoscope || copiesTo360 ) { rot_pos = origin; } SPLPEItem * item = const_cast(lpeitem); @@ -140,7 +140,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) item->apply_to_mask(item); } -int +int LPECopyRotate::pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X) { //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line @@ -163,7 +163,8 @@ LPECopyRotate::pointInTriangle(Geom::Point p, Geom::Point p1, Geom::Point p2, Ge } void -LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ +LPECopyRotate::split(std::vector &path_on,Geom::Path divider) +{ std::vector tmp_path; double timeStart = 0.0; Geom::Path original = path_on[0]; @@ -179,25 +180,25 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ Geom::Path portionOriginal = original.portion(timeStart,timeEnd); Geom::Point sideChecker = portionOriginal.pointAt(0.001); position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), sideChecker); - if(num_copies > 2){ + if(num_copies > 2) { position = pointInTriangle(sideChecker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } - if(position == 1){ + if(position == 1) { tmp_path.push_back(portionOriginal); } portionOriginal.clear(); timeStart = timeEnd; } position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); - if(num_copies > 2){ + if(num_copies > 2) { position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } - if(cs.size() > 0 && position == 1){ + if(cs.size() > 0 && position == 1) { Geom::Path portionOriginal = original.portion(timeStart, original.size()); - if (!original.closed()){ + if (!original.closed()) { tmp_path.push_back(portionOriginal); } else { - if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ){ + if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { portionOriginal.setFinal(tmp_path[0].initialPoint()); portionOriginal.append(tmp_path[0]); tmp_path[0] = portionOriginal; @@ -208,20 +209,21 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider){ } portionOriginal.clear(); } - if(cs.size()==0 && position == 1){ + if(cs.size()==0 && position == 1) { tmp_path.push_back(original); } path_on = tmp_path; } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, double sizeDivider){ +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, double sizeDivider) +{ split(path_on,divider); std::vector tmp_path; Geom::Affine pre = Geom::Translate(-origin); for (Geom::PathVector::const_iterator path_it = path_on.begin(); path_it != path_on.end(); ++path_it) { Geom::Path original = *path_it; - if (path_it->empty()){ + if (path_it->empty()) { continue; } std::vector tmp_path2; @@ -229,7 +231,7 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi for (int i = 0; i < num_copies; ++i) { Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * (i))); Geom::Affine m = pre * rot * Geom::Translate(origin); - if(i%2 != 0){ + if(i%2 != 0) { Geom::Point A = (Geom::Point)origin; Geom::Point B = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle*i)+starting_angle)) * sizeDivider; Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); @@ -249,44 +251,44 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi appendPath = original; } appendPath *= m; - if(i != 0 && tmp_path2.size() > 0 &&( Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.finalPoint()))){ + if(i != 0 && tmp_path2.size() > 0 &&( Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.finalPoint()))) { Geom::Path tmpAppend = appendPath.reverse(); tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); tmp_path2[tmp_path2.size()-1].append(tmpAppend); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.initialPoint())){ + } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.initialPoint())) { Geom::Path tmpAppend = appendPath; tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); tmp_path2[tmp_path2.size()-1].append(tmpAppend); tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.initialPoint())){ + } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.initialPoint())) { Geom::Path tmpAppend = appendPath; tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); tmp_path2[tmp_path2.size()-1].append(tmpAppend); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.finalPoint())){ + } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.finalPoint())) { Geom::Path tmpAppend = appendPath.reverse(); tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); tmp_path2[tmp_path2.size()-1].append(tmpAppend); tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].finalPoint(),appendPath.finalPoint())){ + } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].finalPoint(),appendPath.finalPoint())) { Geom::Path tmpAppend = appendPath.reverse(); tmpAppend.setInitial(tmp_path2[0].finalPoint()); tmp_path2[0].append(tmpAppend); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].initialPoint(),appendPath.initialPoint())){ + } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].initialPoint(),appendPath.initialPoint())) { Geom::Path tmpAppend = appendPath; tmp_path2[0] = tmp_path2[0].reverse(); tmpAppend.setInitial(tmp_path2[0].finalPoint()); tmp_path2[0].append(tmpAppend); tmp_path2[0] = tmp_path2[0].reverse(); - } else { + } else { tmp_path2.push_back(appendPath); } - if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),tmp_path2[tmp_path2.size()-1].initialPoint())){ + if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),tmp_path2[tmp_path2.size()-1].initialPoint())) { tmp_path2[tmp_path2.size()-1].close(); } } - if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].finalPoint(),tmp_path2[0].initialPoint())){ + if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].finalPoint(),tmp_path2[0].initialPoint())) { tmp_path2[0].close(); } tmp_path.insert(tmp_path.end(), tmp_path2.begin(), tmp_path2.end()); @@ -301,12 +303,12 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p { using namespace Geom; - if(num_copies == 1){ + if(num_copies == 1) { return pwd2_in; } double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); - Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); double sizeDivider = Geom::distance(origin,bbox) + (diagonal * 2); Geom::Point lineStart = origin + dir * Rotate(-deg_to_rad(starting_angle)) * sizeDivider; Geom::Point lineEnd = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * sizeDivider; @@ -317,12 +319,12 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p divider.appendNew(lineEnd); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); - if(kaleidoscope){ + if(kaleidoscope) { std::vector path_out; std::vector tmp_path; PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { - if (path_it->empty()){ + if (path_it->empty()) { continue; } bool end_open = false; @@ -333,7 +335,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p } } Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it->closed()){ + if(end_open && path_it->closed()) { original.close(false); original.appendNew( original.initialPoint() ); original.close(true); @@ -343,7 +345,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } - if(path_out.size()>0){ + if(path_out.size()>0) { output = paths_to_pw(path_out); } } else { @@ -377,8 +379,9 @@ LPECopyRotate::resetDefaults(SPItem const* item) original_bbox(SP_LPE_ITEM(item)); } -void -LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { +void +LPECopyRotate::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) +{ { KnotHolderEntity *e = new CR::KnotHolderEntityStartingAngle(this); e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index d0a5b004b..de00226a4 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -22,9 +22,9 @@ namespace Inkscape { namespace LivePathEffect { namespace CR { - // we need a separate namespace to avoid clashes with LPEPerpBisector - class KnotHolderEntityStartingAngle; - class KnotHolderEntityRotationAngle; +// we need a separate namespace to avoid clashes with LPEPerpBisector +class KnotHolderEntityStartingAngle; +class KnotHolderEntityRotationAngle; } class LPECopyRotate : public Effect, GroupBBoxEffect { -- cgit v1.2.3 From d163d3b01c24671f3124c16455d8654d7a1523f7 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 9 Apr 2015 21:13:54 +0200 Subject: Rename some variables to fit coding style (bzr r13708.1.26) --- src/live_effects/lpe-copy_rotate.cpp | 136 +++++++++++++++++------------------ src/live_effects/lpe-copy_rotate.h | 2 +- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index bb331b37a..4fd605b6d 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -51,7 +51,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0), rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), - copiesTo360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copiesTo360", &wr, this, true), + copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), kaleidoscope(_("kaleidoscope"), _("kaleidoscope"), "kaleidoscope", &wr, this, false), dist_angle_handle(100.0) { @@ -59,7 +59,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : _provides_knotholder_entities = true; // register all your parameters here, so Inkscape knows which parameters this effect has: - registerParameter(&copiesTo360); + registerParameter(&copies_to_360); registerParameter(&kaleidoscope); registerParameter(&starting_angle); registerParameter(&rotation_angle); @@ -110,7 +110,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if(kaleidoscope || copiesTo360 ) { + if(kaleidoscope || copies_to_360 ) { rotation_angle.param_set_value(360.0/(double)num_copies); } if(kaleidoscope) { @@ -132,7 +132,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; rot_pos = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * dist_angle_handle; - if( kaleidoscope || copiesTo360 ) { + if( kaleidoscope || copies_to_360 ) { rot_pos = origin; } SPLPEItem * item = const_cast(lpeitem); @@ -166,7 +166,7 @@ void LPECopyRotate::split(std::vector &path_on,Geom::Path divider) { std::vector tmp_path; - double timeStart = 0.0; + double time_start = 0.0; Geom::Path original = path_on[0]; int position = 0; Geom::Crossings cs = crossings(original,divider); @@ -177,37 +177,37 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) std::sort (crossed.begin(), crossed.end()); for(unsigned int i = 0; i < crossed.size(); i++) { double timeEnd = crossed[i]; - Geom::Path portionOriginal = original.portion(timeStart,timeEnd); - Geom::Point sideChecker = portionOriginal.pointAt(0.001); - position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), sideChecker); + Geom::Path portion_original = original.portion(time_start,timeEnd); + Geom::Point side_checker = portion_original.pointAt(0.001); + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); if(num_copies > 2) { - position = pointInTriangle(sideChecker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if(position == 1) { - tmp_path.push_back(portionOriginal); + tmp_path.push_back(portion_original); } - portionOriginal.clear(); - timeStart = timeEnd; + portion_original.clear(); + time_start = timeEnd; } position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); if(num_copies > 2) { position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if(cs.size() > 0 && position == 1) { - Geom::Path portionOriginal = original.portion(timeStart, original.size()); + Geom::Path portion_original = original.portion(time_start, original.size()); if (!original.closed()) { - tmp_path.push_back(portionOriginal); + tmp_path.push_back(portion_original); } else { if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { - portionOriginal.setFinal(tmp_path[0].initialPoint()); - portionOriginal.append(tmp_path[0]); - tmp_path[0] = portionOriginal; + portion_original.setFinal(tmp_path[0].initialPoint()); + portion_original.append(tmp_path[0]); + tmp_path[0] = portion_original; } else { - tmp_path.push_back(portionOriginal); + tmp_path.push_back(portion_original); } //temp_path[0].close(); } - portionOriginal.clear(); + portion_original.clear(); } if(cs.size()==0 && position == 1) { tmp_path.push_back(original); @@ -216,7 +216,7 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, double sizeDivider) +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, double size_divider) { split(path_on,divider); std::vector tmp_path; @@ -226,14 +226,14 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi if (path_it->empty()) { continue; } - std::vector tmp_path2; - Geom::Path appendPath = original; + std::vector tmp_path_helper; + Geom::Path append_path = original; for (int i = 0; i < num_copies; ++i) { Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * (i))); Geom::Affine m = pre * rot * Geom::Translate(origin); if(i%2 != 0) { Geom::Point A = (Geom::Point)origin; - Geom::Point B = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle*i)+starting_angle)) * sizeDivider; + Geom::Point B = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle*i)+starting_angle)) * size_divider; Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); double hyp = Geom::distance(A, B); double c = (B[0] - A[0]) / hyp; // cos(alpha) @@ -248,51 +248,51 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi m = m * m2.inverse(); m = m * m1; } else { - appendPath = original; + append_path = original; } - appendPath *= m; - if(i != 0 && tmp_path2.size() > 0 &&( Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.finalPoint()))) { - Geom::Path tmpAppend = appendPath.reverse(); - tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); - tmp_path2[tmp_path2.size()-1].append(tmpAppend); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.initialPoint())) { - Geom::Path tmpAppend = appendPath; - tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); - tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); - tmp_path2[tmp_path2.size()-1].append(tmpAppend); - tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),appendPath.initialPoint())) { - Geom::Path tmpAppend = appendPath; - tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); - tmp_path2[tmp_path2.size()-1].append(tmpAppend); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].initialPoint(),appendPath.finalPoint())) { - Geom::Path tmpAppend = appendPath.reverse(); - tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); - tmpAppend.setInitial(tmp_path2[tmp_path2.size()-1].finalPoint()); - tmp_path2[tmp_path2.size()-1].append(tmpAppend); - tmp_path2[tmp_path2.size()-1] = tmp_path2[tmp_path2.size()-1].reverse(); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].finalPoint(),appendPath.finalPoint())) { - Geom::Path tmpAppend = appendPath.reverse(); - tmpAppend.setInitial(tmp_path2[0].finalPoint()); - tmp_path2[0].append(tmpAppend); - } else if(i != 0 && tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].initialPoint(),appendPath.initialPoint())) { - Geom::Path tmpAppend = appendPath; - tmp_path2[0] = tmp_path2[0].reverse(); - tmpAppend.setInitial(tmp_path2[0].finalPoint()); - tmp_path2[0].append(tmpAppend); - tmp_path2[0] = tmp_path2[0].reverse(); + append_path *= m; + if(i != 0 && tmp_path_helper.size() > 0 &&( Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),append_path.finalPoint()))) { + Geom::Path tmp_append = append_path.reverse(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reverse(); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].finalPoint(),append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reverse(); + tmp_append.setInitial(tmp_path_helper[0].finalPoint()); + tmp_path_helper[0].append(tmp_append); + } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].initialPoint(),append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_path_helper[0] = tmp_path_helper[0].reverse(); + tmp_append.setInitial(tmp_path_helper[0].finalPoint()); + tmp_path_helper[0].append(tmp_append); + tmp_path_helper[0] = tmp_path_helper[0].reverse(); } else { - tmp_path2.push_back(appendPath); + tmp_path_helper.push_back(append_path); } - if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[tmp_path2.size()-1].finalPoint(),tmp_path2[tmp_path2.size()-1].initialPoint())) { - tmp_path2[tmp_path2.size()-1].close(); + if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),tmp_path_helper[tmp_path_helper.size()-1].initialPoint())) { + tmp_path_helper[tmp_path_helper.size()-1].close(); } } - if(tmp_path2.size() > 0 && Geom::are_near(tmp_path2[0].finalPoint(),tmp_path2[0].initialPoint())) { - tmp_path2[0].close(); + if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].finalPoint(),tmp_path_helper[0].initialPoint())) { + tmp_path_helper[0].close(); } - tmp_path.insert(tmp_path.end(), tmp_path2.begin(), tmp_path2.end()); - tmp_path2.clear(); + tmp_path.insert(tmp_path.end(), tmp_path_helper.begin(), tmp_path_helper.end()); + tmp_path_helper.clear(); } path_on = tmp_path; tmp_path.clear(); @@ -309,14 +309,14 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); - double sizeDivider = Geom::distance(origin,bbox) + (diagonal * 2); - Geom::Point lineStart = origin + dir * Rotate(-deg_to_rad(starting_angle)) * sizeDivider; - Geom::Point lineEnd = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * sizeDivider; + double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); + Geom::Point line_start = origin + dir * Rotate(-deg_to_rad(starting_angle)) * size_divider; + Geom::Point line_end = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * size_divider; //Note:: beter way to do this //Whith AppendNew have problems whith the crossing order - Geom::Path divider = Geom::Path(lineStart); + Geom::Path divider = Geom::Path(line_start); divider.appendNew((Geom::Point)origin); - divider.appendNew(lineEnd); + divider.appendNew(line_end); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(kaleidoscope) { @@ -341,7 +341,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path,divider,sizeDivider); + setKaleidoscope(tmp_path,divider,size_divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index de00226a4..83f4a6984 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -63,7 +63,7 @@ private: ScalarParam starting_angle; ScalarParam rotation_angle; ScalarParam num_copies; - BoolParam copiesTo360; + BoolParam copies_to_360; BoolParam kaleidoscope; Geom::Point A; -- cgit v1.2.3 From a34915d4a9af00a7bf4fe7fdc20dcadbaf619edd Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 10 Apr 2015 22:11:17 +0200 Subject: Fix coding style issues in mirror symmetry code (bzr r13682.1.25) --- src/live_effects/lpe-mirror_symmetry.cpp | 179 ++++++++++++++++--------------- src/live_effects/lpe-mirror_symmetry.h | 14 +-- 2 files changed, 100 insertions(+), 93 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index e549ad697..5bae6738b 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -42,8 +42,14 @@ namespace MS { class KnotHolderEntityCenterMirrorSymmetry : public LPEKnotHolderEntity { public: - KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) {this->knoth = effect->knoth;}; - virtual ~KnotHolderEntityCenterMirrorSymmetry() { this->knoth = NULL;} + KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) + { + this->knoth = effect->knoth; + }; + virtual ~KnotHolderEntityCenterMirrorSymmetry() + { + this->knoth = NULL; + } virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual Geom::Point knot_get() const; private: @@ -56,8 +62,8 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), mode(_("Mode"), _("Symetry move mode"), "mode", MTConverter, &wr, this, MT_FREE), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), - fusionPaths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusionPaths", &wr, this, true), - reverseFusion(_("Reverse fusion"), _("Reverse fusion"), "reverseFusion", &wr, this, false), + fusion_paths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusion_paths", &wr, this, true), + reverse_fusion(_("Reverse fusion"), _("Reverse fusion"), "reverse_fusion", &wr, this, false), reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring"), knoth(NULL) @@ -66,8 +72,8 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : registerParameter(&mode); registerParameter( &discard_orig_path); - registerParameter( &fusionPaths); - registerParameter( &reverseFusion); + registerParameter( &fusion_paths); + registerParameter( &reverse_fusion); registerParameter( &reflection_line); registerParameter( ¢er); @@ -83,46 +89,46 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) using namespace Geom; SPLPEItem * item = const_cast(lpeitem); - Point A(boundingbox_X.max(), boundingbox_Y.min()); - Point B(boundingbox_X.max(), boundingbox_Y.max()); - Point C(boundingbox_X.max(), boundingbox_Y.middle()); - if(mode == MT_Y){ - A = Geom::Point(boundingbox_X.min(),center[Y]); - B = Geom::Point(boundingbox_X.max(),center[Y]); + Point point_a(boundingbox_X.max(), boundingbox_Y.min()); + Point point_b(boundingbox_X.max(), boundingbox_Y.max()); + Point point_c(boundingbox_X.max(), boundingbox_Y.middle()); + if(mode == MT_Y) { + point_a = Geom::Point(boundingbox_X.min(),center[Y]); + point_b = Geom::Point(boundingbox_X.max(),center[Y]); } - if(mode == MT_X){ - A = Geom::Point(center[X],boundingbox_Y.min()); - B = Geom::Point(center[X],boundingbox_Y.max()); + if(mode == MT_X) { + point_a = Geom::Point(center[X],boundingbox_Y.min()); + point_b = Geom::Point(center[X],boundingbox_Y.max()); } - if( mode == MT_X || mode == MT_Y ){ + if( mode == MT_X || mode == MT_Y ) { Geom::Path path; - path.start( A ); - path.appendNew( B ); + path.start( point_a ); + path.appendNew( point_b ); reflection_line.set_new_value(path.toPwSb(), true); - lineSeparation.setPoints(A,B); + line_separation.setPoints(point_a, point_b); center.param_setValue(path.pointAt(0.5)); - if(knoth){ + if(knoth) { knoth->update_knots(); } } else if( mode == MT_FREE) { - std::vector mline(reflection_line.get_pathvector()); - if(!are_near(previousCenter,center, 0.01)){ - Geom::Point trans = center - mline[0].pointAt(0.5); - mline[0] *= Geom::Affine(1,0,0,1,trans[X],trans[Y]); - A = mline[0].initialPoint(); - B = mline[0].finalPoint(); - reflection_line.set_new_value(mline[0].toPwSb(), true); - lineSeparation.setPoints(A,B); + std::vector line_m(reflection_line.get_pathvector()); + if(!are_near(previous_center,center, 0.01)) { + Geom::Point trans = center - line_m[0].pointAt(0.5); + line_m[0] *= Geom::Affine(1,0,0,1,trans[X],trans[Y]); + point_a = line_m[0].initialPoint(); + point_b = line_m[0].finalPoint(); + reflection_line.set_new_value(line_m[0].toPwSb(), true); + line_separation.setPoints(point_a, point_b); } else { - center.param_setValue(mline[0].pointAt(0.5)); - A = mline[0].initialPoint(); - B = mline[0].finalPoint(); - lineSeparation.setPoints(A,B); - if(knoth){ + center.param_setValue(line_m[0].pointAt(0.5)); + point_a = line_m[0].initialPoint(); + point_b = line_m[0].finalPoint(); + line_separation.setPoints(point_a, point_b); + if(knoth) { knoth->update_knots(); } } - previousCenter = center; + previous_center = center; } item->apply_to_clippath(item); @@ -136,22 +142,22 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) original_bbox(lpeitem); - Point A(boundingbox_X.max(), boundingbox_Y.min()); - Point B(boundingbox_X.max(), boundingbox_Y.max()); - Point C(boundingbox_X.max(), boundingbox_Y.middle()); + Point point_a(boundingbox_X.max(), boundingbox_Y.min()); + Point point_b(boundingbox_X.max(), boundingbox_Y.max()); + Point point_c(boundingbox_X.max(), boundingbox_Y.middle()); Geom::Path path; - path.start( A ); - path.appendNew( B ); + path.start( point_a ); + path.appendNew( point_b ); reflection_line.set_new_value(path.toPwSb(), true); - center.param_setValue(C); - previousCenter = center; + center.param_setValue(point_c); + previous_center = center; } -int -LPEMirrorSymmetry::pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X) +int +LPEMirrorSymmetry::pointSideOfLine(Geom::Point point_a, Geom::Point point_b, Geom::Point point_x) { //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); + double pos = (point_b[Geom::X]-point_a[Geom::X])*(point_x[Geom::Y]-point_a[Geom::Y]) - (point_b[Geom::Y]-point_a[Geom::Y])*(point_x[Geom::X]-point_a[Geom::X]); return (pos < 0) ? -1 : (pos > 0); } @@ -164,23 +170,23 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) } Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); std::vector path_out; - Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); - mlineExpanded.start( lineStart); - mlineExpanded.appendNew( lineEnd); + Geom::Path line_m_expanded; + Geom::Point line_start = line_separation.pointAt(-100000.0); + Geom::Point line_end = line_separation.pointAt(100000.0); + line_m_expanded.start( line_start); + line_m_expanded.appendNew( line_end); - if (!discard_orig_path && !fusionPaths) { + if (!discard_orig_path && !fusion_paths) { path_out = path_in; } - Geom::Point A(lineStart); - Geom::Point B(lineEnd); + Geom::Point point_a(line_start); + Geom::Point point_b(line_end); - Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); - double hyp = Geom::distance(A, B); - double c = (B[0] - A[0]) / hyp; // cos(alpha) - double s = (B[1] - A[1]) / hyp; // sin(alpha) + Geom::Affine m1(1.0, 0.0, 0.0, 1.0, point_a[0], point_a[1]); + double hyp = Geom::distance(point_a, point_b); + double c = (point_b[0] - point_a[0]) / hyp; // cos(alpha) + double s = (point_b[1] - point_a[1]) / hyp; // sin(alpha) Geom::Affine m2(c, -s, s, c, 0.0, 0.0); Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); @@ -189,15 +195,15 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) m = m * sca; m = m * m2.inverse(); m = m * m1; - - if(fusionPaths && !discard_orig_path){ + + if(fusion_paths && !discard_orig_path) { for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); - path_it != original_pathv.end(); ++path_it) { - if (path_it->empty()){ + path_it != original_pathv.end(); ++path_it) { + if (path_it->empty()) { continue; } std::vector temp_path; - double timeStart = 0.0; + double time_start = 0.0; int position = 0; bool end_open = false; if (path_it->closed()) { @@ -207,48 +213,48 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) } } Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it->closed()){ + if(end_open && path_it->closed()) { original.close(false); original.appendNew( original.initialPoint() ); original.close(true); } - Geom::Crossings cs = crossings(original, mlineExpanded); + Geom::Crossings cs = crossings(original, line_m_expanded); for(unsigned int i = 0; i < cs.size(); i++) { double timeEnd = cs[i].ta; - Geom::Path portion = original.portion(timeStart, timeEnd); + Geom::Path portion = original.portion(time_start, timeEnd); Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = pointSideOfLine(lineStart, lineEnd, middle); - if(reverseFusion){ + position = pointSideOfLine(line_start, line_end, middle); + if(reverse_fusion) { position *= -1; } - if(position == 1){ + if(position == 1) { Geom::Path mirror = portion.reverse() * m; mirror.setInitial(portion.finalPoint()); portion.append(mirror); - if(i!=0){ + if(i!=0) { portion.setFinal(portion.initialPoint()); portion.close(); } temp_path.push_back(portion); } portion.clear(); - timeStart = timeEnd; + time_start = timeEnd; } - position = pointSideOfLine(lineStart, lineEnd, original.finalPoint()); - if(reverseFusion){ + position = pointSideOfLine(line_start, line_end, original.finalPoint()); + if(reverse_fusion) { position *= -1; } - if(cs.size()!=0 && position == 1){ - Geom::Path portion = original.portion(timeStart, original.size()); + if(cs.size()!=0 && position == 1) { + Geom::Path portion = original.portion(time_start, original.size()); portion = portion.reverse(); Geom::Path mirror = portion.reverse() * m; mirror.setInitial(portion.finalPoint()); portion.append(mirror); portion = portion.reverse(); - if (!original.closed()){ + if (!original.closed()) { temp_path.push_back(portion); } else { - if(cs.size() >1 ){ + if(cs.size() >1 ) { portion.setFinal(temp_path[0].initialPoint()); portion.setInitial(temp_path[0].finalPoint()); temp_path[0].append(portion); @@ -259,7 +265,7 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) } portion.clear(); } - if(cs.size() == 0 && position == 1){ + if(cs.size() == 0 && position == 1) { temp_path.push_back(original); temp_path.push_back(original * m); } @@ -267,8 +273,8 @@ LPEMirrorSymmetry::doEffect_path (std::vector const & path_in) temp_path.clear(); } } - - if (!fusionPaths || discard_orig_path) { + + if (!fusion_paths || discard_orig_path) { for (int i = 0; i < static_cast(path_in.size()); ++i) { path_out.push_back(path_in[i] * m); } @@ -283,17 +289,18 @@ LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector using namespace Geom; PathVector pathv; - Geom::Path mlineExpanded; - Geom::Point lineStart = lineSeparation.pointAt(-100000.0); - Geom::Point lineEnd = lineSeparation.pointAt(100000.0); - mlineExpanded.start( lineStart); - mlineExpanded.appendNew( lineEnd); - pathv.push_back(mlineExpanded); + Geom::Path line_m_expanded; + Geom::Point line_start = line_separation.pointAt(-100000.0); + Geom::Point line_end = line_separation.pointAt(100000.0); + line_m_expanded.start( line_start); + line_m_expanded.appendNew( line_end); + pathv.push_back(line_m_expanded); hp_vec.push_back(pathv); } -void -LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { +void +LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) +{ { knoth = knotholder; KnotHolderEntity *e = new MS::KnotHolderEntityCenterMirrorSymmetry(this); diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 97d641bcc..43535650d 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -26,8 +26,8 @@ namespace Inkscape { namespace LivePathEffect { namespace MS { - // we need a separate namespace to avoid clashes with LPEPerpBisector - class KnotHolderEntityCenterMirrorSymmetry; +// we need a separate namespace to avoid clashes with LPEPerpBisector +class KnotHolderEntityCenterMirrorSymmetry; } enum ModeType { @@ -37,7 +37,7 @@ enum ModeType { MT_END }; -class LPEMirrorSymmetry : public Effect, GroupBBoxEffect{ +class LPEMirrorSymmetry : public Effect, GroupBBoxEffect { public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); virtual ~LPEMirrorSymmetry(); @@ -60,11 +60,11 @@ protected: private: EnumParam mode; BoolParam discard_orig_path; - BoolParam fusionPaths; - BoolParam reverseFusion; + BoolParam fusion_paths; + BoolParam reverse_fusion; PathParam reflection_line; - Geom::Line lineSeparation; - Geom::Point previousCenter; + Geom::Line line_separation; + Geom::Point previous_center; PointParam center; KnotHolder *knoth; -- cgit v1.2.3 From 78f080901f40a7390559f88ab14465131bb02717 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 1 Jun 2015 23:46:40 +0200 Subject: opening kaleidscope (bzr r13708.1.28) --- src/live_effects/lpe-copy_rotate.cpp | 95 ++++++++++++++++++++++++++++++++++-- src/live_effects/lpe-copy_rotate.h | 4 +- 2 files changed, 94 insertions(+), 5 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 4fd605b6d..c119ca02e 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -110,10 +110,10 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if(kaleidoscope || copies_to_360 ) { + if(copies_to_360 ) { rotation_angle.param_set_value(360.0/(double)num_copies); } - if(kaleidoscope) { + if(kaleidoscope && copies_to_360) { num_copies.param_set_increments(2,2); if((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); @@ -216,8 +216,72 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, double size_divider) +LPECopyRotate::split_extreme(std::vector &path_on,Geom::Path divider_extreme) { + std::vector tmp_path; + double time_start = 0.0; + Geom::Path original = path_on[0]; + int position = 0; + Geom::Crossings cs = crossings(original,divider_extreme); + std::vector crossed; + for(unsigned int i = 0; i < cs.size(); i++) { + crossed.push_back(cs[i].ta); + } + std::sort (crossed.begin(), crossed.end()); + for(unsigned int i = 0; i < crossed.size(); i++) { + double timeEnd = crossed[i]; + Geom::Path portion_original = original.portion(time_start,timeEnd); + Geom::Point side_checker = portion_original.pointAt(0.001); + position = pointSideOfLine(divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint(), side_checker); + if(num_copies > 2) { + position = pointInTriangle(side_checker, divider_extreme.initialPoint(), divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint()); + } + if(position == 1) { + Geom::Path start = Geom::Path(divider_extreme.at(0)); + start.appendNew(divider_extreme.at(1)); + if(!are_near(nearest_point(portion_original.initialPoint(),start),portion_original.initialPoint())){ + portion_original.reverse(); + } + tmp_path.push_back(portion_original); + } + portion_original.clear(); + time_start = timeEnd; + } + position = pointSideOfLine(divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint(), original.finalPoint()); + if(num_copies > 2) { + position = pointInTriangle(original.finalPoint(), divider_extreme.initialPoint(), divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint()); + } + if(cs.size() > 0 && position == 1) { + Geom::Path portion_original = original.portion(time_start, original.size()); + Geom::Path start = Geom::Path(divider_extreme.at(0)); + start.appendNew(divider_extreme.at(1)); + if(!are_near(nearest_point(portion_original.initialPoint(),start),portion_original.initialPoint())){ + portion_original.reverse(); + } + if (!original.closed()) { + tmp_path.push_back(portion_original); + } else { + if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { + portion_original.setFinal(tmp_path[0].initialPoint()); + portion_original.append(tmp_path[0]); + tmp_path[0] = portion_original; + } else { + tmp_path.push_back(portion_original); + } + //temp_path[0].close(); + } + portion_original.clear(); + } + if(cs.size()==0 && position == 1) { + tmp_path.push_back(original); + } + path_on = tmp_path; +} + +void +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, Geom::Path divider_extreme, double size_divider) +{ + std::vector path_on_start = path_on; split(path_on,divider); std::vector tmp_path; Geom::Affine pre = Geom::Translate(-origin); @@ -282,6 +346,21 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi tmp_path_helper[0].append(tmp_append); tmp_path_helper[0] = tmp_path_helper[0].reverse(); } else { + if(rotation_angle * num_copies != 360){ + split_start(path_on_start,divider_extreme); + for (Geom::PathVector::const_iterator path_it_start = path_on_start.begin(); path_it_start != path_on_start.end(); ++path_it_start) { + Geom::Path original_start = *path_it_start; + if (path_it->empty()) { + continue; + } + std::vector tmp_path_helper; + if(tmp_path_helper.size() > 0 && Geom::are_near(append_path.initialPoint(),path_it_start[0].initialPoint())) { + path_it_start.reverse(); + path_it_start.append(append_path); + append_path = path_it_start; + } + } + } tmp_path_helper.push_back(append_path); } if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),tmp_path_helper[tmp_path_helper.size()-1].initialPoint())) { @@ -317,6 +396,14 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Geom::Path divider = Geom::Path(line_start); divider.appendNew((Geom::Point)origin); divider.appendNew(line_end); + Geom::Point line_oposite = origin + dir * Rotate(-deg_to_rad((rotation_angle/2)+starting_angle)) * size_divider; + Geom::Path divider_start = Geom::Path(line_start); + divider_start.appendNew((Geom::Point)origin); + divider_start.appendNew(line_oposite); + Geom::Path divider_end = Geom::Path(line_end); + divider_end.appendNew((Geom::Point)origin); + divider_end.appendNew(line_oposite); + Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(kaleidoscope) { @@ -341,7 +428,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path,divider,size_divider); + setKaleidoscope(tmp_path,divider, divider_extreme, size_divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 83f4a6984..638f8a413 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,7 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, double sizeDivider); + virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, Geom::Path extreme, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); @@ -46,6 +46,8 @@ public: virtual void split(std::vector &path_in,Geom::Path divider); + virtual void split_extreme(std::vector &path_on,Geom::Path divider_extreme); + virtual void resetDefaults(SPItem const* item); virtual void transform_multiply(Geom::Affine const& postmul, bool set); -- cgit v1.2.3 From 53ff3799d1f7c05cfa7f1384eb39b5105c29f9ab Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 2 Jun 2015 19:29:54 +0200 Subject: opening kaleidscope (bzr r13708.1.30) --- src/live_effects/lpe-copy_rotate.cpp | 27 +++++++++++++-------------- src/live_effects/lpe-copy_rotate.h | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index c119ca02e..f9d1bffee 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -237,9 +237,9 @@ LPECopyRotate::split_extreme(std::vector &path_on,Geom::Path divider position = pointInTriangle(side_checker, divider_extreme.initialPoint(), divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint()); } if(position == 1) { - Geom::Path start = Geom::Path(divider_extreme.at(0)); - start.appendNew(divider_extreme.at(1)); - if(!are_near(nearest_point(portion_original.initialPoint(),start),portion_original.initialPoint())){ + Geom::Path start = Geom::Path(divider_extreme.pointAt(0)); + start.appendNew(divider_extreme.pointAt(1)); + if(!are_near(start.pointAt(nearest_point(portion_original.initialPoint(),start)),portion_original.initialPoint())){ portion_original.reverse(); } tmp_path.push_back(portion_original); @@ -253,9 +253,9 @@ LPECopyRotate::split_extreme(std::vector &path_on,Geom::Path divider } if(cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); - Geom::Path start = Geom::Path(divider_extreme.at(0)); - start.appendNew(divider_extreme.at(1)); - if(!are_near(nearest_point(portion_original.initialPoint(),start),portion_original.initialPoint())){ + Geom::Path start = Geom::Path(divider_extreme.pointAt(0)); + start.appendNew(divider_extreme.pointAt(1)); + if(!are_near(start.pointAt(nearest_point(portion_original.initialPoint(),start)),portion_original.initialPoint())){ portion_original.reverse(); } if (!original.closed()) { @@ -279,7 +279,7 @@ LPECopyRotate::split_extreme(std::vector &path_on,Geom::Path divider } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, Geom::Path divider_extreme, double size_divider) +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, Geom::Path divider_start, Geom::Path divider_end, double size_divider) { std::vector path_on_start = path_on; split(path_on,divider); @@ -347,18 +347,17 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi tmp_path_helper[0] = tmp_path_helper[0].reverse(); } else { if(rotation_angle * num_copies != 360){ - split_start(path_on_start,divider_extreme); + split_extreme(path_on_start,divider_start); for (Geom::PathVector::const_iterator path_it_start = path_on_start.begin(); path_it_start != path_on_start.end(); ++path_it_start) { Geom::Path original_start = *path_it_start; if (path_it->empty()) { continue; } - std::vector tmp_path_helper; - if(tmp_path_helper.size() > 0 && Geom::are_near(append_path.initialPoint(),path_it_start[0].initialPoint())) { - path_it_start.reverse(); - path_it_start.append(append_path); - append_path = path_it_start; + if(Geom::are_near(append_path.initialPoint(),original_start.initialPoint())) { + original_start.reverse(); } + original_start.append(append_path); + append_path = original_start; } } tmp_path_helper.push_back(append_path); @@ -428,7 +427,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path,divider, divider_extreme, size_divider); + setKaleidoscope(tmp_path,divider, divider_start, divider_end, size_divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 638f8a413..e16d3ceee 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,7 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, Geom::Path extreme, double sizeDivider); + virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, Geom::Path divider_start, Geom::Path divider_end, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); -- cgit v1.2.3 From 22ca2d7d903022da13a50ac2517e1ff2e3b5257d Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 4 Jun 2015 00:54:55 +0200 Subject: opening kaleidscope (bzr r13708.1.32) --- src/live_effects/lpe-copy_rotate.cpp | 134 +++++++++++++---------------------- src/live_effects/lpe-copy_rotate.h | 4 +- 2 files changed, 51 insertions(+), 87 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index f9d1bffee..990bc1192 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -113,7 +113,10 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) if(copies_to_360 ) { rotation_angle.param_set_value(360.0/(double)num_copies); } - if(kaleidoscope && copies_to_360) { + if(kaleidoscope && rotation_angle * num_copies > 360 && rotation_angle > 0){ + num_copies.param_set_value(floor(360/rotation_angle)); + } + if(kaleidoscope || copies_to_360) { num_copies.param_set_increments(2,2); if((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); @@ -169,6 +172,7 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) double time_start = 0.0; Geom::Path original = path_on[0]; int position = 0; + Geom::Line divider_line(divider.pointAt(0),divider.pointAt(1)); Geom::Crossings cs = crossings(original,divider); std::vector crossed; for(unsigned int i = 0; i < cs.size(); i++) { @@ -184,6 +188,9 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if(position == 1) { + if(!Geom::are_near(portion_original.pointAt(0),divider_line)){ + portion_original = portion_original.reverse(); + } tmp_path.push_back(portion_original); } portion_original.clear(); @@ -195,68 +202,8 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } if(cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); - if (!original.closed()) { - tmp_path.push_back(portion_original); - } else { - if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { - portion_original.setFinal(tmp_path[0].initialPoint()); - portion_original.append(tmp_path[0]); - tmp_path[0] = portion_original; - } else { - tmp_path.push_back(portion_original); - } - //temp_path[0].close(); - } - portion_original.clear(); - } - if(cs.size()==0 && position == 1) { - tmp_path.push_back(original); - } - path_on = tmp_path; -} - -void -LPECopyRotate::split_extreme(std::vector &path_on,Geom::Path divider_extreme) -{ - std::vector tmp_path; - double time_start = 0.0; - Geom::Path original = path_on[0]; - int position = 0; - Geom::Crossings cs = crossings(original,divider_extreme); - std::vector crossed; - for(unsigned int i = 0; i < cs.size(); i++) { - crossed.push_back(cs[i].ta); - } - std::sort (crossed.begin(), crossed.end()); - for(unsigned int i = 0; i < crossed.size(); i++) { - double timeEnd = crossed[i]; - Geom::Path portion_original = original.portion(time_start,timeEnd); - Geom::Point side_checker = portion_original.pointAt(0.001); - position = pointSideOfLine(divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint(), side_checker); - if(num_copies > 2) { - position = pointInTriangle(side_checker, divider_extreme.initialPoint(), divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint()); - } - if(position == 1) { - Geom::Path start = Geom::Path(divider_extreme.pointAt(0)); - start.appendNew(divider_extreme.pointAt(1)); - if(!are_near(start.pointAt(nearest_point(portion_original.initialPoint(),start)),portion_original.initialPoint())){ - portion_original.reverse(); - } - tmp_path.push_back(portion_original); - } - portion_original.clear(); - time_start = timeEnd; - } - position = pointSideOfLine(divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint(), original.finalPoint()); - if(num_copies > 2) { - position = pointInTriangle(original.finalPoint(), divider_extreme.initialPoint(), divider_extreme[0].finalPoint(), divider_extreme[1].finalPoint()); - } - if(cs.size() > 0 && position == 1) { - Geom::Path portion_original = original.portion(time_start, original.size()); - Geom::Path start = Geom::Path(divider_extreme.pointAt(0)); - start.appendNew(divider_extreme.pointAt(1)); - if(!are_near(start.pointAt(nearest_point(portion_original.initialPoint(),start)),portion_original.initialPoint())){ - portion_original.reverse(); + if(!Geom::are_near(portion_original.pointAt(0),divider_line)){ + portion_original = portion_original.reverse(); } if (!original.closed()) { tmp_path.push_back(portion_original); @@ -279,7 +226,7 @@ LPECopyRotate::split_extreme(std::vector &path_on,Geom::Path divider } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, Geom::Path divider_start, Geom::Path divider_end, double size_divider) +LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, Geom::Path divider_start, double size_divider) { std::vector path_on_start = path_on; split(path_on,divider); @@ -346,26 +293,49 @@ LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divi tmp_path_helper[0].append(tmp_append); tmp_path_helper[0] = tmp_path_helper[0].reverse(); } else { - if(rotation_angle * num_copies != 360){ - split_extreme(path_on_start,divider_start); - for (Geom::PathVector::const_iterator path_it_start = path_on_start.begin(); path_it_start != path_on_start.end(); ++path_it_start) { - Geom::Path original_start = *path_it_start; - if (path_it->empty()) { - continue; - } - if(Geom::are_near(append_path.initialPoint(),original_start.initialPoint())) { - original_start.reverse(); - } - original_start.append(append_path); - append_path = original_start; - } - } tmp_path_helper.push_back(append_path); } if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),tmp_path_helper[tmp_path_helper.size()-1].initialPoint())) { tmp_path_helper[tmp_path_helper.size()-1].close(); } } + if(rotation_angle * num_copies != 360 && tmp_path_helper.size() > 0){ + split(path_on_start,divider_start); + for (Geom::PathVector::const_iterator path_it_start = path_on_start.begin(); path_it_start != path_on_start.end(); ++path_it_start) { + Geom::Path original_start = *path_it_start; + if (path_it->empty()) { + continue; + } + + if( Geom::are_near(tmp_path_helper[0].initialPoint(),original_start.initialPoint())){ + Geom::Point A(divider_start.pointAt(1)); + Geom::Point B(divider_start.pointAt(2)); + + Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); + double hyp = Geom::distance(A, B); + double c = (B[0] - A[0]) / hyp; // cos(alpha) + double s = (B[1] - A[1]) / hyp; // sin(alpha) + + Geom::Affine m2(c, -s, s, c, 0.0, 0.0); + Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); + + Geom::Affine m = m1.inverse() * m2; + m = m * sca; + m = m * m2.inverse(); + m = m * m1; + original_start.setInitial(tmp_path_helper[0].initialPoint()); + Geom::Path mirror = original_start * m; + mirror = mirror.reverse(); + mirror.setInitial(original_start.finalPoint()); + original_start.append(mirror); + original_start = original_start.reverse(); + original_start.setFinal(tmp_path_helper[0].initialPoint()); + original_start.append(tmp_path_helper[0]); + tmp_path_helper[0] = original_start; + } + } + } + if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].finalPoint(),tmp_path_helper[0].initialPoint())) { tmp_path_helper[0].close(); } @@ -395,14 +365,10 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Geom::Path divider = Geom::Path(line_start); divider.appendNew((Geom::Point)origin); divider.appendNew(line_end); - Geom::Point line_oposite = origin + dir * Rotate(-deg_to_rad((rotation_angle/2)+starting_angle)) * size_divider; + Geom::Point line_oposite = origin + dir * Rotate(-deg_to_rad((rotation_angle * num_copies /2)+starting_angle + 180)) * size_divider; Geom::Path divider_start = Geom::Path(line_start); divider_start.appendNew((Geom::Point)origin); divider_start.appendNew(line_oposite); - Geom::Path divider_end = Geom::Path(line_end); - divider_end.appendNew((Geom::Point)origin); - divider_end.appendNew(line_oposite); - Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(kaleidoscope) { @@ -427,7 +393,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path,divider, divider_start, divider_end, size_divider); + setKaleidoscope(tmp_path,divider, divider_start, size_divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index e16d3ceee..efbb5f746 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,7 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, Geom::Path divider_start, Geom::Path divider_end, double sizeDivider); + virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, Geom::Path divider_start, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); @@ -46,8 +46,6 @@ public: virtual void split(std::vector &path_in,Geom::Path divider); - virtual void split_extreme(std::vector &path_on,Geom::Path divider_extreme); - virtual void resetDefaults(SPItem const* item); virtual void transform_multiply(Geom::Affine const& postmul, bool set); -- cgit v1.2.3 From d50fe92ba2df09544c11aca985e1746ecdc47fe2 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 4 Jun 2015 01:20:27 +0200 Subject: opening kaleidscope (bzr r13708.1.33) --- src/live_effects/lpe-copy_rotate.cpp | 24 ++++++++++++------------ src/live_effects/lpe-copy_rotate.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 990bc1192..559e117cf 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -52,7 +52,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), - kaleidoscope(_("kaleidoscope"), _("kaleidoscope"), "kaleidoscope", &wr, this, false), + fusion_paths(_("Fusioned paths"), _("Fusion paths by helper line"), "fusion_paths", &wr, this, false), dist_angle_handle(100.0) { show_orig_path = true; @@ -60,7 +60,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : // register all your parameters here, so Inkscape knows which parameters this effect has: registerParameter(&copies_to_360); - registerParameter(&kaleidoscope); + registerParameter(&fusion_paths); registerParameter(&starting_angle); registerParameter(&rotation_angle); registerParameter(&num_copies); @@ -92,7 +92,7 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) void LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) { - if(kaleidoscope) { + if(fusion_paths) { Geom::Coord angle = Geom::rad_to_deg(atan(-postmul[1]/postmul[0])); angle += starting_angle; starting_angle.param_set_value(angle); @@ -113,10 +113,10 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) if(copies_to_360 ) { rotation_angle.param_set_value(360.0/(double)num_copies); } - if(kaleidoscope && rotation_angle * num_copies > 360 && rotation_angle > 0){ + if(fusion_paths && rotation_angle * num_copies > 360 && rotation_angle > 0){ num_copies.param_set_value(floor(360/rotation_angle)); } - if(kaleidoscope || copies_to_360) { + if(fusion_paths || copies_to_360) { num_copies.param_set_increments(2,2); if((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); @@ -135,7 +135,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-deg_to_rad(starting_angle)) * dist_angle_handle; rot_pos = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * dist_angle_handle; - if( kaleidoscope || copies_to_360 ) { + if( fusion_paths || copies_to_360 ) { rot_pos = origin; } SPLPEItem * item = const_cast(lpeitem); @@ -189,7 +189,7 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } if(position == 1) { if(!Geom::are_near(portion_original.pointAt(0),divider_line)){ - portion_original = portion_original.reverse(); + //portion_original = portion_original.reverse(); } tmp_path.push_back(portion_original); } @@ -203,7 +203,7 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) if(cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); if(!Geom::are_near(portion_original.pointAt(0),divider_line)){ - portion_original = portion_original.reverse(); + // portion_original = portion_original.reverse(); } if (!original.closed()) { tmp_path.push_back(portion_original); @@ -226,7 +226,7 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } void -LPECopyRotate::setKaleidoscope(std::vector &path_on, Geom::Path divider, Geom::Path divider_start, double size_divider) +LPECopyRotate::setFusion(std::vector &path_on, Geom::Path divider, Geom::Path divider_start, double size_divider) { std::vector path_on_start = path_on; split(path_on,divider); @@ -359,7 +359,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); Geom::Point line_start = origin + dir * Rotate(-deg_to_rad(starting_angle)) * size_divider; - Geom::Point line_end = origin + dir * Rotate(-deg_to_rad(rotation_angle+starting_angle)) * size_divider; + Geom::Point line_end = origin + dir * Rotate(-deg_to_rad(rotation_angle + starting_angle)) * size_divider; //Note:: beter way to do this //Whith AppendNew have problems whith the crossing order Geom::Path divider = Geom::Path(line_start); @@ -371,7 +371,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p divider_start.appendNew(line_oposite); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); - if(kaleidoscope) { + if(fusion_paths) { std::vector path_out; std::vector tmp_path; PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); @@ -393,7 +393,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setKaleidoscope(tmp_path,divider, divider_start, size_divider); + setFusion(tmp_path,divider, divider_start, size_divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index efbb5f746..02141b359 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,7 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setKaleidoscope(std::vector &path_in, Geom::Path divider, Geom::Path divider_start, double sizeDivider); + virtual void setFusion(std::vector &path_in, Geom::Path divider, Geom::Path divider_start, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); @@ -64,7 +64,7 @@ private: ScalarParam rotation_angle; ScalarParam num_copies; BoolParam copies_to_360; - BoolParam kaleidoscope; + BoolParam fusion_paths; Geom::Point A; Geom::Point B; -- cgit v1.2.3 From ee3b91ebda768eb483c159dc3072cb5a20df5086 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 4 Jun 2015 20:37:00 +0200 Subject: Change from kaleidoscope to multiangle fusion (bzr r13708.1.34) --- src/live_effects/lpe-copy_rotate.cpp | 77 +++++++++++++----------------------- src/live_effects/lpe-copy_rotate.h | 2 +- 2 files changed, 28 insertions(+), 51 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 559e117cf..d12c03f7e 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -116,7 +116,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) if(fusion_paths && rotation_angle * num_copies > 360 && rotation_angle > 0){ num_copies.param_set_value(floor(360/rotation_angle)); } - if(fusion_paths || copies_to_360) { + if(fusion_paths && copies_to_360) { num_copies.param_set_increments(2,2); if((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); @@ -172,7 +172,6 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) double time_start = 0.0; Geom::Path original = path_on[0]; int position = 0; - Geom::Line divider_line(divider.pointAt(0),divider.pointAt(1)); Geom::Crossings cs = crossings(original,divider); std::vector crossed; for(unsigned int i = 0; i < cs.size(); i++) { @@ -184,27 +183,21 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) Geom::Path portion_original = original.portion(time_start,timeEnd); Geom::Point side_checker = portion_original.pointAt(0.001); position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); - if(num_copies > 2) { + if(rotation_angle != 180) { position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if(position == 1) { - if(!Geom::are_near(portion_original.pointAt(0),divider_line)){ - //portion_original = portion_original.reverse(); - } tmp_path.push_back(portion_original); } portion_original.clear(); time_start = timeEnd; } position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); - if(num_copies > 2) { + if(rotation_angle != 180) { position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if(cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); - if(!Geom::are_near(portion_original.pointAt(0),divider_line)){ - // portion_original = portion_original.reverse(); - } if (!original.closed()) { tmp_path.push_back(portion_original); } else { @@ -215,7 +208,6 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } else { tmp_path.push_back(portion_original); } - //temp_path[0].close(); } portion_original.clear(); } @@ -226,9 +218,8 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } void -LPECopyRotate::setFusion(std::vector &path_on, Geom::Path divider, Geom::Path divider_start, double size_divider) +LPECopyRotate::setFusion(std::vector &path_on, Geom::Path divider, double size_divider) { - std::vector path_on_start = path_on; split(path_on,divider); std::vector tmp_path; Geom::Affine pre = Geom::Translate(-origin); @@ -300,39 +291,29 @@ LPECopyRotate::setFusion(std::vector &path_on, Geom::Path divider, G } } if(rotation_angle * num_copies != 360 && tmp_path_helper.size() > 0){ - split(path_on_start,divider_start); - for (Geom::PathVector::const_iterator path_it_start = path_on_start.begin(); path_it_start != path_on_start.end(); ++path_it_start) { - Geom::Path original_start = *path_it_start; - if (path_it->empty()) { - continue; + Geom::Ray base_a(divider.pointAt(1),divider.pointAt(0)); + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); + Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle * num_copies) + starting_angle)) * size_divider; + Geom::Ray base_b(divider.pointAt(1), base_point); + if(Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && Geom::are_near(tmp_path_helper[0].finalPoint(),base_a)){ + tmp_path_helper[0].close(); + if(tmp_path_helper.size() > 1){ + tmp_path_helper[tmp_path_helper.size()-1].close(); } - - if( Geom::are_near(tmp_path_helper[0].initialPoint(),original_start.initialPoint())){ - Geom::Point A(divider_start.pointAt(1)); - Geom::Point B(divider_start.pointAt(2)); - - Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); - double hyp = Geom::distance(A, B); - double c = (B[0] - A[0]) / hyp; // cos(alpha) - double s = (B[1] - A[1]) / hyp; // sin(alpha) - - Geom::Affine m2(c, -s, s, c, 0.0, 0.0); - Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); - - Geom::Affine m = m1.inverse() * m2; - m = m * sca; - m = m * m2.inverse(); - m = m * m1; - original_start.setInitial(tmp_path_helper[0].initialPoint()); - Geom::Path mirror = original_start * m; - mirror = mirror.reverse(); - mirror.setInitial(original_start.finalPoint()); - original_start.append(mirror); - original_start = original_start.reverse(); - original_start.setFinal(tmp_path_helper[0].initialPoint()); - original_start.append(tmp_path_helper[0]); - tmp_path_helper[0] = original_start; + } else if(Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),base_b) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)){ + tmp_path_helper[0].close(); + if(tmp_path_helper.size() > 1){ + tmp_path_helper[tmp_path_helper.size()-1].close(); } + } else if((Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)) || + (Geom::are_near(tmp_path_helper[0].initialPoint(),base_b) && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_a))){ + Geom::Path close_path = Geom::Path(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + close_path.appendNew((Geom::Point)origin); + close_path.appendNew(tmp_path_helper[0].initialPoint()); + tmp_path_helper[0].append(close_path); } } @@ -351,7 +332,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p { using namespace Geom; - if(num_copies == 1) { + if(num_copies == 1 && !fusion_paths) { return pwd2_in; } @@ -365,10 +346,6 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Geom::Path divider = Geom::Path(line_start); divider.appendNew((Geom::Point)origin); divider.appendNew(line_end); - Geom::Point line_oposite = origin + dir * Rotate(-deg_to_rad((rotation_angle * num_copies /2)+starting_angle + 180)) * size_divider; - Geom::Path divider_start = Geom::Path(line_start); - divider_start.appendNew((Geom::Point)origin); - divider_start.appendNew(line_oposite); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(fusion_paths) { @@ -393,7 +370,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p original.close(true); } tmp_path.push_back(original); - setFusion(tmp_path,divider, divider_start, size_divider); + setFusion(tmp_path, divider, size_divider); path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 02141b359..b230a6fc9 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,7 +38,7 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setFusion(std::vector &path_in, Geom::Path divider, Geom::Path divider_start, double sizeDivider); + virtual void setFusion(std::vector &path_in, Geom::Path divider, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); -- cgit v1.2.3 From e9e6116349cc51e31ae3a643a89644aa4e817b0a Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 4 Jun 2015 22:21:35 +0200 Subject: fix minor bug (bzr r13708.1.36) --- src/live_effects/lpe-copy_rotate.cpp | 42 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index d12c03f7e..cfc1b92cf 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -110,7 +110,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if(copies_to_360 ) { + if( copies_to_360 ) { rotation_angle.param_set_value(360.0/(double)num_copies); } if(fusion_paths && rotation_angle * num_copies > 360 && rotation_angle > 0){ @@ -181,16 +181,18 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) for(unsigned int i = 0; i < crossed.size(); i++) { double timeEnd = crossed[i]; Geom::Path portion_original = original.portion(time_start,timeEnd); - Geom::Point side_checker = portion_original.pointAt(0.001); - position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); - if(rotation_angle != 180) { - position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); - } - if(position == 1) { - tmp_path.push_back(portion_original); + if(!portion_original.empty()){ + Geom::Point side_checker = portion_original.pointAt(0.001); + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); + if(rotation_angle != 180) { + position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + } + if(position == 1) { + tmp_path.push_back(portion_original); + } + portion_original.clear(); + time_start = timeEnd; } - portion_original.clear(); - time_start = timeEnd; } position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); if(rotation_angle != 180) { @@ -198,18 +200,20 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } if(cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); - if (!original.closed()) { - tmp_path.push_back(portion_original); - } else { - if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { - portion_original.setFinal(tmp_path[0].initialPoint()); - portion_original.append(tmp_path[0]); - tmp_path[0] = portion_original; - } else { + if(!portion_original.empty()){ + if (!original.closed()) { tmp_path.push_back(portion_original); + } else { + if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { + portion_original.setFinal(tmp_path[0].initialPoint()); + portion_original.append(tmp_path[0]); + tmp_path[0] = portion_original; + } else { + tmp_path.push_back(portion_original); + } } + portion_original.clear(); } - portion_original.clear(); } if(cs.size()==0 && position == 1) { tmp_path.push_back(original); -- cgit v1.2.3 From 713ebbaf2d2961951d599543cff3b3cae721955c Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 25 Jul 2015 00:19:48 +0200 Subject: fixes for update to trunk (bzr r13708.1.38) --- src/live_effects/lpe-copy_rotate.cpp | 32 ++++++++++++++++---------------- src/live_effects/lpe-copy_rotate.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index cfc1b92cf..083f56be8 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -166,9 +166,9 @@ LPECopyRotate::pointInTriangle(Geom::Point p, Geom::Point p1, Geom::Point p2, Ge } void -LPECopyRotate::split(std::vector &path_on,Geom::Path divider) +LPECopyRotate::split(Geom::PathVector &path_on,Geom::Path divider) { - std::vector tmp_path; + Geom::PathVector tmp_path; double time_start = 0.0; Geom::Path original = path_on[0]; int position = 0; @@ -222,17 +222,17 @@ LPECopyRotate::split(std::vector &path_on,Geom::Path divider) } void -LPECopyRotate::setFusion(std::vector &path_on, Geom::Path divider, double size_divider) +LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double size_divider) { split(path_on,divider); - std::vector tmp_path; + Geom::PathVector tmp_path; Geom::Affine pre = Geom::Translate(-origin); for (Geom::PathVector::const_iterator path_it = path_on.begin(); path_it != path_on.end(); ++path_it) { Geom::Path original = *path_it; if (path_it->empty()) { continue; } - std::vector tmp_path_helper; + Geom::PathVector tmp_path_helper; Geom::Path append_path = original; for (int i = 0; i < num_copies; ++i) { Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * (i))); @@ -258,35 +258,35 @@ LPECopyRotate::setFusion(std::vector &path_on, Geom::Path divider, d } append_path *= m; if(i != 0 && tmp_path_helper.size() > 0 &&( Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),append_path.finalPoint()))) { - Geom::Path tmp_append = append_path.reverse(); + Geom::Path tmp_append = append_path.reversed(); tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),append_path.initialPoint())) { Geom::Path tmp_append = append_path; - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),append_path.initialPoint())) { Geom::Path tmp_append = append_path; tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),append_path.finalPoint())) { - Geom::Path tmp_append = append_path.reverse(); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + Geom::Path tmp_append = append_path.reversed(); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reverse(); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].finalPoint(),append_path.finalPoint())) { - Geom::Path tmp_append = append_path.reverse(); + Geom::Path tmp_append = append_path.reversed(); tmp_append.setInitial(tmp_path_helper[0].finalPoint()); tmp_path_helper[0].append(tmp_append); } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].initialPoint(),append_path.initialPoint())) { Geom::Path tmp_append = append_path; - tmp_path_helper[0] = tmp_path_helper[0].reverse(); + tmp_path_helper[0] = tmp_path_helper[0].reversed(); tmp_append.setInitial(tmp_path_helper[0].finalPoint()); tmp_path_helper[0].append(tmp_append); - tmp_path_helper[0] = tmp_path_helper[0].reverse(); + tmp_path_helper[0] = tmp_path_helper[0].reversed(); } else { tmp_path_helper.push_back(append_path); } @@ -353,8 +353,8 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p Piecewise > output; Affine pre = Translate(-origin) * Rotate(-deg_to_rad(starting_angle)); if(fusion_paths) { - std::vector path_out; - std::vector tmp_path; + Geom::PathVector path_out; + Geom::PathVector tmp_path; PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { if (path_it->empty()) { diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index b230a6fc9..e45fa6d37 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -38,13 +38,13 @@ public: virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setFusion(std::vector &path_in, Geom::Path divider, double sizeDivider); + virtual void setFusion(Geom::PathVector &path_in, Geom::Path divider, double sizeDivider); virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); - virtual void split(std::vector &path_in,Geom::Path divider); + virtual void split(Geom::PathVector &path_in,Geom::Path divider); virtual void resetDefaults(SPItem const* item); -- cgit v1.2.3 From 8c56f58ee39a66e2a25252e01c795296a958ec40 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 25 Jul 2015 04:15:13 +0200 Subject: Fix helper path (bzr r13682.1.29) --- src/live_effects/lpe-mirror_symmetry.cpp | 44 ++++++++------------------------ src/live_effects/lpe-mirror_symmetry.h | 1 - 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 7a9870d78..79cdf947d 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -42,18 +42,9 @@ namespace MS { class KnotHolderEntityCenterMirrorSymmetry : public LPEKnotHolderEntity { public: - KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect) - { - this->knoth = effect->knoth; - }; - virtual ~KnotHolderEntityCenterMirrorSymmetry() - { - this->knoth = NULL; - } + KnotHolderEntityCenterMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect){}; virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual Geom::Point knot_get() const; -private: - KnotHolder *knoth; }; } // namespace MS @@ -65,8 +56,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : fusion_paths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusion_paths", &wr, this, true), reverse_fusion(_("Reverse fusion"), _("Reverse fusion"), "reverse_fusion", &wr, this, false), reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), - center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring"), - knoth(NULL) + center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") { show_orig_path = true; @@ -106,10 +96,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) path.appendNew( point_b ); reflection_line.set_new_value(path.toPwSb(), true); line_separation.setPoints(point_a, point_b); - center.param_setValue(path.pointAt(0.5)); - if(knoth) { - knoth->update_knots(); - } + center.param_setValue(path.pointAt(0.5), true); } else if( mode == MT_FREE) { Geom::PathVector line_m(reflection_line.get_pathvector()); if(!are_near(previous_center,center, 0.01)) { @@ -120,13 +107,10 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) reflection_line.set_new_value(line_m[0].toPwSb(), true); line_separation.setPoints(point_a, point_b); } else { - center.param_setValue(line_m[0].pointAt(0.5)); + center.param_setValue(line_m[0].pointAt(0.5), true); point_a = line_m[0].initialPoint(); point_b = line_m[0].finalPoint(); line_separation.setPoints(point_a, point_b); - if(knoth) { - knoth->update_knots(); - } } previous_center = center; } @@ -228,7 +212,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) position *= -1; } if(position == 1) { - Geom::Path mirror = portion.reverse() * m; + Geom::Path mirror = portion.reversed() * m; mirror.setInitial(portion.finalPoint()); portion.append(mirror); if(i!=0) { @@ -246,11 +230,11 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) } if(cs.size()!=0 && position == 1) { Geom::Path portion = original.portion(time_start, original.size()); - portion = portion.reverse(); - Geom::Path mirror = portion.reverse() * m; + portion = portion.reversed(); + Geom::Path mirror = portion.reversed() * m; mirror.setInitial(portion.finalPoint()); portion.append(mirror); - portion = portion.reverse(); + portion = portion.reversed(); if (!original.closed()) { temp_path.push_back(portion); } else { @@ -287,22 +271,14 @@ void LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector &hp_vec) { using namespace Geom; - - PathVector pathv; - Geom::Path line_m_expanded; - Geom::Point line_start = line_separation.pointAt(-100000.0); - Geom::Point line_end = line_separation.pointAt(100000.0); - line_m_expanded.start( line_start); - line_m_expanded.appendNew( line_end); - pathv.push_back(line_m_expanded); - hp_vec.push_back(pathv); + hp_vec.clear(); + hp_vec.push_back(reflection_line.get_pathvector()); } void LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { { - knoth = knotholder; KnotHolderEntity *e = new MS::KnotHolderEntityCenterMirrorSymmetry(this); e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _("Adjust the center") ); diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index b30972308..12bf2e7d3 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -66,7 +66,6 @@ private: Geom::Line line_separation; Geom::Point previous_center; PointParam center; - KnotHolder *knoth; LPEMirrorSymmetry(const LPEMirrorSymmetry&); LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); -- cgit v1.2.3 From e2386a9a6f485c6e1a1ea6d4ca4f7b3809fda9c6 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 25 Jul 2015 04:24:00 +0200 Subject: clean merge (bzr r13682.1.30) --- src/knotholder.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/knotholder.cpp b/src/knotholder.cpp index 6d39fa5fa..a2d1cf017 100644 --- a/src/knotholder.cpp +++ b/src/knotholder.cpp @@ -68,9 +68,8 @@ KnotHolder::KnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFun sizeUpdatedConn = ControlManager::getManager().connectCtrlSizeChanged(sigc::mem_fun(*this, &KnotHolder::updateControlSizes)); } -KnotHolder::~KnotHolder() -{ - sp_object_unref(item); +KnotHolder::~KnotHolder() { + sp_object_unref(item); for (std::list::iterator i = entity.begin(); i != entity.end(); ++i) { -- cgit v1.2.3 From 46df96973716748cde5c889a49379fcc6bbd82b9 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 25 Jul 2015 04:30:46 +0200 Subject: update credits (bzr r13682.1.31) --- src/live_effects/lpe-mirror_symmetry.cpp | 1 + src/live_effects/lpe-mirror_symmetry.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 79cdf947d..685dc6354 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -6,6 +6,7 @@ * Maximilian Albert * Johan Engelen * Abhishek Sharma + * Jabiertxof * * Copyright (C) Johan Engelen 2007 * Copyright (C) Maximilin Albert 2008 diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 12bf2e7d3..0874f0c7e 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -8,6 +8,7 @@ * Authors: * Maximilian Albert * Johan Engelen + * Jabiertxof * * Copyright (C) Johan Engelen 2007 * Copyright (C) Maximilin Albert 2008 -- cgit v1.2.3 From 710d4b83c310bd2fe9958aa22a9938b7ddb022a7 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 13 Feb 2016 02:41:52 +0100 Subject: Improved eraser tool, now working on documents not pixels and with 0 width (bzr r14648.1.1) --- src/splivarot.cpp | 7 ++ src/splivarot.h | 1 + src/ui/tools/eraser-tool.cpp | 159 +++++++++++++++++++++-------------------- src/ui/tools/eraser-tool.h | 1 + src/widgets/eraser-toolbar.cpp | 6 +- 5 files changed, 92 insertions(+), 82 deletions(-) diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 9b2890bb8..461445ee0 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -105,6 +105,13 @@ sp_selected_path_cut(Inkscape::Selection *selection, SPDesktop *desktop) { sp_selected_path_boolop(selection, desktop, bool_op_cut, SP_VERB_SELECTION_CUT, _("Division")); } + +void +sp_selected_path_cut_skip_undo(Inkscape::Selection *selection, SPDesktop *desktop) +{ + sp_selected_path_boolop(selection, desktop, bool_op_cut, SP_VERB_NONE, _("Division")); +} + void sp_selected_path_slice(Inkscape::Selection *selection, SPDesktop *desktop) { diff --git a/src/splivarot.h b/src/splivarot.h index ba314399f..421c9c4b8 100644 --- a/src/splivarot.h +++ b/src/splivarot.h @@ -33,6 +33,7 @@ void sp_selected_path_diff (Inkscape::Selection *selection, SPDesktop *desktop); void sp_selected_path_diff_skip_undo (Inkscape::Selection *selection, SPDesktop *desktop); void sp_selected_path_symdiff (Inkscape::Selection *selection, SPDesktop *desktop); void sp_selected_path_cut (Inkscape::Selection *selection, SPDesktop *desktop); +void sp_selected_path_cut_skip_undo (Inkscape::Selection *selection, SPDesktop *desktop); void sp_selected_path_slice (Inkscape::Selection *selection, SPDesktop *desktop); // offset/inset of a curve diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 83ecf7a0a..51068a3ae 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -96,6 +96,7 @@ const std::string EraserTool::prefsPath = "/tools/eraser"; EraserTool::EraserTool() : DynamicBase(cursor_eraser_xpm, 4, 4) + , nowidth(false) { } @@ -145,6 +146,7 @@ static ProfileFloatElement f_profile[PROFILE_FLOAT_SIZE] = { sp_event_context_read(this, "cap_rounding"); this->is_drawing = false; + //TODO not sure why get 0.01 if slider width == 0, maybe a double/int problem Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/tools/eraser/selcue", 0) != 0) { @@ -339,7 +341,10 @@ void EraserTool::brush() { this->point1[this->npoints] = brush + del_left; this->point2[this->npoints] = brush - del_right; - + + if (this->nowidth) { + this->point1[this->npoints] = Geom::middle_point(this->point1[this->npoints],this->point2[this->npoints]); + } this->del = 0.5*(del_left + del_right); this->npoints++; @@ -489,33 +494,32 @@ bool EraserTool::root_handler(GdkEvent* event) { case GDK_KEY_PRESS: switch (get_group0_keyval (&event->key)) { - case GDK_KEY_Up: - case GDK_KEY_KP_Up: - if (!MOD__CTRL_ONLY(event)) { - this->angle += 5.0; - - if (this->angle > 90.0) { - this->angle = 90.0; - } - - sp_erc_update_toolbox (desktop, "eraser-angle", this->angle); - ret = TRUE; - } - break; - - case GDK_KEY_Down: - case GDK_KEY_KP_Down: - if (!MOD__CTRL_ONLY(event)) { - this->angle -= 5.0; - - if (this->angle < -90.0) { - this->angle = -90.0; - } - - sp_erc_update_toolbox (desktop, "eraser-angle", this->angle); - ret = TRUE; - } - break; +// case GDK_KEY_Up: +// case GDK_KEY_KP_Up: +// if (!MOD__CTRL_ONLY(event)) { +// this->angle += 5.0; + +// if (this->angle > 90.0) { +// this->angle = 90.0; +// } +// sp_erc_update_toolbox (desktop, "eraser-angle", this->angle); +// ret = TRUE; +// } +// break; + +// case GDK_KEY_Down: +// case GDK_KEY_KP_Down: +// if (!MOD__CTRL_ONLY(event)) { +// this->angle -= 5.0; + +// if (this->angle < -90.0) { +// this->angle = -90.0; +// } + +// sp_erc_update_toolbox (desktop, "eraser-angle", this->angle); +// ret = TRUE; +// } +// break; case GDK_KEY_Right: case GDK_KEY_KP_Right: @@ -640,20 +644,16 @@ void EraserTool::set_to_accumulated() { sp_desktop_apply_style_tool (desktop, repr, "/tools/eraser", false); this->repr = repr; - - SPItem *item=SP_ITEM(desktop->currentLayer()->appendChildRepr(this->repr)); - Inkscape::GC::release(this->repr); - - item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); - item->updateRepr(); } - + SPItem *item=SP_ITEM(desktop->currentLayer()->appendChildRepr(this->repr)); + Inkscape::GC::release(this->repr); + item->updateRepr(); Geom::PathVector pathv = this->accumulated->get_pathvector() * desktop->dt2doc(); + pathv *= item->i2doc_affine().inverse(); gchar *str = sp_svg_write_path(pathv); g_assert( str != NULL ); this->repr->setAttribute("d", str); g_free(str); - if ( this->repr ) { bool wasSelection = false; Inkscape::Selection *selection = desktop->getSelection(); @@ -663,13 +663,12 @@ void EraserTool::set_to_accumulated() { Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc(); SPItem* acid = SP_ITEM(desktop->doc()->getObjectByRepr(this->repr)); - Geom::OptRect eraserBbox = acid->visualBounds(); - Geom::Rect bounds = (*eraserBbox) * desktop->doc2dt(); + Geom::OptRect eraserBbox = acid->desktopVisualBounds(); std::vector remainingItems; std::vector toWorkOn; if (selection->isEmpty()) { if ( eraserMode ) { - toWorkOn = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, bounds); + toWorkOn = desktop->getDocument()->getItemsPartiallyInBox(desktop->dkey, *eraserBbox); } else { Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); toWorkOn = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints()); @@ -684,30 +683,30 @@ void EraserTool::set_to_accumulated() { if ( eraserMode ) { for (std::vector::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); ++i){ SPItem *item = *i; - - if ( eraserMode ) { - Geom::OptRect bbox = item->visualBounds(); - - if (bbox && bbox->intersects(*eraserBbox)) { - Inkscape::XML::Node* dup = this->repr->duplicate(xml_doc); - this->repr->parent()->appendChild(dup); - Inkscape::GC::release(dup); // parent takes over - - selection->set(item); - selection->add(dup); + Geom::OptRect bbox = item->desktopVisualBounds(); + if (bbox && bbox->intersects(*eraserBbox)) { + Inkscape::XML::Node* dup = this->repr->duplicate(xml_doc); + this->repr->parent()->appendChild(dup); + Inkscape::GC::release(dup); // parent takes over + + selection->set(item); + selection->add(dup); + if (this->nowidth) { + sp_selected_path_cut_skip_undo(selection, desktop); + } else { sp_selected_path_diff_skip_undo(selection, desktop); - workDone = true; // TODO set this only if something was cut. - - if ( !selection->isEmpty() ) { - // If the item was not completely erased, track the new remainder. - std::vector nowSel(selection->itemList()); - for (std::vector::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) { - remainingItems.push_back(*i2); - } + } + workDone = true; // TODO set this only if something was cut. + + if ( !selection->isEmpty() ) { + // If the item was not completely erased, track the new remainder. + std::vector nowSel(selection->itemList()); + for (std::vector::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) { + remainingItems.push_back(*i2); } - } else { - remainingItems.push_back(item); } + } else { + remainingItems.push_back(item); } } } else { @@ -811,24 +810,25 @@ void EraserTool::accumulate() { g_assert( rev_cal2_lastseg ); this->accumulated->append(this->cal1, FALSE); - - add_cap(this->accumulated, - dc_cal1_lastseg->finalPoint() - dc_cal1_lastseg->unitTangentAt(1), - dc_cal1_lastseg->finalPoint(), - rev_cal2_firstseg->initialPoint(), - rev_cal2_firstseg->initialPoint() + rev_cal2_firstseg->unitTangentAt(0), - this->cap_rounding); - - this->accumulated->append(rev_cal2, TRUE); - - add_cap(this->accumulated, - rev_cal2_lastseg->finalPoint() - rev_cal2_lastseg->unitTangentAt(1), - rev_cal2_lastseg->finalPoint(), - dc_cal1_firstseg->initialPoint(), - dc_cal1_firstseg->initialPoint() + dc_cal1_firstseg->unitTangentAt(0), - this->cap_rounding); - - this->accumulated->closepath(); + if(!this->nowidth) { + add_cap(this->accumulated, + dc_cal1_lastseg->finalPoint() - dc_cal1_lastseg->unitTangentAt(1), + dc_cal1_lastseg->finalPoint(), + rev_cal2_firstseg->initialPoint(), + rev_cal2_firstseg->initialPoint() + rev_cal2_firstseg->unitTangentAt(0), + this->cap_rounding); + + this->accumulated->append(rev_cal2, TRUE); + + add_cap(this->accumulated, + rev_cal2_lastseg->finalPoint() - rev_cal2_lastseg->unitTangentAt(1), + rev_cal2_lastseg->finalPoint(), + dc_cal1_firstseg->initialPoint(), + dc_cal1_firstseg->initialPoint() + dc_cal1_firstseg->unitTangentAt(0), + this->cap_rounding); + + this->accumulated->closepath(); + } rev_cal2->unref(); @@ -844,6 +844,8 @@ static double square(double const x) void EraserTool::fit_and_split(bool release) { double const tolerance_sq = square( desktop->w2d().descrim() * TOLERANCE_ERASER ); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + this->nowidth = prefs->getDouble( "/tools/eraser/width", 1) == 0; #ifdef ERASER_VERBOSE g_print("[F&S:R=%c]", release?'T':'F'); @@ -940,7 +942,6 @@ void EraserTool::fit_and_split(bool release) { g_print("[%d]Yup\n", this->npoints); #endif if (!release) { - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0; g_assert(!this->currentcurve->is_empty()); diff --git a/src/ui/tools/eraser-tool.h b/src/ui/tools/eraser-tool.h index 110f57ba3..50ce6b6e3 100644 --- a/src/ui/tools/eraser-tool.h +++ b/src/ui/tools/eraser-tool.h @@ -58,6 +58,7 @@ private: void accumulate(); void fit_and_split(bool release); void draw_temporary_box(); + bool nowidth; }; } diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 1f79b50f2..f18a805b2 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -122,14 +122,14 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb { /* Width */ - gchar const* labels[] = {_("(hairline)"), 0, 0, 0, _("(default)"), 0, 0, 0, 0, _("(broad stroke)")}; - gdouble values[] = {1, 3, 5, 10, 15, 20, 30, 50, 75, 100}; + gchar const* labels[] = {_("(no width)"),_("(hairline)"), 0, 0, 0, _("(default)"), 0, 0, 0, 0, _("(broad stroke)")}; + gdouble values[] = {0, 1, 3, 5, 10, 15, 20, 30, 50, 75, 100}; EgeAdjustmentAction *eact = create_adjustment_action( "EraserWidthAction", _("Pen Width"), _("Width:"), _("The width of the eraser pen (relative to the visible canvas area)"), "/tools/eraser/width", 15, GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-eraser", - 1, 100, 1.0, 10.0, + 0, 100, 1.0, 10.0, labels, values, G_N_ELEMENTS(labels), sp_erc_width_value_changed, NULL /*unit tracker*/, 1, 0); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); -- cgit v1.2.3 From 53a4d10251bb079fa22ced4dcbb381f42f56ceb1 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Sat, 27 Feb 2016 01:25:50 -0800 Subject: cmake: Add sigc++ support Patch from rindolf Signed-off-by: Bryce Harrington (bzr r14669) --- CMakeScripts/DefineDependsandFlags.cmake | 1 + CMakeScripts/Modules/FindSigC++.cmake | 22 +++++++++++++++++++++- CMakeScripts/Modules/sigcpp_test.cpp | 15 +++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 CMakeScripts/Modules/sigcpp_test.cpp diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 59c2cb063..ab197a7af 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -411,6 +411,7 @@ if(WITH_NLS) endif(GETTEXT_FOUND) endif(WITH_NLS) +find_package(SigC++ REQUIRED) # end Dependencies diff --git a/CMakeScripts/Modules/FindSigC++.cmake b/CMakeScripts/Modules/FindSigC++.cmake index ed0abc545..8046410b5 100644 --- a/CMakeScripts/Modules/FindSigC++.cmake +++ b/CMakeScripts/Modules/FindSigC++.cmake @@ -13,7 +13,6 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # - if (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) # in cache already set(SIGC++_FOUND TRUE) @@ -103,4 +102,25 @@ else (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) endif (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) +# Try to add -std=c++11 if needed - see: +# https://bugs.launchpad.net/inkscape/+bug/1488079 + +macro (sigcpp_compile extra_cppflags) + try_compile(SIGCPP_COMPILES_FINE "${CMAKE_BINARY_DIR}/sigcpp-bindir" + SOURCES "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules/sigcpp_test.cpp" + COMPILE_DEFINITIONS ${_SIGC++_CFLAGS} ${extra_cppflags} + LINK_LIBRARIES ${SIGC++_LIBRARIES}) +endmacro() + + +sigcpp_compile("") +if (NOT "${SIGCPP_COMPILES_FINE}") + set (cppflag "-std=c++11") + sigcpp_compile("${cppflag}") + if ("${SIGCPP_COMPILES_FINE}") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cppflag}") + else() + message(FATAL_ERROR "Could not compile against SIGC++") + endif() +endif() diff --git a/CMakeScripts/Modules/sigcpp_test.cpp b/CMakeScripts/Modules/sigcpp_test.cpp new file mode 100644 index 000000000..b4cf2c773 --- /dev/null +++ b/CMakeScripts/Modules/sigcpp_test.cpp @@ -0,0 +1,15 @@ +/* + * Building this using: + + g++ `pkg-config --cflags sigc++-2.0` sigcpp_test.cpp + + Results in an error. + * */ +#include +#include +#include + +int main() +{ + return 0; +} -- cgit v1.2.3 From 1968410abdc6b7ad7631d62fa1677badac8caeab Mon Sep 17 00:00:00 2001 From: "Eduard Braun (eduard-braun2)" <> Date: Sat, 27 Feb 2016 12:53:28 +0100 Subject: UI. Fix for bug #1351597 (Inkscape + Cairo >= 1.12 very slow on Windows, unless rulers are hidden). Fixed bugs: - https://launchpad.net/bugs/1351597 (bzr r14670) --- src/widgets/ruler.cpp | 328 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 198 insertions(+), 130 deletions(-) diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index ab486eeeb..b722ecea7 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -41,8 +41,9 @@ #define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB -#define DEFAULT_RULER_FONT_SCALE PANGO_SCALE_X_SMALL -#define MINIMUM_INCR 5 +#define DEFAULT_RULER_FONT_SCALE PANGO_SCALE_X_SMALL +#define MINIMUM_INCR 5 +#define IMMEDIATE_REDRAW_THRESHOLD 20 using Inkscape::Util::unit_table; @@ -71,11 +72,11 @@ typedef struct GdkWindow *input_window; cairo_surface_t *backing_store; + gboolean backing_store_valid; + GdkRectangle last_pos_rect; + guint pos_redraw_idle_id; PangoLayout *layout; gdouble font_scale; - - gint xsrc; - gint ysrc; GList *track_widgets; } SPRulerPrivate; @@ -132,18 +133,22 @@ static void sp_ruler_style_updated (GtkWidget *widget); static void sp_ruler_size_request (GtkWidget *widget, GtkRequisition *requisition); static void sp_ruler_style_set (GtkWidget *widget, - GtkStyle *prev_style); + GtkStyle *prev_style); #endif static gboolean sp_ruler_motion_notify (GtkWidget *widget, GdkEventMotion *event); static gboolean sp_ruler_draw (GtkWidget *widget, - cairo_t *cr); + cairo_t *cr); #if !GTK_CHECK_VERSION(3,0,0) static gboolean sp_ruler_expose (GtkWidget *widget, GdkEventExpose *event); #endif static void sp_ruler_draw_ticks (SPRuler *ruler); +static GdkRectangle sp_ruler_get_pos_rect (SPRuler *ruler, + gdouble position); +static gboolean sp_ruler_idle_queue_pos_redraw(gpointer data); +static void sp_ruler_queue_pos_redraw (SPRuler *ruler); static void sp_ruler_draw_pos (SPRuler *ruler, cairo_t *cr); static void sp_ruler_make_pixmap (SPRuler *ruler); @@ -260,14 +265,23 @@ sp_ruler_init (SPRuler *ruler) gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE); - priv->orientation = GTK_ORIENTATION_HORIZONTAL; - priv->unit = unit_table.getUnit("px"); - priv->lower = 0; - priv->upper = 0; - priv->position = 0; - priv->max_size = 0; - priv->backing_store = NULL; - priv->font_scale = DEFAULT_RULER_FONT_SCALE; + priv->orientation = GTK_ORIENTATION_HORIZONTAL; + priv->unit = unit_table.getUnit("px"); + priv->lower = 0; + priv->upper = 0; + priv->position = 0; + priv->max_size = 0; + + priv->backing_store = NULL; + priv->backing_store_valid = FALSE; + + priv->last_pos_rect.x = 0; + priv->last_pos_rect.y = 0; + priv->last_pos_rect.width = 0; + priv->last_pos_rect.height = 0; + priv->pos_redraw_idle_id = 0; + + priv->font_scale = DEFAULT_RULER_FONT_SCALE; #if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,8,0) @@ -299,6 +313,12 @@ sp_ruler_dispose (GObject *object) while (priv->track_widgets) sp_ruler_remove_track_widget (ruler, GTK_WIDGET(priv->track_widgets->data)); + if (priv->pos_redraw_idle_id) + { + g_source_remove (priv->pos_redraw_idle_id); + priv->pos_redraw_idle_id = 0; + } + G_OBJECT_CLASS (parent_class)->dispose (object); } @@ -343,6 +363,7 @@ sp_ruler_set_range (SPRuler *ruler, } g_object_thaw_notify (G_OBJECT (ruler)); + priv->backing_store_valid = FALSE; gtk_widget_queue_draw (GTK_WIDGET (ruler)); } @@ -513,7 +534,9 @@ sp_ruler_unrealize(GtkWidget *widget) cairo_surface_destroy (priv->backing_store); priv->backing_store = NULL; } - + + priv->backing_store_valid = FALSE; + if (priv->layout) { g_object_unref (priv->layout); @@ -689,7 +712,6 @@ sp_ruler_expose (GtkWidget *widget, cairo_clip (cr); gtk_widget_get_allocation (widget, &allocation); - cairo_translate (cr, allocation.x, allocation.y); gboolean result = sp_ruler_draw (widget, cr); @@ -733,6 +755,8 @@ sp_ruler_make_pixmap (SPRuler *ruler) CAIRO_CONTENT_COLOR, allocation.width, allocation.height); + + priv->backing_store_valid = FALSE; } static void @@ -743,118 +767,22 @@ sp_ruler_draw_pos (SPRuler *ruler, #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *context = gtk_widget_get_style_context (widget); - GtkBorder border; GdkRGBA color; #else GtkStyle *style = gtk_widget_get_style (widget); GtkStateType state = gtk_widget_get_state (widget); - gint xthickness; - gint ythickness; #endif SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - GtkAllocation allocation; - gint x, y; - gint width, height; - gint bs_width, bs_height; + GdkRectangle pos_rect; if (! gtk_widget_is_drawable (widget)) return; - gtk_widget_get_allocation(widget, &allocation); - -#if GTK_CHECK_VERSION(3,0,0) - gtk_style_context_get_border (context, static_cast(0), &border); -#else - xthickness = style->xthickness; - ythickness = style->ythickness; -#endif - - if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - width = allocation.width; -#if GTK_CHECK_VERSION(3,0,0) - height = allocation.height - (border.top + border.bottom); -#else - height = allocation.height - ythickness * 2; -#endif - - bs_width = height / 2 + 2; - bs_width |= 1; /* make sure it's odd */ - bs_height = bs_width / 2 + 1; - } - else - { -#if GTK_CHECK_VERSION(3,0,0) - width = allocation.width - (border.left + border.right); -#else - width = allocation.width - xthickness * 2; -#endif - height = allocation.height; - - bs_height = width / 2 + 2; - bs_height |= 1; /* make sure it's odd */ - bs_width = bs_height / 2 + 1; - } + pos_rect = sp_ruler_get_pos_rect (ruler, sp_ruler_get_position (ruler)); - if ((bs_width > 0) && (bs_height > 0)) + if ((pos_rect.width > 0) && (pos_rect.height > 0)) { - gdouble lower; - gdouble upper; - gdouble position; - gdouble increment; - - if (! cr) - { - cr = gdk_cairo_create (gtk_widget_get_window (widget)); - cairo_translate (cr, allocation.x, allocation.y); - cairo_rectangle (cr, allocation.x, allocation.y, allocation.width, allocation.height); - cairo_clip (cr); - - cairo_translate (cr, allocation.x, allocation.y); - - /* If a backing store exists, restore the ruler */ - if (priv->backing_store) - { - cairo_set_source_surface (cr, priv->backing_store, 0, 0); - cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height); - cairo_fill (cr); - } - } - else - { - cairo_reference (cr); - } - - position = sp_ruler_get_position (ruler); - - sp_ruler_get_range (ruler, &lower, &upper, NULL); - - if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - { - increment = (gdouble) width / (upper - lower); - -#if GTK_CHECK_VERSION(3,0,0) - x = ROUND ((position - lower) * increment) + (border.left - bs_width) / 2 - 1; - y = (height + bs_height) / 2 + border.top; -#else - x = ROUND ((position - lower) * increment) + (xthickness - bs_width) / 2 - 1; - y = (height + bs_height) / 2 + ythickness; -#endif - } - else - { - increment = (gdouble) height / (upper - lower); - -#if GTK_CHECK_VERSION(3,0,0) - x = (width + bs_width) / 2 + border.left; - y = ROUND ((position - lower) * increment) + (border.top - bs_height) / 2 - 1; -#else - x = (width + bs_width) / 2 + xthickness; - y = ROUND ((position - lower) * increment) + (ythickness - bs_height) / 2 - 1; -#endif - } - #if GTK_CHECK_VERSION(3,0,0) gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget), &color); @@ -863,26 +791,28 @@ sp_ruler_draw_pos (SPRuler *ruler, gdk_cairo_set_source_color (cr, &style->fg[state]); #endif - cairo_move_to (cr, x, y); + cairo_move_to (cr, pos_rect.x, pos_rect.y); if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - cairo_line_to (cr, x + bs_width / 2.0, y + bs_height); - cairo_line_to (cr, x + bs_width, y); + cairo_line_to (cr, pos_rect.x + pos_rect.width / 2.0, + pos_rect.y + pos_rect.height); + cairo_line_to (cr, pos_rect.x + pos_rect.width, + pos_rect.y); } else { - cairo_line_to (cr, x + bs_width, y + bs_height / 2.0); - cairo_line_to (cr, x, y + bs_height); + cairo_line_to (cr, pos_rect.x + pos_rect.width, + + pos_rect.y + pos_rect.height / 2.0); + cairo_line_to (cr, pos_rect.x, + pos_rect.y + pos_rect.height); } cairo_fill (cr); - - cairo_destroy (cr); - - priv->xsrc = x; - priv->ysrc = y; } + + priv->last_pos_rect = pos_rect; } /** @@ -1096,6 +1026,7 @@ sp_ruler_set_unit (SPRuler *ruler, priv->unit = unit; g_object_notify(G_OBJECT(ruler), "unit"); + priv->backing_store_valid = FALSE; gtk_widget_queue_draw (GTK_WIDGET (ruler)); } } @@ -1131,10 +1062,39 @@ sp_ruler_set_position (SPRuler *ruler, if (priv->position != position) { - priv->position = position; - g_object_notify (G_OBJECT (ruler), "position"); - - sp_ruler_draw_pos (ruler, NULL); + GdkRectangle rect; + gint xdiff, ydiff; + + priv->position = position; + g_object_notify (G_OBJECT (ruler), "position"); + + rect = sp_ruler_get_pos_rect (ruler, priv->position); + + xdiff = rect.x - priv->last_pos_rect.x; + ydiff = rect.y - priv->last_pos_rect.y; + + /* + * If the position has changed far enough, queue a redraw immediately. + * Otherwise, we only queue a redraw in a low priority idle handler, to + * allow for other things (like updating the canvas) to run. + * + * TODO: This might not be necessary any more in GTK3 with the frame + * clock. Investigate this more after the port to GTK3. + */ + if (priv->last_pos_rect.width != 0 && + priv->last_pos_rect.height != 0 && + (ABS (xdiff) > IMMEDIATE_REDRAW_THRESHOLD || + ABS (ydiff) > IMMEDIATE_REDRAW_THRESHOLD)) + { + sp_ruler_queue_pos_redraw (ruler); + } + else if (! priv->pos_redraw_idle_id) + { + priv->pos_redraw_idle_id = + g_idle_add_full (G_PRIORITY_LOW, + sp_ruler_idle_queue_pos_redraw, + ruler, NULL); + } } } @@ -1454,10 +1414,118 @@ sp_ruler_draw_ticks (SPRuler *ruler) cairo_fill (cr); + priv->backing_store_valid = TRUE; + out: cairo_destroy (cr); } +static GdkRectangle +sp_ruler_get_pos_rect (SPRuler *ruler, + gdouble position) +{ + GtkWidget *widget = GTK_WIDGET (ruler); + GtkStyle *style = gtk_widget_get_style (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation allocation; + gint width, height; + gint xthickness; + gint ythickness; + gdouble upper, lower; + gdouble increment; + GdkRectangle rect = { 0, }; + + if (! gtk_widget_is_drawable (widget)) + return rect; + + gtk_widget_get_allocation (widget, &allocation); + + xthickness = style->xthickness; + ythickness = style->ythickness; + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + width = allocation.width; + height = allocation.height - ythickness * 2; + + rect.width = height / 2 + 2; + rect.width |= 1; /* make sure it's odd */ + rect.height = rect.width / 2 + 1; + } + else + { + width = allocation.width - xthickness * 2; + height = allocation.height; + + rect.height = width / 2 + 2; + rect.height |= 1; /* make sure it's odd */ + rect.width = rect.height / 2 + 1; + } + + sp_ruler_get_range (ruler, &lower, &upper, NULL); + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + increment = (gdouble) width / (upper - lower); + + rect.x = ROUND ((position - lower) * increment) + (xthickness - rect.width) / 2 - 1; + rect.y = (height + rect.height) / 2 + ythickness; + } + else + { + increment = (gdouble) height / (upper - lower); + + rect.x = (width + rect.width) / 2 + xthickness; + rect.y = ROUND ((position - lower) * increment) + (ythickness - rect.height) / 2 - 1; + } + + rect.x += allocation.x; + rect.y += allocation.y; + + return rect; +} + +static gboolean +sp_ruler_idle_queue_pos_redraw (gpointer data) +{ + SPRuler *ruler = (SPRuler *)data; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + + sp_ruler_queue_pos_redraw (ruler); + + gboolean ret = g_source_remove(priv->pos_redraw_idle_id); + priv->pos_redraw_idle_id = 0; + + return ret; +} + +static void +sp_ruler_queue_pos_redraw (SPRuler *ruler) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + const GdkRectangle rect = sp_ruler_get_pos_rect (ruler, priv->position); + + gtk_widget_queue_draw_area (GTK_WIDGET(ruler), + rect.x, + rect.y, + rect.width, + rect.height); + + if (priv->last_pos_rect.width != 0 || priv->last_pos_rect.height != 0) + { + gtk_widget_queue_draw_area (GTK_WIDGET(ruler), + priv->last_pos_rect.x, + priv->last_pos_rect.y, + priv->last_pos_rect.width, + priv->last_pos_rect.height); + + priv->last_pos_rect.x = 0; + priv->last_pos_rect.y = 0; + priv->last_pos_rect.width = 0; + priv->last_pos_rect.height = 0; + } +} + static PangoLayout* sp_ruler_create_layout (GtkWidget *widget, const gchar *text) -- cgit v1.2.3 From ee541fdb5f3096cf4805563eca091173a70ddf9e Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 27 Feb 2016 15:59:01 +0100 Subject: Fix miter-limit behavior to match SVG spec. (bzr r14671) --- src/helper/geom-pathstroke.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index 52871ae2a..3ef4b15da 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -163,7 +163,9 @@ void miter_join_internal(join_data jd, bool clip) if (p.isFinite()) { // check size of miter Point point_on_path = incoming.finalPoint() + rot90(tang1)*width; - satisfied = distance(p, point_on_path) <= miter * 2.0 * width; + // SVG defines miter length as distance between inner intersection and outer intersection, + // which is twice the distance from p to point_on_path but width is half stroke width. + satisfied = distance(p, point_on_path) <= miter * width; if (satisfied) { // miter OK, check to see if we can do a relocation if (inc_ls) { @@ -175,7 +177,7 @@ void miter_join_internal(join_data jd, bool clip) // std::cout << " Clipping ------------ " << std::endl; // miter needs clipping, find two points Point bisector_versor = Line(point_on_path, p).versor(); - Point point_limit = point_on_path + miter * 2.0 * width * bisector_versor; + Point point_limit = point_on_path + miter * width * bisector_versor; // std::cout << " bisector_versor: " << bisector_versor << std::endl; // std::cout << " point_limit: " << point_limit << std::endl; Point p1 = intersection_point(incoming.finalPoint(), tang1, point_limit, bisector_versor.cw()); -- cgit v1.2.3 From 380741fc91724ef40be2b6d938fd3d991bb28ccb Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 27 Feb 2016 12:38:36 -0500 Subject: Remove Maren from AUTHORS (on request) and add nicecharts from upstream where it was abandoned (bzr r14672) --- AUTHORS | 1 - share/extensions/nicechart.inx | 103 ++++++ share/extensions/nicechart.py | 718 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 821 insertions(+), 1 deletion(-) create mode 100644 share/extensions/nicechart.inx create mode 100755 share/extensions/nicechart.py diff --git a/AUTHORS b/AUTHORS index baffedb20..665b32a1e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -65,7 +65,6 @@ Toine de Greef Michael Grosberg Bryce Harrington Dale Harvey -Maren Hachmann Aurélio Adnauer Heckert Carl Hetherington Jos Hirth diff --git a/share/extensions/nicechart.inx b/share/extensions/nicechart.inx new file mode 100644 index 000000000..0ebcd8fca --- /dev/null +++ b/share/extensions/nicechart.inx @@ -0,0 +1,103 @@ + + + + <_name>NiceCharts + org.inkscape.filter.nicechart + nicechart.py + inkex.py + + + + + <_param name="desc" type="description">Enter the full path to a CSV file: + + ; + 0 + 1 + utf-8 + false + + + <_param name="desc" type="description">Type in comma separated values: + <_param name="desc" type="description">(format like this: apples:3,bananas:5) + apples:3,bananas:5,oranges:10,pears:4 + + + + + sans-serif + 10 + #000000 + + + false + 100 + 10 + 100 + 5 + 1 + 5 + 50 + false + + + <_item value="default">Default + <_item value="blue">Blue + <_item value="gray">Gray + <_item value="contrast">Contrast + <_item value="sap">SAP + + + + + false + false + + + false + + + + + <_item value="bar">Bar chart + <_item value="pie">Pie chart + <_item value="pie_abs">Pie chart (percentage) + <_item value="stbar">Stacked bar chart + + + all + + + + + + diff --git a/share/extensions/nicechart.py b/share/extensions/nicechart.py new file mode 100755 index 000000000..d4a819ccc --- /dev/null +++ b/share/extensions/nicechart.py @@ -0,0 +1,718 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# nicechart.py +# +# Copyright 2011-2016 +# +# Christoph Sterz +# Florian Weber +# Maren Hachmann +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +# TODO / Ideas: +# allow negative values for bar charts +# show values for stacked bar charts +# don't create a new layer for each chart, but a normal group +# correct bar height for stacked bars (it's only half as high as it should be, double) +# adjust position of heading +# use aliasing workaround for stacked bars (e.g. let the rectangles overlap) + +# Example CSV file contents: +''' +Month;1978;1979;1980;1981 +January;2;1,3;0.1;2.3 +February;6.5;2.4;1.2;6.1 +March;7.4;6.7;7.9;4.7 +April;7.7;6.4;8.2;8.9 +May;10.9;11.7;18.7;11.1 +June;12.6;14.2;14.7;14.7 +July;16.5;15.5;17.5;15.1 +August;15.9;15.4;14.6;16.6 +September;14;14.5;13.2;15.3 +October;11.9;13.9;11.5;9.2 +November;6.7;8.5;7;6.6 +December;6.4;2.2;6.3;3.5 +''' +# The extension creates one chart for a single value column in one go, +# e.g. chart all temperatures for all months of the year 1978 into one chart. +# (for this, select column 0 for labels and column 1 for values). +# "1978" etc. can be used as heading (Need not be numeric. If not used delete the heading line.) +# Month names can be used as labels +# Values can be shown, in addition to labels (doesn't work with stacked bar charts) +# Values can contain commas as decimal separator, as long as delimiter isn't comma +# Negative values are not yet supported. + + +import re +import sys +import math +import inkex + +from simplestyle import * + +#www.sapdesignguild.org/goodies/diagram_guidelines/color_palettes.html#mss +COLOUR_TABLE = { + "red": ["#460101", "#980101", "#d40000", "#f44800", "#fb8b00", "#eec73e", "#d9bb7a", "#fdd99b"], + "blue": ["#000442", "#0F1781", "#252FB7", "#3A45E1", "#656DDE", "#8A91EC"], + "gray": ["#222222", "#444444", "#666666", "#888888", "#aaaaaa", "#cccccc", "#eeeeee"], + "contrast": ["#0000FF", "#FF0000", "#00FF00", "#CF9100", "#FF00FF", "#00FFFF"], + "sap": ["#f8d753", "#5c9746", "#3e75a7", "#7a653e", "#e1662a", "#74796f", "#c4384f", + "#fff8a3", "#a9cc8f", "#b2c8d9", "#bea37a", "#f3aa79", "#b5b5a9", "#e6a5a5"] +} + +def get_color_scheme(name="default"): + return COLOUR_TABLE.get(name.lower(), COLOUR_TABLE['red']) + + +class NiceChart(inkex.Effect): + """ + Inkscape extension that can draw pie charts and bar charts + (stacked, single, horizontally or vertically) + with optional drop shadow, from a csv file or from pasted text + """ + + def __init__(self): + """ + Constructor. + Defines the "--what" option of a script. + """ + # Call the base class constructor. + inkex.Effect.__init__(self) + + # Define string option "--what" with "-w" shortcut and default chart values. + self.OptionParser.add_option('-w', '--what', action='store', + type='string', dest='what', default='22,11,67', + help='Chart Values') + + # Define string option "--type" with "-t" shortcut. + self.OptionParser.add_option("-t", "--type", action="store", + type="string", dest="type", default='', + help="Chart Type") + + # Define bool option "--blur" with "-b" shortcut. + self.OptionParser.add_option("-b", "--blur", action="store", + type="inkbool", dest="blur", default='True', + help="Blur Type") + + # Define string option "--file" with "-f" shortcut. + self.OptionParser.add_option("-f", "--filename", action="store", + type="string", dest="filename", default='', + help="Name of File") + + # Define string option "--input_type" with "-i" shortcut. + self.OptionParser.add_option("-i", "--input_type", action="store", + type="string", dest="input_type", default='file', + help="Chart Type") + + # Define string option "--delimiter" with "-d" shortcut. + self.OptionParser.add_option("-d", "--delimiter", action="store", + type="string", dest="csv_delimiter", default=';', + help="delimiter") + + # Define string option "--colors" with "-c" shortcut. + self.OptionParser.add_option("-c", "--colors", action="store", + type="string", dest="colors", default='default', + help="color-scheme") + + # Define string option "--colors_override" + self.OptionParser.add_option("", "--colors_override", action="store", + type="string", dest="colors_override", default='', + help="color-scheme-override") + + + self.OptionParser.add_option("", "--reverse_colors", action="store", + type="inkbool", dest="reverse_colors", default='False', + help="reverse color-scheme") + + self.OptionParser.add_option("-k", "--col_key", action="store", + type="int", dest="col_key", default='0', + help="column that contains the keys") + + + self.OptionParser.add_option("-v", "--col_val", action="store", + type="int", dest="col_val", default='1', + help="column that contains the values") + + self.OptionParser.add_option("", "--encoding", action="store", + type="string", dest="encoding", default='utf-8', + help="encoding of the CSV file, e.g. utf-8") + + self.OptionParser.add_option("", "--headings", action="store", + type="inkbool", dest="headings", default='False', + help="the first line of the CSV file consists of headings for the columns") + + self.OptionParser.add_option("-r", "--rotate", action="store", + type="inkbool", dest="rotate", default='False', + help="Draw barchart horizontally") + + self.OptionParser.add_option("-W", "--bar-width", action="store", + type="int", dest="bar_width", default='10', + help="width of bars") + + self.OptionParser.add_option("-p", "--pie-radius", action="store", + type="int", dest="pie_radius", default='100', + help="radius of pie-charts") + + self.OptionParser.add_option("-H", "--bar-height", action="store", + type="int", dest="bar_height", default='100', + help="height of bars") + + self.OptionParser.add_option("-O", "--bar-offset", action="store", + type="int", dest="bar_offset", default='5', + help="distance between bars") + + self.OptionParser.add_option("", "--stroke-width", action="store", + type="float", dest="stroke_width", default='1') + + self.OptionParser.add_option("-o", "--text-offset", action="store", + type="int", dest="text_offset", default='5', + help="distance between bar and descriptions") + + self.OptionParser.add_option("", "--heading-offset", action="store", + type="int", dest="heading_offset", default='50', + help="distance between chart and chart title") + + self.OptionParser.add_option("", "--segment-overlap", action="store", + type="inkbool", dest="segment_overlap", default='False', + help="work around aliasing effects by letting pie chart segments overlap") + + self.OptionParser.add_option("-F", "--font", action="store", + type="string", dest="font", default='sans-serif', + help="font of description") + + self.OptionParser.add_option("-S", "--font-size", action="store", + type="int", dest="font_size", default='10', + help="font size of description") + + self.OptionParser.add_option("-C", "--font-color", action="store", + type="string", dest="font_color", default='black', + help="font color of description") + #Dummy: + self.OptionParser.add_option("","--input_sections") + + self.OptionParser.add_option("-V", "--show_values", action="store", + type="inkbool", dest="show_values", default='False', + help="Show values in chart") + + def effect(self): + """ + Effect behaviour. + Overrides base class' method and inserts a nice looking chart into SVG document. + """ + # Get script's "--what" option value and process the data type --- i concess the if term is a little bit of magic + what = self.options.what + keys = [] + values = [] + orig_values = [] + keys_present = True + pie_abs = False + cnt = 0 + csv_file_name = self.options.filename + csv_delimiter = self.options.csv_delimiter + input_type = self.options.input_type + col_key = self.options.col_key + col_val = self.options.col_val + show_values = self.options.show_values + encoding = self.options.encoding.strip() or 'utf-8' + headings = self.options.headings + heading_offset = self.options.heading_offset + + if input_type == "\"file\"": + csv_file = open(csv_file_name, "r") + + for linenum, line in enumerate(csv_file): + value = line.decode(encoding).split(csv_delimiter) + #make sure that there is at least one value (someone may want to use it as description) + if len(value) >= 1: + # allow to parse headings as strings + if linenum == 0 and headings: + heading = value[col_val] + else: + keys.append(value[col_key]) + # replace comma decimal separator from file by colon, + # to avoid file editing for people whose programs output + # values with comma + values.append(float(value[col_val].replace(",","."))) + csv_file.close() + + elif input_type == "\"direct_input\"": + what = re.findall("([A-Z|a-z|0-9]+:[0-9]+\.?[0-9]*)", what) + for value in what: + value = value.split(":") + keys.append(value[0]) + values.append(float(value[1])) + + # warn about negative values (not yet supported) + for value in values: + if value < 0: + inkex.errormsg("Negative values are currently not supported!") + return + + # Get script's "--type" option value. + charttype = self.options.type + + if charttype == "pie_abs": + pie_abs = True + charttype = "pie" + + # Get access to main SVG document element and get its dimensions. + svg = self.document.getroot() + + # Get the page attibutes: + width = self.getUnittouu(svg.get('width')) + height = self.getUnittouu(svg.attrib['height']) + + # Create a new layer. + layer = inkex.etree.SubElement(svg, 'g') + layer.set(inkex.addNS('label', 'inkscape'), 'Chart-Layer: %s' % (what)) + layer.set(inkex.addNS('groupmode', 'inkscape'), 'layer') + + # Check if a drop shadow should be drawn: + draw_blur = self.options.blur + + if draw_blur: + # Get defs of Document + defs = self.xpathSingle('/svg:svg//svg:defs') + if defs == None: + defs = inkex.etree.SubElement(self.document.getroot(), inkex.addNS('defs', 'svg')) + + # Create new Filter + filt = inkex.etree.SubElement(defs,inkex.addNS('filter', 'svg')) + filtId = self.uniqueId('filter') + self.filtId = 'filter:url(#%s);' % filtId + for k, v in [('id', filtId), ('height', "3"), + ('width', "3"), + ('x', '-0.5'), ('y', '-0.5')]: + filt.set(k, v) + + # Append Gaussian Blur to that Filter + fe = inkex.etree.SubElement(filt, inkex.addNS('feGaussianBlur', 'svg')) + fe.set('stdDeviation', "1.1") + + # Set Default Colors + self.options.colors_override.strip() + if len(self.options.colors_override) > 0: + colors = self.options.colors_override + else: + colors = self.options.colors + + if colors[0].isalpha(): + colors = get_color_scheme(colors) + else: + colors = re.findall("(#[0-9a-fA-F]{6})", colors) + #to be sure we create a fallback: + if len(colors) == 0: + colors = get_color_scheme() + + color_count = len(colors) + + if self.options.reverse_colors: + colors.reverse() + + # Those values should be self-explanatory: + bar_height = self.options.bar_height + bar_width = self.options.bar_width + bar_offset = self.options.bar_offset + # offset of the description in stacked-bar-charts: + # stacked_bar_text_offset=self.options.stacked_bar_text_offset + text_offset = self.options.text_offset + # prevents ugly aliasing effects between pie chart segments by overlapping + segment_overlap = self.options.segment_overlap + + # get font + font = self.options.font + font_size = self.options.font_size + font_color = self.options.font_color + + # get rotation + rotate = self.options.rotate + + pie_radius = self.options.pie_radius + stroke_width = self.options.stroke_width + + if charttype == "bar": + ######### + ###BAR### + ######### + + # iterate all values, use offset to draw the bars in different places + offset = 0 + color = 0 + + # Normalize the bars to the largest value + try: + value_max = max(values) + except ValueError: + value_max = 0.0 + + for x in range(len(values)): + orig_values.append(values[x]) + values[x] = (values[x]/value_max) * bar_height + + # Draw Single bars with their shadows + for value in values: + + # draw drop shadow, if necessary + if draw_blur: + # Create shadow element + shadow = inkex.etree.Element(inkex.addNS("rect", "svg")) + # Set chart position to center of document. Make it horizontal or vertical + if not rotate: + shadow.set('x', str(width/2 + offset + 1)) + shadow.set('y', str(height/2 - int(value) + 1)) + shadow.set("width", str(bar_width)) + shadow.set("height", str(int(value))) + else: + shadow.set('y', str(width/2 + offset + 1)) + shadow.set('x', str(height/2 + 1)) + shadow.set("height", str(bar_width)) + shadow.set("width", str(int(value))) + + # Set shadow blur (connect to filter object in xml path) + shadow.set("style", "filter:url(#filter)") + + # Create rectangle element + rect = inkex.etree.Element(inkex.addNS('rect', 'svg')) + + # Set chart position to center of document. + if not rotate: + rect.set('x', str(width/2 + offset)) + rect.set('y', str(height/2 - int(value))) + rect.set("width", str(bar_width)) + rect.set("height", str(int(value))) + else: + rect.set('y', str(width/2 + offset)) + rect.set('x', str(height/2)) + rect.set("height", str(bar_width)) + rect.set("width", str(int(value))) + + rect.set("style", "fill:" + colors[color % color_count]) + + # If keys are given, create text elements + if keys_present: + text = inkex.etree.Element(inkex.addNS('text', 'svg')) + if not rotate: #=vertical + text.set("transform", "matrix(0,-1,1,0,0,0)") + #y after rotation: + text.set("x", "-" + str(height/2 + text_offset)) + #x after rotation: + text.set("y", str(width/2 + offset + bar_width/2 + font_size/3)) + else: #=horizontal + text.set("y", str(width/2 + offset + bar_width/2 + font_size/3)) + text.set("x", str(height/2 - text_offset)) + + text.set("style", "font-size:" + str(font_size)\ + + "px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:"\ + + font + ";-inkscape-font-specification:Bitstream Charter;text-align:end;text-anchor:end;fill:"\ + + font_color) + + text.text = keys[cnt] + + # Increase Offset and Color + #offset=offset+bar_width+bar_offset + color = (color + 1) % 8 + # Connect elements together. + if draw_blur: + layer.append(shadow) + layer.append(rect) + if keys_present: + layer.append(text) + + if show_values: + vtext = inkex.etree.Element(inkex.addNS('text', 'svg')) + if not rotate: #=vertical + vtext.set("transform", "matrix(0,-1,1,0,0,0)") + #y after rotation: + vtext.set("x", "-"+str(height/2+text_offset-value-text_offset-text_offset)) + #x after rotation: + vtext.set("y", str(width/2+offset+bar_width/2+font_size/3)) + else: #=horizontal + vtext.set("y", str(width/2+offset+bar_width/2+font_size/3)) + vtext.set("x", str(height/2-text_offset+value+text_offset+text_offset)) + + vtext.set("style", "font-size:"+str(font_size)\ + + "px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:"\ + + font + ";-inkscape-font-specification:Bitstream Charter;text-align:start;text-anchor:start;fill:"\ + + font_color) + + vtext.text = str(int(orig_values[cnt])) + layer.append(vtext) + + cnt = cnt+1 + offset = offset + bar_width + bar_offset + + # set x position for heading line + if not rotate: + heading_x = width/2 # TODO: adjust + else: + heading_x = width/2 # TODO: adjust + + + elif charttype == "pie": + ######### + ###PIE### + ######### + # Iterate all values to draw the different slices + color = 0 + + # Create the shadow first (if it should be created): + if draw_blur: + shadow = inkex.etree.Element(inkex.addNS("circle", "svg")) + shadow.set('cx', str(width/2)) + shadow.set('cy', str(height/2)) + shadow.set('r', str(pie_radius)) + shadow.set("style", "filter:url(#filter);fill:#000000") + layer.append(shadow) + + + # Add a grey background circle with a light stroke + background = inkex.etree.Element(inkex.addNS("circle", "svg")) + background.set("cx", str(width/2)) + background.set("cy", str(height/2)) + background.set("r", str(pie_radius)) + background.set("style", "stroke:#ececec;fill:#f9f9f9") + layer.append(background) + + #create value sum in order to divide the slices + try: + valuesum = sum(values) + + except ValueError: + valuesum = 0 + + if pie_abs: + valuesum = 100 + + num_values = len(values) + + # Set an offsetangle + offset = 0 + + # Draw single slices + for i in range(num_values): + value = values[i] + # Calculate the PI-angles for start and end + angle = (2*3.141592) / valuesum * float(value) + start = offset + end = offset + angle + + # proper overlapping + if segment_overlap: + if i != num_values-1: + end += 0.09 # add a 5° overlap + if i == 0: + start -= 0.09 # let the first element overlap into the other direction + + #then add the slice + pieslice = inkex.etree.Element(inkex.addNS("path", "svg")) + pieslice.set(inkex.addNS('type', 'sodipodi'), 'arc') + pieslice.set(inkex.addNS('cx', 'sodipodi'), str(width/2)) + pieslice.set(inkex.addNS('cy', 'sodipodi'), str(height/2)) + pieslice.set(inkex.addNS('rx', 'sodipodi'), str(pie_radius)) + pieslice.set(inkex.addNS('ry', 'sodipodi'), str(pie_radius)) + pieslice.set(inkex.addNS('start', 'sodipodi'), str(start)) + pieslice.set(inkex.addNS('end', 'sodipodi'), str(end)) + pieslice.set("style", "fill:"+ colors[color % color_count] + ";stroke:none;fill-opacity:1") + + #If text is given, draw short paths and add the text + if keys_present: + path = inkex.etree.Element(inkex.addNS("path", "svg")) + path.set("d", "m " + + str((width/2) + pie_radius * math.cos(angle/2 + offset)) + "," + + str((height/2) + pie_radius * math.sin(angle/2 + offset)) + " " + + str((text_offset - 2) * math.cos(angle/2 + offset)) + "," + + str((text_offset - 2) * math.sin(angle/2 + offset))) + + path.set("style", "fill:none;stroke:" + + font_color + ";stroke-width:" + str(stroke_width) + + "px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1") + layer.append(path) + text = inkex.etree.Element(inkex.addNS('text', 'svg')) + text.set("x", str((width/2) + (pie_radius + text_offset) * math.cos(angle/2 + offset))) + text.set("y", str((height/2) + (pie_radius + text_offset) * math.sin(angle/2 + offset) + font_size/3)) + textstyle = "font-size:" + str(font_size) \ + + "px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:" \ + + font + ";-inkscape-font-specification:Bitstream Charter;fill:" + font_color + # check if it is right or left of the Pie + if math.cos(angle/2 + offset) > 0: + text.set("style", textstyle) + else: + text.set("style", textstyle + ";text-align:end;text-anchor:end") + text.text = keys[cnt] + if show_values: + text.text = text.text + "(" + str(values[cnt]) + + if pie_abs: + text.text = text.text + " %" + + text.text = text.text + ")" + + cnt = cnt + 1 + layer.append(text) + + # increase the rotation-offset and the colorcycle-position + offset = offset + angle + color = (color + 1) % 8 + + # append the objects to the extension-layer + layer.append(pieslice) + + # set x position for heading line + heading_x = width/2 - pie_radius # TODO: adjust + + elif charttype == "stbar": + ################# + ###STACKED BAR### + ################# + # Iterate over all values to draw the different slices + color = 0 + + #create value sum in order to divide the bars + try: + valuesum = sum(values) + except ValueError: + valuesum = 0.0 + + for value in values: + valuesum = valuesum + float(value) + + # Init offset + offset = 0 + + if draw_blur: + # Create rectangle element + shadow = inkex.etree.Element(inkex.addNS("rect", "svg")) + # Set chart position to center of document. + if not rotate: + shadow.set('x', str(width/2)) + shadow.set('y', str(height/2 - bar_height/2)) + else: + shadow.set('x', str(width/2)) + shadow.set('y', str(height/2)) + # Set rectangle properties + if not rotate: + shadow.set("width", str(bar_width)) + shadow.set("height", str(bar_height/2)) + else: + shadow.set("width",str(bar_height/2)) + shadow.set("height", str(bar_width)) + # Set shadow blur (connect to filter object in xml path) + shadow.set("style", "filter:url(#filter)") + layer.append(shadow) + + i = 0 + # Draw Single bars + for value in values: + + # Calculate the individual heights normalized on 100units + normedvalue = (bar_height / valuesum) * float(value) + + # Create rectangle element + rect = inkex.etree.Element(inkex.addNS('rect', 'svg')) + + # Set chart position to center of document. + if not rotate: + rect.set('x', str(width / 2 )) + rect.set('y', str(height / 2 - offset - normedvalue)) + else: + rect.set('x', str(width / 2 + offset )) + rect.set('y', str(height / 2 )) + # Set rectangle properties + if not rotate: + rect.set("width", str(bar_width)) + rect.set("height", str(normedvalue)) + else: + rect.set("height", str(bar_width)) + rect.set("width", str(normedvalue)) + rect.set("style", "fill:" + colors[color % color_count]) + + #If text is given, draw short paths and add the text + # TODO: apply overlap workaround for visible gaps in between + if keys_present: + if not rotate: + path = inkex.etree.Element(inkex.addNS("path", "svg")) + path.set("d","m " + str((width + bar_width)/2) + "," + + str(height/2 - offset - (normedvalue / 2)) + " " + + str(bar_width/2 + text_offset) + ",0") + path.set("style", "fill:none;stroke:" + font_color + + ";stroke-width:" + str(stroke_width) + + "px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1") + layer.append(path) + text = inkex.etree.Element(inkex.addNS('text', 'svg')) + text.set("x", str(width/2 + bar_width + text_offset + 1)) + text.set("y", str(height/ 2 - offset + font_size/3 - (normedvalue/2))) + text.set("style", "font-size:" + str(font_size) + + "px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:" + + font + ";-inkscape-font-specification:Bitstream Charter;fill:" + font_color) + text.text = keys[cnt] + cnt = cnt + 1 + layer.append(text) + else: + path = inkex.etree.Element(inkex.addNS("path", "svg")) + path.set("d","m " + str((width)/2 + offset + normedvalue/2) + "," + + str(height / 2 + bar_width/2) + " 0," + + str(bar_width/2 + (font_size * i) + text_offset)) #line + path.set("style", "fill:none;stroke:" + font_color + + ";stroke-width:" + str(stroke_width) + + "px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1") + layer.append(path) + text = inkex.etree.Element(inkex.addNS('text', 'svg')) + text.set("x", str((width)/2 + offset + normedvalue/2 - font_size/3)) + text.set("y", str((height/2) + bar_width + (font_size * (i + 1)) + text_offset)) + text.set("style", "font-size:" + str(font_size) + + "px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:" + + font + ";-inkscape-font-specification:Bitstream Charter;fill:" + font_color) + text.text = keys[color] + layer.append(text) + + # Increase Offset and Color + offset = offset + normedvalue + color = (color + 1) % 8 + + # Draw rectangle + layer.append(rect) + i += 1 + + # set x position for heading line + if not rotate: + heading_x = width/2 + offset + normedvalue # TODO: adjust + else: + heading_x = width/2 + offset + normedvalue # TODO: adjust + + if headings and input_type == "\"file\"": + headingtext = inkex.etree.Element(inkex.addNS('text', 'svg')) + headingtext.set("y", str(height/2 + heading_offset)) + headingtext.set("x", str(heading_x)) + headingtext.set("style", "font-size:" + str(font_size + 4)\ + + "px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:"\ + + font + ";-inkscape-font-specification:Bitstream Charter;text-align:end;text-anchor:end;fill:"\ + + font_color) + + headingtext.text = heading + layer.append(headingtext) + + def getUnittouu(self, param): + try: + return inkex.unittouu(param) + except AttributeError: + return self.unittouu(param) + +if __name__ == '__main__': + # Create effect instance and apply it. + effect = NiceChart() + effect.affect() -- cgit v1.2.3 From b55e7a4462eb82d1280a2fd89b0e1bb96b996005 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 28 Feb 2016 15:49:24 +0100 Subject: Update win64 build files for devlibs64 update (bzr r14673) --- build-x64-gtk3.xml | 131 +++++++++++++++++++++++---------------- build-x64.xml | 178 +++++++++++++++++++++-------------------------------- 2 files changed, 148 insertions(+), 161 deletions(-) diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml index 542125e56..73e9ab898 100644 --- a/build-x64-gtk3.xml +++ b/build-x64-gtk3.xml @@ -35,6 +35,7 @@ Build file for the Inkscape SVG editor. This file was written for GTK-3 on Win64. + Note that the default target is 'dist-all'. You can execute other targets instead, by "btool {target}", like "btool compile", if you want to save time, or "dist-inkscape" if you don't want inkview. @@ -109,7 +110,7 @@ char const *version_string = "${version}"; } - + namespace Inkscape { char const *version_string = "${version} ${bzr.revision}"; } @@ -159,6 +160,7 @@ #define HAVE_LIBLCMS2 1 #define WITH_GTKMM_3_0 1 + #define WITH_GTKMM_3_10 1 //#define WITH_GLIBMM_2_32 1 #define HAVE_GLIBMM_THREADS_H 1 #define WITH_EXT_GDL 1 @@ -185,9 +187,6 @@ #define HAVE_POPPLER 1 #define HAVE_POPPLER_GLIB 1 #define HAVE_POPPLER_CAIRO 1 - #define POPPLER_NEW_ERRORAPI 1 - #define POPPLER_NEW_GFXPATCH 1 - #define POPPLER_NEW_GFXFONT 1 /* do we want bitmap manipulation? */ #define WITH_IMAGE_MAGICK 1 @@ -196,17 +195,17 @@ #define HAVE_EXIF 1 #define HAVE_JPEG 1 - /* Allow reading WordPerfect? */ + /* WordPerfect import filter */ #define WITH_LIBWPG 1 - - /* Default to libwpg 0.2.x */ - #define WITH_LIBWPG02 1 + #define WITH_LIBWPG03 1 /* Visio import filter */ #define WITH_LIBVISIO 1 + #define WITH_LIBVISIO01 1 /* Corel Draw import filter */ #define WITH_LIBCDR 1 + #define WITH_LIBCDR01 1 /* Do we support SVG Fonts? */ #define ENABLE_SVG_FONTS 1 @@ -222,6 +221,8 @@ #define HAVE_ASPELL 1 + #define HAVE_POTRACE 1 + #endif /* _CONFIG_H_ */ @@ -363,7 +364,7 @@ -Wall -Wformat -Werror=format-security -Wextra -Wpointer-arith -Wcast-align -Wsign-compare -Wswitch -Werror=return-type - + -Wno-error=pointer-sign -Wno-error=unused-parameter -Wno-error=unused-but-set-variable -Wno-error=strict-overflow -Wno-error=write-strings @@ -376,9 +377,10 @@ -fopenmp - -std=gnu++11 -DCPP11 + -std=gnu++11 -DCPP11 -Woverloaded-virtual + -Wno-deprecated-declarations -DVERSION=\"${version}\" @@ -386,6 +388,11 @@ -D_INTL_REDIRECT_INLINE -DHAVE_SSL -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" + -DPOPPLER_NEW_GFXFONT + -DPOPPLER_NEW_GFXPATCH + -DPOPPLER_NEW_ERRORAPI + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API -DGLIBMM_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED @@ -404,16 +411,19 @@ ${pcc.gdk-3.0} ${pcc.gdl-3.0} ${pcc.glibmm-2.4} + + ${pcc.pangomm-1.4} ${pcc.cairomm-1.0} - ${pcc.Magick++} - ${pcc.libxml-2.0} + ${pcc.Magick++} + ${pcc.libxml-2.0} ${pcc.freetype2} ${pcc.cairo} ${pcc.poppler} -I${devlibs}/include/gc - ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0} + -I${devlibs}/include/potracelib + ${pcc.libwpg-0.3} ${pcc.libvisio-0.1} ${pcc.libcdr-0.1} -I${cxxtest} @@ -492,8 +502,10 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} + ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} ${pcl.glibmm-2.4} + + ${pcl.pangomm-1.4} ${pcl.cairomm-1.0} -liconv @@ -502,9 +514,9 @@ ${pcl.lcms2} ${pcl.gsl} -lpng -ljpeg -ltiff -lexif -lpopt -lz - -lgc + -lgc -lpotrace -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm - -lgomp -lwinpthread-1 + -lgomp -lwinpthread -laspell -lmscms @@ -581,8 +593,10 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} + ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} ${pcl.glibmm-2.4} + + ${pcl.pangomm-1.4} ${pcl.cairomm-1.0} -liconv @@ -591,9 +605,9 @@ ${pcl.lcms2} ${pcl.gsl} -lpng -ljpeg -ltiff -lexif -lpopt -lz - -lgc + -lgc -lpotrace -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm - -lgomp -lwinpthread-1 + -lgomp -lwinpthread -laspell -lmscms @@ -638,8 +652,10 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} + ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} ${pcl.glibmm-2.4} + + ${pcl.pangomm-1.4} ${pcl.cairomm-1.0} -liconv @@ -648,9 +664,9 @@ ${pcl.lcms2} ${pcl.gsl} -lpng -ljpeg -ltiff -lexif -lpopt -lz - -lgc + -lgc -lpotrace -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm - -lgomp -lwinpthread-1 + -lgomp -lwinpthread -laspell -lmscms @@ -687,7 +703,7 @@ - + @@ -704,7 +720,7 @@ - + @@ -714,16 +730,18 @@ - - - - - - - - - - + + + + + + + + + + + + @@ -732,21 +750,23 @@ - - + + + - + + - + @@ -769,29 +789,32 @@ + + - - - - + + + + - - - - + - - + + - - + + + + + + @@ -804,9 +827,9 @@ - + @@ -814,8 +837,9 @@ [Settings] -gtk-font-name=Tahoma 8 -gtk-theme-name = Adwaita +#gtk-font-name = Tahoma 8 +#gtk-theme-name = Adwaita +gtk-menu-images = true @@ -857,6 +881,7 @@ gtk-theme-name = Adwaita --> + diff --git a/build-x64.xml b/build-x64.xml index 76b2a467f..c3fe58a2b 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -110,7 +110,7 @@ char const *version_string = "${version}"; } - + namespace Inkscape { char const *version_string = "${version} ${bzr.revision}"; } @@ -182,9 +182,6 @@ #define HAVE_POPPLER 1 #define HAVE_POPPLER_GLIB 1 #define HAVE_POPPLER_CAIRO 1 - #define POPPLER_NEW_ERRORAPI 1 - #define POPPLER_NEW_GFXPATCH 1 - #define POPPLER_NEW_GFXFONT 1 /* do we want bitmap manipulation? */ #define WITH_IMAGE_MAGICK 1 @@ -193,17 +190,17 @@ #define HAVE_EXIF 1 #define HAVE_JPEG 1 - /* Allow reading WordPerfect? */ + /* WordPerfect import filter */ #define WITH_LIBWPG 1 - - /* Default to libwpg 0.2.x */ - #define WITH_LIBWPG02 1 + #define WITH_LIBWPG03 1 /* Visio import filter */ #define WITH_LIBVISIO 1 + #define WITH_LIBVISIO01 1 /* Corel Draw import filter */ #define WITH_LIBCDR 1 + #define WITH_LIBCDR01 1 /* Do we support SVG Fonts? */ #define ENABLE_SVG_FONTS 1 @@ -219,6 +216,8 @@ #define HAVE_ASPELL 1 + #define HAVE_POTRACE 1 + #endif /* _CONFIG_H_ */ @@ -359,7 +358,7 @@ -Wall -Wformat -Werror=format-security -Wextra -Wpointer-arith -Wcast-align -Wsign-compare -Wswitch -Werror=return-type - + -Wno-error=pointer-sign -Wno-error=unused-parameter -Wno-error=unused-but-set-variable -Wno-error=strict-overflow -Wno-error=write-strings @@ -372,9 +371,10 @@ -fopenmp - -std=gnu++0x -DCPP11 + -std=gnu++11 -DCPP11 -Woverloaded-virtual + -Wno-deprecated-declarations -DVERSION=\"${version}\" @@ -382,6 +382,11 @@ -D_INTL_REDIRECT_INLINE -DHAVE_SSL -DRELAYTOOL_SSL="static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }" + -DPOPPLER_NEW_GFXFONT + -DPOPPLER_NEW_GFXPATCH + -DPOPPLER_NEW_ERRORAPI + -DPOPPLER_EVEN_NEWER_COLOR_SPACE_API + -DPOPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API -DGLIBMM_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED @@ -401,13 +406,14 @@ ${pcc.pangomm-1.4} ${pcc.cairomm-1.0} - ${pcc.Magick++} - ${pcc.libxml-2.0} + ${pcc.Magick++} + ${pcc.libxml-2.0} ${pcc.freetype2} ${pcc.cairo} ${pcc.poppler} -I${devlibs}/include/gc - ${pcc.libwpg-0.2} ${pcc.libvisio-0.0} ${pcc.libcdr-0.0} + -I${devlibs}/include/potracelib + ${pcc.libwpg-0.3} ${pcc.libvisio-0.1} ${pcc.libcdr-0.1} -I${cxxtest} @@ -483,7 +489,7 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} + ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -495,9 +501,9 @@ ${pcl.lcms2} ${pcl.gsl} -lpng -ljpeg -ltiff -lexif -lpopt -lz - -lgc + -lgc -lpotrace -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm - -lgomp -lwinpthread-1 + -lgomp -lwinpthread -laspell -lmscms @@ -571,7 +577,7 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} + ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -583,7 +589,7 @@ ${pcl.lcms2} ${pcl.gsl} -lpng -ljpeg -ltiff -lexif -lpopt -lz - -lgc + -lgc -lpotrace -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm -lgomp -lwinpthread -laspell @@ -627,7 +633,7 @@ ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} - ${pcl.libwpg-0.2} ${pcl.libvisio-0.0} ${pcl.libcdr-0.0} + ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -639,9 +645,9 @@ ${pcl.lcms2} ${pcl.gsl} -lpng -ljpeg -ltiff -lexif -lpopt -lz - -lgc + -lgc -lpotrace -lws2_32 -lintl -lgdi32 -lcomdlg32 -lm - -lgomp -lwinpthread-1 + -lgomp -lwinpthread -laspell -lmscms @@ -674,12 +680,12 @@ - - - - - - + + + + + + @@ -693,7 +699,7 @@ - + @@ -703,18 +709,17 @@ - - - - - - - - - - - - + + + + + + + + + + + @@ -723,21 +728,23 @@ - - + + + - + + - + @@ -754,29 +761,34 @@ - + + + + + - + - - - + + + - - - - + - - + + - - + + + + + + @@ -789,63 +801,13 @@ - + - - - gtk-icon-sizes = "gtk-menu=16,16:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32:inkscape-decoration=16,16" - gtk-toolbar-icon-size = small-toolbar - - # disable images in buttons. i've only seen ugly delphi apps use this feature. - gtk-button-images = 0 - - # disable the annoying beep in editable controls - gtk-error-bell = 0 - - # enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly. - # the office apps use them heavily, though. - gtk-menu-images = 1 - - # use the win32 button ordering instead of the GNOME HIG one, where applicable - gtk-alternative-button-order = 1 - - style "msw-default" - { - GtkWidget::interior-focus = 1 - GtkOptionMenu::indicator-size = { 9, 5 } - GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 } - GtkSpinButton::shadow-type = in - - # Owen and I disagree that these should be themable - #GtkUIManager::add-tearoffs = 0 - #GtkComboBox::add-tearoffs = 0 - - GtkComboBox::appears-as-list = 1 - GtkComboBox::focus-on-click = 0 - - GOComboBox::add_tearoffs = 0 - - GtkTreeView::allow-rules = 0 - GtkTreeView::expander-size = 12 - - GtkExpander::expander-size = 12 - - GtkScrolledWindow::scrollbar_spacing = 1 - - GtkSeparatorMenuItem::horizontal-padding = 2 - - engine "wimp" - { - } - } - class "*" style "msw-default" - - -- cgit v1.2.3 From e5af44c875cb512a58ec520328e974a09819d965 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 29 Feb 2016 09:06:33 +0100 Subject: Inkview. Code consistency fixes. (bzr r14674) --- src/inkview.cpp | 328 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 162 insertions(+), 166 deletions(-) diff --git a/src/inkview.cpp b/src/inkview.cpp index c0c6f0b2c..3fcd9ed8a 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -102,66 +102,67 @@ static GtkWidget *ctrlwin = NULL; int sp_main_gui (int, char const**) { return 0; } int sp_main_console (int, char const**) { return 0; } -static int -sp_svgview_main_delete (GtkWidget */*widget*/, GdkEvent */*event*/, struct SPSlideShow */*ss*/) +static int sp_svgview_main_delete (GtkWidget */*widget*/, + GdkEvent */*event*/, + struct SPSlideShow */*ss*/) { gtk_main_quit (); return FALSE; } -static int -sp_svgview_main_key_press (GtkWidget */*widget*/, GdkEventKey *event, struct SPSlideShow *ss) +static int sp_svgview_main_key_press (GtkWidget */*widget*/, + GdkEventKey *event, + struct SPSlideShow *ss) { switch (event->keyval) { - case GDK_KEY_Up: - case GDK_KEY_Home: - sp_svgview_goto_first(ss); - break; - case GDK_KEY_Down: - case GDK_KEY_End: - sp_svgview_goto_last(ss); - break; - case GDK_KEY_F11: - if (ss->fullscreen) { - gtk_window_unfullscreen (GTK_WINDOW(ss->window)); - ss->fullscreen = false; - } else { - gtk_window_fullscreen (GTK_WINDOW(ss->window)); - ss->fullscreen = true; - } - break; - case GDK_KEY_Return: - sp_svgview_control_show (ss); - break; - case GDK_KEY_KP_Page_Down: - case GDK_KEY_Page_Down: - case GDK_KEY_Right: - case GDK_KEY_space: - sp_svgview_show_next (ss); - break; - case GDK_KEY_KP_Page_Up: - case GDK_KEY_Page_Up: - case GDK_KEY_Left: - case GDK_KEY_BackSpace: - sp_svgview_show_prev (ss); - break; - case GDK_KEY_Escape: - case GDK_KEY_q: - case GDK_KEY_Q: - gtk_main_quit(); - break; - default: - break; + case GDK_KEY_Up: + case GDK_KEY_Home: + sp_svgview_goto_first(ss); + break; + case GDK_KEY_Down: + case GDK_KEY_End: + sp_svgview_goto_last(ss); + break; + case GDK_KEY_F11: + if (ss->fullscreen) { + gtk_window_unfullscreen (GTK_WINDOW(ss->window)); + ss->fullscreen = false; + } else { + gtk_window_fullscreen (GTK_WINDOW(ss->window)); + ss->fullscreen = true; + } + break; + case GDK_KEY_Return: + sp_svgview_control_show (ss); + break; + case GDK_KEY_KP_Page_Down: + case GDK_KEY_Page_Down: + case GDK_KEY_Right: + case GDK_KEY_space: + sp_svgview_show_next (ss); + break; + case GDK_KEY_KP_Page_Up: + case GDK_KEY_Page_Up: + case GDK_KEY_Left: + case GDK_KEY_BackSpace: + sp_svgview_show_prev (ss); + break; + case GDK_KEY_Escape: + case GDK_KEY_q: + case GDK_KEY_Q: + gtk_main_quit(); + break; + default: + break; } gtk_window_set_title(GTK_WINDOW(ss->window), ss->doc->getName()); return TRUE; } -int -main (int argc, const char **argv) +int main (int argc, const char **argv) { if (argc == 1) { - usage(); + usage(); } // Prevents errors like "Unable to wrap GdkPixbuf..." (in nr-filter-image.cpp for example) @@ -171,8 +172,7 @@ main (int argc, const char **argv) struct SPSlideShow ss; - int option, - num_parsed_options = 0; + int num_parsed_options = 0; // the list of arguments is in the net line for (int i = 1; i < argc; i++) { @@ -233,82 +233,84 @@ main (int argc, const char **argv) // starting at where the commandline options stopped parsing because // we want all the files to be in the list for (i = num_parsed_options + 1 ; i < argc; i++) { - struct stat st; - if (stat (argv[i], &st) - || !S_ISREG (st.st_mode) - || (st.st_size < 64)) { - fprintf(stderr, "could not open file %s\n", argv[i]); - } else { - -#ifdef WITH_INKJAR - if (is_jar(argv[i])) { - Inkjar::JarFileReader jar_file_reader(argv[i]); - for (;;) { - GByteArray *gba = jar_file_reader.get_next_file(); - if (gba == NULL) { - char *c_ptr; - gchar *last_filename = jar_file_reader.get_last_filename(); - if (last_filename == NULL) - break; - if ((c_ptr = std::strrchr(last_filename, '/')) != NULL) { - if (*(++c_ptr) == '\0') { - g_free(last_filename); - continue; - } - } - } else if (gba->len > 0) { - //::write(1, gba->data, gba->len); - /* Append to list */ - if (ss.length >= ss.size) { - /* Expand */ - ss.size <<= 1; - ss.slides = g_renew (char *, ss.slides, ss.size); - } - - ss.doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data, - gba->len, - TRUE); - gchar *last_filename = jar_file_reader.get_last_filename(); - if (ss.doc) { - ss.slides[ss.length++] = strdup (last_filename); - (ss.doc)->setUri (last_filename); - } - g_byte_array_free(gba, TRUE); - g_free(last_filename); - } else - break; - } - } else { -#endif /* WITH_INKJAR */ - /* Append to list */ - if (ss.length >= ss.size) { - /* Expand */ - ss.size <<= 1; - ss.slides = g_renew (char *, ss.slides, ss.size); - - } + struct stat st; + if (stat (argv[i], &st) + || !S_ISREG (st.st_mode) + || (st.st_size < 64)) { + fprintf(stderr, "could not open file %s\n", argv[i]); + } else { + + #ifdef WITH_INKJAR + if (is_jar(argv[i])) { + Inkjar::JarFileReader jar_file_reader(argv[i]); + for (;;) { + GByteArray *gba = jar_file_reader.get_next_file(); + if (gba == NULL) { + char *c_ptr; + gchar *last_filename = jar_file_reader.get_last_filename(); + if (last_filename == NULL) + break; + if ((c_ptr = std::strrchr(last_filename, '/')) != NULL) { + if (*(++c_ptr) == '\0') { + g_free(last_filename); + continue; + } + } + } else if (gba->len > 0) { + //::write(1, gba->data, gba->len); + /* Append to list */ + if (ss.length >= ss.size) { + /* Expand */ + ss.size <<= 1; + ss.slides = g_renew (char *, ss.slides, ss.size); + } + + ss.doc = SPDocument::createNewDocFromMem ((const gchar *)gba->data, + gba->len, + TRUE); + gchar *last_filename = jar_file_reader.get_last_filename(); + if (ss.doc) { + ss.slides[ss.length++] = strdup (last_filename); + (ss.doc)->setUri (last_filename); + } + g_byte_array_free(gba, TRUE); + g_free(last_filename); + } else { + break; + } + } + } else { + #endif /* WITH_INKJAR */ + /* Append to list */ + if (ss.length >= ss.size) { + /* Expand */ + ss.size <<= 1; + ss.slides = g_renew (char *, ss.slides, ss.size); + } - ss.slides[ss.length++] = strdup (argv[i]); + ss.slides[ss.length++] = strdup (argv[i]); + if (!ss.doc) { + ss.doc = SPDocument::createNewDoc (ss.slides[ss.current], TRUE, false); if (!ss.doc) { - ss.doc = SPDocument::createNewDoc (ss.slides[ss.current], TRUE, false); - if (!ss.doc) - ++ss.current; - } -#ifdef WITH_INKJAR - } -#endif - } + ++ss.current; + } + } + #ifdef WITH_INKJAR + } + #endif + } } - if(!ss.doc) + if(!ss.doc) { return 1; /* none of the slides loadable */ - + } + w = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title( GTK_WINDOW(w), ss.doc->getName() ); gtk_window_set_default_size (GTK_WINDOW (w), - MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64), - MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64)); + MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64), + MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64)); ss.window = w; g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss); @@ -328,8 +330,9 @@ main (int argc, const char **argv) return 0; } -static int -sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, GdkEvent */*event*/, void */*data*/) +static int sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, + GdkEvent */*event*/, + void */*data*/) { ctrlwin = NULL; return FALSE; @@ -338,97 +341,92 @@ sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, GdkEvent */*event*/, void */*d static GtkWidget* sp_svgview_control_show(struct SPSlideShow *ss) { if (!ctrlwin) { - ctrlwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); + ctrlwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_resizable(GTK_WINDOW(ctrlwin), FALSE); gtk_window_set_transient_for(GTK_WINDOW(ctrlwin), GTK_WINDOW(ss->window)); g_signal_connect(G_OBJECT (ctrlwin), "key_press_event", (GCallback) sp_svgview_main_key_press, ss); g_signal_connect(G_OBJECT (ctrlwin), "delete_event", (GCallback) sp_svgview_ctrlwin_delete, NULL); #if GTK_CHECK_VERSION(3,0,0) - GtkWidget *t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); + GtkWidget *t = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); #else - GtkWidget *t = gtk_hbutton_box_new(); + GtkWidget *t = gtk_hbutton_box_new(); #endif - gtk_container_add(GTK_CONTAINER(ctrlwin), t); + gtk_container_add(GTK_CONTAINER(ctrlwin), t); #if GTK_CHECK_VERSION(3,10,0) GtkWidget *b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-first"), GTK_ICON_SIZE_BUTTON); #else - GtkWidget *b = gtk_button_new(); + GtkWidget *b = gtk_button_new(); GtkWidget *img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-first"), GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(b), img); #endif - gtk_container_add(GTK_CONTAINER(t), b); + gtk_container_add(GTK_CONTAINER(t), b); - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_first_cb, ss); + g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_first_cb, ss); #if GTK_CHECK_VERSION(3,10,0) b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-previous"), GTK_ICON_SIZE_BUTTON); #else - b = gtk_button_new(); + b = gtk_button_new(); img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-previous"), GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(b), img); #endif - gtk_container_add(GTK_CONTAINER(t), b); + gtk_container_add(GTK_CONTAINER(t), b); - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_prev_cb, ss); + g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_prev_cb, ss); #if GTK_CHECK_VERSION(3,10,0) b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-next"), GTK_ICON_SIZE_BUTTON); #else - b = gtk_button_new(); + b = gtk_button_new(); img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-next"), GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(b), img); #endif - gtk_container_add(GTK_CONTAINER(t), b); + gtk_container_add(GTK_CONTAINER(t), b); - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_next_cb, ss); + g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_show_next_cb, ss); #if GTK_CHECK_VERSION(3,10,0) b = gtk_button_new_from_icon_name(INKSCAPE_ICON("go-last"), GTK_ICON_SIZE_BUTTON); #else - b = gtk_button_new(); + b = gtk_button_new(); img = gtk_image_new_from_icon_name(INKSCAPE_ICON("go-last"), GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(b), img); #endif - gtk_container_add(GTK_CONTAINER(t), b); - g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_last_cb, ss); - gtk_widget_show_all(ctrlwin); + gtk_container_add(GTK_CONTAINER(t), b); + g_signal_connect(G_OBJECT(b), "clicked", (GCallback) sp_svgview_goto_last_cb, ss); + gtk_widget_show_all(ctrlwin); } else { - gtk_window_present(GTK_WINDOW(ctrlwin)); + gtk_window_present(GTK_WINDOW(ctrlwin)); } return NULL; } -static int -sp_svgview_show_next_cb (GtkWidget */*widget*/, void *data) +static int sp_svgview_show_next_cb (GtkWidget */*widget*/, void *data) { sp_svgview_show_next(static_cast(data)); return FALSE; } -static int -sp_svgview_show_prev_cb (GtkWidget */*widget*/, void *data) +static int sp_svgview_show_prev_cb (GtkWidget */*widget*/, void *data) { sp_svgview_show_prev(static_cast(data)); return FALSE; } -static int -sp_svgview_goto_first_cb (GtkWidget */*widget*/, void *data) +static int sp_svgview_goto_first_cb (GtkWidget */*widget*/, void *data) { sp_svgview_goto_first(static_cast(data)); return FALSE; } -static int -sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data) +static int sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data) { sp_svgview_goto_last(static_cast(data)); return FALSE; } -static void -sp_svgview_waiting_cursor(struct SPSlideShow *ss) +static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) { GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting); @@ -446,12 +444,12 @@ sp_svgview_waiting_cursor(struct SPSlideShow *ss) gdk_cursor_unref(waiting); #endif } - while(gtk_events_pending()) + while(gtk_events_pending()) { gtk_main_iteration(); + } } -static void -sp_svgview_normal_cursor(struct SPSlideShow *ss) +static void sp_svgview_normal_cursor(struct SPSlideShow *ss) { gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), NULL); if (ctrlwin) { @@ -459,8 +457,9 @@ sp_svgview_normal_cursor(struct SPSlideShow *ss) } } -static void -sp_svgview_set_document(struct SPSlideShow *ss, SPDocument *doc, int current) +static void sp_svgview_set_document(struct SPSlideShow *ss, + SPDocument *doc, + int current) { if (doc && doc != ss->doc) { doc->ensureUpToDate(); @@ -470,8 +469,7 @@ sp_svgview_set_document(struct SPSlideShow *ss, SPDocument *doc, int current) } } -static void -sp_svgview_show_next (struct SPSlideShow *ss) +static void sp_svgview_show_next (struct SPSlideShow *ss) { sp_svgview_waiting_cursor(ss); @@ -486,8 +484,7 @@ sp_svgview_show_next (struct SPSlideShow *ss) sp_svgview_normal_cursor(ss); } -static void -sp_svgview_show_prev (struct SPSlideShow *ss) +static void sp_svgview_show_prev (struct SPSlideShow *ss) { sp_svgview_waiting_cursor(ss); @@ -502,16 +499,16 @@ sp_svgview_show_prev (struct SPSlideShow *ss) sp_svgview_normal_cursor(ss); } -static void -sp_svgview_goto_first (struct SPSlideShow *ss) +static void sp_svgview_goto_first (struct SPSlideShow *ss) { sp_svgview_waiting_cursor(ss); SPDocument *doc = NULL; int current = 0; while ( !doc && (current < ss->length - 1)) { - if (current == ss->current) + if (current == ss->current) { break; + } doc = SPDocument::createNewDoc (ss->slides[current++], TRUE, false); } @@ -520,16 +517,16 @@ sp_svgview_goto_first (struct SPSlideShow *ss) sp_svgview_normal_cursor(ss); } -static void -sp_svgview_goto_last (struct SPSlideShow *ss) +static void sp_svgview_goto_last (struct SPSlideShow *ss) { sp_svgview_waiting_cursor(ss); SPDocument *doc = NULL; int current = ss->length - 1; while (!doc && (current >= 0)) { - if (current == ss->current) + if (current == ss->current) { break; + } doc = SPDocument::createNewDoc (ss->slides[current--], TRUE, false); } @@ -539,8 +536,7 @@ sp_svgview_goto_last (struct SPSlideShow *ss) } #ifdef WITH_INKJAR -static bool -is_jar(char const *filename) +static bool is_jar(char const *filename) { /* fixme: Check MIME type or something. /usr/share/misc/file/magic suggests that checking for initial string "PK\003\004" in content should suffice. */ @@ -557,12 +553,12 @@ is_jar(char const *filename) static void usage() { fprintf(stderr, - "Usage: inkview [OPTIONS...] [FILES ...]\n" - "\twhere FILES are SVG (.svg or .svgz)" + "Usage: inkview [OPTIONS...] [FILES ...]\n" + "\twhere FILES are SVG (.svg or .svgz)" #ifdef WITH_INKJAR - " or archives of SVGs (.sxw, .jar)" + " or archives of SVGs (.sxw, .jar)" #endif - "\n"); + "\n"); exit(1); } -- cgit v1.2.3 From 42a5da69a0042b89907e58a613ce6b4a4c157ea8 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 29 Feb 2016 10:54:01 +0100 Subject: Code-design. Fixing variable initialization warnings and replacing tabs with spaces. (bzr r14675) --- src/widgets/ruler.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index b722ecea7..3a5e76277 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -1114,7 +1114,7 @@ sp_ruler_get_position (SPRuler *ruler) static gboolean sp_ruler_motion_notify (GtkWidget *widget, - GdkEventMotion *event) + GdkEventMotion *event) { SPRuler *ruler = SP_RULER(widget); @@ -1307,7 +1307,7 @@ sp_ruler_draw_ticks (SPRuler *ruler) if (ideal_length > ++length) length = ideal_length; - if (lower < upper) + if (lower < upper) { start = floor (lower / subd_incr) * subd_incr; end = ceil (upper / subd_incr) * subd_incr; @@ -1373,16 +1373,16 @@ sp_ruler_draw_ticks (SPRuler *ruler) pango_layout_get_extents (layout, &logical_rect, NULL); #if GTK_CHECK_VERSION(3,0,0) - cairo_move_to (cr, + cairo_move_to (cr, pos + 2, border.top + PANGO_PIXELS (logical_rect.y - digit_offset)); #else - cairo_move_to (cr, + cairo_move_to (cr, pos + 2, ythickness + PANGO_PIXELS (logical_rect.y - digit_offset)); #endif - pango_cairo_show_layout(cr, layout); + pango_cairo_show_layout(cr, layout); } else { @@ -1395,15 +1395,15 @@ sp_ruler_draw_ticks (SPRuler *ruler) pango_layout_get_extents (layout, NULL, &logical_rect); #if GTK_CHECK_VERSION(3,0,0) - cairo_move_to (cr, + cairo_move_to (cr, border.left + 1, pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset)); #else - cairo_move_to (cr, + cairo_move_to (cr, xthickness + 1, pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset)); #endif - pango_cairo_show_layout (cr, layout); + pango_cairo_show_layout (cr, layout); } } } @@ -1433,7 +1433,7 @@ sp_ruler_get_pos_rect (SPRuler *ruler, gint ythickness; gdouble upper, lower; gdouble increment; - GdkRectangle rect = { 0, }; + GdkRectangle rect = { 0, 0, 0, 0 }; if (! gtk_widget_is_drawable (widget)) return rect; -- cgit v1.2.3 From df60915bd9b41940cd58b5d0016e7746cf85cb95 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Mon, 29 Feb 2016 18:37:19 +0100 Subject: type in commit r14664 (bzr r14676) --- src/display/sp-canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index ef47613e4..d17271752 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -656,7 +656,7 @@ void sp_canvas_item_lower(SPCanvasItem *item, int positions) g_assert (l != parent->items.end()); for (int i=0; iitems.begin(); ++i) - ++l; + --l; parent->items.remove(item); parent->items.insert(l, item); -- cgit v1.2.3 From 5234acfed2a47dc2445475ec7a9e245f0f8dc729 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 1 Mar 2016 02:39:05 +0100 Subject: Improve fill rule and add mass option (bzr r14648.1.2) --- src/ui/tools/eraser-tool.cpp | 62 +++++++++++++++++++++++++------------ src/widgets/eraser-toolbar.cpp | 69 +++++++++++++++++++++++++++++++++++++++--- src/widgets/toolbox.cpp | 3 ++ 3 files changed, 111 insertions(+), 23 deletions(-) diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 51068a3ae..698415480 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -64,8 +64,11 @@ #include "livarot/Shape.h" #include "document-undo.h" #include "verbs.h" +#include "style.h" +#include "style-enums.h" #include <2geom/math-utils.h> #include <2geom/pathvector.h> +#include "path-chemistry.h" #include "display/curve.h" #include "ui/tools/eraser-tool.h" @@ -376,7 +379,8 @@ void EraserTool::cancel() { bool EraserTool::root_handler(GdkEvent* event) { gint ret = FALSE; - + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0; switch (event->type) { case GDK_BUTTON_PRESS: if (event->button.button == 1 && !this->space_panning) { @@ -396,10 +400,10 @@ bool EraserTool::root_handler(GdkEvent* event) { if (this->repr) { this->repr = NULL; } - - Inkscape::Rubberband::get(desktop)->start(desktop, button_dt); - Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH); - + if ( ! eraserMode ) { + Inkscape::Rubberband::get(desktop)->start(desktop, button_dt); + Inkscape::Rubberband::get(desktop)->setMode(RUBBERBAND_MODE_TOUCHPATH); + } /* initialize first point */ this->npoints = 0; @@ -444,8 +448,9 @@ bool EraserTool::root_handler(GdkEvent* event) { ret = TRUE; } - - Inkscape::Rubberband::get(desktop)->move(motion_dt); + if ( !eraserMode ) { + Inkscape::Rubberband::get(desktop)->move(motion_dt); + } } break; @@ -485,7 +490,7 @@ bool EraserTool::root_handler(GdkEvent* event) { ret = TRUE; } - if (Inkscape::Rubberband::get(desktop)->is_started()) { + if (!eraserMode && Inkscape::Rubberband::get(desktop)->is_started()) { Inkscape::Rubberband::get(desktop)->stop(); } @@ -572,8 +577,9 @@ bool EraserTool::root_handler(GdkEvent* event) { break; case GDK_KEY_Escape: - Inkscape::Rubberband::get(desktop)->stop(); - + if ( !eraserMode ) { + Inkscape::Rubberband::get(desktop)->stop(); + } if (this->is_drawing) { // if drawing, cancel, otherwise pass it up for deselecting this->cancel(); @@ -645,7 +651,7 @@ void EraserTool::set_to_accumulated() { this->repr = repr; } - SPItem *item=SP_ITEM(desktop->currentLayer()->appendChildRepr(this->repr)); + SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(this->repr)); Inkscape::GC::release(this->repr); item->updateRepr(); Geom::PathVector pathv = this->accumulated->get_pathvector() * desktop->dt2doc(); @@ -654,11 +660,11 @@ void EraserTool::set_to_accumulated() { g_assert( str != NULL ); this->repr->setAttribute("d", str); g_free(str); + if ( this->repr ) { bool wasSelection = false; Inkscape::Selection *selection = desktop->getSelection(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0; Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc(); @@ -675,32 +681,50 @@ void EraserTool::set_to_accumulated() { } toWorkOn.erase(std::remove(toWorkOn.begin(), toWorkOn.end(), acid), toWorkOn.end()); } else { - toWorkOn= selection->itemList(); + toWorkOn = selection->itemList(); wasSelection = true; } if ( !toWorkOn.empty() ) { if ( eraserMode ) { for (std::vector::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); ++i){ - SPItem *item = *i; + SPItem *item = *i; + SPUse *use = dynamic_cast(item); + if (SP_IS_GROUP(item) || use ) { + continue; + } Geom::OptRect bbox = item->desktopVisualBounds(); if (bbox && bbox->intersects(*eraserBbox)) { Inkscape::XML::Node* dup = this->repr->duplicate(xml_doc); this->repr->parent()->appendChild(dup); Inkscape::GC::release(dup); // parent takes over - - selection->set(item); - selection->add(dup); + selection->set(dup); + sp_selected_path_union(selection, desktop); + selection->add(item); + if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){ + SPCSSAttr *css = sp_repr_css_attr_new(); + sp_repr_css_set_property(css, "fill-rule", "evenodd"); + sp_desktop_set_style(desktop, css); + sp_repr_css_attr_unref(css); + css = 0; + } if (this->nowidth) { sp_selected_path_cut_skip_undo(selection, desktop); } else { sp_selected_path_diff_skip_undo(selection, desktop); } workDone = true; // TODO set this only if something was cut. - + bool break_apart = prefs->getBool("/tools/eraser/break_apart", false); + if(!break_apart){ + sp_selected_path_combine(desktop); + } else { + if(!this->nowidth){ + sp_selected_path_break_apart(desktop); + } + } if ( !selection->isEmpty() ) { // If the item was not completely erased, track the new remainder. - std::vector nowSel(selection->itemList()); + std::vector nowSel(selection->itemList()); for (std::vector::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) { remainingItems.push_back(*i2); } diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index f18a805b2..1fc520185 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -57,6 +57,13 @@ static void sp_erc_width_value_changed( GtkAdjustment *adj, GObject *tbl ) update_presets_list(tbl); } +static void sp_erc_mass_value_changed( GtkAdjustment *adj, GObject* tbl ) +{ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setDouble( "/tools/eraser/mass", gtk_adjustment_get_value(adj) ); + update_presets_list(tbl); +} + static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl ) { SPDesktop *desktop = static_cast(g_object_get_data( tbl, "desktop" )); @@ -65,7 +72,15 @@ static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl ) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setBool( "/tools/eraser/mode", eraserMode ); } - + GtkAction *split = GTK_ACTION( g_object_get_data(tbl, "split") ); + GtkAction *mass = GTK_ACTION( g_object_get_data(tbl, "mass") ); + if(eraserMode == TRUE){ + gtk_action_set_visible( split, TRUE ); + gtk_action_set_visible( mass, TRUE ); + } else { + gtk_action_set_visible( split, FALSE ); + gtk_action_set_visible( mass, FALSE ); + } // only take action if run by the attr_changed listener if (!g_object_get_data( tbl, "freeze" )) { // in turn, prevent listener from responding @@ -82,11 +97,20 @@ static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl ) } } +static void sp_toogle_break_apart( GtkToggleAction* act, gpointer data ) +{ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gboolean active = gtk_toggle_action_get_active(act); + prefs->setBool("/tools/eraser/break_apart", active); +} + void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { + Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + gint eraserMode = FALSE; { GtkListStore* model = gtk_list_store_new( 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING ); - GtkTreeIter iter; gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, @@ -113,9 +137,8 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb ege_select_one_action_set_icon_column( act, 2 ); ege_select_one_action_set_tooltip_column( act, 1 ); - /// @todo Convert to boolean? Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - gint eraserMode = prefs->getBool("/tools/eraser/mode") ? 1 : 0; + eraserMode = prefs->getBool("/tools/eraser/mode") ? TRUE : FALSE; ege_select_one_action_set_active( act, eraserMode ); g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_erasertb_mode_changed), holder ); } @@ -136,6 +159,44 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } + { + /* Mass */ + gchar const* labels[] = {_("(no inertia)"), _("(slight smoothing, default)"), _("(noticeable lagging)"), 0, 0, _("(maximum inertia)")}; + gdouble values[] = {0.0, 2, 10, 20, 50, 100}; + EgeAdjustmentAction* eact = create_adjustment_action( "EraserMassAction", + _("Eraser Mass"), _("Mass:"), + _("Increase to make the eraser drag behind, as if slowed by inertia"), + "/tools/eraser/mass", 10.0, + GTK_WIDGET(desktop->canvas), holder, FALSE, NULL, + 0.0, 100, 1, 10.0, + labels, values, G_N_ELEMENTS(labels), + sp_erc_mass_value_changed, NULL /*unit tracker*/, 1, 0); + ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); + g_object_set_data( holder, "mass", eact ); + gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); + } + /* Overlap */ + { + InkToggleAction* act = ink_toggle_action_new( "EraserBreakAppart", + _("Break appart cutted items"), + _("Break appart cutted itemss"), + INKSCAPE_ICON("distribute-randomize"), + secondarySize ); + gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/eraser/break_apart", false) ); + g_object_set_data( holder, "split", act ); + g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toogle_break_apart), holder) ; + gtk_action_group_add_action( mainActions, GTK_ACTION(act) ); + } + GtkAction *split = GTK_ACTION( g_object_get_data(holder, "split") ); + GtkAction *mass = GTK_ACTION( g_object_get_data(holder, "mass") ); + if(eraserMode == TRUE){ + gtk_action_set_visible( split, TRUE ); + gtk_action_set_visible( mass, TRUE ); + } else { + gtk_action_set_visible( split, FALSE ); + gtk_action_set_visible( mass, FALSE ); + } } diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 6787ef6cc..72537f727 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -497,6 +497,9 @@ static gchar const * ui_descr = " " " " " " + " " + " " + " " " " " " -- cgit v1.2.3 From fb08e5217a32dbfaf097cb26d67d9d7e0f5b718e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 1 Mar 2016 12:03:12 +0100 Subject: Fix a bug with 0 width shapes (bzr r14648.1.4) --- src/ui/tools/eraser-tool.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 698415480..b34a2d3ce 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -699,7 +699,9 @@ void EraserTool::set_to_accumulated() { this->repr->parent()->appendChild(dup); Inkscape::GC::release(dup); // parent takes over selection->set(dup); - sp_selected_path_union(selection, desktop); + if (!this->nowidth) { + sp_selected_path_union(selection, desktop); + } selection->add(item); if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){ SPCSSAttr *css = sp_repr_css_attr_new(); -- cgit v1.2.3 From 7e69baf4baa9d56e51782e80958386a806c78eac Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 2 Mar 2016 14:34:33 +0100 Subject: Another small change to miter-limit for 'arcs' join to match SVG spec. (bzr r14677) --- src/helper/geom-pathstroke.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helper/geom-pathstroke.cpp b/src/helper/geom-pathstroke.cpp index 3ef4b15da..d2e9f9a1b 100644 --- a/src/helper/geom-pathstroke.cpp +++ b/src/helper/geom-pathstroke.cpp @@ -557,7 +557,7 @@ void extrapolate_join_internal(join_data jd, int alternative) Geom::Line bisector_chord = make_bisector_line(chord); Geom::Line limit_line; - double miter_limit = 2.0 * width * miter; + double miter_limit = width * miter; bool clipped = false; if (are_parallel(bisector_chord, ortho)) { -- cgit v1.2.3 From 4aba6b92f30733f400891d2c3a6d77c1ae1d7a47 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 2 Mar 2016 20:34:31 +0100 Subject: Fix for bug 1540070 Fixed bugs: - https://launchpad.net/bugs/1540070 (bzr r14678) --- src/live_effects/effect.cpp | 3 +- src/live_effects/effect.h | 2 + src/live_effects/lpe-bendpath.cpp | 5 +- src/live_effects/lpe-copy_rotate.cpp | 5 +- src/live_effects/lpe-envelope.cpp | 4 +- src/live_effects/lpe-lattice.cpp | 5 +- src/live_effects/lpe-lattice2.cpp | 4 +- src/live_effects/lpe-mirror_symmetry.cpp | 10 +- src/live_effects/lpe-mirror_symmetry.h | 2 - src/live_effects/lpe-offset.cpp | 10 +- src/live_effects/lpe-offset.h | 2 - src/live_effects/lpe-perspective-envelope.cpp | 4 +- src/live_effects/lpe-perspective_path.cpp | 3 +- src/live_effects/lpe-roughen.cpp | 4 +- src/live_effects/lpe-simplify.cpp | 4 +- src/live_effects/lpe-transform_2pts.cpp | 3 +- src/live_effects/lpe-vonkoch.cpp | 5 +- src/sp-lpe-item.cpp | 202 +++++++++----------------- src/sp-lpe-item.h | 4 +- 19 files changed, 91 insertions(+), 190 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index fe7bf3a97..47fd02554 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -356,7 +356,8 @@ Effect::createAndApply(EffectType type, SPDocument *doc, SPItem *item) } Effect::Effect(LivePathEffectObject *lpeobject) - : _provides_knotholder_entities(false), + : apply_to_clippath_and_mask(false), + _provides_knotholder_entities(false), oncanvasedit_it(0), is_visible(_("Is visible?"), _("If unchecked, the effect remains applied to the object but is temporarily disabled on canvas"), "is_visible", &wr, this, true), show_orig_path(false), diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h index ea57ff243..898e089b7 100644 --- a/src/live_effects/effect.h +++ b/src/live_effects/effect.h @@ -121,6 +121,7 @@ public: inline bool isVisible() const { return is_visible; } void editNextParamOncanvas(SPItem * item, SPDesktop * desktop); + bool apply_to_clippath_and_mask; protected: Effect(LivePathEffectObject *lpeobject); @@ -144,6 +145,7 @@ protected: std::vector param_vector; bool _provides_knotholder_entities; + int oncanvasedit_it; BoolParam is_visible; diff --git a/src/live_effects/lpe-bendpath.cpp b/src/live_effects/lpe-bendpath.cpp index d7c0b69a4..bc112285f 100644 --- a/src/live_effects/lpe-bendpath.cpp +++ b/src/live_effects/lpe-bendpath.cpp @@ -81,6 +81,7 @@ LPEBendPath::LPEBendPath(LivePathEffectObject *lpeobject) : prop_scale.param_set_increments(0.01, 0.10); _provides_knotholder_entities = true; + apply_to_clippath_and_mask = true; concatenate_before_pwd2 = true; } @@ -95,10 +96,6 @@ LPEBendPath::doBeforeEffect (SPLPEItem const* lpeitem) // get the item bounding box original_bbox(lpeitem); original_height = boundingbox_Y.max() - boundingbox_Y.min(); - SPLPEItem * item = const_cast(lpeitem); - - item->apply_to_clippath(item); - item->apply_to_mask(item); } Geom::Piecewise > diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 87d8f05a9..8dfaf7525 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -61,6 +61,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : { show_orig_path = true; _provides_knotholder_entities = true; + apply_to_clippath_and_mask = true; // register all your parameters here, so Inkscape knows which parameters this effect has: registerParameter(&copiesTo360); @@ -111,10 +112,6 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) if(copiesTo360 ){ rot_pos = origin; } - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); - } diff --git a/src/live_effects/lpe-envelope.cpp b/src/live_effects/lpe-envelope.cpp index 05a672ae8..e873c0b15 100644 --- a/src/live_effects/lpe-envelope.cpp +++ b/src/live_effects/lpe-envelope.cpp @@ -42,6 +42,7 @@ LPEEnvelope::LPEEnvelope(LivePathEffectObject *lpeobject) : registerParameter( dynamic_cast(&bend_path3) ); registerParameter( dynamic_cast(&bend_path4) ); concatenate_before_pwd2 = true; + apply_to_clippath_and_mask = true; } LPEEnvelope::~LPEEnvelope() @@ -54,9 +55,6 @@ LPEEnvelope::doBeforeEffect (SPLPEItem const* lpeitem) { // get the item bounding box original_bbox(lpeitem); - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); } Geom::Piecewise > diff --git a/src/live_effects/lpe-lattice.cpp b/src/live_effects/lpe-lattice.cpp index c05bae7e1..3c23e349e 100644 --- a/src/live_effects/lpe-lattice.cpp +++ b/src/live_effects/lpe-lattice.cpp @@ -78,7 +78,7 @@ LPELattice::LPELattice(LivePathEffectObject *lpeobject) : registerParameter( dynamic_cast(&grid_point14) ); registerParameter( dynamic_cast(&grid_point15) ); - + apply_to_clippath_and_mask = true; } LPELattice::~LPELattice() @@ -176,9 +176,6 @@ void LPELattice::doBeforeEffect (SPLPEItem const* lpeitem) { original_bbox(lpeitem); - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); } void diff --git a/src/live_effects/lpe-lattice2.cpp b/src/live_effects/lpe-lattice2.cpp index b749370fa..0c403daec 100644 --- a/src/live_effects/lpe-lattice2.cpp +++ b/src/live_effects/lpe-lattice2.cpp @@ -103,6 +103,7 @@ LPELattice2::LPELattice2(LivePathEffectObject *lpeobject) : registerParameter(&grid_point_28x30); registerParameter(&grid_point_29x31); registerParameter(&grid_point_32x33x34x35); + apply_to_clippath_and_mask = true; } LPELattice2::~LPELattice2() @@ -358,9 +359,6 @@ LPELattice2::doBeforeEffect (SPLPEItem const* lpeitem) horizontal(grid_point_17, grid_point_19,horiz); horizontal(grid_point_20x21, grid_point_22x23,horiz); } - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); } void diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 783053df2..c13cffb6a 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -33,7 +33,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L100,100") { show_orig_path = true; - + apply_to_clippath_and_mask = true; registerParameter( dynamic_cast(&discard_orig_path) ); registerParameter( dynamic_cast(&reflection_line) ); } @@ -42,14 +42,6 @@ LPEMirrorSymmetry::~LPEMirrorSymmetry() { } -void -LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) -{ - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); -} - void LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) { diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 7a484a473..64a72d7b3 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -30,8 +30,6 @@ public: virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); private: diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp index dd7af92a2..d611b88a1 100644 --- a/src/live_effects/lpe-offset.cpp +++ b/src/live_effects/lpe-offset.cpp @@ -31,7 +31,7 @@ LPEOffset::LPEOffset(LivePathEffectObject *lpeobject) : offset_pt(_("Offset"), _("Handle to control the distance of the offset from the curve"), "offset_pt", &wr, this) { show_orig_path = true; - + apply_to_clippath_and_mask = true; registerParameter(dynamic_cast(&offset_pt)); } @@ -57,14 +57,6 @@ static void append_half_circle(Geom::Piecewise > &pwd2, pwd2.continuousConcat(cap_pwd2); } -void -LPEOffset::doBeforeEffect (SPLPEItem const* lpeitem) -{ - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); -} - Geom::Piecewise > LPEOffset::doEffect_pwd2 (Geom::Piecewise > const & pwd2_in) { diff --git a/src/live_effects/lpe-offset.h b/src/live_effects/lpe-offset.h index 997311c7d..9966fd45d 100644 --- a/src/live_effects/lpe-offset.h +++ b/src/live_effects/lpe-offset.h @@ -28,8 +28,6 @@ public: virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > const & pwd2_in); private: diff --git a/src/live_effects/lpe-perspective-envelope.cpp b/src/live_effects/lpe-perspective-envelope.cpp index 72c1b0e99..5b29df4a7 100644 --- a/src/live_effects/lpe-perspective-envelope.cpp +++ b/src/live_effects/lpe-perspective-envelope.cpp @@ -56,6 +56,7 @@ LPEPerspectiveEnvelope::LPEPerspectiveEnvelope(LivePathEffectObject *lpeobject) registerParameter(&up_right_point); registerParameter(&down_left_point); registerParameter(&down_right_point); + apply_to_clippath_and_mask = true; } LPEPerspectiveEnvelope::~LPEPerspectiveEnvelope() @@ -371,9 +372,6 @@ LPEPerspectiveEnvelope::doBeforeEffect (SPLPEItem const* lpeitem) horizontal(up_left_point, down_left_point,horiz); horizontal(up_right_point, down_right_point,horiz); } - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); setDefaults(); } diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp index 901519b4f..c8cdd7912 100644 --- a/src/live_effects/lpe-perspective_path.cpp +++ b/src/live_effects/lpe-perspective_path.cpp @@ -64,6 +64,7 @@ LPEPerspectivePath::LPEPerspectivePath(LivePathEffectObject *lpeobject) : concatenate_before_pwd2 = true; // don't split the path into its subpaths _provides_knotholder_entities = true; + apply_to_clippath_and_mask = true; } LPEPerspectivePath::~LPEPerspectivePath() @@ -100,8 +101,6 @@ LPEPerspectivePath::doBeforeEffect (SPLPEItem const* lpeitem) Geom::Affine doc2d = Geom::Scale(1, -1) * Geom::Translate(0, item->document->getHeight().value("px")); pmat = pmat * doc2d; pmat.copy_tmat(tmat); - item->apply_to_clippath(item); - item->apply_to_mask(item); } void LPEPerspectivePath::refresh(Gtk::Entry* perspective) { diff --git a/src/live_effects/lpe-roughen.cpp b/src/live_effects/lpe-roughen.cpp index b4ee54f1a..105fe2fc4 100644 --- a/src/live_effects/lpe-roughen.cpp +++ b/src/live_effects/lpe-roughen.cpp @@ -87,6 +87,7 @@ LPERoughen::LPERoughen(LivePathEffectObject *lpeobject) segments.param_set_increments(1, 1); segments.param_set_digits(0); seed = 0; + apply_to_clippath_and_mask = true; } LPERoughen::~LPERoughen() {} @@ -102,9 +103,6 @@ void LPERoughen::doBeforeEffect(SPLPEItem const *lpeitem) displace_y.resetRandomizer(); global_randomize.resetRandomizer(); srand(1); - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); } Gtk::Widget *LPERoughen::newWidget() diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp index 4b62c6c65..f807bdc8d 100644 --- a/src/live_effects/lpe-simplify.cpp +++ b/src/live_effects/lpe-simplify.cpp @@ -60,6 +60,7 @@ LPESimplify::LPESimplify(LivePathEffectObject *lpeobject) helper_size.param_set_digits(2); radius_helper_nodes = 6.0; + apply_to_clippath_and_mask = true; } LPESimplify::~LPESimplify() {} @@ -71,10 +72,7 @@ LPESimplify::doBeforeEffect (SPLPEItem const* lpeitem) hp.clear(); } bbox = SP_ITEM(lpeitem)->visualBounds(); - SPLPEItem * item = const_cast(lpeitem); radius_helper_nodes = helper_size; - item->apply_to_clippath(item); - item->apply_to_mask(item); } Gtk::Widget * diff --git a/src/live_effects/lpe-transform_2pts.cpp b/src/live_effects/lpe-transform_2pts.cpp index dd1a29689..1cd59b7fa 100644 --- a/src/live_effects/lpe-transform_2pts.cpp +++ b/src/live_effects/lpe-transform_2pts.cpp @@ -78,6 +78,7 @@ LPETransform2Pts::LPETransform2Pts(LivePathEffectObject *lpeobject) : strech.param_set_range(0, 999.0); strech.param_set_increments(0.01, 0.01); strech.param_set_digits(4); + apply_to_clippath_and_mask = true; } LPETransform2Pts::~LPETransform2Pts() @@ -167,8 +168,6 @@ LPETransform2Pts::doBeforeEffect (SPLPEItem const* lpeitem) previous_angle = transformed.angle(); previous_lenght = Geom::distance((Geom::Point)start, (Geom::Point)end); previous_start = start; - splpeitem->apply_to_clippath(splpeitem); - splpeitem->apply_to_mask(splpeitem); } void diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp index 7b424e019..7eda7446e 100644 --- a/src/live_effects/lpe-vonkoch.cpp +++ b/src/live_effects/lpe-vonkoch.cpp @@ -64,7 +64,7 @@ LPEVonKoch::LPEVonKoch(LivePathEffectObject *lpeobject) : registerParameter( dynamic_cast(&drawall) ); registerParameter( dynamic_cast(&maxComplexity) ); //registerParameter( dynamic_cast(&draw_boxes) ); - + apply_to_clippath_and_mask = true; nbgenerations.param_make_integer(); nbgenerations.param_set_range(0, Geom::infinity()); maxComplexity.param_make_integer(); @@ -262,9 +262,6 @@ LPEVonKoch::doBeforeEffect (SPLPEItem const* lpeitem) tmp_pathv.push_back(tmp_path); ref_path.set_new_value(tmp_pathv,true); } - SPLPEItem * item = const_cast(lpeitem); - item->apply_to_clippath(item); - item->apply_to_mask(item); } diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index 98b77cfe8..e2afbb55b 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -209,7 +209,7 @@ Inkscape::XML::Node* SPLPEItem::write(Inkscape::XML::Document *xml_doc, Inkscape /** * returns true when LPE was successful. */ -bool SPLPEItem::performPathEffect(SPCurve *curve) { +bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { if (!this) { return false; } @@ -217,7 +217,7 @@ bool SPLPEItem::performPathEffect(SPCurve *curve) { if (!curve) { return false; } - + bool apply_to_clippath_and_mask = false; if (this->hasPathEffect() && this->pathEffectsEnabled()) { for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); ++it) { @@ -239,35 +239,42 @@ bool SPLPEItem::performPathEffect(SPCurve *curve) { } if (lpe->isVisible()) { + if(lpe->apply_to_clippath_and_mask){ + apply_to_clippath_and_mask = true; + } if (lpe->acceptsNumClicks() > 0 && !lpe->isReady()) { // if the effect expects mouse input before being applied and the input is not finished // yet, we don't alter the path return false; } + if (clip_paths || lpe->apply_to_clippath_and_mask) { + // Groups have their doBeforeEffect called elsewhere + if (!SP_IS_GROUP(this)) { + lpe->doBeforeEffect_impl(this); + } - // Groups have their doBeforeEffect called elsewhere - if (!SP_IS_GROUP(this)) { - lpe->doBeforeEffect_impl(this); - } - - try { - lpe->doEffect(curve); - } - catch (std::exception & e) { - g_warning("Exception during LPE %s execution. \n %s", lpe->getName().c_str(), e.what()); - if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->messageStack()) { - SP_ACTIVE_DESKTOP->messageStack()->flash( Inkscape::WARNING_MESSAGE, - _("An exception occurred during execution of the Path Effect.") ); + try { + lpe->doEffect(curve); + } + catch (std::exception & e) { + g_warning("Exception during LPE %s execution. \n %s", lpe->getName().c_str(), e.what()); + if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->messageStack()) { + SP_ACTIVE_DESKTOP->messageStack()->flash( Inkscape::WARNING_MESSAGE, + _("An exception occurred during execution of the Path Effect.") ); + } + return false; + } + if (!SP_IS_GROUP(this)) { + lpe->doAfterEffect(this); } - return false; - } - if (!SP_IS_GROUP(this)) { - lpe->doAfterEffect(this); } } } } - + if(apply_to_clippath_and_mask && clip_paths){ + this->apply_to_clippath((SPItem *)this); + this->apply_to_mask((SPItem *)this); + } return true; } @@ -641,43 +648,7 @@ SPLPEItem::apply_to_clippath(SPItem *item) SPClipPath *clipPath = item->clip_ref->getObject(); if(clipPath) { SPObject * clip_data = clipPath->firstChild(); - SPCurve * clip_curve = NULL; - - if (SP_IS_PATH(clip_data)) { - clip_curve = SP_PATH(clip_data)->get_original_curve(); - } else if(SP_IS_SHAPE(clip_data)) { - clip_curve = SP_SHAPE(clip_data)->getCurve(); - } else if(SP_IS_GROUP(clip_data)) { - apply_to_clip_or_mask_group(SP_ITEM(clip_data), item); - return; - } - if(clip_curve) { - bool success = false; - if(SP_IS_GROUP(this)){ - clip_curve->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this))); - success = this->performPathEffect(clip_curve); - clip_curve->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this)).inverse()); - } else { - success = this->performPathEffect(clip_curve); - } - Inkscape::XML::Node *reprClip = clip_data->getRepr(); - if (success) { - gchar *str = sp_svg_write_path(clip_curve->get_pathvector()); - reprClip->setAttribute("d", str); - g_free(str); - } else { - // LPE was unsuccesfull. Read the old 'd'-attribute. - if (gchar const * value = reprClip->attribute("d")) { - Geom::PathVector pv = sp_svg_read_pathv(value); - SPCurve *oldcurve = new SPCurve(pv); - if (oldcurve) { - SP_SHAPE(clip_data)->setCurve(oldcurve, TRUE); - oldcurve->unref(); - } - } - } - clip_curve->unref(); - } + apply_to_clip_or_mask(SP_ITEM(clip_data), item); } if(SP_IS_GROUP(item)){ std::vector item_list = sp_item_group_item_list(SP_GROUP(item)); @@ -694,42 +665,7 @@ SPLPEItem::apply_to_mask(SPItem *item) SPMask *mask = item->mask_ref->getObject(); if(mask) { SPObject *mask_data = mask->firstChild(); - SPCurve * mask_curve = NULL; - if (SP_IS_PATH(mask_data)) { - mask_curve = SP_PATH(mask_data)->get_original_curve(); - } else if(SP_IS_SHAPE(mask_data)) { - mask_curve = SP_SHAPE(mask_data)->getCurve(); - } else if(SP_IS_GROUP(mask_data)) { - apply_to_clip_or_mask_group(SP_ITEM(mask_data), item); - return; - } - if(mask_curve) { - bool success = false; - if(SP_IS_GROUP(this)){ - mask_curve->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this))); - success = this->performPathEffect(mask_curve); - mask_curve->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this)).inverse()); - } else { - success = this->performPathEffect(mask_curve); - } - Inkscape::XML::Node *reprmask = mask_data->getRepr(); - if (success) { - gchar *str = sp_svg_write_path(mask_curve->get_pathvector()); - reprmask->setAttribute("d", str); - g_free(str); - } else { - // LPE was unsuccesfull. Read the old 'd'-attribute. - if (gchar const * value = reprmask->attribute("d")) { - Geom::PathVector pv = sp_svg_read_pathv(value); - SPCurve *oldcurve = new SPCurve(pv); - if (oldcurve) { - SP_SHAPE(mask_data)->setCurve(oldcurve, TRUE); - oldcurve->unref(); - } - } - } - mask_curve->unref(); - } + apply_to_clip_or_mask(SP_ITEM(mask_data), item); } if(SP_IS_GROUP(item)){ std::vector item_list = sp_item_group_item_list(SP_GROUP(item)); @@ -741,51 +677,57 @@ SPLPEItem::apply_to_mask(SPItem *item) } void -SPLPEItem::apply_to_clip_or_mask_group(SPItem *group, SPItem *item) +SPLPEItem::apply_to_clip_or_mask(SPItem *clip_mask, SPItem *item) { - if (!SP_IS_GROUP(group)) { - return; - } - std::vector item_list = sp_item_group_item_list(SP_GROUP(group)); - for ( std::vector::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) { - SPObject *subitem = *iter; - if (SP_IS_GROUP(subitem)) { - apply_to_clip_or_mask_group(SP_ITEM(subitem), item); - } else if (SP_IS_SHAPE(subitem)) { - SPCurve * c = NULL; - - if (SP_IS_PATH(subitem)) { - c = SP_PATH(subitem)->get_original_curve(); - } else { - c = SP_SHAPE(subitem)->getCurve(); - } - if (c) { - bool success = false; - if(SP_IS_GROUP(group)){ + if (SP_IS_GROUP(clip_mask)) { + std::vector item_list = sp_item_group_item_list(SP_GROUP(clip_mask)); + for ( std::vector::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) { + SPItem *subitem = *iter; + apply_to_clip_or_mask(subitem, item); + } + } else if (SP_IS_SHAPE(clip_mask)) { + SPCurve * c = NULL; + + if (SP_IS_PATH(clip_mask)) { + c = SP_PATH(clip_mask)->get_original_curve(); + } else { + c = SP_SHAPE(clip_mask)->getCurve(); + } + if (c) { + bool success = false; + try { + if(SP_IS_GROUP(this)){ c->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this))); - success = this->performPathEffect(c); + success = this->performPathEffect(c, false); c->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this)).inverse()); } else { - success = this->performPathEffect(c); + success = this->performPathEffect(c, false); } - Inkscape::XML::Node *repr = subitem->getRepr(); - if (success) { - gchar *str = sp_svg_write_path(c->get_pathvector()); - repr->setAttribute("d", str); - g_free(str); - } else { - // LPE was unsuccesfull. Read the old 'd'-attribute. - if (gchar const * value = repr->attribute("d")) { - Geom::PathVector pv = sp_svg_read_pathv(value); - SPCurve *oldcurve = new SPCurve(pv); - if (oldcurve) { - SP_SHAPE(subitem)->setCurve(oldcurve, TRUE); - oldcurve->unref(); - } + } catch (std::exception & e) { + g_warning("Exception during LPE execution. \n %s", e.what()); + if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->messageStack()) { + SP_ACTIVE_DESKTOP->messageStack()->flash( Inkscape::WARNING_MESSAGE, + _("An exception occurred during execution of the Path Effect.") ); + } + success = false; + } + Inkscape::XML::Node *repr = clip_mask->getRepr(); + if (success) { + gchar *str = sp_svg_write_path(c->get_pathvector()); + repr->setAttribute("d", str); + g_free(str); + } else { + // LPE was unsuccesfull. Read the old 'd'-attribute. + if (gchar const * value = repr->attribute("d")) { + Geom::PathVector pv = sp_svg_read_pathv(value); + SPCurve *oldcurve = new SPCurve(pv); + if (oldcurve) { + SP_SHAPE(clip_mask)->setCurve(oldcurve, TRUE); + oldcurve->unref(); } } - c->unref(); } + c->unref(); } } } diff --git a/src/sp-lpe-item.h b/src/sp-lpe-item.h index c35ad8411..d5e868b2e 100644 --- a/src/sp-lpe-item.h +++ b/src/sp-lpe-item.h @@ -69,7 +69,7 @@ public: virtual void update_patheffect(bool write); - bool performPathEffect(SPCurve *curve); + bool performPathEffect(SPCurve *curve, bool clip_paths = true); bool pathEffectsEnabled() const; bool hasPathEffect() const; @@ -93,7 +93,7 @@ public: void addPathEffect(LivePathEffectObject * new_lpeobj); void apply_to_mask(SPItem * item); void apply_to_clippath(SPItem * item); - void apply_to_clip_or_mask_group(SPItem * group, SPItem * item); + void apply_to_clip_or_mask(SPItem * clip_mask, SPItem * item); bool forkPathEffectsIfNecessary(unsigned int nr_of_allowed_users = 1); void editNextParamOncanvas(SPDesktop *dt); -- cgit v1.2.3 From 32829581539b00c07f592c15cb62b69d71de9bb7 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 2 Mar 2016 20:44:36 +0100 Subject: Fix bug 1540155: Interactive simplify on pencit tool is hard to edit Fixed bugs: - https://launchpad.net/bugs/1540155 (bzr r14679) --- src/ui/dialog/inkscape-preferences.cpp | 10 ++++++++++ src/ui/dialog/inkscape-preferences.h | 1 + src/ui/tools/pencil-tool.cpp | 16 ++++++++++------ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index b6d7e25ec..b20f71a6a 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -206,6 +206,15 @@ void InkscapePreferences::AddDotSizeSpinbutton(DialogPage &p, Glib::ustring cons false ); } +void InkscapePreferences::AddBaseSimplifySpinbutton(DialogPage &p, Glib::ustring const &prefs_path, double def_value) +{ + PrefSpinButton* sb = Gtk::manage( new PrefSpinButton); + sb->init ( prefs_path + "/base-simplify", 0.0, 100.0, 1.0, 10.0, def_value, false, false); + p.add_line( false, _("Base simplify:"), *sb, _("on dinamic LPE simplify"), + _("Base simplify of dinamic LPE based simplify"), + false ); +} + static void StyleFromSelectionToTool(Glib::ustring const &prefs_path, StyleSwatch *swatch) { @@ -425,6 +434,7 @@ void InkscapePreferences::initPageTools() this->AddSelcueCheckbox(_page_pencil, "/tools/freehand/pencil", true); this->AddNewObjectsStyle(_page_pencil, "/tools/freehand/pencil"); this->AddDotSizeSpinbutton(_page_pencil, "/tools/freehand/pencil", 3.0); + this->AddBaseSimplifySpinbutton(_page_pencil, "/tools/freehand/pencil", 25.0); _page_pencil.add_group_header( _("Sketch mode")); _page_pencil.add_line( true, "", _pencil_average_all_sketches, "", _("If on, the sketch result will be the normal average of all sketches made, instead of averaging the old result with the new sketch")); diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index b7696ab8c..d1abcfc58 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -502,6 +502,7 @@ protected: static void AddConvertGuidesCheckbox(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, bool def_value); static void AddFirstAndLastCheckbox(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, bool def_value); static void AddDotSizeSpinbutton(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, double def_value); + static void AddBaseSimplifySpinbutton(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, double def_value); static void AddNewObjectsStyle(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, const gchar* banner = NULL); void on_pagelist_selection_changed(); diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp index bfb1c67f0..b029ca613 100644 --- a/src/ui/tools/pencil-tool.cpp +++ b/src/ui/tools/pencil-tool.cpp @@ -634,12 +634,14 @@ void PencilTool::_interpolate() { using Geom::Y; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4; - double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2); + double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4; bool simplify = prefs->getInt("/tools/freehand/pencil/simplify", 0); if(simplify){ - tolerance_sq = 0; + double tol2 = prefs->getDoubleLimited("/tools/freehand/pencil/base-simplify", 25.0, 1.0, 100.0) * 0.4; + tol = std::min(tol,tol2); } + double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2); + g_assert(is_zero(this->req_tangent) || is_unit_vector(this->req_tangent)); this->green_curve->reset(); @@ -705,12 +707,14 @@ void PencilTool::_sketchInterpolate() { } Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4; - double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2); + double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4; bool simplify = prefs->getInt("/tools/freehand/pencil/simplify", 0); if(simplify){ - tolerance_sq = 0; + double tol2 = prefs->getDoubleLimited("/tools/freehand/pencil/base-simplify", 25.0, 1.0, 100.0) * 0.4; + tol = std::min(tol,tol2); } + double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2); + bool average_all_sketches = prefs->getBool("/tools/freehand/pencil/average_all_sketches", true); g_assert(is_zero(this->req_tangent) || is_unit_vector(this->req_tangent)); -- cgit v1.2.3 From b3f002153bce861dd2f86fb02da66725c644459e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 2 Mar 2016 20:47:26 +0100 Subject: Fix bug: 1552003 Randomize color extension has no limits Fixed bugs: - https://launchpad.net/bugs/1552003 (bzr r14680) --- share/extensions/color_randomize.inx | 6 +++- share/extensions/color_randomize.py | 58 ++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 7 deletions(-) mode change 100755 => 100644 share/extensions/color_randomize.py diff --git a/share/extensions/color_randomize.inx b/share/extensions/color_randomize.inx index 82691f0f4..0c84227ae 100644 --- a/share/extensions/color_randomize.inx +++ b/share/extensions/color_randomize.inx @@ -8,11 +8,15 @@ true + 100 true + 100 true + 100 + - <_param name="instructions" type="description" xml:space="preserve">Converts to HSL, randomizes hue and/or saturation and/or lightness and converts it back to RGB. + <_param name="instructions" type="description" xml:space="preserve">Converts to HSL, randomizes hue and/or saturation and/or lightness and converts it back to RGB. Lower the range values to limit the distance between the original color and the randomized one. diff --git a/share/extensions/color_randomize.py b/share/extensions/color_randomize.py old mode 100755 new mode 100644 index e939b7b6d..b8f52cb6b --- a/share/extensions/color_randomize.py +++ b/share/extensions/color_randomize.py @@ -7,15 +7,27 @@ class C(coloreffect.ColorEffect): self.OptionParser.add_option("-x", "--hue", action="store", type="inkbool", dest="hue", default=True, - help="randomize hue") + help="Randomize hue") + self.OptionParser.add_option("-y", "--hue_range", + action="store", type="int", + dest="hue_range", default=0, + help="Hue range") self.OptionParser.add_option("-s", "--saturation", action="store", type="inkbool", dest="saturation", default=True, - help="randomize saturation") + help="Randomize saturation") + self.OptionParser.add_option("-t", "--saturation_range", + action="store", type="int", + dest="saturation_range", default=0, + help="Saturation range") self.OptionParser.add_option("-l", "--lightness", action="store", type="inkbool", dest="lightness", default=True, - help="randomize lightness") + help="Randomize lightness") + self.OptionParser.add_option("-m", "--lightness_range", + action="store", type="int", + dest="lightness_range", default=0, + help="Lightness range") self.OptionParser.add_option("--tab", action="store", type="string", dest="tab", @@ -23,12 +35,46 @@ class C(coloreffect.ColorEffect): def colmod(self,r,g,b): hsl = self.rgb_to_hsl(r/255.0, g/255.0, b/255.0) + if(self.options.hue): - hsl[0]=random.random() + limit = 255.0 * (1 + self.options.hue_range) / 100.0 + limit /= 2 + max = int((hsl[0] * 255.0) + limit) + min = int((hsl[0] * 255.0) - limit) + if max > 255: + min = min - (max - 255) + max = 255 + if min < 0: + max = max - min + min = 0 + hsl[0] = random.randrange(min, max) + hsl[0] /= 255.0 if(self.options.saturation): - hsl[1]=random.random() + limit = 255.0 * (1 + self.options.saturation_range) / 100.0 + limit /= 2 + max = int((hsl[1] * 255.0) + limit) + min = int((hsl[1] * 255.0) - limit) + if max > 255: + min = min - (max - 255) + max = 255 + if min < 0: + max = max - min + min = 0 + hsl[1] = random.randrange(min, max) + hsl[1] /= 255.0 if(self.options.lightness): - hsl[2]=random.random() + limit = 255.0 * (1 + self.options.lightness_range) / 100.0 + limit /= 2 + max = int((hsl[2] * 255.0) + limit) + min = int((hsl[2] * 255.0) - limit) + if max > 255: + min = min - (max - 255) + max = 255 + if min < 0: + max = max - min + min = 0 + hsl[2] = random.randrange(min, max) + hsl[2] /= 255.0 rgb = self.hsl_to_rgb(hsl[0], hsl[1], hsl[2]) return '%02x%02x%02x' % (rgb[0]*255, rgb[1]*255, rgb[2]*255) -- cgit v1.2.3 From d2d53a21a717ac8506960504385566a55b3a7b22 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 4 Mar 2016 00:29:08 +0100 Subject: Add support for the "relative to" setting when aligning baselines (fixes 167228) Fixed bugs: - https://launchpad.net/bugs/167228 (bzr r14682) --- src/ui/dialog/align-and-distribute.cpp | 49 +++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 9e7861217..5a16ecce8 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -741,7 +741,6 @@ private : if (!selection) return; std::vector selected(selection->itemList()); - if (selected.empty()) return; //Check 2 or more selected objects if (selected.size() < 2) return; @@ -794,7 +793,51 @@ private : _("Distribute text baselines")); } - } else { + } else { //align + Geom::Point ref_point; + SPItem *focus = NULL; + Geom::OptRect b = Geom::OptRect(); + + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + + switch (AlignTarget(prefs->getInt("/dialogs/align/align-to", 6))) + { + case LAST: + focus = SP_ITEM(*selected.begin()); + break; + case FIRST: + focus = SP_ITEM(*--(selected.end())); + break; + case BIGGEST: + focus = selection->largestItem(Selection::AREA); + break; + case SMALLEST: + focus = selection->smallestItem(Selection::AREA); + break; + case PAGE: + b = desktop->getDocument()->preferredBounds(); + break; + case DRAWING: + b = desktop->getDocument()->getRoot()->desktopPreferredBounds(); + break; + case SELECTION: + b = selection->preferredBounds(); + break; + default: + g_assert_not_reached (); + break; + }; + + if(focus) { + if (SP_IS_TEXT (focus) || SP_IS_FLOWTEXT (focus)) { + ref_point = *(te_get_layout(focus)->baselineAnchorPoint())*(focus->i2dt_affine()); + } else { + ref_point = focus->desktopPreferredBounds()->min(); + } + } else { + ref_point = b->min(); + } + for (std::vector::iterator it(selected.begin()); it != selected.end(); ++it) @@ -806,7 +849,7 @@ private : if (pt) { Geom::Point base = *pt * (item)->i2dt_affine(); Geom::Point t(0.0, 0.0); - t[_orientation] = b_min[_orientation] - base[_orientation]; + t[_orientation] = ref_point[_orientation] - base[_orientation]; sp_item_move_rel(item, Geom::Translate(t)); changed = true; } -- cgit v1.2.3 From a7448ad9a0afe4616fc1ef4eb31101d852160767 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 4 Mar 2016 00:37:54 +0100 Subject: forgot to include a file in previous commit >< (bzr r14683) --- src/ui/dialog/align-and-distribute.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h index eecc30ff8..d337775cf 100644 --- a/src/ui/dialog/align-and-distribute.h +++ b/src/ui/dialog/align-and-distribute.h @@ -149,6 +149,7 @@ bool operator< (const BBoxSort &a, const BBoxSort &b); class Action { public : + enum AlignTarget { LAST=0, FIRST, BIGGEST, SMALLEST, PAGE, DRAWING, SELECTION }; Action(const Glib::ustring &id, const Glib::ustring &tiptext, guint row, guint column, @@ -183,7 +184,6 @@ public : double sx0, sx1, sy0, sy1; int verb_id; }; - enum AlignTarget { LAST=0, FIRST, BIGGEST, SMALLEST, PAGE, DRAWING, SELECTION }; ActionAlign(const Glib::ustring &id, const Glib::ustring &tiptext, guint row, guint column, -- cgit v1.2.3 From c6cfbcf0dfd490c9ab46b21219881f78c0af8bf1 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 4 Mar 2016 10:51:55 +0100 Subject: Hide with widget in delete mode of eraser tool (bzr r14684) --- src/ui/tools/eraser-tool.cpp | 1 + src/widgets/eraser-toolbar.cpp | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index b34a2d3ce..edda211ca 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -449,6 +449,7 @@ bool EraserTool::root_handler(GdkEvent* event) { ret = TRUE; } if ( !eraserMode ) { + this->accumulated->reset(); Inkscape::Rubberband::get(desktop)->move(motion_dt); } } diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 1fc520185..45989936f 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -74,12 +74,15 @@ static void sp_erasertb_mode_changed( EgeSelectOneAction *act, GObject *tbl ) } GtkAction *split = GTK_ACTION( g_object_get_data(tbl, "split") ); GtkAction *mass = GTK_ACTION( g_object_get_data(tbl, "mass") ); + GtkAction *width = GTK_ACTION( g_object_get_data(tbl, "width") ); if(eraserMode == TRUE){ gtk_action_set_visible( split, TRUE ); gtk_action_set_visible( mass, TRUE ); + gtk_action_set_visible( width, TRUE ); } else { gtk_action_set_visible( split, FALSE ); gtk_action_set_visible( mass, FALSE ); + gtk_action_set_visible( width, FALSE ); } // only take action if run by the attr_changed listener if (!g_object_get_data( tbl, "freeze" )) { @@ -157,6 +160,7 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb sp_erc_width_value_changed, NULL /*unit tracker*/, 1, 0); ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); + g_object_set_data( holder, "width", eact ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); } { @@ -190,12 +194,15 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb } GtkAction *split = GTK_ACTION( g_object_get_data(holder, "split") ); GtkAction *mass = GTK_ACTION( g_object_get_data(holder, "mass") ); + GtkAction *width = GTK_ACTION( g_object_get_data(holder, "width") ); if(eraserMode == TRUE){ gtk_action_set_visible( split, TRUE ); gtk_action_set_visible( mass, TRUE ); + gtk_action_set_visible( width, TRUE ); } else { gtk_action_set_visible( split, FALSE ); gtk_action_set_visible( mass, FALSE ); + gtk_action_set_visible( width, FALSE ); } } -- cgit v1.2.3 From 532e38d87f1465b0cce151bcc520f8f5b0b6bffc Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 4 Mar 2016 16:02:09 +0100 Subject: Fix bug: 230480 eraser tool always deletes selected objects Fixed bugs: - https://launchpad.net/bugs/230480 (bzr r14685) --- src/ui/tools/eraser-tool.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index edda211ca..8a3dbc66e 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -682,7 +682,18 @@ void EraserTool::set_to_accumulated() { } toWorkOn.erase(std::remove(toWorkOn.begin(), toWorkOn.end(), acid), toWorkOn.end()); } else { - toWorkOn = selection->itemList(); + if ( !eraserMode ) { + Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); + std::vector touched; + touched = desktop->getDocument()->getItemsAtPoints(desktop->dkey, r->getPoints()); + for (std::vector::const_iterator i = touched.begin();i!=touched.end();++i) { + if(selection->includes(*i)){ + toWorkOn.push_back((*i)); + } + } + } else { + toWorkOn = selection->itemList(); + } wasSelection = true; } -- cgit v1.2.3 From ec0ae472f3d3221081a1248d0a517c68a296f6f5 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 4 Mar 2016 10:33:09 -0500 Subject: Update 2geom copy to 143bbcf: Fix for multiple sequential closepath commands Fixed bugs: - https://launchpad.net/bugs/1492153 (bzr r14686) --- src/2geom/path-sink.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/2geom/path-sink.h b/src/2geom/path-sink.h index 17ede18a4..3bdb00783 100644 --- a/src/2geom/path-sink.h +++ b/src/2geom/path-sink.h @@ -179,8 +179,10 @@ public: } void closePath() { - _path.close(); - flush(); + if (_in_path) { + _path.close(); + flush(); + } } void flush() { -- cgit v1.2.3 From 1e3c55578b899990862b21e826dbe38129c3fff0 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Fri, 4 Mar 2016 10:39:45 -0500 Subject: Remove regex hack added in 14650 (bzr r14687) --- src/extension/internal/cdr-input.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index a4e26e224..f4789a08f 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -22,7 +22,6 @@ #include #include -#include #include @@ -282,12 +281,7 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u } } - // remove consecutive closepath commands (see bug 1492153) - Glib::RefPtr regex = Glib::Regex::create("(Z(?:\\s+Z)+)(?=[^<]+\")"); - Glib::ustring outString1 = Glib::ustring(tmpSVGOutput[page_num-1].cstr()); - Glib::ustring outString2 = regex->replace(outString1, 0, "Z", Glib::REGEX_MATCH_NEWLINE_ANY); - - SPDocument * doc = SPDocument::createNewDocFromMem(outString2.c_str(), outString2.bytes(), TRUE); + SPDocument * doc = SPDocument::createNewDocFromMem(tmpSVGOutput[page_num-1].cstr(), strlen(tmpSVGOutput[page_num-1].cstr()), TRUE); // Set viewBox if it doesn't exist if (doc && !doc->getRoot()->viewBox_set) { -- cgit v1.2.3 From 70f07d3a84ebcc213420c8028a2bc3d1dd4110d4 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 4 Mar 2016 20:19:00 +0100 Subject: Fix for bug 415471 and 1553182 related to undo with eraser tool Fixed bugs: - https://launchpad.net/bugs/1553182 (bzr r14688) --- src/path-chemistry.cpp | 18 +++++---- src/path-chemistry.h | 4 +- src/ui/tools/eraser-tool.cpp | 89 ++++++++++++++++++++++++-------------------- 3 files changed, 60 insertions(+), 51 deletions(-) diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 7b52ac2e1..15d3f0f99 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -52,7 +52,7 @@ inline bool less_than_items(SPItem const *first, SPItem const *second) } void -sp_selected_path_combine(SPDesktop *desktop) +sp_selected_path_combine(SPDesktop *desktop, bool skip_undo) { Inkscape::Selection *selection = desktop->getSelection(); SPDocument *doc = desktop->getDocument(); @@ -172,10 +172,10 @@ sp_selected_path_combine(SPDesktop *desktop) // move to the position of the topmost, reduced by the number of deleted items repr->setPosition(position > 0 ? position : 0); - - DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_COMBINE, - _("Combine")); - + if ( !skip_undo ) { + DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_COMBINE, + _("Combine")); + } selection->set(repr); Inkscape::GC::release(repr); @@ -188,7 +188,7 @@ sp_selected_path_combine(SPDesktop *desktop) } void -sp_selected_path_break_apart(SPDesktop *desktop) +sp_selected_path_break_apart(SPDesktop *desktop, bool skip_undo) { Inkscape::Selection *selection = desktop->getSelection(); @@ -283,8 +283,10 @@ sp_selected_path_break_apart(SPDesktop *desktop) desktop->clearWaitingCursor(); if (did) { - DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_BREAK_APART, - _("Break apart")); + if ( !skip_undo ) { + DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_BREAK_APART, + _("Break apart")); + } } else { desktop->getMessageStack()->flash(Inkscape::ERROR_MESSAGE, _("No path(s) to break apart in the selection.")); } diff --git a/src/path-chemistry.h b/src/path-chemistry.h index 35ab923c0..7b9beaed8 100644 --- a/src/path-chemistry.h +++ b/src/path-chemistry.h @@ -25,8 +25,8 @@ class Node; typedef unsigned int guint32; -void sp_selected_path_combine (SPDesktop *desktop); -void sp_selected_path_break_apart (SPDesktop *desktop); +void sp_selected_path_combine (SPDesktop *desktop, bool skip_undo = false); +void sp_selected_path_break_apart (SPDesktop *desktop, bool skip_undo = false); // interactive=true only has an effect if desktop != NULL, i.e. if a GUI is available void sp_selected_path_to_curves (Inkscape::Selection *selection, SPDesktop *desktop, bool interactive = true); void sp_selected_to_lpeitems(SPDesktop *desktop); diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp index 8a3dbc66e..6b32b5901 100644 --- a/src/ui/tools/eraser-tool.cpp +++ b/src/ui/tools/eraser-tool.cpp @@ -702,49 +702,57 @@ void EraserTool::set_to_accumulated() { for (std::vector::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); ++i){ SPItem *item = *i; SPUse *use = dynamic_cast(item); - if (SP_IS_GROUP(item) || use ) { - continue; - } - Geom::OptRect bbox = item->desktopVisualBounds(); - if (bbox && bbox->intersects(*eraserBbox)) { - Inkscape::XML::Node* dup = this->repr->duplicate(xml_doc); - this->repr->parent()->appendChild(dup); - Inkscape::GC::release(dup); // parent takes over - selection->set(dup); - if (!this->nowidth) { - sp_selected_path_union(selection, desktop); - } - selection->add(item); - if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){ - SPCSSAttr *css = sp_repr_css_attr_new(); - sp_repr_css_set_property(css, "fill-rule", "evenodd"); - sp_desktop_set_style(desktop, css); - sp_repr_css_attr_unref(css); - css = 0; - } - if (this->nowidth) { - sp_selected_path_cut_skip_undo(selection, desktop); - } else { - sp_selected_path_diff_skip_undo(selection, desktop); - } - workDone = true; // TODO set this only if something was cut. - bool break_apart = prefs->getBool("/tools/eraser/break_apart", false); - if(!break_apart){ - sp_selected_path_combine(desktop); - } else { - if(!this->nowidth){ - sp_selected_path_break_apart(desktop); + if (SP_IS_PATH(item) && SP_PATH(item)->nodesInPath () == 2){ + sp_object_ref( *i, 0 ); + SPItem *item = *i; + item->deleteObject(true); + sp_object_unref(item); + workDone = true; + workDone = true; + } else if (SP_IS_GROUP(item) || use ) { + /*Do nothing*/ + } else { + Geom::OptRect bbox = item->desktopVisualBounds(); + if (bbox && bbox->intersects(*eraserBbox)) { + Inkscape::XML::Node* dup = this->repr->duplicate(xml_doc); + this->repr->parent()->appendChild(dup); + Inkscape::GC::release(dup); // parent takes over + selection->set(dup); + if (!this->nowidth) { + sp_selected_path_union_skip_undo(selection, desktop); } - } - if ( !selection->isEmpty() ) { - // If the item was not completely erased, track the new remainder. - std::vector nowSel(selection->itemList()); - for (std::vector::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) { - remainingItems.push_back(*i2); + selection->add(item); + if(item->style->fill_rule.value == SP_WIND_RULE_EVENODD){ + SPCSSAttr *css = sp_repr_css_attr_new(); + sp_repr_css_set_property(css, "fill-rule", "evenodd"); + sp_desktop_set_style(desktop, css); + sp_repr_css_attr_unref(css); + css = 0; + } + if (this->nowidth) { + sp_selected_path_cut_skip_undo(selection, desktop); + } else { + sp_selected_path_diff_skip_undo(selection, desktop); + } + workDone = true; // TODO set this only if something was cut. + bool break_apart = prefs->getBool("/tools/eraser/break_apart", false); + if(!break_apart){ + sp_selected_path_combine(desktop, true); + } else { + if(!this->nowidth){ + sp_selected_path_break_apart(desktop, true); + } + } + if ( !selection->isEmpty() ) { + // If the item was not completely erased, track the new remainder. + std::vector nowSel(selection->itemList()); + for (std::vector::const_iterator i2 = nowSel.begin();i2!=nowSel.end();++i2) { + remainingItems.push_back(*i2); + } } + } else { + remainingItems.push_back(item); } - } else { - remainingItems.push_back(item); } } } else { @@ -773,7 +781,6 @@ void EraserTool::set_to_accumulated() { } } } - // Remove the eraser stroke itself: sp_repr_unparent( this->repr ); this->repr = 0; -- cgit v1.2.3 From 054a977163f423ddd25c873cf4c8d433bfe20cae Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 5 Mar 2016 16:03:14 +0100 Subject: btool: Switch regex library from T-Rex to SLRE (see bug 1550776 for details) Fixed bugs: - https://launchpad.net/bugs/1550776 (bzr r14689) --- buildtool.cpp | 1129 +++++++++++++++++++++++---------------------------------- 1 file changed, 462 insertions(+), 667 deletions(-) diff --git a/buildtool.cpp b/buildtool.cpp index ae3d40106..0169f82ae 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -120,733 +120,523 @@ namespace buildtool //######################################################################## /** - * This is the T-Rex regular expression library, which we - * gratefully acknowledge. It's clean code and small size allow - * us to embed it in BuildTool without adding a dependency + * This is the SLRE (Super Light Regular Expression library) + * SLRE is an ISO C library that implements a subset of Perl + * regular expression syntax. + * + * See https://github.com/cesanta/slre for details + * + * It's clean code and small size allow us to + * embed it in BuildTool without adding a dependency * */ -//begin trex.h +//begin slre.h -#ifndef _TREX_H_ -#define _TREX_H_ -/*************************************************************** - T-Rex a tiny regular expression library +/* + * Copyright (c) 2004-2013 Sergey Lyubka + * Copyright (c) 2013 Cesanta Software Limited + * All rights reserved + * + * This library is dual-licensed: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. For the terms of this + * license, see . + * + * You are free to use this library under the terms of the GNU General + * Public License, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * Alternatively, you can license this library under a commercial + * license, as set out in . + */ - Copyright (C) 2003-2006 Alberto Demichelis +/* + * This is a regular expression library that implements a subset of Perl RE. + * Please refer to README.md for a detailed reference. + */ - This software is provided 'as-is', without any express - or implied warranty. In no event will the authors be held - liable for any damages arising from the use of this software. +#ifndef SLRE_HEADER_DEFINED +#define SLRE_HEADER_DEFINED - Permission is granted to anyone to use this software for - any purpose, including commercial applications, and to alter - it and redistribute it freely, subject to the following restrictions: +#ifdef __cplusplus +extern "C" { +#endif - 1. The origin of this software must not be misrepresented; - you must not claim that you wrote the original software. - If you use this software in a product, an acknowledgment - in the product documentation would be appreciated but - is not required. +struct slre_cap { + const char *ptr; + int len; +}; - 2. Altered source versions must be plainly marked as such, - and must not be misrepresented as being the original software. - 3. This notice may not be removed or altered from any - source distribution. +int slre_match(const char *regexp, const char *buf, int buf_len, + struct slre_cap *caps, int num_caps, int flags); -****************************************************************/ +/* Possible flags for slre_match() */ +enum { SLRE_IGNORE_CASE = 1 }; -#ifdef _UNICODE -#define TRexChar unsigned short -#define MAX_CHAR 0xFFFF -#define _TREXC(c) L##c -#define trex_strlen wcslen -#define trex_printf wprintf -#else -#define TRexChar char -#define MAX_CHAR 0xFF -#define _TREXC(c) (c) -#define trex_strlen strlen -#define trex_printf printf -#endif -#ifndef TREX_API -#define TREX_API extern -#endif +/* slre_match() failure codes */ +#define SLRE_NO_MATCH -1 +#define SLRE_UNEXPECTED_QUANTIFIER -2 +#define SLRE_UNBALANCED_BRACKETS -3 +#define SLRE_INTERNAL_ERROR -4 +#define SLRE_INVALID_CHARACTER_SET -5 +#define SLRE_INVALID_METACHARACTER -6 +#define SLRE_CAPS_ARRAY_TOO_SMALL -7 +#define SLRE_TOO_MANY_BRANCHES -8 +#define SLRE_TOO_MANY_BRACKETS -9 -#define TRex_True 1 -#define TRex_False 0 +#ifdef __cplusplus +} +#endif -typedef unsigned int TRexBool; -typedef struct TRex TRex; +#endif /* SLRE_HEADER_DEFINED */ -typedef struct { - const TRexChar *begin; - int len; -} TRexMatch; +//end slre.h -TREX_API TRex *trex_compile(const TRexChar *pattern,const TRexChar **error); -TREX_API void trex_free(TRex *exp); -TREX_API TRexBool trex_match(TRex* exp,const TRexChar* text); -TREX_API TRexBool trex_search(TRex* exp,const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end); -TREX_API TRexBool trex_searchrange(TRex* exp,const TRexChar* text_begin,const TRexChar* text_end,const TRexChar** out_begin, const TRexChar** out_end); -TREX_API int trex_getsubexpcount(TRex* exp); -TREX_API TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp); +//start slre.c -#endif +/* + * Copyright (c) 2004-2013 Sergey Lyubka + * Copyright (c) 2013 Cesanta Software Limited + * All rights reserved + * + * This library is dual-licensed: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. For the terms of this + * license, see . + * + * You are free to use this library under the terms of the GNU General + * Public License, but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + * + * Alternatively, you can license this library under a commercial + * license, as set out in . + */ -//end trex.h +#include +#include +#include -//start trex.c +//#include "slre.h" +#define MAX_BRANCHES 100 +#define MAX_BRACKETS 100 +#define FAIL_IF(condition, error_code) if (condition) return (error_code) -#include -#include +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(ar) (sizeof(ar) / sizeof((ar)[0])) +#endif -/* see copyright notice in trex.h */ -#include -#include -#include -#include -//#include "trex.h" - -#ifdef _UNICODE -#define scisprint iswprint -#define scstrlen wcslen -#define scprintf wprintf -#define _SC(x) L(x) +#ifdef SLRE_DEBUG +#define DBG(x) printf x #else -#define scisprint isprint -#define scstrlen strlen -#define scprintf printf -#define _SC(x) (x) +#define DBG(x) #endif -#ifdef _DEBUG -#include - -static const TRexChar *g_nnames[] = -{ - _SC("NONE"),_SC("OP_GREEDY"), _SC("OP_OR"), - _SC("OP_EXPR"),_SC("OP_NOCAPEXPR"),_SC("OP_DOT"), _SC("OP_CLASS"), - _SC("OP_CCLASS"),_SC("OP_NCLASS"),_SC("OP_RANGE"),_SC("OP_CHAR"), - _SC("OP_EOL"),_SC("OP_BOL"),_SC("OP_WB") +struct bracket_pair { + const char *ptr; /* Points to the first char after '(' in regex */ + int len; /* Length of the text between '(' and ')' */ + int branches; /* Index in the branches array for this pair */ + int num_branches; /* Number of '|' in this bracket pair */ }; -#endif -#define OP_GREEDY (MAX_CHAR+1) // * + ? {n} -#define OP_OR (MAX_CHAR+2) -#define OP_EXPR (MAX_CHAR+3) //parentesis () -#define OP_NOCAPEXPR (MAX_CHAR+4) //parentesis (?:) -#define OP_DOT (MAX_CHAR+5) -#define OP_CLASS (MAX_CHAR+6) -#define OP_CCLASS (MAX_CHAR+7) -#define OP_NCLASS (MAX_CHAR+8) //negates class the [^ -#define OP_RANGE (MAX_CHAR+9) -#define OP_CHAR (MAX_CHAR+10) -#define OP_EOL (MAX_CHAR+11) -#define OP_BOL (MAX_CHAR+12) -#define OP_WB (MAX_CHAR+13) - -#define TREX_SYMBOL_ANY_CHAR ('.') -#define TREX_SYMBOL_GREEDY_ONE_OR_MORE ('+') -#define TREX_SYMBOL_GREEDY_ZERO_OR_MORE ('*') -#define TREX_SYMBOL_GREEDY_ZERO_OR_ONE ('?') -#define TREX_SYMBOL_BRANCH ('|') -#define TREX_SYMBOL_END_OF_STRING ('$') -#define TREX_SYMBOL_BEGINNING_OF_STRING ('^') -#define TREX_SYMBOL_ESCAPE_CHAR ('\\') - - -typedef int TRexNodeType; - -typedef struct tagTRexNode{ - TRexNodeType type; - int left; - int right; - int next; -}TRexNode; - -struct TRex{ - const TRexChar *_eol; - const TRexChar *_bol; - const TRexChar *_p; - int _first; - int _op; - TRexNode *_nodes; - int _nallocated; - int _nsize; - int _nsubexpr; - TRexMatch *_matches; - int _currsubexp; - void *_jmpbuf; - const TRexChar **_error; +struct branch { + int bracket_index; /* index for 'struct bracket_pair brackets' */ + /* array defined below */ + const char *schlong; /* points to the '|' character in the regex */ }; -static int trex_list(TRex *exp); +struct regex_info { + /* + * Describes all bracket pairs in the regular expression. + * First entry is always present, and grabs the whole regex. + */ + struct bracket_pair brackets[MAX_BRACKETS]; + int num_brackets; + + /* + * Describes alternations ('|' operators) in the regular expression. + * Each branch falls into a specific branch pair. + */ + struct branch branches[MAX_BRANCHES]; + int num_branches; + + /* Array of captures provided by the user */ + struct slre_cap *caps; + int num_caps; + + /* E.g. SLRE_IGNORE_CASE. See enum below */ + int flags; +}; -static int trex_newnode(TRex *exp, TRexNodeType type) -{ - TRexNode n; - int newid; - n.type = type; - n.next = n.right = n.left = -1; - if(type == OP_EXPR) - n.right = exp->_nsubexpr++; - if(exp->_nallocated < (exp->_nsize + 1)) { - //int oldsize = exp->_nallocated; - exp->_nallocated *= 2; - exp->_nodes = (TRexNode *)realloc(exp->_nodes, exp->_nallocated * sizeof(TRexNode)); - } - exp->_nodes[exp->_nsize++] = n; - newid = exp->_nsize - 1; - return (int)newid; +static int is_metacharacter(const unsigned char *s) { + static const char *metacharacters = "^$().[]*+?|\\Ssdbfnrtv"; + return strchr(metacharacters, *s) != NULL; } -static void trex_error(TRex *exp,const TRexChar *error) -{ - if(exp->_error) *exp->_error = error; - longjmp(*((jmp_buf*)exp->_jmpbuf),-1); +static int op_len(const char *re) { + return re[0] == '\\' && re[1] == 'x' ? 4 : re[0] == '\\' ? 2 : 1; } -static void trex_expect(TRex *exp, int n){ - if((*exp->_p) != n) - trex_error(exp, _SC("expected paren")); - exp->_p++; -} +static int set_len(const char *re, int re_len) { + int len = 0; -static TRexChar trex_escapechar(TRex *exp) -{ - if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR){ - exp->_p++; - switch(*exp->_p) { - case 'v': exp->_p++; return '\v'; - case 'n': exp->_p++; return '\n'; - case 't': exp->_p++; return '\t'; - case 'r': exp->_p++; return '\r'; - case 'f': exp->_p++; return '\f'; - default: return (*exp->_p++); - } - } else if(!scisprint(*exp->_p)) trex_error(exp,_SC("letter expected")); - return (*exp->_p++); + while (len < re_len && re[len] != ']') { + len += op_len(re + len); + } + + return len <= re_len ? len + 1 : -1; } -static int trex_charclass(TRex *exp,int classid) -{ - int n = trex_newnode(exp,OP_CCLASS); - exp->_nodes[n].left = classid; - return n; +static int get_op_len(const char *re, int re_len) { + return re[0] == '[' ? set_len(re + 1, re_len - 1) + 1 : op_len(re); } -static int trex_charnode(TRex *exp,TRexBool isclass) -{ - TRexChar t; - if(*exp->_p == TREX_SYMBOL_ESCAPE_CHAR) { - exp->_p++; - switch(*exp->_p) { - case 'n': exp->_p++; return trex_newnode(exp,'\n'); - case 't': exp->_p++; return trex_newnode(exp,'\t'); - case 'r': exp->_p++; return trex_newnode(exp,'\r'); - case 'f': exp->_p++; return trex_newnode(exp,'\f'); - case 'v': exp->_p++; return trex_newnode(exp,'\v'); - case 'a': case 'A': case 'w': case 'W': case 's': case 'S': - case 'd': case 'D': case 'x': case 'X': case 'c': case 'C': - case 'p': case 'P': case 'l': case 'u': - { - t = *exp->_p; exp->_p++; - return trex_charclass(exp,t); - } - case 'b': - case 'B': - if(!isclass) { - int node = trex_newnode(exp,OP_WB); - exp->_nodes[node].left = *exp->_p; - exp->_p++; - return node; - } //else default - default: - t = *exp->_p; exp->_p++; - return trex_newnode(exp,t); - } - } - else if(!scisprint(*exp->_p)) { - - trex_error(exp,_SC("letter expected")); - } - t = *exp->_p; exp->_p++; - return trex_newnode(exp,t); +static int is_quantifier(const char *re) { + return re[0] == '*' || re[0] == '+' || re[0] == '?'; } -static int trex_class(TRex *exp) -{ - int ret = -1; - int first = -1,chain; - if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING){ - ret = trex_newnode(exp,OP_NCLASS); - exp->_p++; - }else ret = trex_newnode(exp,OP_CLASS); - - if(*exp->_p == ']') trex_error(exp,_SC("empty class")); - chain = ret; - while(*exp->_p != ']' && exp->_p != exp->_eol) { - if(*exp->_p == '-' && first != -1){ - int r,t; - if(*exp->_p++ == ']') trex_error(exp,_SC("unfinished range")); - r = trex_newnode(exp,OP_RANGE); - if(first>*exp->_p) trex_error(exp,_SC("invalid range")); - if(exp->_nodes[first].type == OP_CCLASS) trex_error(exp,_SC("cannot use character classes in ranges")); - exp->_nodes[r].left = exp->_nodes[first].type; - t = trex_escapechar(exp); - exp->_nodes[r].right = t; - exp->_nodes[chain].next = r; - chain = r; - first = -1; - } - else{ - if(first!=-1){ - int c = first; - exp->_nodes[chain].next = c; - chain = c; - first = trex_charnode(exp,TRex_True); - } - else{ - first = trex_charnode(exp,TRex_True); - } - } - } - if(first!=-1){ - int c = first; - exp->_nodes[chain].next = c; - chain = c; - first = -1; - } - /* hack? */ - exp->_nodes[ret].left = exp->_nodes[ret].next; - exp->_nodes[ret].next = -1; - return ret; + +static int toi(int x) { + return isdigit(x) ? x - '0' : x - 'W'; } -static int trex_parsenumber(TRex *exp) -{ - int ret = *exp->_p-'0'; - int positions = 10; - exp->_p++; - while(isdigit(*exp->_p)) { - ret = ret*10+(*exp->_p++-'0'); - if(positions==1000000000) trex_error(exp,_SC("overflow in numeric constant")); - positions *= 10; - }; - return ret; +static int hextoi(const unsigned char *s) { + return (toi(tolower(s[0])) << 4) | toi(tolower(s[1])); } -static int trex_element(TRex *exp) -{ - int ret = -1; - switch(*exp->_p) - { - case '(': { - int expr,newn; - exp->_p++; +static int match_op(const unsigned char *re, const unsigned char *s, + struct regex_info *info) { + int result = 0; + switch (*re) { + case '\\': + /* Metacharacters */ + switch (re[1]) { + case 'S': FAIL_IF(isspace(*s), SLRE_NO_MATCH); result++; break; + case 's': FAIL_IF(!isspace(*s), SLRE_NO_MATCH); result++; break; + case 'd': FAIL_IF(!isdigit(*s), SLRE_NO_MATCH); result++; break; + case 'b': FAIL_IF(*s != '\b', SLRE_NO_MATCH); result++; break; + case 'f': FAIL_IF(*s != '\f', SLRE_NO_MATCH); result++; break; + case 'n': FAIL_IF(*s != '\n', SLRE_NO_MATCH); result++; break; + case 'r': FAIL_IF(*s != '\r', SLRE_NO_MATCH); result++; break; + case 't': FAIL_IF(*s != '\t', SLRE_NO_MATCH); result++; break; + case 'v': FAIL_IF(*s != '\v', SLRE_NO_MATCH); result++; break; + case 'x': + /* Match byte, \xHH where HH is hexadecimal byte representaion */ + FAIL_IF(hextoi(re + 2) != *s, SLRE_NO_MATCH); + result++; + break; - if(*exp->_p =='?') { - exp->_p++; - trex_expect(exp,':'); - expr = trex_newnode(exp,OP_NOCAPEXPR); - } - else - expr = trex_newnode(exp,OP_EXPR); - newn = trex_list(exp); - exp->_nodes[expr].left = newn; - ret = expr; - trex_expect(exp,')'); - } - break; - case '[': - exp->_p++; - ret = trex_class(exp); - trex_expect(exp,']'); - break; - case TREX_SYMBOL_END_OF_STRING: exp->_p++; ret = trex_newnode(exp,OP_EOL);break; - case TREX_SYMBOL_ANY_CHAR: exp->_p++; ret = trex_newnode(exp,OP_DOT);break; - default: - ret = trex_charnode(exp,TRex_False); - break; - } + default: + /* Valid metacharacter check is done in bar() */ + FAIL_IF(re[1] != s[0], SLRE_NO_MATCH); + result++; + break; + } + break; - { - int op; - TRexBool isgreedy = TRex_False; - unsigned short p0 = 0, p1 = 0; - switch(*exp->_p){ - case TREX_SYMBOL_GREEDY_ZERO_OR_MORE: p0 = 0; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break; - case TREX_SYMBOL_GREEDY_ONE_OR_MORE: p0 = 1; p1 = 0xFFFF; exp->_p++; isgreedy = TRex_True; break; - case TREX_SYMBOL_GREEDY_ZERO_OR_ONE: p0 = 0; p1 = 1; exp->_p++; isgreedy = TRex_True; break; - case '{': - exp->_p++; - if(!isdigit(*exp->_p)) trex_error(exp,_SC("number expected")); - p0 = (unsigned short)trex_parsenumber(exp); - /*******************************/ - switch(*exp->_p) { - case '}': - p1 = p0; exp->_p++; - break; - case ',': - exp->_p++; - p1 = 0xFFFF; - if(isdigit(*exp->_p)){ - p1 = (unsigned short)trex_parsenumber(exp); - } - trex_expect(exp,'}'); - break; - default: - trex_error(exp,_SC(", or } expected")); - } - /*******************************/ - isgreedy = TRex_True; - break; + case '|': FAIL_IF(1, SLRE_INTERNAL_ERROR); break; + case '$': FAIL_IF(1, SLRE_NO_MATCH); break; + case '.': result++; break; - } - if(isgreedy) { - int nnode = trex_newnode(exp,OP_GREEDY); - op = OP_GREEDY; - exp->_nodes[nnode].left = ret; - exp->_nodes[nnode].right = ((p0)<<16)|p1; - ret = nnode; - } - } - if((*exp->_p != TREX_SYMBOL_BRANCH) && (*exp->_p != ')') && (*exp->_p != TREX_SYMBOL_GREEDY_ZERO_OR_MORE) && (*exp->_p != TREX_SYMBOL_GREEDY_ONE_OR_MORE) && (*exp->_p != '\0')) { - int nnode = trex_element(exp); - exp->_nodes[ret].next = nnode; - } + default: + if (info->flags & SLRE_IGNORE_CASE) { + FAIL_IF(tolower(*re) != tolower(*s), SLRE_NO_MATCH); + } else { + FAIL_IF(*re != *s, SLRE_NO_MATCH); + } + result++; + break; + } - return ret; + return result; } -static int trex_list(TRex *exp) -{ - int ret=-1,e; - if(*exp->_p == TREX_SYMBOL_BEGINNING_OF_STRING) { - exp->_p++; - ret = trex_newnode(exp,OP_BOL); - } - e = trex_element(exp); - if(ret != -1) { - exp->_nodes[ret].next = e; - } - else ret = e; - - if(*exp->_p == TREX_SYMBOL_BRANCH) { - int temp,tright; - exp->_p++; - temp = trex_newnode(exp,OP_OR); - exp->_nodes[temp].left = ret; - tright = trex_list(exp); - exp->_nodes[temp].right = tright; - ret = temp; - } - return ret; -} +static int match_set(const char *re, int re_len, const char *s, + struct regex_info *info) { + int len = 0, result = -1, invert = re[0] == '^'; -static TRexBool trex_matchcclass(int cclass,TRexChar c) -{ - switch(cclass) { - case 'a': return isalpha(c)?TRex_True:TRex_False; - case 'A': return !isalpha(c)?TRex_True:TRex_False; - case 'w': return (isalnum(c) || c == '_')?TRex_True:TRex_False; - case 'W': return (!isalnum(c) && c != '_')?TRex_True:TRex_False; - case 's': return isspace(c)?TRex_True:TRex_False; - case 'S': return !isspace(c)?TRex_True:TRex_False; - case 'd': return isdigit(c)?TRex_True:TRex_False; - case 'D': return !isdigit(c)?TRex_True:TRex_False; - case 'x': return isxdigit(c)?TRex_True:TRex_False; - case 'X': return !isxdigit(c)?TRex_True:TRex_False; - case 'c': return iscntrl(c)?TRex_True:TRex_False; - case 'C': return !iscntrl(c)?TRex_True:TRex_False; - case 'p': return ispunct(c)?TRex_True:TRex_False; - case 'P': return !ispunct(c)?TRex_True:TRex_False; - case 'l': return islower(c)?TRex_True:TRex_False; - case 'u': return isupper(c)?TRex_True:TRex_False; + if (invert) re++, re_len--; + + while (len <= re_len && re[len] != ']' && result <= 0) { + /* Support character range */ + if (re[len] != '-' && re[len + 1] == '-' && re[len + 2] != ']' && + re[len + 2] != '\0') { + result = info->flags & SLRE_IGNORE_CASE ? + tolower(*s) >= tolower(re[len]) && tolower(*s) <= tolower(re[len + 2]) : + *s >= re[len] && *s <= re[len + 2]; + len += 3; + } else { + result = match_op((unsigned char *) re + len, (unsigned char *) s, info); + len += op_len(re + len); } - return TRex_False; /*cannot happen*/ + } + return (!invert && result > 0) || (invert && result <= 0) ? 1 : -1; } -static TRexBool trex_matchclass(TRex* exp,TRexNode *node,TRexChar c) -{ - do { - switch(node->type) { - case OP_RANGE: - if(c >= node->left && c <= node->right) return TRex_True; - break; - case OP_CCLASS: - if(trex_matchcclass(node->left,c)) return TRex_True; - break; - default: - if(c == node->type)return TRex_True; - } - } while((node->next != -1) && (node = &exp->_nodes[node->next])); - return TRex_False; -} +static int doh(const char *s, int s_len, struct regex_info *info, int bi); -static const TRexChar *trex_matchnode(TRex* exp,TRexNode *node,const TRexChar *str,TRexNode *next) -{ - - TRexNodeType type = node->type; - switch(type) { - case OP_GREEDY: { - //TRexNode *greedystop = (node->next != -1) ? &exp->_nodes[node->next] : NULL; - TRexNode *greedystop = NULL; - int p0 = (node->right >> 16)&0x0000FFFF, p1 = node->right&0x0000FFFF, nmaches = 0; - const TRexChar *s=str, *good = str; +static int bar(const char *re, int re_len, const char *s, int s_len, + struct regex_info *info, int bi) { + /* i is offset in re, j is offset in s, bi is brackets index */ + int i, j, n, step; - if(node->next != -1) { - greedystop = &exp->_nodes[node->next]; - } - else { - greedystop = next; - } + for (i = j = 0; i < re_len && j <= s_len; i += step) { - while((nmaches == 0xFFFF || nmaches < p1)) { + /* Handle quantifiers. Get the length of the chunk. */ + step = re[i] == '(' ? info->brackets[bi + 1].len + 2 : + get_op_len(re + i, re_len - i); - const TRexChar *stop; - if(!(s = trex_matchnode(exp,&exp->_nodes[node->left],s,greedystop))) - break; - nmaches++; - good=s; - if(greedystop) { - //checks that 0 matches satisfy the expression(if so skips) - //if not would always stop(for instance if is a '?') - if(greedystop->type != OP_GREEDY || - (greedystop->type == OP_GREEDY && ((greedystop->right >> 16)&0x0000FFFF) != 0)) - { - TRexNode *gnext = NULL; - if(greedystop->next != -1) { - gnext = &exp->_nodes[greedystop->next]; - }else if(next && next->next != -1){ - gnext = &exp->_nodes[next->next]; - } - stop = trex_matchnode(exp,greedystop,s,gnext); - if(stop) { - //if satisfied stop it - if(p0 == p1 && p0 == nmaches) break; - else if(nmaches >= p0 && p1 == 0xFFFF) break; - else if(nmaches >= p0 && nmaches <= p1) break; - } - } - } - - if(s >= exp->_eol) - break; - } - if(p0 == p1 && p0 == nmaches) return good; - else if(nmaches >= p0 && p1 == 0xFFFF) return good; - else if(nmaches >= p0 && nmaches <= p1) return good; - return NULL; - } - case OP_OR: { - const TRexChar *asd = str; - TRexNode *temp=&exp->_nodes[node->left]; - while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) { - if(temp->next != -1) - temp = &exp->_nodes[temp->next]; - else - return asd; - } - asd = str; - temp = &exp->_nodes[node->right]; - while( (asd = trex_matchnode(exp,temp,asd,NULL)) ) { - if(temp->next != -1) - temp = &exp->_nodes[temp->next]; - else - return asd; - } - return NULL; - break; - } - case OP_EXPR: - case OP_NOCAPEXPR:{ - TRexNode *n = &exp->_nodes[node->left]; - const TRexChar *cur = str; - int capture = -1; - if(node->type != OP_NOCAPEXPR && node->right == exp->_currsubexp) { - capture = exp->_currsubexp; - exp->_matches[capture].begin = cur; - exp->_currsubexp++; - } - - do { - TRexNode *subnext = NULL; - if(n->next != -1) { - subnext = &exp->_nodes[n->next]; - }else { - subnext = next; - } - if(!(cur = trex_matchnode(exp,n,cur,subnext))) { - if(capture != -1){ - exp->_matches[capture].begin = 0; - exp->_matches[capture].len = 0; - } - return NULL; - } - } while((n->next != -1) && (n = &exp->_nodes[n->next])); - - if(capture != -1) - exp->_matches[capture].len = cur - exp->_matches[capture].begin; - return cur; - } - case OP_WB: - if((str == exp->_bol && !isspace(*str)) - || (str == exp->_eol && !isspace(*(str-1))) - || (!isspace(*str) && isspace(*(str+1))) - || (isspace(*str) && !isspace(*(str+1))) ) { - return (node->left == 'b')?str:NULL; - } - return (node->left == 'b')?NULL:str; - case OP_BOL: - if(str == exp->_bol) return str; - return NULL; - case OP_EOL: - if(str == exp->_eol) return str; - return NULL; - case OP_DOT:{ - *str++; - } - return str; - case OP_NCLASS: - case OP_CLASS: - if(trex_matchclass(exp,&exp->_nodes[node->left],*str)?(type == OP_CLASS?TRex_True:TRex_False):(type == OP_NCLASS?TRex_True:TRex_False)) { - *str++; - return str; + DBG(("%s [%.*s] [%.*s] re_len=%d step=%d i=%d j=%d\n", __func__, + re_len - i, re + i, s_len - j, s + j, re_len, step, i, j)); + + FAIL_IF(is_quantifier(&re[i]), SLRE_UNEXPECTED_QUANTIFIER); + FAIL_IF(step <= 0, SLRE_INVALID_CHARACTER_SET); + + if (i + step < re_len && is_quantifier(re + i + step)) { + DBG(("QUANTIFIER: [%.*s]%c [%.*s]\n", step, re + i, + re[i + step], s_len - j, s + j)); + if (re[i + step] == '?') { + int result = bar(re + i, step, s + j, s_len - j, info, bi); + j += result > 0 ? result : 0; + i++; + } else if (re[i + step] == '+' || re[i + step] == '*') { + int j2 = j, nj = j, n1, n2 = -1, ni, non_greedy = 0; + + /* Points to the regexp code after the quantifier */ + ni = i + step + 1; + if (ni < re_len && re[ni] == '?') { + non_greedy = 1; + ni++; } - return NULL; - case OP_CCLASS: - if(trex_matchcclass(node->left,*str)) { - *str++; - return str; + + do { + if ((n1 = bar(re + i, step, s + j2, s_len - j2, info, bi)) > 0) { + j2 += n1; + } + if (re[i + step] == '+' && n1 < 0) break; + + if (ni >= re_len) { + /* After quantifier, there is nothing */ + nj = j2; + } else if ((n2 = bar(re + ni, re_len - ni, s + j2, + s_len - j2, info, bi)) >= 0) { + /* Regex after quantifier matched */ + nj = j2 + n2; + } + if (nj > j && non_greedy) break; + } while (n1 > 0); + + /* + * Even if we found one or more pattern, this branch will be executed, + * changing the next captures. + */ + if (n1 < 0 && n2 < 0 && re[i + step] == '*' && + (n2 = bar(re + ni, re_len - ni, s + j, s_len - j, info, bi)) > 0) { + nj = j + n2; } - return NULL; - default: /* char */ - if(*str != node->type) return NULL; - *str++; - return str; + + DBG(("STAR/PLUS END: %d %d %d %d %d\n", j, nj, re_len - ni, n1, n2)); + FAIL_IF(re[i + step] == '+' && nj == j, SLRE_NO_MATCH); + + /* If while loop body above was not executed for the * quantifier, */ + /* make sure the rest of the regex matches */ + FAIL_IF(nj == j && ni < re_len && n2 < 0, SLRE_NO_MATCH); + + /* Returning here cause we've matched the rest of RE already */ + return nj; + } + continue; } - return NULL; -} - -/* public api */ -TRex *trex_compile(const TRexChar *pattern,const TRexChar **error) -{ - TRex *exp = (TRex *)malloc(sizeof(TRex)); - exp->_eol = exp->_bol = NULL; - exp->_p = pattern; - exp->_nallocated = (int)scstrlen(pattern) * sizeof(TRexChar); - exp->_nodes = (TRexNode *)malloc(exp->_nallocated * sizeof(TRexNode)); - exp->_nsize = 0; - exp->_matches = 0; - exp->_nsubexpr = 0; - exp->_first = trex_newnode(exp,OP_EXPR); - exp->_error = error; - exp->_jmpbuf = malloc(sizeof(jmp_buf)); - if(setjmp(*((jmp_buf*)exp->_jmpbuf)) == 0) { - int res = trex_list(exp); - exp->_nodes[exp->_first].left = res; - if(*exp->_p!='\0') - trex_error(exp,_SC("unexpected character")); -#ifdef _DEBUG - { - int nsize,i; - TRexNode *t; - nsize = exp->_nsize; - t = &exp->_nodes[0]; - scprintf(_SC("\n")); - for(i = 0;i < nsize; i++) { - if(exp->_nodes[i].type>MAX_CHAR) - scprintf(_SC("[%02d] %10s "),i,g_nnames[exp->_nodes[i].type-MAX_CHAR]); - else - scprintf(_SC("[%02d] %10c "),i,exp->_nodes[i].type); - scprintf(_SC("left %02d right %02d next %02d\n"),exp->_nodes[i].left,exp->_nodes[i].right,exp->_nodes[i].next); - } - scprintf(_SC("\n")); + + if (re[i] == '[') { + n = match_set(re + i + 1, re_len - (i + 2), s + j, info); + DBG(("SET %.*s [%.*s] -> %d\n", step, re + i, s_len - j, s + j, n)); + FAIL_IF(n <= 0, SLRE_NO_MATCH); + j += n; + } else if (re[i] == '(') { + n = SLRE_NO_MATCH; + bi++; + FAIL_IF(bi >= info->num_brackets, SLRE_INTERNAL_ERROR); + DBG(("CAPTURING [%.*s] [%.*s] [%s]\n", + step, re + i, s_len - j, s + j, re + i + step)); + + if (re_len - (i + step) <= 0) { + /* Nothing follows brackets */ + n = doh(s + j, s_len - j, info, bi); + } else { + int j2; + for (j2 = 0; j2 <= s_len - j; j2++) { + if ((n = doh(s + j, s_len - (j + j2), info, bi)) >= 0 && + bar(re + i + step, re_len - (i + step), + s + j + n, s_len - (j + n), info, bi) >= 0) break; } -#endif - exp->_matches = (TRexMatch *) malloc(exp->_nsubexpr * sizeof(TRexMatch)); - memset(exp->_matches,0,exp->_nsubexpr * sizeof(TRexMatch)); - } - else{ - trex_free(exp); - return NULL; + } + + DBG(("CAPTURED [%.*s] [%.*s]:%d\n", step, re + i, s_len - j, s + j, n)); + FAIL_IF(n < 0, n); + if (info->caps != NULL && n > 0) { + info->caps[bi - 1].ptr = s + j; + info->caps[bi - 1].len = n; + } + j += n; + } else if (re[i] == '^') { + FAIL_IF(j != 0, SLRE_NO_MATCH); + } else if (re[i] == '$') { + FAIL_IF(j != s_len, SLRE_NO_MATCH); + } else { + FAIL_IF(j >= s_len, SLRE_NO_MATCH); + n = match_op((unsigned char *) (re + i), (unsigned char *) (s + j), info); + FAIL_IF(n <= 0, n); + j += n; } - return exp; + } + + return j; } -void trex_free(TRex *exp) -{ - if(exp) { - if(exp->_nodes) free(exp->_nodes); - if(exp->_jmpbuf) free(exp->_jmpbuf); - if(exp->_matches) free(exp->_matches); - free(exp); - } +/* Process branch points */ +static int doh(const char *s, int s_len, struct regex_info *info, int bi) { + const struct bracket_pair *b = &info->brackets[bi]; + int i = 0, len, result; + const char *p; + + do { + p = i == 0 ? b->ptr : info->branches[b->branches + i - 1].schlong + 1; + len = b->num_branches == 0 ? b->len : + i == b->num_branches ? (int) (b->ptr + b->len - p) : + (int) (info->branches[b->branches + i].schlong - p); + DBG(("%s %d %d [%.*s] [%.*s]\n", __func__, bi, i, len, p, s_len, s)); + result = bar(p, len, s, s_len, info, bi); + DBG(("%s <- %d\n", __func__, result)); + } while (result <= 0 && i++ < b->num_branches); /* At least 1 iteration */ + + return result; } -TRexBool trex_match(TRex* exp,const TRexChar* text) -{ - const TRexChar* res = NULL; - exp->_bol = text; - exp->_eol = text + scstrlen(text); - exp->_currsubexp = 0; - res = trex_matchnode(exp,exp->_nodes,text,NULL); - if(res == NULL || res != exp->_eol) - return TRex_False; - return TRex_True; +static int baz(const char *s, int s_len, struct regex_info *info) { + int i, result = -1, is_anchored = info->brackets[0].ptr[0] == '^'; + + for (i = 0; i <= s_len; i++) { + result = doh(s + i, s_len - i, info, 0); + if (result >= 0) { + result += i; + break; + } + if (is_anchored) break; + } + + return result; } -TRexBool trex_searchrange(TRex* exp,const TRexChar* text_begin,const TRexChar* text_end,const TRexChar** out_begin, const TRexChar** out_end) -{ - const TRexChar *cur = NULL; - int node = exp->_first; - if(text_begin >= text_end) return TRex_False; - exp->_bol = text_begin; - exp->_eol = text_end; - do { - cur = text_begin; - while(node != -1) { - exp->_currsubexp = 0; - cur = trex_matchnode(exp,&exp->_nodes[node],cur,NULL); - if(!cur) - break; - node = exp->_nodes[node].next; - } - *text_begin++; - } while(cur == NULL && text_begin != text_end); +static void setup_branch_points(struct regex_info *info) { + int i, j; + struct branch tmp; - if(cur == NULL) - return TRex_False; + /* First, sort branches. Must be stable, no qsort. Use bubble algo. */ + for (i = 0; i < info->num_branches; i++) { + for (j = i + 1; j < info->num_branches; j++) { + if (info->branches[i].bracket_index > info->branches[j].bracket_index) { + tmp = info->branches[i]; + info->branches[i] = info->branches[j]; + info->branches[j] = tmp; + } + } + } + + /* + * For each bracket, set their branch points. This way, for every bracket + * (i.e. every chunk of regex) we know all branch points before matching. + */ + for (i = j = 0; i < info->num_brackets; i++) { + info->brackets[i].num_branches = 0; + info->brackets[i].branches = j; + while (j < info->num_branches && info->branches[j].bracket_index == i) { + info->brackets[i].num_branches++; + j++; + } + } +} + +static int foo(const char *re, int re_len, const char *s, int s_len, + struct regex_info *info) { + int i, step, depth = 0; + + /* First bracket captures everything */ + info->brackets[0].ptr = re; + info->brackets[0].len = re_len; + info->num_brackets = 1; + + /* Make a single pass over regex string, memorize brackets and branches */ + for (i = 0; i < re_len; i += step) { + step = get_op_len(re + i, re_len - i); + + if (re[i] == '|') { + FAIL_IF(info->num_branches >= (int) ARRAY_SIZE(info->branches), + SLRE_TOO_MANY_BRANCHES); + info->branches[info->num_branches].bracket_index = + info->brackets[info->num_brackets - 1].len == -1 ? + info->num_brackets - 1 : depth; + info->branches[info->num_branches].schlong = &re[i]; + info->num_branches++; + } else if (re[i] == '\\') { + FAIL_IF(i >= re_len - 1, SLRE_INVALID_METACHARACTER); + if (re[i + 1] == 'x') { + /* Hex digit specification must follow */ + FAIL_IF(re[i + 1] == 'x' && i >= re_len - 3, + SLRE_INVALID_METACHARACTER); + FAIL_IF(re[i + 1] == 'x' && !(isxdigit(re[i + 2]) && + isxdigit(re[i + 3])), SLRE_INVALID_METACHARACTER); + } else { + FAIL_IF(!is_metacharacter((unsigned char *) re + i + 1), + SLRE_INVALID_METACHARACTER); + } + } else if (re[i] == '(') { + FAIL_IF(info->num_brackets >= (int) ARRAY_SIZE(info->brackets), + SLRE_TOO_MANY_BRACKETS); + depth++; /* Order is important here. Depth increments first. */ + info->brackets[info->num_brackets].ptr = re + i + 1; + info->brackets[info->num_brackets].len = -1; + info->num_brackets++; + FAIL_IF(info->num_caps > 0 && info->num_brackets - 1 > info->num_caps, + SLRE_CAPS_ARRAY_TOO_SMALL); + } else if (re[i] == ')') { + int ind = info->brackets[info->num_brackets - 1].len == -1 ? + info->num_brackets - 1 : depth; + info->brackets[ind].len = (int) (&re[i] - info->brackets[ind].ptr); + DBG(("SETTING BRACKET %d [%.*s]\n", + ind, info->brackets[ind].len, info->brackets[ind].ptr)); + depth--; + FAIL_IF(depth < 0, SLRE_UNBALANCED_BRACKETS); + FAIL_IF(i > 0 && re[i - 1] == '(', SLRE_NO_MATCH); + } + } - --text_begin; + FAIL_IF(depth != 0, SLRE_UNBALANCED_BRACKETS); + setup_branch_points(info); - if(out_begin) *out_begin = text_begin; - if(out_end) *out_end = cur; - return TRex_True; + return baz(s, s_len, info); } -TRexBool trex_search(TRex* exp,const TRexChar* text, const TRexChar** out_begin, const TRexChar** out_end) -{ - return trex_searchrange(exp,text,text + scstrlen(text),out_begin,out_end); -} +int slre_match(const char *regexp, const char *s, int s_len, + struct slre_cap *caps, int num_caps, int flags) { + struct regex_info info; -int trex_getsubexpcount(TRex* exp) -{ - return exp->_nsubexpr; -} + /* Initialize info structure */ + info.flags = flags; + info.num_brackets = info.num_branches = 0; + info.num_caps = num_caps; + info.caps = caps; -TRexBool trex_getsubexp(TRex* exp, int n, TRexMatch *subexp) -{ - if( n<0 || n >= exp->_nsubexpr) return TRex_False; - *subexp = exp->_matches[n]; - return TRex_True; + DBG(("========================> [%s] [%.*s]\n", regexp, s_len, s)); + return foo(regexp, (int) strlen(regexp), s, s_len, &info); } +//end slre.c //######################################################################## //######################################################################## @@ -3861,31 +3651,36 @@ String MakeBase::resolve(const String &otherPath) */ bool MakeBase::regexMatch(const String &str, const String &pattern) { - const TRexChar *terror = NULL; - const TRexChar *cpat = pattern.c_str(); - TRex *expr = trex_compile(cpat, &terror); - if (!expr) - { - if (!terror) - terror = "undefined"; - error("compilation error [%s]!\n", terror); - return false; - } - + int res = slre_match(pattern.c_str(), str.c_str(), str.length(), NULL, 0, SLRE_IGNORE_CASE); + bool ret = true; - - const TRexChar *cstr = str.c_str(); - if (trex_match(expr, cstr)) - { - ret = true; - } - else + if (res < 0) { ret = false; + + // error cases + if (res < -1) + { + String err; + switch(res) + { + case SLRE_UNEXPECTED_QUANTIFIER: + err = "unexpected quantifier"; break; + case SLRE_UNBALANCED_BRACKETS: + err = "unbalanced brackets"; break; + case SLRE_INTERNAL_ERROR: + err = "internal error"; break; + case SLRE_INVALID_CHARACTER_SET: + err = "invald character set"; break; + case SLRE_INVALID_METACHARACTER: + err = "invalid meta character"; break; + default: + err = "unknown error"; break; + } + error("regex failure (%s) while parsing [%s]!\n", err.c_str(), pattern.c_str()); + } } - trex_free(expr); - return ret; } -- cgit v1.2.3 From c8bcd8d3d0934f17a699b6eb3d205e5dc66a66ad Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 5 Mar 2016 16:03:39 +0100 Subject: btool: Update buildfiles for previous commit (bzr r14690) --- build-x64-gtk3.xml | 18 ++++++++++++------ build-x64.xml | 26 +++++++++++++++++++------- build.xml | 8 ++++---- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml index 73e9ab898..d9f95151a 100644 --- a/build-x64-gtk3.xml +++ b/build-x64-gtk3.xml @@ -793,9 +793,11 @@ - - - + + + + + @@ -805,8 +807,8 @@ - - + + @@ -814,7 +816,11 @@ - + + + + + diff --git a/build-x64.xml b/build-x64.xml index c3fe58a2b..a4600d387 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -766,21 +766,29 @@ - + + + + + + + - - - + + + + + - - + + @@ -788,7 +796,11 @@ - + + + + + diff --git a/build.xml b/build.xml index e26399f3f..022cdff4f 100644 --- a/build.xml +++ b/build.xml @@ -720,7 +720,7 @@ - + @@ -735,9 +735,9 @@ - - - + + + -- cgit v1.2.3 From 79dcf9dc649fedbf685416eb4e3747afa69cf807 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 5 Mar 2016 18:38:48 +0100 Subject: btool: Fix multiply included test file header (bzr r14691) --- build-x64-gtk3.xml | 2 +- build-x64.xml | 2 +- build.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml index d9f95151a..ffea1a848 100644 --- a/build-x64-gtk3.xml +++ b/build-x64-gtk3.xml @@ -270,7 +270,7 @@ - + diff --git a/build-x64.xml b/build-x64.xml index a4600d387..1be9d9449 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -265,7 +265,7 @@ - + diff --git a/build.xml b/build.xml index 022cdff4f..82cb64231 100644 --- a/build.xml +++ b/build.xml @@ -268,7 +268,7 @@ - + -- cgit v1.2.3 From 0a0947876040165625941a4bccc1a788173121c0 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 7 Mar 2016 20:34:38 +0100 Subject: does not zoom in to selection box if holding shift to zoom out (bzr r14692) --- src/ui/tools/zoom-tool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp index 6a4d4dbbd..13e097c18 100644 --- a/src/ui/tools/zoom-tool.cpp +++ b/src/ui/tools/zoom-tool.cpp @@ -142,7 +142,7 @@ bool ZoomTool::root_handler(GdkEvent* event) { if ( event->button.button == 1 && !this->space_panning) { Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle(); - if (b && !within_tolerance) { + if (b && !within_tolerance && !(GDK_SHIFT_MASK & event->button.state) ) { desktop->set_display_area(*b, 10); } else if (!escaped) { double const zoom_rel( (event->button.state & GDK_SHIFT_MASK) -- cgit v1.2.3 From a3f684fa5156f66fdcd3d15cc469d84258807201 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 7 Mar 2016 22:10:20 +0100 Subject: Add GUI for 'paint-order' property. (bzr r14693) --- share/icons/icons.svg | 84 +++++++++++++++++++++++++++++++++ src/desktop-style.cpp | 76 ++++++++++++++++++++++++++---- src/desktop-style.h | 1 + src/widgets/stroke-style.cpp | 107 +++++++++++++++++++++++++++++++++++++++++++ src/widgets/stroke-style.h | 11 ++++- 5 files changed, 268 insertions(+), 11 deletions(-) diff --git a/share/icons/icons.svg b/share/icons/icons.svg index c12e5b5b0..5e3be4220 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -4308,4 +4308,88 @@ http://www.inkscape.org/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index a81cbdd1f..c36bcee44 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -881,8 +881,7 @@ objects_query_strokecap (const std::vector &objects, SPStyle *style_res return QUERY_STYLE_NOTHING; } - int cap = -1; - gdouble prev_cap = -1; + int prev_cap = -1; bool same_cap = true; int n_stroked = 0; @@ -905,11 +904,9 @@ objects_query_strokecap (const std::vector &objects, SPStyle *style_res if (prev_cap != -1 && style->stroke_linecap.value != prev_cap) same_cap = false; prev_cap = style->stroke_linecap.value; - - cap = style->stroke_linecap.value; } - style_res->stroke_linecap.value = cap; + style_res->stroke_linecap.value = prev_cap; style_res->stroke_linecap.set = true; if (n_stroked == 0) { @@ -935,8 +932,7 @@ objects_query_strokejoin (const std::vector &objects, SPStyle *style_re return QUERY_STYLE_NOTHING; } - int join = -1; - gdouble prev_join = -1; + int prev_join = -1; bool same_join = true; int n_stroked = 0; @@ -960,11 +956,9 @@ objects_query_strokejoin (const std::vector &objects, SPStyle *style_re same_join = false; } prev_join = style->stroke_linejoin.value; - - join = style->stroke_linejoin.value; } - style_res->stroke_linejoin.value = join; + style_res->stroke_linejoin.value = prev_join; style_res->stroke_linejoin.set = true; if (n_stroked == 0) { @@ -979,6 +973,62 @@ objects_query_strokejoin (const std::vector &objects, SPStyle *style_re } } +/** + * Write to style_res the paint order of a list of objects. + */ +int +objects_query_paintorder (const std::vector &objects, SPStyle *style_res) +{ + if (objects.empty()) { + /* No objects, set empty */ + return QUERY_STYLE_NOTHING; + } + + std::string prev_order; + bool same_order = true; + int n_order = 0; + + for (std::vector::const_iterator i = objects.begin(); i != objects.end(); ++i) { + SPObject *obj = *i; + if (!dynamic_cast(obj)) { + continue; + } + SPStyle *style = obj->style; + if (!style) { + continue; + } + + if ( style->stroke.isNone() ) { + continue; + } + + n_order ++; + + if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { + same_order = false; + } + if (style->paint_order.set) { + prev_order = style->paint_order.value; + } + } + + + g_free( style_res->paint_order.value ); + style_res->paint_order.value= g_strdup( prev_order.c_str() ); + style_res->paint_order.set = true; + + if (n_order == 0) { + return QUERY_STYLE_NOTHING; + } else if (n_order == 1) { + return QUERY_STYLE_SINGLE; + } else { + if (same_order) + return QUERY_STYLE_MULTIPLE_SAME; + else + return QUERY_STYLE_MULTIPLE_DIFFERENT; + } +} + /** * Write to style_res the average font size and spacing of objects. */ @@ -1763,6 +1813,8 @@ sp_desktop_query_style_from_list (const std::vector &list, SPStyle *sty } else if (property == QUERY_STYLE_PROPERTY_STROKEJOIN) { return objects_query_strokejoin (list, style); + } else if (property == QUERY_STYLE_PROPERTY_PAINTORDER) { + return objects_query_paintorder (list, style); } else if (property == QUERY_STYLE_PROPERTY_MASTEROPACITY) { return objects_query_opacity (list, style); @@ -1829,6 +1881,9 @@ sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query) int result_strokemiterlimit = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_STROKEMITERLIMIT); int result_strokecap = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_STROKECAP); int result_strokejoin = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_STROKEJOIN); + + int result_paintorder = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_PAINTORDER); + int result_opacity = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_MASTEROPACITY); int result_blur = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_BLUR); @@ -1842,6 +1897,7 @@ sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query) result_strokemiterlimit != QUERY_STYLE_NOTHING || result_strokecap != QUERY_STYLE_NOTHING || result_strokejoin != QUERY_STYLE_NOTHING || + result_paintorder != QUERY_STYLE_NOTHING || result_blur != QUERY_STYLE_NOTHING); } diff --git a/src/desktop-style.h b/src/desktop-style.h index bf05adadf..f3d6775a4 100644 --- a/src/desktop-style.h +++ b/src/desktop-style.h @@ -43,6 +43,7 @@ enum { // which property was queried (add when you need more) QUERY_STYLE_PROPERTY_STROKEJOIN, // stroke join QUERY_STYLE_PROPERTY_STROKECAP, // stroke cap QUERY_STYLE_PROPERTY_STROKESTYLE, // markers, dasharray, miterlimit, stroke-width, stroke-cap, stroke-join + QUERY_STYLE_PROPERTY_PAINTORDER, // paint-order QUERY_STYLE_PROPERTY_FONT_SPECIFICATION, //-inkscape-font-specification QUERY_STYLE_PROPERTY_FONTFAMILY, // font-family QUERY_STYLE_PROPERTY_FONTSTYLE, // font style diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 43dffec56..e1e5ecc17 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -381,6 +381,46 @@ StrokeStyle::StrokeStyle() : hb->pack_start(*endMarkerCombo, true, true, 0); + i++; + + /* Paint order */ + // TRANSLATORS: Paint order determines the order the 'fill', 'stroke', and 'markers are painted. + spw_label(table, _("Order:"), 0, i, NULL); + + hb = spw_hbox(table, 4, 1, i); + + Gtk::RadioButtonGroup paintOrderGrp; + + paintOrderFSM = makeRadioButton(paintOrderGrp, INKSCAPE_ICON("paint-order-fsm"), + hb, STROKE_STYLE_BUTTON_ORDER, "normal"); + paintOrderFSM->set_tooltip_text(_("Fill, Stroke, Markers")); + + paintOrderSFM = makeRadioButton(paintOrderGrp, INKSCAPE_ICON("paint-order-sfm"), + hb, STROKE_STYLE_BUTTON_ORDER, "stroke fill markers"); + paintOrderSFM->set_tooltip_text(_("Stroke, Fill, Markers")); + + paintOrderFMS = makeRadioButton(paintOrderGrp, INKSCAPE_ICON("paint-order-fms"), + hb, STROKE_STYLE_BUTTON_ORDER, "fill markers stroke"); + paintOrderFMS->set_tooltip_text(_("Fill, Markers, Stroke")); + + i++; + + hb = spw_hbox(table, 4, 1, i); + + paintOrderMFS = makeRadioButton(paintOrderGrp, INKSCAPE_ICON("paint-order-mfs"), + hb, STROKE_STYLE_BUTTON_ORDER, "markers fill stroke"); + paintOrderMFS->set_tooltip_text(_("Markers, Fill, Stroke")); + + paintOrderSMF = makeRadioButton(paintOrderGrp, INKSCAPE_ICON("paint-order-smf"), + hb, STROKE_STYLE_BUTTON_ORDER, "stroke markers fill"); + paintOrderSMF->set_tooltip_text(_("Stroke, Markers, Fill")); + + paintOrderMSF = makeRadioButton(paintOrderGrp, INKSCAPE_ICON("paint-order-msf"), + hb, STROKE_STYLE_BUTTON_ORDER, "markers stroke fill"); + paintOrderMSF->set_tooltip_text(_("Markers, Stroke, Fill")); + + i++; + setDesktop(desktop); updateLine(); @@ -801,6 +841,43 @@ StrokeStyle::setCapType (unsigned const captype) setCapButtons(tb); } +/** + * Sets the cap type for a line, and updates the stroke style widget's buttons + */ +void +StrokeStyle::setPaintOrder (gchar const *paint_order) +{ + Gtk::RadioButton *tb = paintOrderFSM; + + SPIPaintOrder temp; + temp.read( paint_order ); + + if (temp.layer[0] != SP_CSS_PAINT_ORDER_NORMAL) { + + if (temp.layer[0] == SP_CSS_PAINT_ORDER_FILL) { + if (temp.layer[1] == SP_CSS_PAINT_ORDER_STROKE) { + tb = paintOrderFSM; + } else { + tb = paintOrderFMS; + } + } else if (temp.layer[0] == SP_CSS_PAINT_ORDER_STROKE) { + if (temp.layer[1] == SP_CSS_PAINT_ORDER_FILL) { + tb = paintOrderSFM; + } else { + tb = paintOrderSMF; + } + } else { + if (temp.layer[1] == SP_CSS_PAINT_ORDER_STROKE) { + tb = paintOrderMSF; + } else { + tb = paintOrderMFS; + } + } + + } + setPaintOrderButtons(tb); +} + /** * Callback for when stroke style widget is updated, including markers, cap type, * join type, etc. @@ -825,6 +902,9 @@ StrokeStyle::updateLine() int result_ml = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_STROKEMITERLIMIT); int result_cap = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_STROKECAP); int result_join = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_STROKEJOIN); + + int result_order = sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_PAINTORDER); + SPIPaint &targPaint = (kind == FILL) ? query.fill : query.stroke; if (!sel || sel->isEmpty()) { @@ -902,6 +982,13 @@ StrokeStyle::updateLine() setCapButtons(NULL); } + if (result_order != QUERY_STYLE_MULTIPLE_DIFFERENT && + result_order != QUERY_STYLE_NOTHING ) { + setPaintOrder (query.paint_order.value); + } else { + setPaintOrder (NULL); + } + if (!sel || sel->isEmpty()) return; @@ -1109,6 +1196,11 @@ void StrokeStyle::buttonToggledCB(StrokeStyleButton *tb, StrokeStyle *spw) sp_repr_css_set_property(css, "stroke-linecap", tb->get_stroke_style()); sp_desktop_set_style (spw->desktop, css); spw->setCapButtons(tb); + break; + case STROKE_STYLE_BUTTON_ORDER: + sp_repr_css_set_property(css, "paint-order", tb->get_stroke_style()); + sp_desktop_set_style (spw->desktop, css); + //spw->setPaintButtons(tb); } sp_repr_css_attr_unref(css); @@ -1142,6 +1234,21 @@ StrokeStyle::setCapButtons(Gtk::ToggleButton *active) } +/** + * Updates the paint order style toggle buttons + */ +void +StrokeStyle::setPaintOrderButtons(Gtk::ToggleButton *active) +{ + paintOrderFSM->set_active(active == paintOrderFSM); + paintOrderSFM->set_active(active == paintOrderSFM); + paintOrderFMS->set_active(active == paintOrderFMS); + paintOrderMFS->set_active(active == paintOrderMFS); + paintOrderSMF->set_active(active == paintOrderSMF); + paintOrderMSF->set_active(active == paintOrderMSF); +} + + /** * Updates the marker combobox to highlight the appropriate marker and scroll to * that marker. diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index 2605e1acf..d83067a4a 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -127,7 +127,8 @@ private: /** List of valid types for the stroke-style radio-button widget */ enum StrokeStyleButtonType { STROKE_STYLE_BUTTON_JOIN, ///< A button to set the line-join style - STROKE_STYLE_BUTTON_CAP ///< A button to set the line-cap style + STROKE_STYLE_BUTTON_CAP, ///< A button to set the line-cap style + STROKE_STYLE_BUTTON_ORDER ///< A button to set the paint-order style }; /** @@ -158,8 +159,10 @@ private: void setDashSelectorFromStyle(SPDashSelector *dsel, SPStyle *style); void setJoinType (unsigned const jointype); void setCapType (unsigned const captype); + void setPaintOrder (gchar const *paint_order); void setJoinButtons(Gtk::ToggleButton *active); void setCapButtons(Gtk::ToggleButton *active); + void setPaintOrderButtons(Gtk::ToggleButton *active); void scaleLine(); void setScaledDash(SPCSSAttr *css, int ndash, double *dash, double offset, double scale); void setMarkerColor(SPObject *marker, int loc, SPItem *item); @@ -204,6 +207,12 @@ private: StrokeStyleButton *capButt; StrokeStyleButton *capRound; StrokeStyleButton *capSquare; + StrokeStyleButton *paintOrderFSM; + StrokeStyleButton *paintOrderSFM; + StrokeStyleButton *paintOrderFMS; + StrokeStyleButton *paintOrderMFS; + StrokeStyleButton *paintOrderSMF; + StrokeStyleButton *paintOrderMSF; SPDashSelector *dashSelector; gboolean update; -- cgit v1.2.3 From e0d7f04457c7ed18b5f4df751f66e40ad8ab18a9 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Mon, 7 Mar 2016 20:23:26 -0500 Subject: Re-order the stroke dialog so buttons are collected and miter is inline. (bzr r14694) --- src/widgets/stroke-style.cpp | 142 +++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 73 deletions(-) diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index e1e5ecc17..84a6e77ad 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -221,6 +221,67 @@ StrokeStyle::StrokeStyle() : #endif i++; + /* Dash */ + spw_label(table, _("Dashes:"), 0, i, NULL); //no mnemonic for now + //decide what to do: + // implement a set_mnemonic_source function in the + // SPDashSelector class, so that we do not have to + // expose any of the underlying widgets? + dashSelector = Gtk::manage(new SPDashSelector); + + dashSelector->show(); + +#if WITH_GTKMM_3_0 + dashSelector->set_hexpand(); + dashSelector->set_halign(Gtk::ALIGN_FILL); + dashSelector->set_valign(Gtk::ALIGN_CENTER); + table->attach(*dashSelector, 1, i, 3, 1); +#else + table->attach(*dashSelector, 1, 4, i, i+1, (Gtk::EXPAND | Gtk::FILL), static_cast(0), 0, 0); +#endif + + dashSelector->changed_signal.connect(sigc::mem_fun(*this, &StrokeStyle::lineDashChangedCB)); + + i++; + + /* Drop down marker selectors*/ + // TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes + // (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. + + spw_label(table, _("Markers:"), 0, i, NULL); + + hb = spw_hbox(table, 1, 1, i); + i++; + + startMarkerCombo = Gtk::manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START)); + startMarkerCombo->set_tooltip_text(_("Start Markers are drawn on the first node of a path or shape")); + startMarkerConn = startMarkerCombo->signal_changed().connect( + sigc::bind( + sigc::ptr_fun(&StrokeStyle::markerSelectCB), startMarkerCombo, this, SP_MARKER_LOC_START)); + startMarkerCombo->show(); + + hb->pack_start(*startMarkerCombo, true, true, 0); + + midMarkerCombo = Gtk::manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID)); + midMarkerCombo->set_tooltip_text(_("Mid Markers are drawn on every node of a path or shape except the first and last nodes")); + midMarkerConn = midMarkerCombo->signal_changed().connect( + sigc::bind( + sigc::ptr_fun(&StrokeStyle::markerSelectCB), midMarkerCombo, this, SP_MARKER_LOC_MID)); + midMarkerCombo->show(); + + hb->pack_start(*midMarkerCombo, true, true, 0); + + endMarkerCombo = Gtk::manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END)); + endMarkerCombo->set_tooltip_text(_("End Markers are drawn on the last node of a path or shape")); + endMarkerConn = endMarkerCombo->signal_changed().connect( + sigc::bind( + sigc::ptr_fun(&StrokeStyle::markerSelectCB), endMarkerCombo, this, SP_MARKER_LOC_END)); + endMarkerCombo->show(); + + hb->pack_start(*endMarkerCombo, true, true, 0); + + i++; + /* Join type */ // TRANSLATORS: The line join style specifies the shape to be used at the // corners of paths. It can be "miter", "round" or "bevel". @@ -230,14 +291,6 @@ StrokeStyle::StrokeStyle() : Gtk::RadioButtonGroup joinGrp; - joinMiter = makeRadioButton(joinGrp, INKSCAPE_ICON("stroke-join-miter"), - hb, STROKE_STYLE_BUTTON_JOIN, "miter"); - - // TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. - // For an example, draw a triangle with a large stroke width and modify the - // "Join" option (in the Fill and Stroke dialog). - joinMiter->set_tooltip_text(_("Miter join")); - joinRound = makeRadioButton(joinGrp, INKSCAPE_ICON("stroke-join-round"), hb, STROKE_STYLE_BUTTON_JOIN, "round"); @@ -254,7 +307,13 @@ StrokeStyle::StrokeStyle() : // "Join" option (in the Fill and Stroke dialog). joinBevel->set_tooltip_text(_("Bevel join")); - i++; + joinMiter = makeRadioButton(joinGrp, INKSCAPE_ICON("stroke-join-miter"), + hb, STROKE_STYLE_BUTTON_JOIN, "miter"); + + // TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. + // For an example, draw a triangle with a large stroke width and modify the + // "Join" option (in the Fill and Stroke dialog). + joinMiter->set_tooltip_text(_("Miter join")); /* Miterlimit */ // TRANSLATORS: Miter limit: only for "miter join", this limits the length @@ -265,8 +324,6 @@ StrokeStyle::StrokeStyle() : // when they become too long. //spw_label(t, _("Miter _limit:"), 0, i); - hb = spw_hbox(table, 3, 1, i); - #if WITH_GTKMM_3_0 miterLimitAdj = new Glib::RefPtr(Gtk::Adjustment::create(4.0, 0.0, 100.0, 0.1, 10.0, 0.0)); miterLimitSpin = new Inkscape::UI::Widget::SpinButton(*miterLimitAdj, 0.1, 2); @@ -277,7 +334,6 @@ StrokeStyle::StrokeStyle() : miterLimitSpin->set_tooltip_text(_("Maximum length of the miter (in units of stroke width)")); miterLimitSpin->show(); - spw_label(table, _("Miter _limit:"), 0, i, miterLimitSpin); sp_dialog_defocus_on_enter_cpp(miterLimitSpin); hb->pack_start(*miterLimitSpin, false, false, 0); @@ -288,6 +344,7 @@ StrokeStyle::StrokeStyle() : #else miterLimitAdj->signal_value_changed().connect(sigc::mem_fun(*this, &StrokeStyle::miterLimitChangedCB)); #endif + i++; /* Cap type */ @@ -322,67 +379,6 @@ StrokeStyle::StrokeStyle() : i++; - /* Dash */ - spw_label(table, _("Dashes:"), 0, i, NULL); //no mnemonic for now - //decide what to do: - // implement a set_mnemonic_source function in the - // SPDashSelector class, so that we do not have to - // expose any of the underlying widgets? - dashSelector = Gtk::manage(new SPDashSelector); - - dashSelector->show(); - -#if WITH_GTKMM_3_0 - dashSelector->set_hexpand(); - dashSelector->set_halign(Gtk::ALIGN_FILL); - dashSelector->set_valign(Gtk::ALIGN_CENTER); - table->attach(*dashSelector, 1, i, 3, 1); -#else - table->attach(*dashSelector, 1, 4, i, i+1, (Gtk::EXPAND | Gtk::FILL), static_cast(0), 0, 0); -#endif - - dashSelector->changed_signal.connect(sigc::mem_fun(*this, &StrokeStyle::lineDashChangedCB)); - - i++; - - /* Drop down marker selectors*/ - // TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes - // (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. - - spw_label(table, _("Markers:"), 0, i, NULL); - - hb = spw_hbox(table, 1, 1, i); - i++; - - startMarkerCombo = Gtk::manage(new MarkerComboBox("marker-start", SP_MARKER_LOC_START)); - startMarkerCombo->set_tooltip_text(_("Start Markers are drawn on the first node of a path or shape")); - startMarkerConn = startMarkerCombo->signal_changed().connect( - sigc::bind( - sigc::ptr_fun(&StrokeStyle::markerSelectCB), startMarkerCombo, this, SP_MARKER_LOC_START)); - startMarkerCombo->show(); - - hb->pack_start(*startMarkerCombo, true, true, 0); - - midMarkerCombo = Gtk::manage(new MarkerComboBox("marker-mid", SP_MARKER_LOC_MID)); - midMarkerCombo->set_tooltip_text(_("Mid Markers are drawn on every node of a path or shape except the first and last nodes")); - midMarkerConn = midMarkerCombo->signal_changed().connect( - sigc::bind( - sigc::ptr_fun(&StrokeStyle::markerSelectCB), midMarkerCombo, this, SP_MARKER_LOC_MID)); - midMarkerCombo->show(); - - hb->pack_start(*midMarkerCombo, true, true, 0); - - endMarkerCombo = Gtk::manage(new MarkerComboBox("marker-end", SP_MARKER_LOC_END)); - endMarkerCombo->set_tooltip_text(_("End Markers are drawn on the last node of a path or shape")); - endMarkerConn = endMarkerCombo->signal_changed().connect( - sigc::bind( - sigc::ptr_fun(&StrokeStyle::markerSelectCB), endMarkerCombo, this, SP_MARKER_LOC_END)); - endMarkerCombo->show(); - - hb->pack_start(*endMarkerCombo, true, true, 0); - - i++; - /* Paint order */ // TRANSLATORS: Paint order determines the order the 'fill', 'stroke', and 'markers are painted. spw_label(table, _("Order:"), 0, i, NULL); -- cgit v1.2.3 From 9855e957ca6619d9cc7a88a9dcb5bb256961d7ba Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Tue, 8 Mar 2016 14:39:08 +0100 Subject: Translations. PO template updated. (bzr r14695) --- po/inkscape.pot | 2871 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 1480 insertions(+), 1391 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index 4f266eccf..69e849a2c 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-02-14 00:09+0100\n" +"POT-Creation-Date: 2016-03-08 14:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -318,7 +318,7 @@ msgstr "" #. Pencil #: ../share/filters/filters.svg.h:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:424 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 msgid "Pencil" msgstr "" @@ -1101,7 +1101,7 @@ msgstr "" #: ../share/extensions/color_morelight.inx.h:2 #: ../share/extensions/color_moresaturation.inx.h:2 #: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_randomize.inx.h:14 #: ../share/extensions/color_removeblue.inx.h:2 #: ../share/extensions/color_removegreen.inx.h:2 #: ../share/extensions/color_removered.inx.h:2 @@ -3333,1032 +3333,1032 @@ msgstr "" msgid "Old paint (bitmap)" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:2 msgctxt "Symbol" -msgid "United States National Park Service Map Symbols" +msgid "AIGA Symbol Signs" msgstr "" +#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 +#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 msgctxt "Symbol" -msgid "Airport" +msgid "Telephone" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6 msgctxt "Symbol" -msgid "Amphitheatre" +msgid "Mail" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 msgctxt "Symbol" -msgid "Bicycle Trail" +msgid "Currency Exchange" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 msgctxt "Symbol" -msgid "Boat Launch" +msgid "Currency Exchange - Euro" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 msgctxt "Symbol" -msgid "Boat Tour" +msgid "Cashier" msgstr "" +#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 +#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 msgctxt "Symbol" -msgid "Bus Stop" +msgid "First Aid" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 msgctxt "Symbol" -msgid "Campfire" +msgid "Lost and Found" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 msgctxt "Symbol" -msgid "Campground" +msgid "Coat Check" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 msgctxt "Symbol" -msgid "CanoeAccess" +msgid "Baggage Lockers" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 msgctxt "Symbol" -msgid "Crosscountry Ski Trail" +msgid "Escalator" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 msgctxt "Symbol" -msgid "Downhill Skiing" +msgid "Escalator Down" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 msgctxt "Symbol" -msgid "Drinking Water" +msgid "Escalator Up" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 -#: ../share/symbols/symbols.h:172 ../share/symbols/symbols.h:173 msgctxt "Symbol" -msgid "First Aid" +msgid "Stairs" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 msgctxt "Symbol" -msgid "Fishing" +msgid "Stairs Down" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 msgctxt "Symbol" -msgid "Food Service" +msgid "Stairs Up" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 msgctxt "Symbol" -msgid "Four Wheel Drive Road" +msgid "Elevator" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 msgctxt "Symbol" -msgid "Gas Station" +msgid "Toilets - Men" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 msgctxt "Symbol" -msgid "Golfing" +msgid "Toilets - Women" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 msgctxt "Symbol" -msgid "Horseback Riding" +msgid "Toilets" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 msgctxt "Symbol" -msgid "Hospital" +msgid "Nursery" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 msgctxt "Symbol" -msgid "Ice Skating" +msgid "Drinking Fountain" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 -#: ../share/symbols/symbols.h:206 ../share/symbols/symbols.h:207 msgctxt "Symbol" -msgid "Information" +msgid "Waiting Room" msgstr "" +#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 +#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 msgctxt "Symbol" -msgid "Litter Receptacle" +msgid "Information" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 msgctxt "Symbol" -msgid "Lodging" +msgid "Hotel Information" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 msgctxt "Symbol" -msgid "Marina" +msgid "Air Transportation" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 msgctxt "Symbol" -msgid "Motorbike Trail" +msgid "Heliport" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 msgctxt "Symbol" -msgid "Radiator Water" +msgid "Taxi" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58 msgctxt "Symbol" -msgid "Recycling" +msgid "Bus" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60 -#: ../share/symbols/symbols.h:258 ../share/symbols/symbols.h:259 msgctxt "Symbol" -msgid "Parking" +msgid "Ground Transportation" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62 msgctxt "Symbol" -msgid "Pets On Leash" +msgid "Rail Transportation" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64 msgctxt "Symbol" -msgid "Picnic Area" +msgid "Water Transportation" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 msgctxt "Symbol" -msgid "Post Office" +msgid "Car Rental" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 msgctxt "Symbol" -msgid "Ranger Station" +msgid "Restaurant" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70 msgctxt "Symbol" -msgid "RV Campground" +msgid "Coffeeshop" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72 msgctxt "Symbol" -msgid "Restrooms" +msgid "Bar" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74 msgctxt "Symbol" -msgid "Sailing" +msgid "Shops" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 msgctxt "Symbol" -msgid "Sanitary Disposal Station" +msgid "Barber Shop - Beauty Salon" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 msgctxt "Symbol" -msgid "Scuba Diving" +msgid "Barber Shop" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 msgctxt "Symbol" -msgid "Self Guided Trail" +msgid "Beauty Salon" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82 msgctxt "Symbol" -msgid "Shelter" +msgid "Ticket Purchase" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 msgctxt "Symbol" -msgid "Showers" +msgid "Baggage Check In" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 msgctxt "Symbol" -msgid "Sledding" +msgid "Baggage Claim" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88 msgctxt "Symbol" -msgid "SnowmobileTrail" +msgid "Customs" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 msgctxt "Symbol" -msgid "Stable" +msgid "Immigration" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 msgctxt "Symbol" -msgid "Store" +msgid "Departing Flights" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94 msgctxt "Symbol" -msgid "Swimming" +msgid "Arriving Flights" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96 -#: ../share/symbols/symbols.h:162 ../share/symbols/symbols.h:163 msgctxt "Symbol" -msgid "Telephone" +msgid "Smoking" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98 msgctxt "Symbol" -msgid "Emergency Telephone" +msgid "No Smoking" msgstr "" +#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 +#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 msgctxt "Symbol" -msgid "Trailhead" +msgid "Parking" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 msgctxt "Symbol" -msgid "Wheelchair Accessible" +msgid "No Parking" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg +#. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 msgctxt "Symbol" -msgid "Wind Surfing" +msgid "No Dogs" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:105 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 msgctxt "Symbol" -msgid "Blank" +msgid "No Entry" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:106 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 msgctxt "Symbol" -msgid "Flow Chart Shapes" +msgid "Exit" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:107 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110 msgctxt "Symbol" -msgid "Process" +msgid "Fire Extinguisher" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:108 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112 msgctxt "Symbol" -msgid "Input/Output" +msgid "Right Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:109 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 msgctxt "Symbol" -msgid "Document" +msgid "Forward and Right Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:110 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 msgctxt "Symbol" -msgid "Manual Operation" +msgid "Up Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:111 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 msgctxt "Symbol" -msgid "Preparation" +msgid "Forward and Left Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:112 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 msgctxt "Symbol" -msgid "Merge" +msgid "Left Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:113 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 msgctxt "Symbol" -msgid "Decision" +msgid "Left and Down Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:114 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 msgctxt "Symbol" -msgid "Magnetic Tape" +msgid "Down Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:115 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 msgctxt "Symbol" -msgid "Display" +msgid "Right and Down Arrow" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:116 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 msgctxt "Symbol" -msgid "Auxiliary Operation" +msgid "NPS Wheelchair Accessible - 1996" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:117 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 msgctxt "Symbol" -msgid "Manual Input" +msgid "NPS Wheelchair Accessible" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:118 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132 msgctxt "Symbol" -msgid "Extract" +msgid "New Wheelchair Accessible" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:119 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:133 msgctxt "Symbol" -msgid "Terminal/Interrupt" +msgid "Word Balloons" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:120 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:134 msgctxt "Symbol" -msgid "Punched Card" +msgid "Thought Balloon" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:121 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:135 msgctxt "Symbol" -msgid "Punch Tape" +msgid "Dream Speaking" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:122 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:136 msgctxt "Symbol" -msgid "Online Storage" +msgid "Rounded Balloon" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:123 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:137 msgctxt "Symbol" -msgid "Keying" +msgid "Squared Balloon" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:124 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:138 msgctxt "Symbol" -msgid "Sort" +msgid "Over the Phone" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:125 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:139 msgctxt "Symbol" -msgid "Connector" +msgid "Hip Balloon" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:126 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:140 msgctxt "Symbol" -msgid "Off-Page Connector" +msgid "Circle Balloon" msgstr "" -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:127 +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:141 msgctxt "Symbol" -msgid "Transmittal Tape" +msgid "Exclaim Balloon" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:128 +#: ../share/symbols/symbols.h:142 msgctxt "Symbol" -msgid "Communication Link" +msgid "Flow Chart Shapes" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:129 +#: ../share/symbols/symbols.h:143 msgctxt "Symbol" -msgid "Collate" +msgid "Process" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:130 +#: ../share/symbols/symbols.h:144 msgctxt "Symbol" -msgid "Comment/Annotation" +msgid "Input/Output" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:131 +#: ../share/symbols/symbols.h:145 msgctxt "Symbol" -msgid "Core" +msgid "Document" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:132 +#: ../share/symbols/symbols.h:146 msgctxt "Symbol" -msgid "Predefined Process" +msgid "Manual Operation" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:133 +#: ../share/symbols/symbols.h:147 msgctxt "Symbol" -msgid "Magnetic Disk (Database)" +msgid "Preparation" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:134 +#: ../share/symbols/symbols.h:148 msgctxt "Symbol" -msgid "Magnetic Drum (Direct Access)" +msgid "Merge" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:135 +#: ../share/symbols/symbols.h:149 msgctxt "Symbol" -msgid "Offline Storage" +msgid "Decision" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:136 +#: ../share/symbols/symbols.h:150 msgctxt "Symbol" -msgid "Logical Or" +msgid "Magnetic Tape" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:137 +#: ../share/symbols/symbols.h:151 msgctxt "Symbol" -msgid "Logical And" +msgid "Display" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:138 +#: ../share/symbols/symbols.h:152 msgctxt "Symbol" -msgid "Delay" +msgid "Auxiliary Operation" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:139 +#: ../share/symbols/symbols.h:153 msgctxt "Symbol" -msgid "Loop Limit Begin" +msgid "Manual Input" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:140 +#: ../share/symbols/symbols.h:154 msgctxt "Symbol" -msgid "Loop Limit End" +msgid "Extract" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:141 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:155 msgctxt "Symbol" -msgid "Word Balloons" +msgid "Terminal/Interrupt" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:142 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:156 msgctxt "Symbol" -msgid "Thought Balloon" +msgid "Punched Card" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:143 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:157 msgctxt "Symbol" -msgid "Dream Speaking" +msgid "Punch Tape" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:144 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:158 msgctxt "Symbol" -msgid "Rounded Balloon" +msgid "Online Storage" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:145 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:159 msgctxt "Symbol" -msgid "Squared Balloon" +msgid "Keying" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:146 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:160 msgctxt "Symbol" -msgid "Over the Phone" +msgid "Sort" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:147 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:161 msgctxt "Symbol" -msgid "Hip Balloon" +msgid "Connector" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:148 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:162 msgctxt "Symbol" -msgid "Circle Balloon" +msgid "Off-Page Connector" msgstr "" -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:149 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:163 msgctxt "Symbol" -msgid "Exclaim Balloon" +msgid "Transmittal Tape" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:150 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:164 msgctxt "Symbol" -msgid "Logic Symbols" +msgid "Communication Link" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:151 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:165 msgctxt "Symbol" -msgid "Xnor Gate" +msgid "Collate" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:152 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:166 msgctxt "Symbol" -msgid "Xor Gate" +msgid "Comment/Annotation" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:153 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:167 msgctxt "Symbol" -msgid "Nor Gate" +msgid "Core" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:154 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:168 msgctxt "Symbol" -msgid "Or Gate" +msgid "Predefined Process" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:155 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:169 msgctxt "Symbol" -msgid "Nand Gate" +msgid "Magnetic Disk (Database)" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:156 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:170 msgctxt "Symbol" -msgid "And Gate" +msgid "Magnetic Drum (Direct Access)" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:157 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:171 msgctxt "Symbol" -msgid "Buffer" +msgid "Offline Storage" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:158 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:172 msgctxt "Symbol" -msgid "Not Gate" +msgid "Logical Or" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:159 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:173 msgctxt "Symbol" -msgid "Buffer Small" +msgid "Logical And" msgstr "" -#. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:160 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:174 msgctxt "Symbol" -msgid "Not Gate Small" +msgid "Delay" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:161 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:175 msgctxt "Symbol" -msgid "AIGA Symbol Signs" +msgid "Loop Limit Begin" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:164 ../share/symbols/symbols.h:165 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:176 msgctxt "Symbol" -msgid "Mail" +msgid "Loop Limit End" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:166 ../share/symbols/symbols.h:167 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:177 msgctxt "Symbol" -msgid "Currency Exchange" +msgid "Logic Symbols" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:168 ../share/symbols/symbols.h:169 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:178 msgctxt "Symbol" -msgid "Currency Exchange - Euro" +msgid "Xnor Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:170 ../share/symbols/symbols.h:171 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:179 msgctxt "Symbol" -msgid "Cashier" +msgid "Xor Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:174 ../share/symbols/symbols.h:175 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:180 msgctxt "Symbol" -msgid "Lost and Found" +msgid "Nor Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:176 ../share/symbols/symbols.h:177 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:181 msgctxt "Symbol" -msgid "Coat Check" +msgid "Or Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:178 ../share/symbols/symbols.h:179 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:182 msgctxt "Symbol" -msgid "Baggage Lockers" +msgid "Nand Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:180 ../share/symbols/symbols.h:181 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:183 msgctxt "Symbol" -msgid "Escalator" +msgid "And Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:182 ../share/symbols/symbols.h:183 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:184 msgctxt "Symbol" -msgid "Escalator Down" +msgid "Buffer" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:184 ../share/symbols/symbols.h:185 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:185 msgctxt "Symbol" -msgid "Escalator Up" +msgid "Not Gate" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:186 ../share/symbols/symbols.h:187 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:186 msgctxt "Symbol" -msgid "Stairs" +msgid "Buffer Small" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:188 ../share/symbols/symbols.h:189 +#. Symbols: ./LogicSymbols.svg +#: ../share/symbols/symbols.h:187 msgctxt "Symbol" -msgid "Stairs Down" +msgid "Not Gate Small" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:190 ../share/symbols/symbols.h:191 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:188 msgctxt "Symbol" -msgid "Stairs Up" +msgid "United States National Park Service Map Symbols" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:192 ../share/symbols/symbols.h:193 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 msgctxt "Symbol" -msgid "Elevator" +msgid "Airport" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:194 ../share/symbols/symbols.h:195 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 msgctxt "Symbol" -msgid "Toilets - Men" +msgid "Amphitheatre" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:196 ../share/symbols/symbols.h:197 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 msgctxt "Symbol" -msgid "Toilets - Women" +msgid "Bicycle Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:198 ../share/symbols/symbols.h:199 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 msgctxt "Symbol" -msgid "Toilets" +msgid "Boat Launch" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:200 ../share/symbols/symbols.h:201 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 msgctxt "Symbol" -msgid "Nursery" +msgid "Boat Tour" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:202 ../share/symbols/symbols.h:203 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 msgctxt "Symbol" -msgid "Drinking Fountain" +msgid "Bus Stop" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:204 ../share/symbols/symbols.h:205 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 msgctxt "Symbol" -msgid "Waiting Room" +msgid "Campfire" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:208 ../share/symbols/symbols.h:209 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 msgctxt "Symbol" -msgid "Hotel Information" +msgid "Campground" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:210 ../share/symbols/symbols.h:211 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 msgctxt "Symbol" -msgid "Air Transportation" +msgid "CanoeAccess" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:212 ../share/symbols/symbols.h:213 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 msgctxt "Symbol" -msgid "Heliport" +msgid "Crosscountry Ski Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:214 ../share/symbols/symbols.h:215 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 msgctxt "Symbol" -msgid "Taxi" +msgid "Downhill Skiing" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:216 ../share/symbols/symbols.h:217 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 msgctxt "Symbol" -msgid "Bus" +msgid "Drinking Water" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:218 ../share/symbols/symbols.h:219 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 msgctxt "Symbol" -msgid "Ground Transportation" +msgid "Fishing" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:221 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 msgctxt "Symbol" -msgid "Rail Transportation" +msgid "Food Service" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:222 ../share/symbols/symbols.h:223 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220 msgctxt "Symbol" -msgid "Water Transportation" +msgid "Four Wheel Drive Road" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:224 ../share/symbols/symbols.h:225 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 msgctxt "Symbol" -msgid "Car Rental" +msgid "Gas Station" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:226 ../share/symbols/symbols.h:227 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 msgctxt "Symbol" -msgid "Restaurant" +msgid "Golfing" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:228 ../share/symbols/symbols.h:229 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 msgctxt "Symbol" -msgid "Coffeeshop" +msgid "Horseback Riding" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:230 ../share/symbols/symbols.h:231 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 msgctxt "Symbol" -msgid "Bar" +msgid "Hospital" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:232 ../share/symbols/symbols.h:233 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230 msgctxt "Symbol" -msgid "Shops" +msgid "Ice Skating" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:234 ../share/symbols/symbols.h:235 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 msgctxt "Symbol" -msgid "Barber Shop - Beauty Salon" +msgid "Litter Receptacle" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:236 ../share/symbols/symbols.h:237 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 msgctxt "Symbol" -msgid "Barber Shop" +msgid "Lodging" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:238 ../share/symbols/symbols.h:239 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 msgctxt "Symbol" -msgid "Beauty Salon" +msgid "Marina" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:240 ../share/symbols/symbols.h:241 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 msgctxt "Symbol" -msgid "Ticket Purchase" +msgid "Motorbike Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:242 ../share/symbols/symbols.h:243 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 msgctxt "Symbol" -msgid "Baggage Check In" +msgid "Radiator Water" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:244 ../share/symbols/symbols.h:245 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 msgctxt "Symbol" -msgid "Baggage Claim" +msgid "Recycling" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:246 ../share/symbols/symbols.h:247 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 msgctxt "Symbol" -msgid "Customs" +msgid "Pets On Leash" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:248 ../share/symbols/symbols.h:249 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 msgctxt "Symbol" -msgid "Immigration" +msgid "Picnic Area" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:250 ../share/symbols/symbols.h:251 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 msgctxt "Symbol" -msgid "Departing Flights" +msgid "Post Office" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:252 ../share/symbols/symbols.h:253 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 msgctxt "Symbol" -msgid "Arriving Flights" +msgid "Ranger Station" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:254 ../share/symbols/symbols.h:255 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 msgctxt "Symbol" -msgid "Smoking" +msgid "RV Campground" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:256 ../share/symbols/symbols.h:257 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 msgctxt "Symbol" -msgid "No Smoking" +msgid "Restrooms" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:260 ../share/symbols/symbols.h:261 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 msgctxt "Symbol" -msgid "No Parking" +msgid "Sailing" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:262 ../share/symbols/symbols.h:263 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 msgctxt "Symbol" -msgid "No Dogs" +msgid "Sanitary Disposal Station" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:264 ../share/symbols/symbols.h:265 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 msgctxt "Symbol" -msgid "No Entry" +msgid "Scuba Diving" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:266 ../share/symbols/symbols.h:267 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 msgctxt "Symbol" -msgid "Exit" +msgid "Self Guided Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:268 ../share/symbols/symbols.h:269 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 msgctxt "Symbol" -msgid "Fire Extinguisher" +msgid "Shelter" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:270 ../share/symbols/symbols.h:271 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 msgctxt "Symbol" -msgid "Right Arrow" +msgid "Showers" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:272 ../share/symbols/symbols.h:273 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 msgctxt "Symbol" -msgid "Forward and Right Arrow" +msgid "Sledding" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:274 ../share/symbols/symbols.h:275 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 msgctxt "Symbol" -msgid "Up Arrow" +msgid "SnowmobileTrail" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:276 ../share/symbols/symbols.h:277 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 msgctxt "Symbol" -msgid "Forward and Left Arrow" +msgid "Stable" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:278 ../share/symbols/symbols.h:279 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 msgctxt "Symbol" -msgid "Left Arrow" +msgid "Store" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:280 ../share/symbols/symbols.h:281 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 msgctxt "Symbol" -msgid "Left and Down Arrow" +msgid "Swimming" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:282 ../share/symbols/symbols.h:283 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 msgctxt "Symbol" -msgid "Down Arrow" +msgid "Emergency Telephone" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:284 ../share/symbols/symbols.h:285 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 msgctxt "Symbol" -msgid "Right and Down Arrow" +msgid "Trailhead" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:286 ../share/symbols/symbols.h:287 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288 msgctxt "Symbol" -msgid "NPS Wheelchair Accessible - 1996" +msgid "Wheelchair Accessible" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:288 ../share/symbols/symbols.h:289 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290 msgctxt "Symbol" -msgid "NPS Wheelchair Accessible" +msgid "Wind Surfing" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:290 ../share/symbols/symbols.h:291 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:291 msgctxt "Symbol" -msgid "New Wheelchair Accessible" +msgid "Blank" msgstr "" #: ../share/templates/templates.h:1 @@ -4411,7 +4411,7 @@ msgstr "" #. 3D box #: ../src/box3d.cpp:255 ../src/box3d.cpp:1309 -#: ../src/ui/dialog/inkscape-preferences.cpp:407 +#: ../src/ui/dialog/inkscape-preferences.cpp:416 msgid "3D Box" msgstr "" @@ -4472,8 +4472,8 @@ msgid "_Origin X:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:780 -#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "X coordinate of grid origin" msgstr "" @@ -4482,8 +4482,8 @@ msgid "O_rigin Y:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:781 -#: ../src/ui/dialog/inkscape-preferences.cpp:806 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Y coordinate of grid origin" msgstr "" @@ -4492,29 +4492,29 @@ msgid "Spacing _Y:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:809 +#: ../src/ui/dialog/inkscape-preferences.cpp:819 msgid "Base length of z-axis" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 +#: ../src/ui/dialog/inkscape-preferences.cpp:822 #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 +#: ../src/ui/dialog/inkscape-preferences.cpp:822 msgid "Angle of x-axis" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 msgid "Angle of z-axis" msgstr "" @@ -4523,7 +4523,7 @@ msgid "Minor grid line _color:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/ui/dialog/inkscape-preferences.cpp:774 msgid "Minor grid line color" msgstr "" @@ -4536,7 +4536,7 @@ msgid "Ma_jor grid line color:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 msgid "Major grid line color" msgstr "" @@ -4599,12 +4599,12 @@ msgid "Spacing _X:" msgstr "" #: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:796 msgid "Distance between vertical grid lines" msgstr "" #: ../src/display/canvas-grid.cpp:708 -#: ../src/ui/dialog/inkscape-preferences.cpp:787 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Distance between horizontal grid lines" msgstr "" @@ -4822,21 +4822,21 @@ msgstr "" msgid " to " msgstr "" -#: ../src/document.cpp:528 +#: ../src/document.cpp:530 #, c-format msgid "New document %d" msgstr "" -#: ../src/document.cpp:533 +#: ../src/document.cpp:535 #, c-format msgid "Memory document %d" msgstr "" -#: ../src/document.cpp:562 +#: ../src/document.cpp:564 msgid "Memory document %1" msgstr "" -#: ../src/document.cpp:870 +#: ../src/document.cpp:872 #, c-format msgid "Unnamed document %d" msgstr "" @@ -5013,7 +5013,7 @@ msgstr "" #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:297 +#: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 #: ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" @@ -5484,7 +5484,10 @@ msgstr "" msgid "Reduce Noise" msgstr "" +#. Paint order +#. TRANSLATORS: Paint order determines the order the 'fill', 'stroke', and 'markers are painted. #: ../src/extension/internal/bitmap/reduceNoise.cpp:42 +#: ../src/widgets/stroke-style.cpp:384 #: ../share/extensions/jessyInk_effects.inx.h:3 #: ../share/extensions/jessyInk_view.inx.h:3 #: ../share/extensions/lindenmayer.inx.h:5 @@ -5816,79 +5819,79 @@ msgstr "" msgid "Open presentation exchange files saved in Corel DRAW" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3581 +#: ../src/extension/internal/emf-inout.cpp:3601 msgid "EMF Input" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3586 +#: ../src/extension/internal/emf-inout.cpp:3606 msgid "Enhanced Metafiles (*.emf)" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3587 +#: ../src/extension/internal/emf-inout.cpp:3607 msgid "Enhanced Metafiles" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3595 +#: ../src/extension/internal/emf-inout.cpp:3615 msgid "EMF Output" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3597 -#: ../src/extension/internal/wmf-inout.cpp:3176 +#: ../src/extension/internal/emf-inout.cpp:3617 +#: ../src/extension/internal/wmf-inout.cpp:3196 msgid "Convert texts to paths" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3598 -#: ../src/extension/internal/wmf-inout.cpp:3177 +#: ../src/extension/internal/emf-inout.cpp:3618 +#: ../src/extension/internal/wmf-inout.cpp:3197 msgid "Map Unicode to Symbol font" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3599 -#: ../src/extension/internal/wmf-inout.cpp:3178 +#: ../src/extension/internal/emf-inout.cpp:3619 +#: ../src/extension/internal/wmf-inout.cpp:3198 msgid "Map Unicode to Wingdings" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3600 -#: ../src/extension/internal/wmf-inout.cpp:3179 +#: ../src/extension/internal/emf-inout.cpp:3620 +#: ../src/extension/internal/wmf-inout.cpp:3199 msgid "Map Unicode to Zapf Dingbats" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3601 -#: ../src/extension/internal/wmf-inout.cpp:3180 +#: ../src/extension/internal/emf-inout.cpp:3621 +#: ../src/extension/internal/wmf-inout.cpp:3200 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3602 -#: ../src/extension/internal/wmf-inout.cpp:3181 +#: ../src/extension/internal/emf-inout.cpp:3622 +#: ../src/extension/internal/wmf-inout.cpp:3201 msgid "Compensate for PPT font bug" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3603 -#: ../src/extension/internal/wmf-inout.cpp:3182 +#: ../src/extension/internal/emf-inout.cpp:3623 +#: ../src/extension/internal/wmf-inout.cpp:3202 msgid "Convert dashed/dotted lines to single lines" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3604 -#: ../src/extension/internal/wmf-inout.cpp:3183 +#: ../src/extension/internal/emf-inout.cpp:3624 +#: ../src/extension/internal/wmf-inout.cpp:3203 msgid "Convert gradients to colored polygon series" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3605 +#: ../src/extension/internal/emf-inout.cpp:3625 msgid "Use native rectangular linear gradients" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3606 +#: ../src/extension/internal/emf-inout.cpp:3626 msgid "Map all fill patterns to standard EMF hatches" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3607 +#: ../src/extension/internal/emf-inout.cpp:3627 msgid "Ignore image rotations" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3611 +#: ../src/extension/internal/emf-inout.cpp:3631 msgid "Enhanced Metafile (*.emf)" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3612 +#: ../src/extension/internal/emf-inout.cpp:3632 msgid "Enhanced Metafile" msgstr "" @@ -5974,7 +5977,7 @@ msgstr "" #: ../src/extension/internal/filter/transparency.h:214 #: ../src/extension/internal/filter/transparency.h:287 #: ../src/extension/internal/filter/transparency.h:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1795 +#: ../src/ui/dialog/inkscape-preferences.cpp:1805 #, c-format msgid "Filters" msgstr "" @@ -6185,7 +6188,7 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:697 msgid "Normal" msgstr "" @@ -6288,7 +6291,7 @@ msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:187 #: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 #: ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 +#: ../share/extensions/color_randomize.inx.h:9 msgid "Lightness" msgstr "" @@ -6311,7 +6314,7 @@ msgid "Distant" msgstr "" #: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Point" msgstr "" @@ -6484,13 +6487,13 @@ msgstr "" #: ../src/extension/internal/filter/color.h:157 #: ../src/extension/internal/filter/color.h:332 #: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 #: ../src/ui/tools/flood-tool.cpp:95 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 #: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 #: ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 +#: ../share/extensions/color_randomize.inx.h:6 msgid "Saturation" msgstr "" @@ -7355,7 +7358,7 @@ msgid "Convert image to an engraving made of vertical and horizontal lines" msgstr "" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:998 +#: ../src/ui/dialog/align-and-distribute.cpp:1041 #: ../src/widgets/desktop-widget.cpp:2049 msgid "Drawing" msgstr "" @@ -7365,7 +7368,7 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:496 #: ../src/extension/internal/filter/paint.h:590 #: ../src/extension/internal/filter/paint.h:976 -#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2197 +#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2204 msgid "Simplify" msgstr "" @@ -7436,7 +7439,7 @@ msgid "Contrasted" msgstr "" #: ../src/extension/internal/filter/paint.h:591 -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Line width" msgstr "" @@ -7648,7 +7651,7 @@ msgstr "" #: ../src/extension/internal/filter/transparency.h:59 #: ../src/ui/dialog/filter-effects-dialog.cpp:2854 -#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 +#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:133 #: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:389 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 #: ../share/extensions/triangle.inx.h:8 @@ -7714,13 +7717,13 @@ msgid "" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:196 -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1510 #, c-format msgid "Embed" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:197 ../src/sp-anchor.cpp:105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1510 #, c-format msgid "Link" msgstr "" @@ -7760,19 +7763,19 @@ msgid "" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:206 -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1517 #, c-format msgid "None (auto)" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:207 -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1517 #, c-format msgid "Smooth (optimizeQuality)" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:208 -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1517 #, c-format msgid "Blocky (optimizeSpeed)" msgstr "" @@ -7824,7 +7827,7 @@ msgid "Vertical Offset:" msgstr "" #: ../src/extension/internal/grid.cpp:214 -#: ../src/ui/dialog/inkscape-preferences.cpp:1521 +#: ../src/ui/dialog/inkscape-preferences.cpp:1531 #: ../share/extensions/draw_from_triangle.inx.h:58 #: ../share/extensions/eqtexsvg.inx.h:4 #: ../share/extensions/foldablebox.inx.h:9 @@ -7856,8 +7859,8 @@ msgstr "" #: ../src/extension/internal/grid.cpp:215 #: ../src/ui/dialog/document-properties.cpp:163 -#: ../src/ui/dialog/inkscape-preferences.cpp:821 -#: ../src/widgets/toolbox.cpp:1876 +#: ../src/ui/dialog/inkscape-preferences.cpp:831 +#: ../src/widgets/toolbox.cpp:1879 msgid "Grids" msgstr "" @@ -8160,33 +8163,33 @@ msgstr "" msgid "Microsoft Visio 2013 drawing (*.vsdx)" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3160 +#: ../src/extension/internal/wmf-inout.cpp:3180 msgid "WMF Input" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3165 +#: ../src/extension/internal/wmf-inout.cpp:3185 msgid "Windows Metafiles (*.wmf)" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3166 +#: ../src/extension/internal/wmf-inout.cpp:3186 msgid "Windows Metafiles" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3174 +#: ../src/extension/internal/wmf-inout.cpp:3194 msgid "WMF Output" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3184 +#: ../src/extension/internal/wmf-inout.cpp:3204 msgid "Map all fill patterns to standard WMF hatches" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3188 +#: ../src/extension/internal/wmf-inout.cpp:3208 #: ../share/extensions/wmf_input.inx.h:2 #: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3189 +#: ../src/extension/internal/wmf-inout.cpp:3209 msgid "Windows Metafile" msgstr "" @@ -8314,7 +8317,7 @@ msgstr "" msgid "Saving document..." msgstr "" -#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1494 +#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1504 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "" @@ -8753,7 +8756,7 @@ msgstr "" msgid "Dockitem which 'owns' this grip" msgstr "" -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:192 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:197 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 msgid "Orientation" @@ -8882,7 +8885,7 @@ msgid "" msgstr "" #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:997 +#: ../src/ui/dialog/align-and-distribute.cpp:1040 #: ../src/ui/dialog/document-properties.cpp:161 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 #: ../src/widgets/desktop-widget.cpp:2045 @@ -8897,7 +8900,7 @@ msgstr "" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 -#: ../src/ui/dialog/inkscape-preferences.cpp:1555 +#: ../src/ui/dialog/inkscape-preferences.cpp:1565 #: ../src/ui/widget/page-sizer.cpp:285 #: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 @@ -8965,7 +8968,7 @@ msgid "" "Attempt to bind to %p an already bound dock object %p (current master: %p)" msgstr "" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:230 +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:235 msgid "Position" msgstr "" @@ -9053,8 +9056,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:676 -#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:729 msgid "Floating" msgstr "" @@ -9290,31 +9293,31 @@ msgstr "" msgid "Transform by 2 points" msgstr "" -#: ../src/live_effects/effect.cpp:361 +#: ../src/live_effects/effect.cpp:362 msgid "Is visible?" msgstr "" -#: ../src/live_effects/effect.cpp:361 +#: ../src/live_effects/effect.cpp:362 msgid "" "If unchecked, the effect remains applied to the object but is temporarily " "disabled on canvas" msgstr "" -#: ../src/live_effects/effect.cpp:386 +#: ../src/live_effects/effect.cpp:387 msgid "No effect" msgstr "" -#: ../src/live_effects/effect.cpp:494 +#: ../src/live_effects/effect.cpp:495 #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "" -#: ../src/live_effects/effect.cpp:761 +#: ../src/live_effects/effect.cpp:762 #, c-format msgid "Editing parameter %s." msgstr "" -#: ../src/live_effects/effect.cpp:766 +#: ../src/live_effects/effect.cpp:767 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" @@ -9414,7 +9417,7 @@ msgstr "" msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "" -#: ../src/live_effects/lpe-bendpath.cpp:181 +#: ../src/live_effects/lpe-bendpath.cpp:178 #: ../src/live_effects/lpe-patternalongpath.cpp:278 msgid "Change the width" msgstr "" @@ -9870,7 +9873,7 @@ msgid "Beveled" msgstr "" #: ../src/live_effects/lpe-jointype.cpp:32 -#: ../src/live_effects/lpe-jointype.cpp:40 +#: ../src/live_effects/lpe-jointype.cpp:43 #: ../src/live_effects/lpe-powerstroke.cpp:167 #: ../src/live_effects/lpe-taperstroke.cpp:64 #: ../src/widgets/star-toolbar.cpp:534 @@ -9893,64 +9896,76 @@ msgstr "" msgid "Extrapolated arc" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:39 +#: ../src/live_effects/lpe-jointype.cpp:36 +msgid "Extrapolated arc Alt1" +msgstr "" + +#: ../src/live_effects/lpe-jointype.cpp:37 +msgid "Extrapolated arc Alt2" +msgstr "" + +#: ../src/live_effects/lpe-jointype.cpp:38 +msgid "Extrapolated arc Alt3" +msgstr "" + +#: ../src/live_effects/lpe-jointype.cpp:42 #: ../src/live_effects/lpe-powerstroke.cpp:149 msgid "Butt" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:41 +#: ../src/live_effects/lpe-jointype.cpp:44 #: ../src/live_effects/lpe-powerstroke.cpp:150 msgid "Square" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:42 +#: ../src/live_effects/lpe-jointype.cpp:45 #: ../src/live_effects/lpe-powerstroke.cpp:152 msgid "Peak" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Thickness of the stroke" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:52 +#: ../src/live_effects/lpe-jointype.cpp:55 msgid "Line cap" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:52 +#: ../src/live_effects/lpe-jointype.cpp:55 msgid "The end shape of the stroke" msgstr "" #. Join type #. TRANSLATORS: The line join style specifies the shape to be used at the #. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-jointype.cpp:53 +#: ../src/live_effects/lpe-jointype.cpp:56 #: ../src/live_effects/lpe-powerstroke.cpp:182 -#: ../src/widgets/stroke-style.cpp:227 +#: ../src/widgets/stroke-style.cpp:288 msgid "Join:" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:53 +#: ../src/live_effects/lpe-jointype.cpp:56 #: ../src/live_effects/lpe-powerstroke.cpp:182 msgid "Determines the shape of the path's corners" msgstr "" #. start_lean(_("Start path lean"), _("Start path lean"), "start_lean", &wr, this, 0.), #. end_lean(_("End path lean"), _("End path lean"), "end_lean", &wr, this, 0.), -#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-jointype.cpp:59 #: ../src/live_effects/lpe-powerstroke.cpp:183 #: ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Miter limit:" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-jointype.cpp:59 msgid "Maximum length of the miter join (in units of stroke width)" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:57 +#: ../src/live_effects/lpe-jointype.cpp:60 msgid "Force miter" msgstr "" -#: ../src/live_effects/lpe-jointype.cpp:57 +#: ../src/live_effects/lpe-jointype.cpp:60 msgid "Overrides the miter limit and forces a join." msgstr "" @@ -10236,16 +10251,16 @@ msgid "" "axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:238 +#: ../src/live_effects/lpe-lattice2.cpp:239 msgid "Reset grid" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:270 -#: ../src/live_effects/lpe-lattice2.cpp:285 +#: ../src/live_effects/lpe-lattice2.cpp:271 +#: ../src/live_effects/lpe-lattice2.cpp:286 msgid "Show Points" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:283 +#: ../src/live_effects/lpe-lattice2.cpp:284 msgid "Hide Points" msgstr "" @@ -10391,7 +10406,7 @@ msgstr "" msgid "Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-perspective-envelope.cpp:268 +#: ../src/live_effects/lpe-perspective-envelope.cpp:269 msgid "Handles:" msgstr "" @@ -10445,7 +10460,7 @@ msgid "Determines the shape of the path's start" msgstr "" #: ../src/live_effects/lpe-powerstroke.cpp:183 -#: ../src/widgets/stroke-style.cpp:278 +#: ../src/widgets/stroke-style.cpp:335 msgid "Maximum length of the miter (in units of stroke width)" msgstr "" @@ -10707,19 +10722,19 @@ msgstr "" msgid "For use with spray tool in copy mode" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:123 +#: ../src/live_effects/lpe-roughen.cpp:121 msgid "Add nodes Subdivide each segment" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:132 +#: ../src/live_effects/lpe-roughen.cpp:130 msgid "Jitter nodes Move nodes/handles" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:141 +#: ../src/live_effects/lpe-roughen.cpp:139 msgid "Extra roughen Add a extra layer of rough" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:150 +#: ../src/live_effects/lpe-roughen.cpp:148 msgid "Options Modify options to rough" msgstr "" @@ -10774,7 +10789,7 @@ msgstr "" msgid "Unit:" msgstr "" -#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:202 +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:207 msgid "Unit" msgstr "" @@ -11151,12 +11166,12 @@ msgstr "" msgid "Rotation helper size" msgstr "" -#: ../src/live_effects/lpe-transform_2pts.cpp:197 +#: ../src/live_effects/lpe-transform_2pts.cpp:196 msgid "Change index of knot" msgstr "" -#: ../src/live_effects/lpe-transform_2pts.cpp:350 -#: ../src/ui/dialog/inkscape-preferences.cpp:1612 +#: ../src/live_effects/lpe-transform_2pts.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1622 #: ../src/ui/dialog/pixelartdialog.cpp:296 #: ../src/ui/dialog/svg-fonts-dialog.cpp:699 #: ../src/ui/dialog/tracedialog.cpp:813 @@ -11456,7 +11471,7 @@ msgid "The ID of the object to export" msgstr "" #: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1558 +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 msgid "ID" msgstr "" @@ -11755,43 +11770,43 @@ msgstr "" msgid "Breaking apart paths..." msgstr "" -#: ../src/path-chemistry.cpp:287 +#: ../src/path-chemistry.cpp:288 msgid "Break apart" msgstr "" -#: ../src/path-chemistry.cpp:289 +#: ../src/path-chemistry.cpp:291 msgid "No path(s) to break apart in the selection." msgstr "" -#: ../src/path-chemistry.cpp:299 +#: ../src/path-chemistry.cpp:301 msgid "Select object(s) to convert to path." msgstr "" -#: ../src/path-chemistry.cpp:305 +#: ../src/path-chemistry.cpp:307 msgid "Converting objects to paths..." msgstr "" -#: ../src/path-chemistry.cpp:324 +#: ../src/path-chemistry.cpp:326 msgid "Object to path" msgstr "" -#: ../src/path-chemistry.cpp:326 +#: ../src/path-chemistry.cpp:328 msgid "No objects to convert to path in the selection." msgstr "" -#: ../src/path-chemistry.cpp:613 +#: ../src/path-chemistry.cpp:615 msgid "Select path(s) to reverse." msgstr "" -#: ../src/path-chemistry.cpp:622 +#: ../src/path-chemistry.cpp:624 msgid "Reversing paths..." msgstr "" -#: ../src/path-chemistry.cpp:657 +#: ../src/path-chemistry.cpp:659 msgid "Reverse path" msgstr "" -#: ../src/path-chemistry.cpp:659 +#: ../src/path-chemistry.cpp:661 msgid "No paths to reverse in the selection." msgstr "" @@ -11989,7 +12004,7 @@ msgstr "" msgid "A related resource" msgstr "" -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1914 +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1924 msgid "Language:" msgstr "" @@ -12068,7 +12083,7 @@ msgstr "" #: ../src/selection-chemistry.cpp:426 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 #: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:965 -#: ../src/widgets/eraser-toolbar.cpp:93 +#: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 #: ../src/widgets/gradient-toolbar.cpp:1209 @@ -12670,7 +12685,7 @@ msgstr "" #. Ellipse #: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 -#: ../src/ui/dialog/inkscape-preferences.cpp:412 +#: ../src/ui/dialog/inkscape-preferences.cpp:421 #: ../src/widgets/pencil-toolbar.cpp:179 msgid "Ellipse" msgstr "" @@ -12700,7 +12715,7 @@ msgstr "" msgid "Linked Flowed Text" msgstr "" -#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:377 +#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:380 #: ../src/ui/tools/text-tool.cpp:1556 msgid " [truncated]" msgstr "" @@ -12802,7 +12817,7 @@ msgstr "" msgid "Line" msgstr "" -#: ../src/sp-lpe-item.cpp:260 +#: ../src/sp-lpe-item.cpp:263 ../src/sp-lpe-item.cpp:710 msgid "An exception occurred during execution of the Path Effect." msgstr "" @@ -12856,12 +12871,12 @@ msgid "Polyline" msgstr "" #. Rectangle -#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:402 +#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:411 msgid "Rectangle" msgstr "" #. Spiral -#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:420 +#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:429 #: ../share/extensions/gcodetools_area.inx.h:11 msgid "Spiral" msgstr "" @@ -12874,7 +12889,7 @@ msgid "with %3f turns" msgstr "" #. Star -#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:416 +#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:425 #: ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "" @@ -12915,12 +12930,12 @@ msgstr "" msgid "Text" msgstr "" -#: ../src/sp-text.cpp:381 +#: ../src/sp-text.cpp:384 #, c-format msgid "on path%s (%s, %s)" msgstr "" -#: ../src/sp-text.cpp:382 +#: ../src/sp-text.cpp:385 #, c-format msgid "%s (%s, %s)" msgstr "" @@ -12977,97 +12992,97 @@ msgstr "" msgid "Intersection" msgstr "" -#: ../src/splivarot.cpp:106 +#: ../src/splivarot.cpp:106 ../src/splivarot.cpp:112 msgid "Division" msgstr "" -#: ../src/splivarot.cpp:111 +#: ../src/splivarot.cpp:118 msgid "Cut path" msgstr "" -#: ../src/splivarot.cpp:335 +#: ../src/splivarot.cpp:342 msgid "Select at least 2 paths to perform a boolean operation." msgstr "" -#: ../src/splivarot.cpp:339 +#: ../src/splivarot.cpp:346 msgid "Select at least 1 path to perform a boolean union." msgstr "" -#: ../src/splivarot.cpp:356 ../src/splivarot.cpp:371 +#: ../src/splivarot.cpp:363 ../src/splivarot.cpp:378 msgid "" "Unable to determine the z-order of the objects selected for " "difference, XOR, division, or path cut." msgstr "" -#: ../src/splivarot.cpp:401 +#: ../src/splivarot.cpp:408 msgid "" "One of the objects is not a path, cannot perform boolean operation." msgstr "" -#: ../src/splivarot.cpp:1146 +#: ../src/splivarot.cpp:1153 msgid "Select stroked path(s) to convert stroke to path." msgstr "" -#: ../src/splivarot.cpp:1502 +#: ../src/splivarot.cpp:1509 msgid "Convert stroke to path" msgstr "" #. TRANSLATORS: "to outline" means "to convert stroke to path" -#: ../src/splivarot.cpp:1505 +#: ../src/splivarot.cpp:1512 msgid "No stroked paths in the selection." msgstr "" -#: ../src/splivarot.cpp:1576 +#: ../src/splivarot.cpp:1583 msgid "Selected object is not a path, cannot inset/outset." msgstr "" -#: ../src/splivarot.cpp:1667 ../src/splivarot.cpp:1734 +#: ../src/splivarot.cpp:1674 ../src/splivarot.cpp:1741 msgid "Create linked offset" msgstr "" -#: ../src/splivarot.cpp:1668 ../src/splivarot.cpp:1735 +#: ../src/splivarot.cpp:1675 ../src/splivarot.cpp:1742 msgid "Create dynamic offset" msgstr "" -#: ../src/splivarot.cpp:1760 +#: ../src/splivarot.cpp:1767 msgid "Select path(s) to inset/outset." msgstr "" -#: ../src/splivarot.cpp:1953 +#: ../src/splivarot.cpp:1960 msgid "Outset path" msgstr "" -#: ../src/splivarot.cpp:1953 +#: ../src/splivarot.cpp:1960 msgid "Inset path" msgstr "" -#: ../src/splivarot.cpp:1955 +#: ../src/splivarot.cpp:1962 msgid "No paths to inset/outset in the selection." msgstr "" -#: ../src/splivarot.cpp:2117 +#: ../src/splivarot.cpp:2124 msgid "Simplifying paths (separately):" msgstr "" -#: ../src/splivarot.cpp:2119 +#: ../src/splivarot.cpp:2126 msgid "Simplifying paths:" msgstr "" -#: ../src/splivarot.cpp:2156 +#: ../src/splivarot.cpp:2163 #, c-format msgid "%s %d of %d paths simplified..." msgstr "" -#: ../src/splivarot.cpp:2169 +#: ../src/splivarot.cpp:2176 #, c-format msgid "%d paths simplified." msgstr "" -#: ../src/splivarot.cpp:2183 +#: ../src/splivarot.cpp:2190 msgid "Select path(s) to simplify." msgstr "" -#: ../src/splivarot.cpp:2199 +#: ../src/splivarot.cpp:2206 msgid "No paths to simplify in the selection." msgstr "" @@ -13288,12 +13303,12 @@ msgid "translator-credits" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:169 -#: ../src/ui/dialog/align-and-distribute.cpp:846 +#: ../src/ui/dialog/align-and-distribute.cpp:889 msgid "Align" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:337 -#: ../src/ui/dialog/align-and-distribute.cpp:847 +#: ../src/ui/dialog/align-and-distribute.cpp:890 msgid "Distribute" msgstr "" @@ -13318,7 +13333,7 @@ msgid "_V:" msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:463 -#: ../src/ui/dialog/align-and-distribute.cpp:849 +#: ../src/ui/dialog/align-and-distribute.cpp:892 #: ../src/widgets/connector-toolbar.cpp:405 msgid "Remove overlaps" msgstr "" @@ -13340,195 +13355,195 @@ msgstr "" msgid "Randomize positions" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:794 +#: ../src/ui/dialog/align-and-distribute.cpp:793 msgid "Distribute text baselines" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:818 +#: ../src/ui/dialog/align-and-distribute.cpp:861 msgid "Align text baselines" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:848 +#: ../src/ui/dialog/align-and-distribute.cpp:891 msgid "Rearrange" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:850 -#: ../src/widgets/toolbox.cpp:1778 +#: ../src/ui/dialog/align-and-distribute.cpp:893 +#: ../src/widgets/toolbox.cpp:1781 msgid "Nodes" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:864 +#: ../src/ui/dialog/align-and-distribute.cpp:907 msgid "Relative to: " msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:865 +#: ../src/ui/dialog/align-and-distribute.cpp:908 msgid "_Treat selection as group: " msgstr "" #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:871 ../src/verbs.cpp:3035 +#: ../src/ui/dialog/align-and-distribute.cpp:914 ../src/verbs.cpp:3035 #: ../src/verbs.cpp:3036 msgid "Align right edges of objects to the left edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:874 ../src/verbs.cpp:3037 +#: ../src/ui/dialog/align-and-distribute.cpp:917 ../src/verbs.cpp:3037 #: ../src/verbs.cpp:3038 msgid "Align left edges" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:3039 +#: ../src/ui/dialog/align-and-distribute.cpp:920 ../src/verbs.cpp:3039 #: ../src/verbs.cpp:3040 msgid "Center on vertical axis" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:3041 +#: ../src/ui/dialog/align-and-distribute.cpp:923 ../src/verbs.cpp:3041 #: ../src/verbs.cpp:3042 msgid "Align right sides" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:3043 +#: ../src/ui/dialog/align-and-distribute.cpp:926 ../src/verbs.cpp:3043 #: ../src/verbs.cpp:3044 msgid "Align left edges of objects to the right edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:3045 +#: ../src/ui/dialog/align-and-distribute.cpp:929 ../src/verbs.cpp:3045 #: ../src/verbs.cpp:3046 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:3047 +#: ../src/ui/dialog/align-and-distribute.cpp:932 ../src/verbs.cpp:3047 #: ../src/verbs.cpp:3048 msgid "Align top edges" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:3049 +#: ../src/ui/dialog/align-and-distribute.cpp:935 ../src/verbs.cpp:3049 #: ../src/verbs.cpp:3050 msgid "Center on horizontal axis" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:3051 +#: ../src/ui/dialog/align-and-distribute.cpp:938 ../src/verbs.cpp:3051 #: ../src/verbs.cpp:3052 msgid "Align bottom edges" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:3053 +#: ../src/ui/dialog/align-and-distribute.cpp:941 ../src/verbs.cpp:3053 #: ../src/verbs.cpp:3054 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:903 +#: ../src/ui/dialog/align-and-distribute.cpp:946 msgid "Align baseline anchors of texts horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:906 +#: ../src/ui/dialog/align-and-distribute.cpp:949 msgid "Align baselines of texts" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:911 +#: ../src/ui/dialog/align-and-distribute.cpp:954 msgid "Make horizontal gaps between objects equal" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:915 +#: ../src/ui/dialog/align-and-distribute.cpp:958 msgid "Distribute left edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:918 +#: ../src/ui/dialog/align-and-distribute.cpp:961 msgid "Distribute centers equidistantly horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:921 +#: ../src/ui/dialog/align-and-distribute.cpp:964 msgid "Distribute right edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:925 +#: ../src/ui/dialog/align-and-distribute.cpp:968 msgid "Make vertical gaps between objects equal" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:929 +#: ../src/ui/dialog/align-and-distribute.cpp:972 msgid "Distribute top edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:932 +#: ../src/ui/dialog/align-and-distribute.cpp:975 msgid "Distribute centers equidistantly vertically" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:935 +#: ../src/ui/dialog/align-and-distribute.cpp:978 msgid "Distribute bottom edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:940 +#: ../src/ui/dialog/align-and-distribute.cpp:983 msgid "Distribute baseline anchors of texts horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:943 +#: ../src/ui/dialog/align-and-distribute.cpp:986 msgid "Distribute baselines of texts vertically" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:949 +#: ../src/ui/dialog/align-and-distribute.cpp:992 #: ../src/widgets/connector-toolbar.cpp:367 msgid "Nicely arrange selected connector network" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:952 +#: ../src/ui/dialog/align-and-distribute.cpp:995 msgid "Exchange positions of selected objects - selection order" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/ui/dialog/align-and-distribute.cpp:998 msgid "Exchange positions of selected objects - stacking order" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:958 +#: ../src/ui/dialog/align-and-distribute.cpp:1001 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:963 +#: ../src/ui/dialog/align-and-distribute.cpp:1006 msgid "Randomize centers in both dimensions" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:966 +#: ../src/ui/dialog/align-and-distribute.cpp:1009 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:971 +#: ../src/ui/dialog/align-and-distribute.cpp:1014 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:979 +#: ../src/ui/dialog/align-and-distribute.cpp:1022 msgid "Align selected nodes to a common horizontal line" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:982 +#: ../src/ui/dialog/align-and-distribute.cpp:1025 msgid "Align selected nodes to a common vertical line" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:985 +#: ../src/ui/dialog/align-and-distribute.cpp:1028 msgid "Distribute selected nodes horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:988 +#: ../src/ui/dialog/align-and-distribute.cpp:1031 msgid "Distribute selected nodes vertically" msgstr "" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:993 +#: ../src/ui/dialog/align-and-distribute.cpp:1036 msgid "Last selected" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:994 +#: ../src/ui/dialog/align-and-distribute.cpp:1037 msgid "First selected" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:995 +#: ../src/ui/dialog/align-and-distribute.cpp:1038 msgid "Biggest object" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:996 +#: ../src/ui/dialog/align-and-distribute.cpp:1039 msgid "Smallest object" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:999 +#: ../src/ui/dialog/align-and-distribute.cpp:1042 msgid "Selection Area" msgstr "" @@ -14547,7 +14562,7 @@ msgid "Remove selected grid." msgstr "" #: ../src/ui/dialog/document-properties.cpp:162 -#: ../src/widgets/toolbox.cpp:1885 +#: ../src/widgets/toolbox.cpp:1888 msgid "Guides" msgstr "" @@ -14838,9 +14853,9 @@ msgid "_Height:" msgstr "" #: ../src/ui/dialog/export.cpp:304 -#: ../src/ui/dialog/inkscape-preferences.cpp:1487 -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 -#: ../src/ui/dialog/inkscape-preferences.cpp:1515 +#: ../src/ui/dialog/inkscape-preferences.cpp:1497 +#: ../src/ui/dialog/inkscape-preferences.cpp:1501 +#: ../src/ui/dialog/inkscape-preferences.cpp:1525 msgid "dpi" msgstr "" @@ -14948,7 +14963,7 @@ msgstr "" #: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 #: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:6 +#: ../share/extensions/color_randomize.inx.h:12 #: ../share/extensions/dots.inx.h:7 #: ../share/extensions/draw_from_triangle.inx.h:35 #: ../share/extensions/dxf_input.inx.h:10 @@ -15967,7 +15982,7 @@ msgstr "" msgid "Search spirals" msgstr "" -#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1786 +#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1789 msgid "Paths" msgstr "" @@ -17032,299 +17047,311 @@ msgstr "" msgid "Size of dots created with Ctrl+click (relative to current stroke width)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:220 -msgid "No objects selected to take the style from." +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "Base simplify:" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "on dinamic LPE simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:214 +msgid "Base simplify of dinamic LPE based simplify" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:229 +msgid "No objects selected to take the style from." +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:238 msgid "" "More than one object selected. Cannot take style from multiple " "objects." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:265 +#: ../src/ui/dialog/inkscape-preferences.cpp:274 msgid "Style of new objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:267 +#: ../src/ui/dialog/inkscape-preferences.cpp:276 msgid "Last used style" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:269 +#: ../src/ui/dialog/inkscape-preferences.cpp:278 msgid "Apply the style you last set on an object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:274 +#: ../src/ui/dialog/inkscape-preferences.cpp:283 msgid "This tool's own style:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:278 +#: ../src/ui/dialog/inkscape-preferences.cpp:287 msgid "" "Each tool may store its own style to apply to the newly created objects. Use " "the button below to set it." msgstr "" #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:282 +#: ../src/ui/dialog/inkscape-preferences.cpp:291 msgid "Take from selection" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:291 +#: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This tool's style of new objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 +#: ../src/ui/dialog/inkscape-preferences.cpp:307 msgid "Remember the style of the (first) selected object as this tool's style" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:312 msgid "Tools" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Bounding box to use" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:307 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Visual bounding box" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:318 msgid "This bounding box includes stroke width, markers, filter margins, etc." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:310 +#: ../src/ui/dialog/inkscape-preferences.cpp:319 msgid "Geometric bounding box" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:312 +#: ../src/ui/dialog/inkscape-preferences.cpp:321 msgid "This bounding box includes only the bare path" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 +#: ../src/ui/dialog/inkscape-preferences.cpp:323 msgid "Conversion to guides" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 +#: ../src/ui/dialog/inkscape-preferences.cpp:324 msgid "Keep objects after conversion to guides" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:317 +#: ../src/ui/dialog/inkscape-preferences.cpp:326 msgid "" "When converting an object to guides, don't delete the object after the " "conversion" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:318 +#: ../src/ui/dialog/inkscape-preferences.cpp:327 msgid "Treat groups as a single object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:320 +#: ../src/ui/dialog/inkscape-preferences.cpp:329 msgid "" "Treat groups as a single object during conversion to guides rather than " "converting each child separately" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:322 +#: ../src/ui/dialog/inkscape-preferences.cpp:331 msgid "Average all sketches" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:323 +#: ../src/ui/dialog/inkscape-preferences.cpp:332 msgid "Width is in absolute units" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 +#: ../src/ui/dialog/inkscape-preferences.cpp:333 msgid "Select new path" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:334 msgid "Don't attach connectors to text objects" msgstr "" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:328 +#: ../src/ui/dialog/inkscape-preferences.cpp:337 msgid "Selector" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:333 +#: ../src/ui/dialog/inkscape-preferences.cpp:342 msgid "When transforming, show" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 +#: ../src/ui/dialog/inkscape-preferences.cpp:343 msgid "Objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:336 +#: ../src/ui/dialog/inkscape-preferences.cpp:345 msgid "Show the actual objects when moving or transforming" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:337 +#: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Box outline" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:339 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Show only a box outline of the objects when moving or transforming" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:349 msgid "Per-object selection cue" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:341 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgctxt "Selection cue" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:343 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "No per-object selection indication" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:344 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 msgid "Mark" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:355 msgid "Each selected object has a diamond mark in the top left corner" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:347 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "Box" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "Each selected object displays its bounding box" msgstr "" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:352 +#: ../src/ui/dialog/inkscape-preferences.cpp:361 msgid "Node" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:355 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Path outline" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Path outline color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "Selects the color used for showing the path outline" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:358 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 msgid "Always show outline" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:368 msgid "Show outlines for all paths, not only invisible paths" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 +#: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "Update outline when dragging nodes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:361 +#: ../src/ui/dialog/inkscape-preferences.cpp:370 msgid "" "Update the outline when dragging or transforming nodes; if this is off, the " "outline will only update when completing a drag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "Update paths when dragging nodes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:363 +#: ../src/ui/dialog/inkscape-preferences.cpp:372 msgid "" "Update paths when dragging or transforming nodes; if this is off, paths will " "only be updated when completing a drag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:373 msgid "Show path direction on outlines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:374 msgid "" "Visualize the direction of selected paths by drawing small arrows in the " "middle of each outline segment" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:366 +#: ../src/ui/dialog/inkscape-preferences.cpp:375 msgid "Show temporary path outline" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:367 +#: ../src/ui/dialog/inkscape-preferences.cpp:376 msgid "When hovering over a path, briefly flash its outline" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:377 msgid "Show temporary outline for selected paths" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:369 +#: ../src/ui/dialog/inkscape-preferences.cpp:378 msgid "Show temporary outline even when a path is selected for editing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "_Flash time:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "" "Specifies how long the path outline will be visible after a mouse-over (in " "milliseconds); specify 0 to have the outline shown until mouse leaves the " "path" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:372 +#: ../src/ui/dialog/inkscape-preferences.cpp:381 msgid "Editing preferences" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:373 +#: ../src/ui/dialog/inkscape-preferences.cpp:382 msgid "Show transform handles for single nodes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:374 +#: ../src/ui/dialog/inkscape-preferences.cpp:383 msgid "Show transform handles even when only a single node is selected" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:375 +#: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "Deleting nodes preserves shape" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:376 +#: ../src/ui/dialog/inkscape-preferences.cpp:385 msgid "" "Move handles next to deleted nodes to resemble original shape; hold Ctrl to " "get the other behavior" msgstr "" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:379 +#: ../src/ui/dialog/inkscape-preferences.cpp:388 msgid "Tweak" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:380 +#: ../src/ui/dialog/inkscape-preferences.cpp:389 msgid "Object paint style" msgstr "" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:385 +#: ../src/ui/dialog/inkscape-preferences.cpp:394 #: ../src/widgets/desktop-widget.cpp:659 msgid "Zoom" msgstr "" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:390 ../src/verbs.cpp:2762 +#: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2762 msgctxt "ContextVerb" msgid "Measure" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:392 +#: ../src/ui/dialog/inkscape-preferences.cpp:401 msgid "Ignore first and last points" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:393 +#: ../src/ui/dialog/inkscape-preferences.cpp:402 msgid "" "The start and end of the measurement tool's control line will not be " "considered for calculating lengths. Only lengths between actual curve " @@ -17332,970 +17359,970 @@ msgid "" msgstr "" #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:396 +#: ../src/ui/dialog/inkscape-preferences.cpp:405 msgid "Shapes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:428 +#: ../src/ui/dialog/inkscape-preferences.cpp:438 msgid "Sketch mode" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:430 +#: ../src/ui/dialog/inkscape-preferences.cpp:440 msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" msgstr "" #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:433 +#: ../src/ui/dialog/inkscape-preferences.cpp:443 #: ../src/ui/dialog/input.cpp:1485 msgid "Pen" msgstr "" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:439 +#: ../src/ui/dialog/inkscape-preferences.cpp:449 msgid "Calligraphy" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:443 +#: ../src/ui/dialog/inkscape-preferences.cpp:453 msgid "" "If on, pen width is in absolute units (px) independent of zoom; otherwise " "pen width depends on zoom so that it looks the same at any zoom" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/ui/dialog/inkscape-preferences.cpp:455 msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" msgstr "" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2754 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2754 msgctxt "ContextVerb" msgid "Text" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:463 msgid "Show font samples in the drop-down list" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:454 +#: ../src/ui/dialog/inkscape-preferences.cpp:464 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:456 +#: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Show font substitution warning dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pixel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pica" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Millimeter" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Centimeter" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Inch" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Em square" msgstr "" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:463 +#: ../src/ui/dialog/inkscape-preferences.cpp:473 msgid "Text units" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:465 +#: ../src/ui/dialog/inkscape-preferences.cpp:475 msgid "Text size unit type:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:466 +#: ../src/ui/dialog/inkscape-preferences.cpp:476 msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:467 +#: ../src/ui/dialog/inkscape-preferences.cpp:477 msgid "Always output text size in pixels (px)" msgstr "" #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:473 +#: ../src/ui/dialog/inkscape-preferences.cpp:483 msgid "Spray" msgstr "" #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:478 +#: ../src/ui/dialog/inkscape-preferences.cpp:488 msgid "Eraser" msgstr "" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:483 +#: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "Paint Bucket" msgstr "" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:489 +#: ../src/ui/dialog/inkscape-preferences.cpp:499 #: ../src/widgets/gradient-selector.cpp:144 #: ../src/widgets/gradient-selector.cpp:295 msgid "Gradient" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:491 +#: ../src/ui/dialog/inkscape-preferences.cpp:501 msgid "Prevent sharing of gradient definitions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:493 +#: ../src/ui/dialog/inkscape-preferences.cpp:503 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " "may affect other objects using the same gradient" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:494 +#: ../src/ui/dialog/inkscape-preferences.cpp:504 msgid "Use legacy Gradient Editor" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:496 +#: ../src/ui/dialog/inkscape-preferences.cpp:506 msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:499 +#: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Linear gradient _angle:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:500 +#: ../src/ui/dialog/inkscape-preferences.cpp:510 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:504 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Dropper" msgstr "" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Connector" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:512 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "If on, connector attachment points will not be shown for text objects" msgstr "" #. LPETool #. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "LPE Tool" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Interface" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "System default" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Albanian (sq)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Amharic (am)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Arabic (ar)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Armenian (hy)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Assamese (as)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Azerbaijani (az)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Basque (eu)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Belarusian (be)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bulgarian (bg)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali (bn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali/Bangladesh (bn_BD)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bodo (brx)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Breton (br)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Catalan (ca)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Valencian Catalan (ca@valencia)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/China (zh_CN)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/Taiwan (zh_TW)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Croatian (hr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Czech (cs)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Danish (da)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dogri (doi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dutch (nl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dzongkha (dz)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "German (de)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "Greek (el)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English (en)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Australia (en_AU)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Canada (en_CA)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Great Britain (en_GB)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Pig Latin (en_US@piglatin)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Esperanto (eo)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Estonian (et)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Farsi (fa)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Finnish (fi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "French (fr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Galician (gl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Gujarati (gu)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hebrew (he)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hindi (hi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hungarian (hu)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Icelandic (is)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Indonesian (id)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Irish (ga)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Italian (it)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:538 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Japanese (ja)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kannada (kn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Peso-Arabic script (ks@aran)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Devanagari script (ks@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Khmer (km)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kinyarwanda (rw)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Konkani (kok)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Konkani in Latin script (kok@latin)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Korean (ko)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Latvian (lv)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Lithuanian (lt)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Macedonian (mk)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Maithili (mai)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Malayalam (ml)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri (mni)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri in Bengali script (mni@beng)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Marathi (mr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Mongolian (mn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Nepali (ne)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Bokmål (nb)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Nynorsk (nn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:543 +#: ../src/ui/dialog/inkscape-preferences.cpp:553 msgid "Odia (or)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Panjabi (pa)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Polish (pl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese (pt)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese/Brazil (pt_BR)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Romanian (ro)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Russian (ru)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Sanskrit (sa)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Santali (sat)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Santali in Devanagari script (sat@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian (sr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian in Latin script (sr@latin)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi (sd)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi in Devanagari script (sd@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovak (sk)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovenian (sl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish (es)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish/Mexico (es_MX)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Swedish (sv)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Tamil (ta)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Telugu (te)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Thai (th)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Turkish (tr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:549 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Ukrainian (uk)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:549 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Urdu (ur)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:550 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Vietnamese (vi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:602 +#: ../src/ui/dialog/inkscape-preferences.cpp:612 msgid "Language (requires restart):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:603 +#: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "Set the language for menus and number formats" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Large" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Small" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Smaller" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:610 +#: ../src/ui/dialog/inkscape-preferences.cpp:620 msgid "Toolbox icon size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:611 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "Set the size for the tool icons (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:614 +#: ../src/ui/dialog/inkscape-preferences.cpp:624 msgid "Control bar icon size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:615 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:618 +#: ../src/ui/dialog/inkscape-preferences.cpp:628 msgid "Secondary toolbar icon size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:619 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:632 msgid "Work-around color sliders not drawing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:624 +#: ../src/ui/dialog/inkscape-preferences.cpp:634 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:629 +#: ../src/ui/dialog/inkscape-preferences.cpp:639 msgid "Clear list" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:632 +#: ../src/ui/dialog/inkscape-preferences.cpp:642 msgid "Maximum documents in Open _Recent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:633 +#: ../src/ui/dialog/inkscape-preferences.cpp:643 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:636 +#: ../src/ui/dialog/inkscape-preferences.cpp:646 msgid "_Zoom correction factor (in %):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:637 +#: ../src/ui/dialog/inkscape-preferences.cpp:647 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " "display objects in their true sizes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:640 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 msgid "Enable dynamic relayout for incomplete sections" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:642 +#: ../src/ui/dialog/inkscape-preferences.cpp:652 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" msgstr "" #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:655 msgid "Show filter primitives infobox (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:647 +#: ../src/ui/dialog/inkscape-preferences.cpp:657 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Icons only" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Text only" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Icons and text" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:655 +#: ../src/ui/dialog/inkscape-preferences.cpp:665 msgid "Dockbar style (requires restart):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:663 +#: ../src/ui/dialog/inkscape-preferences.cpp:673 msgid "Switcher style (requires restart):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:664 +#: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:678 msgid "Save and restore window geometry for each document" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:669 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Remember and use last window's geometry" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:670 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "Don't save window geometry" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:672 +#: ../src/ui/dialog/inkscape-preferences.cpp:682 msgid "Save and restore dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:719 msgid "Don't save dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:675 -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:685 +#: ../src/ui/dialog/inkscape-preferences.cpp:727 msgid "Dockable" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:679 +#: ../src/ui/dialog/inkscape-preferences.cpp:689 msgid "Native open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:680 +#: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "GTK open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:682 +#: ../src/ui/dialog/inkscape-preferences.cpp:692 msgid "Dialogs are hidden in taskbar" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Save and restore documents viewport" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "Zoom when window is resized" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:685 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Show close button on dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 msgctxt "Dialog on top" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:688 +#: ../src/ui/dialog/inkscape-preferences.cpp:698 msgid "Aggressive" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgctxt "Window size" msgid "Small" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgctxt "Window size" msgid "Large" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgctxt "Window size" msgid "Maximized" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:695 +#: ../src/ui/dialog/inkscape-preferences.cpp:705 msgid "Default window size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:696 +#: ../src/ui/dialog/inkscape-preferences.cpp:706 msgid "Set the default window size" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:709 msgid "Saving window geometry (size and position)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:711 msgid "Let the window manager determine placement of all windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:703 +#: ../src/ui/dialog/inkscape-preferences.cpp:713 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:715 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:717 msgid "Saving dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:711 +#: ../src/ui/dialog/inkscape-preferences.cpp:721 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:715 +#: ../src/ui/dialog/inkscape-preferences.cpp:725 msgid "Dialog behavior (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:731 msgid "Desktop integration" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:733 msgid "Use Windows like open and save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:725 +#: ../src/ui/dialog/inkscape-preferences.cpp:735 msgid "Use GTK open and save dialogs " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:729 +#: ../src/ui/dialog/inkscape-preferences.cpp:739 msgid "Dialogs on top:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:732 +#: ../src/ui/dialog/inkscape-preferences.cpp:742 msgid "Dialogs are treated as regular windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:744 msgid "Dialogs stay on top of document windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:736 +#: ../src/ui/dialog/inkscape-preferences.cpp:746 msgid "Same as Normal but may work better with some window managers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:749 msgid "Dialog Transparency" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:751 msgid "_Opacity when focused:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:743 +#: ../src/ui/dialog/inkscape-preferences.cpp:753 msgid "Opacity when _unfocused:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:745 +#: ../src/ui/dialog/inkscape-preferences.cpp:755 msgid "_Time of opacity change animation:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:748 +#: ../src/ui/dialog/inkscape-preferences.cpp:758 msgid "Miscellaneous" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:751 +#: ../src/ui/dialog/inkscape-preferences.cpp:761 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:754 +#: ../src/ui/dialog/inkscape-preferences.cpp:764 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " "above the right scrollbar)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:756 +#: ../src/ui/dialog/inkscape-preferences.cpp:766 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:758 +#: ../src/ui/dialog/inkscape-preferences.cpp:768 msgid "Whether dialog windows have a close button (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:759 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Windows" msgstr "" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:762 +#: ../src/ui/dialog/inkscape-preferences.cpp:772 msgid "Line color when zooming out" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:765 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 msgid "The gridlines will be shown in minor grid line color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:777 msgid "The gridlines will be shown in major grid line color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:769 +#: ../src/ui/dialog/inkscape-preferences.cpp:779 msgid "Default grid settings" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:775 -#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:785 +#: ../src/ui/dialog/inkscape-preferences.cpp:810 msgid "Grid units:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:780 -#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "Origin X:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:781 -#: ../src/ui/dialog/inkscape-preferences.cpp:806 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Origin Y:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:796 msgid "Spacing X:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:787 -#: ../src/ui/dialog/inkscape-preferences.cpp:809 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 +#: ../src/ui/dialog/inkscape-preferences.cpp:819 msgid "Spacing Y:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:789 -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:814 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:799 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 +#: ../src/ui/dialog/inkscape-preferences.cpp:825 msgid "Minor grid line color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:825 msgid "Color used for normal grid lines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:791 -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:816 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 +#: ../src/ui/dialog/inkscape-preferences.cpp:827 msgid "Major grid line color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 +#: ../src/ui/dialog/inkscape-preferences.cpp:827 msgid "Color used for major (highlighted) grid lines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:794 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 +#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:829 msgid "Major grid line every:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:795 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 msgid "Show dots instead of lines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:796 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:877 +#: ../src/ui/dialog/inkscape-preferences.cpp:887 msgid "Input/Output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 +#: ../src/ui/dialog/inkscape-preferences.cpp:890 msgid "Use current directory for \"Save As ...\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:892 msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " @@ -18303,176 +18330,176 @@ msgid "" "it" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:884 +#: ../src/ui/dialog/inkscape-preferences.cpp:894 msgid "Add label comments to printing output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:896 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:888 +#: ../src/ui/dialog/inkscape-preferences.cpp:898 msgid "Add default metadata to new documents" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:890 +#: ../src/ui/dialog/inkscape-preferences.cpp:900 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:904 msgid "_Grab sensitivity:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:904 msgid "pixels (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 +#: ../src/ui/dialog/inkscape-preferences.cpp:907 msgid "_Click/drag threshold:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +#: ../src/ui/dialog/inkscape-preferences.cpp:907 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 #: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 msgid "pixels" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:901 +#: ../src/ui/dialog/inkscape-preferences.cpp:911 msgid "_Handle size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/ui/dialog/inkscape-preferences.cpp:912 msgid "Set the relative size of node handles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:904 +#: ../src/ui/dialog/inkscape-preferences.cpp:914 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:906 +#: ../src/ui/dialog/inkscape-preferences.cpp:916 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " "mouse)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:918 msgid "Switch tool based on tablet device (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:910 +#: ../src/ui/dialog/inkscape-preferences.cpp:920 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:911 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "Input devices" msgstr "" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:914 +#: ../src/ui/dialog/inkscape-preferences.cpp:924 msgid "Use named colors" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:915 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:927 msgid "XML formatting" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:919 +#: ../src/ui/dialog/inkscape-preferences.cpp:929 msgid "Inline attributes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:920 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Put attributes on the same line as the element tag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:933 msgid "_Indent, spaces:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:933 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:925 +#: ../src/ui/dialog/inkscape-preferences.cpp:935 msgid "Path data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 +#: ../src/ui/dialog/inkscape-preferences.cpp:938 msgid "Absolute" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 +#: ../src/ui/dialog/inkscape-preferences.cpp:938 msgid "Relative" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 -#: ../src/ui/dialog/inkscape-preferences.cpp:1218 +#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 msgid "Optimized" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:942 msgid "Path string format:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:942 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " "relative coordinates)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:934 +#: ../src/ui/dialog/inkscape-preferences.cpp:944 msgid "Force repeat commands" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:937 +#: ../src/ui/dialog/inkscape-preferences.cpp:947 msgid "Numbers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:950 msgid "_Numeric precision:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:950 msgid "Significant figures of the values written to the SVG file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 +#: ../src/ui/dialog/inkscape-preferences.cpp:953 msgid "Minimum _exponent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 +#: ../src/ui/dialog/inkscape-preferences.cpp:953 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -18480,56 +18507,56 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:948 +#: ../src/ui/dialog/inkscape-preferences.cpp:958 msgid "Improper Attributes Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:950 -#: ../src/ui/dialog/inkscape-preferences.cpp:958 -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:960 +#: ../src/ui/dialog/inkscape-preferences.cpp:968 +#: ../src/ui/dialog/inkscape-preferences.cpp:976 msgid "Print warnings" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:951 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:952 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "Remove attributes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:953 +#: ../src/ui/dialog/inkscape-preferences.cpp:963 msgid "Delete invalid or non-useful attributes from element tag" msgstr "" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:956 +#: ../src/ui/dialog/inkscape-preferences.cpp:966 msgid "Inappropriate Style Properties Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:959 +#: ../src/ui/dialog/inkscape-preferences.cpp:969 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:960 -#: ../src/ui/dialog/inkscape-preferences.cpp:968 +#: ../src/ui/dialog/inkscape-preferences.cpp:970 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "Remove style properties" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:961 +#: ../src/ui/dialog/inkscape-preferences.cpp:971 msgid "Delete inappropriate style properties" msgstr "" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:964 +#: ../src/ui/dialog/inkscape-preferences.cpp:974 msgid "Non-useful Style Properties Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:967 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " @@ -18537,207 +18564,207 @@ msgid "" "attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:979 msgid "Delete redundant style properties" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:981 msgid "Check Attributes and Style Properties on" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:973 +#: ../src/ui/dialog/inkscape-preferences.cpp:983 msgid "Reading" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:975 +#: ../src/ui/dialog/inkscape-preferences.cpp:985 msgid "Editing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:976 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:977 +#: ../src/ui/dialog/inkscape-preferences.cpp:987 msgid "Writing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:978 +#: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "Check attributes and style properties on writing out SVG files" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:980 +#: ../src/ui/dialog/inkscape-preferences.cpp:990 msgid "SVG output" msgstr "" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 msgid "Perceptual" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 msgid "Relative Colorimetric" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 msgid "Absolute Colorimetric" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:990 +#: ../src/ui/dialog/inkscape-preferences.cpp:1000 msgid "(Note: Color management has been disabled in this build)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:994 +#: ../src/ui/dialog/inkscape-preferences.cpp:1004 msgid "Display adjustment" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1004 +#: ../src/ui/dialog/inkscape-preferences.cpp:1014 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" "Searched directories:%s" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1005 +#: ../src/ui/dialog/inkscape-preferences.cpp:1015 msgid "Display profile:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1010 +#: ../src/ui/dialog/inkscape-preferences.cpp:1020 msgid "Retrieve profile from display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1013 +#: ../src/ui/dialog/inkscape-preferences.cpp:1023 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1015 +#: ../src/ui/dialog/inkscape-preferences.cpp:1025 msgid "Retrieve profiles from those attached to displays" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1020 +#: ../src/ui/dialog/inkscape-preferences.cpp:1030 msgid "Display rendering intent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1021 +#: ../src/ui/dialog/inkscape-preferences.cpp:1031 msgid "The rendering intent to use to calibrate display output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 +#: ../src/ui/dialog/inkscape-preferences.cpp:1033 msgid "Proofing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1025 +#: ../src/ui/dialog/inkscape-preferences.cpp:1035 msgid "Simulate output on screen" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1027 +#: ../src/ui/dialog/inkscape-preferences.cpp:1037 msgid "Simulates output of target device" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1029 +#: ../src/ui/dialog/inkscape-preferences.cpp:1039 msgid "Mark out of gamut colors" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1031 +#: ../src/ui/dialog/inkscape-preferences.cpp:1041 msgid "Highlights colors that are out of gamut for the target device" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1043 +#: ../src/ui/dialog/inkscape-preferences.cpp:1053 msgid "Out of gamut warning color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1044 +#: ../src/ui/dialog/inkscape-preferences.cpp:1054 msgid "Selects the color used for out of gamut warning" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1046 +#: ../src/ui/dialog/inkscape-preferences.cpp:1056 msgid "Device profile:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1047 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 msgid "The ICC profile to use to simulate device output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1050 +#: ../src/ui/dialog/inkscape-preferences.cpp:1060 msgid "Device rendering intent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1051 +#: ../src/ui/dialog/inkscape-preferences.cpp:1061 msgid "The rendering intent to use to calibrate device output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1063 msgid "Black point compensation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1055 +#: ../src/ui/dialog/inkscape-preferences.cpp:1065 msgid "Enables black point compensation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1057 +#: ../src/ui/dialog/inkscape-preferences.cpp:1067 msgid "Preserve black" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1064 +#: ../src/ui/dialog/inkscape-preferences.cpp:1074 msgid "(LittleCMS 1.15 or later required)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1066 +#: ../src/ui/dialog/inkscape-preferences.cpp:1076 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1080 +#: ../src/ui/dialog/inkscape-preferences.cpp:1090 #: ../src/ui/widget/color-icc-selector.cpp:395 #: ../src/ui/widget/color-icc-selector.cpp:674 msgid "" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1125 +#: ../src/ui/dialog/inkscape-preferences.cpp:1135 msgid "Color management" msgstr "" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1128 +#: ../src/ui/dialog/inkscape-preferences.cpp:1138 msgid "Enable autosave (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1129 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1147 msgid "_Interval (in minutes):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1147 msgid "Interval (in minutes) at which document will be autosaved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1149 msgid "_Maximum number of autosaves:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1149 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -18754,508 +18781,508 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1154 +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 msgid "Autosave" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1158 +#: ../src/ui/dialog/inkscape-preferences.cpp:1168 msgid "Open Clip Art Library _Server Name:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1169 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1161 +#: ../src/ui/dialog/inkscape-preferences.cpp:1171 msgid "Open Clip Art Library _Username:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1162 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "The username used to log into Open Clip Art Library" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1164 +#: ../src/ui/dialog/inkscape-preferences.cpp:1174 msgid "Open Clip Art Library _Password:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "The password used to log into Open Clip Art Library" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1166 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "Open Clip Art" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1171 +#: ../src/ui/dialog/inkscape-preferences.cpp:1181 msgid "Behavior" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 +#: ../src/ui/dialog/inkscape-preferences.cpp:1185 msgid "_Simplification threshold:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " "this command several times in quick succession, it will act more and more " "aggressively; invoking it again after a pause restores the default threshold." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1178 +#: ../src/ui/dialog/inkscape-preferences.cpp:1188 msgid "Color stock markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1179 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "Color custom markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1180 -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 +#: ../src/ui/dialog/inkscape-preferences.cpp:1410 msgid "Update marker color when object color changes" msgstr "" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 +#: ../src/ui/dialog/inkscape-preferences.cpp:1193 msgid "Select in all layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 msgid "Select only within current layer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Select in current layer and sublayers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Ignore hidden objects and layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Ignore locked objects and layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1188 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 msgid "Deselect upon layer change" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1201 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1203 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 msgid "Make keyboard selection commands work on objects in all layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1207 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1209 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1211 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1213 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1215 msgid "Wrap when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1217 msgid "Alt+Scroll Wheel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 +#: ../src/ui/dialog/inkscape-preferences.cpp:1221 msgid "Selecting" msgstr "" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1224 #: ../src/widgets/select-toolbar.cpp:572 msgid "Scale stroke width" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 msgid "Scale rounded corners in rectangles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Transform gradients" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "Transform patterns" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1219 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Preserved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/ui/dialog/inkscape-preferences.cpp:1232 #: ../src/widgets/select-toolbar.cpp:573 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 +#: ../src/ui/dialog/inkscape-preferences.cpp:1234 #: ../src/widgets/select-toolbar.cpp:584 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1236 #: ../src/widgets/select-toolbar.cpp:595 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 +#: ../src/ui/dialog/inkscape-preferences.cpp:1238 #: ../src/widgets/select-toolbar.cpp:606 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 msgid "Store transformation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +#: ../src/ui/dialog/inkscape-preferences.cpp:1241 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 msgid "Always store transformation as a transform= attribute on objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/ui/dialog/inkscape-preferences.cpp:1245 msgid "Transforms" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 msgid "Mouse _wheel scrolls by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "Ctrl+arrows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 msgid "Sc_roll by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1244 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1246 +#: ../src/ui/dialog/inkscape-preferences.cpp:1256 msgid "_Acceleration:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1247 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1248 +#: ../src/ui/dialog/inkscape-preferences.cpp:1258 msgid "Autoscrolling" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1260 msgid "_Speed:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 msgid "_Threshold:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "Mouse move pans when Space is pressed" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1257 +#: ../src/ui/dialog/inkscape-preferences.cpp:1267 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "Mouse wheel zooms by default" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1260 +#: ../src/ui/dialog/inkscape-preferences.cpp:1270 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1261 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 msgid "Scrolling" msgstr "" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1274 msgid "Snap indicator" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1276 msgid "Enable snap indicator" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1278 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +#: ../src/ui/dialog/inkscape-preferences.cpp:1283 msgid "Snap indicator persistence (in seconds):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "" "Controls how long the snap indicator message will be shown, before it " "disappears" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 +#: ../src/ui/dialog/inkscape-preferences.cpp:1286 msgid "What should snap" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 +#: ../src/ui/dialog/inkscape-preferences.cpp:1288 msgid "Only snap the node closest to the pointer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 +#: ../src/ui/dialog/inkscape-preferences.cpp:1290 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1293 msgid "_Weight factor:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "" "When multiple snap solutions are found, then Inkscape can either prefer the " "closest transformation (when set to 0), or prefer the node that was " "initially the closest to the pointer (when set to 1)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +#: ../src/ui/dialog/inkscape-preferences.cpp:1296 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1298 msgid "" "When dragging a knot along a constraint line, then snap the position of the " "mouse pointer instead of snapping the projection of the knot onto the " "constraint line" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1290 +#: ../src/ui/dialog/inkscape-preferences.cpp:1300 msgid "Delayed snap" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1293 +#: ../src/ui/dialog/inkscape-preferences.cpp:1303 msgid "Delay (in seconds):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 msgid "" "Postpone snapping as long as the mouse is moving, and then wait an " "additional fraction of a second. This additional delay is specified here. " "When set to zero or to a very small number, snapping will be immediate." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1296 +#: ../src/ui/dialog/inkscape-preferences.cpp:1306 msgid "Snapping" msgstr "" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1301 +#: ../src/ui/dialog/inkscape-preferences.cpp:1311 msgid "_Arrow keys move by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1302 +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" msgstr "" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1305 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgid "> and < _scale by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1306 +#: ../src/ui/dialog/inkscape-preferences.cpp:1316 msgid "Pressing > or < scales selection up or down by this increment" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1308 +#: ../src/ui/dialog/inkscape-preferences.cpp:1318 msgid "_Inset/Outset by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1309 +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "Inset and Outset commands displace the path by this distance" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 msgid "Compass-like display of angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +#: ../src/ui/dialog/inkscape-preferences.cpp:1322 msgid "" "When on, angles are displayed with 0 at north, 0 to 360 range, positive " "clockwise; otherwise with 0 at east, -180 to 180 range, positive " "counterclockwise" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1314 +#: ../src/ui/dialog/inkscape-preferences.cpp:1324 msgctxt "Rotation angle" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1328 msgid "_Rotation snaps every:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1328 msgid "degrees" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1319 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1320 +#: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "Relative snapping of guideline angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#: ../src/ui/dialog/inkscape-preferences.cpp:1332 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 msgid "_Zoom in/out by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 #: ../src/ui/dialog/objects.cpp:1630 #: ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1325 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1326 +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 msgid "Steps" msgstr "" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +#: ../src/ui/dialog/inkscape-preferences.cpp:1339 msgid "Move in parallel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1331 +#: ../src/ui/dialog/inkscape-preferences.cpp:1341 msgid "Stay unmoved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1333 +#: ../src/ui/dialog/inkscape-preferences.cpp:1343 msgid "Move according to transform" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1345 msgid "Are unlinked" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1337 +#: ../src/ui/dialog/inkscape-preferences.cpp:1347 msgid "Are deleted" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1340 +#: ../src/ui/dialog/inkscape-preferences.cpp:1350 msgid "Moving original: clones and linked offsets" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1342 +#: ../src/ui/dialog/inkscape-preferences.cpp:1352 msgid "Clones are translated by the same vector as their original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1344 +#: ../src/ui/dialog/inkscape-preferences.cpp:1354 msgid "Clones preserve their positions when their original is moved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1346 +#: ../src/ui/dialog/inkscape-preferences.cpp:1356 msgid "" "Each clone moves according to the value of its transform= attribute; for " "example, a rotated clone will move in a different direction than its original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 msgid "Deleting original: clones" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1359 msgid "Orphaned clones are converted to regular objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1351 +#: ../src/ui/dialog/inkscape-preferences.cpp:1361 msgid "Orphaned clones are deleted along with their original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1363 msgid "Duplicating original+clones/linked offset" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1355 +#: ../src/ui/dialog/inkscape-preferences.cpp:1365 msgid "Relink duplicated clones" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1357 +#: ../src/ui/dialog/inkscape-preferences.cpp:1367 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -19263,127 +19290,127 @@ msgid "" msgstr "" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1360 +#: ../src/ui/dialog/inkscape-preferences.cpp:1370 msgid "Clones" msgstr "" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1363 +#: ../src/ui/dialog/inkscape-preferences.cpp:1373 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 +#: ../src/ui/dialog/inkscape-preferences.cpp:1375 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 msgid "Remove clippath/mask object after applying" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1368 +#: ../src/ui/dialog/inkscape-preferences.cpp:1378 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1380 msgid "Before applying" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1372 +#: ../src/ui/dialog/inkscape-preferences.cpp:1382 msgid "Do not group clipped/masked objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 +#: ../src/ui/dialog/inkscape-preferences.cpp:1383 msgid "Put every clipped/masked object in its own group" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Put all clipped/masked objects into one group" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1377 +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 msgid "Apply clippath/mask to every object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Apply clippath/mask to groups containing single object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 +#: ../src/ui/dialog/inkscape-preferences.cpp:1393 msgid "Apply clippath/mask to group containing all objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +#: ../src/ui/dialog/inkscape-preferences.cpp:1395 msgid "After releasing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1397 msgid "Ungroup automatically created groups" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1389 +#: ../src/ui/dialog/inkscape-preferences.cpp:1399 msgid "Ungroup groups created when setting clip/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1391 +#: ../src/ui/dialog/inkscape-preferences.cpp:1401 msgid "Clippaths and masks" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 +#: ../src/ui/dialog/inkscape-preferences.cpp:1404 msgid "Stroke Style Markers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +#: ../src/ui/dialog/inkscape-preferences.cpp:1406 +#: ../src/ui/dialog/inkscape-preferences.cpp:1408 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1402 +#: ../src/ui/dialog/inkscape-preferences.cpp:1412 #: ../share/extensions/hershey.inx.h:27 msgid "Markers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1405 +#: ../src/ui/dialog/inkscape-preferences.cpp:1415 msgid "Document cleanup" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1406 -#: ../src/ui/dialog/inkscape-preferences.cpp:1408 +#: ../src/ui/dialog/inkscape-preferences.cpp:1416 +#: ../src/ui/dialog/inkscape-preferences.cpp:1418 msgid "Remove unused swatches when doing a document cleanup" msgstr "" #. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1409 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 msgid "Cleanup" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +#: ../src/ui/dialog/inkscape-preferences.cpp:1427 msgid "Number of _Threads:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1417 -#: ../src/ui/dialog/inkscape-preferences.cpp:1953 +#: ../src/ui/dialog/inkscape-preferences.cpp:1427 +#: ../src/ui/dialog/inkscape-preferences.cpp:1963 msgid "(requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1418 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgid "Rendering _cache size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgid "" "Set the amount of memory per document which can be used to store rendered " "parts of the drawing for later reuse; set to zero to disable caching" @@ -19391,365 +19418,365 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1425 -#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1435 +#: ../src/ui/dialog/inkscape-preferences.cpp:1459 msgid "Best quality (slowest)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1437 +#: ../src/ui/dialog/inkscape-preferences.cpp:1461 msgid "Better quality (slower)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 -#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1439 +#: ../src/ui/dialog/inkscape-preferences.cpp:1463 msgid "Average quality" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1441 +#: ../src/ui/dialog/inkscape-preferences.cpp:1465 msgid "Lower quality (faster)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1433 -#: ../src/ui/dialog/inkscape-preferences.cpp:1457 +#: ../src/ui/dialog/inkscape-preferences.cpp:1443 +#: ../src/ui/dialog/inkscape-preferences.cpp:1467 msgid "Lowest quality (fastest)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1446 msgid "Gaussian blur quality for display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 -#: ../src/ui/dialog/inkscape-preferences.cpp:1462 +#: ../src/ui/dialog/inkscape-preferences.cpp:1448 +#: ../src/ui/dialog/inkscape-preferences.cpp:1472 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1440 -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#: ../src/ui/dialog/inkscape-preferences.cpp:1450 +#: ../src/ui/dialog/inkscape-preferences.cpp:1474 msgid "Better quality, but slower display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1442 -#: ../src/ui/dialog/inkscape-preferences.cpp:1466 +#: ../src/ui/dialog/inkscape-preferences.cpp:1452 +#: ../src/ui/dialog/inkscape-preferences.cpp:1476 msgid "Average quality, acceptable display speed" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#: ../src/ui/dialog/inkscape-preferences.cpp:1454 +#: ../src/ui/dialog/inkscape-preferences.cpp:1478 msgid "Lower quality (some artifacts), but display is faster" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1446 -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#: ../src/ui/dialog/inkscape-preferences.cpp:1456 +#: ../src/ui/dialog/inkscape-preferences.cpp:1480 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1460 +#: ../src/ui/dialog/inkscape-preferences.cpp:1470 msgid "Filter effects quality for display" msgstr "" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1472 +#: ../src/ui/dialog/inkscape-preferences.cpp:1482 #: ../src/ui/dialog/print.cpp:215 msgid "Rendering" msgstr "" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1478 ../src/verbs.cpp:156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1488 ../src/verbs.cpp:156 #: ../src/widgets/calligraphy-toolbar.cpp:626 msgid "Edit" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1479 +#: ../src/ui/dialog/inkscape-preferences.cpp:1489 msgid "Automatically reload bitmaps" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +#: ../src/ui/dialog/inkscape-preferences.cpp:1491 msgid "Automatically reload linked images when file is changed on disk" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1483 +#: ../src/ui/dialog/inkscape-preferences.cpp:1493 msgid "_Bitmap editor:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 +#: ../src/ui/dialog/inkscape-preferences.cpp:1495 #: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1487 +#: ../src/ui/dialog/inkscape-preferences.cpp:1497 msgid "Default export _resolution:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1488 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 +#: ../src/ui/dialog/inkscape-preferences.cpp:1499 #: ../src/ui/dialog/xml-tree.cpp:920 msgid "Create" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 +#: ../src/ui/dialog/inkscape-preferences.cpp:1501 msgid "Resolution for Create Bitmap _Copy:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1492 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 msgid "Resolution used by the Create Bitmap Copy command" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1495 +#: ../src/ui/dialog/inkscape-preferences.cpp:1505 msgid "Ask about linking and scaling when importing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1497 +#: ../src/ui/dialog/inkscape-preferences.cpp:1507 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1503 +#: ../src/ui/dialog/inkscape-preferences.cpp:1513 msgid "Bitmap link:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1510 +#: ../src/ui/dialog/inkscape-preferences.cpp:1520 msgid "Bitmap scale (image-rendering):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1515 +#: ../src/ui/dialog/inkscape-preferences.cpp:1525 msgid "Default _import resolution:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1516 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1517 +#: ../src/ui/dialog/inkscape-preferences.cpp:1527 msgid "Override file resolution" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1519 +#: ../src/ui/dialog/inkscape-preferences.cpp:1529 msgid "Use default bitmap resolution in favor of information from file" msgstr "" #. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1523 +#: ../src/ui/dialog/inkscape-preferences.cpp:1533 msgid "Images in Outline Mode" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1524 +#: ../src/ui/dialog/inkscape-preferences.cpp:1534 msgid "" "When active will render images while in outline mode instead of a red box " "with an x. This is useful for manual tracing." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1526 +#: ../src/ui/dialog/inkscape-preferences.cpp:1536 msgid "Bitmaps" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1538 +#: ../src/ui/dialog/inkscape-preferences.cpp:1548 msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1541 +#: ../src/ui/dialog/inkscape-preferences.cpp:1551 msgid "Shortcut file:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1544 +#: ../src/ui/dialog/inkscape-preferences.cpp:1554 #: ../src/ui/dialog/template-load-tab.cpp:48 msgid "Search:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1556 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 msgid "Shortcut" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1557 +#: ../src/ui/dialog/inkscape-preferences.cpp:1567 #: ../src/ui/widget/page-sizer.cpp:287 msgid "Description" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1612 +#: ../src/ui/dialog/inkscape-preferences.cpp:1622 msgid "" "Remove all your customized keyboard shortcuts, and revert to the shortcuts " "in the shortcut file listed above" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1616 +#: ../src/ui/dialog/inkscape-preferences.cpp:1626 msgid "Import ..." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1616 +#: ../src/ui/dialog/inkscape-preferences.cpp:1626 msgid "Import custom keyboard shortcuts from a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1619 +#: ../src/ui/dialog/inkscape-preferences.cpp:1629 msgid "Export ..." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1619 +#: ../src/ui/dialog/inkscape-preferences.cpp:1629 msgid "Export custom keyboard shortcuts to a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1629 +#: ../src/ui/dialog/inkscape-preferences.cpp:1639 msgid "Keyboard Shortcuts" msgstr "" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1792 +#: ../src/ui/dialog/inkscape-preferences.cpp:1802 msgid "Misc" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1894 +#: ../src/ui/dialog/inkscape-preferences.cpp:1904 msgctxt "Spellchecker language" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1915 +#: ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "Set the main spell check language" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1918 +#: ../src/ui/dialog/inkscape-preferences.cpp:1928 msgid "Second language:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1919 +#: ../src/ui/dialog/inkscape-preferences.cpp:1929 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 +#: ../src/ui/dialog/inkscape-preferences.cpp:1932 msgid "Third language:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1923 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1925 +#: ../src/ui/dialog/inkscape-preferences.cpp:1935 msgid "Ignore words with digits" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1927 +#: ../src/ui/dialog/inkscape-preferences.cpp:1937 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1929 +#: ../src/ui/dialog/inkscape-preferences.cpp:1939 msgid "Ignore words in ALL CAPITALS" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1931 +#: ../src/ui/dialog/inkscape-preferences.cpp:1941 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1933 +#: ../src/ui/dialog/inkscape-preferences.cpp:1943 msgid "Spellcheck" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1953 +#: ../src/ui/dialog/inkscape-preferences.cpp:1963 msgid "Latency _skew:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1954 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1956 +#: ../src/ui/dialog/inkscape-preferences.cpp:1966 msgid "Pre-render named icons" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1958 +#: ../src/ui/dialog/inkscape-preferences.cpp:1968 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1966 +#: ../src/ui/dialog/inkscape-preferences.cpp:1976 msgid "System info" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1970 +#: ../src/ui/dialog/inkscape-preferences.cpp:1980 msgid "User config: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1970 +#: ../src/ui/dialog/inkscape-preferences.cpp:1980 msgid "Location of users configuration" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1974 +#: ../src/ui/dialog/inkscape-preferences.cpp:1984 msgid "User preferences: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1974 +#: ../src/ui/dialog/inkscape-preferences.cpp:1984 msgid "Location of the users preferences file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1978 +#: ../src/ui/dialog/inkscape-preferences.cpp:1988 msgid "User extensions: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1978 +#: ../src/ui/dialog/inkscape-preferences.cpp:1988 msgid "Location of the users extensions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1982 +#: ../src/ui/dialog/inkscape-preferences.cpp:1992 msgid "User cache: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1982 +#: ../src/ui/dialog/inkscape-preferences.cpp:1992 msgid "Location of users cache" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1990 +#: ../src/ui/dialog/inkscape-preferences.cpp:2000 msgid "Temporary files: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1990 +#: ../src/ui/dialog/inkscape-preferences.cpp:2000 msgid "Location of the temporary files used for autosave" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1994 +#: ../src/ui/dialog/inkscape-preferences.cpp:2004 msgid "Inkscape data: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1994 +#: ../src/ui/dialog/inkscape-preferences.cpp:2004 msgid "Location of Inkscape data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1998 +#: ../src/ui/dialog/inkscape-preferences.cpp:2008 msgid "Inkscape extensions: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1998 +#: ../src/ui/dialog/inkscape-preferences.cpp:2008 msgid "Location of the Inkscape extensions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2007 +#: ../src/ui/dialog/inkscape-preferences.cpp:2017 msgid "System data: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2007 +#: ../src/ui/dialog/inkscape-preferences.cpp:2017 msgid "Locations of system data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2031 +#: ../src/ui/dialog/inkscape-preferences.cpp:2041 msgid "Icon theme: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2031 +#: ../src/ui/dialog/inkscape-preferences.cpp:2041 msgid "Locations of icon themes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2033 +#: ../src/ui/dialog/inkscape-preferences.cpp:2043 msgid "System" msgstr "" @@ -21176,7 +21203,7 @@ msgid "Vertical text" msgstr "" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -msgid "Spacing between lines (percent of font size)" +msgid "Spacing between baselines (percent of font size)" msgstr "" #: ../src/ui/dialog/text-edit.cpp:147 @@ -22734,11 +22761,11 @@ msgstr "" msgid "Set picked color" msgstr "" -#: ../src/ui/tools/eraser-tool.cpp:427 +#: ../src/ui/tools/eraser-tool.cpp:436 msgid "Drawing an eraser stroke" msgstr "" -#: ../src/ui/tools/eraser-tool.cpp:753 +#: ../src/ui/tools/eraser-tool.cpp:797 msgid "Draw eraser stroke" msgstr "" @@ -23241,33 +23268,33 @@ msgstr "" msgid "Selection canceled." msgstr "" -#: ../src/ui/tools/select-tool.cpp:636 +#: ../src/ui/tools/select-tool.cpp:638 msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" msgstr "" -#: ../src/ui/tools/select-tool.cpp:638 +#: ../src/ui/tools/select-tool.cpp:640 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" msgstr "" -#: ../src/ui/tools/select-tool.cpp:919 +#: ../src/ui/tools/select-tool.cpp:921 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "" -#: ../src/ui/tools/select-tool.cpp:920 +#: ../src/ui/tools/select-tool.cpp:922 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" -#: ../src/ui/tools/select-tool.cpp:921 +#: ../src/ui/tools/select-tool.cpp:923 msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" msgstr "" -#: ../src/ui/tools/select-tool.cpp:1129 +#: ../src/ui/tools/select-tool.cpp:1131 msgid "Selected object is not a group. Cannot enter." msgstr "" @@ -24735,7 +24762,7 @@ msgstr "" msgid "3D box: Move vanishing point" msgstr "" -#: ../src/vanishing-point.cpp:330 +#: ../src/vanishing-point.cpp:329 #, c-format msgid "Finite vanishing point shared by %d box" msgid_plural "" @@ -24746,7 +24773,7 @@ msgstr[1] "" #. This won't make sense any more when infinite VPs are not shown on the canvas, #. but currently we update the status message anyway -#: ../src/vanishing-point.cpp:337 +#: ../src/vanishing-point.cpp:336 #, c-format msgid "Infinite vanishing point shared by %d box" msgid_plural "" @@ -24755,7 +24782,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../src/vanishing-point.cpp:345 +#: ../src/vanishing-point.cpp:344 #, c-format msgid "" "shared by %d box; drag with Shift to separate selected box(es)" @@ -27205,7 +27232,7 @@ msgstr "" #. Width #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(hairline)" msgstr "" @@ -27214,7 +27241,7 @@ msgstr "" #. Scale #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:372 +#: ../src/widgets/eraser-toolbar.cpp:151 ../src/widgets/pencil-toolbar.cpp:372 #: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 #: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:408 #: ../src/widgets/spray-toolbar.cpp:438 ../src/widgets/spray-toolbar.cpp:456 @@ -27224,12 +27251,12 @@ msgid "(default)" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(broad stroke)" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 +#: ../src/widgets/eraser-toolbar.cpp:154 msgid "Pen Width" msgstr "" @@ -27414,18 +27441,22 @@ msgstr "" #. Mass #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(no inertia)" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(slight smoothing, default)" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(noticeable lagging)" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(maximum inertia)" msgstr "" @@ -27434,6 +27465,7 @@ msgid "Pen Mass" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:549 +#: ../src/widgets/eraser-toolbar.cpp:171 msgid "Mass:" msgstr "" @@ -27718,22 +27750,43 @@ msgstr "" msgid "remove" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:94 +#: ../src/widgets/eraser-toolbar.cpp:121 msgid "Delete objects touched by the eraser" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:100 +#: ../src/widgets/eraser-toolbar.cpp:127 msgid "Cut" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:101 +#: ../src/widgets/eraser-toolbar.cpp:128 msgid "Cut out from objects" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:129 +#. Width +#: ../src/widgets/eraser-toolbar.cpp:151 +msgid "(no width)" +msgstr "" + +#: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "" +#: ../src/widgets/eraser-toolbar.cpp:171 +msgid "Eraser Mass" +msgstr "" + +#: ../src/widgets/eraser-toolbar.cpp:172 +msgid "Increase to make the eraser drag behind, as if slowed by inertia" +msgstr "" + +#: ../src/widgets/eraser-toolbar.cpp:186 +msgid "Break appart cutted items" +msgstr "" + +#: ../src/widgets/eraser-toolbar.cpp:187 +msgid "Break appart cutted itemss" +msgstr "" + #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" msgstr "" @@ -28818,39 +28871,39 @@ msgstr "" msgid "Make corners sharp" msgstr "" -#: ../src/widgets/ruler.cpp:193 +#: ../src/widgets/ruler.cpp:198 msgid "The orientation of the ruler" msgstr "" -#: ../src/widgets/ruler.cpp:203 +#: ../src/widgets/ruler.cpp:208 msgid "Unit of the ruler" msgstr "" -#: ../src/widgets/ruler.cpp:210 +#: ../src/widgets/ruler.cpp:215 msgid "Lower" msgstr "" -#: ../src/widgets/ruler.cpp:211 +#: ../src/widgets/ruler.cpp:216 msgid "Lower limit of ruler" msgstr "" -#: ../src/widgets/ruler.cpp:220 +#: ../src/widgets/ruler.cpp:225 msgid "Upper" msgstr "" -#: ../src/widgets/ruler.cpp:221 +#: ../src/widgets/ruler.cpp:226 msgid "Upper limit of ruler" msgstr "" -#: ../src/widgets/ruler.cpp:231 +#: ../src/widgets/ruler.cpp:236 msgid "Position of mark on the ruler" msgstr "" -#: ../src/widgets/ruler.cpp:240 +#: ../src/widgets/ruler.cpp:245 msgid "Max Size" msgstr "" -#: ../src/widgets/ruler.cpp:241 +#: ../src/widgets/ruler.cpp:246 msgid "Maximum size of the ruler" msgstr "" @@ -29477,91 +29530,111 @@ msgctxt "Stroke width" msgid "_Width:" msgstr "" -#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:239 -msgid "Miter join" +#. Dash +#: ../src/widgets/stroke-style.cpp:225 +msgid "Dashes:" +msgstr "" + +#. Drop down marker selectors +#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes +#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. +#: ../src/widgets/stroke-style.cpp:251 +msgid "Markers:" +msgstr "" + +#: ../src/widgets/stroke-style.cpp:257 +msgid "Start Markers are drawn on the first node of a path or shape" +msgstr "" + +#: ../src/widgets/stroke-style.cpp:266 +msgid "" +"Mid Markers are drawn on every node of a path or shape except the first and " +"last nodes" +msgstr "" + +#: ../src/widgets/stroke-style.cpp:275 +msgid "End Markers are drawn on the last node of a path or shape" msgstr "" #. TRANSLATORS: Round join: joining lines with a rounded corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:247 +#: ../src/widgets/stroke-style.cpp:300 msgid "Round join" msgstr "" #. TRANSLATORS: Bevel join: joining lines with a blunted (flattened) corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:255 +#: ../src/widgets/stroke-style.cpp:308 msgid "Bevel join" msgstr "" -#: ../src/widgets/stroke-style.cpp:280 -msgid "Miter _limit:" +#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:316 +msgid "Miter join" msgstr "" #. Cap type #. TRANSLATORS: cap type specifies the shape for the ends of lines #. spw_label(t, _("_Cap:"), 0, i); -#: ../src/widgets/stroke-style.cpp:296 +#: ../src/widgets/stroke-style.cpp:353 msgid "Cap:" msgstr "" #. TRANSLATORS: Butt cap: the line shape does not extend beyond the end point #. of the line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:307 +#: ../src/widgets/stroke-style.cpp:364 msgid "Butt cap" msgstr "" #. TRANSLATORS: Round cap: the line shape extends beyond the end point of the #. line; the ends of the line are rounded -#: ../src/widgets/stroke-style.cpp:314 +#: ../src/widgets/stroke-style.cpp:371 msgid "Round cap" msgstr "" #. TRANSLATORS: Square cap: the line shape extends beyond the end point of the #. line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:321 +#: ../src/widgets/stroke-style.cpp:378 msgid "Square cap" msgstr "" -#. Dash -#: ../src/widgets/stroke-style.cpp:326 -msgid "Dashes:" +#: ../src/widgets/stroke-style.cpp:392 +msgid "Fill, Stroke, Markers" msgstr "" -#. Drop down marker selectors -#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes -#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. -#: ../src/widgets/stroke-style.cpp:352 -msgid "Markers:" +#: ../src/widgets/stroke-style.cpp:396 +msgid "Stroke, Fill, Markers" msgstr "" -#: ../src/widgets/stroke-style.cpp:358 -msgid "Start Markers are drawn on the first node of a path or shape" +#: ../src/widgets/stroke-style.cpp:400 +msgid "Fill, Markers, Stroke" msgstr "" -#: ../src/widgets/stroke-style.cpp:367 -msgid "" -"Mid Markers are drawn on every node of a path or shape except the first and " -"last nodes" +#: ../src/widgets/stroke-style.cpp:408 +msgid "Markers, Fill, Stroke" msgstr "" -#: ../src/widgets/stroke-style.cpp:376 -msgid "End Markers are drawn on the last node of a path or shape" +#: ../src/widgets/stroke-style.cpp:412 +msgid "Stroke, Markers, Fill" +msgstr "" + +#: ../src/widgets/stroke-style.cpp:416 +msgid "Markers, Stroke, Fill" msgstr "" -#: ../src/widgets/stroke-style.cpp:498 +#: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" msgstr "" -#: ../src/widgets/stroke-style.cpp:1033 ../src/widgets/stroke-style.cpp:1117 +#: ../src/widgets/stroke-style.cpp:1116 ../src/widgets/stroke-style.cpp:1205 msgid "Set stroke style" msgstr "" -#: ../src/widgets/stroke-style.cpp:1206 +#: ../src/widgets/stroke-style.cpp:1309 msgid "Set marker color" msgstr "" @@ -29768,7 +29841,7 @@ msgstr "" #. short label #: ../src/widgets/text-toolbar.cpp:1595 -msgid "Spacing between lines (times font size)" +msgid "Spacing between baselines (times font size)" msgstr "" #. Drop down menu @@ -29899,131 +29972,131 @@ msgstr "" msgid "Style of Paint Bucket fill objects" msgstr "" -#: ../src/widgets/toolbox.cpp:1732 +#: ../src/widgets/toolbox.cpp:1735 msgid "Bounding box" msgstr "" -#: ../src/widgets/toolbox.cpp:1732 +#: ../src/widgets/toolbox.cpp:1735 msgid "Snap bounding boxes" msgstr "" -#: ../src/widgets/toolbox.cpp:1741 +#: ../src/widgets/toolbox.cpp:1744 msgid "Bounding box edges" msgstr "" -#: ../src/widgets/toolbox.cpp:1741 +#: ../src/widgets/toolbox.cpp:1744 msgid "Snap to edges of a bounding box" msgstr "" -#: ../src/widgets/toolbox.cpp:1750 +#: ../src/widgets/toolbox.cpp:1753 msgid "Bounding box corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1750 +#: ../src/widgets/toolbox.cpp:1753 msgid "Snap bounding box corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1759 +#: ../src/widgets/toolbox.cpp:1762 msgid "BBox Edge Midpoints" msgstr "" -#: ../src/widgets/toolbox.cpp:1759 +#: ../src/widgets/toolbox.cpp:1762 msgid "Snap midpoints of bounding box edges" msgstr "" -#: ../src/widgets/toolbox.cpp:1769 +#: ../src/widgets/toolbox.cpp:1772 msgid "BBox Centers" msgstr "" -#: ../src/widgets/toolbox.cpp:1769 +#: ../src/widgets/toolbox.cpp:1772 msgid "Snapping centers of bounding boxes" msgstr "" -#: ../src/widgets/toolbox.cpp:1778 +#: ../src/widgets/toolbox.cpp:1781 msgid "Snap nodes, paths, and handles" msgstr "" -#: ../src/widgets/toolbox.cpp:1786 +#: ../src/widgets/toolbox.cpp:1789 msgid "Snap to paths" msgstr "" -#: ../src/widgets/toolbox.cpp:1795 +#: ../src/widgets/toolbox.cpp:1798 msgid "Path intersections" msgstr "" -#: ../src/widgets/toolbox.cpp:1795 +#: ../src/widgets/toolbox.cpp:1798 msgid "Snap to path intersections" msgstr "" -#: ../src/widgets/toolbox.cpp:1804 +#: ../src/widgets/toolbox.cpp:1807 msgid "To nodes" msgstr "" -#: ../src/widgets/toolbox.cpp:1804 +#: ../src/widgets/toolbox.cpp:1807 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1813 +#: ../src/widgets/toolbox.cpp:1816 msgid "Smooth nodes" msgstr "" -#: ../src/widgets/toolbox.cpp:1813 +#: ../src/widgets/toolbox.cpp:1816 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:1822 +#: ../src/widgets/toolbox.cpp:1825 msgid "Line Midpoints" msgstr "" -#: ../src/widgets/toolbox.cpp:1822 +#: ../src/widgets/toolbox.cpp:1825 msgid "Snap midpoints of line segments" msgstr "" -#: ../src/widgets/toolbox.cpp:1831 +#: ../src/widgets/toolbox.cpp:1834 msgid "Others" msgstr "" -#: ../src/widgets/toolbox.cpp:1831 +#: ../src/widgets/toolbox.cpp:1834 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" -#: ../src/widgets/toolbox.cpp:1839 +#: ../src/widgets/toolbox.cpp:1842 msgid "Object Centers" msgstr "" -#: ../src/widgets/toolbox.cpp:1839 +#: ../src/widgets/toolbox.cpp:1842 msgid "Snap centers of objects" msgstr "" -#: ../src/widgets/toolbox.cpp:1848 +#: ../src/widgets/toolbox.cpp:1851 msgid "Rotation Centers" msgstr "" -#: ../src/widgets/toolbox.cpp:1848 +#: ../src/widgets/toolbox.cpp:1851 msgid "Snap an item's rotation center" msgstr "" -#: ../src/widgets/toolbox.cpp:1857 +#: ../src/widgets/toolbox.cpp:1860 msgid "Text baseline" msgstr "" -#: ../src/widgets/toolbox.cpp:1857 +#: ../src/widgets/toolbox.cpp:1860 msgid "Snap text anchors and baselines" msgstr "" -#: ../src/widgets/toolbox.cpp:1867 +#: ../src/widgets/toolbox.cpp:1870 msgid "Page border" msgstr "" -#: ../src/widgets/toolbox.cpp:1867 +#: ../src/widgets/toolbox.cpp:1870 msgid "Snap to the page border" msgstr "" -#: ../src/widgets/toolbox.cpp:1876 +#: ../src/widgets/toolbox.cpp:1879 msgid "Snap to grids" msgstr "" -#: ../src/widgets/toolbox.cpp:1885 +#: ../src/widgets/toolbox.cpp:1888 msgid "Snap guides" msgstr "" @@ -31395,10 +31468,26 @@ msgstr "" msgid "Randomize" msgstr "" -#: ../share/extensions/color_randomize.inx.h:7 +#: ../share/extensions/color_randomize.inx.h:5 +#, no-c-format +msgid "Hue range (%)" +msgstr "" + +#: ../share/extensions/color_randomize.inx.h:8 +#, no-c-format +msgid "Saturation range (%)" +msgstr "" + +#: ../share/extensions/color_randomize.inx.h:11 +#, no-c-format +msgid "Lightness range (%)" +msgstr "" + +#: ../share/extensions/color_randomize.inx.h:13 msgid "" "Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB." +"converts it back to RGB. Lower the range values to limit the distance " +"between the original color and the randomized one." msgstr "" #: ../share/extensions/color_removeblue.inx.h:1 -- cgit v1.2.3 From cd166baa1470b0ca83973f76fabea9a935163344 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 8 Mar 2016 15:10:38 +0100 Subject: Add PDF/PS output support for 'paint-order' property. (bzr r14696) --- src/extension/internal/cairo-render-context.cpp | 90 ++++++++++++++++++++----- src/extension/internal/cairo-render-context.h | 9 ++- src/extension/internal/cairo-renderer.cpp | 30 ++++++++- 3 files changed, 110 insertions(+), 19 deletions(-) diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index f811f00ad..5d8b0e076 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -1453,8 +1453,11 @@ CairoRenderContext::_prepareRenderText() } } +/* We need CairoPaintOrder as markers are rendered in a separate step and may be rendered + * inbetween fill and stroke. + */ bool -CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle const *style, Geom::OptRect const &pbox) +CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle const *style, Geom::OptRect const &pbox, CairoPaintOrder order) { g_assert( _is_valid ); @@ -1476,9 +1479,10 @@ CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle con return true; } - bool no_fill = style->fill.isNone() || style->fill_opacity.value == 0; + bool no_fill = style->fill.isNone() || style->fill_opacity.value == 0 || + order == STROKE_ONLY; bool no_stroke = style->stroke.isNone() || style->stroke_width.computed < 1e-9 || - style->stroke_opacity.value == 0; + style->stroke_opacity.value == 0 || order == FILL_ONLY; if (no_fill && no_stroke) return true; @@ -1492,14 +1496,17 @@ CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle con pushLayer(); if (!no_fill) { - _setFillStyle(style, pbox); - setPathVector(pathv); - if (style->fill_rule.computed == SP_WIND_RULE_EVENODD) { cairo_set_fill_rule(_cr, CAIRO_FILL_RULE_EVEN_ODD); } else { cairo_set_fill_rule(_cr, CAIRO_FILL_RULE_WINDING); } + } + + setPathVector(pathv); + + if (!no_fill && (order == STROKE_OVER_FILL || order == FILL_ONLY)) { + _setFillStyle(style, pbox); if (no_stroke) cairo_fill(_cr); @@ -1509,10 +1516,17 @@ CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle con if (!no_stroke) { _setStrokeStyle(style, pbox); - if (no_fill) - setPathVector(pathv); - cairo_stroke(_cr); + if (no_fill || order == STROKE_OVER_FILL) + cairo_stroke(_cr); + else + cairo_stroke_preserve(_cr); + } + + if (!no_fill && order == FILL_OVER_STROKE) { + _setFillStyle(style, pbox); + + cairo_fill(_cr); } if (need_layer) @@ -1642,7 +1656,7 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Affine const &font_ma return true; // create a cairo_font_face from PangoFont - double size = style->font_size.computed; /// \fixme why is this variable never used? + // double size = style->font_size.computed; /// \fixme why is this variable never used? gpointer fonthash = (gpointer)font; cairo_font_face_t *font_face = NULL; if(font_table.find(fonthash)!=font_table.end()) @@ -1699,30 +1713,72 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Affine const &font_ma _showGlyphs(_cr, font, glyphtext, TRUE); } } else { - bool fill = false, stroke = false, have_path = false; + + bool fill = false; if (style->fill.isColor() || style->fill.isPaintserver()) { fill = true; } + bool stroke = false; if (style->stroke.isColor() || style->stroke.isPaintserver()) { stroke = true; } - if (fill) { + + // Text never has markers + bool stroke_over_fill = true; + if ( (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_FILL) || + + (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[2] == SP_CSS_PAINT_ORDER_FILL) || + + (style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[2] == SP_CSS_PAINT_ORDER_FILL) ) { + stroke_over_fill = false; + } + + bool have_path = false; + if (fill && stroke_over_fill) { _setFillStyle(style, Geom::OptRect()); if (_is_texttopath) { _showGlyphs(_cr, font, glyphtext, true); - have_path = true; - if (stroke) cairo_fill_preserve(_cr); - else cairo_fill(_cr); + if (stroke) { + cairo_fill_preserve(_cr); + have_path = true; + } else { + cairo_fill(_cr); + } } else { _showGlyphs(_cr, font, glyphtext, false); } } + if (stroke) { _setStrokeStyle(style, Geom::OptRect()); - if (!have_path) _showGlyphs(_cr, font, glyphtext, true); - cairo_stroke(_cr); + if (!have_path) { + _showGlyphs(_cr, font, glyphtext, true); + } + if (fill && _is_texttopath && !stroke_over_fill) { + cairo_stroke_preserve(_cr); + have_path = true; + } else { + cairo_stroke(_cr); + } + } + + if (fill && !stroke_over_fill) { + _setFillStyle(style, Geom::OptRect()); + if (_is_texttopath) { + if (!have_path) { + // Could happen if both 'stroke' and 'stroke_over_fill' are false + _showGlyphs(_cr, font, glyphtext, true); + } + cairo_fill(_cr); + } else { + _showGlyphs(_cr, font, glyphtext, false); + } } + } cairo_restore(_cr); diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h index b3ab3655a..dfa6084d1 100644 --- a/src/extension/internal/cairo-render-context.h +++ b/src/extension/internal/cairo-render-context.h @@ -148,7 +148,14 @@ public: void addClippingRect(double x, double y, double width, double height); /* Rendering methods */ - bool renderPathVector(Geom::PathVector const &pathv, SPStyle const *style, Geom::OptRect const &pbox); + enum CairoPaintOrder { + STROKE_OVER_FILL, + FILL_OVER_STROKE, + FILL_ONLY, + STROKE_ONLY + }; + + bool renderPathVector(Geom::PathVector const &pathv, SPStyle const *style, Geom::OptRect const &pbox, CairoPaintOrder order = STROKE_OVER_FILL); bool renderImage(Inkscape::Pixbuf *pb, Geom::Affine const &image_transform, SPStyle const *style); bool renderGlyphtext(PangoFont *font, Geom::Affine const &font_matrix, diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index a4561fd11..5dc20ab06 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -194,7 +194,20 @@ static void sp_shape_render(SPShape *shape, CairoRenderContext *ctx) return; } - ctx->renderPathVector(pathv, style, pbox); + if (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_NORMAL || + (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_FILL && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_STROKE)) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::STROKE_OVER_FILL); + } else if (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_FILL ) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::FILL_OVER_STROKE); + } else if (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_MARKER ) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::STROKE_ONLY); + } else if (style->paint_order.layer[0] == SP_CSS_PAINT_ORDER_FILL && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_MARKER ) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::FILL_ONLY); + } // START marker for (int i = 0; i < 2; i++) { // SP_MARKER_LOC and SP_MARKER_LOC_START @@ -287,6 +300,21 @@ static void sp_shape_render(SPShape *shape, CairoRenderContext *ctx) sp_shape_render_invoke_marker_rendering(marker, tr, style, ctx); } } + + if (style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_FILL && + style->paint_order.layer[2] == SP_CSS_PAINT_ORDER_STROKE) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::STROKE_OVER_FILL); + } else if (style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[2] == SP_CSS_PAINT_ORDER_FILL ) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::FILL_OVER_STROKE); + } else if (style->paint_order.layer[2] == SP_CSS_PAINT_ORDER_STROKE && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_MARKER ) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::STROKE_ONLY); + } else if (style->paint_order.layer[2] == SP_CSS_PAINT_ORDER_FILL && + style->paint_order.layer[1] == SP_CSS_PAINT_ORDER_MARKER ) { + ctx->renderPathVector(pathv, style, pbox, CairoRenderContext::FILL_ONLY); + } + } static void sp_group_render(SPGroup *group, CairoRenderContext *ctx) -- cgit v1.2.3 From 9836d660348065f224b68a0f13765b73c65d54f3 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 10 Mar 2016 23:00:32 +0100 Subject: Displays filename instead of blank string in unnamed palettes Fixed bugs: - https://launchpad.net/bugs/780659 (bzr r14697) --- src/ui/dialog/swatches.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index ed1cd2079..924ebe03d 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -393,10 +393,10 @@ static bool parseNum( char*& str, int& val ) { } -void _loadPaletteFile( gchar const *filename, gboolean user/*=FALSE*/ ) +void _loadPaletteFile( gchar const *filename, gchar const *path, gboolean user/*=FALSE*/ ) { char block[1024]; - FILE *f = Inkscape::IO::fopen_utf8name( filename, "r" ); + FILE *f = Inkscape::IO::fopen_utf8name(path, "r" ); if ( f ) { char* result = fgets( block, sizeof(block), f ); if ( result ) { @@ -405,6 +405,7 @@ void _loadPaletteFile( gchar const *filename, gboolean user/*=FALSE*/ ) bool hasErr = false; SwatchPage *onceMore = new SwatchPage(); + onceMore->_name = filename; do { result = fgets( block, sizeof(block), f ); @@ -521,7 +522,7 @@ compare_swatch_names(SwatchPage const *a, SwatchPage const *b) { static void loadEmUp() { static bool beenHere = false; - gboolean userPalete = true; + gboolean userPalette = true; if ( !beenHere ) { beenHere = true; @@ -549,7 +550,7 @@ static void loadEmUp() if ( !g_str_has_suffix(lower, "~") ) { gchar* full = g_build_filename(dirname, filename, NULL); if ( !Inkscape::IO::file_test( full, G_FILE_TEST_IS_DIR ) ) { - _loadPaletteFile(full, userPalete); + _loadPaletteFile(filename, full, userPalette); } g_free(full); } @@ -563,7 +564,7 @@ static void loadEmUp() // toss the dirname g_free(dirname); sources.pop_front(); - userPalete = false; + userPalette = false; } } -- cgit v1.2.3 From 43884ced57f56cf41ad2d7fac3a8f5ba87f78276 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Fri, 11 Mar 2016 02:06:39 +0100 Subject: Improvements on the "new from template" dialog -> greyed buttons when no dialogs selected (bug 1363450) -> selected template deselects when filtered out -> filtering down to 1 template selects it -> selected template keeps looking selected when filtered Fixed bugs: - https://launchpad.net/bugs/1363450 (bzr r14698) --- src/ui/dialog/new-from-template.cpp | 18 +++++++++++++++--- src/ui/dialog/new-from-template.h | 6 ++++-- src/ui/dialog/template-load-tab.cpp | 38 +++++++++++++++++++++++++++++-------- src/ui/dialog/template-load-tab.h | 4 +++- src/ui/dialog/template-widget.cpp | 26 ++++++++++++++++--------- src/ui/dialog/template-widget.h | 1 + 6 files changed, 70 insertions(+), 23 deletions(-) diff --git a/src/ui/dialog/new-from-template.cpp b/src/ui/dialog/new-from-template.cpp index e30b148bb..74ec7111e 100644 --- a/src/ui/dialog/new-from-template.cpp +++ b/src/ui/dialog/new-from-template.cpp @@ -29,10 +29,12 @@ NewFromTemplate::NewFromTemplate() set_title(_("New From Template")); resize(400, 400); + _main_widget = new TemplateLoadTab(this); + #if WITH_GTKMM_3_0 - get_content_area()->pack_start(_main_widget); + get_content_area()->pack_start(*_main_widget); #else - get_vbox()->pack_start(_main_widget); + get_vbox()->pack_start(*_main_widget); #endif Gtk::Alignment *align; @@ -49,14 +51,24 @@ NewFromTemplate::NewFromTemplate() _create_template_button.signal_clicked().connect( sigc::mem_fun(*this, &NewFromTemplate::_createFromTemplate)); + _create_template_button.set_sensitive(false); show_all(); } +NewFromTemplate::~NewFromTemplate() +{ + delete _main_widget; +} + +void NewFromTemplate::setCreateButtonSensitive(bool value) +{ + _create_template_button.set_sensitive(value); +} void NewFromTemplate::_createFromTemplate() { - _main_widget.createTemplate(); + _main_widget->createTemplate(); _onClose(); } diff --git a/src/ui/dialog/new-from-template.h b/src/ui/dialog/new-from-template.h index 2b40af2a6..c0b65affb 100644 --- a/src/ui/dialog/new-from-template.h +++ b/src/ui/dialog/new-from-template.h @@ -27,11 +27,13 @@ class NewFromTemplate : public Gtk::Dialog friend class TemplateLoadTab; public: static void load_new_from_template(); - + void setCreateButtonSensitive(bool value); + virtual ~NewFromTemplate(); + private: NewFromTemplate(); Gtk::Button _create_template_button; - TemplateLoadTab _main_widget; + TemplateLoadTab* _main_widget; void _createFromTemplate(); void _onClose(); diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp index fca1f7b30..7eb04ff79 100644 --- a/src/ui/dialog/template-load-tab.cpp +++ b/src/ui/dialog/template-load-tab.cpp @@ -35,10 +35,11 @@ namespace Inkscape { namespace UI { -TemplateLoadTab::TemplateLoadTab() +TemplateLoadTab::TemplateLoadTab(NewFromTemplate* parent) : _current_keyword("") , _keywords_combo(true) , _current_search_type(ALL) + , _parent_widget(parent) { set_border_width(10); @@ -94,7 +95,8 @@ void TemplateLoadTab::_displayTemplateInfo() if (templateSelectionRef->get_selected()) { _current_template = (*templateSelectionRef->get_selected())[_columns.textValue]; - _info_widget->display(_tdata[_current_template]); + _info_widget->display(_tdata[_current_template]); + _parent_widget->setCreateButtonSensitive(true); } } @@ -148,11 +150,10 @@ void TemplateLoadTab::_keywordSelected() void TemplateLoadTab::_refreshTemplatesList() { - _tlist_store->clear(); - + _tlist_store->clear(); + switch (_current_search_type){ case ALL :{ - for (std::map::iterator it = _tdata.begin() ; it != _tdata.end() ; ++it) { Gtk::TreeModel::iterator iter = _tlist_store->append(); Gtk::TreeModel::Row row = *iter; @@ -160,7 +161,7 @@ void TemplateLoadTab::_refreshTemplatesList() } break; } - + case LIST_KEYWORD: { for (std::map::iterator it = _tdata.begin() ; it != _tdata.end() ; ++it) { if (it->second.keywords.count(_current_keyword.lowercase()) != 0){ @@ -171,10 +172,10 @@ void TemplateLoadTab::_refreshTemplatesList() } break; } - + case USER_SPECIFIED : { for (std::map::iterator it = _tdata.begin() ; it != _tdata.end() ; ++it) { - if (it->second.keywords.count(_current_keyword.lowercase()) != 0 || + if (it->second.keywords.count(_current_keyword.lowercase()) != 0 || it->second.display_name.lowercase().find(_current_keyword.lowercase()) != Glib::ustring::npos || it->second.author.lowercase().find(_current_keyword.lowercase()) != Glib::ustring::npos || it->second.short_description.lowercase().find(_current_keyword.lowercase()) != Glib::ustring::npos || @@ -188,6 +189,27 @@ void TemplateLoadTab::_refreshTemplatesList() break; } } + + // reselect item + Gtk::TreeIter* item_to_select = NULL; + for (Gtk::TreeModel::Children::iterator it = _tlist_store->children().begin(); it != _tlist_store->children().end(); ++it) { + Gtk::TreeModel::Row row = *it; + if (_current_template == row[_columns.textValue]) { + item_to_select = new Gtk::TreeIter(it); + break; + } + } + if (_tlist_store->children().size() == 1) { + item_to_select = new Gtk::TreeIter(_tlist_store->children().begin()); + } + if (item_to_select) { + _tlist_view.get_selection()->select(*item_to_select); + delete item_to_select; + } else { + _current_template = ""; + _info_widget->clear(); + _parent_widget->setCreateButtonSensitive(false); + } } diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h index 920ae6ca2..d11c4c77f 100644 --- a/src/ui/dialog/template-load-tab.h +++ b/src/ui/dialog/template-load-tab.h @@ -28,6 +28,7 @@ namespace Inkscape { namespace UI { class TemplateWidget; +class NewFromTemplate; class TemplateLoadTab : public Gtk::HBox { @@ -47,7 +48,7 @@ public: Inkscape::Extension::Effect *tpl_effect; }; - TemplateLoadTab(); + TemplateLoadTab(NewFromTemplate* parent); virtual ~TemplateLoadTab(); virtual void createTemplate(); @@ -95,6 +96,7 @@ private: }; SearchType _current_search_type; + NewFromTemplate* _parent_widget; void _getDataFromNode(Inkscape::XML::Node *, TemplateData &); void _getProceduralTemplates(); diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp index eff75b311..0d110d853 100644 --- a/src/ui/dialog/template-widget.cpp +++ b/src/ui/dialog/template-widget.cpp @@ -56,6 +56,7 @@ TemplateWidget::TemplateWidget() _more_info_button.signal_clicked().connect( sigc::mem_fun(*this, &TemplateWidget::_displayTemplateDetails)); + _more_info_button.set_sensitive(false); } @@ -85,14 +86,12 @@ void TemplateWidget::create() void TemplateWidget::display(TemplateLoadTab::TemplateData data) { + clear(); _current_template = data; _template_name_label.set_text(_current_template.display_name); _short_description_label.set_text(_current_template.short_description); - - _preview_render.hide(); - _preview_image.hide(); - + std::string imagePath = Glib::build_filename(Glib::path_get_dirname(_current_template.path), _current_template.preview_name); if (data.preview_name != ""){ _preview_image.set(imagePath); @@ -103,17 +102,26 @@ void TemplateWidget::display(TemplateLoadTab::TemplateData data) _preview_render.showImage(gPath); _preview_render.show(); } - - if (_effect_prefs != NULL){ - remove (*_effect_prefs); - _effect_prefs = NULL; - } + if (data.is_procedural){ _effect_prefs = data.tpl_effect->get_imp()->prefs_effect(data.tpl_effect, SP_ACTIVE_DESKTOP, NULL, NULL); pack_start(*_effect_prefs); } + _more_info_button.set_sensitive(true); } +void TemplateWidget::clear() +{ + _template_name_label.set_text(""); + _short_description_label.set_text(""); + _preview_render.hide(); + _preview_image.hide(); + if (_effect_prefs != NULL){ + remove (*_effect_prefs); + _effect_prefs = NULL; + } + _more_info_button.set_sensitive(false); +} void TemplateWidget::_displayTemplateDetails() { diff --git a/src/ui/dialog/template-widget.h b/src/ui/dialog/template-widget.h index bb35d26a0..13488089c 100644 --- a/src/ui/dialog/template-widget.h +++ b/src/ui/dialog/template-widget.h @@ -28,6 +28,7 @@ public: TemplateWidget (); void create(); void display(TemplateLoadTab::TemplateData); + void clear(); private: TemplateLoadTab::TemplateData _current_template; -- cgit v1.2.3 From baf25c4bd70f2cd99ed7888c94a6a77b4781e225 Mon Sep 17 00:00:00 2001 From: mathog <> Date: Fri, 11 Mar 2016 12:33:16 -0800 Subject: patch for bug 1538361, work around limits in mingw/MSVCRT (bzr r14699) --- src/extension/internal/emf-print.cpp | 2 +- src/extension/internal/text_reassemble.c | 82 ++++++++++++++++---------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index 3dfa5cb23..1c85182ae 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -253,7 +253,7 @@ unsigned int PrintEmf::begin(Inkscape::Extension::Print *mod, SPDocument *doc) char *oldlocale = g_strdup(setlocale(LC_NUMERIC, NULL)); setlocale(LC_NUMERIC, "C"); - snprintf(buff, sizeof(buff) - 1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, Inkscape::Util::Quantity::convert(dwInchesX, "in", "mm"), Inkscape::Util::Quantity::convert(dwInchesY, "in", "mm")); + snprintf(buff, sizeof(buff) - 1, "Drawing=%.1fx%.1fpx, %.1fx%.1fmm", _width, _height, Inkscape::Util::Quantity::convert(dwInchesX, "in", "mm"), Inkscape::Util::Quantity::convert(dwInchesY, "in", "mm")); setlocale(LC_NUMERIC, oldlocale); g_free(oldlocale); rec = textcomment_set(buff); diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c index fa983b83d..b23176ed5 100644 --- a/src/extension/internal/text_reassemble.c +++ b/src/extension/internal/text_reassemble.c @@ -67,11 +67,11 @@ Optional compiler switches for development: File: text_reassemble.c -Version: 0.0.17 -Date: 21-MAY-2015 +Version: 0.0.18 +Date: 11-MAR-2016 Author: David Mathog, Biology Division, Caltech email: mathog@caltech.edu -Copyright: 2015 David Mathog and California Institute of Technology (Caltech) +Copyright: 2016 David Mathog and California Institute of Technology (Caltech) */ #ifdef __cplusplus @@ -223,7 +223,7 @@ char *TR_construct_fontspec(const TCHUNK_SPECS *tsp, const char *fontname){ int newlen = 128 + strlen(fontname); /* too big, but not by much */ char *newfs = NULL; newfs = (char *) malloc(newlen); - sprintf(newfs,"%s:slant=%d:weight=%d:size=%lf:width=%d",fontname,tsp->italics,tsp->weight,tsp->fs,(tsp->co ? 75 : tsp->condensed)); + sprintf(newfs,"%s:slant=%d:weight=%d:size=%f:width=%d",fontname,tsp->italics,tsp->weight,tsp->fs,(tsp->co ? 75 : tsp->condensed)); return(newfs); } @@ -804,7 +804,7 @@ int ftinfo_load_fontname(FT_INFO *fti, const char *fontspec){ int fb; if(FcPatternGetBool( fpat, FC_OUTLINE, 0, &fb)== FcResultMatch){ printf("outline: %d\n",fb);fflush(stdout); } if(FcPatternGetBool( fpat, FC_SCALABLE, 0, &fb)== FcResultMatch){ printf("scalable: %d\n",fb);fflush(stdout); } - if(FcPatternGetDouble( fpat, FC_DPI, 0, &fd)== FcResultMatch){ printf("DPI: %lf\n",fd);fflush(stdout); } + if(FcPatternGetDouble( fpat, FC_DPI, 0, &fd)== FcResultMatch){ printf("DPI: %f\n",fd);fflush(stdout); } if(FcPatternGetInteger( fpat, FC_FONTVERSION, 0, &fb)== FcResultMatch){ printf("fontversion: %d\n",fb);fflush(stdout); } if(FcPatternGetString( fpat, FC_FULLNAME , 0, (FcChar8 **)&fs)== FcResultMatch){ printf("FULLNAME : %s\n",fs);fflush(stdout); } if(FcPatternGetString( fpat, FC_FAMILY , 0, (FcChar8 **)&fs)== FcResultMatch){ printf("FAMILY : %s\n",fs);fflush(stdout); } @@ -831,7 +831,7 @@ void ftinfo_dump(const FT_INFO *fti){ printf("fti used: %d\n",fti->used); for(i=0; i< fti->used; i++){ fsp = &(fti->fonts[i]); - printf("fti font: %6d space: %6d used: %6d spcadv %8lf fsize %8lf \n",i,fsp->space,fsp->used,fsp->spcadv,fsp->fsize); + printf("fti font: %6d space: %6d used: %6d spcadv %8f fsize %8f \n",i,fsp->space,fsp->used,fsp->spcadv,fsp->fsize); printf(" file: %s\n",fsp->file); printf(" fspc: %s\n",fsp->fontspec); for(j=0;jused;j++){ @@ -1123,18 +1123,18 @@ void cxinfo_dump(const TR_INFO *tri){ printf("cxi phase1: %d\n",cxi->phase1); printf("cxi lines: %d\n",cxi->lines); printf("cxi paras: %d\n",cxi->paras); - printf("cxi xy: %lf , %lf\n",tri->x,tri->y); + printf("cxi xy: %f , %f\n",tri->x,tri->y); for(i=0;iused;i++){ csp = &(cxi->cx[i]); bsp = &(bri->rects[csp->rt_cidx]); printf("cxi cx[%d] type:%d rt_tidx:%d kids_used:%d kids_space:%d\n",i, csp->type, csp->rt_cidx, csp->kids.used, csp->kids.space); - printf("cxi cx[%d] br (LL,UR) (%lf,%lf),(%lf,%lf)\n",i,bsp->xll,bsp->yll,bsp->xur,bsp->yur); + printf("cxi cx[%d] br (LL,UR) (%f,%f),(%f,%f)\n",i,bsp->xll,bsp->yll,bsp->xur,bsp->yur); for(j=0;jkids.used;j++){ k = csp->kids.members[j]; bsp = &(bri->rects[k]); if(csp->type == TR_TEXT || csp->type == TR_LINE){ - printf("cxi cx[%d] member:%3d tp_idx:%3d ldir:%d rt_tidx:%3d br (LL,UR) (%8.3lf,%8.3lf),(%8.3lf,%8.3lf) xy (%8.3lf,%8.3lf) kern (%8.3lf,%8.3lf) text:<%s> decor:%5.5x\n", + printf("cxi cx[%d] member:%3d tp_idx:%3d ldir:%d rt_tidx:%3d br (LL,UR) (%8.3f,%8.3f),(%8.3f,%8.3f) xy (%8.3f,%8.3f) kern (%8.3f,%8.3f) text:<%s> decor:%5.5x\n", i, j, k, tpi->chunks[k].ldir, tpi->chunks[k].rt_tidx, bsp->xll,bsp->yll,bsp->xur,bsp->yur, tpi->chunks[k].x, tpi->chunks[k].y, @@ -1311,7 +1311,7 @@ int brinfo_merge(BR_INFO *bri, int dst, int src){ bri->rects[dst].xur = TEREMAX(bri->rects[dst].xur, bri->rects[src].xur); bri->rects[dst].yur = TEREMIN(bri->rects[dst].yur, bri->rects[src].yur); /* MIN because Y is positive DOWN */ /* -printf("bri_Merge into rect:%d (LL,UR) dst:(%lf,%lf),(%lf,%lf) src:(%lf,%lf),(%lf,%lf)\n",dst, +printf("bri_Merge into rect:%d (LL,UR) dst:(%f,%f),(%f,%f) src:(%f,%f),(%f,%f)\n",dst, (bri->rects[dst].xll), (bri->rects[dst].yll), (bri->rects[dst].xur), @@ -1374,7 +1374,7 @@ int brinfo_overlap(const BR_INFO *bri, int dst, int src, RT_PAD *rp_dst, RT_PAD } } /* -printf("Overlap status:%d\nOverlap trects (LL,UR) dst:(%lf,%lf),(%lf,%lf) src:(%lf,%lf),(%lf,%lf)\n", +printf("Overlap status:%d\nOverlap trects (LL,UR) dst:(%f,%f),(%f,%f) src:(%f,%f),(%f,%f)\n", status, (br_dst->xll - rp_dst->left ), (br_dst->yll - rp_dst->down ), @@ -1384,7 +1384,7 @@ status, (br_src->yll - rp_src->down ), (br_src->xur + rp_src->right), (br_src->yur + rp_src->up )); -printf("Overlap brects (LL,UR) dst:(%lf,%lf),(%lf,%lf) src:(%lf,%lf),(%lf,%lf)\n", +printf("Overlap brects (LL,UR) dst:(%f,%f),(%f,%f) src:(%f,%f),(%f,%f)\n", (br_dst->xll), (br_dst->yll), (br_dst->xur), @@ -1393,7 +1393,7 @@ printf("Overlap brects (LL,UR) dst:(%lf,%lf),(%lf,%lf) src:(%lf,%lf),(%lf,%lf)\n (br_src->yll), (br_src->xur), (br_src->yur)); -printf("Overlap rprect (LL,UR) dst:(%lf,%lf),(%lf,%lf) src:(%lf,%lf),(%lf,%lf)\n", +printf("Overlap rprect (LL,UR) dst:(%f,%f),(%f,%f) src:(%f,%f),(%f,%f)\n", (rp_dst->left), (rp_dst->down), (rp_dst->right), @@ -1481,7 +1481,7 @@ enum tr_classes brinfo_pp_alignment(const BR_INFO *bri, int dst, int src, double newtype = TR_PARA_UJ; } /* -printf("pp_align newtype:%d brects (LL,UR) dst:(%lf,%lf),(%lf,%lf) src:(%lf,%lf),(%lf,%lf)\n", +printf("pp_align newtype:%d brects (LL,UR) dst:(%f,%f),(%f,%f) src:(%f,%f),(%f,%f)\n", newtype, (br_dst->xll), (br_dst->yll), @@ -1779,7 +1779,7 @@ int trinfo_load_textrec(TR_INFO *tri, const TCHUNK_SPECS *tsp, double escapement tpi->chunks[current].y = x * sin(escapement) + y * cos(escapement); /* Careful! face bbox does NOT scale with FT_Set_Char_Size -printf("Face idx:%d bbox: xMax/Min:%ld,%ld yMax/Min:%ld,%ld UpEM:%d asc/des:%d,%d height:%d size:%lf\n", +printf("Face idx:%d bbox: xMax/Min:%ld,%ld yMax/Min:%ld,%ld UpEM:%d asc/des:%d,%d height:%d size:%f\n", idx, fsp->face->bbox.xMax,fsp->face->bbox.xMin, fsp->face->bbox.yMax,fsp->face->bbox.yMin, @@ -1955,7 +1955,7 @@ void TR_layout_2_svg(TR_INFO *tri){ /* put rectangles down for each text string - debugging!!! This will not work properly for any Narrow fonts */ esc = tri->esc; esc *= 2.0 * M_PI / 360.0; /* degrees to radians and change direction of rotation */ - sprintf(stransform,"transform=\"matrix(%lf,%lf,%lf,%lf,%lf,%lf)\"\n",cos(esc),-sin(esc),sin(esc),cos(esc), 1.25*x,1.25*y); + sprintf(stransform,"transform=\"matrix(%f,%f,%f,%f,%f,%f)\"\n",cos(esc),-sin(esc),sin(esc),cos(esc), 1.25*x,1.25*y); for(i=cxi->phase1; iused;i++){ /* over all complex members from phase2 == TR_PARA_* complexes */ csp = &(cxi->cx[i]); for(j=0; jkids.used; j++){ /* over all members of these complexes, which are phase1 complexes */ @@ -1968,11 +1968,11 @@ void TR_layout_2_svg(TR_INFO *tri){ #if DBG_TR_PARA TRPRINT(tri, "rects[csp->rt_cidx].xur - bri->rects[csp->rt_cidx].xll)); + sprintf(obuf,"width=\"%f\"\n", 1.25*(bri->rects[csp->rt_cidx].xur - bri->rects[csp->rt_cidx].xll)); TRPRINT(tri, obuf); - sprintf(obuf,"height=\"%lf\"\n",1.25*(bri->rects[csp->rt_cidx].yll - bri->rects[csp->rt_cidx].yur)); + sprintf(obuf,"height=\"%f\"\n",1.25*(bri->rects[csp->rt_cidx].yll - bri->rects[csp->rt_cidx].yur)); TRPRINT(tri, obuf); - sprintf(obuf,"x=\"%lf\" y=\"%lf\"\n",1.25*(bri->rects[csp->rt_cidx].xll),1.25*(bri->rects[csp->rt_cidx].yur)); + sprintf(obuf,"x=\"%f\" y=\"%f\"\n",1.25*(bri->rects[csp->rt_cidx].xll),1.25*(bri->rects[csp->rt_cidx].yur)); TRPRINT(tri, obuf); TRPRINT(tri, stransform); TRPRINT(tri, "/>\n"); @@ -1983,23 +1983,23 @@ void TR_layout_2_svg(TR_INFO *tri){ newy = 1.25*(bri->rects[tsp->rt_tidx].yur); TRPRINT(tri, "rects[tsp->rt_tidx].xur - bri->rects[tsp->rt_tidx].xll)); + sprintf(obuf,"width=\"%f\"\n", 1.25*(bri->rects[tsp->rt_tidx].xur - bri->rects[tsp->rt_tidx].xll)); TRPRINT(tri, obuf); - sprintf(obuf,"height=\"%lf\"\n",1.25*(bri->rects[tsp->rt_tidx].yll - bri->rects[tsp->rt_tidx].yur)); + sprintf(obuf,"height=\"%f\"\n",1.25*(bri->rects[tsp->rt_tidx].yll - bri->rects[tsp->rt_tidx].yur)); TRPRINT(tri, obuf); - sprintf(obuf,"x=\"%lf\" y=\"%lf\"\n",1.25*(bri->rects[tsp->rt_tidx].xll),newy); + sprintf(obuf,"x=\"%f\" y=\"%f\"\n",1.25*(bri->rects[tsp->rt_tidx].xll),newy); TRPRINT(tri, obuf); TRPRINT(tri, stransform); TRPRINT(tri, "/>\n"); newy = 1.25*(bri->rects[tsp->rt_tidx].yll - tsp->boff); - sprintf(obuf,"fs*1.25); /*IMPORTANT, if the FS is given in pt it looks like crap in browsers. As if px != 1.25 pt, maybe 96 dpi not 90?*/ + sprintf(obuf,"font-size:%fpx;",tsp->fs*1.25); /*IMPORTANT, if the FS is given in pt it looks like crap in browsers. As if px != 1.25 pt, maybe 96 dpi not 90?*/ TRPRINT(tri, obuf); sprintf(obuf,"font-style:%s;",(tsp->italics ? "italic" : "normal")); TRPRINT(tri, obuf); @@ -2025,7 +2025,7 @@ void TR_layout_2_svg(TR_INFO *tri){ if(tri->usebk){ esc = tri->esc; esc *= 2.0 * M_PI / 360.0; /* degrees to radians and change direction of rotation */ - sprintf(stransform,"transform=\"matrix(%lf,%lf,%lf,%lf,%lf,%lf)\"\n",cos(esc),-sin(esc),sin(esc),cos(esc), 1.25*x,1.25*y); + sprintf(stransform,"transform=\"matrix(%f,%f,%f,%f,%f,%f)\"\n",cos(esc),-sin(esc),sin(esc),cos(esc), 1.25*x,1.25*y); for(i=cxi->phase1; iused;i++){ /* over all complex members from phase2 == TR_PARA_* complexes */ TRPRINT(tri, "\n"); /* group backgrounds for each object in the SVG */ @@ -2037,11 +2037,11 @@ void TR_layout_2_svg(TR_INFO *tri){ TRPRINT(tri, "bkcolor.Red,tri->bkcolor.Green,tri->bkcolor.Blue); TRPRINT(tri, obuf); - sprintf(obuf,"width=\"%lf\"\n", 1.25*(bri->rects[cline_sp->rt_cidx].xur - bri->rects[cline_sp->rt_cidx].xll)); + sprintf(obuf,"width=\"%f\"\n", 1.25*(bri->rects[cline_sp->rt_cidx].xur - bri->rects[cline_sp->rt_cidx].xll)); TRPRINT(tri, obuf); - sprintf(obuf,"height=\"%lf\"\n",1.25*(bri->rects[cline_sp->rt_cidx].yll - bri->rects[cline_sp->rt_cidx].yur)); + sprintf(obuf,"height=\"%f\"\n",1.25*(bri->rects[cline_sp->rt_cidx].yll - bri->rects[cline_sp->rt_cidx].yur)); TRPRINT(tri, obuf); - sprintf(obuf,"x=\"%lf\" y=\"%lf\"\n",1.25*(bri->rects[cline_sp->rt_cidx].xll),1.25*(bri->rects[cline_sp->rt_cidx].yur)); + sprintf(obuf,"x=\"%f\" y=\"%f\"\n",1.25*(bri->rects[cline_sp->rt_cidx].xll),1.25*(bri->rects[cline_sp->rt_cidx].yur)); TRPRINT(tri, obuf); TRPRINT(tri, stransform); TRPRINT(tri, "/>\n"); @@ -2056,11 +2056,11 @@ void TR_layout_2_svg(TR_INFO *tri){ TRPRINT(tri, "bkcolor.Red,tri->bkcolor.Green,tri->bkcolor.Blue); TRPRINT(tri, obuf); - sprintf(obuf,"width=\"%lf\"\n", 1.25*(bri->rects[csp->rt_cidx].xur - bri->rects[csp->rt_cidx].xll)); + sprintf(obuf,"width=\"%f\"\n", 1.25*(bri->rects[csp->rt_cidx].xur - bri->rects[csp->rt_cidx].xll)); TRPRINT(tri, obuf); - sprintf(obuf,"height=\"%lf\"\n",1.25*(bri->rects[csp->rt_cidx].yll - bri->rects[csp->rt_cidx].yur)); + sprintf(obuf,"height=\"%f\"\n",1.25*(bri->rects[csp->rt_cidx].yll - bri->rects[csp->rt_cidx].yur)); TRPRINT(tri, obuf); - sprintf(obuf,"x=\"%lf\" y=\"%lf\"\n",1.25*(bri->rects[csp->rt_cidx].xll),1.25*(bri->rects[csp->rt_cidx].yur)); + sprintf(obuf,"x=\"%f\" y=\"%f\"\n",1.25*(bri->rects[csp->rt_cidx].xll),1.25*(bri->rects[csp->rt_cidx].yur)); TRPRINT(tri, obuf); TRPRINT(tri, stransform); TRPRINT(tri, "/>\n"); @@ -2072,11 +2072,11 @@ void TR_layout_2_svg(TR_INFO *tri){ TRPRINT(tri, "bkcolor.Red,tri->bkcolor.Green,tri->bkcolor.Blue); TRPRINT(tri, obuf); - sprintf(obuf,"width=\"%lf\"\n", 1.25*(bri->rects[tsp->rt_tidx].xur - bri->rects[tsp->rt_tidx].xll)); + sprintf(obuf,"width=\"%f\"\n", 1.25*(bri->rects[tsp->rt_tidx].xur - bri->rects[tsp->rt_tidx].xll)); TRPRINT(tri, obuf); - sprintf(obuf,"height=\"%lf\"\n",1.25*(bri->rects[tsp->rt_tidx].yll - bri->rects[tsp->rt_tidx].yur)); + sprintf(obuf,"height=\"%f\"\n",1.25*(bri->rects[tsp->rt_tidx].yll - bri->rects[tsp->rt_tidx].yur)); TRPRINT(tri, obuf); - sprintf(obuf,"x=\"%lf\" y=\"%lf\"\n",newx,newy); + sprintf(obuf,"x=\"%f\" y=\"%f\"\n",newx,newy); TRPRINT(tri, obuf); TRPRINT(tri, stransform); TRPRINT(tri, "/>\n"); @@ -2135,7 +2135,7 @@ void TR_layout_2_svg(TR_INFO *tri){ TRPRINT(tri, "fs*1.25); /*IMPORTANT, if the FS is given in pt it looks like crap in browsers. As if px != 1.25 pt, maybe 96 dpi not 90?*/ + sprintf(obuf,"font-size:%fpx;",tsp->fs*1.25); /*IMPORTANT, if the FS is given in pt it looks like crap in browsers. As if px != 1.25 pt, maybe 96 dpi not 90?*/ TRPRINT(tri, obuf); sprintf(obuf,"font-style:%s;",(tsp->italics ? "italic" : "normal")); TRPRINT(tri, obuf); @@ -2146,7 +2146,7 @@ void TR_layout_2_svg(TR_INFO *tri){ TRPRINT(tri, obuf); if(tsp->vadvance){ lineheight = tsp->vadvance *100.0; } else { lineheight = 125.0; } - sprintf(obuf,"line-height:%lf%%;",lineheight); + sprintf(obuf,"line-height:%f%%;",lineheight); TRPRINT(tri, obuf); TRPRINT(tri, "letter-spacing:0px;"); TRPRINT(tri, "word-spacing:0px;"); @@ -2174,14 +2174,14 @@ void TR_layout_2_svg(TR_INFO *tri){ } TRPRINT(tri, obuf); TRPRINT(tri, "\"\n"); /* End of style specification */ - sprintf(obuf,"transform=\"matrix(%lf,%lf,%lf,%lf,%lf,%lf)\"\n",cos(esc),-sin(esc),sin(esc),cos(esc),1.25*x,1.25*y); + sprintf(obuf,"transform=\"matrix(%f,%f,%f,%f,%f,%f)\"\n",cos(esc),-sin(esc),sin(esc),cos(esc),1.25*x,1.25*y); TRPRINT(tri, obuf); tmpx = 1.25*((ldir == LDIR_RL ? bri->rects[kdx].xur : bri->rects[kdx].xll) + recenter); - sprintf(obuf,"x=\"%lf\" y=\"%lf\"\n>",tmpx,1.25*(bri->rects[kdx].yll - tsp->boff)); + sprintf(obuf,"x=\"%f\" y=\"%f\"\n>",tmpx,1.25*(bri->rects[kdx].yll - tsp->boff)); TRPRINT(tri, obuf); } tmpx = 1.25*((ldir == LDIR_RL ? bri->rects[kdx].xur : bri->rects[kdx].xll) + recenter); - sprintf(obuf,"",tmpx,1.25*(bri->rects[kdx].yll - tsp->boff)); + sprintf(obuf,"",tmpx,1.25*(bri->rects[kdx].yll - tsp->boff)); TRPRINT(tri, obuf); } TRPRINT(tri, "xkern; dy = 1.25 * tsp->ykern; - sprintf(obuf,"dx=\"%lf\" dy=\"%lf\" ",dx, dy); + sprintf(obuf,"dx=\"%f\" dy=\"%f\" ",dx, dy); TRPRINT(tri, obuf); sprintf(obuf,"style=\"fill:#%2.2X%2.2X%2.2X;",tsp->color.Red,tsp->color.Green,tsp->color.Blue); TRPRINT(tri, obuf); - sprintf(obuf,"font-size:%lfpx;",tsp->fs*1.25); /*IMPORTANT, if the FS is given in pt it looks like crap in browsers. As if px != 1.25 pt, maybe 96 dpi not 90?*/ + sprintf(obuf,"font-size:%fpx;",tsp->fs*1.25); /*IMPORTANT, if the FS is given in pt it looks like crap in browsers. As if px != 1.25 pt, maybe 96 dpi not 90?*/ TRPRINT(tri, obuf); sprintf(obuf,"font-style:%s;",(tsp->italics ? "italic" : "normal")); TRPRINT(tri, obuf); -- cgit v1.2.3 From c9d12eb92288ab99118138376cf5c3b76d6a22da Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 12 Mar 2016 17:42:06 +0100 Subject: Add new TTF to the logo in seamless pattern extension Add checkboard background to the same extension Update template to 0.01+devel Fix a bug on SPPatern when apply a transform = Affine() (bzr r14700) --- share/extensions/seamless_pattern.py | 7 ++- share/extensions/seamless_pattern.svg | 85 +++++++++++++++++------------------ src/sp-pattern.cpp | 9 ++-- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/share/extensions/seamless_pattern.py b/share/extensions/seamless_pattern.py index 11ed4c356..db8fd8c51 100755 --- a/share/extensions/seamless_pattern.py +++ b/share/extensions/seamless_pattern.py @@ -24,8 +24,8 @@ class C(inkex.Effect): self.document = etree.parse(os.path.join(path, "seamless_pattern.svg")) root = self.document.getroot() root.set("id", "SVGRoot") - root.set("width", str(width) + 'px') - root.set("height", str(height) + 'px') + root.set("width", str(width)) + root.set("height", str(height)) root.set("viewBox", "0 0 " + str(width) + " " + str(height) ) xpathStr = '//svg:rect[@id="clipPathRect"]' @@ -42,12 +42,11 @@ class C(inkex.Effect): else: designZoneData[0].set("patternTransform", "scale(" + str(10.0/factor) + "," + str(10.0) + ")") - xpathStr = '//svg:g[@id="designTop"] | //svg:g[@id="designBottom"] | //svg:g[@id="transparencyPreview"]' + xpathStr = '//svg:g[@id="designTop"] | //svg:g[@id="designBottom"]' designZone = root.xpath(xpathStr, namespaces=inkex.NSS) if designZone != []: designZone[0].set("transform", "scale(" + str(width/100.0) + "," + str(height/100.0) + ")") designZone[1].set("transform", "scale(" + str(width /100.0) + "," + str(height/100.0) + ")") - designZone[2].set("transform", "scale(" + str(width /100.0) + "," + str(height/100.0) + ")") xpathStr = '//svg:g[@id="designTop"]/child::*' designZoneData = root.xpath(xpathStr, namespaces=inkex.NSS) diff --git a/share/extensions/seamless_pattern.svg b/share/extensions/seamless_pattern.svg index 9b33970d5..5bff87af8 100644 --- a/share/extensions/seamless_pattern.svg +++ b/share/extensions/seamless_pattern.svg @@ -1,66 +1,82 @@ - - - - - - - - - - + + + + + + + + + + - + + image/svg+xml - + - - - - + - + + + +Seamless pattern +Use the layers "Pattern Foreground" and "Pattern Background" on the pattern page to create your design. The separation into two layers will make it easier for you to create and edit overlapping content like a foreground drawing with a background fill.The layer named "Pattern" is for using the seamless pattern, copying it to other documents, adding opacity etc. Select the group on the page, and use Object->Pattern->Objects to Pattern to convert your creation into a fill pattern.The layer "Preview Background" provides an easy way to preview your creation if it contains transparency.Changing this layer's visibility will not alter the pattern.If an object is moved outside the pattern/page limits, it will be difficult to select it. To move it back onto the page, select the object using the rubberband selection (click and drag a selection box) with the selection tool.Then move it back onto the page, using the arrow keys or the "Align and Distribute" dialog (Shift+Ctrl+A). + + + + + + + + + + + + + + - + - - - + + - + + - + - + @@ -69,31 +85,14 @@ - + - + - -Seamless pattern -Use the layers "Pattern Foreground" and "Pattern Background" on the pattern page to create your design. The separation into two layers will make it easier for you to create and edit overlapping content like a foreground drawing with a background fill.The layer named "Pattern" is for using the seamless pattern, copying it to other documents, adding opacity etc. Select the group on the page, and use Object->Pattern->Objects to Pattern to convert your creation into a fill pattern.The layer "Preview Background" provides an easy way to preview your creation if it contains transparency.Changing this layer's visibility will not alter the pattern.If an object is moved outside the pattern/page limits, it will be difficult to select it. To move it back onto the page, select the object using the rubberband selection (click and drag a selection box) with the selection tool.Then move it back onto the page, using the arrow keys or the "Align and Distribute" dialog (Shift+Ctrl+A). - - - - - - - - - - - - - - Seamless Pattern diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index dd351a8d5..55110f3c5 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -390,10 +390,11 @@ const gchar *SPPattern::produce(const std::vector &reprs, repr->setAttribute("patternUnits", "userSpaceOnUse"); sp_repr_set_svg_double(repr, "width", bounds.dimensions()[Geom::X]); sp_repr_set_svg_double(repr, "height", bounds.dimensions()[Geom::Y]); - - Glib::ustring t = sp_svg_transform_write(transform); - repr->setAttribute("patternTransform", t); - + //TODO: Maybe is better handle it in sp_svg_transform_write + if(transform != Geom::Affine()){ + Glib::ustring t = sp_svg_transform_write(transform); + repr->setAttribute("patternTransform", t); + } defsrepr->appendChild(repr); const gchar *pat_id = repr->attribute("id"); SPObject *pat_object = document->getObjectById(pat_id); -- cgit v1.2.3 From 1c9e7ee09d40b8e06b80d0a09eca17d1b0fb8357 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 12 Mar 2016 18:50:04 -0500 Subject: Add a units box to line height and wire in the style units, plus some cleanup (bzr r14701) --- src/desktop-style.cpp | 8 ++- src/libnrtype/Layout-TNG.cpp | 2 +- src/sp-text.cpp | 9 --- src/style.cpp | 4 +- src/ui/widget/unit-tracker.cpp | 10 +++ src/ui/widget/unit-tracker.h | 1 + src/util/units.cpp | 70 ++++++++++++++---- src/util/units.h | 8 +++ src/widgets/select-toolbar.cpp | 159 +++++++++++++++++++---------------------- src/widgets/text-toolbar.cpp | 81 +++++++++++++++++---- src/widgets/toolbox.cpp | 6 ++ 11 files changed, 233 insertions(+), 125 deletions(-) diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index c36bcee44..c28302d22 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1049,6 +1049,7 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r double letterspacing_prev = 0; double wordspacing_prev = 0; double linespacing_prev = 0; + int linespacing_unit = 0; int texts = 0; int no_size = 0; @@ -1105,6 +1106,11 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r linespacing_current = style->line_height.computed; linespacing_normal = false; } + if (linespacing_unit == 0) { + linespacing_unit = style->line_height.unit; + } else if (linespacing_unit != style->line_height.unit) { + linespacing_unit = SP_CSS_UNIT_PERCENT; + } linespacing += linespacing_current; if ((size_prev != 0 && style->font_size.computed != size_prev) || @@ -1148,7 +1154,7 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r style_res->line_height.normal = linespacing_normal; style_res->line_height.computed = linespacing; style_res->line_height.value = linespacing; - style_res->line_height.unit = SP_CSS_UNIT_PERCENT; + style_res->line_height.unit = linespacing_unit; if (texts > 1) { if (different) { diff --git a/src/libnrtype/Layout-TNG.cpp b/src/libnrtype/Layout-TNG.cpp index 8b0889188..ec488b584 100644 --- a/src/libnrtype/Layout-TNG.cpp +++ b/src/libnrtype/Layout-TNG.cpp @@ -14,7 +14,7 @@ namespace Inkscape { namespace Text { const gunichar Layout::UNICODE_SOFT_HYPHEN = 0x00AD; -const double Layout::LINE_HEIGHT_NORMAL = 1.25; +const double Layout::LINE_HEIGHT_NORMAL = 125; Layout::Layout() : _input_truncated(0), diff --git a/src/sp-text.cpp b/src/sp-text.cpp index afbe0b147..4a5b1b1d6 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -302,15 +302,6 @@ Inkscape::XML::Node *SPText::write(Inkscape::XML::Document *xml_doc, Inkscape::X this->attributes.writeTo(repr); this->rebuildLayout(); // copied from update(), see LP Bug 1339305 - // deprecated attribute, but keep it around for backwards compatibility - if (this->style->line_height.set && !this->style->line_height.inherit && !this->style->line_height.normal && this->style->line_height.unit == SP_CSS_UNIT_PERCENT) { - Inkscape::SVGOStringStream os; - os << (this->style->line_height.value * 100.0) << "%"; - this->getRepr()->setAttribute("sodipodi:linespacing", os.str().c_str()); - } else { - this->getRepr()->setAttribute("sodipodi:linespacing", NULL); - } - // SVG 2 Auto-wrapped text if( this->width.computed > 0.0 ) { sp_repr_set_svg_double(repr, "width", this->width.computed); diff --git a/src/style.cpp b/src/style.cpp index 35138d25b..99beaed22 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -113,7 +113,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : font_weight( "font-weight", enum_font_weight, SP_CSS_FONT_WEIGHT_NORMAL, SP_CSS_FONT_WEIGHT_400 ), font_stretch( "font-stretch", enum_font_stretch, SP_CSS_FONT_STRETCH_NORMAL ), font_size(), - line_height( "line-height", 1.25 ), // SPILengthOrNormal + line_height( "line-height", 125 ), // SPILengthOrNormal font_family( "font-family", "sans-serif" ), // SPIString w/default font(), // SPIFont font_specification( "-inkscape-font-specification" ), // SPIString @@ -1957,7 +1957,7 @@ sp_css_attr_scale(SPCSSAttr *css, double ex) sp_css_attr_scale_property_single(css, "kerning", ex); sp_css_attr_scale_property_single(css, "letter-spacing", ex); sp_css_attr_scale_property_single(css, "word-spacing", ex); - sp_css_attr_scale_property_single(css, "line-height", ex, true); + //sp_css_attr_scale_property_single(css, "line-height", ex, true); return css; } diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp index c6318db25..a1501c229 100644 --- a/src/ui/widget/unit-tracker.cpp +++ b/src/ui/widget/unit-tracker.cpp @@ -12,6 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "style-internal.h" #include "unit-tracker.h" #include "widgets/ege-select-one-action.h" @@ -121,6 +122,15 @@ void UnitTracker::addUnit(Inkscape::Util::Unit const *u) gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1); } +void UnitTracker::prependUnit(Inkscape::Util::Unit const *u) +{ + GtkTreeIter iter; + gtk_list_store_prepend(_store, &iter); + gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1); + /* Re-shuffle our default selection here (_active gets out of sync) */ + setActiveUnit(_activeUnit); +} + void UnitTracker::setFullVal(GtkAdjustment *adj, gdouble val) { _priorValues[adj] = val; diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h index 06245930e..0fe5bda80 100644 --- a/src/ui/widget/unit-tracker.h +++ b/src/ui/widget/unit-tracker.h @@ -42,6 +42,7 @@ public: Inkscape::Util::Unit const * getActiveUnit() const; void addUnit(Inkscape::Util::Unit const *u); + void prependUnit(Inkscape::Util::Unit const *u); void addAdjustment(GtkAdjustment *adj); void setFullVal(GtkAdjustment *adj, gdouble val); diff --git a/src/util/units.cpp b/src/util/units.cpp index 2c72ec3ae..2e7a3b1d2 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -81,7 +81,21 @@ unsigned const svg_length_lookup[] = { UNIT_CODE_PERCENT }; - +/* From SP_CSS_UNIT_* to unit */ +unsigned const sp_css_unit_lookup[] = { + 0, + UNIT_CODE_PX, + UNIT_CODE_PT, + UNIT_CODE_PC, + UNIT_CODE_MM, + UNIT_CODE_CM, + UNIT_CODE_IN, + UNIT_CODE_EM, + UNIT_CODE_EX, + UNIT_CODE_PERCENT + // UNIT_CODE_FT Missing, + // UNIT_CODE_MT Missing, +}; // maps unit codes obtained from their abbreviations to their SVGLength unit indexes typedef INK_UNORDERED_MAP UnitCodeLookup; @@ -213,6 +227,10 @@ bool Unit::compatibleWith(Glib::ustring const &u) const { return compatibleWith(unit_table.getUnit(u)); } +bool Unit::compatibleWith(char const *u) const +{ + return compatibleWith(unit_table.getUnit(u)); +} bool Unit::operator==(Unit const &other) const { @@ -231,7 +249,29 @@ int Unit::svgUnit() const return 0; } - +double Unit::convert(double from_dist, Unit const *to) const +{ + // Percentage + if (to->type == UNIT_TYPE_DIMENSIONLESS) { + return from_dist * to->factor; + } + + // Incompatible units + if (type != to->type) { + return -1; + } + + // Compatible units + return from_dist * factor / to->factor; +} +double Unit::convert(double from_dist, Glib::ustring const &to) const +{ + return convert(from_dist, unit_table.getUnit(to)); +} +double Unit::convert(double from_dist, char const *to) const +{ + return convert(from_dist, unit_table.getUnit(to)); +} Unit UnitTable::_empty_unit; @@ -283,6 +323,19 @@ Unit const *UnitTable::getUnit(SVGLength::Unit u) const } return &_empty_unit; } +/* SP_CSS_UNIT lookup */ +Unit const *UnitTable::getUnit(unsigned int u) const +{ + if (u == 0 || u > 9) { + return &_empty_unit; + } + + UnitCodeMap::const_iterator f = _unit_map.find(sp_css_unit_lookup[u]); + if (f != _unit_map.end()) { + return &(*f->second); + } + return &_empty_unit; +} Unit const *UnitTable::findUnit(double factor, UnitType type) const { @@ -505,18 +558,7 @@ Glib::ustring Quantity::string() const { double Quantity::convert(double from_dist, Unit const *from, Unit const *to) { - // Percentage - if (to->type == UNIT_TYPE_DIMENSIONLESS) { - return from_dist * to->factor; - } - - // Incompatible units - if (from->type != to->type) { - return -1; - } - - // Compatible units - return from_dist * from->factor / to->factor; + return from->convert(from_dist, to); } double Quantity::convert(double from_dist, Glib::ustring const &from, Unit const *to) { diff --git a/src/util/units.h b/src/util/units.h index 13777fd1b..a840a37ec 100644 --- a/src/util/units.h +++ b/src/util/units.h @@ -75,6 +75,11 @@ public: /** Get SVG unit code. */ int svgUnit() const; + + /** Convert value from this unit **/ + double convert(double from_dist, Unit const *to) const; + double convert(double from_dist, Glib::ustring const &to) const; + double convert(double from_dist, char const *to) const; }; class Quantity @@ -147,6 +152,9 @@ public: /** Retrieve a given unit based on its SVGLength unit */ Unit const *getUnit(SVGLength::Unit u) const; + + /** Retrieve a given unit based on its SP_CSS_UNIT */ + Unit const *getUnit(unsigned int u) const; /** Retrieve a quantity based on its string identifier */ Quantity parseQuantity(Glib::ustring const &q) const; diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index e49c4c00a..3cd6c0e28 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -136,13 +136,13 @@ sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection * } static void -sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) +sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) { - if (g_object_get_data(G_OBJECT(spw), "update")) { + if (g_object_get_data(tbl, "update")) { return; } - UnitTracker *tracker = reinterpret_cast(g_object_get_data(G_OBJECT(spw), "tracker")); + UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); if ( !tracker || tracker->isUpdating() ) { /* * When only units are being changed, don't treat changes @@ -150,7 +150,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) */ return; } - g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(TRUE)); + g_object_set_data(tbl, "update", GINT_TO_POINTER(TRUE)); SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::Selection *selection = desktop->getSelection(); @@ -168,7 +168,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) Geom::OptRect bbox_user = selection->bounds(bbox_type); if ( !bbox_user ) { - g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); + g_object_set_data(tbl, "update", GINT_TO_POINTER(FALSE)); return; } @@ -181,10 +181,10 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) Unit const *unit = tracker->getActiveUnit(); g_return_if_fail(unit != NULL); - GtkAdjustment* a_x = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "X" ) ); - GtkAdjustment* a_y = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "Y" ) ); - GtkAdjustment* a_w = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "width" ) ); - GtkAdjustment* a_h = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "height" ) ); + GtkAdjustment* a_x = GTK_ADJUSTMENT( g_object_get_data( tbl, "X" ) ); + GtkAdjustment* a_y = GTK_ADJUSTMENT( g_object_get_data( tbl, "Y" ) ); + GtkAdjustment* a_w = GTK_ADJUSTMENT( g_object_get_data( tbl, "width" ) ); + GtkAdjustment* a_h = GTK_ADJUSTMENT( g_object_get_data( tbl, "height" ) ); if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) { x0 = Quantity::convert(gtk_adjustment_get_value(a_x), unit, "px"); @@ -205,7 +205,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) } // Keep proportions if lock is on - GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(G_OBJECT(spw), "lock") ); + GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "lock") ); if ( gtk_toggle_action_get_active(lock) ) { if (adj == a_h) { x1 = x0 + yrel * bbox_user->dimensions()[Geom::X]; @@ -265,68 +265,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) desktop->getCanvas()->endForcedFullRedraws(); } - g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); -} - -static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker ) -{ -#if WITH_GTKMM_3_0 - Glib::RefPtr adj = Glib::wrap(adjustment, true); - Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(adj, climbRate, digits); -#else - Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(*Glib::wrap(adjustment, true), climbRate, digits); -#endif - inkSpinner->addUnitTracker(unit_tracker); - inkSpinner = Gtk::manage( inkSpinner ); - GtkWidget *widget = GTK_WIDGET( inkSpinner->gobj() ); - return widget; -} - -// TODO create_adjustment_action appears to be a rogue tile copy from toolbox.cpp. Resolve it to be unified: - -static EgeAdjustmentAction * create_adjustment_action( gchar const *name, - gchar const *label, - gchar const *shortLabel, - gchar const *data, - gdouble lower, - GtkWidget* focusTarget, - UnitTracker* tracker, - GtkWidget* spw, - gchar const *tooltip, - gboolean altx ) -{ - static bool init = false; - if ( !init ) { - init = true; - ege_adjustment_action_set_compact_tool_factory( createCustomSlider ); - } - - GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0.0, lower, 1e6, SPIN_STEP, SPIN_PAGE_STEP, 0 ) ); - if (tracker) { - tracker->addAdjustment(adj); - } - if ( spw ) { - g_object_set_data( G_OBJECT(spw), data, adj ); - } - - EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, Q_(label), tooltip, 0, SPIN_STEP, 3, tracker ); - if ( shortLabel ) { - g_object_set( act, "short_label", Q_(shortLabel), NULL ); - } - - g_signal_connect( G_OBJECT(adj), "value_changed", G_CALLBACK(sp_object_layout_any_value_changed), spw ); - if ( focusTarget ) { - ege_adjustment_action_set_focuswidget( act, focusTarget ); - } - - if ( altx ) { // this spinbutton will be activated by alt-x - g_object_set( G_OBJECT(act), "self-id", "altx", NULL ); - } - - // Using a cast just to make sure we pass in the right kind of function pointer - g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); - - return act; + g_object_set_data(tbl, "update", GINT_TO_POINTER(FALSE)); } // toggle button callbacks and updaters @@ -497,21 +436,60 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb // four spinbuttons - eact = create_adjustment_action( "XAction", C_("Select toolbar", "X position"), C_("Select toolbar", "X:"), "X", - -1e6, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Horizontal coordinate of selection"), TRUE ); + eact = create_adjustment_action( + /* name= */ "XAction", + /* label= */ C_("Select toolbar", "X position"), + /* shortLabel= */ C_("Select toolbar", "X:"), + /* tooltip= */ C_("Select toolbar", "Horizontal coordinate of selection"), + /* path= */ "/tools/select/X", + /* def(default) */ 0.0, + /* focusTarget= */ GTK_WIDGET(desktop->canvas), + /* dataKludge= */ G_OBJECT(spw), + /* altx, altx_mark */ TRUE, "altx", + /* lower, uppper, step, page */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, + /* descrLabels, descrValues, descrCount */ 0, 0, 0, + /* callback= */ sp_object_layout_any_value_changed, + /* unit_tracker= */ tracker, + /* climb, digits, factor */ SPIN_STEP, 3, 1); + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); - eact = create_adjustment_action( "YAction", C_("Select toolbar", "Y position"), C_("Select toolbar", "Y:"), "Y", - -1e6, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Vertical coordinate of selection"), FALSE ); + eact = create_adjustment_action( + /* name= */ "YAction", + /* label= */ C_("Select toolbar", "Y position"), + /* shortLabel= */ C_("Select toolbar", "Y:"), + /* tooltip= */ C_("Select toolbar", "Vertical coordinate of selection"), + /* path= */ "/tools/select/Y", + /* def(default) */ 0.0, + /* focusTarget= */ GTK_WIDGET(desktop->canvas), + /* dataKludge= */ G_OBJECT(spw), + /* altx, altx_mark */ TRUE, "altx", + /* lower, uppper, step, page */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, + /* descrLabels, descrValues, descrCount */ 0, 0, 0, + /* callback= */ sp_object_layout_any_value_changed, + /* unit_tracker= */ tracker, + /* climb, digits, factor */ SPIN_STEP, 3, 1); + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); - eact = create_adjustment_action( "WidthAction", C_("Select toolbar", "Width"), C_("Select toolbar", "W:"), "width", - 0.0, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Width of selection"), FALSE ); + eact = create_adjustment_action( + /* name= */ "WidthAction", + /* label= */ C_("Select toolbar", "Width"), + /* shortLabel= */ C_("Select toolbar", "W:"), + /* tooltip= */ C_("Select toolbar", "Width of selection"), + /* path= */ "/tools/select/width", + /* def(default) */ 0.0, + /* focusTarget= */ GTK_WIDGET(desktop->canvas), + /* dataKludge= */ G_OBJECT(spw), + /* altx, altx_mark */ TRUE, "altx", + /* lower, uppper, step, page */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, + /* descrLabels, descrValues, descrCount */ 0, 0, 0, + /* callback= */ sp_object_layout_any_value_changed, + /* unit_tracker= */ tracker, + /* climb, digits, factor */ SPIN_STEP, 3, 1); + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); @@ -528,9 +506,22 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb gtk_action_group_add_action( mainActions, GTK_ACTION(itact) ); } - eact = create_adjustment_action( "HeightAction", C_("Select toolbar", "Height"), C_("Select toolbar", "H:"), "height", - 0.0, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Height of selection"), FALSE ); + eact = create_adjustment_action( + /* name= */ "HeightAction", + /* label= */ C_("Select toolbar", "Height"), + /* shortLabel= */ C_("Select toolbar", "H:"), + /* tooltip= */ C_("Select toolbar", "Height of selection"), + /* path= */ "/tools/select/height", + /* def(default) */ 0.0, + /* focusTarget= */ GTK_WIDGET(desktop->canvas), + /* dataKludge= */ G_OBJECT(spw), + /* altx, altx_mark */ TRUE, "altx", + /* lower, uppper, step, page */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, + /* descrLabels, descrValues, descrCount */ 0, 0, 0, + /* callback= */ sp_object_layout_any_value_changed, + /* unit_tracker= */ tracker, + /* climb, digits, factor */ SPIN_STEP, 3, 1); + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 5ca92b4c0..c49f0bc05 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -54,12 +54,17 @@ #include "ui/icon-names.h" #include "ui/tools/text-tool.h" #include "ui/tools/tool-base.h" +#include "ui/widget/unit-tracker.h" +#include "util/units.h" #include "verbs.h" #include "xml/repr.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; using Inkscape::UI::PrefPusher; +using Inkscape::UI::Widget::UnitTracker; +using Inkscape::Util::Unit; +using Inkscape::Util::unit_table; //#define DEBUG_TEXT @@ -504,8 +509,14 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl ) static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) { - // quit if run by the _changed callbacks - if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); + + if ( !tracker || tracker->isUpdating() || g_object_get_data(tbl, "freeze")) { + /* + * When only units are being changed, don't treat changes + * to adjuster values as object changes. + * or quit if run by the _changed callbacks + */ return; } g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); @@ -514,7 +525,18 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) // Set css line height. SPCSSAttr *css = sp_repr_css_attr_new (); Inkscape::CSSOStringStream osfs; - osfs << gtk_adjustment_get_value(adj)*100 << "%"; + + gdouble value = gtk_adjustment_get_value(adj); + + Unit const *unit = tracker->getActiveUnit(); + + // Value can only be in px or percent or naked pc (e.g. 0.7 for 70%) + if (unit->abbr != "%") { + value = unit->convert(value, "px"); + unit = unit_table.getUnit("px"); + } + + osfs << value << unit->abbr; sp_repr_css_set_property (css, "line-height", osfs.str().c_str()); // Apply line-height to selected objects. @@ -1073,21 +1095,31 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ // Line height (spacing) double height; + + Unit const *lh_unit; + UnitTracker* tracker = reinterpret_cast( g_object_get_data( tbl, "tracker" ) ); + if (query.line_height.normal) { - height = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; + lh_unit = unit_table.getUnit("%"); + height = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL * 100; + } else if (query.line_height.unit == SP_CSS_UNIT_PERCENT) { + lh_unit = unit_table.getUnit("%"); + height = query.line_height.value * 100; } else { - if (query.line_height.unit == SP_CSS_UNIT_PERCENT) { - height = query.line_height.value; - } else { - height = query.line_height.computed; - } + lh_unit = tracker->getActiveUnit(); + // Can get unit like this: unit_table.getUnit(query.line_height.unit); + height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); } + // Set before value is set + tracker->setActiveUnit(lh_unit); + GtkAction* lineHeightAction = GTK_ACTION( g_object_get_data( tbl, "TextLineHeightAction" ) ); GtkAdjustment *lineHeightAdjustment = ege_adjustment_action_get_adjustment(EGE_ADJUSTMENT_ACTION( lineHeightAction )); gtk_adjustment_set_value( lineHeightAdjustment, height ); + height = gtk_adjustment_get_value( lineHeightAdjustment ); // Word spacing double wordSpacing; @@ -1290,6 +1322,15 @@ static void sp_text_toolbox_select_cb( GtkEntry* entry, GtkEntryIconPosition /*p static void text_toolbox_watch_ec(SPDesktop* dt, Inkscape::UI::Tools::ToolBase* ec, GObject* holder); +static void destroy_tracker( GObject* obj, gpointer /*user_data*/ ) +{ + UnitTracker *tracker = reinterpret_cast(g_object_get_data(obj, "tracker")); + if ( tracker ) { + delete tracker; + g_object_set_data( obj, "tracker", 0 ); + } +} + // Define all the "widgets" in the toolbar. void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { @@ -1588,22 +1629,29 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje gchar const* labels[] = {_("Smaller spacing"), 0, 0, 0, 0, C_("Text tool", "Normal"), 0, 0, 0, 0, 0, _("Larger spacing")}; gdouble values[] = { 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1,2, 1.3, 1.4, 1.5, 2.0}; + // Add the units menu. + UnitTracker* tracker = new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR); + tracker->prependUnit(unit_table.getUnit("%")); + + g_object_set_data( holder, "tracker", tracker ); + g_signal_connect( holder, "destroy", G_CALLBACK(destroy_tracker), holder ); + EgeAdjustmentAction *eact = create_adjustment_action( "TextLineHeightAction", /* name */ _("Line Height"), /* label */ _("Line:"), /* short label */ - _("Spacing between baselines (times font size)"), /* tooltip */ + _("Spacing between baselines"), /* tooltip */ "/tools/text/lineheight", /* preferences path */ - 0.0, /* default */ + 125, /* default */ GTK_WIDGET(desktop->canvas), /* focusTarget */ holder, /* dataKludge */ FALSE, /* set alt-x keyboard shortcut? */ NULL, /* altx_mark */ - 0.0, 10.0, 0.01, 0.10, /* lower, upper, step (arrow up/down), page up/down */ + 0.0, 1e6, 1.0, 10.0, /* lower, upper, step (arrow up/down), page up/down */ labels, values, G_N_ELEMENTS(labels), /* drop down menu */ sp_text_lineheight_value_changed, /* callback */ - NULL, /* unit tracker */ - 0.1, /* step (used?) */ + tracker, /* unit tracker */ + 1.0, /* step (used?) */ 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); @@ -1611,6 +1659,11 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); g_object_set_data( holder, "TextLineHeightAction", eact ); g_object_set( G_OBJECT(eact), "iconId", "text_line_spacing", NULL ); + + GtkAction* act = tracker->createAction( "TextLineHeightUnitAction", _("Units"), ("") ); + gtk_action_group_add_action( mainActions, act ); + g_object_set_data( holder, "TextLineHeightUnitAction", act ); + } /* Word spacing */ diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 72537f727..f4d7ebf25 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -55,6 +55,7 @@ #include "ui/tools-switch.h" #include "../ui/icon-names.h" #include "../ui/widget/style-swatch.h" +#include "../ui/widget/unit-tracker.h" #include "../verbs.h" #include "../widgets/button.h" #include "../widgets/spinbutton-events.h" @@ -515,6 +516,7 @@ static gchar const * ui_descr = " " " " " " + " " " " " " " " @@ -1122,6 +1124,10 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name, g_object_set_data( dataKludge, prefs->getEntry(path).getEntryName().data(), adj ); } + if (unit_tracker) { + unit_tracker->addAdjustment(adj); + } + // Using a cast just to make sure we pass in the right kind of function pointer g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); -- cgit v1.2.3 From 0d3db7f07ff76ca5fb3bc96c11ee7857ba3b08b7 Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Sun, 13 Mar 2016 09:44:13 +0100 Subject: Translations. Danish translation update. Fixed bugs: - https://launchpad.net/bugs/1471443 (bzr r14702) --- po/da.po | 8655 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 4584 insertions(+), 4071 deletions(-) diff --git a/po/da.po b/po/da.po index 22c68b59d..bd4900835 100644 --- a/po/da.po +++ b/po/da.po @@ -4,13 +4,14 @@ # Keld Simonsen , 2000-2001. # Kjartan Maraas , 2000. # Rune Rønde Laursen , 2006. -# scootergrisen, 2015. +# scootergrisen, 2015, 2016. +#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-09-10 11:16+0200\n" -"PO-Revision-Date: 2015-08-27 00:00+0200\n" +"POT-Creation-Date: 2016-02-14 00:09+0100\n" +"PO-Revision-Date: 2016-03-11 00:00+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" "Language: da\n" @@ -18,18 +19,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator:\n" +"X-Generator: Virtaal 0.7.1\n" "X-Language: da_DK\n" "X-Source-Language: C\n" -#: ../inkscape.desktop.in.h:1 +#: ../inkscape.appdata.xml.in.h:1 ../inkscape.desktop.in.h:1 msgid "Inkscape" msgstr "Inkscape" -#: ../inkscape.desktop.in.h:2 +#: ../inkscape.appdata.xml.in.h:2 ../inkscape.desktop.in.h:2 msgid "Vector Graphics Editor" msgstr "Vectorgrafik redigering" +#: ../inkscape.appdata.xml.in.h:3 +msgid "" +"An Open Source vector graphics editor, with capabilities similar to " +"Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " +"Graphics (SVG) file format." +msgstr "" + +#: ../inkscape.appdata.xml.in.h:4 +msgid "" +"Inkscape supports many advanced SVG features (markers, clones, alpha " +"blending, etc.) and great care is taken in designing a streamlined " +"interface. It is very easy to edit nodes, perform complex path operations, " +"trace bitmaps and much more. We also aim to maintain a thriving user and " +"developer community by using open, community-oriented development." +msgstr "" + +#: ../inkscape.appdata.xml.in.h:5 +msgid "Main application window" +msgstr "Hovedprogramvindue" + #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" msgstr "Inkscape vektorgrafik redigering" @@ -39,6 +60,10 @@ msgid "Create and edit Scalable Vector Graphics images" msgstr "Opret og redigér SVG-billeder" #: ../inkscape.desktop.in.h:5 +msgid "image;editor;vector;drawing;" +msgstr "" + +#: ../inkscape.desktop.in.h:6 msgid "New Drawing" msgstr "Ny tegning" @@ -105,9 +130,8 @@ msgid "Low, sharp bevel" msgstr "" #: ../share/filters/filters.svg.h:18 -#, fuzzy msgid "Rubber Stamp" -msgstr "Antal trin" +msgstr "Gummistempel" #: ../share/filters/filters.svg.h:19 ../share/filters/filters.svg.h:43 #: ../share/filters/filters.svg.h:47 ../share/filters/filters.svg.h:51 @@ -176,9 +200,8 @@ msgid "Ridged border with inner bevel" msgstr "" #: ../share/filters/filters.svg.h:38 -#, fuzzy msgid "Ripple" -msgstr "Krusninger" +msgstr "" #: ../share/filters/filters.svg.h:39 ../share/filters/filters.svg.h:123 #: ../share/filters/filters.svg.h:315 ../share/filters/filters.svg.h:319 @@ -282,9 +305,8 @@ msgid "Sharpen edges and boundaries within the object, force=0.3" msgstr "" #: ../share/filters/filters.svg.h:74 -#, fuzzy msgid "Oil painting" -msgstr "GNOME-udskrivning" +msgstr "Oliemaleri" #: ../share/filters/filters.svg.h:75 ../share/filters/filters.svg.h:79 #: ../share/filters/filters.svg.h:83 ../share/filters/filters.svg.h:447 @@ -496,23 +518,20 @@ msgid "Neon light effect" msgstr "Neonlyseffekt" #: ../share/filters/filters.svg.h:142 -#, fuzzy msgid "Molten Metal" -msgstr "Opret firkant" +msgstr "Smeltet metal" #: ../share/filters/filters.svg.h:144 msgid "Melting parts of object together, with a glossy bevel and a glow" msgstr "" #: ../share/filters/filters.svg.h:146 -#, fuzzy msgid "Pressed Steel" -msgstr " _Nulstil " +msgstr "Presset stål" #: ../share/filters/filters.svg.h:148 -#, fuzzy msgid "Pressed metal with a rolled edge" -msgstr "Indstillinger for stjerner" +msgstr "Presset metal med rullet kant" #: ../share/filters/filters.svg.h:150 #, fuzzy @@ -542,19 +561,16 @@ msgid "Soft pastel ridge" msgstr "Side_størrelse:" #: ../share/filters/filters.svg.h:162 -#, fuzzy msgid "Glowing Metal" -msgstr "Vandret tekst" +msgstr "Glødende metal" #: ../share/filters/filters.svg.h:164 -#, fuzzy msgid "Glowing metal texture" -msgstr "Vandret tekst" +msgstr "Glødende metalmønster" #: ../share/filters/filters.svg.h:166 -#, fuzzy msgid "Leaves" -msgstr "Hjul" +msgstr "Blade" #: ../share/filters/filters.svg.h:167 ../share/filters/filters.svg.h:235 #: ../share/filters/filters.svg.h:271 ../share/filters/filters.svg.h:639 @@ -568,9 +584,8 @@ msgstr "" #: ../share/filters/filters.svg.h:170 #: ../src/extension/internal/filter/paint.h:339 -#, fuzzy msgid "Translucent" -msgstr "Vinkel" +msgstr "Gennemsigtig" #: ../share/filters/filters.svg.h:172 msgid "Illuminated translucent plastic or glass effect" @@ -585,9 +600,8 @@ msgid "Waxy texture which keeps its iridescence through color fill change" msgstr "" #: ../share/filters/filters.svg.h:178 -#, fuzzy msgid "Eroded Metal" -msgstr "Opret firkant" +msgstr "Irret metal" #: ../share/filters/filters.svg.h:180 msgid "Eroded metal texture with ridges, grooves, holes and bumps" @@ -618,9 +632,8 @@ msgid "Stylized reptile skin texture" msgstr "" #: ../share/filters/filters.svg.h:194 -#, fuzzy msgid "Stone Wall" -msgstr "Slet alle" +msgstr "Stenmur" #: ../share/filters/filters.svg.h:196 msgid "Stone wall texture to use with not too saturated colors" @@ -653,9 +666,8 @@ msgid "Gel effect with strong refraction" msgstr "" #: ../share/filters/filters.svg.h:210 -#, fuzzy msgid "Metallized Paint" -msgstr "Venstre vinkel" +msgstr "Metallisk maling" #: ../share/filters/filters.svg.h:212 msgid "" @@ -672,9 +684,8 @@ msgid "Gel Ridge with a pearlescent look" msgstr "" #: ../share/filters/filters.svg.h:218 -#, fuzzy msgid "Raised Border" -msgstr "Hæv knudepunkt" +msgstr "Hævet kant" #: ../share/filters/filters.svg.h:220 msgid "Strongly raised border around a flat surface" @@ -690,18 +701,16 @@ msgid "Gel Ridge metallized at its top" msgstr "" #: ../share/filters/filters.svg.h:226 -#, fuzzy msgid "Fat Oil" -msgstr "Enkel farve" +msgstr "Fed olie" #: ../share/filters/filters.svg.h:228 msgid "Fat oil with some adjustable turbulence" msgstr "" #: ../share/filters/filters.svg.h:230 -#, fuzzy msgid "Black Hole" -msgstr "Flad farvestreg" +msgstr "Sort hul" #: ../share/filters/filters.svg.h:231 ../share/filters/filters.svg.h:275 #: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 @@ -769,9 +778,8 @@ msgid "Slightly cracked enameled texture" msgstr "" #: ../share/filters/filters.svg.h:258 -#, fuzzy msgid "Rough Paper" -msgstr "endeknudepunkt" +msgstr "" #: ../share/filters/filters.svg.h:260 msgid "Aquarelle paper effect which can be used for pictures as for objects" @@ -805,18 +813,16 @@ msgid "Convert to small scattered particles with some thickness" msgstr "" #: ../share/filters/filters.svg.h:274 -#, fuzzy msgid "Warm Inside" -msgstr "endeknudepunkt" +msgstr "Vand inden i" #: ../share/filters/filters.svg.h:276 msgid "Blurred colorized contour, filled inside" msgstr "" #: ../share/filters/filters.svg.h:278 -#, fuzzy msgid "Cool Outside" -msgstr "Boksomrids" +msgstr "Kold udenfor" #: ../share/filters/filters.svg.h:280 msgid "Blurred colorized contour, empty inside" @@ -865,9 +871,8 @@ msgid "Illuminated stained glass effect" msgstr "" #: ../share/filters/filters.svg.h:302 -#, fuzzy msgid "Dark Glass" -msgstr "Tegn håndtag" +msgstr "Mørkt glas" #: ../share/filters/filters.svg.h:304 msgid "Illuminated glass effect with light coming from beneath" @@ -892,9 +897,8 @@ msgid "Same as Bubbly Bumps but with transparent highlights" msgstr "" #: ../share/filters/filters.svg.h:314 ../share/filters/filters.svg.h:362 -#, fuzzy msgid "Torn Edges" -msgstr "Flyt knudepunkter" +msgstr "Revet kanter" #: ../share/filters/filters.svg.h:316 ../share/filters/filters.svg.h:364 msgid "" @@ -929,18 +933,16 @@ msgid "Low turbulence gives sponge look and high turbulence chalk" msgstr "" #: ../share/filters/filters.svg.h:330 -#, fuzzy msgid "People" -msgstr "_Slip" +msgstr "Folk" #: ../share/filters/filters.svg.h:332 msgid "Colorized blotches, like a crowd of people" msgstr "" #: ../share/filters/filters.svg.h:334 -#, fuzzy msgid "Scotland" -msgstr "Fri" +msgstr "Skotland" #: ../share/filters/filters.svg.h:336 msgid "Colorized mountain tops out of the fog" @@ -990,18 +992,16 @@ msgid "Inkblot on blotting paper" msgstr "" #: ../share/filters/filters.svg.h:358 -#, fuzzy msgid "Wax Print" -msgstr "LaTeX udskrivning" +msgstr "" #: ../share/filters/filters.svg.h:360 msgid "Wax print on tissue texture" msgstr "" #: ../share/filters/filters.svg.h:366 -#, fuzzy msgid "Watercolor" -msgstr "Indsæt farve" +msgstr "Vandfarve" #: ../share/filters/filters.svg.h:368 msgid "Cloudy watercolor effect" @@ -1018,9 +1018,8 @@ msgid "" msgstr "" #: ../share/filters/filters.svg.h:374 -#, fuzzy msgid "Ink Paint" -msgstr "Ingen farve" +msgstr "Blækmaling" #: ../share/filters/filters.svg.h:376 msgid "Ink paint on paper with some turbulent color shift" @@ -1036,9 +1035,8 @@ msgid "Smooth rainbow colors melted along the edges and colorizable" msgstr "" #: ../share/filters/filters.svg.h:382 -#, fuzzy msgid "Melted Rainbow" -msgstr "Venstre vinkel" +msgstr "Smeltet regnbue" #: ../share/filters/filters.svg.h:384 msgid "Smooth rainbow colors slightly melted along the edges" @@ -1136,9 +1134,9 @@ msgstr "Sort" #: ../src/extension/internal/filter/paint.h:717 #: ../src/extension/internal/filter/shadows.h:73 #: ../src/extension/internal/filter/transparency.h:345 -#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:830 -#: ../src/ui/dialog/clonetiler.cpp:981 -#: ../src/ui/dialog/document-properties.cpp:164 +#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:828 +#: ../src/ui/dialog/clonetiler.cpp:979 +#: ../src/ui/dialog/document-properties.cpp:165 #: ../share/extensions/color_HSL_adjust.inx.h:20 #: ../share/extensions/color_blackandwhite.inx.h:3 #: ../share/extensions/color_brighter.inx.h:2 @@ -1159,7 +1157,7 @@ msgstr "Sort" #: ../share/extensions/color_removered.inx.h:2 #: ../share/extensions/color_replace.inx.h:6 #: ../share/extensions/color_rgbbarrel.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:19 +#: ../share/extensions/interp_att_g.inx.h:21 msgid "Color" msgstr "Farvelæg" @@ -1168,9 +1166,8 @@ msgid "Light areas turn to black" msgstr "" #: ../share/filters/filters.svg.h:414 -#, fuzzy msgid "Film Grain" -msgstr "PDF-udskrift" +msgstr "Filmkorn" #: ../share/filters/filters.svg.h:416 msgid "Adds a small scale graininess" @@ -1226,18 +1223,16 @@ msgid "" msgstr "" #: ../share/filters/filters.svg.h:434 -#, fuzzy msgid "Dark And Glow" -msgstr "Tegn håndtag" +msgstr "Mørk og glød" #: ../share/filters/filters.svg.h:436 msgid "Darkens the edge with an inner blur and adds a flexible glow" msgstr "" #: ../share/filters/filters.svg.h:438 -#, fuzzy msgid "Warped Rainbow" -msgstr "Venstre vinkel" +msgstr "Forvredet regnbue" #: ../share/filters/filters.svg.h:440 msgid "Smooth rainbow colors warped along the edges and colorizable" @@ -1253,27 +1248,24 @@ msgid "Create a turbulent contour around" msgstr "" #: ../share/filters/filters.svg.h:446 -#, fuzzy msgid "Old Postcard" -msgstr "GNOME-udskrivning" +msgstr "Gammelt postkort" #: ../share/filters/filters.svg.h:448 msgid "Slightly posterize and draw edges like on old printed postcards" msgstr "" #: ../share/filters/filters.svg.h:450 -#, fuzzy msgid "Dots Transparency" -msgstr "0 (gennemsigtig)" +msgstr "Prikkernes gennemsigtig" #: ../share/filters/filters.svg.h:452 msgid "Gives a pointillist HSL sensitive transparency" msgstr "" #: ../share/filters/filters.svg.h:454 -#, fuzzy msgid "Canvas Transparency" -msgstr "0 (gennemsigtig)" +msgstr "Lærredets gennemsigtig" #: ../share/filters/filters.svg.h:456 msgid "Gives a canvas like HSL sensitive transparency." @@ -1290,9 +1282,8 @@ msgid "" msgstr "" #: ../share/filters/filters.svg.h:462 -#, fuzzy msgid "Thick Paint" -msgstr "Ingen farve" +msgstr "Tyk maling" #: ../share/filters/filters.svg.h:464 msgid "Thick painting effect with turbulence" @@ -1328,9 +1319,8 @@ msgid "White splotches evocating carnaval masks" msgstr "" #: ../share/filters/filters.svg.h:478 -#, fuzzy msgid "Plastify" -msgstr "Ligestillet" +msgstr "Plastificér" #: ../share/filters/filters.svg.h:480 msgid "" @@ -1349,9 +1339,8 @@ msgid "" msgstr "" #: ../share/filters/filters.svg.h:486 -#, fuzzy msgid "Rough Transparency" -msgstr "0 (gennemsigtig)" +msgstr "Ru gennemsigtig" #: ../share/filters/filters.svg.h:488 msgid "Adds a turbulent transparency which displaces pixels at the same time" @@ -1385,9 +1374,8 @@ msgid "Gives a transparent fluid drawing effect with rough line and filling" msgstr "" #: ../share/filters/filters.svg.h:502 -#, fuzzy msgid "Liquid Drawing" -msgstr "tegning%s" +msgstr "Flydene tegning" #: ../share/filters/filters.svg.h:504 msgid "Gives a fluid and wavy expressionist drawing effect to images" @@ -1429,9 +1417,8 @@ msgid "Something like a water noise" msgstr "" #: ../share/filters/filters.svg.h:522 -#, fuzzy msgid "Monochrome Transparency" -msgstr "0 (gennemsigtig)" +msgstr "Monokrom gennemsigtig" #: ../share/filters/filters.svg.h:523 ../share/filters/filters.svg.h:527 #: ../share/filters/filters.svg.h:647 ../share/filters/filters.svg.h:651 @@ -1449,9 +1436,8 @@ msgid "Convert to a colorizable transparent positive or negative" msgstr "" #: ../share/filters/filters.svg.h:526 -#, fuzzy msgid "Saturation Map" -msgstr "Farvemætning" +msgstr "Farvemætningskort" #: ../share/filters/filters.svg.h:528 msgid "" @@ -1504,9 +1490,8 @@ msgid "Same as Canvas Bumps but with transparent highlights" msgstr "" #: ../share/filters/filters.svg.h:550 -#, fuzzy msgid "Bright Metal" -msgstr "Lysstyrke" +msgstr "Lyst metal" #: ../share/filters/filters.svg.h:552 msgid "Bright metallic effect for any color" @@ -1558,9 +1543,8 @@ msgid "Metallic foil effect combining two lighting types and variable crumple" msgstr "" #: ../share/filters/filters.svg.h:574 -#, fuzzy msgid "Soft Colors" -msgstr "Kopiér farve" +msgstr "Bløde farver" #: ../share/filters/filters.svg.h:576 msgid "Adds a colorizable edges glow inside objects and pictures" @@ -1600,7 +1584,7 @@ msgstr "Pixel" #: ../share/filters/filters.svg.h:591 msgid "Pixel tools" -msgstr "Pixel-værktøjer" +msgstr "Pixelværktøjer" #: ../share/filters/filters.svg.h:592 msgid "Reduce or remove antialiasing around shapes" @@ -1721,9 +1705,8 @@ msgid "Basic noise transparency texture" msgstr "" #: ../share/filters/filters.svg.h:646 -#, fuzzy msgid "Fill Background" -msgstr "Ba_ggrund:" +msgstr "Udfyld baggrund" #: ../share/filters/filters.svg.h:648 #, fuzzy @@ -1731,9 +1714,8 @@ msgid "Adds a colorizable opaque background" msgstr "Tegn en sti som er et gitter" #: ../share/filters/filters.svg.h:650 -#, fuzzy msgid "Flatten Transparency" -msgstr "0 (gennemsigtig)" +msgstr "Fladgør gennemsigtig" #: ../share/filters/filters.svg.h:652 #, fuzzy @@ -1813,9 +1795,8 @@ msgid "Alpha Turbulent" msgstr "Alfa (uigennemsigtighed)" #: ../share/filters/filters.svg.h:690 -#, fuzzy msgid "Colorize Turbulent" -msgstr "Farve" +msgstr "" #: ../share/filters/filters.svg.h:694 msgid "Cross Noise B" @@ -1875,18 +1856,16 @@ msgid "Colorizable filling with liquid transparency" msgstr "" #: ../share/filters/filters.svg.h:726 -#, fuzzy msgid "Aluminium" -msgstr "Minimumsstørrelse" +msgstr "Aluminium" #: ../share/filters/filters.svg.h:728 msgid "Aluminium effect with sharp brushed reflections" msgstr "" #: ../share/filters/filters.svg.h:730 -#, fuzzy msgid "Comics" -msgstr "Kombinér" +msgstr "Tegneserier" #: ../share/filters/filters.svg.h:732 #, fuzzy @@ -1912,9 +1891,8 @@ msgid "Cartoon paint style with some fading at the edges" msgstr "" #: ../share/filters/filters.svg.h:742 -#, fuzzy msgid "Brushed Metal" -msgstr "Opret firkant" +msgstr "Børstet metal" #: ../share/filters/filters.svg.h:744 msgid "Satiny metal surface effect" @@ -1930,24 +1908,20 @@ msgid "Contouring version of smooth shader" msgstr "" #: ../share/filters/filters.svg.h:750 -#, fuzzy msgid "Chrome" -msgstr "Kombinér" +msgstr "Krom" #: ../share/filters/filters.svg.h:752 -#, fuzzy msgid "Bright chrome effect" -msgstr "Lysstyrke" +msgstr "Lys krom effekt" #: ../share/filters/filters.svg.h:754 -#, fuzzy msgid "Deep Chrome" -msgstr "Kombinér" +msgstr "Dyb krom" #: ../share/filters/filters.svg.h:756 -#, fuzzy msgid "Dark chrome effect" -msgstr "Aktuelt lag" +msgstr "Mørk krom effekt" #: ../share/filters/filters.svg.h:758 #, fuzzy @@ -1959,14 +1933,12 @@ msgid "Combination of satiny and emboss effect" msgstr "" #: ../share/filters/filters.svg.h:762 -#, fuzzy msgid "Sharp Metal" -msgstr "Figurer" +msgstr "Skarp metal" #: ../share/filters/filters.svg.h:764 -#, fuzzy msgid "Chrome effect with darkened edges" -msgstr "Indstillinger for stjerner" +msgstr "Krom effekt med mørke kanter" #: ../share/filters/filters.svg.h:766 #, fuzzy @@ -2245,7 +2217,7 @@ msgstr "Hvid" #: ../share/palettes/palettes.h:16 msgctxt "Palette" msgid "Maroon (#800000)" -msgstr "" +msgstr "Rødbrun (#800000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:17 @@ -2257,7 +2229,7 @@ msgstr "Rød (#FF0000)" #: ../share/palettes/palettes.h:18 msgctxt "Palette" msgid "Olive (#808000)" -msgstr "" +msgstr "Oliven (#808000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:19 @@ -2275,25 +2247,25 @@ msgstr "Grøn (#008000)" #: ../share/palettes/palettes.h:21 msgctxt "Palette" msgid "Lime (#00FF00)" -msgstr "" +msgstr "Lime (#00FF00)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:22 msgctxt "Palette" msgid "Teal (#008080)" -msgstr "" +msgstr "Blågrøn (#008080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:23 msgctxt "Palette" msgid "Aqua (#00FFFF)" -msgstr "" +msgstr "Akva (#00FFFF)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:24 msgctxt "Palette" msgid "Navy (#000080)" -msgstr "" +msgstr "Marineblå (#000080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:25 @@ -2311,13 +2283,13 @@ msgstr "Lilla (#800080)" #: ../share/palettes/palettes.h:27 msgctxt "Palette" msgid "Fuchsia (#FF00FF)" -msgstr "" +msgstr "Lyslilla (#FF00FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:28 msgctxt "Palette" msgid "black (#000000)" -msgstr "" +msgstr "sort (#000000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:29 @@ -2329,25 +2301,25 @@ msgstr "" #: ../share/palettes/palettes.h:30 msgctxt "Palette" msgid "gray (#808080)" -msgstr "" +msgstr "grå (#808080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:31 msgctxt "Palette" msgid "darkgray (#A9A9A9)" -msgstr "" +msgstr "mørkegrå (#A9A9A9)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:32 msgctxt "Palette" msgid "silver (#C0C0C0)" -msgstr "" +msgstr "sølv (#C0C0C0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:33 msgctxt "Palette" msgid "lightgray (#D3D3D3)" -msgstr "" +msgstr "lysegrå (#D3D3D3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:34 @@ -2359,13 +2331,13 @@ msgstr "" #: ../share/palettes/palettes.h:35 msgctxt "Palette" msgid "whitesmoke (#F5F5F5)" -msgstr "" +msgstr "hvid røg (#F5F5F5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:36 msgctxt "Palette" msgid "white (#FFFFFF)" -msgstr "" +msgstr "hvid (#FFFFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:37 @@ -2383,7 +2355,7 @@ msgstr "" #: ../share/palettes/palettes.h:39 msgctxt "Palette" msgid "brown (#A52A2A)" -msgstr "" +msgstr "brun (#A52A2A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:40 @@ -2401,25 +2373,25 @@ msgstr "" #: ../share/palettes/palettes.h:42 msgctxt "Palette" msgid "maroon (#800000)" -msgstr "" +msgstr "rødbrun (#800000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:43 msgctxt "Palette" msgid "darkred (#8B0000)" -msgstr "" +msgstr "mørkrød (#8B0000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:44 msgctxt "Palette" msgid "red (#FF0000)" -msgstr "" +msgstr "rød (#FF0000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:45 msgctxt "Palette" msgid "snow (#FFFAFA)" -msgstr "" +msgstr "sne (#FFFAFA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:46 @@ -2431,37 +2403,37 @@ msgstr "" #: ../share/palettes/palettes.h:47 msgctxt "Palette" msgid "salmon (#FA8072)" -msgstr "" +msgstr "laks (#FA8072)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:48 msgctxt "Palette" msgid "tomato (#FF6347)" -msgstr "" +msgstr "tomat (#FF6347)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:49 msgctxt "Palette" msgid "darksalmon (#E9967A)" -msgstr "" +msgstr "mørk laks (#E9967A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:50 msgctxt "Palette" msgid "coral (#FF7F50)" -msgstr "" +msgstr "koral (#FF7F50)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:51 msgctxt "Palette" msgid "orangered (#FF4500)" -msgstr "" +msgstr "orangerød (#FF4500)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:52 msgctxt "Palette" msgid "lightsalmon (#FFA07A)" -msgstr "" +msgstr "lys laks (#FFA07A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:53 @@ -2473,19 +2445,19 @@ msgstr "" #: ../share/palettes/palettes.h:54 msgctxt "Palette" msgid "seashell (#FFF5EE)" -msgstr "" +msgstr "søskal (#FFF5EE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:55 msgctxt "Palette" msgid "chocolate (#D2691E)" -msgstr "" +msgstr "chokolade (#D2691E)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:56 msgctxt "Palette" msgid "saddlebrown (#8B4513)" -msgstr "" +msgstr "saddelbrun (#8B4513)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:57 @@ -2521,7 +2493,7 @@ msgstr "" #: ../share/palettes/palettes.h:62 msgctxt "Palette" msgid "darkorange (#FF8C00)" -msgstr "" +msgstr "mørkorange (#FF8C00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:63 @@ -2569,13 +2541,13 @@ msgstr "" #: ../share/palettes/palettes.h:70 msgctxt "Palette" msgid "orange (#FFA500)" -msgstr "" +msgstr "orange (#FFA500)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:71 msgctxt "Palette" msgid "wheat (#F5DEB3)" -msgstr "" +msgstr "hvede (#F5DEB3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:72 @@ -2611,7 +2583,7 @@ msgstr "" #: ../share/palettes/palettes.h:77 msgctxt "Palette" msgid "gold (#FFD700)" -msgstr "" +msgstr "guld (#FFD700)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:78 @@ -2653,19 +2625,19 @@ msgstr "" #: ../share/palettes/palettes.h:84 msgctxt "Palette" msgid "olive (#808000)" -msgstr "" +msgstr "oliven (#808000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:85 msgctxt "Palette" msgid "yellow (#FFFF00)" -msgstr "" +msgstr "gul (#FFFF00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:86 msgctxt "Palette" msgid "lightyellow (#FFFFE0)" -msgstr "" +msgstr "lysgul (#FFFFE0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:87 @@ -2683,7 +2655,7 @@ msgstr "" #: ../share/palettes/palettes.h:89 msgctxt "Palette" msgid "yellowgreen (#9ACD32)" -msgstr "" +msgstr "gulgrøn (#9ACD32)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:90 @@ -2695,7 +2667,7 @@ msgstr "" #: ../share/palettes/palettes.h:91 msgctxt "Palette" msgid "greenyellow (#ADFF2F)" -msgstr "" +msgstr "grøngul (#ADFF2F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:92 @@ -2707,7 +2679,7 @@ msgstr "" #: ../share/palettes/palettes.h:93 msgctxt "Palette" msgid "lawngreen (#7CFC00)" -msgstr "" +msgstr "græsplænegrøn (#7CFC00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:94 @@ -2719,13 +2691,13 @@ msgstr "" #: ../share/palettes/palettes.h:95 msgctxt "Palette" msgid "forestgreen (#228B22)" -msgstr "" +msgstr "skovgrøn (#228B22)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:96 msgctxt "Palette" msgid "limegreen (#32CD32)" -msgstr "" +msgstr "limegrøn (#32CD32)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:97 @@ -2737,7 +2709,7 @@ msgstr "" #: ../share/palettes/palettes.h:98 msgctxt "Palette" msgid "palegreen (#98FB98)" -msgstr "" +msgstr "bleggrøn (#98FB98)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:99 @@ -2803,13 +2775,13 @@ msgstr "" #: ../share/palettes/palettes.h:109 msgctxt "Palette" msgid "aquamarine (#7FFFD4)" -msgstr "" +msgstr "akvamarin (#7FFFD4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:110 msgctxt "Palette" msgid "turquoise (#40E0D0)" -msgstr "" +msgstr "turkis (#40E0D0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:111 @@ -2821,7 +2793,7 @@ msgstr "" #: ../share/palettes/palettes.h:112 msgctxt "Palette" msgid "mediumturquoise (#48D1CC)" -msgstr "" +msgstr "mediumturkis (#48D1CC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:113 @@ -2833,7 +2805,7 @@ msgstr "" #: ../share/palettes/palettes.h:114 msgctxt "Palette" msgid "paleturquoise (#AFEEEE)" -msgstr "" +msgstr "blegturkis (#AFEEEE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:115 @@ -2845,13 +2817,13 @@ msgstr "" #: ../share/palettes/palettes.h:116 msgctxt "Palette" msgid "darkcyan (#008B8B)" -msgstr "" +msgstr "mørkcyan (#008B8B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:117 msgctxt "Palette" msgid "cyan (#00FFFF)" -msgstr "" +msgstr "cyan (#00FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:118 @@ -2869,7 +2841,7 @@ msgstr "" #: ../share/palettes/palettes.h:120 msgctxt "Palette" msgid "darkturquoise (#00CED1)" -msgstr "" +msgstr "mørkturkis (#00CED1)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:121 @@ -3025,13 +2997,13 @@ msgstr "" #: ../share/palettes/palettes.h:146 msgctxt "Palette" msgid "blueviolet (#8A2BE2)" -msgstr "" +msgstr "blåviolet (#8A2BE2)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:147 msgctxt "Palette" msgid "indigo (#4B0082)" -msgstr "" +msgstr "indigo (#4B0082)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:148 @@ -3043,7 +3015,7 @@ msgstr "" #: ../share/palettes/palettes.h:149 msgctxt "Palette" msgid "darkviolet (#9400D3)" -msgstr "" +msgstr "mørkviolet (#9400D3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:150 @@ -3067,25 +3039,25 @@ msgstr "" #: ../share/palettes/palettes.h:153 msgctxt "Palette" msgid "violet (#EE82EE)" -msgstr "" +msgstr "violet (#EE82EE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:154 msgctxt "Palette" msgid "purple (#800080)" -msgstr "" +msgstr "lilla (#800080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:155 msgctxt "Palette" msgid "darkmagenta (#8B008B)" -msgstr "" +msgstr "mørkmagenta (#8B008B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:156 msgctxt "Palette" msgid "magenta (#FF00FF)" -msgstr "" +msgstr "magenta (#FF00FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:157 @@ -3097,7 +3069,7 @@ msgstr "" #: ../share/palettes/palettes.h:158 msgctxt "Palette" msgid "mediumvioletred (#C71585)" -msgstr "" +msgstr "mediumvioletrød (#C71585)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:159 @@ -3121,7 +3093,7 @@ msgstr "" #: ../share/palettes/palettes.h:162 msgctxt "Palette" msgid "palevioletred (#DB7093)" -msgstr "" +msgstr "blegvioletrød (#DB7093)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:163 @@ -3133,13 +3105,13 @@ msgstr "" #: ../share/palettes/palettes.h:164 msgctxt "Palette" msgid "pink (#FFC0CB)" -msgstr "" +msgstr "pink (#FFC0CB)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:165 msgctxt "Palette" msgid "lightpink (#FFB6C1)" -msgstr "" +msgstr "lyspink (#FFB6C1)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:166 @@ -3149,24 +3121,21 @@ msgstr "" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:167 -#, fuzzy msgctxt "Palette" msgid "Butter 1" -msgstr "Afkortet ende" +msgstr "Smør 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:168 -#, fuzzy msgctxt "Palette" msgid "Butter 2" -msgstr "Afkortet ende" +msgstr "Smør 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:169 -#, fuzzy msgctxt "Palette" msgid "Butter 3" -msgstr "Afkortet ende" +msgstr "Smør 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:170 @@ -3188,24 +3157,21 @@ msgstr "" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:173 -#, fuzzy msgctxt "Palette" msgid "Orange 1" -msgstr "Vinkel" +msgstr "Orange 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:174 -#, fuzzy msgctxt "Palette" msgid "Orange 2" -msgstr "Vinkel" +msgstr "Orange 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:175 -#, fuzzy msgctxt "Palette" msgid "Orange 3" -msgstr "Vinkel" +msgstr "Orange 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:176 @@ -3477,9 +3443,8 @@ msgid "Polka dots, large white" msgstr "" #: ../share/patterns/patterns.svg.h:1 -#, fuzzy msgid "Wavy" -msgstr "_Gem" +msgstr "Bølget" #: ../share/patterns/patterns.svg.h:1 #, fuzzy @@ -3510,1071 +3475,1042 @@ msgstr "Opret punktbillede" msgid "Old paint (bitmap)" msgstr "Udskriv som punktbillede" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:2 msgctxt "Symbol" -msgid "AIGA Symbol Signs" +msgid "United States National Park Service Map Symbols" msgstr "" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 -#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 msgctxt "Symbol" -msgid "Telephone" -msgstr "" +msgid "Airport" +msgstr "Lufthavn" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:5 ../share/symbols/symbols.h:6 msgctxt "Symbol" -msgid "Mail" +msgid "Amphitheatre" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 -#, fuzzy msgctxt "Symbol" -msgid "Currency Exchange" -msgstr "Aktuelt lag" +msgid "Bicycle Trail" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 msgctxt "Symbol" -msgid "Currency Exchange - Euro" +msgid "Boat Launch" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 msgctxt "Symbol" -msgid "Cashier" +msgid "Boat Tour" msgstr "" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 -#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 -#, fuzzy msgctxt "Symbol" -msgid "First Aid" -msgstr "Første valgt" +msgid "Bus Stop" +msgstr "Busstoppested" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 -#, fuzzy msgctxt "Symbol" -msgid "Lost and Found" -msgstr "Ikke afrundede" +msgid "Campfire" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 msgctxt "Symbol" -msgid "Coat Check" +msgid "Campground" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 msgctxt "Symbol" -msgid "Baggage Lockers" +msgid "CanoeAccess" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 msgctxt "Symbol" -msgid "Escalator" +msgid "Crosscountry Ski Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:23 ../share/symbols/symbols.h:24 msgctxt "Symbol" -msgid "Escalator Down" +msgid "Downhill Skiing" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:25 ../share/symbols/symbols.h:26 msgctxt "Symbol" -msgid "Escalator Up" +msgid "Drinking Water" msgstr "" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:27 ../share/symbols/symbols.h:28 +#: ../share/symbols/symbols.h:172 ../share/symbols/symbols.h:173 msgctxt "Symbol" -msgid "Stairs" -msgstr "" +msgid "First Aid" +msgstr "Førstehjælp" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:29 ../share/symbols/symbols.h:30 msgctxt "Symbol" -msgid "Stairs Down" +msgid "Fishing" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:31 ../share/symbols/symbols.h:32 msgctxt "Symbol" -msgid "Stairs Up" +msgid "Food Service" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:33 ../share/symbols/symbols.h:34 -#, fuzzy msgctxt "Symbol" -msgid "Elevator" -msgstr "Relationer" +msgid "Four Wheel Drive Road" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:35 ../share/symbols/symbols.h:36 msgctxt "Symbol" -msgid "Toilets - Men" +msgid "Gas Station" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:37 ../share/symbols/symbols.h:38 msgctxt "Symbol" -msgid "Toilets - Women" +msgid "Golfing" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:39 ../share/symbols/symbols.h:40 msgctxt "Symbol" -msgid "Toilets" +msgid "Horseback Riding" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 msgctxt "Symbol" -msgid "Nursery" +msgid "Hospital" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 msgctxt "Symbol" -msgid "Drinking Fountain" +msgid "Ice Skating" msgstr "" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 -#, fuzzy +#: ../share/symbols/symbols.h:206 ../share/symbols/symbols.h:207 msgctxt "Symbol" -msgid "Waiting Room" -msgstr "Script" +msgid "Information" +msgstr "Information" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 -#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 -#, fuzzy msgctxt "Symbol" -msgid "Information" -msgstr "Information" +msgid "Litter Receptacle" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 -#, fuzzy msgctxt "Symbol" -msgid "Hotel Information" -msgstr "Information" +msgid "Lodging" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 -#, fuzzy msgctxt "Symbol" -msgid "Air Transportation" -msgstr "Information" +msgid "Marina" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 msgctxt "Symbol" -msgid "Heliport" +msgid "Motorbike Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:55 ../share/symbols/symbols.h:56 msgctxt "Symbol" -msgid "Taxi" +msgid "Radiator Water" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:57 ../share/symbols/symbols.h:58 -#, fuzzy msgctxt "Symbol" -msgid "Bus" -msgstr "Blå" +msgid "Recycling" +msgstr "" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:59 ../share/symbols/symbols.h:60 -#, fuzzy +#: ../share/symbols/symbols.h:258 ../share/symbols/symbols.h:259 msgctxt "Symbol" -msgid "Ground Transportation" -msgstr "Information" +msgid "Parking" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:61 ../share/symbols/symbols.h:62 -#, fuzzy msgctxt "Symbol" -msgid "Rail Transportation" -msgstr "Information" +msgid "Pets On Leash" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:63 ../share/symbols/symbols.h:64 -#, fuzzy msgctxt "Symbol" -msgid "Water Transportation" -msgstr "Information" +msgid "Picnic Area" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 msgctxt "Symbol" -msgid "Car Rental" +msgid "Post Office" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 msgctxt "Symbol" -msgid "Restaurant" +msgid "Ranger Station" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:69 ../share/symbols/symbols.h:70 msgctxt "Symbol" -msgid "Coffeeshop" +msgid "RV Campground" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:71 ../share/symbols/symbols.h:72 -#, fuzzy msgctxt "Symbol" -msgid "Bar" -msgstr "Markér" +msgid "Restrooms" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:73 ../share/symbols/symbols.h:74 msgctxt "Symbol" -msgid "Shops" -msgstr "" +msgid "Sailing" +msgstr "Sejllas" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:75 ../share/symbols/symbols.h:76 msgctxt "Symbol" -msgid "Barber Shop - Beauty Salon" +msgid "Sanitary Disposal Station" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:77 ../share/symbols/symbols.h:78 msgctxt "Symbol" -msgid "Barber Shop" +msgid "Scuba Diving" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:79 ../share/symbols/symbols.h:80 msgctxt "Symbol" -msgid "Beauty Salon" +msgid "Self Guided Trail" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:81 ../share/symbols/symbols.h:82 msgctxt "Symbol" -msgid "Ticket Purchase" -msgstr "" +msgid "Shelter" +msgstr "Læ" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:83 ../share/symbols/symbols.h:84 msgctxt "Symbol" -msgid "Baggage Check In" +msgid "Showers" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:85 ../share/symbols/symbols.h:86 msgctxt "Symbol" -msgid "Baggage Claim" +msgid "Sledding" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:87 ../share/symbols/symbols.h:88 -#, fuzzy msgctxt "Symbol" -msgid "Customs" -msgstr "_Brugerdefineret" +msgid "SnowmobileTrail" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:89 ../share/symbols/symbols.h:90 -#, fuzzy msgctxt "Symbol" -msgid "Immigration" -msgstr "Udskrivningsdestination" +msgid "Stable" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:91 ../share/symbols/symbols.h:92 -#, fuzzy msgctxt "Symbol" -msgid "Departing Flights" -msgstr "Destinationens højde" +msgid "Store" +msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:93 ../share/symbols/symbols.h:94 -#, fuzzy msgctxt "Symbol" -msgid "Arriving Flights" -msgstr "Lysstyrke" +msgid "Swimming" +msgstr "" +#. Symbols: ./MapSymbolsNPS.svg #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:95 ../share/symbols/symbols.h:96 +#: ../share/symbols/symbols.h:162 ../share/symbols/symbols.h:163 msgctxt "Symbol" -msgid "Smoking" +msgid "Telephone" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:97 ../share/symbols/symbols.h:98 msgctxt "Symbol" -msgid "No Smoking" +msgid "Emergency Telephone" msgstr "" -#. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 -#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 msgctxt "Symbol" -msgid "Parking" +msgid "Trailhead" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:101 ../share/symbols/symbols.h:102 msgctxt "Symbol" -msgid "No Parking" +msgid "Wheelchair Accessible" msgstr "" -#. Symbols: ./AigaSymbols.svg +#. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:103 ../share/symbols/symbols.h:104 msgctxt "Symbol" -msgid "No Dogs" +msgid "Wind Surfing" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:105 ../share/symbols/symbols.h:106 +#. Symbols: ./MapSymbolsNPS.svg +#: ../share/symbols/symbols.h:105 msgctxt "Symbol" -msgid "No Entry" +msgid "Blank" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:107 ../share/symbols/symbols.h:108 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:106 msgctxt "Symbol" -msgid "Exit" +msgid "Flow Chart Shapes" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:109 ../share/symbols/symbols.h:110 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:107 msgctxt "Symbol" -msgid "Fire Extinguisher" +msgid "Process" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:111 ../share/symbols/symbols.h:112 -#, fuzzy +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:108 msgctxt "Symbol" -msgid "Right Arrow" -msgstr "Rettigheder" +msgid "Input/Output" +msgstr "Input/output" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:113 ../share/symbols/symbols.h:114 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:109 msgctxt "Symbol" -msgid "Forward and Right Arrow" -msgstr "" +msgid "Document" +msgstr "Dokument" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:115 ../share/symbols/symbols.h:116 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:110 #, fuzzy msgctxt "Symbol" -msgid "Up Arrow" -msgstr "Fejl" +msgid "Manual Operation" +msgstr "Farvemætning" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:117 ../share/symbols/symbols.h:118 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:111 msgctxt "Symbol" -msgid "Forward and Left Arrow" -msgstr "" +msgid "Preparation" +msgstr "Klargøring" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:119 ../share/symbols/symbols.h:120 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:112 #, fuzzy msgctxt "Symbol" -msgid "Left Arrow" -msgstr "Fejl" +msgid "Merge" +msgstr "Mål sti" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:121 ../share/symbols/symbols.h:122 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:113 msgctxt "Symbol" -msgid "Left and Down Arrow" +msgid "Decision" +msgstr "Beslutning" + +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:114 +msgctxt "Symbol" +msgid "Magnetic Tape" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:123 ../share/symbols/symbols.h:124 -#, fuzzy +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:115 msgctxt "Symbol" -msgid "Down Arrow" -msgstr "Fejl" +msgid "Display" +msgstr "Vis" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:125 ../share/symbols/symbols.h:126 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:116 msgctxt "Symbol" -msgid "Right and Down Arrow" +msgid "Auxiliary Operation" msgstr "" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:127 ../share/symbols/symbols.h:128 +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:117 msgctxt "Symbol" -msgid "NPS Wheelchair Accessible - 1996" -msgstr "" +msgid "Manual Input" +msgstr "Manuel input" -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:129 ../share/symbols/symbols.h:130 -msgctxt "Symbol" -msgid "NPS Wheelchair Accessible" -msgstr "" - -#. Symbols: ./AigaSymbols.svg -#: ../share/symbols/symbols.h:131 ../share/symbols/symbols.h:132 -msgctxt "Symbol" -msgid "New Wheelchair Accessible" -msgstr "" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:133 -msgctxt "Symbol" -msgid "Word Balloons" -msgstr "" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:134 -msgctxt "Symbol" -msgid "Thought Balloon" -msgstr "" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:135 -msgctxt "Symbol" -msgid "Dream Speaking" -msgstr "" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:136 -#, fuzzy -msgctxt "Symbol" -msgid "Rounded Balloon" -msgstr "Rund samling" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:137 -#, fuzzy -msgctxt "Symbol" -msgid "Squared Balloon" -msgstr "Kantet ende" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:138 -msgctxt "Symbol" -msgid "Over the Phone" -msgstr "" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:139 -msgctxt "Symbol" -msgid "Hip Balloon" -msgstr "" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:140 -#, fuzzy -msgctxt "Symbol" -msgid "Circle Balloon" -msgstr "Cirkel" - -#. Symbols: ./BalloonSymbols.svg -#: ../share/symbols/symbols.h:141 -msgctxt "Symbol" -msgid "Exclaim Balloon" -msgstr "" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:142 -msgctxt "Symbol" -msgid "Flow Chart Shapes" -msgstr "" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:143 -msgctxt "Symbol" -msgid "Process" -msgstr "" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:144 -msgctxt "Symbol" -msgid "Input/Output" -msgstr "Input/output" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:145 -#, fuzzy -msgctxt "Symbol" -msgid "Document" -msgstr "Dokument" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:146 -#, fuzzy -msgctxt "Symbol" -msgid "Manual Operation" -msgstr "Farvemætning" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:147 -#, fuzzy -msgctxt "Symbol" -msgid "Preparation" -msgstr "Farvemætning" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:148 -#, fuzzy -msgctxt "Symbol" -msgid "Merge" -msgstr "Mål sti" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:149 -#, fuzzy -msgctxt "Symbol" -msgid "Decision" -msgstr "Beskrivelse" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:150 -msgctxt "Symbol" -msgid "Magnetic Tape" -msgstr "" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:151 -#, fuzzy -msgctxt "Symbol" -msgid "Display" -msgstr "_Visningstilstand" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:152 -msgctxt "Symbol" -msgid "Auxiliary Operation" -msgstr "" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:153 -#, fuzzy -msgctxt "Symbol" -msgid "Manual Input" -msgstr "DXF inddata" - -#. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:154 -#, fuzzy +#. Symbols: ./FlowSymbols.svg +#: ../share/symbols/symbols.h:118 msgctxt "Symbol" msgid "Extract" -msgstr "Udpak et billede" +msgstr "Udtræk" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:155 +#: ../share/symbols/symbols.h:119 msgctxt "Symbol" msgid "Terminal/Interrupt" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:156 +#: ../share/symbols/symbols.h:120 msgctxt "Symbol" msgid "Punched Card" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:157 +#: ../share/symbols/symbols.h:121 #, fuzzy msgctxt "Symbol" msgid "Punch Tape" msgstr "Flad farvestreg" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:158 +#: ../share/symbols/symbols.h:122 msgctxt "Symbol" msgid "Online Storage" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:159 +#: ../share/symbols/symbols.h:123 msgctxt "Symbol" msgid "Keying" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:160 +#: ../share/symbols/symbols.h:124 msgctxt "Symbol" msgid "Sort" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:161 +#: ../share/symbols/symbols.h:125 msgctxt "Symbol" msgid "Connector" msgstr "Tilslutter" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:162 +#: ../share/symbols/symbols.h:126 msgctxt "Symbol" msgid "Off-Page Connector" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:163 +#: ../share/symbols/symbols.h:127 msgctxt "Symbol" msgid "Transmittal Tape" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:164 +#: ../share/symbols/symbols.h:128 msgctxt "Symbol" msgid "Communication Link" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:165 -#, fuzzy +#: ../share/symbols/symbols.h:129 msgctxt "Symbol" msgid "Collate" -msgstr "Flyt" +msgstr "Sætvis" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:166 +#: ../share/symbols/symbols.h:130 msgctxt "Symbol" msgid "Comment/Annotation" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:167 +#: ../share/symbols/symbols.h:131 msgctxt "Symbol" msgid "Core" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:168 +#: ../share/symbols/symbols.h:132 msgctxt "Symbol" msgid "Predefined Process" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:169 +#: ../share/symbols/symbols.h:133 msgctxt "Symbol" msgid "Magnetic Disk (Database)" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:170 +#: ../share/symbols/symbols.h:134 msgctxt "Symbol" msgid "Magnetic Drum (Direct Access)" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:171 +#: ../share/symbols/symbols.h:135 msgctxt "Symbol" msgid "Offline Storage" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:172 +#: ../share/symbols/symbols.h:136 msgctxt "Symbol" msgid "Logical Or" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:173 +#: ../share/symbols/symbols.h:137 msgctxt "Symbol" msgid "Logical And" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:174 +#: ../share/symbols/symbols.h:138 msgctxt "Symbol" msgid "Delay" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:175 +#: ../share/symbols/symbols.h:139 msgctxt "Symbol" msgid "Loop Limit Begin" msgstr "" #. Symbols: ./FlowSymbols.svg -#: ../share/symbols/symbols.h:176 +#: ../share/symbols/symbols.h:140 msgctxt "Symbol" msgid "Loop Limit End" msgstr "" +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:141 +msgctxt "Symbol" +msgid "Word Balloons" +msgstr "" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:142 +msgctxt "Symbol" +msgid "Thought Balloon" +msgstr "" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:143 +msgctxt "Symbol" +msgid "Dream Speaking" +msgstr "" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:144 +msgctxt "Symbol" +msgid "Rounded Balloon" +msgstr "Afrundet ballon" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:145 +msgctxt "Symbol" +msgid "Squared Balloon" +msgstr "Firkantet ballon" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:146 +msgctxt "Symbol" +msgid "Over the Phone" +msgstr "" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:147 +msgctxt "Symbol" +msgid "Hip Balloon" +msgstr "" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:148 +msgctxt "Symbol" +msgid "Circle Balloon" +msgstr "Cirkulær baloon" + +#. Symbols: ./BalloonSymbols.svg +#: ../share/symbols/symbols.h:149 +msgctxt "Symbol" +msgid "Exclaim Balloon" +msgstr "" + #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:177 +#: ../share/symbols/symbols.h:150 msgctxt "Symbol" msgid "Logic Symbols" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:178 +#: ../share/symbols/symbols.h:151 msgctxt "Symbol" msgid "Xnor Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:179 +#: ../share/symbols/symbols.h:152 msgctxt "Symbol" msgid "Xor Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:180 +#: ../share/symbols/symbols.h:153 msgctxt "Symbol" msgid "Nor Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:181 +#: ../share/symbols/symbols.h:154 msgctxt "Symbol" msgid "Or Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:182 +#: ../share/symbols/symbols.h:155 msgctxt "Symbol" msgid "Nand Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:183 +#: ../share/symbols/symbols.h:156 msgctxt "Symbol" msgid "And Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:184 +#: ../share/symbols/symbols.h:157 msgctxt "Symbol" msgid "Buffer" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:185 +#: ../share/symbols/symbols.h:158 msgctxt "Symbol" msgid "Not Gate" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:186 +#: ../share/symbols/symbols.h:159 msgctxt "Symbol" msgid "Buffer Small" msgstr "" #. Symbols: ./LogicSymbols.svg -#: ../share/symbols/symbols.h:187 +#: ../share/symbols/symbols.h:160 msgctxt "Symbol" msgid "Not Gate Small" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:188 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:161 msgctxt "Symbol" -msgid "United States National Park Service Map Symbols" +msgid "AIGA Symbol Signs" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:189 ../share/symbols/symbols.h:190 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:164 ../share/symbols/symbols.h:165 +msgctxt "Symbol" +msgid "Mail" +msgstr "" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:166 ../share/symbols/symbols.h:167 #, fuzzy msgctxt "Symbol" -msgid "Airport" -msgstr "_Importér..." +msgid "Currency Exchange" +msgstr "Aktuelt lag" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:191 ../share/symbols/symbols.h:192 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:168 ../share/symbols/symbols.h:169 msgctxt "Symbol" -msgid "Amphitheatre" +msgid "Currency Exchange - Euro" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:193 ../share/symbols/symbols.h:194 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:170 ../share/symbols/symbols.h:171 msgctxt "Symbol" -msgid "Bicycle Trail" +msgid "Cashier" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:174 ../share/symbols/symbols.h:175 msgctxt "Symbol" -msgid "Boat Launch" -msgstr "" +msgid "Lost and Found" +msgstr "Glemt og fundet" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:176 ../share/symbols/symbols.h:177 msgctxt "Symbol" -msgid "Boat Tour" +msgid "Coat Check" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:199 ../share/symbols/symbols.h:200 -#, fuzzy +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:178 ../share/symbols/symbols.h:179 msgctxt "Symbol" -msgid "Bus Stop" -msgstr "_Sæt" +msgid "Baggage Lockers" +msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:201 ../share/symbols/symbols.h:202 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:180 ../share/symbols/symbols.h:181 msgctxt "Symbol" -msgid "Campfire" +msgid "Escalator" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:203 ../share/symbols/symbols.h:204 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:182 ../share/symbols/symbols.h:183 msgctxt "Symbol" -msgid "Campground" +msgid "Escalator Down" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:205 ../share/symbols/symbols.h:206 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:184 ../share/symbols/symbols.h:185 msgctxt "Symbol" -msgid "CanoeAccess" +msgid "Escalator Up" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:207 ../share/symbols/symbols.h:208 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:186 ../share/symbols/symbols.h:187 msgctxt "Symbol" -msgid "Crosscountry Ski Trail" +msgid "Stairs" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:209 ../share/symbols/symbols.h:210 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:188 ../share/symbols/symbols.h:189 msgctxt "Symbol" -msgid "Downhill Skiing" +msgid "Stairs Down" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:211 ../share/symbols/symbols.h:212 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:190 ../share/symbols/symbols.h:191 msgctxt "Symbol" -msgid "Drinking Water" +msgid "Stairs Up" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:215 ../share/symbols/symbols.h:216 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:192 ../share/symbols/symbols.h:193 msgctxt "Symbol" -msgid "Fishing" +msgid "Elevator" +msgstr "Elevator" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:194 ../share/symbols/symbols.h:195 +msgctxt "Symbol" +msgid "Toilets - Men" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:217 ../share/symbols/symbols.h:218 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:196 ../share/symbols/symbols.h:197 msgctxt "Symbol" -msgid "Food Service" +msgid "Toilets - Women" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:219 ../share/symbols/symbols.h:220 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:198 ../share/symbols/symbols.h:199 msgctxt "Symbol" -msgid "Four Wheel Drive Road" +msgid "Toilets" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:200 ../share/symbols/symbols.h:201 msgctxt "Symbol" -msgid "Gas Station" +msgid "Nursery" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:202 ../share/symbols/symbols.h:203 msgctxt "Symbol" -msgid "Golfing" +msgid "Drinking Fountain" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:225 ../share/symbols/symbols.h:226 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:204 ../share/symbols/symbols.h:205 msgctxt "Symbol" -msgid "Horseback Riding" +msgid "Waiting Room" +msgstr "Venteværelse" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:208 ../share/symbols/symbols.h:209 +msgctxt "Symbol" +msgid "Hotel Information" +msgstr "Hotelinformation" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:210 ../share/symbols/symbols.h:211 +msgctxt "Symbol" +msgid "Air Transportation" +msgstr "Lufttransport" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:212 ../share/symbols/symbols.h:213 +msgctxt "Symbol" +msgid "Heliport" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:227 ../share/symbols/symbols.h:228 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:214 ../share/symbols/symbols.h:215 msgctxt "Symbol" -msgid "Hospital" +msgid "Taxi" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:229 ../share/symbols/symbols.h:230 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:216 ../share/symbols/symbols.h:217 +msgctxt "Symbol" +msgid "Bus" +msgstr "Bus" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:218 ../share/symbols/symbols.h:219 #, fuzzy msgctxt "Symbol" -msgid "Ice Skating" -msgstr "Start:" +msgid "Ground Transportation" +msgstr "Information" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:233 ../share/symbols/symbols.h:234 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:220 ../share/symbols/symbols.h:221 +#, fuzzy msgctxt "Symbol" -msgid "Litter Receptacle" -msgstr "" +msgid "Rail Transportation" +msgstr "Information" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:235 ../share/symbols/symbols.h:236 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:222 ../share/symbols/symbols.h:223 +#, fuzzy msgctxt "Symbol" -msgid "Lodging" -msgstr "" +msgid "Water Transportation" +msgstr "Information" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:237 ../share/symbols/symbols.h:238 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:224 ../share/symbols/symbols.h:225 msgctxt "Symbol" -msgid "Marina" +msgid "Car Rental" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:239 ../share/symbols/symbols.h:240 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:226 ../share/symbols/symbols.h:227 msgctxt "Symbol" -msgid "Motorbike Trail" +msgid "Restaurant" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:241 ../share/symbols/symbols.h:242 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:228 ../share/symbols/symbols.h:229 msgctxt "Symbol" -msgid "Radiator Water" +msgid "Coffeeshop" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:243 ../share/symbols/symbols.h:244 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:230 ../share/symbols/symbols.h:231 +#, fuzzy msgctxt "Symbol" -msgid "Recycling" +msgid "Bar" +msgstr "Markér" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:232 ../share/symbols/symbols.h:233 +msgctxt "Symbol" +msgid "Shops" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:247 ../share/symbols/symbols.h:248 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:234 ../share/symbols/symbols.h:235 msgctxt "Symbol" -msgid "Pets On Leash" +msgid "Barber Shop - Beauty Salon" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:249 ../share/symbols/symbols.h:250 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:236 ../share/symbols/symbols.h:237 msgctxt "Symbol" -msgid "Picnic Area" +msgid "Barber Shop" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:251 ../share/symbols/symbols.h:252 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:238 ../share/symbols/symbols.h:239 msgctxt "Symbol" -msgid "Post Office" +msgid "Beauty Salon" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:240 ../share/symbols/symbols.h:241 msgctxt "Symbol" -msgid "Ranger Station" +msgid "Ticket Purchase" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:242 ../share/symbols/symbols.h:243 msgctxt "Symbol" -msgid "RV Campground" +msgid "Baggage Check In" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:257 ../share/symbols/symbols.h:258 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:244 ../share/symbols/symbols.h:245 msgctxt "Symbol" -msgid "Restrooms" +msgid "Baggage Claim" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:259 ../share/symbols/symbols.h:260 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:246 ../share/symbols/symbols.h:247 +msgctxt "Symbol" +msgid "Customs" +msgstr "Told" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:248 ../share/symbols/symbols.h:249 +msgctxt "Symbol" +msgid "Immigration" +msgstr "Immigration" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:250 ../share/symbols/symbols.h:251 #, fuzzy msgctxt "Symbol" -msgid "Sailing" -msgstr "Rulning" +msgid "Departing Flights" +msgstr "Destinationens højde" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:261 ../share/symbols/symbols.h:262 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:252 ../share/symbols/symbols.h:253 +#, fuzzy msgctxt "Symbol" -msgid "Sanitary Disposal Station" -msgstr "" +msgid "Arriving Flights" +msgstr "Lysstyrke" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:263 ../share/symbols/symbols.h:264 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:254 ../share/symbols/symbols.h:255 msgctxt "Symbol" -msgid "Scuba Diving" +msgid "Smoking" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:265 ../share/symbols/symbols.h:266 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:256 ../share/symbols/symbols.h:257 msgctxt "Symbol" -msgid "Self Guided Trail" +msgid "No Smoking" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:267 ../share/symbols/symbols.h:268 -#, fuzzy +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:260 ../share/symbols/symbols.h:261 msgctxt "Symbol" -msgid "Shelter" -msgstr "Fladhed" +msgid "No Parking" +msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:269 ../share/symbols/symbols.h:270 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:262 ../share/symbols/symbols.h:263 msgctxt "Symbol" -msgid "Showers" +msgid "No Dogs" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:264 ../share/symbols/symbols.h:265 msgctxt "Symbol" -msgid "Sledding" +msgid "No Entry" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:266 ../share/symbols/symbols.h:267 msgctxt "Symbol" -msgid "SnowmobileTrail" +msgid "Exit" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:268 ../share/symbols/symbols.h:269 msgctxt "Symbol" -msgid "Stable" +msgid "Fire Extinguisher" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:277 ../share/symbols/symbols.h:278 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:270 ../share/symbols/symbols.h:271 msgctxt "Symbol" -msgid "Store" +msgid "Right Arrow" +msgstr "Højre pil" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:272 ../share/symbols/symbols.h:273 +msgctxt "Symbol" +msgid "Forward and Right Arrow" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:279 ../share/symbols/symbols.h:280 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:274 ../share/symbols/symbols.h:275 msgctxt "Symbol" -msgid "Swimming" +msgid "Up Arrow" +msgstr "Op pil" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:276 ../share/symbols/symbols.h:277 +msgctxt "Symbol" +msgid "Forward and Left Arrow" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:283 ../share/symbols/symbols.h:284 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:278 ../share/symbols/symbols.h:279 msgctxt "Symbol" -msgid "Emergency Telephone" +msgid "Left Arrow" +msgstr "Venstre pil" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:280 ../share/symbols/symbols.h:281 +msgctxt "Symbol" +msgid "Left and Down Arrow" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:285 ../share/symbols/symbols.h:286 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:282 ../share/symbols/symbols.h:283 msgctxt "Symbol" -msgid "Trailhead" +msgid "Down Arrow" +msgstr "Ned pil" + +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:284 ../share/symbols/symbols.h:285 +msgctxt "Symbol" +msgid "Right and Down Arrow" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:287 ../share/symbols/symbols.h:288 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:286 ../share/symbols/symbols.h:287 msgctxt "Symbol" -msgid "Wheelchair Accessible" +msgid "NPS Wheelchair Accessible - 1996" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:289 ../share/symbols/symbols.h:290 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:288 ../share/symbols/symbols.h:289 msgctxt "Symbol" -msgid "Wind Surfing" +msgid "NPS Wheelchair Accessible" msgstr "" -#. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:291 +#. Symbols: ./AigaSymbols.svg +#: ../share/symbols/symbols.h:290 ../share/symbols/symbols.h:291 msgctxt "Symbol" -msgid "Blank" +msgid "New Wheelchair Accessible" msgstr "" #: ../share/templates/templates.h:1 @@ -4590,9 +4526,8 @@ msgid "CD label 120x120 disc disk" msgstr "" #: ../share/templates/templates.h:1 -#, fuzzy msgid "No Layers" -msgstr "_Lag" +msgstr "Ingen lag" #: ../share/templates/templates.h:1 msgid "Empty sheet with no layers" @@ -4630,7 +4565,7 @@ msgid "guidelines typography canvas" msgstr "" #. 3D box -#: ../src/box3d.cpp:250 ../src/box3d.cpp:1304 +#: ../src/box3d.cpp:255 ../src/box3d.cpp:1309 #: ../src/ui/dialog/inkscape-preferences.cpp:407 msgid "3D Box" msgstr "3D-boks" @@ -4659,32 +4594,29 @@ msgid "Current layer is locked. Unlock it to be able to draw on it." msgstr "" "Det aktuelle lag er låst. Lås det op, for at kunne tegne på det." -#: ../src/desktop-events.cpp:242 -#, fuzzy +#: ../src/desktop-events.cpp:244 msgid "Create guide" -msgstr "Opret ellipse" +msgstr "Opret hjælpelinje" -#: ../src/desktop-events.cpp:498 -#, fuzzy +#: ../src/desktop-events.cpp:500 msgid "Move guide" -msgstr "Flyt knudepunkter" +msgstr "Flyt hjælpelinje" -#: ../src/desktop-events.cpp:505 ../src/desktop-events.cpp:563 -#: ../src/ui/dialog/guides.cpp:138 -#, fuzzy +#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:572 +#: ../src/ui/dialog/guides.cpp:147 msgid "Delete guide" -msgstr "Slet knudepunkt" +msgstr "Slet hjælpelinje" -#: ../src/desktop-events.cpp:543 -#, fuzzy, c-format +#: ../src/desktop-events.cpp:552 +#, c-format msgid "Guideline: %s" -msgstr "Hjælpelinje" +msgstr "Hjælpelinje: %s" -#: ../src/desktop.cpp:873 +#: ../src/desktop.cpp:875 msgid "No previous zoom." msgstr "Ingen forrige zoom." -#: ../src/desktop.cpp:894 +#: ../src/desktop.cpp:896 msgid "No next zoom." msgstr "Ingen næste zoom." @@ -4697,8 +4629,8 @@ msgid "_Origin X:" msgstr "_Udgangspunkt X:" #: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:780 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 msgid "X coordinate of grid origin" msgstr "X-koordinat for gitterudgangspunkt" @@ -4707,8 +4639,8 @@ msgid "O_rigin Y:" msgstr "U_dgangspunkt Y:" #: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:781 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "Y coordinate of grid origin" msgstr "Y-koordinat for gitterudgangspunkt" @@ -4717,29 +4649,29 @@ msgid "Spacing _Y:" msgstr "_Afstand Y:" #: ../src/display/canvas-axonomgrid.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/ui/dialog/inkscape-preferences.cpp:809 msgid "Base length of z-axis" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/ui/dialog/inkscape-preferences.cpp:812 #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "Vinkel X:" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/ui/dialog/inkscape-preferences.cpp:812 msgid "Angle of x-axis" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:811 +#: ../src/ui/dialog/inkscape-preferences.cpp:813 #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "Vinkel Z:" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:811 +#: ../src/ui/dialog/inkscape-preferences.cpp:813 msgid "Angle of z-axis" msgstr "" @@ -4749,7 +4681,7 @@ msgid "Minor grid line _color:" msgstr "Primær gitterlin_jefarve:" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:762 +#: ../src/ui/dialog/inkscape-preferences.cpp:764 #, fuzzy msgid "Minor grid line color" msgstr "Primær gitterlinjefarve" @@ -4764,7 +4696,7 @@ msgid "Ma_jor grid line color:" msgstr "Primær gitterlin_jefarve:" #: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/ui/dialog/inkscape-preferences.cpp:766 msgid "Major grid line color" msgstr "Primær gitterlinjefarve" @@ -4774,30 +4706,27 @@ msgstr "Farve på de primære (fremhævede) gitterlinjer" #: ../src/display/canvas-axonomgrid.cpp:384 ../src/display/canvas-grid.cpp:723 msgid "_Major grid line every:" -msgstr "_Pri_mær gitterlinje for hver:" +msgstr "_Primær gitterlinje for hver:" #: ../src/display/canvas-axonomgrid.cpp:384 ../src/display/canvas-grid.cpp:723 msgid "lines" msgstr "linjer" #: ../src/display/canvas-grid.cpp:60 -#, fuzzy msgid "Rectangular grid" -msgstr "Firkant" +msgstr "Firkantet gitter" #: ../src/display/canvas-grid.cpp:61 msgid "Axonometric grid" msgstr "" #: ../src/display/canvas-grid.cpp:246 -#, fuzzy msgid "Create new grid" -msgstr "Opret ellipse" +msgstr "Opret ny hjælpelinje" #: ../src/display/canvas-grid.cpp:312 -#, fuzzy msgid "_Enabled" -msgstr "Titel" +msgstr "_Aktiveret" #: ../src/display/canvas-grid.cpp:313 msgid "" @@ -4807,7 +4736,7 @@ msgstr "" #: ../src/display/canvas-grid.cpp:317 msgid "Snap to visible _grid lines only" -msgstr "" +msgstr "Fastgør kun til synlige _gitterlinje" #: ../src/display/canvas-grid.cpp:318 msgid "" @@ -4816,9 +4745,8 @@ msgid "" msgstr "" #: ../src/display/canvas-grid.cpp:322 -#, fuzzy msgid "_Visible" -msgstr "Farver:" +msgstr "_Synlig" #: ../src/display/canvas-grid.cpp:323 msgid "" @@ -4831,20 +4759,20 @@ msgid "Spacing _X:" msgstr "Afstand _X:" #: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:784 +#: ../src/ui/dialog/inkscape-preferences.cpp:786 #, fuzzy msgid "Distance between vertical grid lines" msgstr "Afstand mellem lodrette gitterlinjer" #: ../src/display/canvas-grid.cpp:708 -#: ../src/ui/dialog/inkscape-preferences.cpp:785 +#: ../src/ui/dialog/inkscape-preferences.cpp:787 #, fuzzy msgid "Distance between horizontal grid lines" msgstr "Afstand mellem vandrette gitterlinjer" #: ../src/display/canvas-grid.cpp:740 msgid "_Show dots instead of lines" -msgstr "" +msgstr "_Vis prikker i stedet for linjer" #: ../src/display/canvas-grid.cpp:741 msgid "If set, displays dots at gridpoints instead of gridlines" @@ -4857,9 +4785,8 @@ msgid "UNDEFINED" msgstr "" #: ../src/display/snap-indicator.cpp:79 -#, fuzzy msgid "grid line" -msgstr "Hjælpelinje" +msgstr "Hjælpelinje-linje" #: ../src/display/snap-indicator.cpp:82 #, fuzzy @@ -4872,9 +4799,8 @@ msgid "grid line (perpendicular)" msgstr "Gitterlinjefarve" #: ../src/display/snap-indicator.cpp:88 -#, fuzzy msgid "guide" -msgstr "H_jælpelinjer" +msgstr "hjælpelinje" #: ../src/display/snap-indicator.cpp:91 #, fuzzy @@ -4906,9 +4832,8 @@ msgid "smooth node" msgstr "Udjævnet" #: ../src/display/snap-indicator.cpp:109 -#, fuzzy msgid "path" -msgstr "Sti" +msgstr "sti" #: ../src/display/snap-indicator.cpp:112 msgid "path (perpendicular)" @@ -4949,9 +4874,8 @@ msgid "bounding box side" msgstr "Hæng afgrænsningsbokse på hjælpelinjer" #: ../src/display/snap-indicator.cpp:136 -#, fuzzy msgid "page border" -msgstr "Sidekantfarve" +msgstr "sidekant" #: ../src/display/snap-indicator.cpp:139 #, fuzzy @@ -4989,9 +4913,8 @@ msgid "quadrant point" msgstr "Linjeafstand:" #: ../src/display/snap-indicator.cpp:161 -#, fuzzy msgid "corner" -msgstr "Hjørner:" +msgstr "hjørne" #: ../src/display/snap-indicator.cpp:164 msgid "text anchor" @@ -5063,9 +4986,8 @@ msgid "Path intersection" msgstr "Gennemskæring" #: ../src/display/snap-indicator.cpp:218 -#, fuzzy msgid "Guide" -msgstr "H_jælpelinjer" +msgstr "Hjælpelinje" #: ../src/display/snap-indicator.cpp:221 #, fuzzy @@ -5081,9 +5003,8 @@ msgid "Quadrant point" msgstr "" #: ../src/display/snap-indicator.cpp:231 -#, fuzzy msgid "Corner" -msgstr "Hjørner:" +msgstr "Hjørne" #: ../src/display/snap-indicator.cpp:234 #, fuzzy @@ -5098,22 +5019,22 @@ msgstr "" msgid " to " msgstr "" -#: ../src/document.cpp:544 +#: ../src/document.cpp:528 #, c-format msgid "New document %d" msgstr "Nyt dokument %d" -#: ../src/document.cpp:549 +#: ../src/document.cpp:533 #, fuzzy, c-format msgid "Memory document %d" msgstr "Lagret dokument %d" -#: ../src/document.cpp:578 +#: ../src/document.cpp:562 #, fuzzy msgid "Memory document %1" msgstr "Lagret dokument %d" -#: ../src/document.cpp:886 +#: ../src/document.cpp:870 #, c-format msgid "Unnamed document %d" msgstr "Unavngivet dokument %d" @@ -5123,17 +5044,16 @@ msgid "[Unchanged]" msgstr "[Uændret]" #. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2434 +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2461 msgid "_Undo" msgstr "Fo_rtryd" # omgør/gentag -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2436 +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2463 msgid "_Redo" msgstr "Ann_uller fortryd" #: ../src/extension/dependency.cpp:243 -#, fuzzy msgid "Dependency:" msgstr "Afhængighed:" @@ -5154,11 +5074,10 @@ msgid " description: " msgstr " beskrivelse: " #: ../src/extension/effect.cpp:41 -#, fuzzy msgid " (No preferences)" -msgstr "Indstillinger for zoom" +msgstr " (ingen indstillinger)" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2208 +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2235 msgid "Extensions" msgstr "Udvidelser" @@ -5184,7 +5103,7 @@ msgstr "" msgid "Show dialog on startup" msgstr "Vis dialog ved opstart" -#: ../src/extension/execution-env.cpp:138 +#: ../src/extension/execution-env.cpp:136 #, c-format msgid "'%s' working, please wait..." msgstr "'%s' arbejder, vent venligst ..." @@ -5270,7 +5189,7 @@ msgid "" "this extension." msgstr "" -#: ../src/extension/implementation/script.cpp:1063 +#: ../src/extension/implementation/script.cpp:1112 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5302,13 +5221,13 @@ msgstr "Tærskel:" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 #: ../src/extension/internal/bitmap/raise.cpp:42 #: ../src/extension/internal/bitmap/sample.cpp:41 -#: ../src/extension/internal/bluredge.cpp:136 +#: ../src/extension/internal/bluredge.cpp:134 #: ../src/ui/dialog/lpe-powerstroke-properties.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:68 #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:297 #: ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" @@ -5324,6 +5243,7 @@ msgid "Height:" msgstr "Højde:" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 +#: ../src/widgets/measure-toolbar.cpp:328 #: ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "Forskydning:" @@ -5372,9 +5292,8 @@ msgid "Apply adaptive thresholding to selected bitmap(s)" msgstr "Anvend transformation på markering" #: ../src/extension/internal/bitmap/addNoise.cpp:45 -#, fuzzy msgid "Add Noise" -msgstr "Tilføj knudepunkter" +msgstr "Tilføj støj" #. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch"); #: ../src/extension/internal/bitmap/addNoise.cpp:47 @@ -5383,8 +5302,8 @@ msgstr "Tilføj knudepunkter" #: ../src/extension/internal/filter/color.h:1660 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2858 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 #: ../src/ui/dialog/object-attributes.cpp:49 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5439,10 +5358,9 @@ msgstr "Blå" #: ../src/extension/internal/bitmap/oilPaint.cpp:39 #: ../src/extension/internal/bitmap/sharpen.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2910 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2909 msgid "Radius:" -msgstr "Radius" +msgstr "Radius:" #: ../src/extension/internal/bitmap/blur.cpp:41 #: ../src/extension/internal/bitmap/charcoal.cpp:41 @@ -5459,14 +5377,12 @@ msgid "Blur selected bitmap(s)" msgstr "" #: ../src/extension/internal/bitmap/channel.cpp:48 -#, fuzzy msgid "Channel" -msgstr "Fortryd" +msgstr "Kanal" #: ../src/extension/internal/bitmap/channel.cpp:50 -#, fuzzy msgid "Layer:" -msgstr "_Lag" +msgstr "Lag:" #: ../src/extension/internal/bitmap/channel.cpp:51 #: ../src/extension/internal/bitmap/levelChannel.cpp:55 @@ -5491,27 +5407,23 @@ msgstr "Opret firkant" #: ../src/extension/internal/bitmap/channel.cpp:55 #: ../src/extension/internal/bitmap/levelChannel.cpp:59 -#, fuzzy msgid "Magenta Channel" -msgstr "Magenta" +msgstr "Magenta-kanal" #: ../src/extension/internal/bitmap/channel.cpp:56 #: ../src/extension/internal/bitmap/levelChannel.cpp:60 -#, fuzzy msgid "Yellow Channel" -msgstr "Gul" +msgstr "Gul-kanal" #: ../src/extension/internal/bitmap/channel.cpp:57 #: ../src/extension/internal/bitmap/levelChannel.cpp:61 -#, fuzzy msgid "Black Channel" -msgstr "Sort" +msgstr "Sort-kanal" #: ../src/extension/internal/bitmap/channel.cpp:58 #: ../src/extension/internal/bitmap/levelChannel.cpp:62 -#, fuzzy msgid "Opacity Channel" -msgstr "Uigennemsigtighed" +msgstr "Opacitet-kanal" #: ../src/extension/internal/bitmap/channel.cpp:59 #: ../src/extension/internal/bitmap/levelChannel.cpp:63 @@ -5520,12 +5432,11 @@ msgstr "" #: ../src/extension/internal/bitmap/channel.cpp:66 msgid "Extract specific channel from image" -msgstr "" +msgstr "Udtræk specifik kanal fra billede" #: ../src/extension/internal/bitmap/charcoal.cpp:38 -#, fuzzy msgid "Charcoal" -msgstr "Cairo" +msgstr "Kul" #: ../src/extension/internal/bitmap/charcoal.cpp:47 #, fuzzy @@ -5544,14 +5455,12 @@ msgstr "" #: ../src/extension/internal/bitmap/contrast.cpp:40 #: ../src/extension/internal/filter/color.h:1189 -#, fuzzy msgid "Contrast" -msgstr "Hjørner:" +msgstr "Kontrast" #: ../src/extension/internal/bitmap/contrast.cpp:42 -#, fuzzy msgid "Adjust:" -msgstr "Træk kurve" +msgstr "Justér:" #: ../src/extension/internal/bitmap/contrast.cpp:48 msgid "Increase or decrease contrast in bitmap(s)" @@ -5565,22 +5474,19 @@ msgstr "" #: ../src/extension/internal/bitmap/crop.cpp:68 msgid "Top (px):" -msgstr "" +msgstr "Top (px):" #: ../src/extension/internal/bitmap/crop.cpp:69 -#, fuzzy msgid "Bottom (px):" -msgstr "Bot" +msgstr "Bund (px):" #: ../src/extension/internal/bitmap/crop.cpp:70 -#, fuzzy msgid "Left (px):" -msgstr "Forskydninger" +msgstr "Venstre (px):" #: ../src/extension/internal/bitmap/crop.cpp:71 -#, fuzzy msgid "Right (px):" -msgstr "Rettigheder" +msgstr "Højre (px):" #: ../src/extension/internal/bitmap/crop.cpp:77 msgid "Crop selected bitmap(s)" @@ -5593,10 +5499,9 @@ msgstr "" #: ../src/extension/internal/bitmap/cycleColormap.cpp:39 #: ../src/extension/internal/bitmap/spread.cpp:39 #: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:208 -#, fuzzy +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount:" -msgstr "Skrifttype" +msgstr "Mængde:" #: ../src/extension/internal/bitmap/cycleColormap.cpp:45 msgid "Cycle colormap(s) of selected bitmap(s)" @@ -5613,9 +5518,8 @@ msgid "Reduce speckle noise of selected bitmap(s)" msgstr "Husk valgte" #: ../src/extension/internal/bitmap/edge.cpp:37 -#, fuzzy msgid "Edge" -msgstr "Udtvær kant" +msgstr "Kant" #: ../src/extension/internal/bitmap/edge.cpp:45 #, fuzzy @@ -5656,9 +5560,8 @@ msgstr "" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:40 #: ../src/extension/internal/bitmap/implode.cpp:39 #: ../src/extension/internal/bitmap/solarize.cpp:41 -#, fuzzy msgid "Factor:" -msgstr "Enkel farve" +msgstr "Faktor:" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:47 msgid "Gaussian blur selected bitmap(s)" @@ -5679,25 +5582,21 @@ msgstr "Husk valgte" #: ../src/extension/internal/filter/image.h:56 #: ../src/extension/internal/filter/morphology.h:66 #: ../src/extension/internal/filter/paint.h:345 -#, fuzzy msgid "Level" -msgstr "Hjul" +msgstr "Niveau" #: ../src/extension/internal/bitmap/level.cpp:43 #: ../src/extension/internal/bitmap/levelChannel.cpp:65 -#, fuzzy msgid "Black Point:" -msgstr "Sort" +msgstr "Sortpunkt:" #: ../src/extension/internal/bitmap/level.cpp:44 #: ../src/extension/internal/bitmap/levelChannel.cpp:66 -#, fuzzy msgid "White Point:" -msgstr "Hjørnesamling" +msgstr "Hvidpunkt:" #: ../src/extension/internal/bitmap/level.cpp:45 #: ../src/extension/internal/bitmap/levelChannel.cpp:67 -#, fuzzy msgid "Gamma Correction:" msgstr "Gamma-korrigering:" @@ -5709,13 +5608,12 @@ msgstr "" #: ../src/extension/internal/bitmap/levelChannel.cpp:52 msgid "Level (with Channel)" -msgstr "" +msgstr "Niveau (med kanal)" #: ../src/extension/internal/bitmap/levelChannel.cpp:54 #: ../src/extension/internal/filter/color.h:711 -#, fuzzy msgid "Channel:" -msgstr "Fortryd" +msgstr "Kanal:" #: ../src/extension/internal/bitmap/levelChannel.cpp:73 msgid "" @@ -5739,19 +5637,16 @@ msgid "HSB Adjust" msgstr "Træk kurve" #: ../src/extension/internal/bitmap/modulate.cpp:42 -#, fuzzy msgid "Hue:" -msgstr "Farvetone" +msgstr "Farvetone:" #: ../src/extension/internal/bitmap/modulate.cpp:43 -#, fuzzy msgid "Saturation:" -msgstr "Farvemætning" +msgstr "Farvemætning:" #: ../src/extension/internal/bitmap/modulate.cpp:44 -#, fuzzy msgid "Brightness:" -msgstr "Lysstyrke" +msgstr "Lysstyrke:" #: ../src/extension/internal/bitmap/modulate.cpp:50 msgid "" @@ -5768,9 +5663,8 @@ msgid "Negate (take inverse) selected bitmap(s)" msgstr "" #: ../src/extension/internal/bitmap/normalize.cpp:36 -#, fuzzy msgid "Normalize" -msgstr "Normal" +msgstr "Normalisér" #: ../src/extension/internal/bitmap/normalize.cpp:43 msgid "" @@ -5779,9 +5673,8 @@ msgid "" msgstr "" #: ../src/extension/internal/bitmap/oilPaint.cpp:37 -#, fuzzy msgid "Oil Paint" -msgstr "GNOME-udskrivning" +msgstr "Oliemaling" #: ../src/extension/internal/bitmap/oilPaint.cpp:45 msgid "Stylize selected bitmap(s) so that they appear to be painted with oils" @@ -5790,17 +5683,17 @@ msgstr "" #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/blurs.h:333 #: ../src/extension/internal/filter/transparency.h:279 -#: ../src/ui/dialog/clonetiler.cpp:838 ../src/ui/dialog/clonetiler.cpp:991 +#: ../src/ui/dialog/clonetiler.cpp:836 ../src/ui/dialog/clonetiler.cpp:989 #: ../src/widgets/tweak-toolbar.cpp:334 -#: ../share/extensions/interp_att_g.inx.h:16 +#: ../share/extensions/interp_att_g.inx.h:18 msgid "Opacity" -msgstr "Synlighed" +msgstr "Opacitet" #: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 -#: ../src/ui/dialog/objects.cpp:1625 ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2899 +#: ../src/ui/dialog/objects.cpp:1629 ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" -msgstr "Synlighed:" +msgstr "Opacitet:" #: ../src/extension/internal/bitmap/opacity.cpp:46 msgid "Modify opacity channel(s) of selected bitmap(s)" @@ -5811,9 +5704,8 @@ msgid "Raise" msgstr "Hæv" #: ../src/extension/internal/bitmap/raise.cpp:44 -#, fuzzy msgid "Raised" -msgstr "Hæv" +msgstr "" #: ../src/extension/internal/bitmap/raise.cpp:50 msgid "" @@ -5950,30 +5842,30 @@ msgstr "Skalalængde" msgid "Alter selected bitmap(s) along sine wave" msgstr "" -#: ../src/extension/internal/bluredge.cpp:134 +#: ../src/extension/internal/bluredge.cpp:132 #, fuzzy msgid "Inset/Outset Halo" msgstr "Skub ind/ud med:" -#: ../src/extension/internal/bluredge.cpp:136 +#: ../src/extension/internal/bluredge.cpp:134 #, fuzzy msgid "Width in px of the halo" msgstr "Bredde af det udtværrede område i billedpunkter" -#: ../src/extension/internal/bluredge.cpp:137 +#: ../src/extension/internal/bluredge.cpp:135 #, fuzzy msgid "Number of steps:" msgstr "Antal trin" -#: ../src/extension/internal/bluredge.cpp:137 +#: ../src/extension/internal/bluredge.cpp:135 #, fuzzy msgid "Number of inset/outset copies of the object to make" msgstr "Antal kopier af objektet der skal simulere udtværingen" -#: ../src/extension/internal/bluredge.cpp:141 +#: ../src/extension/internal/bluredge.cpp:139 #: ../share/extensions/extrude.inx.h:5 #: ../share/extensions/generate_voronoi.inx.h:9 -#: ../share/extensions/interp.inx.h:7 ../share/extensions/motion.inx.h:4 +#: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 #: ../share/extensions/pathalongpath.inx.h:18 #: ../share/extensions/pathscatter.inx.h:20 #: ../share/extensions/voronoi2svg.inx.h:13 @@ -6111,11 +6003,11 @@ msgstr "" #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:246 msgid "PDF 1.5" -msgstr "" +msgstr "PDF 1.5" #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:248 msgid "PDF 1.4" -msgstr "" +msgstr "PDF 1.4" #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:257 #, fuzzy @@ -6133,9 +6025,9 @@ msgstr "Slet tekst" #: ../src/extension/internal/cdr-input.cpp:128 #: ../src/extension/internal/pdfinput/pdf-input.cpp:111 #: ../src/extension/internal/vsd-input.cpp:128 -#, fuzzy, c-format +#, c-format msgid "out of %i" -msgstr "Mængde af hvirvlen" +msgstr "ud af %i" #: ../src/extension/internal/cdr-input.cpp:165 #: ../src/extension/internal/vsd-input.cpp:165 @@ -6193,86 +6085,86 @@ msgstr "" msgid "Open presentation exchange files saved in Corel DRAW" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3584 +#: ../src/extension/internal/emf-inout.cpp:3581 #, fuzzy msgid "EMF Input" msgstr "DXF inddata" -#: ../src/extension/internal/emf-inout.cpp:3589 +#: ../src/extension/internal/emf-inout.cpp:3586 #, fuzzy msgid "Enhanced Metafiles (*.emf)" msgstr "Windows Metafile (*.wmf)" -#: ../src/extension/internal/emf-inout.cpp:3590 +#: ../src/extension/internal/emf-inout.cpp:3587 msgid "Enhanced Metafiles" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3598 +#: ../src/extension/internal/emf-inout.cpp:3595 msgid "EMF Output" msgstr "EMF-output" -#: ../src/extension/internal/emf-inout.cpp:3600 +#: ../src/extension/internal/emf-inout.cpp:3597 #: ../src/extension/internal/wmf-inout.cpp:3176 #, fuzzy msgid "Convert texts to paths" msgstr "Konvertér tekst til sti" -#: ../src/extension/internal/emf-inout.cpp:3601 +#: ../src/extension/internal/emf-inout.cpp:3598 #: ../src/extension/internal/wmf-inout.cpp:3177 msgid "Map Unicode to Symbol font" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3602 +#: ../src/extension/internal/emf-inout.cpp:3599 #: ../src/extension/internal/wmf-inout.cpp:3178 msgid "Map Unicode to Wingdings" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3603 +#: ../src/extension/internal/emf-inout.cpp:3600 #: ../src/extension/internal/wmf-inout.cpp:3179 msgid "Map Unicode to Zapf Dingbats" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3604 +#: ../src/extension/internal/emf-inout.cpp:3601 #: ../src/extension/internal/wmf-inout.cpp:3180 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3605 +#: ../src/extension/internal/emf-inout.cpp:3602 #: ../src/extension/internal/wmf-inout.cpp:3181 msgid "Compensate for PPT font bug" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3606 +#: ../src/extension/internal/emf-inout.cpp:3603 #: ../src/extension/internal/wmf-inout.cpp:3182 msgid "Convert dashed/dotted lines to single lines" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3607 +#: ../src/extension/internal/emf-inout.cpp:3604 #: ../src/extension/internal/wmf-inout.cpp:3183 #, fuzzy msgid "Convert gradients to colored polygon series" msgstr "Streg med lineær overgang" -#: ../src/extension/internal/emf-inout.cpp:3608 +#: ../src/extension/internal/emf-inout.cpp:3605 #, fuzzy msgid "Use native rectangular linear gradients" msgstr "Opret lineær overgang" -#: ../src/extension/internal/emf-inout.cpp:3609 +#: ../src/extension/internal/emf-inout.cpp:3606 msgid "Map all fill patterns to standard EMF hatches" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3610 +#: ../src/extension/internal/emf-inout.cpp:3607 #, fuzzy msgid "Ignore image rotations" msgstr "Sideorientering:" -#: ../src/extension/internal/emf-inout.cpp:3614 +#: ../src/extension/internal/emf-inout.cpp:3611 #, fuzzy msgid "Enhanced Metafile (*.emf)" msgstr "Windows Metafile (*.wmf)" -#: ../src/extension/internal/emf-inout.cpp:3615 +#: ../src/extension/internal/emf-inout.cpp:3612 #, fuzzy msgid "Enhanced Metafile" msgstr "Opret firkant" @@ -6343,7 +6235,7 @@ msgstr "Farve på frem_hævning:" #: ../src/extension/internal/filter/distort.h:95 #: ../src/extension/internal/filter/distort.h:204 #: ../src/extension/internal/filter/filter-file.cpp:151 -#: ../src/extension/internal/filter/filter.cpp:212 +#: ../src/extension/internal/filter/filter.cpp:211 #: ../src/extension/internal/filter/image.h:61 #: ../src/extension/internal/filter/morphology.h:75 #: ../src/extension/internal/filter/morphology.h:202 @@ -6569,15 +6461,14 @@ msgstr "Placering:" #: ../src/extension/internal/filter/blurs.h:336 #: ../src/extension/internal/filter/color.h:1280 #: ../src/extension/internal/filter/color.h:1392 -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:123 msgid "Background color" msgstr "Baggrundsfarve" #: ../src/extension/internal/filter/blurs.h:337 #: ../src/extension/internal/filter/bumps.h:129 -#, fuzzy msgid "Blend type:" -msgstr " type: " +msgstr "Blandetype:" #: ../src/extension/internal/filter/blurs.h:338 #: ../src/extension/internal/filter/bumps.h:130 @@ -6594,8 +6485,7 @@ msgstr " type: " #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:685 -#: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50 +#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:687 msgid "Normal" msgstr "Normal" @@ -6693,10 +6583,9 @@ msgstr "Farver:" #: ../src/extension/internal/filter/bumps.h:329 #: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199 #: ../src/ui/widget/page-sizer.cpp:250 ../src/widgets/rect-toolbar.cpp:334 -#: ../share/extensions/interp_att_g.inx.h:11 -#, fuzzy +#: ../share/extensions/interp_att_g.inx.h:13 msgid "Height" -msgstr "Højde:" +msgstr "Højde" #: ../src/extension/internal/filter/bumps.h:99 #: ../src/extension/internal/filter/bumps.h:330 @@ -6716,19 +6605,17 @@ msgstr "Lysstyrke" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 -#, fuzzy +#: ../src/widgets/measure-toolbar.cpp:302 msgid "Precision" -msgstr "Beskrivelse" +msgstr "Præcision" #: ../src/extension/internal/filter/bumps.h:103 -#, fuzzy msgid "Light source" -msgstr "Kilde" +msgstr "Lyskilde" #: ../src/extension/internal/filter/bumps.h:104 -#, fuzzy msgid "Light source:" -msgstr "Kilde" +msgstr "Lyskilde:" #: ../src/extension/internal/filter/bumps.h:105 #, fuzzy @@ -6769,21 +6656,18 @@ msgstr "Kildes højde" #: ../src/extension/internal/filter/bumps.h:113 #: ../src/extension/internal/filter/bumps.h:117 -#, fuzzy msgid "X location" -msgstr " sted: " +msgstr "X-placering" #: ../src/extension/internal/filter/bumps.h:114 #: ../src/extension/internal/filter/bumps.h:118 -#, fuzzy msgid "Y location" -msgstr " sted: " +msgstr "Y-placering" #: ../src/extension/internal/filter/bumps.h:115 #: ../src/extension/internal/filter/bumps.h:119 -#, fuzzy msgid "Z location" -msgstr " sted: " +msgstr "Z-placering" #: ../src/extension/internal/filter/bumps.h:116 #, fuzzy @@ -6791,19 +6675,16 @@ msgid "Spot light options" msgstr "Kildes højde" #: ../src/extension/internal/filter/bumps.h:120 -#, fuzzy msgid "X target" -msgstr "Mål:" +msgstr "x-mål" #: ../src/extension/internal/filter/bumps.h:121 -#, fuzzy msgid "Y target" -msgstr "Mål:" +msgstr "y-mål" #: ../src/extension/internal/filter/bumps.h:122 -#, fuzzy msgid "Z target" -msgstr "Mål:" +msgstr "z-mål" #: ../src/extension/internal/filter/bumps.h:123 #, fuzzy @@ -6811,14 +6692,12 @@ msgid "Specular exponent" msgstr "Eksponent" #: ../src/extension/internal/filter/bumps.h:124 -#, fuzzy msgid "Cone angle" -msgstr "Vinkel" +msgstr "Keglevinkel" #: ../src/extension/internal/filter/bumps.h:127 -#, fuzzy msgid "Image color" -msgstr "Indsæt farve" +msgstr "Billedfarve" #: ../src/extension/internal/filter/bumps.h:128 #, fuzzy @@ -6835,9 +6714,8 @@ msgid "Wax Bump" msgstr "Vælg maske" #: ../src/extension/internal/filter/bumps.h:320 -#, fuzzy msgid "Background:" -msgstr "Ba_ggrund:" +msgstr "Baggrund:" #: ../src/extension/internal/filter/bumps.h:322 #: ../src/extension/internal/filter/transparency.h:57 @@ -6939,7 +6817,7 @@ msgstr "GNOME-udskrivning" #: ../src/extension/internal/filter/color.h:157 #: ../src/extension/internal/filter/color.h:332 #: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 #: ../src/ui/tools/flood-tool.cpp:95 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 @@ -7005,14 +6883,12 @@ msgid "Simulate color blindness" msgstr "" #: ../src/extension/internal/filter/color.h:329 -#, fuzzy msgid "Color Shift" -msgstr "Farve på skygge" +msgstr "Farveskift" #: ../src/extension/internal/filter/color.h:331 -#, fuzzy msgid "Shift (°)" -msgstr "S_hift" +msgstr "Skift (°)" #: ../src/extension/internal/filter/color.h:340 msgid "Rotate and desaturate hue" @@ -7029,9 +6905,8 @@ msgid "Normal light" msgstr "Vandret forskudt" #: ../src/extension/internal/filter/color.h:398 -#, fuzzy msgid "Duotone" -msgstr "Bot" +msgstr "" #: ../src/extension/internal/filter/color.h:399 #: ../src/extension/internal/filter/color.h:1487 @@ -7075,9 +6950,8 @@ msgstr "Distribuér" #: ../src/extension/internal/filter/color.h:505 ../src/filter-enums.cpp:113 #: ../src/live_effects/lpe-interpolate_points.cpp:25 #: ../src/live_effects/lpe-powerstroke.cpp:133 -#, fuzzy msgid "Linear" -msgstr "Linje" +msgstr "Linær" #: ../src/extension/internal/filter/color.h:506 ../src/filter-enums.cpp:114 msgid "Gamma" @@ -7106,28 +6980,24 @@ msgid "No swap" msgstr "" #: ../src/extension/internal/filter/color.h:591 -#, fuzzy msgid "Color and alpha" -msgstr "Farve på sidekant" +msgstr "Farve og alfa" #: ../src/extension/internal/filter/color.h:592 -#, fuzzy msgid "Color only" -msgstr "Farve på hjælpelinjer" +msgstr "Kun farve" #: ../src/extension/internal/filter/color.h:593 msgid "Alpha only" msgstr "Kun alfa" #: ../src/extension/internal/filter/color.h:597 -#, fuzzy msgid "Color 1" -msgstr "Farve" +msgstr "Farve 1" #: ../src/extension/internal/filter/color.h:600 -#, fuzzy msgid "Color 2" -msgstr "Farve" +msgstr "Farve 2" #: ../src/extension/internal/filter/color.h:610 #, fuzzy @@ -7165,13 +7035,12 @@ msgid "Background blend mode:" msgstr "Baggrundsfarve" #: ../src/extension/internal/filter/color.h:724 -#, fuzzy msgid "Channel to alpha" -msgstr "Fortryd" +msgstr "Kanal til alfa" #: ../src/extension/internal/filter/color.h:732 msgid "Extract color channel as a transparent image" -msgstr "" +msgstr "Udtræk farvekanal som et transparent billede" #: ../src/extension/internal/filter/color.h:815 #, fuzzy @@ -7179,9 +7048,8 @@ msgid "Fade to Black or White" msgstr "Invertér sorte og hvide områdr til enkelte sporinger" #: ../src/extension/internal/filter/color.h:818 -#, fuzzy msgid "Fade to:" -msgstr "Ton ud:" +msgstr "Ton ud:" #: ../src/extension/internal/filter/color.h:819 #: ../src/ui/widget/color-icc-selector.cpp:193 @@ -7201,16 +7069,14 @@ msgid "Fade to black or white" msgstr "Invertér sorte og hvide områdr til enkelte sporinger" #: ../src/extension/internal/filter/color.h:894 -#, fuzzy msgid "Greyscale" -msgstr "_Skalér" +msgstr "Gråtone" #: ../src/extension/internal/filter/color.h:900 #: ../src/extension/internal/filter/paint.h:83 #: ../src/extension/internal/filter/paint.h:239 -#, fuzzy msgid "Transparent" -msgstr "0 (gennemsigtig)" +msgstr "Transparent" #: ../src/extension/internal/filter/color.h:908 msgid "Customize greyscale components" @@ -7222,23 +7088,20 @@ msgid "Invert" msgstr "Invertér" #: ../src/extension/internal/filter/color.h:982 -#, fuzzy msgid "Invert channels:" -msgstr "Invertér" +msgstr "Invertér kanaler:" #: ../src/extension/internal/filter/color.h:983 -#, fuzzy msgid "No inversion" -msgstr "Opdeling" +msgstr "" #: ../src/extension/internal/filter/color.h:984 msgid "Red and blue" msgstr "" #: ../src/extension/internal/filter/color.h:985 -#, fuzzy msgid "Red and green" -msgstr "Opret og redigér overgange" +msgstr "Rød og grøn" #: ../src/extension/internal/filter/color.h:986 msgid "Green and blue" @@ -7274,18 +7137,18 @@ msgid "Lights" msgstr "Rettigheder" #: ../src/extension/internal/filter/color.h:1118 -#, fuzzy msgid "Shadows" -msgstr "Figurer" +msgstr "Skygger" #: ../src/extension/internal/filter/color.h:1119 #: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 #: ../src/live_effects/effect.cpp:108 +#: ../src/live_effects/lpe-transform_2pts.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:1048 -#: ../src/widgets/gradient-toolbar.cpp:1162 -#, fuzzy +#: ../src/widgets/gradient-toolbar.cpp:1159 +#: ../src/widgets/measure-toolbar.cpp:328 msgid "Offset" -msgstr "Forskydninger" +msgstr "Forskydning" #: ../src/extension/internal/filter/color.h:1127 msgid "Modify lights and shadows separately" @@ -7305,9 +7168,8 @@ msgid "Nudge RGB" msgstr "" #: ../src/extension/internal/filter/color.h:1269 -#, fuzzy msgid "Red offset" -msgstr "Mønsterforskydning" +msgstr "Rød-forskydning" #: ../src/extension/internal/filter/color.h:1270 #: ../src/extension/internal/filter/color.h:1273 @@ -7331,14 +7193,12 @@ msgid "Y" msgstr "Y" #: ../src/extension/internal/filter/color.h:1272 -#, fuzzy msgid "Green offset" -msgstr "Mønsterforskydning" +msgstr "Grøn-forskydning" #: ../src/extension/internal/filter/color.h:1275 -#, fuzzy msgid "Blue offset" -msgstr "Værdi" +msgstr "Blå-forskydning" #: ../src/extension/internal/filter/color.h:1290 msgid "" @@ -7351,19 +7211,16 @@ msgid "Nudge CMY" msgstr "" #: ../src/extension/internal/filter/color.h:1381 -#, fuzzy msgid "Cyan offset" -msgstr "Mønsterforskydning" +msgstr "Cyan-forskydning" #: ../src/extension/internal/filter/color.h:1384 -#, fuzzy msgid "Magenta offset" -msgstr "Lodret forskydning" +msgstr "Magenta-forskydning" #: ../src/extension/internal/filter/color.h:1387 -#, fuzzy msgid "Yellow offset" -msgstr "Mønsterforskydning" +msgstr "Gul-forskydning" #: ../src/extension/internal/filter/color.h:1402 msgid "" @@ -7382,9 +7239,8 @@ msgstr "Brug normal fordeling" #: ../src/extension/internal/filter/color.h:1486 #: ../share/extensions/svgcalendar.inx.h:19 -#, fuzzy msgid "Colors" -msgstr "Farver:" +msgstr "Farver" #: ../src/extension/internal/filter/color.h:1507 #, fuzzy @@ -7436,9 +7292,8 @@ msgid "Global blend:" msgstr "Sideorientering:" #: ../src/extension/internal/filter/color.h:1673 -#, fuzzy msgid "Glow" -msgstr "Kopiér farve" +msgstr "Glød" #: ../src/extension/internal/filter/color.h:1674 msgid "Glow blend:" @@ -7473,17 +7328,15 @@ msgstr "Meter" #: ../src/extension/internal/filter/distort.h:71 #: ../src/extension/internal/filter/morphology.h:175 #: ../src/filter-enums.cpp:90 -#, fuzzy msgid "Out" -msgstr "Uddata" +msgstr "Ud" #: ../src/extension/internal/filter/distort.h:77 #: ../src/extension/internal/filter/textures.h:75 #: ../src/ui/widget/selected-style.cpp:132 #: ../src/ui/widget/style-swatch.cpp:128 -#, fuzzy msgid "Stroke:" -msgstr "Bredde på streg" +msgstr "Bestryg:" #: ../src/extension/internal/filter/distort.h:79 #: ../src/extension/internal/filter/textures.h:76 @@ -7492,9 +7345,8 @@ msgstr "Bred" #: ../src/extension/internal/filter/distort.h:80 #: ../src/extension/internal/filter/textures.h:78 -#, fuzzy msgid "Narrow" -msgstr "Sænk" +msgstr "Snæver" #: ../src/extension/internal/filter/distort.h:81 msgid "No fill" @@ -7609,19 +7461,16 @@ msgstr "" #: ../src/extension/internal/filter/image.h:52 #: ../src/ui/dialog/template-load-tab.cpp:105 #: ../src/ui/dialog/template-load-tab.cpp:142 -#, fuzzy msgid "All" -msgstr "Titel" +msgstr "Alle" #: ../src/extension/internal/filter/image.h:53 -#, fuzzy msgid "Vertical lines" -msgstr "Lodret afstand" +msgstr "Lodrette linjer" #: ../src/extension/internal/filter/image.h:54 -#, fuzzy msgid "Horizontal lines" -msgstr "Vandret afstand" +msgstr "Vandrette linjer" #: ../src/extension/internal/filter/image.h:57 #, fuzzy @@ -7655,17 +7504,15 @@ msgstr "Åbn" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 #: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317 -#: ../src/widgets/spray-toolbar.cpp:116 ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/interp_att_g.inx.h:10 -#, fuzzy +#: ../src/widgets/spray-toolbar.cpp:297 ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/interp_att_g.inx.h:12 msgid "Width" -msgstr "Bredde:" +msgstr "Bredde" #: ../src/extension/internal/filter/morphology.h:69 #: ../src/extension/internal/filter/morphology.h:190 -#, fuzzy msgid "Antialiasing" -msgstr "Begyndelsesstørrelse" +msgstr "Udjævning" #: ../src/extension/internal/filter/morphology.h:70 #, fuzzy @@ -7687,9 +7534,8 @@ msgid "Fill image" msgstr "Indlejr alle billeder" #: ../src/extension/internal/filter/morphology.h:171 -#, fuzzy msgid "Hide image" -msgstr "Hæv lag" +msgstr "Skjul billede" #: ../src/extension/internal/filter/morphology.h:172 #, fuzzy @@ -7710,6 +7556,7 @@ msgstr "" #: ../src/extension/internal/filter/morphology.h:179 #: ../src/ui/dialog/layer-properties.cpp:185 #: ../src/ui/dialog/lpe-powerstroke-properties.cpp:59 +#: ../share/extensions/measure.inx.h:5 msgid "Position:" msgstr "Placering:" @@ -7729,9 +7576,8 @@ msgid "Overlayed" msgstr "Meter" #: ../src/extension/internal/filter/morphology.h:184 -#, fuzzy msgid "Width 1" -msgstr "Bredde:" +msgstr "Bredde 1" #: ../src/extension/internal/filter/morphology.h:185 #, fuzzy @@ -7744,9 +7590,8 @@ msgid "Erosion 1" msgstr "Placering:" #: ../src/extension/internal/filter/morphology.h:187 -#, fuzzy msgid "Width 2" -msgstr "Bredde:" +msgstr "Bredde 2" #: ../src/extension/internal/filter/morphology.h:188 #, fuzzy @@ -7759,6 +7604,7 @@ msgid "Erosion 2" msgstr "Placering:" #: ../src/extension/internal/filter/morphology.h:191 +#: ../src/live_effects/lpe-roughen.cpp:41 msgid "Smooth" msgstr "Udjævnet" @@ -7913,18 +7759,17 @@ msgid "Clean-up" msgstr "" #: ../src/extension/internal/filter/paint.h:238 -#: ../share/extensions/measure.inx.h:11 -#, fuzzy +#: ../share/extensions/measure.inx.h:17 msgid "Length" -msgstr "Længde:" +msgstr "Længde" #: ../src/extension/internal/filter/paint.h:247 msgid "Convert image to an engraving made of vertical and horizontal lines" msgstr "" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:999 -#: ../src/widgets/desktop-widget.cpp:1998 +#: ../src/ui/dialog/align-and-distribute.cpp:998 +#: ../src/widgets/desktop-widget.cpp:2049 msgid "Drawing" msgstr "Tegning" @@ -7933,7 +7778,7 @@ msgstr "Tegning" #: ../src/extension/internal/filter/paint.h:496 #: ../src/extension/internal/filter/paint.h:590 #: ../src/extension/internal/filter/paint.h:976 -#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2204 +#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2197 msgid "Simplify" msgstr "Simplificér" @@ -8001,9 +7846,8 @@ msgid "Neon Draw" msgstr "Ingen" #: ../src/extension/internal/filter/paint.h:586 -#, fuzzy msgid "Line type:" -msgstr " type: " +msgstr "Linjetype:" #: ../src/extension/internal/filter/paint.h:587 #, fuzzy @@ -8104,7 +7948,7 @@ msgstr "Farvemætning" #: ../src/extension/internal/filter/paint.h:872 msgid "Simulate antialiasing" -msgstr "" +msgstr "Simulér udjævning" #: ../src/extension/internal/filter/paint.h:880 #, fuzzy @@ -8221,6 +8065,7 @@ msgstr "Redigér udfyldning..." #: ../src/extension/internal/filter/textures.h:81 #: ../share/extensions/markers_strokepaint.inx.h:8 +#: ../share/extensions/restack.inx.h:4 msgid "Custom" msgstr "Brugerdefineret" @@ -8252,20 +8097,18 @@ msgid "Blend" msgstr "Blå" #: ../src/extension/internal/filter/transparency.h:55 ../src/rdf.cpp:261 -#, fuzzy msgid "Source:" -msgstr "Kilde" +msgstr "Kilde:" #: ../src/extension/internal/filter/transparency.h:56 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1603 -#, fuzzy msgid "Background" -msgstr "Ba_ggrund:" +msgstr "Baggrund" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 #: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:144 ../src/widgets/spray-toolbar.cpp:186 +#: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:389 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 #: ../share/extensions/triangle.inx.h:8 msgid "Mode:" @@ -8317,93 +8160,93 @@ msgstr "skub ud" msgid "Repaint anything visible monochrome" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:183 +#: ../src/extension/internal/gdkpixbuf-input.cpp:188 #, fuzzy, c-format msgid "%s bitmap image import" msgstr "Importér punktbillede som " -#: ../src/extension/internal/gdkpixbuf-input.cpp:190 +#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format msgid "Image Import Type:" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:190 +#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format msgid "" "Embed results in stand-alone, larger SVG files. Link references a file " "outside this SVG document and all files must be moved together." msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 +#: ../src/extension/internal/gdkpixbuf-input.cpp:196 #: ../src/ui/dialog/inkscape-preferences.cpp:1500 -#, fuzzy, c-format +#, c-format msgid "Embed" -msgstr "indlejret" +msgstr "Indlejr" -#: ../src/extension/internal/gdkpixbuf-input.cpp:192 ../src/sp-anchor.cpp:105 +#: ../src/extension/internal/gdkpixbuf-input.cpp:197 ../src/sp-anchor.cpp:105 #: ../src/ui/dialog/inkscape-preferences.cpp:1500 -#, fuzzy, c-format +#, c-format msgid "Link" -msgstr "Linje" +msgstr "Link" -#: ../src/extension/internal/gdkpixbuf-input.cpp:195 -#, fuzzy, c-format +#: ../src/extension/internal/gdkpixbuf-input.cpp:200 +#, c-format msgid "Image DPI:" -msgstr "Billede" +msgstr "Billede DPI:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:195 +#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #, c-format msgid "" "Take information from file or use default bitmap import resolution as " "defined in the preferences." msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +#: ../src/extension/internal/gdkpixbuf-input.cpp:201 #, fuzzy, c-format msgid "From file" msgstr "Linke_genskaber" -#: ../src/extension/internal/gdkpixbuf-input.cpp:197 +#: ../src/extension/internal/gdkpixbuf-input.cpp:202 #, fuzzy, c-format msgid "Default import resolution" msgstr "Standard eksporteringsopløsning:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:200 +#: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, fuzzy, c-format msgid "Image Rendering Mode:" msgstr "Optegn" -#: ../src/extension/internal/gdkpixbuf-input.cpp:200 +#: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format msgid "" "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " "not work in all browsers.)" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 +#: ../src/extension/internal/gdkpixbuf-input.cpp:206 #: ../src/ui/dialog/inkscape-preferences.cpp:1507 -#, fuzzy, c-format +#, c-format msgid "None (auto)" -msgstr "Standard" +msgstr "Ingen (auto)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:202 +#: ../src/extension/internal/gdkpixbuf-input.cpp:207 #: ../src/ui/dialog/inkscape-preferences.cpp:1507 #, c-format msgid "Smooth (optimizeQuality)" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:203 +#: ../src/extension/internal/gdkpixbuf-input.cpp:208 #: ../src/ui/dialog/inkscape-preferences.cpp:1507 #, c-format msgid "Blocky (optimizeSpeed)" msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:206 +#: ../src/extension/internal/gdkpixbuf-input.cpp:211 #, c-format msgid "Hide the dialog next time and always apply the same actions." msgstr "" -#: ../src/extension/internal/gdkpixbuf-input.cpp:206 +#: ../src/extension/internal/gdkpixbuf-input.cpp:211 #, c-format msgid "Don't ask again" msgstr "" @@ -8420,36 +8263,31 @@ msgstr "GIMP Gradient (*.ggr)" msgid "Gradients used in GIMP" msgstr "Gradienter brugt i GIMP" -#: ../src/extension/internal/grid.cpp:205 ../src/ui/widget/panel.cpp:114 +#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:114 msgid "Grid" msgstr "Gitter" -#: ../src/extension/internal/grid.cpp:207 -#, fuzzy +#: ../src/extension/internal/grid.cpp:206 msgid "Line Width:" -msgstr "Linjebredde" +msgstr "Linjebredde:" -#: ../src/extension/internal/grid.cpp:208 -#, fuzzy +#: ../src/extension/internal/grid.cpp:207 msgid "Horizontal Spacing:" -msgstr "Vandret afstand" +msgstr "Vandret afstand:" -#: ../src/extension/internal/grid.cpp:209 -#, fuzzy +#: ../src/extension/internal/grid.cpp:208 msgid "Vertical Spacing:" -msgstr "Lodret afstand" +msgstr "Lodret afstand:" -#: ../src/extension/internal/grid.cpp:210 -#, fuzzy +#: ../src/extension/internal/grid.cpp:209 msgid "Horizontal Offset:" -msgstr "Vandret forskudt" +msgstr "Vandret forskydning:" -#: ../src/extension/internal/grid.cpp:211 -#, fuzzy +#: ../src/extension/internal/grid.cpp:210 msgid "Vertical Offset:" -msgstr "Lodret forskydning" +msgstr "Lodret forskydning:" -#: ../src/extension/internal/grid.cpp:215 +#: ../src/extension/internal/grid.cpp:214 #: ../src/ui/dialog/inkscape-preferences.cpp:1521 #: ../share/extensions/draw_from_triangle.inx.h:58 #: ../share/extensions/eqtexsvg.inx.h:4 @@ -8471,7 +8309,7 @@ msgstr "Lodret forskydning" #: ../share/extensions/render_barcode_datamatrix.inx.h:5 #: ../share/extensions/render_barcode_qrcode.inx.h:18 #: ../share/extensions/render_gear_rack.inx.h:5 -#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:4 +#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:6 #: ../share/extensions/seamless_pattern.inx.h:5 #: ../share/extensions/spirograph.inx.h:10 #: ../share/extensions/svgcalendar.inx.h:38 @@ -8480,14 +8318,14 @@ msgstr "Lodret forskydning" msgid "Render" msgstr "Gengiv" -#: ../src/extension/internal/grid.cpp:216 -#: ../src/ui/dialog/document-properties.cpp:162 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 -#: ../src/widgets/toolbox.cpp:1825 +#: ../src/extension/internal/grid.cpp:215 +#: ../src/ui/dialog/document-properties.cpp:163 +#: ../src/ui/dialog/inkscape-preferences.cpp:821 +#: ../src/widgets/toolbox.cpp:1876 msgid "Grids" msgstr "Gitter" -#: ../src/extension/internal/grid.cpp:219 +#: ../src/extension/internal/grid.cpp:218 msgid "Draw a path which is a grid" msgstr "Tegn en sti som er et gitter" @@ -8500,9 +8338,8 @@ msgid "JavaFX (*.fx)" msgstr "" #: ../src/extension/internal/javafx-out.cpp:969 -#, fuzzy msgid "JavaFX Raytracer File" -msgstr "PovRay Raytracer fil" +msgstr "JavaFX Raytracer-fil" #: ../src/extension/internal/latex-pstricks-out.cpp:95 msgid "LaTeX Output" @@ -8561,9 +8398,8 @@ msgid "Clip to:" msgstr "Besk_ær" #: ../src/extension/internal/pdfinput/pdf-input.cpp:128 -#, fuzzy msgid "Page settings" -msgstr "Sideorientering:" +msgstr "Sideindstillinger" #: ../src/extension/internal/pdfinput/pdf-input.cpp:129 msgid "Precision of approximating gradient meshes:" @@ -8587,9 +8423,8 @@ msgid "" msgstr "" #: ../src/extension/internal/pdfinput/pdf-input.cpp:136 -#, fuzzy msgid "Internal import" -msgstr "Lodret tekst" +msgstr "Intern import" #: ../src/extension/internal/pdfinput/pdf-input.cpp:137 msgid "" @@ -8615,66 +8450,61 @@ msgid "Replace PDF fonts by closest-named installed fonts" msgstr "" #: ../src/extension/internal/pdfinput/pdf-input.cpp:161 -#, fuzzy msgid "Embed images" -msgstr "Indlejr alle billeder" +msgstr "Indlejr billeder" #: ../src/extension/internal/pdfinput/pdf-input.cpp:163 msgid "Import settings" msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:290 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:291 msgid "PDF Import Settings" msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:437 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:438 #, fuzzy msgctxt "PDF input precision" msgid "rough" msgstr "Gruppér" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:438 -#, fuzzy +#: ../src/extension/internal/pdfinput/pdf-input.cpp:439 msgctxt "PDF input precision" msgid "medium" -msgstr "mellem" +msgstr "medium" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:439 -#, fuzzy +#: ../src/extension/internal/pdfinput/pdf-input.cpp:440 msgctxt "PDF input precision" msgid "fine" -msgstr "Linje" +msgstr "fine" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:440 -#, fuzzy +#: ../src/extension/internal/pdfinput/pdf-input.cpp:441 msgctxt "PDF input precision" msgid "very fine" -msgstr "Uindfattet udfyldning" +msgstr "meget fine" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:936 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:937 #, fuzzy msgid "PDF Input" msgstr "DXF inddata" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:941 -#, fuzzy +#: ../src/extension/internal/pdfinput/pdf-input.cpp:942 msgid "Adobe PDF (*.pdf)" -msgstr "AutoCAD DXF (*.dxf)" +msgstr "Adobe PDF (*.pdf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:942 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:943 msgid "Adobe Portable Document Format" msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:949 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:950 #, fuzzy msgid "AI Input" msgstr "AI-inddata" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:954 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:955 msgid "Adobe Illustrator 9.0 and above (*.ai)" msgstr "Adobe Illustrator 9.0 og over (*.ai)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:955 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:956 #, fuzzy msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" msgstr "Åbn filer gemt med Adobe Illustrator" @@ -8716,7 +8546,7 @@ msgstr "Inkscape SVG (*.svg)" msgid "SVG format with Inkscape extensions" msgstr "SVG-format med Inkscape-udvidelser" -#: ../src/extension/internal/svg.cpp:128 +#: ../src/extension/internal/svg.cpp:128 ../share/extensions/scour.inx.h:19 msgid "SVG Output" msgstr "SVG-output" @@ -8812,14 +8642,12 @@ msgid "WMF Input" msgstr "WPG-inddata" #: ../src/extension/internal/wmf-inout.cpp:3165 -#, fuzzy msgid "Windows Metafiles (*.wmf)" -msgstr "Windows Metafile (*.wmf)" +msgstr "Windows Meta-filer (*.wmf)" #: ../src/extension/internal/wmf-inout.cpp:3166 -#, fuzzy msgid "Windows Metafiles" -msgstr "Windows Metafile-inddata" +msgstr "Windows Meta-filer" #: ../src/extension/internal/wmf-inout.cpp:3174 msgid "WMF Output" @@ -8836,9 +8664,8 @@ msgid "Windows Metafile (*.wmf)" msgstr "Windows Metafile (*.wmf)" #: ../src/extension/internal/wmf-inout.cpp:3189 -#, fuzzy msgid "Windows Metafile" -msgstr "Windows Metafile-inddata" +msgstr "Windows Meta-fil" #: ../src/extension/internal/wpg-input.cpp:144 msgid "WPG Input" @@ -8865,57 +8692,57 @@ msgstr "" msgid "Format autodetect failed. The file is being opened as SVG." msgstr "Format-autodetektion mislykkedes. Filen åbnes som SVG." -#: ../src/file.cpp:183 +#: ../src/file.cpp:185 msgid "default.svg" msgstr "" -#: ../src/file.cpp:328 +#: ../src/file.cpp:332 msgid "Broken links have been changed to point to existing files." msgstr "" -#: ../src/file.cpp:339 ../src/file.cpp:1274 +#: ../src/file.cpp:343 ../src/file.cpp:1278 #, c-format msgid "Failed to load the requested file %s" msgstr "Kunne ikke indlæse den valgte fil %s" -#: ../src/file.cpp:365 +#: ../src/file.cpp:369 msgid "Document not saved yet. Cannot revert." msgstr "Dokument endnu ikke gemt, kan ikke fortryde." -#: ../src/file.cpp:371 +#: ../src/file.cpp:375 #, fuzzy msgid "Changes will be lost! Are you sure you want to reload document %1?" msgstr "" "Ændringer vil gå tabt! Er du sikker på du vil genindlæse dokumentet %s?" -#: ../src/file.cpp:397 +#: ../src/file.cpp:401 msgid "Document reverted." msgstr "Dokumentændringer fortrudt." -#: ../src/file.cpp:399 +#: ../src/file.cpp:403 msgid "Document not reverted." msgstr "Dokumentændringer ej fortrudt." -#: ../src/file.cpp:549 +#: ../src/file.cpp:553 msgid "Select file to open" msgstr "Vælg fil der skal åbnes" -#: ../src/file.cpp:631 +#: ../src/file.cpp:635 msgid "Clean up document" msgstr "Rens dokument" -#: ../src/file.cpp:638 +#: ../src/file.cpp:642 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." msgstr[0] "Fjernede %i ubrugt definition i <defs>." msgstr[1] "Fjernede %i ubrugte definitioner i <defs>." -#: ../src/file.cpp:643 +#: ../src/file.cpp:647 msgid "No unused definitions in <defs>." msgstr "Ingen ubrugte definitioner i <defs>." -#: ../src/file.cpp:675 +#: ../src/file.cpp:679 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8924,67 +8751,65 @@ msgstr "" "Ingen Inkscape -udvidelse fundet at gemme dokumentet (%s) med. Dette kan " "være forårsaget af en ukendt filnavneendelse." -#: ../src/file.cpp:676 ../src/file.cpp:684 ../src/file.cpp:692 -#: ../src/file.cpp:698 ../src/file.cpp:703 +#: ../src/file.cpp:680 ../src/file.cpp:688 ../src/file.cpp:696 +#: ../src/file.cpp:702 ../src/file.cpp:707 msgid "Document not saved." msgstr "Dokument ikke gemt." -#: ../src/file.cpp:683 +#: ../src/file.cpp:687 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." msgstr "" -#: ../src/file.cpp:691 +#: ../src/file.cpp:695 #, c-format msgid "File %s could not be saved." msgstr "Filen %s kunne ikke gemmes." -#: ../src/file.cpp:721 ../src/file.cpp:723 +#: ../src/file.cpp:725 ../src/file.cpp:727 msgid "Document saved." msgstr "Dokument gemt." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:866 ../src/file.cpp:1433 -#, fuzzy +#: ../src/file.cpp:870 ../src/file.cpp:1437 msgid "drawing" -msgstr "tegning%s" +msgstr "tegning" -#: ../src/file.cpp:871 -#, fuzzy +#: ../src/file.cpp:875 msgid "drawing-%1" -msgstr "tegning%s" +msgstr "tegning-%1" -#: ../src/file.cpp:888 +#: ../src/file.cpp:892 msgid "Select file to save a copy to" msgstr "Vælg fil at gemme en kopi til" -#: ../src/file.cpp:890 +#: ../src/file.cpp:894 msgid "Select file to save to" msgstr "Vælg fil at gemme i" -#: ../src/file.cpp:995 ../src/file.cpp:997 +#: ../src/file.cpp:999 ../src/file.cpp:1001 msgid "No changes need to be saved." msgstr "Ingen ændringer behøver at gemmes." -#: ../src/file.cpp:1016 +#: ../src/file.cpp:1020 msgid "Saving document..." msgstr "Gemmer dokument ..." -#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1494 +#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1494 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "Importér" -#: ../src/file.cpp:1321 +#: ../src/file.cpp:1325 msgid "Select file to import" msgstr "Vælg fil der skal importeres" -#: ../src/file.cpp:1454 +#: ../src/file.cpp:1458 msgid "Select file to export to" msgstr "Vælg fil der skal importeres" -#: ../src/file.cpp:1707 +#: ../src/file.cpp:1711 msgid "Import Clip Art" msgstr "Importér clipart" @@ -9106,9 +8931,8 @@ msgid "Luminosity" msgstr "" #: ../src/filter-enums.cpp:78 -#, fuzzy msgid "Matrix" -msgstr "Matri_x" +msgstr "" #: ../src/filter-enums.cpp:79 #, fuzzy @@ -9127,19 +8951,18 @@ msgstr "" #: ../src/filter-enums.cpp:87 #: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 +#: ../share/extensions/measure.inx.h:20 msgid "Default" msgstr "Standard" #. New CSS #: ../src/filter-enums.cpp:95 -#, fuzzy msgid "Clear" -msgstr "_Ryd" +msgstr "Ryd" #: ../src/filter-enums.cpp:96 -#, fuzzy msgid "Copy" -msgstr "K_opiér" +msgstr "Kopiér" #: ../src/filter-enums.cpp:97 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1623 #, fuzzy @@ -9176,7 +8999,7 @@ msgid "Arithmetic" msgstr "" #: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:545 -#: ../src/ui/dialog/objects.cpp:1889 +#: ../src/ui/dialog/objects.cpp:1893 msgid "Duplicate" msgstr "Duplikér" @@ -9229,7 +9052,7 @@ msgstr "Lineær overgang" msgid "Reverse gradient" msgstr "Lineær overgang" -#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:226 +#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:222 #, fuzzy msgid "Delete swatch" msgstr "Slet stop" @@ -9283,51 +9106,51 @@ msgstr "Flyt knudepunkts-håndtag" msgid "Mesh gradient tensor" msgstr "Slut på lineær overgang" -#: ../src/gradient-drag.cpp:567 +#: ../src/gradient-drag.cpp:565 msgid "Added patch row or column" msgstr "" -#: ../src/gradient-drag.cpp:799 +#: ../src/gradient-drag.cpp:798 #, fuzzy msgid "Merge gradient handles" msgstr "Flyt knudepunkts-håndtag" #. we did an undoable action -#: ../src/gradient-drag.cpp:1105 +#: ../src/gradient-drag.cpp:1101 #, fuzzy msgid "Move gradient handle" msgstr "Flyt knudepunkts-håndtag" -#: ../src/gradient-drag.cpp:1164 ../src/widgets/gradient-vector.cpp:834 +#: ../src/gradient-drag.cpp:1160 ../src/widgets/gradient-vector.cpp:834 #, fuzzy msgid "Delete gradient stop" msgstr "Slet stop" -#: ../src/gradient-drag.cpp:1427 +#: ../src/gradient-drag.cpp:1423 #, fuzzy, c-format msgid "" "%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl" "+Alt to delete stop" msgstr "" "%s til: %s%s; træk med Ctrl for trinvis justering af vinkel, med " -"Ctrl+Alt for at bevare vinkel, med Ctrl+Shift for at skalere " +"Ctrl+Alt for at bevare vinkel, med Ctrl+Skift for at skalere " "omkring centrum" -#: ../src/gradient-drag.cpp:1431 ../src/gradient-drag.cpp:1438 +#: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434 msgid " (stroke)" msgstr " (streg)" -#: ../src/gradient-drag.cpp:1435 +#: ../src/gradient-drag.cpp:1431 #, c-format msgid "" "%s for: %s%s; drag with Ctrl to snap angle, with Ctrl+Alt to " "preserve angle, with Ctrl+Shift to scale around center" msgstr "" "%s til: %s%s; træk med Ctrl for trinvis justering af vinkel, med " -"Ctrl+Alt for at bevare vinkel, med Ctrl+Shift for at skalere " +"Ctrl+Alt for at bevare vinkel, med Ctrl+Skift for at skalere " "omkring centrum" -#: ../src/gradient-drag.cpp:1443 +#: ../src/gradient-drag.cpp:1439 msgid "" "Radial gradient center and focus; drag with Shift to " "separate focus" @@ -9335,7 +9158,7 @@ msgstr "" "Radialovergang centrum og fokus; træk med Shift for at " "adskille fokus" -#: ../src/gradient-drag.cpp:1446 +#: ../src/gradient-drag.cpp:1442 #, c-format msgid "" "Gradient point shared by %d gradient; drag with Shift to " @@ -9350,39 +9173,32 @@ msgstr[1] "" "Overgangspunkt delt af %d overgange; træk med Shift for at " "adskille" -#: ../src/gradient-drag.cpp:2379 +#: ../src/gradient-drag.cpp:2364 #, fuzzy msgid "Move gradient handle(s)" msgstr "Flyt knudepunkts-håndtag" -#: ../src/gradient-drag.cpp:2415 +#: ../src/gradient-drag.cpp:2398 #, fuzzy msgid "Move gradient mid stop(s)" msgstr "Slet stop" -#: ../src/gradient-drag.cpp:2704 +#: ../src/gradient-drag.cpp:2687 #, fuzzy msgid "Delete gradient stop(s)" msgstr "Slet stop" #: ../src/inkscape.cpp:242 -#, fuzzy msgid "Autosave failed! Cannot create directory %1." -msgstr "" -"Kan ikke oprette mappe %s.\n" -"%s" +msgstr "Autogem mislykkedes! Kan ikke oprette mappen %1." #: ../src/inkscape.cpp:251 -#, fuzzy msgid "Autosave failed! Cannot open directory %1." -msgstr "" -"Kan ikke oprette mappe %s.\n" -"%s" +msgstr "Autogem mislykkedes! Kan ikke åbne mappen %1." #: ../src/inkscape.cpp:267 -#, fuzzy msgid "Autosaving documents..." -msgstr "Gem dokument" +msgstr "Gem dokument automatisk ..." #: ../src/inkscape.cpp:335 msgid "Autosave failed! Could not find inkscape extension to save document." @@ -9435,7 +9251,7 @@ msgstr "Flyt knudepunkts-håndtag" #. TRANSLATORS: This refers to the pattern that's inside the object #: ../src/knotholder.cpp:277 ../src/knotholder.cpp:299 msgid "Move the pattern fill inside the object" -msgstr "Flyt udfyldningsmønsteret indeni objektet" +msgstr "Flyt udfyldningsmønsteret ind i objektet" #: ../src/knotholder.cpp:281 ../src/knotholder.cpp:303 #, fuzzy @@ -9467,12 +9283,11 @@ msgstr "" #: ../src/libgdl/gdl-dock-item-grip.c:402 msgid "Iconify this dock" -msgstr "" +msgstr "Ikonifisér denne dok" #: ../src/libgdl/gdl-dock-item-grip.c:404 -#, fuzzy msgid "Close this dock" -msgstr "Luk dette dokumentvindue" +msgstr "Luk denne dok" #: ../src/libgdl/gdl-dock-item-grip.c:723 #: ../src/libgdl/gdl-dock-tablabel.c:125 @@ -9483,9 +9298,7 @@ msgstr "" msgid "Dockitem which 'owns' this grip" msgstr "" -#. Name #: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:192 -#: ../src/widgets/text-toolbar.cpp:1411 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 #, fuzzy @@ -9624,10 +9437,10 @@ msgid "" msgstr "" #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:998 -#: ../src/ui/dialog/document-properties.cpp:160 +#: ../src/ui/dialog/align-and-distribute.cpp:997 +#: ../src/ui/dialog/document-properties.cpp:161 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 -#: ../src/widgets/desktop-widget.cpp:1994 +#: ../src/widgets/desktop-widget.cpp:2045 #: ../share/extensions/empty_page.inx.h:1 #: ../share/extensions/voronoi2svg.inx.h:9 msgid "Page" @@ -9642,7 +9455,7 @@ msgstr "Omdøb det aktuelle lag" #: ../src/live_effects/parameter/originalpatharray.cpp:82 #: ../src/ui/dialog/inkscape-preferences.cpp:1555 #: ../src/ui/widget/page-sizer.cpp:285 -#: ../src/widgets/gradient-selector.cpp:154 +#: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Navn" @@ -9712,8 +9525,7 @@ msgid "" "Attempt to bind to %p an already bound dock object %p (current master: %p)" msgstr "" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/ui/widget/font-variants.cpp:44 -#: ../src/widgets/ruler.cpp:230 +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:230 #, fuzzy msgid "Position" msgstr "Placering:" @@ -9810,8 +9622,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:674 -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:676 +#: ../src/ui/dialog/inkscape-preferences.cpp:719 #, fuzzy msgid "Floating" msgstr "Relationer" @@ -10020,7 +9832,7 @@ msgstr "_Slip" msgid "Show handles" msgstr "" -#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:121 +#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:118 msgid "BSpline" msgstr "" @@ -10041,7 +9853,7 @@ msgstr "" msgid "Fill between strokes" msgstr "" -#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2871 +#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2874 msgid "Fill between many" msgstr "" @@ -10165,47 +9977,53 @@ msgstr "" msgid "End path curve end:" msgstr "" -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/live_effects/lpe-bendpath.cpp:69 #, fuzzy msgid "Bend path:" msgstr "Bryd sti op" -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/live_effects/lpe-bendpath.cpp:69 #, fuzzy msgid "Path along which to bend the original path" msgstr "Opret et dynamisk forskudt objekt, linket til den oprindelige sti" -#: ../src/live_effects/lpe-bendpath.cpp:54 -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/transformation.cpp:74 +#: ../src/live_effects/lpe-bendpath.cpp:71 +#: ../src/live_effects/lpe-patternalongpath.cpp:74 +#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/transformation.cpp:73 #: ../src/ui/widget/page-sizer.cpp:237 msgid "_Width:" msgstr "_Bredde:" -#: ../src/live_effects/lpe-bendpath.cpp:54 +#: ../src/live_effects/lpe-bendpath.cpp:71 #, fuzzy msgid "Width of the path" msgstr "Papirbredde" -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/live_effects/lpe-bendpath.cpp:72 #, fuzzy msgid "W_idth in units of length" msgstr "Bredde af det udtværrede område i billedpunkter" -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/live_effects/lpe-bendpath.cpp:72 #, fuzzy msgid "Scale the width of the path in units of its length" msgstr "Maksimal længde af hjørne (i stregbredde-enheder)" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/live_effects/lpe-bendpath.cpp:73 #, fuzzy msgid "_Original path is vertical" msgstr "Mønsterforskydning" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/live_effects/lpe-bendpath.cpp:73 msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "" +#: ../src/live_effects/lpe-bendpath.cpp:181 +#: ../src/live_effects/lpe-patternalongpath.cpp:278 +#, fuzzy +msgid "Change the width" +msgstr "Skalér stregbredde" + #: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 #: ../src/live_effects/lpe-fill-between-many.cpp:25 @@ -10229,56 +10047,74 @@ msgstr "" msgid "Uses the visual bounding box" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:28 +#: ../src/live_effects/lpe-bspline.cpp:30 msgid "Steps with CTRL:" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:28 +#: ../src/live_effects/lpe-bspline.cpp:30 msgid "Change number of steps with CTRL pressed" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:29 +#: ../src/live_effects/lpe-bspline.cpp:31 #: ../src/live_effects/lpe-simplify.cpp:33 -#: ../src/live_effects/lpe-transform_2pts.cpp:38 +#: ../src/live_effects/lpe-transform_2pts.cpp:43 msgid "Helper size:" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:29 +#: ../src/live_effects/lpe-bspline.cpp:31 #: ../src/live_effects/lpe-simplify.cpp:33 msgid "Helper size" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:30 +#: ../src/live_effects/lpe-bspline.cpp:32 msgid "Apply changes if weight = 0%" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:31 +#: ../src/live_effects/lpe-bspline.cpp:33 msgid "Apply changes if weight > 0%" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:32 +#: ../src/live_effects/lpe-bspline.cpp:34 #: ../src/live_effects/lpe-fillet-chamfer.cpp:56 msgid "Change only selected nodes" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:33 +#: ../src/live_effects/lpe-bspline.cpp:35 #, fuzzy msgid "Change weight %:" msgstr "Højde:" -#: ../src/live_effects/lpe-bspline.cpp:33 +#: ../src/live_effects/lpe-bspline.cpp:35 #, fuzzy msgid "Change weight percent of the effect" msgstr "Streg med lineær overgang" -#: ../src/live_effects/lpe-bspline.cpp:95 +#: ../src/live_effects/lpe-bspline.cpp:99 msgid "Default weight" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:100 +#: ../src/live_effects/lpe-bspline.cpp:104 msgid "Make cusp" msgstr "" +#: ../src/live_effects/lpe-bspline.cpp:148 +#, fuzzy +msgid "Change to default weight" +msgstr "Opret lineær overgang" + +#: ../src/live_effects/lpe-bspline.cpp:154 +#, fuzzy +msgid "Change to 0 weight" +msgstr "Skalér stregbredde" + +#: ../src/live_effects/lpe-bspline.cpp:160 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:240 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:262 +#: ../src/live_effects/parameter/parameter.cpp:170 +#, fuzzy +msgid "Change scalar parameter" +msgstr "Primær uigennemsigtighed" + #: ../src/live_effects/lpe-constructgrid.cpp:27 #, fuzzy msgid "Size _X:" @@ -10474,6 +10310,7 @@ msgid "Reverses the second path order" msgstr "" #: ../src/live_effects/lpe-fillet-chamfer.cpp:41 +#: ../src/widgets/text-toolbar.cpp:1540 #: ../share/extensions/render_barcode_qrcode.inx.h:5 #, fuzzy msgid "Auto" @@ -10539,26 +10376,54 @@ msgstr "" msgid "Helper size with direction" msgstr "" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:154 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:103 +msgid "IMPORTANT! New version soon..." +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:107 +msgid "Not compatible. Convert to path after." +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 msgid "Fillet" msgstr "" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:158 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:169 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 msgid "Inverse fillet" msgstr "" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:163 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:174 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 msgid "Chamfer" msgstr "" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:167 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:178 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 msgid "Inverse chamfer" msgstr "" +#: ../src/live_effects/lpe-fillet-chamfer.cpp:247 +#, fuzzy +msgid "Convert to fillet" +msgstr "_Konvertér til tekst" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:278 +#, fuzzy +msgid "Convert to inverse fillet" +msgstr "_Konvertér til tekst" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 +#, fuzzy +msgid "Convert to chamfer" +msgstr "_Konvertér til tekst" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:290 +msgid "Knots and helper paths refreshed" +msgstr "" + #: ../src/live_effects/lpe-gears.cpp:214 #, fuzzy msgid "_Teeth:" @@ -10580,31 +10445,31 @@ msgid "" "contact." msgstr "" -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 #, fuzzy msgid "Trajectory:" msgstr "Enkel farve" -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 #, fuzzy msgid "Path along which intermediate steps are created." msgstr "Opret et dynamisk forskudt objekt, linket til den oprindelige sti" -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 #, fuzzy msgid "Steps_:" msgstr "Trin" -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Determines the number of steps from start to end path." msgstr "" -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 #, fuzzy msgid "E_quidistant spacing" msgstr "Linjeafstand:" -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "" "If true, the spacing between intermediates is constant along the length of " "the path. If false, the distance depends on the location of the nodes of the " @@ -10744,65 +10609,65 @@ msgid "Overrides the miter limit and forces a join." msgstr "" #. initialise your parameters here: -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/live_effects/lpe-knot.cpp:350 #, fuzzy msgid "Fi_xed width:" msgstr "Side_bredde" -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/live_effects/lpe-knot.cpp:350 msgid "Size of hidden region of lower string" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:352 +#: ../src/live_effects/lpe-knot.cpp:351 #, fuzzy msgid "_In units of stroke width" msgstr "Bredde på streg" -#: ../src/live_effects/lpe-knot.cpp:352 +#: ../src/live_effects/lpe-knot.cpp:351 msgid "Consider 'Interruption width' as a ratio of stroke width" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:353 +#: ../src/live_effects/lpe-knot.cpp:352 #, fuzzy msgid "St_roke width" msgstr "Bredde på streg" -#: ../src/live_effects/lpe-knot.cpp:353 +#: ../src/live_effects/lpe-knot.cpp:352 msgid "Add the stroke width to the interruption size" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:354 +#: ../src/live_effects/lpe-knot.cpp:353 #, fuzzy msgid "_Crossing path stroke width" msgstr "Skalér stregbredde" -#: ../src/live_effects/lpe-knot.cpp:354 +#: ../src/live_effects/lpe-knot.cpp:353 msgid "Add crossed stroke width to the interruption size" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:355 +#: ../src/live_effects/lpe-knot.cpp:354 #, fuzzy msgid "S_witcher size:" msgstr "Indsætnings_stil" -#: ../src/live_effects/lpe-knot.cpp:355 +#: ../src/live_effects/lpe-knot.cpp:354 msgid "Orientation indicator/switcher size" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:356 +#: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossing Signs" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:356 +#: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossings signs" msgstr "" -#: ../src/live_effects/lpe-knot.cpp:627 +#: ../src/live_effects/lpe-knot.cpp:626 msgid "Drag to select a crossing, click to flip it" msgstr "" #. / @todo Is this the right verb? -#: ../src/live_effects/lpe-knot.cpp:665 +#: ../src/live_effects/lpe-knot.cpp:664 #, fuzzy msgid "Change knot crossing" msgstr "Ændr afstand på forbindelsesmellemrum" @@ -10818,330 +10683,334 @@ msgid "Mirror movements in vertical" msgstr "" #: ../src/live_effects/lpe-lattice2.cpp:49 +msgid "Update while moving knots (maybe slow)" +msgstr "" + +#: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:49 +#: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:51 +#: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:51 +#: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:52 +#: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:52 +#: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:53 +#: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:53 +#: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:54 +#: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:54 +#: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:55 +#: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:55 +#: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:56 +#: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:56 +#: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:57 +#: ../src/live_effects/lpe-lattice2.cpp:58 msgid "Control 8x9:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:57 +#: ../src/live_effects/lpe-lattice2.cpp:58 msgid "" "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:58 +#: ../src/live_effects/lpe-lattice2.cpp:59 msgid "Control 10x11:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:58 +#: ../src/live_effects/lpe-lattice2.cpp:59 msgid "" "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:59 +#: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:59 +#: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:60 +#: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:60 +#: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:61 +#: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:61 +#: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:62 +#: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:62 +#: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:63 +#: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:63 +#: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:64 +#: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:64 +#: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:65 +#: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:65 +#: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:66 +#: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:66 +#: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:67 +#: ../src/live_effects/lpe-lattice2.cpp:68 msgid "Control 20x21:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:67 +#: ../src/live_effects/lpe-lattice2.cpp:68 msgid "" "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:68 +#: ../src/live_effects/lpe-lattice2.cpp:69 msgid "Control 22x23:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:68 +#: ../src/live_effects/lpe-lattice2.cpp:69 msgid "" "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:69 +#: ../src/live_effects/lpe-lattice2.cpp:70 msgid "Control 24x26:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:69 +#: ../src/live_effects/lpe-lattice2.cpp:70 msgid "" "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:70 +#: ../src/live_effects/lpe-lattice2.cpp:71 msgid "Control 25x27:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:70 +#: ../src/live_effects/lpe-lattice2.cpp:71 msgid "" "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:71 +#: ../src/live_effects/lpe-lattice2.cpp:72 msgid "Control 28x30:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:71 +#: ../src/live_effects/lpe-lattice2.cpp:72 msgid "" "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:72 +#: ../src/live_effects/lpe-lattice2.cpp:73 msgid "Control 29x31:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:72 +#: ../src/live_effects/lpe-lattice2.cpp:73 msgid "" "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:73 +#: ../src/live_effects/lpe-lattice2.cpp:74 msgid "Control 32x33x34x35:" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:73 +#: ../src/live_effects/lpe-lattice2.cpp:74 msgid "" "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " "axes" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:236 +#: ../src/live_effects/lpe-lattice2.cpp:238 msgid "Reset grid" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:268 -#: ../src/live_effects/lpe-lattice2.cpp:283 +#: ../src/live_effects/lpe-lattice2.cpp:270 +#: ../src/live_effects/lpe-lattice2.cpp:285 msgid "Show Points" msgstr "" -#: ../src/live_effects/lpe-lattice2.cpp:281 +#: ../src/live_effects/lpe-lattice2.cpp:283 msgid "Hide Points" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:50 +#: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 #, fuzzy msgid "Single" msgstr "Vinkel" -#: ../src/live_effects/lpe-patternalongpath.cpp:51 +#: ../src/live_effects/lpe-patternalongpath.cpp:64 #: ../share/extensions/pathalongpath.inx.h:11 msgid "Single, stretched" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:52 +#: ../src/live_effects/lpe-patternalongpath.cpp:65 #: ../share/extensions/pathalongpath.inx.h:12 #, fuzzy msgid "Repeated" msgstr "Gentag:" -#: ../src/live_effects/lpe-patternalongpath.cpp:53 +#: ../src/live_effects/lpe-patternalongpath.cpp:66 #: ../share/extensions/pathalongpath.inx.h:13 msgid "Repeated, stretched" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 #, fuzzy msgid "Pattern source:" msgstr "Mønsterstreg" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 msgid "Path to put along the skeleton path" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#: ../src/live_effects/lpe-patternalongpath.cpp:74 +#, fuzzy +msgid "Width of the pattern" +msgstr "Papirbredde" + +#: ../src/live_effects/lpe-patternalongpath.cpp:75 #, fuzzy msgid "Pattern copies:" msgstr "Mønster" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "How many pattern copies to place along the skeleton path" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -#, fuzzy -msgid "Width of the pattern" -msgstr "Papirbredde" - -#: ../src/live_effects/lpe-patternalongpath.cpp:63 +#: ../src/live_effects/lpe-patternalongpath.cpp:77 #, fuzzy msgid "Wid_th in units of length" msgstr "Bredde af det udtværrede område i billedpunkter" -#: ../src/live_effects/lpe-patternalongpath.cpp:64 +#: ../src/live_effects/lpe-patternalongpath.cpp:78 #, fuzzy msgid "Scale the width of the pattern in units of its length" msgstr "Maksimal længde af hjørne (i stregbredde-enheder)" -#: ../src/live_effects/lpe-patternalongpath.cpp:66 +#: ../src/live_effects/lpe-patternalongpath.cpp:80 #, fuzzy msgid "Spa_cing:" msgstr "Mellemrum:" -#: ../src/live_effects/lpe-patternalongpath.cpp:68 +#: ../src/live_effects/lpe-patternalongpath.cpp:82 #, no-c-format msgid "" "Space between copies of the pattern. Negative values allowed, but are " "limited to -90% of pattern width." msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:70 +#: ../src/live_effects/lpe-patternalongpath.cpp:84 #, fuzzy msgid "No_rmal offset:" msgstr "Vandret forskudt" -#: ../src/live_effects/lpe-patternalongpath.cpp:71 +#: ../src/live_effects/lpe-patternalongpath.cpp:85 #, fuzzy msgid "Tan_gential offset:" msgstr "Lodret forskydning" -#: ../src/live_effects/lpe-patternalongpath.cpp:72 +#: ../src/live_effects/lpe-patternalongpath.cpp:86 #, fuzzy msgid "Offsets in _unit of pattern size" msgstr "Objekter til mønster" -#: ../src/live_effects/lpe-patternalongpath.cpp:73 +#: ../src/live_effects/lpe-patternalongpath.cpp:87 msgid "" "Spacing, tangential and normal offset are expressed as a ratio of width/" "height" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/live_effects/lpe-patternalongpath.cpp:89 #, fuzzy msgid "Pattern is _vertical" msgstr "Mønsterforskydning" -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/live_effects/lpe-patternalongpath.cpp:89 msgid "Rotate pattern 90 deg before applying" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/live_effects/lpe-patternalongpath.cpp:91 msgid "_Fuse nearby ends:" msgstr "" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/live_effects/lpe-patternalongpath.cpp:91 msgid "Fuse ends closer than this number. 0 means don't fuse." msgstr "" @@ -11215,7 +11084,7 @@ msgid "Zero width" msgstr "Side_bredde" #: ../src/live_effects/lpe-powerstroke.cpp:171 -#: ../src/widgets/pencil-toolbar.cpp:115 +#: ../src/widgets/pencil-toolbar.cpp:112 #, fuzzy msgid "Spiro" msgstr "Spiral" @@ -11455,86 +11324,127 @@ msgid "" "amount" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:29 ../share/extensions/addnodes.inx.h:4 +#: ../src/live_effects/lpe-roughen.cpp:31 ../share/extensions/addnodes.inx.h:4 #, fuzzy msgid "By number of segments" msgstr "Antal trin" -#: ../src/live_effects/lpe-roughen.cpp:30 +#: ../src/live_effects/lpe-roughen.cpp:32 msgid "By max. segment size" msgstr "" -#. initialise your parameters here: #: ../src/live_effects/lpe-roughen.cpp:38 #, fuzzy +msgid "Along nodes" +msgstr "Sammenføj knudepunkter" + +#: ../src/live_effects/lpe-roughen.cpp:39 +#, fuzzy +msgid "Rand" +msgstr "Tilfældiggør:" + +#: ../src/live_effects/lpe-roughen.cpp:40 +#, fuzzy +msgid "Retract" +msgstr "Udtræk" + +#. initialise your parameters here: +#: ../src/live_effects/lpe-roughen.cpp:49 +#, fuzzy msgid "Method" msgstr "Meter" -#: ../src/live_effects/lpe-roughen.cpp:38 +#: ../src/live_effects/lpe-roughen.cpp:49 msgid "Division method" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:40 +#: ../src/live_effects/lpe-roughen.cpp:51 msgid "Max. segment size" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:42 +#: ../src/live_effects/lpe-roughen.cpp:53 msgid "Number of segments" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:44 +#: ../src/live_effects/lpe-roughen.cpp:55 msgid "Max. displacement in X" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:46 +#: ../src/live_effects/lpe-roughen.cpp:57 msgid "Max. displacement in Y" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:48 +#: ../src/live_effects/lpe-roughen.cpp:59 msgid "Global randomize" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:50 +#: ../src/live_effects/lpe-roughen.cpp:61 +#, fuzzy +msgid "Handles" +msgstr "Vinkel" + +#: ../src/live_effects/lpe-roughen.cpp:61 +#, fuzzy +msgid "Handles options" +msgstr "Tilfældig placering" + +#: ../src/live_effects/lpe-roughen.cpp:63 #: ../share/extensions/radiusrand.inx.h:5 #, fuzzy msgid "Shift nodes" msgstr "Sammenføj knudepunkter" -#: ../src/live_effects/lpe-roughen.cpp:52 -#: ../share/extensions/radiusrand.inx.h:6 +#: ../src/live_effects/lpe-roughen.cpp:65 #, fuzzy -msgid "Shift node handles" -msgstr "Flyt knudepunkts-håndtag" +msgid "Fixed displacement" +msgstr "Maksimal linjestykkelængde" -#: ../src/live_effects/lpe-roughen.cpp:100 +#: ../src/live_effects/lpe-roughen.cpp:65 +msgid "Fixed displacement, 1/3 of segment length" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:67 +#, fuzzy +msgid "Spray Tool friendly" +msgstr "Indstillinger for spiraler" + +#: ../src/live_effects/lpe-roughen.cpp:67 +msgid "For use with spray tool in copy mode" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:123 msgid "Add nodes Subdivide each segment" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:109 +#: ../src/live_effects/lpe-roughen.cpp:132 msgid "Jitter nodes Move nodes/handles" msgstr "" -#: ../src/live_effects/lpe-roughen.cpp:118 +#: ../src/live_effects/lpe-roughen.cpp:141 msgid "Extra roughen Add a extra layer of rough" msgstr "" -#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/restack.inx.h:12 +#: ../src/live_effects/lpe-roughen.cpp:150 +msgid "Options Modify options to rough" +msgstr "" + +#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27 +#: ../share/extensions/restack.inx.h:16 #: ../share/extensions/text_extract.inx.h:8 #: ../share/extensions/text_merge.inx.h:8 msgid "Left" msgstr "" -#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/restack.inx.h:14 +#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/measure.inx.h:29 +#: ../share/extensions/restack.inx.h:18 #: ../share/extensions/text_extract.inx.h:10 #: ../share/extensions/text_merge.inx.h:10 -#, fuzzy msgid "Right" -msgstr "Rettigheder" +msgstr "Højre" #: ../src/live_effects/lpe-ruler.cpp:27 ../src/live_effects/lpe-ruler.cpp:35 -#, fuzzy msgid "Both" -msgstr "Bot" +msgstr "Begge" #: ../src/live_effects/lpe-ruler.cpp:32 msgctxt "Border mark" @@ -11542,14 +11452,14 @@ msgid "None" msgstr "" #: ../src/live_effects/lpe-ruler.cpp:33 -#: ../src/live_effects/lpe-transform_2pts.cpp:34 -#: ../src/widgets/arc-toolbar.cpp:319 +#: ../src/live_effects/lpe-transform_2pts.cpp:37 +#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "Start" #: ../src/live_effects/lpe-ruler.cpp:34 -#: ../src/live_effects/lpe-transform_2pts.cpp:35 -#: ../src/widgets/arc-toolbar.cpp:332 +#: ../src/live_effects/lpe-transform_2pts.cpp:38 +#: ../src/ui/tools/measure-tool.cpp:757 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "Slut" @@ -11679,7 +11589,7 @@ msgid "Smooth angles:" msgstr "" #: ../src/live_effects/lpe-simplify.cpp:32 -msgid "Max degree difference on handles to preform a smooth" +msgid "Max degree difference on handles to perform a smooth" msgstr "" #: ../src/live_effects/lpe-simplify.cpp:34 @@ -11792,7 +11702,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 #: ../share/extensions/render_alphabetsoup.inx.h:3 #, fuzzy msgid "Scale:" @@ -11901,69 +11811,98 @@ msgstr "" msgid "Limit for miter joins" msgstr "" -#: ../src/live_effects/lpe-taperstroke.cpp:448 +#: ../src/live_effects/lpe-taperstroke.cpp:447 msgid "Start point of the taper" msgstr "" -#: ../src/live_effects/lpe-taperstroke.cpp:452 +#: ../src/live_effects/lpe-taperstroke.cpp:451 msgid "End point of the taper" msgstr "" -#: ../src/live_effects/lpe-transform_2pts.cpp:30 +#: ../src/live_effects/lpe-transform_2pts.cpp:31 #, fuzzy msgid "Elastic" msgstr "Indsæt" -#: ../src/live_effects/lpe-transform_2pts.cpp:30 +#: ../src/live_effects/lpe-transform_2pts.cpp:31 #, fuzzy msgid "Elastic transform mode" msgstr "Markér og transformér objekter" -#: ../src/live_effects/lpe-transform_2pts.cpp:31 +#: ../src/live_effects/lpe-transform_2pts.cpp:32 #, fuzzy msgid "From original width" msgstr "_Slip" -#: ../src/live_effects/lpe-transform_2pts.cpp:32 +#: ../src/live_effects/lpe-transform_2pts.cpp:33 #, fuzzy -msgid "Lock lenght" -msgstr "Sænk lag" +msgid "Lock length" +msgstr "Længde:" -#: ../src/live_effects/lpe-transform_2pts.cpp:32 +#: ../src/live_effects/lpe-transform_2pts.cpp:33 #, fuzzy -msgid "Lock lenght to current distance" +msgid "Lock length to current distance" msgstr "Lås eller lås det aktulle lag op" -#: ../src/live_effects/lpe-transform_2pts.cpp:33 +#: ../src/live_effects/lpe-transform_2pts.cpp:34 #, fuzzy msgid "Lock angle" msgstr "Vinkel" -#: ../src/live_effects/lpe-transform_2pts.cpp:34 +#: ../src/live_effects/lpe-transform_2pts.cpp:35 +#, fuzzy +msgid "Flip horizontal" +msgstr "Vend vandret" + +#: ../src/live_effects/lpe-transform_2pts.cpp:36 +#, fuzzy +msgid "Flip vertical" +msgstr "Vend lodret" + +#: ../src/live_effects/lpe-transform_2pts.cpp:37 #, fuzzy msgid "Start point" msgstr "Sideorientering:" -#: ../src/live_effects/lpe-transform_2pts.cpp:35 +#: ../src/live_effects/lpe-transform_2pts.cpp:38 #, fuzzy msgid "End point" msgstr "Linjebredde" -#: ../src/live_effects/lpe-transform_2pts.cpp:36 +#: ../src/live_effects/lpe-transform_2pts.cpp:39 +#, fuzzy +msgid "Stretch" +msgstr "Trinlængde (px)" + +#: ../src/live_effects/lpe-transform_2pts.cpp:39 +msgid "Stretch the result" +msgstr "" + +#: ../src/live_effects/lpe-transform_2pts.cpp:40 +#, fuzzy +msgid "Offset from knots" +msgstr "Forskydningssti" + +#: ../src/live_effects/lpe-transform_2pts.cpp:41 #, fuzzy msgid "First Knot" msgstr "Første valgt" -#: ../src/live_effects/lpe-transform_2pts.cpp:37 +#: ../src/live_effects/lpe-transform_2pts.cpp:42 msgid "Last Knot" msgstr "" -#: ../src/live_effects/lpe-transform_2pts.cpp:38 +#: ../src/live_effects/lpe-transform_2pts.cpp:43 #, fuzzy msgid "Rotation helper size" msgstr "_Rotering" -#: ../src/live_effects/lpe-transform_2pts.cpp:319 +#: ../src/live_effects/lpe-transform_2pts.cpp:197 +#, fuzzy +msgid "Change index of knot" +msgstr "Ændr knudepunkttype" + +#: ../src/live_effects/lpe-transform_2pts.cpp:350 #: ../src/ui/dialog/inkscape-preferences.cpp:1612 #: ../src/ui/dialog/pixelartdialog.cpp:296 #: ../src/ui/dialog/svg-fonts-dialog.cpp:699 @@ -12030,7 +11969,7 @@ msgstr "" msgid "Disable effect if the output is too complex" msgstr "" -#: ../src/live_effects/parameter/bool.cpp:67 +#: ../src/live_effects/parameter/bool.cpp:68 #, fuzzy msgid "Change bool parameter" msgstr "Primær uigennemsigtighed" @@ -12040,29 +11979,29 @@ msgstr "Primær uigennemsigtighed" msgid "Change enumeration parameter" msgstr "Ændr linjestykketype" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:780 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:841 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:778 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:839 msgid "" "Chamfer: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:784 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:845 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 msgid "" "Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:788 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:849 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 msgid "" "Inverse Fillet: Ctrl+Click toggle type, Shift+Click " "open dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:792 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:853 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 msgid "" "Fillet: Ctrl+Click toggle type, Shift+Click open " "dialog, Ctrl+Alt+Click reset" @@ -12080,7 +12019,7 @@ msgid "Select original" msgstr "Markér _original" #: ../src/live_effects/parameter/originalpatharray.cpp:90 -#: ../src/widgets/gradient-toolbar.cpp:1208 +#: ../src/widgets/gradient-toolbar.cpp:1205 #, fuzzy msgid "Reverse" msgstr "_Skift retning" @@ -12097,12 +12036,12 @@ msgid "Remove Path" msgstr "Fjern sti" #: ../src/live_effects/parameter/originalpatharray.cpp:179 -#: ../src/ui/dialog/objects.cpp:1850 +#: ../src/ui/dialog/objects.cpp:1854 msgid "Move Down" msgstr "" #: ../src/live_effects/parameter/originalpatharray.cpp:191 -#: ../src/ui/dialog/objects.cpp:1858 +#: ../src/ui/dialog/objects.cpp:1862 msgid "Move Up" msgstr "" @@ -12118,25 +12057,17 @@ msgstr "" msgid "Remove path" msgstr "Fjern sti" -#: ../src/live_effects/parameter/parameter.cpp:152 -#: ../src/live_effects/parameter/parameter.cpp:170 -#, fuzzy -msgid "Change scalar parameter" -msgstr "Primær uigennemsigtighed" - #: ../src/live_effects/parameter/path.cpp:170 msgid "Edit on-canvas" msgstr "" #: ../src/live_effects/parameter/path.cpp:180 -#, fuzzy msgid "Copy path" -msgstr "Skær sti" +msgstr "Kopiér sti" #: ../src/live_effects/parameter/path.cpp:190 -#, fuzzy msgid "Paste path" -msgstr "Indsæt _bredde" +msgstr "Indsæt sti" #: ../src/live_effects/parameter/path.cpp:200 msgid "Link to path on clipboard" @@ -12147,7 +12078,7 @@ msgstr "Link til sti på udklipsholder" msgid "Paste path parameter" msgstr "Indsæt bredde separat" -#: ../src/live_effects/parameter/point.cpp:124 +#: ../src/live_effects/parameter/point.cpp:132 #, fuzzy msgid "Change point parameter" msgstr "Opret spiraler" @@ -12351,8 +12282,8 @@ msgstr "Eksportér dokument til EPS-fil" #: ../src/main.cpp:407 msgid "" -"Choose the PostScript Level used to export. Possible choices are 2 (the " -"default) and 3" +"Choose the PostScript Level used to export. Possible choices are 2 and 3 " +"(the default)" msgstr "" #: ../src/main.cpp:409 @@ -12494,7 +12425,7 @@ msgstr "" msgid "Start Inkscape in interactive shell mode." msgstr "" -#: ../src/main.cpp:871 ../src/main.cpp:1280 +#: ../src/main.cpp:871 ../src/main.cpp:1284 msgid "" "[OPTIONS...] [FILE...]\n" "\n" @@ -12505,98 +12436,98 @@ msgstr "" "Valgmuligheder:" #. ## Add a menu for clear() -#: ../src/menus-skeleton.h:16 ../src/ui/dialog/debug.cpp:79 +#: ../src/menus-skeleton.h:18 ../src/ui/dialog/debug.cpp:79 msgid "_File" msgstr "_Fil" #. " \n" #. " \n" -#: ../src/menus-skeleton.h:41 ../src/verbs.cpp:2682 ../src/verbs.cpp:2690 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2714 ../src/verbs.cpp:2722 msgid "_Edit" msgstr "_Redigér" -#: ../src/menus-skeleton.h:51 ../src/verbs.cpp:2446 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2473 msgid "Paste Si_ze" msgstr "Inds_æt størrelse" -#: ../src/menus-skeleton.h:63 +#: ../src/menus-skeleton.h:65 msgid "Clo_ne" msgstr "Klo_n" -#: ../src/menus-skeleton.h:77 +#: ../src/menus-skeleton.h:79 msgid "Select Sa_me" msgstr "Markér sa_mme" -#: ../src/menus-skeleton.h:95 +#: ../src/menus-skeleton.h:98 msgid "_View" msgstr "_Vis" -#: ../src/menus-skeleton.h:96 +#: ../src/menus-skeleton.h:99 msgid "_Zoom" msgstr "_Zoom" -#: ../src/menus-skeleton.h:112 +#: ../src/menus-skeleton.h:115 msgid "_Display mode" msgstr "_Visningstilstand" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:121 +#: ../src/menus-skeleton.h:124 msgid "_Color display mode" msgstr "_Farvevisningstilstand" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:134 +#: ../src/menus-skeleton.h:137 msgid "Sh_ow/Hide" msgstr "_Vis/skjul" #. Not quite ready to be in the menus. #. " \n" -#: ../src/menus-skeleton.h:154 +#: ../src/menus-skeleton.h:157 msgid "_Layer" msgstr "_Lag" -#: ../src/menus-skeleton.h:178 +#: ../src/menus-skeleton.h:181 msgid "_Object" msgstr "_Objekt" -#: ../src/menus-skeleton.h:189 +#: ../src/menus-skeleton.h:192 msgid "Cli_p" msgstr "Besk_ær" -#: ../src/menus-skeleton.h:193 +#: ../src/menus-skeleton.h:196 msgid "Mas_k" msgstr "Mas_ke" -#: ../src/menus-skeleton.h:197 +#: ../src/menus-skeleton.h:200 msgid "Patter_n" msgstr "_Mønster" -#: ../src/menus-skeleton.h:221 +#: ../src/menus-skeleton.h:224 msgid "_Path" msgstr "_Sti" -#: ../src/menus-skeleton.h:249 ../src/ui/dialog/find.cpp:78 +#: ../src/menus-skeleton.h:256 ../src/ui/dialog/find.cpp:78 #: ../src/ui/dialog/text-edit.cpp:71 msgid "_Text" msgstr "_Tekst" -#: ../src/menus-skeleton.h:267 +#: ../src/menus-skeleton.h:274 msgid "Filter_s" msgstr "_Filtre" -#: ../src/menus-skeleton.h:273 +#: ../src/menus-skeleton.h:280 msgid "Exte_nsions" msgstr "_Udvidelser" -#: ../src/menus-skeleton.h:279 +#: ../src/menus-skeleton.h:286 msgid "_Help" msgstr "_Hjælp" -#: ../src/menus-skeleton.h:283 +#: ../src/menus-skeleton.h:290 msgid "Tutorials" msgstr "Vejledninger" @@ -12606,9 +12537,8 @@ msgid "Select object(s) to combine." msgstr "Markér objekt(er) at hæve." #: ../src/path-chemistry.cpp:67 -#, fuzzy msgid "Combining paths..." -msgstr "Lukker sti." +msgstr "Kombinerer stier ..." #: ../src/path-chemistry.cpp:177 msgid "Combine" @@ -12722,21 +12652,17 @@ msgstr "" #. _reportError(Glib::ustring::compose(_("Cannot create profile directory %1."), #. Glib::filename_to_utf8(_prefs_dir)), not_saved); #: ../src/preferences.cpp:151 -#, fuzzy, c-format +#, c-format msgid "Cannot create profile directory %s." -msgstr "" -"Kan ikke oprette mappe %s.\n" -"%s" +msgstr "Kan ikke oprette profilmappen %s." #. The profile dir is not actually a directory #. _reportError(Glib::ustring::compose(_("%1 is not a valid directory."), #. Glib::filename_to_utf8(_prefs_dir)), not_saved); #: ../src/preferences.cpp:169 -#, fuzzy, c-format +#, c-format msgid "%s is not a valid directory." -msgstr "" -"%s er ikke en gyldig mappe.\n" -"%s" +msgstr "%s er ikke en gyldig mappe." #. The write failed. #. _reportError(Glib::ustring::compose(_("Failed to create the preferences file %1."), @@ -12804,9 +12730,8 @@ msgid "FreeArt" msgstr "FreeArt" #: ../src/rdf.cpp:215 -#, fuzzy msgid "Open Font License" -msgstr "Åbn ny fil" +msgstr "Åbn skifttypelicens" #. Create the Title label and edit control #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkTitleAttribute @@ -12820,9 +12745,8 @@ msgid "A name given to the resource" msgstr "" #: ../src/rdf.cpp:238 -#, fuzzy msgid "Date:" -msgstr "Dato" +msgstr "Dato:" #: ../src/rdf.cpp:239 msgid "" @@ -12831,9 +12755,8 @@ msgid "" msgstr "" #: ../src/rdf.cpp:241 ../share/extensions/webslicer_create_rect.inx.h:3 -#, fuzzy msgid "Format:" -msgstr "Format" +msgstr "Format:" #: ../src/rdf.cpp:242 msgid "The file format, physical medium, or dimensions of the resource" @@ -12844,9 +12767,8 @@ msgid "The nature or genre of the resource" msgstr "" #: ../src/rdf.cpp:248 -#, fuzzy msgid "Creator:" -msgstr "Forfatter" +msgstr "Forfatter:" #: ../src/rdf.cpp:249 #, fuzzy @@ -12855,9 +12777,8 @@ msgstr "" "Navnet på forfatteren med hovedansvar for udformningen af dette dokument." #: ../src/rdf.cpp:251 -#, fuzzy msgid "Rights:" -msgstr "Rettigheder" +msgstr "Rettigheder:" #: ../src/rdf.cpp:252 msgid "Information about rights held in and over the resource" @@ -12905,9 +12826,8 @@ msgid "A language of the resource" msgstr "" #: ../src/rdf.cpp:270 -#, fuzzy msgid "Keywords:" -msgstr "Nøgleord" +msgstr "Nøgleord:" #: ../src/rdf.cpp:271 msgid "The topic of the resource" @@ -12927,9 +12847,8 @@ msgid "" msgstr "" #: ../src/rdf.cpp:279 -#, fuzzy msgid "Description:" -msgstr "Beskrivelse" +msgstr "Beskrivelse:" #: ../src/rdf.cpp:280 #, fuzzy @@ -12940,7 +12859,7 @@ msgstr "En kort beskrivelse af dokumentets indhold." #: ../src/rdf.cpp:284 #, fuzzy msgid "Contributors:" -msgstr "Bidragydere" +msgstr "Bidragydere:" #: ../src/rdf.cpp:285 #, fuzzy @@ -12949,9 +12868,8 @@ msgstr "Navne på bidragydere til dokumentet." #. TRANSLATORS: URL to a page that defines the license for the document #: ../src/rdf.cpp:289 -#, fuzzy msgid "URI:" -msgstr "URI" +msgstr "URI:" #. TRANSLATORS: this is where you put a URL to a page that defines the license #: ../src/rdf.cpp:291 @@ -12966,11 +12884,10 @@ msgid "Fragment:" msgstr "Fragment" #: ../src/rdf.cpp:296 -#, fuzzy msgid "XML fragment for the RDF 'License' section" -msgstr "XML-fragment til RDF 'License'-afsnittet." +msgstr "XML-fragment til RDF 'License'-afsnittet" -#: ../src/resource-manager.cpp:332 +#: ../src/resource-manager.cpp:336 msgid "Fixup broken links" msgstr "" @@ -12986,9 +12903,9 @@ msgstr "Intet blev slettet." #: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 #: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:965 #: ../src/widgets/eraser-toolbar.cpp:93 -#: ../src/widgets/gradient-toolbar.cpp:1184 -#: ../src/widgets/gradient-toolbar.cpp:1198 -#: ../src/widgets/gradient-toolbar.cpp:1212 +#: ../src/widgets/gradient-toolbar.cpp:1181 +#: ../src/widgets/gradient-toolbar.cpp:1195 +#: ../src/widgets/gradient-toolbar.cpp:1209 #: ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Slet" @@ -13025,7 +12942,7 @@ msgid "No groups to ungroup in the selection." msgstr "Ingen grupper at afgruppere i markeringen." #: ../src/selection-chemistry.cpp:869 ../src/sp-item-group.cpp:550 -#: ../src/ui/dialog/objects.cpp:1912 +#: ../src/ui/dialog/objects.cpp:1916 msgid "Ungroup" msgstr "Afgruppér" @@ -13043,7 +12960,6 @@ msgstr "" #. TRANSLATORS: "Raise" means "to raise an object" in the undo history #: ../src/selection-chemistry.cpp:999 -#, fuzzy msgctxt "Undo action" msgid "Raise" msgstr "Hæv" @@ -13062,7 +12978,6 @@ msgstr "Markér objekt(er) at sænke." #. TRANSLATORS: "Lower" means "to lower an object" in the undo history #: ../src/selection-chemistry.cpp:1083 -#, fuzzy msgctxt "Undo action" msgid "Lower" msgstr "Sænk" @@ -13112,7 +13027,7 @@ msgid "Select object(s) to remove filters from." msgstr "Markér tekst(er) at fjerne knibning fra." #: ../src/selection-chemistry.cpp:1288 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1693 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 #, fuzzy msgid "Remove filter" msgstr "Fjern udfyldning" @@ -13129,145 +13044,143 @@ msgstr "Indsæt størrelse separat" msgid "Select object(s) to move to the layer above." msgstr "Markér objekt(er) at flytte til overliggende lag." -#: ../src/selection-chemistry.cpp:1360 +#: ../src/selection-chemistry.cpp:1361 msgid "Raise to next layer" msgstr "Hæv til næste lag" -#: ../src/selection-chemistry.cpp:1367 +#: ../src/selection-chemistry.cpp:1368 msgid "No more layers above." msgstr "Ikke flere lag ovenfor." -#: ../src/selection-chemistry.cpp:1378 +#: ../src/selection-chemistry.cpp:1379 msgid "Select object(s) to move to the layer below." msgstr "Markér objekt(er) at flytte til laget nedenunder." -#: ../src/selection-chemistry.cpp:1403 +#: ../src/selection-chemistry.cpp:1405 msgid "Lower to previous layer" msgstr "Sænk til forrige lag" -#: ../src/selection-chemistry.cpp:1410 +#: ../src/selection-chemistry.cpp:1412 msgid "No more layers below." msgstr "Ikke flere lag under." -#: ../src/selection-chemistry.cpp:1420 +#: ../src/selection-chemistry.cpp:1422 #, fuzzy msgid "Select object(s) to move." msgstr "Markér objekt(er) at sænke." -#: ../src/selection-chemistry.cpp:1437 ../src/verbs.cpp:2625 +#: ../src/selection-chemistry.cpp:1440 ../src/verbs.cpp:2657 msgid "Move selection to layer" msgstr "Flyt markering til lag" #. An SVG element cannot have a transform. We could change 'x' and 'y' in response #. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1526 ../src/seltrans.cpp:390 +#: ../src/selection-chemistry.cpp:1529 ../src/seltrans.cpp:391 msgid "Cannot transform an embedded SVG." msgstr "" -#: ../src/selection-chemistry.cpp:1696 +#: ../src/selection-chemistry.cpp:1699 msgid "Remove transform" msgstr "Fjern transformation" -#: ../src/selection-chemistry.cpp:1803 -#, fuzzy +#: ../src/selection-chemistry.cpp:1806 msgid "Rotate 90° CCW" -msgstr "Rotér 90° mod urets retning" +msgstr "Rotér 90° mod uret" -#: ../src/selection-chemistry.cpp:1803 -#, fuzzy +#: ../src/selection-chemistry.cpp:1806 msgid "Rotate 90° CW" -msgstr "Rotér 90° i urets retning" +msgstr "Rotér 90° med uret" -#: ../src/selection-chemistry.cpp:1824 ../src/seltrans.cpp:483 -#: ../src/ui/dialog/transformation.cpp:891 +#: ../src/selection-chemistry.cpp:1827 ../src/seltrans.cpp:484 +#: ../src/ui/dialog/transformation.cpp:890 msgid "Rotate" msgstr "Rotér" -#: ../src/selection-chemistry.cpp:2173 +#: ../src/selection-chemistry.cpp:2176 msgid "Rotate by pixels" msgstr "Rotér med billedpunkter" -#: ../src/selection-chemistry.cpp:2203 ../src/seltrans.cpp:480 -#: ../src/ui/dialog/transformation.cpp:865 ../src/ui/widget/page-sizer.cpp:450 -#: ../share/extensions/interp_att_g.inx.h:12 +#: ../src/selection-chemistry.cpp:2206 ../src/seltrans.cpp:481 +#: ../src/ui/dialog/transformation.cpp:864 ../src/ui/widget/page-sizer.cpp:450 +#: ../share/extensions/interp_att_g.inx.h:14 msgid "Scale" msgstr "Skalér" -#: ../src/selection-chemistry.cpp:2228 +#: ../src/selection-chemistry.cpp:2231 msgid "Scale by whole factor" msgstr "Skalér med hel faktor" -#: ../src/selection-chemistry.cpp:2243 +#: ../src/selection-chemistry.cpp:2246 msgid "Move vertically" msgstr "Flyt lodret" -#: ../src/selection-chemistry.cpp:2246 +#: ../src/selection-chemistry.cpp:2249 msgid "Move horizontally" msgstr "FLyt vandret" -#: ../src/selection-chemistry.cpp:2249 ../src/selection-chemistry.cpp:2275 -#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:802 +#: ../src/selection-chemistry.cpp:2252 ../src/selection-chemistry.cpp:2278 +#: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:801 msgid "Move" msgstr "Flyt" -#: ../src/selection-chemistry.cpp:2269 +#: ../src/selection-chemistry.cpp:2272 #, fuzzy msgid "Move vertically by pixels" msgstr "Skub til billedpunkter lodret" -#: ../src/selection-chemistry.cpp:2272 +#: ../src/selection-chemistry.cpp:2275 #, fuzzy msgid "Move horizontally by pixels" msgstr "Skub til billedpunkter vandret" -#: ../src/selection-chemistry.cpp:2475 +#: ../src/selection-chemistry.cpp:2478 #, fuzzy msgid "The selection has no applied path effect." msgstr "Opret et dynamisk forskudt objekt" -#: ../src/selection-chemistry.cpp:2567 ../src/ui/dialog/clonetiler.cpp:2221 +#: ../src/selection-chemistry.cpp:2570 ../src/ui/dialog/clonetiler.cpp:2230 msgid "Select an object to clone." msgstr "Markér et objekt til kloning." -#: ../src/selection-chemistry.cpp:2602 +#: ../src/selection-chemistry.cpp:2605 msgctxt "Action" msgid "Clone" msgstr "Klon" -#: ../src/selection-chemistry.cpp:2616 +#: ../src/selection-chemistry.cpp:2619 #, fuzzy msgid "Select clones to relink." msgstr "Markér en klon at aflinke." -#: ../src/selection-chemistry.cpp:2623 +#: ../src/selection-chemistry.cpp:2626 #, fuzzy msgid "Copy an object to clipboard to relink clones to." msgstr "Markér et objekt til kloning." -#: ../src/selection-chemistry.cpp:2644 +#: ../src/selection-chemistry.cpp:2647 #, fuzzy msgid "No clones to relink in the selection." msgstr "Ingen kloner at aflinkel i markeringen." -#: ../src/selection-chemistry.cpp:2647 +#: ../src/selection-chemistry.cpp:2650 #, fuzzy msgid "Relink clone" msgstr "Aflink klon" -#: ../src/selection-chemistry.cpp:2661 +#: ../src/selection-chemistry.cpp:2664 #, fuzzy msgid "Select clones to unlink." msgstr "Markér en klon at aflinke." -#: ../src/selection-chemistry.cpp:2714 +#: ../src/selection-chemistry.cpp:2717 msgid "No clones to unlink in the selection." msgstr "Ingen kloner at aflinkel i markeringen." -#: ../src/selection-chemistry.cpp:2718 +#: ../src/selection-chemistry.cpp:2721 msgid "Unlink clone" msgstr "Aflink klon" -#: ../src/selection-chemistry.cpp:2731 +#: ../src/selection-chemistry.cpp:2734 msgid "" "Select a clone to go to its original. Select a linked offset " "to go to its source. Select a text on path to go to the path. Select " @@ -13277,7 +13190,7 @@ msgstr "" "for at gå til kilde. Markér tekst på sti for at gå til stien. Markér " "en flydende tekst for at gå til ramme." -#: ../src/selection-chemistry.cpp:2781 +#: ../src/selection-chemistry.cpp:2784 msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" @@ -13285,141 +13198,139 @@ msgstr "" "Kan ikke finde objektet at markere (klon uden forælder, forskydning, " "tekststi, flydende tekst?)" -#: ../src/selection-chemistry.cpp:2787 +#: ../src/selection-chemistry.cpp:2790 msgid "" "The object you're trying to select is not visible (it is in <" "defs>)" msgstr "" "Objektet du forsøger at markere er usynligt (det er i <defs>)" -#: ../src/selection-chemistry.cpp:2877 +#: ../src/selection-chemistry.cpp:2880 msgid "Select path(s) to fill." msgstr "" -#: ../src/selection-chemistry.cpp:2895 +#: ../src/selection-chemistry.cpp:2898 #, fuzzy msgid "Select object(s) to convert to marker." msgstr "Markér objekt(er) at konvertere til mønster." -#: ../src/selection-chemistry.cpp:2969 +#: ../src/selection-chemistry.cpp:2972 msgid "Objects to marker" msgstr "Objekter til markør" -#: ../src/selection-chemistry.cpp:2995 +#: ../src/selection-chemistry.cpp:2998 #, fuzzy msgid "Select object(s) to convert to guides." msgstr "Markér objekt(er) at konvertere til mønster." -#: ../src/selection-chemistry.cpp:3016 +#: ../src/selection-chemistry.cpp:3019 msgid "Objects to guides" msgstr "Objekter til hjælpelinjer" -#: ../src/selection-chemistry.cpp:3052 +#: ../src/selection-chemistry.cpp:3055 #, fuzzy msgid "Select objects to convert to symbol." msgstr "Markér objekt(er) at konvertere til mønster." -#: ../src/selection-chemistry.cpp:3153 +#: ../src/selection-chemistry.cpp:3156 msgid "Group to symbol" msgstr "" -#: ../src/selection-chemistry.cpp:3172 -#, fuzzy +#: ../src/selection-chemistry.cpp:3175 msgid "Select a symbol to extract objects from." -msgstr "" -"Markér et objekt med mønsterudfyldning at udtrække objekter fra." +msgstr "Markér et symbol at udtrække objekter fra." -#: ../src/selection-chemistry.cpp:3181 +#: ../src/selection-chemistry.cpp:3184 msgid "Select only one symbol in Symbol dialog to convert to group." msgstr "" -#: ../src/selection-chemistry.cpp:3237 +#: ../src/selection-chemistry.cpp:3240 msgid "Group from symbol" msgstr "" -#: ../src/selection-chemistry.cpp:3255 +#: ../src/selection-chemistry.cpp:3258 msgid "Select object(s) to convert to pattern." msgstr "Markér objekt(er) at konvertere til mønster." -#: ../src/selection-chemistry.cpp:3351 +#: ../src/selection-chemistry.cpp:3354 msgid "Objects to pattern" msgstr "Objekter til mønster" -#: ../src/selection-chemistry.cpp:3367 +#: ../src/selection-chemistry.cpp:3370 msgid "Select an object with pattern fill to extract objects from." msgstr "" "Markér et objekt med mønsterudfyldning at udtrække objekter fra." -#: ../src/selection-chemistry.cpp:3426 +#: ../src/selection-chemistry.cpp:3429 msgid "No pattern fills in the selection." msgstr "Ingen mønsterudfyldninger i markeringen." -#: ../src/selection-chemistry.cpp:3429 +#: ../src/selection-chemistry.cpp:3432 msgid "Pattern to objects" msgstr "Mønstre til objekter" -#: ../src/selection-chemistry.cpp:3516 +#: ../src/selection-chemistry.cpp:3518 msgid "Select object(s) to make a bitmap copy." msgstr "Markér objekt(er) at lave punktbilledkopi af." -#: ../src/selection-chemistry.cpp:3520 +#: ../src/selection-chemistry.cpp:3522 #, fuzzy msgid "Rendering bitmap..." msgstr "_Skift retning" -#: ../src/selection-chemistry.cpp:3705 +#: ../src/selection-chemistry.cpp:3707 msgid "Create bitmap" msgstr "Opret punktbillede" -#: ../src/selection-chemistry.cpp:3730 ../src/selection-chemistry.cpp:3842 +#: ../src/selection-chemistry.cpp:3732 ../src/selection-chemistry.cpp:3844 msgid "Select object(s) to create clippath or mask from." msgstr "Marker objekter at oprette beskæringssti eller maske fra." -#: ../src/selection-chemistry.cpp:3816 ../src/ui/dialog/objects.cpp:1918 +#: ../src/selection-chemistry.cpp:3818 ../src/ui/dialog/objects.cpp:1922 msgid "Create Clip Group" msgstr "" -#: ../src/selection-chemistry.cpp:3845 +#: ../src/selection-chemistry.cpp:3847 msgid "Select mask object and object(s) to apply clippath or mask to." msgstr "" "Markér maskeobjekt og objekt(er) at anvende beskæringssti eller maske " "til." -#: ../src/selection-chemistry.cpp:3992 +#: ../src/selection-chemistry.cpp:3994 msgid "Set clipping path" msgstr "Vælg beskæringssti" -#: ../src/selection-chemistry.cpp:3994 +#: ../src/selection-chemistry.cpp:3996 msgid "Set mask" msgstr "Vælg maske" -#: ../src/selection-chemistry.cpp:4009 +#: ../src/selection-chemistry.cpp:4011 msgid "Select object(s) to remove clippath or mask from." msgstr "Markér objekt(er) at fjerne beskæringssti eller maske fra." -#: ../src/selection-chemistry.cpp:4125 +#: ../src/selection-chemistry.cpp:4127 msgid "Release clipping path" msgstr "Frigør beskæringssti" -#: ../src/selection-chemistry.cpp:4127 +#: ../src/selection-chemistry.cpp:4129 msgid "Release mask" msgstr "Frigiv maske" -#: ../src/selection-chemistry.cpp:4146 +#: ../src/selection-chemistry.cpp:4148 #, fuzzy msgid "Select object(s) to fit canvas to." msgstr "Markér objekt(er) at indsætte størrelse til." #. Fit Page -#: ../src/selection-chemistry.cpp:4166 ../src/verbs.cpp:2961 +#: ../src/selection-chemistry.cpp:4168 ../src/verbs.cpp:3003 msgid "Fit Page to Selection" msgstr "_Tilpas side til markering" -#: ../src/selection-chemistry.cpp:4195 ../src/verbs.cpp:2963 +#: ../src/selection-chemistry.cpp:4197 ../src/verbs.cpp:3005 msgid "Fit Page to Drawing" msgstr "Tilpas side til tegning" -#: ../src/selection-chemistry.cpp:4216 ../src/verbs.cpp:2965 +#: ../src/selection-chemistry.cpp:4218 ../src/verbs.cpp:3007 msgid "Fit Page to Selection or Drawing" msgstr "Tilpas siden til markering eller tegning" @@ -13556,47 +13467,47 @@ msgstr "" "Centrum for rotation og vridning: træk for at omplacere; skalering " "med Shift bruger også dette centrum." -#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:980 +#: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:979 msgid "Skew" msgstr "Vrid" -#: ../src/seltrans.cpp:500 +#: ../src/seltrans.cpp:501 msgid "Set center" msgstr "Sæt midte" -#: ../src/seltrans.cpp:573 +#: ../src/seltrans.cpp:574 msgid "Stamp" msgstr "Stempl" -#: ../src/seltrans.cpp:722 +#: ../src/seltrans.cpp:723 msgid "Reset center" msgstr "Nulstil midte" -#: ../src/seltrans.cpp:954 ../src/seltrans.cpp:1059 +#: ../src/seltrans.cpp:961 ../src/seltrans.cpp:1065 #, c-format msgid "Scale: %0.2f%% x %0.2f%%; with Ctrl to lock ratio" msgstr "Skalér: %0.2f%% x %0.2f%%; med Ctrl for at låse forhold" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1198 +#: ../src/seltrans.cpp:1202 #, c-format msgid "Skew: %0.2f°; with Ctrl to snap angle" msgstr "Vrid: %0.2f°; med Ctrl for trinvis justering" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1273 +#: ../src/seltrans.cpp:1278 #, c-format msgid "Rotate: %0.2f°; with Ctrl to snap angle" msgstr "Rotér: %0.2f°; med Ctrl for trinvis justering" -#: ../src/seltrans.cpp:1310 +#: ../src/seltrans.cpp:1315 #, c-format msgid "Move center to %s, %s" msgstr "Flyt midte til %s, %s" -#: ../src/seltrans.cpp:1464 +#: ../src/seltrans.cpp:1461 #, c-format msgid "" "Move by %s, %s; with Ctrl to restrict to horizontal/vertical; " @@ -13610,8 +13521,8 @@ msgstr "" msgid "Keyboard directory (%s) is unavailable." msgstr "Palettemappen (%s) er ikke tilgængelig." -#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1298 -#: ../src/ui/dialog/export.cpp:1332 +#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305 +#: ../src/ui/dialog/export.cpp:1339 msgid "Select a filename for exporting" msgstr "Vælg et filnavn til eksporteringen" @@ -13626,9 +13537,8 @@ msgid "to %s" msgstr "" #: ../src/sp-anchor.cpp:115 -#, fuzzy msgid "without URI" -msgstr "Link uden URI" +msgstr "uden URI" #: ../src/sp-ellipse.cpp:362 #, fuzzy @@ -13636,14 +13546,13 @@ msgid "Segment" msgstr "Sammenføj med nyt linjestykke" #: ../src/sp-ellipse.cpp:364 -#, fuzzy msgid "Arc" -msgstr "_Udgangspunkt X:" +msgstr "Bue" #. Ellipse #: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 #: ../src/ui/dialog/inkscape-preferences.cpp:412 -#: ../src/widgets/pencil-toolbar.cpp:181 +#: ../src/widgets/pencil-toolbar.cpp:179 msgid "Ellipse" msgstr "Elipse" @@ -13666,44 +13575,43 @@ msgstr "Flyd område" msgid "Flow Excluded Region" msgstr "Flyd ekskluderet område" -#: ../src/sp-flowtext.cpp:280 +#: ../src/sp-flowtext.cpp:282 #, fuzzy msgid "Flowed Text" msgstr "Flydende tekst" -#: ../src/sp-flowtext.cpp:282 +#: ../src/sp-flowtext.cpp:284 #, fuzzy msgid "Linked Flowed Text" msgstr "Flydende tekst" -#: ../src/sp-flowtext.cpp:288 ../src/sp-text.cpp:367 +#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:377 #: ../src/ui/tools/text-tool.cpp:1556 #, fuzzy msgid " [truncated]" msgstr "[Uændret]" -#: ../src/sp-flowtext.cpp:290 +#: ../src/sp-flowtext.cpp:292 #, fuzzy, c-format msgid "(%d character%s)" msgid_plural "(%d characters%s)" msgstr[0] "Usynligt tegn" msgstr[1] "Usynligt tegn" -#: ../src/sp-guide.cpp:253 +#: ../src/sp-guide.cpp:261 msgid "Create Guides Around the Page" msgstr "" -#: ../src/sp-guide.cpp:265 ../src/verbs.cpp:2518 +#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2545 msgid "Delete All Guides" msgstr "Slet alle hjælpelinjer" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:452 -#, fuzzy +#: ../src/sp-guide.cpp:485 msgid "Deleted" -msgstr "Slet" +msgstr "Slettet" -#: ../src/sp-guide.cpp:461 +#: ../src/sp-guide.cpp:494 #, fuzzy msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " @@ -13712,17 +13620,17 @@ msgstr "" "Træk for at oprette en ellipse. Træk i håndtag for at lave en " "bue eller et segment. Klik for at markere." -#: ../src/sp-guide.cpp:465 +#: ../src/sp-guide.cpp:498 #, fuzzy, c-format msgid "vertical, at %s" msgstr "lodret hjælpelinje" -#: ../src/sp-guide.cpp:468 +#: ../src/sp-guide.cpp:501 #, fuzzy, c-format msgid "horizontal, at %s" msgstr "vandret hjælpelinje" -#: ../src/sp-guide.cpp:473 +#: ../src/sp-guide.cpp:506 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "" @@ -13737,11 +13645,11 @@ msgid "[bad reference]: %s" msgstr "Indstillinger for stjerner" #: ../src/sp-image.cpp:526 -#, fuzzy, c-format +#, c-format msgid "%d × %d: %s" -msgstr "Billede %d × %d: %s" +msgstr "%d × %d: %s" -#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1911 +#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1915 msgid "Group" msgstr "Gruppér" @@ -13852,38 +13760,38 @@ msgstr "Spiral" #. TRANSLATORS: since turn count isn't an integer, please adjust the #. string as needed to deal with an localized plural forms. #: ../src/sp-spiral.cpp:226 -#, fuzzy, c-format +#, c-format msgid "with %3f turns" -msgstr "Spiral med %3f omgange" +msgstr "med %3f omgange" #. Star -#: ../src/sp-star.cpp:246 ../src/ui/dialog/inkscape-preferences.cpp:416 +#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:416 #: ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "Stjerne" -#: ../src/sp-star.cpp:247 ../src/widgets/star-toolbar.cpp:462 +#: ../src/sp-star.cpp:248 ../src/widgets/star-toolbar.cpp:462 msgid "Polygon" msgstr "Polygon" #. while there will never be less than 3 vertices, we still need to #. make calls to ngettext because the pluralization may be different #. for various numbers >=3. The singular form is used as the index. -#: ../src/sp-star.cpp:254 -#, fuzzy, c-format +#: ../src/sp-star.cpp:255 +#, c-format msgid "with %d vertex" -msgstr "Stjerne med %d spids" +msgstr "med %d spids" -#: ../src/sp-star.cpp:254 -#, fuzzy, c-format +#: ../src/sp-star.cpp:255 +#, c-format msgid "with %d vertices" -msgstr "Stjerne med %d spids" +msgstr "med %d spids" #: ../src/sp-switch.cpp:63 msgid "Conditional Group" msgstr "" -#: ../src/sp-text.cpp:351 ../src/verbs.cpp:347 +#: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 #: ../share/extensions/replace_font.inx.h:11 #: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 @@ -13898,15 +13806,15 @@ msgstr "" msgid "Text" msgstr "Tekst" -#: ../src/sp-text.cpp:371 +#: ../src/sp-text.cpp:381 #, fuzzy, c-format msgid "on path%s (%s, %s)" msgstr "Tekst på sti (%s, %s)" -#: ../src/sp-text.cpp:372 -#, fuzzy, c-format +#: ../src/sp-text.cpp:382 +#, c-format msgid "%s (%s, %s)" -msgstr "Tekst (%s, %s)" +msgstr "%s (%s, %s)" #: ../src/sp-tref.cpp:218 #, fuzzy @@ -13921,7 +13829,7 @@ msgstr "" msgid "[orphaned]" msgstr "" -#: ../src/sp-tspan.cpp:203 +#: ../src/sp-tspan.cpp:217 #, fuzzy msgid "Text Span" msgstr "Tekst-inddata" @@ -13951,9 +13859,9 @@ msgid "..." msgstr " ..." #: ../src/sp-use.cpp:266 -#, fuzzy, c-format +#, c-format msgid "of: %s" -msgstr "Fejl" +msgstr "af: %s" #: ../src/splivarot.cpp:71 ../src/splivarot.cpp:77 msgid "Union" @@ -13968,28 +13876,19 @@ msgid "Division" msgstr "Opdeling" #: ../src/splivarot.cpp:111 -#, fuzzy msgid "Cut path" -msgstr "Skær sti" +msgstr "Klip sti" #: ../src/splivarot.cpp:335 msgid "Select at least 2 paths to perform a boolean operation." -msgstr "Markér mindst to stier at udføre en boolsk operation på." +msgstr "Markér mindst to stier at udføre en boolesk operation på." #: ../src/splivarot.cpp:339 #, fuzzy msgid "Select at least 1 path to perform a boolean union." -msgstr "Markér mindst to stier at udføre en boolsk operation på." - -#: ../src/splivarot.cpp:347 -#, fuzzy -msgid "" -"Select exactly 2 paths to perform difference, division, or path cut." -msgstr "" -"Markér præcis to stier at udføre differens, XOR, division eller sti-" -"beskæring." +msgstr "Markér mindst to stier at udføre en boolesk operation på." -#: ../src/splivarot.cpp:363 ../src/splivarot.cpp:378 +#: ../src/splivarot.cpp:356 ../src/splivarot.cpp:371 msgid "" "Unable to determine the z-order of the objects selected for " "difference, XOR, division, or path cut." @@ -13997,84 +13896,84 @@ msgstr "" "Kunne ikke bestemme z-rækkefølge for objekter markeret til differens, " "XOR, division eller sti-beskæring." -#: ../src/splivarot.cpp:408 +#: ../src/splivarot.cpp:401 msgid "" "One of the objects is not a path, cannot perform boolean operation." msgstr "" -"Et af objekterne er ikke en sti, kan ikke udføre boolsk operation." +"Et af objekterne er ikke en sti, kan ikke udføre boolesk operation." -#: ../src/splivarot.cpp:1153 +#: ../src/splivarot.cpp:1146 #, fuzzy msgid "Select stroked path(s) to convert stroke to path." msgstr "Markér objekt(er) at konvertere til sti." -#: ../src/splivarot.cpp:1509 +#: ../src/splivarot.cpp:1502 #, fuzzy msgid "Convert stroke to path" msgstr "Konvertér tekst til sti" #. TRANSLATORS: "to outline" means "to convert stroke to path" -#: ../src/splivarot.cpp:1512 +#: ../src/splivarot.cpp:1505 #, fuzzy msgid "No stroked paths in the selection." msgstr "Ingen stier med streg at lave omrids af i denne markering." -#: ../src/splivarot.cpp:1583 +#: ../src/splivarot.cpp:1576 msgid "Selected object is not a path, cannot inset/outset." msgstr "Det markerede objekt er ikke en sti, kan ikke skubbe ind/ud." -#: ../src/splivarot.cpp:1674 ../src/splivarot.cpp:1741 +#: ../src/splivarot.cpp:1667 ../src/splivarot.cpp:1734 #, fuzzy msgid "Create linked offset" msgstr "_Opret link" -#: ../src/splivarot.cpp:1675 ../src/splivarot.cpp:1742 +#: ../src/splivarot.cpp:1668 ../src/splivarot.cpp:1735 #, fuzzy msgid "Create dynamic offset" msgstr "Opret et dynamisk forskudt objekt" -#: ../src/splivarot.cpp:1767 +#: ../src/splivarot.cpp:1760 msgid "Select path(s) to inset/outset." msgstr "Vælg sti(er) at skubbe ind/ud." -#: ../src/splivarot.cpp:1960 +#: ../src/splivarot.cpp:1953 #, fuzzy msgid "Outset path" msgstr "Forskydningssti" -#: ../src/splivarot.cpp:1960 +#: ../src/splivarot.cpp:1953 #, fuzzy msgid "Inset path" msgstr "Forskydningssti" -#: ../src/splivarot.cpp:1962 +#: ../src/splivarot.cpp:1955 msgid "No paths to inset/outset in the selection." msgstr "Ingen stier i markeringen at skubbe ind/ud." -#: ../src/splivarot.cpp:2124 +#: ../src/splivarot.cpp:2117 msgid "Simplifying paths (separately):" msgstr "" -#: ../src/splivarot.cpp:2126 +#: ../src/splivarot.cpp:2119 #, fuzzy msgid "Simplifying paths:" msgstr "Simplificeringsgrænse:" -#: ../src/splivarot.cpp:2163 +#: ../src/splivarot.cpp:2156 #, fuzzy, c-format msgid "%s %d of %d paths simplified..." msgstr "Simplificerer %s - %d af %d stier simplificeret ..." -#: ../src/splivarot.cpp:2176 +#: ../src/splivarot.cpp:2169 #, fuzzy, c-format msgid "%d paths simplified." msgstr "Udført - %d stier simplificeret." -#: ../src/splivarot.cpp:2190 +#: ../src/splivarot.cpp:2183 msgid "Select path(s) to simplify." msgstr "Markér sti(er) at simplificere." -#: ../src/splivarot.cpp:2206 +#: ../src/splivarot.cpp:2199 msgid "No paths to simplify in the selection." msgstr "Ingen stier at simplificere i markeringen." @@ -14103,7 +14002,7 @@ msgstr "" msgid "The flowed text(s) must be visible in order to be put on a path." msgstr "" -#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2540 +#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2568 msgid "Put text on path" msgstr "Sæt tekst på sti" @@ -14115,7 +14014,7 @@ msgstr "Markér en tekst på en sti for at fjerne den fra dens sti." msgid "No texts-on-paths in the selection." msgstr "Ingen tekst på stier i denne markering." -#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2542 +#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2570 msgid "Remove text from path" msgstr "Fjern tekst fra sti" @@ -14172,8 +14071,8 @@ msgstr "Ingen objekter at konvertere til sti i markeringen." msgid "You cannot edit cloned character data." msgstr "" -#: ../src/trace/potrace/inkscape-potrace.cpp:512 -#: ../src/trace/potrace/inkscape-potrace.cpp:575 +#: ../src/trace/potrace/inkscape-potrace.cpp:511 +#: ../src/trace/potrace/inkscape-potrace.cpp:574 #, fuzzy msgid "Trace: %1. %2 nodes" msgstr "Spor: %d. %ld knudepunkter" @@ -14316,231 +14215,231 @@ msgstr "" "Rune Rønde Laursen (runerl@skjoldhoej.dk)\n" "scootergrisen" -#: ../src/ui/dialog/align-and-distribute.cpp:170 -#: ../src/ui/dialog/align-and-distribute.cpp:847 +#: ../src/ui/dialog/align-and-distribute.cpp:169 +#: ../src/ui/dialog/align-and-distribute.cpp:846 msgid "Align" msgstr "Justér" -#: ../src/ui/dialog/align-and-distribute.cpp:338 -#: ../src/ui/dialog/align-and-distribute.cpp:848 +#: ../src/ui/dialog/align-and-distribute.cpp:337 +#: ../src/ui/dialog/align-and-distribute.cpp:847 msgid "Distribute" msgstr "Distribuér" -#: ../src/ui/dialog/align-and-distribute.cpp:417 +#: ../src/ui/dialog/align-and-distribute.cpp:416 msgid "Minimum horizontal gap (in px units) between bounding boxes" msgstr "Minimumstørrelse (i billedpunkter) af åbning mellem omkrandsningsbokse" #. TRANSLATORS: "H:" stands for horizontal gap -#: ../src/ui/dialog/align-and-distribute.cpp:419 +#: ../src/ui/dialog/align-and-distribute.cpp:418 msgctxt "Gap" msgid "_H:" msgstr "_H:" -#: ../src/ui/dialog/align-and-distribute.cpp:427 +#: ../src/ui/dialog/align-and-distribute.cpp:426 msgid "Minimum vertical gap (in px units) between bounding boxes" msgstr "" "Minimumstørrelse (i billedpunkter) af lodret åbning mellem omkrandsningsbokse" #. TRANSLATORS: Vertical gap -#: ../src/ui/dialog/align-and-distribute.cpp:429 +#: ../src/ui/dialog/align-and-distribute.cpp:428 #, fuzzy msgctxt "Gap" msgid "_V:" msgstr "V:" -#: ../src/ui/dialog/align-and-distribute.cpp:464 -#: ../src/ui/dialog/align-and-distribute.cpp:850 -#: ../src/widgets/connector-toolbar.cpp:407 +#: ../src/ui/dialog/align-and-distribute.cpp:463 +#: ../src/ui/dialog/align-and-distribute.cpp:849 +#: ../src/widgets/connector-toolbar.cpp:405 msgid "Remove overlaps" msgstr "Fjern ovelap" -#: ../src/ui/dialog/align-and-distribute.cpp:495 -#: ../src/widgets/connector-toolbar.cpp:236 +#: ../src/ui/dialog/align-and-distribute.cpp:494 +#: ../src/widgets/connector-toolbar.cpp:234 #, fuzzy msgid "Arrange connector network" msgstr "Arrangér det markerede forbindelsesnetværk pænt" -#: ../src/ui/dialog/align-and-distribute.cpp:588 +#: ../src/ui/dialog/align-and-distribute.cpp:587 #, fuzzy msgid "Exchange Positions" msgstr "Tilfældig placering" -#: ../src/ui/dialog/align-and-distribute.cpp:622 +#: ../src/ui/dialog/align-and-distribute.cpp:621 #, fuzzy msgid "Unclump" msgstr " _Afklump " -#: ../src/ui/dialog/align-and-distribute.cpp:693 +#: ../src/ui/dialog/align-and-distribute.cpp:692 #, fuzzy msgid "Randomize positions" msgstr "Tilfældig placering" -#: ../src/ui/dialog/align-and-distribute.cpp:795 +#: ../src/ui/dialog/align-and-distribute.cpp:794 #, fuzzy msgid "Distribute text baselines" msgstr "Fordel knudepunkter" -#: ../src/ui/dialog/align-and-distribute.cpp:819 +#: ../src/ui/dialog/align-and-distribute.cpp:818 #, fuzzy msgid "Align text baselines" msgstr "Justér venstre sider" -#: ../src/ui/dialog/align-and-distribute.cpp:849 +#: ../src/ui/dialog/align-and-distribute.cpp:848 msgid "Rearrange" msgstr "Omarrangér" -#: ../src/ui/dialog/align-and-distribute.cpp:851 -#: ../src/widgets/toolbox.cpp:1727 +#: ../src/ui/dialog/align-and-distribute.cpp:850 +#: ../src/widgets/toolbox.cpp:1778 msgid "Nodes" msgstr "Noder" -#: ../src/ui/dialog/align-and-distribute.cpp:865 +#: ../src/ui/dialog/align-and-distribute.cpp:864 msgid "Relative to: " msgstr "Relativ til: " -#: ../src/ui/dialog/align-and-distribute.cpp:866 +#: ../src/ui/dialog/align-and-distribute.cpp:865 #, fuzzy msgid "_Treat selection as group: " msgstr "Opret et dynamisk forskudt objekt" #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:872 ../src/verbs.cpp:2993 -#: ../src/verbs.cpp:2994 +#: ../src/ui/dialog/align-and-distribute.cpp:871 ../src/verbs.cpp:3035 +#: ../src/verbs.cpp:3036 #, fuzzy msgid "Align right edges of objects to the left edge of the anchor" msgstr "Justér objekters højre side til venstre side af anker" -#: ../src/ui/dialog/align-and-distribute.cpp:875 ../src/verbs.cpp:2995 -#: ../src/verbs.cpp:2996 +#: ../src/ui/dialog/align-and-distribute.cpp:874 ../src/verbs.cpp:3037 +#: ../src/verbs.cpp:3038 #, fuzzy msgid "Align left edges" msgstr "Justér venstre sider" -#: ../src/ui/dialog/align-and-distribute.cpp:878 ../src/verbs.cpp:2997 -#: ../src/verbs.cpp:2998 +#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:3039 +#: ../src/verbs.cpp:3040 msgid "Center on vertical axis" msgstr "Centrér på lodret akse" -#: ../src/ui/dialog/align-and-distribute.cpp:881 ../src/verbs.cpp:2999 -#: ../src/verbs.cpp:3000 +#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:3041 +#: ../src/verbs.cpp:3042 msgid "Align right sides" msgstr "Justér højre sider" -#: ../src/ui/dialog/align-and-distribute.cpp:884 ../src/verbs.cpp:3001 -#: ../src/verbs.cpp:3002 +#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:3043 +#: ../src/verbs.cpp:3044 #, fuzzy msgid "Align left edges of objects to the right edge of the anchor" msgstr "Justér objekters venstre til højre for anker" -#: ../src/ui/dialog/align-and-distribute.cpp:887 ../src/verbs.cpp:3003 -#: ../src/verbs.cpp:3004 +#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:3045 +#: ../src/verbs.cpp:3046 #, fuzzy msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "Justér objekters bund til toppen af anker" -#: ../src/ui/dialog/align-and-distribute.cpp:890 ../src/verbs.cpp:3005 -#: ../src/verbs.cpp:3006 +#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:3047 +#: ../src/verbs.cpp:3048 #, fuzzy msgid "Align top edges" msgstr "Justér toppe" -#: ../src/ui/dialog/align-and-distribute.cpp:893 ../src/verbs.cpp:3007 -#: ../src/verbs.cpp:3008 +#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:3049 +#: ../src/verbs.cpp:3050 msgid "Center on horizontal axis" msgstr "Centrér på vandret akse" -#: ../src/ui/dialog/align-and-distribute.cpp:896 ../src/verbs.cpp:3009 -#: ../src/verbs.cpp:3010 +#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:3051 +#: ../src/verbs.cpp:3052 #, fuzzy msgid "Align bottom edges" msgstr "Justér bunde" -#: ../src/ui/dialog/align-and-distribute.cpp:899 ../src/verbs.cpp:3011 -#: ../src/verbs.cpp:3012 +#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:3053 +#: ../src/verbs.cpp:3054 #, fuzzy msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "Justér objekters toppe til bunden af anker" -#: ../src/ui/dialog/align-and-distribute.cpp:904 +#: ../src/ui/dialog/align-and-distribute.cpp:903 msgid "Align baseline anchors of texts horizontally" msgstr "Justér tekstområders grundlinjeanker vandret" -#: ../src/ui/dialog/align-and-distribute.cpp:907 +#: ../src/ui/dialog/align-and-distribute.cpp:906 #, fuzzy msgid "Align baselines of texts" msgstr "Justér teksområders grundlinjeanker lodret" -#: ../src/ui/dialog/align-and-distribute.cpp:912 +#: ../src/ui/dialog/align-and-distribute.cpp:911 msgid "Make horizontal gaps between objects equal" msgstr "Gør horisontale mellemrum blandt objekter ens" -#: ../src/ui/dialog/align-and-distribute.cpp:916 +#: ../src/ui/dialog/align-and-distribute.cpp:915 #, fuzzy msgid "Distribute left edges equidistantly" msgstr "Distribuér venstre sider med jævne mellemrum" -#: ../src/ui/dialog/align-and-distribute.cpp:919 +#: ../src/ui/dialog/align-and-distribute.cpp:918 msgid "Distribute centers equidistantly horizontally" msgstr "Distribuér venstre sider med jævne vandrette mellemrum" -#: ../src/ui/dialog/align-and-distribute.cpp:922 +#: ../src/ui/dialog/align-and-distribute.cpp:921 #, fuzzy msgid "Distribute right edges equidistantly" msgstr "Distribuér højre sider med jævne mellemrum" -#: ../src/ui/dialog/align-and-distribute.cpp:926 +#: ../src/ui/dialog/align-and-distribute.cpp:925 msgid "Make vertical gaps between objects equal" msgstr "Gør vertikale mellemrum blandt objekter ens" -#: ../src/ui/dialog/align-and-distribute.cpp:930 +#: ../src/ui/dialog/align-and-distribute.cpp:929 #, fuzzy msgid "Distribute top edges equidistantly" msgstr "Distribuér toppe med jævne mellemrum" -#: ../src/ui/dialog/align-and-distribute.cpp:933 +#: ../src/ui/dialog/align-and-distribute.cpp:932 msgid "Distribute centers equidistantly vertically" msgstr "Distribuér midter med jævne lodrette mellemrum" -#: ../src/ui/dialog/align-and-distribute.cpp:936 +#: ../src/ui/dialog/align-and-distribute.cpp:935 #, fuzzy msgid "Distribute bottom edges equidistantly" msgstr "Distribuér bunde med jævne mellemrum" -#: ../src/ui/dialog/align-and-distribute.cpp:941 +#: ../src/ui/dialog/align-and-distribute.cpp:940 msgid "Distribute baseline anchors of texts horizontally" msgstr "Distribuér tekstområders grundlinjeankere vandret" -#: ../src/ui/dialog/align-and-distribute.cpp:944 +#: ../src/ui/dialog/align-and-distribute.cpp:943 #, fuzzy msgid "Distribute baselines of texts vertically" msgstr "Distribuér tekstområders grundlinjeankere lodret" -#: ../src/ui/dialog/align-and-distribute.cpp:950 -#: ../src/widgets/connector-toolbar.cpp:369 +#: ../src/ui/dialog/align-and-distribute.cpp:949 +#: ../src/widgets/connector-toolbar.cpp:367 msgid "Nicely arrange selected connector network" msgstr "Arrangér det markerede forbindelsesnetværk pænt" -#: ../src/ui/dialog/align-and-distribute.cpp:953 +#: ../src/ui/dialog/align-and-distribute.cpp:952 msgid "Exchange positions of selected objects - selection order" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:956 +#: ../src/ui/dialog/align-and-distribute.cpp:955 msgid "Exchange positions of selected objects - stacking order" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:959 +#: ../src/ui/dialog/align-and-distribute.cpp:958 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:964 +#: ../src/ui/dialog/align-and-distribute.cpp:963 msgid "Randomize centers in both dimensions" msgstr "Tilfældiggør midter i begge dimensioner" -#: ../src/ui/dialog/align-and-distribute.cpp:967 +#: ../src/ui/dialog/align-and-distribute.cpp:966 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "Afklump objekter: forsøg at udligne kant-til-kant afstande" -#: ../src/ui/dialog/align-and-distribute.cpp:972 +#: ../src/ui/dialog/align-and-distribute.cpp:971 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" @@ -14548,44 +14447,44 @@ msgstr "" "Flyt objekter så lidt som muligt, så deres afgrænsningsbokse ikke overlapper " "hinanden" -#: ../src/ui/dialog/align-and-distribute.cpp:980 +#: ../src/ui/dialog/align-and-distribute.cpp:979 #, fuzzy msgid "Align selected nodes to a common horizontal line" msgstr "Justér markerede knudepunkter vandret" -#: ../src/ui/dialog/align-and-distribute.cpp:983 +#: ../src/ui/dialog/align-and-distribute.cpp:982 #, fuzzy msgid "Align selected nodes to a common vertical line" msgstr "Justér markerede knudepunkter lodret" -#: ../src/ui/dialog/align-and-distribute.cpp:986 +#: ../src/ui/dialog/align-and-distribute.cpp:985 msgid "Distribute selected nodes horizontally" msgstr "Distribuer markerede knudepunkter vandret" -#: ../src/ui/dialog/align-and-distribute.cpp:989 +#: ../src/ui/dialog/align-and-distribute.cpp:988 msgid "Distribute selected nodes vertically" msgstr "Distribuer markerede knudepunkter lodret" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:994 +#: ../src/ui/dialog/align-and-distribute.cpp:993 msgid "Last selected" msgstr "Sidste valgt" -#: ../src/ui/dialog/align-and-distribute.cpp:995 +#: ../src/ui/dialog/align-and-distribute.cpp:994 msgid "First selected" msgstr "Første valgt" -#: ../src/ui/dialog/align-and-distribute.cpp:996 +#: ../src/ui/dialog/align-and-distribute.cpp:995 #, fuzzy msgid "Biggest object" msgstr "Ingen objekter" -#: ../src/ui/dialog/align-and-distribute.cpp:997 +#: ../src/ui/dialog/align-and-distribute.cpp:996 #, fuzzy msgid "Smallest object" msgstr "Søg efter tekstobjekter" -#: ../src/ui/dialog/align-and-distribute.cpp:1000 +#: ../src/ui/dialog/align-and-distribute.cpp:999 #, fuzzy msgid "Selection Area" msgstr "Markering" @@ -14988,9 +14887,10 @@ msgid "Initial color of tiled clones" msgstr "Fliselagte kloners startfarve" #: ../src/ui/dialog/clonetiler.cpp:665 +#, fuzzy msgid "" "Initial color for clones (works only if the original has unset fill or " -"stroke)" +"stroke or on spray tool in copy mode)" msgstr "" "Kloners startfarve (virker kun hvis originalen har uindfattet streg eller " "udfyldning)" @@ -15055,134 +14955,136 @@ msgstr "Skiftende fortegn på farveændringer for hver søjle" msgid "_Trace" msgstr "_Tegn af" -#: ../src/ui/dialog/clonetiler.cpp:790 -msgid "Trace the drawing under the tiles" +#: ../src/ui/dialog/clonetiler.cpp:788 +#, fuzzy +msgid "Trace the drawing under the clones/sprayed items" msgstr "Tegn tegningen under fliserne af" -#: ../src/ui/dialog/clonetiler.cpp:794 +#: ../src/ui/dialog/clonetiler.cpp:792 +#, fuzzy msgid "" -"For each clone, pick a value from the drawing in that clone's location and " -"apply it to the clone" +"For each clone/sprayed item, pick a value from the drawing in its location " +"and apply it" msgstr "" "Vælg for hver klon en værdi fra tegningen i den aktuelle klons placering og " "anvend værdien på klonen" -#: ../src/ui/dialog/clonetiler.cpp:813 +#: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" msgstr "1. Vælg fra tegningen:" -#: ../src/ui/dialog/clonetiler.cpp:831 +#: ../src/ui/dialog/clonetiler.cpp:829 msgid "Pick the visible color and opacity" msgstr "Vælg den synlige farve og uigennemsigtighed" -#: ../src/ui/dialog/clonetiler.cpp:839 +#: ../src/ui/dialog/clonetiler.cpp:837 msgid "Pick the total accumulated opacity" msgstr "Vælg den totale akkumulerede uigennemsigtighed" -#: ../src/ui/dialog/clonetiler.cpp:846 +#: ../src/ui/dialog/clonetiler.cpp:844 msgid "R" msgstr "R" -#: ../src/ui/dialog/clonetiler.cpp:847 +#: ../src/ui/dialog/clonetiler.cpp:845 msgid "Pick the Red component of the color" msgstr "Vælg farvens rødkomponent" -#: ../src/ui/dialog/clonetiler.cpp:854 +#: ../src/ui/dialog/clonetiler.cpp:852 msgid "G" msgstr "G" -#: ../src/ui/dialog/clonetiler.cpp:855 +#: ../src/ui/dialog/clonetiler.cpp:853 msgid "Pick the Green component of the color" msgstr "Vælg farvens grønkomponent" -#: ../src/ui/dialog/clonetiler.cpp:862 +#: ../src/ui/dialog/clonetiler.cpp:860 msgid "B" msgstr "B" -#: ../src/ui/dialog/clonetiler.cpp:863 +#: ../src/ui/dialog/clonetiler.cpp:861 msgid "Pick the Blue component of the color" msgstr "Vælg farvens blåkomponent" -#: ../src/ui/dialog/clonetiler.cpp:870 +#: ../src/ui/dialog/clonetiler.cpp:868 msgctxt "Clonetiler color hue" msgid "H" msgstr "H" -#: ../src/ui/dialog/clonetiler.cpp:871 +#: ../src/ui/dialog/clonetiler.cpp:869 msgid "Pick the hue of the color" msgstr "Vælg farvetone" -#: ../src/ui/dialog/clonetiler.cpp:878 +#: ../src/ui/dialog/clonetiler.cpp:876 msgctxt "Clonetiler color saturation" msgid "S" msgstr "S" -#: ../src/ui/dialog/clonetiler.cpp:879 +#: ../src/ui/dialog/clonetiler.cpp:877 msgid "Pick the saturation of the color" msgstr "Vælg farvens mætning" -#: ../src/ui/dialog/clonetiler.cpp:886 +#: ../src/ui/dialog/clonetiler.cpp:884 msgctxt "Clonetiler color lightness" msgid "L" msgstr "L" -#: ../src/ui/dialog/clonetiler.cpp:887 +#: ../src/ui/dialog/clonetiler.cpp:885 msgid "Pick the lightness of the color" msgstr "Vælg farvens lysstyrke" -#: ../src/ui/dialog/clonetiler.cpp:897 +#: ../src/ui/dialog/clonetiler.cpp:895 msgid "2. Tweak the picked value:" msgstr "2. Ændr den valgte værdi:" -#: ../src/ui/dialog/clonetiler.cpp:914 +#: ../src/ui/dialog/clonetiler.cpp:912 msgid "Gamma-correct:" msgstr "Gamma-korrigering:" -#: ../src/ui/dialog/clonetiler.cpp:918 +#: ../src/ui/dialog/clonetiler.cpp:916 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "" "Forskyd mellemværdierne af de valgte værdier opad (>0) eller nedad (<0)" -#: ../src/ui/dialog/clonetiler.cpp:925 +#: ../src/ui/dialog/clonetiler.cpp:923 msgid "Randomize:" msgstr "Tilfældiggør:" -#: ../src/ui/dialog/clonetiler.cpp:929 +#: ../src/ui/dialog/clonetiler.cpp:927 msgid "Randomize the picked value by this percentage" msgstr "Tilfældiggør den valgte værdi med denne procentdel" -#: ../src/ui/dialog/clonetiler.cpp:936 +#: ../src/ui/dialog/clonetiler.cpp:934 msgid "Invert:" msgstr "Invertér:" -#: ../src/ui/dialog/clonetiler.cpp:940 +#: ../src/ui/dialog/clonetiler.cpp:938 msgid "Invert the picked value" msgstr "Invertér den valgte værdi" -#: ../src/ui/dialog/clonetiler.cpp:946 +#: ../src/ui/dialog/clonetiler.cpp:944 msgid "3. Apply the value to the clones':" msgstr "3. Anvend værdien på klonerne:" -#: ../src/ui/dialog/clonetiler.cpp:961 +#: ../src/ui/dialog/clonetiler.cpp:959 msgid "Presence" msgstr "Nærvær" -#: ../src/ui/dialog/clonetiler.cpp:964 +#: ../src/ui/dialog/clonetiler.cpp:962 msgid "" "Each clone is created with the probability determined by the picked value in " "that point" msgstr "" "Hver klon oprettes med sandsynligheden bestemt af den valgte værdi i punktet" -#: ../src/ui/dialog/clonetiler.cpp:971 +#: ../src/ui/dialog/clonetiler.cpp:969 msgid "Size" msgstr "Størrelse" -#: ../src/ui/dialog/clonetiler.cpp:974 +#: ../src/ui/dialog/clonetiler.cpp:972 msgid "Each clone's size is determined by the picked value in that point" msgstr "Hver klons størrelse bestemmes af den valgte værdi i punktet" -#: ../src/ui/dialog/clonetiler.cpp:984 +#: ../src/ui/dialog/clonetiler.cpp:982 msgid "" "Each clone is painted by the picked color (the original must have unset fill " "or stroke)" @@ -15190,59 +15092,64 @@ msgstr "" "Hver klon males af den valgte farve (virker kun hvis originalen har " "uindfattet streg eller udfyldning)" -#: ../src/ui/dialog/clonetiler.cpp:994 +#: ../src/ui/dialog/clonetiler.cpp:992 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "Hver klons uigennemsigtighed bestemmes af den valgte værdi i punktet" -#: ../src/ui/dialog/clonetiler.cpp:1042 +#: ../src/ui/dialog/clonetiler.cpp:1011 +#, fuzzy +msgid "Apply to tiled clones:" +msgstr "Slet valgte knuder" + +#: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" msgstr "Hvor mange rækker i fliselægningen" -#: ../src/ui/dialog/clonetiler.cpp:1072 +#: ../src/ui/dialog/clonetiler.cpp:1082 msgid "How many columns in the tiling" msgstr "Hvor mange søjler i fliselægningen" -#: ../src/ui/dialog/clonetiler.cpp:1117 +#: ../src/ui/dialog/clonetiler.cpp:1127 msgid "Width of the rectangle to be filled" msgstr "Bredde på firkanten der skal udfyldes" -#: ../src/ui/dialog/clonetiler.cpp:1150 +#: ../src/ui/dialog/clonetiler.cpp:1160 msgid "Height of the rectangle to be filled" msgstr "Højde på firkanten der skal udfyldes" -#: ../src/ui/dialog/clonetiler.cpp:1167 +#: ../src/ui/dialog/clonetiler.cpp:1177 msgid "Rows, columns: " msgstr "Rækker, søjler: " -#: ../src/ui/dialog/clonetiler.cpp:1168 +#: ../src/ui/dialog/clonetiler.cpp:1178 msgid "Create the specified number of rows and columns" msgstr "Opret det angivede antal rækker og søjler" -#: ../src/ui/dialog/clonetiler.cpp:1177 +#: ../src/ui/dialog/clonetiler.cpp:1187 msgid "Width, height: " msgstr "Bredde, højde: " -#: ../src/ui/dialog/clonetiler.cpp:1178 +#: ../src/ui/dialog/clonetiler.cpp:1188 msgid "Fill the specified width and height with the tiling" msgstr "Udfyld den angivede bredde og højde med fliselægningen" -#: ../src/ui/dialog/clonetiler.cpp:1199 +#: ../src/ui/dialog/clonetiler.cpp:1209 msgid "Use saved size and position of the tile" msgstr "Benyt flisens gemte størrelse og placering" -#: ../src/ui/dialog/clonetiler.cpp:1202 +#: ../src/ui/dialog/clonetiler.cpp:1212 msgid "" "Pretend that the size and position of the tile are the same as the last time " "you tiled it (if any), instead of using the current size" msgstr "" "Lad som om flisens størrelse og placering er samme som sidste gang du " -"fliselagde, istedet for den aktuelle størrelse" +"fliselagde, i stedet for den aktuelle størrelse" -#: ../src/ui/dialog/clonetiler.cpp:1236 +#: ../src/ui/dialog/clonetiler.cpp:1246 msgid " _Create " msgstr " _Opret " -#: ../src/ui/dialog/clonetiler.cpp:1238 +#: ../src/ui/dialog/clonetiler.cpp:1248 msgid "Create and tile the clones of the selection" msgstr "Opret og fliselæg klonerne i markeringen" @@ -15251,29 +15158,29 @@ msgstr "Opret og fliselæg klonerne i markeringen" #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1258 +#: ../src/ui/dialog/clonetiler.cpp:1268 msgid " _Unclump " msgstr " _Afklump " -#: ../src/ui/dialog/clonetiler.cpp:1259 +#: ../src/ui/dialog/clonetiler.cpp:1269 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "Spred kloner for at reducere klumpning. Kan gentages" -#: ../src/ui/dialog/clonetiler.cpp:1265 +#: ../src/ui/dialog/clonetiler.cpp:1275 msgid " Re_move " msgstr " _Fjern " -#: ../src/ui/dialog/clonetiler.cpp:1266 +#: ../src/ui/dialog/clonetiler.cpp:1276 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" "Fjern eksisterende fliselagte kloner af det markerede objekt (kun søskende)" -#: ../src/ui/dialog/clonetiler.cpp:1283 +#: ../src/ui/dialog/clonetiler.cpp:1293 msgid " R_eset " msgstr " _Nulstil " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1285 +#: ../src/ui/dialog/clonetiler.cpp:1295 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" @@ -15281,42 +15188,42 @@ msgstr "" "Nulstil alle forskydninger, skaleringer, rotationer, uigennemsigtighed- og " "farveændringer i dialogen til nul" -#: ../src/ui/dialog/clonetiler.cpp:1358 +#: ../src/ui/dialog/clonetiler.cpp:1367 msgid "Nothing selected." msgstr "Intet markeret." -#: ../src/ui/dialog/clonetiler.cpp:1364 +#: ../src/ui/dialog/clonetiler.cpp:1373 msgid "More than one object selected." msgstr "Mere end et objekt markeret" -#: ../src/ui/dialog/clonetiler.cpp:1371 +#: ../src/ui/dialog/clonetiler.cpp:1380 #, c-format msgid "Object has %d tiled clones." msgstr "Objektet har %d fliselagte kloner." -#: ../src/ui/dialog/clonetiler.cpp:1376 +#: ../src/ui/dialog/clonetiler.cpp:1385 msgid "Object has no tiled clones." msgstr "Objektet har ingen fliselagte kloner." -#: ../src/ui/dialog/clonetiler.cpp:2100 +#: ../src/ui/dialog/clonetiler.cpp:2109 msgid "Select one object whose tiled clones to unclump." msgstr "Markér et objekt hvis fliselagte kloner skal afklumpes." -#: ../src/ui/dialog/clonetiler.cpp:2120 +#: ../src/ui/dialog/clonetiler.cpp:2129 #, fuzzy msgid "Unclump tiled clones" msgstr "Fliselagte kloners startfarve" -#: ../src/ui/dialog/clonetiler.cpp:2149 +#: ../src/ui/dialog/clonetiler.cpp:2158 msgid "Select one object whose tiled clones to remove." msgstr "Markér et objekt hvis fliselagte kloner skal fjernes." -#: ../src/ui/dialog/clonetiler.cpp:2174 +#: ../src/ui/dialog/clonetiler.cpp:2183 #, fuzzy msgid "Delete tiled clones" msgstr "Slet valgte knuder" -#: ../src/ui/dialog/clonetiler.cpp:2227 +#: ../src/ui/dialog/clonetiler.cpp:2236 msgid "" "If you want to clone several objects, group them and clone the " "group." @@ -15324,25 +15231,25 @@ msgstr "" "Hvis du vil klone flere objekter, så gruppér dem og klon gruppen." -#: ../src/ui/dialog/clonetiler.cpp:2236 +#: ../src/ui/dialog/clonetiler.cpp:2245 #, fuzzy msgid "Creating tiled clones..." msgstr "Objektet har ingen fliselagte kloner." -#: ../src/ui/dialog/clonetiler.cpp:2652 +#: ../src/ui/dialog/clonetiler.cpp:2661 #, fuzzy msgid "Create tiled clones" msgstr "Opret fliselagte kloner..." -#: ../src/ui/dialog/clonetiler.cpp:2885 +#: ../src/ui/dialog/clonetiler.cpp:2894 msgid "Per row:" msgstr "Pr. række:" -#: ../src/ui/dialog/clonetiler.cpp:2903 +#: ../src/ui/dialog/clonetiler.cpp:2912 msgid "Per column:" msgstr "Pr. søjle:" -#: ../src/ui/dialog/clonetiler.cpp:2911 +#: ../src/ui/dialog/clonetiler.cpp:2920 msgid "Randomize:" msgstr "Tilfældiggør:" @@ -15406,30 +15313,29 @@ msgid "Release log messages" msgstr "Tøm logmeddelelser" #: ../src/ui/dialog/document-metadata.cpp:88 -#: ../src/ui/dialog/document-properties.cpp:166 +#: ../src/ui/dialog/document-properties.cpp:167 msgid "Metadata" msgstr "Metadata" #: ../src/ui/dialog/document-metadata.cpp:89 -#: ../src/ui/dialog/document-properties.cpp:167 +#: ../src/ui/dialog/document-properties.cpp:168 msgid "License" msgstr "Licens" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:978 +#: ../src/ui/dialog/document-properties.cpp:994 msgid "Dublin Core Entities" msgstr "Dublin Core Entities" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1040 +#: ../src/ui/dialog/document-properties.cpp:1056 msgid "License" msgstr "Licens" #. --------------------------------------------------------------- #: ../src/ui/dialog/document-properties.cpp:118 -#, fuzzy msgid "Use antialiasing" -msgstr "Begyndelsesstørrelse" +msgstr "Brug udjævning" #: ../src/ui/dialog/document-properties.cpp:118 #, fuzzy @@ -15437,459 +15343,469 @@ msgid "If unset, no antialiasing will be done on the drawing" msgstr "Hvis sat, er kanten altid i toppen af tegningen" #: ../src/ui/dialog/document-properties.cpp:119 +#, fuzzy +msgid "Checkerboard background" +msgstr "Whiteboa_rd" + +#: ../src/ui/dialog/document-properties.cpp:119 +msgid "" +"If set, use checkerboard for background, otherwise use background color at " +"full opacity." +msgstr "" + +#: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" msgstr "Vis side_kant" -#: ../src/ui/dialog/document-properties.cpp:119 +#: ../src/ui/dialog/document-properties.cpp:120 msgid "If set, rectangular page border is shown" msgstr "Hvis sat vises firkantet sidekant" -#: ../src/ui/dialog/document-properties.cpp:120 +#: ../src/ui/dialog/document-properties.cpp:121 msgid "Border on _top of drawing" msgstr "Kant i _toppen af tegning" -#: ../src/ui/dialog/document-properties.cpp:120 +#: ../src/ui/dialog/document-properties.cpp:121 msgid "If set, border is always on top of the drawing" msgstr "Hvis sat, er kanten altid i toppen af tegningen" -#: ../src/ui/dialog/document-properties.cpp:121 +#: ../src/ui/dialog/document-properties.cpp:122 msgid "_Show border shadow" msgstr "_Vis kantskygge" -#: ../src/ui/dialog/document-properties.cpp:121 +#: ../src/ui/dialog/document-properties.cpp:122 msgid "If set, page border shows a shadow on its right and lower side" msgstr "Hvis sat, vises en skygge kantens højre og nederste side" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:123 #, fuzzy msgid "Back_ground color:" msgstr "Baggrundsfarve" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:123 msgid "" "Color of the page background. Note: transparency setting ignored while " -"editing but used when exporting to bitmap." +"editing if 'Checkerboard background' unset (but used when exporting to " +"bitmap)." msgstr "" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" msgstr "_Kantfarve:" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Page border color" msgstr "Sidekantfarve" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Color of the page border" msgstr "Farve på sidekant" -#: ../src/ui/dialog/document-properties.cpp:124 +#: ../src/ui/dialog/document-properties.cpp:125 msgid "Display _units:" msgstr "" #. --------------------------------------------------------------- #. General snap options -#: ../src/ui/dialog/document-properties.cpp:128 +#: ../src/ui/dialog/document-properties.cpp:129 msgid "Show _guides" msgstr "Vis h_jælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:128 +#: ../src/ui/dialog/document-properties.cpp:129 msgid "Show or hide guides" msgstr "Vis/skjul hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:129 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Guide co_lor:" msgstr "Farve på hjælpe_linjer:" -#: ../src/ui/dialog/document-properties.cpp:129 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Guideline color" msgstr "Farver for hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:129 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Color of guidelines" msgstr "Farve på hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "_Highlight color:" msgstr "Farve på frem_hævning:" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "Highlighted guideline color" msgstr "Farve på fremhævede hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "Color of a guideline when it is under mouse" msgstr "Farve på hjælpelinje når den er under musemarkøren" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:132 +#: ../src/ui/dialog/document-properties.cpp:133 #, fuzzy msgid "Snap _distance" msgstr "Inkscap: _Avanceret" -#: ../src/ui/dialog/document-properties.cpp:132 +#: ../src/ui/dialog/document-properties.cpp:133 msgid "Snap only when _closer than:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:132 -#: ../src/ui/dialog/document-properties.cpp:137 -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Always snap" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:134 msgid "Snapping distance, in screen pixels, for snapping to objects" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:134 #, fuzzy msgid "Always snap to objects, regardless of their distance" msgstr "" "Hvis sat, hænges objektet på nærmeste objekt, uden hensyntagen til afstanden" -#: ../src/ui/dialog/document-properties.cpp:134 +#: ../src/ui/dialog/document-properties.cpp:135 msgid "" "If set, objects only snap to another object when it's within the range " "specified below" msgstr "" #. Options for snapping to grids -#: ../src/ui/dialog/document-properties.cpp:137 +#: ../src/ui/dialog/document-properties.cpp:138 #, fuzzy msgid "Snap d_istance" msgstr "Inkscap: _Avanceret" -#: ../src/ui/dialog/document-properties.cpp:137 +#: ../src/ui/dialog/document-properties.cpp:138 msgid "Snap only when c_loser than:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:139 msgid "Snapping distance, in screen pixels, for snapping to grid" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:139 #, fuzzy msgid "Always snap to grids, regardless of the distance" msgstr "" "Hvis sat, hænges objekter på nærmeste hjælpelinje når det flyttes, uden " "hensyntagen til afstanden" -#: ../src/ui/dialog/document-properties.cpp:139 +#: ../src/ui/dialog/document-properties.cpp:140 msgid "" "If set, objects only snap to a grid line when it's within the range " "specified below" msgstr "" #. Options for snapping to guides -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:143 #, fuzzy msgid "Snap dist_ance" msgstr "Inkscap: _Avanceret" -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Snap only when close_r than:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:143 +#: ../src/ui/dialog/document-properties.cpp:144 msgid "Snapping distance, in screen pixels, for snapping to guides" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:143 +#: ../src/ui/dialog/document-properties.cpp:144 #, fuzzy msgid "Always snap to guides, regardless of the distance" msgstr "" "Hvis sat, hænges objekter på nærmeste hjælpelinje når det flyttes, uden " "hensyntagen til afstanden" -#: ../src/ui/dialog/document-properties.cpp:144 +#: ../src/ui/dialog/document-properties.cpp:145 msgid "" "If set, objects only snap to a guide when it's within the range specified " "below" msgstr "" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:147 +#: ../src/ui/dialog/document-properties.cpp:148 #, fuzzy msgid "Snap to clip paths" msgstr "Hæng på objekt_stier" -#: ../src/ui/dialog/document-properties.cpp:147 +#: ../src/ui/dialog/document-properties.cpp:148 msgid "When snapping to paths, then also try snapping to clip paths" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:148 +#: ../src/ui/dialog/document-properties.cpp:149 #, fuzzy msgid "Snap to mask paths" msgstr "Hæng på objekt_stier" -#: ../src/ui/dialog/document-properties.cpp:148 +#: ../src/ui/dialog/document-properties.cpp:149 msgid "When snapping to paths, then also try snapping to mask paths" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:149 +#: ../src/ui/dialog/document-properties.cpp:150 msgid "Snap perpendicularly" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:149 +#: ../src/ui/dialog/document-properties.cpp:150 msgid "" "When snapping to paths or guides, then also try snapping perpendicularly" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:150 +#: ../src/ui/dialog/document-properties.cpp:151 #, fuzzy msgid "Snap tangentially" msgstr "Uindfattet udfyldning" -#: ../src/ui/dialog/document-properties.cpp:150 +#: ../src/ui/dialog/document-properties.cpp:151 msgid "When snapping to paths or guides, then also try snapping tangentially" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:153 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:154 msgctxt "Grid" msgid "_New" msgstr "_Ny" -#: ../src/ui/dialog/document-properties.cpp:153 +#: ../src/ui/dialog/document-properties.cpp:154 #, fuzzy msgid "Create new grid." msgstr "Opret ellipse" -#: ../src/ui/dialog/document-properties.cpp:154 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:155 msgctxt "Grid" msgid "_Remove" -msgstr "Fjern" +msgstr "_Fjern" -#: ../src/ui/dialog/document-properties.cpp:154 +#: ../src/ui/dialog/document-properties.cpp:155 #, fuzzy msgid "Remove selected grid." msgstr "Husk valgte" -#: ../src/ui/dialog/document-properties.cpp:161 -#: ../src/widgets/toolbox.cpp:1834 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:162 +#: ../src/widgets/toolbox.cpp:1885 msgid "Guides" -msgstr "H_jælpelinjer" +msgstr "Hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:163 ../src/verbs.cpp:2796 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2836 msgid "Snap" -msgstr "Stempl" +msgstr "Fastgør" -#: ../src/ui/dialog/document-properties.cpp:165 +#: ../src/ui/dialog/document-properties.cpp:166 #, fuzzy msgid "Scripting" msgstr "Script" -#: ../src/ui/dialog/document-properties.cpp:329 +#: ../src/ui/dialog/document-properties.cpp:330 msgid "General" msgstr "Generelt" -#: ../src/ui/dialog/document-properties.cpp:331 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:333 msgid "Page Size" -msgstr "Linje" +msgstr "Side størrelse" -#: ../src/ui/dialog/document-properties.cpp:333 +#: ../src/ui/dialog/document-properties.cpp:336 +#, fuzzy +msgid "Background" +msgstr "Ba_ggrund:" + +#: ../src/ui/dialog/document-properties.cpp:339 +#, fuzzy +msgid "Border" +msgstr "a" + +#: ../src/ui/dialog/document-properties.cpp:342 #, fuzzy msgid "Display" msgstr "a" -#: ../src/ui/dialog/document-properties.cpp:368 +#: ../src/ui/dialog/document-properties.cpp:381 msgid "Guides" msgstr "Hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:386 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:399 msgid "Snap to objects" -msgstr "Hæng _knudepunkter på objekter" +msgstr "Fastgør til objekter" -#: ../src/ui/dialog/document-properties.cpp:388 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:401 msgid "Snap to grids" -msgstr "Gitter-påhængning" +msgstr "Fastgør til gitre" -#: ../src/ui/dialog/document-properties.cpp:390 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:403 msgid "Snap to guides" -msgstr "Hæng p_unkter på hjælpelinjer" +msgstr "Fastgør til hjælpelinjer" -#: ../src/ui/dialog/document-properties.cpp:392 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:405 msgid "Miscellaneous" -msgstr "Forskellige vink og trick" +msgstr "Diverse" #. TODO check if this next line was sometimes needed. It being there caused an assertion. #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:505 ../src/verbs.cpp:2977 +#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3019 #, fuzzy msgid "Link Color Profile" msgstr "Vælg gennemsnitsfarver fra billede" -#: ../src/ui/dialog/document-properties.cpp:606 +#: ../src/ui/dialog/document-properties.cpp:623 msgid "Remove linked color profile" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:620 +#: ../src/ui/dialog/document-properties.cpp:636 #, fuzzy msgid "Linked Color Profiles:" msgstr "Generelt" -#: ../src/ui/dialog/document-properties.cpp:622 +#: ../src/ui/dialog/document-properties.cpp:638 msgid "Available Color Profiles:" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:624 +#: ../src/ui/dialog/document-properties.cpp:640 #, fuzzy msgid "Link Profile" msgstr "Linke_genskaber" -#: ../src/ui/dialog/document-properties.cpp:627 +#: ../src/ui/dialog/document-properties.cpp:643 #, fuzzy msgid "Unlink Profile" msgstr "Linke_genskaber" -#: ../src/ui/dialog/document-properties.cpp:705 +#: ../src/ui/dialog/document-properties.cpp:721 #, fuzzy msgid "Profile Name" msgstr "Sæt filnavn" -#: ../src/ui/dialog/document-properties.cpp:741 +#: ../src/ui/dialog/document-properties.cpp:757 #, fuzzy msgid "External scripts" msgstr "Redigér udfyldning..." -#: ../src/ui/dialog/document-properties.cpp:742 +#: ../src/ui/dialog/document-properties.cpp:758 #, fuzzy msgid "Embedded scripts" msgstr "Fjern" -#: ../src/ui/dialog/document-properties.cpp:747 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:763 msgid "External script files:" -msgstr "Hæng p_unkter på hjælpelinjer" +msgstr "Eksterne script-filer:" -#: ../src/ui/dialog/document-properties.cpp:749 +#: ../src/ui/dialog/document-properties.cpp:765 msgid "Add the current file name or browse for a file" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:752 -#: ../src/ui/dialog/document-properties.cpp:829 +#: ../src/ui/dialog/document-properties.cpp:768 +#: ../src/ui/dialog/document-properties.cpp:845 #: ../src/ui/widget/selected-style.cpp:356 msgid "Remove" msgstr "Fjern" -#: ../src/ui/dialog/document-properties.cpp:816 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:832 msgid "Filename" -msgstr "Sæt filnavn" +msgstr "Filnavn" -#: ../src/ui/dialog/document-properties.cpp:824 -#, fuzzy +#: ../src/ui/dialog/document-properties.cpp:840 msgid "Embedded script files:" -msgstr "Hæng p_unkter på hjælpelinjer" +msgstr "Indlejret script-filer:" -#: ../src/ui/dialog/document-properties.cpp:826 -#: ../src/ui/dialog/objects.cpp:1890 +#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/objects.cpp:1894 #, fuzzy msgid "New" msgstr "Ny" -#: ../src/ui/dialog/document-properties.cpp:893 +#: ../src/ui/dialog/document-properties.cpp:909 #, fuzzy msgid "Script id" msgstr "Script" -#: ../src/ui/dialog/document-properties.cpp:899 +#: ../src/ui/dialog/document-properties.cpp:915 #, fuzzy msgid "Content:" msgstr "Eksponent:" -#: ../src/ui/dialog/document-properties.cpp:1016 +#: ../src/ui/dialog/document-properties.cpp:1032 #, fuzzy msgid "_Save as default" msgstr "Vælg som standard" -#: ../src/ui/dialog/document-properties.cpp:1017 +#: ../src/ui/dialog/document-properties.cpp:1033 msgid "Save this metadata as the default metadata" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:1018 +#: ../src/ui/dialog/document-properties.cpp:1034 #, fuzzy msgid "Use _default" msgstr "Vælg som standard" -#: ../src/ui/dialog/document-properties.cpp:1019 +#: ../src/ui/dialog/document-properties.cpp:1035 msgid "Use the previously saved default metadata here" msgstr "" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1092 +#: ../src/ui/dialog/document-properties.cpp:1108 #, fuzzy msgid "Add external script..." msgstr "Redigér udfyldning..." -#: ../src/ui/dialog/document-properties.cpp:1131 +#: ../src/ui/dialog/document-properties.cpp:1147 #, fuzzy msgid "Select a script to load" msgstr "Slet tekst" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1159 +#: ../src/ui/dialog/document-properties.cpp:1175 #, fuzzy msgid "Add embedded script..." msgstr "Redigér udfyldning..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1190 +#: ../src/ui/dialog/document-properties.cpp:1206 #, fuzzy msgid "Remove external script" msgstr "Fjern tekst fra sti" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1220 +#: ../src/ui/dialog/document-properties.cpp:1235 #, fuzzy msgid "Remove embedded script" msgstr "Fjern" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1317 +#: ../src/ui/dialog/document-properties.cpp:1331 #, fuzzy msgid "Edit embedded script" msgstr "Fjern" -#: ../src/ui/dialog/document-properties.cpp:1405 +#: ../src/ui/dialog/document-properties.cpp:1415 #, fuzzy msgid "Creation" msgstr " _Opret " -#: ../src/ui/dialog/document-properties.cpp:1406 +#: ../src/ui/dialog/document-properties.cpp:1416 #, fuzzy msgid "Defined grids" msgstr "Generelt" -#: ../src/ui/dialog/document-properties.cpp:1654 +#: ../src/ui/dialog/document-properties.cpp:1660 #, fuzzy msgid "Remove grid" msgstr "Fjern" -#: ../src/ui/dialog/document-properties.cpp:1746 +#: ../src/ui/dialog/document-properties.cpp:1752 msgid "Changed default display unit" msgstr "" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2848 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2886 msgid "_Page" msgstr "_Side" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2852 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2890 msgid "_Drawing" msgstr "_Tegning" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2854 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2892 msgid "_Selection" msgstr "_Markering" @@ -15897,8 +15813,8 @@ msgstr "_Markering" msgid "_Custom" msgstr "_Brugerdefineret" -#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "Enheder:" @@ -15941,9 +15857,8 @@ msgid "_Export" msgstr "_Eksportér" #: ../src/ui/dialog/export.cpp:193 -#, fuzzy msgid "Export area" -msgstr " Eksportéringsområde" +msgstr "Eksportområde" #: ../src/ui/dialog/export.cpp:232 msgid "_x0:" @@ -15954,9 +15869,8 @@ msgid "x_1:" msgstr "x_1:" #: ../src/ui/dialog/export.cpp:240 -#, fuzzy msgid "Wid_th:" -msgstr "Bredde:" +msgstr "_Bredde:" #: ../src/ui/dialog/export.cpp:244 msgid "_y0:" @@ -15967,14 +15881,12 @@ msgid "y_1:" msgstr "y_1:" #: ../src/ui/dialog/export.cpp:252 -#, fuzzy msgid "Hei_ght:" -msgstr "Højde:" +msgstr "_Højde:" #: ../src/ui/dialog/export.cpp:267 -#, fuzzy msgid "Image size" -msgstr "Linje" +msgstr "Billedstørrelse" #: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/export.cpp:296 msgid "pixels at" @@ -15984,7 +15896,7 @@ msgstr "billedpunkter ved" msgid "dp_i" msgstr "dp_i" -#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:76 +#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:75 #: ../src/ui/widget/page-sizer.cpp:238 msgid "_Height:" msgstr "_Højde:" @@ -15997,102 +15909,104 @@ msgid "dpi" msgstr "dpi" #: ../src/ui/dialog/export.cpp:312 -#, fuzzy msgid "_Filename" -msgstr "_Filnavn" +msgstr "_Filnavn" #: ../src/ui/dialog/export.cpp:354 msgid "Export the bitmap file with these settings" msgstr "Eksportér punktbilledfilen med disse indstillinger" -#: ../src/ui/dialog/export.cpp:607 +#: ../src/ui/dialog/export.cpp:479 +msgid "bitmap" +msgstr "punktbillede" + +#: ../src/ui/dialog/export.cpp:614 #, fuzzy, c-format msgid "B_atch export %d selected object" msgid_plural "B_atch export %d selected objects" msgstr[0] "Duplikér markerede objekter" msgstr[1] "Duplikér markerede objekter" -#: ../src/ui/dialog/export.cpp:923 +#: ../src/ui/dialog/export.cpp:930 msgid "Export in progress" msgstr "Eksporterer" -#: ../src/ui/dialog/export.cpp:1015 +#: ../src/ui/dialog/export.cpp:1022 #, fuzzy msgid "No items selected." msgstr "Intet dokument valgt" -#: ../src/ui/dialog/export.cpp:1019 ../src/ui/dialog/export.cpp:1021 +#: ../src/ui/dialog/export.cpp:1026 ../src/ui/dialog/export.cpp:1028 #, fuzzy msgid "Exporting %1 files" msgstr "Eksporterer %s (%d ×%d)" -#: ../src/ui/dialog/export.cpp:1062 ../src/ui/dialog/export.cpp:1064 -#, fuzzy, c-format +#: ../src/ui/dialog/export.cpp:1069 ../src/ui/dialog/export.cpp:1071 +#, c-format msgid "Exporting file %s..." -msgstr "Eksporterer %s (%d ×%d)" +msgstr "Eksporterer filen %s ..." -#: ../src/ui/dialog/export.cpp:1073 ../src/ui/dialog/export.cpp:1165 +#: ../src/ui/dialog/export.cpp:1080 ../src/ui/dialog/export.cpp:1172 #, c-format msgid "Could not export to filename %s.\n" msgstr "Kunne ikke eksportere til filnavn %s.\n" -#: ../src/ui/dialog/export.cpp:1076 -#, fuzzy, c-format +#: ../src/ui/dialog/export.cpp:1083 +#, c-format msgid "Could not export to filename %s." -msgstr "Kunne ikke eksportere til filnavn %s.\n" +msgstr "Kunne ikke eksportere til filnavnet %s." -#: ../src/ui/dialog/export.cpp:1091 +#: ../src/ui/dialog/export.cpp:1098 #, c-format msgid "Successfully exported %d files from %d selected items." msgstr "" -#: ../src/ui/dialog/export.cpp:1102 -#, fuzzy +#: ../src/ui/dialog/export.cpp:1109 msgid "You have to enter a filename." -msgstr "Du skal indtaste et filnavn" +msgstr "Du skal indtaste et filnavn." -#: ../src/ui/dialog/export.cpp:1103 +#: ../src/ui/dialog/export.cpp:1110 msgid "You have to enter a filename" msgstr "Du skal indtaste et filnavn" -#: ../src/ui/dialog/export.cpp:1117 +#: ../src/ui/dialog/export.cpp:1124 #, fuzzy msgid "The chosen area to be exported is invalid." msgstr "Eksporteringsområdet er ugyldigt" -#: ../src/ui/dialog/export.cpp:1118 +#: ../src/ui/dialog/export.cpp:1125 msgid "The chosen area to be exported is invalid" msgstr "Eksporteringsområdet er ugyldigt" -#: ../src/ui/dialog/export.cpp:1133 +#: ../src/ui/dialog/export.cpp:1140 #, c-format msgid "Directory %s does not exist or is not a directory.\n" msgstr "Mappen %s eksisterer ikke eller er ikke en mappe.\n" #. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image -#: ../src/ui/dialog/export.cpp:1147 ../src/ui/dialog/export.cpp:1149 +#: ../src/ui/dialog/export.cpp:1154 ../src/ui/dialog/export.cpp:1156 #, fuzzy msgid "Exporting %1 (%2 x %3)" msgstr "Eksporterer %s (%d ×%d)" -#: ../src/ui/dialog/export.cpp:1176 +#: ../src/ui/dialog/export.cpp:1183 #, fuzzy, c-format msgid "Drawing exported to %s." msgstr "Firkant" -#: ../src/ui/dialog/export.cpp:1180 +#: ../src/ui/dialog/export.cpp:1187 #, fuzzy msgid "Export aborted." msgstr "Eksporterer" -#: ../src/ui/dialog/export.cpp:1301 ../src/ui/interface.cpp:1392 -#: ../src/widgets/desktop-widget.cpp:1122 -#: ../src/widgets/desktop-widget.cpp:1184 +#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1389 +#: ../src/widgets/desktop-widget.cpp:1172 +#: ../src/widgets/desktop-widget.cpp:1234 msgid "_Cancel" msgstr "_Annuller" -#: ../src/ui/dialog/export.cpp:1302 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2406 ../src/widgets/desktop-widget.cpp:1123 +#: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 +#: ../src/verbs.cpp:2433 ../src/widgets/desktop-widget.cpp:1173 msgid "_Save" msgstr "_Gem" @@ -16121,7 +16035,7 @@ msgstr "Information" #: ../share/extensions/gcodetools_tools_library.inx.h:12 #: ../share/extensions/generate_voronoi.inx.h:5 #: ../share/extensions/gimp_xcf.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:27 +#: ../share/extensions/interp_att_g.inx.h:29 #: ../share/extensions/jessyInk_autoTexts.inx.h:8 #: ../share/extensions/jessyInk_effects.inx.h:13 #: ../share/extensions/jessyInk_export.inx.h:7 @@ -16137,11 +16051,11 @@ msgstr "Information" #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 #: ../share/extensions/lorem_ipsum.inx.h:6 -#: ../share/extensions/measure.inx.h:16 +#: ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 -#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/split.inx.h:8 -#: ../share/extensions/voronoi2svg.inx.h:11 +#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25 +#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:11 #: ../share/extensions/web-set-att.inx.h:25 #: ../share/extensions/web-transmit-att.inx.h:23 #: ../share/extensions/webslicer_create_group.inx.h:11 @@ -16155,18 +16069,16 @@ msgstr "Parametre" #. Fill in the template #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:427 -#, fuzzy msgid "No preview" -msgstr "Forhåndsvis" +msgstr "Ingen forhåndsvisning" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:531 msgid "too large for preview" msgstr "" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:617 -#, fuzzy msgid "Enable preview" -msgstr "Forhåndsvis" +msgstr "Aktivér forhåndsvisning" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:767 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 @@ -16268,12 +16180,11 @@ msgstr "Foretrukken opløsning af punktbillede (dpi)" #. ######################################### #. ##### Export options buttons/spinners, etc #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 -#, fuzzy msgid "Document" msgstr "Dokument" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2002 +#: ../src/widgets/desktop-widget.cpp:2053 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "Markering" @@ -16294,7 +16205,7 @@ msgstr "Cairo" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600 msgid "Antialias" -msgstr "" +msgstr "Udjævning" #: ../src/ui/dialog/filedialogimpl-win32.cpp:418 #, fuzzy @@ -16311,9 +16222,8 @@ msgid "No file selected" msgstr "Ingen fil valgt" #: ../src/ui/dialog/fill-and-stroke.cpp:62 -#, fuzzy msgid "_Fill" -msgstr "Udfyldning" +msgstr "_Udfyld" #: ../src/ui/dialog/fill-and-stroke.cpp:63 msgid "Stroke _paint" @@ -16339,9 +16249,8 @@ msgid "None" msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:657 -#, fuzzy msgid "Image File" -msgstr "Billede" +msgstr "Billedfil" #: ../src/ui/dialog/filter-effects-dialog.cpp:660 #, fuzzy @@ -16412,23 +16321,20 @@ msgstr "_Rotering" #: ../src/ui/dialog/filter-effects-dialog.cpp:1200 #: ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 -#, fuzzy msgid "X coordinate" -msgstr "Markørkoordinater" +msgstr "x-koordinat" #: ../src/ui/dialog/filter-effects-dialog.cpp:1200 #: ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 -#, fuzzy msgid "Y coordinate" -msgstr "Markørkoordinater" +msgstr "y-koordinat" #: ../src/ui/dialog/filter-effects-dialog.cpp:1200 #: ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 -#, fuzzy msgid "Z coordinate" -msgstr "Markørkoordinater" +msgstr "z-koordinat" #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 #, fuzzy @@ -16446,9 +16352,8 @@ msgstr "" #. TODO: here I have used 100 degrees as default value. But spec says that if not specified, no limiting cone is applied. So, there should be a way for the user to set a "no limiting cone" option. #: ../src/ui/dialog/filter-effects-dialog.cpp:1209 -#, fuzzy msgid "Cone Angle" -msgstr "Vinkel" +msgstr "Keglevinkel" #: ../src/ui/dialog/filter-effects-dialog.cpp:1209 msgid "" @@ -16486,102 +16391,97 @@ msgstr "Fjern udfyldning" msgid "Apply filter" msgstr "Tilføj lag" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1652 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1653 #, fuzzy msgid "filter" msgstr "Fladhed" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1659 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:1660 msgid "Add filter" -msgstr "Tilføj lag" +msgstr "Tilføj filter" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1709 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1710 #, fuzzy msgid "Duplicate filter" msgstr "Kopiér knudepunkt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1808 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:1809 msgid "_Effect" -msgstr "Effe_kter" +msgstr "Effe_kt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1818 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1819 #, fuzzy msgid "Connections" msgstr "Tilslutninger" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1956 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1957 msgid "Remove filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2543 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2544 #, fuzzy msgid "Remove merge node" msgstr "Fjern streg" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2663 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2664 msgid "Reorder filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2743 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2744 msgid "Add Effect:" -msgstr "Effe_kter" +msgstr "Tilføj effekt:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2744 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 #, fuzzy msgid "No effect selected" msgstr "Intet dokument valgt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 #, fuzzy msgid "No filter selected" msgstr "Intet dokument valgt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2792 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2791 msgid "Effect parameters" -msgstr "Firkant" +msgstr "Effektparametre" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2793 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2792 msgid "Filter General Settings" msgstr "" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 #, fuzzy msgid "Coordinates:" msgstr "Markørkoordinater" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 #, fuzzy msgid "X coordinate of the left corners of filter effects region" msgstr "Opret og fliselæg klonerne i markeringen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 msgid "Y coordinate of the upper corners of filter effects region" msgstr "" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2852 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 msgid "Dimensions:" -msgstr "Opdeling" +msgstr "Dimensioner:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2852 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 #, fuzzy msgid "Width of filter effects region" msgstr "Bredde på markering" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2852 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 #, fuzzy msgid "Height of filter effects region" msgstr "Højde på markering" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2858 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 msgid "" "Indicates the type of matrix operation. The keyword 'matrix' indicates that " "a full 5x4 matrix of values will be provided. The other keywords represent " @@ -16589,105 +16489,100 @@ msgid "" "performed without specifying a complete matrix." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2859 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2858 #, fuzzy msgid "Value(s):" msgstr "Værdi" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 msgid "R:" -msgstr "Rx:" +msgstr "R:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2864 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 #: ../src/ui/widget/color-icc-selector.cpp:180 -#, fuzzy msgid "G:" -msgstr "_G" +msgstr "G:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2864 msgid "B:" -msgstr "_B" +msgstr "B:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 msgid "A:" -msgstr "_A" +msgstr "A:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2909 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 #, fuzzy msgid "Operator:" msgstr "Forfatter" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 msgid "K1:" msgstr "" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 #: ../src/ui/dialog/filter-effects-dialog.cpp:2870 #: ../src/ui/dialog/filter-effects-dialog.cpp:2871 #: ../src/ui/dialog/filter-effects-dialog.cpp:2872 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 msgid "" "If the arithmetic operation is chosen, each result pixel is computed using " "the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " "values of the first and second inputs respectively." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 msgid "K2:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 msgid "K3:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 msgid "K4:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 -#, fuzzy +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Size:" -msgstr "Størrelse" +msgstr "Størrelse:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 #, fuzzy msgid "width of the convolve matrix" msgstr "Papirbredde" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 #, fuzzy msgid "height of the convolve matrix" msgstr "Højde på firkanten der skal udfyldes" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2877 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 #: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "Mål:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2877 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "" "X coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2877 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "" "Y coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." msgstr "" #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 #, fuzzy msgid "Kernel:" msgstr "Br_ugernavn:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 msgid "" "This matrix describes the convolve operation that is applied to the input " "image in order to calculate the pixel colors at the output. Different " @@ -16697,12 +16592,12 @@ msgid "" "would lead to a common blur effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 #, fuzzy msgid "Divisor:" msgstr "Opdeling" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 msgid "" "After applying the kernelMatrix to the input image to yield a number, that " "number is divided by divisor to yield the final destination color value. A " @@ -16710,206 +16605,206 @@ msgid "" "effect on the overall color intensity of the result." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 #, fuzzy msgid "Bias:" msgstr "Vælg maske" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 msgid "" "This value is added to each component. This is useful to define a constant " "value as the zero response of the filter." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 #, fuzzy msgid "Edge Mode:" msgstr "Flyt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "" "Determines how to extend the input image as necessary with color values so " "that the matrix operations can be applied when the kernel is positioned at " "or near the edge of the input image." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2884 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 #, fuzzy msgid "Preserve Alpha" msgstr "Bevaret" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2884 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 #, fuzzy msgid "Diffuse Color:" msgstr "Farver:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Defines the color of the light source" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 #, fuzzy msgid "Surface Scale:" msgstr "Kantet ende" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 #, fuzzy msgid "Constant:" msgstr "Forbind" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 msgid "This constant affects the Phong lighting model." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2890 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2924 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "Kernel Unit Length:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 msgid "This defines the intensity of the displacement effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 #, fuzzy msgid "X displacement:" msgstr "Maksimal linjestykkelængde" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 msgid "Color component that controls the displacement in the X direction" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 #, fuzzy msgid "Y displacement:" msgstr "Maksimal linjestykkelængde" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 msgid "Color component that controls the displacement in the Y direction" msgstr "" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2899 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 #, fuzzy msgid "Flood Color:" msgstr "Stopfarve" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2899 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 msgid "The whole filter region will be filled with this color." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 #, fuzzy msgid "Standard Deviation:" msgstr "Udskrivningsdestination" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 msgid "The standard deviation for the blur operation." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2909 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 #, fuzzy msgid "Source of Image:" msgstr "Antal trin" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 #, fuzzy msgid "Delta X:" msgstr "Slet" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 msgid "This is how far the input image gets shifted to the right" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2917 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 #, fuzzy msgid "Delta Y:" msgstr "Slet" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2917 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 msgid "This is how far the input image gets shifted downwards" msgstr "" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 #, fuzzy msgid "Specular Color:" msgstr "Stopfarve" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 #: ../share/extensions/interp.inx.h:2 #, fuzzy msgid "Exponent:" msgstr "Eksponent" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 msgid "Base Frequency:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 #, fuzzy msgid "Octaves:" msgstr "Udløs:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2935 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 #, fuzzy msgid "Seed:" msgstr "Hastighed:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2935 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 msgid "The starting number for the pseudo random number generator." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "Add filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2964 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2963 msgid "" "The feBlend filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2968 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2967 msgid "" "The feColorMatrix filter primitive applies a matrix transformation to " "color of each rendered pixel. This allows for effects like turning object to " "grayscale, modifying color saturation and changing color hue." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2972 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 msgid "" "The feComponentTransfer filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " @@ -16917,7 +16812,7 @@ msgid "" "adjustment, color balance, and thresholding." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2976 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2975 msgid "" "The feComposite filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -16925,7 +16820,7 @@ msgid "" "between the corresponding pixel values of the images." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2980 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2979 msgid "" "The feConvolveMatrix lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -16934,7 +16829,7 @@ msgid "" "is faster and resolution-independent." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2984 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2983 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -16942,7 +16837,7 @@ msgid "" "opacity areas recede away from the viewer." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2988 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2987 msgid "" "The feDisplacementMap filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -16950,26 +16845,26 @@ msgid "" "effects." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2992 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2991 msgid "" "The feFlood filter primitive fills the region with a given color and " "opacity. It is usually used as an input to other filters to apply color to " "a graphic." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2996 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2995 msgid "" "The feGaussianBlur filter primitive uniformly blurs its input. It is " "commonly used together with feOffset to create a drop shadow effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3000 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2999 msgid "" "The feImage filter primitive fills the region with an external image " "or another part of the document." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3004 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3003 msgid "" "The feMerge filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -16977,21 +16872,21 @@ msgid "" "in 'normal' mode or several feComposite primitives in 'over' mode." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3008 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3007 msgid "" "The feMorphology filter primitive provides erode and dilate effects. " "For single-color objects erode makes the object thinner and dilate makes it " "thicker." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3012 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3011 msgid "" "The feOffset filter primitive offsets the image by an user-defined " "amount. For example, this is useful for drop shadows, where the shadow is in " "a slightly different position than the actual object." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3016 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3015 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives " "create \"embossed\" shadings. The input's alpha channel is used to provide " @@ -16999,23 +16894,24 @@ msgid "" "lower opacity areas recede away from the viewer." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3020 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3019 msgid "" -"The feTile filter primitive tiles a region with its input graphic" +"The feTile filter primitive tiles a region with an input graphic. The " +"source tile is defined by the filter primitive subregion of the input." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3024 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3023 msgid "" "The feTurbulence filter primitive renders Perlin noise. This kind of " "noise is useful in simulating several nature phenomena like clouds, fire and " "smoke and in generating complex textures like marble or granite." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3043 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 msgid "Duplicate filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3096 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3095 #, fuzzy msgid "Set filter primitive attribute" msgstr "Slet attribut" @@ -17057,7 +16953,7 @@ msgstr "Begræns søgning til det aktuelle lag" #: ../src/ui/dialog/find.cpp:77 msgid "Sele_ction" -msgstr "Markering" +msgstr "_Markering" #: ../src/ui/dialog/find.cpp:77 msgid "Limit search to the current selection" @@ -17168,9 +17064,8 @@ msgid "F_ont" msgstr "" #: ../src/ui/dialog/find.cpp:95 -#, fuzzy msgid "Search fonts" -msgstr "Søg efter kloner" +msgstr "Søg efter skrifttyper" #: ../src/ui/dialog/find.cpp:96 msgid "Properties" @@ -17217,7 +17112,7 @@ msgstr "Spiraler" msgid "Search spirals" msgstr "Søg efter spiraler" -#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1735 +#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1786 msgid "Paths" msgstr "Stier" @@ -17283,9 +17178,8 @@ msgid "Select all objects matching the selection criteria" msgstr "Markér objekter der matcher alle de felter du udfyldte" #: ../src/ui/dialog/find.cpp:116 -#, fuzzy msgid "_Replace All" -msgstr "_Slip" +msgstr "_Erstat alle" #: ../src/ui/dialog/find.cpp:116 #, fuzzy @@ -17377,9 +17271,8 @@ msgid "Font '%1' substituted with '%2'" msgstr "" #: ../src/ui/dialog/glyphs.cpp:60 ../src/ui/dialog/glyphs.cpp:152 -#, fuzzy msgid "all" -msgstr "Titel" +msgstr "alt" #: ../src/ui/dialog/glyphs.cpp:61 msgid "common" @@ -17390,9 +17283,8 @@ msgid "inherited" msgstr "" #: ../src/ui/dialog/glyphs.cpp:63 ../src/ui/dialog/glyphs.cpp:165 -#, fuzzy msgid "Arabic" -msgstr "_Udgangspunkt X:" +msgstr "Arabisk" #: ../src/ui/dialog/glyphs.cpp:64 ../src/ui/dialog/glyphs.cpp:163 #, fuzzy @@ -17447,9 +17339,8 @@ msgid "Gothic" msgstr "rod" #: ../src/ui/dialog/glyphs.cpp:75 -#, fuzzy msgid "Greek" -msgstr "Grøn" +msgstr "Græsk" #: ../src/ui/dialog/glyphs.cpp:76 ../src/ui/dialog/glyphs.cpp:174 msgid "Gujarati" @@ -17496,9 +17387,8 @@ msgid "Lao" msgstr "Layout" #: ../src/ui/dialog/glyphs.cpp:86 -#, fuzzy msgid "Latin" -msgstr "Start:" +msgstr "Latinsk" #: ../src/ui/dialog/glyphs.cpp:87 ../src/ui/dialog/glyphs.cpp:179 msgid "Malayalam" @@ -17539,9 +17429,8 @@ msgid "Syriac" msgstr "" #: ../src/ui/dialog/glyphs.cpp:96 ../src/ui/dialog/glyphs.cpp:176 -#, fuzzy msgid "Tamil" -msgstr "Titel" +msgstr "" #: ../src/ui/dialog/glyphs.cpp:97 ../src/ui/dialog/glyphs.cpp:177 msgid "Telugu" @@ -17859,9 +17748,8 @@ msgid "Number Forms" msgstr "Antal rækker" #: ../src/ui/dialog/glyphs.cpp:222 -#, fuzzy msgid "Arrows" -msgstr "Fejl" +msgstr "Pile" #: ../src/ui/dialog/glyphs.cpp:223 msgid "Mathematical Operators" @@ -18174,7 +18062,7 @@ msgstr "" #: ../src/ui/dialog/grid-arrange-tab.cpp:571 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:666 +#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:694 #: ../src/widgets/node-toolbar.cpp:581 msgid "X:" msgstr "X:" @@ -18187,7 +18075,7 @@ msgstr "Vandret afstand mellem søjler (billedpunkter)" #: ../src/ui/dialog/grid-arrange-tab.cpp:572 #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:76 -#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:676 +#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:704 #: ../src/widgets/node-toolbar.cpp:599 msgid "Y:" msgstr "Y:" @@ -18253,56 +18141,65 @@ msgstr "Indstil afstand:" #: ../src/ui/dialog/guides.cpp:47 #, fuzzy +msgid "Lo_cked" +msgstr "L_ås" + +#: ../src/ui/dialog/guides.cpp:47 +msgid "Lock the movement of guides" +msgstr "" + +#: ../src/ui/dialog/guides.cpp:48 +#, fuzzy msgid "Rela_tive change" msgstr "Rela_tiv flytning" -#: ../src/ui/dialog/guides.cpp:47 +#: ../src/ui/dialog/guides.cpp:48 #, fuzzy msgid "Move and/or rotate the guide relative to current settings" msgstr "Flyt hjælper i forhold til den aktuelle placering" -#: ../src/ui/dialog/guides.cpp:48 +#: ../src/ui/dialog/guides.cpp:49 #, fuzzy msgctxt "Guides" msgid "_X:" msgstr "X:" -#: ../src/ui/dialog/guides.cpp:49 +#: ../src/ui/dialog/guides.cpp:50 #, fuzzy msgctxt "Guides" msgid "_Y:" msgstr "Y:" -#: ../src/ui/dialog/guides.cpp:50 ../src/ui/dialog/object-properties.cpp:59 +#: ../src/ui/dialog/guides.cpp:51 ../src/ui/dialog/object-properties.cpp:59 #, fuzzy msgid "_Label:" msgstr "_Etiket" -#: ../src/ui/dialog/guides.cpp:50 +#: ../src/ui/dialog/guides.cpp:51 msgid "Optionally give this guideline a name" msgstr "" -#: ../src/ui/dialog/guides.cpp:51 +#: ../src/ui/dialog/guides.cpp:52 #, fuzzy msgid "_Angle:" msgstr "Vinkel:" -#: ../src/ui/dialog/guides.cpp:130 +#: ../src/ui/dialog/guides.cpp:139 #, fuzzy msgid "Set guide properties" msgstr "Udskrivningsegenskaber" -#: ../src/ui/dialog/guides.cpp:160 +#: ../src/ui/dialog/guides.cpp:169 #, fuzzy msgid "Guideline" msgstr "Farver for hjælpelinjer" -#: ../src/ui/dialog/guides.cpp:311 +#: ../src/ui/dialog/guides.cpp:336 #, fuzzy, c-format msgid "Guideline ID: %s" msgstr "Hjælpelinje" -#: ../src/ui/dialog/guides.cpp:317 +#: ../src/ui/dialog/guides.cpp:342 #, fuzzy, c-format msgid "Current: %s" msgstr "Sideorientering:" @@ -18678,12 +18575,12 @@ msgstr "Objekter" #. Zoom #: ../src/ui/dialog/inkscape-preferences.cpp:385 -#: ../src/widgets/desktop-widget.cpp:631 +#: ../src/widgets/desktop-widget.cpp:659 msgid "Zoom" msgstr "Zoom" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:390 ../src/verbs.cpp:2730 +#: ../src/ui/dialog/inkscape-preferences.cpp:390 ../src/verbs.cpp:2762 msgctxt "ContextVerb" msgid "Measure" msgstr "Mål" @@ -18742,7 +18639,7 @@ msgid "" msgstr "" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2722 +#: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2754 msgctxt "ContextVerb" msgid "Text" msgstr "Tekst" @@ -18823,776 +18720,786 @@ msgid "Eraser" msgstr "Viskelæder" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:482 +#: ../src/ui/dialog/inkscape-preferences.cpp:483 msgid "Paint Bucket" msgstr "Malerspand" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:487 -#: ../src/widgets/gradient-selector.cpp:148 -#: ../src/widgets/gradient-selector.cpp:299 +#: ../src/ui/dialog/inkscape-preferences.cpp:489 +#: ../src/widgets/gradient-selector.cpp:144 +#: ../src/widgets/gradient-selector.cpp:295 msgid "Gradient" msgstr "Overgang" -#: ../src/ui/dialog/inkscape-preferences.cpp:489 +#: ../src/ui/dialog/inkscape-preferences.cpp:491 msgid "Prevent sharing of gradient definitions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:491 +#: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " "may affect other objects using the same gradient" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:492 +#: ../src/ui/dialog/inkscape-preferences.cpp:494 #, fuzzy msgid "Use legacy Gradient Editor" msgstr "Overgangseditor" -#: ../src/ui/dialog/inkscape-preferences.cpp:494 +#: ../src/ui/dialog/inkscape-preferences.cpp:496 msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:497 +#: ../src/ui/dialog/inkscape-preferences.cpp:499 #, fuzzy msgid "Linear gradient _angle:" msgstr "Udfyldning med lineær overgang" -#: ../src/ui/dialog/inkscape-preferences.cpp:498 +#: ../src/ui/dialog/inkscape-preferences.cpp:500 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:502 +#: ../src/ui/dialog/inkscape-preferences.cpp:504 msgid "Dropper" msgstr "Pipette" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:507 +#: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Connector" msgstr "Tilslutter" -#: ../src/ui/dialog/inkscape-preferences.cpp:510 +#: ../src/ui/dialog/inkscape-preferences.cpp:512 msgid "If on, connector attachment points will not be shown for text objects" msgstr "Hvis aktiveret, vises forbindelsespunkter ikke ved tekstobjekter" #. LPETool #. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 #, fuzzy msgid "LPE Tool" msgstr "Værktøjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Interface" msgstr "Brugerflade" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 #, fuzzy msgid "System default" msgstr "Vælg som standard" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:528 msgid "Albanian (sq)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:528 msgid "Amharic (am)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:528 msgid "Arabic (ar)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:528 msgid "Armenian (hy)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:528 msgid "Assamese (as)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:528 msgid "Azerbaijani (az)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 #, fuzzy msgid "Basque (eu)" msgstr "Mål sti" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 msgid "Belarusian (be)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 msgid "Bulgarian (bg)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 msgid "Bengali (bn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 msgid "Bengali/Bangladesh (bn_BD)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 msgid "Bodo (brx)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:529 msgid "Breton (br)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:530 msgid "Catalan (ca)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:530 msgid "Valencian Catalan (ca@valencia)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:530 msgid "Chinese/China (zh_CN)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:530 msgid "Chinese/Taiwan (zh_TW)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:530 msgid "Croatian (hr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:530 msgid "Czech (cs)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:531 msgid "Danish (da)" msgstr "Dansk (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:531 msgid "Dogri (doi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:531 msgid "Dutch (nl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:531 msgid "Dzongkha (dz)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:532 msgid "German (de)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:532 msgid "Greek (el)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 msgid "English (en)" msgstr "Engelsk (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 msgid "English/Australia (en_AU)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 msgid "English/Canada (en_CA)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 msgid "English/Great Britain (en_GB)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 msgid "Pig Latin (en_US@piglatin)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 #, fuzzy msgid "Esperanto (eo)" msgstr "Forfatter" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:533 msgid "Estonian (et)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Farsi (fa)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Finnish (fi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "French (fr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:535 msgid "Galician (gl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:535 msgid "Gujarati (gu)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:536 msgid "Hebrew (he)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:536 msgid "Hindi (hi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:536 msgid "Hungarian (hu)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "Icelandic (is)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "Indonesian (id)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "Irish (ga)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 #, fuzzy msgid "Italian (it)" msgstr "Kursiv" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Japanese (ja)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Kannada (kn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Kashmiri in Peso-Arabic script (ks@aran)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Kashmiri in Devanagari script (ks@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Khmer (km)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Kinyarwanda (rw)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Konkani (kok)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Konkani in Latin script (kok@latin)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Korean (ko)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:538 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Latvian (lv)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:538 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Lithuanian (lt)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Macedonian (mk)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Maithili (mai)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Malayalam (ml)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Manipuri (mni)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Manipuri in Bengali script (mni@beng)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Marathi (mr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Mongolian (mn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 #, fuzzy msgid "Nepali (ne)" msgstr "linjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "Norwegian Bokmål (nb)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "Norwegian Nynorsk (nn)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Odia (or)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Panjabi (pa)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Polish (pl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Portuguese (pt)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Portuguese/Brazil (pt_BR)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:543 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Romanian (ro)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:543 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Russian (ru)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Sanskrit (sa)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 #, fuzzy msgid "Santali (sat)" msgstr "Kursiv" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Santali in Devanagari script (sat@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Serbian (sr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Serbian in Latin script (sr@latin)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Sindhi (sd)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Sindhi in Devanagari script (sd@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Slovak (sk)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Slovenian (sl)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Spanish (es)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Spanish/Mexico (es_MX)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Swedish (sv)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 #, fuzzy msgid "Tamil (ta)" msgstr "Titel" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Telugu (te)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Thai (th)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Turkish (tr)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Ukrainian (uk)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Urdu (ur)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Vietnamese (vi)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:600 +#: ../src/ui/dialog/inkscape-preferences.cpp:602 msgid "Language (requires restart):" msgstr "Sprog (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:601 +#: ../src/ui/dialog/inkscape-preferences.cpp:603 msgid "Set the language for menus and number formats" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#: ../src/ui/dialog/inkscape-preferences.cpp:689 -#, fuzzy +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +msgctxt "Icon size" msgid "Large" -msgstr "stor" +msgstr "Stor" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#: ../src/ui/dialog/inkscape-preferences.cpp:689 -#: ../src/ui/widget/font-variants.cpp:51 -#, fuzzy +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +msgctxt "Icon size" msgid "Small" -msgstr "lille" +msgstr "Lille" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#, fuzzy +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +msgctxt "Icon size" msgid "Smaller" -msgstr "lille" +msgstr "Mindre" -#: ../src/ui/dialog/inkscape-preferences.cpp:608 +#: ../src/ui/dialog/inkscape-preferences.cpp:610 msgid "Toolbox icon size:" msgstr "Værktøjskasse ikonstørrelse:" -#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:611 #, fuzzy msgid "Set the size for the tool icons (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/inkscape-preferences.cpp:614 msgid "Control bar icon size:" msgstr "Kontrollinje ikonstørrelse:" -#: ../src/ui/dialog/inkscape-preferences.cpp:613 +#: ../src/ui/dialog/inkscape-preferences.cpp:615 #, fuzzy msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:618 msgid "Secondary toolbar icon size:" msgstr "Sekundær værktøjslinje ikonstørrelse:" -#: ../src/ui/dialog/inkscape-preferences.cpp:617 +#: ../src/ui/dialog/inkscape-preferences.cpp:619 #, fuzzy msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:620 +#: ../src/ui/dialog/inkscape-preferences.cpp:622 msgid "Work-around color sliders not drawing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:624 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:627 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 #, fuzzy msgid "Clear list" msgstr "Ryd værdier" -#: ../src/ui/dialog/inkscape-preferences.cpp:630 +#: ../src/ui/dialog/inkscape-preferences.cpp:632 msgid "Maximum documents in Open _Recent:" msgstr "Højeste antal dokumente_r i Åbn seneste:" -#: ../src/ui/dialog/inkscape-preferences.cpp:631 +#: ../src/ui/dialog/inkscape-preferences.cpp:633 #, fuzzy msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" msgstr "Den maksimale længde af Åbn-seneste-listen i fil-menuen" -#: ../src/ui/dialog/inkscape-preferences.cpp:634 +#: ../src/ui/dialog/inkscape-preferences.cpp:636 msgid "_Zoom correction factor (in %):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:635 +#: ../src/ui/dialog/inkscape-preferences.cpp:637 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " "display objects in their true sizes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:638 +#: ../src/ui/dialog/inkscape-preferences.cpp:640 msgid "Enable dynamic relayout for incomplete sections" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:640 +#: ../src/ui/dialog/inkscape-preferences.cpp:642 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" msgstr "" #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:645 #, fuzzy msgid "Show filter primitives infobox (requires restart)" msgstr "Slet attribut" -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:647 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 #, fuzzy msgid "Icons only" msgstr "Farve på hjælpelinjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 #, fuzzy msgid "Text only" msgstr "Tekst-inddata" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 #, fuzzy msgid "Icons and text" msgstr "Ingen farve" -#: ../src/ui/dialog/inkscape-preferences.cpp:653 +#: ../src/ui/dialog/inkscape-preferences.cpp:655 #, fuzzy msgid "Dockbar style (requires restart):" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:654 +#: ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:663 #, fuzzy msgid "Switcher style (requires restart):" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:662 +#: ../src/ui/dialog/inkscape-preferences.cpp:664 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:666 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Save and restore window geometry for each document" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:667 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 #, fuzzy msgid "Remember and use last window's geometry" msgstr "Gem vinduesstørrelse" -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:670 #, fuzzy msgid "Don't save window geometry" msgstr "Gem vinduesstørrelse" -#: ../src/ui/dialog/inkscape-preferences.cpp:670 +#: ../src/ui/dialog/inkscape-preferences.cpp:672 msgid "Save and restore dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:671 -#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:673 +#: ../src/ui/dialog/inkscape-preferences.cpp:709 msgid "Don't save dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 -#: ../src/ui/dialog/inkscape-preferences.cpp:715 +#: ../src/ui/dialog/inkscape-preferences.cpp:675 +#: ../src/ui/dialog/inkscape-preferences.cpp:717 #, fuzzy msgid "Dockable" msgstr "Skalér" -#: ../src/ui/dialog/inkscape-preferences.cpp:677 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Native open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:678 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "GTK open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:680 +#: ../src/ui/dialog/inkscape-preferences.cpp:682 msgid "Dialogs are hidden in taskbar" msgstr "Dialoger skjules i opgavelinjen" -#: ../src/ui/dialog/inkscape-preferences.cpp:681 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 msgid "Save and restore documents viewport" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:682 +#: ../src/ui/dialog/inkscape-preferences.cpp:684 msgid "Zoom when window is resized" msgstr "Zoom når vinduet ændrer størrelse" -#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:685 msgid "Show close button on dialogs" msgstr "Vis lukkeknap på dialoger" -#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 msgctxt "Dialog on top" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:688 msgid "Aggressive" msgstr "Aggressiv" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 +#: ../src/ui/dialog/inkscape-preferences.cpp:691 #, fuzzy +msgctxt "Window size" +msgid "Small" +msgstr "lille" + +#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#, fuzzy +msgctxt "Window size" +msgid "Large" +msgstr "stor" + +#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#, fuzzy +msgctxt "Window size" msgid "Maximized" msgstr "Optimeret" -#: ../src/ui/dialog/inkscape-preferences.cpp:693 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 #, fuzzy msgid "Default window size:" msgstr "Sideorientering:" -#: ../src/ui/dialog/inkscape-preferences.cpp:694 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 #, fuzzy msgid "Set the default window size" msgstr "Opret lineær overgang" -#: ../src/ui/dialog/inkscape-preferences.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:699 #, fuzzy msgid "Saving window geometry (size and position)" msgstr "Gem vinduesstørrelse" -#: ../src/ui/dialog/inkscape-preferences.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgid "Let the window manager determine placement of all windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:703 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:703 +#: ../src/ui/dialog/inkscape-preferences.cpp:705 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 #, fuzzy msgid "Saving dialogs status" msgstr "Vis dialog ved opstart" -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:711 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:713 +#: ../src/ui/dialog/inkscape-preferences.cpp:715 #, fuzzy msgid "Dialog behavior (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/ui/dialog/inkscape-preferences.cpp:721 #, fuzzy msgid "Desktop integration" msgstr "Udskrivningsdestination" -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:723 msgid "Use Windows like open and save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:725 msgid "Use GTK open and save dialogs " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:727 +#: ../src/ui/dialog/inkscape-preferences.cpp:729 msgid "Dialogs on top:" msgstr "Dialoger øverst:" -#: ../src/ui/dialog/inkscape-preferences.cpp:730 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "Dialogs are treated as regular windows" msgstr "Dialoger behandles som almindelige vinduer" -#: ../src/ui/dialog/inkscape-preferences.cpp:732 +#: ../src/ui/dialog/inkscape-preferences.cpp:734 msgid "Dialogs stay on top of document windows" msgstr "Dialoger holdes over dokumenvinduer" -#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:736 msgid "Same as Normal but may work better with some window managers" msgstr "" "Samme som Normal, men fungerer måske bedre med nogle vindueshåndteringer" -#: ../src/ui/dialog/inkscape-preferences.cpp:737 +#: ../src/ui/dialog/inkscape-preferences.cpp:739 #, fuzzy msgid "Dialog Transparency" msgstr "0 (gennemsigtig)" -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:741 #, fuzzy msgid "_Opacity when focused:" msgstr "Uigennemsigtighed" -#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 #, fuzzy msgid "Opacity when _unfocused:" msgstr "Uigennemsigtighed" -#: ../src/ui/dialog/inkscape-preferences.cpp:743 +#: ../src/ui/dialog/inkscape-preferences.cpp:745 msgid "_Time of opacity change animation:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:746 +#: ../src/ui/dialog/inkscape-preferences.cpp:748 #, fuzzy msgid "Miscellaneous" msgstr "Forskellige vink og trick" -#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:751 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "Om dialoger skal skjules i desktoppens opgavelinje" -#: ../src/ui/dialog/inkscape-preferences.cpp:752 +#: ../src/ui/dialog/inkscape-preferences.cpp:754 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " @@ -19602,118 +19509,118 @@ msgstr "" "samme område synligt (dette er standarden der kan ændre i ethvert vindue ved " "at bruge knappen over det højre rullepanel)" -#: ../src/ui/dialog/inkscape-preferences.cpp:754 +#: ../src/ui/dialog/inkscape-preferences.cpp:756 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:756 +#: ../src/ui/dialog/inkscape-preferences.cpp:758 msgid "Whether dialog windows have a close button (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:757 +#: ../src/ui/dialog/inkscape-preferences.cpp:759 msgid "Windows" msgstr "Vinduer" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:760 +#: ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "Line color when zooming out" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:763 +#: ../src/ui/dialog/inkscape-preferences.cpp:765 msgid "The gridlines will be shown in minor grid line color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:765 +#: ../src/ui/dialog/inkscape-preferences.cpp:767 msgid "The gridlines will be shown in major grid line color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 #, fuzzy msgid "Default grid settings" msgstr "Sideorientering:" -#: ../src/ui/dialog/inkscape-preferences.cpp:773 -#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 #, fuzzy msgid "Grid units:" msgstr "Gitter_enheder:" -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:780 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 #, fuzzy msgid "Origin X:" msgstr "_Udgangspunkt X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:781 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 #, fuzzy msgid "Origin Y:" msgstr "U_dgangspunkt Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:784 +#: ../src/ui/dialog/inkscape-preferences.cpp:786 #, fuzzy msgid "Spacing X:" msgstr "Afstand _X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:785 -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/ui/dialog/inkscape-preferences.cpp:787 +#: ../src/ui/dialog/inkscape-preferences.cpp:809 #, fuzzy msgid "Spacing Y:" msgstr "_Afstand Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:787 -#: ../src/ui/dialog/inkscape-preferences.cpp:788 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:789 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:814 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 #, fuzzy msgid "Minor grid line color:" msgstr "Primær gitterlin_jefarve:" -#: ../src/ui/dialog/inkscape-preferences.cpp:788 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 #, fuzzy msgid "Color used for normal grid lines" msgstr "Farve på gitterlinjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:789 -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:814 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 #, fuzzy msgid "Major grid line color:" msgstr "Primær gitterlin_jefarve:" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 #, fuzzy msgid "Color used for major (highlighted) grid lines" msgstr "Farve på de primære (fremhævede) gitterlinjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:794 +#: ../src/ui/dialog/inkscape-preferences.cpp:819 #, fuzzy msgid "Major grid line every:" msgstr "_Pri_mær gitterlinje for hver:" -#: ../src/ui/dialog/inkscape-preferences.cpp:793 +#: ../src/ui/dialog/inkscape-preferences.cpp:795 msgid "Show dots instead of lines" -msgstr "" +msgstr "Vis prikker i stedet for linjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:794 +#: ../src/ui/dialog/inkscape-preferences.cpp:796 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:875 +#: ../src/ui/dialog/inkscape-preferences.cpp:877 msgid "Input/Output" msgstr "Input/output" -#: ../src/ui/dialog/inkscape-preferences.cpp:878 +#: ../src/ui/dialog/inkscape-preferences.cpp:880 msgid "Use current directory for \"Save As ...\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 +#: ../src/ui/dialog/inkscape-preferences.cpp:882 msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " @@ -19721,11 +19628,11 @@ msgid "" "it" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:884 msgid "Add label comments to printing output" msgstr "Tilføj etiketkommentarer til udskrivningsoutput" -#: ../src/ui/dialog/inkscape-preferences.cpp:884 +#: ../src/ui/dialog/inkscape-preferences.cpp:886 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" @@ -19733,28 +19640,28 @@ msgstr "" "Når aktiveret, tilføjes en kommentar til den rå udskrift, der markerer det " "optegnede uddata for et objekt med sin etiket" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:888 #, fuzzy msgid "Add default metadata to new documents" msgstr "Redigér dokumentets metadata (gemmes med dokumentet)" -#: ../src/ui/dialog/inkscape-preferences.cpp:888 +#: ../src/ui/dialog/inkscape-preferences.cpp:890 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:894 #, fuzzy msgid "_Grab sensitivity:" msgstr "Gribefølsomhed:" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:894 #, fuzzy msgid "pixels (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:893 +#: ../src/ui/dialog/inkscape-preferences.cpp:895 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" @@ -19762,157 +19669,157 @@ msgstr "" "Hvor tæt på et objekt du skal være for at kunne gribe det med musen (i " "skærmbilledpunkter)" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 #, fuzzy msgid "_Click/drag threshold:" msgstr "Klik/træk-tærskelværdi:" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 msgid "pixels" msgstr "billedpunkter" -#: ../src/ui/dialog/inkscape-preferences.cpp:896 +#: ../src/ui/dialog/inkscape-preferences.cpp:898 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" "Maksimum musetræk (i skærm-billedpunkter) der tolkes som et klik, ikke et " "træk" -#: ../src/ui/dialog/inkscape-preferences.cpp:899 +#: ../src/ui/dialog/inkscape-preferences.cpp:901 #, fuzzy msgid "_Handle size:" msgstr "Vinkel" -#: ../src/ui/dialog/inkscape-preferences.cpp:900 +#: ../src/ui/dialog/inkscape-preferences.cpp:902 #, fuzzy msgid "Set the relative size of node handles" msgstr "Flyt knudepunkts-håndtag" -#: ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/ui/dialog/inkscape-preferences.cpp:904 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:904 +#: ../src/ui/dialog/inkscape-preferences.cpp:906 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " "mouse)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:906 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 #, fuzzy msgid "Switch tool based on tablet device (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:910 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:909 +#: ../src/ui/dialog/inkscape-preferences.cpp:911 msgid "Input devices" msgstr "Inputenheder" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:912 +#: ../src/ui/dialog/inkscape-preferences.cpp:914 #, fuzzy msgid "Use named colors" msgstr "Sidste valgte farve" -#: ../src/ui/dialog/inkscape-preferences.cpp:913 +#: ../src/ui/dialog/inkscape-preferences.cpp:915 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:915 +#: ../src/ui/dialog/inkscape-preferences.cpp:917 #, fuzzy msgid "XML formatting" msgstr "Information" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:919 #, fuzzy msgid "Inline attributes" msgstr "Sæt attribut" -#: ../src/ui/dialog/inkscape-preferences.cpp:918 +#: ../src/ui/dialog/inkscape-preferences.cpp:920 msgid "Put attributes on the same line as the element tag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:921 +#: ../src/ui/dialog/inkscape-preferences.cpp:923 #, fuzzy msgid "_Indent, spaces:" msgstr "Indryk knudepunkt" -#: ../src/ui/dialog/inkscape-preferences.cpp:921 +#: ../src/ui/dialog/inkscape-preferences.cpp:923 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 #, fuzzy msgid "Path data" msgstr "Indsæt _bredde" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 msgid "Absolute" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 #, fuzzy msgid "Relative" msgstr "Relativ til: " -#: ../src/ui/dialog/inkscape-preferences.cpp:926 -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "Optimized" msgstr "Optimeret" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:932 msgid "Path string format:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:932 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " "relative coordinates)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "Force repeat commands" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 +#: ../src/ui/dialog/inkscape-preferences.cpp:935 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 +#: ../src/ui/dialog/inkscape-preferences.cpp:937 #, fuzzy msgid "Numbers" msgstr "Nummerér knudpunkter" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:940 #, fuzzy msgid "_Numeric precision:" msgstr "Beskrivelse" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:940 msgid "Significant figures of the values written to the SVG file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:941 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 #, fuzzy msgid "Minimum _exponent:" msgstr "Minimumsstørrelse" -#: ../src/ui/dialog/inkscape-preferences.cpp:941 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -19920,60 +19827,60 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:946 +#: ../src/ui/dialog/inkscape-preferences.cpp:948 msgid "Improper Attributes Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:948 -#: ../src/ui/dialog/inkscape-preferences.cpp:956 -#: ../src/ui/dialog/inkscape-preferences.cpp:964 +#: ../src/ui/dialog/inkscape-preferences.cpp:950 +#: ../src/ui/dialog/inkscape-preferences.cpp:958 +#: ../src/ui/dialog/inkscape-preferences.cpp:966 #, fuzzy msgid "Print warnings" msgstr "Udskriv vha. PDF-operatorer" -#: ../src/ui/dialog/inkscape-preferences.cpp:949 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:950 +#: ../src/ui/dialog/inkscape-preferences.cpp:952 #, fuzzy msgid "Remove attributes" msgstr "Sæt attribut" -#: ../src/ui/dialog/inkscape-preferences.cpp:951 +#: ../src/ui/dialog/inkscape-preferences.cpp:953 msgid "Delete invalid or non-useful attributes from element tag" msgstr "" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:954 +#: ../src/ui/dialog/inkscape-preferences.cpp:956 msgid "Inappropriate Style Properties Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:957 +#: ../src/ui/dialog/inkscape-preferences.cpp:959 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:958 -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:960 +#: ../src/ui/dialog/inkscape-preferences.cpp:968 #, fuzzy msgid "Remove style properties" msgstr "Udskrivningsegenskaber" -#: ../src/ui/dialog/inkscape-preferences.cpp:959 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 #, fuzzy msgid "Delete inappropriate style properties" msgstr "Udskrivningsegenskaber" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:962 +#: ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Non-useful Style Properties Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:965 +#: ../src/ui/dialog/inkscape-preferences.cpp:967 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " @@ -19981,199 +19888,199 @@ msgid "" "attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:967 +#: ../src/ui/dialog/inkscape-preferences.cpp:969 #, fuzzy msgid "Delete redundant style properties" msgstr "Udskrivningsegenskaber" -#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:971 msgid "Check Attributes and Style Properties on" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:973 #, fuzzy msgid "Reading" msgstr "Mellemrum:" -#: ../src/ui/dialog/inkscape-preferences.cpp:972 +#: ../src/ui/dialog/inkscape-preferences.cpp:974 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:973 +#: ../src/ui/dialog/inkscape-preferences.cpp:975 #, fuzzy msgid "Editing" msgstr "_Redigér" -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:976 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:975 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 #, fuzzy msgid "Writing" msgstr "Script" -#: ../src/ui/dialog/inkscape-preferences.cpp:976 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "Check attributes and style properties on writing out SVG files" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:978 +#: ../src/ui/dialog/inkscape-preferences.cpp:980 msgid "SVG output" msgstr "SVG-output" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 #, fuzzy msgid "Perceptual" -msgstr "Procent" +msgstr "Sanselig" -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 #, fuzzy msgid "Relative Colorimetric" msgstr "Rela_tiv flytning" -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "Absolute Colorimetric" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:988 +#: ../src/ui/dialog/inkscape-preferences.cpp:990 msgid "(Note: Color management has been disabled in this build)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:992 +#: ../src/ui/dialog/inkscape-preferences.cpp:994 #, fuzzy msgid "Display adjustment" msgstr "_Visningstilstand" -#: ../src/ui/dialog/inkscape-preferences.cpp:1002 +#: ../src/ui/dialog/inkscape-preferences.cpp:1004 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" "Searched directories:%s" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1003 +#: ../src/ui/dialog/inkscape-preferences.cpp:1005 #, fuzzy msgid "Display profile:" msgstr "_Visningstilstand" -#: ../src/ui/dialog/inkscape-preferences.cpp:1008 +#: ../src/ui/dialog/inkscape-preferences.cpp:1010 msgid "Retrieve profile from display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1011 +#: ../src/ui/dialog/inkscape-preferences.cpp:1013 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1013 +#: ../src/ui/dialog/inkscape-preferences.cpp:1015 msgid "Retrieve profiles from those attached to displays" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1018 +#: ../src/ui/dialog/inkscape-preferences.cpp:1020 #, fuzzy msgid "Display rendering intent:" msgstr "_Visningstilstand" -#: ../src/ui/dialog/inkscape-preferences.cpp:1019 +#: ../src/ui/dialog/inkscape-preferences.cpp:1021 msgid "The rendering intent to use to calibrate display output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1021 +#: ../src/ui/dialog/inkscape-preferences.cpp:1023 #, fuzzy msgid "Proofing" msgstr "Punkt" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 +#: ../src/ui/dialog/inkscape-preferences.cpp:1025 msgid "Simulate output on screen" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1025 +#: ../src/ui/dialog/inkscape-preferences.cpp:1027 msgid "Simulates output of target device" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1027 +#: ../src/ui/dialog/inkscape-preferences.cpp:1029 msgid "Mark out of gamut colors" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1029 +#: ../src/ui/dialog/inkscape-preferences.cpp:1031 msgid "Highlights colors that are out of gamut for the target device" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1041 +#: ../src/ui/dialog/inkscape-preferences.cpp:1043 msgid "Out of gamut warning color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1042 +#: ../src/ui/dialog/inkscape-preferences.cpp:1044 #, fuzzy msgid "Selects the color used for out of gamut warning" msgstr "Farve på de primære (fremhævede) gitterlinjer" -#: ../src/ui/dialog/inkscape-preferences.cpp:1044 +#: ../src/ui/dialog/inkscape-preferences.cpp:1046 msgid "Device profile:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1045 +#: ../src/ui/dialog/inkscape-preferences.cpp:1047 msgid "The ICC profile to use to simulate device output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1048 +#: ../src/ui/dialog/inkscape-preferences.cpp:1050 msgid "Device rendering intent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1049 +#: ../src/ui/dialog/inkscape-preferences.cpp:1051 msgid "The rendering intent to use to calibrate device output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1051 +#: ../src/ui/dialog/inkscape-preferences.cpp:1053 #, fuzzy msgid "Black point compensation" msgstr "Udskrivningsdestination" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1055 #, fuzzy msgid "Enables black point compensation" msgstr "Udskrivningsdestination" -#: ../src/ui/dialog/inkscape-preferences.cpp:1055 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 #, fuzzy msgid "Preserve black" msgstr "Bevaret" -#: ../src/ui/dialog/inkscape-preferences.cpp:1062 +#: ../src/ui/dialog/inkscape-preferences.cpp:1064 msgid "(LittleCMS 1.15 or later required)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1064 +#: ../src/ui/dialog/inkscape-preferences.cpp:1066 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1078 +#: ../src/ui/dialog/inkscape-preferences.cpp:1080 #: ../src/ui/widget/color-icc-selector.cpp:395 #: ../src/ui/widget/color-icc-selector.cpp:674 msgid "" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1123 +#: ../src/ui/dialog/inkscape-preferences.cpp:1125 msgid "Color management" msgstr "Farvehåndtering" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1126 +#: ../src/ui/dialog/inkscape-preferences.cpp:1128 #, fuzzy msgid "Enable autosave (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1127 +#: ../src/ui/dialog/inkscape-preferences.cpp:1129 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1135 #, fuzzy msgctxt "Filesystem" msgid "Autosave _directory:" @@ -20181,27 +20088,26 @@ msgstr "" "%s er ikke en gyldig mappe.\n" "%s" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1135 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1137 #, fuzzy msgid "_Interval (in minutes):" msgstr "Interpolationstrin" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1137 msgid "Interval (in minutes) at which document will be autosaved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 -#, fuzzy +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "_Maximum number of autosaves:" -msgstr "Maksimale nylige dokumenter:" +msgstr "_Maksimale antal af seneste dokumenter:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -20218,52 +20124,52 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1152 +#: ../src/ui/dialog/inkscape-preferences.cpp:1154 msgid "Autosave" msgstr "Automatisk gem" -#: ../src/ui/dialog/inkscape-preferences.cpp:1156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1158 msgid "Open Clip Art Library _Server Name:" msgstr "Open Clip Art Library-_servernavn:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1157 +#: ../src/ui/dialog/inkscape-preferences.cpp:1159 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1161 msgid "Open Clip Art Library _Username:" msgstr "Open Clip Art Library-_brugernavn:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1160 +#: ../src/ui/dialog/inkscape-preferences.cpp:1162 #, fuzzy msgid "The username used to log into Open Clip Art Library" msgstr "Eksportér dette dokument eller en markering som et punktbillede" -#: ../src/ui/dialog/inkscape-preferences.cpp:1162 +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 msgid "Open Clip Art Library _Password:" msgstr "Open Clip Art Library-_adgangskode:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1163 +#: ../src/ui/dialog/inkscape-preferences.cpp:1165 #, fuzzy msgid "The password used to log into Open Clip Art Library" msgstr "Eksportér dette dokument eller en markering som et punktbillede" -#: ../src/ui/dialog/inkscape-preferences.cpp:1164 +#: ../src/ui/dialog/inkscape-preferences.cpp:1166 msgid "Open Clip Art" msgstr "Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 +#: ../src/ui/dialog/inkscape-preferences.cpp:1171 msgid "Behavior" msgstr "Opførsel" -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 #, fuzzy msgid "_Simplification threshold:" msgstr "Simplificeringsgrænse:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1174 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 #, fuzzy msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " @@ -20274,47 +20180,47 @@ msgstr "" "kommando flere gange hurtigt efter hinanden er effekten mere aggressiv; " "bruges den efter en pause genskabes standardtærskelen." -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1178 msgid "Color stock markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1177 +#: ../src/ui/dialog/inkscape-preferences.cpp:1179 msgid "Color custom markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1178 +#: ../src/ui/dialog/inkscape-preferences.cpp:1180 #: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Update marker color when object color changes" msgstr "" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 +#: ../src/ui/dialog/inkscape-preferences.cpp:1183 msgid "Select in all layers" msgstr "Markér i alle lag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1182 +#: ../src/ui/dialog/inkscape-preferences.cpp:1184 msgid "Select only within current layer" msgstr "Markér kun i aktuelle lag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 +#: ../src/ui/dialog/inkscape-preferences.cpp:1185 msgid "Select in current layer and sublayers" msgstr "Marker i aktuelle lag og underlag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 #, fuzzy msgid "Ignore hidden objects and layers" msgstr "Ignorér skjulte objekter" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1187 #, fuzzy msgid "Ignore locked objects and layers" msgstr "Ignorér låste objekter" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 +#: ../src/ui/dialog/inkscape-preferences.cpp:1188 msgid "Deselect upon layer change" msgstr "Afmarkér ved ændring af lag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1191 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" @@ -20322,21 +20228,21 @@ msgstr "" "Fjern markering for at kunne bevare markeringen af objekter når det aktuelle " "lag skiftes" -#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1193 #, fuzzy msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Ctrl+A, Faneblad, Shift+Faneblad:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Make keyboard selection commands work on objects in all layers" msgstr "Lad tastaturmarkeringskommandoer virke på objekter i alle lag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "" "Lad tastaturmarkeringskommandoer virke på objekter i kun det aktuelle lag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1199 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" @@ -20344,7 +20250,7 @@ msgstr "" "Lad tastaturmarkeringskommandoer virke på objekter i det aktuelle lag og " "alle underlag" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1201 #, fuzzy msgid "" "Uncheck this to be able to select objects that are hidden (either by " @@ -20353,7 +20259,7 @@ msgstr "" "Deaktivér denne for at kunne markere skjulte objekter (enten skjult selv, " "eller en del af en skjult gruppe eller et skjult lag)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1203 #, fuzzy msgid "" "Uncheck this to be able to select objects that are locked (either by " @@ -20362,70 +20268,70 @@ msgstr "" "Deaktivér denne for at kunne markere låste objekter (enten låst selv, eller " "en del af en låst gruppe eller et skjult lag)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 msgid "Wrap when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1207 msgid "Alt+Scroll Wheel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1209 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1211 msgid "Selecting" msgstr "Markering" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 +#: ../src/ui/dialog/inkscape-preferences.cpp:1214 #: ../src/widgets/select-toolbar.cpp:572 msgid "Scale stroke width" msgstr "Skalér stregbredde" -#: ../src/ui/dialog/inkscape-preferences.cpp:1213 +#: ../src/ui/dialog/inkscape-preferences.cpp:1215 msgid "Scale rounded corners in rectangles" msgstr "Skalér afrundede hjørner i firkanter" -#: ../src/ui/dialog/inkscape-preferences.cpp:1214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1216 msgid "Transform gradients" msgstr "Transformér overgange" -#: ../src/ui/dialog/inkscape-preferences.cpp:1215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1217 msgid "Transform patterns" msgstr "Transformér mønstre" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "Preserved" msgstr "Bevaret" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 #: ../src/widgets/select-toolbar.cpp:573 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "Når objekter skaleres, skalér også stregbredden med samme andel" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/ui/dialog/inkscape-preferences.cpp:1224 #: ../src/widgets/select-toolbar.cpp:584 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "Når firkanter skaleres, skalér også afrundede hjørners radier" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 #: ../src/widgets/select-toolbar.cpp:595 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "Transformér overgange (i udfyldning eller streg) sammen med objekterne" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 #: ../src/widgets/select-toolbar.cpp:606 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "Transformér mønstre (i udfyldning eller streg) sammen med objekterne" -#: ../src/ui/dialog/inkscape-preferences.cpp:1227 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 #, fuzzy msgid "Store transformation" msgstr "Gem transformation:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1231 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" @@ -20433,20 +20339,20 @@ msgstr "" "Hvis muligt, anvend transformation på objekter, uden at tilføje en attribut: " "transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 msgid "Always store transformation as a transform= attribute on objects" msgstr "Gem altid en tranformation som attribut transform= på objekter" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 msgid "Transforms" msgstr "Transformationer" -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 #, fuzzy msgid "Mouse _wheel scrolls by:" msgstr "Musehjul ruller med:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +#: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" @@ -20454,26 +20360,26 @@ msgstr "" "Et rul med musehjulet, ruller med denne afstand i skærmbilledpunkter " "(vandret med Shift)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/ui/dialog/inkscape-preferences.cpp:1241 msgid "Ctrl+arrows" msgstr "Ctrl+piletaster" -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 #, fuzzy msgid "Sc_roll by:" msgstr "Rul med:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1242 +#: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" "Tryk på Ctrl+piletaster, ruller med denne afstand (i skærmbilledpunkter)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1244 +#: ../src/ui/dialog/inkscape-preferences.cpp:1246 #, fuzzy msgid "_Acceleration:" msgstr "Acceleration:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1245 +#: ../src/ui/dialog/inkscape-preferences.cpp:1247 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" @@ -20481,16 +20387,16 @@ msgstr "" "Tryk og hold Ctrl+piletast øger gradvist rullehastigheden (0 for ingen " "acceleration)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1246 +#: ../src/ui/dialog/inkscape-preferences.cpp:1248 msgid "Autoscrolling" msgstr "Autorul" -#: ../src/ui/dialog/inkscape-preferences.cpp:1248 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 #, fuzzy msgid "_Speed:" msgstr "Hastighed:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" @@ -20498,13 +20404,13 @@ msgstr "" "Hvor hurtigt lærredets autoruller, når du trækker udenfor lærredets kant (0 " "for at slå autorul fra)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 #, fuzzy msgid "_Threshold:" msgstr "Tærskel:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1252 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" @@ -20512,11 +20418,14 @@ msgstr "" "Hvor langt i (skærmbilledpunkter) du skal være fra lærredets kant, for at " "slå autorul til. Positiv er udenfor lærredet, negativ er indenfor lærredet" -#. -#. _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false); -#. _page_scrolling.add_line( false, "", _scroll_space, "", -#. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)")); -#. +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +msgid "Mouse move pans when Space is pressed" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 +msgid "When on, pressing and holding Space and dragging pans canvas" +msgstr "" + #: ../src/ui/dialog/inkscape-preferences.cpp:1258 #, fuzzy msgid "Mouse wheel zooms by default" @@ -20699,7 +20608,7 @@ msgid "_Zoom in/out by:" msgstr "Zoom ind/ud med:" #: ../src/ui/dialog/inkscape-preferences.cpp:1324 -#: ../src/ui/dialog/objects.cpp:1626 +#: ../src/ui/dialog/objects.cpp:1630 #: ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "%" @@ -20709,7 +20618,7 @@ msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" msgstr "" -"KKlik på zoom-værktøjet, +/--knapper og midterklik, zoomer ind med denne " +"Klik på zoomværktøjet, +/--knapper og midterklik, zoomer ind med denne " "gangefaktor" #: ../src/ui/dialog/inkscape-preferences.cpp:1326 @@ -21020,7 +20929,7 @@ msgid "_Bitmap editor:" msgstr "Overgangseditor" #: ../src/ui/dialog/inkscape-preferences.cpp:1485 -#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:67 +#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "Eksportér" @@ -21353,12 +21262,12 @@ msgid "Hardware" msgstr "" #: ../src/ui/dialog/input.cpp:732 -#, fuzzy msgid "Link:" -msgstr "Linje" +msgstr "Link:" #: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 #: ../src/ui/dialog/input.cpp:1571 ../src/ui/widget/color-scales.cpp:46 +#: ../share/extensions/plotter.inx.h:24 msgid "None" msgstr "Ingen" @@ -21368,9 +21277,8 @@ msgid "Axes count:" msgstr "Skrifttype" #: ../src/ui/dialog/input.cpp:788 -#, fuzzy msgid "axis:" -msgstr "Radius" +msgstr "akser:" #: ../src/ui/dialog/input.cpp:812 #, fuzzy @@ -21392,9 +21300,8 @@ msgid "_Use pressure-sensitive tablet (requires restart)" msgstr "Om dialoger skal have en lukkeknap (kræver genstart)" #: ../src/ui/dialog/input.cpp:1086 -#, fuzzy msgid "Axes" -msgstr "Tegn håndtag" +msgstr "Akser" #: ../src/ui/dialog/input.cpp:1087 msgid "Keys" @@ -21407,10 +21314,10 @@ msgid "" msgstr "" #: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 -#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372 -#, fuzzy +#: ../src/widgets/spray-toolbar.cpp:311 ../src/widgets/spray-toolbar.cpp:427 +#: ../src/widgets/spray-toolbar.cpp:476 ../src/widgets/tweak-toolbar.cpp:372 msgid "Pressure" -msgstr "Bevaret" +msgstr "Tryk" #: ../src/ui/dialog/input.cpp:1616 msgid "X tilt" @@ -21430,12 +21337,42 @@ msgctxt "Input device axe" msgid "None" msgstr "" +#: ../src/ui/dialog/knot-properties.cpp:59 +#, fuzzy +msgid "Position X:" +msgstr "Placering:" + +#: ../src/ui/dialog/knot-properties.cpp:66 +#, fuzzy +msgid "Position Y:" +msgstr "Placering:" + +#: ../src/ui/dialog/knot-properties.cpp:120 +msgid "Modify Knot Position" +msgstr "" + +#: ../src/ui/dialog/knot-properties.cpp:121 +#: ../src/ui/dialog/layer-properties.cpp:411 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 +#: ../src/ui/dialog/transformation.cpp:107 +msgid "_Move" +msgstr "_Flyt" + +#: ../src/ui/dialog/knot-properties.cpp:180 +#, fuzzy, c-format +msgid "Position X (%s):" +msgstr "Placering:" + +#: ../src/ui/dialog/knot-properties.cpp:181 +#, fuzzy, c-format +msgid "Position Y (%s):" +msgstr "Placering:" + #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "Lagnavn:" #: ../src/ui/dialog/layer-properties.cpp:136 -#, fuzzy msgid "Add layer" msgstr "Tilføj lag" @@ -21458,7 +21395,7 @@ msgstr "Omdøb lag" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:354 #: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2337 +#: ../src/verbs.cpp:2364 msgid "Layer" msgstr "Lag" @@ -21467,9 +21404,8 @@ msgid "_Rename" msgstr "_Omdøb" #: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:758 -#, fuzzy msgid "Rename layer" -msgstr "Lag omdøbt" +msgstr "Omdøb lag" #. TRANSLATORS: This means "The layer has been renamed" #: ../src/ui/dialog/layer-properties.cpp:370 @@ -21493,12 +21429,6 @@ msgstr "Nyt lag oprettet." msgid "Move to Layer" msgstr "Sænk lag" -#: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 -#: ../src/ui/dialog/transformation.cpp:108 -msgid "_Move" -msgstr "_Flyt" - #: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 #, fuzzy msgid "Unhide layer" @@ -21520,13 +21450,13 @@ msgid "Unlock layer" msgstr "Sænk lag" #: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 -#: ../src/verbs.cpp:1407 +#: ../src/verbs.cpp:1424 #, fuzzy msgid "Toggle layer solo" msgstr "Slå aktuelle lagsynlighed til/fra" #: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 -#: ../src/verbs.cpp:1431 +#: ../src/verbs.cpp:1448 #, fuzzy msgid "Lock other layers" msgstr "Sænk lag" @@ -21537,10 +21467,9 @@ msgid "Move layer" msgstr "Sænk lag" #: ../src/ui/dialog/layers.cpp:892 -#, fuzzy msgctxt "Layers" msgid "New" -msgstr "Ny" +msgstr "Nyt" #: ../src/ui/dialog/layers.cpp:897 #, fuzzy @@ -21811,7 +21740,7 @@ msgstr "L_ås" #: ../src/ui/dialog/object-properties.cpp:139 msgid "" "The id= attribute (only letters, digits, and the characters .-_: allowed)" -msgstr "Attributten «id=» (kun bogstaver, tal og tegnene .-_: er tilladt)" +msgstr "id-attributten (kun bogstaver, tal og tegnene .-_: er tilladt)" #. Create the entry box for the object label #: ../src/ui/dialog/object-properties.cpp:174 @@ -21846,8 +21775,8 @@ msgid "Check to make the object insensitive (not selectable by mouse)" msgstr "Afmærk for at gøre objektet urørligt (ikke-markérbart med musen)" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2680 -#: ../src/verbs.cpp:2686 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2718 msgid "_Set" msgstr "_Angiv" @@ -21942,8 +21871,8 @@ msgstr "" msgid "Moved objects" msgstr "" -#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:857 -#: ../src/ui/dialog/tags.cpp:864 +#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:853 +#: ../src/ui/dialog/tags.cpp:860 msgid "Rename object" msgstr "" @@ -21963,153 +21892,158 @@ msgstr "" msgid "Set object blur" msgstr "" -#: ../src/ui/dialog/objects.cpp:1617 +#: ../src/ui/dialog/objects.cpp:1621 +msgctxt "Visibility" msgid "V" msgstr "" -#. TRANSLATORS: "L" here stands for Lightness -#: ../src/ui/dialog/objects.cpp:1618 ../src/widgets/tweak-toolbar.cpp:323 +#: ../src/ui/dialog/objects.cpp:1622 +#, fuzzy +msgctxt "Lock" msgid "L" msgstr "L" -#: ../src/ui/dialog/objects.cpp:1619 +#: ../src/ui/dialog/objects.cpp:1623 +msgctxt "Type" msgid "T" msgstr "" -#: ../src/ui/dialog/objects.cpp:1620 +#: ../src/ui/dialog/objects.cpp:1624 #, fuzzy +msgctxt "Clip and mask" msgid "CM" msgstr "CMYK" -#: ../src/ui/dialog/objects.cpp:1621 +#: ../src/ui/dialog/objects.cpp:1625 #, fuzzy +msgctxt "Highlight" msgid "HL" msgstr "HSL" -#: ../src/ui/dialog/objects.cpp:1622 +#: ../src/ui/dialog/objects.cpp:1626 #, fuzzy msgid "Label" msgstr "_Etiket" #. In order to get tooltips on header, we must create our own label. -#: ../src/ui/dialog/objects.cpp:1664 +#: ../src/ui/dialog/objects.cpp:1668 #, fuzzy msgid "Toggle visibility of Layer, Group, or Object." msgstr "Sænk det aktuelle lag" -#: ../src/ui/dialog/objects.cpp:1677 +#: ../src/ui/dialog/objects.cpp:1681 msgid "Toggle lock of Layer, Group, or Object." msgstr "" -#: ../src/ui/dialog/objects.cpp:1689 +#: ../src/ui/dialog/objects.cpp:1693 msgid "" "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " "between the two types." msgstr "" -#: ../src/ui/dialog/objects.cpp:1708 +#: ../src/ui/dialog/objects.cpp:1712 msgid "Is object clipped and/or masked?" msgstr "" -#: ../src/ui/dialog/objects.cpp:1719 +#: ../src/ui/dialog/objects.cpp:1723 msgid "" "Highlight color of outline in Node tool. Click to set. If alpha is zero, use " "inherited color." msgstr "" -#: ../src/ui/dialog/objects.cpp:1730 +#: ../src/ui/dialog/objects.cpp:1734 msgid "" "Layer/Group/Object label (inkscape:label). Double-click to set. Default " "value is object 'id'." msgstr "" -#: ../src/ui/dialog/objects.cpp:1827 +#: ../src/ui/dialog/objects.cpp:1831 msgid "Add layer..." msgstr "Tilføj lag ..." -#: ../src/ui/dialog/objects.cpp:1834 +#: ../src/ui/dialog/objects.cpp:1838 msgid "Remove object" msgstr "" -#: ../src/ui/dialog/objects.cpp:1842 +#: ../src/ui/dialog/objects.cpp:1846 msgid "Move To Bottom" msgstr "" -#: ../src/ui/dialog/objects.cpp:1866 +#: ../src/ui/dialog/objects.cpp:1870 msgid "Move To Top" msgstr "" -#: ../src/ui/dialog/objects.cpp:1874 +#: ../src/ui/dialog/objects.cpp:1878 msgid "Collapse All" msgstr "" -#: ../src/ui/dialog/objects.cpp:1888 +#: ../src/ui/dialog/objects.cpp:1892 #, fuzzy msgid "Rename" msgstr "_Omdøb" -#: ../src/ui/dialog/objects.cpp:1894 +#: ../src/ui/dialog/objects.cpp:1898 msgid "Solo" msgstr "" -#: ../src/ui/dialog/objects.cpp:1895 +#: ../src/ui/dialog/objects.cpp:1899 #, fuzzy msgid "Show All" msgstr "Vis:" -#: ../src/ui/dialog/objects.cpp:1896 +#: ../src/ui/dialog/objects.cpp:1900 #, fuzzy msgid "Hide All" msgstr "Vis alle" -#: ../src/ui/dialog/objects.cpp:1900 +#: ../src/ui/dialog/objects.cpp:1904 #, fuzzy msgid "Lock Others" msgstr "Sænk lag" -#: ../src/ui/dialog/objects.cpp:1901 +#: ../src/ui/dialog/objects.cpp:1905 #, fuzzy msgid "Lock All" msgstr "Oplås alle" #. LockAndHide -#: ../src/ui/dialog/objects.cpp:1902 ../src/verbs.cpp:2968 +#: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3010 msgid "Unlock All" msgstr "Oplås alle" -#: ../src/ui/dialog/objects.cpp:1906 +#: ../src/ui/dialog/objects.cpp:1910 #, fuzzy msgid "Up" msgstr "Op" -#: ../src/ui/dialog/objects.cpp:1907 +#: ../src/ui/dialog/objects.cpp:1911 msgid "Down" msgstr "" -#: ../src/ui/dialog/objects.cpp:1916 +#: ../src/ui/dialog/objects.cpp:1920 #, fuzzy msgid "Set Clip" msgstr "Uindfattet udfyldning" #. will never be implemented #. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) ); -#: ../src/ui/dialog/objects.cpp:1922 +#: ../src/ui/dialog/objects.cpp:1926 #, fuzzy msgid "Unset Clip" msgstr "Uindfattet udfyldning" #. Set mask -#: ../src/ui/dialog/objects.cpp:1926 ../src/ui/interface.cpp:1739 +#: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1736 #, fuzzy msgid "Set Mask" msgstr "Vælg maske" -#: ../src/ui/dialog/objects.cpp:1927 +#: ../src/ui/dialog/objects.cpp:1931 #, fuzzy msgid "Unset Mask" msgstr "Vælg maske" -#: ../src/ui/dialog/objects.cpp:1949 +#: ../src/ui/dialog/objects.cpp:1953 msgid "Select Highlight Color" msgstr "" @@ -22138,7 +22072,7 @@ msgstr "Kunne ikke eksportere til filnavn %s.\n" #: ../src/ui/dialog/ocaldialogs.cpp:1011 #, fuzzy msgid "No description" -msgstr " beskrivelse: " +msgstr "Ingen beskrivelse" #: ../src/ui/dialog/ocaldialogs.cpp:1079 msgid "Searching clipart..." @@ -22497,9 +22431,8 @@ msgid "Family Name:" msgstr "Sæt filnavn" #: ../src/ui/dialog/svg-fonts-dialog.cpp:397 -#, fuzzy msgid "Set width:" -msgstr "Kildes bredde" +msgstr "Indstil bredde:" #: ../src/ui/dialog/svg-fonts-dialog.cpp:456 msgid "glyph" @@ -22545,14 +22478,12 @@ msgid "Set glyph unicode" msgstr "" #: ../src/ui/dialog/svg-fonts-dialog.cpp:649 -#, fuzzy msgid "Remove font" -msgstr "Fjern udfyldning" +msgstr "Fjern skrifttype" #: ../src/ui/dialog/svg-fonts-dialog.cpp:666 -#, fuzzy msgid "Remove glyph" -msgstr "Fjern udfyldning" +msgstr "" #: ../src/ui/dialog/svg-fonts-dialog.cpp:683 #, fuzzy @@ -22607,9 +22538,8 @@ msgid "2nd Glyph:" msgstr "" #: ../src/ui/dialog/svg-fonts-dialog.cpp:785 -#, fuzzy msgid "Add pair" -msgstr "Tilføj lag" +msgstr "Tilføj par" #: ../src/ui/dialog/svg-fonts-dialog.cpp:797 #, fuzzy @@ -22631,15 +22561,13 @@ msgid "Set font family" msgstr "Skrifttype" #: ../src/ui/dialog/svg-fonts-dialog.cpp:872 -#, fuzzy msgid "font" -msgstr "Skrifttype" +msgstr "skrifttype" #. select_font(font); #: ../src/ui/dialog/svg-fonts-dialog.cpp:887 -#, fuzzy msgid "Add font" -msgstr "Tilføj lag" +msgstr "Tilføj skrifttype" #: ../src/ui/dialog/svg-fonts-dialog.cpp:913 ../src/ui/dialog/text-edit.cpp:69 msgid "_Font" @@ -22694,9 +22622,8 @@ msgid "Edit..." msgstr "Redigér ..." #: ../src/ui/dialog/swatches.cpp:298 -#, fuzzy msgid "Convert" -msgstr "Omfang" +msgstr "Konvertér" #: ../src/ui/dialog/swatches.cpp:542 #, c-format @@ -22751,28 +22678,28 @@ msgstr "" msgid "Unnamed Symbols" msgstr "Sidste valgte farve" -#: ../src/ui/dialog/tags.cpp:274 ../src/ui/dialog/tags.cpp:573 -#: ../src/ui/dialog/tags.cpp:687 +#: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 +#: ../src/ui/dialog/tags.cpp:683 msgid "Remove from selection set" msgstr "" -#: ../src/ui/dialog/tags.cpp:431 +#: ../src/ui/dialog/tags.cpp:427 msgid "Items" msgstr "" -#: ../src/ui/dialog/tags.cpp:670 +#: ../src/ui/dialog/tags.cpp:666 msgid "Add selection to set" msgstr "" -#: ../src/ui/dialog/tags.cpp:828 +#: ../src/ui/dialog/tags.cpp:824 msgid "Moved sets" msgstr "" -#: ../src/ui/dialog/tags.cpp:998 +#: ../src/ui/dialog/tags.cpp:994 msgid "Add a new selection set" msgstr "" -#: ../src/ui/dialog/tags.cpp:1007 +#: ../src/ui/dialog/tags.cpp:1003 msgid "Remove Item/Set" msgstr "" @@ -22785,19 +22712,16 @@ msgid "no template selected" msgstr "Ingen skabelon valgt" #: ../src/ui/dialog/template-widget.cpp:123 -#, fuzzy msgid "Path: " -msgstr "Sti" +msgstr "Sti:" #: ../src/ui/dialog/template-widget.cpp:126 -#, fuzzy msgid "Description: " -msgstr "Beskrivelse" +msgstr "Beskrivelse:" #: ../src/ui/dialog/template-widget.cpp:128 -#, fuzzy msgid "Keywords: " -msgstr "Nøgleord" +msgstr "Nøgleord:" #: ../src/ui/dialog/template-widget.cpp:135 msgid "By: " @@ -22812,38 +22736,37 @@ msgid "Set as _default" msgstr "Anven_d som standard" #: ../src/ui/dialog/text-edit.cpp:87 -#, fuzzy -msgid "AaBbCcIiPpQq12369$ےے?.;/()" +msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/()" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1339 -#: ../src/widgets/text-toolbar.cpp:1340 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1432 +#: ../src/widgets/text-toolbar.cpp:1433 msgid "Align left" msgstr "Venstrestillet" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1347 -#: ../src/widgets/text-toolbar.cpp:1348 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1440 +#: ../src/widgets/text-toolbar.cpp:1441 #, fuzzy msgid "Align center" msgstr "Venstrestillet" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1355 -#: ../src/widgets/text-toolbar.cpp:1356 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1448 +#: ../src/widgets/text-toolbar.cpp:1449 msgid "Align right" msgstr "Højrestillet" -#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1364 +#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1457 #, fuzzy msgid "Justify (only flowed text)" msgstr "Flydende tekst" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1399 +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1492 msgid "Horizontal text" msgstr "Vandret tekst" -#: ../src/ui/dialog/text-edit.cpp:110 ../src/widgets/text-toolbar.cpp:1406 +#: ../src/ui/dialog/text-edit.cpp:110 msgid "Vertical text" msgstr "Lodret tekst" @@ -22857,7 +22780,7 @@ msgstr "Mellemrum mellem linjer" msgid "Text path offset" msgstr "Justér forskydningsafstand" -#: ../src/ui/dialog/text-edit.cpp:598 ../src/ui/dialog/text-edit.cpp:685 +#: ../src/ui/dialog/text-edit.cpp:612 ../src/ui/dialog/text-edit.cpp:699 #: ../src/ui/tools/text-tool.cpp:1446 #, fuzzy msgid "Set text style" @@ -23101,20 +23024,23 @@ msgstr "Tolerance:" #. ## end option page #: ../src/ui/dialog/tracedialog.cpp:753 -#, fuzzy msgid "O_ptions" -msgstr "Beskrivelse" +msgstr "" #. ### credits #: ../src/ui/dialog/tracedialog.cpp:757 -#, fuzzy msgid "" "Inkscape bitmap tracing\n" "is based on Potrace,\n" "created by Peter Selinger\n" "\n" "http://potrace.sourceforge.net" -msgstr "Tak til Peter Selinger, http://potrace.sourceforge.net" +msgstr "" +"Inkscape bitmap tracing\n" +"er baseret på Potrace,\n" +"skabt af Peter Selinger\n" +"\n" +"http://potrace.sourceforge.net" #: ../src/ui/dialog/tracedialog.cpp:760 msgid "Credits" @@ -23137,9 +23063,8 @@ msgid "Live Preview" msgstr "Forhåndsvis" #: ../src/ui/dialog/tracedialog.cpp:788 -#, fuzzy msgid "_Update" -msgstr "Dato" +msgstr "_Opdatér" #. I guess it's correct to call the "intermediate bitmap" a preview of the trace #: ../src/ui/dialog/tracedialog.cpp:796 @@ -23153,47 +23078,44 @@ msgstr "Forhåndsvis resultatet uden egentlig sporing" msgid "Preview" msgstr "Forhåndsvis" -#: ../src/ui/dialog/transformation.cpp:70 -#: ../src/ui/dialog/transformation.cpp:80 -#, fuzzy +#: ../src/ui/dialog/transformation.cpp:69 +#: ../src/ui/dialog/transformation.cpp:79 msgid "_Horizontal:" -msgstr "_Vandret" +msgstr "_Vandret:" -#: ../src/ui/dialog/transformation.cpp:70 +#: ../src/ui/dialog/transformation.cpp:69 msgid "Horizontal displacement (relative) or position (absolute)" msgstr "Vandret forskydning (relativ) eller position (absolut)" -#: ../src/ui/dialog/transformation.cpp:72 -#: ../src/ui/dialog/transformation.cpp:82 -#, fuzzy +#: ../src/ui/dialog/transformation.cpp:71 +#: ../src/ui/dialog/transformation.cpp:81 msgid "_Vertical:" -msgstr "_Lodret" +msgstr "_Lodret:" -#: ../src/ui/dialog/transformation.cpp:72 +#: ../src/ui/dialog/transformation.cpp:71 msgid "Vertical displacement (relative) or position (absolute)" msgstr "Lodret forskydning (relativ) eller position (absolut)" -#: ../src/ui/dialog/transformation.cpp:74 +#: ../src/ui/dialog/transformation.cpp:73 #, fuzzy msgid "Horizontal size (absolute or percentage of current)" msgstr "Vandret størrelsesforøgelse (absolut eller procendel)" -#: ../src/ui/dialog/transformation.cpp:76 +#: ../src/ui/dialog/transformation.cpp:75 #, fuzzy msgid "Vertical size (absolute or percentage of current)" msgstr "Lodret størrelsesforøgelse (absolut eller procentdel)" -#: ../src/ui/dialog/transformation.cpp:78 -#, fuzzy +#: ../src/ui/dialog/transformation.cpp:77 msgid "A_ngle:" -msgstr "V_inkel" +msgstr "V_inkel:" -#: ../src/ui/dialog/transformation.cpp:78 -#: ../src/ui/dialog/transformation.cpp:1103 +#: ../src/ui/dialog/transformation.cpp:77 +#: ../src/ui/dialog/transformation.cpp:1102 msgid "Rotation angle (positive = counterclockwise)" msgstr "Rotationsvinkel (positiv = mod urets retning)" -#: ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/dialog/transformation.cpp:79 msgid "" "Horizontal skew angle (positive = counterclockwise), or absolute " "displacement, or percentage displacement" @@ -23201,7 +23123,7 @@ msgstr "" "Vandret vridningsvinkel (positiv = mod uret) eller absolut forskydning, " "eller procentvis forskydning" -#: ../src/ui/dialog/transformation.cpp:82 +#: ../src/ui/dialog/transformation.cpp:81 msgid "" "Vertical skew angle (positive = counterclockwise), or absolute displacement, " "or percentage displacement" @@ -23209,35 +23131,35 @@ msgstr "" "Lodret vridningsvinkel (positiv = mod uret) eller absolut forskydning, eller " "procentvis forskydning" -#: ../src/ui/dialog/transformation.cpp:85 +#: ../src/ui/dialog/transformation.cpp:84 msgid "Transformation matrix element A" msgstr "Transformationsmatrixelement A" -#: ../src/ui/dialog/transformation.cpp:86 +#: ../src/ui/dialog/transformation.cpp:85 msgid "Transformation matrix element B" msgstr "Transformationsmatrixelement B" -#: ../src/ui/dialog/transformation.cpp:87 +#: ../src/ui/dialog/transformation.cpp:86 msgid "Transformation matrix element C" msgstr "Transformationsmatrixelement C" -#: ../src/ui/dialog/transformation.cpp:88 +#: ../src/ui/dialog/transformation.cpp:87 msgid "Transformation matrix element D" msgstr "Transformationsmatrixelement D" -#: ../src/ui/dialog/transformation.cpp:89 +#: ../src/ui/dialog/transformation.cpp:88 msgid "Transformation matrix element E" msgstr "Transformationsmatrixelement E" -#: ../src/ui/dialog/transformation.cpp:90 +#: ../src/ui/dialog/transformation.cpp:89 msgid "Transformation matrix element F" msgstr "Transformationsmatrixelement F" -#: ../src/ui/dialog/transformation.cpp:95 +#: ../src/ui/dialog/transformation.cpp:94 msgid "Rela_tive move" msgstr "Rela_tiv flytning" -#: ../src/ui/dialog/transformation.cpp:95 +#: ../src/ui/dialog/transformation.cpp:94 msgid "" "Add the specified relative displacement to the current position; otherwise, " "edit the current absolute position directly" @@ -23245,20 +23167,19 @@ msgstr "" "Tilføj den angivede relative forskydning til den aktuelle position; eller " "redigér den aktuelle absolutte position direkte" -#: ../src/ui/dialog/transformation.cpp:96 -#, fuzzy +#: ../src/ui/dialog/transformation.cpp:95 msgid "_Scale proportionally" -msgstr "Skalér proportionalt" +msgstr "_Skalér proportionalt" -#: ../src/ui/dialog/transformation.cpp:96 +#: ../src/ui/dialog/transformation.cpp:95 msgid "Preserve the width/height ratio of the scaled objects" msgstr "Bevar bredde/højde-forholdet på de skalerede objekter" -#: ../src/ui/dialog/transformation.cpp:97 +#: ../src/ui/dialog/transformation.cpp:96 msgid "Apply to each _object separately" msgstr "Anvend på hvert _objekt separat" -#: ../src/ui/dialog/transformation.cpp:97 +#: ../src/ui/dialog/transformation.cpp:96 msgid "" "Apply the scale/rotate/skew to each selected object separately; otherwise, " "transform the selection as a whole" @@ -23266,11 +23187,11 @@ msgstr "" "Anvend skalering/rotation/vridning på hvert markeret objekt separat; ellers " "transformér markeringen som et hele" -#: ../src/ui/dialog/transformation.cpp:98 +#: ../src/ui/dialog/transformation.cpp:97 msgid "Edit c_urrent matrix" msgstr "Redigér akt_uelle matrix" -#: ../src/ui/dialog/transformation.cpp:98 +#: ../src/ui/dialog/transformation.cpp:97 msgid "" "Edit the current transform= matrix; otherwise, post-multiply transform= by " "this matrix" @@ -23278,56 +23199,56 @@ msgstr "" "Redigér den aktuelle tranformation = matrix; ellers, post-multipy-" "tranformation= med denne matrix" -#: ../src/ui/dialog/transformation.cpp:111 +#: ../src/ui/dialog/transformation.cpp:110 msgid "_Scale" msgstr "_Skalér" -#: ../src/ui/dialog/transformation.cpp:114 +#: ../src/ui/dialog/transformation.cpp:113 msgid "_Rotate" msgstr "_Rotér" -#: ../src/ui/dialog/transformation.cpp:117 +#: ../src/ui/dialog/transformation.cpp:116 msgid "Ske_w" msgstr "_Vrid" -#: ../src/ui/dialog/transformation.cpp:120 +#: ../src/ui/dialog/transformation.cpp:119 msgid "Matri_x" msgstr "Matri_x" -#: ../src/ui/dialog/transformation.cpp:144 +#: ../src/ui/dialog/transformation.cpp:143 msgid "Reset the values on the current tab to defaults" msgstr "Nulstil værdier i det aktuelle faneblad til standardværdierne" -#: ../src/ui/dialog/transformation.cpp:151 +#: ../src/ui/dialog/transformation.cpp:150 msgid "Apply transformation to selection" msgstr "Anvend transformation på markering" -#: ../src/ui/dialog/transformation.cpp:327 +#: ../src/ui/dialog/transformation.cpp:326 #, fuzzy msgid "Rotate in a counterclockwise direction" msgstr "Rotation er mod uret" -#: ../src/ui/dialog/transformation.cpp:333 +#: ../src/ui/dialog/transformation.cpp:332 #, fuzzy msgid "Rotate in a clockwise direction" msgstr "Rotation er mod uret" -#: ../src/ui/dialog/transformation.cpp:906 -#: ../src/ui/dialog/transformation.cpp:917 -#: ../src/ui/dialog/transformation.cpp:931 -#: ../src/ui/dialog/transformation.cpp:950 -#: ../src/ui/dialog/transformation.cpp:961 -#: ../src/ui/dialog/transformation.cpp:971 -#: ../src/ui/dialog/transformation.cpp:995 +#: ../src/ui/dialog/transformation.cpp:905 +#: ../src/ui/dialog/transformation.cpp:916 +#: ../src/ui/dialog/transformation.cpp:930 +#: ../src/ui/dialog/transformation.cpp:949 +#: ../src/ui/dialog/transformation.cpp:960 +#: ../src/ui/dialog/transformation.cpp:970 +#: ../src/ui/dialog/transformation.cpp:994 msgid "Transform matrix is singular, not used." msgstr "" -#: ../src/ui/dialog/transformation.cpp:1011 +#: ../src/ui/dialog/transformation.cpp:1010 #, fuzzy msgid "Edit transformation matrix" msgstr "Transformationsmatrixelement F" -#: ../src/ui/dialog/transformation.cpp:1110 +#: ../src/ui/dialog/transformation.cpp:1109 #, fuzzy msgid "Rotation angle (positive = clockwise)" msgstr "Rotationsvinkel (positiv = mod urets retning)" @@ -23439,73 +23360,73 @@ msgstr "" msgid "Change attribute" msgstr "Sæt attribut" -#: ../src/ui/interface.cpp:748 +#: ../src/ui/interface.cpp:751 msgctxt "Interface setup" msgid "Default" msgstr "Standard" -#: ../src/ui/interface.cpp:748 +#: ../src/ui/interface.cpp:751 #, fuzzy msgid "Default interface setup" msgstr "Standarder" -#: ../src/ui/interface.cpp:749 +#: ../src/ui/interface.cpp:752 msgctxt "Interface setup" msgid "Custom" msgstr "Brugerdefineret" -#: ../src/ui/interface.cpp:749 +#: ../src/ui/interface.cpp:752 msgid "Setup for custom task" msgstr "" -#: ../src/ui/interface.cpp:750 +#: ../src/ui/interface.cpp:753 msgctxt "Interface setup" msgid "Wide" msgstr "Bred" -#: ../src/ui/interface.cpp:750 +#: ../src/ui/interface.cpp:753 msgid "Setup for widescreen work" msgstr "" -#: ../src/ui/interface.cpp:862 +#: ../src/ui/interface.cpp:863 #, c-format msgid "Verb \"%s\" Unknown" msgstr "Verbum \"%s\" er ukendt" -#: ../src/ui/interface.cpp:901 +#: ../src/ui/interface.cpp:898 msgid "Open _Recent" msgstr "_Åbn seneste" -#: ../src/ui/interface.cpp:1009 ../src/ui/interface.cpp:1095 -#: ../src/ui/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:544 +#: ../src/ui/interface.cpp:1006 ../src/ui/interface.cpp:1092 +#: ../src/ui/interface.cpp:1195 ../src/ui/widget/selected-style.cpp:544 #, fuzzy msgid "Drop color" msgstr "Kopiér farve" -#: ../src/ui/interface.cpp:1048 ../src/ui/interface.cpp:1158 +#: ../src/ui/interface.cpp:1045 ../src/ui/interface.cpp:1155 #, fuzzy msgid "Drop color on gradient" msgstr "Ingen stop i overgange" -#: ../src/ui/interface.cpp:1211 +#: ../src/ui/interface.cpp:1208 msgid "Could not parse SVG data" msgstr "Kunne ikke fortolke SVG-data" -#: ../src/ui/interface.cpp:1250 +#: ../src/ui/interface.cpp:1247 msgid "Drop SVG" msgstr "" -#: ../src/ui/interface.cpp:1263 +#: ../src/ui/interface.cpp:1260 #, fuzzy msgid "Drop Symbol" msgstr "Kopiér farve" -#: ../src/ui/interface.cpp:1294 +#: ../src/ui/interface.cpp:1291 #, fuzzy msgid "Drop bitmap image" msgstr "Importér punktbillede som " -#: ../src/ui/interface.cpp:1386 +#: ../src/ui/interface.cpp:1383 #, c-format msgid "" "A file named \"%s\" already exists. Do " @@ -23514,184 +23435,181 @@ msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" -#: ../src/ui/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21 +#: ../src/ui/interface.cpp:1390 ../share/extensions/web-set-att.inx.h:21 #: ../share/extensions/web-transmit-att.inx.h:19 -#, fuzzy msgid "Replace" -msgstr "_Slip" +msgstr "Erstat" -#: ../src/ui/interface.cpp:1464 +#: ../src/ui/interface.cpp:1461 msgid "Go to parent" msgstr "Gå til forælder" #. TRANSLATORS: #%1 is the id of the group e.g. , not a number. -#: ../src/ui/interface.cpp:1505 +#: ../src/ui/interface.cpp:1502 #, fuzzy msgid "Enter group #%1" msgstr "Gå ind i gruppe #%s" #. Item dialog -#: ../src/ui/interface.cpp:1641 ../src/verbs.cpp:2901 +#: ../src/ui/interface.cpp:1638 ../src/verbs.cpp:2939 msgid "_Object Properties..." msgstr "_Objektegenskaber ..." -#: ../src/ui/interface.cpp:1650 +#: ../src/ui/interface.cpp:1647 msgid "_Select This" msgstr "_Vælg dette" -#: ../src/ui/interface.cpp:1661 +#: ../src/ui/interface.cpp:1658 #, fuzzy msgid "Select Same" msgstr "Slet tekst" #. Select same fill and stroke -#: ../src/ui/interface.cpp:1671 +#: ../src/ui/interface.cpp:1668 #, fuzzy msgid "Fill and Stroke" msgstr "Ud_fyldning og streg" #. Select same fill color -#: ../src/ui/interface.cpp:1678 +#: ../src/ui/interface.cpp:1675 #, fuzzy msgid "Fill Color" msgstr "Enkel farve" #. Select same stroke color -#: ../src/ui/interface.cpp:1685 +#: ../src/ui/interface.cpp:1682 #, fuzzy msgid "Stroke Color" msgstr "Sidste valgte farve" #. Select same stroke style -#: ../src/ui/interface.cpp:1692 +#: ../src/ui/interface.cpp:1689 #, fuzzy msgid "Stroke Style" msgstr "Stregst_il" #. Select same stroke style -#: ../src/ui/interface.cpp:1699 +#: ../src/ui/interface.cpp:1696 #, fuzzy msgid "Object type" msgstr "Objekt" #. Move to layer -#: ../src/ui/interface.cpp:1706 +#: ../src/ui/interface.cpp:1703 msgid "_Move to layer ..." msgstr "_Flyt til lag ..." #. Create link -#: ../src/ui/interface.cpp:1716 +#: ../src/ui/interface.cpp:1713 #, fuzzy msgid "Create _Link" msgstr "_Opret link" #. Release mask -#: ../src/ui/interface.cpp:1750 +#: ../src/ui/interface.cpp:1747 #, fuzzy msgid "Release Mask" msgstr "Frigiv maske" #. SSet Clip Group -#: ../src/ui/interface.cpp:1761 +#: ../src/ui/interface.cpp:1758 msgid "Create Clip G_roup" msgstr "" #. Set Clip -#: ../src/ui/interface.cpp:1768 +#: ../src/ui/interface.cpp:1765 #, fuzzy msgid "Set Cl_ip" msgstr "Uindfattet udfyldning" #. Release Clip -#: ../src/ui/interface.cpp:1779 +#: ../src/ui/interface.cpp:1776 #, fuzzy msgid "Release C_lip" msgstr "_Slip" #. Group -#: ../src/ui/interface.cpp:1790 ../src/verbs.cpp:2534 +#: ../src/ui/interface.cpp:1787 ../src/verbs.cpp:2562 msgid "_Group" msgstr "_Gruppér" -#: ../src/ui/interface.cpp:1861 -#, fuzzy +#: ../src/ui/interface.cpp:1858 msgid "Create link" -msgstr "_Opret link" +msgstr "Opret link" #. Ungroup -#: ../src/ui/interface.cpp:1896 ../src/verbs.cpp:2536 +#: ../src/ui/interface.cpp:1893 ../src/verbs.cpp:2564 msgid "_Ungroup" msgstr "_Afgruppér" #. Link dialog -#: ../src/ui/interface.cpp:1920 +#: ../src/ui/interface.cpp:1917 msgid "Link _Properties..." msgstr "Linke_genskaber ..." #. Select item -#: ../src/ui/interface.cpp:1926 +#: ../src/ui/interface.cpp:1923 msgid "_Follow Link" msgstr "_Følg link" #. Reset transformations -#: ../src/ui/interface.cpp:1932 +#: ../src/ui/interface.cpp:1929 msgid "_Remove Link" msgstr "F_jern link" -#: ../src/ui/interface.cpp:1963 +#: ../src/ui/interface.cpp:1960 #, fuzzy msgid "Remove link" msgstr "F_jern link" #. Image properties -#: ../src/ui/interface.cpp:1973 +#: ../src/ui/interface.cpp:1970 msgid "Image _Properties..." msgstr "_Billedegenskaber ..." #. Edit externally -#: ../src/ui/interface.cpp:1979 +#: ../src/ui/interface.cpp:1976 #, fuzzy msgid "Edit Externally..." msgstr "Redigér udfyldning..." #. Trace Bitmap #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/ui/interface.cpp:1988 ../src/verbs.cpp:2597 +#: ../src/ui/interface.cpp:1985 ../src/verbs.cpp:2627 msgid "_Trace Bitmap..." msgstr "_Spor billede ..." #. Trace Pixel Art -#: ../src/ui/interface.cpp:1997 +#: ../src/ui/interface.cpp:1994 msgid "Trace Pixel Art" msgstr "Spor pixelart" -#: ../src/ui/interface.cpp:2007 -#, fuzzy +#: ../src/ui/interface.cpp:2004 msgctxt "Context menu" msgid "Embed Image" -msgstr "Indlejr alle billeder" +msgstr "Indlejr billede" -#: ../src/ui/interface.cpp:2018 +#: ../src/ui/interface.cpp:2015 msgctxt "Context menu" msgid "Extract Image..." -msgstr "Udpak billede ..." +msgstr "Udtræk billede..." #. Item dialog #. Fill and Stroke dialog -#: ../src/ui/interface.cpp:2162 ../src/ui/interface.cpp:2182 -#: ../src/verbs.cpp:2864 +#: ../src/ui/interface.cpp:2159 ../src/ui/interface.cpp:2179 +#: ../src/verbs.cpp:2902 msgid "_Fill and Stroke..." msgstr "_Udfyldning og streg ..." #. Edit Text dialog -#: ../src/ui/interface.cpp:2188 ../src/verbs.cpp:2883 +#: ../src/ui/interface.cpp:2185 ../src/verbs.cpp:2921 msgid "_Text and Font..." msgstr "_Tekst og skrifttype ..." #. Spellcheck dialog -#: ../src/ui/interface.cpp:2194 ../src/verbs.cpp:2891 +#: ../src/ui/interface.cpp:2191 ../src/verbs.cpp:2929 msgid "Check Spellin_g..." -msgstr "Stavekontrol ..." +msgstr "_Stavekontrol ..." #: ../src/ui/object-edit.cpp:450 msgid "" @@ -23752,7 +23670,7 @@ msgid "" "segment" msgstr "" "Placér buen eller linjestykkets startpunkt med Ctrl for " -"trinvis justering; træk indeni ellipsen for bue, udenfor for " +"trinvis justering; træk ind i ellipsen for bue, udenfor for " "linjestykke" #: ../src/ui/object-edit.cpp:996 @@ -23762,7 +23680,7 @@ msgid "" "segment" msgstr "" "Placér buen eller linjestykkets slutpunkt med Ctrl for trinvis " -"justering; træk indeni ellipsen for bue, udenfor for " +"justering; træk inden i ellipsen for bue, udenfor for " "linjestykke" #: ../src/ui/object-edit.cpp:1142 @@ -23800,11 +23718,11 @@ msgstr "" "Rul/udrul spiralen fra yderst; med Ctrl for trinvis justering; " "med Alt for at skalere/rotere" -#: ../src/ui/object-edit.cpp:1396 +#: ../src/ui/object-edit.cpp:1398 msgid "Adjust the offset distance" msgstr "Justér forskydningsafstand" -#: ../src/ui/object-edit.cpp:1433 +#: ../src/ui/object-edit.cpp:1435 msgid "Drag to resize the flowed text frame" msgstr "Træk for at ændre størrelsen på den flydende tekstramme" @@ -24187,50 +24105,49 @@ msgstr "Tegn håndtag" msgid "Retract handle" msgstr "Træk håndtag tilbage" -#: ../src/ui/tool/transform-handle-set.cpp:195 +#: ../src/ui/tool/transform-handle-set.cpp:203 #, fuzzy msgctxt "Transform handle tip" msgid "Shift+Ctrl: scale uniformly about the rotation center" msgstr "Shift: tegn omkring startpunktet" -#: ../src/ui/tool/transform-handle-set.cpp:197 -#, fuzzy +#: ../src/ui/tool/transform-handle-set.cpp:205 msgctxt "Transform handle tip" msgid "Ctrl: scale uniformly" -msgstr "Ctrl: trinvis justering" +msgstr "Ctrl: skalér ensformet" -#: ../src/ui/tool/transform-handle-set.cpp:202 +#: ../src/ui/tool/transform-handle-set.cpp:210 #, fuzzy msgctxt "Transform handle tip" msgid "" "Shift+Alt: scale using an integer ratio about the rotation center" msgstr "Shift: tegn overgang omkring startpunktet" -#: ../src/ui/tool/transform-handle-set.cpp:204 +#: ../src/ui/tool/transform-handle-set.cpp:212 #, fuzzy msgctxt "Transform handle tip" msgid "Shift: scale from the rotation center" msgstr "Shift: tegn omkring startpunktet" -#: ../src/ui/tool/transform-handle-set.cpp:207 +#: ../src/ui/tool/transform-handle-set.cpp:215 #, fuzzy msgctxt "Transform handle tip" msgid "Alt: scale using an integer ratio" msgstr "Alt: lås spiralradius" -#: ../src/ui/tool/transform-handle-set.cpp:209 +#: ../src/ui/tool/transform-handle-set.cpp:217 #, fuzzy msgctxt "Transform handle tip" msgid "Scale handle: drag to scale the selection" msgstr "Ingen stier at vende om i det markerede." -#: ../src/ui/tool/transform-handle-set.cpp:214 +#: ../src/ui/tool/transform-handle-set.cpp:222 #, c-format msgctxt "Transform handle tip" msgid "Scale by %.2f%% x %.2f%%" msgstr "" -#: ../src/ui/tool/transform-handle-set.cpp:438 +#: ../src/ui/tool/transform-handle-set.cpp:449 #, c-format msgctxt "Transform handle tip" msgid "" @@ -24238,19 +24155,19 @@ msgid "" "increments" msgstr "" -#: ../src/ui/tool/transform-handle-set.cpp:441 +#: ../src/ui/tool/transform-handle-set.cpp:452 #, fuzzy msgctxt "Transform handle tip" msgid "Shift: rotate around the opposite corner" msgstr "Shift: tegn omkring startpunktet" -#: ../src/ui/tool/transform-handle-set.cpp:445 +#: ../src/ui/tool/transform-handle-set.cpp:456 #, fuzzy, c-format msgctxt "Transform handle tip" msgid "Ctrl: snap angle to %f° increments" msgstr "Ctrl: trinvis justering" -#: ../src/ui/tool/transform-handle-set.cpp:447 +#: ../src/ui/tool/transform-handle-set.cpp:458 msgctxt "Transform handle tip" msgid "" "Rotation handle: drag to rotate the selection around the rotation " @@ -24258,13 +24175,13 @@ msgid "" msgstr "" #. event -#: ../src/ui/tool/transform-handle-set.cpp:452 +#: ../src/ui/tool/transform-handle-set.cpp:463 #, fuzzy, c-format msgctxt "Transform handle tip" msgid "Rotate by %.2f°" msgstr "Rotér med billedpunkter" -#: ../src/ui/tool/transform-handle-set.cpp:578 +#: ../src/ui/tool/transform-handle-set.cpp:588 #, c-format msgctxt "Transform handle tip" msgid "" @@ -24272,65 +24189,65 @@ msgid "" "increments" msgstr "" -#: ../src/ui/tool/transform-handle-set.cpp:581 +#: ../src/ui/tool/transform-handle-set.cpp:591 #, fuzzy msgctxt "Transform handle tip" msgid "Shift: skew about the rotation center" msgstr "Shift: tegn omkring startpunktet" -#: ../src/ui/tool/transform-handle-set.cpp:585 +#: ../src/ui/tool/transform-handle-set.cpp:595 #, fuzzy, c-format msgctxt "Transform handle tip" msgid "Ctrl: snap skew angle to %f° increments" msgstr "Ctrl: trinvis justering" -#: ../src/ui/tool/transform-handle-set.cpp:588 +#: ../src/ui/tool/transform-handle-set.cpp:598 msgctxt "Transform handle tip" msgid "" "Skew handle: drag to skew (shear) selection about the opposite handle" msgstr "" -#: ../src/ui/tool/transform-handle-set.cpp:594 +#: ../src/ui/tool/transform-handle-set.cpp:604 #, fuzzy, c-format msgctxt "Transform handle tip" msgid "Skew horizontally by %.2f°" msgstr "Skub til billedpunkter vandret" -#: ../src/ui/tool/transform-handle-set.cpp:597 +#: ../src/ui/tool/transform-handle-set.cpp:607 #, fuzzy, c-format msgctxt "Transform handle tip" msgid "Skew vertically by %.2f°" msgstr "Skub til billedpunkter lodret" -#: ../src/ui/tool/transform-handle-set.cpp:656 +#: ../src/ui/tool/transform-handle-set.cpp:666 msgctxt "Transform handle tip" msgid "Rotation center: drag to change the origin of transforms" msgstr "" -#: ../src/ui/tools-switch.cpp:95 +#: ../src/ui/tools-switch.cpp:101 #, fuzzy msgid "" "Click to Select and Transform objects, Drag to select many " "objects." msgstr "Klik for at vælge knudepunkter, træk for at omarrangere." -#: ../src/ui/tools-switch.cpp:96 +#: ../src/ui/tools-switch.cpp:102 #, fuzzy msgid "Modify selected path points (nodes) directly." msgstr "Simplificér markerede stier (fjern ekstra knudepunkter)" -#: ../src/ui/tools-switch.cpp:97 +#: ../src/ui/tools-switch.cpp:103 msgid "To tweak a path by pushing, select it and drag over it." msgstr "" -#: ../src/ui/tools-switch.cpp:98 +#: ../src/ui/tools-switch.cpp:104 #, fuzzy msgid "" "Drag, click or click and scroll to spray the selected " "objects." msgstr "Klik eller klik og træk for at lukke og afslutte stien." -#: ../src/ui/tools-switch.cpp:99 +#: ../src/ui/tools-switch.cpp:105 msgid "" "Drag to create a rectangle. Drag controls to round corners and " "resize. Click to select." @@ -24338,7 +24255,7 @@ msgstr "" "Træk for at oprette en firkant. Træk i håndtag for at " "afrunde hjørner og ændre størrelse. Klik for at markere." -#: ../src/ui/tools-switch.cpp:100 +#: ../src/ui/tools-switch.cpp:106 #, fuzzy msgid "" "Drag to create a 3D box. Drag controls to resize in " @@ -24347,7 +24264,7 @@ msgstr "" "Træk for at oprette en stjerne. Træk i håndtag for at redigere " "formen. Klik for at markere." -#: ../src/ui/tools-switch.cpp:101 +#: ../src/ui/tools-switch.cpp:107 msgid "" "Drag to create an ellipse. Drag controls to make an arc or " "segment. Click to select." @@ -24355,7 +24272,7 @@ msgstr "" "Træk for at oprette en ellipse. Træk i håndtag for at lave en " "bue eller et segment. Klik for at markere." -#: ../src/ui/tools-switch.cpp:102 +#: ../src/ui/tools-switch.cpp:108 msgid "" "Drag to create a star. Drag controls to edit the star shape. " "Click to select." @@ -24363,7 +24280,7 @@ msgstr "" "Træk for at oprette en stjerne. Træk i håndtag for at redigere " "formen. Klik for at markere." -#: ../src/ui/tools-switch.cpp:103 +#: ../src/ui/tools-switch.cpp:109 msgid "" "Drag to create a spiral. Drag controls to edit the spiral " "shape. Click to select." @@ -24371,16 +24288,16 @@ msgstr "" "Træk for at oprette en spiral. Træk i håndtag for at redigere " "spiralformen. Klik for at markere." -#: ../src/ui/tools-switch.cpp:104 +#: ../src/ui/tools-switch.cpp:110 #, fuzzy msgid "" "Drag to create a freehand line. Shift appends to selected " "path, Alt activates sketch mode." msgstr "" -"Træk for at oprette en frihåndslinje. Begynd at tegne med Shift for at føje til den markerede sti." +"Træk for at oprette en frihåndslinje. Begynd at tegne med " +"Shift for at føje til den markerede sti." -#: ../src/ui/tools-switch.cpp:105 +#: ../src/ui/tools-switch.cpp:111 #, fuzzy msgid "" "Click or click and drag to start a path; with Shift to " @@ -24390,7 +24307,7 @@ msgstr "" "Klik eller klik og træk for at starte en sti; med Shift " "for at føje til markerede sti." -#: ../src/ui/tools-switch.cpp:106 +#: ../src/ui/tools-switch.cpp:112 #, fuzzy msgid "" "Drag to draw a calligraphic stroke; with Ctrl to track a guide " @@ -24399,7 +24316,7 @@ msgstr "" "Træk for at male kalligrafisk. Venstre/højre piletaster " "justerer bredden, op/ned justerer vinkelen." -#: ../src/ui/tools-switch.cpp:107 ../src/ui/tools/text-tool.cpp:1583 +#: ../src/ui/tools-switch.cpp:113 ../src/ui/tools/text-tool.cpp:1583 msgid "" "Click to select or create text, drag to create flowed text; " "then type." @@ -24407,7 +24324,7 @@ msgstr "" "Klik for at markere eller oprette tekst, træk for at oprette " "flydende tekst, skriv så." -#: ../src/ui/tools-switch.cpp:108 +#: ../src/ui/tools-switch.cpp:114 msgid "" "Drag or double click to create a gradient on selected objects, " "drag handles to adjust gradients." @@ -24415,7 +24332,7 @@ msgstr "" "Træk eller dobbeltklik for at oprette en overgang på de " "markerede objekter, træk i håndtag for at justere overgange." -#: ../src/ui/tools-switch.cpp:109 +#: ../src/ui/tools-switch.cpp:115 #, fuzzy msgid "" "Drag or double click to create a mesh on selected objects, " @@ -24424,7 +24341,7 @@ msgstr "" "Træk eller dobbeltklik for at oprette en overgang på de " "markerede objekter, træk i håndtag for at justere overgange." -#: ../src/ui/tools-switch.cpp:110 +#: ../src/ui/tools-switch.cpp:116 msgid "" "Click or drag around an area to zoom in, Shift+click to " "zoom out." @@ -24432,11 +24349,11 @@ msgstr "" "Klik eller træk omkring et område for at zoome ind, Shift" "+klik for at zoome ud." -#: ../src/ui/tools-switch.cpp:111 +#: ../src/ui/tools-switch.cpp:117 msgid "Drag to measure the dimensions of objects." msgstr "" -#: ../src/ui/tools-switch.cpp:112 ../src/ui/tools/dropper-tool.cpp:274 +#: ../src/ui/tools-switch.cpp:118 ../src/ui/tools/dropper-tool.cpp:274 msgid "" "Click to set fill, Shift+click to set stroke; drag to " "average color in area; with Alt to pick inverse color; Ctrl+C " @@ -24447,23 +24364,23 @@ msgstr "" "inverteret farve; Ctrl+C for at kopiere farven under markøren til " "udklipsholderen" -#: ../src/ui/tools-switch.cpp:113 +#: ../src/ui/tools-switch.cpp:119 msgid "Click and drag between shapes to create a connector." msgstr "Klik og træk mellem figurer for at oprette en forbindelse." -#: ../src/ui/tools-switch.cpp:114 +#: ../src/ui/tools-switch.cpp:121 msgid "" "Click to paint a bounded area, Shift+click to union the new " "fill with the current selection, Ctrl+click to change the clicked " "object's fill and stroke to the current setting." msgstr "" -#: ../src/ui/tools-switch.cpp:115 +#: ../src/ui/tools-switch.cpp:123 #, fuzzy msgid "Drag to erase." msgstr "Link til %s" -#: ../src/ui/tools-switch.cpp:116 +#: ../src/ui/tools-switch.cpp:124 msgid "Choose a subtool from the toolbar" msgstr "" @@ -24574,12 +24491,12 @@ msgid "Select at least one non-connector object." msgstr "Markér mindst ét objekt der ikke er en forbindelse." #: ../src/ui/tools/connector-tool.cpp:1329 -#: ../src/widgets/connector-toolbar.cpp:310 +#: ../src/widgets/connector-toolbar.cpp:308 msgid "Make connectors avoid selected objects" msgstr "Lad forbindelser undvige markerede objekter" #: ../src/ui/tools/connector-tool.cpp:1330 -#: ../src/widgets/connector-toolbar.cpp:320 +#: ../src/widgets/connector-toolbar.cpp:318 msgid "Make connectors ignore selected objects" msgstr "Lad forbindelser ignorere markerede objekter" @@ -24692,26 +24609,26 @@ msgid "Draw over areas to add to fill, hold Alt for touch fill" msgstr "" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:669 +#: ../src/ui/tools/freehand-base.cpp:674 msgid "Path is closed." msgstr "Sti er lukket." #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:684 +#: ../src/ui/tools/freehand-base.cpp:689 msgid "Closing path." msgstr "Lukker sti." -#: ../src/ui/tools/freehand-base.cpp:823 +#: ../src/ui/tools/freehand-base.cpp:828 #, fuzzy msgid "Draw path" msgstr "Bryd sti op" -#: ../src/ui/tools/freehand-base.cpp:976 +#: ../src/ui/tools/freehand-base.cpp:981 #, fuzzy msgid "Creating single dot" msgstr "Opret ny sti" -#: ../src/ui/tools/freehand-base.cpp:977 +#: ../src/ui/tools/freehand-base.cpp:982 #, fuzzy msgid "Create single dot" msgstr "Opret fliselagte kloner..." @@ -24785,15 +24702,15 @@ msgstr "Opret lineær overgang" msgid "Draw around handles to select them" msgstr "" -#: ../src/ui/tools/gradient-tool.cpp:692 +#: ../src/ui/tools/gradient-tool.cpp:690 msgid "Ctrl: snap gradient angle" msgstr "Ctrl: trinvis justering af overgangsvinkel" -#: ../src/ui/tools/gradient-tool.cpp:693 +#: ../src/ui/tools/gradient-tool.cpp:691 msgid "Shift: draw gradient around the starting point" msgstr "Shift: tegn overgang omkring startpunktet" -#: ../src/ui/tools/gradient-tool.cpp:947 ../src/ui/tools/mesh-tool.cpp:984 +#: ../src/ui/tools/gradient-tool.cpp:945 ../src/ui/tools/mesh-tool.cpp:977 #, c-format msgid "Gradient for %d object; with Ctrl to snap angle" msgid_plural "Gradient for %d objects; with Ctrl to snap angle" @@ -24804,7 +24721,7 @@ msgstr[1] "" "Overgang for %d objekter; med Ctrl for trinvis justering af " "vinkel" -#: ../src/ui/tools/gradient-tool.cpp:951 ../src/ui/tools/mesh-tool.cpp:988 +#: ../src/ui/tools/gradient-tool.cpp:949 ../src/ui/tools/mesh-tool.cpp:981 msgid "Select objects on which to create gradient." msgstr "Markér objekter hvorpå du vil skabe overgangen." @@ -24812,6 +24729,45 @@ msgstr "Markér objekter hvorpå du vil skabe overgangen." msgid "Choose a construction tool from the toolbar." msgstr "" +#. create the knots +#: ../src/ui/tools/measure-tool.cpp:349 +msgid "Measure start, Shift+Click for position dialog" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:355 +msgid "Measure end, Shift+Click for position dialog" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 +msgid "Measure" +msgstr "Mål" + +#: ../src/ui/tools/measure-tool.cpp:752 +msgid "Base" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:761 +msgid "Add guides from measure tool" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:781 +msgid "Add Stored to measure tool" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:801 +#, fuzzy +msgid "Convert measure to items" +msgstr "Konvertér tekst til sti" + +#: ../src/ui/tools/measure-tool.cpp:839 +msgid "Add global measure line" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:1291 ../src/ui/tools/measure-tool.cpp:1293 +#, fuzzy, c-format +msgid "Crossing %u" +msgstr "Tegning" + #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 #, fuzzy, c-format @@ -24866,16 +24822,21 @@ msgstr "Vælg farvetone" msgid "Create default mesh" msgstr "Opret lineær overgang" -#: ../src/ui/tools/mesh-tool.cpp:709 +#: ../src/ui/tools/mesh-tool.cpp:713 #, fuzzy msgid "FIXMECtrl: snap mesh angle" msgstr "Ctrl: trinvis justering" -#: ../src/ui/tools/mesh-tool.cpp:710 +#: ../src/ui/tools/mesh-tool.cpp:714 #, fuzzy msgid "FIXMEShift: draw mesh around the starting point" msgstr "Shift: tegn omkring startpunktet" +#: ../src/ui/tools/mesh-tool.cpp:971 +#, fuzzy +msgid "Create mesh" +msgstr "Opret lineær overgang" + #: ../src/ui/tools/node-tool.cpp:653 msgctxt "Node tool tip" msgid "" @@ -25111,11 +25072,11 @@ msgstr "" msgid "Create rectangle" msgstr "Opret firkant" -#: ../src/ui/tools/select-tool.cpp:160 +#: ../src/ui/tools/select-tool.cpp:156 msgid "Click selection to toggle scale/rotation handles" msgstr "Klik på markeringen for at skifte skalerings- eller roteringshåndtag" -#: ../src/ui/tools/select-tool.cpp:161 +#: ../src/ui/tools/select-tool.cpp:157 msgid "" "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " "or drag around objects to select." @@ -25123,45 +25084,45 @@ msgstr "" "Ingen objekter markeret. Klik, Skift+klik, Alt+rul musen oven på et objekt, " "eller træk omkring objekter for at markere." -#: ../src/ui/tools/select-tool.cpp:214 +#: ../src/ui/tools/select-tool.cpp:210 msgid "Move canceled." msgstr "Flytning annulleret." -#: ../src/ui/tools/select-tool.cpp:222 +#: ../src/ui/tools/select-tool.cpp:218 msgid "Selection canceled." msgstr "Markering annulleret." -#: ../src/ui/tools/select-tool.cpp:644 +#: ../src/ui/tools/select-tool.cpp:636 msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" msgstr "" -#: ../src/ui/tools/select-tool.cpp:646 +#: ../src/ui/tools/select-tool.cpp:638 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" msgstr "" -#: ../src/ui/tools/select-tool.cpp:939 +#: ../src/ui/tools/select-tool.cpp:919 #, fuzzy msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "Ctrl: markér i grupper, flyt vandret/lodret" -#: ../src/ui/tools/select-tool.cpp:940 +#: ../src/ui/tools/select-tool.cpp:920 #, fuzzy msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" "Shift: markér/afmarkér, tving gummibånd, deaktivér trinvis justering" -#: ../src/ui/tools/select-tool.cpp:941 +#: ../src/ui/tools/select-tool.cpp:921 #, fuzzy msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" msgstr "Alt: markér under, flyt markerede" -#: ../src/ui/tools/select-tool.cpp:1149 +#: ../src/ui/tools/select-tool.cpp:1129 msgid "Selected object is not a group. Cannot enter." msgstr "Markerede objekt er ikke en gruppe. Kan ikke gå ind." @@ -25186,55 +25147,55 @@ msgstr "" msgid "Create spiral" msgstr "Opret spiraler" -#: ../src/ui/tools/spray-tool.cpp:173 ../src/ui/tools/tweak-tool.cpp:157 +#: ../src/ui/tools/spray-tool.cpp:214 ../src/ui/tools/tweak-tool.cpp:157 #, c-format msgid "%i object selected" msgid_plural "%i objects selected" msgstr[0] "%i objekt markeret" msgstr[1] "%i objekter markeret" -#: ../src/ui/tools/spray-tool.cpp:175 ../src/ui/tools/tweak-tool.cpp:159 +#: ../src/ui/tools/spray-tool.cpp:216 ../src/ui/tools/tweak-tool.cpp:159 #, fuzzy msgid "Nothing selected" msgstr "Intet blev slettet." -#: ../src/ui/tools/spray-tool.cpp:180 +#: ../src/ui/tools/spray-tool.cpp:221 #, fuzzy, c-format msgid "" "%s. Drag, click or click and scroll to spray copies of the initial " "selection." msgstr "Anvend transformation på markering" -#: ../src/ui/tools/spray-tool.cpp:183 +#: ../src/ui/tools/spray-tool.cpp:224 #, fuzzy, c-format msgid "" "%s. Drag, click or click and scroll to spray clones of the initial " "selection." msgstr "Opret og fliselæg klonerne i markeringen" -#: ../src/ui/tools/spray-tool.cpp:186 +#: ../src/ui/tools/spray-tool.cpp:227 #, fuzzy, c-format msgid "" "%s. Drag, click or click and scroll to spray in a single path of the " "initial selection." msgstr "Anvend transformation på markering" -#: ../src/ui/tools/spray-tool.cpp:618 +#: ../src/ui/tools/spray-tool.cpp:1305 #, fuzzy msgid "Nothing selected! Select objects to spray." msgstr "Intet blev slettet." -#: ../src/ui/tools/spray-tool.cpp:693 ../src/widgets/spray-toolbar.cpp:166 +#: ../src/ui/tools/spray-tool.cpp:1380 ../src/widgets/spray-toolbar.cpp:360 #, fuzzy msgid "Spray with copies" msgstr "Mellemrum mellem linjer" -#: ../src/ui/tools/spray-tool.cpp:697 ../src/widgets/spray-toolbar.cpp:173 +#: ../src/ui/tools/spray-tool.cpp:1384 ../src/widgets/spray-toolbar.cpp:367 #, fuzzy msgid "Spray with clones" msgstr "Søg efter kloner" -#: ../src/ui/tools/spray-tool.cpp:701 +#: ../src/ui/tools/spray-tool.cpp:1388 #, fuzzy msgid "Spray in single path" msgstr "Opret ny sti" @@ -25426,7 +25387,7 @@ msgstr[1] "Skriv tekst; Enter for at starte på ny linje." msgid "Type text" msgstr "T_ype: " -#: ../src/ui/tools/tool-base.cpp:701 +#: ../src/ui/tools/tool-base.cpp:700 msgid "Space+mouse move to pan canvas" msgstr "" @@ -25675,7 +25636,7 @@ msgstr "" msgid "Too much ink!" msgstr "For meget blæk!" -#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2733 +#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2765 msgid "Pick colors from image" msgstr "Vælg farver fra billede" @@ -25707,111 +25668,173 @@ msgid "Blur (%)" msgstr "Blå" #: ../src/ui/widget/font-variants.cpp:38 +msgctxt "Font variant" msgid "Ligatures" msgstr "" #: ../src/ui/widget/font-variants.cpp:39 +#, fuzzy +msgctxt "Font variant" msgid "Common" -msgstr "" +msgstr "Objekter" #: ../src/ui/widget/font-variants.cpp:40 +#, fuzzy +msgctxt "Font variant" msgid "Discretionary" -msgstr "" +msgstr "Beskrivelse" #: ../src/ui/widget/font-variants.cpp:41 +#, fuzzy +msgctxt "Font variant" msgid "Historical" -msgstr "" +msgstr "Vejledninger" #: ../src/ui/widget/font-variants.cpp:42 +#, fuzzy +msgctxt "Font variant" msgid "Contextual" -msgstr "" +msgstr "Hjørner:" + +#: ../src/ui/widget/font-variants.cpp:44 +#, fuzzy +msgctxt "Font variant" +msgid "Position" +msgstr "Placering:" + +#: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50 +#, fuzzy +msgctxt "Font variant" +msgid "Normal" +msgstr "Normal" #: ../src/ui/widget/font-variants.cpp:46 +#, fuzzy +msgctxt "Font variant" msgid "Subscript" -msgstr "" +msgstr "Script" #: ../src/ui/widget/font-variants.cpp:47 +#, fuzzy +msgctxt "Font variant" msgid "Superscript" -msgstr "" +msgstr "Beskrivelse" #: ../src/ui/widget/font-variants.cpp:49 +msgctxt "Font variant" msgid "Capitals" msgstr "" +#: ../src/ui/widget/font-variants.cpp:51 +#, fuzzy +msgctxt "Font variant" +msgid "Small" +msgstr "lille" + #: ../src/ui/widget/font-variants.cpp:52 +#, fuzzy +msgctxt "Font variant" msgid "All small" -msgstr "" +msgstr "Alle billeder" #: ../src/ui/widget/font-variants.cpp:53 +msgctxt "Font variant" msgid "Petite" msgstr "" #: ../src/ui/widget/font-variants.cpp:54 +#, fuzzy +msgctxt "Font variant" msgid "All petite" -msgstr "" +msgstr "Alle filer" #: ../src/ui/widget/font-variants.cpp:55 +msgctxt "Font variant" msgid "Unicase" msgstr "" #: ../src/ui/widget/font-variants.cpp:56 +#, fuzzy +msgctxt "Font variant" msgid "Titling" -msgstr "" +msgstr "Rulning" #: ../src/ui/widget/font-variants.cpp:58 +msgctxt "Font variant" msgid "Numeric" msgstr "" #: ../src/ui/widget/font-variants.cpp:59 +#, fuzzy +msgctxt "Font variant" msgid "Lining" -msgstr "" +msgstr "Udtynding:" #: ../src/ui/widget/font-variants.cpp:60 +#, fuzzy +msgctxt "Font variant" msgid "Old Style" -msgstr "" +msgstr "Stil" #: ../src/ui/widget/font-variants.cpp:61 +#, fuzzy +msgctxt "Font variant" msgid "Default Style" -msgstr "" +msgstr "Standard_enheder:" #: ../src/ui/widget/font-variants.cpp:62 +#, fuzzy +msgctxt "Font variant" msgid "Proportional" -msgstr "" +msgstr "Skalér proportionalt" #: ../src/ui/widget/font-variants.cpp:63 +msgctxt "Font variant" msgid "Tabular" msgstr "" #: ../src/ui/widget/font-variants.cpp:64 +#, fuzzy +msgctxt "Font variant" msgid "Default Width" -msgstr "" +msgstr "Standard_enheder:" #: ../src/ui/widget/font-variants.cpp:65 +#, fuzzy +msgctxt "Font variant" msgid "Diagonal" -msgstr "" +msgstr "Hæng p_unkter på hjælpelinjer" #: ../src/ui/widget/font-variants.cpp:66 +#, fuzzy +msgctxt "Font variant" msgid "Stacked" -msgstr "" +msgstr "Ba_ggrund:" #: ../src/ui/widget/font-variants.cpp:67 +#, fuzzy +msgctxt "Font variant" msgid "Default Fractions" -msgstr "" +msgstr "Sideorientering:" #: ../src/ui/widget/font-variants.cpp:68 +msgctxt "Font variant" msgid "Ordinal" msgstr "" #: ../src/ui/widget/font-variants.cpp:69 +msgctxt "Font variant" msgid "Slashed Zero" msgstr "" #: ../src/ui/widget/font-variants.cpp:71 #, fuzzy +msgctxt "Font variant" msgid "Feature Settings" msgstr "Sideorientering:" #: ../src/ui/widget/font-variants.cpp:72 +msgctxt "Font variant" msgid "Selection has different Feature Settings!" msgstr "" @@ -25969,9 +25992,8 @@ msgstr "" #: ../src/ui/widget/object-composite-settings.cpp:47 #: ../src/ui/widget/selected-style.cpp:1119 #: ../src/ui/widget/selected-style.cpp:1120 -#, fuzzy msgid "Opacity (%)" -msgstr "Uigennemsigtighed:" +msgstr "Opacitet (%)" #: ../src/ui/widget/object-composite-settings.cpp:160 #, fuzzy @@ -26072,7 +26094,7 @@ msgstr "Tilpasset størrelse" #: ../src/ui/widget/page-sizer.cpp:395 msgid "Resi_ze page to content..." -msgstr "" +msgstr "_Tilpas side til indhold ..." #: ../src/ui/widget/page-sizer.cpp:447 #, fuzzy @@ -26120,64 +26142,54 @@ msgid "List" msgstr "Liste" #: ../src/ui/widget/panel.cpp:136 -#, fuzzy msgctxt "Swatches" msgid "Size" msgstr "Størrelse" #: ../src/ui/widget/panel.cpp:140 -#, fuzzy msgctxt "Swatches height" msgid "Tiny" -msgstr "meget lille" +msgstr "Meget lille" #: ../src/ui/widget/panel.cpp:141 -#, fuzzy msgctxt "Swatches height" msgid "Small" -msgstr "lille" +msgstr "Lille" #: ../src/ui/widget/panel.cpp:142 -#, fuzzy msgctxt "Swatches height" msgid "Medium" -msgstr "mellem" +msgstr "Medium" #: ../src/ui/widget/panel.cpp:143 -#, fuzzy msgctxt "Swatches height" msgid "Large" -msgstr "stor" +msgstr "Stor" #: ../src/ui/widget/panel.cpp:144 -#, fuzzy msgctxt "Swatches height" msgid "Huge" -msgstr "Farvetone" +msgstr "Kæmpe" #: ../src/ui/widget/panel.cpp:166 -#, fuzzy msgctxt "Swatches" msgid "Width" -msgstr "Bredde:" +msgstr "Bredde" #: ../src/ui/widget/panel.cpp:170 -#, fuzzy msgctxt "Swatches width" msgid "Narrower" -msgstr "Sænk" +msgstr "Smallere" #: ../src/ui/widget/panel.cpp:171 -#, fuzzy msgctxt "Swatches width" msgid "Narrow" -msgstr "Sænk" +msgstr "Smal" #: ../src/ui/widget/panel.cpp:172 -#, fuzzy msgctxt "Swatches width" msgid "Medium" -msgstr "mellem" +msgstr "Medium" #: ../src/ui/widget/panel.cpp:173 msgctxt "Swatches width" @@ -26185,16 +26197,14 @@ msgid "Wide" msgstr "Bred" #: ../src/ui/widget/panel.cpp:174 -#, fuzzy msgctxt "Swatches width" msgid "Wider" -msgstr "_Skjul" +msgstr "Breddere" #: ../src/ui/widget/panel.cpp:204 -#, fuzzy msgctxt "Swatches" msgid "Border" -msgstr "Rækkefølge" +msgstr "Kanter" #: ../src/ui/widget/panel.cpp:208 msgctxt "Swatches border" @@ -26213,10 +26223,9 @@ msgstr "Bred" #. TRANSLATORS: "Wrap" indicates how colour swatches are displayed #: ../src/ui/widget/panel.cpp:241 -#, fuzzy msgctxt "Swatches" msgid "Wrap" -msgstr "Ombryd" +msgstr "" #: ../src/ui/widget/preferences-widget.cpp:799 msgid "_Browse..." @@ -26293,7 +26302,7 @@ msgstr "N/A" #: ../src/ui/widget/selected-style.cpp:181 #: ../src/ui/widget/selected-style.cpp:1112 #: ../src/ui/widget/selected-style.cpp:1113 -#: ../src/widgets/gradient-toolbar.cpp:163 +#: ../src/widgets/gradient-toolbar.cpp:162 msgid "Nothing selected" msgstr "Intet markeret" @@ -26309,17 +26318,15 @@ msgstr "" #: ../src/ui/widget/selected-style.cpp:190 #: ../src/ui/widget/style-swatch.cpp:321 -#, fuzzy msgctxt "Fill and stroke" msgid "No fill" msgstr "Ingen udfyldning" #: ../src/ui/widget/selected-style.cpp:190 #: ../src/ui/widget/style-swatch.cpp:321 -#, fuzzy msgctxt "Fill and stroke" msgid "No stroke" -msgstr "Ingen streg" +msgstr "Ingen bestrykning" #: ../src/ui/widget/selected-style.cpp:192 #: ../src/ui/widget/style-swatch.cpp:300 ../src/widgets/paint-selector.cpp:231 @@ -26337,9 +26344,8 @@ msgid "Pattern stroke" msgstr "Mønsterstreg" #: ../src/ui/widget/selected-style.cpp:197 -#, fuzzy msgid "L" -msgstr "L:" +msgstr "L" #: ../src/ui/widget/selected-style.cpp:200 #: ../src/ui/widget/style-swatch.cpp:294 @@ -26352,9 +26358,8 @@ msgid "Linear gradient stroke" msgstr "Streg med lineær overgang" #: ../src/ui/widget/selected-style.cpp:207 -#, fuzzy msgid "R" -msgstr "a" +msgstr "R" #: ../src/ui/widget/selected-style.cpp:210 #: ../src/ui/widget/style-swatch.cpp:298 @@ -26577,14 +26582,12 @@ msgid "0 (transparent)" msgstr "0 (gennemsigtig)" #: ../src/ui/widget/selected-style.cpp:1212 -#, fuzzy msgid "100% (opaque)" -msgstr "1.0 (uigennemsigtig)" +msgstr "100% (synlig)" #: ../src/ui/widget/selected-style.cpp:1386 -#, fuzzy msgid "Adjust alpha" -msgstr "Træk kurve" +msgstr "Justér alfa" #: ../src/ui/widget/selected-style.cpp:1388 #, c-format @@ -26670,10 +26673,9 @@ msgid "Stroke: %06x/%.3g" msgstr "Bestrygning: %06x/%.3g" #: ../src/ui/widget/style-swatch.cpp:319 -#, fuzzy msgctxt "Fill and stroke" msgid "None" -msgstr "%s" +msgstr "Ingen" #: ../src/ui/widget/style-swatch.cpp:346 #, c-format @@ -26686,9 +26688,9 @@ msgid "O: %2.0f" msgstr "" #: ../src/ui/widget/style-swatch.cpp:367 -#, fuzzy, c-format +#, c-format msgid "Opacity: %2.1f %%" -msgstr "Uigennemsigtighed: %.3g" +msgstr "Opacitet: %2.1f %%" #: ../src/vanishing-point.cpp:133 msgid "Split vanishing points" @@ -26740,7 +26742,7 @@ msgstr[1] "" msgid "File" msgstr "Fil" -#: ../src/verbs.cpp:232 ../share/extensions/interp_att_g.inx.h:22 +#: ../src/verbs.cpp:232 ../share/extensions/interp_att_g.inx.h:24 #, fuzzy msgid "Tag" msgstr "Mål:" @@ -26750,7 +26752,7 @@ msgstr "Mål:" msgid "Context" msgstr "Hjørner:" -#: ../src/verbs.cpp:270 ../src/verbs.cpp:2271 +#: ../src/verbs.cpp:270 ../src/verbs.cpp:2298 #: ../share/extensions/jessyInk_view.inx.h:1 #: ../share/extensions/polyhedron_3d.inx.h:26 msgid "View" @@ -26761,260 +26763,265 @@ msgstr "Vis" msgid "Dialog" msgstr "Mål:" -#: ../src/verbs.cpp:1259 +#: ../src/verbs.cpp:1276 #, fuzzy msgid "Switch to next layer" msgstr "Hæv til næste lag" -#: ../src/verbs.cpp:1260 +#: ../src/verbs.cpp:1277 #, fuzzy msgid "Switched to next layer." msgstr "Flyttet til næste lag." -#: ../src/verbs.cpp:1262 +#: ../src/verbs.cpp:1279 #, fuzzy msgid "Cannot go past last layer." msgstr "Kan ikke flytte forbi sidste lag." -#: ../src/verbs.cpp:1271 +#: ../src/verbs.cpp:1288 #, fuzzy msgid "Switch to previous layer" msgstr "Sænk til forrige lag" -#: ../src/verbs.cpp:1272 +#: ../src/verbs.cpp:1289 #, fuzzy msgid "Switched to previous layer." msgstr "Flyttet til forrige lag." -#: ../src/verbs.cpp:1274 +#: ../src/verbs.cpp:1291 #, fuzzy msgid "Cannot go before first layer." msgstr "Kan ikke flytte forbi første lag." -#: ../src/verbs.cpp:1295 ../src/verbs.cpp:1362 ../src/verbs.cpp:1398 -#: ../src/verbs.cpp:1404 ../src/verbs.cpp:1428 ../src/verbs.cpp:1443 +#: ../src/verbs.cpp:1312 ../src/verbs.cpp:1379 ../src/verbs.cpp:1415 +#: ../src/verbs.cpp:1421 ../src/verbs.cpp:1445 ../src/verbs.cpp:1460 msgid "No current layer." msgstr "Intet aktuelt lag." -#: ../src/verbs.cpp:1324 ../src/verbs.cpp:1328 +#: ../src/verbs.cpp:1341 ../src/verbs.cpp:1345 #, c-format msgid "Raised layer %s." msgstr "Hævet lag %s." -#: ../src/verbs.cpp:1325 +#: ../src/verbs.cpp:1342 msgid "Layer to top" msgstr "Lag til top" -#: ../src/verbs.cpp:1329 +#: ../src/verbs.cpp:1346 msgid "Raise layer" msgstr "Hæv lag" -#: ../src/verbs.cpp:1332 ../src/verbs.cpp:1336 +#: ../src/verbs.cpp:1349 ../src/verbs.cpp:1353 #, c-format msgid "Lowered layer %s." msgstr "Sænket lag %s." -#: ../src/verbs.cpp:1333 +#: ../src/verbs.cpp:1350 msgid "Layer to bottom" msgstr "Lag til bund" -#: ../src/verbs.cpp:1337 +#: ../src/verbs.cpp:1354 msgid "Lower layer" msgstr "Sænk lag" -#: ../src/verbs.cpp:1346 +#: ../src/verbs.cpp:1363 msgid "Cannot move layer any further." msgstr "Kan ikke flytte laget yderligere." -#: ../src/verbs.cpp:1357 +#: ../src/verbs.cpp:1374 #, fuzzy msgid "Duplicate layer" msgstr "Kopiér knudepunkt" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1360 +#: ../src/verbs.cpp:1377 #, fuzzy msgid "Duplicated layer." msgstr "Kopiér knudepunkt" -#: ../src/verbs.cpp:1393 +#: ../src/verbs.cpp:1410 msgid "Delete layer" msgstr "Slet lag" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1396 +#: ../src/verbs.cpp:1413 msgid "Deleted layer." msgstr "Slettet lag." -#: ../src/verbs.cpp:1413 +#: ../src/verbs.cpp:1430 #, fuzzy msgid "Show all layers" msgstr "Markér i alle lag" -#: ../src/verbs.cpp:1418 +#: ../src/verbs.cpp:1435 #, fuzzy msgid "Hide all layers" msgstr "Hæv lag" -#: ../src/verbs.cpp:1423 +#: ../src/verbs.cpp:1440 #, fuzzy msgid "Lock all layers" msgstr "Markér i alle lag" -#: ../src/verbs.cpp:1437 +#: ../src/verbs.cpp:1454 #, fuzzy msgid "Unlock all layers" msgstr "Sænk lag" -#: ../src/verbs.cpp:1521 +#: ../src/verbs.cpp:1538 msgid "Flip horizontally" msgstr "Vend vandret" -#: ../src/verbs.cpp:1526 +#: ../src/verbs.cpp:1543 msgid "Flip vertically" msgstr "Vend lodret" -#: ../src/verbs.cpp:1583 ../src/verbs.cpp:2696 +#: ../src/verbs.cpp:1591 +#, fuzzy, c-format +msgid "Set %d" +msgstr "Kildes bredde" + +#: ../src/verbs.cpp:1600 ../src/verbs.cpp:2728 msgid "Create new selection set" msgstr "" #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language #. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2153 +#: ../src/verbs.cpp:2176 msgid "tutorial-basic.svg" msgstr "tutorial-basic.da.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2157 +#: ../src/verbs.cpp:2180 msgid "tutorial-shapes.svg" msgstr "tutorial-shapes.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2161 +#: ../src/verbs.cpp:2184 msgid "tutorial-advanced.svg" msgstr "tutorial-advanced.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2165 +#: ../src/verbs.cpp:2190 msgid "tutorial-tracing.svg" msgstr "tutorial-tracing.svg" -#: ../src/verbs.cpp:2168 +#: ../src/verbs.cpp:2195 #, fuzzy msgid "tutorial-tracing-pixelart.svg" msgstr "tutorial-tracing.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2172 +#: ../src/verbs.cpp:2199 msgid "tutorial-calligraphy.svg" msgstr "tutorial-calligraphy.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2176 +#: ../src/verbs.cpp:2203 #, fuzzy msgid "tutorial-interpolate.svg" msgstr "tutorial-tips.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2180 +#: ../src/verbs.cpp:2207 msgid "tutorial-elements.svg" msgstr "tutorial-elements.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2184 +#: ../src/verbs.cpp:2211 msgid "tutorial-tips.svg" msgstr "tutorial-tips.svg" -#: ../src/verbs.cpp:2370 ../src/verbs.cpp:2969 +#: ../src/verbs.cpp:2397 ../src/verbs.cpp:3011 #, fuzzy msgid "Unlock all objects in the current layer" msgstr "Omdøb det aktuelle lag" -#: ../src/verbs.cpp:2374 ../src/verbs.cpp:2971 +#: ../src/verbs.cpp:2401 ../src/verbs.cpp:3013 #, fuzzy msgid "Unlock all objects in all layers" msgstr "Markér alle objekter eller alle knudepunkter" -#: ../src/verbs.cpp:2378 ../src/verbs.cpp:2973 +#: ../src/verbs.cpp:2405 ../src/verbs.cpp:3015 #, fuzzy msgid "Unhide all objects in the current layer" msgstr "Slet det aktuelle lag" -#: ../src/verbs.cpp:2382 ../src/verbs.cpp:2975 +#: ../src/verbs.cpp:2409 ../src/verbs.cpp:3017 #, fuzzy msgid "Unhide all objects in all layers" msgstr "Markér i alle lag" -#: ../src/verbs.cpp:2397 +#: ../src/verbs.cpp:2424 msgctxt "Verb" msgid "None" msgstr "" -#: ../src/verbs.cpp:2397 +#: ../src/verbs.cpp:2424 msgid "Does nothing" msgstr "Gør intet" #. File #. Tag -#: ../src/verbs.cpp:2400 ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2427 ../src/verbs.cpp:2727 msgid "_New" msgstr "_Ny" -#: ../src/verbs.cpp:2400 +#: ../src/verbs.cpp:2427 msgid "Create new document from the default template" msgstr "Opret nyt dokument fra standardskabelonen" -#: ../src/verbs.cpp:2402 +#: ../src/verbs.cpp:2429 msgid "_Open..." msgstr "Å_bn ..." -#: ../src/verbs.cpp:2403 +#: ../src/verbs.cpp:2430 msgid "Open an existing document" msgstr "Åbn et eksisterende dokument" -#: ../src/verbs.cpp:2404 +#: ../src/verbs.cpp:2431 msgid "Re_vert" -msgstr "Genindlæs" +msgstr "_Genindlæs" -#: ../src/verbs.cpp:2405 +#: ../src/verbs.cpp:2432 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "Vend tilbage til sidst gemte udgave af dokumentet (ændringer går tabt)" -#: ../src/verbs.cpp:2406 +#: ../src/verbs.cpp:2433 msgid "Save document" msgstr "Gem dokument" -#: ../src/verbs.cpp:2408 +#: ../src/verbs.cpp:2435 msgid "Save _As..." msgstr "Gem _som ..." -#: ../src/verbs.cpp:2409 +#: ../src/verbs.cpp:2436 msgid "Save document under a new name" msgstr "Gem dokument under et nyt navn" -#: ../src/verbs.cpp:2410 +#: ../src/verbs.cpp:2437 msgid "Save a Cop_y..." msgstr "Gem en kop_i ..." -#: ../src/verbs.cpp:2411 +#: ../src/verbs.cpp:2438 msgid "Save a copy of the document under a new name" msgstr "Gem en kopi af dokumentet under et nyt navn" -#: ../src/verbs.cpp:2412 +#: ../src/verbs.cpp:2439 msgid "_Print..." msgstr "_Udskriv ..." -#: ../src/verbs.cpp:2412 +#: ../src/verbs.cpp:2439 msgid "Print document" msgstr "Udskriv dokument" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2415 +#: ../src/verbs.cpp:2442 msgid "Clean _up document" -msgstr "Rens dokument" +msgstr "_Rens dokument" -#: ../src/verbs.cpp:2415 +#: ../src/verbs.cpp:2442 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" @@ -27022,142 +27029,142 @@ msgstr "" "Fjern ubrugte definitioner (som overgange eller beskæringsstier) fra " "dokumentets <defs>" -#: ../src/verbs.cpp:2417 +#: ../src/verbs.cpp:2444 msgid "_Import..." msgstr "_Importér ..." -#: ../src/verbs.cpp:2418 +#: ../src/verbs.cpp:2445 msgid "Import a bitmap or SVG image into this document" msgstr "Importér et punktbillede eller SVG-billede til dette dokument" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2420 +#: ../src/verbs.cpp:2447 msgid "Import Clip Art..." msgstr "Importér clipart ..." -#: ../src/verbs.cpp:2421 +#: ../src/verbs.cpp:2448 msgid "Import clipart from Open Clip Art Library" msgstr "Importér clipart fra Open Clip Art Library" #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2423 +#: ../src/verbs.cpp:2450 msgid "N_ext Window" msgstr "_Næste vindue" -#: ../src/verbs.cpp:2424 +#: ../src/verbs.cpp:2451 msgid "Switch to the next document window" msgstr "Skift til næste dokumentvindue" -#: ../src/verbs.cpp:2425 +#: ../src/verbs.cpp:2452 msgid "P_revious Window" msgstr "_Forrige vindue" -#: ../src/verbs.cpp:2426 +#: ../src/verbs.cpp:2453 msgid "Switch to the previous document window" msgstr "Skift til forrige dokumentvindue" -#: ../src/verbs.cpp:2427 +#: ../src/verbs.cpp:2454 msgid "_Close" msgstr "_Luk" -#: ../src/verbs.cpp:2428 +#: ../src/verbs.cpp:2455 msgid "Close this document window" msgstr "Luk dette dokumentvindue" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2456 msgid "_Quit" msgstr "_Afslut" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2456 msgid "Quit Inkscape" msgstr "Afslut Inkscape" -#: ../src/verbs.cpp:2430 +#: ../src/verbs.cpp:2457 msgid "New from _Template..." -msgstr "Ny fra skabelon ..." +msgstr "Ny fra _skabelon ..." -#: ../src/verbs.cpp:2431 +#: ../src/verbs.cpp:2458 #, fuzzy msgid "Create new project from template" msgstr "Opret nyt dokument fra standardskabelonen" -#: ../src/verbs.cpp:2434 +#: ../src/verbs.cpp:2461 msgid "Undo last action" msgstr "Fortryd sidste handling" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2464 msgid "Do again the last undone action" msgstr "Annullér fortryd" -#: ../src/verbs.cpp:2438 +#: ../src/verbs.cpp:2465 msgid "Cu_t" msgstr "K_lip" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2466 msgid "Cut selection to clipboard" msgstr "Klip markering til udklipsholder" -#: ../src/verbs.cpp:2440 +#: ../src/verbs.cpp:2467 msgid "_Copy" msgstr "K_opiér" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2468 msgid "Copy selection to clipboard" msgstr "Kopiér markering til udklipsholder" -#: ../src/verbs.cpp:2442 +#: ../src/verbs.cpp:2469 msgid "_Paste" msgstr "_Indsæt" -#: ../src/verbs.cpp:2443 +#: ../src/verbs.cpp:2470 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "Indsæt objekter fra udklipsholder til musemarkøren, eller indsæt tekst" -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2471 msgid "Paste _Style" msgstr "Indsætnings_stil" -#: ../src/verbs.cpp:2445 +#: ../src/verbs.cpp:2472 msgid "Apply the style of the copied object to selection" msgstr "Anvend det kopierede objekts stil på markeringen" -#: ../src/verbs.cpp:2447 +#: ../src/verbs.cpp:2474 msgid "Scale selection to match the size of the copied object" msgstr "Skalér markering så den passer med størrelsen af det kopierede objekt" -#: ../src/verbs.cpp:2448 +#: ../src/verbs.cpp:2475 msgid "Paste _Width" msgstr "Indsæt _bredde" -#: ../src/verbs.cpp:2449 +#: ../src/verbs.cpp:2476 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" "Skalér markering vandret så den passer med bredden af det kopierede objekt" -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2477 msgid "Paste _Height" msgstr "Indsæt _højde" -#: ../src/verbs.cpp:2451 +#: ../src/verbs.cpp:2478 msgid "Scale selection vertically to match the height of the copied object" msgstr "" "Skalér markering lodret så den passer med højden af det kopierede objekt" -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2479 msgid "Paste Size Separately" msgstr "Indsæt størrelse separat" -#: ../src/verbs.cpp:2453 +#: ../src/verbs.cpp:2480 msgid "Scale each selected object to match the size of the copied object" msgstr "" "Skalér hvert markeret objekt så det passer med størrelsen af det kopierede " "objekt" -#: ../src/verbs.cpp:2454 +#: ../src/verbs.cpp:2481 msgid "Paste Width Separately" msgstr "Indsæt bredde separat" -#: ../src/verbs.cpp:2455 +#: ../src/verbs.cpp:2482 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" @@ -27165,11 +27172,11 @@ msgstr "" "Skalér hvert markeret objekt vandret, så det passer med bredden af det " "kopierede objekt" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2483 msgid "Paste Height Separately" msgstr "Indsæt højde separat" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2484 msgid "" "Scale each selected object vertically to match the height of the copied " "object" @@ -27177,69 +27184,69 @@ msgstr "" "Skalér hvert markeret objekt lodret, så det passer med højden af det " "kopierede objekt" -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2485 msgid "Paste _In Place" msgstr "Indsæt på _samme sted" -#: ../src/verbs.cpp:2459 +#: ../src/verbs.cpp:2486 msgid "Paste objects from clipboard to the original location" msgstr "Indsæt objekter fra udklipsholder til den oprindelige placering" -#: ../src/verbs.cpp:2460 +#: ../src/verbs.cpp:2487 msgid "Paste Path _Effect" msgstr "Indsæt sti_effekt" -#: ../src/verbs.cpp:2461 +#: ../src/verbs.cpp:2488 #, fuzzy msgid "Apply the path effect of the copied object to selection" msgstr "Anvend det kopierede objekts stil på markeringen" -#: ../src/verbs.cpp:2462 +#: ../src/verbs.cpp:2489 msgid "Remove Path _Effect" msgstr "Fjern sti_effekt" -#: ../src/verbs.cpp:2463 +#: ../src/verbs.cpp:2490 #, fuzzy msgid "Remove any path effects from selected objects" msgstr "Fjern maske fra markering" -#: ../src/verbs.cpp:2464 +#: ../src/verbs.cpp:2491 msgid "_Remove Filters" msgstr "_Fjern filtre" -#: ../src/verbs.cpp:2465 +#: ../src/verbs.cpp:2492 msgid "Remove any filters from selected objects" msgstr "Fjern eventuelle filtre fra markerede objekter" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2493 msgid "_Delete" msgstr "S_let" -#: ../src/verbs.cpp:2467 +#: ../src/verbs.cpp:2494 msgid "Delete selection" msgstr "Slet markering" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2495 msgid "Duplic_ate" msgstr "Dupli_kér" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2496 msgid "Duplicate selected objects" msgstr "Duplikér markerede objekter" -#: ../src/verbs.cpp:2470 +#: ../src/verbs.cpp:2497 msgid "Create Clo_ne" msgstr "Opret klo_n" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2498 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "Opret en klon (en kopi linket til originalen) af det markerede objekt" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2499 msgid "Unlin_k Clone" msgstr "Aflin_k klon" -#: ../src/verbs.cpp:2473 +#: ../src/verbs.cpp:2500 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" @@ -27247,144 +27254,144 @@ msgstr "" "Klip de markerede kloners links til originalerne, så den bliver et " "selvstændige objekter" -#: ../src/verbs.cpp:2474 +#: ../src/verbs.cpp:2501 msgid "Relink to Copied" msgstr "Genlink til kopieret" -#: ../src/verbs.cpp:2475 +#: ../src/verbs.cpp:2502 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "" -#: ../src/verbs.cpp:2476 +#: ../src/verbs.cpp:2503 msgid "Select _Original" msgstr "Markér _original" -#: ../src/verbs.cpp:2477 +#: ../src/verbs.cpp:2504 msgid "Select the object to which the selected clone is linked" msgstr "Markér objektet hvortil den markerede klon er linket" -#: ../src/verbs.cpp:2478 +#: ../src/verbs.cpp:2505 msgid "Clone original path (LPE)" msgstr "Klon original sti (LPE)" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2506 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" msgstr "" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2507 msgid "Objects to _Marker" msgstr "Objekter til _markør" -#: ../src/verbs.cpp:2481 +#: ../src/verbs.cpp:2508 msgid "Convert selection to a line marker" msgstr "Konvertér markering til en linjemarkør" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2509 msgid "Objects to Gu_ides" msgstr "Objekter til _hjælpelinjer" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2510 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" msgstr "" -#: ../src/verbs.cpp:2484 +#: ../src/verbs.cpp:2511 msgid "Objects to Patter_n" msgstr "Objekt til _mønster" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2512 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "Konvertér markeringen til en firkant med fliselagt mønsterudfyldning" -#: ../src/verbs.cpp:2486 +#: ../src/verbs.cpp:2513 msgid "Pattern to _Objects" msgstr "Mønster til _objekter" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2514 msgid "Extract objects from a tiled pattern fill" -msgstr "Udtræk objekter fra et fliselagt mønsterudfyldning" +msgstr "Udtræk objekter fra en fliselagt mønsterudfyldning" -#: ../src/verbs.cpp:2488 +#: ../src/verbs.cpp:2515 msgid "Group to Symbol" msgstr "" -#: ../src/verbs.cpp:2489 +#: ../src/verbs.cpp:2516 #, fuzzy msgid "Convert group to a symbol" msgstr "Konvertér tekst til sti" -#: ../src/verbs.cpp:2490 +#: ../src/verbs.cpp:2517 msgid "Symbol to Group" msgstr "" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2518 msgid "Extract group from a symbol" -msgstr "" +msgstr "Udtræk gruppe fra et symbol" -#: ../src/verbs.cpp:2492 +#: ../src/verbs.cpp:2519 msgid "Clea_r All" msgstr "_Ryd alt" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2520 msgid "Delete all objects from document" msgstr "Slet alle objekter fra dokumentet" -#: ../src/verbs.cpp:2494 +#: ../src/verbs.cpp:2521 msgid "Select Al_l" msgstr "Markér _alt" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2522 msgid "Select all objects or all nodes" msgstr "Markér alle objekter eller alle knudepunkter" -#: ../src/verbs.cpp:2496 +#: ../src/verbs.cpp:2523 msgid "Select All in All La_yers" msgstr "Markér alt i alle la_g" -#: ../src/verbs.cpp:2497 +#: ../src/verbs.cpp:2524 msgid "Select all objects in all visible and unlocked layers" msgstr "Markér alle objekter i alle synlige og ulåste lag" -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2525 msgid "Fill _and Stroke" msgstr "Ud_fyldning og streg" -#: ../src/verbs.cpp:2499 +#: ../src/verbs.cpp:2526 #, fuzzy msgid "" "Select all objects with the same fill and stroke as the selected objects" msgstr "" "Markér et objekt med mønsterudfyldning at udtrække objekter fra." -#: ../src/verbs.cpp:2500 +#: ../src/verbs.cpp:2527 msgid "_Fill Color" msgstr "_Udfyldningsfarve" -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2528 #, fuzzy msgid "Select all objects with the same fill as the selected objects" msgstr "" "Markér et objekt med mønsterudfyldning at udtrække objekter fra." -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2529 msgid "_Stroke Color" msgstr "_Stregfarve" -#: ../src/verbs.cpp:2503 +#: ../src/verbs.cpp:2530 #, fuzzy msgid "Select all objects with the same stroke as the selected objects" msgstr "" "Skalér hvert markeret objekt så det passer med størrelsen af det kopierede " "objekt" -#: ../src/verbs.cpp:2504 +#: ../src/verbs.cpp:2531 msgid "Stroke St_yle" msgstr "Stregst_il" -#: ../src/verbs.cpp:2505 +#: ../src/verbs.cpp:2532 #, fuzzy msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " @@ -27393,11 +27400,11 @@ msgstr "" "Skalér hvert markeret objekt så det passer med størrelsen af det kopierede " "objekt" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2533 msgid "_Object Type" msgstr "_Objekttype" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2534 #, fuzzy msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " @@ -27406,544 +27413,555 @@ msgstr "" "Skalér hvert markeret objekt så det passer med størrelsen af det kopierede " "objekt" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2535 msgid "In_vert Selection" -msgstr "Invertér markering" +msgstr "_Invertér markering" -#: ../src/verbs.cpp:2509 +#: ../src/verbs.cpp:2536 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "Invertér markering (afmarkér det valgte og markér alt andet)" -#: ../src/verbs.cpp:2510 +#: ../src/verbs.cpp:2537 msgid "Invert in All Layers" msgstr "Invertér i alle lag" -#: ../src/verbs.cpp:2511 +#: ../src/verbs.cpp:2538 msgid "Invert selection in all visible and unlocked layers" msgstr "Invertér markering i alle synlige og ulåste lag" -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2539 #, fuzzy msgid "Select Next" msgstr "Slet tekst" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2540 #, fuzzy msgid "Select next object or node" msgstr "Markér alle objekter eller alle knudepunkter" -#: ../src/verbs.cpp:2514 +#: ../src/verbs.cpp:2541 #, fuzzy msgid "Select Previous" msgstr "Markering" -#: ../src/verbs.cpp:2515 +#: ../src/verbs.cpp:2542 #, fuzzy msgid "Select previous object or node" msgstr "Markér alle objekter eller alle knudepunkter" -#: ../src/verbs.cpp:2516 +#: ../src/verbs.cpp:2543 msgid "D_eselect" msgstr "Fjern m_arkering" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2544 msgid "Deselect any selected objects or nodes" msgstr "Afmarkér alle markerede objekter eller knudepunkter" -#: ../src/verbs.cpp:2519 +#: ../src/verbs.cpp:2546 #, fuzzy msgid "Delete all the guides in the document" msgstr "Slet alle objekter fra dokumentet" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2547 +#, fuzzy +msgid "Lock All Guides" +msgstr "Slet alle hjælpelinjer" + +#: ../src/verbs.cpp:2547 ../src/widgets/desktop-widget.cpp:402 +#, fuzzy +msgid "Toggle lock of all guides in the document" +msgstr "Slet alle objekter fra dokumentet" + +#: ../src/verbs.cpp:2548 msgid "Create _Guides Around the Page" -msgstr "Opret hjælpelinjer omkring siden" +msgstr "Opret _hjælpelinjer omkring siden" -#: ../src/verbs.cpp:2521 +#: ../src/verbs.cpp:2549 msgid "Create four guides aligned with the page borders" msgstr "Opret fire hjælpelinjer langs med sidens kanter" -#: ../src/verbs.cpp:2522 +#: ../src/verbs.cpp:2550 #, fuzzy msgid "Next path effect parameter" msgstr "Indsæt bredde separat" -#: ../src/verbs.cpp:2523 +#: ../src/verbs.cpp:2551 #, fuzzy msgid "Show next editable path effect parameter" msgstr "Indsæt bredde separat" #. Selection -#: ../src/verbs.cpp:2526 +#: ../src/verbs.cpp:2554 msgid "Raise to _Top" msgstr "Hæv til _toppen" -#: ../src/verbs.cpp:2527 +#: ../src/verbs.cpp:2555 msgid "Raise selection to top" msgstr "Markering til øverst" -#: ../src/verbs.cpp:2528 +#: ../src/verbs.cpp:2556 msgid "Lower to _Bottom" msgstr "Sænk til _bunden" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2557 msgid "Lower selection to bottom" msgstr "Sænk markering til nederst" -#: ../src/verbs.cpp:2530 +#: ../src/verbs.cpp:2558 msgid "_Raise" msgstr "_Hæv" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2559 msgid "Raise selection one step" msgstr "Hæv det markerede ét lag" -#: ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2560 msgid "_Lower" msgstr "_Sænk" -#: ../src/verbs.cpp:2533 +#: ../src/verbs.cpp:2561 msgid "Lower selection one step" msgstr "Sænk det markerede ét lag" -#: ../src/verbs.cpp:2535 +#: ../src/verbs.cpp:2563 msgid "Group selected objects" msgstr "Gruppér markerede objeckter" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2565 msgid "Ungroup selected groups" msgstr "Afgruppér markerede grupper" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2567 msgid "_Put on Path" msgstr "_Sæt på sti" -#: ../src/verbs.cpp:2541 +#: ../src/verbs.cpp:2569 msgid "_Remove from Path" msgstr "_Fjern fra sti" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2571 msgid "Remove Manual _Kerns" msgstr "Fjern manuelle _knibninger" #. TRANSLATORS: "glyph": An image used in the visual representation of characters; #. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2574 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "Fjern alle manuelle knibninger og tegnrotationer fra tekstobjektet" -#: ../src/verbs.cpp:2548 +#: ../src/verbs.cpp:2576 msgid "_Union" msgstr "_Forening" -#: ../src/verbs.cpp:2549 +#: ../src/verbs.cpp:2577 msgid "Create union of selected paths" msgstr "Opret forening af markerede stier" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2578 msgid "_Intersection" msgstr "_Gennemsnit" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2579 msgid "Create intersection of selected paths" msgstr "Opret gennemsnit markerede stier" -#: ../src/verbs.cpp:2552 +#: ../src/verbs.cpp:2580 msgid "_Difference" msgstr "F_orskel" -#: ../src/verbs.cpp:2553 +#: ../src/verbs.cpp:2581 msgid "Create difference of selected paths (bottom minus top)" msgstr "Opret differens af markerede stier (bund minus top)" -#: ../src/verbs.cpp:2554 +#: ../src/verbs.cpp:2582 msgid "E_xclusion" msgstr "Eks_klusion" -#: ../src/verbs.cpp:2555 +#: ../src/verbs.cpp:2583 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" msgstr "Opret XOR af markerede stier (de dele som hører til kun en én sti)" -#: ../src/verbs.cpp:2556 +#: ../src/verbs.cpp:2584 msgid "Di_vision" msgstr "Delin_g" -#: ../src/verbs.cpp:2557 +#: ../src/verbs.cpp:2585 msgid "Cut the bottom path into pieces" msgstr "Skær den nederste sti i stykker" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2560 +#: ../src/verbs.cpp:2588 msgid "Cut _Path" msgstr "Skær _sti" -#: ../src/verbs.cpp:2561 +#: ../src/verbs.cpp:2589 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "Skær nederste stis streger i stykker, fjern udfyldning" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2593 msgid "Outs_et" msgstr "Skub _ud" -#: ../src/verbs.cpp:2566 +#: ../src/verbs.cpp:2594 msgid "Outset selected paths" msgstr "Skub markerede stier ud" -#: ../src/verbs.cpp:2568 +#: ../src/verbs.cpp:2596 msgid "O_utset Path by 1 px" msgstr "S_kub sti ud med 1 px" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2597 msgid "Outset selected paths by 1 px" msgstr "Skub markerede stier ud med 1 px" -#: ../src/verbs.cpp:2571 +#: ../src/verbs.cpp:2599 msgid "O_utset Path by 10 px" msgstr "S_kub sti ud med 10 px" -#: ../src/verbs.cpp:2572 +#: ../src/verbs.cpp:2600 msgid "Outset selected paths by 10 px" msgstr "Skub markerede stier ud med 10 px" #. TRANSLATORS: "inset": contract a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2604 msgid "I_nset" -msgstr "Indføj" +msgstr "_Indføj" -#: ../src/verbs.cpp:2577 +#: ../src/verbs.cpp:2605 msgid "Inset selected paths" msgstr "Indføj markerede stier" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2607 msgid "I_nset Path by 1 px" msgstr "I_ndføj sti med en pixel" -#: ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2608 msgid "Inset selected paths by 1 px" msgstr "Indføj markerede stier med 1 pixel" -#: ../src/verbs.cpp:2582 +#: ../src/verbs.cpp:2610 msgid "I_nset Path by 10 px" msgstr "Indføj _stier med 10 pixler" -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2611 msgid "Inset selected paths by 10 px" msgstr "Indføj markerede stier med 10 pixler" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2613 msgid "D_ynamic Offset" msgstr "D_ynamisk forskudt" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2613 msgid "Create a dynamic offset object" msgstr "Opret et dynamisk forskudt objekt" -#: ../src/verbs.cpp:2587 +#: ../src/verbs.cpp:2615 msgid "_Linked Offset" msgstr "_Linket forskudt" -#: ../src/verbs.cpp:2588 +#: ../src/verbs.cpp:2616 msgid "Create a dynamic offset object linked to the original path" msgstr "Opret et dynamisk forskudt objekt, linket til den oprindelige sti" -#: ../src/verbs.cpp:2590 +#: ../src/verbs.cpp:2618 msgid "_Stroke to Path" msgstr "_Streg til sti" -#: ../src/verbs.cpp:2591 +#: ../src/verbs.cpp:2619 msgid "Convert selected object's stroke to paths" msgstr "Konvertér markerede objekters streg til stier" -#: ../src/verbs.cpp:2592 +#: ../src/verbs.cpp:2620 msgid "Si_mplify" msgstr "S_implificér" -#: ../src/verbs.cpp:2593 +#: ../src/verbs.cpp:2621 msgid "Simplify selected paths (remove extra nodes)" msgstr "Simplificér markerede stier (fjern ekstra knudepunkter)" -#: ../src/verbs.cpp:2594 +#: ../src/verbs.cpp:2622 msgid "_Reverse" msgstr "_Skift retning" -#: ../src/verbs.cpp:2595 +#: ../src/verbs.cpp:2623 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "Skift retningen af de markerede stier (nyttig til pilmarkører)" -#: ../src/verbs.cpp:2598 +#: ../src/verbs.cpp:2628 msgid "Create one or more paths from a bitmap by tracing it" msgstr "Opret en eller flere stier fra et billede, ved at spore det" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2631 msgid "Trace Pixel Art..." msgstr "Spor pixelart ..." -#: ../src/verbs.cpp:2600 +#: ../src/verbs.cpp:2632 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" msgstr "" -#: ../src/verbs.cpp:2601 +#: ../src/verbs.cpp:2633 msgid "Make a _Bitmap Copy" msgstr "_Opret en punktbilledkopi" -#: ../src/verbs.cpp:2602 +#: ../src/verbs.cpp:2634 msgid "Export selection to a bitmap and insert it into document" msgstr "Eksportér markering til punktbillede og indsæt i dokumentet" -#: ../src/verbs.cpp:2603 +#: ../src/verbs.cpp:2635 msgid "_Combine" msgstr "_Kombinér" -#: ../src/verbs.cpp:2604 +# scootergrisen: måske Kombinér +#: ../src/verbs.cpp:2636 msgid "Combine several paths into one" msgstr "Kombiner flere stier til en" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2607 +#: ../src/verbs.cpp:2639 msgid "Break _Apart" msgstr "_Bryd op" -#: ../src/verbs.cpp:2608 +#: ../src/verbs.cpp:2640 msgid "Break selected paths into subpaths" msgstr "Bryd markerede stier op i understier" -#: ../src/verbs.cpp:2609 +#: ../src/verbs.cpp:2641 msgid "_Arrange..." msgstr "_Arrangér ..." -#: ../src/verbs.cpp:2610 +#: ../src/verbs.cpp:2642 #, fuzzy msgid "Arrange selected objects in a table or circle" msgstr "Arrangér markerede objekter i et gittermønster" #. Layer -#: ../src/verbs.cpp:2612 +#: ../src/verbs.cpp:2644 msgid "_Add Layer..." msgstr "_Tilføj lag ..." -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2645 msgid "Create a new layer" msgstr "Opret nyt lag" -#: ../src/verbs.cpp:2614 +#: ../src/verbs.cpp:2646 msgid "Re_name Layer..." msgstr "Om_døb lag ..." -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2647 msgid "Rename the current layer" msgstr "Omdøb det aktuelle lag" -#: ../src/verbs.cpp:2616 +#: ../src/verbs.cpp:2648 msgid "Switch to Layer Abov_e" msgstr "Skift til ov_erliggende lag" -#: ../src/verbs.cpp:2617 +#: ../src/verbs.cpp:2649 msgid "Switch to the layer above the current" msgstr "Skift til laget ovenover det aktuelle" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2650 msgid "Switch to Layer Belo_w" msgstr "Skift til _underliggende lag" -#: ../src/verbs.cpp:2619 +#: ../src/verbs.cpp:2651 msgid "Switch to the layer below the current" msgstr "Skift til laget under det aktuelle" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2652 msgid "Move Selection to Layer Abo_ve" msgstr "Flyt markering til o_verliggende lag" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2653 msgid "Move selection to the layer above the current" msgstr "Flyt markering til laget nedenunder det aktuelle" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2654 msgid "Move Selection to Layer Bel_ow" msgstr "Flyt markering til _underliggende lag" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2655 msgid "Move selection to the layer below the current" msgstr "Flyt markering til laget under det aktuelle" -#: ../src/verbs.cpp:2624 +#: ../src/verbs.cpp:2656 msgid "Move Selection to Layer..." msgstr "Flyt markering til lag ..." -#: ../src/verbs.cpp:2626 +#: ../src/verbs.cpp:2658 msgid "Layer to _Top" msgstr "Lag _øverst" -#: ../src/verbs.cpp:2627 +#: ../src/verbs.cpp:2659 msgid "Raise the current layer to the top" msgstr "Hæv det aktuelle lag til toppen" -#: ../src/verbs.cpp:2628 +#: ../src/verbs.cpp:2660 msgid "Layer to _Bottom" msgstr "Lag _nederst" -#: ../src/verbs.cpp:2629 +#: ../src/verbs.cpp:2661 msgid "Lower the current layer to the bottom" msgstr "Sænk det aktuelle lag til bunden" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2662 msgid "_Raise Layer" msgstr "_Hæv lag" -#: ../src/verbs.cpp:2631 +#: ../src/verbs.cpp:2663 msgid "Raise the current layer" msgstr "Hæv det aktuelle lag" -#: ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2664 msgid "_Lower Layer" msgstr "_Sænk lag" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2665 msgid "Lower the current layer" msgstr "Sænk det aktuelle lag" -#: ../src/verbs.cpp:2634 +#: ../src/verbs.cpp:2666 msgid "D_uplicate Current Layer" msgstr "D_uplikér det aktuelle lag" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2667 msgid "Duplicate an existing layer" msgstr "Duplikér et eksisterende lag" -#: ../src/verbs.cpp:2636 +#: ../src/verbs.cpp:2668 msgid "_Delete Current Layer" msgstr "S_let det aktuelle lag" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2669 msgid "Delete the current layer" msgstr "Slet det aktuelle lag" -#: ../src/verbs.cpp:2638 +#: ../src/verbs.cpp:2670 msgid "_Show/hide other layers" msgstr "_Vis/skjul andre lag" -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2671 #, fuzzy msgid "Solo the current layer" msgstr "Sænk det aktuelle lag" -#: ../src/verbs.cpp:2640 +#: ../src/verbs.cpp:2672 #, fuzzy msgid "_Show all layers" msgstr "Markér i alle lag" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2673 #, fuzzy msgid "Show all the layers" msgstr "Vis eller skjul lærredetst linealer" -#: ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2674 #, fuzzy msgid "_Hide all layers" msgstr "Hæv lag" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2675 #, fuzzy msgid "Hide all the layers" msgstr "Hæv lag" -#: ../src/verbs.cpp:2644 +#: ../src/verbs.cpp:2676 #, fuzzy msgid "_Lock all layers" msgstr "Markér i alle lag" -#: ../src/verbs.cpp:2645 +#: ../src/verbs.cpp:2677 #, fuzzy msgid "Lock all the layers" msgstr "Vis eller skjul lærredetst linealer" -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2678 msgid "Lock/Unlock _other layers" -msgstr "Lås/Oplås andre lag" +msgstr "Lås/Oplås _andre lag" -#: ../src/verbs.cpp:2647 +#: ../src/verbs.cpp:2679 #, fuzzy msgid "Lock all the other layers" msgstr "Vis eller skjul lærredetst linealer" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2680 #, fuzzy msgid "_Unlock all layers" msgstr "Sænk lag" -#: ../src/verbs.cpp:2649 +#: ../src/verbs.cpp:2681 #, fuzzy msgid "Unlock all the layers" msgstr "Vis eller skjul lærredetst linealer" -#: ../src/verbs.cpp:2650 +#: ../src/verbs.cpp:2682 msgid "_Lock/Unlock Current Layer" msgstr "_Lås/oplås aktuelt lag" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2683 #, fuzzy msgid "Toggle lock on current layer" msgstr "Sænk det aktuelle lag" -#: ../src/verbs.cpp:2652 +#: ../src/verbs.cpp:2684 msgid "_Show/hide Current Layer" msgstr "_Vis/skjul aktuelt lag" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2685 #, fuzzy msgid "Toggle visibility of current layer" msgstr "Sænk det aktuelle lag" #. Object -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2688 msgid "Rotate _90° CW" msgstr "Rotér _90° i urets retning" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2659 +#: ../src/verbs.cpp:2691 msgid "Rotate selection 90° clockwise" msgstr "Rotér markering 90° i urets retning" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2692 msgid "Rotate 9_0° CCW" msgstr "Rotér 9_0° mod urets retning" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2695 msgid "Rotate selection 90° counter-clockwise" msgstr "Rotér markering 90° mod urets retning" -#: ../src/verbs.cpp:2664 +#: ../src/verbs.cpp:2696 msgid "Remove _Transformations" msgstr "Fjern _transformationer" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2697 msgid "Remove transformations from object" msgstr "Fjern transformationer fra objekt" -#: ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2698 msgid "_Object to Path" msgstr "_Objekt til sti" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2699 msgid "Convert selected object to path" msgstr "Konvertér det markerede objekt til sti" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2700 msgid "_Flow into Frame" msgstr "_Flyd ind i ramme" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2701 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" @@ -27951,779 +27969,778 @@ msgstr "" "Put tekst ind i ramme (sti eller figur), så der dannes en flydende tekst " "linket til rammen" -#: ../src/verbs.cpp:2670 +#: ../src/verbs.cpp:2702 msgid "_Unflow" msgstr "_Ikke-flydende" -#: ../src/verbs.cpp:2671 +#: ../src/verbs.cpp:2703 msgid "Remove text from frame (creates a single-line text object)" msgstr "Fjern tekst fra ramme (opretter et tekstobjekt med én linje)" -#: ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2704 msgid "_Convert to Text" msgstr "_Konvertér til tekst" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2705 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "" "Konvertér flydende tekst til almindelig tekstobjekt (bevarer udseendet)" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2707 msgid "Flip _Horizontal" msgstr "Vend _vandret" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2707 msgid "Flip selected objects horizontally" msgstr "Vend markerede objekter vandret" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2710 msgid "Flip _Vertical" msgstr "Vend _lodret" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2710 msgid "Flip selected objects vertically" msgstr "Vend markerede objekter lodret" -#: ../src/verbs.cpp:2681 +#: ../src/verbs.cpp:2713 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "Anvend maske på markering (ved at bruge det øverste objekt som maske)" -#: ../src/verbs.cpp:2683 +#: ../src/verbs.cpp:2715 #, fuzzy msgid "Edit mask" msgstr "Vælg maske" -#: ../src/verbs.cpp:2684 ../src/verbs.cpp:2692 +#: ../src/verbs.cpp:2716 ../src/verbs.cpp:2724 msgid "_Release" msgstr "_Frigør" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2717 msgid "Remove mask from selection" msgstr "Fjern maske fra markering" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2719 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" msgstr "" "Anvend beskæringsti på markeringen (ved at bruge det øverste objekt som " "beskæringssti)" -#: ../src/verbs.cpp:2688 +#: ../src/verbs.cpp:2720 msgid "Create Cl_ip Group" msgstr "" -#: ../src/verbs.cpp:2689 +#: ../src/verbs.cpp:2721 msgid "Creates a clip group using the selected objects as a base" msgstr "" -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2723 #, fuzzy msgid "Edit clipping path" msgstr "Vælg beskæringssti" -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2725 msgid "Remove clipping path from selection" msgstr "Fjern beskæringssti fra markeringen" #. Tools -#: ../src/verbs.cpp:2698 +#: ../src/verbs.cpp:2730 #, fuzzy msgctxt "ContextVerb" msgid "Select" msgstr "Vælg" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2731 msgid "Select and transform objects" msgstr "Markér og transformér objekter" -#: ../src/verbs.cpp:2700 +#: ../src/verbs.cpp:2732 #, fuzzy msgctxt "ContextVerb" msgid "Node Edit" msgstr "Redigér knudepunkt" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2733 msgid "Edit paths by nodes" msgstr "Redigér stier med knudepunkter" -#: ../src/verbs.cpp:2702 +#: ../src/verbs.cpp:2734 msgctxt "ContextVerb" msgid "Tweak" msgstr "" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2735 msgid "Tweak objects by sculpting or painting" msgstr "Tweak objekter ved formning eller maling" -#: ../src/verbs.cpp:2704 +#: ../src/verbs.cpp:2736 #, fuzzy msgctxt "ContextVerb" msgid "Spray" msgstr "Spiral" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2737 msgid "Spray objects by sculpting or painting" msgstr "Spray objekter ved formning eller maling" -#: ../src/verbs.cpp:2706 +#: ../src/verbs.cpp:2738 #, fuzzy msgctxt "ContextVerb" msgid "Rectangle" msgstr "Firkant" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2739 msgid "Create rectangles and squares" msgstr "Opret firkanter og kvadrater" -#: ../src/verbs.cpp:2708 +#: ../src/verbs.cpp:2740 msgctxt "ContextVerb" msgid "3D Box" msgstr "3D-boks" -#: ../src/verbs.cpp:2709 +#: ../src/verbs.cpp:2741 msgid "Create 3D boxes" msgstr "Opret 3D-bokse" -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2742 #, fuzzy msgctxt "ContextVerb" msgid "Ellipse" msgstr "Elipse" -#: ../src/verbs.cpp:2711 +#: ../src/verbs.cpp:2743 msgid "Create circles, ellipses, and arcs" msgstr "Opret cirkler, ellipser og buer" -#: ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2744 #, fuzzy msgctxt "ContextVerb" msgid "Star" msgstr "Stjerne" -#: ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2745 msgid "Create stars and polygons" msgstr "Opret stjerner og polygoner" -#: ../src/verbs.cpp:2714 +#: ../src/verbs.cpp:2746 #, fuzzy msgctxt "ContextVerb" msgid "Spiral" msgstr "Spiral" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2747 msgid "Create spirals" msgstr "Opret spiraler" -#: ../src/verbs.cpp:2716 +#: ../src/verbs.cpp:2748 #, fuzzy msgctxt "ContextVerb" msgid "Pencil" msgstr "Blyant" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2749 msgid "Draw freehand lines" msgstr "Frihåndstegning" -#: ../src/verbs.cpp:2718 +#: ../src/verbs.cpp:2750 #, fuzzy msgctxt "ContextVerb" msgid "Pen" msgstr "Pen" -#: ../src/verbs.cpp:2719 +#: ../src/verbs.cpp:2751 msgid "Draw Bezier curves and straight lines" msgstr "Tegn bezierkurver og rette linjer" -#: ../src/verbs.cpp:2720 +#: ../src/verbs.cpp:2752 #, fuzzy msgctxt "ContextVerb" msgid "Calligraphy" msgstr "Kalligrafi" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2753 msgid "Draw calligraphic or brush strokes" msgstr "Tegn kalligrafi eller penselstrøg" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2755 msgid "Create and edit text objects" msgstr "Opret og redigér tekstobjekter" -#: ../src/verbs.cpp:2724 +#: ../src/verbs.cpp:2756 #, fuzzy msgctxt "ContextVerb" msgid "Gradient" msgstr "Overgang" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2757 msgid "Create and edit gradients" msgstr "Opret og redigér overgange" -#: ../src/verbs.cpp:2726 +#: ../src/verbs.cpp:2758 msgctxt "ContextVerb" msgid "Mesh" msgstr "" -#: ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2759 #, fuzzy msgid "Create and edit meshes" msgstr "Opret og redigér overgange" -#: ../src/verbs.cpp:2728 -#, fuzzy +#: ../src/verbs.cpp:2760 msgctxt "ContextVerb" msgid "Zoom" msgstr "Zoom" -#: ../src/verbs.cpp:2729 +#: ../src/verbs.cpp:2761 msgid "Zoom in or out" msgstr "Zoom ind eller ud" -#: ../src/verbs.cpp:2731 +#: ../src/verbs.cpp:2763 msgid "Measurement tool" msgstr "Måleværktøj" -#: ../src/verbs.cpp:2732 +#: ../src/verbs.cpp:2764 msgctxt "ContextVerb" msgid "Dropper" msgstr "Pipette" -#: ../src/verbs.cpp:2734 +#: ../src/verbs.cpp:2766 msgctxt "ContextVerb" msgid "Connector" msgstr "Tilslutter" -#: ../src/verbs.cpp:2735 +#: ../src/verbs.cpp:2767 msgid "Create diagram connectors" msgstr "Opret diagramforbindelser" -#: ../src/verbs.cpp:2736 +#: ../src/verbs.cpp:2770 msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "Malerspand" -#: ../src/verbs.cpp:2737 +#: ../src/verbs.cpp:2771 msgid "Fill bounded areas" msgstr "Udfyld afgrænsede områder" -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2774 #, fuzzy msgctxt "ContextVerb" msgid "LPE Edit" msgstr "_Redigér" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2775 #, fuzzy msgid "Edit Path Effect parameters" msgstr "Indsæt bredde separat" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2776 msgctxt "ContextVerb" msgid "Eraser" msgstr "Viskelæder" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2777 msgid "Erase existing paths" msgstr "Slet eksisterende stier" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2778 #, fuzzy msgctxt "ContextVerb" msgid "LPE Tool" msgstr "Værktøjer" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2779 msgid "Do geometric constructions" msgstr "" #. Tool prefs -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2781 msgid "Selector Preferences" msgstr "Indstillinger for markeringsværktøj" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2782 msgid "Open Preferences for the Selector tool" msgstr "Åbn indstillinger for markeringsværktøjet" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2783 msgid "Node Tool Preferences" msgstr "Indstillinger for knudepunktsværktøj" -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2784 msgid "Open Preferences for the Node tool" msgstr "Åbn indstillinger for knudepunktsværktøj" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2785 #, fuzzy msgid "Tweak Tool Preferences" msgstr "Indstillinger for knudepunktsværktøj" -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2786 #, fuzzy msgid "Open Preferences for the Tweak tool" msgstr "Åbn indstillinger for tekstværktøjet" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2787 #, fuzzy msgid "Spray Tool Preferences" msgstr "Indstillinger for spiraler" -#: ../src/verbs.cpp:2752 +#: ../src/verbs.cpp:2788 #, fuzzy msgid "Open Preferences for the Spray tool" msgstr "Åbn indstillinger for spiralværktøjet" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2789 msgid "Rectangle Preferences" msgstr "Indstillinger for firkanter" -#: ../src/verbs.cpp:2754 +#: ../src/verbs.cpp:2790 msgid "Open Preferences for the Rectangle tool" msgstr "Åbn indstillinger for firkantværktøjet" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2791 msgid "3D Box Preferences" msgstr "Indstillinger for 3D-boks" -#: ../src/verbs.cpp:2756 +#: ../src/verbs.cpp:2792 #, fuzzy msgid "Open Preferences for the 3D Box tool" msgstr "Åbn indstillinger for knudepunktsværktøj" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2793 msgid "Ellipse Preferences" msgstr "Indstillinger for ellipser" -#: ../src/verbs.cpp:2758 +#: ../src/verbs.cpp:2794 msgid "Open Preferences for the Ellipse tool" msgstr "Åbn indstillinger for ellipseværktøjet" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2795 msgid "Star Preferences" msgstr "Indstillinger for stjerner" -#: ../src/verbs.cpp:2760 +#: ../src/verbs.cpp:2796 msgid "Open Preferences for the Star tool" msgstr "Åbn indstillinger for stjerneværktøjet" -#: ../src/verbs.cpp:2761 +#: ../src/verbs.cpp:2797 msgid "Spiral Preferences" msgstr "Indstillinger for spiraler" -#: ../src/verbs.cpp:2762 +#: ../src/verbs.cpp:2798 msgid "Open Preferences for the Spiral tool" msgstr "Åbn indstillinger for spiralværktøjet" -#: ../src/verbs.cpp:2763 +#: ../src/verbs.cpp:2799 msgid "Pencil Preferences" msgstr "Indstillinger for blyant" -#: ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2800 msgid "Open Preferences for the Pencil tool" msgstr "Åbn indstillinger for blyantværktøjet" -#: ../src/verbs.cpp:2765 +#: ../src/verbs.cpp:2801 msgid "Pen Preferences" msgstr "Indstillinger for pen" -#: ../src/verbs.cpp:2766 +#: ../src/verbs.cpp:2802 msgid "Open Preferences for the Pen tool" msgstr "Åbn indstillinger for penværktøjet" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2803 msgid "Calligraphic Preferences" msgstr "Indstillinger for kalligrafi" -#: ../src/verbs.cpp:2768 +#: ../src/verbs.cpp:2804 msgid "Open Preferences for the Calligraphy tool" msgstr "Åbn indstillinger for kalligrafiværktøjet" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2805 msgid "Text Preferences" msgstr "Indstillinger for tekst" -#: ../src/verbs.cpp:2770 +#: ../src/verbs.cpp:2806 msgid "Open Preferences for the Text tool" msgstr "Åbn indstillinger for tekstværktøjet" -#: ../src/verbs.cpp:2771 +#: ../src/verbs.cpp:2807 msgid "Gradient Preferences" msgstr "Indstillinger for overgange" -#: ../src/verbs.cpp:2772 +#: ../src/verbs.cpp:2808 msgid "Open Preferences for the Gradient tool" msgstr "Åbn indstillinger for overgangsværktøjet" -#: ../src/verbs.cpp:2773 +#: ../src/verbs.cpp:2809 #, fuzzy msgid "Mesh Preferences" msgstr "Indstillinger for stjerner" -#: ../src/verbs.cpp:2774 +#: ../src/verbs.cpp:2810 #, fuzzy msgid "Open Preferences for the Mesh tool" msgstr "Åbn indstillinger for stjerneværktøjet" -#: ../src/verbs.cpp:2775 +#: ../src/verbs.cpp:2811 msgid "Zoom Preferences" msgstr "Indstillinger for zoom" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2812 msgid "Open Preferences for the Zoom tool" msgstr "Åbn indstillinger for zoomværktøjet" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2813 #, fuzzy msgid "Measure Preferences" msgstr "Indstillinger for stjerner" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2814 #, fuzzy msgid "Open Preferences for the Measure tool" msgstr "Åbn indstillinger for stjerneværktøjet" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2815 msgid "Dropper Preferences" msgstr "Indstillinger for pipette" -#: ../src/verbs.cpp:2780 +#: ../src/verbs.cpp:2816 msgid "Open Preferences for the Dropper tool" msgstr "Åbn indstillinger for pipetteværktøjet" -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2817 msgid "Connector Preferences" msgstr "Indstillinger for forbindelser" -#: ../src/verbs.cpp:2782 +#: ../src/verbs.cpp:2818 msgid "Open Preferences for the Connector tool" msgstr "Åbn indstillinger for forbindelsesværktøjet" -#: ../src/verbs.cpp:2783 +#: ../src/verbs.cpp:2821 msgid "Paint Bucket Preferences" msgstr "Indstillinger for malerspand" -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2822 #, fuzzy msgid "Open Preferences for the Paint Bucket tool" msgstr "Åbn indstillinger for penværktøjet" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2825 #, fuzzy msgid "Eraser Preferences" msgstr "Indstillinger for stjerner" -#: ../src/verbs.cpp:2786 +#: ../src/verbs.cpp:2826 #, fuzzy msgid "Open Preferences for the Eraser tool" msgstr "Åbn indstillinger for stjerneværktøjet" -#: ../src/verbs.cpp:2787 +#: ../src/verbs.cpp:2827 #, fuzzy msgid "LPE Tool Preferences" msgstr "Indstillinger for knudepunktsværktøj" -#: ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2828 #, fuzzy msgid "Open Preferences for the LPETool tool" msgstr "Åbn indstillinger for zoomværktøjet" #. Zoom/View -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2830 msgid "Zoom In" msgstr "Zoom ind" -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2830 msgid "Zoom in" msgstr "Zoom ind" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2831 msgid "Zoom Out" msgstr "Zoom ud" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2831 msgid "Zoom out" msgstr "Zoom ud" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2832 msgid "_Rulers" msgstr "_Linealer" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2832 msgid "Show or hide the canvas rulers" msgstr "Vis eller skjul lærredetst linealer" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2833 msgid "Scroll_bars" -msgstr "Rullepaneler" +msgstr "_Rullepaneler" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2833 msgid "Show or hide the canvas scrollbars" msgstr "Vis eller skjul lærredets rullepaneler" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2834 msgid "Page _Grid" msgstr "Side_gitter" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2834 msgid "Show or hide the page grid" msgstr "Vis eller skjul sidens gitter" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2835 msgid "G_uides" msgstr "H_jælpelinjer" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2835 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" "Vis eller skjul hjælpelinjer (træk fra en lineal for at oprette en " "hjælpelinje)" -#: ../src/verbs.cpp:2796 +#: ../src/verbs.cpp:2836 #, fuzzy msgid "Enable snapping" msgstr "Forhåndsvis" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2837 msgid "_Commands Bar" msgstr "_Kommandolinje" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2837 msgid "Show or hide the Commands bar (under the menu)" msgstr "Vis eller skjul kommandolinjen (under menuen)" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2838 msgid "Sn_ap Controls Bar" msgstr "F_astgørelseskontrollinje" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2838 #, fuzzy msgid "Show or hide the snapping controls" msgstr "Vis eller skjul værktøjskontrollinjen" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2839 msgid "T_ool Controls Bar" -msgstr "Værktøjskontrollinjen" +msgstr "_Værktøjskontrollinjen" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2839 msgid "Show or hide the Tool Controls bar" msgstr "Vis eller skjul værktøjskontrollinjen" -#: ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2840 msgid "_Toolbox" msgstr "_Værktøjskasse" -#: ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2840 msgid "Show or hide the main toolbox (on the left)" msgstr "Vis eller skjul værktøjskassen (til venstre)" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2841 msgid "_Palette" msgstr "_Palet" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2841 msgid "Show or hide the color palette" msgstr "Vis eller skjul farvepaletten" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2842 msgid "_Statusbar" msgstr "_Statuslinje" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2842 msgid "Show or hide the statusbar (at the bottom of the window)" msgstr "Vis eller skjul statuslinjen (i bunden af vinduet)" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2843 msgid "Nex_t Zoom" msgstr "Næs_te zoom" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2843 msgid "Next zoom (from the history of zooms)" msgstr "Næste zoom (fra zoomhistorik)" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2845 msgid "Pre_vious Zoom" msgstr "Fo_rrige zoom" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2845 msgid "Previous zoom (from the history of zooms)" msgstr "Forrige zoom (fra zoomhistorik)" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2847 msgid "Zoom 1:_1" msgstr "Zoom 1:_1" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2847 msgid "Zoom to 1:1" msgstr "Zoom til 1:1" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2849 msgid "Zoom 1:_2" msgstr "Zoom 1:_2" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2849 msgid "Zoom to 1:2" msgstr "Zoom til 1:2" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2851 msgid "_Zoom 2:1" msgstr "_Zoom 2:1" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2851 msgid "Zoom to 2:1" msgstr "Zoom til 2:1" -#: ../src/verbs.cpp:2814 +#: ../src/verbs.cpp:2853 msgid "_Fullscreen" msgstr "_Fuldskærm" -#: ../src/verbs.cpp:2814 ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2853 ../src/verbs.cpp:2855 msgid "Stretch this document window to full screen" msgstr "Stræk dokumentetvinduet til fuldskærm" -#: ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2855 msgid "Fullscreen & Focus Mode" msgstr "" -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2857 msgid "Toggle _Focus Mode" msgstr "" -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2857 msgid "Remove excess toolbars to focus on drawing" msgstr "" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2859 msgid "Duplic_ate Window" msgstr "Dupli_kér vindue" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2859 msgid "Open a new window with the same document" msgstr "Åbn et nyt vindue med samme dokument" -#: ../src/verbs.cpp:2823 +#: ../src/verbs.cpp:2861 msgid "_New View Preview" msgstr "_Ny forhåndsvisning" -#: ../src/verbs.cpp:2824 +#: ../src/verbs.cpp:2862 msgid "New View Preview" msgstr "Ny forhåndsvisning" #. "view_new_preview" -#: ../src/verbs.cpp:2826 ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2864 ../src/verbs.cpp:2872 msgid "_Normal" msgstr "_Normal" -#: ../src/verbs.cpp:2827 +#: ../src/verbs.cpp:2865 msgid "Switch to normal display mode" msgstr "Skift visningstilstand til normal" -#: ../src/verbs.cpp:2828 +#: ../src/verbs.cpp:2866 msgid "No _Filters" msgstr "Ingen _filtre" -#: ../src/verbs.cpp:2829 +#: ../src/verbs.cpp:2867 #, fuzzy msgid "Switch to normal display without filters" msgstr "Skift visningstilstand til normal" -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2868 msgid "_Outline" msgstr "_Omrids" -#: ../src/verbs.cpp:2831 +#: ../src/verbs.cpp:2869 msgid "Switch to outline (wireframe) display mode" msgstr "Skift visningstilstand til omrids" #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), #. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2832 ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2870 ../src/verbs.cpp:2878 msgid "_Toggle" msgstr "_Skift" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2871 msgid "Toggle between normal and outline display modes" msgstr "Skift mellem tilstandende normal- og omridsvisning" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2873 #, fuzzy msgid "Switch to normal color display mode" msgstr "Skift visningstilstand til normal" -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2874 msgid "_Grayscale" msgstr "_Gråtone" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2875 #, fuzzy msgid "Switch to grayscale display mode" msgstr "Skift visningstilstand til normal" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2879 msgid "Toggle between normal and grayscale color display modes" msgstr "" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2881 msgid "Color-managed view" msgstr "Farvehåndteret visning" -#: ../src/verbs.cpp:2844 +#: ../src/verbs.cpp:2882 msgid "Toggle color-managed display for this document window" msgstr "Skift Farvehåndteret visning for dette dokumentvindue" -#: ../src/verbs.cpp:2846 +#: ../src/verbs.cpp:2884 msgid "Ico_n Preview..." -msgstr "Ikon forhåndsvisnig ..." +msgstr "_Ikon forhåndsvisnig ..." -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2885 msgid "Open a window to preview objects at different icon resolutions" msgstr "" "Åbn et vindue at forhåndsvise objekter ved forskellige ikon-opløsninger" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2887 msgid "Zoom to fit page in window" msgstr "Tilpas side i vindue" -#: ../src/verbs.cpp:2850 +#: ../src/verbs.cpp:2888 msgid "Page _Width" msgstr "Side_bredde" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2889 msgid "Zoom to fit page width in window" msgstr "Tilpas til sidebredde" -#: ../src/verbs.cpp:2853 +#: ../src/verbs.cpp:2891 msgid "Zoom to fit drawing in window" msgstr "Tilpas tegning i vindue" -#: ../src/verbs.cpp:2855 +#: ../src/verbs.cpp:2893 msgid "Zoom to fit selection in window" msgstr "Tilpas markering i vindue" #. Dialogs -#: ../src/verbs.cpp:2858 +#: ../src/verbs.cpp:2896 msgid "P_references..." msgstr "Indstillinge_r ..." -#: ../src/verbs.cpp:2859 +#: ../src/verbs.cpp:2897 msgid "Edit global Inkscape preferences" msgstr "Redigér globale indstillinger" -#: ../src/verbs.cpp:2860 +#: ../src/verbs.cpp:2898 msgid "_Document Properties..." msgstr "_Dokumentindstillinger ..." -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2899 msgid "Edit properties of this document (to be saved with the document)" msgstr "Redigér dokumentets indstillinger (gemms med dokumentet)" -#: ../src/verbs.cpp:2862 +#: ../src/verbs.cpp:2900 msgid "Document _Metadata..." msgstr "Dokument_metadata ..." -#: ../src/verbs.cpp:2863 +#: ../src/verbs.cpp:2901 msgid "Edit document metadata (to be saved with the document)" msgstr "Redigér dokumentets metadata (gemmes med dokumentet)" -#: ../src/verbs.cpp:2865 +#: ../src/verbs.cpp:2903 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " "properties..." @@ -28732,121 +28749,121 @@ msgstr "" "udfyldnings- og stregindstillinger" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2867 +#: ../src/verbs.cpp:2905 msgid "Gl_yphs..." msgstr "Gl_yffer ..." -#: ../src/verbs.cpp:2868 +#: ../src/verbs.cpp:2906 #, fuzzy msgid "Select characters from a glyphs palette" msgstr "Vælg farver fra en farvesamlingspalet" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2871 +#: ../src/verbs.cpp:2909 msgid "S_watches..." -msgstr "Farvesamlinger ..." +msgstr "_Farvesamlinger ..." -#: ../src/verbs.cpp:2872 +#: ../src/verbs.cpp:2910 msgid "Select colors from a swatches palette" msgstr "Vælg farver fra en farvesamlingspalet" -#: ../src/verbs.cpp:2873 +#: ../src/verbs.cpp:2911 msgid "S_ymbols..." msgstr "S_ymboler ..." -#: ../src/verbs.cpp:2874 +#: ../src/verbs.cpp:2912 #, fuzzy msgid "Select symbol from a symbols palette" msgstr "Vælg farver fra en farvesamlingspalet" -#: ../src/verbs.cpp:2875 +#: ../src/verbs.cpp:2913 msgid "Transfor_m..." msgstr "Transfor_mér ..." -#: ../src/verbs.cpp:2876 +#: ../src/verbs.cpp:2914 msgid "Precisely control objects' transformations" msgstr "Kontrollér objekters transformationer eksakt" -#: ../src/verbs.cpp:2877 +#: ../src/verbs.cpp:2915 msgid "_Align and Distribute..." msgstr "_Justér og fordel ..." -#: ../src/verbs.cpp:2878 +#: ../src/verbs.cpp:2916 msgid "Align and distribute objects" msgstr "Justér og fordel objekter" -#: ../src/verbs.cpp:2879 +#: ../src/verbs.cpp:2917 msgid "_Spray options..." -msgstr "" +msgstr "_Sprøjteindstillinger ..." -#: ../src/verbs.cpp:2880 +#: ../src/verbs.cpp:2918 #, fuzzy msgid "Some options for the spray" msgstr "Papirbredde" -#: ../src/verbs.cpp:2881 +#: ../src/verbs.cpp:2919 msgid "Undo _History..." msgstr "Fortrydelses_historik ..." -#: ../src/verbs.cpp:2882 +#: ../src/verbs.cpp:2920 msgid "Undo History" msgstr "Fortrydelseshistorik" -#: ../src/verbs.cpp:2884 +#: ../src/verbs.cpp:2922 msgid "View and select font family, font size and other text properties" msgstr "Vis og vælg skrifttype, skriftstørrelse og andre tekstindstillinger" -#: ../src/verbs.cpp:2885 +#: ../src/verbs.cpp:2923 msgid "_XML Editor..." msgstr "_XML redigering ..." -#: ../src/verbs.cpp:2886 +#: ../src/verbs.cpp:2924 msgid "View and edit the XML tree of the document" msgstr "Vis og redigér dokumentets XML-træ" -#: ../src/verbs.cpp:2887 +#: ../src/verbs.cpp:2925 msgid "_Find/Replace..." msgstr "_Find/erstat ..." -#: ../src/verbs.cpp:2888 +#: ../src/verbs.cpp:2926 msgid "Find objects in document" msgstr "Find objekter i dokumentet" -#: ../src/verbs.cpp:2889 +#: ../src/verbs.cpp:2927 msgid "Find and _Replace Text..." -msgstr "" +msgstr "Find og _erstat tekst ..." -#: ../src/verbs.cpp:2890 +#: ../src/verbs.cpp:2928 #, fuzzy msgid "Find and replace text in document" msgstr "Find objekter i dokumentet" -#: ../src/verbs.cpp:2892 +#: ../src/verbs.cpp:2930 msgid "Check spelling of text in document" msgstr "Stavekontrol af dokumentets tekst" -#: ../src/verbs.cpp:2893 +#: ../src/verbs.cpp:2931 msgid "_Messages..." msgstr "_Meddelelser ..." -#: ../src/verbs.cpp:2894 +#: ../src/verbs.cpp:2932 msgid "View debug messages" msgstr "Vis fejlfindingsmeddelelser" -#: ../src/verbs.cpp:2895 +#: ../src/verbs.cpp:2933 msgid "Show/Hide D_ialogs" msgstr "Vis/skjul d_ialoger" -#: ../src/verbs.cpp:2896 +#: ../src/verbs.cpp:2934 msgid "Show or hide all open dialogs" msgstr "Vis eller skjul alle åbne dialoger" -#: ../src/verbs.cpp:2897 +#: ../src/verbs.cpp:2935 msgid "Create Tiled Clones..." msgstr "Opret fliselagte kloner ..." -#: ../src/verbs.cpp:2898 +#: ../src/verbs.cpp:2936 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" @@ -28854,318 +28871,316 @@ msgstr "" "Opret flere kloner af de markerede objekter og arrangér dem i et mønster " "eller spredning" -#: ../src/verbs.cpp:2899 +#: ../src/verbs.cpp:2937 msgid "_Object attributes..." msgstr "_Objektattributter ..." -#: ../src/verbs.cpp:2900 +#: ../src/verbs.cpp:2938 #, fuzzy msgid "Edit the object attributes..." msgstr "Sæt attribut" -#: ../src/verbs.cpp:2902 +#: ../src/verbs.cpp:2940 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "Redigér id, status for låsning og synlighed og andre objektegenskaber" -#: ../src/verbs.cpp:2903 +#: ../src/verbs.cpp:2941 msgid "_Input Devices..." msgstr "_Inputenheder ..." -#: ../src/verbs.cpp:2904 +#: ../src/verbs.cpp:2942 msgid "Configure extended input devices, such as a graphics tablet" msgstr "Indstil yderligere inputenheder som f.eks. en tegneplade" -#: ../src/verbs.cpp:2905 +#: ../src/verbs.cpp:2943 msgid "_Extensions..." msgstr "_Udvidelser ..." -#: ../src/verbs.cpp:2906 +#: ../src/verbs.cpp:2944 msgid "Query information about extensions" msgstr "Forespørg information om udvidelser" -#: ../src/verbs.cpp:2907 +#: ../src/verbs.cpp:2945 msgid "Layer_s..." msgstr "_Lag ..." -#: ../src/verbs.cpp:2908 +#: ../src/verbs.cpp:2946 msgid "View Layers" msgstr "Vis lag" -#: ../src/verbs.cpp:2909 +#: ../src/verbs.cpp:2947 msgid "Object_s..." -msgstr "Objekter ..." +msgstr "_Objekter ..." -#: ../src/verbs.cpp:2910 +#: ../src/verbs.cpp:2948 msgid "View Objects" -msgstr "" +msgstr "Vis objekter" -#: ../src/verbs.cpp:2911 +#: ../src/verbs.cpp:2949 msgid "Selection se_ts..." -msgstr "Markeringssæt ..." +msgstr "_Markeringssæt ..." -#: ../src/verbs.cpp:2912 +#: ../src/verbs.cpp:2950 msgid "View Tags" -msgstr "" +msgstr "Vis mærkater" -#: ../src/verbs.cpp:2913 +#: ../src/verbs.cpp:2951 msgid "Path E_ffects ..." msgstr "Stieffe_kter ..." -#: ../src/verbs.cpp:2914 +#: ../src/verbs.cpp:2952 #, fuzzy msgid "Manage, edit, and apply path effects" msgstr "Opret et dynamisk forskudt objekt" -#: ../src/verbs.cpp:2915 +#: ../src/verbs.cpp:2953 msgid "Filter _Editor..." -msgstr "Filterredigering ..." +msgstr "_Filterredigering ..." -#: ../src/verbs.cpp:2916 +#: ../src/verbs.cpp:2954 msgid "Manage, edit, and apply SVG filters" -msgstr "" +msgstr "Håndtér, redigér og anvend SVG-filtre" -#: ../src/verbs.cpp:2917 +#: ../src/verbs.cpp:2955 msgid "SVG Font Editor..." msgstr "SVG skrifttyperedigering ..." -#: ../src/verbs.cpp:2918 +#: ../src/verbs.cpp:2956 msgid "Edit SVG fonts" -msgstr "" +msgstr "Redigér SVG-skrifttyper" -#: ../src/verbs.cpp:2919 +#: ../src/verbs.cpp:2957 msgid "Print Colors..." msgstr "Udskriv farver ..." -#: ../src/verbs.cpp:2920 +#: ../src/verbs.cpp:2958 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" -#: ../src/verbs.cpp:2921 +#: ../src/verbs.cpp:2959 msgid "_Export PNG Image..." msgstr "_Eksportér PNG-billede ..." -#: ../src/verbs.cpp:2922 +#: ../src/verbs.cpp:2960 msgid "Export this document or a selection as a PNG image" msgstr "Eksportér dokumentet eller en markering som et PNG-billede" #. Help -#: ../src/verbs.cpp:2924 +#: ../src/verbs.cpp:2962 msgid "About E_xtensions" msgstr "Om _udvidelser" -#: ../src/verbs.cpp:2925 +#: ../src/verbs.cpp:2963 msgid "Information on Inkscape extensions" msgstr "Information til Inkscape-udvidelser" -#: ../src/verbs.cpp:2926 +#: ../src/verbs.cpp:2964 msgid "About _Memory" msgstr "Om _hukommelse" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:2965 msgid "Memory usage information" msgstr "Information om hukommelsesforbrug" -#: ../src/verbs.cpp:2928 +#: ../src/verbs.cpp:2966 msgid "_About Inkscape" msgstr "_Om Inkscape" -#: ../src/verbs.cpp:2929 +#: ../src/verbs.cpp:2967 msgid "Inkscape version, authors, license" msgstr "Inkscape version, forfattere, license" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2934 +#: ../src/verbs.cpp:2972 msgid "Inkscape: _Basic" msgstr "Inkscape: _Grundlæggende" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:2973 msgid "Getting started with Inkscape" msgstr "Kom igang med Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2936 +#: ../src/verbs.cpp:2974 msgid "Inkscape: _Shapes" msgstr "Inkscape: _Figurer" -#: ../src/verbs.cpp:2937 +#: ../src/verbs.cpp:2975 msgid "Using shape tools to create and edit shapes" msgstr "Brug af figurværktøjet til at oprette og redigere figurer" -#: ../src/verbs.cpp:2938 +#: ../src/verbs.cpp:2976 msgid "Inkscape: _Advanced" msgstr "Inkscape: _Avanceret" -#: ../src/verbs.cpp:2939 +#: ../src/verbs.cpp:2977 msgid "Advanced Inkscape topics" msgstr "Avancerede emner om Inkscape" -#. "tutorial_advanced" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2941 +#: ../src/verbs.cpp:2981 msgid "Inkscape: T_racing" msgstr "Inkscape: S_poring" -#: ../src/verbs.cpp:2942 +#: ../src/verbs.cpp:2982 msgid "Using bitmap tracing" msgstr "Brug af sporing på billeder" -#. "tutorial_tracing" -#: ../src/verbs.cpp:2943 +#: ../src/verbs.cpp:2985 msgid "Inkscape: Tracing Pixel Art" msgstr "Inkscape: Spore pixelart" -#: ../src/verbs.cpp:2944 +#: ../src/verbs.cpp:2986 msgid "Using Trace Pixel Art dialog" msgstr "" -#: ../src/verbs.cpp:2945 +#: ../src/verbs.cpp:2987 msgid "Inkscape: _Calligraphy" msgstr "Inkscape: _Kalligrafi" -#: ../src/verbs.cpp:2946 +#: ../src/verbs.cpp:2988 msgid "Using the Calligraphy pen tool" msgstr "Brug af kalligrafipennen" -#: ../src/verbs.cpp:2947 +#: ../src/verbs.cpp:2989 msgid "Inkscape: _Interpolate" msgstr "Inkscape: _Interpolér" -#: ../src/verbs.cpp:2948 +#: ../src/verbs.cpp:2990 msgid "Using the interpolate extension" msgstr "" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2949 +#: ../src/verbs.cpp:2991 msgid "_Elements of Design" msgstr "_Designelementer" -#: ../src/verbs.cpp:2950 +#: ../src/verbs.cpp:2992 msgid "Principles of design in the tutorial form" msgstr "Designprincipper i gennemgangsform" #. "tutorial_design" -#: ../src/verbs.cpp:2951 +#: ../src/verbs.cpp:2993 msgid "_Tips and Tricks" msgstr "_Tips og tricks" -#: ../src/verbs.cpp:2952 +#: ../src/verbs.cpp:2994 msgid "Miscellaneous tips and tricks" msgstr "Diverse tips og tricks" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2955 +#: ../src/verbs.cpp:2997 msgid "Previous Exte_nsion" msgstr "Forrige _udvidelse" -#: ../src/verbs.cpp:2956 +#: ../src/verbs.cpp:2998 #, fuzzy msgid "Repeat the last extension with the same settings" msgstr "Gentag den sidst brugte effekt med de samme indstillinger" -#: ../src/verbs.cpp:2957 +#: ../src/verbs.cpp:2999 msgid "_Previous Extension Settings..." msgstr "_Forrige udvidelsesindstillinger ..." -#: ../src/verbs.cpp:2958 +#: ../src/verbs.cpp:3000 #, fuzzy msgid "Repeat the last extension with new settings" msgstr "Gentag den sidst brugte effekt med nye indstillinger" -#: ../src/verbs.cpp:2962 +#: ../src/verbs.cpp:3004 msgid "Fit the page to the current selection" msgstr "Tilpas side til den aktuelle markering" -#: ../src/verbs.cpp:2964 +#: ../src/verbs.cpp:3006 msgid "Fit the page to the drawing" msgstr "Tilpas siden til tegningen" -#: ../src/verbs.cpp:2966 +#: ../src/verbs.cpp:3008 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" "Tilpas siden til den aktuelle markering, eller til tegningen hvis der ingen " "markering er" -#: ../src/verbs.cpp:2970 +#: ../src/verbs.cpp:3012 msgid "Unlock All in All Layers" msgstr "Oplås alle i all lag" -#: ../src/verbs.cpp:2972 +#: ../src/verbs.cpp:3014 msgid "Unhide All" msgstr "Vis alle" -#: ../src/verbs.cpp:2974 +#: ../src/verbs.cpp:3016 msgid "Unhide All in All Layers" msgstr "Vis alt i alle lag" -#: ../src/verbs.cpp:2978 +#: ../src/verbs.cpp:3020 msgid "Link an ICC color profile" msgstr "" -#: ../src/verbs.cpp:2979 +#: ../src/verbs.cpp:3021 #, fuzzy msgid "Remove Color Profile" msgstr "Fjern udfyldning" -#: ../src/verbs.cpp:2980 +#: ../src/verbs.cpp:3022 msgid "Remove a linked ICC color profile" msgstr "" -#: ../src/verbs.cpp:2983 +#: ../src/verbs.cpp:3025 #, fuzzy msgid "Add External Script" msgstr "Redigér udfyldning..." -#: ../src/verbs.cpp:2983 +#: ../src/verbs.cpp:3025 #, fuzzy msgid "Add an external script" msgstr "Redigér udfyldning..." -#: ../src/verbs.cpp:2985 +#: ../src/verbs.cpp:3027 #, fuzzy msgid "Add Embedded Script" msgstr "Redigér udfyldning..." -#: ../src/verbs.cpp:2985 +#: ../src/verbs.cpp:3027 #, fuzzy msgid "Add an embedded script" msgstr "Redigér udfyldning..." -#: ../src/verbs.cpp:2987 +#: ../src/verbs.cpp:3029 #, fuzzy msgid "Edit Embedded Script" msgstr "Fjern" -#: ../src/verbs.cpp:2987 +#: ../src/verbs.cpp:3029 #, fuzzy msgid "Edit an embedded script" msgstr "Fjern" -#: ../src/verbs.cpp:2989 +#: ../src/verbs.cpp:3031 #, fuzzy msgid "Remove External Script" msgstr "Fjern tekst fra sti" -#: ../src/verbs.cpp:2989 +#: ../src/verbs.cpp:3031 #, fuzzy msgid "Remove an external script" msgstr "Fjern tekst fra sti" -#: ../src/verbs.cpp:2991 +#: ../src/verbs.cpp:3033 #, fuzzy msgid "Remove Embedded Script" msgstr "Fjern" -#: ../src/verbs.cpp:2991 +#: ../src/verbs.cpp:3033 #, fuzzy msgid "Remove an embedded script" msgstr "Fjern" -#: ../src/verbs.cpp:3013 ../src/verbs.cpp:3014 +#: ../src/verbs.cpp:3055 ../src/verbs.cpp:3056 #, fuzzy msgid "Center on horizontal and vertical axis" msgstr "Centrér på vandret akse" @@ -29321,15 +29336,14 @@ msgstr "" #. Scale #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:374 -#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 -#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 -#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 -#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 -#: ../src/widgets/tweak-toolbar.cpp:350 -#, fuzzy +#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 +#: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:408 +#: ../src/widgets/spray-toolbar.cpp:438 ../src/widgets/spray-toolbar.cpp:456 +#: ../src/widgets/spray-toolbar.cpp:605 ../src/widgets/tweak-toolbar.cpp:125 +#: ../src/widgets/tweak-toolbar.cpp:142 ../src/widgets/tweak-toolbar.cpp:350 msgid "(default)" -msgstr "Standard" +msgstr "(standard)" #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/eraser-toolbar.cpp:125 @@ -29393,9 +29407,8 @@ msgid "(left edge up)" msgstr "" #: ../src/widgets/calligraphy-toolbar.cpp:460 -#, fuzzy msgid "(horizontal)" -msgstr "_Vandret" +msgstr "(vandret)" #: ../src/widgets/calligraphy-toolbar.cpp:460 msgid "(right edge up)" @@ -29407,7 +29420,7 @@ msgid "Pen Angle" msgstr "Vinkel" #: ../src/widgets/calligraphy-toolbar.cpp:463 -#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:10 +#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5 msgid "Angle:" msgstr "Vinkel:" @@ -29626,81 +29639,81 @@ msgstr "" msgid "Change connector curvature" msgstr "Ændr afstand på forbindelsesmellemrum" -#: ../src/widgets/connector-toolbar.cpp:216 +#: ../src/widgets/connector-toolbar.cpp:214 #, fuzzy msgid "Change connector spacing" msgstr "Ændr afstand på forbindelsesmellemrum" -#: ../src/widgets/connector-toolbar.cpp:309 +#: ../src/widgets/connector-toolbar.cpp:307 msgid "Avoid" -msgstr "" +msgstr "Undgå" -#: ../src/widgets/connector-toolbar.cpp:319 +#: ../src/widgets/connector-toolbar.cpp:317 #, fuzzy msgid "Ignore" msgstr "ingen" -#: ../src/widgets/connector-toolbar.cpp:330 +#: ../src/widgets/connector-toolbar.cpp:328 msgid "Orthogonal" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:331 +#: ../src/widgets/connector-toolbar.cpp:329 msgid "Make connector orthogonal or polyline" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:345 +#: ../src/widgets/connector-toolbar.cpp:343 #, fuzzy msgid "Connector Curvature" msgstr "Indstillinger for forbindelser" -#: ../src/widgets/connector-toolbar.cpp:345 +#: ../src/widgets/connector-toolbar.cpp:343 #, fuzzy msgid "Curvature:" msgstr "Træk kurve" -#: ../src/widgets/connector-toolbar.cpp:346 +#: ../src/widgets/connector-toolbar.cpp:344 msgid "The amount of connectors curvature" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:356 +#: ../src/widgets/connector-toolbar.cpp:354 #, fuzzy msgid "Connector Spacing" msgstr "Ændr afstand på forbindelsesmellemrum" -#: ../src/widgets/connector-toolbar.cpp:356 +#: ../src/widgets/connector-toolbar.cpp:354 msgid "Spacing:" msgstr "Mellemrum:" -#: ../src/widgets/connector-toolbar.cpp:357 +#: ../src/widgets/connector-toolbar.cpp:355 msgid "The amount of space left around objects by auto-routing connectors" msgstr "Afstand omkring objekter, når forbindelser dirigeres automatisk" -#: ../src/widgets/connector-toolbar.cpp:368 +#: ../src/widgets/connector-toolbar.cpp:366 #, fuzzy msgid "Graph" msgstr "Ombryd" -#: ../src/widgets/connector-toolbar.cpp:378 +#: ../src/widgets/connector-toolbar.cpp:376 msgid "Connector Length" msgstr "Tilslutterlængde" -#: ../src/widgets/connector-toolbar.cpp:378 +#: ../src/widgets/connector-toolbar.cpp:376 msgid "Length:" msgstr "Længde:" -#: ../src/widgets/connector-toolbar.cpp:379 +#: ../src/widgets/connector-toolbar.cpp:377 msgid "Ideal length for connectors when layout is applied" msgstr "Ideel længde for forbindelser når layout anvendes" -#: ../src/widgets/connector-toolbar.cpp:391 +#: ../src/widgets/connector-toolbar.cpp:389 msgid "Downwards" msgstr "" -#: ../src/widgets/connector-toolbar.cpp:392 +#: ../src/widgets/connector-toolbar.cpp:390 msgid "Make connectors with end-markers (arrows) point downwards" msgstr "Lad forbindelser med endemarkører (pile) pege nedad" -#: ../src/widgets/connector-toolbar.cpp:408 +#: ../src/widgets/connector-toolbar.cpp:406 msgid "Do not allow overlapping shapes" msgstr "Tillad ikke overlappende figurer" @@ -29712,20 +29725,20 @@ msgstr "Stiplet mønster" msgid "Pattern offset" msgstr "Mønsterforskydning" -#: ../src/widgets/desktop-widget.cpp:466 +#: ../src/widgets/desktop-widget.cpp:494 msgid "Zoom drawing if window size changes" msgstr "Zoom ind på tegning, hvis vinduesstørrelsen ændres" -#: ../src/widgets/desktop-widget.cpp:665 +#: ../src/widgets/desktop-widget.cpp:693 msgid "Cursor coordinates" msgstr "Markørkoordinater" -#: ../src/widgets/desktop-widget.cpp:691 +#: ../src/widgets/desktop-widget.cpp:719 msgid "Z:" -msgstr "" +msgstr "Z:" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:734 +#: ../src/widgets/desktop-widget.cpp:762 msgid "" "Welcome to Inkscape! Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." @@ -29734,76 +29747,86 @@ msgstr "" "oprette objekter; brug markeringsværktøjet til at flytte eller transformere " "dem." -#: ../src/widgets/desktop-widget.cpp:828 +#: ../src/widgets/desktop-widget.cpp:856 #, fuzzy msgid "grayscale" msgstr "_Skalér" -#: ../src/widgets/desktop-widget.cpp:829 +#: ../src/widgets/desktop-widget.cpp:857 #, fuzzy msgid ", grayscale" msgstr "_Skalér" -#: ../src/widgets/desktop-widget.cpp:830 +#: ../src/widgets/desktop-widget.cpp:858 #, fuzzy msgid "print colors preview" msgstr "_Forhåndsvis udskrift" -#: ../src/widgets/desktop-widget.cpp:831 +#: ../src/widgets/desktop-widget.cpp:859 #, fuzzy msgid ", print colors preview" msgstr "_Forhåndsvis udskrift" -#: ../src/widgets/desktop-widget.cpp:832 +#: ../src/widgets/desktop-widget.cpp:860 msgid "outline" msgstr "omrids" -#: ../src/widgets/desktop-widget.cpp:833 +#: ../src/widgets/desktop-widget.cpp:861 #, fuzzy msgid "no filters" msgstr "Fladhed" -#: ../src/widgets/desktop-widget.cpp:860 -#, fuzzy, c-format +#: ../src/widgets/desktop-widget.cpp:888 +#, c-format msgid "%s%s: %d (%s%s) - Inkscape" -msgstr "%s: %d - Inkscape" +msgstr "%s%s: %d (%s%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:862 ../src/widgets/desktop-widget.cpp:866 -#, fuzzy, c-format +#: ../src/widgets/desktop-widget.cpp:890 ../src/widgets/desktop-widget.cpp:894 +#, c-format msgid "%s%s: %d (%s) - Inkscape" -msgstr "%s: %d - Inkscape" +msgstr "%s%s: %d (%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:868 -#, fuzzy, c-format +#: ../src/widgets/desktop-widget.cpp:896 +#, c-format msgid "%s%s: %d - Inkscape" -msgstr "%s: %d - Inkscape" +msgstr "%s%s: %d - Inkscape" -#: ../src/widgets/desktop-widget.cpp:874 -#, fuzzy, c-format +#: ../src/widgets/desktop-widget.cpp:902 +#, c-format msgid "%s%s (%s%s) - Inkscape" -msgstr "%s - Inkscape" +msgstr "%s%s (%s%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:876 ../src/widgets/desktop-widget.cpp:880 -#, fuzzy, c-format +#: ../src/widgets/desktop-widget.cpp:904 ../src/widgets/desktop-widget.cpp:908 +#, c-format msgid "%s%s (%s) - Inkscape" -msgstr "%s - Inkscape" +msgstr "%s%s (%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:882 -#, fuzzy, c-format +#: ../src/widgets/desktop-widget.cpp:910 +#, c-format msgid "%s%s - Inkscape" -msgstr "%s - Inkscape" +msgstr "%s%s - Inkscape" + +#: ../src/widgets/desktop-widget.cpp:1082 +#, fuzzy +msgid "Locked all guides" +msgstr "Markér i alle lag" + +#: ../src/widgets/desktop-widget.cpp:1084 +#, fuzzy +msgid "Unlocked all guides" +msgstr "Sænk lag" -#: ../src/widgets/desktop-widget.cpp:1051 +#: ../src/widgets/desktop-widget.cpp:1101 #, fuzzy msgid "Color-managed display is enabled in this window" msgstr "Luk dette dokumentvindue" -#: ../src/widgets/desktop-widget.cpp:1053 +#: ../src/widgets/desktop-widget.cpp:1103 #, fuzzy msgid "Color-managed display is disabled in this window" msgstr "Luk dette dokumentvindue" -#: ../src/widgets/desktop-widget.cpp:1108 +#: ../src/widgets/desktop-widget.cpp:1158 #, c-format msgid "" "Save changes to document \"%s\" before " @@ -29816,12 +29839,12 @@ msgstr "" "\n" "Hvis du lukker uden at gemme, mister du dine ændringer." -#: ../src/widgets/desktop-widget.cpp:1118 -#: ../src/widgets/desktop-widget.cpp:1177 +#: ../src/widgets/desktop-widget.cpp:1168 +#: ../src/widgets/desktop-widget.cpp:1227 msgid "Close _without saving" msgstr "Luk _uden at gemme" -#: ../src/widgets/desktop-widget.cpp:1167 +#: ../src/widgets/desktop-widget.cpp:1217 #, fuzzy, c-format msgid "" "The file \"%s\" was saved with a " @@ -29834,14 +29857,13 @@ msgstr "" "\n" "Vil du gemme denne fil i et andet format?" -#: ../src/widgets/desktop-widget.cpp:1179 -#, fuzzy +#: ../src/widgets/desktop-widget.cpp:1229 msgid "_Save as Inkscape SVG" -msgstr "%s - Inkscape" +msgstr "_Gem som Inkscape-SVG" -#: ../src/widgets/desktop-widget.cpp:1392 +#: ../src/widgets/desktop-widget.cpp:1442 msgid "Note:" -msgstr "" +msgstr "Bemærk:" #: ../src/widgets/dropper-toolbar.cpp:90 #, fuzzy @@ -29938,10 +29960,10 @@ msgstr "Mønsterudfyldning" msgid "Set pattern on stroke" msgstr "Mønsterstreg" -#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:953 -#: ../src/widgets/text-toolbar.cpp:1265 +#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1017 +#: ../src/widgets/text-toolbar.cpp:1358 msgid "Font size" -msgstr "Skrifttypestørrelse" +msgstr "Skriftstørrelse" #. Family frame #: ../src/widgets/font-selector.cpp:134 @@ -29962,154 +29984,154 @@ msgstr "Fladhed" #: ../src/widgets/font-selector.cpp:240 ../share/extensions/dots.inx.h:3 msgid "Font size:" -msgstr "Skrifttypestørrelse:" +msgstr "Skriftstørrelse:" -#: ../src/widgets/gradient-selector.cpp:205 +#: ../src/widgets/gradient-selector.cpp:201 #, fuzzy msgid "Create a duplicate gradient" msgstr "Opret og redigér overgange" -#: ../src/widgets/gradient-selector.cpp:216 +#: ../src/widgets/gradient-selector.cpp:212 #, fuzzy msgid "Edit gradient" msgstr "Radial overgang" -#: ../src/widgets/gradient-selector.cpp:285 +#: ../src/widgets/gradient-selector.cpp:281 #: ../src/widgets/paint-selector.cpp:233 #, fuzzy msgid "Swatch" msgstr "Sæt" -#: ../src/widgets/gradient-selector.cpp:335 +#: ../src/widgets/gradient-selector.cpp:331 #, fuzzy msgid "Rename gradient" msgstr "Lineær overgang" -#: ../src/widgets/gradient-toolbar.cpp:157 -#: ../src/widgets/gradient-toolbar.cpp:170 -#: ../src/widgets/gradient-toolbar.cpp:761 -#: ../src/widgets/gradient-toolbar.cpp:1100 +#: ../src/widgets/gradient-toolbar.cpp:156 +#: ../src/widgets/gradient-toolbar.cpp:169 +#: ../src/widgets/gradient-toolbar.cpp:758 +#: ../src/widgets/gradient-toolbar.cpp:1097 #, fuzzy msgid "No gradient" msgstr "Flyt knudepunkts-håndtag" -#: ../src/widgets/gradient-toolbar.cpp:177 +#: ../src/widgets/gradient-toolbar.cpp:176 #, fuzzy msgid "Multiple gradients" msgstr "Flyt knudepunkts-håndtag" -#: ../src/widgets/gradient-toolbar.cpp:681 +#: ../src/widgets/gradient-toolbar.cpp:678 #, fuzzy msgid "Multiple stops" msgstr "Flere stilarter" -#: ../src/widgets/gradient-toolbar.cpp:779 +#: ../src/widgets/gradient-toolbar.cpp:776 #: ../src/widgets/gradient-vector.cpp:614 msgid "No stops in gradient" msgstr "Ingen stop i overgange" -#: ../src/widgets/gradient-toolbar.cpp:933 +#: ../src/widgets/gradient-toolbar.cpp:930 #, fuzzy msgid "Assign gradient to object" msgstr "Justér og fordel objekter" -#: ../src/widgets/gradient-toolbar.cpp:955 +#: ../src/widgets/gradient-toolbar.cpp:952 #, fuzzy msgid "Set gradient repeat" msgstr "Opret overgang i streg" -#: ../src/widgets/gradient-toolbar.cpp:993 +#: ../src/widgets/gradient-toolbar.cpp:990 #: ../src/widgets/gradient-vector.cpp:727 #, fuzzy msgid "Change gradient stop offset" msgstr "Streg med lineær overgang" -#: ../src/widgets/gradient-toolbar.cpp:1040 +#: ../src/widgets/gradient-toolbar.cpp:1037 #, fuzzy msgid "linear" msgstr "Linje" -#: ../src/widgets/gradient-toolbar.cpp:1040 +#: ../src/widgets/gradient-toolbar.cpp:1037 msgid "Create linear gradient" msgstr "Opret lineær overgang" -#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/gradient-toolbar.cpp:1041 msgid "radial" -msgstr "" +msgstr "radial" -#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/gradient-toolbar.cpp:1041 msgid "Create radial (elliptic or circular) gradient" msgstr "Opret radiær (elliptisk eller cirkulær) overgang" -#: ../src/widgets/gradient-toolbar.cpp:1047 -#: ../src/widgets/mesh-toolbar.cpp:343 +#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" -msgstr "" +msgstr "Ny:" -#: ../src/widgets/gradient-toolbar.cpp:1070 -#: ../src/widgets/mesh-toolbar.cpp:366 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 #, fuzzy msgid "fill" msgstr "Vandret forskudt" -#: ../src/widgets/gradient-toolbar.cpp:1070 -#: ../src/widgets/mesh-toolbar.cpp:366 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "Opret overgang i udfyldning" -#: ../src/widgets/gradient-toolbar.cpp:1074 -#: ../src/widgets/mesh-toolbar.cpp:370 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 #, fuzzy msgid "stroke" msgstr "Bredde på streg" -#: ../src/widgets/gradient-toolbar.cpp:1074 -#: ../src/widgets/mesh-toolbar.cpp:370 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "Opret overgang i streg" -#: ../src/widgets/gradient-toolbar.cpp:1077 -#: ../src/widgets/mesh-toolbar.cpp:373 +#: ../src/widgets/gradient-toolbar.cpp:1074 +#: ../src/widgets/mesh-toolbar.cpp:417 #, fuzzy msgid "on:" msgstr "til" -#: ../src/widgets/gradient-toolbar.cpp:1102 +#: ../src/widgets/gradient-toolbar.cpp:1099 msgid "Select" msgstr "Vælg" -#: ../src/widgets/gradient-toolbar.cpp:1102 +#: ../src/widgets/gradient-toolbar.cpp:1099 #, fuzzy msgid "Choose a gradient" msgstr "Forhåndsvis" -#: ../src/widgets/gradient-toolbar.cpp:1103 +#: ../src/widgets/gradient-toolbar.cpp:1100 #, fuzzy msgid "Select:" msgstr "Vælg" -#: ../src/widgets/gradient-toolbar.cpp:1118 +#: ../src/widgets/gradient-toolbar.cpp:1115 msgctxt "Gradient repeat type" msgid "None" -msgstr "" +msgstr "Intet" -#: ../src/widgets/gradient-toolbar.cpp:1121 +#: ../src/widgets/gradient-toolbar.cpp:1118 #, fuzzy msgid "Reflected" msgstr "reflekteret" -#: ../src/widgets/gradient-toolbar.cpp:1124 +#: ../src/widgets/gradient-toolbar.cpp:1121 #, fuzzy msgid "Direct" msgstr "direkte" -#: ../src/widgets/gradient-toolbar.cpp:1126 +#: ../src/widgets/gradient-toolbar.cpp:1123 #, fuzzy msgid "Repeat" msgstr "Gentag:" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute -#: ../src/widgets/gradient-toolbar.cpp:1128 +#: ../src/widgets/gradient-toolbar.cpp:1125 msgid "" "Whether to fill with flat color beyond the ends of the gradient vector " "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " @@ -30121,66 +30143,66 @@ msgstr "" "(spreadMethod=\"repeat\"), eller gentag overgangen i skiftende retninger " "(spreadMethod=\"reflect\")" -#: ../src/widgets/gradient-toolbar.cpp:1133 +#: ../src/widgets/gradient-toolbar.cpp:1130 msgid "Repeat:" msgstr "Gentag:" -#: ../src/widgets/gradient-toolbar.cpp:1147 +#: ../src/widgets/gradient-toolbar.cpp:1144 #, fuzzy msgid "No stops" msgstr "Ingen streg" -#: ../src/widgets/gradient-toolbar.cpp:1149 +#: ../src/widgets/gradient-toolbar.cpp:1146 #, fuzzy msgid "Stops" msgstr "_Sæt" -#: ../src/widgets/gradient-toolbar.cpp:1149 +#: ../src/widgets/gradient-toolbar.cpp:1146 #, fuzzy msgid "Select a stop for the current gradient" msgstr "Redigér overgangens stop" -#: ../src/widgets/gradient-toolbar.cpp:1150 +#: ../src/widgets/gradient-toolbar.cpp:1147 #, fuzzy msgid "Stops:" msgstr "_Sæt" #. Label -#: ../src/widgets/gradient-toolbar.cpp:1162 -#: ../src/widgets/gradient-vector.cpp:915 +#: ../src/widgets/gradient-toolbar.cpp:1159 +#: ../src/widgets/gradient-vector.cpp:916 #, fuzzy msgctxt "Gradient" msgid "Offset:" msgstr "Forskydning:" -#: ../src/widgets/gradient-toolbar.cpp:1162 +#: ../src/widgets/gradient-toolbar.cpp:1159 #, fuzzy msgid "Offset of selected stop" msgstr "Skub markerede stier ud" -#: ../src/widgets/gradient-toolbar.cpp:1180 -#: ../src/widgets/gradient-toolbar.cpp:1181 +#: ../src/widgets/gradient-toolbar.cpp:1177 +#: ../src/widgets/gradient-toolbar.cpp:1178 #, fuzzy msgid "Insert new stop" msgstr "Indryk knudepunkt" -#: ../src/widgets/gradient-toolbar.cpp:1194 -#: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-vector.cpp:897 +#: ../src/widgets/gradient-toolbar.cpp:1191 +#: ../src/widgets/gradient-toolbar.cpp:1192 +#: ../src/widgets/gradient-vector.cpp:898 msgid "Delete stop" msgstr "Slet stop" -#: ../src/widgets/gradient-toolbar.cpp:1209 +#: ../src/widgets/gradient-toolbar.cpp:1206 #, fuzzy msgid "Reverse the direction of the gradient" msgstr "Redigér overgangens stop" -#: ../src/widgets/gradient-toolbar.cpp:1223 +#: ../src/widgets/gradient-toolbar.cpp:1220 #, fuzzy msgid "Link gradients" msgstr "Lineær overgang" -#: ../src/widgets/gradient-toolbar.cpp:1224 +#: ../src/widgets/gradient-toolbar.cpp:1221 msgid "Link gradients to change all related gradients" msgstr "" @@ -30199,28 +30221,28 @@ msgid "No gradient selected" msgstr "Ingen overgange markeret" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:892 +#: ../src/widgets/gradient-vector.cpp:893 msgid "Add stop" msgstr "Tilføj stop" -#: ../src/widgets/gradient-vector.cpp:895 +#: ../src/widgets/gradient-vector.cpp:896 msgid "Add another control stop to gradient" msgstr "Tilføj endnu et kontrolstop til overgangen" -#: ../src/widgets/gradient-vector.cpp:900 +#: ../src/widgets/gradient-vector.cpp:901 msgid "Delete current control stop from gradient" msgstr "Slet aktuelle kontrolstop fra gradienten" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:968 +#: ../src/widgets/gradient-vector.cpp:969 msgid "Stop Color" msgstr "Stopfarve" -#: ../src/widgets/gradient-vector.cpp:1007 +#: ../src/widgets/gradient-vector.cpp:1008 msgid "Gradient editor" msgstr "Overgangseditor" -#: ../src/widgets/gradient-vector.cpp:1359 +#: ../src/widgets/gradient-vector.cpp:1360 #, fuzzy msgid "Change gradient stop color" msgstr "Streg med lineær overgang" @@ -30242,7 +30264,7 @@ msgstr "_Åbn seneste" #: ../src/widgets/lpe-toolbar.cpp:239 msgid "Open both" -msgstr "" +msgstr "Åbn begge" #: ../src/widgets/lpe-toolbar.cpp:301 msgid "All inactive" @@ -30302,136 +30324,297 @@ msgstr "" msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1268 +#: ../src/widgets/measure-toolbar.cpp:157 +msgid "Start and end measures inactive." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:159 +msgid "Start and end measures active." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:175 +#, fuzzy +msgid "Show all crossings." +msgstr "Markér i alle lag" + +#: ../src/widgets/measure-toolbar.cpp:177 +msgid "Show visible crossings." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:193 +msgid "Use all layers in the measure." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:195 +#, fuzzy +msgid "Use current layer in the measure." +msgstr "Hæv det aktuelle lag til toppen" + +#: ../src/widgets/measure-toolbar.cpp:211 +#, fuzzy +msgid "Compute all elements." +msgstr "tutorial-elements.svg" + +#: ../src/widgets/measure-toolbar.cpp:213 +#, fuzzy +msgid "Compute max length." +msgstr "_Sæt på sti" + +#: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1361 #, fuzzy msgid "Font Size" msgstr "Skriftstørrelse" -#: ../src/widgets/measure-toolbar.cpp:86 +#: ../src/widgets/measure-toolbar.cpp:274 #, fuzzy msgid "Font Size:" msgstr "Skriftstørrelse" -#: ../src/widgets/measure-toolbar.cpp:87 +#: ../src/widgets/measure-toolbar.cpp:275 msgid "The font size to be used in the measurement labels" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 msgid "The units to be used for the measurements" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:313 +#: ../src/widgets/measure-toolbar.cpp:302 ../share/extensions/measure.inx.h:14 +#, fuzzy +msgid "Precision:" +msgstr "Beskrivelse" + +#: ../src/widgets/measure-toolbar.cpp:303 +msgid "Decimal precision of measure" +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:315 +#, fuzzy +msgid "Scale %" +msgstr "Skalér" + +#: ../src/widgets/measure-toolbar.cpp:315 +#, fuzzy +msgid "Scale %:" +msgstr "Skalér" + +#: ../src/widgets/measure-toolbar.cpp:316 +msgid "Scale the results" +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:329 +#, fuzzy +msgid "The offset size" +msgstr "Mønsterforskydning" + +#: ../src/widgets/measure-toolbar.cpp:341 +#: ../src/widgets/measure-toolbar.cpp:342 +#, fuzzy +msgid "Ignore first and last" +msgstr "Ignorer første og sidste punkt" + +#: ../src/widgets/measure-toolbar.cpp:352 +#: ../src/widgets/measure-toolbar.cpp:353 +#, fuzzy +msgid "Show hidden intersections" +msgstr "Gennemskæring" + +#: ../src/widgets/measure-toolbar.cpp:363 +#: ../src/widgets/measure-toolbar.cpp:364 +#, fuzzy +msgid "Show measures between items" +msgstr "Mellemrum mellem linjer" + +#: ../src/widgets/measure-toolbar.cpp:374 +#: ../src/widgets/measure-toolbar.cpp:375 +#, fuzzy +msgid "Measure all layers" +msgstr "Markér i alle lag" + +#: ../src/widgets/measure-toolbar.cpp:385 +#: ../src/widgets/measure-toolbar.cpp:386 +#, fuzzy +msgid "Reverse measure" +msgstr "_Skift retning" + +#: ../src/widgets/measure-toolbar.cpp:395 +#: ../src/widgets/measure-toolbar.cpp:396 +msgid "Phantom measure" +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:405 +#: ../src/widgets/measure-toolbar.cpp:406 +#, fuzzy +msgid "To guides" +msgstr "Vis h_jælpelinjer" + +#: ../src/widgets/measure-toolbar.cpp:415 +#: ../src/widgets/measure-toolbar.cpp:416 +#, fuzzy +msgid "Mark Dimension" +msgstr "Opdeling" + +#: ../src/widgets/measure-toolbar.cpp:425 +#: ../src/widgets/measure-toolbar.cpp:426 +#, fuzzy +msgid "Convert to item" +msgstr "_Konvertér til tekst" + +#: ../src/widgets/mesh-toolbar.cpp:318 msgid "Set mesh type" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:336 +#: ../src/widgets/mesh-toolbar.cpp:380 #, fuzzy msgid "normal" msgstr "Normal" -#: ../src/widgets/mesh-toolbar.cpp:336 +#: ../src/widgets/mesh-toolbar.cpp:380 #, fuzzy msgid "Create mesh gradient" msgstr "Opret lineær overgang" -#: ../src/widgets/mesh-toolbar.cpp:340 +#: ../src/widgets/mesh-toolbar.cpp:384 msgid "conical" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:340 +#: ../src/widgets/mesh-toolbar.cpp:384 #, fuzzy msgid "Create conical gradient" msgstr "Opret lineær overgang" -#: ../src/widgets/mesh-toolbar.cpp:395 +#: ../src/widgets/mesh-toolbar.cpp:439 #, fuzzy msgid "Rows" msgstr "Rækker:" -#: ../src/widgets/mesh-toolbar.cpp:395 +#: ../src/widgets/mesh-toolbar.cpp:439 #: ../share/extensions/guides_creator.inx.h:5 #: ../share/extensions/layout_nup.inx.h:12 #, fuzzy msgid "Rows:" msgstr "Rækker:" -#: ../src/widgets/mesh-toolbar.cpp:395 +#: ../src/widgets/mesh-toolbar.cpp:439 #, fuzzy msgid "Number of rows in new mesh" msgstr "Antal rækker" -#: ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/mesh-toolbar.cpp:455 #, fuzzy msgid "Columns" msgstr "Søjler:" -#: ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/mesh-toolbar.cpp:455 #: ../share/extensions/guides_creator.inx.h:4 #, fuzzy msgid "Columns:" msgstr "Søjler:" -#: ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/mesh-toolbar.cpp:455 #, fuzzy msgid "Number of columns in new mesh" msgstr "Antal søjler" -#: ../src/widgets/mesh-toolbar.cpp:425 +#: ../src/widgets/mesh-toolbar.cpp:469 #, fuzzy msgid "Edit Fill" msgstr "Redigér udfyldning..." -#: ../src/widgets/mesh-toolbar.cpp:426 +#: ../src/widgets/mesh-toolbar.cpp:470 #, fuzzy msgid "Edit fill mesh" msgstr "Redigér udfyldning..." -#: ../src/widgets/mesh-toolbar.cpp:437 +#: ../src/widgets/mesh-toolbar.cpp:481 #, fuzzy msgid "Edit Stroke" msgstr "Redigér streg..." -#: ../src/widgets/mesh-toolbar.cpp:438 +#: ../src/widgets/mesh-toolbar.cpp:482 #, fuzzy msgid "Edit stroke mesh" msgstr "Redigér streg..." -#: ../src/widgets/mesh-toolbar.cpp:449 ../src/widgets/node-toolbar.cpp:521 +#: ../src/widgets/mesh-toolbar.cpp:493 ../src/widgets/node-toolbar.cpp:521 #, fuzzy msgid "Show Handles" msgstr "Tegn håndtag" -#: ../src/widgets/mesh-toolbar.cpp:450 +#: ../src/widgets/mesh-toolbar.cpp:494 #, fuzzy msgid "Show side and tensor handles" msgstr "Gem transformation:" -#: ../src/widgets/mesh-toolbar.cpp:465 +#: ../src/widgets/mesh-toolbar.cpp:509 msgid "WARNING: Mesh SVG Syntax Subject to Change" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:475 +#: ../src/widgets/mesh-toolbar.cpp:519 msgctxt "Type" msgid "Coons" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:478 +#: ../src/widgets/mesh-toolbar.cpp:522 msgid "Bicubic" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:480 +#: ../src/widgets/mesh-toolbar.cpp:524 msgid "Coons" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:481 +#: ../src/widgets/mesh-toolbar.cpp:525 msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:483 ../src/widgets/pencil-toolbar.cpp:377 +#: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing:" msgstr "Udjævning:" +#: ../src/widgets/mesh-toolbar.cpp:537 +#, fuzzy +msgid "Toggle Sides" +msgstr "_Skift" + +#: ../src/widgets/mesh-toolbar.cpp:538 +msgid "Toggle selected sides between Beziers and lines." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:541 +#, fuzzy +msgid "Toggle side:" +msgstr "PostScript" + +#: ../src/widgets/mesh-toolbar.cpp:548 +#, fuzzy +msgid "Make elliptical" +msgstr "Gør kursiv" + +#: ../src/widgets/mesh-toolbar.cpp:549 +msgid "" +"Make selected sides elliptical by changing length of handles. Works best if " +"handles already approximate ellipse." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:552 +#, fuzzy +msgid "Make elliptical:" +msgstr "Gør kursiv" + +#: ../src/widgets/mesh-toolbar.cpp:559 +#, fuzzy +msgid "Pick colors:" +msgstr "Kopiér farve" + +#: ../src/widgets/mesh-toolbar.cpp:560 +msgid "Pick colors for selected corner nodes from underneath mesh." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:563 +#, fuzzy +msgid "Pick Color" +msgstr "Enkel farve" + #: ../src/widgets/node-toolbar.cpp:341 #, fuzzy msgid "Insert node" @@ -30808,7 +30991,7 @@ msgid "Close gaps:" msgstr "_Ryd" #: ../src/widgets/paintbucket-toolbar.cpp:211 -#: ../src/widgets/pencil-toolbar.cpp:398 ../src/widgets/spiral-toolbar.cpp:285 +#: ../src/widgets/pencil-toolbar.cpp:396 ../src/widgets/spiral-toolbar.cpp:285 #: ../src/widgets/star-toolbar.cpp:564 msgid "Defaults" msgstr "Standarder" @@ -30822,99 +31005,99 @@ msgstr "" "Nulstil figurparametre til standard (benyt Indstillinger for Inkscape > " "Værktøjer for at ændre standarden)" -#: ../src/widgets/pencil-toolbar.cpp:108 +#: ../src/widgets/pencil-toolbar.cpp:105 msgid "Bezier" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:109 +#: ../src/widgets/pencil-toolbar.cpp:106 #, fuzzy msgid "Create regular Bezier path" msgstr "Opret ny sti" -#: ../src/widgets/pencil-toolbar.cpp:116 +#: ../src/widgets/pencil-toolbar.cpp:113 #, fuzzy msgid "Create Spiro path" msgstr "Opret spiraler" -#: ../src/widgets/pencil-toolbar.cpp:122 +#: ../src/widgets/pencil-toolbar.cpp:119 msgid "Create BSpline path" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:128 +#: ../src/widgets/pencil-toolbar.cpp:125 msgid "Zigzag" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:129 +#: ../src/widgets/pencil-toolbar.cpp:126 msgid "Create a sequence of straight line segments" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:135 +#: ../src/widgets/pencil-toolbar.cpp:132 #, fuzzy msgid "Paraxial" msgstr "delvis" -#: ../src/widgets/pencil-toolbar.cpp:136 +#: ../src/widgets/pencil-toolbar.cpp:133 msgid "Create a sequence of paraxial line segments" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:144 +#: ../src/widgets/pencil-toolbar.cpp:141 msgid "Mode of new lines drawn by this tool" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:178 +#: ../src/widgets/pencil-toolbar.cpp:176 msgctxt "Freehand shape" msgid "None" -msgstr "" +msgstr "Intet" -#: ../src/widgets/pencil-toolbar.cpp:179 +#: ../src/widgets/pencil-toolbar.cpp:177 #, fuzzy msgid "Triangle in" msgstr "Vinkel" -#: ../src/widgets/pencil-toolbar.cpp:180 +#: ../src/widgets/pencil-toolbar.cpp:178 #, fuzzy msgid "Triangle out" msgstr "Vinkel" -#: ../src/widgets/pencil-toolbar.cpp:182 +#: ../src/widgets/pencil-toolbar.cpp:180 msgid "From clipboard" -msgstr "" +msgstr "Fra udklipsholder" -#: ../src/widgets/pencil-toolbar.cpp:183 +#: ../src/widgets/pencil-toolbar.cpp:181 #, fuzzy msgid "Bend from clipboard" -msgstr "Klip markering til udklipsholder" +msgstr "Fra udklipsholder" -#: ../src/widgets/pencil-toolbar.cpp:184 +#: ../src/widgets/pencil-toolbar.cpp:182 msgid "Last applied" -msgstr "" +msgstr "Sidst påført" -#: ../src/widgets/pencil-toolbar.cpp:209 ../src/widgets/pencil-toolbar.cpp:210 +#: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" msgstr "Form:" -#: ../src/widgets/pencil-toolbar.cpp:209 +#: ../src/widgets/pencil-toolbar.cpp:207 msgid "Shape of new paths drawn by this tool" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:374 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(many nodes, rough)" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:374 +#: ../src/widgets/pencil-toolbar.cpp:372 #, fuzzy msgid "(few nodes, smooth)" msgstr "Udjævn markerede knudepunkter" -#: ../src/widgets/pencil-toolbar.cpp:377 +#: ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing: " msgstr "Udjævning: " -#: ../src/widgets/pencil-toolbar.cpp:378 +#: ../src/widgets/pencil-toolbar.cpp:376 msgid "How much smoothing (simplifying) is applied to the line" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:399 +#: ../src/widgets/pencil-toolbar.cpp:397 #, fuzzy msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " @@ -30923,11 +31106,11 @@ msgstr "" "Nulstil figurparametre til standard (benyt Indstillinger for Inkscape > " "Værktøjer for at ændre standarden)" -#: ../src/widgets/pencil-toolbar.cpp:409 ../src/widgets/pencil-toolbar.cpp:410 +#: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:420 ../src/widgets/pencil-toolbar.cpp:421 +#: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" msgstr "" @@ -31185,7 +31368,7 @@ msgstr "Mønster" msgid "Set attribute" msgstr "Sæt attribut" -#: ../src/widgets/sp-color-selector.cpp:47 +#: ../src/widgets/sp-color-selector.cpp:43 msgid "Unnamed" msgstr "Unavngivet" @@ -31300,155 +31483,240 @@ msgstr "" "Værktøjer for at ændre standarden)" #. Width -#: ../src/widgets/spray-toolbar.cpp:113 +#: ../src/widgets/spray-toolbar.cpp:294 #, fuzzy msgid "(narrow spray)" msgstr "Sænk" -#: ../src/widgets/spray-toolbar.cpp:113 +#: ../src/widgets/spray-toolbar.cpp:294 #, fuzzy msgid "(broad spray)" msgstr " (streg)" -#: ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/spray-toolbar.cpp:297 #, fuzzy msgid "The width of the spray area (relative to the visible canvas area)" msgstr "" "Bredde på den kalligrafiske pen (relativt til det synlige område af lærredet)" -#: ../src/widgets/spray-toolbar.cpp:129 +#: ../src/widgets/spray-toolbar.cpp:312 +#, fuzzy +msgid "Use the pressure of the input device to alter the width of spray area" +msgstr "Brug inputenhedens tryk til at ændre pennens bredde" + +#: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 #, fuzzy msgid "Focus" msgstr "spids" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus:" msgstr "Fokus:" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "" #. Standard_deviation -#: ../src/widgets/spray-toolbar.cpp:145 +#: ../src/widgets/spray-toolbar.cpp:339 #, fuzzy msgid "(minimum scatter)" msgstr "Minimumsstørrelse" -#: ../src/widgets/spray-toolbar.cpp:145 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(maximum scatter)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 #, fuzzy msgctxt "Spray tool" msgid "Scatter" msgstr "Mønster" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 #, fuzzy msgctxt "Spray tool" msgid "Scatter:" msgstr "Mønster" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgid "Increase to scatter sprayed objects" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:167 +#: ../src/widgets/spray-toolbar.cpp:361 #, fuzzy msgid "Spray copies of the initial selection" msgstr "Anvend transformation på markering" -#: ../src/widgets/spray-toolbar.cpp:174 +#: ../src/widgets/spray-toolbar.cpp:368 #, fuzzy msgid "Spray clones of the initial selection" msgstr "Opret og fliselæg klonerne i markeringen" -#: ../src/widgets/spray-toolbar.cpp:180 +#: ../src/widgets/spray-toolbar.cpp:375 #, fuzzy msgid "Spray single path" msgstr "Frigør beskæringssti" -#: ../src/widgets/spray-toolbar.cpp:181 +#: ../src/widgets/spray-toolbar.cpp:376 msgid "Spray objects in a single path" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:185 ../src/widgets/tweak-toolbar.cpp:253 +#: ../src/widgets/spray-toolbar.cpp:383 +#, fuzzy +msgid "Delete sprayed items" +msgstr "Slet stop" + +#: ../src/widgets/spray-toolbar.cpp:384 +#, fuzzy +msgid "Delete sprayed items from selection" +msgstr "Fjern maske fra markering" + +#: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 #, fuzzy msgid "Mode" msgstr "Flyt" #. Population -#: ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(low population)" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:408 #, fuzzy msgid "(high population)" msgstr "Udskrivningsdestination" -#: ../src/widgets/spray-toolbar.cpp:208 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount" msgstr "Mængde" -#: ../src/widgets/spray-toolbar.cpp:209 +#: ../src/widgets/spray-toolbar.cpp:412 msgid "Adjusts the number of items sprayed per click" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:225 +#: ../src/widgets/spray-toolbar.cpp:428 #, fuzzy msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "Brug inputenhedens tryk til at ændre pennens bredde" -#: ../src/widgets/spray-toolbar.cpp:235 +#: ../src/widgets/spray-toolbar.cpp:438 #, fuzzy msgid "(high rotation variation)" msgstr "Udskrivningsdestination" -#: ../src/widgets/spray-toolbar.cpp:238 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation" msgstr "Rotation" -#: ../src/widgets/spray-toolbar.cpp:238 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation:" msgstr "Rotation:" -#: ../src/widgets/spray-toolbar.cpp:240 +#: ../src/widgets/spray-toolbar.cpp:443 #, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " "than the original object" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:253 +#: ../src/widgets/spray-toolbar.cpp:456 #, fuzzy msgid "(high scale variation)" msgstr "Udskrivningsdestination" -#: ../src/widgets/spray-toolbar.cpp:256 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale" msgstr "Skalering" -#: ../src/widgets/spray-toolbar.cpp:256 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale:" msgstr "Skalering:" -#: ../src/widgets/spray-toolbar.cpp:258 +#: ../src/widgets/spray-toolbar.cpp:461 #, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " "the original object" msgstr "" +#: ../src/widgets/spray-toolbar.cpp:477 +#, fuzzy +msgid "Use the pressure of the input device to alter the scale of new items" +msgstr "Brug inputenhedens tryk til at ændre pennens bredde" + +#: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 +msgid "" +"Pick color from the drawing. You can use clonetiler trace dialog for " +"advanced effects. In clone mode original fill or stroke colors must be unset." +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 +msgid "Pick from center instead average area." +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 +msgid "Inverted pick value, retaining color in advanced trace mode" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 +#, fuzzy +msgid "Apply picked color to fill" +msgstr "Sidste valgte farve" + +#: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 +#, fuzzy +msgid "Apply picked color to stroke" +msgstr "Sidste valgte farve" + +#: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 +msgid "No overlap between colors" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 +msgid "Apply over transparent areas" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 +msgid "Apply over no transparent areas" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 +#, fuzzy +msgid "Prevent overlapping objects" +msgstr "Duplikér markerede objekter" + +#: ../src/widgets/spray-toolbar.cpp:605 +#, fuzzy +msgid "(minimum offset)" +msgstr "Minimumsstørrelse" + +#: ../src/widgets/spray-toolbar.cpp:605 +#, fuzzy +msgid "(maximum offset)" +msgstr "Minimumsstørrelse" + +#: ../src/widgets/spray-toolbar.cpp:608 +#, fuzzy +msgid "Offset %" +msgstr "Forskydninger" + +#: ../src/widgets/spray-toolbar.cpp:608 +#, fuzzy +msgid "Offset %:" +msgstr "Forskydning:" + +#: ../src/widgets/spray-toolbar.cpp:609 +msgid "Increase to segregate objects more (value in percent)" +msgstr "" + #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" msgstr "" @@ -31479,12 +31747,12 @@ msgstr "Gem transformation:" #: ../src/widgets/star-toolbar.cpp:463 msgid "Regular polygon (with one handle) instead of a star" -msgstr "Almindelig polygon (med et håndtag) istedet for en stjerne" +msgstr "Almindelig polygon (med et håndtag) i stedet for en stjerne" #: ../src/widgets/star-toolbar.cpp:470 #, fuzzy msgid "Star instead of a regular polygon (with one handle)" -msgstr "Almindelig polygon (med et håndtag) istedet for en stjerne" +msgstr "Almindelig polygon (med et håndtag) i stedet for en stjerne" #: ../src/widgets/star-toolbar.cpp:491 msgid "triangle/tri-star" @@ -31639,7 +31907,7 @@ msgstr "Spred hjørner og vinkler tilfældigt" #: ../src/widgets/stroke-marker-selector.cpp:388 msgctxt "Marker" msgid "None" -msgstr "" +msgstr "Intet" #: ../src/widgets/stroke-style.cpp:192 msgid "Stroke width" @@ -31800,429 +32068,483 @@ msgstr "Ændr linjestykketype" msgid "Text: Change rotate" msgstr "Ændr linjestykketype" -#: ../src/widgets/text-toolbar.cpp:781 +#: ../src/widgets/text-toolbar.cpp:787 +#, fuzzy +msgid "Text: Change writing mode" +msgstr "Sideorientering:" + +#: ../src/widgets/text-toolbar.cpp:841 #, fuzzy msgid "Text: Change orientation" msgstr "Sideorientering:" -#: ../src/widgets/text-toolbar.cpp:1216 +#: ../src/widgets/text-toolbar.cpp:1309 msgid "Font Family" msgstr "Skrifttypefamilie" -#: ../src/widgets/text-toolbar.cpp:1217 +#: ../src/widgets/text-toolbar.cpp:1310 #, fuzzy msgid "Select Font Family (Alt-X to access)" msgstr "Skrifttype" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1227 +#: ../src/widgets/text-toolbar.cpp:1320 msgid "Select all text with this font-family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1231 +#: ../src/widgets/text-toolbar.cpp:1324 msgid "Font not found on system" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1290 +#: ../src/widgets/text-toolbar.cpp:1383 #, fuzzy msgid "Font Style" msgstr "Skriftstørrelse" -#: ../src/widgets/text-toolbar.cpp:1291 +#: ../src/widgets/text-toolbar.cpp:1384 #, fuzzy msgid "Font style" msgstr "Skriftstørrelse" #. Name -#: ../src/widgets/text-toolbar.cpp:1308 +#: ../src/widgets/text-toolbar.cpp:1401 msgid "Toggle Superscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1309 +#: ../src/widgets/text-toolbar.cpp:1402 msgid "Toggle superscript" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1321 +#: ../src/widgets/text-toolbar.cpp:1414 msgid "Toggle Subscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1322 +#: ../src/widgets/text-toolbar.cpp:1415 #, fuzzy msgid "Toggle subscript" msgstr "PostScript" -#: ../src/widgets/text-toolbar.cpp:1363 +#: ../src/widgets/text-toolbar.cpp:1456 msgid "Justify" msgstr "Ligestillet" #. Name -#: ../src/widgets/text-toolbar.cpp:1370 +#: ../src/widgets/text-toolbar.cpp:1463 #, fuzzy msgid "Alignment" msgstr "Venstrestillet" #. Label -#: ../src/widgets/text-toolbar.cpp:1371 +#: ../src/widgets/text-toolbar.cpp:1464 #, fuzzy msgid "Text alignment" msgstr "Tekst-inddata" -#: ../src/widgets/text-toolbar.cpp:1398 +#: ../src/widgets/text-toolbar.cpp:1491 #, fuzzy msgid "Horizontal" msgstr "_Vandret" -#: ../src/widgets/text-toolbar.cpp:1405 +#: ../src/widgets/text-toolbar.cpp:1498 #, fuzzy -msgid "Vertical" +msgid "Vertical — RL" msgstr "_Lodret" +#: ../src/widgets/text-toolbar.cpp:1499 +msgid "Vertical text — lines: right to left" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1505 +#, fuzzy +msgid "Vertical — LR" +msgstr "_Lodret" + +#: ../src/widgets/text-toolbar.cpp:1506 +msgid "Vertical text — lines: left to right" +msgstr "" + +#. Name +#: ../src/widgets/text-toolbar.cpp:1511 +#, fuzzy +msgid "Writing mode" +msgstr "Tegning" + #. Label -#: ../src/widgets/text-toolbar.cpp:1412 +#: ../src/widgets/text-toolbar.cpp:1512 +msgid "Block progression" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1541 +#, fuzzy +msgid "Auto glyph orientation" +msgstr "Sideorientering:" + +#: ../src/widgets/text-toolbar.cpp:1548 +#, fuzzy +msgid "Upright" +msgstr "Lysstyrke" + +#: ../src/widgets/text-toolbar.cpp:1549 +#, fuzzy +msgid "Upright glyph orientation" +msgstr "Sideorientering:" + +#: ../src/widgets/text-toolbar.cpp:1556 +msgid "Sideways" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1557 +#, fuzzy +msgid "Sideways glyph orientation" +msgstr "Sideorientering:" + +#. Name +#: ../src/widgets/text-toolbar.cpp:1563 #, fuzzy msgid "Text orientation" msgstr "Sideorientering:" +#. Label +#: ../src/widgets/text-toolbar.cpp:1564 +msgid "Text (glyph) orientation in vertical text." +msgstr "" + #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1435 +#: ../src/widgets/text-toolbar.cpp:1588 #, fuzzy msgid "Smaller spacing" msgstr "Indstil afstand:" -#: ../src/widgets/text-toolbar.cpp:1435 ../src/widgets/text-toolbar.cpp:1466 -#: ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1588 ../src/widgets/text-toolbar.cpp:1619 +#: ../src/widgets/text-toolbar.cpp:1650 #, fuzzy msgctxt "Text tool" msgid "Normal" msgstr "Normal" -#: ../src/widgets/text-toolbar.cpp:1435 +#: ../src/widgets/text-toolbar.cpp:1588 #, fuzzy msgid "Larger spacing" msgstr "Linjeafstand:" #. name -#: ../src/widgets/text-toolbar.cpp:1440 +#: ../src/widgets/text-toolbar.cpp:1593 #, fuzzy msgid "Line Height" msgstr "Højde:" #. label -#: ../src/widgets/text-toolbar.cpp:1441 +#: ../src/widgets/text-toolbar.cpp:1594 #, fuzzy msgid "Line:" msgstr "Linje" #. short label -#: ../src/widgets/text-toolbar.cpp:1442 +#: ../src/widgets/text-toolbar.cpp:1595 #, fuzzy msgid "Spacing between lines (times font size)" msgstr "Mellemrum mellem linjer" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1466 ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 #, fuzzy msgid "Negative spacing" msgstr "Indstil afstand:" -#: ../src/widgets/text-toolbar.cpp:1466 ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 #, fuzzy msgid "Positive spacing" msgstr "Linjeafstand:" #. name -#: ../src/widgets/text-toolbar.cpp:1471 +#: ../src/widgets/text-toolbar.cpp:1624 #, fuzzy msgid "Word spacing" msgstr "Indstil afstand:" #. label -#: ../src/widgets/text-toolbar.cpp:1472 +#: ../src/widgets/text-toolbar.cpp:1625 #, fuzzy msgid "Word:" msgstr "Flyt" #. short label -#: ../src/widgets/text-toolbar.cpp:1473 +#: ../src/widgets/text-toolbar.cpp:1626 #, fuzzy msgid "Spacing between words (px)" msgstr "Mellemrum mellem tegn" #. name -#: ../src/widgets/text-toolbar.cpp:1502 +#: ../src/widgets/text-toolbar.cpp:1655 #, fuzzy msgid "Letter spacing" msgstr "Indstil afstand:" #. label -#: ../src/widgets/text-toolbar.cpp:1503 +#: ../src/widgets/text-toolbar.cpp:1656 #, fuzzy msgid "Letter:" msgstr "Længde:" #. short label -#: ../src/widgets/text-toolbar.cpp:1504 +#: ../src/widgets/text-toolbar.cpp:1657 #, fuzzy msgid "Spacing between letters (px)" msgstr "Mellemrum mellem tegn" #. name -#: ../src/widgets/text-toolbar.cpp:1533 +#: ../src/widgets/text-toolbar.cpp:1686 #, fuzzy msgid "Kerning" msgstr "_Tegning" #. label -#: ../src/widgets/text-toolbar.cpp:1534 +#: ../src/widgets/text-toolbar.cpp:1687 #, fuzzy msgid "Kern:" msgstr "Br_ugernavn:" #. short label -#: ../src/widgets/text-toolbar.cpp:1535 +#: ../src/widgets/text-toolbar.cpp:1688 #, fuzzy msgid "Horizontal kerning (px)" msgstr "Vandret knibning" #. name -#: ../src/widgets/text-toolbar.cpp:1564 +#: ../src/widgets/text-toolbar.cpp:1717 #, fuzzy msgid "Vertical Shift" msgstr "Lodret tekst" #. label -#: ../src/widgets/text-toolbar.cpp:1565 +#: ../src/widgets/text-toolbar.cpp:1718 #, fuzzy msgid "Vert:" msgstr "Invertér:" #. short label -#: ../src/widgets/text-toolbar.cpp:1566 +#: ../src/widgets/text-toolbar.cpp:1719 #, fuzzy msgid "Vertical shift (px)" msgstr "Lodret forskydning" #. name -#: ../src/widgets/text-toolbar.cpp:1595 +#: ../src/widgets/text-toolbar.cpp:1748 #, fuzzy msgid "Letter rotation" msgstr "Indstil afstand:" #. label -#: ../src/widgets/text-toolbar.cpp:1596 +#: ../src/widgets/text-toolbar.cpp:1749 #, fuzzy msgid "Rot:" msgstr "Rolle:" #. short label -#: ../src/widgets/text-toolbar.cpp:1597 +#: ../src/widgets/text-toolbar.cpp:1750 #, fuzzy msgid "Character rotation (degrees)" msgstr "_Rotering" -#: ../src/widgets/toolbox.cpp:177 +#: ../src/widgets/toolbox.cpp:184 msgid "Color/opacity used for color tweaking" msgstr "" -#: ../src/widgets/toolbox.cpp:185 +#: ../src/widgets/toolbox.cpp:192 msgid "Style of new stars" msgstr "" -#: ../src/widgets/toolbox.cpp:187 +#: ../src/widgets/toolbox.cpp:194 #, fuzzy msgid "Style of new rectangles" msgstr "Højde på rektangel" -#: ../src/widgets/toolbox.cpp:189 +#: ../src/widgets/toolbox.cpp:196 #, fuzzy msgid "Style of new 3D boxes" msgstr "Højde på rektangel" -#: ../src/widgets/toolbox.cpp:191 +#: ../src/widgets/toolbox.cpp:198 msgid "Style of new ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:193 +#: ../src/widgets/toolbox.cpp:200 msgid "Style of new spirals" msgstr "" -#: ../src/widgets/toolbox.cpp:195 +#: ../src/widgets/toolbox.cpp:202 msgid "Style of new paths created by Pencil" msgstr "" -#: ../src/widgets/toolbox.cpp:197 +#: ../src/widgets/toolbox.cpp:204 msgid "Style of new paths created by Pen" msgstr "" -#: ../src/widgets/toolbox.cpp:199 +#: ../src/widgets/toolbox.cpp:206 #, fuzzy msgid "Style of new calligraphic strokes" msgstr "Tegn kalligrafi" -#: ../src/widgets/toolbox.cpp:201 ../src/widgets/toolbox.cpp:203 +#: ../src/widgets/toolbox.cpp:208 ../src/widgets/toolbox.cpp:210 msgid "TBD" msgstr "" -#: ../src/widgets/toolbox.cpp:215 +#: ../src/widgets/toolbox.cpp:223 msgid "Style of Paint Bucket fill objects" msgstr "" -#: ../src/widgets/toolbox.cpp:1681 +#: ../src/widgets/toolbox.cpp:1732 #, fuzzy msgid "Bounding box" msgstr "Hæng afgrænsningsbokse på hjælpelinjer" -#: ../src/widgets/toolbox.cpp:1681 +#: ../src/widgets/toolbox.cpp:1732 #, fuzzy msgid "Snap bounding boxes" msgstr "Hæng afgrænsningsbokse på hjælpelinjer" -#: ../src/widgets/toolbox.cpp:1690 +#: ../src/widgets/toolbox.cpp:1741 #, fuzzy msgid "Bounding box edges" msgstr "Hæng afgrænsningsbokse på hjælpelinjer" -#: ../src/widgets/toolbox.cpp:1690 +#: ../src/widgets/toolbox.cpp:1741 #, fuzzy msgid "Snap to edges of a bounding box" msgstr "Hæng afgrænsningsbokse på gitter" -#: ../src/widgets/toolbox.cpp:1699 +#: ../src/widgets/toolbox.cpp:1750 #, fuzzy msgid "Bounding box corners" msgstr "Hæng afgrænsningsbokse på hjælpelinjer" -#: ../src/widgets/toolbox.cpp:1699 +#: ../src/widgets/toolbox.cpp:1750 #, fuzzy msgid "Snap bounding box corners" msgstr "Hæng afgrænsningsbokse på hjælpelinjer" -#: ../src/widgets/toolbox.cpp:1708 +#: ../src/widgets/toolbox.cpp:1759 msgid "BBox Edge Midpoints" msgstr "" -#: ../src/widgets/toolbox.cpp:1708 +#: ../src/widgets/toolbox.cpp:1759 #, fuzzy msgid "Snap midpoints of bounding box edges" msgstr "Hæng afgrænsningsbokse på gitter" -#: ../src/widgets/toolbox.cpp:1718 +#: ../src/widgets/toolbox.cpp:1769 #, fuzzy msgid "BBox Centers" msgstr "Centrér" -#: ../src/widgets/toolbox.cpp:1718 +#: ../src/widgets/toolbox.cpp:1769 #, fuzzy msgid "Snapping centers of bounding boxes" msgstr "_Hæng afgrænsningsbokse på objekter" -#: ../src/widgets/toolbox.cpp:1727 +#: ../src/widgets/toolbox.cpp:1778 #, fuzzy msgid "Snap nodes, paths, and handles" msgstr "Flyt knudepunkts-håndtag" -#: ../src/widgets/toolbox.cpp:1735 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1786 msgid "Snap to paths" -msgstr "Hæng på objekt_stier" +msgstr "Fastgør til stier" -#: ../src/widgets/toolbox.cpp:1744 +#: ../src/widgets/toolbox.cpp:1795 #, fuzzy msgid "Path intersections" msgstr "Gennemskæring" -#: ../src/widgets/toolbox.cpp:1744 +#: ../src/widgets/toolbox.cpp:1795 #, fuzzy msgid "Snap to path intersections" msgstr "Hæng _knudepunkter på objekter" -#: ../src/widgets/toolbox.cpp:1753 +#: ../src/widgets/toolbox.cpp:1804 #, fuzzy msgid "To nodes" msgstr "Flyt knudepunkter" -#: ../src/widgets/toolbox.cpp:1753 +#: ../src/widgets/toolbox.cpp:1804 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1762 +#: ../src/widgets/toolbox.cpp:1813 #, fuzzy msgid "Smooth nodes" msgstr "Udjævnet" -#: ../src/widgets/toolbox.cpp:1762 +#: ../src/widgets/toolbox.cpp:1813 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:1771 +#: ../src/widgets/toolbox.cpp:1822 #, fuzzy msgid "Line Midpoints" msgstr "Linjebredde" -#: ../src/widgets/toolbox.cpp:1771 +#: ../src/widgets/toolbox.cpp:1822 #, fuzzy msgid "Snap midpoints of line segments" msgstr "Hæng afgrænsningsbokse på gitter" -#: ../src/widgets/toolbox.cpp:1780 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1831 msgid "Others" -msgstr "Meter" +msgstr "Andre" -#: ../src/widgets/toolbox.cpp:1780 +#: ../src/widgets/toolbox.cpp:1831 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" -#: ../src/widgets/toolbox.cpp:1788 +#: ../src/widgets/toolbox.cpp:1839 #, fuzzy msgid "Object Centers" msgstr "_Egenskaber for objekt" -#: ../src/widgets/toolbox.cpp:1788 +#: ../src/widgets/toolbox.cpp:1839 #, fuzzy msgid "Snap centers of objects" msgstr "Hæng _knudepunkter på objekter" -#: ../src/widgets/toolbox.cpp:1797 +#: ../src/widgets/toolbox.cpp:1848 #, fuzzy msgid "Rotation Centers" msgstr "_Rotering" -#: ../src/widgets/toolbox.cpp:1797 +#: ../src/widgets/toolbox.cpp:1848 #, fuzzy msgid "Snap an item's rotation center" msgstr "Inkludér skjulte objekter i søgningen" -#: ../src/widgets/toolbox.cpp:1806 +#: ../src/widgets/toolbox.cpp:1857 #, fuzzy msgid "Text baseline" msgstr "Justér venstre sider" -#: ../src/widgets/toolbox.cpp:1806 +#: ../src/widgets/toolbox.cpp:1857 #, fuzzy msgid "Snap text anchors and baselines" msgstr "Justér venstre sider" -#: ../src/widgets/toolbox.cpp:1816 +#: ../src/widgets/toolbox.cpp:1867 #, fuzzy msgid "Page border" msgstr "Sidekantfarve" -#: ../src/widgets/toolbox.cpp:1816 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1867 msgid "Snap to the page border" -msgstr "Vis side_kant" +msgstr "Fastgør til sidekanten" -#: ../src/widgets/toolbox.cpp:1825 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1876 msgid "Snap to grids" -msgstr "Gitter-påhængning" +msgstr "Fastgør til gitre" -#: ../src/widgets/toolbox.cpp:1834 +#: ../src/widgets/toolbox.cpp:1885 #, fuzzy msgid "Snap guides" msgstr "Hæng p_unkter på hjælpelinjer" @@ -32399,6 +32721,8 @@ msgstr "" #. TRANSLATORS: "H" here stands for hue #: ../src/widgets/tweak-toolbar.cpp:291 +#, fuzzy +msgctxt "Hue" msgid "H" msgstr "H" @@ -32408,6 +32732,8 @@ msgstr "" #. TRANSLATORS: "S" here stands for Saturation #: ../src/widgets/tweak-toolbar.cpp:307 +#, fuzzy +msgctxt "Saturation" msgid "S" msgstr "S" @@ -32415,6 +32741,13 @@ msgstr "S" msgid "In color mode, act on objects' lightness" msgstr "" +#. TRANSLATORS: "L" here stands for Lightness +#: ../src/widgets/tweak-toolbar.cpp:323 +#, fuzzy +msgctxt "Lightness" +msgid "L" +msgstr "L" + #: ../src/widgets/tweak-toolbar.cpp:335 msgid "In color mode, act on objects' opacity" msgstr "" @@ -32422,6 +32755,7 @@ msgstr "" #. TRANSLATORS: "O" here stands for Opacity #: ../src/widgets/tweak-toolbar.cpp:339 #, fuzzy +msgctxt "Opacity" msgid "O" msgstr "O" @@ -32547,6 +32881,7 @@ msgid "" "or image/x-icon" msgstr "" +# scootergrisen: kildesprog: forslå at lave til link så "." efter ".net/" ikke bliver del af URL'en #: ../share/extensions/export_gimp_palette.py:16 msgid "" "The export_gpl.py module requires PyXML. Please download the latest version " @@ -32556,7 +32891,7 @@ msgstr "" #: ../share/extensions/extractimage.py:68 #, python-format msgid "Image extracted to: %s" -msgstr "" +msgstr "Billede udtrukket til: %s" #: ../share/extensions/extractimage.py:75 msgid "Unable to find image data." @@ -32603,12 +32938,12 @@ msgid "" msgstr "Mappen %s eksisterer ikke eller er ikke en mappe.\n" #: ../share/extensions/gcodetools.py:3894 -#, fuzzy, python-format +#, python-format msgid "" "Can not write to specified file!\n" "%s" msgstr "" -"Kan ikke skrive til fil %s.\n" +"Kan ikke skrive til den angivne fil.\n" "%s" #: ../share/extensions/gcodetools.py:4040 @@ -32725,7 +33060,7 @@ msgstr "" #: ../share/extensions/gcodetools.py:5511 #, fuzzy msgid "Please select at least one path to engrave and run again." -msgstr "Markér mindst to stier at udføre en boolsk operation på." +msgstr "Markér mindst to stier at udføre en boolesk operation på." #: ../share/extensions/gcodetools.py:5519 msgid "Unknown unit selected. mm assumed" @@ -32833,12 +33168,12 @@ msgstr "Opret forening af markerede stier" msgid "The sliced bitmaps have been saved as:" msgstr "" -#: ../share/extensions/hpgl_decoder.py:43 +#: ../share/extensions/hpgl_decoder.py:42 #, fuzzy msgid "Movements" msgstr "Flyt knudepunkts-håndtag" -#: ../share/extensions/hpgl_decoder.py:44 +#: ../share/extensions/hpgl_decoder.py:43 msgid "Pen " msgstr "" @@ -32872,28 +33207,26 @@ msgid "" "%s" msgstr "" -#: ../share/extensions/inkex.py:169 -#, fuzzy, python-format +#: ../share/extensions/inkex.py:172 +#, python-format msgid "Unable to open specified file: %s" -msgstr "" -"Kan ikke skrive til fil %s.\n" -"%s" +msgstr "Kan ikke åbne den angivne fil: %s" -#: ../share/extensions/inkex.py:178 +#: ../share/extensions/inkex.py:181 #, python-format msgid "Unable to open object member file: %s" msgstr "" -#: ../share/extensions/inkex.py:283 +#: ../share/extensions/inkex.py:286 #, python-format msgid "No matching node for expression: %s" msgstr "" -#: ../share/extensions/inkex.py:313 +#: ../share/extensions/inkex.py:340 msgid "SVG Width not set correctly! Assuming width = 100" msgstr "" -#: ../share/extensions/interp_att_g.py:167 +#: ../share/extensions/interp_att_g.py:176 #, fuzzy msgid "There is no selection to interpolate" msgstr "Markering til øverst" @@ -33091,20 +33424,20 @@ msgstr "" msgid "unable to locate marker: %s" msgstr "" -#: ../share/extensions/measure.py:50 +#: ../share/extensions/measure.py:58 msgid "" "Failed to import the numpy modules. These modules are required by this " "extension. Please install them and try again. On a Debian-like system this " "can be done with the command, sudo apt-get install python-numpy." msgstr "" -#: ../share/extensions/measure.py:112 +#: ../share/extensions/measure.py:120 msgid "Area is zero, cannot calculate Center of Mass" msgstr "" #: ../share/extensions/pathalongpath.py:208 #: ../share/extensions/pathscatter.py:228 -#: ../share/extensions/perspective.py:53 +#: ../share/extensions/perspective.py:52 #, fuzzy msgid "This extension requires two selected paths." msgstr "Opret forening af markerede stier" @@ -33126,7 +33459,7 @@ msgstr "" msgid "Please first convert objects to paths! (Got [%s].)" msgstr "" -#: ../share/extensions/perspective.py:45 +#: ../share/extensions/perspective.py:44 msgid "" "Failed to import the numpy or numpy.linalg modules. These modules are " "required by this extension. Please install them and try again. On a Debian-" @@ -33134,48 +33467,48 @@ msgid "" "numpy." msgstr "" -#: ../share/extensions/perspective.py:61 -#: ../share/extensions/summersnight.py:52 +#: ../share/extensions/perspective.py:60 +#: ../share/extensions/summersnight.py:51 #, python-format msgid "" "The first selected object is of type '%s'.\n" "Try using the procedure Path->Object to Path." msgstr "" -#: ../share/extensions/perspective.py:68 -#: ../share/extensions/summersnight.py:60 +#: ../share/extensions/perspective.py:67 +#: ../share/extensions/summersnight.py:59 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" -#: ../share/extensions/perspective.py:94 -#: ../share/extensions/summersnight.py:93 +#: ../share/extensions/perspective.py:93 +#: ../share/extensions/summersnight.py:92 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." msgstr "" -#: ../share/extensions/perspective.py:96 -#: ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:95 +#: ../share/extensions/summersnight.py:94 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." msgstr "" -#: ../share/extensions/perspective.py:99 -#: ../share/extensions/summersnight.py:98 +#: ../share/extensions/perspective.py:98 +#: ../share/extensions/summersnight.py:97 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." msgstr "" #. issue error if no paths found -#: ../share/extensions/plotter.py:70 +#: ../share/extensions/plotter.py:69 msgid "" "No paths where found. Please convert all objects you want to plot into paths." msgstr "" -#: ../share/extensions/plotter.py:148 +#: ../share/extensions/plotter.py:147 msgid "" "pySerial is not installed.\n" "\n" @@ -33186,43 +33519,43 @@ msgid "" "3. Restart Inkscape." msgstr "" -#: ../share/extensions/plotter.py:200 +#: ../share/extensions/plotter.py:199 msgid "" "Could not open port. Please check that your plotter is running, connected " "and the settings are correct." msgstr "" -#: ../share/extensions/polyhedron_3d.py:65 +#: ../share/extensions/polyhedron_3d.py:66 msgid "" "Failed to import the numpy module. This module is required by this " "extension. Please install it and try again. On a Debian-like system this " "can be done with the command 'sudo apt-get install python-numpy'." msgstr "" -#: ../share/extensions/polyhedron_3d.py:336 +#: ../share/extensions/polyhedron_3d.py:337 msgid "No face data found in specified file." msgstr "" -#: ../share/extensions/polyhedron_3d.py:337 +#: ../share/extensions/polyhedron_3d.py:338 msgid "Try selecting \"Edge Specified\" in the Model File tab.\n" msgstr "" -#: ../share/extensions/polyhedron_3d.py:343 +#: ../share/extensions/polyhedron_3d.py:344 msgid "No edge data found in specified file." msgstr "" -#: ../share/extensions/polyhedron_3d.py:344 +#: ../share/extensions/polyhedron_3d.py:345 msgid "Try selecting \"Face Specified\" in the Model File tab.\n" msgstr "" #. we cannot generate a list of faces from the edges without a lot of computation -#: ../share/extensions/polyhedron_3d.py:522 +#: ../share/extensions/polyhedron_3d.py:524 msgid "" "Face Data Not Found. Ensure file contains face data, and check the file is " "imported as \"Face-Specified\" under the \"Model File\" tab.\n" msgstr "" -#: ../share/extensions/polyhedron_3d.py:524 +#: ../share/extensions/polyhedron_3d.py:526 msgid "Internal Error. No view type selected\n" msgstr "" @@ -33235,22 +33568,22 @@ msgstr "" msgid "Failed to open default printer" msgstr "Opret lineær overgang" -#: ../share/extensions/render_barcode_datamatrix.py:202 +#: ../share/extensions/render_barcode_datamatrix.py:203 msgid "Unrecognised DataMatrix size" msgstr "" #. we have an invalid bit value -#: ../share/extensions/render_barcode_datamatrix.py:643 +#: ../share/extensions/render_barcode_datamatrix.py:644 msgid "Invalid bit value, this is a bug!" msgstr "" #. abort if converting blank text -#: ../share/extensions/render_barcode_datamatrix.py:678 +#: ../share/extensions/render_barcode_datamatrix.py:679 msgid "Please enter an input string" msgstr "" #. abort if converting blank text -#: ../share/extensions/render_barcode_qrcode.py:1054 +#: ../share/extensions/render_barcode_qrcode.py:1055 #, fuzzy msgid "Please enter an input text" msgstr "Du skal indtaste et filnavn" @@ -33297,7 +33630,12 @@ msgstr "" msgid "Please enter a replacement font in the replace all box." msgstr "" -#: ../share/extensions/summersnight.py:44 +#: ../share/extensions/restack.py:76 +#, fuzzy +msgid "There is no selection to restack." +msgstr "Markering til øverst" + +#: ../share/extensions/summersnight.py:43 #, fuzzy msgid "" "This extension requires two selected paths. \n" @@ -33324,7 +33662,7 @@ msgid "" "and install into your Inkscape's Python location\n" msgstr "" -#: ../share/extensions/voronoi2svg.py:215 +#: ../share/extensions/voronoi2svg.py:198 #, fuzzy msgid "Please select objects!" msgstr "Duplikér markerede objekter" @@ -33354,21 +33692,19 @@ msgid "You must give a directory to export the slices." msgstr "" #: ../share/extensions/webslicer_export.py:69 -#, fuzzy, python-format +#, python-format msgid "Can't create \"%s\"." -msgstr "" -"Kan ikke oprette fil %s.\n" -"%s" +msgstr "Kan ikke oprette \"%s\"." #: ../share/extensions/webslicer_export.py:70 -#, fuzzy, python-format +#, python-format msgid "Error: %s" -msgstr "Fejl" +msgstr "Fejl: %s" #: ../share/extensions/webslicer_export.py:73 -#, fuzzy, python-format +#, python-format msgid "The directory \"%s\" does not exists." -msgstr "Mappen %s eksisterer ikke eller er ikke en mappe.\n" +msgstr "Mappen \"%s\" eksisterer ikke." #: ../share/extensions/webslicer_export.py:78 #, fuzzy @@ -33386,7 +33722,7 @@ msgstr "" #. PARAMETER PROCESSING #. lines of longitude are odd : abort -#: ../share/extensions/wireframe_sphere.py:116 +#: ../share/extensions/wireframe_sphere.py:117 msgid "Please enter an even number of lines of longitude." msgstr "" @@ -33419,7 +33755,7 @@ msgstr "Antal trin" #: ../share/extensions/convert2dashes.inx.h:2 #: ../share/extensions/edge3d.inx.h:9 ../share/extensions/flatten.inx.h:3 #: ../share/extensions/fractalize.inx.h:4 -#: ../share/extensions/interp_att_g.inx.h:29 +#: ../share/extensions/interp_att_g.inx.h:31 #: ../share/extensions/markers_strokepaint.inx.h:13 #: ../share/extensions/perspective.inx.h:2 #: ../share/extensions/pixelsnap.inx.h:3 @@ -33571,9 +33907,8 @@ msgid "" msgstr "" #: ../share/extensions/color_blackandwhite.inx.h:1 -#, fuzzy msgid "Black and White" -msgstr "Invertér sorte og hvide områdr til enkelte sporinger" +msgstr "Sort og hvid" #: ../share/extensions/color_blackandwhite.inx.h:2 msgid "Threshold Color (1-255):" @@ -33633,7 +33968,7 @@ msgstr "Deaktiveret" #: ../share/extensions/color_grayscale.inx.h:1 #: ../share/extensions/webslicer_create_rect.inx.h:15 msgid "Grayscale" -msgstr "" +msgstr "Gråtone" #: ../share/extensions/color_lesshue.inx.h:1 msgid "Less Hue" @@ -33702,7 +34037,7 @@ msgstr "Sidste valgte farve" #: ../share/extensions/color_replace.inx.h:2 msgid "Replace color (RRGGBB hex):" -msgstr "" +msgstr "Erstat farve (RRGGBB hex):" #: ../share/extensions/color_replace.inx.h:3 #, fuzzy @@ -33711,7 +34046,7 @@ msgstr "Farve på gitterlinjer" #: ../share/extensions/color_replace.inx.h:4 msgid "By color (RRGGBB hex):" -msgstr "" +msgstr "Efter farve (RRGGBB hex):" #: ../share/extensions/color_replace.inx.h:5 #, fuzzy @@ -33799,7 +34134,7 @@ msgid "Visual" msgstr "Visualisér sti" #: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13 -#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:25 +#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:42 msgid "Visualize Path" msgstr "Visualisér sti" @@ -33969,9 +34304,8 @@ msgstr "" #: ../share/extensions/draw_from_triangle.inx.h:29 #: ../share/extensions/wireframe_sphere.inx.h:6 -#, fuzzy msgid "Radius (px):" -msgstr "Radius" +msgstr "Radius (px):" #: ../share/extensions/draw_from_triangle.inx.h:30 msgid "Draw Isogonal Conjugate" @@ -34169,20 +34503,19 @@ msgstr "Start:" #: ../share/extensions/dxf_outlines.inx.h:18 msgid "CP 1250" -msgstr "" +msgstr "CP 1250" #: ../share/extensions/dxf_outlines.inx.h:19 msgid "CP 1252" -msgstr "" +msgstr "CP 1252" #: ../share/extensions/dxf_outlines.inx.h:20 msgid "UTF 8" -msgstr "" +msgstr "UTF 8" #: ../share/extensions/dxf_outlines.inx.h:21 -#, fuzzy msgid "All (default)" -msgstr "Standard" +msgstr "Alt (standard)" #: ../share/extensions/dxf_outlines.inx.h:22 #, fuzzy @@ -34271,9 +34604,8 @@ msgid "Blur height:" msgstr "Højde:" #: ../share/extensions/embedimage.inx.h:1 -#, fuzzy msgid "Embed Images" -msgstr "Indlejr alle billeder" +msgstr "Indlejr billeder" #: ../share/extensions/embedimage.inx.h:2 #: ../share/extensions/embedselectedimages.inx.h:2 @@ -34346,16 +34678,15 @@ msgstr "" #: ../share/extensions/empty_icon.inx.h:1 msgid "Icon" -msgstr "" +msgstr "Ikon" #: ../share/extensions/empty_icon.inx.h:2 msgid "Icon size:" -msgstr "" +msgstr "Ikonstørrelse:" #: ../share/extensions/empty_page.inx.h:2 -#, fuzzy msgid "Page size:" -msgstr "Side_størrelse:" +msgstr "Side størrelse:" #: ../share/extensions/empty_page.inx.h:3 msgid "Page orientation:" @@ -34363,15 +34694,15 @@ msgstr "Sideorientering:" #: ../share/extensions/empty_page.inx.h:4 msgid "Page background:" -msgstr "" +msgstr "Sidebaggrund:" #: ../share/extensions/empty_video.inx.h:1 msgid "Video Screen" -msgstr "" +msgstr "Videoskærm" #: ../share/extensions/empty_video.inx.h:2 msgid "Video size:" -msgstr "" +msgstr "Videostørrelse:" #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" @@ -34393,7 +34724,7 @@ msgstr "" #: ../share/extensions/export_gimp_palette.inx.h:1 msgid "Export as GIMP Palette" -msgstr "" +msgstr "Eksportér som GIMP-palet" #: ../share/extensions/export_gimp_palette.inx.h:2 #, fuzzy @@ -34405,9 +34736,8 @@ msgid "Exports the colors of this document as GIMP Palette" msgstr "" #: ../share/extensions/extractimage.inx.h:1 -#, fuzzy msgid "Extract Image" -msgstr "Udpak et billede" +msgstr "Udtræk billede" #: ../share/extensions/extractimage.inx.h:2 #, fuzzy @@ -34615,7 +34945,7 @@ msgstr "" #: ../share/extensions/gcodetools_about.inx.h:1 msgid "About" -msgstr "" +msgstr "Om" #: ../share/extensions/gcodetools_about.inx.h:2 msgid "" @@ -34921,7 +35251,7 @@ msgstr "" #: ../share/extensions/gcodetools_orientation_points.inx.h:6 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:23 msgid "Units (mm or in):" -msgstr "" +msgstr "Enheder (mm eller in):" #: ../share/extensions/gcodetools_area.inx.h:42 #: ../share/extensions/gcodetools_dxf_points.inx.h:14 @@ -34969,7 +35299,7 @@ msgstr "Flad farveudfyldning" #: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 msgctxt "GCode postprocessor" msgid "None" -msgstr "" +msgstr "Intet" #: ../share/extensions/gcodetools_area.inx.h:49 #: ../share/extensions/gcodetools_dxf_points.inx.h:21 @@ -35010,7 +35340,7 @@ msgstr "" #: ../share/extensions/gcodetools_check_for_updates.inx.h:1 msgid "Check for updates" -msgstr "" +msgstr "Søg efter opdateringer" #: ../share/extensions/gcodetools_check_for_updates.inx.h:2 msgid "Check for Gcodetools latest stable version and try to get the updates." @@ -35289,9 +35619,8 @@ msgid "Perpendicular" msgstr "" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:15 -#, fuzzy msgid "Tangent" -msgstr "Magenta" +msgstr "" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:16 msgid "-------------------------------------------------" @@ -35808,9 +36137,8 @@ msgid "Action: " msgstr "Acceleration:" #: ../share/extensions/hershey.inx.h:5 -#, fuzzy msgid "Font face: " -msgstr "Skrifttypestørrelse:" +msgstr "" #: ../share/extensions/hershey.inx.h:6 #, fuzzy @@ -35967,14 +36295,14 @@ msgstr "" #: ../share/extensions/hpgl_input.inx.h:3 #: ../share/extensions/hpgl_output.inx.h:4 -#: ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/plotter.inx.h:32 #, fuzzy msgid "Resolution X (dpi):" msgstr "Foretrukken opløsning af punktbillede (dpi)" #: ../share/extensions/hpgl_input.inx.h:4 #: ../share/extensions/hpgl_output.inx.h:5 -#: ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" @@ -35982,14 +36310,14 @@ msgstr "" #: ../share/extensions/hpgl_input.inx.h:5 #: ../share/extensions/hpgl_output.inx.h:6 -#: ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/plotter.inx.h:34 #, fuzzy msgid "Resolution Y (dpi):" msgstr "Foretrukken opløsning af punktbillede (dpi)" #: ../share/extensions/hpgl_input.inx.h:6 #: ../share/extensions/hpgl_output.inx.h:7 -#: ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -36026,36 +36354,36 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_output.inx.h:3 -#: ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/plotter.inx.h:31 #, fuzzy msgid "Plotter Settings " msgstr "Sideorientering:" #: ../share/extensions/hpgl_output.inx.h:8 -#: ../share/extensions/plotter.inx.h:38 +#: ../share/extensions/plotter.inx.h:36 #, fuzzy msgid "Pen number:" msgstr "Vinkel" #: ../share/extensions/hpgl_output.inx.h:9 -#: ../share/extensions/plotter.inx.h:39 +#: ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "" #: ../share/extensions/hpgl_output.inx.h:10 -#: ../share/extensions/plotter.inx.h:40 +#: ../share/extensions/plotter.inx.h:38 msgid "Pen force (g):" msgstr "" #: ../share/extensions/hpgl_output.inx.h:11 -#: ../share/extensions/plotter.inx.h:41 +#: ../share/extensions/plotter.inx.h:39 msgid "" "The amount of force pushing down the pen in grams, set to 0 to omit command; " "most plotters ignore this command (Default: 0)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:12 -#: ../share/extensions/plotter.inx.h:42 +#: ../share/extensions/plotter.inx.h:40 msgid "Pen speed (cm/s or mm/s):" msgstr "" @@ -36072,44 +36400,44 @@ msgid "Rotation (°, Clockwise):" msgstr "Rotation er mod uret" #: ../share/extensions/hpgl_output.inx.h:15 -#: ../share/extensions/plotter.inx.h:45 +#: ../share/extensions/plotter.inx.h:43 msgid "Rotation of the drawing (Default: 0°)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:16 -#: ../share/extensions/plotter.inx.h:46 +#: ../share/extensions/plotter.inx.h:44 msgid "Mirror X axis" msgstr "" #: ../share/extensions/hpgl_output.inx.h:17 -#: ../share/extensions/plotter.inx.h:47 +#: ../share/extensions/plotter.inx.h:45 msgid "Check this to mirror the X axis (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:18 -#: ../share/extensions/plotter.inx.h:48 +#: ../share/extensions/plotter.inx.h:46 msgid "Mirror Y axis" msgstr "" #: ../share/extensions/hpgl_output.inx.h:19 -#: ../share/extensions/plotter.inx.h:49 +#: ../share/extensions/plotter.inx.h:47 msgid "Check this to mirror the Y axis (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:20 -#: ../share/extensions/plotter.inx.h:50 +#: ../share/extensions/plotter.inx.h:48 #, fuzzy msgid "Center zero point" msgstr "Centrér linjer" #: ../share/extensions/hpgl_output.inx.h:21 -#: ../share/extensions/plotter.inx.h:51 +#: ../share/extensions/plotter.inx.h:49 msgid "" "Check this if your plotter uses a centered zero point (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:22 -#: ../share/extensions/plotter.inx.h:52 +#: ../share/extensions/plotter.inx.h:50 msgid "" "If you want to use multiple pens on your pen plotter create one layer for " "each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " @@ -36117,70 +36445,70 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_output.inx.h:23 -#: ../share/extensions/plotter.inx.h:53 +#: ../share/extensions/plotter.inx.h:51 #, fuzzy msgid "Plot Features " msgstr "Meter" #: ../share/extensions/hpgl_output.inx.h:24 -#: ../share/extensions/plotter.inx.h:54 +#: ../share/extensions/plotter.inx.h:52 msgid "Overcut (mm):" msgstr "" #: ../share/extensions/hpgl_output.inx.h:25 -#: ../share/extensions/plotter.inx.h:55 +#: ../share/extensions/plotter.inx.h:53 msgid "" "The distance in mm that will be cut over the starting point of the path to " "prevent open paths, set to 0.0 to omit command (Default: 1.00)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:26 -#: ../share/extensions/plotter.inx.h:56 +#: ../share/extensions/plotter.inx.h:54 #, fuzzy -msgid "Tool offset (mm):" +msgid "Tool (Knife) offset correction (mm):" msgstr "Vandret forskudt" #: ../share/extensions/hpgl_output.inx.h:27 -#: ../share/extensions/plotter.inx.h:57 +#: ../share/extensions/plotter.inx.h:55 msgid "" "The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " "command (Default: 0.25)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:28 -#: ../share/extensions/plotter.inx.h:58 +#: ../share/extensions/plotter.inx.h:56 #, fuzzy -msgid "Use precut" +msgid "Precut" msgstr "Vælg som standard" #: ../share/extensions/hpgl_output.inx.h:29 -#: ../share/extensions/plotter.inx.h:59 +#: ../share/extensions/plotter.inx.h:57 msgid "" "Check this to cut a small line before the real drawing starts to correctly " "align the tool orientation. (Default: Checked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:30 -#: ../share/extensions/plotter.inx.h:60 +#: ../share/extensions/plotter.inx.h:58 #, fuzzy msgid "Curve flatness:" msgstr "Fladhed" #: ../share/extensions/hpgl_output.inx.h:31 -#: ../share/extensions/plotter.inx.h:61 +#: ../share/extensions/plotter.inx.h:59 msgid "" "Curves are divided into lines, this number controls how fine the curves will " "be reproduced, the smaller the finer (Default: '1.2')" msgstr "" #: ../share/extensions/hpgl_output.inx.h:32 -#: ../share/extensions/plotter.inx.h:62 +#: ../share/extensions/plotter.inx.h:60 #, fuzzy msgid "Auto align" msgstr "Justér" #: ../share/extensions/hpgl_output.inx.h:33 -#: ../share/extensions/plotter.inx.h:63 +#: ../share/extensions/plotter.inx.h:61 msgid "" "Check this to auto align the drawing to the zero point (Plus the tool offset " "if used). If unchecked you have to make sure that all parts of your drawing " @@ -36188,7 +36516,7 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_output.inx.h:34 -#: ../share/extensions/plotter.inx.h:66 +#: ../share/extensions/plotter.inx.h:64 msgid "" "All these settings depend on the plotter you use, for more information " "please consult the manual or homepage for your plotter." @@ -36211,7 +36539,7 @@ msgstr "" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:5 -msgid "Support non-unifom scaling" +msgid "Support non-uniform scaling" msgstr "" #. render images like in 0.48 @@ -36299,11 +36627,11 @@ msgstr "_Konvertér til tekst" #: ../share/extensions/ink2canvas.inx.h:2 msgid "HTML 5 canvas (*.html)" -msgstr "" +msgstr "HTML 5 canvas (*.html)" #: ../share/extensions/ink2canvas.inx.h:3 msgid "HTML 5 canvas code" -msgstr "" +msgstr "HTML 5 canvas kode" #: ../share/extensions/inkscape_follow_link.inx.h:1 #, fuzzy @@ -36385,6 +36713,17 @@ msgstr "Duplikér endestier" msgid "Interpolate style" msgstr "Interpolér" +#: ../share/extensions/interp.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:10 +#, fuzzy +msgid "Use Z-order" +msgstr "Hæv knudepunkt" + +#: ../share/extensions/interp.inx.h:8 +#: ../share/extensions/interp_att_g.inx.h:11 +msgid "Workaround for reversed selection order in Live Preview cycles" +msgstr "" + #: ../share/extensions/interp_att_g.inx.h:1 msgid "Interpolate Attribute in a group" msgstr "" @@ -36419,61 +36758,60 @@ msgstr "Attributværdi" msgid "End Value:" msgstr "Værdi" -#: ../share/extensions/interp_att_g.inx.h:13 +#: ../share/extensions/interp_att_g.inx.h:15 #, fuzzy msgid "Translate X" msgstr "_Oversættere" -#: ../share/extensions/interp_att_g.inx.h:14 +#: ../share/extensions/interp_att_g.inx.h:16 #, fuzzy msgid "Translate Y" msgstr "_Oversættere" -#: ../share/extensions/interp_att_g.inx.h:15 +#: ../share/extensions/interp_att_g.inx.h:17 #: ../share/extensions/markers_strokepaint.inx.h:9 msgid "Fill" msgstr "Udfyldning" -#: ../share/extensions/interp_att_g.inx.h:17 -#, fuzzy +#: ../share/extensions/interp_att_g.inx.h:19 msgid "Other" -msgstr "Meter" +msgstr "Andre" -#: ../share/extensions/interp_att_g.inx.h:18 +#: ../share/extensions/interp_att_g.inx.h:20 msgid "" "If you select \"Other\", you must know the SVG attributes to identify here " "this \"other\"." msgstr "" -#: ../share/extensions/interp_att_g.inx.h:20 +#: ../share/extensions/interp_att_g.inx.h:22 msgid "Integer Number" -msgstr "" +msgstr "Heltal" -#: ../share/extensions/interp_att_g.inx.h:21 +#: ../share/extensions/interp_att_g.inx.h:23 #, fuzzy msgid "Float Number" msgstr "Firkant" -#: ../share/extensions/interp_att_g.inx.h:23 +#: ../share/extensions/interp_att_g.inx.h:25 #: ../share/extensions/polyhedron_3d.inx.h:33 msgid "Style" msgstr "Stil" -#: ../share/extensions/interp_att_g.inx.h:24 +#: ../share/extensions/interp_att_g.inx.h:26 #, fuzzy msgid "Transformation" msgstr "Information" -#: ../share/extensions/interp_att_g.inx.h:25 +#: ../share/extensions/interp_att_g.inx.h:27 msgid "••••••••••••••••••••••••••••••••••••••••••••••••" msgstr "" -#: ../share/extensions/interp_att_g.inx.h:26 +#: ../share/extensions/interp_att_g.inx.h:28 #, fuzzy msgid "No Unit" msgstr "Enhed" -#: ../share/extensions/interp_att_g.inx.h:28 +#: ../share/extensions/interp_att_g.inx.h:30 msgid "" "This effect applies a value for any interpolatable attribute for all " "elements inside the selected group or for all elements in a multiple " @@ -36556,9 +36894,8 @@ msgid "Build-in effect" msgstr "Aktuelt lag" #: ../share/extensions/jessyInk_effects.inx.h:7 -#, fuzzy msgid "None (default)" -msgstr "Standard" +msgstr "Ingen (standard)" #: ../share/extensions/jessyInk_effects.inx.h:8 #: ../share/extensions/jessyInk_transitions.inx.h:8 @@ -36583,9 +36920,8 @@ msgid "Build-out effect" msgstr "Vandret forskudt" #: ../share/extensions/jessyInk_effects.inx.h:12 -#, fuzzy msgid "Fade out" -msgstr "Ton ud:" +msgstr "Ton ud" #: ../share/extensions/jessyInk_effects.inx.h:14 msgid "" @@ -36605,11 +36941,11 @@ msgstr "Relationer" #: ../share/extensions/jessyInk_export.inx.h:5 msgid "PDF" -msgstr "" +msgstr "PDF" #: ../share/extensions/jessyInk_export.inx.h:6 msgid "PNG" -msgstr "" +msgstr "PNG" #: ../share/extensions/jessyInk_export.inx.h:8 msgid "" @@ -36630,7 +36966,7 @@ msgstr "" #: ../share/extensions/jessyInk_install.inx.h:1 msgid "Install/update" -msgstr "" +msgstr "Installér/opdatér" #: ../share/extensions/jessyInk_install.inx.h:3 msgid "" @@ -36936,7 +37272,7 @@ msgstr "" #: ../share/extensions/jessyInk_uninstall.inx.h:1 msgid "Uninstall/remove" -msgstr "" +msgstr "Afinstallér/fjern" #: ../share/extensions/jessyInk_uninstall.inx.h:3 #, fuzzy @@ -37121,7 +37457,7 @@ msgstr "Hæng afgrænsningsbokse på hjælpelinjer" #: ../share/extensions/layout_nup.inx.h:23 msgid "Margin box" -msgstr "" +msgstr "Margenboks" #: ../share/extensions/layout_nup.inx.h:25 msgid "" @@ -37212,7 +37548,7 @@ msgstr "" #: ../share/extensions/lorem_ipsum.inx.h:1 msgid "Lorem ipsum" -msgstr "" +msgstr "Lorem ipsum" #: ../share/extensions/lorem_ipsum.inx.h:3 #, fuzzy @@ -37287,10 +37623,6 @@ msgstr "Sidste valgte farve" msgid "Measure Path" msgstr "Mål sti" -#: ../share/extensions/measure.inx.h:2 -msgid "Measure" -msgstr "Mål" - #: ../share/extensions/measure.inx.h:3 #, fuzzy msgid "Measurement Type: " @@ -37298,62 +37630,114 @@ msgstr "Mål sti" #: ../share/extensions/measure.inx.h:4 #, fuzzy -msgid "Text Orientation: " -msgstr "Sideorientering:" - -#: ../share/extensions/measure.inx.h:5 -msgid "Angle [with Fixed Angle option only] (°):" -msgstr "" +msgid "Text Presets" +msgstr "Indstillinger for tekst" #: ../share/extensions/measure.inx.h:6 #, fuzzy +msgid "Text on Path" +msgstr "_Sæt på sti" + +#: ../share/extensions/measure.inx.h:8 +#, fuzzy, no-c-format +msgid "Offset (%)" +msgstr "Forskydninger" + +#: ../share/extensions/measure.inx.h:9 +#, fuzzy +msgid "Text anchor:" +msgstr "Tekst-inddata" + +#: ../share/extensions/measure.inx.h:10 +#, fuzzy +msgid "Fixed Text" +msgstr "Flydende tekst" + +#: ../share/extensions/measure.inx.h:11 +#, fuzzy +msgid "Angle (°):" +msgstr "Vinkel X:" + +#: ../share/extensions/measure.inx.h:12 +#, fuzzy msgid "Font size (px):" msgstr "Skriftstørrelse" -#: ../share/extensions/measure.inx.h:7 +#: ../share/extensions/measure.inx.h:13 #, fuzzy msgid "Offset (px):" msgstr "Forskydninger" -#: ../share/extensions/measure.inx.h:8 -#, fuzzy -msgid "Precision:" -msgstr "Beskrivelse" - -#: ../share/extensions/measure.inx.h:9 +#: ../share/extensions/measure.inx.h:15 msgid "Scale Factor (Drawing:Real Length) = 1:" msgstr "" -#: ../share/extensions/measure.inx.h:10 +#: ../share/extensions/measure.inx.h:16 #, fuzzy msgid "Length Unit:" msgstr "Længde:" -#: ../share/extensions/measure.inx.h:12 +#: ../share/extensions/measure.inx.h:18 #, fuzzy msgctxt "measure extension" msgid "Area" msgstr "Løst koblede" -#: ../share/extensions/measure.inx.h:13 +#: ../share/extensions/measure.inx.h:19 #, fuzzy msgctxt "measure extension" msgid "Center of Mass" msgstr "Masse:" -#: ../share/extensions/measure.inx.h:14 +#: ../share/extensions/measure.inx.h:21 #, fuzzy -msgctxt "measure extension" -msgid "Text On Path" +msgid "Text on Path, Start" msgstr "_Sæt på sti" -#: ../share/extensions/measure.inx.h:15 +#: ../share/extensions/measure.inx.h:22 #, fuzzy -msgctxt "measure extension" -msgid "Fixed Angle" -msgstr "Vinkel" +msgid "Text on Path, Middle" +msgstr "_Sæt på sti" -#: ../share/extensions/measure.inx.h:18 +#: ../share/extensions/measure.inx.h:23 +#, fuzzy +msgid "Text on Path, End" +msgstr "_Sæt på sti" + +#: ../share/extensions/measure.inx.h:24 +msgid "Fixed Text, Start of Path" +msgstr "" + +#: ../share/extensions/measure.inx.h:25 +msgid "Fixed Text, Center of BBox" +msgstr "" + +#: ../share/extensions/measure.inx.h:26 +#, fuzzy +msgid "Fixed Text, Center of Mass" +msgstr "Masse:" + +#: ../share/extensions/measure.inx.h:28 +#, fuzzy +msgid "Center" +msgstr "Centimeter" + +#: ../share/extensions/measure.inx.h:30 +#, fuzzy +msgid "Start of Path" +msgstr "_Streg til sti" + +#: ../share/extensions/measure.inx.h:31 +#, fuzzy +msgid "Center of BBox" +msgstr "Masse:" + +#: ../share/extensions/measure.inx.h:32 +#, fuzzy +msgid "Center of Mass" +msgstr "Masse:" + +#: ../share/extensions/measure.inx.h:35 #, no-c-format msgid "" "This effect measures the length, area, or center-of-mass of the selected " @@ -37772,78 +38156,63 @@ msgid "The command language to use (Default: HPGL)" msgstr "" #: ../share/extensions/plotter.inx.h:21 -msgid "Initialization commands:" -msgstr "" - -#: ../share/extensions/plotter.inx.h:22 -msgid "" -"Commands that will be sent to the plotter before the main data stream, only " -"use this if you know what you are doing! (Default: Empty)" -msgstr "" - -#: ../share/extensions/plotter.inx.h:23 msgid "Software (XON/XOFF)" msgstr "" -#: ../share/extensions/plotter.inx.h:24 +#: ../share/extensions/plotter.inx.h:22 msgid "Hardware (RTS/CTS)" msgstr "" -#: ../share/extensions/plotter.inx.h:25 +#: ../share/extensions/plotter.inx.h:23 msgid "Hardware (DSR/DTR + RTS/CTS)" msgstr "" -#: ../share/extensions/plotter.inx.h:26 -msgctxt "Flow control" -msgid "None" -msgstr "" - -#: ../share/extensions/plotter.inx.h:27 +#: ../share/extensions/plotter.inx.h:25 msgid "HPGL" msgstr "" -#: ../share/extensions/plotter.inx.h:28 +#: ../share/extensions/plotter.inx.h:26 msgid "DMPL" msgstr "" -#: ../share/extensions/plotter.inx.h:29 +#: ../share/extensions/plotter.inx.h:27 msgid "KNK Plotter (HPGL variant)" msgstr "" -#: ../share/extensions/plotter.inx.h:30 +#: ../share/extensions/plotter.inx.h:28 msgid "" "Using wrong settings can under certain circumstances cause Inkscape to " "freeze. Always save your work before plotting!" msgstr "" -#: ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/plotter.inx.h:29 msgid "" "This can be a physical serial connection or a USB-to-Serial bridge. Ask your " "plotter manufacturer for drivers if needed." msgstr "" -#: ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/plotter.inx.h:30 msgid "Parallel (LPT) connections are not supported." msgstr "" -#: ../share/extensions/plotter.inx.h:43 +#: ../share/extensions/plotter.inx.h:41 msgid "" "The speed the pen will move with in centimeters or millimeters per second " "(depending on your plotter model), set to 0 to omit command. Most plotters " "ignore this command. (Default: 0)" msgstr "" -#: ../share/extensions/plotter.inx.h:44 +#: ../share/extensions/plotter.inx.h:42 #, fuzzy msgid "Rotation (°, clockwise):" msgstr "Rotation er mod uret" -#: ../share/extensions/plotter.inx.h:64 +#: ../share/extensions/plotter.inx.h:62 #, fuzzy msgid "Show debug information" msgstr "Information om hukommelsesforbrug" -#: ../share/extensions/plotter.inx.h:65 +#: ../share/extensions/plotter.inx.h:63 msgid "" "Check this to get verbose information about the plot without actually " "sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" @@ -37889,9 +38258,8 @@ msgid "Object:" msgstr "Objekt" #: ../share/extensions/polyhedron_3d.inx.h:4 -#, fuzzy msgid "Filename:" -msgstr "Sæt filnavn" +msgstr "Filenavn:" #: ../share/extensions/polyhedron_3d.inx.h:5 #, fuzzy @@ -38001,15 +38369,15 @@ msgstr "Ikke afrundede" #: ../share/extensions/polyhedron_3d.inx.h:30 msgid "X-Axis" -msgstr "" +msgstr "X-akser" #: ../share/extensions/polyhedron_3d.inx.h:31 msgid "Y-Axis" -msgstr "" +msgstr "Y-akser" #: ../share/extensions/polyhedron_3d.inx.h:32 msgid "Z-Axis" -msgstr "" +msgstr "Z-akser" #: ../share/extensions/polyhedron_3d.inx.h:34 #, fuzzy @@ -38187,6 +38555,11 @@ msgstr "Maksimal linjestykkelængde" msgid "Maximum displacement in Y (px):" msgstr "Maksimal linjestykkelængde" +#: ../share/extensions/radiusrand.inx.h:6 +#, fuzzy +msgid "Shift node handles" +msgstr "Flyt knudepunkts-håndtag" + #: ../share/extensions/radiusrand.inx.h:7 msgid "Use normal distribution" msgstr "Brug normal fordeling" @@ -38206,13 +38579,12 @@ msgid "Classic" msgstr "" #: ../share/extensions/render_barcode.inx.h:2 -#, fuzzy msgid "Barcode Type:" -msgstr " type: " +msgstr "Stregkodetype:" #: ../share/extensions/render_barcode.inx.h:3 msgid "Barcode Data:" -msgstr "" +msgstr "Stregkodedata:" #: ../share/extensions/render_barcode.inx.h:4 #, fuzzy @@ -38223,7 +38595,7 @@ msgstr "Højde:" #: ../share/extensions/render_barcode_datamatrix.inx.h:6 #: ../share/extensions/render_barcode_qrcode.inx.h:19 msgid "Barcode" -msgstr "" +msgstr "Stregkode" #: ../share/extensions/render_barcode_datamatrix.inx.h:1 #, fuzzy @@ -38242,7 +38614,7 @@ msgstr "Kantet ende" #: ../share/extensions/render_barcode_qrcode.inx.h:1 msgid "QR Code" -msgstr "" +msgstr "QR-kode" #: ../share/extensions/render_barcode_qrcode.inx.h:2 msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" @@ -38388,72 +38760,109 @@ msgstr " _Nulstil " #: ../share/extensions/restack.inx.h:2 #, fuzzy -msgid "Restack Direction:" -msgstr "Beskrivelse" +msgid "Based on Position" +msgstr "Placering:" #: ../share/extensions/restack.inx.h:3 +#, fuzzy +msgid "Presets" +msgstr "Nærvær" + +#: ../share/extensions/restack.inx.h:6 +#, fuzzy +msgid "Horizontal:" +msgstr "_Vandret" + +#: ../share/extensions/restack.inx.h:7 +#, fuzzy +msgid "Vertical:" +msgstr "_Lodret" + +#: ../share/extensions/restack.inx.h:8 +#, fuzzy +msgid "Restack Direction" +msgstr "Beskrivelse" + +#: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" msgstr "" -#: ../share/extensions/restack.inx.h:4 +#: ../share/extensions/restack.inx.h:10 msgid "Bottom to Top (90)" msgstr "" -#: ../share/extensions/restack.inx.h:5 +#: ../share/extensions/restack.inx.h:11 msgid "Right to Left (180)" msgstr "" -#: ../share/extensions/restack.inx.h:6 +#: ../share/extensions/restack.inx.h:12 #, fuzzy msgid "Top to Bottom (270)" msgstr "Sænk til _nederst" -#: ../share/extensions/restack.inx.h:7 +#: ../share/extensions/restack.inx.h:13 #, fuzzy msgid "Radial Outward" msgstr "Radial overgang" -#: ../share/extensions/restack.inx.h:8 +#: ../share/extensions/restack.inx.h:14 #, fuzzy msgid "Radial Inward" msgstr "Radial overgang" -#: ../share/extensions/restack.inx.h:9 -#, fuzzy -msgid "Arbitrary Angle" -msgstr "Vinkel" - -#: ../share/extensions/restack.inx.h:11 +#: ../share/extensions/restack.inx.h:15 #, fuzzy -msgid "Horizontal Point:" -msgstr "Vandret tekst" +msgid "Object Reference Point" +msgstr "Indstillinger for overgange" -#: ../share/extensions/restack.inx.h:13 +#: ../share/extensions/restack.inx.h:17 #: ../share/extensions/text_extract.inx.h:9 #: ../share/extensions/text_merge.inx.h:9 #, fuzzy msgid "Middle" msgstr "Titel" -#: ../share/extensions/restack.inx.h:15 -#, fuzzy -msgid "Vertical Point:" -msgstr "Lodret tekst" - -#: ../share/extensions/restack.inx.h:16 +#: ../share/extensions/restack.inx.h:19 #: ../share/extensions/text_extract.inx.h:12 #: ../share/extensions/text_merge.inx.h:12 msgid "Top" msgstr "Øverst" -#: ../share/extensions/restack.inx.h:17 +#: ../share/extensions/restack.inx.h:20 #: ../share/extensions/text_extract.inx.h:13 #: ../share/extensions/text_merge.inx.h:13 #, fuzzy msgid "Bottom" msgstr "Bot" -#: ../share/extensions/restack.inx.h:18 +#: ../share/extensions/restack.inx.h:21 +#, fuzzy +msgid "Based on Z-Order" +msgstr "Hæv knudepunkt" + +#: ../share/extensions/restack.inx.h:22 +#, fuzzy +msgid "Restack Mode" +msgstr " _Nulstil " + +#: ../share/extensions/restack.inx.h:23 +#, fuzzy +msgid "Reverse Z-Order" +msgstr "Lineær overgang" + +#: ../share/extensions/restack.inx.h:24 +msgid "Shuffle Z-Order" +msgstr "" + +#: ../share/extensions/restack.inx.h:26 +msgid "" +"This extension changes the z-order of objects based on their position on the " +"canvas or their current z-order. Selection: The extension restacks either " +"objects inside a single selected group, or a selection of multiple objects " +"on the current drawing level (layer or group)." +msgstr "" + +#: ../share/extensions/restack.inx.h:27 msgid "Arrange" msgstr "Arrangér" @@ -38471,6 +38880,15 @@ msgstr "Begyndelsesstørrelse" msgid "Minimum size:" msgstr "Minimumsstørrelse" +#: ../share/extensions/rtree.inx.h:4 +#, fuzzy +msgid "Omit redundant segments" +msgstr "Slet linjestykke" + +#: ../share/extensions/rtree.inx.h:5 +msgid "Lift pen for backward steps" +msgstr "" + #: ../share/extensions/rubberstretch.inx.h:1 #, fuzzy msgid "Rubber Stretch" @@ -38491,169 +38909,286 @@ msgid "Optimized SVG Output" msgstr "Optimeret SVG-output" #: ../share/extensions/scour.inx.h:3 +msgid "Number of significant digits for coordinates:" +msgstr "" + +#: ../share/extensions/scour.inx.h:4 +msgid "" +"Specifies the number of significant digits that should be output for " +"coordinates. Note that significant digits are *not* the number of decimals " +"but the overall number of digits in the output. For example if a value of " +"\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " +"coordinate 123.675 is output as 124." +msgstr "" + +#: ../share/extensions/scour.inx.h:5 #, fuzzy msgid "Shorten color values" msgstr "Kopiér farve" -#: ../share/extensions/scour.inx.h:4 +#: ../share/extensions/scour.inx.h:6 +msgid "" +"Convert all color specifications to #RRGGBB (or #RGB where applicable) " +"format." +msgstr "" + +#: ../share/extensions/scour.inx.h:7 #, fuzzy msgid "Convert CSS attributes to XML attributes" msgstr "Slet attribut" -#: ../share/extensions/scour.inx.h:5 -msgid "Group collapsing" +#: ../share/extensions/scour.inx.h:8 +msgid "" +"Convert styles from style tags and inline style=\"\" declarations into XML " +"attributes." msgstr "" -#: ../share/extensions/scour.inx.h:6 +#: ../share/extensions/scour.inx.h:9 +#, fuzzy +msgid "Collapse groups" +msgstr "_Ryd" + +#: ../share/extensions/scour.inx.h:10 +msgid "" +"Remove useless groups, promoting their contents up one level. Requires " +"\"Remove unused IDs\" to be set." +msgstr "" + +#: ../share/extensions/scour.inx.h:11 msgid "Create groups for similar attributes" msgstr "" -#: ../share/extensions/scour.inx.h:7 -#, fuzzy -msgid "Embed rasters" -msgstr "Indlejr alle billeder" +#: ../share/extensions/scour.inx.h:12 +msgid "" +"Create groups for runs of elements having at least one attribute in common " +"(e.g. fill-color, stroke-opacity, ...)." +msgstr "" -#: ../share/extensions/scour.inx.h:8 +#: ../share/extensions/scour.inx.h:13 msgid "Keep editor data" msgstr "" -#: ../share/extensions/scour.inx.h:9 +#: ../share/extensions/scour.inx.h:14 +msgid "" +"Don't remove editor-specific elements and attributes. Currently supported: " +"Inkscape, Sodipodi and Adobe Illustrator." +msgstr "" + +#: ../share/extensions/scour.inx.h:15 +msgid "Keep unreferenced definitions" +msgstr "" + +#: ../share/extensions/scour.inx.h:16 +msgid "Keep element definitions that are not currently used in the SVG" +msgstr "" + +#: ../share/extensions/scour.inx.h:17 +msgid "Work around renderer bugs" +msgstr "" + +#: ../share/extensions/scour.inx.h:18 +msgid "" +"Works around some common renderer bugs (mainly libRSVG) at the cost of a " +"slightly larger SVG file." +msgstr "" + +#: ../share/extensions/scour.inx.h:20 +#, fuzzy +msgid "Remove the XML declaration" +msgstr "Fjern _transformationer" + +#: ../share/extensions/scour.inx.h:21 +msgid "" +"Removes the XML declaration (which is optional but should be provided, " +"especially if special characters are used in the document) from the file " +"header." +msgstr "" + +#: ../share/extensions/scour.inx.h:22 #, fuzzy msgid "Remove metadata" msgstr "Fjern" -#: ../share/extensions/scour.inx.h:10 +#: ../share/extensions/scour.inx.h:23 +msgid "" +"Remove metadata tags along with all the contained information, which may " +"include license and author information, alternate versions for non-SVG-" +"enabled browsers, etc." +msgstr "" + +#: ../share/extensions/scour.inx.h:24 #, fuzzy msgid "Remove comments" msgstr "Fjern udfyldning" -#: ../share/extensions/scour.inx.h:11 -msgid "Work around renderer bugs" +#: ../share/extensions/scour.inx.h:25 +msgid "Remove all XML comments from output." msgstr "" -#: ../share/extensions/scour.inx.h:12 +#: ../share/extensions/scour.inx.h:26 +#, fuzzy +msgid "Embed raster images" +msgstr "Indlejr alle billeder" + +#: ../share/extensions/scour.inx.h:27 +msgid "" +"Resolve external references to raster images and embed them as Base64-" +"encoded data URLs." +msgstr "" + +#: ../share/extensions/scour.inx.h:28 #, fuzzy msgid "Enable viewboxing" msgstr "Forhåndsvis" -#: ../share/extensions/scour.inx.h:13 +#: ../share/extensions/scour.inx.h:30 +#, no-c-format +msgid "" +"Set page size to 100%/100% (full width and height of the display area) and " +"introduce a viewBox specifying the drawings dimensions." +msgstr "" + +#: ../share/extensions/scour.inx.h:31 +msgid "Format output with line-breaks and indentation" +msgstr "" + +#: ../share/extensions/scour.inx.h:32 +msgid "" +"Produce nicely formatted output including line-breaks. If you do not intend " +"to hand-edit the SVG file you can disable this option to bring down the file " +"size even more at the cost of clarity." +msgstr "" + +#: ../share/extensions/scour.inx.h:33 #, fuzzy -msgid "Remove the xml declaration" -msgstr "Fjern _transformationer" +msgid "Indentation characters:" +msgstr "Usynligt tegn" -#: ../share/extensions/scour.inx.h:14 -msgid "Number of significant digits for coords:" +#: ../share/extensions/scour.inx.h:34 +msgid "" +"The type of indentation used for each level of nesting in the output. " +"Specify \"None\" to disable indentation. This option has no effect if " +"\"Format output with line-breaks and indentation\" is disabled." msgstr "" -#: ../share/extensions/scour.inx.h:15 -msgid "XML indentation (pretty-printing):" +#: ../share/extensions/scour.inx.h:35 +#, fuzzy +msgid "Depth of indentation:" +msgstr "Funktion" + +#: ../share/extensions/scour.inx.h:36 +msgid "" +"The depth of the chosen type of indentation. E.g. if you choose \"2\" every " +"nesting level in the output will be indented by two additional spaces/tabs." msgstr "" -#: ../share/extensions/scour.inx.h:16 +#: ../share/extensions/scour.inx.h:37 +msgid "Strip the \"xml:space\" attribute from the root SVG element" +msgstr "" + +#: ../share/extensions/scour.inx.h:38 +msgid "" +"This is useful if the input file specifies \"xml:space='preserve'\" in the " +"root SVG element which instructs the SVG editor not to change whitespace in " +"the document at all (and therefore overrides the options above)." +msgstr "" + +#: ../share/extensions/scour.inx.h:39 +#, fuzzy +msgid "Document options" +msgstr "_Dokumentindstillinger ..." + +#: ../share/extensions/scour.inx.h:40 +#, fuzzy +msgid "Pretty-printing" +msgstr "GNOME-udskrivning" + +#: ../share/extensions/scour.inx.h:41 #, fuzzy msgid "Space" msgstr "Fjern m_arkering" -#: ../share/extensions/scour.inx.h:17 +#: ../share/extensions/scour.inx.h:42 #, fuzzy msgid "Tab" msgstr "Titel" -#: ../share/extensions/scour.inx.h:18 +#: ../share/extensions/scour.inx.h:43 msgctxt "Indent" msgid "None" -msgstr "" +msgstr "Intet" -#: ../share/extensions/scour.inx.h:19 +#: ../share/extensions/scour.inx.h:44 #, fuzzy -msgid "Ids" -msgstr "_Id" +msgid "IDs" +msgstr "ID" -#: ../share/extensions/scour.inx.h:20 -msgid "Remove unused ID names for elements" +#: ../share/extensions/scour.inx.h:45 +#, fuzzy +msgid "Remove unused IDs" +msgstr "Fjern" + +#: ../share/extensions/scour.inx.h:46 +msgid "" +"Remove all unreferenced IDs from elements. Those are not needed for " +"rendering." msgstr "" -#: ../share/extensions/scour.inx.h:21 +#: ../share/extensions/scour.inx.h:47 msgid "Shorten IDs" msgstr "" -#: ../share/extensions/scour.inx.h:22 -msgid "Preserve manually created ID names not ending with digits" +#: ../share/extensions/scour.inx.h:48 +msgid "" +"Minimize the length of IDs using only lowercase letters, assigning the " +"shortest values to the most-referenced elements. For instance, " +"\"linearGradient5621\" will become \"a\" if it is the most used element." msgstr "" -#: ../share/extensions/scour.inx.h:23 -msgid "Preserve these ID names, comma-separated:" +#: ../share/extensions/scour.inx.h:49 +msgid "Prefix shortened IDs with:" msgstr "" -#: ../share/extensions/scour.inx.h:24 -msgid "Preserve ID names starting with:" +#: ../share/extensions/scour.inx.h:50 +msgid "Prepend shortened IDs with the specified prefix." msgstr "" -#: ../share/extensions/scour.inx.h:25 -msgid "Help (Options)" +#: ../share/extensions/scour.inx.h:51 +msgid "Preserve manually created IDs not ending with digits" msgstr "" -#: ../share/extensions/scour.inx.h:27 -#, no-c-format +#: ../share/extensions/scour.inx.h:52 msgid "" -"This extension optimizes the SVG file according to the following options:\n" -" * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -" * Convert CSS attributes to XML attributes: convert styles from style " -"tags and inline style=\"\" declarations into XML attributes.\n" -" * Group collapsing: removes useless g elements, promoting their contents " -"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" -" * Create groups for similar attributes: create g elements for runs of " -"elements having at least one attribute in common (e.g. fill color, stroke " -"opacity, ...).\n" -" * Embed rasters: embed raster images as base64-encoded data URLs.\n" -" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " -"elements and attributes.\n" -" * Remove metadata: remove metadata tags along with all the information " -"in them, which may include license metadata, alternate versions for non-SVG-" -"enabled browsers, etc.\n" -" * Remove comments: remove comment tags.\n" -" * Work around renderer bugs: emits slightly larger SVG data, but works " -"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " -"various applications.\n" -" * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" -" * Number of significant digits for coords: all coordinates are output " -"with that number of significant digits. For example, if 3 is specified, the " -"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " -"472.\n" -" * XML indentation (pretty-printing): either None for no indentation, " -"Space to use one space per nesting level, or Tab to use one tab per nesting " -"level." +"Descriptive IDs which were manually created to reference or label specific " +"elements or groups (e.g. #arrowStart, #arrowEnd or #textLabels) will be " +"preserved while numbered IDs (as they are generated by most SVG editors " +"including Inkscape) will be removed/shortened." msgstr "" -#: ../share/extensions/scour.inx.h:40 -msgid "Help (Ids)" +#: ../share/extensions/scour.inx.h:53 +msgid "Preserve the following IDs:" msgstr "" -#: ../share/extensions/scour.inx.h:41 +#: ../share/extensions/scour.inx.h:54 +msgid "A comma-separated list of IDs that are to be preserved." +msgstr "" + +#: ../share/extensions/scour.inx.h:55 +msgid "Preserve IDs starting with:" +msgstr "" + +#: ../share/extensions/scour.inx.h:56 msgid "" -"Ids specific options:\n" -" * Remove unused ID names for elements: remove all unreferenced ID " -"attributes.\n" -" * Shorten IDs: reduce the length of all ID attributes, assigning the " -"shortest to the most-referenced elements. For instance, #linearGradient5621, " -"referenced 100 times, can become #a.\n" -" * Preserve manually created ID names not ending with digits: usually, " -"optimised SVG output removes these, but if they're needed for referencing (e." -"g. #middledot), you may use this option.\n" -" * Preserve these ID names, comma-separated: you can use this in " -"conjunction with the other preserve options if you wish to preserve some " -"more specific ID names.\n" -" * Preserve ID names starting with: usually, optimised SVG output removes " -"all unused ID names, but if all of your preserved ID names start with the " -"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +"Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " +"to preserve \"flag-mx\", \"flag-pt\", etc.)." msgstr "" -#: ../share/extensions/scour.inx.h:47 +#: ../share/extensions/scour.inx.h:57 #, fuzzy msgid "Optimized SVG (*.svg)" msgstr "Inkscape SVG (*.svg)" -#: ../share/extensions/scour.inx.h:48 +#: ../share/extensions/scour.inx.h:58 #, fuzzy msgid "Scalable Vector Graphics" msgstr "Scalable Vector Graphic (*.svg)" @@ -39089,9 +39624,8 @@ msgid "Convert to Braille" msgstr "_Konvertér til tekst" #: ../share/extensions/text_extract.inx.h:1 -#, fuzzy msgid "Extract" -msgstr "Udpak et billede" +msgstr "Udtræk" #: ../share/extensions/text_extract.inx.h:2 #: ../share/extensions/text_merge.inx.h:2 @@ -39481,13 +40015,12 @@ msgstr "Højde:" #: ../share/extensions/webslicer_create_group.inx.h:7 #: ../share/extensions/webslicer_create_rect.inx.h:9 -#, fuzzy msgid "Background color:" -msgstr "Baggrundsfarve" +msgstr "Baggrundsfarve:" #: ../share/extensions/webslicer_create_group.inx.h:8 msgid "Pixel (fixed)" -msgstr "" +msgstr "Pixel (fast)" #: ../share/extensions/webslicer_create_group.inx.h:9 #, fuzzy @@ -39515,14 +40048,12 @@ msgid "Create a slicer rectangle" msgstr "Opret firkant" #: ../share/extensions/webslicer_create_rect.inx.h:4 -#, fuzzy msgid "DPI:" -msgstr "DPI" +msgstr "DPI:" #: ../share/extensions/webslicer_create_rect.inx.h:5 -#, fuzzy msgid "Force Dimension:" -msgstr "Opdeling" +msgstr "Tving dimension:" #. i18n. Description duplicated in a fake value attribute in order to make it translatable #: ../share/extensions/webslicer_create_rect.inx.h:7 @@ -39538,9 +40069,8 @@ msgid "JPG specific options" msgstr "" #: ../share/extensions/webslicer_create_rect.inx.h:11 -#, fuzzy msgid "Quality:" -msgstr "_Afslut" +msgstr "Kvalitet:" #: ../share/extensions/webslicer_create_rect.inx.h:12 msgid "" @@ -39553,14 +40083,12 @@ msgid "GIF specific options" msgstr "" #: ../share/extensions/webslicer_create_rect.inx.h:16 -#, fuzzy msgid "Palette" -msgstr "_Palet" +msgstr "Palet" #: ../share/extensions/webslicer_create_rect.inx.h:17 -#, fuzzy msgid "Palette size:" -msgstr "Indsæt størrelse" +msgstr "Paletstørrelse:" #: ../share/extensions/webslicer_create_rect.inx.h:20 msgid "Options for HTML export" @@ -39728,18 +40256,3 @@ msgstr "Et populært grafik-filformat til clipart" #, fuzzy msgid "XAML Input" msgstr "DXF inddata" - -#, fuzzy -#~ msgid "Text handling:" -#~ msgstr "Indstil afstand:" - -#, fuzzy -#~ msgid "Import text as text" -#~ msgstr "Konvertér tekst til sti" - -#, fuzzy -#~ msgid "Boolops" -#~ msgstr "Værktøjer" - -#~ msgid "http://wiki.inkscape.org/wiki/index.php/FAQ" -#~ msgstr "http://wiki.inkscape.org/wiki/index.php/FAQ" -- cgit v1.2.3 From d7b1e066fa7c7d9e6a83d688fe48c5f06620bf10 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 14 Mar 2016 00:50:24 +0100 Subject: "Relative to" option for node alignment. - Node tool has those new "relative to" alignment options : last selected, first selected, current behaviour (middle), max value(rightmost/topmost) or min value(leftmost/bottommost). - Verbs: --If the node tool is active and whole objects are selected (no individual node is), works as usual for objects; --Else, align horizontal/vertical (SP_VERB_ALIGN_HORIZONTAL_CENTER) honor the "relative to" settings, SP_VERB_ALIGN_HORIZONTAL_LEFT (ctrl+alt+pavnum4) aligns vertically on the leftmost node (same behavior as SP_VERB_ALIGN_HORIZONTAL_LEFT when the setting is "align relative to min value"), and so on with all alignment verbs Fixed bugs: - https://launchpad.net/bugs/171287 (bzr r14703) --- src/ui/dialog/align-and-distribute.cpp | 76 ++++++++++++++++++++++++++++++++- src/ui/dialog/align-and-distribute.h | 11 +++++ src/ui/tool/control-point-selection.cpp | 29 ++++++++++++- src/ui/tool/control-point-selection.h | 3 ++ 4 files changed, 116 insertions(+), 3 deletions(-) diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 5a16ecce8..8f87932b8 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -42,6 +42,7 @@ #include "ui/icon-names.h" #include "ui/tools/node-tool.h" #include "ui/tool/multi-path-manipulator.h" +#include "ui/tool/control-point-selection.h" #include "verbs.h" #include "widgets/icon.h" #include "sp-root.h" @@ -88,6 +89,42 @@ Action::Action(const Glib::ustring &id, } +void ActionAlign::do_node_action(Inkscape::UI::Tools::NodeTool *nt, int verb) +{ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int prev_pref = prefs->getInt("/dialogs/align/align-nodes-to"); + switch(verb){ + case SP_VERB_ALIGN_HORIZONTAL_LEFT: + prefs->setInt("/dialogs/align/align-nodes-to", MIN_NODE ); + nt->_multipath->alignNodes(Geom::Y); + break; + case SP_VERB_ALIGN_HORIZONTAL_CENTER: + nt->_multipath->alignNodes(Geom::Y); + break; + case SP_VERB_ALIGN_HORIZONTAL_RIGHT: + prefs->setInt("/dialogs/align/align-nodes-to", MAX_NODE ); + nt->_multipath->alignNodes(Geom::Y); + break; + case SP_VERB_ALIGN_VERTICAL_TOP: + prefs->setInt("/dialogs/align/align-nodes-to", MAX_NODE ); + nt->_multipath->alignNodes(Geom::X); + break; + case SP_VERB_ALIGN_VERTICAL_CENTER: + nt->_multipath->alignNodes(Geom::X); + break; + case SP_VERB_ALIGN_VERTICAL_BOTTOM: + prefs->setInt("/dialogs/align/align-nodes-to", MIN_NODE ); + nt->_multipath->alignNodes(Geom::X); + break; + case SP_VERB_ALIGN_VERTICAL_HORIZONTAL_CENTER: + nt->_multipath->alignNodes(Geom::X); + nt->_multipath->alignNodes(Geom::Y); + break; + default:return; + } + prefs->setInt("/dialogs/align/align-nodes-to", prev_pref ); +} + void ActionAlign::do_action(SPDesktop *desktop, int index) { Inkscape::Selection *selection = desktop->getSelection(); @@ -187,6 +224,14 @@ ActionAlign::Coeffs const ActionAlign::_allCoeffs[11] = { void ActionAlign::do_verb_action(SPDesktop *desktop, int verb) { + Inkscape::UI::Tools::ToolBase *event_context = desktop->getEventContext(); + if (INK_IS_NODE_TOOL(event_context)) { + Inkscape::UI::Tools::NodeTool *nt = INK_NODE_TOOL(event_context); + if(!nt->_selected_nodes->empty()){ + do_node_action(nt, verb); + return; + } + } do_action(desktop, verb_to_coeff(verb)); } @@ -871,6 +916,9 @@ static void on_tool_changed(AlignAndDistribute *daad) SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop && desktop->getEventContext()) daad->setMode(tools_active(desktop) == TOOLS_NODES); + else + daad->setMode(false); + } static void on_selection_changed(AlignAndDistribute *daad) @@ -905,6 +953,7 @@ AlignAndDistribute::AlignAndDistribute() _nodesTable(1, 4, true), #endif _anchorLabel(_("Relative to: ")), + _anchorLabelNode(_("Relative to: ")), _selgrpLabel(_("_Treat selection as group: "), 1) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -1043,9 +1092,20 @@ AlignAndDistribute::AlignAndDistribute() _combo.set_active(prefs->getInt("/dialogs/align/align-to", 6)); _combo.signal_changed().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_ref_change)); + _comboNode.append(_("Last selected")); + _comboNode.append(_("First selected")); + _comboNode.append(_("Middle of selection")); + _comboNode.append(_("Min value")); + _comboNode.append(_("Max value")); + _comboNode.set_active(prefs->getInt("/dialogs/align/align-nodes-to", 2)); + _comboNode.signal_changed().connect(sigc::mem_fun(*this, &AlignAndDistribute::on_node_ref_change)); + _anchorBox.pack_end(_combo, false, false); _anchorBox.pack_end(_anchorLabel, false, false); + _anchorBoxNode.pack_end(_comboNode, false, false); + _anchorBoxNode.pack_end(_anchorLabelNode, false, false); + _selgrpLabel.set_mnemonic_widget(_selgrp); _selgrpBox.pack_end(_selgrp, false, false); _selgrpBox.pack_end(_selgrpLabel, false, false); @@ -1063,11 +1123,15 @@ AlignAndDistribute::AlignAndDistribute() _alignBox.pack_start(_selgrpBox); _alignBox.pack_start(_alignTableBox); + _alignBoxNode.pack_start(_anchorBoxNode, false, false); + _alignBoxNode.pack_start(_nodesTableBox); + + _alignFrame.add(_alignBox); _distributeFrame.add(_distributeTableBox); _rearrangeFrame.add(_rearrangeTableBox); _removeOverlapFrame.add(_removeOverlapTableBox); - _nodesFrame.add(_nodesTableBox); + _nodesFrame.add(_alignBoxNode); Gtk::Box *contents = _getContents(); contents->set_spacing(4); @@ -1078,7 +1142,7 @@ AlignAndDistribute::AlignAndDistribute() contents->pack_start(_distributeFrame, true, true); contents->pack_start(_rearrangeFrame, true, true); contents->pack_start(_removeOverlapFrame, true, true); - contents->pack_start(_nodesFrame, true, true); + contents->pack_start(_nodesFrame, true, false); //Connect to the global tool change signal _toolChangeConn = INKSCAPE.signal_eventcontext_set.connect(sigc::hide<0>(sigc::bind(sigc::ptr_fun(&on_tool_changed), this))); @@ -1124,6 +1188,13 @@ void AlignAndDistribute::on_ref_change(){ //Make blink the master } +void AlignAndDistribute::on_node_ref_change(){ + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setInt("/dialogs/align/align-nodes-to", _comboNode.get_active_row_number()); + + //Make blink the master +} + void AlignAndDistribute::on_selgrp_toggled(){ Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setInt("/dialogs/align/sel-as-groups", _selgrp.get_active()); @@ -1149,6 +1220,7 @@ void AlignAndDistribute::setMode(bool nodeEdit) ((_rearrangeFrame).*(mSel))(); ((_removeOverlapFrame).*(mSel))(); ((_nodesFrame).*(mNode))(); + _getContents()->queue_resize(); } void AlignAndDistribute::addAlignButton(const Glib::ustring &id, const Glib::ustring tiptext, diff --git a/src/ui/dialog/align-and-distribute.h b/src/ui/dialog/align-and-distribute.h index d337775cf..f8cc61af2 100644 --- a/src/ui/dialog/align-and-distribute.h +++ b/src/ui/dialog/align-and-distribute.h @@ -18,6 +18,7 @@ #include #include "ui/widget/panel.h" #include "ui/widget/frame.h" + #include #include #include @@ -35,6 +36,9 @@ class SPItem; namespace Inkscape { namespace UI { +namespace Tools{ +class NodeTool; +} namespace Dialog { class Action; @@ -68,6 +72,7 @@ public: protected: void on_ref_change(); + void on_node_ref_change(); void on_selgrp_toggled(); void addDistributeButton(const Glib::ustring &id, const Glib::ustring tiptext, guint row, guint col, bool onInterSpace, @@ -114,15 +119,19 @@ protected: Gtk::HBox _anchorBox; Gtk::HBox _selgrpBox; Gtk::VBox _alignBox; + Gtk::VBox _alignBoxNode; Gtk::HBox _alignTableBox; Gtk::HBox _distributeTableBox; Gtk::HBox _rearrangeTableBox; Gtk::HBox _removeOverlapTableBox; Gtk::HBox _nodesTableBox; Gtk::Label _anchorLabel; + Gtk::Label _anchorLabelNode; Gtk::Label _selgrpLabel; Gtk::CheckButton _selgrp; Gtk::ComboBoxText _combo; + Gtk::HBox _anchorBoxNode; + Gtk::ComboBoxText _comboNode; SPDesktop *_desktop; DesktopTracker _deskTrack; @@ -150,6 +159,7 @@ class Action { public : enum AlignTarget { LAST=0, FIRST, BIGGEST, SMALLEST, PAGE, DRAWING, SELECTION }; + enum AlignTargetNode { LAST_NODE=0, FIRST_NODE, MID_NODE, MIN_NODE, MAX_NODE }; Action(const Glib::ustring &id, const Glib::ustring &tiptext, guint row, guint column, @@ -213,6 +223,7 @@ private : } static void do_action(SPDesktop *desktop, int index); + static void do_node_action(Inkscape::UI::Tools::NodeTool *nt, int index); guint _index; AlignAndDistribute &_dialog; diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp index 998f74ee0..f36ad7374 100644 --- a/src/ui/tool/control-point-selection.cpp +++ b/src/ui/tool/control-point-selection.cpp @@ -19,6 +19,8 @@ #include "ui/tool/transform-handle-set.h" #include "ui/tool/node.h" + + #include namespace Inkscape { @@ -82,6 +84,7 @@ std::pair ControlPointSelection::insert(c } found = _points.insert(x).first; + _points_list.push_back(x); x->updateState(); _pointChanged(x, true); @@ -97,6 +100,7 @@ std::pair ControlPointSelection::insert(c void ControlPointSelection::erase(iterator pos) { SelectableControlPoint *erased = *pos; + _points_list.remove(*pos); _points.erase(pos); erased->updateState(); _pointChanged(erased, false); @@ -219,8 +223,11 @@ void ControlPointSelection::transform(Geom::Affine const &m) /** Align control points on the specified axis. */ void ControlPointSelection::align(Geom::Dim2 axis) { + enum AlignTargetNode { LAST_NODE=0, FIRST_NODE, MID_NODE, MIN_NODE, MAX_NODE }; if (empty()) return; Geom::Dim2 d = static_cast((axis + 1) % 2); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + Geom::OptInterval bound; for (iterator i = _points.begin(); i != _points.end(); ++i) { @@ -229,7 +236,27 @@ void ControlPointSelection::align(Geom::Dim2 axis) if (!bound) { return; } - double new_coord = bound->middle(); + double new_coord; + switch (AlignTargetNode(prefs->getInt("/dialogs/align/align-nodes-to", 2))){ + case FIRST_NODE: + new_coord=(_points_list.front())->position()[d]; + break; + case LAST_NODE: + new_coord=(_points_list.back())->position()[d]; + break; + case MID_NODE: + new_coord=bound->middle(); + break; + case MIN_NODE: + new_coord=bound->min(); + break; + case MAX_NODE: + new_coord=bound->max(); + break; + default: + return; + } + for (iterator i = _points.begin(); i != _points.end(); ++i) { Geom::Point pos = (*i)->position(); pos[d] = new_coord; diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h index 2d812c0a3..f122a468d 100644 --- a/src/ui/tool/control-point-selection.h +++ b/src/ui/tool/control-point-selection.h @@ -12,6 +12,7 @@ #ifndef SEEN_UI_TOOL_CONTROL_POINT_SELECTION_H #define SEEN_UI_TOOL_CONTROL_POINT_SELECTION_H +#include #include #include #include @@ -140,6 +141,8 @@ private: double _rotationRadius(Geom::Point const &); set_type _points; + //the purpose of this list is to keep track of first and last selected + std::list _points_list; set_type _all_points; INK_UNORDERED_MAP _original_positions; INK_UNORDERED_MAP _last_trans; -- cgit v1.2.3 From e798d5601af30bce49fa7288ea7a78fb7cd5bd70 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 14 Mar 2016 18:17:09 +0100 Subject: Fix a bug meassuring text in units diferent than PX (bzr r14704) --- src/ui/tools/measure-tool.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index a2a440ef4..07edf6039 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -1198,8 +1198,7 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, curve->unref(); continue; } - - curve->transform(item->i2doc_affine()); + curve->transform(item->transform); calculate_intersections(desktop, item, lineseg, curve, intersection_times); if (iter == te_get_layout(item)->end()) { -- cgit v1.2.3 From 423f16a37b9dfde787bce560c802034380f4be25 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 14 Mar 2016 18:19:58 +0100 Subject: Bug #1545333 - Add new generated file 'inkscape.appdata.xml' to .bzrignore (for in-tree builds). Bug #1545333 - Remove duplicate entry 'filtereffects' from preferences skeleton. (bzr r14705) --- .bzrignore | 1 + src/preferences-skeleton.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index 5f5e524d2..6f725aa26 100644 --- a/.bzrignore +++ b/.bzrignore @@ -48,6 +48,7 @@ ./man/inkscape.zh_TW.1 ./man/inkscape.zh_TW.pod ./man/inkscape.zh_TW.tmp +./inkscape.appdata.xml ./inkscape.spec ./inkview.1 ./install diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index b428cbe7a..9f2e68b1d 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -216,7 +216,6 @@ static char const preferences_skeleton[] = " \n" " \n" " \n" -" \n" " Date: Mon, 14 Mar 2016 18:24:16 +0100 Subject: Order LPE list (bzr r14706) --- src/live_effects/effect.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 47fd02554..38d59a43a 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -133,25 +133,24 @@ const Util::EnumData LPETypeData[] = { /* 0.91 */ {POWERSTROKE, N_("Power stroke"), "powerstroke"}, {CLONE_ORIGINAL, N_("Clone original path"), "clone_original"}, -/* EXPERIMENTAL */ +/* 0.92 */ + {SIMPLIFY, N_("Simplify"), "simplify"}, + {LATTICE2, N_("Lattice Deformation 2"), "lattice2"}, + {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, + {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, + {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, + {TRANSFORM_2PTS, N_("Transform by 2 points"), "transform_2pts"}, {SHOW_HANDLES, N_("Show handles"), "show_handles"}, {ROUGHEN, N_("Roughen"), "roughen"}, {BSPLINE, N_("BSpline"), "bspline"}, {JOIN_TYPE, N_("Join type"), "join_type"}, {TAPER_STROKE, N_("Taper stroke"), "taper_stroke"}, -/* Ponyscape */ +/* Ponyscape -> Inkscape 0.92*/ {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"}, {ELLIPSE_5PTS, N_("Ellipse by 5 points"), "ellipse_5pts"}, {BOUNDING_BOX, N_("Bounding Box"), "bounding_box"}, -/* 0.91 */ - {SIMPLIFY, N_("Simplify"), "simplify"}, - {LATTICE2, N_("Lattice Deformation 2"), "lattice2"}, - {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, - {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, - {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, - {TRANSFORM_2PTS, N_("Transform by 2 points"), "transform_2pts"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); -- cgit v1.2.3 From 235b6bd52fd472cbc18224d4724961c70fd6214f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 14 Mar 2016 18:34:24 +0100 Subject: Fix order LPE (bzr r13708.1.41) --- src/live_effects/effect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index c8696ea3a..2e811ed37 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -144,13 +144,13 @@ const Util::EnumData LPETypeData[] = { {BSPLINE, N_("BSpline"), "bspline"}, {JOIN_TYPE, N_("Join type"), "join_type"}, {TAPER_STROKE, N_("Taper stroke"), "taper_stroke"}, + {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, /* Ponyscape -> Inkscape 0.92*/ {ATTACH_PATH, N_("Attach path"), "attach_path"}, {FILL_BETWEEN_STROKES, N_("Fill between strokes"), "fill_between_strokes"}, {FILL_BETWEEN_MANY, N_("Fill between many"), "fill_between_many"}, {ELLIPSE_5PTS, N_("Ellipse by 5 points"), "ellipse_5pts"}, {BOUNDING_BOX, N_("Bounding Box"), "bounding_box"}, - {COPY_ROTATE, N_("Rotate copies"), "copy_rotate"}, }; const Util::EnumDataConverter LPETypeConverter(LPETypeData, sizeof(LPETypeData)/sizeof(*LPETypeData)); -- cgit v1.2.3 From 1bd6284551204ec5b44775a27069595366742ac9 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 14 Mar 2016 23:56:39 +0100 Subject: Fix compiling bugs (bzr r13708.1.42) --- src/live_effects/lpe-copy_rotate.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index c60de961d..a16a21bf0 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -93,7 +93,7 @@ void LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) { if(fusion_paths) { - Geom::Coord angle = Geom::rad_to_deg(atan(-postmul[1]/postmul[0])); + Geom::Coord angle = Geom::deg_from_rad(atan(-postmul[1]/postmul[0])); angle += starting_angle; starting_angle.param_set_value(angle); } @@ -235,11 +235,11 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s Geom::PathVector tmp_path_helper; Geom::Path append_path = original; for (int i = 0; i < num_copies; ++i) { - Geom::Rotate rot(-Geom::deg_to_rad(rotation_angle * (i))); + Geom::Rotate rot(-Geom::rad_from_deg(rotation_angle * (i))); Geom::Affine m = pre * rot * Geom::Translate(origin); if(i%2 != 0) { Geom::Point A = (Geom::Point)origin; - Geom::Point B = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle*i)+starting_angle)) * size_divider; + Geom::Point B = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle*i)+starting_angle)) * size_divider; Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); double hyp = Geom::distance(A, B); double c = (B[0] - A[0]) / hyp; // cos(alpha) @@ -299,7 +299,7 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); - Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::deg_to_rad((rotation_angle * num_copies) + starting_angle)) * size_divider; + Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle * num_copies) + starting_angle)) * size_divider; Geom::Ray base_b(divider.pointAt(1), base_point); if(Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && Geom::are_near(tmp_path_helper[0].finalPoint(),base_a)){ tmp_path_helper[0].close(); @@ -343,8 +343,8 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); - Geom::Point line_start = origin + dir * Rotate(-deg_to_rad(starting_angle)) * size_divider; - Geom::Point line_end = origin + dir * Rotate(-deg_to_rad(rotation_angle + starting_angle)) * size_divider; + Geom::Point line_start = origin + dir * Rotate(-rad_from_deg(starting_angle)) * size_divider; + Geom::Point line_end = origin + dir * Rotate(-rad_from_deg(rotation_angle + starting_angle)) * size_divider; //Note:: beter way to do this //Whith AppendNew have problems whith the crossing order Geom::Path divider = Geom::Path(line_start); @@ -383,7 +383,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p } } else { for (int i = 0; i < num_copies; ++i) { - Rotate rot(-deg_to_rad(rotation_angle * i)); + Rotate rot(-rad_from_deg(rotation_angle * i)); Affine t = pre * rot * Translate(origin); output.concat(pwd2_in * t); } -- cgit v1.2.3 From d832c91bf21f6649c1ca7b35bfa7ac67b7832cc3 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Mon, 14 Mar 2016 23:37:29 -0400 Subject: Commit to using our stored units for now. (bzr r14707) --- src/widgets/text-toolbar.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index c49f0bc05..60e932338 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1106,9 +1106,11 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ lh_unit = unit_table.getUnit("%"); height = query.line_height.value * 100; } else { - lh_unit = tracker->getActiveUnit(); - // Can get unit like this: unit_table.getUnit(query.line_height.unit); - height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); + //Unit const *active = tracker->getActiveUnit(); + // This allows us to show the unit stored to the user, but right now + // it's always px (because Tav said other units are broken/2016) + lh_unit = unit_table.getUnit(query.line_height.unit); + height = query.line_height.computed; } // Set before value is set -- cgit v1.2.3 From c1a9b9773542b5a5de771a06a20834f38bb2da90 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 15 Mar 2016 22:38:20 +0100 Subject: fix-bug-1557192. paint-order crash with multiple items Fixed bugs: - https://launchpad.net/bugs/1557192 (bzr r14708) --- src/desktop-style.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index c28302d22..d10c75cd8 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1004,10 +1004,10 @@ objects_query_paintorder (const std::vector &objects, SPStyle *style_re n_order ++; - if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { - same_order = false; - } if (style->paint_order.set) { + if (!prev_order.empty() && prev_order.compare( style->paint_order.value ) != 0) { + same_order = false; + } prev_order = style->paint_order.value; } } -- cgit v1.2.3 From 061e103f1157c2c2e9cf1260be6abeaeb5e6a1a5 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 15 Mar 2016 23:42:46 +0100 Subject: Updates to the branding folder. (bzr r14709) --- share/branding/draw-freely.ru.svg | 82 ------------ share/branding/draw-freely.svg | 208 ++++++++++++++++++------------ share/branding/euphoriascript-regular.ttf | Bin 0 -> 38424 bytes share/branding/inkscape-flat.svg | 58 +++++++++ 4 files changed, 187 insertions(+), 161 deletions(-) delete mode 100644 share/branding/draw-freely.ru.svg create mode 100644 share/branding/euphoriascript-regular.ttf create mode 100644 share/branding/inkscape-flat.svg diff --git a/share/branding/draw-freely.ru.svg b/share/branding/draw-freely.ru.svg deleted file mode 100644 index 61e98a9f7..000000000 --- a/share/branding/draw-freely.ru.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/share/branding/draw-freely.svg b/share/branding/draw-freely.svg index bcf2fb16e..c46109386 100644 --- a/share/branding/draw-freely.svg +++ b/share/branding/draw-freely.svg @@ -1,82 +1,132 @@ - - - - - - - image/svg+xml - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml + + + + + +Draw Freely + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/share/branding/euphoriascript-regular.ttf b/share/branding/euphoriascript-regular.ttf new file mode 100644 index 000000000..0c434cb0e Binary files /dev/null and b/share/branding/euphoriascript-regular.ttf differ diff --git a/share/branding/inkscape-flat.svg b/share/branding/inkscape-flat.svg new file mode 100644 index 000000000..a9534676d --- /dev/null +++ b/share/branding/inkscape-flat.svg @@ -0,0 +1,58 @@ + + +Inkscape Logo + + + + + + + +image/svg+xml + + + +Andy Fitzsimon + + + + +Andrew Michael Fitzsimon + + + + +Fitzsimon IT Consulting Pty Ltd + + +http://andy.fitzsimon.com.au +2006 + +Inkscape Logo + + + + + + + + + + + + + -- cgit v1.2.3 From ad91896b0ece9504ca8506f5a650200cdef1e2ef Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 16 Mar 2016 01:06:40 +0100 Subject: Fix broken compile from branding folder (bzr r14710) --- share/branding/CMakeLists.txt | 2 +- share/branding/Makefile.am | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt index ff12059ca..11f772204 100644 --- a/share/branding/CMakeLists.txt +++ b/share/branding/CMakeLists.txt @@ -1,2 +1,2 @@ -file(GLOB _FILES "README" "*.svg") +file(GLOB _FILES "README" "*.svg" "*.ttf") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding) diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am index f992c8165..d47f206d6 100644 --- a/share/branding/Makefile.am +++ b/share/branding/Makefile.am @@ -5,10 +5,11 @@ iconsdir = $(datadir)/inkscape/icons branding_DATA = \ README \ inkscape.svg \ + inkscape-flat.svg \ sodipodi.svg \ + euphoriascript-regular.ttf \ tux.svg \ - draw-freely.svg \ - draw-freely.ru.svg + draw-freely.svg icons_DATA = \ inkscape.svg -- cgit v1.2.3 From f26d3e191ae2d1d1cf5b52a379a24e96afc1a518 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 16 Mar 2016 07:56:42 +0100 Subject: Updates to the branding folder. Set also OFT typos (bzr r14711) --- share/branding/CMakeLists.txt | 2 +- share/branding/EuphoriaScript-Regular.otf | Bin 0 -> 23632 bytes share/branding/LinLibertine_DR.otf | Bin 0 -> 383672 bytes share/branding/Makefile.am | 7 +- share/branding/draw-freely.svg | 132 ------------------------------ share/branding/euphoriascript-regular.ttf | Bin 38424 -> 0 bytes share/branding/inkscape-text.svg | 130 +++++++++++++++++++++++++++++ 7 files changed, 135 insertions(+), 136 deletions(-) create mode 100644 share/branding/EuphoriaScript-Regular.otf create mode 100644 share/branding/LinLibertine_DR.otf delete mode 100644 share/branding/draw-freely.svg delete mode 100644 share/branding/euphoriascript-regular.ttf create mode 100644 share/branding/inkscape-text.svg diff --git a/share/branding/CMakeLists.txt b/share/branding/CMakeLists.txt index 11f772204..0bfd54267 100644 --- a/share/branding/CMakeLists.txt +++ b/share/branding/CMakeLists.txt @@ -1,2 +1,2 @@ -file(GLOB _FILES "README" "*.svg" "*.ttf") +file(GLOB _FILES "README" "*.svg" "*.oft") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/branding) diff --git a/share/branding/EuphoriaScript-Regular.otf b/share/branding/EuphoriaScript-Regular.otf new file mode 100644 index 000000000..6f475a68e Binary files /dev/null and b/share/branding/EuphoriaScript-Regular.otf differ diff --git a/share/branding/LinLibertine_DR.otf b/share/branding/LinLibertine_DR.otf new file mode 100644 index 000000000..4ff287426 Binary files /dev/null and b/share/branding/LinLibertine_DR.otf differ diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am index d47f206d6..1561dbf2c 100644 --- a/share/branding/Makefile.am +++ b/share/branding/Makefile.am @@ -6,10 +6,11 @@ branding_DATA = \ README \ inkscape.svg \ inkscape-flat.svg \ + inkscape-text.svg \ sodipodi.svg \ - euphoriascript-regular.ttf \ - tux.svg \ - draw-freely.svg + LinLibertine_DR.otf \ + EuphoriaScript-Regular.otf \ + tux.svg icons_DATA = \ inkscape.svg diff --git a/share/branding/draw-freely.svg b/share/branding/draw-freely.svg deleted file mode 100644 index c46109386..000000000 --- a/share/branding/draw-freely.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -image/svg+xml - - - - - -Draw Freely - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/share/branding/euphoriascript-regular.ttf b/share/branding/euphoriascript-regular.ttf deleted file mode 100644 index 0c434cb0e..000000000 Binary files a/share/branding/euphoriascript-regular.ttf and /dev/null differ diff --git a/share/branding/inkscape-text.svg b/share/branding/inkscape-text.svg new file mode 100644 index 000000000..e025b1680 --- /dev/null +++ b/share/branding/inkscape-text.svg @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +image/svg+xml + + + + + +Draw Freely + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +INKSCAPE + -- cgit v1.2.3 From 52182947eb952812b093f79e1ec121fa719f084b Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Wed, 16 Mar 2016 10:58:21 +0100 Subject: [Bug #1545726] Incorrect FSF address in many extension files. Fixed bugs: - https://launchpad.net/bugs/1545726 (bzr r14712) --- share/extensions/Barcode/Base.py | 2 +- share/extensions/Barcode/BaseEan.py | 2 +- share/extensions/Barcode/Code128.py | 2 +- share/extensions/Barcode/Code25i.py | 2 +- share/extensions/Barcode/Code39.py | 2 +- share/extensions/Barcode/Code39Ext.py | 2 +- share/extensions/Barcode/Code93.py | 2 +- share/extensions/Barcode/Ean13.py | 2 +- share/extensions/Barcode/Ean5.py | 2 +- share/extensions/Barcode/Ean8.py | 2 +- share/extensions/Barcode/Rm4scc.py | 2 +- share/extensions/Barcode/Upca.py | 2 +- share/extensions/Barcode/Upce.py | 2 +- share/extensions/Barcode/__init__.py | 2 +- share/extensions/addnodes.py | 2 +- share/extensions/bezmisc.py | 2 +- share/extensions/chardataeffect.py | 2 +- share/extensions/coloreffect.py | 2 +- share/extensions/convert2dashes.py | 2 +- share/extensions/cubicsuperpath.py | 2 +- share/extensions/dimension.py | 2 +- share/extensions/dm2svg.py | 2 +- share/extensions/dots.py | 2 +- share/extensions/draw_from_triangle.py | 2 +- share/extensions/dxf_input.py | 2 +- share/extensions/dxf_outlines.py | 2 +- share/extensions/edge3d.py | 2 +- share/extensions/embedimage.py | 2 +- share/extensions/extractimage.py | 2 +- share/extensions/extrude.py | 2 +- share/extensions/ffgeom.py | 2 +- share/extensions/flatten.py | 2 +- share/extensions/foldablebox.py | 2 +- share/extensions/fractalize.py | 2 +- share/extensions/funcplot.py | 2 +- share/extensions/gcodetools.py | 2 +- share/extensions/generate_voronoi.py | 2 +- share/extensions/gimp_xcf.py | 2 +- share/extensions/grid_cartesian.py | 2 +- share/extensions/grid_isometric.py | 2 +- share/extensions/grid_polar.py | 2 +- share/extensions/guides_creator.py | 2 +- share/extensions/handles.py | 2 +- share/extensions/hershey.py | 2 +- share/extensions/hpgl_decoder.py | 2 +- share/extensions/hpgl_encoder.py | 2 +- share/extensions/hpgl_input.py | 2 +- share/extensions/hpgl_output.py | 2 +- share/extensions/image_attributes.py | 2 +- share/extensions/ink2canvas.py | 2 +- share/extensions/ink2canvas/canvas.py | 2 +- share/extensions/ink2canvas/svg.py | 2 +- share/extensions/inkex.py | 2 +- share/extensions/inkwebeffect.py | 2 +- share/extensions/interp.py | 2 +- share/extensions/interp_att_g.py | 2 +- share/extensions/layers2svgfont.py | 2 +- share/extensions/layout_nup.py | 2 +- share/extensions/lindenmayer.py | 2 +- share/extensions/lorem_ipsum.py | 2 +- share/extensions/markers_strokepaint.py | 2 +- share/extensions/measure.py | 2 +- share/extensions/merge_styles.py | 2 +- share/extensions/motion.py | 2 +- share/extensions/new_glyph_layer.py | 2 +- share/extensions/next_glyph_layer.py | 2 +- share/extensions/param_curves.py | 2 +- share/extensions/pathalongpath.py | 2 +- share/extensions/pathmodifier.py | 2 +- share/extensions/pathscatter.py | 2 +- share/extensions/perfectboundcover.py | 2 +- share/extensions/perspective.py | 2 +- share/extensions/plotter.py | 2 +- share/extensions/polyhedron_3d.py | 2 +- share/extensions/previous_glyph_layer.py | 2 +- share/extensions/print_win32_vector.py | 2 +- share/extensions/printing_marks.py | 2 +- share/extensions/pturtle.py | 2 +- share/extensions/radiusrand.py | 2 +- share/extensions/render_alphabetsoup.py | 2 +- share/extensions/render_barcode.py | 2 +- share/extensions/render_barcode_datamatrix.py | 2 +- share/extensions/render_gear_rack.py | 2 +- share/extensions/render_gears.py | 2 +- share/extensions/rtree.py | 2 +- share/extensions/rubberstretch.py | 2 +- share/extensions/setup_typography_canvas.py | 2 +- share/extensions/simplepath.py | 2 +- share/extensions/simplestyle.py | 2 +- share/extensions/simpletransform.py | 2 +- share/extensions/spirograph.py | 2 +- share/extensions/split.py | 2 +- share/extensions/straightseg.py | 2 +- share/extensions/summersnight.py | 2 +- share/extensions/svg_and_media_zip_output.py | 2 +- share/extensions/svgcalendar.py | 2 +- share/extensions/svgfont2layers.py | 2 +- share/extensions/tar_layers.py | 2 +- share/extensions/triangle.py | 2 +- share/extensions/voronoi2svg.py | 2 +- share/extensions/web-set-att.py | 2 +- share/extensions/web-transmit-att.py | 2 +- share/extensions/webslicer_create_group.py | 2 +- share/extensions/webslicer_create_rect.py | 2 +- share/extensions/webslicer_effect.py | 2 +- share/extensions/webslicer_export.py | 2 +- share/extensions/whirl.py | 2 +- share/extensions/wireframe_sphere.py | 2 +- 108 files changed, 108 insertions(+), 108 deletions(-) diff --git a/share/extensions/Barcode/Base.py b/share/extensions/Barcode/Base.py index b7429f84f..1aa1f8415 100644 --- a/share/extensions/Barcode/Base.py +++ b/share/extensions/Barcode/Base.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Base module for rendering barcodes for Inkscape. diff --git a/share/extensions/Barcode/BaseEan.py b/share/extensions/Barcode/BaseEan.py index 05c9b1c39..4ceaeed4a 100644 --- a/share/extensions/Barcode/BaseEan.py +++ b/share/extensions/Barcode/BaseEan.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Some basic common code shared between EAN and UCP generators. diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py index 618ce7817..7ff92088f 100644 --- a/share/extensions/Barcode/Code128.py +++ b/share/extensions/Barcode/Code128.py @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code128/EAN128 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Code25i.py b/share/extensions/Barcode/Code25i.py index 51346be60..9812d8598 100644 --- a/share/extensions/Barcode/Code25i.py +++ b/share/extensions/Barcode/Code25i.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Generate barcodes for Code25-interleaved 2 of 5, for Inkscape. diff --git a/share/extensions/Barcode/Code39.py b/share/extensions/Barcode/Code39.py index ade397463..3cd8467a8 100644 --- a/share/extensions/Barcode/Code39.py +++ b/share/extensions/Barcode/Code39.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code39 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Code39Ext.py b/share/extensions/Barcode/Code39Ext.py index b6df47de2..3edf82d2e 100644 --- a/share/extensions/Barcode/Code39Ext.py +++ b/share/extensions/Barcode/Code39Ext.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code39 Extended barcodes. Designed for Inkscape. diff --git a/share/extensions/Barcode/Code93.py b/share/extensions/Barcode/Code93.py index 866ec6036..2b90fdda1 100644 --- a/share/extensions/Barcode/Code93.py +++ b/share/extensions/Barcode/Code93.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for Code93 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean13.py b/share/extensions/Barcode/Ean13.py index 3bad5d6e5..7e138f25a 100644 --- a/share/extensions/Barcode/Ean13.py +++ b/share/extensions/Barcode/Ean13.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN13 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean5.py b/share/extensions/Barcode/Ean5.py index 1bd26a4bd..d2e38a063 100644 --- a/share/extensions/Barcode/Ean5.py +++ b/share/extensions/Barcode/Ean5.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN5 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Ean8.py b/share/extensions/Barcode/Ean8.py index 83e82814a..010dff03e 100644 --- a/share/extensions/Barcode/Ean8.py +++ b/share/extensions/Barcode/Ean8.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for EAN8 barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Rm4scc.py b/share/extensions/Barcode/Rm4scc.py index 0fb154280..d40cd2435 100644 --- a/share/extensions/Barcode/Rm4scc.py +++ b/share/extensions/Barcode/Rm4scc.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for RM4CC barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Upca.py b/share/extensions/Barcode/Upca.py index d69ed11e6..bc6ffdf29 100644 --- a/share/extensions/Barcode/Upca.py +++ b/share/extensions/Barcode/Upca.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for UPCA barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/Upce.py b/share/extensions/Barcode/Upce.py index eee2a739c..d25c9c6cc 100644 --- a/share/extensions/Barcode/Upce.py +++ b/share/extensions/Barcode/Upce.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Python barcode renderer for UPCE barcodes. Designed for use with Inkscape. diff --git a/share/extensions/Barcode/__init__.py b/share/extensions/Barcode/__init__.py index e4e328ae3..9ad412448 100644 --- a/share/extensions/Barcode/__init__.py +++ b/share/extensions/Barcode/__init__.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Renderer for barcodes, SVG extention for Inkscape. diff --git a/share/extensions/addnodes.py b/share/extensions/addnodes.py index d78ab55e7..4e57f0185 100755 --- a/share/extensions/addnodes.py +++ b/share/extensions/addnodes.py @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/bezmisc.py b/share/extensions/bezmisc.py index 0c7ad4957..c36e8e1b4 100755 --- a/share/extensions/bezmisc.py +++ b/share/extensions/bezmisc.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, cmath diff --git a/share/extensions/chardataeffect.py b/share/extensions/chardataeffect.py index a1758c890..f81de6b80 100755 --- a/share/extensions/chardataeffect.py +++ b/share/extensions/chardataeffect.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, optparse, inkex diff --git a/share/extensions/coloreffect.py b/share/extensions/coloreffect.py index 8f67c6090..a6b5cfe41 100755 --- a/share/extensions/coloreffect.py +++ b/share/extensions/coloreffect.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, copy, simplestyle, inkex import random diff --git a/share/extensions/convert2dashes.py b/share/extensions/convert2dashes.py index 1228b247c..3910d8e82 100755 --- a/share/extensions/convert2dashes.py +++ b/share/extensions/convert2dashes.py @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkex diff --git a/share/extensions/cubicsuperpath.py b/share/extensions/cubicsuperpath.py index 925efdb04..b505e8c4f 100755 --- a/share/extensions/cubicsuperpath.py +++ b/share/extensions/cubicsuperpath.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import simplepath diff --git a/share/extensions/dimension.py b/share/extensions/dimension.py index 30b674201..462a05bae 100755 --- a/share/extensions/dimension.py +++ b/share/extensions/dimension.py @@ -29,7 +29,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/dm2svg.py b/share/extensions/dm2svg.py index 908fedbad..74afe6adf 100755 --- a/share/extensions/dm2svg.py +++ b/share/extensions/dm2svg.py @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import struct diff --git a/share/extensions/dots.py b/share/extensions/dots.py index dc533ffb6..296a56dfc 100755 --- a/share/extensions/dots.py +++ b/share/extensions/dots.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, simplepath, math diff --git a/share/extensions/draw_from_triangle.py b/share/extensions/draw_from_triangle.py index 42cda7035..5efabfbba 100755 --- a/share/extensions/draw_from_triangle.py +++ b/share/extensions/draw_from_triangle.py @@ -28,7 +28,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import sys diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index acfed0921..30adb73f9 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, math diff --git a/share/extensions/dxf_outlines.py b/share/extensions/dxf_outlines.py index b7ae0ef14..0e8cb7f62 100755 --- a/share/extensions/dxf_outlines.py +++ b/share/extensions/dxf_outlines.py @@ -28,7 +28,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import math diff --git a/share/extensions/edge3d.py b/share/extensions/edge3d.py index d2d8ead5c..86df52908 100755 --- a/share/extensions/edge3d.py +++ b/share/extensions/edge3d.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplepath, sys, copy from math import degrees, atan2 diff --git a/share/extensions/embedimage.py b/share/extensions/embedimage.py index bdc15bde2..136c20f98 100755 --- a/share/extensions/embedimage.py +++ b/share/extensions/embedimage.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import base64 diff --git a/share/extensions/extractimage.py b/share/extensions/extractimage.py index 62dc83c87..aae7bd062 100755 --- a/share/extensions/extractimage.py +++ b/share/extensions/extractimage.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import base64 diff --git a/share/extensions/extrude.py b/share/extensions/extrude.py index c91ea645e..8db6b1512 100755 --- a/share/extensions/extrude.py +++ b/share/extensions/extrude.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkex diff --git a/share/extensions/ffgeom.py b/share/extensions/ffgeom.py index ef8799b97..a6d268239 100755 --- a/share/extensions/ffgeom.py +++ b/share/extensions/ffgeom.py @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with FretFind 2-D; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import math try: diff --git a/share/extensions/flatten.py b/share/extensions/flatten.py index f5add5fc5..7b4d2a7d6 100755 --- a/share/extensions/flatten.py +++ b/share/extensions/flatten.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, cubicsuperpath, simplepath, cspsubdiv diff --git a/share/extensions/foldablebox.py b/share/extensions/foldablebox.py index 9d58974c5..772083094 100755 --- a/share/extensions/foldablebox.py +++ b/share/extensions/foldablebox.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' __version__ = "0.2" diff --git a/share/extensions/fractalize.py b/share/extensions/fractalize.py index 901a8f761..c6bbe397a 100755 --- a/share/extensions/fractalize.py +++ b/share/extensions/fractalize.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import random, math, inkex, simplepath diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py index f37bf335e..c0fb3e525 100755 --- a/share/extensions/funcplot.py +++ b/share/extensions/funcplot.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Changes: * This program is a modified version of wavy.py by Aaron Spike. diff --git a/share/extensions/gcodetools.py b/share/extensions/gcodetools.py index 12f438cca..4cb5b2696 100755 --- a/share/extensions/gcodetools.py +++ b/share/extensions/gcodetools.py @@ -59,7 +59,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ ### diff --git a/share/extensions/generate_voronoi.py b/share/extensions/generate_voronoi.py index 7acd1be5f..8907db493 100755 --- a/share/extensions/generate_voronoi.py +++ b/share/extensions/generate_voronoi.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/gimp_xcf.py b/share/extensions/gimp_xcf.py index bdb0d1e4c..39dec8c13 100755 --- a/share/extensions/gimp_xcf.py +++ b/share/extensions/gimp_xcf.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import os diff --git a/share/extensions/grid_cartesian.py b/share/extensions/grid_cartesian.py index ae4c6b6b4..26270002d 100755 --- a/share/extensions/grid_cartesian.py +++ b/share/extensions/grid_cartesian.py @@ -19,7 +19,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/grid_isometric.py b/share/extensions/grid_isometric.py index 6202fd9e2..d80be6c4d 100755 --- a/share/extensions/grid_isometric.py +++ b/share/extensions/grid_isometric.py @@ -20,7 +20,7 @@ #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import inkex diff --git a/share/extensions/grid_polar.py b/share/extensions/grid_polar.py index 350b21195..f3d5dbf41 100755 --- a/share/extensions/grid_polar.py +++ b/share/extensions/grid_polar.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/guides_creator.py b/share/extensions/guides_creator.py index a8c7bb18a..e0aa6cadf 100755 --- a/share/extensions/guides_creator.py +++ b/share/extensions/guides_creator.py @@ -25,7 +25,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # Inspired by hello_world turorial by Blackhex and Rubikcube diff --git a/share/extensions/handles.py b/share/extensions/handles.py index 0cbdef44c..6987a3bb2 100755 --- a/share/extensions/handles.py +++ b/share/extensions/handles.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplepath, simplestyle diff --git a/share/extensions/hershey.py b/share/extensions/hershey.py index d0b27b129..471959b10 100755 --- a/share/extensions/hershey.py +++ b/share/extensions/hershey.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import hersheydata #data file w/ Hershey font data import inkex diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py index a54a81e81..8f3c18e42 100644 --- a/share/extensions/hpgl_decoder.py +++ b/share/extensions/hpgl_decoder.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_encoder.py b/share/extensions/hpgl_encoder.py index 0e4158725..b9975215f 100644 --- a/share/extensions/hpgl_encoder.py +++ b/share/extensions/hpgl_encoder.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_input.py b/share/extensions/hpgl_input.py index a85c32b34..8cc7edaaf 100755 --- a/share/extensions/hpgl_input.py +++ b/share/extensions/hpgl_input.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard libraries diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py index 78edba53b..477db40e7 100755 --- a/share/extensions/hpgl_output.py +++ b/share/extensions/hpgl_output.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/image_attributes.py b/share/extensions/image_attributes.py index ddd5a8b87..80ad62c26 100755 --- a/share/extensions/image_attributes.py +++ b/share/extensions/image_attributes.py @@ -21,7 +21,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library diff --git a/share/extensions/ink2canvas.py b/share/extensions/ink2canvas.py index b5c0fbb7b..f44c3e48f 100755 --- a/share/extensions/ink2canvas.py +++ b/share/extensions/ink2canvas.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/ink2canvas/canvas.py b/share/extensions/ink2canvas/canvas.py index 139835f0e..a88d368d3 100644 --- a/share/extensions/ink2canvas/canvas.py +++ b/share/extensions/ink2canvas/canvas.py @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/ink2canvas/svg.py b/share/extensions/ink2canvas/svg.py index b60b2ca9f..f4dca8279 100644 --- a/share/extensions/ink2canvas/svg.py +++ b/share/extensions/ink2canvas/svg.py @@ -13,7 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 0fdaeea75..16aff2fc8 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -24,7 +24,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import copy import gettext diff --git a/share/extensions/inkwebeffect.py b/share/extensions/inkwebeffect.py index 994f74dea..4e29892de 100755 --- a/share/extensions/inkwebeffect.py +++ b/share/extensions/inkwebeffect.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, sys, os, re diff --git a/share/extensions/interp.py b/share/extensions/interp.py index 093a98fda..9dbb996e4 100755 --- a/share/extensions/interp.py +++ b/share/extensions/interp.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, cubicsuperpath, simplestyle, copy, math, bezmisc, simpletransform, pathmodifier diff --git a/share/extensions/interp_att_g.py b/share/extensions/interp_att_g.py index 168e7ffb0..2ae46b46d 100755 --- a/share/extensions/interp_att_g.py +++ b/share/extensions/interp_att_g.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import math diff --git a/share/extensions/layers2svgfont.py b/share/extensions/layers2svgfont.py index 379e8e34c..e449ae380 100755 --- a/share/extensions/layers2svgfont.py +++ b/share/extensions/layers2svgfont.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/layout_nup.py b/share/extensions/layout_nup.py index 266a3950d..022aa0d3f 100755 --- a/share/extensions/layout_nup.py +++ b/share/extensions/layout_nup.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex import sys diff --git a/share/extensions/lindenmayer.py b/share/extensions/lindenmayer.py index eb0d84328..8e1c4ac22 100755 --- a/share/extensions/lindenmayer.py +++ b/share/extensions/lindenmayer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, pturtle, random from simpletransform import computePointInNode diff --git a/share/extensions/lorem_ipsum.py b/share/extensions/lorem_ipsum.py index 20a2fdd18..efb2361ea 100755 --- a/share/extensions/lorem_ipsum.py +++ b/share/extensions/lorem_ipsum.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' ''' Example filltext sentences generated over at http://lipsum.com/ diff --git a/share/extensions/markers_strokepaint.py b/share/extensions/markers_strokepaint.py index d92716939..76284b234 100755 --- a/share/extensions/markers_strokepaint.py +++ b/share/extensions/markers_strokepaint.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import random diff --git a/share/extensions/measure.py b/share/extensions/measure.py index 9fc632c2a..fe981e39e 100755 --- a/share/extensions/measure.py +++ b/share/extensions/measure.py @@ -23,7 +23,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODO: * should use the standard attributes for text diff --git a/share/extensions/merge_styles.py b/share/extensions/merge_styles.py index f028bf4ce..cdd7b5ed5 100755 --- a/share/extensions/merge_styles.py +++ b/share/extensions/merge_styles.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Merges styles into class based styles and removes. diff --git a/share/extensions/motion.py b/share/extensions/motion.py index 9bf31e008..3af80d5c1 100755 --- a/share/extensions/motion.py +++ b/share/extensions/motion.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, simplestyle, simplepath, bezmisc diff --git a/share/extensions/new_glyph_layer.py b/share/extensions/new_glyph_layer.py index cb7dba854..7261baa2d 100755 --- a/share/extensions/new_glyph_layer.py +++ b/share/extensions/new_glyph_layer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/next_glyph_layer.py b/share/extensions/next_glyph_layer.py index f8a43aff5..5f152c71e 100755 --- a/share/extensions/next_glyph_layer.py +++ b/share/extensions/next_glyph_layer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/param_curves.py b/share/extensions/param_curves.py index d8f880d0c..e38d5208a 100755 --- a/share/extensions/param_curves.py +++ b/share/extensions/param_curves.py @@ -18,7 +18,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Changes: * This program is derived by Michel Chatelain from funcplot.py. His changes are in the Public Domain. diff --git a/share/extensions/pathalongpath.py b/share/extensions/pathalongpath.py index 234430acd..93bb99d6b 100755 --- a/share/extensions/pathalongpath.py +++ b/share/extensions/pathalongpath.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr Quick description: diff --git a/share/extensions/pathmodifier.py b/share/extensions/pathmodifier.py index ff2bbfb3a..d80b6eeae 100755 --- a/share/extensions/pathmodifier.py +++ b/share/extensions/pathmodifier.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr This code defines a basic class (PathModifier) of effects whose purpose is diff --git a/share/extensions/pathscatter.py b/share/extensions/pathscatter.py index 5c2857979..92af6ad76 100755 --- a/share/extensions/pathscatter.py +++ b/share/extensions/pathscatter.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr Quick description: diff --git a/share/extensions/perfectboundcover.py b/share/extensions/perfectboundcover.py index 9f81dbb36..e69bcf4c2 100755 --- a/share/extensions/perfectboundcover.py +++ b/share/extensions/perfectboundcover.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import sys, inkex diff --git a/share/extensions/perspective.py b/share/extensions/perspective.py index a6ee5810b..febe34a22 100755 --- a/share/extensions/perspective.py +++ b/share/extensions/perspective.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Perspective approach & math by Dmitry Platonov, shadowjack@mail.ru, 2006 """ diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index 7e34f2953..60858cc6c 100755 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py index 8e4a8e8e6..7ce8b1c6d 100755 --- a/share/extensions/polyhedron_3d.py +++ b/share/extensions/polyhedron_3d.py @@ -46,7 +46,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import sys diff --git a/share/extensions/previous_glyph_layer.py b/share/extensions/previous_glyph_layer.py index 801570d65..5e9de1fb8 100755 --- a/share/extensions/previous_glyph_layer.py +++ b/share/extensions/previous_glyph_layer.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/print_win32_vector.py b/share/extensions/print_win32_vector.py index 37c2021ac..bf8e89845 100755 --- a/share/extensions/print_win32_vector.py +++ b/share/extensions/print_win32_vector.py @@ -25,7 +25,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library from ctypes import * diff --git a/share/extensions/printing_marks.py b/share/extensions/printing_marks.py index 0306048d6..6c718da01 100755 --- a/share/extensions/printing_marks.py +++ b/share/extensions/printing_marks.py @@ -21,7 +21,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' from subprocess import Popen, PIPE, STDOUT diff --git a/share/extensions/pturtle.py b/share/extensions/pturtle.py index b2740a4bc..a4925bf4c 100755 --- a/share/extensions/pturtle.py +++ b/share/extensions/pturtle.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math class pTurtle: diff --git a/share/extensions/radiusrand.py b/share/extensions/radiusrand.py index e272a50c4..e4585ccd4 100755 --- a/share/extensions/radiusrand.py +++ b/share/extensions/radiusrand.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import random, math, inkex, cubicsuperpath diff --git a/share/extensions/render_alphabetsoup.py b/share/extensions/render_alphabetsoup.py index a2cbcb978..06c82cb2d 100755 --- a/share/extensions/render_alphabetsoup.py +++ b/share/extensions/render_alphabetsoup.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import copy diff --git a/share/extensions/render_barcode.py b/share/extensions/render_barcode.py index 4f1464a92..381f3fc76 100755 --- a/share/extensions/render_barcode.py +++ b/share/extensions/render_barcode.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ Inkscape's general barcode extension. Run from within inkscape or use the diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py index 72ffddbe6..82c827bb8 100755 --- a/share/extensions/render_barcode_datamatrix.py +++ b/share/extensions/render_barcode_datamatrix.py @@ -43,7 +43,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ######VERSION HISTORY##### Ver. Date Notes diff --git a/share/extensions/render_gear_rack.py b/share/extensions/render_gear_rack.py index 63433aadb..95076ba64 100755 --- a/share/extensions/render_gear_rack.py +++ b/share/extensions/render_gear_rack.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/render_gears.py b/share/extensions/render_gears.py index 2584117f2..fbec5d052 100755 --- a/share/extensions/render_gears.py +++ b/share/extensions/render_gears.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/rtree.py b/share/extensions/rtree.py index c0dc1cca6..b336c4e3a 100755 --- a/share/extensions/rtree.py +++ b/share/extensions/rtree.py @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, pturtle, random from simpletransform import computePointInNode diff --git a/share/extensions/rubberstretch.py b/share/extensions/rubberstretch.py index 95d1cffb5..2e6b85ad5 100755 --- a/share/extensions/rubberstretch.py +++ b/share/extensions/rubberstretch.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr ''' diff --git a/share/extensions/setup_typography_canvas.py b/share/extensions/setup_typography_canvas.py index a1000f2d1..209c9757f 100755 --- a/share/extensions/setup_typography_canvas.py +++ b/share/extensions/setup_typography_canvas.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/simplepath.py b/share/extensions/simplepath.py index 514dd4666..5d99e46e7 100644 --- a/share/extensions/simplepath.py +++ b/share/extensions/simplepath.py @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ import re, math diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py index ca33e68a4..32328a40d 100644 --- a/share/extensions/simplestyle.py +++ b/share/extensions/simplestyle.py @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ svgcolors={ diff --git a/share/extensions/simpletransform.py b/share/extensions/simpletransform.py index 8b6f46935..f6f68d2be 100644 --- a/share/extensions/simpletransform.py +++ b/share/extensions/simpletransform.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. barraud@math.univ-lille1.fr This code defines several functions to make handling of transform diff --git a/share/extensions/spirograph.py b/share/extensions/spirograph.py index e702344a5..02cb02bcd 100755 --- a/share/extensions/spirograph.py +++ b/share/extensions/spirograph.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex, simplestyle, math from simpletransform import computePointInNode diff --git a/share/extensions/split.py b/share/extensions/split.py index 18d4327fe..4e83b3d33 100755 --- a/share/extensions/split.py +++ b/share/extensions/split.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/straightseg.py b/share/extensions/straightseg.py index f18658012..9222ed5b5 100755 --- a/share/extensions/straightseg.py +++ b/share/extensions/straightseg.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, simplepath, sys diff --git a/share/extensions/summersnight.py b/share/extensions/summersnight.py index fbf88fe92..7af4bb571 100755 --- a/share/extensions/summersnight.py +++ b/share/extensions/summersnight.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/svg_and_media_zip_output.py b/share/extensions/svg_and_media_zip_output.py index 20a5dac18..c5963b721 100755 --- a/share/extensions/svg_and_media_zip_output.py +++ b/share/extensions/svg_and_media_zip_output.py @@ -26,7 +26,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. TODOs - fix bug: not saving existing .zip after a Collect for Output is run diff --git a/share/extensions/svgcalendar.py b/share/extensions/svgcalendar.py index a4269f5d7..9f221a807 100755 --- a/share/extensions/svgcalendar.py +++ b/share/extensions/svgcalendar.py @@ -25,7 +25,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' __version__ = "0.3" diff --git a/share/extensions/svgfont2layers.py b/share/extensions/svgfont2layers.py index 48100e3f5..1a392c72c 100755 --- a/share/extensions/svgfont2layers.py +++ b/share/extensions/svgfont2layers.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/tar_layers.py b/share/extensions/tar_layers.py index 3707af1f8..3ba5aa55e 100755 --- a/share/extensions/tar_layers.py +++ b/share/extensions/tar_layers.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # """ An extension to export multiple svg files from a single svg file containing layers. diff --git a/share/extensions/triangle.py b/share/extensions/triangle.py index ecd977d40..32bd2a1db 100755 --- a/share/extensions/triangle.py +++ b/share/extensions/triangle.py @@ -29,7 +29,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/voronoi2svg.py b/share/extensions/voronoi2svg.py index 26a89393c..c7033b23b 100755 --- a/share/extensions/voronoi2svg.py +++ b/share/extensions/voronoi2svg.py @@ -24,7 +24,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ # standard library diff --git a/share/extensions/web-set-att.py b/share/extensions/web-set-att.py index b224ed9aa..0dafcb974 100755 --- a/share/extensions/web-set-att.py +++ b/share/extensions/web-set-att.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkwebeffect diff --git a/share/extensions/web-transmit-att.py b/share/extensions/web-transmit-att.py index 414eb12ea..bae6956b2 100755 --- a/share/extensions/web-transmit-att.py +++ b/share/extensions/web-transmit-att.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library import inkwebeffect diff --git a/share/extensions/webslicer_create_group.py b/share/extensions/webslicer_create_group.py index dd48c3e96..47e5f706f 100755 --- a/share/extensions/webslicer_create_group.py +++ b/share/extensions/webslicer_create_group.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library from webslicer_effect import * diff --git a/share/extensions/webslicer_create_rect.py b/share/extensions/webslicer_create_rect.py index b4e6858af..b68cd9ad8 100755 --- a/share/extensions/webslicer_create_rect.py +++ b/share/extensions/webslicer_create_rect.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # local library from webslicer_effect import * diff --git a/share/extensions/webslicer_effect.py b/share/extensions/webslicer_effect.py index d91d0ce85..acb78fcbd 100755 --- a/share/extensions/webslicer_effect.py +++ b/share/extensions/webslicer_effect.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import inkex diff --git a/share/extensions/webslicer_export.py b/share/extensions/webslicer_export.py index a8a3c67ba..47db5369c 100755 --- a/share/extensions/webslicer_export.py +++ b/share/extensions/webslicer_export.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' # standard library import os diff --git a/share/extensions/whirl.py b/share/extensions/whirl.py index 7ee9cc0a2..93e04c60d 100755 --- a/share/extensions/whirl.py +++ b/share/extensions/whirl.py @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ''' import math, inkex, cubicsuperpath from simpletransform import computePointInNode diff --git a/share/extensions/wireframe_sphere.py b/share/extensions/wireframe_sphere.py index bda06af21..64a1266b6 100755 --- a/share/extensions/wireframe_sphere.py +++ b/share/extensions/wireframe_sphere.py @@ -45,7 +45,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ######VERSION HISTORY##### Ver. Date Notes -- cgit v1.2.3 From 67901523e5dc2f6ba839550bd5790fe143c3143e Mon Sep 17 00:00:00 2001 From: raphael0202 Date: Wed, 16 Mar 2016 18:20:29 +0100 Subject: [Bug #1558153] Typos and tabs instead of spaces in extension module. Fixed bugs: - https://launchpad.net/bugs/1558153 (bzr r14713) --- doc/extension_system.txt | 6 +++--- src/extension/implementation/implementation.h | 24 ++++++++++++------------ src/extension/implementation/script.cpp | 18 +++++++++--------- src/extension/init.cpp | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/doc/extension_system.txt b/doc/extension_system.txt index e1918701c..4902fe004 100644 --- a/doc/extension_system.txt +++ b/doc/extension_system.txt @@ -321,7 +321,7 @@ Inkscape, such as in the case of compiled-in printing modules. Most users will never need to write this type of extension, they are pretty much for Inkscape core developers only. -=== Writeing Your Extension === +=== Writing Your Extension === This section provides some guidance and examples for implementing different kinds of Extensions. @@ -334,7 +334,7 @@ different kinds of Extensions. === Creating an INX File === -Every extension must have a corrosponding *.inx file. This is an XML +Every extension must have a corresponding *.inx file. This is an XML file that provides Inkscape with information about the module and allows it to load the info without needing to access the module itself. The *.inx file contains enough info for Inkscape to set up menu items and @@ -342,7 +342,7 @@ know what kinds of functionality to expect from the extension. === Packaging Your Extension === -=== Contributing Your Extensino to the Inkscape Community === +=== Contributing Your Extension to the Inkscape Community === Once your extension is complete, you may wish to share it with the community. There are of course no hard and fast rules for how to share diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index f6f933aaf..1232ae0c8 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -18,7 +18,7 @@ #include <2geom/forward.h> namespace Gtk { - class Widget; + class Widget; } class SPDocument; @@ -33,7 +33,7 @@ class View; } // namespace UI namespace XML { - class Node; + class Node; } // namespace XML namespace Extension { @@ -51,18 +51,18 @@ namespace Implementation { */ class ImplementationDocumentCache { - /** + /** * The document that this instance is working on. */ - Inkscape::UI::View::View * _view; + Inkscape::UI::View::View * _view; public: - ImplementationDocumentCache (Inkscape::UI::View::View * view) : - _view(view) - { - return; - }; - virtual ~ImplementationDocumentCache ( ) { return; }; - Inkscape::UI::View::View const * view ( ) { return _view; }; + ImplementationDocumentCache (Inkscape::UI::View::View * view) : + _view(view) + { + return; + }; + virtual ~ImplementationDocumentCache ( ) { return; }; + Inkscape::UI::View::View const * view ( ) { return _view; }; }; /** @@ -116,7 +116,7 @@ public: // ----- Effect functions ----- /** Find out information about the file. */ virtual Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, - Inkscape::UI::View::View *view, + Inkscape::UI::View::View *view, sigc::signal *changeSignal, ImplementationDocumentCache *docCache); virtual void effect(Inkscape::Extension::Effect * /*module*/, diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 4cb0c9b73..f990598eb 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -152,7 +152,7 @@ Script::Script() : } /** - * brief Destructor + * \brief Destructor */ Script::~Script() { @@ -280,9 +280,9 @@ bool Script::check_existence(const std::string &command) /** \return none - \brief This function 'loads' an extention, basically it determines - the full command for the extention and stores that. - \param module The extention to be loaded. + \brief This function 'loads' an extension, basically it determines + the full command for the extension and stores that. + \param module The extension to be loaded. The most difficult part about this function is finding the actual command through all of the Reprs. Basically it is hidden down a @@ -292,7 +292,7 @@ bool Script::check_existence(const std::string &command) At that point all of the loops are exited, and there is an if statement to make sure they didn't exit because of not finding - the command. If that's the case, the extention doesn't get loaded + the command. If that's the case, the extension doesn't get loaded and should error out at a higher level. */ @@ -545,17 +545,17 @@ SPDocument *Script::open(Inkscape::Extension::Input *module, /** \return none - \brief This function uses an extention to save a document. It first + \brief This function uses an extension to save a document. It first creates an SVG file of the document, and then runs it through the script. - \param module Extention to be used + \param module Extension to be used \param doc Document to be saved \param filename The name to save the final file as \return false in case of any failure writing the file, otherwise true Well, at some point people need to save - it is really what makes the entire application useful. And, it is possible that someone - would want to use an extetion for this, so we need a function to + would want to use an extension for this, so we need a function to do that eh? First things first, the document is saved to a temporary file that @@ -563,7 +563,7 @@ SPDocument *Script::open(Inkscape::Extension::Input *module, ink_ext_ as a prefix. Don't worry, this file gets deleted at the end of the function. - After we have the SVG file, then extention_execute is called with + After we have the SVG file, then Script::execute is called with the temporary file name and the final output filename. This should put the output of the script into the final output file. We then delete the temporary file. diff --git a/src/extension/init.cpp b/src/extension/init.cpp index c16a5a899..af7af2cb1 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -1,6 +1,6 @@ /* * This is what gets executed to initialize all of the modules. For - * the internal modules this invovles executing their initialization + * the internal modules this involves executing their initialization * functions, for external ones it involves reading their .spmodule * files and bringing them into Sodipodi. * -- cgit v1.2.3 From 84dc0d205cca2c02d257a3f388eb316c16cbb208 Mon Sep 17 00:00:00 2001 From: jonathan-underwood <> Date: Fri, 18 Mar 2016 07:44:35 +0100 Subject: [Bug #1545769] Adding MimeTypes in the desktop.in file. Fixed bugs: - https://launchpad.net/bugs/1545769 (bzr r14714) --- inkscape.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inkscape.desktop.in b/inkscape.desktop.in index 771ceccc7..4ce25a287 100644 --- a/inkscape.desktop.in +++ b/inkscape.desktop.in @@ -7,7 +7,7 @@ _Comment=Create and edit Scalable Vector Graphics images _Keywords=image;editor;vector;drawing; Type=Application Categories=Graphics;VectorGraphics;GTK; -MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; +MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd; Exec=inkscape %F TryExec=inkscape Terminal=false -- cgit v1.2.3 From b288e8e5d98684ae81c109a4c4ffa1d25fc4d727 Mon Sep 17 00:00:00 2001 From: raphael0202 Date: Fri, 18 Mar 2016 08:04:08 +0100 Subject: [Bug #1558177] Simplify if conditions in Script.cpp. Fixed bugs: - https://launchpad.net/bugs/1558177 (bzr r14715) --- src/extension/implementation/script.cpp | 6 +----- src/extension/output.cpp | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index f990598eb..2ec17f947 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -232,11 +232,7 @@ bool Script::check_existence(const std::string &command) //Don't search when it is an absolute path. */ if (Glib::path_is_absolute(command)) { - if (Glib::file_test(command, Glib::FILE_TEST_EXISTS)) { - return true; - } else { - return false; - } + return Glib::file_test(command, Glib::FILE_TEST_EXISTS); } // First search in the current directory diff --git a/src/extension/output.cpp b/src/extension/output.cpp index 8de5583c7..83f0fed2f 100644 --- a/src/extension/output.cpp +++ b/src/extension/output.cpp @@ -192,8 +192,7 @@ Output::prefs (void) delete dialog; - if (response == Gtk::RESPONSE_OK) return true; - return false; + return (response == Gtk::RESPONSE_OK); } /** -- cgit v1.2.3 From fbc8d89437445c1024ab4ef2e838f177f408f9f1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 18 Mar 2016 10:16:49 +0100 Subject: Fix writing of 'x' and 'y' attributes in multiline text via sodipode:role="line". (bzr r14716) --- src/sp-text.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 4a5b1b1d6..7d4348d19 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -819,8 +819,8 @@ void TextTagAttributes::setFirstXY(Geom::Point &point) attributes.x.resize(1, zero_length); if (attributes.y.empty()) attributes.y.resize(1, zero_length); - attributes.x[0].computed = point[Geom::X]; - attributes.y[0].computed = point[Geom::Y]; + attributes.x[0] = point[Geom::X]; + attributes.y[0] = point[Geom::Y]; } void TextTagAttributes::mergeInto(Inkscape::Text::Layout::OptionalTextTagAttrs *output, Inkscape::Text::Layout::OptionalTextTagAttrs const &parent_attrs, unsigned parent_attrs_offset, bool copy_xy, bool copy_dxdyrotate) const -- cgit v1.2.3 From 5051da96adc06f2d05c508c2b0ec6ba236d3fdc9 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 18 Mar 2016 11:22:38 +0100 Subject: Revert 14707 (bzr r14716.1.1) --- src/widgets/text-toolbar.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 60e932338..c49f0bc05 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1106,11 +1106,9 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ lh_unit = unit_table.getUnit("%"); height = query.line_height.value * 100; } else { - //Unit const *active = tracker->getActiveUnit(); - // This allows us to show the unit stored to the user, but right now - // it's always px (because Tav said other units are broken/2016) - lh_unit = unit_table.getUnit(query.line_height.unit); - height = query.line_height.computed; + lh_unit = tracker->getActiveUnit(); + // Can get unit like this: unit_table.getUnit(query.line_height.unit); + height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); } // Set before value is set -- cgit v1.2.3 From a714c688d60a3a62114591984f57f26cd41dbed9 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 18 Mar 2016 11:23:29 +0100 Subject: Reverting 14701. (bzr r14716.1.2) --- src/desktop-style.cpp | 8 +-- src/libnrtype/Layout-TNG.cpp | 2 +- src/sp-text.cpp | 9 +++ src/style.cpp | 4 +- src/ui/widget/unit-tracker.cpp | 10 --- src/ui/widget/unit-tracker.h | 1 - src/util/units.cpp | 70 ++++-------------- src/util/units.h | 8 --- src/widgets/select-toolbar.cpp | 159 ++++++++++++++++++++++------------------- src/widgets/text-toolbar.cpp | 81 ++++----------------- src/widgets/toolbox.cpp | 6 -- 11 files changed, 125 insertions(+), 233 deletions(-) diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index d10c75cd8..7f9670af3 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1049,7 +1049,6 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r double letterspacing_prev = 0; double wordspacing_prev = 0; double linespacing_prev = 0; - int linespacing_unit = 0; int texts = 0; int no_size = 0; @@ -1106,11 +1105,6 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r linespacing_current = style->line_height.computed; linespacing_normal = false; } - if (linespacing_unit == 0) { - linespacing_unit = style->line_height.unit; - } else if (linespacing_unit != style->line_height.unit) { - linespacing_unit = SP_CSS_UNIT_PERCENT; - } linespacing += linespacing_current; if ((size_prev != 0 && style->font_size.computed != size_prev) || @@ -1154,7 +1148,7 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r style_res->line_height.normal = linespacing_normal; style_res->line_height.computed = linespacing; style_res->line_height.value = linespacing; - style_res->line_height.unit = linespacing_unit; + style_res->line_height.unit = SP_CSS_UNIT_PERCENT; if (texts > 1) { if (different) { diff --git a/src/libnrtype/Layout-TNG.cpp b/src/libnrtype/Layout-TNG.cpp index ec488b584..8b0889188 100644 --- a/src/libnrtype/Layout-TNG.cpp +++ b/src/libnrtype/Layout-TNG.cpp @@ -14,7 +14,7 @@ namespace Inkscape { namespace Text { const gunichar Layout::UNICODE_SOFT_HYPHEN = 0x00AD; -const double Layout::LINE_HEIGHT_NORMAL = 125; +const double Layout::LINE_HEIGHT_NORMAL = 1.25; Layout::Layout() : _input_truncated(0), diff --git a/src/sp-text.cpp b/src/sp-text.cpp index 7d4348d19..da92ad8d4 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -302,6 +302,15 @@ Inkscape::XML::Node *SPText::write(Inkscape::XML::Document *xml_doc, Inkscape::X this->attributes.writeTo(repr); this->rebuildLayout(); // copied from update(), see LP Bug 1339305 + // deprecated attribute, but keep it around for backwards compatibility + if (this->style->line_height.set && !this->style->line_height.inherit && !this->style->line_height.normal && this->style->line_height.unit == SP_CSS_UNIT_PERCENT) { + Inkscape::SVGOStringStream os; + os << (this->style->line_height.value * 100.0) << "%"; + this->getRepr()->setAttribute("sodipodi:linespacing", os.str().c_str()); + } else { + this->getRepr()->setAttribute("sodipodi:linespacing", NULL); + } + // SVG 2 Auto-wrapped text if( this->width.computed > 0.0 ) { sp_repr_set_svg_double(repr, "width", this->width.computed); diff --git a/src/style.cpp b/src/style.cpp index 99beaed22..35138d25b 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -113,7 +113,7 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : font_weight( "font-weight", enum_font_weight, SP_CSS_FONT_WEIGHT_NORMAL, SP_CSS_FONT_WEIGHT_400 ), font_stretch( "font-stretch", enum_font_stretch, SP_CSS_FONT_STRETCH_NORMAL ), font_size(), - line_height( "line-height", 125 ), // SPILengthOrNormal + line_height( "line-height", 1.25 ), // SPILengthOrNormal font_family( "font-family", "sans-serif" ), // SPIString w/default font(), // SPIFont font_specification( "-inkscape-font-specification" ), // SPIString @@ -1957,7 +1957,7 @@ sp_css_attr_scale(SPCSSAttr *css, double ex) sp_css_attr_scale_property_single(css, "kerning", ex); sp_css_attr_scale_property_single(css, "letter-spacing", ex); sp_css_attr_scale_property_single(css, "word-spacing", ex); - //sp_css_attr_scale_property_single(css, "line-height", ex, true); + sp_css_attr_scale_property_single(css, "line-height", ex, true); return css; } diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp index a1501c229..c6318db25 100644 --- a/src/ui/widget/unit-tracker.cpp +++ b/src/ui/widget/unit-tracker.cpp @@ -12,7 +12,6 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "style-internal.h" #include "unit-tracker.h" #include "widgets/ege-select-one-action.h" @@ -122,15 +121,6 @@ void UnitTracker::addUnit(Inkscape::Util::Unit const *u) gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1); } -void UnitTracker::prependUnit(Inkscape::Util::Unit const *u) -{ - GtkTreeIter iter; - gtk_list_store_prepend(_store, &iter); - gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1); - /* Re-shuffle our default selection here (_active gets out of sync) */ - setActiveUnit(_activeUnit); -} - void UnitTracker::setFullVal(GtkAdjustment *adj, gdouble val) { _priorValues[adj] = val; diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h index 0fe5bda80..06245930e 100644 --- a/src/ui/widget/unit-tracker.h +++ b/src/ui/widget/unit-tracker.h @@ -42,7 +42,6 @@ public: Inkscape::Util::Unit const * getActiveUnit() const; void addUnit(Inkscape::Util::Unit const *u); - void prependUnit(Inkscape::Util::Unit const *u); void addAdjustment(GtkAdjustment *adj); void setFullVal(GtkAdjustment *adj, gdouble val); diff --git a/src/util/units.cpp b/src/util/units.cpp index 2e7a3b1d2..2c72ec3ae 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -81,21 +81,7 @@ unsigned const svg_length_lookup[] = { UNIT_CODE_PERCENT }; -/* From SP_CSS_UNIT_* to unit */ -unsigned const sp_css_unit_lookup[] = { - 0, - UNIT_CODE_PX, - UNIT_CODE_PT, - UNIT_CODE_PC, - UNIT_CODE_MM, - UNIT_CODE_CM, - UNIT_CODE_IN, - UNIT_CODE_EM, - UNIT_CODE_EX, - UNIT_CODE_PERCENT - // UNIT_CODE_FT Missing, - // UNIT_CODE_MT Missing, -}; + // maps unit codes obtained from their abbreviations to their SVGLength unit indexes typedef INK_UNORDERED_MAP UnitCodeLookup; @@ -227,10 +213,6 @@ bool Unit::compatibleWith(Glib::ustring const &u) const { return compatibleWith(unit_table.getUnit(u)); } -bool Unit::compatibleWith(char const *u) const -{ - return compatibleWith(unit_table.getUnit(u)); -} bool Unit::operator==(Unit const &other) const { @@ -249,29 +231,7 @@ int Unit::svgUnit() const return 0; } -double Unit::convert(double from_dist, Unit const *to) const -{ - // Percentage - if (to->type == UNIT_TYPE_DIMENSIONLESS) { - return from_dist * to->factor; - } - - // Incompatible units - if (type != to->type) { - return -1; - } - - // Compatible units - return from_dist * factor / to->factor; -} -double Unit::convert(double from_dist, Glib::ustring const &to) const -{ - return convert(from_dist, unit_table.getUnit(to)); -} -double Unit::convert(double from_dist, char const *to) const -{ - return convert(from_dist, unit_table.getUnit(to)); -} + Unit UnitTable::_empty_unit; @@ -323,19 +283,6 @@ Unit const *UnitTable::getUnit(SVGLength::Unit u) const } return &_empty_unit; } -/* SP_CSS_UNIT lookup */ -Unit const *UnitTable::getUnit(unsigned int u) const -{ - if (u == 0 || u > 9) { - return &_empty_unit; - } - - UnitCodeMap::const_iterator f = _unit_map.find(sp_css_unit_lookup[u]); - if (f != _unit_map.end()) { - return &(*f->second); - } - return &_empty_unit; -} Unit const *UnitTable::findUnit(double factor, UnitType type) const { @@ -558,7 +505,18 @@ Glib::ustring Quantity::string() const { double Quantity::convert(double from_dist, Unit const *from, Unit const *to) { - return from->convert(from_dist, to); + // Percentage + if (to->type == UNIT_TYPE_DIMENSIONLESS) { + return from_dist * to->factor; + } + + // Incompatible units + if (from->type != to->type) { + return -1; + } + + // Compatible units + return from_dist * from->factor / to->factor; } double Quantity::convert(double from_dist, Glib::ustring const &from, Unit const *to) { diff --git a/src/util/units.h b/src/util/units.h index a840a37ec..13777fd1b 100644 --- a/src/util/units.h +++ b/src/util/units.h @@ -75,11 +75,6 @@ public: /** Get SVG unit code. */ int svgUnit() const; - - /** Convert value from this unit **/ - double convert(double from_dist, Unit const *to) const; - double convert(double from_dist, Glib::ustring const &to) const; - double convert(double from_dist, char const *to) const; }; class Quantity @@ -152,9 +147,6 @@ public: /** Retrieve a given unit based on its SVGLength unit */ Unit const *getUnit(SVGLength::Unit u) const; - - /** Retrieve a given unit based on its SP_CSS_UNIT */ - Unit const *getUnit(unsigned int u) const; /** Retrieve a quantity based on its string identifier */ Quantity parseQuantity(Glib::ustring const &q) const; diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index 3cd6c0e28..e49c4c00a 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -136,13 +136,13 @@ sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection * } static void -sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) +sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) { - if (g_object_get_data(tbl, "update")) { + if (g_object_get_data(G_OBJECT(spw), "update")) { return; } - UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); + UnitTracker *tracker = reinterpret_cast(g_object_get_data(G_OBJECT(spw), "tracker")); if ( !tracker || tracker->isUpdating() ) { /* * When only units are being changed, don't treat changes @@ -150,7 +150,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) */ return; } - g_object_set_data(tbl, "update", GINT_TO_POINTER(TRUE)); + g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(TRUE)); SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::Selection *selection = desktop->getSelection(); @@ -168,7 +168,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) Geom::OptRect bbox_user = selection->bounds(bbox_type); if ( !bbox_user ) { - g_object_set_data(tbl, "update", GINT_TO_POINTER(FALSE)); + g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); return; } @@ -181,10 +181,10 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) Unit const *unit = tracker->getActiveUnit(); g_return_if_fail(unit != NULL); - GtkAdjustment* a_x = GTK_ADJUSTMENT( g_object_get_data( tbl, "X" ) ); - GtkAdjustment* a_y = GTK_ADJUSTMENT( g_object_get_data( tbl, "Y" ) ); - GtkAdjustment* a_w = GTK_ADJUSTMENT( g_object_get_data( tbl, "width" ) ); - GtkAdjustment* a_h = GTK_ADJUSTMENT( g_object_get_data( tbl, "height" ) ); + GtkAdjustment* a_x = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "X" ) ); + GtkAdjustment* a_y = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "Y" ) ); + GtkAdjustment* a_w = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "width" ) ); + GtkAdjustment* a_h = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "height" ) ); if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) { x0 = Quantity::convert(gtk_adjustment_get_value(a_x), unit, "px"); @@ -205,7 +205,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) } // Keep proportions if lock is on - GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "lock") ); + GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(G_OBJECT(spw), "lock") ); if ( gtk_toggle_action_get_active(lock) ) { if (adj == a_h) { x1 = x0 + yrel * bbox_user->dimensions()[Geom::X]; @@ -265,7 +265,68 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) desktop->getCanvas()->endForcedFullRedraws(); } - g_object_set_data(tbl, "update", GINT_TO_POINTER(FALSE)); + g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); +} + +static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker ) +{ +#if WITH_GTKMM_3_0 + Glib::RefPtr adj = Glib::wrap(adjustment, true); + Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(adj, climbRate, digits); +#else + Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(*Glib::wrap(adjustment, true), climbRate, digits); +#endif + inkSpinner->addUnitTracker(unit_tracker); + inkSpinner = Gtk::manage( inkSpinner ); + GtkWidget *widget = GTK_WIDGET( inkSpinner->gobj() ); + return widget; +} + +// TODO create_adjustment_action appears to be a rogue tile copy from toolbox.cpp. Resolve it to be unified: + +static EgeAdjustmentAction * create_adjustment_action( gchar const *name, + gchar const *label, + gchar const *shortLabel, + gchar const *data, + gdouble lower, + GtkWidget* focusTarget, + UnitTracker* tracker, + GtkWidget* spw, + gchar const *tooltip, + gboolean altx ) +{ + static bool init = false; + if ( !init ) { + init = true; + ege_adjustment_action_set_compact_tool_factory( createCustomSlider ); + } + + GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0.0, lower, 1e6, SPIN_STEP, SPIN_PAGE_STEP, 0 ) ); + if (tracker) { + tracker->addAdjustment(adj); + } + if ( spw ) { + g_object_set_data( G_OBJECT(spw), data, adj ); + } + + EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, Q_(label), tooltip, 0, SPIN_STEP, 3, tracker ); + if ( shortLabel ) { + g_object_set( act, "short_label", Q_(shortLabel), NULL ); + } + + g_signal_connect( G_OBJECT(adj), "value_changed", G_CALLBACK(sp_object_layout_any_value_changed), spw ); + if ( focusTarget ) { + ege_adjustment_action_set_focuswidget( act, focusTarget ); + } + + if ( altx ) { // this spinbutton will be activated by alt-x + g_object_set( G_OBJECT(act), "self-id", "altx", NULL ); + } + + // Using a cast just to make sure we pass in the right kind of function pointer + g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); + + return act; } // toggle button callbacks and updaters @@ -436,60 +497,21 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb // four spinbuttons - eact = create_adjustment_action( - /* name= */ "XAction", - /* label= */ C_("Select toolbar", "X position"), - /* shortLabel= */ C_("Select toolbar", "X:"), - /* tooltip= */ C_("Select toolbar", "Horizontal coordinate of selection"), - /* path= */ "/tools/select/X", - /* def(default) */ 0.0, - /* focusTarget= */ GTK_WIDGET(desktop->canvas), - /* dataKludge= */ G_OBJECT(spw), - /* altx, altx_mark */ TRUE, "altx", - /* lower, uppper, step, page */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - /* descrLabels, descrValues, descrCount */ 0, 0, 0, - /* callback= */ sp_object_layout_any_value_changed, - /* unit_tracker= */ tracker, - /* climb, digits, factor */ SPIN_STEP, 3, 1); - + eact = create_adjustment_action( "XAction", C_("Select toolbar", "X position"), C_("Select toolbar", "X:"), "X", + -1e6, GTK_WIDGET(desktop->canvas), tracker, spw, + _("Horizontal coordinate of selection"), TRUE ); gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); - eact = create_adjustment_action( - /* name= */ "YAction", - /* label= */ C_("Select toolbar", "Y position"), - /* shortLabel= */ C_("Select toolbar", "Y:"), - /* tooltip= */ C_("Select toolbar", "Vertical coordinate of selection"), - /* path= */ "/tools/select/Y", - /* def(default) */ 0.0, - /* focusTarget= */ GTK_WIDGET(desktop->canvas), - /* dataKludge= */ G_OBJECT(spw), - /* altx, altx_mark */ TRUE, "altx", - /* lower, uppper, step, page */ -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - /* descrLabels, descrValues, descrCount */ 0, 0, 0, - /* callback= */ sp_object_layout_any_value_changed, - /* unit_tracker= */ tracker, - /* climb, digits, factor */ SPIN_STEP, 3, 1); - + eact = create_adjustment_action( "YAction", C_("Select toolbar", "Y position"), C_("Select toolbar", "Y:"), "Y", + -1e6, GTK_WIDGET(desktop->canvas), tracker, spw, + _("Vertical coordinate of selection"), FALSE ); gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); - eact = create_adjustment_action( - /* name= */ "WidthAction", - /* label= */ C_("Select toolbar", "Width"), - /* shortLabel= */ C_("Select toolbar", "W:"), - /* tooltip= */ C_("Select toolbar", "Width of selection"), - /* path= */ "/tools/select/width", - /* def(default) */ 0.0, - /* focusTarget= */ GTK_WIDGET(desktop->canvas), - /* dataKludge= */ G_OBJECT(spw), - /* altx, altx_mark */ TRUE, "altx", - /* lower, uppper, step, page */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - /* descrLabels, descrValues, descrCount */ 0, 0, 0, - /* callback= */ sp_object_layout_any_value_changed, - /* unit_tracker= */ tracker, - /* climb, digits, factor */ SPIN_STEP, 3, 1); - + eact = create_adjustment_action( "WidthAction", C_("Select toolbar", "Width"), C_("Select toolbar", "W:"), "width", + 0.0, GTK_WIDGET(desktop->canvas), tracker, spw, + _("Width of selection"), FALSE ); gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); @@ -506,22 +528,9 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb gtk_action_group_add_action( mainActions, GTK_ACTION(itact) ); } - eact = create_adjustment_action( - /* name= */ "HeightAction", - /* label= */ C_("Select toolbar", "Height"), - /* shortLabel= */ C_("Select toolbar", "H:"), - /* tooltip= */ C_("Select toolbar", "Height of selection"), - /* path= */ "/tools/select/height", - /* def(default) */ 0.0, - /* focusTarget= */ GTK_WIDGET(desktop->canvas), - /* dataKludge= */ G_OBJECT(spw), - /* altx, altx_mark */ TRUE, "altx", - /* lower, uppper, step, page */ 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, - /* descrLabels, descrValues, descrCount */ 0, 0, 0, - /* callback= */ sp_object_layout_any_value_changed, - /* unit_tracker= */ tracker, - /* climb, digits, factor */ SPIN_STEP, 3, 1); - + eact = create_adjustment_action( "HeightAction", C_("Select toolbar", "Height"), C_("Select toolbar", "H:"), "height", + 0.0, GTK_WIDGET(desktop->canvas), tracker, spw, + _("Height of selection"), FALSE ); gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index c49f0bc05..5ca92b4c0 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -54,17 +54,12 @@ #include "ui/icon-names.h" #include "ui/tools/text-tool.h" #include "ui/tools/tool-base.h" -#include "ui/widget/unit-tracker.h" -#include "util/units.h" #include "verbs.h" #include "xml/repr.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; using Inkscape::UI::PrefPusher; -using Inkscape::UI::Widget::UnitTracker; -using Inkscape::Util::Unit; -using Inkscape::Util::unit_table; //#define DEBUG_TEXT @@ -509,14 +504,8 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl ) static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) { - UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); - - if ( !tracker || tracker->isUpdating() || g_object_get_data(tbl, "freeze")) { - /* - * When only units are being changed, don't treat changes - * to adjuster values as object changes. - * or quit if run by the _changed callbacks - */ + // quit if run by the _changed callbacks + if (g_object_get_data(G_OBJECT(tbl), "freeze")) { return; } g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); @@ -525,18 +514,7 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) // Set css line height. SPCSSAttr *css = sp_repr_css_attr_new (); Inkscape::CSSOStringStream osfs; - - gdouble value = gtk_adjustment_get_value(adj); - - Unit const *unit = tracker->getActiveUnit(); - - // Value can only be in px or percent or naked pc (e.g. 0.7 for 70%) - if (unit->abbr != "%") { - value = unit->convert(value, "px"); - unit = unit_table.getUnit("px"); - } - - osfs << value << unit->abbr; + osfs << gtk_adjustment_get_value(adj)*100 << "%"; sp_repr_css_set_property (css, "line-height", osfs.str().c_str()); // Apply line-height to selected objects. @@ -1095,31 +1073,21 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ // Line height (spacing) double height; - - Unit const *lh_unit; - UnitTracker* tracker = reinterpret_cast( g_object_get_data( tbl, "tracker" ) ); - if (query.line_height.normal) { - lh_unit = unit_table.getUnit("%"); - height = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL * 100; - } else if (query.line_height.unit == SP_CSS_UNIT_PERCENT) { - lh_unit = unit_table.getUnit("%"); - height = query.line_height.value * 100; + height = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; } else { - lh_unit = tracker->getActiveUnit(); - // Can get unit like this: unit_table.getUnit(query.line_height.unit); - height = Inkscape::Util::Quantity::convert(query.line_height.computed, "px", lh_unit); + if (query.line_height.unit == SP_CSS_UNIT_PERCENT) { + height = query.line_height.value; + } else { + height = query.line_height.computed; + } } - // Set before value is set - tracker->setActiveUnit(lh_unit); - GtkAction* lineHeightAction = GTK_ACTION( g_object_get_data( tbl, "TextLineHeightAction" ) ); GtkAdjustment *lineHeightAdjustment = ege_adjustment_action_get_adjustment(EGE_ADJUSTMENT_ACTION( lineHeightAction )); gtk_adjustment_set_value( lineHeightAdjustment, height ); - height = gtk_adjustment_get_value( lineHeightAdjustment ); // Word spacing double wordSpacing; @@ -1322,15 +1290,6 @@ static void sp_text_toolbox_select_cb( GtkEntry* entry, GtkEntryIconPosition /*p static void text_toolbox_watch_ec(SPDesktop* dt, Inkscape::UI::Tools::ToolBase* ec, GObject* holder); -static void destroy_tracker( GObject* obj, gpointer /*user_data*/ ) -{ - UnitTracker *tracker = reinterpret_cast(g_object_get_data(obj, "tracker")); - if ( tracker ) { - delete tracker; - g_object_set_data( obj, "tracker", 0 ); - } -} - // Define all the "widgets" in the toolbar. void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder) { @@ -1629,29 +1588,22 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje gchar const* labels[] = {_("Smaller spacing"), 0, 0, 0, 0, C_("Text tool", "Normal"), 0, 0, 0, 0, 0, _("Larger spacing")}; gdouble values[] = { 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1,2, 1.3, 1.4, 1.5, 2.0}; - // Add the units menu. - UnitTracker* tracker = new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR); - tracker->prependUnit(unit_table.getUnit("%")); - - g_object_set_data( holder, "tracker", tracker ); - g_signal_connect( holder, "destroy", G_CALLBACK(destroy_tracker), holder ); - EgeAdjustmentAction *eact = create_adjustment_action( "TextLineHeightAction", /* name */ _("Line Height"), /* label */ _("Line:"), /* short label */ - _("Spacing between baselines"), /* tooltip */ + _("Spacing between baselines (times font size)"), /* tooltip */ "/tools/text/lineheight", /* preferences path */ - 125, /* default */ + 0.0, /* default */ GTK_WIDGET(desktop->canvas), /* focusTarget */ holder, /* dataKludge */ FALSE, /* set alt-x keyboard shortcut? */ NULL, /* altx_mark */ - 0.0, 1e6, 1.0, 10.0, /* lower, upper, step (arrow up/down), page up/down */ + 0.0, 10.0, 0.01, 0.10, /* lower, upper, step (arrow up/down), page up/down */ labels, values, G_N_ELEMENTS(labels), /* drop down menu */ sp_text_lineheight_value_changed, /* callback */ - tracker, /* unit tracker */ - 1.0, /* step (used?) */ + NULL, /* unit tracker */ + 0.1, /* step (used?) */ 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); @@ -1659,11 +1611,6 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); g_object_set_data( holder, "TextLineHeightAction", eact ); g_object_set( G_OBJECT(eact), "iconId", "text_line_spacing", NULL ); - - GtkAction* act = tracker->createAction( "TextLineHeightUnitAction", _("Units"), ("") ); - gtk_action_group_add_action( mainActions, act ); - g_object_set_data( holder, "TextLineHeightUnitAction", act ); - } /* Word spacing */ diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index f4d7ebf25..72537f727 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -55,7 +55,6 @@ #include "ui/tools-switch.h" #include "../ui/icon-names.h" #include "../ui/widget/style-swatch.h" -#include "../ui/widget/unit-tracker.h" #include "../verbs.h" #include "../widgets/button.h" #include "../widgets/spinbutton-events.h" @@ -516,7 +515,6 @@ static gchar const * ui_descr = " " " " " " - " " " " " " " " @@ -1124,10 +1122,6 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name, g_object_set_data( dataKludge, prefs->getEntry(path).getEntryName().data(), adj ); } - if (unit_tracker) { - unit_tracker->addAdjustment(adj); - } - // Using a cast just to make sure we pass in the right kind of function pointer g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); -- cgit v1.2.3 From ae7a4f0320d820a6183dde933fba576bc2c9f58f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 18 Mar 2016 18:34:07 +0100 Subject: Bug #1419517 Fix Crash when applying new path effect after deleting pattern of Pattern-along-path LPE Fixed bugs: - https://launchpad.net/bugs/1419517 (bzr r14717) --- src/live_effects/parameter/path.cpp | 7 ++++++- src/sp-object.cpp | 15 +++++++-------- src/ui/tool/path-manipulator.cpp | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index e0369e662..7ea1d465c 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -294,7 +294,12 @@ void PathParam::set_new_value (Geom::PathVector const &newpath, bool write_to_svg) { remove_link(); - _pathvector = newpath; + if (newpath.empty()) { + param_set_and_write_default(); + return; + } else { + _pathvector = newpath; + } must_recalculate_pwd2 = true; if (write_to_svg) { diff --git a/src/sp-object.cpp b/src/sp-object.cpp index db66eb3e6..7dbc51b84 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -958,16 +958,15 @@ void SPObject::readAttr(gchar const *key) //g_assert(object != NULL); //g_assert(SP_IS_OBJECT(object)); g_assert(key != NULL); - //XML Tree being used here. - g_assert(this->getRepr() != NULL); + if (this->getRepr() != NULL ) { + unsigned int keyid = sp_attribute_lookup(key); + if (keyid != SP_ATTR_INVALID) { + /* Retrieve the 'key' attribute from the object's XML representation */ + gchar const *value = this->getRepr()->attribute(key); - unsigned int keyid = sp_attribute_lookup(key); - if (keyid != SP_ATTR_INVALID) { - /* Retrieve the 'key' attribute from the object's XML representation */ - gchar const *value = getRepr()->attribute(key); - - setKeyValue(keyid, value); + setKeyValue(keyid, value); + } } } diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index f4790c317..3b25439f3 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -1492,7 +1492,6 @@ void PathManipulator::_getGeometry() void PathManipulator::_setGeometry() { using namespace Inkscape::LivePathEffect; - if (empty()) return; if (!_lpe_key.empty()) { // copied from nodepath.cpp @@ -1505,6 +1504,7 @@ void PathManipulator::_setGeometry() LIVEPATHEFFECT(_path)->requestModified(SP_OBJECT_MODIFIED_FLAG); } } else { + if (empty()) return; //XML Tree being used here directly while it shouldn't be. if (_path->getRepr()->attribute("inkscape:original-d")) _path->set_original_curve(_spcurve, false, false); -- cgit v1.2.3 From 4596974f9ee43a2f5700e3daa468474179aaa829 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 18 Mar 2016 18:58:10 +0100 Subject: Remove code of a semifixed bug (bzr r14718) --- src/sp-object.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 7dbc51b84..db66eb3e6 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -958,15 +958,16 @@ void SPObject::readAttr(gchar const *key) //g_assert(object != NULL); //g_assert(SP_IS_OBJECT(object)); g_assert(key != NULL); + //XML Tree being used here. - if (this->getRepr() != NULL ) { - unsigned int keyid = sp_attribute_lookup(key); - if (keyid != SP_ATTR_INVALID) { - /* Retrieve the 'key' attribute from the object's XML representation */ - gchar const *value = this->getRepr()->attribute(key); + g_assert(this->getRepr() != NULL); - setKeyValue(keyid, value); - } + unsigned int keyid = sp_attribute_lookup(key); + if (keyid != SP_ATTR_INVALID) { + /* Retrieve the 'key' attribute from the object's XML representation */ + gchar const *value = getRepr()->attribute(key); + + setKeyValue(keyid, value); } } -- cgit v1.2.3 From 56b52d05b683b379bd9711531cc052fc1d7c3ecf Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 18 Mar 2016 23:30:57 +0100 Subject: Fix Krzysztof comments on merge proposal (bzr r13708.1.43) --- src/live_effects/lpe-copy_rotate.cpp | 203 +++++++++++++++++++---------------- src/live_effects/lpe-copy_rotate.h | 17 +-- 2 files changed, 109 insertions(+), 111 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index a16a21bf0..83175f3e2 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -44,6 +44,29 @@ public: } // namespace CR +int +pointSideOfLine(Geom::Point const &A, Geom::Point const &B, Geom::Point const &X) +{ + //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line + double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); + return (pos < 0) ? -1 : (pos > 0); +} + +bool +pointInTriangle(Geom::Point const &p, Geom::Point const &p1, Geom::Point const &p2, Geom::Point const &p3) +{ + //http://totologic.blogspot.com.es/2014/01/accurate-point-in-triangle-test.html + using Geom::X; + using Geom::Y; + double denominator = (p1[X]*(p2[Y] - p3[Y]) + p1[Y]*(p3[X] - p2[X]) + p2[X]*p3[Y] - p2[Y]*p3[X]); + double t1 = (p[X]*(p3[Y] - p1[Y]) + p[Y]*(p1[X] - p3[X]) - p1[X]*p3[Y] + p1[Y]*p3[X]) / denominator; + double t2 = (p[X]*(p2[Y] - p1[Y]) + p[Y]*(p1[X] - p2[X]) - p1[X]*p2[Y] + p1[Y]*p2[X]) / -denominator; + double s = t1 + t2; + + return 0 <= t1 && t1 <= 1 && 0 <= t2 && t2 <= 1 && s <= 1; +} + + LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : Effect(lpeobject), origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), @@ -110,22 +133,22 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; original_bbox(lpeitem); - if( copies_to_360 ) { + if (copies_to_360) { rotation_angle.param_set_value(360.0/(double)num_copies); } - if(fusion_paths && rotation_angle * num_copies > 360 && rotation_angle > 0){ + if (fusion_paths && rotation_angle * num_copies > 360 && rotation_angle > 0) { num_copies.param_set_value(floor(360/rotation_angle)); } - if(fusion_paths && copies_to_360) { + if (fusion_paths && copies_to_360) { num_copies.param_set_increments(2,2); - if((int)num_copies%2 !=0) { + if ((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); } } else { num_copies.param_set_increments(1,1); } - if(dist_angle_handle < 1.0) { + if (dist_angle_handle < 1.0) { dist_angle_handle = 1.0; } A = Point(boundingbox_X.min(), boundingbox_Y.middle()); @@ -135,7 +158,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-rad_from_deg(starting_angle)) * dist_angle_handle; rot_pos = origin + dir * Rotate(-rad_from_deg(rotation_angle+starting_angle)) * dist_angle_handle; - if( fusion_paths || copies_to_360 ) { + if ( fusion_paths || copies_to_360 ) { rot_pos = origin; } SPLPEItem * item = const_cast(lpeitem); @@ -143,30 +166,8 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) item->apply_to_mask(item); } -int -LPECopyRotate::pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X) -{ - //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); - return (pos < 0) ? -1 : (pos > 0); -} - -bool -LPECopyRotate::pointInTriangle(Geom::Point p, Geom::Point p1, Geom::Point p2, Geom::Point p3) -{ - //http://totologic.blogspot.com.es/2014/01/accurate-point-in-triangle-test.html - using Geom::X; - using Geom::Y; - double denominator = (p1[X]*(p2[Y] - p3[Y]) + p1[Y]*(p3[X] - p2[X]) + p2[X]*p3[Y] - p2[Y]*p3[X]); - double t1 = (p[X]*(p3[Y] - p1[Y]) + p[Y]*(p1[X] - p3[X]) - p1[X]*p3[Y] + p1[Y]*p3[X]) / denominator; - double t2 = (p[X]*(p2[Y] - p1[Y]) + p[Y]*(p1[X] - p2[X]) - p1[X]*p2[Y] + p1[Y]*p2[X]) / -denominator; - double s = t1 + t2; - - return 0 <= t1 && t1 <= 1 && 0 <= t2 && t2 <= 1 && s <= 1; -} - void -LPECopyRotate::split(Geom::PathVector &path_on,Geom::Path divider) +LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) { Geom::PathVector tmp_path; double time_start = 0.0; @@ -177,34 +178,34 @@ LPECopyRotate::split(Geom::PathVector &path_on,Geom::Path divider) for(unsigned int i = 0; i < cs.size(); i++) { crossed.push_back(cs[i].ta); } - std::sort (crossed.begin(), crossed.end()); - for(unsigned int i = 0; i < crossed.size(); i++) { - double timeEnd = crossed[i]; - Geom::Path portion_original = original.portion(time_start,timeEnd); - if(!portion_original.empty()){ + std::sort(crossed.begin(), crossed.end()); + for (unsigned int i = 0; i < crossed.size(); i++) { + double time_end = crossed[i]; + Geom::Path portion_original = original.portion(time_start,time_end); + if (!portion_original.empty()) { Geom::Point side_checker = portion_original.pointAt(0.001); position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); - if(rotation_angle != 180) { + if (rotation_angle != 180) { position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } - if(position == 1) { + if (position == 1) { tmp_path.push_back(portion_original); } portion_original.clear(); - time_start = timeEnd; + time_start = time_end; } } position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); - if(rotation_angle != 180) { + if (rotation_angle != 180) { position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } - if(cs.size() > 0 && position == 1) { + if (cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); if(!portion_original.empty()){ if (!original.closed()) { tmp_path.push_back(portion_original); } else { - if(tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { + if (tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { portion_original.setFinal(tmp_path[0].initialPoint()); portion_original.append(tmp_path[0]); tmp_path[0] = portion_original; @@ -215,7 +216,7 @@ LPECopyRotate::split(Geom::PathVector &path_on,Geom::Path divider) portion_original.clear(); } } - if(cs.size()==0 && position == 1) { + if (cs.size()==0 && position == 1) { tmp_path.push_back(original); } path_on = tmp_path; @@ -235,9 +236,11 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s Geom::PathVector tmp_path_helper; Geom::Path append_path = original; for (int i = 0; i < num_copies; ++i) { + Geom::Path last_helper; + Geom::Path start_helper; Geom::Rotate rot(-Geom::rad_from_deg(rotation_angle * (i))); Geom::Affine m = pre * rot * Geom::Translate(origin); - if(i%2 != 0) { + if (i%2 != 0) { Geom::Point A = (Geom::Point)origin; Geom::Point B = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle*i)+starting_angle)) * size_divider; Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); @@ -257,72 +260,82 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s append_path = original; } append_path *= m; - if(i != 0 && tmp_path_helper.size() > 0 &&( Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),append_path.finalPoint()))) { - Geom::Path tmp_append = append_path.reversed(); - tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); - tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),append_path.initialPoint())) { - Geom::Path tmp_append = append_path; - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); - tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); - tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); - } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),append_path.initialPoint())) { - Geom::Path tmp_append = append_path; - tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); - tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),append_path.finalPoint())) { - Geom::Path tmp_append = append_path.reversed(); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); - tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); - tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); - } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].finalPoint(),append_path.finalPoint())) { - Geom::Path tmp_append = append_path.reversed(); - tmp_append.setInitial(tmp_path_helper[0].finalPoint()); - tmp_path_helper[0].append(tmp_append); - } else if(i != 0 && tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].initialPoint(),append_path.initialPoint())) { - Geom::Path tmp_append = append_path; - tmp_path_helper[0] = tmp_path_helper[0].reversed(); - tmp_append.setInitial(tmp_path_helper[0].finalPoint()); - tmp_path_helper[0].append(tmp_append); - tmp_path_helper[0] = tmp_path_helper[0].reversed(); + if (i != 0 && tmp_path_helper.size() > 0) { + last_helper = tmp_path_helper[tmp_path_helper.size()-1]; + start_helper = tmp_path_helper[0]; + if (Geom::are_near(last_helper.finalPoint(), append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reversed(); + tmp_append.setInitial(last_helper.finalPoint()); + last_helper.append(tmp_append); + } else if (Geom::are_near(last_helper.initialPoint(), append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + last_helper = last_helper.reversed(); + tmp_append.setInitial(last_helper.finalPoint()); + last_helper.append(tmp_append); + last_helper = last_helper.reversed(); + } else if (Geom::are_near(last_helper.finalPoint(), append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + tmp_append.setInitial(last_helper.finalPoint()); + last_helper.append(tmp_append); + } else if (Geom::are_near(last_helper.initialPoint(), append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reversed(); + last_helper = last_helper.reversed(); + tmp_append.setInitial(last_helper.finalPoint()); + last_helper.append(tmp_append); + last_helper = last_helper.reversed(); + } else if (Geom::are_near(start_helper.finalPoint(), append_path.finalPoint())) { + Geom::Path tmp_append = append_path.reversed(); + tmp_append.setInitial(start_helper.finalPoint()); + start_helper.append(tmp_append); + } else if (Geom::are_near(start_helper.initialPoint(), append_path.initialPoint())) { + Geom::Path tmp_append = append_path; + start_helper = start_helper.reversed(); + tmp_append.setInitial(start_helper.finalPoint()); + start_helper.append(tmp_append); + start_helper = start_helper.reversed(); + } else { + tmp_path_helper.push_back(append_path); + } } else { tmp_path_helper.push_back(append_path); } - if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),tmp_path_helper[tmp_path_helper.size()-1].initialPoint())) { - tmp_path_helper[tmp_path_helper.size()-1].close(); + if (tmp_path_helper.size() > 0) { + if ( Geom::are_near(last_helper.finalPoint(),last_helper.initialPoint())) { + last_helper.close(); + } } } - if(rotation_angle * num_copies != 360 && tmp_path_helper.size() > 0){ + if (rotation_angle * num_copies != 360 && tmp_path_helper.size() > 0) { + Geom::Path last_helper = tmp_path_helper[tmp_path_helper.size()-1]; + Geom::Path start_helper = tmp_path_helper[0]; Geom::Ray base_a(divider.pointAt(1),divider.pointAt(0)); double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle * num_copies) + starting_angle)) * size_divider; Geom::Ray base_b(divider.pointAt(1), base_point); - if(Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && Geom::are_near(tmp_path_helper[0].finalPoint(),base_a)){ - tmp_path_helper[0].close(); - if(tmp_path_helper.size() > 1){ - tmp_path_helper[tmp_path_helper.size()-1].close(); + if (Geom::are_near(start_helper.initialPoint(),base_a) && Geom::are_near(start_helper.finalPoint(),base_a)) { + start_helper.close(); + if (tmp_path_helper.size() > 1) { + last_helper.close(); } - } else if(Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),base_b) && - Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)){ - tmp_path_helper[0].close(); - if(tmp_path_helper.size() > 1){ - tmp_path_helper[tmp_path_helper.size()-1].close(); + } else if (Geom::are_near(last_helper.initialPoint(),base_b) && + Geom::are_near(last_helper.finalPoint(),base_b)) { + start_helper.close(); + if (tmp_path_helper.size() > 1) { + last_helper.close(); } - } else if((Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)) || - (Geom::are_near(tmp_path_helper[0].initialPoint(),base_b) && Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_a))){ - Geom::Path close_path = Geom::Path(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + } else if ((Geom::are_near(start_helper.initialPoint(),base_a) && Geom::are_near(last_helper.finalPoint(),base_b)) || + (Geom::are_near(start_helper.initialPoint(),base_b) && Geom::are_near(last_helper.finalPoint(),base_a))) { + Geom::Path close_path = Geom::Path(last_helper.finalPoint()); close_path.appendNew((Geom::Point)origin); - close_path.appendNew(tmp_path_helper[0].initialPoint()); - tmp_path_helper[0].append(close_path); + close_path.appendNew(start_helper.initialPoint()); + start_helper.append(close_path); } } - if(tmp_path_helper.size() > 0 && Geom::are_near(tmp_path_helper[0].finalPoint(),tmp_path_helper[0].initialPoint())) { - tmp_path_helper[0].close(); + if (tmp_path_helper.size() > 0 && Geom::are_near(start_helper.finalPoint(),start_helper.initialPoint())) { + start_helper.close(); } tmp_path.insert(tmp_path.end(), tmp_path_helper.begin(), tmp_path_helper.end()); tmp_path_helper.clear(); @@ -336,7 +349,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p { using namespace Geom; - if(num_copies == 1 && !fusion_paths) { + if (num_copies == 1 && !fusion_paths) { return pwd2_in; } @@ -352,7 +365,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p divider.appendNew(line_end); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-rad_from_deg(starting_angle)); - if(fusion_paths) { + if (fusion_paths) { Geom::PathVector path_out; Geom::PathVector tmp_path; PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); @@ -368,7 +381,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p } } Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it->closed()) { + if (end_open && path_it->closed()) { original.close(false); original.appendNew( original.initialPoint() ); original.close(true); @@ -378,7 +391,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); tmp_path.clear(); } - if(path_out.size()>0) { + if (path_out.size()>0) { output = paths_to_pw(path_out); } } else { diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index e45fa6d37..077699b80 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -31,25 +31,13 @@ class LPECopyRotate : public Effect, GroupBBoxEffect { public: LPECopyRotate(LivePathEffectObject *lpeobject); virtual ~LPECopyRotate(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > const & pwd2_in); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual void setFusion(Geom::PathVector &path_in, Geom::Path divider, double sizeDivider); - - virtual bool pointInTriangle(Geom::Point p, Geom::Point p0, Geom::Point p1, Geom::Point p2); - - virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); - virtual void split(Geom::PathVector &path_in,Geom::Path divider); - virtual void resetDefaults(SPItem const* item); - virtual void transform_multiply(Geom::Affine const& postmul, bool set); - /* the knotholder entity classes must be declared friends */ friend class CR::KnotHolderEntityStartingAngle; friend class CR::KnotHolderEntityRotationAngle; @@ -64,16 +52,13 @@ private: ScalarParam rotation_angle; ScalarParam num_copies; BoolParam copies_to_360; - BoolParam fusion_paths; - + BoolParam fusion_paths ; Geom::Point A; Geom::Point B; Geom::Point dir; - Geom::Point start_pos; Geom::Point rot_pos; double dist_angle_handle; - LPECopyRotate(const LPECopyRotate&); LPECopyRotate& operator=(const LPECopyRotate&); }; -- cgit v1.2.3 From 16a30a307c06154881b9c563cb77309810a15baf Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 19 Mar 2016 01:13:27 +0100 Subject: Fix more Krzysztof comments on merge proposal, temporary disable LPE on clip and paths (bzr r13708.1.44) --- src/live_effects/lpe-copy_rotate.cpp | 147 ++++++++++++++++++----------------- src/live_effects/lpe-copy_rotate.h | 4 +- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index 83175f3e2..f204f8608 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -74,7 +74,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), - fusion_paths(_("Fusioned paths"), _("Fusion paths by helper line"), "fusion_paths", &wr, this, false), + fuse_paths(_("Fuse paths"), _("Fuse paths by helper line"), "fuse_paths", &wr, this, false), dist_angle_handle(100.0) { show_orig_path = true; @@ -83,7 +83,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : // register all your parameters here, so Inkscape knows which parameters this effect has: registerParameter(&copies_to_360); - registerParameter(&fusion_paths); + registerParameter(&fuse_paths); registerParameter(&starting_angle); registerParameter(&rotation_angle); registerParameter(&num_copies); @@ -115,7 +115,7 @@ LPECopyRotate::doOnApply(SPLPEItem const* lpeitem) void LPECopyRotate::transform_multiply(Geom::Affine const& postmul, bool set) { - if(fusion_paths) { + if(fuse_paths) { Geom::Coord angle = Geom::deg_from_rad(atan(-postmul[1]/postmul[0])); angle += starting_angle; starting_angle.param_set_value(angle); @@ -136,10 +136,10 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) if (copies_to_360) { rotation_angle.param_set_value(360.0/(double)num_copies); } - if (fusion_paths && rotation_angle * num_copies > 360 && rotation_angle > 0) { + if (fuse_paths && rotation_angle * num_copies > 360 && rotation_angle > 0) { num_copies.param_set_value(floor(360/rotation_angle)); } - if (fusion_paths && copies_to_360) { + if (fuse_paths && copies_to_360) { num_copies.param_set_increments(2,2); if ((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); @@ -158,7 +158,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) // likely due to SVG's choice of coordinate system orientation (max) start_pos = origin + dir * Rotate(-rad_from_deg(starting_angle)) * dist_angle_handle; rot_pos = origin + dir * Rotate(-rad_from_deg(rotation_angle+starting_angle)) * dist_angle_handle; - if ( fusion_paths || copies_to_360 ) { + if ( fuse_paths || copies_to_360 ) { rot_pos = origin; } SPLPEItem * item = const_cast(lpeitem); @@ -235,9 +235,8 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s } Geom::PathVector tmp_path_helper; Geom::Path append_path = original; + for (int i = 0; i < num_copies; ++i) { - Geom::Path last_helper; - Geom::Path start_helper; Geom::Rotate rot(-Geom::rad_from_deg(rotation_angle * (i))); Geom::Affine m = pre * rot * Geom::Translate(origin); if (i%2 != 0) { @@ -251,8 +250,8 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s Geom::Affine m2(c, -s, s, c, 0.0, 0.0); Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); - Geom::Affine tmpM = m1.inverse() * m2; - m = tmpM; + Geom::Affine tmp_m = m1.inverse() * m2; + m = tmp_m; m = m * sca; m = m * m2.inverse(); m = m * m1; @@ -260,82 +259,86 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s append_path = original; } append_path *= m; - if (i != 0 && tmp_path_helper.size() > 0) { - last_helper = tmp_path_helper[tmp_path_helper.size()-1]; - start_helper = tmp_path_helper[0]; - if (Geom::are_near(last_helper.finalPoint(), append_path.finalPoint())) { + if (tmp_path_helper.size() > 0) { + if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(), append_path.finalPoint())) { Geom::Path tmp_append = append_path.reversed(); - tmp_append.setInitial(last_helper.finalPoint()); - last_helper.append(tmp_append); - } else if (Geom::are_near(last_helper.initialPoint(), append_path.initialPoint())) { + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(), append_path.initialPoint())) { Geom::Path tmp_append = append_path; - last_helper = last_helper.reversed(); - tmp_append.setInitial(last_helper.finalPoint()); - last_helper.append(tmp_append); - last_helper = last_helper.reversed(); - } else if (Geom::are_near(last_helper.finalPoint(), append_path.initialPoint())) { + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(), append_path.initialPoint())) { Geom::Path tmp_append = append_path; - tmp_append.setInitial(last_helper.finalPoint()); - last_helper.append(tmp_append); - } else if (Geom::are_near(last_helper.initialPoint(), append_path.finalPoint())) { + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(), append_path.finalPoint())) { Geom::Path tmp_append = append_path.reversed(); - last_helper = last_helper.reversed(); - tmp_append.setInitial(last_helper.finalPoint()); - last_helper.append(tmp_append); - last_helper = last_helper.reversed(); - } else if (Geom::are_near(start_helper.finalPoint(), append_path.finalPoint())) { + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); + } else if (Geom::are_near(tmp_path_helper[0].finalPoint(), append_path.finalPoint())) { Geom::Path tmp_append = append_path.reversed(); - tmp_append.setInitial(start_helper.finalPoint()); - start_helper.append(tmp_append); - } else if (Geom::are_near(start_helper.initialPoint(), append_path.initialPoint())) { + tmp_append.setInitial(tmp_path_helper[0].finalPoint()); + tmp_path_helper[0].append(tmp_append); + } else if (Geom::are_near(tmp_path_helper[0].initialPoint(), append_path.initialPoint())) { Geom::Path tmp_append = append_path; - start_helper = start_helper.reversed(); - tmp_append.setInitial(start_helper.finalPoint()); - start_helper.append(tmp_append); - start_helper = start_helper.reversed(); + tmp_path_helper[0] = tmp_path_helper[0].reversed(); + tmp_append.setInitial(tmp_path_helper[0].finalPoint()); + tmp_path_helper[0].append(tmp_append); + tmp_path_helper[0] = tmp_path_helper[0].reversed(); } else { tmp_path_helper.push_back(append_path); } + if ( Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),tmp_path_helper[tmp_path_helper.size()-1].initialPoint())) { + tmp_path_helper[tmp_path_helper.size()-1].close(); + } } else { tmp_path_helper.push_back(append_path); } - if (tmp_path_helper.size() > 0) { - if ( Geom::are_near(last_helper.finalPoint(),last_helper.initialPoint())) { - last_helper.close(); - } - } } - if (rotation_angle * num_copies != 360 && tmp_path_helper.size() > 0) { - Geom::Path last_helper = tmp_path_helper[tmp_path_helper.size()-1]; - Geom::Path start_helper = tmp_path_helper[0]; - Geom::Ray base_a(divider.pointAt(1),divider.pointAt(0)); - double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); - Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); - double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); - Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle * num_copies) + starting_angle)) * size_divider; - Geom::Ray base_b(divider.pointAt(1), base_point); - if (Geom::are_near(start_helper.initialPoint(),base_a) && Geom::are_near(start_helper.finalPoint(),base_a)) { - start_helper.close(); - if (tmp_path_helper.size() > 1) { - last_helper.close(); - } - } else if (Geom::are_near(last_helper.initialPoint(),base_b) && - Geom::are_near(last_helper.finalPoint(),base_b)) { - start_helper.close(); - if (tmp_path_helper.size() > 1) { - last_helper.close(); + if (tmp_path_helper.size() > 0) { + tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1]; + tmp_path_helper[0] = tmp_path_helper[0]; + if (rotation_angle * num_copies != 360) { + Geom::Ray base_a(divider.pointAt(1),divider.pointAt(0)); + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double size_divider = Geom::distance(origin,bbox) + (diagonal * 2); + Geom::Point base_point = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle * num_copies) + starting_angle)) * size_divider; + Geom::Ray base_b(divider.pointAt(1), base_point); + if (Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && + Geom::are_near(tmp_path_helper[0].finalPoint(),base_a)) + { + tmp_path_helper[0].close(); + if (tmp_path_helper.size() > 1) { + tmp_path_helper[tmp_path_helper.size()-1].close(); + } + } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].initialPoint(),base_b) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)) + { + tmp_path_helper[0].close(); + if (tmp_path_helper.size() > 1) { + tmp_path_helper[tmp_path_helper.size()-1].close(); + } + } else if ((Geom::are_near(tmp_path_helper[0].initialPoint(),base_a) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_b)) || + (Geom::are_near(tmp_path_helper[0].initialPoint(),base_b) && + Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(),base_a))) + { + Geom::Path close_path = Geom::Path(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); + close_path.appendNew((Geom::Point)origin); + close_path.appendNew(tmp_path_helper[0].initialPoint()); + tmp_path_helper[0].append(close_path); } - } else if ((Geom::are_near(start_helper.initialPoint(),base_a) && Geom::are_near(last_helper.finalPoint(),base_b)) || - (Geom::are_near(start_helper.initialPoint(),base_b) && Geom::are_near(last_helper.finalPoint(),base_a))) { - Geom::Path close_path = Geom::Path(last_helper.finalPoint()); - close_path.appendNew((Geom::Point)origin); - close_path.appendNew(start_helper.initialPoint()); - start_helper.append(close_path); } - } - if (tmp_path_helper.size() > 0 && Geom::are_near(start_helper.finalPoint(),start_helper.initialPoint())) { - start_helper.close(); + if (Geom::are_near(tmp_path_helper[0].finalPoint(),tmp_path_helper[0].initialPoint())) { + tmp_path_helper[0].close(); + } } tmp_path.insert(tmp_path.end(), tmp_path_helper.begin(), tmp_path_helper.end()); tmp_path_helper.clear(); @@ -349,7 +352,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p { using namespace Geom; - if (num_copies == 1 && !fusion_paths) { + if (num_copies == 1 && !fuse_paths) { return pwd2_in; } @@ -365,7 +368,7 @@ LPECopyRotate::doEffect_pwd2 (Geom::Piecewise > const & p divider.appendNew(line_end); Piecewise > output; Affine pre = Translate(-origin) * Rotate(-rad_from_deg(starting_angle)); - if (fusion_paths) { + if (fuse_paths) { Geom::PathVector path_out; Geom::PathVector tmp_path; PathVector const original_pathv = path_from_piecewise(remove_short_cuts(pwd2_in, 0.1), 0.001); diff --git a/src/live_effects/lpe-copy_rotate.h b/src/live_effects/lpe-copy_rotate.h index 077699b80..87af867df 100644 --- a/src/live_effects/lpe-copy_rotate.h +++ b/src/live_effects/lpe-copy_rotate.h @@ -35,7 +35,7 @@ public: virtual Geom::Piecewise > doEffect_pwd2 (Geom::Piecewise > const & pwd2_in); virtual void doBeforeEffect (SPLPEItem const* lpeitem); virtual void setFusion(Geom::PathVector &path_in, Geom::Path divider, double sizeDivider); - virtual void split(Geom::PathVector &path_in,Geom::Path divider); + virtual void split(Geom::PathVector &path_in, Geom::Path const ÷r); virtual void resetDefaults(SPItem const* item); virtual void transform_multiply(Geom::Affine const& postmul, bool set); /* the knotholder entity classes must be declared friends */ @@ -52,7 +52,7 @@ private: ScalarParam rotation_angle; ScalarParam num_copies; BoolParam copies_to_360; - BoolParam fusion_paths ; + BoolParam fuse_paths; Geom::Point A; Geom::Point B; Geom::Point dir; -- cgit v1.2.3 From 05b3344e7b4151a0ef334ed34c5b566801094806 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 19 Mar 2016 12:17:59 +0100 Subject: Fix a problem with LPE on clips and paths making extremly slow on LPE (bzr r14719) --- src/live_effects/effect.cpp | 4 ++++ src/sp-lpe-item.cpp | 21 ++++++++------------- src/sp-lpe-item.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 38d59a43a..deed7a0a1 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -467,6 +467,10 @@ void Effect::doBeforeEffect_impl(SPLPEItem const* lpeitem) pathvector_before_effect = sp_curve->get_pathvector(); } doBeforeEffect(lpeitem); + if (apply_to_clippath_and_mask && SP_IS_GROUP(sp_lpe_item)) { + sp_lpe_item->apply_to_clippath(sp_lpe_item); + sp_lpe_item->apply_to_mask(sp_lpe_item); + } } /** diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index e2afbb55b..fdc2949d5 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -209,7 +209,7 @@ Inkscape::XML::Node* SPLPEItem::write(Inkscape::XML::Document *xml_doc, Inkscape /** * returns true when LPE was successful. */ -bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { +bool SPLPEItem::performPathEffect(SPCurve *curve, bool is_clip_or_mask) { if (!this) { return false; } @@ -217,7 +217,6 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { if (!curve) { return false; } - bool apply_to_clippath_and_mask = false; if (this->hasPathEffect() && this->pathEffectsEnabled()) { for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); ++it) { @@ -237,17 +236,13 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { g_warning("SPLPEItem::performPathEffect - lpeobj with invalid lpe in the stack!"); return false; } - if (lpe->isVisible()) { - if(lpe->apply_to_clippath_and_mask){ - apply_to_clippath_and_mask = true; - } if (lpe->acceptsNumClicks() > 0 && !lpe->isReady()) { // if the effect expects mouse input before being applied and the input is not finished // yet, we don't alter the path return false; } - if (clip_paths || lpe->apply_to_clippath_and_mask) { + if (!is_clip_or_mask || (is_clip_or_mask && lpe->apply_to_clippath_and_mask)) { // Groups have their doBeforeEffect called elsewhere if (!SP_IS_GROUP(this)) { lpe->doBeforeEffect_impl(this); @@ -270,10 +265,10 @@ bool SPLPEItem::performPathEffect(SPCurve *curve, bool clip_paths) { } } } - } - if(apply_to_clippath_and_mask && clip_paths){ - this->apply_to_clippath((SPItem *)this); - this->apply_to_mask((SPItem *)this); + if(!SP_IS_GROUP(this) && !is_clip_or_mask){ + this->apply_to_clippath(this); + this->apply_to_mask(this); + } } return true; } @@ -698,10 +693,10 @@ SPLPEItem::apply_to_clip_or_mask(SPItem *clip_mask, SPItem *item) try { if(SP_IS_GROUP(this)){ c->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this))); - success = this->performPathEffect(c, false); + success = this->performPathEffect(c, true); c->transform(i2anc_affine(SP_GROUP(item), SP_GROUP(this)).inverse()); } else { - success = this->performPathEffect(c, false); + success = this->performPathEffect(c, true); } } catch (std::exception & e) { g_warning("Exception during LPE execution. \n %s", e.what()); diff --git a/src/sp-lpe-item.h b/src/sp-lpe-item.h index d5e868b2e..9e5cb3329 100644 --- a/src/sp-lpe-item.h +++ b/src/sp-lpe-item.h @@ -69,7 +69,7 @@ public: virtual void update_patheffect(bool write); - bool performPathEffect(SPCurve *curve, bool clip_paths = true); + bool performPathEffect(SPCurve *curve, bool is_clip_or_mask = false); bool pathEffectsEnabled() const; bool hasPathEffect() const; -- cgit v1.2.3 From d9f06856ceb526436c47237546f3e18f24d65b9f Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sat, 19 Mar 2016 21:08:57 +0100 Subject: Start fixing Krzysztof review (bzr r13682.1.34) --- src/live_effects/lpe-mirror_symmetry.cpp | 24 ++++++++++++------------ src/live_effects/lpe-mirror_symmetry.h | 9 ++------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 9ea25dbb3..d25225797 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -52,18 +52,18 @@ public: LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), - mode(_("Mode"), _("Symetry move mode"), "mode", MTConverter, &wr, this, MT_FREE), + mode(_("Mode"), _("Symmetry move mode"), "mode", MTConverter, &wr, this, MT_FREE), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), - fusion_paths(_("Fusioned symetry"), _("Fusion right side whith symm"), "fusion_paths", &wr, this, true), - reverse_fusion(_("Reverse fusion"), _("Reverse fusion"), "reverse_fusion", &wr, this, false), - reflection_line(_("Reflection line:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), - center(_("Center of mirroring (X or Y)"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") + fuse_paths(_("Fuse paths"), _("Fuse original and the reflection into a single path"), "fuse_paths", &wr, this, true), + oposite_fuse(_("Oposite fuse"), _("Picks the other side of the mirror as the original"), "oposite_fuse", &wr, this, false), + reflection_line(_("Axis of reflection:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), + center(_("Center of mirroring"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") { show_orig_path = true; registerParameter(&mode); registerParameter( &discard_orig_path); - registerParameter( &fusion_paths); - registerParameter( &reverse_fusion); + registerParameter( &fuse_paths); + registerParameter( &oposite_fuse); registerParameter( &reflection_line); registerParameter( ¢er); apply_to_clippath_and_mask = true; @@ -161,7 +161,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) line_m_expanded.start( line_start); line_m_expanded.appendNew( line_end); - if (!discard_orig_path && !fusion_paths) { + if (!discard_orig_path && !fuse_paths) { path_out = path_in; } @@ -181,7 +181,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) m = m * m2.inverse(); m = m * m1; - if(fusion_paths && !discard_orig_path) { + if(fuse_paths && !discard_orig_path) { for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); path_it != original_pathv.end(); ++path_it) { if (path_it->empty()) { @@ -209,7 +209,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) Geom::Path portion = original.portion(time_start, timeEnd); Geom::Point middle = portion.pointAt((double)portion.size()/2.0); position = pointSideOfLine(line_start, line_end, middle); - if(reverse_fusion) { + if(oposite_fuse) { position *= -1; } if(position == 1) { @@ -226,7 +226,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) time_start = timeEnd; } position = pointSideOfLine(line_start, line_end, original.finalPoint()); - if(reverse_fusion) { + if(oposite_fuse) { position *= -1; } if(cs.size()!=0 && position == 1) { @@ -259,7 +259,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) } } - if (!fusion_paths || discard_orig_path) { + if (!fuse_paths || discard_orig_path) { for (int i = 0; i < static_cast(path_in.size()); ++i) { path_out.push_back(path_in[i] * m); } diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index 0874f0c7e..f4e4678a7 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -42,15 +42,10 @@ class LPEMirrorSymmetry : public Effect, GroupBBoxEffect { public: LPEMirrorSymmetry(LivePathEffectObject *lpeobject); virtual ~LPEMirrorSymmetry(); - virtual void doOnApply (SPLPEItem const* lpeitem); - virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); - virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); - /* the knotholder entity classes must be declared friends */ friend class MS::KnotHolderEntityCenterMirrorSymmetry; void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item); @@ -61,8 +56,8 @@ protected: private: EnumParam mode; BoolParam discard_orig_path; - BoolParam fusion_paths; - BoolParam reverse_fusion; + BoolParam fuse_paths; + BoolParam oposite_fuse; PathParam reflection_line; Geom::Line line_separation; Geom::Point previous_center; -- cgit v1.2.3 From 2ab92c531add6a786d4a9cacf41ce33381c2ffe2 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 19 Mar 2016 22:42:23 -0400 Subject: Add Shift+Enter path complete and larger square node on mouse over. (bzr r14721) --- src/ui/draw-anchor.cpp | 9 +++++++-- src/ui/tools/pen-tool.cpp | 14 +++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/ui/draw-anchor.cpp b/src/ui/draw-anchor.cpp index 6b9a88ed7..e5a7a493e 100644 --- a/src/ui/draw-anchor.cpp +++ b/src/ui/draw-anchor.cpp @@ -26,6 +26,9 @@ using Inkscape::ControlManager; #define FILL_COLOR_NORMAL 0xffffff7f #define FILL_COLOR_MOUSEOVER 0xff0000ff +#define NODE_SIZE_NORMAL 7.0 +#define NODE_SIZE_MOUSEOVER 10.0 + /** * Creates an anchor object and initializes it. */ @@ -78,14 +81,16 @@ SPDrawAnchor *sp_draw_anchor_test(SPDrawAnchor *anchor, Geom::Point w, bool acti if ( activate && ( Geom::LInfty( w - anchor->dc->getDesktop().d2w(anchor->dp) ) <= (ctrl->box.width() / 2.0) ) ) { if (!anchor->active) { - g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, NULL); + g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, + "size", NODE_SIZE_MOUSEOVER, NULL); anchor->active = TRUE; } return anchor; } if (anchor->active) { - g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_NORMAL, NULL); + g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_NORMAL, + "size", NODE_SIZE_NORMAL, NULL); anchor->active = FALSE; } return NULL; diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index 2ed366a7d..ff49417f4 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -1220,7 +1220,19 @@ bool PenTool::_handleKeyPress(GdkEvent *event) { case GDK_KEY_KP_Enter: if (this->npoints != 0) { this->ea = NULL; // unset end anchor if set (otherwise crashes) - this->_finish(false); + if(MOD__SHIFT_ONLY(event)) { + // All this is needed to stop the last control + // point dispeating and stop making an n-1 shape. + Geom::Point const event_w(0, 0); + Geom::Point event_dt(desktop->w2d(event_w)); + if(this->red_curve->is_empty()) { + this->red_curve->moveto(event_w); + } + this->_finishSegment(event_w, 0); + this->_finish(true); + } else { + this->_finish(false); + } ret = true; } break; -- cgit v1.2.3 From b7b077d0aedeb7e1e808c927f15b1f1314ae4b85 Mon Sep 17 00:00:00 2001 From: me-kell <> Date: Sun, 20 Mar 2016 09:26:47 +0100 Subject: [Bug #1518302] Extension new_glyph_layer (Typography) not using decoding properly. Fixed bugs: - https://launchpad.net/bugs/1518302 (bzr r14722) --- share/extensions/new_glyph_layer.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/share/extensions/new_glyph_layer.py b/share/extensions/new_glyph_layer.py index 7261baa2d..d6622cc62 100755 --- a/share/extensions/new_glyph_layer.py +++ b/share/extensions/new_glyph_layer.py @@ -19,6 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import inkex import sys +import locale + class NewGlyphLayer(inkex.Effect): def __init__(self): @@ -27,10 +29,13 @@ class NewGlyphLayer(inkex.Effect): action="store", type="string", dest="unicodechars", default='', help="Unicode chars") + self.encoding = sys.stdin.encoding + if self.encoding == 'cp0' or self.encoding is None: + self.encoding = locale.getpreferredencoding() def effect(self): # Get all the options - unicode_chars = self.options.unicodechars + unicode_chars = self.options.unicodechars.decode(self.encoding) #TODO: remove duplicate chars @@ -40,7 +45,7 @@ class NewGlyphLayer(inkex.Effect): for char in unicode_chars: # Create a new layer. layer = inkex.etree.SubElement(svg, 'g') - layer.set(inkex.addNS('label', 'inkscape'), 'GlyphLayer-'+char) + layer.set(inkex.addNS('label', 'inkscape'), u'GlyphLayer-'+char) layer.set(inkex.addNS('groupmode', 'inkscape'), 'layer') layer.set('style', 'display:none') #initially not visible -- cgit v1.2.3 From bb5e99e378d45f0d8cb3db9842a248acc4dadd43 Mon Sep 17 00:00:00 2001 From: suv-lp <> Date: Sun, 20 Mar 2016 09:32:53 +0100 Subject: [Bug #1545332] Canvas context menu: allow grouping a single selection (same as menu, toolbar command). Fixed bugs: - https://launchpad.net/bugs/1545332 (bzr r14723) --- src/ui/interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 69b229519..531aa728d 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -1786,7 +1786,7 @@ void ContextMenu::MakeItemMenu (void) /* Group */ mi = Gtk::manage(new Gtk::MenuItem(_("_Group"), 1)); mi->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ActivateGroup)); - if (_desktop->selection->isEmpty() || _desktop->selection->single()) { + if (_desktop->selection->isEmpty()) { mi->set_sensitive(FALSE); } else { mi->set_sensitive(TRUE); -- cgit v1.2.3 From 7ea0b4c0ca0839a7b837759d2696259e6c91b179 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 20 Mar 2016 14:11:16 +0100 Subject: Add advert tooltip message to copy rotate (bzr r14724) --- src/live_effects/lpe-copy_rotate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index f204f8608..c0c510fa6 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -74,7 +74,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), - fuse_paths(_("Fuse paths"), _("Fuse paths by helper line"), "fuse_paths", &wr, this, false), + fuse_paths(_("Fuse paths"), _("Fuse paths by helper line -Use fill rule: evenodd for best result-"), "fuse_paths", &wr, this, false), dist_angle_handle(100.0) { show_orig_path = true; -- cgit v1.2.3 From fd794a9d8bf0e82e62dfdb75a9f337b361f26b3e Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sun, 20 Mar 2016 09:21:29 -0400 Subject: Update status bar text and remove spare Geom Point variable. (bzr r14725) --- src/ui/tools/pen-tool.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp index ff49417f4..18af8e105 100644 --- a/src/ui/tools/pen-tool.cpp +++ b/src/ui/tools/pen-tool.cpp @@ -1223,12 +1223,11 @@ bool PenTool::_handleKeyPress(GdkEvent *event) { if(MOD__SHIFT_ONLY(event)) { // All this is needed to stop the last control // point dispeating and stop making an n-1 shape. - Geom::Point const event_w(0, 0); - Geom::Point event_dt(desktop->w2d(event_w)); + Geom::Point const p(0, 0); if(this->red_curve->is_empty()) { - this->red_curve->moveto(event_w); + this->red_curve->moveto(p); } - this->_finishSegment(event_w, 0); + this->_finishSegment(p, 0); this->_finish(true); } else { this->_finish(false); @@ -1795,12 +1794,12 @@ void PenTool::_setSubsequentPoint(Geom::Point const p, bool statusbar, guint sta if (statusbar) { gchar *message = is_curve ? - _("Curve segment: angle %3.2f°, distance %s; with Ctrl to snap angle, Enter to finish the path" ): - _("Line segment: angle %3.2f°, distance %s; with Ctrl to snap angle, Enter to finish the path"); + _("Curve segment: angle %3.2f°, distance %s; with Ctrl to snap angle, Enter or Shift+Enter to finish the path" ): + _("Line segment: angle %3.2f°, distance %s; with Ctrl to snap angle, Enter or Shift+Enter to finish the path"); if(this->spiro || this->bspline){ message = is_curve ? - _("Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" ): - _("Line segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path"); + _("Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" ): + _("Line segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path"); } this->_setAngleDistanceStatusMessage(p, 0, message); } -- cgit v1.2.3 From 0444d47efce07c7fa541b5ce9db823853e3fd686 Mon Sep 17 00:00:00 2001 From: raphael0202 Date: Sun, 20 Mar 2016 15:00:37 +0100 Subject: [Bug #1559679] Make inkex.py PEP8 compliant. Fixed bugs: - https://launchpad.net/bugs/1559679 (bzr r14726) --- share/extensions/inkex.py | 98 ++++++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 43 deletions(-) diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 16aff2fc8..e1602f918 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -48,6 +48,7 @@ u'xlink' :u'http://www.w3.org/1999/xlink', u'xml' :u'http://www.w3.org/XML/1998/namespace' } + def localize(): domain = 'inkscape' if sys.platform.startswith('win'): @@ -55,33 +56,35 @@ def localize(): current_locale, encoding = locale.getdefaultlocale() os.environ['LANG'] = current_locale try: - localdir = os.environ['INKSCAPE_LOCALEDIR']; + localdir = os.environ['INKSCAPE_LOCALEDIR'] trans = gettext.translation(domain, localdir, [current_locale], fallback=True) except KeyError: trans = gettext.translation(domain, fallback=True) elif sys.platform.startswith('darwin'): try: - localdir = os.environ['INKSCAPE_LOCALEDIR']; + localdir = os.environ['INKSCAPE_LOCALEDIR'] trans = gettext.translation(domain, localdir, fallback=True) except KeyError: try: - localdir = os.environ['PACKAGE_LOCALE_DIR']; + localdir = os.environ['PACKAGE_LOCALE_DIR'] trans = gettext.translation(domain, localdir, fallback=True) except KeyError: trans = gettext.translation(domain, fallback=True) else: try: - localdir = os.environ['PACKAGE_LOCALE_DIR']; + localdir = os.environ['PACKAGE_LOCALE_DIR'] trans = gettext.translation(domain, localdir, fallback=True) except KeyError: trans = gettext.translation(domain, fallback=True) #sys.stderr.write(str(localdir) + "\n") trans.install() + def debug(what): sys.stderr.write(str(what) + "\n") return what + def errormsg(msg): """Intended for end-user-visible error messages. @@ -101,6 +104,7 @@ def errormsg(msg): else: sys.stderr.write((unicode(msg, "utf-8", errors='replace') + "\n").encode("UTF-8")) + def are_near_relative(a, b, eps): if (a-b <= a*eps) and (a-b >= -a*eps): return True @@ -113,9 +117,13 @@ try: from lxml import etree except Exception, e: localize() - errormsg(_("The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install the latest version from http://cheeseshop.python.org/pypi/lxml/, or install it through your package manager by a command like: sudo apt-get install python-lxml\n\nTechnical details:\n%s" % (e,))) + errormsg(_("The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension." + "Please download and install the latest version from http://cheeseshop.python.org/pypi/lxml/, " + "or install it through your package manager by a command like: sudo apt-get install " + "python-lxml\n\nTechnical details:\n%s" % (e,))) sys.exit() - + + def check_inkbool(option, opt, value): if str(value).capitalize() == 'True': return True @@ -124,35 +132,40 @@ def check_inkbool(option, opt, value): else: raise optparse.OptionValueError("option %s: invalid inkbool value: %s" % (opt, value)) + def addNS(tag, ns=None): val = tag - if ns!=None and len(ns)>0 and NSS.has_key(ns) and len(tag)>0 and tag[0]!='{': + if ns is not None and len(ns) > 0 and NSS.has_key(ns) and len(tag) > 0 and tag[0] != '{': val = "{%s}%s" % (NSS[ns], tag) return val + class InkOption(optparse.Option): TYPES = optparse.Option.TYPES + ("inkbool",) TYPE_CHECKER = copy.copy(optparse.Option.TYPE_CHECKER) TYPE_CHECKER["inkbool"] = check_inkbool + class Effect: """A class for creating Inkscape SVG Effects""" def __init__(self, *args, **kwargs): - self.document=None - self.original_document=None - self.ctx=None - self.selected={} - self.doc_ids={} - self.options=None - self.args=None - self.OptionParser = optparse.OptionParser(usage="usage: %prog [options] SVGfile",option_class=InkOption) + self.document = None + self.original_document = None + self.ctx = None + self.selected = {} + self.doc_ids = {} + self.options = None + self.args = None + self.OptionParser = optparse.OptionParser(usage="usage: %prog [options] SVGfile", + option_class=InkOption) self.OptionParser.add_option("--id", action="append", type="string", dest="ids", default=[], help="id attribute of object to manipulate") self.OptionParser.add_option("--selected-nodes", action="append", type="string", dest="selected_nodes", default=[], - help="id:subpath:position of selected nodes, if any")#TODO write a parser for this + help="id:subpath:position of selected nodes, if any") + # TODO write a parser for this def effect(self): pass @@ -165,7 +178,7 @@ class Effect: """Parse document in specified file or on stdin""" # First try to open the file from the function argument - if filename != None: + if filename is not None: try: stream = open(filename, 'r') except Exception: @@ -174,7 +187,7 @@ class Effect: # If it wasn't specified, try to open the file specified as # an object member - elif self.svg_file != None: + elif self.svg_file is not None: try: stream = open(self.svg_file, 'r') except Exception: @@ -207,11 +220,12 @@ class Effect: xattr = self.document.xpath('//sodipodi:namedview/@inkscape:cx', namespaces=NSS) yattr = self.document.xpath('//sodipodi:namedview/@inkscape:cy', namespaces=NSS) if xattr and yattr: - x = self.unittouu( xattr[0] + 'px' ) - y = self.unittouu( yattr[0] + 'px') + x = self.unittouu(xattr[0] + 'px') + y = self.unittouu(yattr[0] + 'px') doc_height = self.unittouu(self.getDocumentHeight()) if x and y: - self.view_center = (float(x), doc_height - float(y)) # FIXME: y-coordinate flip, eliminate it when it's gone in Inkscape + self.view_center = (float(x), doc_height - float(y)) + # FIXME: y-coordinate flip, eliminate it when it's gone in Inkscape def getselected(self): """Collect selected nodes""" @@ -224,9 +238,9 @@ class Effect: path = '//*[@id="%s"]' % id el_list = self.document.xpath(path, namespaces=NSS) if el_list: - return el_list[0] + return el_list[0] else: - return None + return None def getParentNode(self, node): for parent in self.document.getiterator(): @@ -234,7 +248,6 @@ class Effect: return parent break - def getdocids(self): docIdNodes = self.document.xpath('//@id', namespaces=NSS) for m in docIdNodes: @@ -250,7 +263,7 @@ class Effect: } guide = etree.SubElement( self.getNamedView(), - addNS('guide','sodipodi'), atts ) + addNS('guide','sodipodi'), atts) return guide def output(self): @@ -271,7 +284,7 @@ class Effect: self.effect() if output: self.output() - def uniqueId(self, old_id, make_new_id = True): + def uniqueId(self, old_id, make_new_id=True): new_id = old_id if make_new_id: while new_id in self.doc_ids: @@ -287,7 +300,7 @@ class Effect: retval = None return retval - #a dictionary of unit to user unit conversion factors + # a dictionary of unit to user unit conversion factors __uuconv = {'in':96.0, 'pt':1.33333333333, 'px':1.0, 'mm':3.77952755913, 'cm':37.7952755913, 'm':3779.52755913, 'km':3779527.55913, 'pc':16.0, 'yd':3456.0 , 'ft':1152.0} @@ -315,12 +328,12 @@ class Effect: else: return '0' - # Function returns the unit used for the values in SVG. - # For lack of an attribute in SVG that explicitly defines what units are used for SVG coordinates, - # try to calculate the unit from the SVG width and SVG viewbox. - # Defaults to 'px' units. def getDocumentUnit(self): - svgunit = 'px' #default to pixels + """Function returns the unit used for the values in SVG. + For lack of an attribute in SVG that explicitly defines what units are used for SVG coordinates, + Try to calculate the unit from the SVG width and SVG viewbox. + Defaults to 'px' units.""" + svgunit = 'px' # default to pixels svgwidth = self.getDocumentWidth() viewboxstr = self.document.getroot().get('viewBox') @@ -331,9 +344,9 @@ class Effect: p = param.match(svgwidth) u = unitmatch.search(svgwidth) - width = 100 #default - viewboxwidth = 100 #default - svgwidthunit = 'px' #default assume 'px' unit + width = 100 # default + viewboxwidth = 100 # default + svgwidthunit = 'px' # default assume 'px' unit if p: width = float(p.string[p.start():p.end()]) else: @@ -347,23 +360,22 @@ class Effect: viewboxnumbers.append(float(t)) except ValueError: pass - if len(viewboxnumbers) == 4: #check for correct number of numbers + if len(viewboxnumbers) == 4: # check for correct number of numbers viewboxwidth = viewboxnumbers[2] svgunitfactor = self.__uuconv[svgwidthunit] * width / viewboxwidth # try to find the svgunitfactor in the list of units known. If we don't find something, ... - eps = 0.01 #allow 1% error in factor + eps = 0.01 # allow 1% error in factor for key in self.__uuconv: if are_near_relative(self.__uuconv[key], svgunitfactor, eps): - #found match! - svgunit = key; + # found match! + svgunit = key return svgunit - def unittouu(self, string): - '''Returns userunits given a string representation of units in another system''' + """Returns userunits given a string representation of units in another system""" unit = re.compile('(%s)$' % '|'.join(self.__uuconv.keys())) param = re.compile(r'(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)') @@ -378,7 +390,7 @@ class Effect: return retval * (self.__uuconv[u.string[u.start():u.end()]] / self.__uuconv[self.getDocumentUnit()]) except KeyError: pass - else: # default assume 'px' unit + else: # default assume 'px' unit return retval / self.__uuconv[self.getDocumentUnit()] return retval @@ -387,7 +399,7 @@ class Effect: return val / (self.__uuconv[unit] / self.__uuconv[self.getDocumentUnit()]) def addDocumentUnit(self, value): - ''' Add document unit when no unit is specified in the string ''' + """Add document unit when no unit is specified in the string """ try: float(value) return value + self.getDocumentUnit() -- cgit v1.2.3 From 504be8ba421045a16c60bd11dbe9e334a1576f0b Mon Sep 17 00:00:00 2001 From: raphael0202 Date: Sun, 20 Mar 2016 17:19:56 +0100 Subject: [Bug #1558160] Move Script::file_listener methods to script.cpp source file. Fixed bugs: - https://launchpad.net/bugs/1558160 (bzr r14727) --- src/extension/implementation/script.cpp | 38 ++++++++++++++++++++++++++++ src/extension/implementation/script.h | 45 +++------------------------------ 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index 2ec17f947..9aaf4b952 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -1119,7 +1119,45 @@ int Script::execute (const std::list &in_command, } +void Script::file_listener::init(int fd, Glib::RefPtr main) { + _channel = Glib::IOChannel::create_from_fd(fd); + _channel->set_encoding(); + _conn = main->get_context()->signal_io().connect(sigc::mem_fun(*this, &file_listener::read), _channel, Glib::IO_IN | Glib::IO_HUP | Glib::IO_ERR); + _main_loop = main; + return; +} + +bool Script::file_listener::read(Glib::IOCondition condition) { + if (condition != Glib::IO_IN) { + _main_loop->quit(); + return false; + } + + Glib::IOStatus status; + Glib::ustring out; + status = _channel->read_line(out); + _string += out; + + if (status != Glib::IO_STATUS_NORMAL) { + _main_loop->quit(); + _dead = true; + return false; + } + + return true; +} + +bool Script::file_listener::toFile(const Glib::ustring &name) { + try { + Glib::RefPtr stdout_file = Glib::IOChannel::create_from_file(name, "w"); + stdout_file->set_encoding(); + stdout_file->write(_string); + } catch (Glib::FileError &e) { + return false; + } + return true; +} } // namespace Implementation } // namespace Extension diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h index 4cf33c989..684719895 100644 --- a/src/extension/implementation/script.h +++ b/src/extension/implementation/script.h @@ -85,49 +85,10 @@ private: }; bool isDead () { return _dead; } - - // TODO move these definitions into script.cpp - void init (int fd, Glib::RefPtr main) { - _channel = Glib::IOChannel::create_from_fd(fd); - _channel->set_encoding(); - _conn = main->get_context()->signal_io().connect(sigc::mem_fun(*this, &file_listener::read), _channel, Glib::IO_IN | Glib::IO_HUP | Glib::IO_ERR); - _main_loop = main; - - return; - }; - - bool read (Glib::IOCondition condition) { - if (condition != Glib::IO_IN) { - _main_loop->quit(); - return false; - } - - Glib::IOStatus status; - Glib::ustring out; - status = _channel->read_line(out); - _string += out; - - if (status != Glib::IO_STATUS_NORMAL) { - _main_loop->quit(); - _dead = true; - return false; - } - - return true; - }; - + void init(int fd, Glib::RefPtr main); + bool read(Glib::IOCondition condition); Glib::ustring string (void) { return _string; }; - - bool toFile (const Glib::ustring &name) { - try { - Glib::RefPtr stdout_file = Glib::IOChannel::create_from_file(name, "w"); - stdout_file->set_encoding(); - stdout_file->write(_string); - } catch (Glib::FileError &e) { - return false; - } - return true; - }; + bool toFile(const Glib::ustring &name); }; int execute (const std::list &in_command, -- cgit v1.2.3 From 9f0f6845ee2584b8fdb110db408e66afad5afa26 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 20 Mar 2016 18:22:19 +0100 Subject: Various minor bugfixes to rotate copies (bzr r14728) --- src/live_effects/lpe-copy_rotate.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index c0c510fa6..f07b2c698 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -74,7 +74,7 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), - fuse_paths(_("Fuse paths"), _("Fuse paths by helper line -Use fill rule: evenodd for best result-"), "fuse_paths", &wr, this, false), + fuse_paths(_("Fuse paths"), _("Fuse paths by helper line, use fill-rule: evenodd for best result"), "fuse_paths", &wr, this, false), dist_angle_handle(100.0) { show_orig_path = true; @@ -143,6 +143,7 @@ LPECopyRotate::doBeforeEffect (SPLPEItem const* lpeitem) num_copies.param_set_increments(2,2); if ((int)num_copies%2 !=0) { num_copies.param_set_value(num_copies+1); + rotation_angle.param_set_value(360.0/(double)num_copies); } } else { num_copies.param_set_increments(1,1); @@ -181,6 +182,9 @@ LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) std::sort(crossed.begin(), crossed.end()); for (unsigned int i = 0; i < crossed.size(); i++) { double time_end = crossed[i]; + if(time_start == time_end){ + continue; + } Geom::Path portion_original = original.portion(time_start,time_end); if (!portion_original.empty()) { Geom::Point side_checker = portion_original.pointAt(0.001); -- cgit v1.2.3 From 400e02890fda98daad1149a13976f0e17567f6fc Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 20 Mar 2016 22:51:26 +0100 Subject: Fix a bug in rotate copies on apply over a ellipse when origin and end are the center of rotation (bzr r14729) --- src/live_effects/lpe-copy_rotate.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index f07b2c698..f3e05f061 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -71,8 +71,8 @@ LPECopyRotate::LPECopyRotate(LivePathEffectObject *lpeobject) : Effect(lpeobject), origin(_("Origin"), _("Origin of the rotation"), "origin", &wr, this, "Adjust the origin of the rotation"), starting_angle(_("Starting:"), _("Angle of the first copy"), "starting_angle", &wr, this, 0.0), - rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 30.0), - num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 5), + rotation_angle(_("Rotation angle:"), _("Angle between two successive copies"), "rotation_angle", &wr, this, 60.0), + num_copies(_("Number of copies:"), _("Number of copies of the original path"), "num_copies", &wr, this, 6), copies_to_360(_("360º Copies"), _("No rotation angle, fixed to 360º"), "copies_to_360", &wr, this, true), fuse_paths(_("Fuse paths"), _("Fuse paths by helper line, use fill-rule: evenodd for best result"), "fuse_paths", &wr, this, false), dist_angle_handle(100.0) @@ -199,9 +199,10 @@ LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) time_start = time_end; } } - position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); + Geom::Point side_checker = original.pointAt(original.size() - 0.001); + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); if (rotation_angle != 180) { - position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if (cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); -- cgit v1.2.3 From 651e8c239d9aedfb88f31b7d0ace14facbc866d8 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 21 Mar 2016 02:02:35 +0100 Subject: Some improvements and bugfixes to rotate copies (bzr r14730) --- src/live_effects/lpe-copy_rotate.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index f3e05f061..d2dd437cb 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -182,12 +182,12 @@ LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) std::sort(crossed.begin(), crossed.end()); for (unsigned int i = 0; i < crossed.size(); i++) { double time_end = crossed[i]; - if(time_start == time_end){ + if (time_start == time_end || time_end - time_start < Geom::EPSILON) { continue; } Geom::Path portion_original = original.portion(time_start,time_end); if (!portion_original.empty()) { - Geom::Point side_checker = portion_original.pointAt(0.001); + Geom::Point side_checker = portion_original.pointAt(0.0001); position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); if (rotation_angle != 180) { position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); @@ -199,10 +199,9 @@ LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) time_start = time_end; } } - Geom::Point side_checker = original.pointAt(original.size() - 0.001); - position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); + position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); if (rotation_angle != 180) { - position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); + position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } if (cs.size() > 0 && position == 1) { Geom::Path portion_original = original.portion(time_start, original.size()); @@ -274,7 +273,6 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); } else if (Geom::are_near(tmp_path_helper[tmp_path_helper.size()-1].finalPoint(), append_path.initialPoint())) { Geom::Path tmp_append = append_path; tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); @@ -284,7 +282,6 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); tmp_append.setInitial(tmp_path_helper[tmp_path_helper.size()-1].finalPoint()); tmp_path_helper[tmp_path_helper.size()-1].append(tmp_append); - tmp_path_helper[tmp_path_helper.size()-1] = tmp_path_helper[tmp_path_helper.size()-1].reversed(); } else if (Geom::are_near(tmp_path_helper[0].finalPoint(), append_path.finalPoint())) { Geom::Path tmp_append = append_path.reversed(); tmp_append.setInitial(tmp_path_helper[0].finalPoint()); @@ -294,7 +291,6 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s tmp_path_helper[0] = tmp_path_helper[0].reversed(); tmp_append.setInitial(tmp_path_helper[0].finalPoint()); tmp_path_helper[0].append(tmp_append); - tmp_path_helper[0] = tmp_path_helper[0].reversed(); } else { tmp_path_helper.push_back(append_path); } -- cgit v1.2.3 From e610fff062fc0eaf7cced8169585e24d57547f0e Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 21 Mar 2016 14:20:26 +0100 Subject: Documentation. French tutorials translation update. (bzr r14731) --- share/tutorials/tutorial-advanced.fr.svg | 446 +++++----- share/tutorials/tutorial-basic.fr.svg | 848 +++++++++--------- share/tutorials/tutorial-calligraphy.fr.svg | 800 ++++++++--------- share/tutorials/tutorial-elements.fr.svg | 284 +++--- share/tutorials/tutorial-interpolate.fr.svg | 688 +++++++-------- share/tutorials/tutorial-shapes.fr.svg | 1022 +++++++++++----------- share/tutorials/tutorial-tips.fr.svg | 296 +++---- share/tutorials/tutorial-tracing-pixelart.fr.svg | 72 +- share/tutorials/tutorial-tracing.fr.svg | 154 ++-- 9 files changed, 2305 insertions(+), 2305 deletions(-) diff --git a/share/tutorials/tutorial-advanced.fr.svg b/share/tutorials/tutorial-advanced.fr.svg index b8b48ff7a..4124fdbc7 100644 --- a/share/tutorials/tutorial-advanced.fr.svg +++ b/share/tutorials/tutorial-advanced.fr.svg @@ -35,445 +35,445 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::AVANCÉ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + - Ce didacticiel couvre le copier/coller, l'édition de nœuds, le dessin à main levée, le tracé de courbes de Bézier, la manipulation de chemins, les opérations booléennes, les objets offset, la simplification et l'outil texte. + Ce didacticiel couvre le copier-coller, l'édition de nœuds, le dessin à main levée, le tracé de courbes de Bézier, la manipulation de chemins, les opérations booléennes, les objets offset, la simplification et l'outil texte. - + - Faites défiler la page avec Ctrl+flèche, ou avec la souris (molette ou bouton du milieu). Pour les bases de la création, sélection et transformation d'objets, voyez le didacticiel basique du menu Aide > didacticiels. + Faites défiler la page avec Ctrl+flèche, ou avec la souris (molette ou bouton du milieu). Pour les bases de la création, sélection et transformation d'objets, voyez le didacticiel basique du menu Aide > Didacticiels. - + Techniques de collage - + - Après avoir copié (Ctrl+C) ou coupé (Ctrl+X) des objets, la commande coller (Ctrl+V) permet de coller les objets copiés juste sous le curseur de la souris (ou au centre de la fenêtre du document si le curseur est en dehors de la fenêtre). Cependant, les objets du presse-papiers retiennent leur emplacement qu'ils avaient au moment d'être copiés, et vous pouvez les recollez à ce même emplacement avec coller sur place (Ctrl+Alt+V). + Après avoir copié (Ctrl+C) ou coupé (Ctrl+X) des objets, la commande coller (Ctrl+V) permet de coller les objets copiés juste sous le curseur de la souris (ou au centre de la fenêtre du document si le curseur est en dehors de la fenêtre). Toutefois, les objets du presse-papiers mémorisent l'emplacement qu'ils avaient au moment d'être copiés, et vous pouvez les recoller à ce même emplacement avec coller sur place (Ctrl+Alt+V). - - + + - En appuyant sur Maj+Ctrl+V, vous pouvez coller le style, c'est-à-dire appliquer le style du premier objet du presse-papiers à la sélection courante. Le « style » ainsi collé inclut le remplissage, le contour et les paramètres de la police, mais pas la forme, la taille ou les paramètres spécifiques à un type de forme (comme le nombre de sommets d'une étoile). + En appuyant sur Maj+Ctrl+V, vous pouvez coller le style, c'est-à-dire appliquer le style du premier objet du presse-papiers à la sélection courante. Le « style » ainsi collé inclut le remplissage, le contour et les paramètres de la police, mais pas la forme, la taille ou les paramètres spécifiques à un type de forme (comme le nombre de sommets d'une étoile). - - + + - Encore un ensemble de commande de collage, Coller les dimensions, change l'échelle de la sélection, afin d'obtenir la taille du ou des objets contenu dans le presse-papiers. Il y a de nombreuses commandes pour coller les dimensions qui sont les suivantes : Coller les dimensions, Coller la largeur, Coller la hauteur, Coller les dimensions séparément, Coller la largeur séparément et Coller la hauteur séparément. + Un autre groupe de commandes de collage, Coller les dimensions, change l'échelle de la sélection, afin d'obtenir la taille du ou des objets contenu dans le presse-papiers. Il y a de nombreuses commandes pour coller les dimensions qui sont les suivantes : Coller les dimensions, Coller la largeur, Coller la hauteur, Coller les dimensions séparément, Coller la largeur séparément et Coller la hauteur séparément. - - + + - Coller les dimensions change l'échelle de l'entière sélection jusqu'à l'obtention de la taille du ou des objets du presse-papiers. Coller la largeur/Coller la hauteur change l'échelle de l'entière sélection horizontalement/verticalement afin d'obtenir la meme largeur/hauteur que le ou les objets du presse-papiers. Ces commandes respectent le verrou des proportions sur la bar de contrôle de l'outil Sélection (entre les champs L et H), de façon à ce que lorsque le verrou est actif, l'autre dimension de l'objet sélectionné soit transformé dans les mêmes proportions ; dans le cas contraire, l'autre dimension ne sera pas modifiée. La commande « Séparément » fonctionne de la même façon que les commandes précédemment décrites, à l'exception près que chaque objet sélectionné change d’échelle séparément, afin que chacun ai la taille/largeur/hauteur du ou des objets du presse-papiers. + Coller les dimensions change l'échelle de l'entière sélection jusqu'à l'obtention de la taille du ou des objets du presse-papiers. Coller la largeur/Coller la hauteur change l'échelle de l'entière sélection horizontalement/verticalement afin d'obtenir la même largeur/hauteur que le ou les objets du presse-papiers. Ces commandes respectent le verrou des proportions sur la barre de contrôle de l'outil Sélection (entre les champs L et H), de façon à ce que lorsque le verrou est actif, l'autre dimension de l'objet sélectionné soit transformée dans les mêmes proportions ; dans le cas contraire, l'autre dimension ne sera pas modifiée. La commande « Séparément » fonctionne de la même façon que les commandes précédemment décrites, à l'exception près que chaque objet sélectionné change d'échelle séparément, afin que chacun ait la taille/largeur/hauteur du ou des objets du presse-papiers. - - + + - Inkscape utilise le presse-papier du système d'exploitation. Vous pouvez copier et coller entre différentes instances d'Inkscape, ou entre Inkscape et une autre application (à condition que celle-ci soit capable de manipuler le SVG déposé dans le presse-papier). + Inkscape utilise le presse-papiers du système d'exploitation. Vous pouvez copier et coller entre différentes instances d'Inkscape, ou entre Inkscape et une autre application (à condition que celle-ci soit capable de manipuler le SVG déposé dans le presse-papiers). - - Dessiner à main levée et tracer des chemins + + Dessiner à main levée et tracer des chemins - - + + - La façon la plus simple de dessiner une forme quelconque est d'utiliser l'outil dessin à main levée (crayon) (F6) : + La façon la plus simple de dessiner une forme quelconque est d'utiliser l'outil Dessin à main levée (crayon — F6) : - - - - - - - - - - - + + + + + + + + + + + - Pour obtenir des formes plus régulières, utilisez plutôt les courbes de Bézier (stylo) (Maj+F6) : + Pour obtenir des formes plus régulières, utilisez plutôt les courbes de Bézier (stylo — Maj+F6) : - - - - - - - - - - - + + + + + + + + + + + - Avec l'outil stylo, chaque cliquer crée un nœud dur sans poignée d'incurvation, et donc une série de clics produit une séquence de segments de droite. Cliquer-déplacer crée un nœud de Bézier doux, avec deux poignées de contrôles colinéaires opposées. Appuyez sur Maj tout en déplaçant une poignée de contrôle pour la faire tourner en gardant l'autre fixe. Comme d'habitude, Ctrl limite la modification de la direction d'un segment ou des poignées de contrôle par incréments de 15 degrés. Appuyer sur Entrée finalise le tracé, Esc l'annule. Pour annuler uniquement le dernier segment d'une ligne non finalisée, appuyez sur Effacement arrière. + Avec l'outil stylo, chaque clic crée un nœud dur sans poignée d'incurvation, et donc une série de clics produit une séquence de segments de droite. Cliquer-déplacer crée un nœud de Bézier doux, avec deux poignées de contrôles colinéaires opposées. Appuyez sur Maj tout en déplaçant une poignée de contrôle pour la faire tourner en gardant l'autre fixe. Comme d'habitude, Ctrl limite la modification de la direction d'un segment ou des poignées de contrôle par incréments de 15 degrés. Appuyer sur Entrée finalise le tracé, Échap l'annule. Pour annuler uniquement le dernier segment d'une ligne non finalisée, appuyez sur Retour arrière. - - + + - Dans les outils dessin à main levée et courbes de Bézier, tout chemin sélectionné affiche des petites ancres carrées à ses extrémités. Ces ancres vous permettent de prolonger ce chemin (en dessinant en partant de ces ancres) ou de le fermer (en dessinant d'une ancre + Dans les outils Dessin à main levée et Courbes de Bézier, tout chemin sélectionné affiche des petites ancres carrées à ses extrémités. Ces ancres vous permettent de prolonger ce chemin (en dessinant en partant de ces ancres) ou de le fermer (en dessinant d'une ancre - - Éditer des chemins + + Éditer des chemins - - + + - Contrairement aux formes créées par les outils forme, les outils dessin à main levée et courbes de Bézier créent ce que l'on appelle des chemins. Un chemin est une séquence de segments et/ou de courbes de Bézier qui, comme tout autre objet d'Inkscape, peut avoir des propriétés de remplissage et de contour. Mais contrairement à une forme, un chemin peut être modifié en déplaçant indépendamment n'importe lequel de ses nœuds (et pas seulement des poignées prédéfinies) ou en déplaçant un segment du chemin. Sélectionnez ce chemin et utilisez l'outil nœud (F2) : + Contrairement aux formes créées par les outils Forme, les outils Dessin à main levée et Courbes de Bézier créent ce que l'on appelle des chemins. Un chemin est une séquence de segments et/ou de courbes de Bézier qui, comme tout autre objet d'Inkscape, peut avoir des propriétés de remplissage et de contour. Mais contrairement à une forme, un chemin peut être modifié en déplaçant indépendamment n'importe lequel de ses nœuds (et pas seulement des poignées prédéfinies) ou en déplaçant un segment du chemin. Sélectionnez ce chemin et utilisez l'outil Nœuds (F2) : - - - + + + - Vous devez voir un certain nombre de nœuds carrés gris sur le chemin. Ces nœuds peuvent être sélectionnés avec un cliquer, Maj+cliquer ou avec une bande étirable — exactement comme les objets avec le sélecteur. Vous pouvez également cliquer sur un segment de chemin pour sélectionner automatiquement les nœuds adjacents. Les nœuds sélectionnés sont mis en valeur et affichent leurs poignées de contrôle — Un ou deux petits cercles connectés à chacun des nœuds sélectionnés par des segments de droite. la touche ! inverse la sélection des nœuds dans les sous-chemins courants (par exemple les sous-chemins avec un moins un nœud de sélectionné); Alt+! inverse dans tout le chemin. + Vous devez voir un certain nombre de nœuds carrés gris sur le chemin. Ces nœuds peuvent être sélectionnés avec un clic, Maj+clic ou avec une bande étirable — exactement comme les objets avec le sélecteur. Vous pouvez également cliquer sur un segment de chemin pour sélectionner automatiquement les nœuds adjacents. Les nœuds sélectionnés sont mis en valeur et affichent leurs poignées de contrôle — un ou deux petits cercles connectés à chacun des nœuds sélectionnés par des segments de droite. La touche ! inverse la sélection des nœuds dans les sous-chemins actuels (par exemple les sous-chemins avec au moins un nœud de sélectionné) ; Alt+! inverse dans tout le chemin. - - + + - Les chemins peuvent être édités en déplaçant leurs nœuds, les poignées de contrôle de ces nœuds ou directement en déplaçant un de ses segments (essayez de déplacer certains nœuds, poignées de contrôle et segments du chemin ci-dessus). Ctrl permet comme d'habitude de restreindre les déplacements et rotations. Les touches flèche, Tab, [, ], <, > et les combinaisons qui y sont associées fonctionnent comme dans le sélecteur mais s'appliquent aux nœuds au lieu des objets. Vous pouvez ajouter des nœuds n'importe où sur les chemins en double-cliquant ou avec Ctrl+Alt+cliquer à l'endroit désiré. + Les chemins peuvent être édités en déplaçant leurs nœuds, les poignées de contrôle de ces nœuds ou directement en déplaçant un de ses segments (essayez de déplacer certains nœuds, poignées de contrôle et segments du chemin ci-dessus). Ctrl permet comme d'habitude de restreindre les déplacements et rotations. Les touches flèche, Tab, [, ], <, > et les combinaisons qui y sont associées fonctionnent comme dans le sélecteur mais s'appliquent aux nœuds au lieu des objets. Vous pouvez ajouter des nœuds n'importe où sur les chemins en double-cliquant ou avec Ctrl+Alt+clic à l'endroit désiré. - - + + - Vous pouvez supprimer les nœuds avec (Suppr) ou à l'aide de Ctrl+Alt+cliquer. Lorsque des nœuds sont effacés, Inkscape va tenter de conserver la forme du chemin, si vous désirez, que les poignées de contrôle des nœuds adjacents rétrécissent (ne pas conserver la forme), vous pouvez effacer avec Ctrl+Suppr. De plus, vous pouvez dupliquer (Maj+D) les nœuds sélectionnés. Un chemin peut être brisé (Maj+B) aux nœuds sélectionnés; ou si vous sélectionnez deux nœuds terminaux, vous pouvez les joindre (Maj+J). + Vous pouvez supprimer les nœuds avec (Suppr) ou à l'aide de Ctrl+Alt+clic. Lorsque des nœuds sont effacés, Inkscape va tenter de conserver la forme du chemin ; si vous souhaitez que les poignées de contrôle des nœuds adjacents rétrécissent (ne pas conserver la forme), vous pouvez effacer avec Ctrl+Suppr. De plus, vous pouvez dupliquer (Maj+D) les nœuds sélectionnés. Un chemin peut être brisé (Maj+B) aux nœuds sélectionnés ; ou si vous sélectionnez deux nœuds terminaux, vous pouvez les joindre (Maj+J). - - + + - Un nœud peut être rendu dur (Maj+C), ses poignées de contrôle pouvant alors être déplacées indépendamment avec un angle différent pour chacuns; doux (Maj+S), les poignées restant alignées (colinéaires) ; symétrique (Maj+Y), ce qui donne les même résultats que doux, mais où les poignées de contrôle ont la même longueur (poignées alignées et équidistantes) ; ou automatique (Maj+A), un nœud spécial qui ajuste automatiquement les poignées des nœuds et les nœuds automatiques voisins pour maintenir une courbe douce. Lorsque vous passez à ce type de nœuds, vous pouvez préserver la position d'une, des deux poignées en déplaçant la souris par dessus, de façon à ce que seule l'autre poignée de contrôle tourne ou change d'échelle jusqu'à obtenir le même résultat. + Un nœud peut être rendu dur (Maj+C), ses poignées de contrôle pouvant alors être déplacées indépendamment avec un angle différent pour chacun ; doux (Maj+S), les poignées restant alignées (colinéaires) ; symétrique (Maj+Y), ce qui donne les même résultats que doux, mais les poignées de contrôle ayant la même longueur (poignées alignées et équidistantes) ; ou automatique (Maj+A), un nœud spécial qui ajuste automatiquement les poignées des nœuds et les nœuds automatiques voisins pour maintenir une courbe douce. Lorsque vous passez à ce type de nœuds, vous pouvez préserver la position d'une, des deux poignées en déplaçant la souris par-dessus, de façon à ce que seule l'autre poignée de contrôle tourne ou change d'échelle jusqu'à obtenir le même résultat. - - + + - Vous pouvez aussi rétracter les poignées de contrôle d'un nœud en effectuant un Ctrl+cliquer sur ce dernier. Si deux nœuds adjacents ont leurs poignées rétractées, le chemin entre ces deux nœuds devient un segment de droite. Pour faire ressortir les poignées rétractées d'un nœud, effectuer un Maj+déplacer depuis ce nœud. + Vous pouvez aussi rétracter les poignées de contrôle d'un nœud en effectuant un Ctrl+clic sur ce dernier. Si deux nœuds adjacents ont leurs poignées rétractées, le chemin entre ces deux nœuds devient un segment de droite. Pour faire ressortir les poignées rétractées d'un nœud, effectuer un Maj+déplacer depuis ce nœud. - - Sous-chemins et combinaisons + + Sous-chemins et combinaisons - - + + Un objet chemin peut contenir plus d'un sous-chemin. Un sous-chemin est une séquence de nœuds connectés les uns aux autres (donc, si un chemin a plusieurs sous-chemins, tous ses nœuds ne sont pas interconnectés). Ci-dessous à gauche, les trois sous-chemins appartiennent à un même chemin composé ; les trois mêmes sous-chemins à droite sont des objets chemins indépendants : - - - - - - + + + + + + - Notez qu'un chemin composé est différent d'un groupe. C'est un objet unique qui n'est sélectionnable que comme un tout. Si vous sélectionnez l'objet de gauche, ci-dessus, et utilisez l'outil nœuds, vous verrez les nœuds des trois sous-chemins affichés simultanément. À droite, vous ne pouvez éditer que les nœuds d'un sous-chemin à la fois. + Notez qu'un chemin composé est différent d'un groupe. C'est un objet unique qui n'est sélectionnable que comme un tout. Si vous sélectionnez l'objet de gauche, ci-dessus, et utilisez l'outil Nœuds, vous verrez les nœuds des trois sous-chemins affichés simultanément. À droite, vous ne pouvez éditer que les nœuds d'un sous-chemin à la fois. - - + + - Inkscape peut combiner des chemins en un chemin composé (Ctrl+K) et séparer un chemin composé en sous-chemins (Maj+Ctrl+K). Essayez ces commandes sur les exemples ci-dessus. Comme un objet ne peut avoir qu'un remplissage et contour, un chemin combiné reçoit le style du premier objet (le plus bas dans l'ordre-z) de la combinaison. + Inkscape peut combiner des chemins en un chemin composé (Ctrl+K) et séparer un chemin composé en sous-chemins (Maj+Ctrl+K). Essayez ces commandes sur les exemples ci-dessus. Comme un objet ne peut avoir qu'un remplissage et contour, un chemin combiné reçoit le style du premier objet (le plus bas dans l'ordre z) de la combinaison. - - + + Si vous combinez des chemins avec remplissage qui se chevauchent, le remplissage disparaîtra dans les zones de chevauchement : - - - + + + Ceci est la façon la plus facile de créer des objets troués. Pour des opérations encore plus puissantes sur des chemins, utilisez les opérations booléennes (voir plus bas). - - Convertir en chemin + + Convertir en chemin - - + + - Tout objet texte ou forme peut être converti en chemin (Maj+Ctrl+C). Cette opération ne modifie pas son apparence mais lui enlève les capacités liées à son type (par exemple, vous ne pouvez plus modifier l'arrondi des coins d'un rectangle ou éditer un texte) ; par contre, cela vous permet d'en éditer les nœuds. Voici deux étoiles, celle de gauche est une forme et la même à droite a été convertie en chemin. Passez en mode nœud et comparez leur possibilités d'édition : + Tout objet texte ou forme peut être converti en chemin (Maj+Ctrl+C). Cette opération ne modifie pas son apparence mais lui enlève les capacités liées à son type (par exemple, vous ne pouvez plus modifier l'arrondi des coins d'un rectangle ou éditer un texte) ; par contre, cela vous permet d'en éditer les nœuds. Voici deux étoiles ; celle de gauche est une forme et la même à droite a été convertie en chemin. Passez en mode Nœuds et comparez leurs possibilités d'édition : - - - - + + + + - De plus, vous pouvez convertir en chemin (ou détourer) (Ctrl+Alt+C) le contour de n'importe quel objet. Ci-dessous, le premier objet est le chemin original (pas de remplissage, contour noir), tandis que le second est le résultat d'une commande Contour en chemin (remplissage noir, pas de contour) : + De plus, vous pouvez convertir en chemin (ou détourer — Ctrl+Alt+C) le contour de n'importe quel objet. Ci-dessous, le premier objet est le chemin original (pas de remplissage, contour noir), tandis que le second est le résultat d'une commande Contour en chemin (remplissage noir, pas de contour) : - - - - Opérations booléennes + + + + Opérations booléennes - - + + Les commandes du menu Chemin vous permettent de combiner deux objets ou plus en utilisant des opérations booléennes : - Formes originales - Union (Ctrl++) - Différence (Ctrl+-) - Intersection(Ctrl+*) - Exclusion(Ctrl+^) - Division(Ctrl+/) - Découper les chemins(Ctrl+Alt+/) - - - - - - - - - - - (bas moins haut) - - + Formes originales + Union (Ctrl++) + Différence (Ctrl+-) + Intersection(Ctrl+*) + Exclusion(Ctrl+^) + Division(Ctrl+/) + Découper le chemin(Ctrl+Alt+/) + + + + + + + + + + + (dessous moins dessus) + + - Les raccourcis clavier de ces commandes font allusion à leurs opérateurs arithmétiques booléens analogues (union pour addition, différence pour soustraction, etc.). Les commandes Différence et Exclusion ne peuvent s'appliquer qu'à deux objets sélectionnés, les autres opérations à un nombre quelconque. Le résultat reçoit toujours le style de l'objet du fond dans l'ordre-z. + Les raccourcis clavier de ces commandes correspondent aux opérateurs arithmétiques booléens analogues (union pour addition, différence pour soustraction, etc.). Les commandes Différence et Exclusion ne peuvent s'appliquer qu'à deux objets sélectionnés, les autres opérations à un nombre quelconque. Le résultat reçoit toujours le style de l'objet du fond dans l'ordre z. - - + + - Le résultat d'une commande Exclure ressemble à celui d'une Combinaison (voir plus haut), mais ajoute des nœuds aux intersections des chemins. Dans la Division le chemin de l'objet du dessus coupe celui du dessous tandis que Découper les chemins se limite à utiliser l'objet du dessusi pour couper le contour de celoui du dessous et à en supprimer les remplissages (ceci est pratique pour découper en morceaux des tracés sans remplissage). + Le résultat d'une commande Exclure ressemble à celui d'une Combinaison (voir plus haut), mais ajoute des nœuds aux intersections des chemins. Dans la Division le chemin de l'objet du dessus coupe celui du dessous tandis que Découper le chemin se limite à utiliser l'objet du dessus pour couper le contour de celui du dessous et à en supprimer les remplissages (ceci est pratique pour découper en morceaux des tracés sans remplissage). - - Éroder et dilater + + Éroder et dilater - - + + - Inkscape peut étendre et contracter des objets par une modification de leurs dimensions, mais aussi par offset du chemin, c'est-à-dire par un déplacement perpendiculaire en tout point du chemin. Les commandes correspondantes sont Éroder (Ctrl+() et Dilater (Ctrl+)). Par exemple, ci-dessous, voyez le chemin original (en rouge) et des érosions et dilatations de celui-ci : + Inkscape peut étendre et contracter des objets par une modification de leurs dimensions, mais aussi par offset du chemin, c'est-à-dire par un déplacement perpendiculaire en tout point du chemin. Les commandes correspondantes sont Éroder (Ctrl+() et Dilater (Ctrl+)). Par exemple, ci-dessous, voyez le chemin original (en rouge) et des érosions et dilatations de celui-ci : - - - - - - - - - + + + + + + + + + - Les commandes éroder et dilater produisent des chemins (si nécessaire en convertissant l'objet original en chemin). Un offset dynamique (Ctrl+J) sera souvent plus pratique : il crée un objet avec une poignée déplaçable qui contrôle le rayon d'offset. Voyez avec l'objet ci-dessous; sélectionnez-le et passez en édition de nœuds pour vous faire une idée: + Les commandes éroder et dilater produisent des chemins (si nécessaire en convertissant l'objet original en chemin). Un offset dynamique (Ctrl+J) sera souvent plus pratique : il crée un objet avec une poignée déplaçable qui contrôle le rayon d'offset. Voyez avec l'objet ci-dessous ; sélectionnez-le et passez en édition de nœuds pour vous faire une idée : - - - + + + - Un tel objet offset dynamique retient le chemin d'origine, et ainsi ne se "dégrade" pas quand vous modifiez un grand nombre de fois la distance d'offset. Quand vous n'avez plus besoin de l'ajuster, vous pouvez toujours le convertir de nouveau en chemin. + Un tel objet offset dynamique retient le chemin d'origine, et ainsi ne se « dégrade » pas quand vous modifiez un grand nombre de fois la distance d'offset. Quand vous n'avez plus besoin de l'ajuster, vous pouvez toujours le convertir de nouveau en chemin. - - + + Encore plus pratique : l'offset lié, similaire à un offset dynamique mais connecté au chemin qui reste éditable. Vous pouvez en créer autant que vous voulez à partir d'un chemin source. Ci-dessous, le chemin source est en rouge, le premier offset lié à celui-ci a un contour noir et pas de remplissage, l'autre un remplissage noir et pas de contour. - - + + - Sélectionnez l'objet rouge et éditez ses nœuds ; voyez le comportement des offsets liés. Maintenant sélectionnez un des offsets et déplacez sa poignée pour ajuster le rayon d'offset. Enfin, observer la façon dont le déplacement ou la transformation de l'objet source affecte les offsets qui lui sont liés et le fait que vous pouvez déplacer et transformer les offsets liés indépendamment sans perdre leur lien avec l'objet source. + Sélectionnez l'objet rouge et éditez ses nœuds ; voyez le comportement des offsets liés. Maintenant sélectionnez un des offsets et déplacez sa poignée pour ajuster le rayon d'offset. Enfin, observez la façon dont le déplacement ou la transformation de l'objet source affecte les offsets qui lui sont liés et le fait que vous pouvez déplacer et transformer les offsets liés indépendamment sans perdre leur lien avec l'objet source. - + - - Simplification + + Simplification - - + + - L'utilisation principale de la commande simplifier (Ctrl+L) est réduire le nombre de nœuds d'un chemin tout en préservant au maximum son aspect. Cela peut être utile pour les chemins tracés à main levée car cet outil crée parfois plus de nœuds que nécessaire. Ci-dessous, le dessin de gauche a été crée à main levée et celui de droite est une copie qui a été quelque peu simplifiée. Le chemin original comporte 28 nœuds, tandis que le simplifié n'en a que 17 (et est donc bien plus facile à retravailler avec l'outil nœuds) et est plus lisse. + L'usage le plus courant de la commande simplifier (Ctrl+L) est la réduction du nombre de nœuds d'un chemin tout en préservant au maximum son aspect. Cela peut être utile pour les chemins tracés à main levée car cet outil crée parfois plus de nœuds que nécessaire. Ci-dessous, le dessin de gauche a été créé à main levée et celui de droite est une copie qui a été quelque peu simplifiée. Le chemin original comporte 28 nœuds, tandis que le simplifié n'en a que 17 (et est donc bien plus facile à retravailler avec l'outil Nœuds) et est plus lisse. - - - - + + + + - L'importance de la simplification (appelée seuil) dépend de la taille de la sélection. Ainsi, si vous sélectionnez simultanément un chemin et un autre objet plus important, la simplification sera plus agressive que pour le chemin seul. De plus, la commande simplifier est accélérée : si vous appuyez sur Ctrl+L plusieurs fois de suite rapidement (avec moins de 0,5 sec entre 2 appuis consécutifs) le seuil est incrémenté à chaque pression. Après une pause le seuil de simplification revient à sa valeur par défaut. Grâce à cette accélération, il est facile d'ajuster précisement la simplification dont vous avez besoin pour chaque cas. + L'importance de la simplification (appelée seuil) dépend de la taille de la sélection. Ainsi, si vous sélectionnez simultanément un chemin et un autre objet plus important, la simplification sera plus agressive que pour le chemin seul. De plus, la commande simplifier est accélérée : si vous appuyez sur Ctrl+L plusieurs fois de suite rapidement (avec moins de 0,5 s entre deux appuis consécutifs), le seuil est incrémenté à chaque pression. Après une pause, le seuil de simplification revient à sa valeur par défaut. Grâce à cette accélération, il est facile d'ajuster précisément la simplification dont vous avez besoin pour chaque cas. - - + + - En plus d'adoucir les tracés à main, simplifier peut être utilisé pour générer différents effets créatifs et originaux. Une forme plutôt rigide et géométrique bénéficiera souvent d'un brin de simplification qui lui donnera un peu de vie — adoucissant certains coins et introduisant des distorsions très naturelles, parfois très stylées et d'autres fois plutôt amusantes. Voici un exemple de dessin (clipart) bien plus réussi après avoir été simplifié : + En plus d'adoucir les tracés à main, simplifier peut être utilisé pour générer différents effets créatifs et originaux. Une forme plutôt rigide et géométrique bénéficiera souvent d'un brin de simplification qui lui donnera un peu de vie — adoucissant certains coins et introduisant des distorsions très naturelles, parfois très stylées et d'autres fois plutôt amusantes. Voici un exemple de dessin (clipart) bien plus réussi après avoir été simplifié : - Original - Simplification légère - Simplification agressive - - - - - Créer du texte + Original + Simplification légère + Simplification agressive + + + + + Créer du texte - - + + - Inkscape permet la composition de textes longs et complexes. Cependant, il convient aussi assez bien pour la création de petits textes comme des titres, bannières, logos, des légendes de diagrammes, légendes, etc. Cette section est une introduction très basique aux possibilités de création de textes avec Inkscape. + Inkscape permet la composition de textes longs et complexes. Cependant, il convient aussi assez bien pour la création de petits textes comme des titres, bannières, logos, étiquettes et légendes de diagrammes, etc. Cette section est une introduction très basique aux possibilités de création de textes avec Inkscape. - - + + - Créer un objet texte se fait tout simplement en passant à l'outil texte (F8), cliquant quelque part sur le canevas et tapant votre texte. Pour changer la police, le style, la taille ou l'alignement d'un texte, ouvrez la boîte de dialogue texte et police (Maj+Ctrl+T). Cette boîte de dialogue a aussi un onglet de saisie de texte que vous pouvez utiliser afin d'éditer l'objet texte sélectionné - dans certaines situations, il peut être plus pratique que l'édition directement sur le canevas (notamment, cet onglet supporte la vérification d'orthographe à la volée). + Créer un objet texte se fait tout simplement en passant à l'outil Texte (F8), en cliquant quelque part sur le canevas et en tapant votre texte. Pour changer la police, le style, la taille ou l'alignement d'un texte, ouvrez la boîte de dialogue texte et police (Maj+Ctrl+T). Cette boîte de dialogue a aussi un onglet de saisie de texte que vous pouvez utiliser afin d'éditer l'objet texte sélectionné — dans certaines situations, il peut être plus pratique que l'édition directement sur le canevas (notamment, cet onglet supporte la vérification orthographique à la volée). - - + + - Comme les autres outils, l'outil texte peut sélectionner des objets de son propre type — les objets texte donc — de sorte que vous pouvez cliquer sur tout objet texte existant (comme ce paragraphe) afin de le sélectionner ou d'y positionner votre curseur. + Comme les autres outils, l'outil Texte peut sélectionner des objets de son propre type — les objets texte donc — de sorte que vous pouvez cliquer sur tout objet texte existant (comme ce paragraphe) afin de le sélectionner ou d'y positionner votre curseur. - - + + - Une des opérations les plus courantes sur la mise en page des textes est l'ajustement de l'espacement entre des lettres ou des lignes. Comme toujours, Inkscape fournit des raccourcis clavier dans ce but. Les combinaisons Alt+< et Alt+> modifient l'inter-lettrage de la ligne courante d'un objet texte, de sorte que la longueur de cette ligne change d'1 pixel au zoom actuel (à comparer avec le comportement du sélecteur où les mêmes touches permettent de modifier les dimensions d'un objet au pixel près). Généralement, si la taille de la police est plus grande que celle par défaut dans un objet texte, elle présentent un meilleur rendu après en avoir légèrement resserré les lettres. Voici un exemple : + Une des opérations les plus courantes sur la mise en page des textes est l'ajustement de l'espacement entre des lettres ou des lignes. Comme toujours, Inkscape fournit des raccourcis clavier dans ce but. Les combinaisons Alt+< et Alt+> modifient l'inter-lettrage de la ligne courante d'un objet texte, de sorte que la longueur de cette ligne change d'1 pixel au zoom actuel (à comparer avec le comportement du sélecteur où les mêmes touches permettent de modifier les dimensions d'un objet au pixel près). Généralement, si la taille de la police est plus grande que celle par défaut dans un objet texte, elle présente un meilleur rendu après en avoir légèrement resserré les lettres. Voici un exemple : - Original - Inter lettrage diminué - Inspiration - Inspiration - - + Original + Inter-lettrage diminué + Inspiration + Inspiration + + - La version remaniée rend un peu mieux, mais n'est toujours pas parfaite : les distances entre les lettres ne sont pas uniformes; par exemple, le "a" et le "t" sont trop éloignés tandis que le "t" et le "i" sont trop proches. L'imperfection des crénages (particulièrement visible avec des grandes tailles de police) est plus importante dans des fontes de mauvaise qualité, mais, vous trouverez probablement, dans toutes les chaînes de caractères et toute les polices, des paires de lettres qui bénéficieront d'un ajustement de crénage. + La version remaniée rend un peu mieux, mais n'est toujours pas parfaite : les distances entre les lettres ne sont pas uniformes ; par exemple, le « a » et le « t » sont trop éloignés tandis que le « t » et le « i » sont trop proches. L'imperfection des crénages (particulièrement visible avec des grandes tailles de police) est plus importante dans des fontes de mauvaise qualité ; toutefois, vous trouverez probablement, dans toutes les chaînes de texte et toutes les polices, des paires de lettres qui bénéficieront d'un ajustement de crénage. - - + + - Inkscape facilite ces ajustements; vous n'avez qu'à positionner votre curseur d'édition de texte entre les caractères qui posent problème et à utiliser Alt+flèche pour déplacer les lettres à droite du curseur. Vous trouverez encore ci-dessous le même exemple, mais cette fois avec des ajustements manuels, de sorte que les lettres sont positionnées uniformément. + Inkscape facilite ces ajustements ; vous n'avez qu'à positionner votre curseur d'édition de texte entre les caractères qui posent problème et à utiliser Alt+flèche pour déplacer les lettres à droite du curseur. Vous trouverez encore ci-dessous le même exemple, mais cette fois avec des ajustements manuels, de sorte que les lettres sont positionnées uniformément. - Inter lettrage diminué et crénage manuel de certaines paires de lettres - Inspiration - - + Inter-lettrage diminué et crénage manuel de certaines paires de lettres + Inspiration + + En plus de pouvoir déplacer les lettres horizontalement avec Alt+Gauche ou Alt+Droite, vous pouvez aussi les déplacer verticalement en utilisant Alt+Haut or Alt+Bas : - Inspiration - - + Inspiration + + Bien sûr, vous pourriez convertir votre texte en chemin (Maj+Ctrl+C) et déplacer les lettres comme un objet chemin classique. Cependant, il est bien plus pratique de conserver ses propriétés de texte : il reste éditable, vous pouvez essayer différentes fontes tout en préservant vos crénages et espacements, et la taille du fichier enregistré reste plus petite. Le seul désavantage de conserver le « texte en texte » est que vous devrez avoir sa fonte originale installée sur tout système où vous voudriez ouvrir votre document SVG. - - + + De la même façon, vous pouvez ajuster l'inter-lignage des objets texte de plusieurs lignes. Essayez les raccourcis Ctrl+Alt+< et Ctrl+Alt+> sur n'importe quel paragraphe de ce didacticiel pour faire varier la hauteur globale de l'objet texte de 1 pixel au zoom courant. Comme dans le sélecteur, combiner un raccourci d'espacement ou de crénage avec la touche Maj multipliera son action par 10. - - Editeur XML + + Éditeur XML - - + + - L'outil le plus puissant d'Inkscape est l'éditeur XML (Maj+Ctrl+X). Affichant l'arborescence XML complète du document, il en reflète en permanence l'état courant. Vous pouvez modifier votre dessin et observer les changements correspondants dans l'arborescence XML. De plus, vous pouvez éditer tout texte, élément ou attribut dans l'éditeur XML et voir le résultat sur le canevas. C'est le meilleur outil imaginable pour apprendre le SVG interactivement et il vous permet d'appliquer des astuces qui seraient impossible avec des outils d'édition standard. + L'outil le plus puissant d'Inkscape est l'éditeur XML (Maj+Ctrl+X). Affichant l'arborescence XML complète du document, il en reflète en permanence l'état courant. Vous pouvez modifier votre dessin et observer les changements correspondants dans l'arborescence XML. De plus, vous pouvez éditer tout texte, élément ou attribut dans l'éditeur XML et voir le résultat sur le canevas. C'est le meilleur outil imaginable pour apprendre le SVG interactivement et il vous permet d'appliquer des astuces qui seraient impossibles avec des outils d'édition standard. - - Conclusion + + Conclusion - - + + - Ce didacticiel ne montre qu'une petite partie des possibilités d'Inkscape. Nous espérons que vous l'avez apprécié. N'ayez pas peur d'expérimenter et de partager vos créations. Veuillez consulter www.inkscape.org pour avoir accès à plus d'information, aux dernières versions et à l'aide des communautés de développeurs et utilisateurs. + Ce didacticiel ne montre qu'une petite partie des possibilités d'Inkscape. Nous espérons que vous l'avez apprécié. N'ayez pas peur d'expérimenter et de partager vos créations. Veuillez consulter www.inkscape.org pour avoir accès à plus d'information, aux dernières versions et à l'aide des communautés de développeurs et utilisateurs. - + @@ -503,8 +503,8 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer diff --git a/share/tutorials/tutorial-basic.fr.svg b/share/tutorials/tutorial-basic.fr.svg index 5916df7e9..d099c7255 100644 --- a/share/tutorials/tutorial-basic.fr.svg +++ b/share/tutorials/tutorial-basic.fr.svg @@ -35,419 +35,419 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::BASIQUE - + - Ce didacticiel présente les opérations de base d'Inkscape. C'est un document réalisé avec Inkscape que vous pouvez afficher, éditer et éventuellement sauver. + Ce didacticiel présente les opérations de base d'Inkscape. Il se présente sous la forme d'un document Inkscape que vous pouvez visionner, éditer et éventuellement sauvegarder. - - + + - Le didacticiel basique aborde la navigation sur le canevas, la gestion des documents, les bases des outils de formes, la transformation d'objets à l'aide du sélecteur, les techniques de sélection, le groupement, les remplissages et contours, l'alignement et la superposition. Pour d'autres sujets, consultez les autres didacticiels dans le menu d'aide. + Le didacticiel basique aborde la navigation sur le canevas, la gestion des documents, les bases des outils de formes, la transformation d'objets à l'aide du sélecteur, les techniques de sélection, le groupement, le paramétrage du remplissage et du contour, l'alignement et la superposition. Pour des sujets plus avancés, consultez les autres didacticiels dans le menu Aide. - - Se déplacer sur le canevas + + Se déplacer sur le canevas - - + + - Il existe plusieurs façons de se déplacer sur le canevas. Vous pouvez essayer le raccourci Ctrl+flèche pour vous déplacer dans ce document (essayez donc dès maintenant de faire défiler ce document vers le bas). Vous pouvez aussi vous déplacer à l'aide du bouton milieu de la souris ou utiliser les barres de défilement (Ctrl+B permet de les afficher ou non). La molette de la souris permet les déplacements verticaux, et même horizontaux en combinaison avec la touche Maj. + Il y a plusieurs façons de se déplacer sur le canevas. Utilisez le raccourci Ctrl+flèche pour vous déplacer avec le clavier (essayez donc dès maintenant de faire défiler ce document vers le bas). Vous pouvez aussi faire glisser le canevas en enfonçant le bouton du milieu de la souris. Ou bien, vous pouvez utiliser les barres de défilement (Ctrl+B permet de les afficher/masquer). La molette de la souris permet les déplacements verticaux, et même horizontaux en combinaison avec la touche Maj. - - Zoomer ou dézoomer + + Zoomer et dézoomer - - + + - + - Le moyen le plus simple est d'utiliser les touches - et + (ou =). Vous pouvez aussi zoomer avec Ctrl+clic-milieu ou Ctrl+clic-droit, et dézoomer avec Maj+clic-milieu ou Maj+clic-droit, ou bien utiliser la molette de la souris en tout en appuyant sur Ctrl. Vous pouvez aussi cliquer sur le champ de saisie (dans le coin en bas à droite de la fenêtre), y entrer une valeur de zoom, et la valider en pressant la touche entrée. Enfin, il reste l'outil de zoom (dans la barre d'outils à gauche) qui vous permet de définir une région sur laquelle zoomer à l'aide de la souris. + Le moyen le plus simple est d'utiliser les touches - et + (ou =). Vous pouvez aussi zoomer avec Ctrl+clic-milieu ou Ctrl+clic-droit, et dézoomer avec Maj+clic-milieu ou Maj+clic-droit, ou bien faire tourner la molette de la souris tout en appuyant sur Ctrl. Vous pouvez aussi cliquer sur le champ de saisie (dans le coin en bas à droite de la fenêtre), y saisir une valeur de zoom, et la valider en appuyant sur la touche Entrée. Enfin, il reste l'outil de zoom (dans la barre d'outils à gauche) qui vous permet de définir une région sur laquelle zoomer à l'aide de la souris. - - + + - + - Inkscape garde aussi en mémoire un historique des niveaux de zoom. Appuyez sur les touches ` pour y naviguer en avant et Maj+` en arrière. + Inkscape garde aussi en mémoire un historique des niveaux de zoom. Appuyez sur la touche ` pour revenir au niveau de zoom précédent et utilisez Maj+` pour retourner au suivant. - - Les outils d'Inkscape + + Les outils d'Inkscape - - + + - + - La barre d'outils verticale à gauche affiche les outils de dessin et d'édition d'Inkscape. En haut de la fenêtre, sous les menus, la barre de commandes affiche les boutons des commandes générales tandis que la barre de contrôle des outils montre les contrôles spécifiques à chaque outil.La barre d'état en bas de la fenêtre affiche des indications et des messages utiles lors de votre session. + La barre d'outils verticale à gauche affiche les outils de dessin et d'édition d'Inkscape. En haut de la fenêtre, juste en dessous des menus, la barre de commandes affiche les boutons des commandes générales tandis que la barre de contrôle des outils montre les contrôles spécifiques à chaque outil. La barre d'état en bas de la fenêtre affiche des indications et des messages qui peuvent vous aider dans votre travail. - - + + - + - Beaucoup d'autres opérations sont disponibles via les raccourcis clavier. Pour consulter tous les raccourcis disponibles, ouvrez le menu Aide > Clavier et souris. + De nombreuses opérations peuvent être effectuées avec des raccourcis clavier. Pour consulter tous les raccourcis disponibles, ouvrez le menu Aide > Clavier et souris. - - Créer et gérer des documents + + Créer et gérer des documents - - + + - + - Pour créer un nouveau document vide, utilisez Fichier > Nouveau > Défaut ou appuyez sur Ctrl+N. Pour créer un nouveau document à partir d'un des nombreux modèles d'Inkscape, utilisez Fichier > Nouveau > Modèles ou appuyez sur Ctrl+Alt+N. + Pour créer un nouveau document vide, utilisez Fichier > Nouveau > Défaut ou appuyez sur Ctrl+N. Pour créer un nouveau document à partir d'un des nombreux modèles d'Inkscape, utilisez Fichier > Nouveau > Modèles ou appuyez sur Ctrl+Alt+N. - - + + - + - Pour ouvrir un fichier SVG existant, utilisez Fichier > Ouvrir (Ctrl+O). Utilisez Fichier > Enregistrer (Ctrl+S) pour sauver ou Enregistrer sous (Maj+Ctrl+S) pour sauver sous un nouveau nom (Inkscape est encore en développement, n'oubliez pas d'enregistrer votre travail fréquemment !). + Pour ouvrir un fichier SVG existant, utilisez Fichier > Ouvrir (Ctrl+O). Pour enregistrer, utilisez Fichier > Enregistrer (Ctrl+S), ou Enregistrer sous… (Maj+Ctrl+S) pour sauver sous un nouveau nom (Inkscape est encore assez instable, donc pensez à enregistrer votre travail fréquemment !). - - + + - + - Inkscape utilise le format SVG (Scalable Vector Graphics) pour ses fichiers. Le format SVG est un standard ouvert largement utilisé par les logiciels de graphisme. Les fichiers SVG sont basés sur le format XML et peuvent être édités à l'aide de n'importe quel éditeur de texte ou XML (ou avec Inkscape, bien sûr). Inkscape peut aussi importer ou exporter plusieurs autres autres formats (EPS, PNG). + Inkscape utilise le format SVG (Scalable Vector Graphics) pour ses fichiers. Le format SVG est un standard ouvert largement utilisé par les logiciels de graphisme. Les fichiers SVG sont basés sur le format XML et peuvent être édités à l'aide de n'importe quel éditeur de texte ou XML (ou avec Inkscape, bien sûr). En plus du SVG, Inkscape peut importer et exporter des documents dans d'autres formats (EPS, PNG…). - - + + - + - Inkscape ouvre une nouvelle fenêtre pour chaque document. Naviguez entre elles avec votre gestionnaire de fenêtre (avec le raccourci Alt+Tab par exemple), ou utilisez le raccourci Ctrl+Tab, qui permet de circuler parmi les documents ouverts (créez dès maintenant un nouveau document et passez de celui-ci à ce document en guise d'exercice). Note : Inkscape traite ces fenêtres comme les onglets dans un navigateur web, ce qui signifie que le raccourci Ctrl+Tab ne fonctionne qu'avec des documents s'exécutant dans la même instance. Si vous ouvrez plusieurs fichiers depuis un navigateur de fichiers ou exécutez plusieurs instances d'Inkscape, cela ne fonctionnera pas. + Inkscape ouvre une nouvelle fenêtre pour chaque document. Naviguez entre elles avec votre gestionnaire de fenêtres (avec le raccourci Alt+Tab par exemple), ou utilisez le raccourci Ctrl+Tab, qui permet de circuler parmi les documents ouverts (créez dès maintenant un nouveau document pour tester la navigation entre le tutoriel et le nouveau document). Note : Inkscape traite ces fenêtres comme les onglets dans un navigateur web, ce qui signifie que le raccourci Ctrl+Tab ne fonctionne qu'avec des documents s'exécutant dans la même instance. Si vous ouvrez plusieurs fichiers depuis un navigateur de fichiers ou exécutez plusieurs instances d'Inkscape, cela ne fonctionnera pas. - - Créer des formes + + Créer des formes - - - - - - Il est temps de passer aux formes! Cliquez sur l'outil Rectangle dans la barre d'outils (ou appuyez sur F4) et avec un cliquer-déplacer, créez un rectangle, soit dans un nouveau document vide, soit dans celui-ci : - - - - - - - - - - - - - - - - - - Comme vous pouvez le voir, par défaut, les rectangles sont bleus, complètement opaques et avec une épaisseur de contour de 1 pt. Nous allons bientôt voir comment changer cela. Avec les autres outils, vous pouvez aussi créer des ellipses, des étoiles et des spirales : - - - - - - - - - - - - - - - - - - - - - - - Ces outils sont les outils de formes. Chaque forme créée affiche une ou plusieurs poignées en forme de diamant; essayez de les déplacer pour voir comment la forme réagit. Pour chacun des outils de formes, la barre de contrôle fournit une façon supplémentaire de modifier la forme; ces contrôles affectent la forme sélectionnée (c'est à dire celle qui a ses poignées affichées) et définissent les paramètres par défaut qui s'appliqueront lors de la création de toute nouvelle forme. - - - - - - - Pour annuler votre dernière action, appuyez sur Ctrl+Z (ou si vous changez d'avis, vous pouvez refaire l'action annulée avec Maj+Ctrl+Z). - - - Déplacer, redimensionner et tourner + + + + + + Il est temps de passer aux formes ! Cliquez sur l'outil Rectangle dans la barre d'outils (ou appuyez sur F4) et avec un cliquer-déplacer, créez un rectangle, soit dans un nouveau document vide, soit dans celui-ci : + + + + + + + + + + + + + + + + + + Comme vous pouvez le voir, par défaut, les rectangles sont bleus, avec un contour noir, et complètement opaques. Nous allons voir comment changer cela ci-dessous. Avec les autres outils, vous pouvez aussi créer des ellipses, des étoiles et des spirales : + + + + + + + + + + + + + + + + + + + + + + + Ces outils sont les outils de formes. Chaque forme créée affiche une ou plusieurs poignées en forme de diamant ; essayez de les déplacer pour voir comment la forme réagit. Pour chacun des outils de formes, la barre de contrôle fournit une façon supplémentaire de modifier la forme ; ces contrôles affectent la forme sélectionnée (c'est-à-dire celle qui a ses poignées affichées) et définissent les paramètres par défaut qui s'appliqueront lors de la création de toute nouvelle forme. + + + + + + + Pour annuler votre dernière action, appuyez sur Ctrl+Z (ou si vous changez d'avis, vous pouvez restaurer l'action annulée avec Maj+Ctrl+Z). + + + Déplacer, redimensionner et tourner - - + + - + - L'outil d'Inkscape le plus utilisé est le sélecteur. Cliquez sur le bouton tout en haut (celui avec la flèche) dans la barre d'outils (ou appuyez sur F1 ou sur la barre d'espace). Vous pouvez alors sélectionner n'importe quel objet sur le canevas. Exemple : cliquez sur le rectangle ci-dessous. + L'outil d'Inkscape le plus utilisé est le sélecteur. Cliquez sur le bouton tout en haut (celui avec la flèche) dans la barre d'outils (ou appuyez sur F1 ou sur la barre d'espace). Vous pouvez alors sélectionner n'importe quel objet sur le canevas. Ainsi, sélectionnez le rectangle ci-dessous. - - - + + + - + - Vous devez voir apparaître huit poignées en forme de flèche autour des bords de l'objet. Vous pouvez maintenant : + Vous devriez voir apparaître huit poignées en forme de flèche autour des bords de l'objet. Vous pouvez maintenant : - - - + + + - + Déplacer l'objet à la souris avec un cliquer-déplacer (appuyez sur Ctrl pour restreindre le mouvement à l'horizontale et à la verticale). - - - + + + - + Redimensionner l'objet, en déplaçant une poignée (appuyez sur Ctrl pour préserver ses proportions). - - + + - + Cliquez à nouveau sur le rectangle. Les poignées changent de forme. Vous pouvez maintenant : - - - + + + - + - Tourner l'objet en déplaçant une poignée de coin (appuyez sur Ctrl pour forcer une rotation par incréments de 15 degrés; déplacez la croix pour définir le centre de rotation). + Tourner l'objet en déplaçant une poignée de coin (appuyez sur Ctrl pour forcer une rotation par incréments de 15 degrés ; déplacez la croix pour définir le centre de rotation). - - - + + + - + Incliner l'objet en déplaçant une poignée autre que celle d'un coin (appuyez sur Ctrl pour forcer une inclinaison par incréments de 15 degrés). - - + + - + Toujours avec le sélecteur, dans les champs numériques de la barre supérieure, vous pouvez définir précisément les coordonnées (X et Y) et la taille (L et H) de la sélection. - - Transformer à l'aide des raccourcis clavier + + Transformer à l'aide des raccourcis clavier - - + + - + Une des capacités d'Inkscape le distinguant d'autres éditeurs vectoriels est la possibilité d'utiliser le clavier de façon intensive. Il n'y a pratiquement pas d'action ou de commande qui ne soit pas accessible depuis le clavier, et la transformation d'objet ne fait pas exception. - - + + - + - Vous pouvez utiliser le clavier pour déplacer (flèches), redimensionner (< et >) et tourner ([ et ]) les objets. L'incrément par défaut de modification des dimensions et de déplacement est de 2 px; avec la touche Maj, le déplacement est multiplié par 10. Ctrl+> et Ctrl+< redimensionnent respectivement de 200% et 50% par rapport à l'original. L'incrément de rotation par défaut est de 15 degrés; ou de 90 degrés si vous appuyez sur simultanément sur Ctrl. + Vous pouvez utiliser le clavier pour déplacer (flèches), redimensionner (< et >) et tourner ([ et ]) les objets. L'incrément par défaut de modification des dimensions et de déplacement est de 2 px ; avec la touche Maj, le déplacement est multiplié par 10. Ctrl+> et Ctrl+< redimensionnent respectivement de 200 % et 50 % par rapport à l'original. L'incrément de rotation par défaut est de 15 degrés ; ou de 90 degrés si vous appuyez sur Ctrl. - - + + - + - Mais les transformations à l'échelle du pixel sont peut-être les plus utiles, obtenues par la combinaison de la touche Alt avec un raccourci. Par exemple, Alt+flèche déplace la sélection d'1 pixel, au zoom courant (c'est à dire d'un pixel sur l'écran, à ne pas confondre avec l'unité px qui est une unité SVG de longueur indépendante du zoom). Ceci implique que si vous zoomez plus, un raccourci Alt+flèche provoquera un mouvement absolu plus petit, correspondant toujours à un pixel à l'écran. Il est ainsi possible de positionner des objets avec une précision arbitraire simplement en zoomant ou dézoommant selon les besoins. + Mais les transformations à l'échelle du pixel sont peut-être les plus utiles, obtenues par la combinaison de la touche Alt avec un raccourci. Par exemple, Alt+flèche déplace la sélection d'1 pixel, au zoom courant (c'est-à-dire d'un pixel sur l'écran, à ne pas confondre avec l'unité px qui est une unité SVG de longueur indépendante du zoom). Ceci implique que si vous zoomez plus, un raccourci Alt+flèche provoquera un mouvement absolu plus petit, correspondant toujours à un pixel à l'écran. Il est ainsi possible de positionner des objets avec une précision arbitraire simplement en zoomant ou dézoommant selon les besoins. - - + + - + De même, Alt+> et Alt+< changent les dimensions de la sélection d'1 pixel à l'écran, et Alt+[ et Alt+] la tournent de telle façon que le point le plus éloigné du centre bouge d'un seul pixel à l'écran. - - + + - + - Note : Les utilisateurs de Linux pourraient ne pas obtenir les resultats attendus avec Alt+flèche·et quelques autres combinaisons si leur gestionnaire de fenêtre récupere les évènements des touches avant qu'elles n'atteignent l'application Inksape. Une des solutions consiste à changer la·configuration du gestionnaire de fenêtres pour éviter cela. + Note : il se peut que les utilisateurs de Linux n'obtiennent pas les résultats attendus avec Alt+flèche et d'autres combinaisons si leur gestionnaire de fenêtres récupère les événements des touches avant qu'elles n'atteignent l'application Inkscape. Une des solutions consiste à changer la configuration du gestionnaire de fenêtres pour éviter cela. - - Sélections multiples + + Sélections multiples - - + + - + - Avec Maj+cliquer, vous pouvez simultanément sélectionner plusieurs objets. Avec un cliquer-déplacerVous pouvez aussi définir une zone autour des objets; on appelle ceci une sélection par bande étirable (le sélecteur crée une bande étirable quand on commence un cliquer-déplacer sur une zone vide; mais si vous appuyez sur Maj avant de cliquer, Inkscape forcera la création d'une bande étirable). Entraînez vous avec les trois formes ci-dessous : + Avec Maj+clic, vous pouvez simultanément sélectionner plusieurs objets. Avec un cliquer-déplacer, vous pouvez aussi définir une zone autour des objets ; on appelle ceci une sélection par bande étirable (le sélecteur crée une bande étirable quand on commence un cliquer-déplacer sur une zone vide ; mais si vous appuyez sur Maj avant de cliquer, Inkscape forcera la création d'une bande étirable). Entraînez-vous avec les trois formes ci-dessous : - - - - - + + + + + - + Maintenant, utilisez la bande étirable (déplacer ou Maj+déplacer) à titre d'exemple pour sélectionner les deux ellipses mais pas le rectangle : - - - - - + + + + + - + - Tout objet sélectionné affiche une marque de sélection — par défaut une boîte l'entourant en pointillés. Ceci permet de distinguer facilement ce qui est sélectionné de ce qui ne l'est pas. Si, par exemple, vous sélectionnez les deux ellipses et le rectangle ci-dessus, sans ces indications, il vous sera difficile de savoir si les ellipses sont bien sélectionnées ou non. + Tout objet sélectionné affiche une marque de sélection — par défaut, un cadre en pointillés. Ceci permet de distinguer facilement ce qui est sélectionné de ce qui ne l'est pas. Si, par exemple, vous sélectionnez les deux ellipses et le rectangle ci-dessus, sans ces indications, il vous sera difficile de savoir si les ellipses sont bien sélectionnées ou non. - - + + - + - Maj+cliquer sur un objet sélectionné l'exclut de la sélection. Sélectionnez les trois objets ci-dessus, puis utilisez Maj+cliquer pour exclure les deux ellipses de la sélection, en n'y conservant que le rectangle. + Maj+clic sur un objet sélectionné l'exclut de la sélection. Sélectionnez les trois objets ci-dessus, puis utilisez Maj+clic pour exclure les deux ellipses de la sélection, en n'y conservant que le rectangle. - - + + - + - Appuyer sur Esc désélectionne tous les objets sélectionnés. Ctrl+A sélectionne tous les objets du calque courant (si vous n'avez pas créé de calque, vous sélectionnerez tous les objets du document). + Appuyer sur Échap désélectionne tous les objets. Ctrl+A sélectionne tous les objets du calque courant (si vous n'avez pas créé de calque, vous sélectionnerez tous les objets du document). - - Grouper + + Grouper - - + + - + - Plusieurs objets peuvent être réunis dans un groupe. Un groupe se comporte comme un simple objet quand vous le déplacez ou le transformez. Ci-dessous, les trois objets de gauche sont indépendants; les trois mêmes objets de doite sont groupés. Essayez de les déplacer. + Plusieurs objets peuvent être réunis dans un groupe. Un groupe se comporte comme un simple objet quand vous le déplacez ou le transformez. Ci-dessous, les trois objets de gauche sont indépendants ; les trois mêmes objets de droite sont groupés. Essayez de les déplacer. - - - - + + + + - - + + - + - Pour créer un groupe, sélectionnez un ou plusieurs objets et appuyez sur Ctrl+G. Pour dégrouper un ou plusieurs groupes, sélectionnez-les et appuyez sur Ctrl+U. Les groupes peuvent eux-mêmes être groupés, comme n'importe quels autres objets; de tels groupes récursifs peuvent avoir une profondeur quelconque. Mais, Ctrl+U ne dégroupe que le dernier niveau de groupe de la sélection; vous devrez répéter Ctrl+U si vous voulez dégrouper complètement des groupes de groupes. + Pour créer un groupe, sélectionnez un ou plusieurs objets et appuyez sur Ctrl+G. Pour dégrouper un ou plusieurs groupes, sélectionnez-les et appuyez sur Ctrl+U. Les groupes peuvent eux-mêmes être groupés, comme n'importe quels autres objets ; de tels groupes récursifs peuvent avoir une profondeur quelconque. Cependant, Ctrl+U ne dégroupe que le dernier niveau de groupe de la sélection ; vous devrez répéter Ctrl+U si vous voulez dégrouper complètement des groupes de groupes. - - + + - + - Cependant, vous n'avez pas nécessairement besoin de dégrouper pour éditer un objet au sein d'un groupe. Un simple Ctrl+cliquer sur cet objet permet de le sélectionner seul et de l'éditer, ou Maj+Ctrl+cliquer sur plusieurs objets (inclus ou non dans des groupes quelconques) pour une sélection multiple. Essayez de déplacer ou transformer sans les dégrouper les formes du groupe ci-dessus à droite, puis de les désélectionner, et resélectionnez le groupe normalement pour vérifier qu'elles sont toujours groupées. + Cependant, vous n'avez pas nécessairement besoin de dégrouper pour éditer un objet au sein d'un groupe. Un simple Ctrl+clic sur un objet permet de le sélectionner seul et de l'éditer, et Maj+Ctrl+clic sur plusieurs objets (inclus ou non dans des groupes quelconques) permet d'effectuer une sélection multiple. Essayez de déplacer ou transformer sans les dégrouper les formes du groupe ci-dessus à droite, puis de les désélectionner, et resélectionnez le groupe normalement pour vérifier qu'elles sont toujours groupées. - - Remplissage et contour + + Remplissage et contour - - + + - + - Beaucoup de fonctions d'Inkscape sont accessibles par des boîtes de dialogues. La façon la plus simple d'attribuer une couleur à un objet est d'ouvrir la boîte de dialogue Palettes du menu Objet, sélectionner un objet et cliquer sur une montre (couleur) pour le peindre (modifier sa couleur de remplissage). + Beaucoup de fonctions d'Inkscape sont accessibles via des boîtes de dialogues. La façon la plus simple d'attribuer une couleur à un objet est probablement d'ouvrir la boîte de dialogue Palettes depuis le menu Affichage, de sélectionner un objet et de cliquer sur un motif pour le peindre (modifier sa couleur de remplissage). - - + + - + - La boîte de dialogue Remplissage et contour (Maj+Ctrl+F) est plus puissante. Sélectionnez la forme ci-dessous et ouvrez la boîte de dialogue Remplissage et contour. + La boîte de dialogue Remplissage et contour du menu Objet (ou accessible avec Maj+Ctrl+F) est plus puissante. Sélectionnez la forme ci-dessous et ouvrez la boîte de dialogue Remplissage et contour. - - - + + + - + - Vous constatez que la boîte de dialogue a trois onglets : Remplissage, Contour et Style de contour. L'onglet Remplissage permet d'éditer le remplissage (l'intérieur) de(s) objet(s) sélectionné(s). L'utilisation des boutons juste sous l'onglet vous permet de choisir le type de remplissage, incluant sans remplissage (le bouton avec un X), couleur uniforme, ou encore dégradé linéaire ou radial. Pour la forme ci-dessus, le bouton couleur uniforme devrait être activé. + Vous constatez que la boîte de dialogue a trois onglets : Fond, Contour et Style du contour. L'onglet Fond permet d'éditer le remplissage (l'intérieur) du ou des objet(s) sélectionné(s). L'utilisation des boutons juste sous l'onglet vous permet de choisir le type de remplissage, incluant sans remplissage (le bouton avec un X), couleur de remplissage uniforme, ou encore dégradé linéaire ou radial. Pour la forme ci-dessus, le bouton Couleur uniforme devrait être sélectionné. - - + + - + Plus bas, vous pouvez voir la collection de sélecteurs de couleur chacun dans un onglet : RVB, TSL, CMJN, et Roue. Le plus pratique est peut-être la roue, dans laquelle vous pouvez tourner un triangle pour choisir une teinte sur la roue, puis une nuance dans le triangle. Tous les sélecteurs de couleur comportent une réglette pour définir l'alpha (opacité) de(s) objet(s) sélectionné(s). - - + + - + - Quand vous sélectionnez un objet, la boîte de dialogue Remplissage et contour est mise à jour pour afficher ses remplissage et contour courants (quand plusieurs objets sont sélectionnés, elle affiche la moyenne de leurs couleurs). Jouez avec les exemples ci-dessous ou créez les votres : + Quand vous sélectionnez un objet, la boîte de dialogue Remplissage et contour est mise à jour pour afficher ses remplissage et contour actuels (quand plusieurs objets sont sélectionnés, elle affiche la moyenne de leurs couleurs). Jouez avec les exemples ci-dessous ou créez les vôtres : - - - - - - - - - + + + + + + + + + - + En utilisant l'onglet Contour, vous pouvez enlever le contour d'un objet ou lui attribuer n'importe quelle couleur ou transparence : - - - - - - - - - - + + + + + + + + + + - + Le dernier onglet, Style de contour, vous permet de définir la largeur et les autres paramètres du contour : - - - - - - - - - + + + + + + + + + - + Enfin, vous pouvez utiliser des dégradés au lieu de couleurs uniformes pour les remplissages comme pour les contours : @@ -488,44 +488,44 @@ - - - - - - - - - - - + + + + + + + + + + + Quand vous passez d'une couleur uniforme à un dégradé, le dégradé nouvellement créé utilise cette même couleur, allant d'opaque à transparente. Utilisez l'outil de Dégradé (Ctrl+F1) pour déplacer les poignées de dégradé — les poignées de contrôle connectées par des lignes qui définissent la direction et la longueur du dégradé. Quand l'une de ces poignées est sélectionnée (surlignée en bleu), la boîte de dialogue Remplissage et contour permet de définir la couleur liée à cette poignée à la place de la couleur de l'objet sélectionné. - - + + - + - Une autre façon pratique de changer la couleur d'un objet est d'utiliser l'outil Pipette (F7). Un simple cliquer n'importe où sur le dessin avec cet outil permet d'attribuer la couleur ainsi capturée au remplissage de l'objet sélectionné (Maj+cliquer l'attribuera à son contour). + Une autre manière pratique de changer la couleur d'un objet est d'utiliser l'outil Pipette (F7). Un simple clic n'importe où sur le dessin avec cet outil permet d'attribuer la couleur ainsi capturée au remplissage de l'objet sélectionné (Maj+clic l'attribuera à son contour). - - Duplication, alignement, distribution + + Duplication, alignement, distribution - - + + - + - Une des opérations les plus courantes est la duplication d'un objet (Ctrl+D). Le dupliqué est placé juste au dessus de l'original et est sélectionné, vous permettant ainsi de le déplacer à la souris ou avec des raccourcis. Pour vous exercer, essayer de remplir la ligne avec des copies du carré noir ci-dessous : + Une des opérations les plus courantes est la duplication d'un objet (Ctrl+D). Le dupliqué est placé juste au-dessus de l'original et est sélectionné, vous permettant ainsi de le déplacer à la souris ou avec des raccourcis. Pour vous exercer, essayez de remplir la ligne avec des copies du carré noir ci-dessous : - - - + + + - + - Il y a des chances que vos copies du carré ne soient pas bien alignées. La boîte de dialogue Aligner et distribuer (Maj+Ctrl+A) devient alors utile. Sélectionnez tous les carrés (avec Maj+cliquer ou une bande étirable), ouvrez la boîte de dialogue et appuyez sur le bouton "Centrer selon l'axe horizontal", puis sur "Distribuer des distances horizontalement entre les objets" (consultez les indications affichées quand la souris passe au-dessus des boutons). Les objets sont maintenant alignés et distribués de façon équidistante. Voici d'autres exemples d'objets alignés et distribués : + Il y a des chances que vos copies du carré ne soient pas bien alignées. La boîte de dialogue Aligner et distribuer (Maj+Ctrl+A) devient alors utile. Sélectionnez tous les carrés (avec Maj+clic ou une bande étirable), ouvrez la boîte de dialogue et appuyez sur le bouton « Centrer selon l'axe horizontal », puis sur « Distribuer des distances horizontalement entre les objets » (consultez les indications affichées quand la souris passe au-dessus des boutons). Les objets sont maintenant alignés et distribués de façon équidistante. Voici d'autres exemples d'objets alignés et distribués : @@ -542,187 +542,187 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Ordre-z (ou superposition) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ordre z (ou superposition) - - + + - + - Le terme ordre-z correspond à l'ordre d'empilement des objets sur un dessin, les objets du dessus masquant les autres. Les deux commandes du menu Objet, Monter au premier plan (Début) et Descendre à l'arrière plan (Fin), feront passer les objets sélectionnés tout au dessus ou tout au fond dans la superposition des objets du calque courant. Deux autres commandes, Monter (Page Précédente) et Descendre (Page Suivante), les déplaceront d'un cran seulement, c'est à dire juste au-delà d'un objet non sélectionné (seuls les objets chevauchant la sélection comptent; si rien ne chevauche la sélection, Monter et Descendre la déplacent tout au dessus ou tout au fond respectivement. + Le terme ordre z désigne l'ordre d'empilement des objets sur un dessin, les objets du dessus masquant les autres. Les deux commandes du menu Objet, Monter au premier plan (touche Début) et Descendre à l'arrière plan (touche Fin), feront passer les objets sélectionnés tout au dessus ou tout au fond dans la superposition des objets du calque actuel. Deux autres commandes, Monter (Page précédente) et Descendre (Page suivante), les déplaceront d'un cran seulement, c'est-à-dire juste au-delà d'un objet non sélectionné (seuls les objets chevauchant la sélection comptent ; si rien ne chevauche la sélection, Monter et Descendre la déplacent tout au-dessus ou tout au fond respectivement. - - + + - + Exercez-vous à l'utilisation de ces commandes en inversant la superposition des objets ci-dessous, de telle sorte que l'ellipse la plus à gauche soit tout au-dessus et la plus à droite tout au fond : - - - - - - - - + + + + + + + + - + - Un raccourci de sélection très utile est la touche Tab. Si rien n'est sélectionné, il sélectionne l'objet le plus au fond; sinon, il sélectionne l'objet juste au-dessus de l'objet sélectionné dans l'ordre-z. Maj+Tab fait l'inverse, commençant par l'objet tout au-dessus en allant vers le fond. Comme les objets que vous créez sont ajoutés au-dessus de la superposition, appuyer sur Maj+Tab quand aucun objet n'est sélectionné vous permettra de retrouver facilement le dernier objet que vous avez créé. Essayez Tab et Maj+Tab sur les ellipses superposées ci-dessus. + Un raccourci de sélection très utile est la touche Tab. Si rien n'est sélectionné, il sélectionne l'objet le plus au fond ; sinon, il sélectionne l'objet juste au-dessus de l'objet sélectionné dans l'ordre z. Maj+Tab fait l'inverse, commençant par l'objet tout au-dessus en allant vers le fond. Comme les objets que vous créez sont ajoutés au-dessus de la superposition, appuyer sur Maj+Tab quand aucun objet n'est sélectionné vous permettra de retrouver facilement le dernier objet que vous avez créé. Essayez Tab et Maj+Tab sur les ellipses superposées ci-dessus. - - Sélectionner en-dessous et déplacer + + Sélectionner et déplacer des objets couverts - - + + - + Que faire si l'objet dont vous avez besoin est caché derrière un autre objet ? Vous pouvez encore voir l'objet en dessous si celui du dessus est (partiellement) transparent, mais en cliquant dessus, vous sélectionnerez l'objet du dessus, pas celui dont vous avez besoin. - - + + - + - Pour cela, il faut utiliser Alt+cliquer. Alt+cliquer sélectionne d'abord l'objet du dessus, comme un cliquer normal; mais le Alt+cliquer suivant au même endroit sélectionne l'objet juste en-dessous; et ainsi de suite. Donc, plusieurs Alt+cliquer à la suite vous permettront de naviguer du dessus vers le fond à travers la superposition de différents objets sous le pointeur de la souris. Quand l'objet du fond est sélectionné, un Alt+cliquer de plus sélectionne de nouveau l'objet du dessus. + Pour cela, il faut utiliser Alt+clic. Alt+clic sélectionne d'abord l'objet du dessus, comme un clic normal ; mais le Alt+clic suivant au même endroit sélectionne l'objet juste en dessous ; et ainsi de suite. Donc, plusieurs Alt+clic à la suite vous permettront de naviguer du dessus vers le fond à travers la superposition de différents objets sous le pointeur de la souris. Quand l'objet du fond est sélectionné, un Alt+clic de plus sélectionne de nouveau l'objet du dessus. - - + + - + - [Si vous utilisez Linux, vous pourriez éventuellement vous appercevroi que Alt+clique ne fonctionne pas correctement, mais déplace la fenêtre Inkscape en totalité. Il s'agit de vôtre gestionnaire de fenêtres qui resèrve Alt+clque pour une action différente. Pour corriger cela, il aut trouver l'option de configuration du comportement des fenêtres de votre gestionnaire de fenêtre, puis la desactiver ou bien lui associer la touche Meta (touche Windows), ainsi configuré, Inkscape et les autres applications pourront librement utiliser la touche Alt.] + [Si vous êtes sous Linux, vous pourriez éventuellement vous apercevoir que Alt+clic ne fonctionne pas correctement, mais déplace la fenêtre Inkscape en totalité. C'est parce que votre gestionnaire de fenêtres a réservé le raccourci Alt+clic pour une autre action. Pour corriger cela, il faut trouver l'option de configuration du comportement des fenêtres de votre gestionnaire de fenêtres, puis la désactiver ou bien lui associer une autre touche (par exemple Super — aussi appelée « Windows »), afin qu'Inkscape et les autres applications puissent librement utiliser la touche Alt.] - - + + - D'accord, mais une fois l'objet recouvert sélectionné, qu'en faire ? Vous pouvez le transformer grâce aux raccourcis et déplacer ses poignées de sélection. Cependant, déplacer l'objet lui-même resélectionnera l'objet tout au dessus à nouveau (le cliquer-déplacer est conçu comme cela : d'abord sélectionner l'objet le plus haut juste sous le curseur puis déplacer la sélection). Pour demander à Inkscape de déplacer la sélection présente (éventuellement en-dessous d'autres objets) sans rien sélectionner d'autre, utilisez Alt+déplacer. Cela vous permettra de déplacer la sélection courante où que vous placiez la souris. + Bien, mais une fois l'objet recouvert sélectionné, qu'en faire ? Vous pouvez le transformer grâce aux raccourcis et déplacer ses poignées de sélection. Cependant, déplacer l'objet lui-même resélectionnera l'objet tout au dessus à nouveau (le cliquer-déplacer est conçu comme cela : d'abord sélectionner l'objet le plus haut juste sous le curseur puis déplacer la sélection). Pour demander à Inkscape de déplacer la sélection présente (éventuellement en dessous d'autres objets) sans rien sélectionner d'autre, utilisez Alt+déplacer. Cela vous permettra de déplacer la sélection actuelle où que vous placiez la souris. - - + + - Essayez Alt+cliquer et Alt+déplacer sur les deux formes brunes sous le rectangle vert transparent : + Essayez Alt+clic et Alt+déplacer sur les deux formes brunes sous le rectangle vert transparent : - - - - - Sélectionner des objets similaires + + + + + Sélectionner des objets similaires - - + + - Inkscape peut ajouter des objets similaires à la sélection courante. Par exemple, si vous souhaitez sélectionner tous les carrés bleus ci-dessous, sélectionnez tout d'abord l'un d'entre eux, puis utilisez Édition > Sélectionner même > Couleur de remplissage dans le menu. Tous les objets avec la même teinte de bleu sont alors sélectionnés. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Inkscape peut sélectionner automatiquement tous les objets ayant un point commun. Par exemple, si vous souhaitez sélectionner tous les carrés bleus ci-dessous, sélectionnez tout d'abord l'un d'entre eux, puis utilisez Édition > Sélectionner même > Couleur de remplissage dans le menu. Tous les objets avec la même teinte de bleu seront alors sélectionnés. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Vous pouvez non seulement sélectionner par couleur de remplissage, mais également par couleur de contour, style de contour, remplissage et contour, et type d'objet. - - Conclusion + + Conclusion - - + + - Ceci conclut le didacticiel basique. Inkscape offre beaucoup d'autres fonctionnalités, mais les techniques décrites ci-dessus vous permettront déjà de créer des dessins simples mais utiles. Pour un usage plus avancé, consultez le didacticiel avancé dans Aide > Didacticiels. + Ceci conclut le didacticiel basique. Inkscape offre beaucoup d'autres fonctionnalités, mais les techniques décrites ci-dessus vous permettront déjà de créer des dessins simples mais utiles. Pour un usage plus avancé, consultez le didacticiel avancé dans Aide > Didacticiels. - + @@ -752,8 +752,8 @@ - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer diff --git a/share/tutorials/tutorial-calligraphy.fr.svg b/share/tutorials/tutorial-calligraphy.fr.svg index b975426a1..e9b16455d 100644 --- a/share/tutorials/tutorial-calligraphy.fr.svg +++ b/share/tutorials/tutorial-calligraphy.fr.svg @@ -35,205 +35,205 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::CALLIGRAPHIE bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + - Un des nombreux outils d'Inkscape est l'outil calligraphie. Ce didacticiel vous aidera à découvrir le fonctionnement de cet outil, ainsi que les bases et techniques de l'art de la calligraphie. + L'outil Calligraphie est l'un des nombreux bons outils proposés par Inkscape. Ce didacticiel vous aidera à découvrir le fonctionnement de cet outil, ainsi que les bases et techniques de l'art de la calligraphie. - - + + - Utiliser Ctrl+flèches, molette de la souris ou tirer avec le bouton du milieu pour faire défiler la page vers le bas. Pour les bases de création, sélection et transformation d'objet, voir le didacticiel basique dans Aide·>·Didacticiels. + Utiliser Ctrl+flèche, la molette de la souris ou le glisser avec le bouton du milieu pour faire défiler la page vers le bas. Pour les bases de création, sélection et transformation d'objet, lisez le didacticiel basique dans Aide > Didacticiels. - - Histoire et styles + + Histoire et styles - - + + Par définition, la calligraphie signifie « belle écriture » ou « faculté d'écrire élégamment ». La calligraphie est essentiellement l'art de former à la main de beaux caractères d'écriture. Cela peut sembler intimidant, mais avec un peu de pratique, n'importe qui peut maîtriser les bases de cet art. - - + + - Les premières formes de calligraphie apparaissent avec les peintures des hommes des cavernes. Et jusqu'à l'apparition de l'imprimerie, en 1440 environ, les livres et autres publications étaient calligraphiés. Un scribe devait transcrire à la main toute copie de livre ou publication. L'écriture se faisait avec une plume (d'oie) et de l'encre sur des matériaux tels que du parchemin ou du vélin. Les styles de lettrage utilisés au cours des âges incluent le Rustique, la minuscule Caroline, le Blackletter, etc. Les endroits les plus courants pour trouver des calligraphies aujourd'hui sont peut-être les faire-part de mariage. + Les premières formes de calligraphie apparaissent avec les peintures des hommes des cavernes. Et jusqu'à l'apparition de l'imprimerie, en 1440 environ, les livres et autres publications étaient calligraphiés. Un scribe devait transcrire à la main toute copie de livre ou publication. L'écriture se faisait avec une plume (d'oie) et de l'encre sur des matériaux tels que du parchemin ou du vélin. Les styles de lettrage utilisés au cours des âges incluent le Rustique, la minuscule Caroline, le Blackletter, etc. Aujourd'hui, l'emplacement le plus commun où une personne classique trouvera de la calligraphie est probablement le faire-part d'un mariage. - - + + Il existe trois principales familles de calligraphie : - - - + + + Occidentale ou romane - - - + + + Arabe - - - + + + Chinoise ou orientale - - + + - Ce didacticiel se focalise principalement sur la calligraphie occidentale, étant donné que les deux autres styles nécessitent généralement un pinceau (au lieu d'une plume), qui ne fait pas encore partie des fonctions de notre outil de calligraphie + Ce didacticiel se focalise principalement sur la calligraphie occidentale, étant donné que les deux autres styles nécessitent généralement un pinceau (au lieu d'une plume), qui ne fait pas encore partie des fonctions de notre outil Calligraphie. - - + + - Un des grands avantages que nous avons sur les scribes du passé est la commande annuler. Si vous faites une erreur, la page entière n'est pas perdue. L'outil calligraphie d'Inkscape permet aussi des techniques qui ne seraient pas possible avec les plumes et encres traditionnelles. + Un des grands avantages que nous avons sur les scribes du passé est la commande Annuler. Si vous faites une erreur, la page entière n'est pas perdue. L'outil Calligraphie d'Inkscape permet aussi des techniques qui ne seraient pas possible avec les plumes et encres traditionnelles. - - Matériel + + Matériel - - + + - Vous obtiendrez de meilleurs résultats si vous utilisez une tablette graphique (ex. : une Wacom) avec un stylet. Mais vous pouvez obtenir des résultats décents avec une souris aussi, même s'il vous sera plus difficile de produire des tracés rapides réguliers. + Vous obtiendrez de meilleurs résultats si vous utilisez une tablette graphique avec stylet (ex. : une Wacom). Mais grâce à la flexibilité de notre outil, vous pouvez également obtenir des résultats décents avec une souris, même s'il vous sera plus difficile de produire des tracés rapides réguliers. - - + + - Inkscape ne gère pas encore la sensibilité à la pression des tablettes graphiques, mais ce n'est pas un problème car les plumes traditionnelles (contrairement aux pinceaux) ne sont pas non plus très sensibles à la pression. La plume calligraphique d'Inkscape est par contre sensible à la vélocité du tracé (voir « Mincissement » plus bas), donc si vous utilisez une souris, vous préférez sans doute mettre ce paramètre à zéro. + Inkscape est capable d'utiliser les sensibilités à la pression et à l'inclinaison d'un stylet de tablette qui prend en charge ces fonctions. Les fonctions de sensibilité sont désactivées par défaut parce qu'elles nécessitent de la configuration. Souvenez-vous par ailleurs que la calligraphie avec une plume ou un stylo avec pointe ne sont pas vraiment sensibles à la pression, contrairement à un pinceau. - - + + - Si vous avez une tablette et désirez utiliser les fonctions de sensibilité, vous devez configurer votre périphérique. Cette configuration n'a besoin d'être effectuée qu'une seule fois, les réglages seront sauvegardés. Pour en activer le support, vous devez avoir la tablette graphique branchée avant de démarrer Inkscape, puis, ouvrir la boîte de dialogue Périphériques de saisie..., via le menu Édition. Lorsque ce dialogue est ouvert, vous pouvez sélectionner le périphérique et les réglages que vous désirez en tant que stylet de votre tablette. Enfin, après avoir choisi ces réglages, passez à l'outil calligraphie et commutez les boutons de la bar d'outil pour la pression et l'inclinaison. Inkscape se souviendra de ses réglages au prochain démarrage. + Si vous avez une tablette et désirez utiliser les fonctions de sensibilité, vous devez configurer votre périphérique. Cette configuration n'a besoin d'être effectuée qu'une seule fois, les réglages seront sauvegardés. Pour en activer le support, vous devez avoir la tablette graphique branchée avant de démarrer Inkscape, puis, ouvrir la boîte de dialogue Périphériques de saisie…, via le menu Édition. Lorsque cette boîte de dialogue est ouverte, vous pouvez sélectionner le périphérique et les réglages que vous désirez pour le stylet de votre tablette. Enfin, après avoir choisi ces réglages, passez à l'outil Calligraphie et commutez les boutons de la barre d'outils pour la pression et l'inclinaison. Inkscape se souviendra de ces réglages au prochain démarrage. - - + + - Le stylo calligraphique d'Inkscape peut être sensible à la vélocité·du tracé·(voir·« Mincissement »·plus bas),·donc, si vous utilisez une souris, vous désirerez probablement mettre ce paramètre à zéro. + Le stylo calligraphique d'Inkscape peut être sensible à la vélocité du tracé (voir « Amincissement » plus bas), donc, si vous utilisez une souris, vous désirerez probablement mettre ce paramètre à zéro. - - Options de l'outil Calligraphie + + Options de l'outil Calligraphie - - + + - Passez à l'outil calligraphie en appuyant sur Ctrl+F6 ou sur C, ou encore en cliquant sur son bouton dans la barre d'outils. Vous remarquerez alors, dans la bar d'outil du haut, huit options : largeur & mincissement ; angle & fixité ; terminaison ; tremblement, agitation & inertie. Il y a également deux autres boutons pour activer ou désactiver la pression de la tablette et la sensibilité à l'inclinaison (pour les tablettes graphiques). + Passez à l'outil Calligraphie en appuyant sur Ctrl+F6 ou sur C, ou encore en cliquant sur son bouton dans la barre d'outils. Vous remarquerez alors, dans la barre d'outils du haut, huit options : largeur & amincissement ; angle & fixité ; terminaisons ; tremblement, agitation & inertie. Il y a également deux autres boutons pour activer ou désactiver la pression de la tablette et la sensibilité à l'inclinaison (pour les tablettes graphiques). - - Largeur et mincissement + + Largeur et amincissement - - + + - Cette paire d'options contrôle la largeur de votre plume. La largeur peut varier entre 1 et 100 et (par de défaut) est mesurée selon une unité relative à la taille de votre fenêtre d'édition, mais indépendante du zoom. En effet, l'« unité de mesure » naturelle en calligraphie est l'amplitude du mouvement de votre main et il est donc pratique d'avoir votre largeur de plume en rapport constant par rapport à votre « plan d'écriture » et non pas en unités réelles, ce qui la ferait dépendre du zoom. + Cette paire d'options contrôle la largeur de votre plume. La largeur peut varier entre 1 et 100 et est (par défaut) mesurée selon une unité relative à la taille de votre fenêtre d'édition, mais indépendante du zoom. En effet, l'« unité de mesure » naturelle en calligraphie est l'amplitude du mouvement de votre main et il est donc pratique d'avoir votre largeur de plume en rapport constant par rapport à votre « planche d'écriture » et non pas en unités réelles, ce qui la ferait dépendre du zoom. Ce comportement est toutefois optionnel, et peut donc être modifié pour ceux qui préféreraient une unité absolue peu importe le zoom. Pour passer à ce mode, utilisez la case à cocher sur la page de Préférences de l'outil (vous pouvez l'ouvrir en double-cliquant sur le bouton de l'outil). - - + + - Comme la largeur de plume varie souvent, vous pouvez l'ajuster sans devoir utiliser la barre de contrôle, en utilisant les flèches gauche et droite. L'avantage de ces raccourcis est qu'ils fonctionnent même pendant que vous dessinez, de sorte que vous pouvez faire varier la largeur de votre plume progressivement pendant un tracé : + Comme la largeur de plume varie souvent, vous pouvez l'ajuster sans avoir à retourner à la barre d'outils, en utilisant les touches fléchées gauche et droite ou avec une tablette qui supporte la sensibilité à la pression. L'avantage de ces raccourcis est qu'ils fonctionnent même pendant que vous dessinez, de sorte que vous pouvez faire varier la largeur de votre plume progressivement pendant un tracé : - largeur=1, augmentant... atteignant 47, diminuant... de nouveau à 0 - - - + largeur=1, augmentant… atteignant 47, diminuant… de nouveau à 0 + + + - La largeur de la plume peut aussi dépendre de la vélocité, et ceci est contrôlé par le paramètre mincissement. Ce paramètre peut prendre une valeur entre -100 et 100 ; zéro signifie que la largeur est indépendante de la vélocité, des valeurs positives font que des tracés plus rapides sont plus fins, des valeurs négatives font que des tracés plus rapides deviennent plus épais. La valeur par défaut de 10 implique un mincissement modéré des tracés rapides. Voici quelques exemples, tous tracés avec une largeur de 20 et un angle de 90° : - - mincissement = 0 (largeur uniforme) - mincissement = 10 - mincissement = 40 - mincissement = -20 - mincissement = -60 - - - - - - - - - - - - - - - - - - - - - - + La largeur de la plume peut aussi dépendre de la vélocité, et ceci est contrôlé par le paramètre d'amincissement. Ce paramètre peut prendre une valeur entre -100 et 100 ; zéro signifie que la largeur est indépendante de la vélocité, des valeurs positives font que des tracés plus rapides sont plus fins, des valeurs négatives font que des tracés plus rapides deviennent plus épais. La valeur par défaut de 10 implique un amincissement modéré des tracés rapides. Voici quelques exemples, tous tracés avec une largeur de 20 et un angle de 90° : + + amincissement = 0 (largeur uniforme) + amincissement = 10 + amincissement = 40 + amincissement = -20 + amincissement = -60 + + + + + + + + + + + + + + + + + + + + + + - Pour vous amuser, donnez une valeur de 100 (maximale) à la largeur et au mincissement puis dessinez avec des mouvements brusques pour obtenir des formes étrangement naturelles, ressemblant à des neurones. + Pour vous amuser, donnez une valeur de 100 (le maximum) à la largeur et à l'amincissement puis dessinez avec des mouvements brusques pour obtenir des formes étrangement naturalistes, ressemblant à des neurones. - - - - - - - - Angle et Fixité + + + + + + + + Angle et fixité - - + + - Après la largeur, l'angle est le paramètre calligraphique le plus important. Il s'agit de l'angle de votre plume en degrés, allant de 0° (épaisseur de la plume à l'horizontale) à 90° (verticale en sens anti-horaire) ou -90° (verticale en sens horaire) : + Après la largeur, l'angle est le paramètre calligraphique le plus important. Il s'agit de l'angle de votre plume en degrés, allant de 0° (épaisseur de la plume à l'horizontale) à 90° (verticale en sens anti-horaire) ou -90 ° (verticale en sens horaire) : @@ -243,15 +243,15 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - - - angle = 90° - angle = 30° (par défaut) - angle = 0° - angle = -90° - - + + + + angle = 90° + angle = 30° (par défaut) + angle = 0° + angle = -90° + + @@ -260,58 +260,58 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - - + + + - Chaque style de calligraphie traditionnelle possède son propre angle prédominant. L'écriture onciale, par exemple, utilise un angle de 25 degrés. Des styles plus complexes et des calligraphes plus expérimentés souhaiterons varier cet angle pendant le tracé, ce qu'Inkscape permet par pression sur les flèches haut et bas. Pour les débutants cependant, il est préférable de conserver un angle constant. Voici des exemples de tracés dessinés selon différents angles (fixité = 100) : - - angle = 30° - angle = 60° - angle = 90° - angle = 0° - angle = 15° - angle = -45° - - - - - - - - + Chaque style de calligraphie traditionnelle possède son propre angle prédominant. L'écriture onciale, par exemple, utilise un angle de 25 degrés. Les styles plus complexes et les calligraphes plus expérimentés feront souvent varier cet angle pendant le tracé, ce qu'Inkscape permet par pression sur les touches fléchées haut et bas ou avec une tablette qui supporte la sensibilité à l'inclinaison. Néanmoins, pour l'exercice des débutants en calligraphie, conserver un angle constant fonctionnera mieux. Voici des exemples de tracés dessinés selon différents angles (fixité = 100) : + + angle = 30° + angle = 60° + angle = 90° + angle = 0° + angle = 15° + angle = -45° + + + + + + + + Comme vous pouvez le voir, le tracé est plus fin quand il est parallèle à l'angle, et plus épais quand il est perpendiculaire. Des angles positifs sont plus naturels et traditionnels pour une calligraphie tracée de la main droite. - - + + - Le niveau de contraste entre l'épaisseur et la finesse maximales est contrôlé par le paramètre fixité. Une valeur de 100 signifie que l'angle est toujours constant, égal à la valeur définie dans le champ angle. Diminuer la fixité permet à la plume de tourner légèrement dans la direction opposée au tracé. Avec fixité=0, la plume tourne librement pour être toujours perpendiculaire au tracé, et la valeur angle n'a plus d'effet : + Le niveau de contraste entre l'épaisseur et la finesse maximales est contrôlé par le paramètre fixité. Une valeur de 100 signifie que l'angle est toujours constant, égal à la valeur définie dans le champ angle. Diminuer la fixité permet à la plume de tourner légèrement dans la direction opposée au tracé. Avec fixité=0, la plume tourne librement pour être toujours perpendiculaire au tracé, et la valeur Angle n'a plus d'effet : - angle = 30°fixité = 100 - angle = 30°fixité = 80 - angle = 30°fixité = 0 - - - - - - - - - - + angle = 30°fixité = 100 + angle = 30°fixité = 80 + angle = 30°fixité = 0 + + + + + + + + + + @@ -320,7 +320,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -329,7 +329,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -338,7 +338,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -347,7 +347,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -356,7 +356,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -365,7 +365,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -374,7 +374,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -383,7 +383,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -392,7 +392,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -401,7 +401,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -410,7 +410,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -419,7 +419,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -428,7 +428,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -437,7 +437,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -446,7 +446,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -455,7 +455,7 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - + @@ -464,26 +464,26 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - + + - Typographiquement parlant, une fixité maximum et donc un contraste maximum de largeur de tracé (ci-dessus à gauche) sont les caractéristiques des antiques fontes serif, comme les Times ou Bodoni (parce que ces fontes étaient historiquement une imitation d'une calligraphie effectuée avec une plume orientée de façon fixe). De l'autre côté, une fixité nulle et donc un contraste de largeur nul (ci-dessus à droite) font plutôt penser à une fonte sans serif moderne, comme l'Helvetica. + Typographiquement parlant, une fixité maximale et donc un contraste maximal de largeur de tracé (ci-dessus à gauche) sont les caractéristiques des antiques fontes serif, comme Times ou Bodoni (parce que ces fontes étaient historiquement une imitation d'une calligraphie effectuée avec une plume orientée de façon fixe). D'un autre côté, une fixité nulle et donc un contraste de largeur nulle (ci-dessus à droite) font plutôt penser à une fonte sans serif moderne, comme Helvetica. - - Tremblement + + Tremblement - - + + - Le tremblement·est conçu pour donner une apparence plus naturelle aux tracés calligraphiques. Le tremblement est ajustable dans la bar de contrôle, avec des valeurs comprises entre 0 et 100. Ceci influencera vos tracés, produisant différents effets pouvant aller des légères inégalités aux bavures et tâches. Cela augmente significativement les possibilités de l'outil. + Le tremblement est conçu pour donner une apparence plus naturelle aux tracés calligraphiques. Le tremblement est ajustable dans la barre de contrôle, avec des valeurs comprises entre 0 et 100. Ceci influencera vos tracés, produisant différents effets pouvant aller des légères inégalités aux bavures et tâches. Cela augmente significativement les possibilités de l'outil. - + lent - moyen + intermédiaire rapide @@ -495,289 +495,289 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - tremblement = 0 - tremblement = 10 - tremblement = 30 - tremblement = 50 - tremblement = 70 - tremblement = 90 - tremblement = 20 - tremblement = 40 - tremblement = 60 - tremblement = 80 - tremblement = 100 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Agitation et inertie + tremblement = 0 + tremblement = 10 + tremblement = 30 + tremblement = 50 + tremblement = 70 + tremblement = 90 + tremblement = 20 + tremblement = 40 + tremblement = 60 + tremblement = 80 + tremblement = 100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Agitation et inertie - - + + - Contrairement à la largeur et à l'angle, ces deux dernier paramètres caractérisent « l'impression » laissée par l'outil plutôt que la façon dont il affecte le rendu visuel. Il n'y aura donc pas d'illustration dans cette section; à la place, essayez simplement par vous-même pour vous en faire une idée. + Contrairement à la largeur et à l'angle, ces deux derniers paramètres définissent la « sensation » laissée par l'outil plutôt qu'affecter son rendu visuel. Il n'y aura donc pas d'illustration dans cette section ; à la place, effectuez simplement des tests par vous-même pour vous faire une idée du fonctionnement. - - + + - L'agitation est la résistance du papier au mouvement de la plume. La valeur par défaut est au minimum (0), et augmenter ce paramètre rend le papier glissant : si la masse est forte, la plume a tendance à partir dans des changements de directions brusques; si la masse est nulle, une agitation forte provoquera des tortillements incontrôlables de la plume. + L'agitation est la résistance du papier au mouvement de la plume. La valeur par défaut est au minimum (0), et augmenter ce paramètre rend le papier glissant : si la masse est forte, la plume a tendance à partir dans des changements de directions brusques ; si la masse est nulle, une agitation forte provoquera des tortillements incontrôlables de la plume. - - + + - En physique, la masse est ce qui génère l'inertie; plus la masse de l'outil calligraphie d'Inkscape est importante, et plus celui-ci traîne derrière votre stylet (ou pointeur de souris) et lisse les changements de direction et mouvements brusques de votre tracé. Par défaut cette valeur est assez faible (2) de façon à ce que l'outil soit rapide et réactif, mais vous pouvez augmenter la masse pour obtenir une plume plus lente et douce. + En physique, la masse est ce qui génère l'inertie ; plus la masse de l'outil Calligraphie d'Inkscape est importante, et plus celui-ci traîne derrière votre stylet (ou pointeur de souris) et lisse les changements de direction et mouvements brusques de votre tracé. Par défaut cette valeur est assez faible (2) de façon à ce que l'outil soit rapide et réactif, mais vous pouvez augmenter la masse pour obtenir une plume plus lente et douce. - - Exemples de calligraphies + + Exemples de calligraphies - - + + Maintenant que vous connaissez les possibilités de base de l'outil, vous pouvez essayer de produire de vraies calligraphies. Si vous êtes débutant dans cette discipline, procurez-vous un bon livre sur la calligraphie et étudiez-le avec Inkscape. Cette section vous montrera juste quelques exemples simples. - - + + Tout d'abord pour tracer des lettres, vous avez besoin d'une paire de règles pour vous guider. Si vous devez avoir une écriture inclinée ou cursive, ajoutez aussi des guides inclinés en travers des deux règles horizontales. Par exemple : - - - - - - - - - - + + + + + + + + + + Ensuite le zoom devra être réglé de telle sorte que la hauteur entre les règles corresponde à votre amplitude naturelle de mouvement de main. Ajustez les paramètres largeur et angle, et c'est parti ! - - + + - La première chose que vous devriez faire en tant que calligraphe débutant est de vous entraîner à dessiner les éléments de base des lettres — des traits horizontaux et verticaux, des tracés ronds et des traits inclinés. Voici quelques éléments de lettres pour l'écriture onciale : - - - - - - - - - - - - - - - - - - - - + La première chose que vous devriez faire en tant que calligraphe débutant est probablement de vous entraîner à dessiner les éléments de base des lettres — des traits horizontaux et verticaux, des tracés ronds et des traits inclinés. Voici quelques éléments de lettres pour l'écriture onciale : + + + + + + + + + + + + + + + + + + + + Plusieurs astuces utiles : - - - + + + Si votre main est confortablement installée sur la tablette, ne la déplacez pas. Faites plutôt défiler le canevas (touches Ctrl+flèche) avec votre main gauche après avoir fini chaque lettre. - - - + + + - Si votre dernier coup de plume est mauvais, annulez le (Ctrl+Z). Cependant, si sa forme est bonne, mais que la position et la taille doivent être légèrement rectifiées, il vaut mieux utiliser le sélecteur temporairement (espace) et opérer les déplacement/redimensionnement/rotation nécessaires (en utilisant la souris ou le clavier), puis appuyer sur espace de nouveau pour revenir à l'outil calligraphie. + Si votre dernier coup de plume est mauvais, annulez-le (Ctrl+Z). Cependant, si sa forme est bonne, mais que la position et la taille doivent être légèrement rectifiées, il vaut mieux utiliser le Sélecteur temporairement (espace) et opérer les déplacement/redimensionnement/rotation nécessaires (en utilisant la souris ou le clavier), puis appuyer sur espace de nouveau pour reprendre l'outil Calligraphie. - - - + + + - Quand vous avez fini un mot, passez au sélecteur de nouveau pour ajuster l'uniformité des traits et l'inter-lettrage. N'en faites pas trop cependant; une belle calligraphie doit garder le côté légèrement irrégulier d'une écriture manuscrite; chaque coup de plume doit être original. + Quand vous avez fini un mot, passez de nouveau au Sélecteur pour ajuster l'uniformité des traits et l'inter-lettrage. N'en faites pas trop cependant ; une belle calligraphie doit garder le côté légèrement irrégulier d'une écriture manuscrite. Résistez à la tentation de dupliquer des lettres et des morceaux de lettres ; chaque coup de plume doit être original. - - + + - Et voici quelques exemples de lettrages complets - - - - - - - - - - Écriture onciale - Écriture carolingienne (minuscule Caroline) - Écriture gothique - Écriture bâtarde - - - Écriture italique florissante - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Conclusion + Et voici quelques exemples de lettrages complets : + + + + + + + + + + Écriture onciale + Écriture carolingienne (minuscule Caroline) + Écriture gothique + Écriture bâtarde + + + Écriture italique florissante + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Conclusion - - + + - La calligraphie n'est pas seulement amusante; c'est un art profondément spirituel qui peut changer votre approche quant à ce que vous voyez et faites. L'outil calligraphie d'Inkscape ne peut servir que d'introduction modeste. Mais il est agréable d'utilisation et peut être utile pour des travaux concrets. Faites-vous plaisir ! + La calligraphie n'est pas seulement amusante ; c'est un art profondément spirituel qui peut transformer votre regard sur tout ce que vous faites et voyez. L'outil Calligraphie d'Inkscape ne peut servir que d'introduction modeste. Et pourtant, il est très amusant de jouer avec et il peut servir à des travaux concrets. Faites-vous plaisir ! - + @@ -807,8 +807,8 @@ bulia byak, buliabyak@users.sf.net et josh andler, scislac@users.sf.net - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer diff --git a/share/tutorials/tutorial-elements.fr.svg b/share/tutorials/tutorial-elements.fr.svg index e64dd1d2e..06be155d4 100644 --- a/share/tutorials/tutorial-elements.fr.svg +++ b/share/tutorials/tutorial-elements.fr.svg @@ -35,16 +35,16 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::RUDIMENTS - + @@ -53,42 +53,42 @@ - Rudiments - Principes - La couleur - La ligne - La forme - L'espace - La texture - Luminosité - La taille - L'équilibre - Le contraste - L'emphase - La proportion - Le motif - Gradation - La composition - Vue d'ensemble - + Rudiments + Principes + Couleur + Ligne + Forme + Espace + Texture + Valeur + Taille + Équilibre + Contraste + Emphase + Proportion + Motif + Gradation + Composition + Vue d'ensemble + Rudiments de design - + - Les éléments suivant forment les bases de l'élaboration d'un design. + Les éléments suivants forment les bases de l'élaboration d'un design. - - La ligne + + Ligne - + - Une ligne est définie comme une marque avec une longueur et une direction, créée par un point se déplaçant sur une surface. Une ligne peut varier en longueur, largeur, direction, courbure et en couleur. Une ligne peut être bi-dimensionnelle (un trait de crayon sur du papier) ou tri-dimensionnelle. + Une ligne est définie comme une marque avec une longueur et une direction, créée par un point se déplaçant sur une surface. Une ligne peut varier en longueur, largeur, direction, courbure et en couleur. Une ligne peut être bidimensionnelle (un trait de crayon sur du papier) ou tridimensionnelle. @@ -102,15 +102,15 @@ - - La forme + + Forme - + - Une forme est créée par la rencontre ou l'intersection de signes entourant un espace. Une variation de couleur ou une ombre peuvent définir une forme. Les formes peuvent être classées en deux catégories : géometriques (un carré, un triangle, un cercle) et organiques (contour irrégulier). + Une forme est créée par la rencontre ou l'intersection de signes entourant un espace. Une variation de couleur ou une ombre peuvent définir une forme. Les formes peuvent être classées en deux catégories : géométriques (un carré, un triangle, un cercle) et organiques (contour irrégulier). @@ -118,38 +118,38 @@ - - La taille + + Taille - + La taille se réfère aux proportions des objets, lignes ou formes. Les variations de taille entre des objets peuvent être réelles ou imaginaires. - GRAND - petit - - L'espace + GRAND + petit + + Espace - + - L'espace est l'aire vide (ou ouverte) entre, autour, au-dessus, en-dessous, devant ou dans des objets. Les formes peuvent être définies par l'espace qu'elles contiennent et qui les entoure. L'espace est souvent qualifié de tri- ou bi-dimensionnel. L'espace positif est celui rempli par une forme. L'espace négatif est celui qui entoure une forme. + L'espace est l'aire vide (ou ouverte) entre, autour, au-dessus, en dessous, devant ou dans des objets. Les formes peuvent être définies par l'espace qu'elles contiennent et qui les entoure. L'espace est souvent qualifié de tri- ou bi-dimensionnel. L'espace positif est celui rempli par une forme. L'espace négatif est celui qui entoure une forme. - - La couleur + + Couleur - + @@ -167,11 +167,11 @@ - - La texture + + Texture - + @@ -192,11 +192,11 @@ - - Luminosité + + Valeur - + @@ -227,25 +227,25 @@ - + Principes de design - + Les principes combinent les éléments de design pour produire une composition. - - L'équilibre + + Équilibre - + - L'équilibre est une impression visuelle de parité dans la forme, la valeur, la couleur... L'équilibre peut être symétrique (équilibré) ou asymétrique (déséquilibré). Les objets, luminosités, couleurs, textures, formes, etc., peuvent être mis à contribution pour créer un équilibre dans la composition. + L'équilibre est une impression visuelle de parité dans la forme, la valeur, la couleur… L'équilibre peut être symétrique (équilibré) ou asymétrique (déséquilibré). Les objets, luminosités, couleurs, textures, formes, etc., peuvent être mis à contribution pour créer un équilibre dans la composition. @@ -253,11 +253,11 @@ - - Le contraste + + Contraste - + @@ -267,11 +267,11 @@ - - L'emphase + + Emphase - + @@ -282,11 +282,11 @@ - - La proportion + + Proportion - + @@ -381,8 +381,8 @@ - Fourmi & 4x4 au hazard - Image SVG crée par Andrew FitzsimonAutorisation de la bibiothèque·Open·Clip·Arthttp://www.openclipart.org/ + Fourmi & 4×4 au hasard + Image SVG créée par Andrew FitzsimonAutorisation de la bibliothèque Open Clip Arthttp://www.openclipart.org/ @@ -405,11 +405,11 @@ - - Le motif + + Motif - - + + @@ -425,14 +425,14 @@ - - - - - Gradation + + + + + Gradation - - + + @@ -448,17 +448,17 @@ - - - - - - - - La composition + + + + + + + + Composition - - + + @@ -544,99 +544,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - Bibliographie + + + Bibliographie - - + + Voici une bibliographie (partielle) utilisée pour la réalisation de ce document : - - - + + + - http://www.makart.com/resources/artclass/EPlist.html + http://www.makart.com/resources/artclass/EPlist.html - - - + + + - http://www.princetonol.com/groups/iad/Files/elements2.htm + http://www.princetonol.com/groups/iad/Files/elements2.htm - - - + + + - http://www.johnlovett.com/test.htm + http://www.johnlovett.com/test.htm - - - + + + - http://digital-web.com/articles/elements_of_design/ + http://digital-web.com/articles/elements_of_design/ - - - + + + - http://digital-web.com/articles/principles_of_design/ + http://digital-web.com/articles/principles_of_design/ - - + + - Remerciements spéciaux à Linda Kim (http://www.coroflot.com/redlucite/) qui m'a (http://www.rejon.org/) bien aidé sur ce didacticiel. Merci également à l'Open Clip Art Library (http://www.openclipart.org/) et aux gens qui ont soumis des dessins pour ce projet. + Remerciements spéciaux à Linda Kim (http://www.coroflot.com/redlucite/) qui m'a (http://www.rejon.org/) bien aidé sur ce didacticiel. Merci également à l'Open Clip Art Library (http://www.openclipart.org/) et aux gens qui ont soumis des dessins pour ce projet. - + @@ -666,8 +666,8 @@ - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer diff --git a/share/tutorials/tutorial-interpolate.fr.svg b/share/tutorials/tutorial-interpolate.fr.svg index ce599e2fb..ad7846111 100644 --- a/share/tutorials/tutorial-interpolate.fr.svg +++ b/share/tutorials/tutorial-interpolate.fr.svg @@ -1,15 +1,15 @@ - + - + - - - + + + @@ -25,542 +25,542 @@ - - - - - - - - - + + + + + + + + + - Essayez Ctrl+flèche pour vous déplacer - - - + Essayez Ctrl+flèche pour vous déplacer + + + - - ::INTERPOLER + + ::INTERPOLATION Ryan Lerch, ryanlerch at gmail dot com - - + + - Ce document explique comment utiliser l'extension Interpoler + Ce document explique comment utiliser l'extension d'interpolation d'Inkscape. - - Introduction + + Introduction - - + + - Interpoler réalise une interpolation linéaire entre deux (ou plus) chemins sélectionnés. Cela signifie essentiellement qu'il « comble les vides » entre les chemins et les transforme en fonction du nombre d'étapes demandées. + L'effet de cette extension consiste en une interpolation linéaire entre deux (ou plus) chemins sélectionnés. Cela signifie essentiellement qu'elle « comble les vides » entre les chemins et les transforme en fonction du nombre d'étapes demandées. - - + + - Pour utiliser l'extension Interpoler, sélectionnez les chemins que vous souhaitez transformer, et choisissez la commande Extensions > Générer à partir du chemin > Interpoler. + Pour utiliser l'extension Interpoler, sélectionnez les chemins que vous souhaitez transformer, et choisissez la commande Extensions > Générer à partir du chemin > Interpoler. - - + + - Avant de lancer cet extension, les objets que vous souhaitez transformer doivent être des chemins. Pour transformer un objet en chemin, utilisez la commande Chemin > Objet en chemin or Maj+Ctrl+C. Si ce n'est pas le cas, l'extension sera inopérante. + Avant d'exécuter cette extension, les objets que vous souhaitez transformer doivent être des chemins. Pour transformer un objet en chemin, utilisez la commande Chemin > Objet en chemin ou Maj+Ctrl+C. Si vos objets ne sont pas des chemins, l'extension n'aura pas d'effet. - - Interpolation entre deux chemins identiques + + Interpolation entre deux chemins identiques - - + + - L'utilisation la plus simple de l'extension Interpoler consiste à l'appliquer entre deux chemins identiques. Lorsque l'extension est appelée, elle a pour effet de remplir l'espace entre les deux chemins avec des copies des chemins originaux. Le nombre d'étapes défini combien de copies seront utilisées. + L'utilisation la plus simple de l'extension Interpoler consiste à l'appliquer entre deux chemins identiques. Lorsque l'extension est appelée, elle a pour effet de remplir l'espace entre les deux chemins avec des copies des chemins originaux. Le nombre d'étapes définit combien de copies seront utilisées. - - + + Prenons par exemple les deux chemins suivants : - - - + + + - - + + Sélectionnez maintenant les deux chemins et exécutez l'extension Interpoler avec les paramètres proposés dans l'image suivante. - - - - - - - - - - + + + + + + + + + + - Exposant : 0.0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché + Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - - + + Comme vous pouvez le voir ci-dessus, l'espace entre les deux chemins en forme de cercle a été rempli par six (le nombre d'étapes d'interpolation) autres chemins de même forme. Notez également que l'extension groupe toutes les formes. - - Interpolation entre deux différents chemins + + Interpolation entre deux différents chemins - - + + - Lorsque l'interpolation est effectuée entre deux chemins différents, le programme interpole la forme du chemin du premier vers le second. En résultat, vous obtenez une séquence fondue entre les chemins, toujours avec la régularité définie par le paramètre Étapes d'interpolation. + Lorsque l'interpolation est effectuée entre deux chemins différents, le programme interpole la forme du chemin du premier vers le second. En résultat, vous obtenez une séquence fondue entre les chemins, toujours avec la régularité définie par la valeur du paramètre Étapes d'interpolation. - - + + Prenons par exemple les deux chemins suivants : - - - + + + - - + + Sélectionnez maintenant les deux chemins et lancez l'extension Interpoler. Le résultat devrait ressembler à ceci : - - - - - - - - - + + + + + + + + + - - Exposant : 0.0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché + + Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - - + + Comme vous pouvez le constater avec le résultat précédent, l'espace entre le chemin en forme de cercle et celui en forme de triangle a été rempli par six chemins qui passent progressivement de la forme du premier chemin à celle du second. - - + + - Lorsque vous utilisez l'extension Interpoler entre deux chemins différents, la position du nœud de départ de chaque chemin est importante. Pour trouver ce nœud particulier, sélectionnez le chemin, puis l'outil Nœud pour faire apparaitre les nœuds, et appuyez sur la touche Tab. Le premier nœud apparaissant sélectionné est le nœud de départ. + Lorsque vous utilisez l'extension Interpoler entre deux chemins différents, la position du nœud de départ de chaque chemin est importante. Pour trouver ce nœud particulier, sélectionnez le chemin, puis l'outil Nœud pour faire apparaître les nœuds, et appuyez sur la touche Tab. Le premier nœud apparaissant sélectionné est le nœud de départ. - - + + Examinez l'image ci-dessous, identique à l'exemple précédent, à l'exception des nœuds ici affichés. Le nœud vert, sur chaque chemin, est le nœud de départ. - - - - - - - - - - + + + + + + + + + + - - + + L'exemple précédent (affiché à nouveau ci-dessous) a été réalisé avec ces nœuds de départ. - - - - - - - - - + + + + + + + + + - - Exposant : 0.0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché + + Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - - + + Notez maintenant les changements, dans le résultat de l'interpolation, lorsque le chemin triangle a été inversé (par miroir) de façon à ce que le nœud de départ soit dans un position différente : - + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - Méthode d'interpolation + + Méthode d'interpolation - - + + - Un des paramètres de l'extension Interpolation est la méthode d'interpolation. Deux méthodes ont été implémentées ; elles se différencient dans la façon dont sont calculées les courbes des nouvelles formes. Ces choix prennent la valeur 1 ou 2. + Un des paramètres de l'extension Interpoler est la méthode d'interpolation. Deux méthodes ont été implémentées ; elles se différencient dans la façon dont sont calculées les courbes des nouvelles formes. Ces choix prennent la valeur 1 ou 2. - - + + Dans l'exemple ci-dessus, nous avons utilisé la méthode d'interpolation 2, et le résultat était : - - - - - - - - - + + + + + + + + + - + - - + + Comparez maintenant avec la méthode d'interpolation 1 : - - - - - - - - - - + + + + + + + + + + - - + + - Expliquer exactement comment ces deux méthodes travaillent dépasse le cadre de ce document. Essayez simplement les deux méthodes, et utilisez celle qui donne le résultat le plus proche de ce que vous souhaitez. + Les différences dans la manière dont ces méthodes calculent les nombres dépassent le cadre de ce document. Essayez donc simplement les deux méthodes, et utilisez celle qui donne le résultat le plus proche de ce que vous souhaitez. - - Exposant + + Exposant - - + + - Le paramètre Exposant contrôle l'espacement entre les étapes de l'extrapolation. Avec un exposant à 0, l'espacement entre les copies est partout identique. + Le paramètre Exposant contrôle l'espacement entre les étapes successives de l'interpolation. Avec un exposant à 0, l'espacement entre les copies est partout identique. - - + + Voici le résultat d'un autre exemple élémentaire avec un exposant de 0. - - - - - - - - - - + + + + + + + + + + - Exposant : 0.0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché + Exposant : 0,0Étapes d'interpolation : 6Méthode d'interpolation : 2Dupliquer les extrémités : décochéInterpoler le style : décoché - - + + Même exemple avec un exposant de 1 : - - - - - - - - - - + + + + + + + + + + - - + + avec un exposant de 2 : - - - - - - - - - - + + + + + + + + + + - - + + et avec un exposant de -1 : - - - - - - - - - - + + + + + + + + + + - - + + Lorsque vous utilisez l'exposant, l'ordre de sélection des objets est important. Dans l'exemple précédent, le chemin en forme d'étoile sur la gauche a été sélectionné en premier, et le chemin en forme d'hexagone sur la droite sélectionné en second. - - + + Voici le résultat d'une interpolation avec le chemin de droite sélectionné en premier. L'exposant, dans cet exemple, a été positionné à 1 : - - - - - - - - - - + + + + + + + + + + - - Dupliquer les extrémités + + Dupliquer les extrémités - - + + Ce paramètre détermine si le groupe de chemins généré par l'extension inclut une copie des chemins originaux sur lesquels l'interpolation est appliquée. - - Interpoler le style + + Interpoler le style - - + + Ce paramètre est un des plus astucieux de l'extension. Il fait en sorte que l'extension essaie de changer le style des chemins à chaque étape. Ainsi, si le chemin original et le chemin final ont une couleur différente, les chemins générés changeront de couleur progressivement à chaque étape. - - + + - Voici un exemple ou la fonction Interpoler le style est utilisée sur le remplissage du chemin : - - - - - - - - - - - + Voici un exemple où la fonction Interpoler le style est utilisée sur le remplissage d'un chemin : + + + + + + + + + + + - - + + - Interpoler le style affecte également le contour du chemin : - - - - - - - - - - - + Interpoler le style affecte également le contour d'un chemin : + + + + + + + + + + + - - + + - Bien sûr, le chemin de départ et le chemin final n'ont pas besoin d'être identiques : - - - - - - - - - - - + Bien sûr, les chemins de départ et de fin n'ont pas besoin d'être identiques : + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - Utiliser l'interpolation pour imiter des gradients de forme irrégulière + + Utiliser l'interpolation pour imiter des dégradés de forme irrégulière - - + + - Il n'est pas (encore) possible avec Inkscape de créer un gradient d'un forme autre que linéaire (en ligne droite) ou radiale (circulaire). Toutefois, l'interpolation du style, dans cette extension, permet d'imiter un gradient irrégulier. Voici un exemple simple — dessinez deux lignes de contours différents : + Il n'est pas (encore) possible avec Inkscape de créer un dégradé d'une forme autre que linéaire (en ligne droite) ou radiale (circulaire). Toutefois, l'interpolation du style, dans cette extension, permet d'imiter un gradient irrégulier. Voici un exemple simple — dessinez deux lignes de contours différents : - - - + + + - - + + - Et lancez une interpolation entre les deux lignes pour créer le gradient : + Et lancez une interpolation entre les deux lignes pour créer votre dégradé : - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - Conclusion + + Conclusion - - + + - Comme démontré ci-dessus, l'extension Interpoler est un outil puissant. Ce tutoriel en couvre les bases, mais l'expérimentation est la clé pour explorer plus en avant l'interpolation. + Comme démontré ci-dessus, l'extension Interpoler est un outil puissant. Ce tutoriel en couvre les bases, mais l'expérimentation est la clé pour explorer l'interpolation plus profondément. - + - - - + + + @@ -576,19 +576,19 @@ Ryan Lerch, ryanlerch at gmail dot com - - - - - - - - - + + + + + + + + + - - Essayez Ctrl+flèche pour vous déplacer - + + Essayez Ctrl+flèche pour vous déplacer + diff --git a/share/tutorials/tutorial-shapes.fr.svg b/share/tutorials/tutorial-shapes.fr.svg index a23d0620c..ccfadc89e 100644 --- a/share/tutorials/tutorial-shapes.fr.svg +++ b/share/tutorials/tutorial-shapes.fr.svg @@ -35,357 +35,357 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::FORMES - + Ce didacticiel aborde les quatre outils de formes : rectangle, ellipse, étoile et spirale. Nous verrons des exemples montrant les possibilités des formes d'Inkscape et suggérerons quand et comment les utiliser. - + - Faites défiler la page avec Ctrl+flèche ou avec la souris (molette ou bouton du milieu). Pour les bases de la création, sélection ou transformation d'objets, voyez le didacticiel basique du menu Aide > Didacticiels. + Faites défiler la page avec Ctrl+flèche ou avec la souris (molette ou bouton du milieu). Pour les bases de la création, sélection ou transformation d'objets, voyez le didacticiel basique du menu Aide > Didacticiels. - + Inkscape possède plusieurs outils de formes versatiles, chacun créant son propre type de forme. Une forme est un objet ayant un certain type de poignées déplaçables et des paramètres numériques permettant de modifier cette forme tout en conservant son type. - + - Par exemple, vous pouvez modifier le nombre de sommets d'une étoile, ou ses dimension, angle, arrondi etc. — mais une étoile reste une étoile. Une forme est donc "moins libre" qu'un chemin, mais souvent plus pratique et intéressante. Vous pouvez convertir une forme en chemin (Maj+Ctrl+C), mais pas l'inverse. + Par exemple, avec une étoile, vous pouvez modifier le nombre de sommets, leur longueur, angle, arrondi, etc. — mais une étoile reste une étoile. Une forme est donc « moins libre » qu'un chemin, mais souvent plus pratique et intéressante. Vous pouvez convertir une forme en chemin (Maj+Ctrl+C), mais la conversion inverse est impossible. - - + + Les outils de formes sont : l'outil rectangle, l'outil ellipse, l'outil étoile et l'outil spirale. Nous allons d'abord voir comment ces outils fonctionnent de manière générale, puis nous explorerons les possibilités particulières de chacun d'entre eux. - - Principes généraux + + Principes généraux - - + + - Une forme est créée sur le canevas par un cliquer-déplacer avec l'outil lui correspondant. Une fois la forme créée (et tant qu'elle est sélectionnée), elle affiche ses poignées (des marques en forme de diamant), de sorte que vous pouvez toujours la modifier en déplaçant ces poignées. + Une forme est créée sur le canevas par un cliquer-déplacer avec l'outil lui correspondant. Une fois la forme créée (et tant qu'elle est sélectionnée), elle affiche ses poignées (des marques en forme de diamant, carré ou cercle), de sorte que vous pouvez toujours la modifier en déplaçant ces poignées. - - + + Les quatre types de formes affichent leurs poignées dans les quatre outils de forme, mais aussi dans l'outil nœud (F2). Lorsque vous faites passer le curseur de la souris au-dessus d'une poignée, la barre d'état affiche des messages vous indiquant ce que vous pouvez faire en lui cliquant dessus ou en la déplaçant en combinaison avec différents raccourcis. - - + + - De plus chaque outil de forme affiche ses paramètres dans la barre de contrôle d'outil (qui est affichée horizontalement au dessus du canevas). Elle comporte habituellement plusieurs champs numériques et un bouton de remise à zéro (retour aux valeurs par défaut) de ces champs. Quand une (ou des) formes de l'outil en cours d'utilisation est sélectionnée, modifier les valeurs de ces champs de la barre de contrôle permet de modifier la (ou les) forme sélectionnée. + De plus, chaque outil de forme affiche ses paramètres dans la barre de contrôle d'outil (qui est affichée horizontalement au-dessus du canevas). Elle comporte habituellement plusieurs champs numériques et un bouton de remise à zéro (retour aux valeurs par défaut) de ces champs. Quand une ou plusieurs formes de l'outil en cours d'utilisation sont sélectionnées, modifier les valeurs de ces champs de la barre de contrôle permet de modifier la ou les formes sélectionnées. - - + + - Toute modification effectuée via la barre de contrôle est retenue afin d'être réappliquée à la prochaine forme que vous dessinerez avec cet outil. Par exemple, après avoir changé le nombre de sommets d'une étoile, les étoiles que vous créerez par la suite auront le même nombre de sommets. De plus, le simple fait de sélectionner une forme donnée envoie ses paramètres à la barre de contrôle d'outil et donc permet de définir les valeurs pour les formes de ce type que vous créerez après. + Toute modification effectuée via la barre de contrôle est retenue afin d'être appliquée à la prochaine forme que vous dessinerez avec cet outil. Par exemple, après avoir changé le nombre de sommets d'une étoile, les étoiles que vous créerez par la suite auront le même nombre de sommets. De plus, le simple fait de sélectionner une forme donnée envoie ses paramètres à la barre de contrôle d'outil et donc permet de définir les valeurs pour les formes de ce type que vous créerez après. - - + + - Lorsque vous utilisez un outil de forme, vous pouvez sélectionner un objet en cliquant dessus.Ctrl+ cliquer (sélectionner au sein d'un groupe) et Alt+cliquer (sélectionner dessous) fonctionne aussi comme dans le sélecteur. Esc permet de désélectionner. + Lorsque vous utilisez un outil de forme, vous pouvez sélectionner un objet en cliquant dessus. Ctrl+clic (sélectionner au sein d'un groupe) et Alt+clic (sélectionner dessous) fonctionnent aussi comme dans le sélecteur. Échap permet de désélectionner. - - Rectangles + + Rectangles - - + + Le rectangle est la forme la plus simple mais sans doute la plus courante en design et en illustration. Inkscape tente de rendre la création et la modification des rectangles aussi simple et efficace que possible. - - + + Passez à l'outil Rectangle en appuyant sur F4 ou en cliquant sur son bouton dans la barre d'outils. Dessinez un nouveau rectangle à côté de celui-ci : - dessinez ici - - - + dessinez ici + + + Puis, sans quitter l'outil rectangle, passez d'un rectangle à l'autre en cliquant dessus. - - + + - Raccourcis de dessin des rectangle : + Raccourcis de dessin des rectangles : - - - + + + En appuyant sur Ctrl, vous pouvez dessiner un carré ou un rectangle de rapport de dimensions entier (2:1, 3:1, etc.). - - - + + + En appuyant sur Maj, vous pouvez dessiner autour du point de départ. - - + + - Comme vous pouvez le voir, le rectangle sélectionné (le rectangle qui vient d'être créé est toujours sélectionné) affiche trois poignées dans trois de ses coins. En fait, il y a quatre poignées, mais deux d'entre elles (dans le coin supérieur droit) se chevauchent si le rectangle n'est pas arrondi. Ces deux-là sont les poignées d'arrondi; les deux autres (en haut à gauche, et en bas à droite) sont les poignées de redimensionnement. + Comme vous pouvez le voir, le rectangle sélectionné (le rectangle qui vient d'être créé est toujours sélectionné) affiche trois poignées dans trois de ses coins. En fait, il y a quatre poignées, mais deux d'entre elles (dans le coin supérieur droit) se chevauchent si le rectangle n'est pas arrondi. Ces deux-là sont les poignées d'arrondi ; les deux autres (en haut à gauche, et en bas à droite) sont les poignées de redimensionnement. - - + + - Voyons les poignées d'arrondi d'abord. Saisissez l'une d'elles, et déplacez-la vers le bas. Les quatres coins du rectangle deviennent arrondis, et vous pouvez maintenant voir la deuxième poignée d'arrondi — qui est toujours au même emplacement dans le coin. Si vous voulez obtenir des coins arrondis circulairement, vous n'avez plus rien à faire. Si vous voulez des arrondis avec un rayon différent selon le côté, vous pouvez déplacer la deuxième poignée vers la gauche. + Voyons les poignées d'arrondi d'abord. Saisissez l'une d'elles, et déplacez-la vers le bas. Les quatre coins du rectangle deviennent arrondis, et vous pouvez maintenant voir la deuxième poignée d'arrondi — qui est toujours au même emplacement dans le coin. Si vous voulez obtenir des coins arrondis circulairement, vous n'avez plus rien à faire. Si vous voulez des arrondis avec un rayon différent selon le côté, vous pouvez déplacer la deuxième poignée vers la gauche. - - + + Ici, les deux premiers rectangles ont des coins arrondis circulairement et les deux autres des coins arrondis elliptiquement : - coins arrondis elliptiques - Coins arrondis circulaires - - - - - - + Coins arrondis elliptiques + Coins arrondis circulaires + + + + + + - Toujours avec l'outil rectangle, cliquez sur ces rectangle pour les sélectionner et observez leurs poignées d'arrondi. + Toujours avec l'outil Rectangle, cliquez sur ces rectangles pour les sélectionner et observez leurs poignées d'arrondi. - - + + - Souvent, le rayon et la forme des coins arrondis doivent garder les mêmes proportions au sein d'une composition, même si les dimensions des rectangles sont différentes (comme dans des diagrammes formés de boîtes arrondies de différentes tailles). Inkscape permet cela facilement. Passez à l'outil sélecteur; dans la barre de contrôle de cet outil, il y a un groupe de quatre boutons enfonçables, le second affichant deux coins arrondis concentriques. Ce bouton vous permet de déterminer si les rayons des coins arrondis doivent être mis à l'échelle ou non quand vous redimensionnez un rectangle. + Souvent, le rayon et la forme des coins arrondis doivent garder les mêmes proportions au sein d'une composition, même si les dimensions des rectangles sont différentes (comme dans des diagrammes formés de boîtes arrondies de différentes tailles). Inkscape permet cela facilement. Passez à l'outil sélecteur ; dans la barre de contrôle de cet outil, il y a un groupe de quatre boutons, le second affichant deux coins arrondis concentriques. Ce bouton vous permet de déterminer si les rayons des coins arrondis doivent être mis à l'échelle ou non quand vous redimensionnez un rectangle. - - + + - Ici par exemple, le rectangle original rouge a été dupliqué et ses dimensions changées (augmentées et diminuées) plusieurs fois selon différentes proportions, le bouton "préserver l'échelle des arrondis" étant décoché : + Ici par exemple, le rectangle original rouge a été dupliqué et ses dimensions changées (augmentées et diminuées) plusieurs fois selon différentes proportions, le bouton « préserver l'échelle des arrondis » étant désactivé : - Rectangles arrondis redimensionnés avec "préserver l'échelle des arrondis" décoché - - - - - - - - - - + Redimensionner des rectangles arrondis avec « préserver l'échelle des arrondis » désactivé + + + + + + + + + + Notez que la taille et la forme des coins arrondis restent les mêmes pour tous les rectangles, de sorte que les coins arrondis se superposent exactement en haut à droite de la figure. Tous les rectangles bleus en pointillés ont été obtenus après un redimensionnement de l'original dans le sélecteur, sans avoir réajusté les poignées d'arrondi. - - + + - Pour comparer, voici la même composition, mais créée cette fois-ci le bouton "préserver l'échelle des arrondis" étant coché : + Pour comparer, voici la même composition, mais créée cette fois-ci le bouton « préserver l'échelle des arrondis » étant activé : - Rectangles arrondis redimensionnés avec "préserver l'échelle des arrondis" coché - - - - - - - - - - + Redimensionner des rectangles arrondis avec « préserver l'échelle des arrondis » activé + + + + + + + + + + - Maintenant, les rectangles ont tous des coins arrondis différemment, et il n'y a plus aucune superposition en haut à droite (zommez pour le vérifier). Ce résultat (visible) est le même que celui que vous auriez obtenu en convertissant le rectangle original en chemin (Ctrl+Maj+C) puis en modifiant les dimensions de ce chemin. + Maintenant, les rectangles ont tous des coins arrondis différemment, et il n'y a plus aucune superposition en haut à droite (zoomez pour le vérifier). Ce résultat (visible) est le même que celui que vous auriez obtenu en convertissant le rectangle original en chemin (Ctrl+Maj+C) puis en modifiant les dimensions de ce chemin. - - + + Voici les raccourcis permettant de manipuler les poignées d'arrondi d'un rectangle : - - - + + + Déplacez-les en appuyant sur Ctrl pour garder égaux les deux rayons (arrondi circulaire). - - - + + + - Ctrl+cliquer sur une poignée rendra son rayon égal à celui de la deuxième sans avoir à la déplacer. + Ctrl+clic sur une poignée rendra son rayon égal à celui de la deuxième sans avoir à la déplacer. - - - + + + - Maj+clicquer permet de supprimer l'arrondi. + Maj+clic permet de supprimer l'arrondi. - - + + - Vous avez peut-être remarqué que la barre de contrôle de l'outil rectangle affiche deux champs pour les rayons horizontal (Rx) et vertical (Ry) d'arrondi pour le rectangle sélectionné , vous permettant ainsi de modifier précisément ces rayons dans l'unité de votre choix. Le bouton Pas d'arrondi fait simplement ce qu'il indique : il supprime l'arrondi des rectangles sélectionnés. + Vous avez peut-être remarqué que la barre de contrôle de l'outil Rectangle affiche deux champs pour les rayons horizontal (Rx) et vertical (Ry) d'arrondi pour le rectangle sélectionné , vous permettant ainsi de modifier précisément ces rayons dans l'unité de votre choix. Le bouton Rendre les coins pointus fait simplement ce qu'il indique : il supprime l'arrondi des rectangles sélectionnés. - - + + - Un avantage important de ces contrôles est qu'ils peuvent affecter plusieurs rectangles en même temps. Par exemple, si vous voulez modifier tous les rectangles d'un calque, vous n'avez qu'à appuyer sur Ctrl+A (tout sélectionner) et définir les paramètres voulus dans la barre de contrôle. Si des objets autres que des rectangles sont sélectionnés, ils seront ignorés — seuls les formes rectangles seront modifiées. + Un avantage important de ces contrôles est qu'ils peuvent affecter plusieurs rectangles en même temps. Par exemple, si vous voulez modifier tous les rectangles d'un calque, vous n'avez qu'à appuyer sur Ctrl+A (tout sélectionner) et définir les paramètres voulus dans la barre de contrôle. Si des objets autres que des rectangles sont sélectionnés, ils seront ignorés — seuls les rectangles seront modifiés. - - + + Maintenant, observons les poignées de redimensionnement d'un rectangle. Vous vous demandez peut-être à quoi elles servent puisqu'il est possible de redimensionner un rectangle avec le sélecteur ? - - + + - Le problème avec le sélecteur est que pour lui, les notions d'horizontale et de verticale sont celles de la page. En revanche, les poignées de redimensionnement d'un rectangle agissent parallèlement à ses côtés, même si le rectangle a été tourné ou incliné. Par exemple, essayez de redimensionner ce rectangle d'abord avec le sélecteur puis avec ses poignées de redimensionnement dans l'outil rectangle : + Le problème avec le sélecteur est que pour lui, les notions d'horizontale et de verticale sont celles de la page. En revanche, les poignées de redimensionnement d'un rectangle agissent parallèlement à ses côtés, même si le rectangle a été tourné ou incliné. Par exemple, essayez de redimensionner ce rectangle d'abord avec le sélecteur puis avec ses poignées de redimensionnement dans l'outil Rectangle : - - - + + + Comme il y a deux poignées de redimensionnement, vous pouvez modifier les dimensions du rectangle selon n'importe quelle direction et même parallèlement à ses côtés. Le redimensionnement préserve les rayons d'arrondi des coins. - - + + Voici les raccourcis permettant de manipuler les poignées de redimensionnement d'un rectangle : - - - + + + Déplacez-les en appuyant sur Ctrl pour forcer leur déplacement parallèlement aux côtés du rectangle ou à sa diagonale. Autrement dit, Ctrl permet de préserver la largeur ou la hauteur ou encore le ratio largeur/hauteur du rectangle (dans son propre système de coordonnées qui peut être tourné ou incliné). - - + + - Voici le même rectangle, entouré de lignes pointillées grises indiquant les directions dans lesquelles vous pouvez déplacer ses poignées de redimensionnement en appuyant sur Ctrl (essayez): + Voici le même rectangle, entouré de lignes pointillées grises indiquant les directions dans lesquelles vous pouvez déplacer ses poignées de redimensionnement en appuyant sur Ctrl (essayez) : - + - - Faire coller le rectangle - redimensionner les poignées avec Ctrl - - + + Faire coller le rectangle — redimensionner les poignées avec Ctrl + + En inclinant et en tournant un rectangle, puis en le dupliquant et en modifiant ses dimensions avec ses poignées de redimensionnement, vous pouvez facilement créer des dessins en 3D : - - - - - - - - - - - - - - - - - - - - - 3 rectangles originaux - Différents rectangles copiés et redimensionnés à l'aide les poignées, la plupart avec Ctrl - - + + + + + + + + + + + + + + + + + + + + + 3 rectangles originaux + Différents rectangles copiés et redimensionnés à l'aide les poignées, la plupart avec Ctrl + + - Voici quelques exemples de plus de compositions avec des rectangles, incluant des coins arrondis et des dégradés de remplissage : + Voici quelques exemples supplémentaires de compositions avec des rectangles, incluant des coins arrondis et des dégradés de remplissage : @@ -451,615 +451,615 @@ - - - - - - - - - - - - - - - - - - - - - - - - Ellipses + + + + + + + + + + + + + + + + + + + + + + + + Ellipses - - + + - L'outil ellipse (F5) permet de créer des ellipses et des cercles, que vous pouvez transformer en camemberts ou en arcs. Les raccourcis sont les mêmes que ceux de l'outil rectangle : + L'outil Ellipse (F5) permet de créer des ellipses et des cercles, que vous pouvez transformer en camemberts ou en arcs. Les raccourcis sont les mêmes que ceux de l'outil Rectangle : - - - + + + En appuyant sur Ctrl, vous pouvez dessiner un cercle ou une ellipse de ratio entier (2:1, 3:1, etc.). - - - + + + En appuyant sur Maj, vous pouvez dessiner autour du point de départ. - - + + Intéressons-nous aux poignées d'une ellipse. Sélectionnez l'ellipse suivante : - - - + + + - une fois de plus, vous ne voyez d'abord que trois poignées, mais en fait il y en a quatre. Celle de droite est en fait deux poignées qui se superposent et qui permettent "d'ouvrir" l'ellipse. En déplaçant la première de ces poignées, la deuxième devient visible; déplacer ces poignées vous permettent d'obtenir toute sorte d'arcs ou de camemberts (portions d'ellipse en forme de part de tarte) : + Une fois de plus, vous ne voyez d'abord que trois poignées, mais il y en a quatre. À droite, il y a en fait deux poignées qui se superposent et qui permettent « d'ouvrir » l'ellipse. En déplaçant la première de ces poignées, la deuxième devient visible ; déplacer ces poignées vous permet d'obtenir toutes sortes d'arcs ou de camemberts (portions d'ellipse en forme de parts de tarte) : - - - - - - - - - + + + + + + + + + - Pour obtenir un camembert (un arc avec ses deux rayons), déplacez la poignée vers l'extérieur de l'ellipse; pour obtenir un arc, déplacez-la vers l'intérieur. Ci-dessus, vous pouvez voir 4 camemberts à gauche et 3 arcs à droite. Notez que les arcs sont des formes ouvertes, c'est à dire que le contour court le long de l'ellipse mais ne relie pas les extrémités de l'arc. Ceci devient évident si vous supprimez le remplissage, ne gardant visible que le contour : + Pour obtenir un camembert (un arc avec ses deux rayons), déplacez la poignée vers l'extérieur de l'ellipse ; pour obtenir un arc, déplacez-la vers l'intérieur. Ci-dessus, vous pouvez voir 4 camemberts à gauche et 3 arcs à droite. Notez que les arcs sont des formes ouvertes, c'est-à-dire que le contour court le long de l'ellipse mais ne relie pas les extrémités de l'arc. Ceci devient évident si vous supprimez le remplissage, ne gardant visible que le contour : - + - 15 + 15 - Segments - Arcs - - - - - - - - - - - - - - - - - - - - - + Segments + Arcs + + + + + + + + + + + + + + + + + + + + + Voyez le groupe de camemberts ressemblant à un ventilateur sur la gauche. Le créer a été facile, en déplaçant les poignées par incréments d'angle avec la touche Ctrl. Voici les raccourcis des poignées arc/camembert : - - - + + + En appuyant sur Ctrl, forcez des modifications d'angle par incréments de 15 degrés lors des déplacements de ces poignées. - - - + + + - Maj+cliquer sur ces poignées permet de refermer ces arcs/camemberts pour en refaire des ellipses. + Maj+clic sur ces poignées permet de refermer ces arcs/camemberts pour en refaire des ellipses. - - + + - L'incrément d'angle par défaut peut être modifié dans les préférences d'Inkscape (dans l'onglet Comportement > Incréments). + L'incrément d'angle par défaut peut être modifié dans les préférences d'Inkscape (dans l'onglet Comportement > Incréments). - - + + Les deux autres poignées d'une ellipse sont utilisées pour la redimensionner autour de son centre. Les raccourcis qui y sont associés sont similaires à ceux des poignées d'arrondi d'un rectangle : - - - + + + Déplacez-les tout en appuyant sur Ctrl pour faire un cercle (garder les deux rayons égaux). - - - + + + - Ctrl+cliquer sur une de ces poignées permet de transformer l'ellipse en cercle sans déplacer de poignée. + Ctrl+clic sur une de ces poignées permet de transformer l'ellipse en cercle sans déplacer de poignée. - - + + Et, tout comme les poignées de redimensionnement d'un rectangle, ces poignées permettent d'ajuster la largeur et la hauteur d'une ellipse dans son propre système de coordonnées. Ce qui signifie qu'une ellipse qui a été tournée ou inclinée peut facilement être redimensionnée parallèlement à ses axes. Essayez de modifier les dimensions de ces ellipses en utilisant leurs poignées de redimensionnement : - - - - - - - - Etoiles + + + + + + + + Étoiles - - + + - Les étoiles sont les formes les plus complexes et les plus intéressantes. Si vous voulez épater vos amis avec Inkscape, laissez-les s'amuser un peu avec l'outil étoile. Il est particulièrement amusant — ça devient presque une drogue ! + Les étoiles sont les formes les plus complexes et les plus intéressantes. Si vous voulez épater vos amis avec Inkscape, laissez-les s'amuser un peu avec l'outil Étoile. Il est particulièrement amusant — presque addictif ! - - + + - L'outil étoile permet de créer deux types de formes similaires : des étoiles et des polygones. Une étoile a deux poignées dont les positions définissent la longueur et la forme de ses branches; un polygone n'a qu'une poignée qui permet en la déplaçant de redimensionner et tourner ce polygone : + L'outil Étoile permet de créer deux types de formes similaires : des étoiles et des polygones. Une étoile a deux poignées dont les positions définissent la longueur et la forme de ses branches ; un polygone n'a qu'une poignée qui permet en la déplaçant de redimensionner et tourner ce polygone : - + - Etoile + Étoile - + - Polygone + Polygone - - + + - Dans la barre de contrôle de l'outil étoile vient d'abord une boîte permettant de passer du mode étoile à polygone et inversement. Puis un champ numérique permet de définir le nombre de sommets d'une étoile ou d'un polygone. Ce paramètre n'est modifiable que depuis cette barre de contrôle, et peut varier de 3 (évidemment) à 1024, mais vous devriez éviter d'entrer un trop grand nombre (disons, plus de 200) si votre ordinateur n'est pas très puissant. + Dans la barre de contrôle de l'outil Étoile, les deux premiers boutons déterminent si l'objet prend la forme d'une étoile ou d'un polygone régulier. Puis un champ numérique permet de définir le nombre de sommets d'une étoile ou d'un polygone. Ce paramètre n'est modifiable que depuis cette barre de contrôle, et peut varier de 3 (évidemment) à 1024, mais vous devriez éviter d'entrer un trop grand nombre (disons, plus de 200) si votre ordinateur n'est pas très puissant. - - + + Quand vous dessinez une nouvelle étoile ou un nouveau polygone, - - - + + + Déplacez une poignée en appuyant sur Ctrl pour forcer des modifications d'angle par incréments de 15 degrés. - - + + - Par nature, une étoile est une des formes les plus intéressantes (bien qu'en pratique les polygones soient souvent plus utiles). Les deux poignées d'une étoile ont des fonctions légèrement différentes. La première poignée (lors de la création de l'étoile, elle se trouve sur une pointe, c'est à dire un coin convexe de l'étoile) permet d'allonger ou raccourcir les branches de l'étoile, mais si vous la tournez (relativement au centre de la forme), l'autre poignée accompagne cette rotation. Ceci implique que vous ne pouvez pas incliner les branches de l'étoile avec cette poignée. + Par nature, une étoile est une des formes les plus intéressantes (bien qu'en pratique les polygones soient souvent plus utiles). Les deux poignées d'une étoile ont des fonctions légèrement différentes. La première poignée (lors de la création de l'étoile, elle se trouve sur une pointe, c'est-à-dire un coin convexe de l'étoile) permet d'allonger ou raccourcir les branches de l'étoile, et si vous la tournez (relativement au centre de la forme), l'autre poignée accompagne cette rotation. Ceci implique que vous ne pouvez pas incliner les branches de l'étoile avec cette poignée. - - + + Par contre, l'autre poignée (située initialement sur un coin concave entre deux pointes) est libre de se déplacer radialement et tangentiellement, sans affecter la poignée au bout d'une pointe (en fait cette poignée peut devenir à son tour la poignée de pointe si elle est déplacée plus loin du centre que l'autre poignée). Avec cette poignée, vous pouvez incliner les branches de l'étoile pour obtenir toutes sortes de cristaux, mandalas et flocons : - - - - - - - - - - - + + + + + + + + + + + Si vous voulez juste obtenir une étoile simple, sans de telles dentelles, vous pouvez restreindre le comportement de cette poignée de façon à éviter toute inclinaison : - - - + + + Déplacer la poignée en appuyant sur Ctrl permet de garder l'étoile strictement radiale (sans inclinaison). - - - + + + - Ctrl+cliquer sur la poignée permet de supprimer l'inclinaison sans la déplacer. + Ctrl+clic sur la poignée permet de supprimer l'inclinaison sans la déplacer. - - + + - En complément utile des possibilités de déplacement des poignées sur le canevas, la barre de contrôle comprend un champ Ratio des rayons qui définit le rapport entre les distances séparant chacune des poignée du centre. + En complément utile des possibilités de déplacement des poignées sur le canevas, la barre de contrôle comprend un champ Ratio des rayons qui définit le rapport entre les distances séparant chacune des poignée du centre. - - + + - Les étoiles d'Inkscape ont deux astuces de plus dans leur sac. En géométrie, un polygone est une forme composée de segments de droites avec des coins anguleux. Dans le monde réel, un certain degré de courbure est parfois présent — et Inkscape peut gérer cela aussi. Cependant, arrondir une étoile ou un polygone est un peu différent d'arrondir un rectangle. Vous n'avez pas de poignée dédiée à cette operation, mais, + Les étoiles d'Inkscape ont deux astuces de plus dans leur sac. En géométrie, un polygone est une forme composée de segments de droites avec des coins anguleux. Dans le monde réel, un certain degré de courbure est parfois présent — et Inkscape peut gérer cela aussi. Cependant, arrondir une étoile ou un polygone est un peu différent d'arrondir un rectangle. Vous n'avez pas de poignée dédiée à cette opération, mais, - - - + + + Maj+cliquer-déplacer tangentiellement une poignée permet d'arrondir une étoile ou un polygone. - - - + + + - Maj+cliquer sur une poignée permet de supprimer l'arrondi. + Maj+clic sur une poignée permet de supprimer l'arrondi. - - + + - "Tangentiellement" signifie dans une direction perpendiculaire à celle d'un rayon. Si vous 'tournez' une poignée en sens anti-horaire, vous augmentez l'arrondi; en sens horaire, vous le diminuez (voyez plus loin ci-dessous pour des exemples d'arrondi négatif). + « Tangentiellement » signifie dans une direction perpendiculaire à celle d'un rayon. Si vous tournez une poignée en sens anti-horaire, vous augmentez l'arrondi ; en sens horaire, vous le diminuez (voyez plus loin ci-dessous pour des exemples d'arrondi négatif). - - + + - Voici une comparaison entre un carré arrondi (issu de l'outil rectangle) et un quadrilatère arrondi (issu de l'outil étoile) : + Voici une comparaison entre un carré arrondi (issu de l'outil Rectangle) et un quadrilatère arrondi (issu de l'outil Étoile) : - + - Polygone arrondi + Polygone arrondi - + - Rectangle arrondi + Rectangle arrondi - - + + - Comme vous pouvez le voir, alors qu'un rectangle arrondi a des côtés droits et des coins arrondis (circulairement ou elliptiquement), un polygone ou une étoile arrondi n'a aucun segment rectiligne; ses courbures varient régulièrement entre un maximum (dans les coins) et un miminum (entre deux coins). Inkscape opère ceci en ajoutant deux tangentes de Bézier colineaires à chaque nœud de la forme (vous pouvez les voir en convertissant la forme en chemin et en l'examinant avec l'outil nœud). + Comme vous pouvez le voir, alors qu'un rectangle arrondi a des côtés droits et des coins arrondis (circulairement ou elliptiquement), un polygone ou une étoile arrondi n'a aucun segment rectiligne ; ses courbures varient régulièrement entre un maximum (dans les coins) et un minimum (entre deux coins). Inkscape opère ceci en ajoutant deux tangentes de Bézier colinéaires à chaque nœud de la forme (vous pouvez les voir en convertissant la forme en chemin et en l'examinant avec l'outil Nœud). - - + + - Le paramètre d'arrondi que vous pouvez ajuster dans la barre de contrôle est le rapport entre la longueur de ces tangentes et celle du côté adjacent de l'étoile/polygone. Ce paramètre peut être négatif, inversant ainsi la direction des tangentes. Des valeurs de 0.2 à 0.4 donnent une courbure 'normale' (assez courante); des valeurs plus importantes conduisent à des formes superbes, inextricables et totalement imprévisibles. Une étoile avec une grande valeur d'arrondi peut facilement dépasser les limites fixées habituellement par ses poignées. Voici quelques exemples, indiquant chacun sa valeur d'arrondi : - - - - - - - - - - - - - - - 0,25 - 0,25 - 0,25 - 0,37 - - 0,43 - 3,00 - -3,00 - - 0,41 - 5,43 - 1,85 - 0,21 - -3,00 - - -0,43 - - -8,94 - - 0,39 - - + Le paramètre d'arrondi que vous pouvez ajuster dans la barre de contrôle est le rapport entre la longueur de ces tangentes et celle du côté adjacent de l'étoile/polygone. Ce paramètre peut être négatif, inversant ainsi la direction des tangentes. Des valeurs de 0,2 à 0,4 donnent une courbure normale (assez courante) ; des valeurs plus importantes conduisent à des formes superbes, inextricables et totalement imprévisibles. Une étoile avec une grande valeur d'arrondi peut facilement dépasser les limites fixées habituellement par ses poignées. Voici quelques exemples, indiquant chacun sa valeur d'arrondi : + + + + + + + + + + + + + + + 0,25 + 0,25 + 0,25 + 0,37 + + 0,43 + 3,00 + -3,00 + + 0,41 + 5,43 + 1,85 + 0,21 + -3,00 + + -0,43 + + -8,94 + + 0,39 + + Si vous voulez que les pointes d'une étoile soient pointues et que les creux soient arrondis ou l'inverse, il suffit simplement de créer un offset (Ctrl+J) de cette étoile : - - - - Etoile originale - Offset lié, érodé - Offset lié, dilaté - - + + + + Étoile originale + Offset lié, érodé + Offset lié, dilaté + + Maj+cliquer-déplacer les poignées d'une étoile dans Inkscape est une des plus merveilleuses activités connues de l'être humain. Mais on peut faire encore mieux. - - + + - Afin d'imiter encore mieux les formes du monde réel, Inkscape peut rendre aléatoires (c'est à dire déformer aléatoirement) ses étoiles et polygones. Un peu de hasard rend une étoile moins régulière, plus 'humaine', souvent amusante; un hasard plus important est une façon distrayante d'obtenir toute une variété de formes complètement imprédictibles. Une étoile arrondie garde des courbures douces quand elle est rendue aléatoire. Voici les raccourcis : + Afin d'imiter encore mieux les formes du monde réel, Inkscape peut rendre aléatoires (c'est-à-dire déformer aléatoirement) ses étoiles et polygones. Un peu de hasard rend une étoile moins régulière, plus « humaine », souvent amusante ; un hasard plus important est une façon distrayante d'obtenir toute une variété de formes complètement imprédictibles. Une étoile arrondie garde des courbures douces quand elle est rendue aléatoire. Voici les raccourcis : - - - + + + Alt+cliquer-déplacer tangentiellement une poignée permet de rendre une étoile ou un polygone aléatoire. - - - + + + - Alt+cliquer sur une poignée permet de supprimer le hasard. + Alt+clic sur une poignée permet de supprimer le hasard. - - + + - Lors de l'édition (avec les poignées) d'une étoile aléatoire, celle-ci 'tremblera' car chaque position précise de ses poignées correspond à une unique quantité de hasard. Donc, déplacer une poignée sans appuyer sur Alt réinitialise ce hasard en conservant son niveau, tandis que Alt+cliquer-déplacer préserve ce hasard mais ajuste son niveau. Voici des étoiles dont les paramètres sont identiques, mais chacune d'entre elle a vu sa quantité de hasard mise à jour en déplaçant très légèrement sa poignée (la quantité de hasard varie de 0.1 tout au long de la figure suivante) : + Lors de l'édition (avec les poignées) d'une étoile aléatoire, celle-ci « tremblera » car chaque position précise de ses poignées correspond à une unique quantité de hasard. Donc, déplacer une poignée sans appuyer sur Alt réinitialise ce hasard en conservant son niveau, tandis que Alt+cliquer-déplacer préserve ce hasard mais ajuste son niveau. Voici des étoiles dont les paramètres sont identiques, mais chacune d'entre elles a vu sa quantité de hasard mise à jour en déplaçant très légèrement sa poignée (la quantité de hasard varie de 0,1 tout au long de la figure suivante) : - - - - - - - + + + + + + + - Et voici l'étoile du milieu de la figure ci-dessus, avec une quantité de hasard variant entre -0.2 et 0.2 : - - +0,2 - +0,1 - 0 - -0,1 - -0,2 - - - - - - - + Et voici l'étoile du milieu de la figure ci-dessus, avec une quantité de hasard variant entre -0,2 et 0,2 : + + +0,2 + +0,1 + 0 + -0,1 + -0,2 + + + + + + + - Essayez de Alt+cliquer-déplacer une poignée de l'étoile du milieu de la figure ci-dessus et observez comment elle passe de la forme de celle de gauche à la forme de celle de droite — et même au delà. + Essayez de Alt+cliquer-déplacer une poignée de l'étoile du milieu de la figure ci-dessus et observez comment elle passe de la forme de celle de gauche à la forme de celle de droite — et même au-delà. - - + + - Vous trouverez probablement vos propres applications aux étoiles aléatoires, j'avoue aimer particulièrement les éclaboussures en forme d'amibes et les grandes planètes irrégulières aux paysages fantastiques : - - - - - - - - - - - - Spirales + Vous trouverez probablement vos propres applications aux étoiles aléatoires, mais j'avoue aimer particulièrement les éclaboussures en forme d'amibes et les grandes planètes irrégulières aux paysages fantastiques : + + + + + + + + + + + + Spirales - - + + - Les spirales d'Inkscape sont des formes versatiles, et bien qu'elles ne soient pas aussi captivantes que les étoiles, elles sont parfois utiles. Une spirale, comme une étoile, est dessinée autour de son centre; lors de sa création tout comme lors de son édition, + Les spirales d'Inkscape sont des formes versatiles, et bien qu'elles ne soient pas aussi captivantes que les étoiles, elles sont parfois utiles. Une spirale, comme une étoile, est dessinée autour de son centre ; lors de sa création tout comme lors de son édition, - - - + + + Déplacez une poignée en appuyant sur Ctrl pour forcer des modifications d'angle par incréments de 15 degrés. - - + + - Une fois créée, une spirale possède deux poignées, intérieure et extérieure. Les deux poignées peuvent être simplement déplacées pour enrouler ou dérouler (c'est à dire la prolonger, en modifiant le nombre de ses tours) la spirale. Voici les autres raccourcis : + Une fois créée, une spirale possède deux poignées, intérieure et extérieure. Les deux poignées peuvent être simplement déplacées pour enrouler ou dérouler la spirale (c'est-à-dire la prolonger, en modifiant le nombre de ses tours). Voici les autres raccourcis : - - + + Poignée extérieure : - - - + + + - Maj+cliquer-déplacer permet de redimensionner/tourner la spirale autour de son centre (sans l'enrouler ou la dérouler). + Maj+cliquer-déplacer pour redimensionner/tourner la spirale autour de son centre (sans l'enrouler ou la dérouler). - - - + + + Alt+cliquer-déplacer pour verrouiller le rayon de la spirale pendant que vous l'enroulez ou la déroulez. - - + + Poignée intérieure : - - - + + + - Alt+cliquer-déplacer verticalement permet de faire converger/diverger la spirale. + Alt+cliquer-déplacer verticalement pour faire converger/diverger la spirale. - - - + + + - Alt+cliquer permet de remettre la divergence à zéro. + Alt+clic pour remettre la divergence à zéro. - - - + + + - Maj+cliquer permet de déplacer la poignée intérieure au centre. + Maj+clic pour déplacer la poignée intérieure au centre. - - + + - La divergence d'une spirale est la mesure de la non-linéarité de ses enroulements. Quand la divergence vaut 1, la spirale est uniforme; inférieure à 1 (Alt+cliquer-déplacer vers le haut), la spirale devient plus dense à sa périphérie; supérieure à 1 (Alt+cliquer-déplacer vers le bas), la spirale est plus dense en son centre : - - 0,2 - 0,5 - 6 - 2 - 1 - - - - - - - + La divergence d'une spirale est la mesure de la non-linéarité de ses enroulements. Quand la divergence vaut 1, la spirale est uniforme ; inférieure à 1 (Alt+cliquer-déplacer vers le haut), la spirale devient plus dense à sa périphérie ; supérieure à 1 (Alt+cliquer-déplacer vers le bas), la spirale est plus dense en son centre : + + 0,2 + 0,5 + 6 + 2 + 1 + + + + + + + Le nombre maximum de tours d'une spirale est 1024. - - + + - Tout comme l'outil ellipse ne se limite pas aux ellipses, mais permet de créer des arcs (des lignes à la courbure constante), l'outil spirale permet de créer des lignes à la courbure variant régulièrement. Comparé à une courbe de Bézier, un arc de spirale est souvent plus pratique car vous pouvez l'allonger ou le racourcir en déplaçant une poignée le long de la courbe sans modifier sa forme. De plus, alors qu'une spirale est habituellement dessinée sans remplissage, vous pouvez en ajouter un et retirer le contour afin d'obtenir des effets intéressants. - - - - - - - - - - - - - - - - - - - - - - - + Tout comme l'outil Ellipse ne se limite pas aux ellipses, mais permet de créer des arcs (des lignes à la courbure constante), l'outil spirale permet de créer des lignes à la courbure variant régulièrement. Comparé à une courbe de Bézier, un arc de spirale est souvent plus pratique car vous pouvez l'allonger ou le raccourcir en déplaçant une poignée le long de la courbe sans modifier sa forme. De plus, alors qu'une spirale est habituellement dessinée sans remplissage, vous pouvez en ajouter un et retirer le contour afin d'obtenir des effets intéressants. + + + + + + + + + + + + + + + + + + + + + + + Les spirales avec des contours en pointillés sont particulièrement intéressantes — elles combinent la concentration naturelle de la forme avec l'espacement régulier des pointillés pour fournir de superbes effets de moiré : - - - - - Conclusion + + + + + Conclusion - - + + - Les outils de formes d'Inkscape sont particulièrement puissants. Initiez-vous à leurs astuces à loisir — ce sera payant pour tout travail de design car, utiliser des formes au lieu de chemins rend la création d'un dessin vectoriel plus rapide et sa modification plus facile. Si vous avez des idées pour améliorer d'une façon quelconque les outils de formes, n'hésitez pas à contacter les développeurs. + Les outils de formes d'Inkscape sont particulièrement puissants. Initiez-vous à leurs astuces à loisir — cela vous servira pour tout travail de design, car utiliser des formes plutôt que des chemins rend la création d'un dessin vectoriel plus rapide et sa modification plus facile. Si vous avez des idées pour améliorer d'une façon quelconque les outils de formes, n'hésitez pas à contacter les développeurs. - + @@ -1089,8 +1089,8 @@ - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer diff --git a/share/tutorials/tutorial-tips.fr.svg b/share/tutorials/tutorial-tips.fr.svg index 70dd27bb0..17b2c6edf 100644 --- a/share/tutorials/tutorial-tips.fr.svg +++ b/share/tutorials/tutorial-tips.fr.svg @@ -35,44 +35,44 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::TRUCS ET ASTUCES - + - Ce didacticiel est là pour vous montrer divers trucs et astuces trouvés par des utilisateurs au cours de leur utilisation d'Inkscape, ainsi que quelques fonctionalités cachées qui peuvent vous aider à accélérer votre production. + Ce didacticiel présente divers trucs et astuces trouvés par des utilisateurs au cours de leur utilisation d'Inkscape, ainsi que quelques fonctionnalités cachées qui peuvent vous aider à accélérer votre production. - + Disposition radiale grâce au pavage de clones - + - Il est facile de comprendre comment se servir de la boîte de dialogue Créer un pavage avec des clones pour créer des motifs ou des grilles rectangulaires. Mais que faire si vous voulez un placement radial, où les objets partagent un même centre de rotation ? C'est possible aussi ! + Il est facile de comprendre comment se servir de la boîte de dialogue Créer un pavage avec des clones pour créer des motifs ou des grilles rectangulaires. Mais que faire si vous voulez un placement radial, où les objets partagent un même centre de rotation ? C'est possible aussi ! - + - Si votre motif radial ne doit comporter que 3, 4, 6, 8, ou 12 éléments, vous pouvez alors essayer les symétries P3, P31M, P3M1, P4, P4M, P6, ou P6M. Celles-ci offrent de bons résultats pour obtenir des flocons ou des formes similaires. Voici une méthode plus générale : + Si votre motif radial ne doit comporter que 3, 4, 6, 8 ou 12 éléments, vous pouvez alors essayer les symétries P3, P31M, P3M1, P4, P4M, P6, ou P6M. Celles-ci offrent de bons résultats pour obtenir des flocons ou des formes similaires. Voici une méthode plus générale : - + - Choisissez la symétrie P1 (translation) puis compensez cette translation en allant dans l'onglet Translation et définissez Par ligne/Translation Y et Parr colonne/Translation X à -100%. Les clones seront alors empilés juste au-dessus de l'original. Tout ce qu'il reste à faire est d'aller dans l'onglet Rotation et définir un angle par colonne, puis créer le motif avec une ligne et plusieurs colonnes. Par exemple, voici un motif fait d'une ligne horizontale et de 30 colonnes, chacune de ces colonnes étant tournée de 6 degrés : + Choisissez la symétrie P1 (translation simple) puis compensez cette translation en allant dans l'onglet Translation et définissez Par ligne/Translation Y et Par colonne/Translation X à -100 %. Les clones seront alors empilés juste au-dessus de l'original. Tout ce qu'il reste à faire est d'aller dans l'onglet Rotation et définir un angle par colonne, puis créer le motif avec une ligne et plusieurs colonnes. Par exemple, voici un motif fait d'une ligne horizontale et de 30 colonnes, chacune de ces colonnes étant tournée de 6 degrés : @@ -105,18 +105,18 @@ - + Pour en faire un cadran, il suffit de découper ce motif ou recouvrir sa partie par un disque blanc (pour effectuer des opérations booléennes sur des clones, déliez-les d'abord). - + - Des effets plus intéressants peuvent créés en utilisant à la fois les lignes et les colonnes. Voici un motif de 10 colonnes et 8 lignes, avec une rotation de 2 degrés par lignes et 18 par colonne. Chaque groupe de segments ici est "une colonne", donc les groupes sont séparés entre eux de 18 degrés; en sein de chaque "colonne", les segments sont séparés de 2 degrés : + Des effets plus intéressants peuvent être créés en utilisant à la fois les lignes et les colonnes. Voici un motif de 10 colonnes et 8 lignes, avec une rotation de 2 degrés par lignes et 18 par colonne. Chaque groupe de segments ici est « une colonne », donc les groupes sont séparés entre eux de 18 degrés ; en sein de chaque « colonne », les segments sont séparés de 2 degrés : @@ -199,11 +199,11 @@ - + - Dans les exemples ci-dessus, le segment a été tourné autour de son centre. Et au cas où vous voudriez que le centre soit en-dehors de votre forme ? Il suffit de créer un rectangle invisible (sans remplissage ni contour) recouvrant votre forme et dont le centre est à l'emplacement désiré; groupez la forme et le rectangle puis utilisez Créer un pavage avec des clones sur ce groupe. Vous pouvez maintenant créer des belles "explosions" ou "éclaboussures" en rendant aléatoire le redimensionnement, la rotation ou l'opacité : + Dans les exemples ci-dessus, le segment a été tourné autour de son centre. Et au cas où vous voudriez que le centre soit en dehors de votre forme ? Il suffit de créer un rectangle invisible (sans remplissage ni contour) recouvrant votre forme et dont le centre est à l'emplacement désiré ; groupez la forme et le rectangle puis utilisez Créer un pavage avec des clones sur ce groupe. Vous pouvez maintenant créer des belles explosions ou éclaboussures en rendant aléatoire le redimensionnement, la rotation ou l'opacité : @@ -280,42 +280,42 @@ - + Trancher plusieurs zones d'export rectangulaires - + - Créez un nouveau calque, et dans ce calque, créez des rectangles invisibles recouvrant des parties de votre image. Assurez-vous que votre document adopte le px (défini par défaut) comme unité, affichez la grille et faites coller les rectangles à cette grille de sorte que chacun d'entre-eux comporte un nombre entier de px. Assignez des ids significatifs aux rectangles, et exportez chacun d'entre-eux dans un fichier différent (Fichier > Exporter une image PNG (Maj+Ctrl+E)). Chacun des rectangles se "souviendra" ainsi de son nom de fichier d'export. Après cela, il est facile de réexporter certains de ces rectangles : passez dans le calque d'export, utilisez Tab pour sélectionner celui dont vous avez besoin (ou utilisez une Recherche par id), et enfin cliquez sur Exporter dans la boîte de dialogue. Vous pouvez aussi écrire un script shell (ou un fichier batch) pour exporter ces zones avec une commande telle que : + Créez un nouveau calque, et dans ce calque, créez des rectangles invisibles recouvrant des parties de votre image. Assurez-vous que votre document adopte le px (défini par défaut) comme unité, affichez la grille et faites coller les rectangles à cette grille de sorte que chacun d'entre eux comporte un nombre entier de px. Assignez des ids significatifs aux rectangles, et exportez chacun d'entre eux dans un fichier différent (Fichier > Exporter une image PNGMaj+Ctrl+E). Chacun des rectangles se « souviendra » ainsi de son nom de fichier d'export. Après cela, il est facile de réexporter certains de ces rectangles : passez dans le calque d'export, utilisez Tab pour sélectionner celui dont vous avez besoin (ou utilisez une Recherche par id), et enfin cliquez sur Exporter dans la boîte de dialogue. Vous pouvez aussi écrire un script shell (ou un fichier batch) pour exporter ces zones avec une commande telle que : - + inkscape -i area-id -t nomdefichier.svg - + - pour chaque zone. L'option -t rappelle à Inkscape d'utiliser le nom de fichier enregistré avec la zone ; sinon vous pouvez fournir un autre nom pour l'export avec l'option -e. Une autre possibilité est d'utiliser Extensions > Web > Découpe extensions, or Extensions > Exporter > Guillotine permettant d'automatiser l'export depuis des documents SVG Inkscape, en utilisant au choix des guides ou un calque de découpage. + pour chaque zone. L'option -t rappelle à Inkscape d'utiliser le nom de fichier enregistré avec la zone ; sinon vous pouvez fournir un autre nom pour l'export avec l'option -e. Une autre possibilité est d'utiliser les extensions Extensions > Web > Découpe, ou Extensions > Exporter > Guillotine permettant d'automatiser l'export depuis des documents SVG Inkscape, en utilisant au choix des guides ou un calque de découpage. - - Dégradés non-linéaires + + Dégradés non linéaires - + - La version 1.1 du SVG ne supporte pas les dégradés non-linéaires (c'est à dire ayant des transitions non linéaires entre les couleurs). Vous pouvez cependant les émuler grâce à des dégradés multi-stops. + La version 1.1 du SVG ne supporte pas les dégradés non linéaires (c'est-à-dire ayant des transitions non linéaires entre les couleurs). Vous pouvez cependant les émuler grâce à des dégradés multi-stops. - - + + @@ -329,7 +329,7 @@ - + @@ -424,15 +424,15 @@ - - Dégradés radiaux excentriques + + Dégradés radiaux excentriques - - + + - Les dégradés radiaux ne sont pas nécessairement symétriques. Dans l'outil dégradés, déplacez la poignée centrale d'un dégradé elliptique tout en appuyant sur Maj. Cela vous permettra de déplacer la poignée du foyer (en forme de "x") du dégradé et de la séparer du centre. Si vous n'en avez plus besoin, vous pouvez redéplacer la poignée de foyer près du centre. + Les dégradés radiaux ne sont pas nécessairement symétriques. Dans l'outil Dégradé, déplacez la poignée centrale d'un dégradé elliptique tout en appuyant sur Maj. Cela vous permettra de déplacer la poignée du foyer (en forme de « x ») du dégradé et de la séparer du centre. Si vous n'en avez plus besoin, vous pouvez déplacer à nouveau la poignée de foyer près du centre. @@ -444,216 +444,216 @@ - - - - Alignement au centre de la page + + + + Alignement au centre de la page - + - Pour aligner quelque-chose au centre ou le long d'un côté de la page, sélectionnez l'objet ou le groupe à aligner puis ouvrez la boîte de dialogue Aligner et distribuer (Maj+Ctrl+A). Vous pouvez alors choisir la page dans la liste relativement à et enfin aligner votre sélection comme vous le désirez. + Pour aligner quelque chose au centre ou le long d'un côté de la page, sélectionnez l'objet ou le groupe à aligner puis ouvrez la boîte de dialogue Aligner et distribuer (Maj+Ctrl+A). Vous pouvez alors choisir la Page dans la liste relativement à et enfin aligner votre sélection comme vous le désirez. - - Nettoyage du document + + Nettoyage du document - - + + - Quand ils ne sont plus utilisés, beaucoup de dégradés, motifs et marqueurs (plus précisément, ceux que vous avez édité manuellement) restent dans les palettes correspondantes et peuvent être utilisés dans de nouveaux objets. Cependant, si vous voulez optimiser votre document, utilisez la commande Nettoyer le document du menu Fichier. Elle supprimera tout dégradé, motif ou marqueur qui n'est plus utilisé par aucun objet du document, réduisant ainsi la taille du fichier. + Quand ils ne sont plus utilisés, beaucoup de dégradés, motifs et marqueurs (plus précisément, ceux que vous avez édités manuellement) restent dans les palettes correspondantes et peuvent être utilisés dans de nouveaux objets. Cependant, si vous voulez optimiser votre document, utilisez la commande Nettoyer le document du menu Fichier. Elle supprimera tout dégradé, motif ou marqueur qui n'est plus utilisé par aucun objet du document, réduisant ainsi la taille du fichier. - - Fonctionnalités cachées et éditeur XML + + Fonctionnalités cachées et éditeur XML - - + + - L'éditeur XML (Maj+Ctrl+X) vous permet de modifier la plupart des aspects du document sans avoir à utiliser un éditeur de texte externe. De plus, Inkscape supporte souvent des fonctionnalités SVG pas encore accessibles depuis l'interface graphique. L'éditeur XML offre la possibilité d'accéder à ces fonctionnalités (à condition de connaître le SVG) + L'éditeur XML (Maj+Ctrl+X) vous permet de modifier la plupart des aspects du document sans avoir à utiliser un éditeur de texte externe. De plus, Inkscape supporte souvent des fonctionnalités SVG pas encore accessibles depuis l'interface graphique. L'éditeur XML offre la possibilité d'accéder à ces fonctionnalités (à condition de connaître le SVG). - - Changer l'unité de mesure des règles + + Changer l'unité de mesure des règles - + - Dans le modèle (template) par défaut, l'unité de mesure utilisée par les règles est le px ("unité utilisateur SVG", égale à 0.8pt ou 1/90 de pouce dans Inkscape). C'est aussi l'unité utilisée pour l'affichage des coordonnées dans le coin inférieur gauche, et celle présélectionnée dans les menus qui font intervenir des unités (vous pouvez déplacer votre souris au-dessus d'une règle pour voir un indicateur affichant l'unité utilisée). Pour modifier ceci, ouvrez les Préférences du document (Maj+Ctrl+D) et changez les Unités par défaut dans l'onglet Page. + Dans le modèle par défaut, l'unité de mesure utilisée par les règles est le px (« unité utilisateur SVG », égale à 0,8 pt ou 1/90 de pouce dans Inkscape). C'est aussi l'unité utilisée pour l'affichage des coordonnées dans le coin inférieur gauche, et celle présélectionnée dans les menus qui font intervenir des unités (vous pouvez déplacer votre souris au-dessus d'une règle pour voir un indicateur affichant l'unité utilisée). Pour modifier ceci, ouvrez les Propriétés du document (Maj+Ctrl+D) et changez les Unités par défaut dans l'onglet Page. - - Appliquer des coups de tampon + + Appliquer des coups de tampon - - + + - Pour créer rapidement plusieurs copies d'un objet, utilisez le coup de tampon. Déplacez simplement un objet (ou redimensionnez/tournez le) et, alors que le bouton de la souris est toujours pressé, appuyez sur Espace. Ceci appose un "tampon" de l'objet courant. Vous pouvez répéter ce coup de tampon autant de fois que vous le voulez. + Pour créer rapidement plusieurs copies d'un objet, utilisez le coup de tampon. Déplacez simplement un objet (ou redimensionnez/tournez-le) et, alors que le bouton de la souris est toujours pressé, appuyez sur Espace. Ceci appose un « tampon » de l'objet courant. Vous pouvez répéter ce coup de tampon autant de fois que vous le voulez. - - Astuces du stylo + + Astuces du stylo - - + + Dans l'outil courbes de Bézier (stylo), vous pouvez terminer la ligne courante de plusieurs façons : - - - + + + - Appuyer sur Entrée. + Appuyer sur Entrée - - - + + + - + - Effectuer un double-clic avec le bouton gauche de la souris. + Effectuer un double-clic avec le bouton gauche de la souris - - - + + + - + - Sélectionner à nouveau le stylo dans la barre d'outils. + Sélectionner à nouveau le stylo dans la barre d'outils - - - + + + - + - Sélectionner un autre outil. + Sélectionner un autre outil - - + + - + - Notez que tant que le chemin n'est pas terminé (c'est à dire qu'il est affiché en vert, avec le segment courant en rouge), il n'existe pas encore en tant qu'objet dans le document. Pour l'annuler, vous pouvez donc utiliser les raccourcis Esc (abandonner complètement le chemin) ou Backspace (supprimer le dernier segment du chemin non terminé) à la place d'Annuler. + Notez que tant que le chemin n'est pas terminé (c'est-à-dire qu'il est affiché en vert, avec le segment actuel en rouge), il n'existe pas encore en tant qu'objet dans le document. Pour l'annuler, vous pouvez donc utiliser les raccourcis Échap (abandonner complètement le chemin) ou Retour arrière (supprimer le dernier segment du chemin non terminé) à la place d'Annuler. - - + + - + - Pour ajouter un nouveau sous-chemin à un chemin existant, sélectionnez ce chemin et commencez à dessiner (d'où vous voulez) tout en appuyant sur Maj. Cependant, si vous voulez simplement prolonger un chemin existant, Maj n'est pas nécessaire; commencez simplement à dessiner depuis l'une des ancres situées aux extrémités du chemin sélectionné. + Pour ajouter un nouveau sous-chemin à un chemin existant, sélectionnez ce chemin et commencez à dessiner (d'où vous voulez) tout en appuyant sur Maj. Cependant, si vous voulez simplement prolonger un chemin existant, Maj n'est pas nécessaire ; commencez simplement à dessiner depuis l'une des ancres situées aux extrémités du chemin sélectionné. - - Entrer des valeurs Unicode + + Entrer des valeurs Unicode - - + + - + - Quand vous êtes dans l'outil texte, appuyer sur Ctrl+U permet d'alterner les modes Normal et Unicode. En mode Unicode, chaque groupe de 4 chiffres hexadécimaux que vous tapez devient un caractère Unicode, vous permettant ainsi de taper les symboles que vous voulez (si vous connaissez leur numéro Unicode, et si la police les supporte). Pour valider un caractère Unicode, appuyez sur Entrée. Par example, Ctrl+U 2 0 1 4 Entrée insère un tiret long (—). Pour quitter le mode Unicode sans insérer quoi que ce soit, appuyez sur la touche Échap. + Quand vous êtes dans l'outil Texte, appuyer sur Ctrl+U permet d'alterner les modes Normal et Unicode. En mode Unicode, chaque groupe de 4 chiffres hexadécimaux que vous tapez devient un caractère Unicode, vous permettant ainsi de taper les symboles que vous voulez (si vous connaissez leur numéro Unicode, et si la police les supporte). Pour valider un caractère Unicode, appuyez sur Entrée. Par exemple, Ctrl+U 2 0 1 4 Entrée insère un tiret long (—). Pour quitter le mode Unicode sans insérer quoi que ce soit, appuyez sur la touche Échap. - - + + - + - Vous pouvez également utiliser la boîte de dialogue Texte > Glyphes pour rechercher et insérer des glyphes dans votre document. + Vous pouvez également utiliser la boîte de dialogue Texte > Glyphes pour rechercher et insérer des glyphes dans votre document. - - Utilisation de la grille pour dessiner des icônes + + Utilisation de la grille pour dessiner des icônes - - + + - + - Supposons que vous vouliez créer une icône de 24x24 pixels. Créez un canevas de 24x24 px (utilisez les Préférences du document)(notez que dans le menu Créer un nouveau document, vous pouvez accéder à une liste de modèles, dont certains d'icônes) et définissez une taille de grille de 0.5 px (une grille de 48x48, donc). Maintenant, si vous alignez les remplissages d'objets sur les lignes paires de grille et les contours sur les lignes impaires, avec un nombre pair (en px) comme largeur de contour, en exportant le document à la résolution par défaut de 90ppp (de sorte qu'1px corresponde à 1 pixel bitmap), vous obtiendrez une icône bitmap nette ne nécessitant pas d'anticrénelage. + Supposons que vous vouliez créer une icône de 24×24 pixels. Créez un canevas de 24×24 px (utilisez les Préférences du document) et définissez la taille de la grille à 0,5 px (48×48 lignes de grille, donc). Maintenant, si vous alignez les remplissages d'objets sur les lignes paires de grille et les contours sur les lignes impaires, avec un nombre pair (en px) comme largeur de contour, en exportant le document à la résolution par défaut de 90 ppp (de sorte qu'1 px corresponde à 1 pixel matriciel), vous obtiendrez une icône matricielle nette ne nécessitant pas d'anticrénelage. - - Rotation d'objets + + Rotation d'objets - - + + - + - Dans le sélecteur, cliquer sur un objet permet d'afficher les flèches de redimensionnement, cliquer une fois de plus sur cet objet permet d'afficher les flèches d'inclinaison et de rotation. Si vous déplacez les flèches des coins, l'objet tournera autour du centre (marqué d'une croix). Si vous appuyez sur Maj pendant cette opération, le rotation se fera autour du coin opposé. Vous pouvez aussi déplacer le centre de rotation (la croix) où vous le désirez. + Dans le sélecteur, le clic sur un objet permet d'afficher les flèches de redimensionnement, et un clic de plus sur l'objet permet d'afficher les flèches d'inclinaison et de rotation. Si vous déplacez les flèches des coins, l'objet tournera autour du centre (marqué d'une croix). Si vous appuyez sur Maj pendant cette opération, la rotation se fera autour du coin opposé. Vous pouvez aussi déplacer le centre de rotation (la croix) où vous le désirez. - - + + - + - Ou bien tourner en utilisant les raccourcis clavier : [ et ] (de 15 degrés) ou Ctrl+[ et Ctrl+] (de 90 degrés). Ces mêmes raccourcis [] combinés avec Alt permettent des rotations lentes à l'échelle du pixel. + Ou bien, vous pouvez effectuer une rotation en utilisant les raccourcis clavier : [ et ] (de 15 degrés) ou Ctrl+[ et Ctrl+] (de 90 degrés). Ces mêmes raccourcis [] combinés avec Alt permettent des rotations lentes à l'échelle du pixel. - - Des ombres portées grâce aux bitmaps + + Ombres portées - - + + - + - Pour créer rapidement une ombre portée sur des objets, utilisez la fonctionnalité Filtres > Ombres et lueurs > Ombre portée... + Pour créer rapidement une ombre portée sur des objets, utilisez la fonctionnalité Filtres > Ombres et lueurs > Ombre portée…. - - + + - Vous pouvez aussi facilement créer des ombres portées manuellement avec le paramètre de flou de la boîte de dialogue Remplissage et contour. Sélectionnez un objet, dupliquez-le avec Ctrl+D, appuyez sur la touche PgBas pour déplacer le duplicata sous l'objet original, puis déplacez-le légèrement vers le bas et la droite par rapport à l'original. Ouvrez maintenant la boîte de dialogue Remplissage et contour et changez la valeur du flou à 5. Le tour est joué ! + Vous pouvez aussi facilement créer des ombres portées manuellement avec le paramètre de flou de la boîte de dialogue Remplissage et contour. Sélectionnez un objet, dupliquez-le avec Ctrl+D, appuyez sur la touche Page suivante pour déplacer le duplicata sous l'objet original, puis déplacez-le légèrement vers le bas et la droite par rapport à l'original. Ouvrez maintenant la boîte de dialogue Remplissage et contour et changez la valeur du flou à 5. Le tour est joué ! - - Placement d'un texte le long d'un chemin + + Placement d'un texte le long d'un chemin - - + + - Pour placer du texte le long d'une courbe, sélectionnez le texte et la courbe puis utilisez la commande Mettre suivant un chemin du menu Texte. Le texte commencera au début du chemin. En général, il vaut mieux créer un chemin auquel vous voulez que le texte s'adapte plutôt que d'adapter ce texte à un autre élément (préexistant) du dessin — cela vous autorisera un meilleur contrôle sans avoir à "bricoler" votre dessin. + Pour placer du texte le long d'une courbe, sélectionnez le texte et la courbe puis utilisez la commande Mettre suivant un chemin du menu Texte. Le texte commencera au début du chemin. En général, il vaut mieux créer un chemin auquel vous voulez que le texte s'adapte plutôt que d'adapter ce texte à un autre élément (préexistant) du dessin — cela vous autorisera un meilleur contrôle sans avoir à « bricoler » votre dessin. - - Sélection de l'original + + Sélection de l'original - - + + - Quand vous avez affaire à un texte suivant un chemin, un offset lié ou un clone, leur objet/chemin source peut être difficile à sélectionner (caché sous d'autres objets, rendu invisible et/ou verrouillé). le raccourci magique Maj+D peut alors vous aider; sélectionnez le texte, l'offset lié ou le clone et appuyez sur Maj+D pour sélectionner alors le chemin correspondant, la source de l'offset ou l'original du clone. + Quand vous avez affaire à un texte suivant un chemin, un offset lié ou un clone, leur objet/chemin source peut être difficile à sélectionner (caché sous d'autres objets, rendu invisible et/ou verrouillé). Le raccourci magique Maj+D peut alors vous aider ; sélectionnez le texte, l'offset lié ou le clone et appuyez sur Maj+D pour sélectionner alors le chemin correspondant, la source de l'offset ou l'original du clone. - - Au cas où la fenêtre serait hors de l'écran + + Au cas où la fenêtre serait hors de l'écran - - + + - Quand vous transférez des documents entre des systèmes avec des résolutions ou un nombre d'écrans différents, vous pouvez être confronté au problème suivant : Inkscape a enregistré une position de fenêtre qui fait que vous ne pouvez plus atteindre Inkscape sur votre écran. Il suffit de maximiser la fenêtre (ce qui devrait la rendre de nouveau visible a l'écran)(utilisez la barre des tâches), d'enregistrer le document et de le recharger. Vous pouvez éviter tout cela en désactivant l'option "enregistrer la taille et la position des fenêtres" (dans l'onglet Interface > Fenêtres des Préférences d'Inkscape). + Quand vous transférez des documents entre des systèmes avec des résolutions ou un nombre d'écrans différents, vous pouvez être confronté au problème suivant : Inkscape a enregistré une position de fenêtre qui fait que vous ne pouvez plus atteindre Inkscape sur votre écran. Il suffit de maximiser la fenêtre (ce qui devrait la rendre de nouveau visible à l'écran ; utilisez la barre des tâches), d'enregistrer le document et de le recharger. Vous pouvez éviter tout cela en désactivant l'option « enregistrer la taille et la position des fenêtres » (dans l'onglet Interface > Fenêtres des Préférences d'Inkscape). - - Transparence, dégradés et export en Postscript + + Transparence, dégradés et export en Postscript - - + + - Les formats PostScript ou EPS ne supportent pas la transparence, aussi vous ne devriez pas utiliser cette fonctionnalité si vous comptez exporter en PS/EPS. Dans le cas d'une transparence uniforme chevauchant une couleur uniforme, il est facile d'y remédier : sélectionnez l'un des objets transparents et passez à l'outil Pipette (F7); Assurez vous qu'il est en mode "capturer la couleur visible sans alpha" et cliquez sur ce même objet. La couleur visible sera capturée et réassignée à l'objet mais cette fois, sans transparence. Répétez cette opération pour tous les objets transparents. Si votre objet transparent chevauche plusieurs zones de différentes couleurs uniformes, vous devrez le découper en morceaux (un morceau par zone) puis appliquer la procédure ci-dessus à chacun des morceaux. + Les formats PostScript ou EPS ne supportent pas la transparence, aussi vous ne devriez pas utiliser cette fonctionnalité si vous comptez exporter en PS/EPS. Dans le cas d'une transparence uniforme chevauchant une couleur uniforme, il est facile d'y remédier : sélectionnez l'un des objets transparents et passez à l'outil Pipette (F7) ; assurez-vous qu'il est en mode « capturer la couleur visible sans alpha » et cliquez sur ce même objet. La couleur visible sera capturée et réassignée à l'objet mais cette fois, sans transparence. Répétez cette opération pour tous les objets transparents. Si votre objet transparent chevauche plusieurs zones de différentes couleurs uniformes, vous devrez le découper en morceaux (un morceau par zone) puis appliquer la procédure ci-dessus à chacun des morceaux. - + @@ -683,8 +683,8 @@ - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer diff --git a/share/tutorials/tutorial-tracing-pixelart.fr.svg b/share/tutorials/tutorial-tracing-pixelart.fr.svg index 3108686a8..1bc503511 100644 --- a/share/tutorials/tutorial-tracing-pixelart.fr.svg +++ b/share/tutorials/tutorial-tracing-pixelart.fr.svg @@ -48,14 +48,14 @@ - Avant que nous ayons accès à un logiciel d'édition de graphismes vectoriels aussi génial... + Avant que nous ayons accès à un logiciel d'édition de graphismes vectoriels aussi puissant… - Avant même que nous ayons des écrans 640x480... + Avant même que nous ayons des moniteurs en 640×480… @@ -76,7 +76,7 @@ - Inkscape s'appuie sur la bibliothèque libdepixelize, ce qui lui permet de vectoriser automatiquement ces images pixel art un peu spéciales. Vous pouvez utiliser cette fonctionnalité avec d'autres types d'images, mais gardez à l'esprit que le résultat ne sera sans doute pas aussi bon qu'avec l'autre outil de vectorisation d'Inkscape, Potrace. + Inkscape s'appuie sur la bibliothèque libdepixelize, ce qui lui permet de vectoriser automatiquement ces images pixel art un peu spéciales. Vous pouvez utiliser cette fonctionnalité avec d'autres types d'images, mais gardez à l'esprit que le résultat ne sera sans doute pas aussi bon qu'avec l'autre outil de vectorisation d'Inkscape, potrace. @@ -332,7 +332,7 @@ - Libdepixelize s'appuie sur l'algorithme Kopf-Lischinski pour vectoriser les images. Cet algorithme utilise les idées de plusieurs techniques informatiques et plusieurs concepts mathématiques pour produire un résultat satisfaisant avec les images pixel art. Détail d'importance, le canal alpha est complètement ignoré par l'algorithme, et il n'existe pas pour l'instant d'extensions permettant ce traitement. Cependant, la vectorisation des images pixel art contenant un canal alpha donne un résultat similaire à celle des images reconnues par Kopf-Lischinski. + libdepixelize s'appuie sur l'algorithme Kopf-Lischinski pour vectoriser les images. Cet algorithme utilise les idées de plusieurs techniques informatiques et plusieurs concepts mathématiques pour produire un résultat satisfaisant avec les images pixel art. Détail d'importance, le canal alpha est complètement ignoré par l'algorithme, et il n'existe pas pour l'instant d'extensions permettant ce traitement. Cependant, la vectorisation des images pixel art contenant un canal alpha donne un résultat similaire à celle des images reconnues par Kopf-Lischinski. @@ -703,14 +703,14 @@ - L'image ci-dessus contient un canal alpha et sa vectorisation est convenable. Si malgré tout vous trouvez ce résultat insatisfaisant et que vous pensez que la cause en est le canal alpha, contactez le gestionnaire de la bibliothèque libdepixelize (en saisissant un rapport de défaut sur la page du projet) qui se fera un plaisir d'améliorer son algorithme (ce qu'il ne peut pas faire ne l'absence de retour sur d'éventuelles images donnant un mauvais résultat). + L'image ci-dessus contient un canal alpha et sa vectorisation est convenable. Si malgré tout vous trouvez ce résultat insatisfaisant et que vous pensez que la cause en est le canal alpha, contactez le gestionnaire de la bibliothèque libdepixelize (en saisissant un rapport de défaut sur la page du projet) qui se fera un plaisir d'améliorer son algorithme (ce qu'il ne peut pas faire en l'absence de retour sur d'éventuelles images donnant un mauvais résultat). - L'image ci-dessous est une capture d'écran de la boîte de dialogue Vectoriser du pixel art que vous pouvez ouvrir avec le menu Chemin > Vectoriser du pixel art... ou en cliquant avec le bouton droit de la souris sur une image puis en sélectionnant l'entrée Vectoriser du pixel art. + L'image ci-dessous est une capture d'écran de la boîte de dialogue Vectoriser du pixel art que vous pouvez ouvrir avec le menu Chemin > Vectoriser du pixel art… ou en cliquant avec le bouton droit de la souris sur une image puis en sélectionnant l'entrée Vectoriser du pixel art. @@ -720,30 +720,30 @@ - La boîte de dialogue propose deux sections, Heuristique et Résultat. Heuristique est assez pointu, mais comme les paramètres par défaut sont bien choisis vous ne devriez pas avoir besoin d'y toucher. Nous y reviendrons plus tard après avoir abordé la section Résultat. + La boîte de dialogue propose deux sections : Heuristique et Résultat. Heuristique cible les usages avancés, mais comme les paramètres par défaut sont bien choisis vous ne devriez pas avoir besoin d'y toucher. Nous y reviendrons plus tard après avoir abordé la section Résultat. - + - L'algorithme Kopf-Lischinski fonctionne (en nous plaçant à un haut niveau) comme un compilateur convertissant les données parmi plusieurs types de représentations. À chaque étape, l'algorithme a le choix d'explorer les opérations que cette représentation propose. Certaines de ces représentations intermédiaires ont un aspect visuel correct (comme une cellule remodelée dans un graphe de Voronoï), d'autres pas (comme un graphe de similitude). Pendant le développement de libdepixelize, les utilisateurs n'ont eu de cesse de demander à ce qu'il soit possible d'exporter ces étapes intermédiaires à partir de la bibliothèque, et l'auteur original a exhaussé leurs vœux. + L'algorithme Kopf-Lischinski fonctionne (en nous plaçant à un haut niveau) comme un compilateur convertissant les données parmi plusieurs types de représentations. À chaque étape, l'algorithme a le choix d'explorer les opérations que cette représentation propose. Certaines de ces représentations intermédiaires ont un aspect visuel correct (comme une cellule remodelée dans un graphe de Voronoï), d'autres pas (comme un graphe de similitude). Pendant le développement de libdepixelize, les utilisateurs n'ont eu de cesse de demander à ce qu'il soit possible d'exporter ces étapes intermédiaires à partir de la bibliothèque, et l'auteur original a exaucé leurs vœux. - + Le paramétrage par défaut devrait donner le résultat le plus lisse possible, ce qui est probablement l'effet désiré. Vous avez déjà vu ce type de résultat dans le premier exemple de ce tutoriel. Pour l'expérimenter vous-même, ouvrez la boîte de dialogue Vectoriser du pixel art et cliquez sur Valider après avoir sélectionné une image. - + - Le résultat de type Voronoï ci-dessous est une image pixel remodelée, dans laquelle les cellules (précédemment des pixels) ont été remodelées pour connecter les pixels faisant partie d'une même fonction. Aucune courbe n'est créée et l'image est toujours composée de lignes droites. La différence peut être observée en agrandissant l'image. Précédemment, les pixels ne pouvaient pas partager de bord avec un voisin en diagonale, même si il ce voisin faisait partie de la même fonction. Mais maintenant (grâce à un graphe de similitude de couleur et l'heuristique que vous pouvez ajuster pour obtenir un meilleur résultat), il est possible de faire en sorte que deux cellules diagonales partagent un bord (auparavant seul un sommet pouvait être partagé entre deux voisins de ce type). + Le résultat de type Voronoï ci-dessous est une image de pixels remodelée, dans laquelle les cellules (précédemment des pixels) ont été remodelées pour connecter les pixels faisant partie d'une même fonction. Aucune courbe n'est créée et l'image est toujours composée de lignes droites. La différence peut être observée en agrandissant l'image. Précédemment, les pixels ne pouvaient pas partager de bord avec un voisin en diagonale, même si il ce voisin faisait partie de la même fonction. Mais maintenant (grâce à un graphe de similitude de couleur et l'heuristique que vous pouvez ajuster pour obtenir un meilleur résultat), il est possible de faire en sorte que deux cellules diagonales partagent un bord (auparavant seul un sommet pouvait être partagé entre deux voisins de ce type). - + @@ -15084,42 +15084,42 @@ - + La conversion B-spline standard apporte un résultat plus doux car l'image obtenue précédemment avec Voronoï est convertie en courbes de Bézier quadratiques. La conversion n'est cependant pas en 1:1 car elle nécessite un travail heuristique plus conséquent pour décider des courbes qui seront fusionnées lorsque l'algorithme atteint une jonction en T dans les couleurs visibles. Sachez qu'à cette étape, vous ne pouvez pas adapter l'heuristique. - + L'étape finale de libdepixelize (actuellement non exportable dans l'interface d'Inkscape du fait de son statut expérimental et incomplet) est l'optimisation des courbes, pour supprimer l'effet d'escalier des courbes B-spline. Cette étape effectue également une détection de bord pour empêcher certaines fonctions d'être lissées ainsi qu'une triangulation pour ajuster la position des nœuds après l'optimisation. Il devrait être possible de désactiver chacune de ces fonctionnalités une fois qu'elles auront quitté leur statut expérimental dans la bibliothèque (bientôt, avec un peu de chance). - + - La section Heuristique de l'interface vous permet d'ajuster l'heuristique utilisée par libdepixelize pour décider, lorsqu'elle rencontre un bloc de 2x2 pixels ayant deux diagonales de couleurs similaires, de la connexion à conserver. L'algorithme essaie d'appliquer l'heuristique aux diagonales en conflit puis conserve la connexion du vainqueur. En cas d'égalité, les deux connexions sont supprimées. + La section Heuristique de l'interface vous permet d'ajuster l'heuristique utilisée par libdepixelize pour décider, lorsqu'elle rencontre un bloc de 2×2 pixels ayant deux diagonales de couleurs similaires, de la connexion à conserver. L'algorithme essaie d'appliquer l'heuristique aux diagonales en conflit puis conserve la connexion du vainqueur. En cas d'égalité, les deux connexions sont supprimées. - + Si vous souhaitez analyser l'effet de chaque heuristique et jouer avec le paramétrage, le meilleur résultat est obtenu avec un diagramme de Voronoï, qui vous permettra de visualiser facilement le rendu engendré par les valeurs choisies. Une fois satisfait de vos paramètres, vous pouvez modifier le type de résultat à votre convenance. - + L'exemple ci-dessous montre une image et sa sortie B-spline avec seulement une des heuristiques activée à chaque essai. Les différences apportées par chaque heuristique sont mises en valeur par un cercle violet. - + @@ -15500,72 +15500,72 @@ - + - Au premier essai (image du haut), nous avons seulement activé l'heuristique Courbes. Cette heuristique tente de conserver les longues courbes connectées. Notez qu'un résultat identique est obtenu avec la dernière image, qui utilise pour sa part l'heuristique Pixels clairsemés. Une différence vient du fait que sa force est plus modérée et qu'elle ne donne de fortes valeurs à son vote que si la conservation des connexions est vraiment importante. La définition de modéré est ici basée sur l'intuition humaine, vu la base de pixels analysée. Une autre différence est que cette heuristique ne peut pas prendre de décision lorsque les connexions assemblent de grands blocs plutôt que des longues courbes (imaginez un jeu d'échecs). + Au premier essai (image du haut), nous avons seulement activé l'heuristique Courbes. Cette heuristique tente de conserver les longues courbes connectées. Notez qu'un résultat identique est obtenu avec la dernière image, qui utilise pour sa part l'heuristique Pixels clairsemés. Une différence vient du fait que sa force est plus modérée et qu'elle ne donne de fortes valeurs à son vote que si la conservation des connexions est vraiment importante. La définition de modéré est ici basée sur l'intuition humaine, vue la base de pixels analysée. Une autre différence est que cette heuristique ne peut pas prendre de décision lorsque les connexions assemblent de grands blocs plutôt que des longues courbes (imaginez un jeu d'échecs). - + Le deuxième essai (image du milieu) active seulement l'heuristique Îles. Sa seule action consiste à tenter de conserver la connexion entre plusieurs pixels autrement isolés (îles) avec un vote de poids constant. Ce type de situation n'est pas aussi courant que ceux traités par les autres heuristiques, mais cette heuristique amène tout de même une amélioration. - + Pour le troisième essai (image du bas), nous avons activé l'heuristique Pixels clairsemés. Cette heuristique tente de converser les courbes avec une couleur de premier plan connectées. Pour déterminer cette couleur, l'heuristique analyse une fenêtre contenant les pixels voisins de la courbe conflictuelle. Vous pouvez ainsi non seulement ajuster sa force, mais également la taille de la fenêtre de pixels à analyser. Gardez à l'esprit que l'augmentation de cette fenêtre augmente aussi la force du vote, et qu'il sera peut-être nécessaire de rééquilibrer en modifiant le multiplicateur. L'auteur original de libdepixelize estime cette heuristique trop gourmande et conseille une valeur de 0,25 pour le multiplicateur. - + - Même si les heuristiques Courbes et Pixels clairsemés donnent des résultats similaires, il peut être judicieux de les conserver toutes les deux actives pour s'assurer que des pixels nécessaires aux courbes de contour ne seront pas supprimés. Par ailleurs, l'heuristique Pixels clairsemés est dans certain cas la seule solution possible. + Même si les heuristiques Courbes et Pixels clairsemés donnent des résultats similaires, il peut être judicieux de les conserver toutes les deux actives pour s'assurer que des pixels nécessaires aux courbes de contour ne seront pas supprimés. Par ailleurs, l'heuristique Pixels clairsemés est dans certains cas la seule solution possible. - + - Astuce : vous pouvez désactiver l'heuristique en positionnant ses valeurs de multiplicateur et de poids à zéro. Vous pouvez faire en sorte que l'heuristique fonctionne à l'encontre de ses principes en utilisant des valeurs négatives pour ces mêmes paramètres. Mais pourquoi donc dégrader la qualité de l'image avec un tel choix ? Et bien, parce-que c'est possible, ou parce-que vous pourriez vouloir un résultat « artistique ». Quoi qu'il en soit, vous le pouvez, c'est tout. + Astuce : vous pouvez désactiver l'heuristique en positionnant ses valeurs de multiplicateur et de poids à zéro. Vous pouvez faire en sorte que l'heuristique fonctionne à l'encontre de ses principes en utilisant des valeurs négatives pour ces mêmes paramètres. Mais pourquoi donc dégrader la qualité de l'image avec un tel choix ? Et bien, parce que c'est possible, ou parce que vous pourriez vouloir un résultat « artistique ». Quoi qu'il en soit, vous le pouvez, c'est tout. - + - Et voilà ! Nous avons fait le tour de toutes les options disponibles avec la version initiale de libdepixelize. Mais si les recherches de l'auteur de cette bibliothèque et de son mentor réussissent, vous pourriez bien recevoir dans le futur de nouvelles options pour élargir le champs des images pour lesquelles le résultat est satisfaisant. Souhaitons-leur bonne chance ! + Et voilà ! Nous avons fait le tour de toutes les options disponibles avec la version initiale de libdepixelize. Mais si les recherches de l'auteur de cette bibliothèque et de son mentor réussissent, vous pourriez bien recevoir dans le futur de nouvelles options pour élargir le champ des images pour lesquelles le résultat est satisfaisant. Souhaitons-leur bonne chance ! - + Les images utilisées dans ce tutoriel sont issues du concours Liberated Pixel Cup (pour éviter tout problème de droit). Les liens sont les suivants : - - + + http://opengameart.org/content/memento - - + + http://opengameart.org/content/rpg-enemies-bathroom-tiles - + diff --git a/share/tutorials/tutorial-tracing.fr.svg b/share/tutorials/tutorial-tracing.fr.svg index 73b967533..4164c792b 100644 --- a/share/tutorials/tutorial-tracing.fr.svg +++ b/share/tutorials/tutorial-tracing.fr.svg @@ -35,165 +35,165 @@ - Essayez Ctrl+flèche pour vous déplacer + Essayez Ctrl+flèche pour vous déplacer - + ::VECTORISATION - + - Une des fonctionnalités d'Inkscape est la vectorisation d'une image bitmap en un élément chemin inséré dans votre dessin SVG. Ce didacticiel devrait vous aider à comprendre le fonctionnement de cet outil. + Inkscape permet de vectoriser des images matricielles, pour en faire un <chemin> inséré dans votre dessin SVG. Ce didacticiel devrait vous aider à comprendre le fonctionnement de cet outil. - - + + - À l'heure actuelle, Inkscape utilise le moteur de vectorisation de bitmap Potrace (potrace.sourceforge.net) créé par Peter Selinger. Dans le futur, nous espérons permettre l'utilisation d'autres programmes/moteurs de vectorisation ; pour le moment, cependant, cet excellent outil est plus que suffisant pour nos besoins. + À l'heure actuelle, Inkscape utilise le moteur de vectorisation de bitmap Potrace (potrace.sourceforge.net) créé par Peter Selinger. Dans le futur, nous espérons permettre l'utilisation d'autres programmes/moteurs de vectorisation ; pour le moment, cependant, cet excellent outil est plus que suffisant pour nos besoins. - - + + Gardez à l'esprit que le but de la vectorisation avec cet outil n'est pas de produire une duplication exacte de l'image originale, ni de produire un résultat finalisé. Aucun outil de vectorisation automatique ne peut produire cela. Vous obtiendrez un ensemble de courbes que vous pourrez utiliser comme ressources dans votre dessin. - - + + - Potrace interprète un bitmap en noir et blanc, et produit un ensemble de courbes. Nous avons trois types de filtres d'entrée pour Potrace, afin de convertir les images brutes en quelque chose que Potrace peut exploiter. + Potrace interprète une image matricielle en noir et blanc, et produit un ensemble de courbes. Nous avons trois types de filtres d'entrée pour Potrace, afin de convertir les images brutes en quelque chose que Potrace peut exploiter. - - + + En général, plus il y a de pixels sombres dans l'image intermédiaire, plus la vectorisation générée par Potrace sera importante. Plus la vectorisation est importante, et plus le temps du processus sera grand et plus le chemin résultant sera important. Nous vous suggérons d'expérimenter cela avec des images intermédiaires plutôt claires, en les assombrissant autant que nécessaire afin d'obtenir les taille et complexité désirées pour le chemin résultant. - - + + - Pour utiliser l'outil de vectorisation, ouvrez ou importez une image, sélectionnez-la, et lancez la commande Chemin > Vectoriser le bitmap ou appuyez sur Maj+Alt+B. + Pour utiliser l'outil de vectorisation, ouvrez ou importez une image, sélectionnez-la, et lancez la commande Chemin > Vectoriser le bitmap ou appuyez sur Maj+Alt+B. - Options principales de vectorisation - - - + Options principales de vectorisation + + + Vous voyez trois options de filtrage disponibles : - - - + + + Seuil de luminosité - - + + - Cette option utilise simplement la somme des composantes rouge, bleue et verte (ou la nuance de gris) d'un pixel pour déterminer s'il doit être considéré comme blanc ou noir. le seuil peut être réglé entre 0.0 (noir) et 1.0 (blanc). Plus ce seuil est grand, moins les pixels considérés comme « blancs » seront nombreux et plus l'image intermédiaire sera sombre. + Cette option utilise simplement la somme des composantes rouge, bleue et verte (ou la nuance de gris) d'un pixel pour déterminer s'il doit être considéré comme blanc ou noir. Le seuil peut être réglé entre 0,0 (noir) et 1,0 (blanc). Plus ce seuil est grand, moins les pixels considérés comme « blancs » seront nombreux et plus l'image intermédiaire sera sombre. - Image originale - Seuil de luminositéRempli, sans contour - Seuil de luminositéContour, non rempli - - - - - - + Image originale + Seuil de luminositéRempli, sans contour + Seuil de luminositéContour, non rempli + + + + + + Détection de contour - - + + - Cette option utilise l'algorithme de détection des arrêtes énoncé par J. Canny, afin de trouver rapidement des isoclines de contraste similaire. Cela produit une image intermédiaire qui ressemble moins à l'image originale que le résultat d'un seuil de luminosité mais qui contient souvent des courbes qui seraient ignorées autrement. Le seuil à régler ici (de 0.0 à 1.0) ajuste le seuil de luminosité afin de déterminer si un pixel adjacent à une courbe de contraste doit être inclus dans le résultat. Le réglage permet d'ajuster l'obscurité ou l'épaisseur des arrêtes du résultat. + Cette option utilise l'algorithme de détection des arêtes énoncé par J. Canny, afin de trouver rapidement des isoclines de contraste similaire. Cela produit une image intermédiaire qui ressemble moins à l'image originale que le résultat d'un seuil de luminosité mais qui contient souvent des courbes qui seraient ignorées autrement. Le seuil à régler ici (de 0,0 à 1,0) ajuste le seuil de luminosité afin de déterminer si un pixel adjacent à une courbe de contraste doit être inclus dans le résultat. Le réglage permet d'ajuster l'obscurité ou l'épaisseur des arêtes du résultat. - Image originale - Arrêtes detectéesRempli, sans contour - Arrêtes detectéesContour, non rempli - - - - - - + Image originale + Arêtes détectéesRempli, sans contour + Arêtes détectéesContour, non rempli + + + + + + - Quantification des couleur + Quantification des couleurs - - + + Le résultat de ce filtre produira une image intermédiaire très différente de celle produite avec les deux autres, mais pouvant être aussi très utile. Au lieu de chercher les isoclines de contraste ou de luminosité, il cherche les limites des changements de couleur, même à contraste ou luminosité constants. Le réglage ici, nombre de couleurs, permet de déterminer le nombre de couleurs que l'image intermédiaire devrait avoir si elle était en couleurs. Il exécute ensuite la détermination blanc/noir d'après l'indice pair ou impair des couleurs. - Image originale - Quantification (12 coul.)Rempli, sans contour - Quantification (12 coul.)Contour, non rempli - - - - - + Image originale + Quantification (12 coul.)Rempli, sans contour + Quantification (12 coul.)Contour, non rempli + + + + + Vous devriez essayer ces trois filtres et observer les résultats différents qu'ils produisent pour différents types d'images. Pour une image donnée, il y en aura un qui donnera de meilleurs résultats que les autres. - - + + - Après la vectorisation, vous devriez essayer d'appliquer la commande Chemin > Simplifier (Ctrl+L) au chemin résultant, afin de diminuer le nombre de nœuds. Cela peut rendre l'édition du résultat de Potrace bien plus facile. Par exemple, voici un exemple typique de vectorisation du « Vieil homme jouant de la guitare » : + Après la vectorisation, vous devriez essayer d'appliquer la commande Chemin > Simplifier (Ctrl+L) au chemin résultant, afin de diminuer le nombre de nœuds. Cela peut rendre l'édition du résultat de Potrace bien plus facile. Par exemple, voici un exemple typique de vectorisation du « Vieil homme jouant de la guitare » : - Image originale - Image vectorisée / Chemin résultant(1,551 nœuds) - - - - + Image originale + Image vectorisée / Chemin résultant(1 551 nœuds) + + + + Notez le très grand nombre de nœuds du chemin. Après avoir appuyé sur Ctrl+L, voici un résultat typique : - Image originale - Image vectorisée / Chemin résultant - Simplifié(384 nœuds) - - - - + Image originale + Image vectorisée / Chemin résultant — Simplifié(384 nœuds) + + + + La représentation est un peu plus approximative et grossière, mais le dessin est plus simple et plus facile à éditer. Gardez à l'esprit que ce que vous devez obtenir n'est pas un rendu exact de l'image mais un ensemble de courbes que vous pourrez utiliser dans votre dessin. - + @@ -223,8 +223,8 @@ - - Essayez Ctrl+flèche pour vous déplacer + + Essayez Ctrl+flèche pour vous déplacer -- cgit v1.2.3 From f46d4226865476eef8d5f9b5101f6ff750a30957 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 21 Mar 2016 14:47:02 +0100 Subject: Translations. Minor French translation update. (bzr r14732) --- po/fr.po | 9912 +++++++++++++++++++------------------------------------------- 1 file changed, 3001 insertions(+), 6911 deletions(-) diff --git a/po/fr.po b/po/fr.po index 37a52ab43..6fae8a22c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-11-01 13:46+0100\n" -"PO-Revision-Date: 2015-11-01 12:37+0100\n" +"PO-Revision-Date: 2016-03-21 14:46+0100\n" "Last-Translator: Nicolas Dufour \n" "Language-Team: fr@li.org\n" "Language: fr_FR\n" @@ -57,20 +57,13 @@ msgstr "Nouveau dessin" msgid "Smart Jelly" msgstr "Gel tous usages" -#: ../share/filters/filters.svg.h:3 ../share/filters/filters.svg.h:7 -#: ../share/filters/filters.svg.h:15 ../share/filters/filters.svg.h:31 -#: ../share/filters/filters.svg.h:35 ../share/filters/filters.svg.h:107 -#: ../share/filters/filters.svg.h:139 ../share/filters/filters.svg.h:143 -#: ../share/filters/filters.svg.h:147 ../share/filters/filters.svg.h:151 -#: ../share/filters/filters.svg.h:163 ../share/filters/filters.svg.h:171 -#: ../share/filters/filters.svg.h:219 ../share/filters/filters.svg.h:227 -#: ../share/filters/filters.svg.h:283 ../share/filters/filters.svg.h:299 -#: ../share/filters/filters.svg.h:303 ../share/filters/filters.svg.h:551 -#: ../share/filters/filters.svg.h:555 ../share/filters/filters.svg.h:559 -#: ../share/filters/filters.svg.h:563 ../share/filters/filters.svg.h:567 -#: ../src/extension/internal/filter/bevels.h:63 -#: ../src/extension/internal/filter/bevels.h:144 -#: ../src/extension/internal/filter/bevels.h:228 +#: ../share/filters/filters.svg.h:3 ../share/filters/filters.svg.h:7 ../share/filters/filters.svg.h:15 ../share/filters/filters.svg.h:31 +#: ../share/filters/filters.svg.h:35 ../share/filters/filters.svg.h:107 ../share/filters/filters.svg.h:139 ../share/filters/filters.svg.h:143 +#: ../share/filters/filters.svg.h:147 ../share/filters/filters.svg.h:151 ../share/filters/filters.svg.h:163 ../share/filters/filters.svg.h:171 +#: ../share/filters/filters.svg.h:219 ../share/filters/filters.svg.h:227 ../share/filters/filters.svg.h:283 ../share/filters/filters.svg.h:299 +#: ../share/filters/filters.svg.h:303 ../share/filters/filters.svg.h:551 ../share/filters/filters.svg.h:555 ../share/filters/filters.svg.h:559 +#: ../share/filters/filters.svg.h:563 ../share/filters/filters.svg.h:567 ../src/extension/internal/filter/bevels.h:63 +#: ../src/extension/internal/filter/bevels.h:144 ../src/extension/internal/filter/bevels.h:228 msgid "Bevels" msgstr "Biseaux" @@ -90,13 +83,9 @@ msgstr "Biseau doux en forme de goutte avec une finition métallisée" msgid "Apparition" msgstr "Apparition" -#: ../share/filters/filters.svg.h:11 ../share/filters/filters.svg.h:323 -#: ../share/filters/filters.svg.h:655 -#: ../src/extension/internal/filter/blurs.h:63 -#: ../src/extension/internal/filter/blurs.h:132 -#: ../src/extension/internal/filter/blurs.h:201 -#: ../src/extension/internal/filter/blurs.h:267 -#: ../src/extension/internal/filter/blurs.h:351 +#: ../share/filters/filters.svg.h:11 ../share/filters/filters.svg.h:323 ../share/filters/filters.svg.h:655 +#: ../src/extension/internal/filter/blurs.h:63 ../src/extension/internal/filter/blurs.h:132 ../src/extension/internal/filter/blurs.h:201 +#: ../src/extension/internal/filter/blurs.h:267 ../src/extension/internal/filter/blurs.h:351 msgid "Blurs" msgstr "Flous" @@ -116,24 +105,15 @@ msgstr "Biseau bas et net" msgid "Rubber Stamp" msgstr "Tampon en caoutchouc" -#: ../share/filters/filters.svg.h:19 ../share/filters/filters.svg.h:43 -#: ../share/filters/filters.svg.h:47 ../share/filters/filters.svg.h:51 -#: ../share/filters/filters.svg.h:59 ../share/filters/filters.svg.h:63 -#: ../share/filters/filters.svg.h:95 ../share/filters/filters.svg.h:99 -#: ../share/filters/filters.svg.h:103 ../share/filters/filters.svg.h:287 -#: ../share/filters/filters.svg.h:291 ../share/filters/filters.svg.h:331 -#: ../share/filters/filters.svg.h:335 ../share/filters/filters.svg.h:339 -#: ../share/filters/filters.svg.h:391 ../share/filters/filters.svg.h:407 -#: ../share/filters/filters.svg.h:451 ../share/filters/filters.svg.h:455 -#: ../share/filters/filters.svg.h:459 ../share/filters/filters.svg.h:475 -#: ../share/filters/filters.svg.h:487 ../share/filters/filters.svg.h:583 -#: ../share/filters/filters.svg.h:643 ../share/filters/filters.svg.h:683 -#: ../share/filters/filters.svg.h:687 ../share/filters/filters.svg.h:691 -#: ../share/filters/filters.svg.h:695 ../share/filters/filters.svg.h:699 -#: ../share/filters/filters.svg.h:703 ../share/filters/filters.svg.h:707 -#: ../share/filters/filters.svg.h:711 ../share/filters/filters.svg.h:715 -#: ../share/filters/filters.svg.h:723 -#: ../src/extension/internal/filter/overlays.h:80 +#: ../share/filters/filters.svg.h:19 ../share/filters/filters.svg.h:43 ../share/filters/filters.svg.h:47 ../share/filters/filters.svg.h:51 +#: ../share/filters/filters.svg.h:59 ../share/filters/filters.svg.h:63 ../share/filters/filters.svg.h:95 ../share/filters/filters.svg.h:99 +#: ../share/filters/filters.svg.h:103 ../share/filters/filters.svg.h:287 ../share/filters/filters.svg.h:291 ../share/filters/filters.svg.h:331 +#: ../share/filters/filters.svg.h:335 ../share/filters/filters.svg.h:339 ../share/filters/filters.svg.h:391 ../share/filters/filters.svg.h:407 +#: ../share/filters/filters.svg.h:451 ../share/filters/filters.svg.h:455 ../share/filters/filters.svg.h:459 ../share/filters/filters.svg.h:475 +#: ../share/filters/filters.svg.h:487 ../share/filters/filters.svg.h:583 ../share/filters/filters.svg.h:643 ../share/filters/filters.svg.h:683 +#: ../share/filters/filters.svg.h:687 ../share/filters/filters.svg.h:691 ../share/filters/filters.svg.h:695 ../share/filters/filters.svg.h:699 +#: ../share/filters/filters.svg.h:703 ../share/filters/filters.svg.h:707 ../share/filters/filters.svg.h:711 ../share/filters/filters.svg.h:715 +#: ../share/filters/filters.svg.h:723 ../src/extension/internal/filter/overlays.h:80 msgid "Overlays" msgstr "Superpositions" @@ -145,8 +125,7 @@ msgstr "Taches de liquide correcteur aléatoires" msgid "Ink Bleed" msgstr "Bavure d'encre" -#: ../share/filters/filters.svg.h:23 ../share/filters/filters.svg.h:27 -#: ../share/filters/filters.svg.h:115 ../share/filters/filters.svg.h:431 +#: ../share/filters/filters.svg.h:23 ../share/filters/filters.svg.h:27 ../share/filters/filters.svg.h:115 ../share/filters/filters.svg.h:431 msgid "Protrusions" msgstr "Protubérances" @@ -182,13 +161,9 @@ msgstr "Contour en arête, avec un biseau intérieur" msgid "Ripple" msgstr "Ondulation" -#: ../share/filters/filters.svg.h:39 ../share/filters/filters.svg.h:123 -#: ../share/filters/filters.svg.h:315 ../share/filters/filters.svg.h:319 -#: ../share/filters/filters.svg.h:327 ../share/filters/filters.svg.h:363 -#: ../share/filters/filters.svg.h:443 ../share/filters/filters.svg.h:519 -#: ../share/filters/filters.svg.h:635 -#: ../src/extension/internal/filter/distort.h:96 -#: ../src/extension/internal/filter/distort.h:205 +#: ../share/filters/filters.svg.h:39 ../share/filters/filters.svg.h:123 ../share/filters/filters.svg.h:315 ../share/filters/filters.svg.h:319 +#: ../share/filters/filters.svg.h:327 ../share/filters/filters.svg.h:363 ../share/filters/filters.svg.h:443 ../share/filters/filters.svg.h:519 +#: ../share/filters/filters.svg.h:635 ../src/extension/internal/filter/distort.h:96 ../src/extension/internal/filter/distort.h:205 msgid "Distort" msgstr "Déformation" @@ -224,12 +199,9 @@ msgstr "Taches blanches floconneuses" msgid "Leopard Fur" msgstr "Fourrure de léopard" -#: ../share/filters/filters.svg.h:55 ../share/filters/filters.svg.h:175 -#: ../share/filters/filters.svg.h:179 ../share/filters/filters.svg.h:183 -#: ../share/filters/filters.svg.h:191 ../share/filters/filters.svg.h:211 -#: ../share/filters/filters.svg.h:239 ../share/filters/filters.svg.h:243 -#: ../share/filters/filters.svg.h:247 ../share/filters/filters.svg.h:255 -#: ../share/filters/filters.svg.h:387 ../share/filters/filters.svg.h:395 +#: ../share/filters/filters.svg.h:55 ../share/filters/filters.svg.h:175 ../share/filters/filters.svg.h:179 ../share/filters/filters.svg.h:183 +#: ../share/filters/filters.svg.h:191 ../share/filters/filters.svg.h:211 ../share/filters/filters.svg.h:239 ../share/filters/filters.svg.h:243 +#: ../share/filters/filters.svg.h:247 ../share/filters/filters.svg.h:255 ../share/filters/filters.svg.h:387 ../share/filters/filters.svg.h:395 #: ../share/filters/filters.svg.h:399 ../share/filters/filters.svg.h:403 msgid "Materials" msgstr "Matières" @@ -244,8 +216,7 @@ msgstr "Zèbre" #: ../share/filters/filters.svg.h:60 msgid "Irregular vertical dark stripes (loses object's own color)" -msgstr "" -"Bandes verticales sombres et irrégulières (l'objet perd sa propre couleur)" +msgstr "Bandes verticales sombres et irrégulières (l'objet perd sa propre couleur)" #: ../share/filters/filters.svg.h:62 msgid "Clouds" @@ -255,15 +226,12 @@ msgstr "Nuages" msgid "Airy, fluffy, sparse white clouds" msgstr "Nuages blancs touffus, épars et légers" -#: ../share/filters/filters.svg.h:66 -#: ../src/extension/internal/bitmap/sharpen.cpp:38 +#: ../share/filters/filters.svg.h:66 ../src/extension/internal/bitmap/sharpen.cpp:38 msgid "Sharpen" msgstr "Netteté" -#: ../share/filters/filters.svg.h:67 ../share/filters/filters.svg.h:71 -#: ../share/filters/filters.svg.h:87 ../share/filters/filters.svg.h:295 -#: ../share/filters/filters.svg.h:415 -#: ../src/extension/internal/filter/image.h:62 +#: ../share/filters/filters.svg.h:67 ../share/filters/filters.svg.h:71 ../share/filters/filters.svg.h:87 ../share/filters/filters.svg.h:295 +#: ../share/filters/filters.svg.h:415 ../src/extension/internal/filter/image.h:62 msgid "Image Effects" msgstr "Effets d'image" @@ -283,22 +251,13 @@ msgstr "Renforcer les bords et frontières intérieures de l'objet, force=0,3" msgid "Oil painting" msgstr "Peinture à l'huile" -#: ../share/filters/filters.svg.h:75 ../share/filters/filters.svg.h:79 -#: ../share/filters/filters.svg.h:83 ../share/filters/filters.svg.h:447 -#: ../share/filters/filters.svg.h:495 ../share/filters/filters.svg.h:499 -#: ../share/filters/filters.svg.h:503 ../share/filters/filters.svg.h:507 -#: ../share/filters/filters.svg.h:515 ../share/filters/filters.svg.h:659 -#: ../share/filters/filters.svg.h:663 ../share/filters/filters.svg.h:667 -#: ../share/filters/filters.svg.h:671 ../share/filters/filters.svg.h:675 -#: ../share/filters/filters.svg.h:679 ../share/filters/filters.svg.h:719 -#: ../share/filters/filters.svg.h:803 ../share/filters/filters.svg.h:815 -#: ../src/extension/internal/filter/paint.h:113 -#: ../src/extension/internal/filter/paint.h:244 -#: ../src/extension/internal/filter/paint.h:363 -#: ../src/extension/internal/filter/paint.h:507 -#: ../src/extension/internal/filter/paint.h:602 -#: ../src/extension/internal/filter/paint.h:725 -#: ../src/extension/internal/filter/paint.h:877 +#: ../share/filters/filters.svg.h:75 ../share/filters/filters.svg.h:79 ../share/filters/filters.svg.h:83 ../share/filters/filters.svg.h:447 +#: ../share/filters/filters.svg.h:495 ../share/filters/filters.svg.h:499 ../share/filters/filters.svg.h:503 ../share/filters/filters.svg.h:507 +#: ../share/filters/filters.svg.h:515 ../share/filters/filters.svg.h:659 ../share/filters/filters.svg.h:663 ../share/filters/filters.svg.h:667 +#: ../share/filters/filters.svg.h:671 ../share/filters/filters.svg.h:675 ../share/filters/filters.svg.h:679 ../share/filters/filters.svg.h:719 +#: ../share/filters/filters.svg.h:803 ../share/filters/filters.svg.h:815 ../src/extension/internal/filter/paint.h:113 +#: ../src/extension/internal/filter/paint.h:244 ../src/extension/internal/filter/paint.h:363 ../src/extension/internal/filter/paint.h:507 +#: ../src/extension/internal/filter/paint.h:602 ../src/extension/internal/filter/paint.h:725 ../src/extension/internal/filter/paint.h:877 #: ../src/extension/internal/filter/paint.h:981 msgid "Image Paint and Draw" msgstr "Dessin et peinture d'image" @@ -308,8 +267,7 @@ msgid "Simulate oil painting style" msgstr "Simule une peinture à l'huile" #. Pencil -#: ../share/filters/filters.svg.h:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:424 +#: ../share/filters/filters.svg.h:78 ../src/ui/dialog/inkscape-preferences.cpp:424 msgid "Pencil" msgstr "Crayon" @@ -337,16 +295,11 @@ msgstr "Imite une photographie ancienne" msgid "Organic" msgstr "Relief organique" -#: ../share/filters/filters.svg.h:91 ../share/filters/filters.svg.h:119 -#: ../share/filters/filters.svg.h:127 ../share/filters/filters.svg.h:187 -#: ../share/filters/filters.svg.h:195 ../share/filters/filters.svg.h:199 -#: ../share/filters/filters.svg.h:251 ../share/filters/filters.svg.h:259 -#: ../share/filters/filters.svg.h:263 ../share/filters/filters.svg.h:355 -#: ../share/filters/filters.svg.h:359 ../share/filters/filters.svg.h:367 -#: ../share/filters/filters.svg.h:371 ../share/filters/filters.svg.h:375 -#: ../share/filters/filters.svg.h:379 ../share/filters/filters.svg.h:383 -#: ../share/filters/filters.svg.h:439 ../share/filters/filters.svg.h:467 -#: ../share/filters/filters.svg.h:491 ../share/filters/filters.svg.h:531 +#: ../share/filters/filters.svg.h:91 ../share/filters/filters.svg.h:119 ../share/filters/filters.svg.h:127 ../share/filters/filters.svg.h:187 +#: ../share/filters/filters.svg.h:195 ../share/filters/filters.svg.h:199 ../share/filters/filters.svg.h:251 ../share/filters/filters.svg.h:259 +#: ../share/filters/filters.svg.h:263 ../share/filters/filters.svg.h:355 ../share/filters/filters.svg.h:359 ../share/filters/filters.svg.h:367 +#: ../share/filters/filters.svg.h:371 ../share/filters/filters.svg.h:375 ../share/filters/filters.svg.h:379 ../share/filters/filters.svg.h:383 +#: ../share/filters/filters.svg.h:439 ../share/filters/filters.svg.h:467 ../share/filters/filters.svg.h:491 ../share/filters/filters.svg.h:531 msgid "Textures" msgstr "Textures" @@ -390,10 +343,8 @@ msgstr "Biseau doux, légèrement enfoncé au milieu" msgid "Inset" msgstr "Incrustation" -#: ../share/filters/filters.svg.h:111 ../share/filters/filters.svg.h:267 -#: ../share/filters/filters.svg.h:343 ../share/filters/filters.svg.h:435 -#: ../share/filters/filters.svg.h:811 -#: ../src/extension/internal/filter/shadows.h:81 +#: ../share/filters/filters.svg.h:111 ../share/filters/filters.svg.h:267 ../share/filters/filters.svg.h:343 ../share/filters/filters.svg.h:435 +#: ../share/filters/filters.svg.h:811 ../src/extension/internal/filter/shadows.h:81 msgid "Shadows and Glows" msgstr "Ombres et lueurs" @@ -437,22 +388,14 @@ msgstr "Sous un verre fissuré" msgid "Bubbly Bumps" msgstr "Bosselage bulleux" -#: ../share/filters/filters.svg.h:131 ../share/filters/filters.svg.h:307 -#: ../share/filters/filters.svg.h:311 ../share/filters/filters.svg.h:347 -#: ../share/filters/filters.svg.h:351 ../share/filters/filters.svg.h:419 -#: ../share/filters/filters.svg.h:423 ../share/filters/filters.svg.h:463 -#: ../share/filters/filters.svg.h:471 ../share/filters/filters.svg.h:479 -#: ../share/filters/filters.svg.h:483 ../share/filters/filters.svg.h:511 -#: ../share/filters/filters.svg.h:535 ../share/filters/filters.svg.h:539 -#: ../share/filters/filters.svg.h:543 ../share/filters/filters.svg.h:547 -#: ../share/filters/filters.svg.h:571 ../share/filters/filters.svg.h:579 -#: ../share/filters/filters.svg.h:595 ../share/filters/filters.svg.h:599 -#: ../share/filters/filters.svg.h:603 ../share/filters/filters.svg.h:607 -#: ../share/filters/filters.svg.h:611 ../share/filters/filters.svg.h:615 -#: ../share/filters/filters.svg.h:619 ../share/filters/filters.svg.h:623 -#: ../share/filters/filters.svg.h:799 ../share/filters/filters.svg.h:807 -#: ../src/extension/internal/filter/bumps.h:142 -#: ../src/extension/internal/filter/bumps.h:362 +#: ../share/filters/filters.svg.h:131 ../share/filters/filters.svg.h:307 ../share/filters/filters.svg.h:311 ../share/filters/filters.svg.h:347 +#: ../share/filters/filters.svg.h:351 ../share/filters/filters.svg.h:419 ../share/filters/filters.svg.h:423 ../share/filters/filters.svg.h:463 +#: ../share/filters/filters.svg.h:471 ../share/filters/filters.svg.h:479 ../share/filters/filters.svg.h:483 ../share/filters/filters.svg.h:511 +#: ../share/filters/filters.svg.h:535 ../share/filters/filters.svg.h:539 ../share/filters/filters.svg.h:543 ../share/filters/filters.svg.h:547 +#: ../share/filters/filters.svg.h:571 ../share/filters/filters.svg.h:579 ../share/filters/filters.svg.h:595 ../share/filters/filters.svg.h:599 +#: ../share/filters/filters.svg.h:603 ../share/filters/filters.svg.h:607 ../share/filters/filters.svg.h:611 ../share/filters/filters.svg.h:615 +#: ../share/filters/filters.svg.h:619 ../share/filters/filters.svg.h:623 ../share/filters/filters.svg.h:799 ../share/filters/filters.svg.h:807 +#: ../src/extension/internal/filter/bumps.h:142 ../src/extension/internal/filter/bumps.h:362 msgid "Bumps" msgstr "Bosselage" @@ -464,10 +407,8 @@ msgstr "Effet de bulles flexible avec un peu de déplacement" msgid "Glowing Bubble" msgstr "Bulle brillante" -#: ../share/filters/filters.svg.h:135 ../share/filters/filters.svg.h:155 -#: ../share/filters/filters.svg.h:159 ../share/filters/filters.svg.h:203 -#: ../share/filters/filters.svg.h:207 ../share/filters/filters.svg.h:215 -#: ../share/filters/filters.svg.h:223 +#: ../share/filters/filters.svg.h:135 ../share/filters/filters.svg.h:155 ../share/filters/filters.svg.h:159 ../share/filters/filters.svg.h:203 +#: ../share/filters/filters.svg.h:207 ../share/filters/filters.svg.h:215 ../share/filters/filters.svg.h:223 msgid "Ridges" msgstr "Crêtes" @@ -535,8 +476,7 @@ msgstr "Texture de métal luisant" msgid "Leaves" msgstr "Feuilles" -#: ../share/filters/filters.svg.h:167 ../share/filters/filters.svg.h:235 -#: ../share/filters/filters.svg.h:271 ../share/filters/filters.svg.h:639 +#: ../share/filters/filters.svg.h:167 ../share/filters/filters.svg.h:235 ../share/filters/filters.svg.h:271 ../share/filters/filters.svg.h:639 #: ../share/extensions/pathscatter.inx.h:1 msgid "Scatter" msgstr "Éparpiller" @@ -545,8 +485,7 @@ msgstr "Éparpiller" msgid "Leaves on the ground in Fall, or living foliage" msgstr "Feuilles sur le sol en automne, ou feuillage vivant" -#: ../share/filters/filters.svg.h:170 -#: ../src/extension/internal/filter/paint.h:339 +#: ../share/filters/filters.svg.h:170 ../src/extension/internal/filter/paint.h:339 msgid "Translucent" msgstr "Verre translucide" @@ -560,9 +499,7 @@ msgstr "Cire d'abeille irisée" #: ../share/filters/filters.svg.h:176 msgid "Waxy texture which keeps its iridescence through color fill change" -msgstr "" -"Texture cireuse conservant ses reflets irisés au travers de variations de " -"couleur de remplissage" +msgstr "Texture cireuse conservant ses reflets irisés au travers de variations de couleur de remplissage" #: ../share/filters/filters.svg.h:178 msgid "Eroded Metal" @@ -570,8 +507,7 @@ msgstr "Métal érodé" #: ../share/filters/filters.svg.h:180 msgid "Eroded metal texture with ridges, grooves, holes and bumps" -msgstr "" -"Texture de métal érodé, avec des arêtes, des sillons, des trous et des bosses" +msgstr "Texture de métal érodé, avec des arêtes, des sillons, des trous et des bosses" #: ../share/filters/filters.svg.h:182 msgid "Cracked Lava" @@ -603,8 +539,7 @@ msgstr "Mur de pierres" #: ../share/filters/filters.svg.h:196 msgid "Stone wall texture to use with not too saturated colors" -msgstr "" -"Texture en mur de pierre à utiliser avec des couleurs pas trop saturées" +msgstr "Texture en mur de pierre à utiliser avec des couleurs pas trop saturées" #: ../share/filters/filters.svg.h:198 msgid "Silk Carpet" @@ -635,10 +570,8 @@ msgid "Metallized Paint" msgstr "Peinture métallisée" #: ../share/filters/filters.svg.h:212 -msgid "" -"Metallized effect with a soft lighting, slightly translucent at the edges" -msgstr "" -"Effet métallisé avec une lumière douce, légèrement translucide sur les bords" +msgid "Metallized effect with a soft lighting, slightly translucent at the edges" +msgstr "Effet métallisé avec une lumière douce, légèrement translucide sur les bords" #: ../share/filters/filters.svg.h:214 msgid "Dragee" @@ -676,12 +609,9 @@ msgstr "Huile grasse avec quelques turbulences ajustables" msgid "Black Hole" msgstr "Trou noir" -#: ../share/filters/filters.svg.h:231 ../share/filters/filters.svg.h:275 -#: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 -#: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 -#: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 -#: ../src/filter-enums.cpp:32 +#: ../share/filters/filters.svg.h:231 ../share/filters/filters.svg.h:275 ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 +#: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 ../src/extension/internal/filter/morphology.h:76 +#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "Morphologie" @@ -695,9 +625,7 @@ msgstr "Cubes" #: ../share/filters/filters.svg.h:236 msgid "Scattered cubes; adjust the Morphology primitive to vary size" -msgstr "" -"Cubes éparpillés ; pour changer la taille des cubes, ajuster la primitive " -"Morphologie" +msgstr "Cubes éparpillés ; pour changer la taille des cubes, ajuster la primitive Morphologie" #: ../share/filters/filters.svg.h:238 msgid "Peel Off" @@ -745,20 +673,15 @@ msgstr "Papier à grain" #: ../share/filters/filters.svg.h:260 msgid "Aquarelle paper effect which can be used for pictures as for objects" -msgstr "" -"Effet de papier à aquarelle, utilisable autant pour les images que pour les " -"objets" +msgstr "Effet de papier à aquarelle, utilisable autant pour les images que pour les objets" #: ../share/filters/filters.svg.h:262 msgid "Rough and Glossy" msgstr "Plastique chiffonné" #: ../share/filters/filters.svg.h:264 -msgid "" -"Crumpled glossy paper effect which can be used for pictures as for objects" -msgstr "" -"Effet de papier brillant froissé, utilisable autant pour les images que pour " -"les objets" +msgid "Crumpled glossy paper effect which can be used for pictures as for objects" +msgstr "Effet de papier brillant froissé, utilisable autant pour les images que pour les objets" #: ../share/filters/filters.svg.h:266 msgid "In and Out" @@ -797,11 +720,8 @@ msgid "Electronic Microscopy" msgstr "Microscope électronique" #: ../share/filters/filters.svg.h:284 -msgid "" -"Bevel, crude light, discoloration and glow like in electronic microscopy" -msgstr "" -"Un biseau, lumière brute, décoloration et lueur comme avec un microscope " -"électronique" +msgid "Bevel, crude light, discoloration and glow like in electronic microscopy" +msgstr "Un biseau, lumière brute, décoloration et lueur comme avec un microscope électronique" #: ../share/filters/filters.svg.h:286 msgid "Tartan" @@ -817,9 +737,7 @@ msgstr "Liquide agité" #: ../share/filters/filters.svg.h:292 msgid "Colorizable filling with flow inside like transparency" -msgstr "" -"Remplissage qu'il est possible de colorer, avec une transparence s'écoulant " -"à l'intérieur" +msgstr "Remplissage qu'il est possible de colorer, avec une transparence s'écoulant à l'intérieur" #: ../share/filters/filters.svg.h:294 msgid "Soft Focus Lens" @@ -866,8 +784,7 @@ msgid "Torn Edges" msgstr "Pourtour déchiré" #: ../share/filters/filters.svg.h:316 ../share/filters/filters.svg.h:364 -msgid "" -"Displace the outside of shapes and pictures without altering their content" +msgid "Displace the outside of shapes and pictures without altering their content" msgstr "Déplace l'extérieur des formes et images sans en altérer le contenu" #: ../share/filters/filters.svg.h:318 @@ -883,12 +800,8 @@ msgid "Evanescent" msgstr "Évanescence" #: ../share/filters/filters.svg.h:324 -msgid "" -"Blur the contents of objects, preserving the outline and adding progressive " -"transparency at edges" -msgstr "" -"Rend flou le contenu des objets, mais préserve le contour et ajoute une " -"transparence progressive aux bords" +msgid "Blur the contents of objects, preserving the outline and adding progressive transparency at edges" +msgstr "Rend flou le contenu des objets, mais préserve le contour et ajoute une transparence progressive aux bords" #: ../share/filters/filters.svg.h:326 msgid "Chalk and Sponge" @@ -896,9 +809,7 @@ msgstr "Éponge et craie" #: ../share/filters/filters.svg.h:328 msgid "Low turbulence gives sponge look and high turbulence chalk" -msgstr "" -"Une agitation légère donne l'aspect d'une éponge et une agitation forte de " -"la craie" +msgstr "Une agitation légère donne l'aspect d'une éponge et une agitation forte de la craie" #: ../share/filters/filters.svg.h:330 msgid "People" @@ -921,11 +832,8 @@ msgid "Garden of Delights" msgstr "Jardin des délices" #: ../share/filters/filters.svg.h:340 -msgid "" -"Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of Delights" -msgstr "" -"Volutes agitées et fantasmagoriques, comme Le Jardin des délices de " -"Jérôme Bosch" +msgid "Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of Delights" +msgstr "Volutes agitées et fantasmagoriques, comme Le Jardin des délices de Jérôme Bosch" #: ../share/filters/filters.svg.h:342 msgid "Cutout Glow" @@ -933,9 +841,7 @@ msgstr "Découpe et flou" #: ../share/filters/filters.svg.h:344 msgid "In and out glow with a possible offset and colorizable flood" -msgstr "" -"Lueur intérieure et extérieure avec possibilité de décaler et colorer le " -"remplissage" +msgstr "Lueur intérieure et extérieure avec possibilité de décaler et colorer le remplissage" #: ../share/filters/filters.svg.h:346 msgid "Dark Emboss" @@ -943,8 +849,7 @@ msgstr "Bosselage sombre" #: ../share/filters/filters.svg.h:348 msgid "Emboss effect : 3D relief where white is replaced by black" -msgstr "" -"Effet d'embossage : relief 3D avec lequel le blanc est remplacé par du noir" +msgstr "Effet d'embossage : relief 3D avec lequel le blanc est remplacé par du noir" #: ../share/filters/filters.svg.h:350 msgid "Bubbly Bumps Matte" @@ -952,9 +857,7 @@ msgstr "Bosselage bulleux mat" #: ../share/filters/filters.svg.h:352 msgid "Same as Bubbly Bumps but with a diffuse light instead of a specular one" -msgstr "" -"Identique à Bosselage bulleux, mais avec une lumière diffuse et non pas " -"spéculaire" +msgstr "Identique à Bosselage bulleux, mais avec une lumière diffuse et non pas spéculaire" #: ../share/filters/filters.svg.h:354 msgid "Blotting Paper" @@ -985,11 +888,8 @@ msgid "Felt" msgstr "Feutre" #: ../share/filters/filters.svg.h:372 -msgid "" -"Felt like texture with color turbulence and slightly darker at the edges" -msgstr "" -"Texture de feutre avec de la turbulence de couleur et légèrement plus sombre " -"sur les bords" +msgid "Felt like texture with color turbulence and slightly darker at the edges" +msgstr "Texture de feutre avec de la turbulence de couleur et légèrement plus sombre sur les bords" #: ../share/filters/filters.svg.h:374 msgid "Ink Paint" @@ -1005,9 +905,7 @@ msgstr "Arc-en-ciel teinté" #: ../share/filters/filters.svg.h:380 msgid "Smooth rainbow colors melted along the edges and colorizable" -msgstr "" -"Couleurs arc-en-ciel douces, fondues le long des bords, et qu'il est " -"possible de colorer" +msgstr "Couleurs arc-en-ciel douces, fondues le long des bords, et qu'il est possible de colorer" #: ../share/filters/filters.svg.h:382 msgid "Melted Rainbow" @@ -1023,8 +921,7 @@ msgstr "Métal souple" #: ../share/filters/filters.svg.h:388 msgid "Bright, polished uneven metal casting, colorizable" -msgstr "" -"Moulage de métal irrégulier, poli et brillant, qu'il est possible de colorer" +msgstr "Moulage de métal irrégulier, poli et brillant, qu'il est possible de colorer" #: ../share/filters/filters.svg.h:390 msgid "Wavy Tartan" @@ -1032,8 +929,7 @@ msgstr "Écossais ondoyant" #: ../share/filters/filters.svg.h:392 msgid "Tartan pattern with a wavy displacement and bevel around the edges" -msgstr "" -"Motif écossais avec des déplacements ondulés et un biseau autour des bords" +msgstr "Motif écossais avec des déplacements ondulés et un biseau autour des bords" #: ../share/filters/filters.svg.h:394 msgid "3D Marble" @@ -1071,66 +967,28 @@ msgstr "Fourrure de tigre avec des plis et un biseau autour des bords" msgid "Black Light" msgstr "Lumière noire" -#: ../share/filters/filters.svg.h:411 ../share/filters/filters.svg.h:575 -#: ../share/filters/filters.svg.h:587 ../share/filters/filters.svg.h:627 -#: ../share/filters/filters.svg.h:631 ../share/filters/filters.svg.h:819 -#: ../share/filters/filters.svg.h:827 ../share/filters/filters.svg.h:831 -#: ../src/extension/internal/bitmap/colorize.cpp:52 -#: ../src/extension/internal/filter/bumps.h:101 -#: ../src/extension/internal/filter/bumps.h:321 -#: ../src/extension/internal/filter/bumps.h:328 -#: ../src/extension/internal/filter/color.h:83 -#: ../src/extension/internal/filter/color.h:165 -#: ../src/extension/internal/filter/color.h:172 -#: ../src/extension/internal/filter/color.h:283 -#: ../src/extension/internal/filter/color.h:337 -#: ../src/extension/internal/filter/color.h:415 -#: ../src/extension/internal/filter/color.h:422 -#: ../src/extension/internal/filter/color.h:512 -#: ../src/extension/internal/filter/color.h:607 -#: ../src/extension/internal/filter/color.h:729 -#: ../src/extension/internal/filter/color.h:826 -#: ../src/extension/internal/filter/color.h:905 -#: ../src/extension/internal/filter/color.h:996 -#: ../src/extension/internal/filter/color.h:1124 -#: ../src/extension/internal/filter/color.h:1194 -#: ../src/extension/internal/filter/color.h:1287 -#: ../src/extension/internal/filter/color.h:1399 -#: ../src/extension/internal/filter/color.h:1504 -#: ../src/extension/internal/filter/color.h:1580 -#: ../src/extension/internal/filter/color.h:1684 -#: ../src/extension/internal/filter/color.h:1691 -#: ../src/extension/internal/filter/morphology.h:194 -#: ../src/extension/internal/filter/overlays.h:73 -#: ../src/extension/internal/filter/paint.h:99 -#: ../src/extension/internal/filter/paint.h:713 -#: ../src/extension/internal/filter/paint.h:717 -#: ../src/extension/internal/filter/shadows.h:73 -#: ../src/extension/internal/filter/transparency.h:345 -#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:830 -#: ../src/ui/dialog/clonetiler.cpp:981 -#: ../src/ui/dialog/document-properties.cpp:164 -#: ../share/extensions/color_HSL_adjust.inx.h:20 -#: ../share/extensions/color_blackandwhite.inx.h:3 -#: ../share/extensions/color_brighter.inx.h:2 -#: ../share/extensions/color_custom.inx.h:15 -#: ../share/extensions/color_darker.inx.h:2 -#: ../share/extensions/color_desaturate.inx.h:2 -#: ../share/extensions/color_grayscale.inx.h:2 -#: ../share/extensions/color_lesshue.inx.h:2 -#: ../share/extensions/color_lesslight.inx.h:2 -#: ../share/extensions/color_lesssaturation.inx.h:2 -#: ../share/extensions/color_morehue.inx.h:2 -#: ../share/extensions/color_morelight.inx.h:2 -#: ../share/extensions/color_moresaturation.inx.h:2 -#: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 -#: ../share/extensions/color_removeblue.inx.h:2 -#: ../share/extensions/color_removegreen.inx.h:2 -#: ../share/extensions/color_removered.inx.h:2 -#: ../share/extensions/color_replace.inx.h:6 -#: ../share/extensions/color_rgbbarrel.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:21 +#: ../share/filters/filters.svg.h:411 ../share/filters/filters.svg.h:575 ../share/filters/filters.svg.h:587 ../share/filters/filters.svg.h:627 +#: ../share/filters/filters.svg.h:631 ../share/filters/filters.svg.h:819 ../share/filters/filters.svg.h:827 ../share/filters/filters.svg.h:831 +#: ../src/extension/internal/bitmap/colorize.cpp:52 ../src/extension/internal/filter/bumps.h:101 ../src/extension/internal/filter/bumps.h:321 +#: ../src/extension/internal/filter/bumps.h:328 ../src/extension/internal/filter/color.h:83 ../src/extension/internal/filter/color.h:165 +#: ../src/extension/internal/filter/color.h:172 ../src/extension/internal/filter/color.h:283 ../src/extension/internal/filter/color.h:337 +#: ../src/extension/internal/filter/color.h:415 ../src/extension/internal/filter/color.h:422 ../src/extension/internal/filter/color.h:512 +#: ../src/extension/internal/filter/color.h:607 ../src/extension/internal/filter/color.h:729 ../src/extension/internal/filter/color.h:826 +#: ../src/extension/internal/filter/color.h:905 ../src/extension/internal/filter/color.h:996 ../src/extension/internal/filter/color.h:1124 +#: ../src/extension/internal/filter/color.h:1194 ../src/extension/internal/filter/color.h:1287 ../src/extension/internal/filter/color.h:1399 +#: ../src/extension/internal/filter/color.h:1504 ../src/extension/internal/filter/color.h:1580 ../src/extension/internal/filter/color.h:1684 +#: ../src/extension/internal/filter/color.h:1691 ../src/extension/internal/filter/morphology.h:194 +#: ../src/extension/internal/filter/overlays.h:73 ../src/extension/internal/filter/paint.h:99 ../src/extension/internal/filter/paint.h:713 +#: ../src/extension/internal/filter/paint.h:717 ../src/extension/internal/filter/shadows.h:73 +#: ../src/extension/internal/filter/transparency.h:345 ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:830 +#: ../src/ui/dialog/clonetiler.cpp:981 ../src/ui/dialog/document-properties.cpp:164 ../share/extensions/color_HSL_adjust.inx.h:20 +#: ../share/extensions/color_blackandwhite.inx.h:3 ../share/extensions/color_brighter.inx.h:2 ../share/extensions/color_custom.inx.h:15 +#: ../share/extensions/color_darker.inx.h:2 ../share/extensions/color_desaturate.inx.h:2 ../share/extensions/color_grayscale.inx.h:2 +#: ../share/extensions/color_lesshue.inx.h:2 ../share/extensions/color_lesslight.inx.h:2 ../share/extensions/color_lesssaturation.inx.h:2 +#: ../share/extensions/color_morehue.inx.h:2 ../share/extensions/color_morelight.inx.h:2 ../share/extensions/color_moresaturation.inx.h:2 +#: ../share/extensions/color_negative.inx.h:2 ../share/extensions/color_randomize.inx.h:8 ../share/extensions/color_removeblue.inx.h:2 +#: ../share/extensions/color_removegreen.inx.h:2 ../share/extensions/color_removered.inx.h:2 ../share/extensions/color_replace.inx.h:6 +#: ../share/extensions/color_rgbbarrel.inx.h:2 ../share/extensions/interp_att_g.inx.h:21 msgid "Color" msgstr "Couleur" @@ -1166,35 +1024,25 @@ msgstr "Donne un bosselage doux semblable à du velours" msgid "Comics Cream" msgstr "Crème BD" -#: ../share/filters/filters.svg.h:427 ../share/filters/filters.svg.h:727 -#: ../share/filters/filters.svg.h:731 ../share/filters/filters.svg.h:735 -#: ../share/filters/filters.svg.h:739 ../share/filters/filters.svg.h:743 -#: ../share/filters/filters.svg.h:747 ../share/filters/filters.svg.h:751 -#: ../share/filters/filters.svg.h:755 ../share/filters/filters.svg.h:759 -#: ../share/filters/filters.svg.h:763 ../share/filters/filters.svg.h:767 -#: ../share/filters/filters.svg.h:771 ../share/filters/filters.svg.h:775 -#: ../share/filters/filters.svg.h:779 ../share/filters/filters.svg.h:783 -#: ../share/filters/filters.svg.h:787 ../share/filters/filters.svg.h:791 -#: ../share/filters/filters.svg.h:795 +#: ../share/filters/filters.svg.h:427 ../share/filters/filters.svg.h:727 ../share/filters/filters.svg.h:731 ../share/filters/filters.svg.h:735 +#: ../share/filters/filters.svg.h:739 ../share/filters/filters.svg.h:743 ../share/filters/filters.svg.h:747 ../share/filters/filters.svg.h:751 +#: ../share/filters/filters.svg.h:755 ../share/filters/filters.svg.h:759 ../share/filters/filters.svg.h:763 ../share/filters/filters.svg.h:767 +#: ../share/filters/filters.svg.h:771 ../share/filters/filters.svg.h:775 ../share/filters/filters.svg.h:779 ../share/filters/filters.svg.h:783 +#: ../share/filters/filters.svg.h:787 ../share/filters/filters.svg.h:791 ../share/filters/filters.svg.h:795 msgid "Non realistic 3D shaders" msgstr "Ombrages 3D non réalistes" #: ../share/filters/filters.svg.h:428 msgid "Comics shader with creamy waves transparency" -msgstr "" -"Ombrage de bande dessinée avec une transparence en ondulations crémeuses" +msgstr "Ombrage de bande dessinée avec une transparence en ondulations crémeuses" #: ../share/filters/filters.svg.h:430 msgid "Chewing Gum" msgstr "Chewing-gum" #: ../share/filters/filters.svg.h:432 -msgid "" -"Creates colorizable blotches which smoothly flow over the edges of the lines " -"at their crossings" -msgstr "" -"Crée des taches qu'il est possible de colorer, avec un écoulement homogène " -"sur les croisements des lignes" +msgid "Creates colorizable blotches which smoothly flow over the edges of the lines at their crossings" +msgstr "Crée des taches qu'il est possible de colorer, avec un écoulement homogène sur les croisements des lignes" #: ../share/filters/filters.svg.h:434 msgid "Dark And Glow" @@ -1202,8 +1050,7 @@ msgstr "Ombre et lumière" #: ../share/filters/filters.svg.h:436 msgid "Darkens the edge with an inner blur and adds a flexible glow" -msgstr "" -"Assombrit les bords avec un flou intérieur et ajoute une lueur flexible" +msgstr "Assombrit les bords avec un flou intérieur et ajoute une lueur flexible" #: ../share/filters/filters.svg.h:438 msgid "Warped Rainbow" @@ -1211,9 +1058,7 @@ msgstr "Arc-en-ciel déformé" #: ../share/filters/filters.svg.h:440 msgid "Smooth rainbow colors warped along the edges and colorizable" -msgstr "" -"Couleurs arc-en-ciel douces déformées le long des bords et qu'il est " -"possible de colorer" +msgstr "Couleurs arc-en-ciel douces déformées le long des bords et qu'il est possible de colorer" #: ../share/filters/filters.svg.h:442 msgid "Rough and Dilate" @@ -1229,9 +1074,7 @@ msgstr "Vieille carte postale" #: ../share/filters/filters.svg.h:448 msgid "Slightly posterize and draw edges like on old printed postcards" -msgstr "" -"Légère postérisation et contours dessinés, comme sur une vieille carte " -"postale imprimée" +msgstr "Légère postérisation et contours dessinés, comme sur une vieille carte postale imprimée" #: ../share/filters/filters.svg.h:450 msgid "Dots Transparency" @@ -1254,11 +1097,8 @@ msgid "Smear Transparency" msgstr "Transparence barbouillée" #: ../share/filters/filters.svg.h:460 -msgid "" -"Paint objects with a transparent turbulence which turns around color edges" -msgstr "" -"Peint des objets avec une turbulence transparente tournant autour des bords " -"colorés" +msgid "Paint objects with a transparent turbulence which turns around color edges" +msgstr "Peint des objets avec une turbulence transparente tournant autour des bords colorés" #: ../share/filters/filters.svg.h:462 msgid "Thick Paint" @@ -1281,12 +1121,8 @@ msgid "Embossed Leather" msgstr "Cuir repoussé" #: ../share/filters/filters.svg.h:472 -msgid "" -"Combine a HSL edges detection bump with a leathery or woody and colorizable " -"texture" -msgstr "" -"Combine un bosselage de type détection de contours TSL avec une texture de " -"cuir ou de bois qu'il est possible de colorer" +msgid "Combine a HSL edges detection bump with a leathery or woody and colorizable texture" +msgstr "Combine un bosselage de type détection de contours TSL avec une texture de cuir ou de bois qu'il est possible de colorer" #: ../share/filters/filters.svg.h:474 msgid "Carnaval" @@ -1301,23 +1137,16 @@ msgid "Plastify" msgstr "Plastifier" #: ../share/filters/filters.svg.h:480 -msgid "" -"HSL edges detection bump with a wavy reflective surface effect and variable " -"crumple" -msgstr "" -"Combine un bosselage de type détection de contours TSL avec un effet de " -"surface ondulant et réflectif et un froissement variable" +msgid "HSL edges detection bump with a wavy reflective surface effect and variable crumple" +msgstr "Combine un bosselage de type détection de contours TSL avec un effet de surface ondulant et réflectif et un froissement variable" #: ../share/filters/filters.svg.h:482 msgid "Plaster" msgstr "Plâtre" #: ../share/filters/filters.svg.h:484 -msgid "" -"Combine a HSL edges detection bump with a matte and crumpled surface effect" -msgstr "" -"Combine un bosselage de type détection de contours TSL avec un effet de " -"surface mat et froissé" +msgid "Combine a HSL edges detection bump with a matte and crumpled surface effect" +msgstr "Combine un bosselage de type détection de contours TSL avec un effet de surface mat et froissé" #: ../share/filters/filters.svg.h:486 msgid "Rough Transparency" @@ -1325,8 +1154,7 @@ msgstr "Transparence agitée" #: ../share/filters/filters.svg.h:488 msgid "Adds a turbulent transparency which displaces pixels at the same time" -msgstr "" -"Ajoute une transparence agitée qui déplace plusieurs pixels en même temps" +msgstr "Ajoute une transparence agitée qui déplace plusieurs pixels en même temps" #: ../share/filters/filters.svg.h:490 msgid "Gouache" @@ -1342,8 +1170,7 @@ msgstr "Gravure transparente" #: ../share/filters/filters.svg.h:496 msgid "Gives a transparent engraving effect with rough line and filling" -msgstr "" -"Donne un effet de gravure transparente avec un trait agité et un remplissage" +msgstr "Donne un effet de gravure transparente avec un trait agité et un remplissage" #: ../share/filters/filters.svg.h:498 msgid "Alpha Draw Liquid" @@ -1351,9 +1178,7 @@ msgstr "Dessin transparent liquide" #: ../share/filters/filters.svg.h:500 msgid "Gives a transparent fluid drawing effect with rough line and filling" -msgstr "" -"Donne un effet de dessin liquide et transparent avec un trait agité et un " -"remplissage" +msgstr "Donne un effet de dessin liquide et transparent avec un trait agité et un remplissage" #: ../share/filters/filters.svg.h:502 msgid "Liquid Drawing" @@ -1377,18 +1202,15 @@ msgstr "Acrylique épaisse" #: ../share/filters/filters.svg.h:512 msgid "Thick acrylic paint texture with high texture depth" -msgstr "" -"Texture de peinture acrylique épaisse avec beaucoup de profondeur de texture" +msgstr "Texture de peinture acrylique épaisse avec beaucoup de profondeur de texture" #: ../share/filters/filters.svg.h:514 msgid "Alpha Engraving B" msgstr "Gravure transparente B" #: ../share/filters/filters.svg.h:516 -msgid "" -"Gives a controllable roughness engraving effect to bitmaps and materials" -msgstr "" -"Donne un effet de gravure agitée contrôlable aux bitmaps et aux matières" +msgid "Gives a controllable roughness engraving effect to bitmaps and materials" +msgstr "Donne un effet de gravure agitée contrôlable aux bitmaps et aux matières" #: ../share/filters/filters.svg.h:518 msgid "Lapping" @@ -1402,34 +1224,24 @@ msgstr "Un peu comme de l'eau agitée" msgid "Monochrome Transparency" msgstr "Monochrome transparent" -#: ../share/filters/filters.svg.h:523 ../share/filters/filters.svg.h:527 -#: ../share/filters/filters.svg.h:647 ../share/filters/filters.svg.h:651 -#: ../share/filters/filters.svg.h:823 -#: ../src/extension/internal/filter/transparency.h:70 -#: ../src/extension/internal/filter/transparency.h:141 -#: ../src/extension/internal/filter/transparency.h:215 -#: ../src/extension/internal/filter/transparency.h:288 +#: ../share/filters/filters.svg.h:523 ../share/filters/filters.svg.h:527 ../share/filters/filters.svg.h:647 ../share/filters/filters.svg.h:651 +#: ../share/filters/filters.svg.h:823 ../src/extension/internal/filter/transparency.h:70 ../src/extension/internal/filter/transparency.h:141 +#: ../src/extension/internal/filter/transparency.h:215 ../src/extension/internal/filter/transparency.h:288 #: ../src/extension/internal/filter/transparency.h:350 msgid "Fill and Transparency" msgstr "Remplissage et transparence" #: ../share/filters/filters.svg.h:524 msgid "Convert to a colorizable transparent positive or negative" -msgstr "" -"Convertit en un positif ou un négatif transparent qu'il est possible de " -"colorer" +msgstr "Convertit en un positif ou un négatif transparent qu'il est possible de colorer" #: ../share/filters/filters.svg.h:526 msgid "Saturation Map" msgstr "Carte de saturation" #: ../share/filters/filters.svg.h:528 -msgid "" -"Creates an approximative semi-transparent and colorizable image of the " -"saturation levels" -msgstr "" -"Crée une image approximative, semi-transparente et à colorer, des niveaux de " -"saturation" +msgid "Creates an approximative semi-transparent and colorizable image of the saturation levels" +msgstr "Crée une image approximative, semi-transparente et à colorer, des niveaux de saturation" #: ../share/filters/filters.svg.h:530 msgid "Riddled" @@ -1445,9 +1257,7 @@ msgstr "Vernis ridé" #: ../share/filters/filters.svg.h:536 msgid "Thick glossy and translucent paint texture with high depth" -msgstr "" -"Texture de peinture épaisse, brillante et translucide, avec beaucoup de " -"profondeur" +msgstr "Texture de peinture épaisse, brillante et translucide, avec beaucoup de profondeur" #: ../share/filters/filters.svg.h:538 msgid "Canvas Bumps" @@ -1463,9 +1273,7 @@ msgstr "Bosselage toilé mat" #: ../share/filters/filters.svg.h:544 msgid "Same as Canvas Bumps but with a diffuse light instead of a specular one" -msgstr "" -"Identique à Bosselage toilé, mais avec une lumière diffuse et non pas " -"spéculaire" +msgstr "Identique à Bosselage toilé, mais avec une lumière diffuse et non pas spéculaire" #: ../share/filters/filters.svg.h:546 msgid "Canvas Bumps Alpha" @@ -1511,8 +1319,7 @@ msgstr "Biseau brillant avec des bords flous" msgid "Combined Lighting" msgstr "Éclairage combiné" -#: ../share/filters/filters.svg.h:568 -#: ../src/extension/internal/filter/bevels.h:231 +#: ../share/filters/filters.svg.h:568 ../src/extension/internal/filter/bevels.h:231 msgid "Basic specular bevel to use for building textures" msgstr "Biseau spéculaire de base pour la construction de textures" @@ -1522,9 +1329,7 @@ msgstr "Papier aluminium" #: ../share/filters/filters.svg.h:572 msgid "Metallic foil effect combining two lighting types and variable crumple" -msgstr "" -"Effet de papier d'aluminium combinant deux types de lumières et un " -"froissement variable" +msgstr "Effet de papier d'aluminium combinant deux types de lumières et un froissement variable" #: ../share/filters/filters.svg.h:574 msgid "Soft Colors" @@ -1532,9 +1337,7 @@ msgstr "Couleurs douces" #: ../share/filters/filters.svg.h:576 msgid "Adds a colorizable edges glow inside objects and pictures" -msgstr "" -"Ajoute une lueur pouvant être colorée sur le bord intérieur des objets et " -"images" +msgstr "Ajoute une lueur pouvant être colorée sur le bord intérieur des objets et images" #: ../share/filters/filters.svg.h:578 msgid "Relief Print" @@ -1542,8 +1345,7 @@ msgstr "Impression en relief" #: ../share/filters/filters.svg.h:580 msgid "Bumps effect with a bevel, color flood and complex lighting" -msgstr "" -"Biseau avec des bosselages, du remplissage de couleur et une lumière complexe" +msgstr "Biseau avec des bosselages, du remplissage de couleur et une lumière complexe" #: ../share/filters/filters.svg.h:582 msgid "Growing Cells" @@ -1551,9 +1353,7 @@ msgstr "Cellules vivantes" #: ../share/filters/filters.svg.h:584 msgid "Random rounded living cells like fill" -msgstr "" -"Remplissage avec des formes rondes et aléatoires ressemblant à des cellules " -"vivantes" +msgstr "Remplissage avec des formes rondes et aléatoires ressemblant à des cellules vivantes" #: ../share/filters/filters.svg.h:586 msgid "Fluorescence" @@ -1652,17 +1452,13 @@ msgstr "Teinte vers blanc" msgid "Fades hue progressively to white" msgstr "Transforme graduellement la teinte en blanc" -#: ../share/filters/filters.svg.h:634 -#: ../src/extension/internal/bitmap/swirl.cpp:37 +#: ../share/filters/filters.svg.h:634 ../src/extension/internal/bitmap/swirl.cpp:37 msgid "Swirl" msgstr "Tourbillon" #: ../share/filters/filters.svg.h:636 -msgid "" -"Paint objects with a transparent turbulence which wraps around color edges" -msgstr "" -"Peint des objets avec une turbulence transparente tournant autour des bords " -"colorés" +msgid "Paint objects with a transparent turbulence which wraps around color edges" +msgstr "Peint des objets avec une turbulence transparente tournant autour des bords colorés" #: ../share/filters/filters.svg.h:638 msgid "Pointillism" @@ -1702,12 +1498,8 @@ msgid "Blur Double" msgstr "Flou double" #: ../share/filters/filters.svg.h:656 -msgid "" -"Overlays two copies with different blur amounts and modifiable blend and " -"composite" -msgstr "" -"Superpose deux copies avec un nouveau de flou différent et des primitives " -"fondu et composite modifiables" +msgid "Overlays two copies with different blur amounts and modifiable blend and composite" +msgstr "Superpose deux copies avec un nouveau de flou différent et des primitives fondu et composite modifiables" #: ../share/filters/filters.svg.h:658 msgid "Image Drawing Basic" @@ -1752,19 +1544,16 @@ msgstr "Poster brut" #: ../share/filters/filters.svg.h:680 msgid "Adds roughness to one of the two channels of the Poster paint filter" -msgstr "" -"Ajouter de la rugosité à un des deux canaux du filtre Peinture et poster" +msgstr "Ajouter de la rugosité à un des deux canaux du filtre Peinture et poster" #: ../share/filters/filters.svg.h:682 msgid "Alpha Monochrome Cracked" msgstr "Monochrome transparent craquelé" -#: ../share/filters/filters.svg.h:684 ../share/filters/filters.svg.h:688 -#: ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 +#: ../share/filters/filters.svg.h:684 ../share/filters/filters.svg.h:688 ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 #: ../share/filters/filters.svg.h:708 ../share/filters/filters.svg.h:712 msgid "Basic noise fill texture; adjust color in Flood" -msgstr "" -"Texture de remplissage agité de base ; ajuster la couleur avec Remplissage" +msgstr "Texture de remplissage agité de base ; ajuster la couleur avec Remplissage" #: ../share/filters/filters.svg.h:686 msgid "Alpha Turbulent" @@ -2036,8 +1825,7 @@ msgstr "Simuler CMJ" #: ../share/filters/filters.svg.h:832 msgid "Render Cyan, Magenta and Yellow channels with a colorizable background" -msgstr "" -"Rendu des canaux cyan, magenta et jaune avec un fond que l'on peut colorer" +msgstr "Rendu des canaux cyan, magenta et jaune avec un fond que l'on peut colorer" #: ../share/filters/filters.svg.h:834 msgid "Contouring table" @@ -3411,8 +3199,7 @@ msgstr "Panneaux signalétiques AIGA" #. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 -#: ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 +#: ../share/symbols/symbols.h:3 ../share/symbols/symbols.h:4 ../share/symbols/symbols.h:281 ../share/symbols/symbols.h:282 msgctxt "Symbol" msgid "Telephone" msgstr "Téléphone" @@ -3443,8 +3230,7 @@ msgstr "Caisse" #. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 -#: ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 +#: ../share/symbols/symbols.h:13 ../share/symbols/symbols.h:14 ../share/symbols/symbols.h:213 ../share/symbols/symbols.h:214 msgctxt "Symbol" msgid "First Aid" msgstr "Premiers secours" @@ -3547,8 +3333,7 @@ msgstr "Salle d'attente" #. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 -#: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 +#: ../share/symbols/symbols.h:47 ../share/symbols/symbols.h:48 ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 msgctxt "Symbol" msgid "Information" msgstr "Information" @@ -3705,8 +3490,7 @@ msgstr "Non fumeur" #. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg -#: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 -#: ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 +#: ../share/symbols/symbols.h:99 ../share/symbols/symbols.h:100 ../share/symbols/symbols.h:245 ../share/symbols/symbols.h:246 msgctxt "Symbol" msgid "Parking" msgstr "Parking" @@ -4480,8 +4264,7 @@ msgid "guidelines typography canvas" msgstr "guides typographie canevas" #. 3D box -#: ../src/box3d.cpp:250 ../src/box3d.cpp:1304 -#: ../src/ui/dialog/inkscape-preferences.cpp:407 +#: ../src/box3d.cpp:250 ../src/box3d.cpp:1304 ../src/ui/dialog/inkscape-preferences.cpp:407 msgid "3D Box" msgstr "Boîte 3D" @@ -4501,15 +4284,11 @@ msgstr "Aucun" #: ../src/context-fns.cpp:33 ../src/context-fns.cpp:62 msgid "Current layer is hidden. Unhide it to be able to draw on it." -msgstr "" -"Le calque courant est caché. Le rendre visible pour pouvoir y " -"dessiner." +msgstr "Le calque courant est caché. Le rendre visible pour pouvoir y dessiner." #: ../src/context-fns.cpp:39 ../src/context-fns.cpp:68 msgid "Current layer is locked. Unlock it to be able to draw on it." -msgstr "" -"Le calque courant est verrouillé. Le déverrouiller pour pouvoir y " -"dessiner." +msgstr "Le calque courant est verrouillé. Le déverrouiller pour pouvoir y dessiner." #: ../src/desktop-events.cpp:242 msgid "Create guide" @@ -4519,8 +4298,7 @@ msgstr "Créer un guide" msgid "Move guide" msgstr "Déplacer le guide" -#: ../src/desktop-events.cpp:505 ../src/desktop-events.cpp:563 -#: ../src/ui/dialog/guides.cpp:138 +#: ../src/desktop-events.cpp:505 ../src/desktop-events.cpp:563 ../src/ui/dialog/guides.cpp:138 msgid "Delete guide" msgstr "Supprimer le guide" @@ -4545,8 +4323,7 @@ msgstr "_Unités de la grille :" msgid "_Origin X:" msgstr "_Origine X :" -#: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:778 +#: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 ../src/ui/dialog/inkscape-preferences.cpp:778 #: ../src/ui/dialog/inkscape-preferences.cpp:803 msgid "X coordinate of grid origin" msgstr "Coordonnée X de l'origine de la grille" @@ -4555,8 +4332,7 @@ msgstr "Coordonnée X de l'origine de la grille" msgid "O_rigin Y:" msgstr "O_rigine Y :" -#: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:779 +#: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 ../src/ui/dialog/inkscape-preferences.cpp:779 #: ../src/ui/dialog/inkscape-preferences.cpp:804 msgid "Y coordinate of grid origin" msgstr "Coordonnée Y de l'origine de la grille" @@ -4565,30 +4341,23 @@ msgstr "Coordonnée Y de l'origine de la grille" msgid "Spacing _Y:" msgstr "Espacement _Y :" -#: ../src/display/canvas-axonomgrid.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/display/canvas-axonomgrid.cpp:365 ../src/ui/dialog/inkscape-preferences.cpp:807 msgid "Base length of z-axis" msgstr "Longueur de base de l'axe z" -#: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 -#: ../src/widgets/box3d-toolbar.cpp:302 +#: ../src/display/canvas-axonomgrid.cpp:368 ../src/ui/dialog/inkscape-preferences.cpp:810 ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "Angle X :" -#: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/display/canvas-axonomgrid.cpp:368 ../src/ui/dialog/inkscape-preferences.cpp:810 msgid "Angle of x-axis" msgstr "Angle de l'axe x" -#: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:811 -#: ../src/widgets/box3d-toolbar.cpp:381 +#: ../src/display/canvas-axonomgrid.cpp:370 ../src/ui/dialog/inkscape-preferences.cpp:811 ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "Angle Z :" -#: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:811 +#: ../src/display/canvas-axonomgrid.cpp:370 ../src/ui/dialog/inkscape-preferences.cpp:811 msgid "Angle of z-axis" msgstr "Angle de l'axe z" @@ -4596,8 +4365,7 @@ msgstr "Angle de l'axe z" msgid "Minor grid line _color:" msgstr "_Couleur de la grille secondaire :" -#: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:762 +#: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "Minor grid line color" msgstr "Couleur de la grille secondaire" @@ -4609,8 +4377,7 @@ msgstr "Couleur des lignes de la grille secondaire" msgid "Ma_jor grid line color:" msgstr "Couleur de la grille _principale :" -#: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 ../src/ui/dialog/inkscape-preferences.cpp:764 msgid "Major grid line color" msgstr "Couleur de la grille principale" @@ -4643,48 +4410,35 @@ msgid "_Enabled" msgstr "_Activé" #: ../src/display/canvas-grid.cpp:313 -msgid "" -"Determines whether to snap to this grid or not. Can be 'on' for invisible " -"grids." -msgstr "" -"Cocher pour activer le magnétisme de la grille. Fonctionne aussi avec une " -"grille invisible." +msgid "Determines whether to snap to this grid or not. Can be 'on' for invisible grids." +msgstr "Cocher pour activer le magnétisme de la grille. Fonctionne aussi avec une grille invisible." #: ../src/display/canvas-grid.cpp:317 msgid "Snap to visible _grid lines only" msgstr "Aimanter seulement aux lignes visibles de la _grille" #: ../src/display/canvas-grid.cpp:318 -msgid "" -"When zoomed out, not all grid lines will be displayed. Only the visible ones " -"will be snapped to" +msgid "When zoomed out, not all grid lines will be displayed. Only the visible ones will be snapped to" msgstr "" -"Lorsque le niveau de zoom est diminué, les lignes des grilles ne sont pas " -"toutes affichées. Seules celles qui sont visibles seront aimantées." +"Lorsque le niveau de zoom est diminué, les lignes des grilles ne sont pas toutes affichées. Seules celles qui sont visibles seront aimantées." #: ../src/display/canvas-grid.cpp:322 msgid "_Visible" msgstr "_Visible" #: ../src/display/canvas-grid.cpp:323 -msgid "" -"Determines whether the grid is displayed or not. Objects are still snapped " -"to invisible grids." -msgstr "" -"Détermine si la grille est affichée ou pas. Le magnétisme fonctionne même " -"avec une grille invisible." +msgid "Determines whether the grid is displayed or not. Objects are still snapped to invisible grids." +msgstr "Détermine si la grille est affichée ou pas. Le magnétisme fonctionne même avec une grille invisible." #: ../src/display/canvas-grid.cpp:705 msgid "Spacing _X:" msgstr "Espacement _X :" -#: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:784 +#: ../src/display/canvas-grid.cpp:705 ../src/ui/dialog/inkscape-preferences.cpp:784 msgid "Distance between vertical grid lines" msgstr "Distance entre les lignes verticales de la grille" -#: ../src/display/canvas-grid.cpp:708 -#: ../src/ui/dialog/inkscape-preferences.cpp:785 +#: ../src/display/canvas-grid.cpp:708 ../src/ui/dialog/inkscape-preferences.cpp:785 msgid "Distance between horizontal grid lines" msgstr "Distance entre les lignes horizontales de la grille" @@ -4694,13 +4448,11 @@ msgstr "Afficher des point_s plutôt que des lignes" #: ../src/display/canvas-grid.cpp:741 msgid "If set, displays dots at gridpoints instead of gridlines" -msgstr "" -"Cocher pour afficher des points sur les points entiers de la grille au lieu " -"de lignes" +msgstr "Cocher pour afficher des points sur les points entiers de la grille au lieu de lignes" #. TRANSLATORS: undefined target for snapping -#: ../src/display/snap-indicator.cpp:72 ../src/display/snap-indicator.cpp:75 -#: ../src/display/snap-indicator.cpp:180 ../src/display/snap-indicator.cpp:183 +#: ../src/display/snap-indicator.cpp:72 ../src/display/snap-indicator.cpp:75 ../src/display/snap-indicator.cpp:180 +#: ../src/display/snap-indicator.cpp:183 msgid "UNDEFINED" msgstr "INDÉFINI" @@ -4968,20 +4720,15 @@ msgstr "Extensions" #. This is some filler text, needs to change before relase #: ../src/extension/error-file.cpp:53 msgid "" -"One or more extensions failed to load\n" +"One or more extensions failed to load\n" "\n" -"The failed extensions have been skipped. Inkscape will continue to run " -"normally but those extensions will be unavailable. For details to " +"The failed extensions have been skipped. Inkscape will continue to run normally but those extensions will be unavailable. For details to " "troubleshoot this problem, please refer to the error log located at: " msgstr "" -"Le chargement d'une ou plusieurs " -"extensions a échoué\n" +"Le chargement d'une ou plusieurs extensions a échoué\n" "\n" -"Les extensions défectueuses ont été ignorées. Inkscape va continuer à " -"fonctionner normalement, mais ces extensions seront indisponibles. Pour plus " -"de détails concernant ce problème, référez-vous à l'historique (log) des " -"messages d'erreur : " +"Les extensions défectueuses ont été ignorées. Inkscape va continuer à fonctionner normalement, mais ces extensions seront indisponibles. Pour " +"plus de détails concernant ce problème, référez-vous à l'historique (log) des messages d'erreur : " #: ../src/extension/error-file.cpp:67 msgid "Show dialog on startup" @@ -4996,11 +4743,11 @@ msgstr "'%s' en cours..." #. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; #: ../src/extension/extension.cpp:267 msgid "" -" This is caused by an improper .inx file for this extension. An improper ." -"inx file could have been caused by a faulty installation of Inkscape." +" This is caused by an improper .inx file for this extension. An improper .inx file could have been caused by a faulty installation of " +"Inkscape." msgstr "" -" C'est le résultat d'un fichier .inx incorrect pour cette extension. Un " -"fichier .inx incorrect peut être du à un problème d'installation d'Inkscape." +" C'est le résultat d'un fichier .inx incorrect pour cette extension. Un fichier .inx incorrect peut être du à un problème d'installation " +"d'Inkscape." #: ../src/extension/extension.cpp:277 msgid "the extension is designed for Windows only." @@ -5040,8 +4787,7 @@ msgstr " » n'a pas été chargée, car " msgid "Could not create extension error log file '%s'" msgstr "Impossible de créer le fichier d'erreur de l'extension : '%s'" -#: ../src/extension/extension.cpp:778 -#: ../share/extensions/webslicer_create_rect.inx.h:2 +#: ../src/extension/extension.cpp:778 ../share/extensions/webslicer_create_rect.inx.h:2 msgid "Name:" msgstr "Nom :" @@ -5067,107 +4813,66 @@ msgstr "Désactivée" #: ../src/extension/extension.cpp:820 msgid "" -"Currently there is no help available for this Extension. Please look on the " -"Inkscape website or ask on the mailing lists if you have questions regarding " -"this extension." +"Currently there is no help available for this Extension. Please look on the Inkscape website or ask on the mailing lists if you have " +"questions regarding this extension." msgstr "" -"Aucune aide n'est actuellement disponible pour cette extension. Veuillez " -"vous référer au site internet d'Inkscape ou aux listes de diffusion pour " -"toute question relative à celle-ci." +"Aucune aide n'est actuellement disponible pour cette extension. Veuillez vous référer au site internet d'Inkscape ou aux listes de diffusion " +"pour toute question relative à celle-ci." #: ../src/extension/implementation/script.cpp:1063 msgid "" -"Inkscape has received additional data from the script executed. The script " -"did not return an error, but this may indicate the results will not be as " -"expected." +"Inkscape has received additional data from the script executed. The script did not return an error, but this may indicate the results will " +"not be as expected." msgstr "" -"Inkscape a reçu des données additionnelles du script exécuté. Le script n'a " -"pas retourné d'erreur, mais ceci peut indiquer que les résultats ne sont pas " -"ceux attendus." +"Inkscape a reçu des données additionnelles du script exécuté. Le script n'a pas retourné d'erreur, mais ceci peut indiquer que les résultats " +"ne sont pas ceux attendus." #: ../src/extension/init.cpp:288 msgid "Null external module directory name. Modules will not be loaded." -msgstr "" -"Le nom de dossier des modules externes est vide. Les modules ne seront pas " -"chargés." +msgstr "Le nom de dossier des modules externes est vide. Les modules ne seront pas chargés." -#: ../src/extension/init.cpp:302 -#: ../src/extension/internal/filter/filter-file.cpp:59 +#: ../src/extension/init.cpp:302 ../src/extension/internal/filter/filter-file.cpp:59 #, c-format -msgid "" -"Modules directory (%s) is unavailable. External modules in that directory " -"will not be loaded." -msgstr "" -"Le dossier des modules (%s) est indisponible. Les modules externes de ce " -"dossier ne seront pas chargés." +msgid "Modules directory (%s) is unavailable. External modules in that directory will not be loaded." +msgstr "Le dossier des modules (%s) est indisponible. Les modules externes de ce dossier ne seront pas chargés." #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:39 msgid "Adaptive Threshold" msgstr "Seuil adaptatif" -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 -#: ../src/extension/internal/bitmap/raise.cpp:42 -#: ../src/extension/internal/bitmap/sample.cpp:41 -#: ../src/extension/internal/bluredge.cpp:136 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:66 -#: ../src/ui/dialog/object-attributes.cpp:68 -#: ../src/ui/dialog/object-attributes.cpp:77 -#: ../src/ui/widget/page-sizer.cpp:249 -#: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 -#: ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/foldablebox.inx.h:2 +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 ../src/extension/internal/bitmap/raise.cpp:42 +#: ../src/extension/internal/bitmap/sample.cpp:41 ../src/extension/internal/bluredge.cpp:136 ../src/ui/dialog/lpe-powerstroke-properties.cpp:66 +#: ../src/ui/dialog/object-attributes.cpp:68 ../src/ui/dialog/object-attributes.cpp:77 ../src/ui/widget/page-sizer.cpp:249 +#: ../src/widgets/calligraphy-toolbar.cpp:430 ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "Épaisseur :" -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:42 -#: ../src/extension/internal/bitmap/raise.cpp:43 -#: ../src/extension/internal/bitmap/sample.cpp:42 -#: ../src/ui/dialog/object-attributes.cpp:69 -#: ../src/ui/dialog/object-attributes.cpp:78 +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:42 ../src/extension/internal/bitmap/raise.cpp:43 +#: ../src/extension/internal/bitmap/sample.cpp:42 ../src/ui/dialog/object-attributes.cpp:69 ../src/ui/dialog/object-attributes.cpp:78 #: ../src/ui/widget/page-sizer.cpp:250 ../share/extensions/foldablebox.inx.h:3 msgid "Height:" msgstr "Hauteur :" -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 -#: ../share/extensions/printing_marks.inx.h:12 +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "Décalage :" -#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:47 -#: ../src/extension/internal/bitmap/addNoise.cpp:58 -#: ../src/extension/internal/bitmap/blur.cpp:45 -#: ../src/extension/internal/bitmap/channel.cpp:64 -#: ../src/extension/internal/bitmap/charcoal.cpp:45 -#: ../src/extension/internal/bitmap/colorize.cpp:56 -#: ../src/extension/internal/bitmap/contrast.cpp:46 -#: ../src/extension/internal/bitmap/crop.cpp:75 -#: ../src/extension/internal/bitmap/cycleColormap.cpp:43 -#: ../src/extension/internal/bitmap/despeckle.cpp:41 -#: ../src/extension/internal/bitmap/edge.cpp:43 -#: ../src/extension/internal/bitmap/emboss.cpp:45 -#: ../src/extension/internal/bitmap/enhance.cpp:40 -#: ../src/extension/internal/bitmap/equalize.cpp:40 -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:45 -#: ../src/extension/internal/bitmap/implode.cpp:43 -#: ../src/extension/internal/bitmap/level.cpp:49 -#: ../src/extension/internal/bitmap/levelChannel.cpp:71 -#: ../src/extension/internal/bitmap/medianFilter.cpp:43 -#: ../src/extension/internal/bitmap/modulate.cpp:48 -#: ../src/extension/internal/bitmap/negate.cpp:41 -#: ../src/extension/internal/bitmap/normalize.cpp:41 -#: ../src/extension/internal/bitmap/oilPaint.cpp:43 -#: ../src/extension/internal/bitmap/opacity.cpp:44 -#: ../src/extension/internal/bitmap/raise.cpp:48 -#: ../src/extension/internal/bitmap/reduceNoise.cpp:46 -#: ../src/extension/internal/bitmap/sample.cpp:46 -#: ../src/extension/internal/bitmap/shade.cpp:48 -#: ../src/extension/internal/bitmap/sharpen.cpp:45 -#: ../src/extension/internal/bitmap/solarize.cpp:45 -#: ../src/extension/internal/bitmap/spread.cpp:43 -#: ../src/extension/internal/bitmap/swirl.cpp:43 -#: ../src/extension/internal/bitmap/threshold.cpp:44 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:50 +#: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:47 ../src/extension/internal/bitmap/addNoise.cpp:58 +#: ../src/extension/internal/bitmap/blur.cpp:45 ../src/extension/internal/bitmap/channel.cpp:64 ../src/extension/internal/bitmap/charcoal.cpp:45 +#: ../src/extension/internal/bitmap/colorize.cpp:56 ../src/extension/internal/bitmap/contrast.cpp:46 +#: ../src/extension/internal/bitmap/crop.cpp:75 ../src/extension/internal/bitmap/cycleColormap.cpp:43 +#: ../src/extension/internal/bitmap/despeckle.cpp:41 ../src/extension/internal/bitmap/edge.cpp:43 ../src/extension/internal/bitmap/emboss.cpp:45 +#: ../src/extension/internal/bitmap/enhance.cpp:40 ../src/extension/internal/bitmap/equalize.cpp:40 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:45 ../src/extension/internal/bitmap/implode.cpp:43 +#: ../src/extension/internal/bitmap/level.cpp:49 ../src/extension/internal/bitmap/levelChannel.cpp:71 +#: ../src/extension/internal/bitmap/medianFilter.cpp:43 ../src/extension/internal/bitmap/modulate.cpp:48 +#: ../src/extension/internal/bitmap/negate.cpp:41 ../src/extension/internal/bitmap/normalize.cpp:41 +#: ../src/extension/internal/bitmap/oilPaint.cpp:43 ../src/extension/internal/bitmap/opacity.cpp:44 +#: ../src/extension/internal/bitmap/raise.cpp:48 ../src/extension/internal/bitmap/reduceNoise.cpp:46 +#: ../src/extension/internal/bitmap/sample.cpp:46 ../src/extension/internal/bitmap/shade.cpp:48 ../src/extension/internal/bitmap/sharpen.cpp:45 +#: ../src/extension/internal/bitmap/solarize.cpp:45 ../src/extension/internal/bitmap/spread.cpp:43 ../src/extension/internal/bitmap/swirl.cpp:43 +#: ../src/extension/internal/bitmap/threshold.cpp:44 ../src/extension/internal/bitmap/unsharpmask.cpp:50 #: ../src/extension/internal/bitmap/wave.cpp:45 msgid "Raster" msgstr "Images matricielles" @@ -5181,19 +4886,11 @@ msgid "Add Noise" msgstr "Ajouter du bruit" #. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch"); -#: ../src/extension/internal/bitmap/addNoise.cpp:47 -#: ../src/extension/internal/filter/color.h:501 -#: ../src/extension/internal/filter/color.h:1572 -#: ../src/extension/internal/filter/color.h:1660 -#: ../src/extension/internal/filter/distort.h:69 -#: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2930 -#: ../src/ui/dialog/object-attributes.cpp:49 -#: ../share/extensions/jessyInk_effects.inx.h:5 -#: ../share/extensions/jessyInk_export.inx.h:3 -#: ../share/extensions/jessyInk_transitions.inx.h:5 -#: ../share/extensions/webslicer_create_rect.inx.h:14 +#: ../src/extension/internal/bitmap/addNoise.cpp:47 ../src/extension/internal/filter/color.h:501 ../src/extension/internal/filter/color.h:1572 +#: ../src/extension/internal/filter/color.h:1660 ../src/extension/internal/filter/distort.h:69 ../src/extension/internal/filter/morphology.h:60 +#: ../src/rdf.cpp:244 ../src/ui/dialog/filter-effects-dialog.cpp:2856 ../src/ui/dialog/filter-effects-dialog.cpp:2930 +#: ../src/ui/dialog/object-attributes.cpp:49 ../share/extensions/jessyInk_effects.inx.h:5 ../share/extensions/jessyInk_export.inx.h:3 +#: ../share/extensions/jessyInk_transitions.inx.h:5 ../share/extensions/webslicer_create_rect.inx.h:14 msgid "Type:" msgstr "Type :" @@ -5225,30 +4922,20 @@ msgstr "Bruit de Poisson" msgid "Add random noise to selected bitmap(s)" msgstr "Ajouter du bruit aux bitmaps sélectionnés" -#: ../src/extension/internal/bitmap/blur.cpp:38 -#: ../src/extension/internal/filter/blurs.h:54 -#: ../src/extension/internal/filter/paint.h:710 +#: ../src/extension/internal/bitmap/blur.cpp:38 ../src/extension/internal/filter/blurs.h:54 ../src/extension/internal/filter/paint.h:710 #: ../src/extension/internal/filter/transparency.h:343 msgid "Blur" msgstr "Flou" -#: ../src/extension/internal/bitmap/blur.cpp:40 -#: ../src/extension/internal/bitmap/charcoal.cpp:40 -#: ../src/extension/internal/bitmap/edge.cpp:39 -#: ../src/extension/internal/bitmap/emboss.cpp:40 -#: ../src/extension/internal/bitmap/medianFilter.cpp:39 -#: ../src/extension/internal/bitmap/oilPaint.cpp:39 -#: ../src/extension/internal/bitmap/sharpen.cpp:40 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/extension/internal/bitmap/blur.cpp:40 ../src/extension/internal/bitmap/charcoal.cpp:40 ../src/extension/internal/bitmap/edge.cpp:39 +#: ../src/extension/internal/bitmap/emboss.cpp:40 ../src/extension/internal/bitmap/medianFilter.cpp:39 +#: ../src/extension/internal/bitmap/oilPaint.cpp:39 ../src/extension/internal/bitmap/sharpen.cpp:40 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:43 ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "Radius:" msgstr "Rayon :" -#: ../src/extension/internal/bitmap/blur.cpp:41 -#: ../src/extension/internal/bitmap/charcoal.cpp:41 -#: ../src/extension/internal/bitmap/emboss.cpp:41 -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:41 -#: ../src/extension/internal/bitmap/sharpen.cpp:41 +#: ../src/extension/internal/bitmap/blur.cpp:41 ../src/extension/internal/bitmap/charcoal.cpp:41 ../src/extension/internal/bitmap/emboss.cpp:41 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:41 ../src/extension/internal/bitmap/sharpen.cpp:41 #: ../src/extension/internal/bitmap/unsharpmask.cpp:44 msgid "Sigma:" msgstr "Sigma :" @@ -5265,48 +4952,39 @@ msgstr "Composante" msgid "Layer:" msgstr "Calque :" -#: ../src/extension/internal/bitmap/channel.cpp:51 -#: ../src/extension/internal/bitmap/levelChannel.cpp:55 +#: ../src/extension/internal/bitmap/channel.cpp:51 ../src/extension/internal/bitmap/levelChannel.cpp:55 msgid "Red Channel" msgstr "Composante rouge" -#: ../src/extension/internal/bitmap/channel.cpp:52 -#: ../src/extension/internal/bitmap/levelChannel.cpp:56 +#: ../src/extension/internal/bitmap/channel.cpp:52 ../src/extension/internal/bitmap/levelChannel.cpp:56 msgid "Green Channel" msgstr "Composante verte" -#: ../src/extension/internal/bitmap/channel.cpp:53 -#: ../src/extension/internal/bitmap/levelChannel.cpp:57 +#: ../src/extension/internal/bitmap/channel.cpp:53 ../src/extension/internal/bitmap/levelChannel.cpp:57 msgid "Blue Channel" msgstr "Composante bleue" -#: ../src/extension/internal/bitmap/channel.cpp:54 -#: ../src/extension/internal/bitmap/levelChannel.cpp:58 +#: ../src/extension/internal/bitmap/channel.cpp:54 ../src/extension/internal/bitmap/levelChannel.cpp:58 msgid "Cyan Channel" msgstr "Composante cyan" -#: ../src/extension/internal/bitmap/channel.cpp:55 -#: ../src/extension/internal/bitmap/levelChannel.cpp:59 +#: ../src/extension/internal/bitmap/channel.cpp:55 ../src/extension/internal/bitmap/levelChannel.cpp:59 msgid "Magenta Channel" msgstr "Composante magenta" -#: ../src/extension/internal/bitmap/channel.cpp:56 -#: ../src/extension/internal/bitmap/levelChannel.cpp:60 +#: ../src/extension/internal/bitmap/channel.cpp:56 ../src/extension/internal/bitmap/levelChannel.cpp:60 msgid "Yellow Channel" msgstr "Composante jaune" -#: ../src/extension/internal/bitmap/channel.cpp:57 -#: ../src/extension/internal/bitmap/levelChannel.cpp:61 +#: ../src/extension/internal/bitmap/channel.cpp:57 ../src/extension/internal/bitmap/levelChannel.cpp:61 msgid "Black Channel" msgstr "Composante noire" -#: ../src/extension/internal/bitmap/channel.cpp:58 -#: ../src/extension/internal/bitmap/levelChannel.cpp:62 +#: ../src/extension/internal/bitmap/channel.cpp:58 ../src/extension/internal/bitmap/levelChannel.cpp:62 msgid "Opacity Channel" msgstr "Composante opacité" -#: ../src/extension/internal/bitmap/channel.cpp:59 -#: ../src/extension/internal/bitmap/levelChannel.cpp:63 +#: ../src/extension/internal/bitmap/channel.cpp:59 ../src/extension/internal/bitmap/levelChannel.cpp:63 msgid "Matte Channel" msgstr "Composante matte" @@ -5322,18 +5000,15 @@ msgstr "Fusain" msgid "Apply charcoal stylization to selected bitmap(s)" msgstr "Transformer les bitmaps sélectionnés en dessins au fusain" -#: ../src/extension/internal/bitmap/colorize.cpp:50 -#: ../src/extension/internal/filter/color.h:392 +#: ../src/extension/internal/bitmap/colorize.cpp:50 ../src/extension/internal/filter/color.h:392 msgid "Colorize" msgstr "Colorer" #: ../src/extension/internal/bitmap/colorize.cpp:58 msgid "Colorize selected bitmap(s) with specified color, using given opacity" -msgstr "" -"Colorer les bitmaps sélectionnés avec la couleur et l'opacité spécifiées" +msgstr "Colorer les bitmaps sélectionnés avec la couleur et l'opacité spécifiées" -#: ../src/extension/internal/bitmap/contrast.cpp:40 -#: ../src/extension/internal/filter/color.h:1189 +#: ../src/extension/internal/bitmap/contrast.cpp:40 ../src/extension/internal/filter/color.h:1189 msgid "Contrast" msgstr "Contraste" @@ -5345,9 +5020,7 @@ msgstr "Ajuster :" msgid "Increase or decrease contrast in bitmap(s)" msgstr "Augmente ou diminue le contraste des images" -#: ../src/extension/internal/bitmap/crop.cpp:66 -#: ../src/extension/internal/filter/bumps.h:86 -#: ../src/extension/internal/filter/bumps.h:315 +#: ../src/extension/internal/bitmap/crop.cpp:66 ../src/extension/internal/filter/bumps.h:86 ../src/extension/internal/filter/bumps.h:315 msgid "Crop" msgstr "Rogner" @@ -5375,10 +5048,8 @@ msgstr "Rogner les bitmaps sélectionnés" msgid "Cycle Colormap" msgstr "Cycle des couleurs" -#: ../src/extension/internal/bitmap/cycleColormap.cpp:39 -#: ../src/extension/internal/bitmap/spread.cpp:39 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:208 +#: ../src/extension/internal/bitmap/cycleColormap.cpp:39 ../src/extension/internal/bitmap/spread.cpp:39 +#: ../src/extension/internal/bitmap/unsharpmask.cpp:45 ../src/widgets/spray-toolbar.cpp:208 msgid "Amount:" msgstr "Quantité :" @@ -5408,8 +5079,7 @@ msgstr "Embosser" #: ../src/extension/internal/bitmap/emboss.cpp:47 msgid "Emboss selected bitmap(s); highlight edges with 3D effect" -msgstr "" -"Gaufrer les bitmaps sélectionnés ; surligne les contours avec un effet 3D" +msgstr "Gaufrer les bitmaps sélectionnés ; surligne les contours avec un effet 3D" #: ../src/extension/internal/bitmap/enhance.cpp:35 msgid "Enhance" @@ -5427,13 +5097,11 @@ msgstr "Égaliser" msgid "Equalize selected bitmap(s); histogram equalization" msgstr "Égaliser l'histogramme des bitmaps sélectionnés" -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 -#: ../src/filter-enums.cpp:29 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 ../src/filter-enums.cpp:29 msgid "Gaussian Blur" msgstr "Flou gaussien" -#: ../src/extension/internal/bitmap/gaussianBlur.cpp:40 -#: ../src/extension/internal/bitmap/implode.cpp:39 +#: ../src/extension/internal/bitmap/gaussianBlur.cpp:40 ../src/extension/internal/bitmap/implode.cpp:39 #: ../src/extension/internal/bitmap/solarize.cpp:41 msgid "Factor:" msgstr "Facteur :" @@ -5450,66 +5118,50 @@ msgstr "Imploser" msgid "Implode selected bitmap(s)" msgstr "Imploser les bitmaps sélectionnés" -#: ../src/extension/internal/bitmap/level.cpp:41 -#: ../src/extension/internal/filter/color.h:817 -#: ../src/extension/internal/filter/image.h:56 -#: ../src/extension/internal/filter/morphology.h:66 -#: ../src/extension/internal/filter/paint.h:345 +#: ../src/extension/internal/bitmap/level.cpp:41 ../src/extension/internal/filter/color.h:817 ../src/extension/internal/filter/image.h:56 +#: ../src/extension/internal/filter/morphology.h:66 ../src/extension/internal/filter/paint.h:345 msgid "Level" msgstr "Niveau" -#: ../src/extension/internal/bitmap/level.cpp:43 -#: ../src/extension/internal/bitmap/levelChannel.cpp:65 +#: ../src/extension/internal/bitmap/level.cpp:43 ../src/extension/internal/bitmap/levelChannel.cpp:65 msgid "Black Point:" msgstr "Point noir :" -#: ../src/extension/internal/bitmap/level.cpp:44 -#: ../src/extension/internal/bitmap/levelChannel.cpp:66 +#: ../src/extension/internal/bitmap/level.cpp:44 ../src/extension/internal/bitmap/levelChannel.cpp:66 msgid "White Point:" msgstr "Point blanc :" -#: ../src/extension/internal/bitmap/level.cpp:45 -#: ../src/extension/internal/bitmap/levelChannel.cpp:67 +#: ../src/extension/internal/bitmap/level.cpp:45 ../src/extension/internal/bitmap/levelChannel.cpp:67 msgid "Gamma Correction:" msgstr "Correction gamma :" #: ../src/extension/internal/bitmap/level.cpp:51 -msgid "" -"Level selected bitmap(s) by scaling values falling between the given ranges " -"to the full color range" +msgid "Level selected bitmap(s) by scaling values falling between the given ranges to the full color range" msgstr "" -"Niveler les bitmaps sélectionnés en mettant à l'échelle les valeurs se " -"situant dans l'intervalle donné pour les élargir à la gamme complète de " +"Niveler les bitmaps sélectionnés en mettant à l'échelle les valeurs se situant dans l'intervalle donné pour les élargir à la gamme complète de " "couleur" #: ../src/extension/internal/bitmap/levelChannel.cpp:52 msgid "Level (with Channel)" msgstr "Niveau (par composante)" -#: ../src/extension/internal/bitmap/levelChannel.cpp:54 -#: ../src/extension/internal/filter/color.h:711 +#: ../src/extension/internal/bitmap/levelChannel.cpp:54 ../src/extension/internal/filter/color.h:711 msgid "Channel:" msgstr "Composante :" #: ../src/extension/internal/bitmap/levelChannel.cpp:73 -msgid "" -"Level the specified channel of selected bitmap(s) by scaling values falling " -"between the given ranges to the full color range" +msgid "Level the specified channel of selected bitmap(s) by scaling values falling between the given ranges to the full color range" msgstr "" -"Niveler la composante spécifiée des bitmaps sélectionnés en mettant à " -"l'échelle les valeurs se situant dans l'intervalle donné pour les élargir à " -"la gamme complète de couleur" +"Niveler la composante spécifiée des bitmaps sélectionnés en mettant à l'échelle les valeurs se situant dans l'intervalle donné pour les " +"élargir à la gamme complète de couleur" #: ../src/extension/internal/bitmap/medianFilter.cpp:37 msgid "Median" msgstr "Médiane" #: ../src/extension/internal/bitmap/medianFilter.cpp:45 -msgid "" -"Replace each pixel component with the median color in a circular neighborhood" -msgstr "" -"Remplace chaque composante des pixels de l'image par la couleur médiane dans " -"un voisinage circulaire" +msgid "Replace each pixel component with the median color in a circular neighborhood" +msgstr "Remplace chaque composante des pixels de l'image par la couleur médiane dans un voisinage circulaire" #: ../src/extension/internal/bitmap/modulate.cpp:40 msgid "HSB Adjust" @@ -5528,10 +5180,8 @@ msgid "Brightness:" msgstr "Brillance :" #: ../src/extension/internal/bitmap/modulate.cpp:50 -msgid "" -"Adjust the amount of hue, saturation, and brightness in selected bitmap(s)" -msgstr "" -"Moduler la teinte, la saturation et la luminosité des bitmaps sélectionnés." +msgid "Adjust the amount of hue, saturation, and brightness in selected bitmap(s)" +msgstr "Moduler la teinte, la saturation et la luminosité des bitmaps sélectionnés." #: ../src/extension/internal/bitmap/negate.cpp:36 msgid "Negate" @@ -5546,12 +5196,8 @@ msgid "Normalize" msgstr "Normaliser" #: ../src/extension/internal/bitmap/normalize.cpp:43 -msgid "" -"Normalize selected bitmap(s), expanding color range to the full possible " -"range of color" -msgstr "" -"Normaliser les bitmaps sélectionnés, étend la gamme des couleurs présente à " -"la gamme complète de couleur" +msgid "Normalize selected bitmap(s), expanding color range to the full possible range of color" +msgstr "Normaliser les bitmaps sélectionnés, étend la gamme des couleurs présente à la gamme complète de couleur" #: ../src/extension/internal/bitmap/oilPaint.cpp:37 msgid "Oil Paint" @@ -5559,22 +5205,16 @@ msgstr "Peinture à l'huile" #: ../src/extension/internal/bitmap/oilPaint.cpp:45 msgid "Stylize selected bitmap(s) so that they appear to be painted with oils" -msgstr "" -"Styliser les bitmaps sélectionnés en leur donnant l'apparence d'une peinture " -"à l'huile" +msgstr "Styliser les bitmaps sélectionnés en leur donnant l'apparence d'une peinture à l'huile" -#: ../src/extension/internal/bitmap/opacity.cpp:38 -#: ../src/extension/internal/filter/blurs.h:333 -#: ../src/extension/internal/filter/transparency.h:279 -#: ../src/ui/dialog/clonetiler.cpp:838 ../src/ui/dialog/clonetiler.cpp:991 -#: ../src/widgets/tweak-toolbar.cpp:334 -#: ../share/extensions/interp_att_g.inx.h:18 +#: ../src/extension/internal/bitmap/opacity.cpp:38 ../src/extension/internal/filter/blurs.h:333 +#: ../src/extension/internal/filter/transparency.h:279 ../src/ui/dialog/clonetiler.cpp:838 ../src/ui/dialog/clonetiler.cpp:991 +#: ../src/widgets/tweak-toolbar.cpp:334 ../share/extensions/interp_att_g.inx.h:18 msgid "Opacity" msgstr "Opacité" -#: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 -#: ../src/ui/dialog/objects.cpp:1625 ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/extension/internal/bitmap/opacity.cpp:40 ../src/ui/dialog/filter-effects-dialog.cpp:2898 ../src/ui/dialog/objects.cpp:1625 +#: ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "Opacité :" @@ -5591,39 +5231,29 @@ msgid "Raised" msgstr "En relief" #: ../src/extension/internal/bitmap/raise.cpp:50 -msgid "" -"Alter lightness the edges of selected bitmap(s) to create a raised appearance" -msgstr "" -"Changer la luminosité des bitmaps sélectionnés pour les faire apparaître " -"« en relief »" +msgid "Alter lightness the edges of selected bitmap(s) to create a raised appearance" +msgstr "Changer la luminosité des bitmaps sélectionnés pour les faire apparaître « en relief »" #: ../src/extension/internal/bitmap/reduceNoise.cpp:40 msgid "Reduce Noise" msgstr "Réduire le bruit" -#: ../src/extension/internal/bitmap/reduceNoise.cpp:42 -#: ../share/extensions/jessyInk_effects.inx.h:3 -#: ../share/extensions/jessyInk_view.inx.h:3 +#: ../src/extension/internal/bitmap/reduceNoise.cpp:42 ../share/extensions/jessyInk_effects.inx.h:3 ../share/extensions/jessyInk_view.inx.h:3 #: ../share/extensions/lindenmayer.inx.h:5 msgid "Order:" msgstr "Ordre :" #: ../src/extension/internal/bitmap/reduceNoise.cpp:48 -msgid "" -"Reduce noise in selected bitmap(s) using a noise peak elimination filter" -msgstr "" -"Réduire le bruit dans les bitmaps sélectionnés en éliminant les pics de bruit" +msgid "Reduce noise in selected bitmap(s) using a noise peak elimination filter" +msgstr "Réduire le bruit dans les bitmaps sélectionnés en éliminant les pics de bruit" #: ../src/extension/internal/bitmap/sample.cpp:39 msgid "Resample" msgstr "Ré-échantillonnage" #: ../src/extension/internal/bitmap/sample.cpp:48 -msgid "" -"Alter the resolution of selected image by resizing it to the given pixel size" -msgstr "" -"Changer la résolution de l'image en la redimensionnant avec la taille de " -"pixel donnée." +msgid "Alter the resolution of selected image by resizing it to the given pixel size" +msgstr "Changer la résolution de l'image en la redimensionnant avec la taille de pixel donnée." #: ../src/extension/internal/bitmap/shade.cpp:40 msgid "Shade" @@ -5649,28 +5279,21 @@ msgstr "Ombrer les bitmaps sélectionnés; simule une source lumineuse lointaine msgid "Sharpen selected bitmap(s)" msgstr "Rendre plus nets les bitmaps sélectionnés" -#: ../src/extension/internal/bitmap/solarize.cpp:39 -#: ../src/extension/internal/filter/color.h:1569 -#: ../src/extension/internal/filter/color.h:1573 +#: ../src/extension/internal/bitmap/solarize.cpp:39 ../src/extension/internal/filter/color.h:1569 ../src/extension/internal/filter/color.h:1573 msgid "Solarize" msgstr "Solariser" #: ../src/extension/internal/bitmap/solarize.cpp:47 msgid "Solarize selected bitmap(s), like overexposing photographic film" -msgstr "" -"Solariser les bitmaps sélectionnés, donne un effet de pellicule surexposée" +msgstr "Solariser les bitmaps sélectionnés, donne un effet de pellicule surexposée" #: ../src/extension/internal/bitmap/spread.cpp:37 msgid "Dither" msgstr "Dispersion" #: ../src/extension/internal/bitmap/spread.cpp:45 -msgid "" -"Randomly scatter pixels in selected bitmap(s), within the given radius of " -"the original position" -msgstr "" -"Disperser au hasard les pixels des bitmaps sélectionnés, dans le rayon donné " -"de la position originale" +msgid "Randomly scatter pixels in selected bitmap(s), within the given radius of the original position" +msgstr "Disperser au hasard les pixels des bitmaps sélectionnés, dans le rayon donné de la position originale" #: ../src/extension/internal/bitmap/swirl.cpp:39 msgid "Degrees:" @@ -5685,8 +5308,7 @@ msgstr "Faire tourbillonner les bitmaps autour d'un point central" msgid "Threshold" msgstr "Seuil" -#: ../src/extension/internal/bitmap/threshold.cpp:40 -#: ../src/extension/internal/bitmap/unsharpmask.cpp:46 +#: ../src/extension/internal/bitmap/threshold.cpp:40 ../src/extension/internal/bitmap/unsharpmask.cpp:46 #: ../src/widgets/paintbucket-toolbar.cpp:147 msgid "Threshold:" msgstr "Seuil :" @@ -5701,9 +5323,7 @@ msgstr "Masque de netteté" #: ../src/extension/internal/bitmap/unsharpmask.cpp:52 msgid "Sharpen selected bitmap(s) using unsharp mask algorithms" -msgstr "" -"Rendre plus nets les bitmaps sélectionnés en utilisant des algorithmes de " -"netteté de type « unsharp mask »" +msgstr "Rendre plus nets les bitmaps sélectionnés en utilisant des algorithmes de netteté de type « unsharp mask »" #: ../src/extension/internal/bitmap/wave.cpp:38 msgid "Wave" @@ -5737,103 +5357,83 @@ msgstr "Nombre de passes :" msgid "Number of inset/outset copies of the object to make" msgstr "Nombre de copies contractées/dilatées de l'objet à créer" -#: ../src/extension/internal/bluredge.cpp:141 -#: ../share/extensions/extrude.inx.h:5 -#: ../share/extensions/generate_voronoi.inx.h:9 -#: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 -#: ../share/extensions/pathalongpath.inx.h:18 -#: ../share/extensions/pathscatter.inx.h:20 -#: ../share/extensions/voronoi2svg.inx.h:13 +#: ../src/extension/internal/bluredge.cpp:141 ../share/extensions/extrude.inx.h:5 ../share/extensions/generate_voronoi.inx.h:9 +#: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 ../share/extensions/pathalongpath.inx.h:18 +#: ../share/extensions/pathscatter.inx.h:20 ../share/extensions/voronoi2svg.inx.h:13 msgid "Generate from Path" msgstr "Générer à partir du chemin" -#: ../src/extension/internal/cairo-ps-out.cpp:327 -#: ../share/extensions/ps_input.inx.h:3 +#: ../src/extension/internal/cairo-ps-out.cpp:327 ../share/extensions/ps_input.inx.h:3 msgid "PostScript" msgstr "PostScript" -#: ../src/extension/internal/cairo-ps-out.cpp:329 -#: ../src/extension/internal/cairo-ps-out.cpp:371 +#: ../src/extension/internal/cairo-ps-out.cpp:329 ../src/extension/internal/cairo-ps-out.cpp:371 msgid "Restrict to PS level:" msgstr "Restreindre à la version de PostScript :" -#: ../src/extension/internal/cairo-ps-out.cpp:330 -#: ../src/extension/internal/cairo-ps-out.cpp:372 +#: ../src/extension/internal/cairo-ps-out.cpp:330 ../src/extension/internal/cairo-ps-out.cpp:372 msgid "PostScript level 3" msgstr "PostScript niveau 3" -#: ../src/extension/internal/cairo-ps-out.cpp:331 -#: ../src/extension/internal/cairo-ps-out.cpp:373 +#: ../src/extension/internal/cairo-ps-out.cpp:331 ../src/extension/internal/cairo-ps-out.cpp:373 msgid "PostScript level 2" msgstr "PostScript niveau 2" -#: ../src/extension/internal/cairo-ps-out.cpp:333 -#: ../src/extension/internal/cairo-ps-out.cpp:375 +#: ../src/extension/internal/cairo-ps-out.cpp:333 ../src/extension/internal/cairo-ps-out.cpp:375 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 #, fuzzy msgid "Text output options:" msgstr "Orientation du texte" -#: ../src/extension/internal/cairo-ps-out.cpp:334 -#: ../src/extension/internal/cairo-ps-out.cpp:376 +#: ../src/extension/internal/cairo-ps-out.cpp:334 ../src/extension/internal/cairo-ps-out.cpp:376 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 msgid "Embed fonts" msgstr "Fontes incorporées" -#: ../src/extension/internal/cairo-ps-out.cpp:335 -#: ../src/extension/internal/cairo-ps-out.cpp:377 +#: ../src/extension/internal/cairo-ps-out.cpp:335 ../src/extension/internal/cairo-ps-out.cpp:377 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252 msgid "Convert text to paths" msgstr "Convertir les textes en chemins" -#: ../src/extension/internal/cairo-ps-out.cpp:336 -#: ../src/extension/internal/cairo-ps-out.cpp:378 +#: ../src/extension/internal/cairo-ps-out.cpp:336 ../src/extension/internal/cairo-ps-out.cpp:378 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 msgid "Omit text in PDF and create LaTeX file" msgstr "Exclure le texte du fichier PDF, et créer un fichier LaTeX" -#: ../src/extension/internal/cairo-ps-out.cpp:338 -#: ../src/extension/internal/cairo-ps-out.cpp:380 +#: ../src/extension/internal/cairo-ps-out.cpp:338 ../src/extension/internal/cairo-ps-out.cpp:380 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255 msgid "Rasterize filter effects" msgstr "Rastériser les effets de filtre" -#: ../src/extension/internal/cairo-ps-out.cpp:339 -#: ../src/extension/internal/cairo-ps-out.cpp:381 +#: ../src/extension/internal/cairo-ps-out.cpp:339 ../src/extension/internal/cairo-ps-out.cpp:381 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256 msgid "Resolution for rasterization (dpi):" msgstr "Résolution pour la rastérisation (ppp) :" -#: ../src/extension/internal/cairo-ps-out.cpp:340 -#: ../src/extension/internal/cairo-ps-out.cpp:382 +#: ../src/extension/internal/cairo-ps-out.cpp:340 ../src/extension/internal/cairo-ps-out.cpp:382 msgid "Output page size" msgstr "Dimensions de la page" -#: ../src/extension/internal/cairo-ps-out.cpp:341 -#: ../src/extension/internal/cairo-ps-out.cpp:383 +#: ../src/extension/internal/cairo-ps-out.cpp:341 ../src/extension/internal/cairo-ps-out.cpp:383 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:258 msgid "Use document's page size" msgstr "Utiliser les dimensions de la page du document" -#: ../src/extension/internal/cairo-ps-out.cpp:342 -#: ../src/extension/internal/cairo-ps-out.cpp:384 +#: ../src/extension/internal/cairo-ps-out.cpp:342 ../src/extension/internal/cairo-ps-out.cpp:384 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:259 msgid "Use exported object's size" msgstr "Utiliser la taille de l'objet exporté" -#: ../src/extension/internal/cairo-ps-out.cpp:344 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:261 +#: ../src/extension/internal/cairo-ps-out.cpp:344 ../src/extension/internal/cairo-renderer-pdf-out.cpp:261 msgid "Bleed/margin (mm):" msgstr "Fond perdu/marge (mm) :" -#: ../src/extension/internal/cairo-ps-out.cpp:345 -#: ../src/extension/internal/cairo-ps-out.cpp:387 +#: ../src/extension/internal/cairo-ps-out.cpp:345 ../src/extension/internal/cairo-ps-out.cpp:387 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:262 msgid "Limit export to the object with ID:" msgstr "Limiter l'exportation à l'objet ayant l'Id :" -#: ../src/extension/internal/cairo-ps-out.cpp:349 -#: ../share/extensions/ps_input.inx.h:2 +#: ../src/extension/internal/cairo-ps-out.cpp:349 ../share/extensions/ps_input.inx.h:2 msgid "PostScript (*.ps)" msgstr "PostScript (*.ps)" @@ -5841,8 +5441,7 @@ msgstr "PostScript (*.ps)" msgid "PostScript File" msgstr "Fichier PostScript" -#: ../src/extension/internal/cairo-ps-out.cpp:369 -#: ../share/extensions/eps_input.inx.h:3 +#: ../src/extension/internal/cairo-ps-out.cpp:369 ../share/extensions/eps_input.inx.h:3 msgid "Encapsulated PostScript" msgstr "PostScript encapsulé" @@ -5850,8 +5449,7 @@ msgstr "PostScript encapsulé" msgid "Bleed/margin (mm)" msgstr "Fond perdu/marge (mm)" -#: ../src/extension/internal/cairo-ps-out.cpp:391 -#: ../share/extensions/eps_input.inx.h:2 +#: ../src/extension/internal/cairo-ps-out.cpp:391 ../share/extensions/eps_input.inx.h:2 msgid "Encapsulated PostScript (*.eps)" msgstr "PostScript encapsulé (*.eps)" @@ -5875,22 +5473,17 @@ msgstr "PDF 1.4" msgid "Output page size:" msgstr "Dimensions de la page :" -#: ../src/extension/internal/cdr-input.cpp:116 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:92 -#: ../src/extension/internal/vsd-input.cpp:116 +#: ../src/extension/internal/cdr-input.cpp:116 ../src/extension/internal/pdfinput/pdf-input.cpp:92 ../src/extension/internal/vsd-input.cpp:116 msgid "Select page:" msgstr "Sélectionner une page :" #. Display total number of pages -#: ../src/extension/internal/cdr-input.cpp:128 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:111 -#: ../src/extension/internal/vsd-input.cpp:128 +#: ../src/extension/internal/cdr-input.cpp:128 ../src/extension/internal/pdfinput/pdf-input.cpp:111 ../src/extension/internal/vsd-input.cpp:128 #, c-format msgid "out of %i" msgstr "sur %i" -#: ../src/extension/internal/cdr-input.cpp:165 -#: ../src/extension/internal/vsd-input.cpp:165 +#: ../src/extension/internal/cdr-input.cpp:165 ../src/extension/internal/vsd-input.cpp:165 msgid "Page Selector" msgstr "Sélecteur de page" @@ -5958,43 +5551,35 @@ msgstr "Métafichier amélioré" msgid "EMF Output" msgstr "Sortie EMF" -#: ../src/extension/internal/emf-inout.cpp:3597 -#: ../src/extension/internal/wmf-inout.cpp:3176 +#: ../src/extension/internal/emf-inout.cpp:3597 ../src/extension/internal/wmf-inout.cpp:3176 msgid "Convert texts to paths" msgstr "Convertir les textes en chemins" -#: ../src/extension/internal/emf-inout.cpp:3598 -#: ../src/extension/internal/wmf-inout.cpp:3177 +#: ../src/extension/internal/emf-inout.cpp:3598 ../src/extension/internal/wmf-inout.cpp:3177 msgid "Map Unicode to Symbol font" msgstr "Associer les caractères Unicode à la police Symbol" -#: ../src/extension/internal/emf-inout.cpp:3599 -#: ../src/extension/internal/wmf-inout.cpp:3178 +#: ../src/extension/internal/emf-inout.cpp:3599 ../src/extension/internal/wmf-inout.cpp:3178 msgid "Map Unicode to Wingdings" msgstr "Associer les caractères Unicode à la police Wingdings" -#: ../src/extension/internal/emf-inout.cpp:3600 -#: ../src/extension/internal/wmf-inout.cpp:3179 +#: ../src/extension/internal/emf-inout.cpp:3600 ../src/extension/internal/wmf-inout.cpp:3179 msgid "Map Unicode to Zapf Dingbats" msgstr "Associer les caractères Unicode à la police Zapf Dingbats" -#: ../src/extension/internal/emf-inout.cpp:3601 -#: ../src/extension/internal/wmf-inout.cpp:3180 +#: ../src/extension/internal/emf-inout.cpp:3601 ../src/extension/internal/wmf-inout.cpp:3180 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" msgstr "Utiliser MS Unicode PUA (0xF020-0xF0FF) pour les caractères convertis" -#: ../src/extension/internal/emf-inout.cpp:3602 -#: ../src/extension/internal/wmf-inout.cpp:3181 +#: ../src/extension/internal/emf-inout.cpp:3602 ../src/extension/internal/wmf-inout.cpp:3181 msgid "Compensate for PPT font bug" msgstr "Corriger le défaut de police PPT" -#: ../src/extension/internal/emf-inout.cpp:3603 -#: ../src/extension/internal/wmf-inout.cpp:3182 +#: ../src/extension/internal/emf-inout.cpp:3603 ../src/extension/internal/wmf-inout.cpp:3182 msgid "Convert dashed/dotted lines to single lines" msgstr "Convertir les pointillés et tirets en lignes simples" -#: ../src/extension/internal/emf-inout.cpp:3604 -#: ../src/extension/internal/wmf-inout.cpp:3183 +#: ../src/extension/internal/emf-inout.cpp:3604 ../src/extension/internal/wmf-inout.cpp:3183 msgid "Convert gradients to colored polygon series" msgstr "Convertir les dégradés en une série de polygones colorés" @@ -6022,84 +5607,42 @@ msgstr "Métafichier amélioré" msgid "Diffuse Light" msgstr "Éclairage diffus" -#: ../src/extension/internal/filter/bevels.h:55 -#: ../src/extension/internal/filter/bevels.h:135 -#: ../src/extension/internal/filter/bevels.h:219 -#: ../src/extension/internal/filter/paint.h:89 -#: ../src/extension/internal/filter/paint.h:340 +#: ../src/extension/internal/filter/bevels.h:55 ../src/extension/internal/filter/bevels.h:135 ../src/extension/internal/filter/bevels.h:219 +#: ../src/extension/internal/filter/paint.h:89 ../src/extension/internal/filter/paint.h:340 msgid "Smoothness" msgstr "Lissage" -#: ../src/extension/internal/filter/bevels.h:56 -#: ../src/extension/internal/filter/bevels.h:137 -#: ../src/extension/internal/filter/bevels.h:221 +#: ../src/extension/internal/filter/bevels.h:56 ../src/extension/internal/filter/bevels.h:137 ../src/extension/internal/filter/bevels.h:221 msgid "Elevation (°)" msgstr "Élévation (°)" -#: ../src/extension/internal/filter/bevels.h:57 -#: ../src/extension/internal/filter/bevels.h:138 -#: ../src/extension/internal/filter/bevels.h:222 +#: ../src/extension/internal/filter/bevels.h:57 ../src/extension/internal/filter/bevels.h:138 ../src/extension/internal/filter/bevels.h:222 msgid "Azimuth (°)" msgstr "Azimut (°)" -#: ../src/extension/internal/filter/bevels.h:58 -#: ../src/extension/internal/filter/bevels.h:139 -#: ../src/extension/internal/filter/bevels.h:223 +#: ../src/extension/internal/filter/bevels.h:58 ../src/extension/internal/filter/bevels.h:139 ../src/extension/internal/filter/bevels.h:223 msgid "Lighting color" msgstr "Couleur d'éclairage :" -#: ../src/extension/internal/filter/bevels.h:62 -#: ../src/extension/internal/filter/bevels.h:143 -#: ../src/extension/internal/filter/bevels.h:227 -#: ../src/extension/internal/filter/blurs.h:62 -#: ../src/extension/internal/filter/blurs.h:131 -#: ../src/extension/internal/filter/blurs.h:200 -#: ../src/extension/internal/filter/blurs.h:266 -#: ../src/extension/internal/filter/blurs.h:350 -#: ../src/extension/internal/filter/bumps.h:141 -#: ../src/extension/internal/filter/bumps.h:361 -#: ../src/extension/internal/filter/color.h:82 -#: ../src/extension/internal/filter/color.h:171 -#: ../src/extension/internal/filter/color.h:282 -#: ../src/extension/internal/filter/color.h:336 -#: ../src/extension/internal/filter/color.h:421 -#: ../src/extension/internal/filter/color.h:511 -#: ../src/extension/internal/filter/color.h:606 -#: ../src/extension/internal/filter/color.h:728 -#: ../src/extension/internal/filter/color.h:825 -#: ../src/extension/internal/filter/color.h:904 -#: ../src/extension/internal/filter/color.h:995 -#: ../src/extension/internal/filter/color.h:1123 -#: ../src/extension/internal/filter/color.h:1193 -#: ../src/extension/internal/filter/color.h:1286 -#: ../src/extension/internal/filter/color.h:1398 -#: ../src/extension/internal/filter/color.h:1503 -#: ../src/extension/internal/filter/color.h:1579 -#: ../src/extension/internal/filter/color.h:1690 -#: ../src/extension/internal/filter/distort.h:95 -#: ../src/extension/internal/filter/distort.h:204 -#: ../src/extension/internal/filter/filter-file.cpp:151 -#: ../src/extension/internal/filter/filter.cpp:212 -#: ../src/extension/internal/filter/image.h:61 -#: ../src/extension/internal/filter/morphology.h:75 -#: ../src/extension/internal/filter/morphology.h:202 -#: ../src/extension/internal/filter/overlays.h:79 -#: ../src/extension/internal/filter/paint.h:112 -#: ../src/extension/internal/filter/paint.h:243 -#: ../src/extension/internal/filter/paint.h:362 -#: ../src/extension/internal/filter/paint.h:506 -#: ../src/extension/internal/filter/paint.h:601 -#: ../src/extension/internal/filter/paint.h:724 -#: ../src/extension/internal/filter/paint.h:876 -#: ../src/extension/internal/filter/paint.h:980 -#: ../src/extension/internal/filter/protrusions.h:54 -#: ../src/extension/internal/filter/shadows.h:80 -#: ../src/extension/internal/filter/textures.h:90 -#: ../src/extension/internal/filter/transparency.h:69 -#: ../src/extension/internal/filter/transparency.h:140 -#: ../src/extension/internal/filter/transparency.h:214 -#: ../src/extension/internal/filter/transparency.h:287 -#: ../src/extension/internal/filter/transparency.h:349 +#: ../src/extension/internal/filter/bevels.h:62 ../src/extension/internal/filter/bevels.h:143 ../src/extension/internal/filter/bevels.h:227 +#: ../src/extension/internal/filter/blurs.h:62 ../src/extension/internal/filter/blurs.h:131 ../src/extension/internal/filter/blurs.h:200 +#: ../src/extension/internal/filter/blurs.h:266 ../src/extension/internal/filter/blurs.h:350 ../src/extension/internal/filter/bumps.h:141 +#: ../src/extension/internal/filter/bumps.h:361 ../src/extension/internal/filter/color.h:82 ../src/extension/internal/filter/color.h:171 +#: ../src/extension/internal/filter/color.h:282 ../src/extension/internal/filter/color.h:336 ../src/extension/internal/filter/color.h:421 +#: ../src/extension/internal/filter/color.h:511 ../src/extension/internal/filter/color.h:606 ../src/extension/internal/filter/color.h:728 +#: ../src/extension/internal/filter/color.h:825 ../src/extension/internal/filter/color.h:904 ../src/extension/internal/filter/color.h:995 +#: ../src/extension/internal/filter/color.h:1123 ../src/extension/internal/filter/color.h:1193 ../src/extension/internal/filter/color.h:1286 +#: ../src/extension/internal/filter/color.h:1398 ../src/extension/internal/filter/color.h:1503 ../src/extension/internal/filter/color.h:1579 +#: ../src/extension/internal/filter/color.h:1690 ../src/extension/internal/filter/distort.h:95 ../src/extension/internal/filter/distort.h:204 +#: ../src/extension/internal/filter/filter-file.cpp:151 ../src/extension/internal/filter/filter.cpp:212 +#: ../src/extension/internal/filter/image.h:61 ../src/extension/internal/filter/morphology.h:75 +#: ../src/extension/internal/filter/morphology.h:202 ../src/extension/internal/filter/overlays.h:79 ../src/extension/internal/filter/paint.h:112 +#: ../src/extension/internal/filter/paint.h:243 ../src/extension/internal/filter/paint.h:362 ../src/extension/internal/filter/paint.h:506 +#: ../src/extension/internal/filter/paint.h:601 ../src/extension/internal/filter/paint.h:724 ../src/extension/internal/filter/paint.h:876 +#: ../src/extension/internal/filter/paint.h:980 ../src/extension/internal/filter/protrusions.h:54 ../src/extension/internal/filter/shadows.h:80 +#: ../src/extension/internal/filter/textures.h:90 ../src/extension/internal/filter/transparency.h:69 +#: ../src/extension/internal/filter/transparency.h:140 ../src/extension/internal/filter/transparency.h:214 +#: ../src/extension/internal/filter/transparency.h:287 ../src/extension/internal/filter/transparency.h:349 #: ../src/ui/dialog/inkscape-preferences.cpp:1793 #, c-format msgid "Filters" @@ -6113,9 +5656,7 @@ msgstr "Biseau diffus simple pour la construction de textures" msgid "Matte Jelly" msgstr "Gel mat" -#: ../src/extension/internal/filter/bevels.h:136 -#: ../src/extension/internal/filter/bevels.h:220 -#: ../src/extension/internal/filter/blurs.h:187 +#: ../src/extension/internal/filter/bevels.h:136 ../src/extension/internal/filter/bevels.h:220 ../src/extension/internal/filter/blurs.h:187 #: ../src/extension/internal/filter/color.h:75 msgid "Brightness" msgstr "Brillance" @@ -6128,16 +5669,12 @@ msgstr "Couche de gel mat et bombé" msgid "Specular Light" msgstr "Éclairage spéculaire" -#: ../src/extension/internal/filter/blurs.h:56 -#: ../src/extension/internal/filter/blurs.h:189 -#: ../src/extension/internal/filter/blurs.h:329 +#: ../src/extension/internal/filter/blurs.h:56 ../src/extension/internal/filter/blurs.h:189 ../src/extension/internal/filter/blurs.h:329 #: ../src/extension/internal/filter/distort.h:73 msgid "Horizontal blur" msgstr "Flou horizontal" -#: ../src/extension/internal/filter/blurs.h:57 -#: ../src/extension/internal/filter/blurs.h:190 -#: ../src/extension/internal/filter/blurs.h:330 +#: ../src/extension/internal/filter/blurs.h:57 ../src/extension/internal/filter/blurs.h:190 ../src/extension/internal/filter/blurs.h:330 #: ../src/extension/internal/filter/distort.h:74 msgid "Vertical blur" msgstr "Flou vertical" @@ -6154,21 +5691,14 @@ msgstr "Effet de flou vertical et horizontal simple" msgid "Clean Edges" msgstr "Nettoyage des bords" -#: ../src/extension/internal/filter/blurs.h:127 -#: ../src/extension/internal/filter/blurs.h:262 -#: ../src/extension/internal/filter/paint.h:237 -#: ../src/extension/internal/filter/paint.h:336 -#: ../src/extension/internal/filter/paint.h:341 +#: ../src/extension/internal/filter/blurs.h:127 ../src/extension/internal/filter/blurs.h:262 ../src/extension/internal/filter/paint.h:237 +#: ../src/extension/internal/filter/paint.h:336 ../src/extension/internal/filter/paint.h:341 msgid "Strength" msgstr "Force" #: ../src/extension/internal/filter/blurs.h:135 -msgid "" -"Removes or decreases glows and jaggeries around objects edges after applying " -"some filters" -msgstr "" -"Supprime ou diminue l'éclat et l'agitation qui apparaissent autour des bords " -"lors de l'application de certains effets" +msgid "Removes or decreases glows and jaggeries around objects edges after applying some filters" +msgstr "Supprime ou diminue l'éclat et l'agitation qui apparaissent autour des bords lors de l'application de certains effets" #: ../src/extension/internal/filter/blurs.h:185 msgid "Cross Blur" @@ -6178,74 +5708,38 @@ msgstr "Flou croisé" msgid "Fading" msgstr "Décoloration" -#: ../src/extension/internal/filter/blurs.h:191 -#: ../src/extension/internal/filter/textures.h:74 +#: ../src/extension/internal/filter/blurs.h:191 ../src/extension/internal/filter/textures.h:74 msgid "Blend:" msgstr "Fondu :" -#: ../src/extension/internal/filter/blurs.h:192 -#: ../src/extension/internal/filter/blurs.h:339 -#: ../src/extension/internal/filter/bumps.h:131 -#: ../src/extension/internal/filter/bumps.h:337 -#: ../src/extension/internal/filter/bumps.h:344 -#: ../src/extension/internal/filter/color.h:404 -#: ../src/extension/internal/filter/color.h:411 -#: ../src/extension/internal/filter/color.h:1498 -#: ../src/extension/internal/filter/color.h:1671 -#: ../src/extension/internal/filter/color.h:1677 -#: ../src/extension/internal/filter/paint.h:705 -#: ../src/extension/internal/filter/transparency.h:63 +#: ../src/extension/internal/filter/blurs.h:192 ../src/extension/internal/filter/blurs.h:339 ../src/extension/internal/filter/bumps.h:131 +#: ../src/extension/internal/filter/bumps.h:337 ../src/extension/internal/filter/bumps.h:344 ../src/extension/internal/filter/color.h:404 +#: ../src/extension/internal/filter/color.h:411 ../src/extension/internal/filter/color.h:1498 ../src/extension/internal/filter/color.h:1671 +#: ../src/extension/internal/filter/color.h:1677 ../src/extension/internal/filter/paint.h:705 ../src/extension/internal/filter/transparency.h:63 #: ../src/filter-enums.cpp:55 msgid "Darken" msgstr "Obscurcir" -#: ../src/extension/internal/filter/blurs.h:193 -#: ../src/extension/internal/filter/blurs.h:340 -#: ../src/extension/internal/filter/bumps.h:132 -#: ../src/extension/internal/filter/bumps.h:335 -#: ../src/extension/internal/filter/bumps.h:342 -#: ../src/extension/internal/filter/color.h:402 -#: ../src/extension/internal/filter/color.h:407 -#: ../src/extension/internal/filter/color.h:722 -#: ../src/extension/internal/filter/color.h:1490 -#: ../src/extension/internal/filter/color.h:1495 -#: ../src/extension/internal/filter/color.h:1669 -#: ../src/extension/internal/filter/paint.h:703 -#: ../src/extension/internal/filter/transparency.h:62 -#: ../src/filter-enums.cpp:54 ../src/ui/dialog/input.cpp:382 +#: ../src/extension/internal/filter/blurs.h:193 ../src/extension/internal/filter/blurs.h:340 ../src/extension/internal/filter/bumps.h:132 +#: ../src/extension/internal/filter/bumps.h:335 ../src/extension/internal/filter/bumps.h:342 ../src/extension/internal/filter/color.h:402 +#: ../src/extension/internal/filter/color.h:407 ../src/extension/internal/filter/color.h:722 ../src/extension/internal/filter/color.h:1490 +#: ../src/extension/internal/filter/color.h:1495 ../src/extension/internal/filter/color.h:1669 ../src/extension/internal/filter/paint.h:703 +#: ../src/extension/internal/filter/transparency.h:62 ../src/filter-enums.cpp:54 ../src/ui/dialog/input.cpp:382 msgid "Screen" msgstr "Superposition" -#: ../src/extension/internal/filter/blurs.h:194 -#: ../src/extension/internal/filter/blurs.h:341 -#: ../src/extension/internal/filter/bumps.h:133 -#: ../src/extension/internal/filter/bumps.h:338 -#: ../src/extension/internal/filter/bumps.h:345 -#: ../src/extension/internal/filter/color.h:400 -#: ../src/extension/internal/filter/color.h:408 -#: ../src/extension/internal/filter/color.h:720 -#: ../src/extension/internal/filter/color.h:1489 -#: ../src/extension/internal/filter/color.h:1496 -#: ../src/extension/internal/filter/color.h:1670 -#: ../src/extension/internal/filter/color.h:1676 -#: ../src/extension/internal/filter/paint.h:701 -#: ../src/extension/internal/filter/transparency.h:60 -#: ../src/filter-enums.cpp:53 +#: ../src/extension/internal/filter/blurs.h:194 ../src/extension/internal/filter/blurs.h:341 ../src/extension/internal/filter/bumps.h:133 +#: ../src/extension/internal/filter/bumps.h:338 ../src/extension/internal/filter/bumps.h:345 ../src/extension/internal/filter/color.h:400 +#: ../src/extension/internal/filter/color.h:408 ../src/extension/internal/filter/color.h:720 ../src/extension/internal/filter/color.h:1489 +#: ../src/extension/internal/filter/color.h:1496 ../src/extension/internal/filter/color.h:1670 ../src/extension/internal/filter/color.h:1676 +#: ../src/extension/internal/filter/paint.h:701 ../src/extension/internal/filter/transparency.h:60 ../src/filter-enums.cpp:53 msgid "Multiply" msgstr "Produit" -#: ../src/extension/internal/filter/blurs.h:195 -#: ../src/extension/internal/filter/blurs.h:342 -#: ../src/extension/internal/filter/bumps.h:134 -#: ../src/extension/internal/filter/bumps.h:339 -#: ../src/extension/internal/filter/bumps.h:346 -#: ../src/extension/internal/filter/color.h:403 -#: ../src/extension/internal/filter/color.h:410 -#: ../src/extension/internal/filter/color.h:1497 -#: ../src/extension/internal/filter/color.h:1668 -#: ../src/extension/internal/filter/paint.h:704 -#: ../src/extension/internal/filter/transparency.h:64 -#: ../src/filter-enums.cpp:56 +#: ../src/extension/internal/filter/blurs.h:195 ../src/extension/internal/filter/blurs.h:342 ../src/extension/internal/filter/bumps.h:134 +#: ../src/extension/internal/filter/bumps.h:339 ../src/extension/internal/filter/bumps.h:346 ../src/extension/internal/filter/color.h:403 +#: ../src/extension/internal/filter/color.h:410 ../src/extension/internal/filter/color.h:1497 ../src/extension/internal/filter/color.h:1668 +#: ../src/extension/internal/filter/paint.h:704 ../src/extension/internal/filter/transparency.h:64 ../src/filter-enums.cpp:56 msgid "Lighten" msgstr "Éclaircir" @@ -6265,55 +5759,33 @@ msgstr "Masque flou sur les bords sans altération du contenu" msgid "Out of Focus" msgstr "Hors focale" -#: ../src/extension/internal/filter/blurs.h:331 -#: ../src/extension/internal/filter/distort.h:75 -#: ../src/extension/internal/filter/morphology.h:67 -#: ../src/extension/internal/filter/paint.h:235 -#: ../src/extension/internal/filter/paint.h:342 -#: ../src/extension/internal/filter/paint.h:346 +#: ../src/extension/internal/filter/blurs.h:331 ../src/extension/internal/filter/distort.h:75 ../src/extension/internal/filter/morphology.h:67 +#: ../src/extension/internal/filter/paint.h:235 ../src/extension/internal/filter/paint.h:342 ../src/extension/internal/filter/paint.h:346 msgid "Dilatation" msgstr "Dilatation" -#: ../src/extension/internal/filter/blurs.h:332 -#: ../src/extension/internal/filter/distort.h:76 -#: ../src/extension/internal/filter/morphology.h:68 -#: ../src/extension/internal/filter/paint.h:98 -#: ../src/extension/internal/filter/paint.h:236 -#: ../src/extension/internal/filter/paint.h:343 -#: ../src/extension/internal/filter/paint.h:347 -#: ../src/extension/internal/filter/transparency.h:208 +#: ../src/extension/internal/filter/blurs.h:332 ../src/extension/internal/filter/distort.h:76 ../src/extension/internal/filter/morphology.h:68 +#: ../src/extension/internal/filter/paint.h:98 ../src/extension/internal/filter/paint.h:236 ../src/extension/internal/filter/paint.h:343 +#: ../src/extension/internal/filter/paint.h:347 ../src/extension/internal/filter/transparency.h:208 #: ../src/extension/internal/filter/transparency.h:282 msgid "Erosion" msgstr "Érosion" -#: ../src/extension/internal/filter/blurs.h:336 -#: ../src/extension/internal/filter/color.h:1280 -#: ../src/extension/internal/filter/color.h:1392 +#: ../src/extension/internal/filter/blurs.h:336 ../src/extension/internal/filter/color.h:1280 ../src/extension/internal/filter/color.h:1392 #: ../src/ui/dialog/document-properties.cpp:122 msgid "Background color" msgstr "Couleur de fond" -#: ../src/extension/internal/filter/blurs.h:337 -#: ../src/extension/internal/filter/bumps.h:129 +#: ../src/extension/internal/filter/blurs.h:337 ../src/extension/internal/filter/bumps.h:129 msgid "Blend type:" msgstr "Type de fondu :" -#: ../src/extension/internal/filter/blurs.h:338 -#: ../src/extension/internal/filter/bumps.h:130 -#: ../src/extension/internal/filter/bumps.h:336 -#: ../src/extension/internal/filter/bumps.h:343 -#: ../src/extension/internal/filter/color.h:401 -#: ../src/extension/internal/filter/color.h:409 -#: ../src/extension/internal/filter/color.h:721 -#: ../src/extension/internal/filter/color.h:1488 -#: ../src/extension/internal/filter/color.h:1494 -#: ../src/extension/internal/filter/color.h:1661 -#: ../src/extension/internal/filter/color.h:1675 -#: ../src/extension/internal/filter/distort.h:78 -#: ../src/extension/internal/filter/paint.h:702 -#: ../src/extension/internal/filter/textures.h:77 -#: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:685 +#: ../src/extension/internal/filter/blurs.h:338 ../src/extension/internal/filter/bumps.h:130 ../src/extension/internal/filter/bumps.h:336 +#: ../src/extension/internal/filter/bumps.h:343 ../src/extension/internal/filter/color.h:401 ../src/extension/internal/filter/color.h:409 +#: ../src/extension/internal/filter/color.h:721 ../src/extension/internal/filter/color.h:1488 ../src/extension/internal/filter/color.h:1494 +#: ../src/extension/internal/filter/color.h:1661 ../src/extension/internal/filter/color.h:1675 ../src/extension/internal/filter/distort.h:78 +#: ../src/extension/internal/filter/paint.h:702 ../src/extension/internal/filter/textures.h:77 +#: ../src/extension/internal/filter/transparency.h:61 ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:685 msgid "Normal" msgstr "Normal" @@ -6329,53 +5801,35 @@ msgstr "Flou érodé par du blanc ou de la transparence" msgid "Bump" msgstr "Bosselage" -#: ../src/extension/internal/filter/bumps.h:84 -#: ../src/extension/internal/filter/bumps.h:313 +#: ../src/extension/internal/filter/bumps.h:84 ../src/extension/internal/filter/bumps.h:313 msgid "Image simplification" msgstr "Simplification de l'image" -#: ../src/extension/internal/filter/bumps.h:85 -#: ../src/extension/internal/filter/bumps.h:314 +#: ../src/extension/internal/filter/bumps.h:85 ../src/extension/internal/filter/bumps.h:314 msgid "Bump simplification" msgstr "Simplification du bosselage" -#: ../src/extension/internal/filter/bumps.h:87 -#: ../src/extension/internal/filter/bumps.h:316 +#: ../src/extension/internal/filter/bumps.h:87 ../src/extension/internal/filter/bumps.h:316 msgid "Bump source" msgstr "Source du bosselage" -#: ../src/extension/internal/filter/bumps.h:88 -#: ../src/extension/internal/filter/bumps.h:317 -#: ../src/extension/internal/filter/color.h:158 -#: ../src/extension/internal/filter/color.h:712 -#: ../src/extension/internal/filter/color.h:896 -#: ../src/extension/internal/filter/transparency.h:132 -#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:91 -#: ../src/ui/widget/color-icc-selector.cpp:176 +#: ../src/extension/internal/filter/bumps.h:88 ../src/extension/internal/filter/bumps.h:317 ../src/extension/internal/filter/color.h:158 +#: ../src/extension/internal/filter/color.h:712 ../src/extension/internal/filter/color.h:896 ../src/extension/internal/filter/transparency.h:132 +#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:91 ../src/ui/widget/color-icc-selector.cpp:176 #: ../src/ui/widget/color-scales.cpp:379 ../src/ui/widget/color-scales.cpp:380 msgid "Red" msgstr "Rouge" -#: ../src/extension/internal/filter/bumps.h:89 -#: ../src/extension/internal/filter/bumps.h:318 -#: ../src/extension/internal/filter/color.h:159 -#: ../src/extension/internal/filter/color.h:713 -#: ../src/extension/internal/filter/color.h:897 -#: ../src/extension/internal/filter/transparency.h:133 -#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:92 -#: ../src/ui/widget/color-icc-selector.cpp:177 +#: ../src/extension/internal/filter/bumps.h:89 ../src/extension/internal/filter/bumps.h:318 ../src/extension/internal/filter/color.h:159 +#: ../src/extension/internal/filter/color.h:713 ../src/extension/internal/filter/color.h:897 ../src/extension/internal/filter/transparency.h:133 +#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:92 ../src/ui/widget/color-icc-selector.cpp:177 #: ../src/ui/widget/color-scales.cpp:382 ../src/ui/widget/color-scales.cpp:383 msgid "Green" msgstr "Vert" -#: ../src/extension/internal/filter/bumps.h:90 -#: ../src/extension/internal/filter/bumps.h:319 -#: ../src/extension/internal/filter/color.h:160 -#: ../src/extension/internal/filter/color.h:714 -#: ../src/extension/internal/filter/color.h:898 -#: ../src/extension/internal/filter/transparency.h:134 -#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:93 -#: ../src/ui/widget/color-icc-selector.cpp:178 +#: ../src/extension/internal/filter/bumps.h:90 ../src/extension/internal/filter/bumps.h:319 ../src/extension/internal/filter/color.h:160 +#: ../src/extension/internal/filter/color.h:714 ../src/extension/internal/filter/color.h:898 ../src/extension/internal/filter/transparency.h:134 +#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:93 ../src/ui/widget/color-icc-selector.cpp:178 #: ../src/ui/widget/color-scales.cpp:385 ../src/ui/widget/color-scales.cpp:386 msgid "Blue" msgstr "Bleu" @@ -6396,32 +5850,21 @@ msgstr "Spéculaire" msgid "Diffuse" msgstr "Diffus" -#: ../src/extension/internal/filter/bumps.h:98 -#: ../src/extension/internal/filter/bumps.h:329 -#: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199 -#: ../src/ui/widget/page-sizer.cpp:250 ../src/widgets/rect-toolbar.cpp:334 +#: ../src/extension/internal/filter/bumps.h:98 ../src/extension/internal/filter/bumps.h:329 ../src/libgdl/gdl-dock-placeholder.c:175 +#: ../src/libgdl/gdl-dock.c:199 ../src/ui/widget/page-sizer.cpp:250 ../src/widgets/rect-toolbar.cpp:334 #: ../share/extensions/interp_att_g.inx.h:13 msgid "Height" msgstr "Hauteur" -#: ../src/extension/internal/filter/bumps.h:99 -#: ../src/extension/internal/filter/bumps.h:330 -#: ../src/extension/internal/filter/color.h:77 -#: ../src/extension/internal/filter/color.h:899 -#: ../src/extension/internal/filter/color.h:1188 -#: ../src/extension/internal/filter/paint.h:86 -#: ../src/extension/internal/filter/paint.h:592 -#: ../src/extension/internal/filter/paint.h:707 -#: ../src/ui/tools/flood-tool.cpp:96 -#: ../src/ui/widget/color-icc-selector.cpp:187 -#: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 -#: ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 +#: ../src/extension/internal/filter/bumps.h:99 ../src/extension/internal/filter/bumps.h:330 ../src/extension/internal/filter/color.h:77 +#: ../src/extension/internal/filter/color.h:899 ../src/extension/internal/filter/color.h:1188 ../src/extension/internal/filter/paint.h:86 +#: ../src/extension/internal/filter/paint.h:592 ../src/extension/internal/filter/paint.h:707 ../src/ui/tools/flood-tool.cpp:96 +#: ../src/ui/widget/color-icc-selector.cpp:187 ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 +#: ../src/widgets/tweak-toolbar.cpp:318 ../share/extensions/color_randomize.inx.h:5 msgid "Lightness" msgstr "Luminosité" -#: ../src/extension/internal/filter/bumps.h:100 -#: ../src/extension/internal/filter/bumps.h:331 +#: ../src/extension/internal/filter/bumps.h:100 ../src/extension/internal/filter/bumps.h:331 msgid "Precision" msgstr "Précision" @@ -6437,8 +5880,7 @@ msgstr "Source de lumière :" msgid "Distant" msgstr "Distante" -#: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/extension/internal/filter/bumps.h:106 ../src/ui/dialog/inkscape-preferences.cpp:460 msgid "Point" msgstr "Point" @@ -6450,15 +5892,11 @@ msgstr "Spot" msgid "Distant light options" msgstr "Options de lumière distante" -#: ../src/extension/internal/filter/bumps.h:110 -#: ../src/extension/internal/filter/bumps.h:332 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 +#: ../src/extension/internal/filter/bumps.h:110 ../src/extension/internal/filter/bumps.h:332 ../src/ui/dialog/filter-effects-dialog.cpp:1196 msgid "Azimuth" msgstr "Azimut" -#: ../src/extension/internal/filter/bumps.h:111 -#: ../src/extension/internal/filter/bumps.h:333 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1197 +#: ../src/extension/internal/filter/bumps.h:111 ../src/extension/internal/filter/bumps.h:333 ../src/ui/dialog/filter-effects-dialog.cpp:1197 msgid "Elevation" msgstr "Élévation" @@ -6466,18 +5904,15 @@ msgstr "Élévation" msgid "Point light options" msgstr "Options de lumière ponctuelle" -#: ../src/extension/internal/filter/bumps.h:113 -#: ../src/extension/internal/filter/bumps.h:117 +#: ../src/extension/internal/filter/bumps.h:113 ../src/extension/internal/filter/bumps.h:117 msgid "X location" msgstr "Position sur l'axe X" -#: ../src/extension/internal/filter/bumps.h:114 -#: ../src/extension/internal/filter/bumps.h:118 +#: ../src/extension/internal/filter/bumps.h:114 ../src/extension/internal/filter/bumps.h:118 msgid "Y location" msgstr "Position sur l'axe Y" -#: ../src/extension/internal/filter/bumps.h:115 -#: ../src/extension/internal/filter/bumps.h:119 +#: ../src/extension/internal/filter/bumps.h:115 ../src/extension/internal/filter/bumps.h:119 msgid "Z location" msgstr "Position sur l'axe Z" @@ -6525,9 +5960,8 @@ msgstr "Bosselage cireux" msgid "Background:" msgstr "Fond :" -#: ../src/extension/internal/filter/bumps.h:322 -#: ../src/extension/internal/filter/transparency.h:57 -#: ../src/filter-enums.cpp:30 ../src/sp-image.cpp:509 +#: ../src/extension/internal/filter/bumps.h:322 ../src/extension/internal/filter/transparency.h:57 ../src/filter-enums.cpp:30 +#: ../src/sp-image.cpp:509 msgid "Image" msgstr "Image" @@ -6539,8 +5973,7 @@ msgstr "Image floue" msgid "Background opacity" msgstr "Opacité de fond" -#: ../src/extension/internal/filter/bumps.h:327 -#: ../src/extension/internal/filter/color.h:1115 +#: ../src/extension/internal/filter/bumps.h:327 ../src/extension/internal/filter/color.h:1115 msgid "Lighting" msgstr "Éclairage" @@ -6564,15 +5997,11 @@ msgstr "Renverser le bosselage" msgid "Transparency type:" msgstr "Type de transparence :" -#: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 -#: ../src/filter-enums.cpp:91 +#: ../src/extension/internal/filter/bumps.h:353 ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91 msgid "Atop" msgstr "Atop" -#: ../src/extension/internal/filter/bumps.h:354 -#: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 +#: ../src/extension/internal/filter/bumps.h:354 ../src/extension/internal/filter/distort.h:70 ../src/extension/internal/filter/morphology.h:174 #: ../src/filter-enums.cpp:89 msgid "In" msgstr "In" @@ -6585,17 +6014,12 @@ msgstr "Transforme l'image en gelée" msgid "Brilliance" msgstr "Brillance" -#: ../src/extension/internal/filter/color.h:76 -#: ../src/extension/internal/filter/color.h:1492 +#: ../src/extension/internal/filter/color.h:76 ../src/extension/internal/filter/color.h:1492 msgid "Over-saturation" msgstr "Sur-saturation" -#: ../src/extension/internal/filter/color.h:78 -#: ../src/extension/internal/filter/color.h:162 -#: ../src/extension/internal/filter/overlays.h:70 -#: ../src/extension/internal/filter/paint.h:85 -#: ../src/extension/internal/filter/paint.h:502 -#: ../src/extension/internal/filter/transparency.h:136 +#: ../src/extension/internal/filter/color.h:78 ../src/extension/internal/filter/color.h:162 ../src/extension/internal/filter/overlays.h:70 +#: ../src/extension/internal/filter/paint.h:85 ../src/extension/internal/filter/paint.h:502 ../src/extension/internal/filter/transparency.h:136 #: ../src/extension/internal/filter/transparency.h:210 msgid "Inverted" msgstr "Inversé" @@ -6608,22 +6032,15 @@ msgstr "Filtre de luminosité" msgid "Channel Painting" msgstr "Peinture par canal" -#: ../src/extension/internal/filter/color.h:157 -#: ../src/extension/internal/filter/color.h:332 -#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:984 -#: ../src/ui/tools/flood-tool.cpp:95 -#: ../src/ui/widget/color-icc-selector.cpp:183 -#: ../src/ui/widget/color-icc-selector.cpp:188 -#: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 -#: ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 +#: ../src/extension/internal/filter/color.h:157 ../src/extension/internal/filter/color.h:332 ../src/extension/internal/filter/paint.h:87 +#: ../src/filter-enums.cpp:66 ../src/ui/dialog/inkscape-preferences.cpp:984 ../src/ui/tools/flood-tool.cpp:95 +#: ../src/ui/widget/color-icc-selector.cpp:183 ../src/ui/widget/color-icc-selector.cpp:188 ../src/ui/widget/color-scales.cpp:408 +#: ../src/ui/widget/color-scales.cpp:409 ../src/widgets/tweak-toolbar.cpp:302 ../share/extensions/color_randomize.inx.h:4 msgid "Saturation" msgstr "Saturation" -#: ../src/extension/internal/filter/color.h:161 -#: ../src/extension/internal/filter/transparency.h:135 -#: ../src/filter-enums.cpp:131 ../src/ui/tools/flood-tool.cpp:97 +#: ../src/extension/internal/filter/color.h:161 ../src/extension/internal/filter/transparency.h:135 ../src/filter-enums.cpp:131 +#: ../src/ui/tools/flood-tool.cpp:97 msgid "Alpha" msgstr "Opacité" @@ -6699,13 +6116,11 @@ msgstr "Lumière normale" msgid "Duotone" msgstr "Duotone" -#: ../src/extension/internal/filter/color.h:399 -#: ../src/extension/internal/filter/color.h:1487 +#: ../src/extension/internal/filter/color.h:399 ../src/extension/internal/filter/color.h:1487 msgid "Blend 1:" msgstr "Fondu 1 :" -#: ../src/extension/internal/filter/color.h:406 -#: ../src/extension/internal/filter/color.h:1493 +#: ../src/extension/internal/filter/color.h:406 ../src/extension/internal/filter/color.h:1493 msgid "Blend 2:" msgstr "Fondu 2 :" @@ -6721,20 +6136,17 @@ msgstr "Transfert de composantes" msgid "Identity" msgstr "Identité" -#: ../src/extension/internal/filter/color.h:503 -#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:111 +#: ../src/extension/internal/filter/color.h:503 ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:111 #: ../src/ui/dialog/filter-effects-dialog.cpp:1051 msgid "Table" msgstr "Table" -#: ../src/extension/internal/filter/color.h:504 -#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:112 +#: ../src/extension/internal/filter/color.h:504 ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:112 #: ../src/ui/dialog/filter-effects-dialog.cpp:1054 msgid "Discrete" msgstr "Discret" -#: ../src/extension/internal/filter/color.h:505 ../src/filter-enums.cpp:113 -#: ../src/live_effects/lpe-interpolate_points.cpp:25 +#: ../src/extension/internal/filter/color.h:505 ../src/filter-enums.cpp:113 ../src/live_effects/lpe-interpolate_points.cpp:25 #: ../src/live_effects/lpe-powerstroke.cpp:133 msgid "Linear" msgstr "Linéaire" @@ -6791,23 +6203,17 @@ msgstr "Convertit les valeurs de luminance en une palette à deux tons" msgid "Extract Channel" msgstr "Extraire un canal" -#: ../src/extension/internal/filter/color.h:715 -#: ../src/ui/widget/color-icc-selector.cpp:190 -#: ../src/ui/widget/color-icc-selector.cpp:195 +#: ../src/extension/internal/filter/color.h:715 ../src/ui/widget/color-icc-selector.cpp:190 ../src/ui/widget/color-icc-selector.cpp:195 #: ../src/ui/widget/color-scales.cpp:433 ../src/ui/widget/color-scales.cpp:434 msgid "Cyan" msgstr "Cyan" -#: ../src/extension/internal/filter/color.h:716 -#: ../src/ui/widget/color-icc-selector.cpp:191 -#: ../src/ui/widget/color-icc-selector.cpp:196 +#: ../src/extension/internal/filter/color.h:716 ../src/ui/widget/color-icc-selector.cpp:191 ../src/ui/widget/color-icc-selector.cpp:196 #: ../src/ui/widget/color-scales.cpp:436 ../src/ui/widget/color-scales.cpp:437 msgid "Magenta" msgstr "Magenta" -#: ../src/extension/internal/filter/color.h:717 -#: ../src/ui/widget/color-icc-selector.cpp:192 -#: ../src/ui/widget/color-icc-selector.cpp:197 +#: ../src/extension/internal/filter/color.h:717 ../src/ui/widget/color-icc-selector.cpp:192 ../src/ui/widget/color-icc-selector.cpp:197 #: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 msgid "Yellow" msgstr "Jaune" @@ -6832,15 +6238,12 @@ msgstr "Décolore en noir ou blanc" msgid "Fade to:" msgstr "Décolorer en :" -#: ../src/extension/internal/filter/color.h:819 -#: ../src/ui/widget/color-icc-selector.cpp:193 -#: ../src/ui/widget/color-scales.cpp:442 ../src/ui/widget/color-scales.cpp:443 -#: ../src/ui/widget/selected-style.cpp:274 +#: ../src/extension/internal/filter/color.h:819 ../src/ui/widget/color-icc-selector.cpp:193 ../src/ui/widget/color-scales.cpp:442 +#: ../src/ui/widget/color-scales.cpp:443 ../src/ui/widget/selected-style.cpp:274 msgid "Black" msgstr "Noir" -#: ../src/extension/internal/filter/color.h:820 -#: ../src/ui/widget/selected-style.cpp:270 +#: ../src/extension/internal/filter/color.h:820 ../src/ui/widget/selected-style.cpp:270 msgid "White" msgstr "Blanc" @@ -6852,9 +6255,7 @@ msgstr "Décolorer en noir ou blanc" msgid "Greyscale" msgstr "Niveaux de gris" -#: ../src/extension/internal/filter/color.h:900 -#: ../src/extension/internal/filter/paint.h:83 -#: ../src/extension/internal/filter/paint.h:239 +#: ../src/extension/internal/filter/color.h:900 ../src/extension/internal/filter/paint.h:83 ../src/extension/internal/filter/paint.h:239 msgid "Transparent" msgstr "Transparent" @@ -6862,8 +6263,7 @@ msgstr "Transparent" msgid "Customize greyscale components" msgstr "Ajuste les composantes de niveau de gris" -#: ../src/extension/internal/filter/color.h:980 -#: ../src/ui/widget/selected-style.cpp:266 +#: ../src/extension/internal/filter/color.h:980 ../src/ui/widget/selected-style.cpp:266 msgid "Invert" msgstr "Inverser" @@ -6915,11 +6315,8 @@ msgstr "Lumières" msgid "Shadows" msgstr "Ombres" -#: ../src/extension/internal/filter/color.h:1119 -#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 -#: ../src/live_effects/effect.cpp:108 -#: ../src/live_effects/lpe-transform_2pts.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1048 +#: ../src/extension/internal/filter/color.h:1119 ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 +#: ../src/live_effects/effect.cpp:108 ../src/live_effects/lpe-transform_2pts.cpp:40 ../src/ui/dialog/filter-effects-dialog.cpp:1048 #: ../src/widgets/gradient-toolbar.cpp:1162 msgid "Offset" msgstr "Offset" @@ -6944,23 +6341,14 @@ msgstr "Déplacement des canaux RVB" msgid "Red offset" msgstr "Décalage rouge" -#: ../src/extension/internal/filter/color.h:1270 -#: ../src/extension/internal/filter/color.h:1273 -#: ../src/extension/internal/filter/color.h:1276 -#: ../src/extension/internal/filter/color.h:1382 -#: ../src/extension/internal/filter/color.h:1385 -#: ../src/extension/internal/filter/color.h:1388 -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/dialog/layers.cpp:925 -#: ../src/ui/widget/page-sizer.cpp:247 +#: ../src/extension/internal/filter/color.h:1270 ../src/extension/internal/filter/color.h:1273 ../src/extension/internal/filter/color.h:1276 +#: ../src/extension/internal/filter/color.h:1382 ../src/extension/internal/filter/color.h:1385 ../src/extension/internal/filter/color.h:1388 +#: ../src/ui/dialog/input.cpp:1616 ../src/ui/dialog/layers.cpp:925 ../src/ui/widget/page-sizer.cpp:247 msgid "X" msgstr "X" -#: ../src/extension/internal/filter/color.h:1271 -#: ../src/extension/internal/filter/color.h:1274 -#: ../src/extension/internal/filter/color.h:1277 -#: ../src/extension/internal/filter/color.h:1383 -#: ../src/extension/internal/filter/color.h:1386 -#: ../src/extension/internal/filter/color.h:1389 +#: ../src/extension/internal/filter/color.h:1271 ../src/extension/internal/filter/color.h:1274 ../src/extension/internal/filter/color.h:1277 +#: ../src/extension/internal/filter/color.h:1383 ../src/extension/internal/filter/color.h:1386 ../src/extension/internal/filter/color.h:1389 #: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/page-sizer.cpp:248 msgid "Y" msgstr "Y" @@ -6974,12 +6362,8 @@ msgid "Blue offset" msgstr "Décalage bleu" #: ../src/extension/internal/filter/color.h:1290 -msgid "" -"Nudge RGB channels separately and blend them to different types of " -"backgrounds" -msgstr "" -"Décale les canaux RVB séparément en les fondant dans différents types " -"d'arrière-plans" +msgid "Nudge RGB channels separately and blend them to different types of backgrounds" +msgstr "Décale les canaux RVB séparément en les fondant dans différents types d'arrière-plans" #: ../src/extension/internal/filter/color.h:1377 msgid "Nudge CMY" @@ -6998,12 +6382,8 @@ msgid "Yellow offset" msgstr "Décalage jaune" #: ../src/extension/internal/filter/color.h:1402 -msgid "" -"Nudge CMY channels separately and blend them to different types of " -"backgrounds" -msgstr "" -"Décale les canaux CMY séparément en les fondant dans différents types " -"d'arrière-plans" +msgid "Nudge CMY channels separately and blend them to different types of backgrounds" +msgstr "Décale les canaux CMY séparément en les fondant dans différents types d'arrière-plans" #: ../src/extension/internal/filter/color.h:1483 msgid "Quadritone fantasy" @@ -7013,8 +6393,7 @@ msgstr "Quadritone fantaisie" msgid "Hue distribution (°)" msgstr "Distribution de la teinte (°)" -#: ../src/extension/internal/filter/color.h:1486 -#: ../share/extensions/svgcalendar.inx.h:19 +#: ../src/extension/internal/filter/color.h:1486 ../share/extensions/svgcalendar.inx.h:19 msgid "Colors" msgstr "Couleurs" @@ -7079,37 +6458,27 @@ msgid "Hue distribution (°):" msgstr "Distribution de la teinte (°) :" #: ../src/extension/internal/filter/color.h:1694 -msgid "" -"Create a custom tritone palette with additional glow, blend modes and hue " -"moving" -msgstr "" -"Crée une palette à trois tons paramétrable avec lueur, modes de fondu et " -"déplacement de teinte" +msgid "Create a custom tritone palette with additional glow, blend modes and hue moving" +msgstr "Crée une palette à trois tons paramétrable avec lueur, modes de fondu et déplacement de teinte" #: ../src/extension/internal/filter/distort.h:67 msgid "Felt Feather" msgstr "Estompage du pourtour" -#: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 -#: ../src/filter-enums.cpp:90 +#: ../src/extension/internal/filter/distort.h:71 ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90 msgid "Out" msgstr "Out" -#: ../src/extension/internal/filter/distort.h:77 -#: ../src/extension/internal/filter/textures.h:75 -#: ../src/ui/widget/selected-style.cpp:132 +#: ../src/extension/internal/filter/distort.h:77 ../src/extension/internal/filter/textures.h:75 ../src/ui/widget/selected-style.cpp:132 #: ../src/ui/widget/style-swatch.cpp:128 msgid "Stroke:" msgstr "Contour :" -#: ../src/extension/internal/filter/distort.h:79 -#: ../src/extension/internal/filter/textures.h:76 +#: ../src/extension/internal/filter/distort.h:79 ../src/extension/internal/filter/textures.h:76 msgid "Wide" msgstr "Large" -#: ../src/extension/internal/filter/distort.h:80 -#: ../src/extension/internal/filter/textures.h:78 +#: ../src/extension/internal/filter/distort.h:80 ../src/extension/internal/filter/textures.h:78 msgid "Narrow" msgstr "Étroit" @@ -7121,51 +6490,37 @@ msgstr "Aucun remplissage" msgid "Turbulence:" msgstr "Turbulence :" -#: ../src/extension/internal/filter/distort.h:84 -#: ../src/extension/internal/filter/distort.h:193 -#: ../src/extension/internal/filter/overlays.h:61 +#: ../src/extension/internal/filter/distort.h:84 ../src/extension/internal/filter/distort.h:193 ../src/extension/internal/filter/overlays.h:61 #: ../src/extension/internal/filter/paint.h:692 msgid "Fractal noise" msgstr "Bruit fractal" -#: ../src/extension/internal/filter/distort.h:85 -#: ../src/extension/internal/filter/distort.h:194 -#: ../src/extension/internal/filter/overlays.h:62 -#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:36 -#: ../src/filter-enums.cpp:145 +#: ../src/extension/internal/filter/distort.h:85 ../src/extension/internal/filter/distort.h:194 ../src/extension/internal/filter/overlays.h:62 +#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:36 ../src/filter-enums.cpp:145 msgid "Turbulence" msgstr "Turbulence" -#: ../src/extension/internal/filter/distort.h:87 -#: ../src/extension/internal/filter/distort.h:196 -#: ../src/extension/internal/filter/paint.h:93 +#: ../src/extension/internal/filter/distort.h:87 ../src/extension/internal/filter/distort.h:196 ../src/extension/internal/filter/paint.h:93 #: ../src/extension/internal/filter/paint.h:695 msgid "Horizontal frequency" msgstr "Fréquence horizontale" -#: ../src/extension/internal/filter/distort.h:88 -#: ../src/extension/internal/filter/distort.h:197 -#: ../src/extension/internal/filter/paint.h:94 +#: ../src/extension/internal/filter/distort.h:88 ../src/extension/internal/filter/distort.h:197 ../src/extension/internal/filter/paint.h:94 #: ../src/extension/internal/filter/paint.h:696 msgid "Vertical frequency" msgstr "Fréquence verticale" -#: ../src/extension/internal/filter/distort.h:89 -#: ../src/extension/internal/filter/distort.h:198 -#: ../src/extension/internal/filter/paint.h:95 +#: ../src/extension/internal/filter/distort.h:89 ../src/extension/internal/filter/distort.h:198 ../src/extension/internal/filter/paint.h:95 #: ../src/extension/internal/filter/paint.h:697 msgid "Complexity" msgstr "Complexité" -#: ../src/extension/internal/filter/distort.h:90 -#: ../src/extension/internal/filter/distort.h:199 -#: ../src/extension/internal/filter/paint.h:96 +#: ../src/extension/internal/filter/distort.h:90 ../src/extension/internal/filter/distort.h:199 ../src/extension/internal/filter/paint.h:96 #: ../src/extension/internal/filter/paint.h:698 msgid "Variation" msgstr "Variante" -#: ../src/extension/internal/filter/distort.h:91 -#: ../src/extension/internal/filter/distort.h:200 +#: ../src/extension/internal/filter/distort.h:91 ../src/extension/internal/filter/distort.h:200 msgid "Intensity" msgstr "Intensité" @@ -7173,14 +6528,11 @@ msgstr "Intensité" msgid "Blur and displace edges of shapes and pictures" msgstr "Déplace et rend flous les bords des formes et images" -#: ../src/extension/internal/filter/distort.h:190 -#: ../src/live_effects/effect.cpp:138 +#: ../src/extension/internal/filter/distort.h:190 ../src/live_effects/effect.cpp:138 msgid "Roughen" msgstr "Agitation" -#: ../src/extension/internal/filter/distort.h:192 -#: ../src/extension/internal/filter/overlays.h:60 -#: ../src/extension/internal/filter/paint.h:691 +#: ../src/extension/internal/filter/distort.h:192 ../src/extension/internal/filter/overlays.h:60 ../src/extension/internal/filter/paint.h:691 #: ../src/extension/internal/filter/textures.h:64 msgid "Turbulence type:" msgstr "Type de turbulence :" @@ -7199,9 +6551,7 @@ msgstr "Personnel" #: ../src/extension/internal/filter/filter-file.cpp:47 msgid "Null external module directory name. Filters will not be loaded." -msgstr "" -"Le nom de dossier des modules externes est vide. Les filtres ne seront pas " -"chargés." +msgstr "Le nom de dossier des modules externes est vide. Les filtres ne seront pas chargés." #: ../src/extension/internal/filter/image.h:49 msgid "Edge Detect" @@ -7211,9 +6561,7 @@ msgstr "Détection des bords" msgid "Detect:" msgstr "Détecter :" -#: ../src/extension/internal/filter/image.h:52 -#: ../src/ui/dialog/template-load-tab.cpp:105 -#: ../src/ui/dialog/template-load-tab.cpp:142 +#: ../src/extension/internal/filter/image.h:52 ../src/ui/dialog/template-load-tab.cpp:105 ../src/ui/dialog/template-load-tab.cpp:142 msgid "All" msgstr "Tout" @@ -7237,13 +6585,11 @@ msgstr "Détecte les bords de couleur dans les objets" msgid "Cross-smooth" msgstr "Adoucissement" -#: ../src/extension/internal/filter/morphology.h:61 -#: ../src/extension/internal/filter/shadows.h:66 +#: ../src/extension/internal/filter/morphology.h:61 ../src/extension/internal/filter/shadows.h:66 msgid "Inner" msgstr "Intérieur" -#: ../src/extension/internal/filter/morphology.h:62 -#: ../src/extension/internal/filter/shadows.h:65 +#: ../src/extension/internal/filter/morphology.h:62 ../src/extension/internal/filter/shadows.h:65 msgid "Outer" msgstr "Extérieur" @@ -7251,16 +6597,13 @@ msgstr "Extérieur" msgid "Open" msgstr "Overt" -#: ../src/extension/internal/filter/morphology.h:65 -#: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 -#: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317 -#: ../src/widgets/spray-toolbar.cpp:116 ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/interp_att_g.inx.h:12 +#: ../src/extension/internal/filter/morphology.h:65 ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 +#: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/interp_att_g.inx.h:12 msgid "Width" msgstr "Largeur" -#: ../src/extension/internal/filter/morphology.h:69 -#: ../src/extension/internal/filter/morphology.h:190 +#: ../src/extension/internal/filter/morphology.h:69 ../src/extension/internal/filter/morphology.h:190 msgid "Antialiasing" msgstr "Antialiasing" @@ -7288,20 +6631,16 @@ msgstr "Cacher l'image" msgid "Composite type:" msgstr "Type de composite :" -#: ../src/extension/internal/filter/morphology.h:173 -#: ../src/filter-enums.cpp:88 +#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 msgid "Over" msgstr "Over" -#: ../src/extension/internal/filter/morphology.h:177 -#: ../src/filter-enums.cpp:92 +#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92 msgid "XOR" msgstr "XOR" -#: ../src/extension/internal/filter/morphology.h:179 -#: ../src/ui/dialog/layer-properties.cpp:185 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:59 -#: ../share/extensions/measure.inx.h:5 +#: ../src/extension/internal/filter/morphology.h:179 ../src/ui/dialog/layer-properties.cpp:185 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:59 ../share/extensions/measure.inx.h:5 msgid "Position:" msgstr "Position :" @@ -7341,8 +6680,7 @@ msgstr "Dilatation 2" msgid "Erosion 2" msgstr "Érosion 2" -#: ../src/extension/internal/filter/morphology.h:191 -#: ../src/live_effects/lpe-roughen.cpp:40 +#: ../src/extension/internal/filter/morphology.h:191 ../src/live_effects/lpe-roughen.cpp:40 msgid "Smooth" msgstr "Adoucir" @@ -7362,33 +6700,17 @@ msgstr "Ajoute un contour qui peut être coloré" msgid "Noise Fill" msgstr "Remplissage turbulent" -#: ../src/extension/internal/filter/overlays.h:59 -#: ../src/extension/internal/filter/paint.h:690 -#: ../src/extension/internal/filter/shadows.h:60 ../src/ui/dialog/find.cpp:88 -#: ../src/ui/dialog/tracedialog.cpp:747 -#: ../share/extensions/color_HSL_adjust.inx.h:2 -#: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 -#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 -#: ../share/extensions/dxf_outlines.inx.h:2 -#: ../share/extensions/gcodetools_area.inx.h:29 -#: ../share/extensions/gcodetools_engraving.inx.h:7 -#: ../share/extensions/gcodetools_graffiti.inx.h:21 -#: ../share/extensions/gcodetools_lathe.inx.h:22 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:11 -#: ../share/extensions/generate_voronoi.inx.h:2 -#: ../share/extensions/gimp_xcf.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:2 -#: ../share/extensions/jessyInk_uninstall.inx.h:2 -#: ../share/extensions/lorem_ipsum.inx.h:2 -#: ../share/extensions/pathalongpath.inx.h:2 -#: ../share/extensions/pathscatter.inx.h:2 -#: ../share/extensions/radiusrand.inx.h:2 ../share/extensions/scour.inx.h:2 -#: ../share/extensions/split.inx.h:2 ../share/extensions/voronoi2svg.inx.h:2 -#: ../share/extensions/web-set-att.inx.h:2 -#: ../share/extensions/web-transmit-att.inx.h:2 -#: ../share/extensions/webslicer_create_group.inx.h:2 -#: ../share/extensions/webslicer_export.inx.h:2 +#: ../src/extension/internal/filter/overlays.h:59 ../src/extension/internal/filter/paint.h:690 ../src/extension/internal/filter/shadows.h:60 +#: ../src/ui/dialog/find.cpp:88 ../src/ui/dialog/tracedialog.cpp:747 ../share/extensions/color_HSL_adjust.inx.h:2 +#: ../share/extensions/color_custom.inx.h:2 ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2 +#: ../share/extensions/dxf_input.inx.h:2 ../share/extensions/dxf_outlines.inx.h:2 ../share/extensions/gcodetools_area.inx.h:29 +#: ../share/extensions/gcodetools_engraving.inx.h:7 ../share/extensions/gcodetools_graffiti.inx.h:21 +#: ../share/extensions/gcodetools_lathe.inx.h:22 ../share/extensions/gcodetools_path_to_gcode.inx.h:11 +#: ../share/extensions/generate_voronoi.inx.h:2 ../share/extensions/gimp_xcf.inx.h:2 ../share/extensions/interp_att_g.inx.h:2 +#: ../share/extensions/jessyInk_uninstall.inx.h:2 ../share/extensions/lorem_ipsum.inx.h:2 ../share/extensions/pathalongpath.inx.h:2 +#: ../share/extensions/pathscatter.inx.h:2 ../share/extensions/radiusrand.inx.h:2 ../share/extensions/scour.inx.h:2 +#: ../share/extensions/split.inx.h:2 ../share/extensions/voronoi2svg.inx.h:2 ../share/extensions/web-set-att.inx.h:2 +#: ../share/extensions/web-transmit-att.inx.h:2 ../share/extensions/webslicer_create_group.inx.h:2 ../share/extensions/webslicer_export.inx.h:2 msgid "Options" msgstr "Options" @@ -7400,13 +6722,11 @@ msgstr "Fréquence horizontale :" msgid "Vertical frequency:" msgstr "Fréquence verticale :" -#: ../src/extension/internal/filter/overlays.h:66 -#: ../src/extension/internal/filter/textures.h:69 +#: ../src/extension/internal/filter/overlays.h:66 ../src/extension/internal/filter/textures.h:69 msgid "Complexity:" msgstr "Complexité :" -#: ../src/extension/internal/filter/overlays.h:67 -#: ../src/extension/internal/filter/textures.h:70 +#: ../src/extension/internal/filter/overlays.h:67 ../src/extension/internal/filter/textures.h:70 msgid "Variation:" msgstr "Variante :" @@ -7430,8 +6750,7 @@ msgstr "Texture en transparence turbulente de base" msgid "Chromolitho" msgstr "Chromolitho" -#: ../src/extension/internal/filter/paint.h:75 -#: ../share/extensions/jessyInk_keyBindings.inx.h:16 +#: ../src/extension/internal/filter/paint.h:75 ../share/extensions/jessyInk_keyBindings.inx.h:16 msgid "Drawing mode" msgstr "Mode dessin" @@ -7443,8 +6762,7 @@ msgstr "Fondu du dessin :" msgid "Dented" msgstr "Irrégulier" -#: ../src/extension/internal/filter/paint.h:88 -#: ../src/extension/internal/filter/paint.h:699 +#: ../src/extension/internal/filter/paint.h:88 ../src/extension/internal/filter/paint.h:699 msgid "Noise reduction" msgstr "Réduction de bruit" @@ -7456,8 +6774,7 @@ msgstr "Grain" msgid "Grain mode" msgstr "Mode grain" -#: ../src/extension/internal/filter/paint.h:97 -#: ../src/extension/internal/filter/transparency.h:207 +#: ../src/extension/internal/filter/paint.h:97 ../src/extension/internal/filter/transparency.h:207 #: ../src/extension/internal/filter/transparency.h:281 msgid "Expansion" msgstr "Extension" @@ -7474,39 +6791,29 @@ msgstr "Effet chromo avec dessin des bords et grain paramétrables" msgid "Cross Engraving" msgstr "Gravure croisée" -#: ../src/extension/internal/filter/paint.h:234 -#: ../src/extension/internal/filter/paint.h:337 +#: ../src/extension/internal/filter/paint.h:234 ../src/extension/internal/filter/paint.h:337 msgid "Clean-up" msgstr "Nettoyage" -#: ../src/extension/internal/filter/paint.h:238 -#: ../share/extensions/measure.inx.h:17 +#: ../src/extension/internal/filter/paint.h:238 ../share/extensions/measure.inx.h:17 msgid "Length" msgstr "Longueur" #: ../src/extension/internal/filter/paint.h:247 msgid "Convert image to an engraving made of vertical and horizontal lines" -msgstr "" -"Convertit l'image en une gravure composée de lignes verticales et " -"horizontales" +msgstr "Convertit l'image en une gravure composée de lignes verticales et horizontales" -#: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:999 -#: ../src/widgets/desktop-widget.cpp:1998 +#: ../src/extension/internal/filter/paint.h:331 ../src/ui/dialog/align-and-distribute.cpp:999 ../src/widgets/desktop-widget.cpp:1998 msgid "Drawing" msgstr "Dessin" #. 0.91 -#: ../src/extension/internal/filter/paint.h:335 -#: ../src/extension/internal/filter/paint.h:496 -#: ../src/extension/internal/filter/paint.h:590 -#: ../src/extension/internal/filter/paint.h:976 -#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2204 +#: ../src/extension/internal/filter/paint.h:335 ../src/extension/internal/filter/paint.h:496 ../src/extension/internal/filter/paint.h:590 +#: ../src/extension/internal/filter/paint.h:976 ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2204 msgid "Simplify" msgstr "Simplifier" -#: ../src/extension/internal/filter/paint.h:338 -#: ../src/extension/internal/filter/paint.h:709 +#: ../src/extension/internal/filter/paint.h:338 ../src/extension/internal/filter/paint.h:709 msgid "Erase" msgstr "Effacement" @@ -7514,13 +6821,11 @@ msgstr "Effacement" msgid "Melt" msgstr "Fondu" -#: ../src/extension/internal/filter/paint.h:350 -#: ../src/extension/internal/filter/paint.h:712 +#: ../src/extension/internal/filter/paint.h:350 ../src/extension/internal/filter/paint.h:712 msgid "Fill color" msgstr "Couleur du remplissage" -#: ../src/extension/internal/filter/paint.h:351 -#: ../src/extension/internal/filter/paint.h:714 +#: ../src/extension/internal/filter/paint.h:351 ../src/extension/internal/filter/paint.h:714 msgid "Image on fill" msgstr "Image sur le remplissage" @@ -7540,14 +6845,11 @@ msgstr "Convertit les images en dessins duochromes" msgid "Electrize" msgstr "Électrisation" -#: ../src/extension/internal/filter/paint.h:497 -#: ../src/extension/internal/filter/paint.h:852 +#: ../src/extension/internal/filter/paint.h:497 ../src/extension/internal/filter/paint.h:852 msgid "Effect type:" msgstr "Type d'effet :" -#: ../src/extension/internal/filter/paint.h:501 -#: ../src/extension/internal/filter/paint.h:860 -#: ../src/extension/internal/filter/paint.h:975 +#: ../src/extension/internal/filter/paint.h:501 ../src/extension/internal/filter/paint.h:860 ../src/extension/internal/filter/paint.h:975 msgid "Levels" msgstr "Niveaux" @@ -7571,14 +6873,11 @@ msgstr "Adouci" msgid "Contrasted" msgstr "Contrasté" -#: ../src/extension/internal/filter/paint.h:591 -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/extension/internal/filter/paint.h:591 ../src/live_effects/lpe-jointype.cpp:51 msgid "Line width" msgstr "Largeur de ligne" -#: ../src/extension/internal/filter/paint.h:593 -#: ../src/extension/internal/filter/paint.h:861 -#: ../src/ui/widget/filter-effect-chooser.cpp:25 +#: ../src/extension/internal/filter/paint.h:593 ../src/extension/internal/filter/paint.h:861 ../src/ui/widget/filter-effect-chooser.cpp:25 msgid "Blend mode:" msgstr "Mode de fondu :" @@ -7742,9 +7041,7 @@ msgstr "Superposé" msgid "External" msgstr "Externe" -#: ../src/extension/internal/filter/textures.h:81 -#: ../share/extensions/markers_strokepaint.inx.h:8 -#: ../share/extensions/restack.inx.h:4 +#: ../src/extension/internal/filter/textures.h:81 ../share/extensions/markers_strokepaint.inx.h:8 ../share/extensions/restack.inx.h:4 msgid "Custom" msgstr "Personnalisée" @@ -7768,8 +7065,7 @@ msgstr "k3 :" msgid "Inkblot on tissue or rough paper" msgstr "Tache d'encre sur du tissu ou du papier à grain" -#: ../src/extension/internal/filter/transparency.h:53 -#: ../src/filter-enums.cpp:21 +#: ../src/extension/internal/filter/transparency.h:53 ../src/filter-enums.cpp:21 msgid "Blend" msgstr "Fondre" @@ -7777,17 +7073,13 @@ msgstr "Fondre" msgid "Source:" msgstr "Source :" -#: ../src/extension/internal/filter/transparency.h:56 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1603 +#: ../src/extension/internal/filter/transparency.h:56 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1603 msgid "Background" msgstr "Fond" -#: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2853 -#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:144 ../src/widgets/spray-toolbar.cpp:186 -#: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 -#: ../share/extensions/triangle.inx.h:8 +#: ../src/extension/internal/filter/transparency.h:59 ../src/ui/dialog/filter-effects-dialog.cpp:2853 ../src/ui/dialog/input.cpp:1088 +#: ../src/widgets/eraser-toolbar.cpp:106 ../src/widgets/pencil-toolbar.cpp:144 ../src/widgets/spray-toolbar.cpp:186 +#: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 ../share/extensions/triangle.inx.h:8 msgid "Mode:" msgstr "Mode :" @@ -7807,15 +7099,13 @@ msgstr "Remplace les canaux RVB par de la transparence" msgid "Light Eraser" msgstr "Gomme lumière" -#: ../src/extension/internal/filter/transparency.h:209 -#: ../src/extension/internal/filter/transparency.h:283 +#: ../src/extension/internal/filter/transparency.h:209 ../src/extension/internal/filter/transparency.h:283 msgid "Global opacity" msgstr "Opacité globale" #: ../src/extension/internal/filter/transparency.h:218 msgid "Make the lightest parts of the object progressively transparent" -msgstr "" -"Rend les parties les plus claires de l'objet progressivement transparentes" +msgstr "Rend les parties les plus claires de l'objet progressivement transparentes" #: ../src/extension/internal/filter/transparency.h:291 msgid "Set opacity and strength of opacity boundaries" @@ -7845,22 +7135,17 @@ msgstr "Type d'importation d'image :" #: ../src/extension/internal/gdkpixbuf-input.cpp:190 #, c-format -msgid "" -"Embed results in stand-alone, larger SVG files. Link references a file " -"outside this SVG document and all files must be moved together." +msgid "Embed results in stand-alone, larger SVG files. Link references a file outside this SVG document and all files must be moved together." msgstr "" -"Incorporer génère un fichier SVG unique, mais plus volumineux. Lier crée une " -"référence vers un fichier externe au document SVG qui doit être déplacé avec " -"le fichier SVG." +"Incorporer génère un fichier SVG unique, mais plus volumineux. Lier crée une référence vers un fichier externe au document SVG qui doit être " +"déplacé avec le fichier SVG." -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 -#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/extension/internal/gdkpixbuf-input.cpp:191 ../src/ui/dialog/inkscape-preferences.cpp:1498 #, c-format msgid "Embed" msgstr "Incorporer" -#: ../src/extension/internal/gdkpixbuf-input.cpp:192 ../src/sp-anchor.cpp:105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/extension/internal/gdkpixbuf-input.cpp:192 ../src/sp-anchor.cpp:105 ../src/ui/dialog/inkscape-preferences.cpp:1498 #, c-format msgid "Link" msgstr "Lier" @@ -7872,12 +7157,8 @@ msgstr "Résolution de l'image (ppp) :" #: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format -msgid "" -"Take information from file or use default bitmap import resolution as " -"defined in the preferences." -msgstr "" -"Récupère les informations dans le fichier ou utilise la résolution " -"d'importation telle que définie dans les préférences." +msgid "Take information from file or use default bitmap import resolution as defined in the preferences." +msgstr "Récupère les informations dans le fichier ou utilise la résolution d'importation telle que définie dans les préférences." #: ../src/extension/internal/gdkpixbuf-input.cpp:196 #, c-format @@ -7896,27 +7177,20 @@ msgstr "Mode de rendu de l'image :" #: ../src/extension/internal/gdkpixbuf-input.cpp:200 #, c-format -msgid "" -"When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " -"not work in all browsers.)" -msgstr "" -"When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " -"not work in all browsers.)" +msgid "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will not work in all browsers.)" +msgstr "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will not work in all browsers.)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/extension/internal/gdkpixbuf-input.cpp:201 ../src/ui/dialog/inkscape-preferences.cpp:1505 #, c-format msgid "None (auto)" msgstr "Aucun (défaut)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:202 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/extension/internal/gdkpixbuf-input.cpp:202 ../src/ui/dialog/inkscape-preferences.cpp:1505 #, c-format msgid "Smooth (optimizeQuality)" msgstr "Lisse (optimisé pour la qualité)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:203 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/extension/internal/gdkpixbuf-input.cpp:203 ../src/ui/dialog/inkscape-preferences.cpp:1505 #, c-format msgid "Blocky (optimizeSpeed)" msgstr "Bloc (optimisé pour la vitesse)" @@ -7924,9 +7198,7 @@ msgstr "Bloc (optimisé pour la vitesse)" #: ../src/extension/internal/gdkpixbuf-input.cpp:206 #, c-format msgid "Hide the dialog next time and always apply the same actions." -msgstr "" -"Masquer cette boîte de dialogue la prochaine fois et toujours appliquer la " -"même action." +msgstr "Masquer cette boîte de dialogue la prochaine fois et toujours appliquer la même action." #: ../src/extension/internal/gdkpixbuf-input.cpp:206 #, c-format @@ -7969,40 +7241,20 @@ msgstr "Décalage horizontal :" msgid "Vertical Offset:" msgstr "Décalage vertical :" -#: ../src/extension/internal/grid.cpp:215 -#: ../src/ui/dialog/inkscape-preferences.cpp:1519 -#: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 -#: ../share/extensions/foldablebox.inx.h:9 -#: ../share/extensions/funcplot.inx.h:38 -#: ../share/extensions/grid_cartesian.inx.h:23 -#: ../share/extensions/grid_isometric.inx.h:11 -#: ../share/extensions/grid_polar.inx.h:22 -#: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 -#: ../share/extensions/layout_nup.inx.h:35 -#: ../share/extensions/lindenmayer.inx.h:34 -#: ../share/extensions/param_curves.inx.h:30 -#: ../share/extensions/perfectboundcover.inx.h:19 -#: ../share/extensions/polyhedron_3d.inx.h:56 -#: ../share/extensions/printing_marks.inx.h:20 -#: ../share/extensions/render_alphabetsoup.inx.h:5 -#: ../share/extensions/render_barcode.inx.h:5 -#: ../share/extensions/render_barcode_datamatrix.inx.h:5 -#: ../share/extensions/render_barcode_qrcode.inx.h:18 -#: ../share/extensions/render_gear_rack.inx.h:5 -#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:6 -#: ../share/extensions/seamless_pattern.inx.h:5 -#: ../share/extensions/spirograph.inx.h:10 -#: ../share/extensions/svgcalendar.inx.h:38 -#: ../share/extensions/triangle.inx.h:14 -#: ../share/extensions/wireframe_sphere.inx.h:8 +#: ../src/extension/internal/grid.cpp:215 ../src/ui/dialog/inkscape-preferences.cpp:1519 ../share/extensions/draw_from_triangle.inx.h:58 +#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 ../share/extensions/funcplot.inx.h:38 +#: ../share/extensions/grid_cartesian.inx.h:23 ../share/extensions/grid_isometric.inx.h:11 ../share/extensions/grid_polar.inx.h:22 +#: ../share/extensions/guides_creator.inx.h:25 ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/lindenmayer.inx.h:34 ../share/extensions/param_curves.inx.h:30 ../share/extensions/perfectboundcover.inx.h:19 +#: ../share/extensions/polyhedron_3d.inx.h:56 ../share/extensions/printing_marks.inx.h:20 ../share/extensions/render_alphabetsoup.inx.h:5 +#: ../share/extensions/render_barcode.inx.h:5 ../share/extensions/render_barcode_datamatrix.inx.h:5 +#: ../share/extensions/render_barcode_qrcode.inx.h:18 ../share/extensions/render_gear_rack.inx.h:5 ../share/extensions/render_gears.inx.h:11 +#: ../share/extensions/rtree.inx.h:6 ../share/extensions/seamless_pattern.inx.h:5 ../share/extensions/spirograph.inx.h:10 +#: ../share/extensions/svgcalendar.inx.h:38 ../share/extensions/triangle.inx.h:14 ../share/extensions/wireframe_sphere.inx.h:8 msgid "Render" msgstr "Rendu" -#: ../src/extension/internal/grid.cpp:216 -#: ../src/ui/dialog/document-properties.cpp:162 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 +#: ../src/extension/internal/grid.cpp:216 ../src/ui/dialog/document-properties.cpp:162 ../src/ui/dialog/inkscape-preferences.cpp:819 #: ../src/widgets/toolbox.cpp:1828 msgid "Grids" msgstr "Grilles" @@ -8087,12 +7339,8 @@ msgid "Precision of approximating gradient meshes:" msgstr "Précision de l'approximation sur les mailles de dégradés :" #: ../src/extension/internal/pdfinput/pdf-input.cpp:130 -msgid "" -"Note: setting the precision too high may result in a large SVG file " -"and slow performance." -msgstr "" -"Note : avec une précision trop haute, vous risquez d'obtenir des " -"fichiers SVG très gros et de ralentir le programme." +msgid "Note: setting the precision too high may result in a large SVG file and slow performance." +msgstr "Note : avec une précision trop haute, vous risquez d'obtenir des fichiers SVG très gros et de ralentir le programme." #: ../src/extension/internal/pdfinput/pdf-input.cpp:134 msgid "Poppler/Cairo import" @@ -8100,8 +7348,7 @@ msgstr "Import Poppler/Cairo" #: ../src/extension/internal/pdfinput/pdf-input.cpp:135 msgid "" -"Import via external library. Text consists of groups containing cloned " -"glyphs where each glyph is a path. Images are stored internally. Meshes " +"Import via external library. Text consists of groups containing cloned glyphs where each glyph is a path. Images are stored internally. Meshes " "cause entire document to be rendered as a raster image." msgstr "" @@ -8111,9 +7358,8 @@ msgstr "Importation interne" #: ../src/extension/internal/pdfinput/pdf-input.cpp:137 msgid "" -"Import via internal (Poppler derived) library. Text is stored as text but " -"white space is missing. Meshes are converted to tiles, the number depends on " -"the precision set below." +"Import via internal (Poppler derived) library. Text is stored as text but white space is missing. Meshes are converted to tiles, the number " +"depends on the precision set below." msgstr "" #: ../src/extension/internal/pdfinput/pdf-input.cpp:148 @@ -8129,9 +7375,7 @@ msgstr "grossier" #. Font option #: ../src/extension/internal/pdfinput/pdf-input.cpp:159 msgid "Replace PDF fonts by closest-named installed fonts" -msgstr "" -"Remplace les polices du PDF par les polices installées dont le nom est le " -"plus proche" +msgstr "Remplace les polices du PDF par les polices installées dont le nom est le plus proche" #: ../src/extension/internal/pdfinput/pdf-input.cpp:161 msgid "Embed images" @@ -8187,9 +7431,7 @@ msgstr "Adobe Illustrator 9.0 et supérieur (*.ai)" #: ../src/extension/internal/pdfinput/pdf-input.cpp:956 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" -msgstr "" -"Ouvrir des fichiers créés avec Adobe Illustrator version 9.0 et les versions " -"plus récentes" +msgstr "Ouvrir des fichiers créés avec Adobe Illustrator version 9.0 et les versions plus récentes" #: ../src/extension/internal/pov-out.cpp:714 msgid "PovRay Output" @@ -8277,8 +7519,7 @@ msgstr "Diagramme Microsoft Visio (*.vsd)" #: ../src/extension/internal/vsd-input.cpp:307 msgid "File format used by Microsoft Visio 6 and later" -msgstr "" -"Format de fichier utilisé par Microsoft Visio 6 et les versions suivantes" +msgstr "Format de fichier utilisé par Microsoft Visio 6 et les versions suivantes" #: ../src/extension/internal/vsd-input.cpp:314 msgid "VDX Input" @@ -8290,8 +7531,7 @@ msgstr "Diagramme Microsoft Visio XML (*.vdx)" #: ../src/extension/internal/vsd-input.cpp:320 msgid "File format used by Microsoft Visio 2010 and later" -msgstr "" -"Format de fichier utilisé par Microsoft Visio 2010 et les versions suivantes" +msgstr "Format de fichier utilisé par Microsoft Visio 2010 et les versions suivantes" #: ../src/extension/internal/vsd-input.cpp:327 msgid "VSDM Input" @@ -8301,11 +7541,9 @@ msgstr "Entrée VSDM" msgid "Microsoft Visio 2013 drawing (*.vsdm)" msgstr "Dessin Microsoft Visio 2013 (*.vsdm)" -#: ../src/extension/internal/vsd-input.cpp:333 -#: ../src/extension/internal/vsd-input.cpp:346 +#: ../src/extension/internal/vsd-input.cpp:333 ../src/extension/internal/vsd-input.cpp:346 msgid "File format used by Microsoft Visio 2013 and later" -msgstr "" -"Format de fichier utilisé par Microsoft Visio 2013 et les versions suivantes" +msgstr "Format de fichier utilisé par Microsoft Visio 2013 et les versions suivantes" #: ../src/extension/internal/vsd-input.cpp:340 msgid "VSDX Input" @@ -8335,9 +7573,7 @@ msgstr "Sortie WMF" msgid "Map all fill patterns to standard WMF hatches" msgstr "Associer tous les motifs de remplissage en hachures WMF" -#: ../src/extension/internal/wmf-inout.cpp:3188 -#: ../share/extensions/wmf_input.inx.h:2 -#: ../share/extensions/wmf_output.inx.h:2 +#: ../src/extension/internal/wmf-inout.cpp:3188 ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Métafichier Windows (*.wmf)" @@ -8367,9 +7603,7 @@ msgstr "Prévisualiser l'effet en direct sur la zone de travail ?" #: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127 msgid "Format autodetect failed. The file is being opened as SVG." -msgstr "" -"Échec de la détection automatique du format. Le fichier est ouvert en tant " -"que SVG." +msgstr "Échec de la détection automatique du format. Le fichier est ouvert en tant que SVG." #: ../src/file.cpp:183 msgid "default.svg" @@ -8377,8 +7611,7 @@ msgstr "default.fr.svg" #: ../src/file.cpp:328 msgid "Broken links have been changed to point to existing files." -msgstr "" -"Les liens brisés ont été modifiés pour pointer vers des fichiers existant." +msgstr "Les liens brisés ont été modifiés pour pointer vers des fichiers existant." #: ../src/file.cpp:339 ../src/file.cpp:1274 #, c-format @@ -8391,9 +7624,7 @@ msgstr "Document non enregistré. Impossible de le recharger." #: ../src/file.cpp:371 msgid "Changes will be lost! Are you sure you want to reload document %1?" -msgstr "" -"Les changements seront perdus ! Êtes-vous sûr de vouloir recharger le " -"document %1 ?" +msgstr "Les changements seront perdus ! Êtes-vous sûr de vouloir recharger le document %1 ?" #: ../src/file.cpp:397 msgid "Document reverted." @@ -8415,10 +7646,8 @@ msgstr "Nettoyer le document" #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." -msgstr[0] "" -"Suppression de %i définition inutilisée dans les <defs>." -msgstr[1] "" -"Suppression de %i définitions inutilisées dans les <defs>." +msgstr[0] "Suppression de %i définition inutilisée dans les <defs>." +msgstr[1] "Suppression de %i définitions inutilisées dans les <defs>." #: ../src/file.cpp:643 msgid "No unused definitions in <defs>." @@ -8426,25 +7655,17 @@ msgstr "Aucune définition inutilisée dans les <defs>." #: ../src/file.cpp:675 #, c-format -msgid "" -"No Inkscape extension found to save document (%s). This may have been " -"caused by an unknown filename extension." -msgstr "" -"Aucune extension Inkscape pour enregistrer le document (%s) n'a été trouvée. " -"Cela peut venir d'une extension de fichier inconnue." +msgid "No Inkscape extension found to save document (%s). This may have been caused by an unknown filename extension." +msgstr "Aucune extension Inkscape pour enregistrer le document (%s) n'a été trouvée. Cela peut venir d'une extension de fichier inconnue." -#: ../src/file.cpp:676 ../src/file.cpp:684 ../src/file.cpp:692 -#: ../src/file.cpp:698 ../src/file.cpp:703 +#: ../src/file.cpp:676 ../src/file.cpp:684 ../src/file.cpp:692 ../src/file.cpp:698 ../src/file.cpp:703 msgid "Document not saved." msgstr "Document non enregistré." #: ../src/file.cpp:683 #, c-format -msgid "" -"File %s is write protected. Please remove write protection and try again." -msgstr "" -"Le fichier %s est protégé en écriture. Veuillez supprimer cette protection " -"et recommencer." +msgid "File %s is write protected. Please remove write protection and try again." +msgstr "Le fichier %s est protégé en écriture. Veuillez supprimer cette protection et recommencer." #: ../src/file.cpp:691 #, c-format @@ -8480,8 +7701,7 @@ msgstr "Aucun changement à enregistrer." msgid "Saving document..." msgstr "Enregistrement du document..." -#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1492 -#: ../src/ui/dialog/ocaldialogs.cpp:1244 +#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1492 ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "Importer" @@ -8586,12 +7806,9 @@ msgstr "Différence" msgid "Exclusion" msgstr "Exclusion" -#: ../src/filter-enums.cpp:65 ../src/ui/tools/flood-tool.cpp:94 -#: ../src/ui/widget/color-icc-selector.cpp:182 -#: ../src/ui/widget/color-icc-selector.cpp:186 -#: ../src/ui/widget/color-scales.cpp:405 ../src/ui/widget/color-scales.cpp:406 -#: ../src/widgets/tweak-toolbar.cpp:286 -#: ../share/extensions/color_randomize.inx.h:3 +#: ../src/filter-enums.cpp:65 ../src/ui/tools/flood-tool.cpp:94 ../src/ui/widget/color-icc-selector.cpp:182 +#: ../src/ui/widget/color-icc-selector.cpp:186 ../src/ui/widget/color-scales.cpp:405 ../src/ui/widget/color-scales.cpp:406 +#: ../src/widgets/tweak-toolbar.cpp:286 ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "Teinte" @@ -8615,9 +7832,7 @@ msgstr "Décalage de teinte" msgid "Luminance to Alpha" msgstr "Luminance vers opacité" -#: ../src/filter-enums.cpp:87 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 -#: ../share/extensions/jessyInk_transitions.inx.h:7 +#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3 ../share/extensions/jessyInk_transitions.inx.h:7 #: ../share/extensions/measure.inx.h:20 msgid "Default" msgstr "Défaut" @@ -8659,8 +7874,7 @@ msgstr "Éclaircir" msgid "Arithmetic" msgstr "Arithmetic" -#: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:545 -#: ../src/ui/dialog/objects.cpp:1889 +#: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:545 ../src/ui/dialog/objects.cpp:1889 msgid "Duplicate" msgstr "Dupliquer" @@ -8726,8 +7940,7 @@ msgstr "Stop médian de dégradé linéaire" msgid "Radial gradient center" msgstr "Centre de dégradé radial" -#: ../src/gradient-drag.cpp:101 ../src/gradient-drag.cpp:102 -#: ../src/ui/tools/gradient-tool.cpp:94 ../src/ui/tools/gradient-tool.cpp:95 +#: ../src/gradient-drag.cpp:101 ../src/gradient-drag.cpp:102 ../src/ui/tools/gradient-tool.cpp:94 ../src/ui/tools/gradient-tool.cpp:95 msgid "Radial gradient radius" msgstr "Rayon de dégradé radial" @@ -8736,8 +7949,7 @@ msgid "Radial gradient focus" msgstr "Foyer de dégradé radial" #. POINT_RG_FOCUS -#: ../src/gradient-drag.cpp:104 ../src/gradient-drag.cpp:105 -#: ../src/ui/tools/gradient-tool.cpp:97 ../src/ui/tools/gradient-tool.cpp:98 +#: ../src/gradient-drag.cpp:104 ../src/gradient-drag.cpp:105 ../src/ui/tools/gradient-tool.cpp:97 ../src/ui/tools/gradient-tool.cpp:98 msgid "Radial gradient mid stop" msgstr "Stop médian de dégradé radial" @@ -8772,12 +7984,9 @@ msgstr "Supprimer un stop de dégradé" #: ../src/gradient-drag.cpp:1427 #, c-format -msgid "" -"%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl" -"+Alt to delete stop" +msgid "%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl+Alt to delete stop" msgstr "" -"%s %d pour %s%s; déplacer avec Ctrl pour faire varier le décalage par " -"incréments; cliquer avec Ctrl+Alt pour supprimer le stop" +"%s %d pour %s%s; déplacer avec Ctrl pour faire varier le décalage par incréments; cliquer avec Ctrl+Alt pour supprimer le stop" #: ../src/gradient-drag.cpp:1431 ../src/gradient-drag.cpp:1438 msgid " (stroke)" @@ -8785,36 +7994,21 @@ msgstr " (contour)" #: ../src/gradient-drag.cpp:1435 #, c-format -msgid "" -"%s for: %s%s; drag with Ctrl to snap angle, with Ctrl+Alt to " -"preserve angle, with Ctrl+Shift to scale around center" +msgid "%s for: %s%s; drag with Ctrl to snap angle, with Ctrl+Alt to preserve angle, with Ctrl+Shift to scale around center" msgstr "" -"%s pour %s%s; cliquer-déplacer avec Ctrl pour faire varier l'angle " -"par incréments; Ctrl+Alt pour préserver l'angle, avec Ctrl+Maj " -"pour redimensionner autour du centre" +"%s pour %s%s; cliquer-déplacer avec Ctrl pour faire varier l'angle par incréments; Ctrl+Alt pour préserver l'angle, avec Ctrl" +"+Maj pour redimensionner autour du centre" #: ../src/gradient-drag.cpp:1443 -msgid "" -"Radial gradient center and focus; drag with Shift to " -"separate focus" -msgstr "" -"Dégradé radial, centre et foyer; déplacer avec Maj pour " -"séparer le foyer" +msgid "Radial gradient center and focus; drag with Shift to separate focus" +msgstr "Dégradé radial, centre et foyer; déplacer avec Maj pour séparer le foyer" #: ../src/gradient-drag.cpp:1446 #, c-format -msgid "" -"Gradient point shared by %d gradient; drag with Shift to " -"separate" -msgid_plural "" -"Gradient point shared by %d gradients; drag with Shift to " -"separate" -msgstr[0] "" -"Point de dégradé partagé entre %d dégradé; déplacer avec Maj " -"pour séparer " -msgstr[1] "" -"Point de dégradé partagé entre %d dégradés; déplacer avec Maj " -"pour séparer " +msgid "Gradient point shared by %d gradient; drag with Shift to separate" +msgid_plural "Gradient point shared by %d gradients; drag with Shift to separate" +msgstr[0] "Point de dégradé partagé entre %d dégradé; déplacer avec Maj pour séparer " +msgstr[1] "Point de dégradé partagé entre %d dégradés; déplacer avec Maj pour séparer " #: ../src/gradient-drag.cpp:2379 msgid "Move gradient handle(s)" @@ -8830,13 +8024,11 @@ msgstr "Supprimer un stop de dégradé" #: ../src/inkscape.cpp:242 msgid "Autosave failed! Cannot create directory %1." -msgstr "" -"Échec de l'enregistrement automatique. Création du dossier %1 impossible." +msgstr "Échec de l'enregistrement automatique. Création du dossier %1 impossible." #: ../src/inkscape.cpp:251 msgid "Autosave failed! Cannot open directory %1." -msgstr "" -"Échec de l'enregistrement automatique. Ouverture du dossier %1 impossible." +msgstr "Échec de l'enregistrement automatique. Ouverture du dossier %1 impossible." #: ../src/inkscape.cpp:267 msgid "Autosaving documents..." @@ -8844,16 +8036,12 @@ msgstr "Enregistrement automatique du document..." #: ../src/inkscape.cpp:335 msgid "Autosave failed! Could not find inkscape extension to save document." -msgstr "" -"Échec de l'enregistrement automatique ! Impossible de trouver l'extension " -"Inkscape pour enregistrer le document." +msgstr "Échec de l'enregistrement automatique ! Impossible de trouver l'extension Inkscape pour enregistrer le document." #: ../src/inkscape.cpp:338 ../src/inkscape.cpp:345 #, c-format msgid "Autosave failed! File %s could not be saved." -msgstr "" -"Échec de l'enregistrement automatique ! Le fichier %s n'a pas pu être " -"enregistré." +msgstr "Échec de l'enregistrement automatique ! Le fichier %s n'a pas pu être enregistré." #: ../src/inkscape.cpp:360 msgid "Autosave complete." @@ -8869,12 +8057,8 @@ msgid "Inkscape encountered an internal error and will close now.\n" msgstr "Inkscape a subi une erreur interne et va se fermer maintenant.\n" #: ../src/inkscape.cpp:651 -msgid "" -"Automatic backups of unsaved documents were done to the following " -"locations:\n" -msgstr "" -"Les enregistrements automatiques des documents non enregistrés ont été " -"effectués à cet emplacement :\n" +msgid "Automatic backups of unsaved documents were done to the following locations:\n" +msgstr "Les enregistrements automatiques des documents non enregistrés ont été effectués à cet emplacement :\n" #: ../src/inkscape.cpp:652 msgid "Automatic backup of the following documents failed:\n" @@ -8899,15 +8083,11 @@ msgstr "Déplacer le motif de remplissage à l'intérieur de l'objet" #: ../src/knotholder.cpp:281 ../src/knotholder.cpp:303 msgid "Scale the pattern fill; uniformly if with Ctrl" -msgstr "" -"Redimensionner le motif de remplissage ; uniformiser en maintenant la " -"touche Ctrl" +msgstr "Redimensionner le motif de remplissage ; uniformiser en maintenant la touche Ctrl" #: ../src/knotholder.cpp:285 ../src/knotholder.cpp:307 msgid "Rotate the pattern fill; with Ctrl to snap angle" -msgstr "" -"Tourner le motif de remplissage ; Ctrl pour tourner par " -"incréments" +msgstr "Tourner le motif de remplissage ; Ctrl pour tourner par incréments" #: ../src/libgdl/gdl-dock-bar.c:105 msgid "Master" @@ -8933,8 +8113,7 @@ msgstr "Iconifier ce point d'attache" msgid "Close this dock" msgstr "Fermer ce point d'attache" -#: ../src/libgdl/gdl-dock-item-grip.c:723 -#: ../src/libgdl/gdl-dock-tablabel.c:125 +#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" msgstr "Élément détachable de contrôle" @@ -8943,10 +8122,8 @@ msgid "Dockitem which 'owns' this grip" msgstr "Élément d'attache qui « possède » cette prise" #. Name -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:192 -#: ../src/widgets/text-toolbar.cpp:1411 -#: ../share/extensions/gcodetools_graffiti.inx.h:9 -#: ../share/extensions/gcodetools_orientation_points.inx.h:2 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:192 ../src/widgets/text-toolbar.cpp:1411 +#: ../share/extensions/gcodetools_graffiti.inx.h:9 ../share/extensions/gcodetools_orientation_points.inx.h:2 msgid "Orientation" msgstr "Orientation" @@ -8960,32 +8137,23 @@ msgstr "Redimensionnable" #: ../src/libgdl/gdl-dock-item.c:315 msgid "If set, the dock item can be resized when docked in a GtkPanel widget" -msgstr "" -"Si coché, l'élément détachable peut être redimensionné quand il est attaché " -"à un widget GtkPanel" +msgstr "Si coché, l'élément détachable peut être redimensionné quand il est attaché à un widget GtkPanel" #: ../src/libgdl/gdl-dock-item.c:322 msgid "Item behavior" msgstr "Comportement de l'élément" #: ../src/libgdl/gdl-dock-item.c:323 -msgid "" -"General behavior for the dock item (i.e. whether it can float, if it's " -"locked, etc.)" -msgstr "" -"Comportement général de l'élément détachable (par ex, s'il peut flotter, " -"s'il est verouillé, etc...)" +msgid "General behavior for the dock item (i.e. whether it can float, if it's locked, etc.)" +msgstr "Comportement général de l'élément détachable (par ex, s'il peut flotter, s'il est verouillé, etc...)" #: ../src/libgdl/gdl-dock-item.c:331 ../src/libgdl/gdl-dock-master.c:148 msgid "Locked" msgstr "Verrouillé" #: ../src/libgdl/gdl-dock-item.c:332 -msgid "" -"If set, the dock item cannot be dragged around and it doesn't show a grip" -msgstr "" -"Si coché, l'élément détachable ne peut pas être déplacé et il n'affiche pas " -"de poignée" +msgid "If set, the dock item cannot be dragged around and it doesn't show a grip" +msgstr "Si coché, l'élément détachable ne peut pas être déplacé et il n'affiche pas de poignée" #: ../src/libgdl/gdl-dock-item.c:340 msgid "Preferred width" @@ -9005,28 +8173,18 @@ msgstr "Hauteur préférée pour l'élément détachable" #: ../src/libgdl/gdl-dock-item.c:716 #, c-format -msgid "" -"You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " -"some other compound dock object." -msgstr "" -"Vous ne pouvez pas ajouter d'objet d'attache (%p de type %s) dans un %s. " -"Utilisez un GdlDock ou un autre objet d'attache composite." +msgid "You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or some other compound dock object." +msgstr "Vous ne pouvez pas ajouter d'objet d'attache (%p de type %s) dans un %s. Utilisez un GdlDock ou un autre objet d'attache composite." #: ../src/libgdl/gdl-dock-item.c:723 #, c-format -msgid "" -"Attempting to add a widget with type %s to a %s, but it can only contain one " -"widget at a time; it already contains a widget of type %s" -msgstr "" -"Tentative d'ajout d'un gadget de %s à un %s, mais il ne peut contenir qu'un " -"gadget à la fois ; il contient déjà un gadget detype %s" +msgid "Attempting to add a widget with type %s to a %s, but it can only contain one widget at a time; it already contains a widget of type %s" +msgstr "Tentative d'ajout d'un gadget de %s à un %s, mais il ne peut contenir qu'un gadget à la fois ; il contient déjà un gadget detype %s" #: ../src/libgdl/gdl-dock-item.c:1474 ../src/libgdl/gdl-dock-item.c:1524 #, c-format msgid "Unsupported docking strategy %s in dock object of type %s" -msgstr "" -"La stratégie d'attache %s n'est pas supportée pour l'objet d'attache de type " -"%s" +msgstr "La stratégie d'attache %s n'est pas supportée pour l'objet d'attache de type %s" #. UnLock menuitem #: ../src/libgdl/gdl-dock-item.c:1632 @@ -9058,12 +8216,10 @@ msgstr "Titre par défaut pour les nouveaux points d'attache flottants" #: ../src/libgdl/gdl-dock-master.c:149 msgid "" -"If is set to 1, all the dock items bound to the master are locked; if it's " -"0, all are unlocked; -1 indicates inconsistency among the items" +"If is set to 1, all the dock items bound to the master are locked; if it's 0, all are unlocked; -1 indicates inconsistency among the items" msgstr "" -"Si la valeur est 1, tous les éléments détachables liés au maître sont " -"verrouillés ; si la valeur est 0, tous sont déverrouillés, -1 indique des " -"états hétérogènes pour les éléments" +"Si la valeur est 1, tous les éléments détachables liés au maître sont verrouillés ; si la valeur est 0, tous sont déverrouillés, -1 indique " +"des états hétérogènes pour les éléments" #: ../src/libgdl/gdl-dock-master.c:157 ../src/libgdl/gdl-switcher.c:737 msgid "Switcher Style" @@ -9075,28 +8231,16 @@ msgstr "Style des boutons de commutation" #: ../src/libgdl/gdl-dock-master.c:783 #, c-format -msgid "" -"master %p: unable to add object %p[%s] to the hash. There already is an " -"item with that name (%p)." -msgstr "" -"maître %p: impossible d'ajouter l'objet %p[%s] dans la table. Il y a déjà un " -"élément avec ce nom (%p)." +msgid "master %p: unable to add object %p[%s] to the hash. There already is an item with that name (%p)." +msgstr "maître %p: impossible d'ajouter l'objet %p[%s] dans la table. Il y a déjà un élément avec ce nom (%p)." #: ../src/libgdl/gdl-dock-master.c:955 #, c-format -msgid "" -"The new dock controller %p is automatic. Only manual dock objects should be " -"named controller." -msgstr "" -"Le nouveau contrôleur d'attache %p est automatique. Seuls les ojbets " -"d'attache manuels peuvent être nommés contrôleurs." - -#: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:998 -#: ../src/ui/dialog/document-properties.cpp:160 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 -#: ../src/widgets/desktop-widget.cpp:1994 -#: ../share/extensions/empty_page.inx.h:1 +msgid "The new dock controller %p is automatic. Only manual dock objects should be named controller." +msgstr "Le nouveau contrôleur d'attache %p est automatique. Seuls les ojbets d'attache manuels peuvent être nommés contrôleurs." + +#: ../src/libgdl/gdl-dock-notebook.c:132 ../src/ui/dialog/align-and-distribute.cpp:998 ../src/ui/dialog/document-properties.cpp:160 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 ../src/widgets/desktop-widget.cpp:1994 ../share/extensions/empty_page.inx.h:1 #: ../share/extensions/voronoi2svg.inx.h:9 msgid "Page" msgstr "Page" @@ -9105,12 +8249,8 @@ msgstr "Page" msgid "The index of the current page" msgstr "L'index de la page courante" -#: ../src/libgdl/gdl-dock-object.c:125 -#: ../src/live_effects/parameter/originalpatharray.cpp:82 -#: ../src/ui/dialog/inkscape-preferences.cpp:1553 -#: ../src/ui/widget/page-sizer.cpp:285 -#: ../src/widgets/gradient-selector.cpp:154 -#: ../src/widgets/sp-xmlview-attr-list.cpp:49 +#: ../src/libgdl/gdl-dock-object.c:125 ../src/live_effects/parameter/originalpatharray.cpp:82 ../src/ui/dialog/inkscape-preferences.cpp:1553 +#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:154 ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Nom" @@ -9152,35 +8292,23 @@ msgstr "Maître d'attache auquel cet objet d'attache est lié" #: ../src/libgdl/gdl-dock-object.c:463 #, c-format -msgid "" -"Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " -"hasn't implemented this method" -msgstr "" -"Appel à gdl_dock_object_dock dans un objet d'attache %p (le type d'objet est " -"%s) qui n'a pas implémenté cette méthode" +msgid "Call to gdl_dock_object_dock in a dock object %p (object type is %s) which hasn't implemented this method" +msgstr "Appel à gdl_dock_object_dock dans un objet d'attache %p (le type d'objet est %s) qui n'a pas implémenté cette méthode" #: ../src/libgdl/gdl-dock-object.c:602 #, c-format -msgid "" -"Dock operation requested in a non-bound object %p. The application might " -"crash" -msgstr "" -"Opération d'attache demandée sur un ojbet %p non-lié. L'application pourrait " -"planter" +msgid "Dock operation requested in a non-bound object %p. The application might crash" +msgstr "Opération d'attache demandée sur un ojbet %p non-lié. L'application pourrait planter" #: ../src/libgdl/gdl-dock-object.c:609 #, c-format msgid "Cannot dock %p to %p because they belong to different masters" -msgstr "" -"Impossible d'attacher %p à %p car ils appartiennent à des maîtres différents" +msgstr "Impossible d'attacher %p à %p car ils appartiennent à des maîtres différents" #: ../src/libgdl/gdl-dock-object.c:651 #, c-format -msgid "" -"Attempt to bind to %p an already bound dock object %p (current master: %p)" -msgstr "" -"Tentative d'attacher à %p un objet d'attache %p déjà lié par ailleurs " -"(maître actuel: %p)" +msgid "Attempt to bind to %p an already bound dock object %p (current master: %p)" +msgstr "Tentative d'attacher à %p un objet d'attache %p déjà lié par ailleurs (maître actuel: %p)" #: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:230 msgid "Position" @@ -9195,12 +8323,8 @@ msgid "Sticky" msgstr "Collé" #: ../src/libgdl/gdl-dock-placeholder.c:142 -msgid "" -"Whether the placeholder will stick to its host or move up the hierarchy when " -"the host is redocked" -msgstr "" -"Détermine si l'élément substituable restera attaché à son hôte ou remontera " -"dans la hiérarchie quand l'hôte est réattaché" +msgid "Whether the placeholder will stick to its host or move up the hierarchy when the host is redocked" +msgstr "Détermine si l'élément substituable restera attaché à son hôte ou remontera dans la hiérarchie quand l'hôte est réattaché" #: ../src/libgdl/gdl-dock-placeholder.c:149 msgid "Host" @@ -9215,12 +8339,8 @@ msgid "Next placement" msgstr "Placement suivant" #: ../src/libgdl/gdl-dock-placeholder.c:158 -msgid "" -"The position an item will be docked to our host if a request is made to dock " -"to us" -msgstr "" -"La position où un élément sera attaché à l'hôte si une demande d'attachement " -"est faite" +msgid "The position an item will be docked to our host if a request is made to dock to us" +msgstr "La position où un élément sera attaché à l'hôte si une demande d'attachement est faite" #: ../src/libgdl/gdl-dock-placeholder.c:168 msgid "Width for the widget when it's attached to the placeholder" @@ -9236,9 +8356,7 @@ msgstr "Niveau supérieur flottant" #: ../src/libgdl/gdl-dock-placeholder.c:183 msgid "Whether the placeholder is standing in for a floating toplevel dock" -msgstr "" -"Détermine si l'élément substituable réserve la place pour un point d'attache " -"flottant de niveau supérieur" +msgstr "Détermine si l'élément substituable réserve la place pour un point d'attache flottant de niveau supérieur" #: ../src/libgdl/gdl-dock-placeholder.c:189 msgid "X Coordinate" @@ -9258,9 +8376,7 @@ msgstr "Coordonnée Y du point d'attache quand il est flottant" #: ../src/libgdl/gdl-dock-placeholder.c:499 msgid "Attempt to dock a dock object to an unbound placeholder" -msgstr "" -"Tentative d'attachement d'un objet d'attache sur un élément substituable non " -"lié" +msgstr "Tentative d'attachement d'un objet d'attache sur un élément substituable non lié" #: ../src/libgdl/gdl-dock-placeholder.c:611 #, c-format @@ -9269,19 +8385,14 @@ msgstr "Signal de détachement reçu d'un objet (%p) qui n'est pas notre hôte % #: ../src/libgdl/gdl-dock-placeholder.c:636 #, c-format -msgid "" -"Something weird happened while getting the child placement for %p from " -"parent %p" -msgstr "" -"Quelque chose de bizarre est arrivé en essayant d'obtenir le placement du " -"fils %p auprès du parent %p" +msgid "Something weird happened while getting the child placement for %p from parent %p" +msgstr "Quelque chose de bizarre est arrivé en essayant d'obtenir le placement du fils %p auprès du parent %p" #: ../src/libgdl/gdl-dock-tablabel.c:126 msgid "Dockitem which 'owns' this tablabel" msgstr "Élément d'attache qui « possède » ce tablabel" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:674 -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:674 ../src/ui/dialog/inkscape-preferences.cpp:717 msgid "Floating" msgstr "Flottant" @@ -9459,8 +8570,7 @@ msgid "Clone original path" msgstr "Cloner le chemin original" #. EXPERIMENTAL -#: ../src/live_effects/effect.cpp:137 -#: ../src/live_effects/lpe-show_handles.cpp:26 +#: ../src/live_effects/effect.cpp:137 ../src/live_effects/lpe-show_handles.cpp:26 msgid "Show handles" msgstr "Afficher les poignées" @@ -9480,7 +8590,7 @@ msgstr "Contour fuselé" #: ../src/live_effects/effect.cpp:143 #, fuzzy msgid "Attach path" -msgstr "Chemin de liaison :" +msgstr "Chemin de liaison" #: ../src/live_effects/effect.cpp:144 #, fuzzy @@ -9525,12 +8635,8 @@ msgid "Is visible?" msgstr "Visible ?" #: ../src/live_effects/effect.cpp:361 -msgid "" -"If unchecked, the effect remains applied to the object but is temporarily " -"disabled on canvas" -msgstr "" -"Si décochée, l'effet est appliqué à l'objet mais est temporairement " -"désactivé sur la zone de travail" +msgid "If unchecked, the effect remains applied to the object but is temporarily disabled on canvas" +msgstr "Si décochée, l'effet est appliqué à l'objet mais est temporairement désactivé sur la zone de travail" #: ../src/live_effects/effect.cpp:386 msgid "No effect" @@ -9539,9 +8645,7 @@ msgstr "Pas d'effet" #: ../src/live_effects/effect.cpp:494 #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" -msgstr "" -"Veuillez spécifier un chemin paramètre pour l'effet de chemin '%s' avec %d " -"clics de souris" +msgstr "Veuillez spécifier un chemin paramètre pour l'effet de chemin '%s' avec %d clics de souris" #: ../src/live_effects/effect.cpp:761 #, c-format @@ -9550,9 +8654,7 @@ msgstr "Édition du paramètre %s." #: ../src/live_effects/effect.cpp:766 msgid "None of the applied path effect's parameters can be edited on-canvas." -msgstr "" -"Aucun des paramètres d'effet de chemin ne peuvent être modifiés sur la zone " -"de travail." +msgstr "Aucun des paramètres d'effet de chemin ne peuvent être modifiés sur la zone de travail." #: ../src/live_effects/lpe-attach-path.cpp:29 msgid "Start path:" @@ -9575,8 +8677,7 @@ msgstr "" msgid "Start path curve start:" msgstr "Définir la couleur du chemin en rouge :" -#: ../src/live_effects/lpe-attach-path.cpp:31 -#: ../src/live_effects/lpe-attach-path.cpp:35 +#: ../src/live_effects/lpe-attach-path.cpp:31 ../src/live_effects/lpe-attach-path.cpp:35 #, fuzzy msgid "Starting curve" msgstr "Début :" @@ -9587,8 +8688,7 @@ msgstr "Début :" msgid "Start path curve end:" msgstr "Définir la couleur du chemin en rouge :" -#: ../src/live_effects/lpe-attach-path.cpp:32 -#: ../src/live_effects/lpe-attach-path.cpp:36 +#: ../src/live_effects/lpe-attach-path.cpp:32 ../src/live_effects/lpe-attach-path.cpp:36 #, fuzzy msgid "Ending curve" msgstr "courbure min." @@ -9627,10 +8727,8 @@ msgstr "Chemin de courbure :" msgid "Path along which to bend the original path" msgstr "Chemin le long duquel le chemin original sera courbé" -#: ../src/live_effects/lpe-bendpath.cpp:54 -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/transformation.cpp:74 -#: ../src/ui/widget/page-sizer.cpp:237 +#: ../src/live_effects/lpe-bendpath.cpp:54 ../src/live_effects/lpe-patternalongpath.cpp:62 ../src/ui/dialog/export.cpp:285 +#: ../src/ui/dialog/transformation.cpp:74 ../src/ui/widget/page-sizer.cpp:237 msgid "_Width:" msgstr "_Largeur :" @@ -9654,16 +8752,12 @@ msgstr "Le chemin _original est vertical" msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "Tourne l'original de 90 degrés avant de le déformer le long du chemin" -#: ../src/live_effects/lpe-bounding-box.cpp:24 -#: ../src/live_effects/lpe-clone-original.cpp:18 -#: ../src/live_effects/lpe-fill-between-many.cpp:25 +#: ../src/live_effects/lpe-bounding-box.cpp:24 ../src/live_effects/lpe-clone-original.cpp:18 ../src/live_effects/lpe-fill-between-many.cpp:25 #: ../src/live_effects/lpe-fill-between-strokes.cpp:23 msgid "Linked path:" msgstr "Chemin lié :" -#: ../src/live_effects/lpe-bounding-box.cpp:24 -#: ../src/live_effects/lpe-clone-original.cpp:18 -#: ../src/live_effects/lpe-fill-between-strokes.cpp:23 +#: ../src/live_effects/lpe-bounding-box.cpp:24 ../src/live_effects/lpe-clone-original.cpp:18 ../src/live_effects/lpe-fill-between-strokes.cpp:23 msgid "Path from which to take the original path data" msgstr "Chemin à partir duquel le chemin original sera cloné" @@ -9684,14 +8778,11 @@ msgstr "" msgid "Change number of steps with CTRL pressed" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:31 -#: ../src/live_effects/lpe-simplify.cpp:33 -#: ../src/live_effects/lpe-transform_2pts.cpp:43 +#: ../src/live_effects/lpe-bspline.cpp:31 ../src/live_effects/lpe-simplify.cpp:33 ../src/live_effects/lpe-transform_2pts.cpp:43 msgid "Helper size:" msgstr "Taille de la poignée :" -#: ../src/live_effects/lpe-bspline.cpp:31 -#: ../src/live_effects/lpe-simplify.cpp:33 +#: ../src/live_effects/lpe-bspline.cpp:31 ../src/live_effects/lpe-simplify.cpp:33 msgid "Helper size" msgstr "Taille de la poignée" @@ -9703,8 +8794,7 @@ msgstr "" msgid "Apply changes if weight > 0%" msgstr "" -#: ../src/live_effects/lpe-bspline.cpp:34 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:56 +#: ../src/live_effects/lpe-bspline.cpp:34 ../src/live_effects/lpe-fillet-chamfer.cpp:56 msgid "Change only selected nodes" msgstr "Modifier les nœuds sélectionnés seulement" @@ -9738,9 +8828,7 @@ msgstr "Titre par défaut" msgid "Change to 0 weight" msgstr "Hauteur de capitale :" -#: ../src/live_effects/lpe-bspline.cpp:160 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:232 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-bspline.cpp:160 ../src/live_effects/lpe-fillet-chamfer.cpp:232 ../src/live_effects/lpe-fillet-chamfer.cpp:254 #: ../src/live_effects/parameter/parameter.cpp:170 msgid "Change scalar parameter" msgstr "Modifier le paramètre scalaire" @@ -9782,48 +8870,34 @@ msgid "Sta_rt edge variance:" msgstr "Va_riance du bord de départ :" #: ../src/live_effects/lpe-curvestitch.cpp:43 -msgid "" -"The amount of random jitter to move the start points of the stitches inside " -"& outside the guide path" -msgstr "" -"La quantité de perturbation aléatoire dans la position des points de départ " -"des liaisons, à l'intérieur et à l'extérieur du guide" +msgid "The amount of random jitter to move the start points of the stitches inside & outside the guide path" +msgstr "La quantité de perturbation aléatoire dans la position des points de départ des liaisons, à l'intérieur et à l'extérieur du guide" #: ../src/live_effects/lpe-curvestitch.cpp:44 msgid "Sta_rt spacing variance:" msgstr "Va_riance de l'espacement de départ :" #: ../src/live_effects/lpe-curvestitch.cpp:44 -msgid "" -"The amount of random shifting to move the start points of the stitches back " -"& forth along the guide path" -msgstr "" -"La quantité de perturbation aléatoire dans la position des extrémités de " -"chaque point de départ des liaisons, le long du guide" +msgid "The amount of random shifting to move the start points of the stitches back & forth along the guide path" +msgstr "La quantité de perturbation aléatoire dans la position des extrémités de chaque point de départ des liaisons, le long du guide" #: ../src/live_effects/lpe-curvestitch.cpp:45 msgid "End ed_ge variance:" msgstr "Variance du bord de _fin :" #: ../src/live_effects/lpe-curvestitch.cpp:45 -msgid "" -"The amount of randomness that moves the end points of the stitches inside & " -"outside the guide path" +msgid "The amount of randomness that moves the end points of the stitches inside & outside the guide path" msgstr "" -"La quantité de perturbation aléatoire dans la position des extrémités de " -"chaque point de fin des liaisons, à l'intérieur et à l'extérieur du guide" +"La quantité de perturbation aléatoire dans la position des extrémités de chaque point de fin des liaisons, à l'intérieur et à l'extérieur du " +"guide" #: ../src/live_effects/lpe-curvestitch.cpp:46 msgid "End spa_cing variance:" msgstr "Variance de l'espa_cement de fin :" #: ../src/live_effects/lpe-curvestitch.cpp:46 -msgid "" -"The amount of random shifting to move the end points of the stitches back & " -"forth along the guide path" -msgstr "" -"La quantité de perturbation aléatoire dans la position des extrémités de " -"chaque point de fin des liaisons, le long du guide" +msgid "The amount of random shifting to move the end points of the stitches back & forth along the guide path" +msgstr "La quantité de perturbation aléatoire dans la position des extrémités de chaque point de fin des liaisons, le long du guide" #: ../src/live_effects/lpe-curvestitch.cpp:47 msgid "Scale _width:" @@ -9839,13 +8913,11 @@ msgstr "R_edimensionner l'épaisseur en fonction de la longueur" #: ../src/live_effects/lpe-curvestitch.cpp:48 msgid "Scale the width of the stitch path relative to its length" -msgstr "" -"Redimensionner l'épaisseur du chemin de liaison proportionnellement à sa " -"longueur" +msgstr "Redimensionner l'épaisseur du chemin de liaison proportionnellement à sa longueur" #: ../src/live_effects/lpe-ellipse_5pts.cpp:77 msgid "Five points required for constructing an ellipse" -msgstr "" +msgstr "Cinq points sont nécessaires à la construction d'une ellipse" #: ../src/live_effects/lpe-ellipse_5pts.cpp:162 #, fuzzy @@ -9858,8 +8930,7 @@ msgstr "Chemin supérieur de l'enveloppe :" #: ../src/live_effects/lpe-envelope.cpp:31 msgid "Top path along which to bend the original path" -msgstr "" -"Chemin supérieur de l'enveloppe le long duquel le chemin original sera courbé" +msgstr "Chemin supérieur de l'enveloppe le long duquel le chemin original sera courbé" #: ../src/live_effects/lpe-envelope.cpp:32 msgid "Right bend path:" @@ -9867,8 +8938,7 @@ msgstr "Chemin droit de l'enveloppe :" #: ../src/live_effects/lpe-envelope.cpp:32 msgid "Right path along which to bend the original path" -msgstr "" -"Chemin droit de l'enveloppe le long duquel le chemin original sera courbé" +msgstr "Chemin droit de l'enveloppe le long duquel le chemin original sera courbé" #: ../src/live_effects/lpe-envelope.cpp:33 msgid "Bottom bend path:" @@ -9876,8 +8946,7 @@ msgstr "Chemin inférieur de l'enveloppe :" #: ../src/live_effects/lpe-envelope.cpp:33 msgid "Bottom path along which to bend the original path" -msgstr "" -"Chemin inférieur de l'enveloppe le long duquel le chemin original sera courbé" +msgstr "Chemin inférieur de l'enveloppe le long duquel le chemin original sera courbé" #: ../src/live_effects/lpe-envelope.cpp:34 msgid "Left bend path:" @@ -9885,8 +8954,7 @@ msgstr "Chemin gauche de l'enveloppe :" #: ../src/live_effects/lpe-envelope.cpp:34 msgid "Left path along which to bend the original path" -msgstr "" -"Chemin gauche de l'enveloppe le long duquel le chemin original sera courbé" +msgstr "Chemin gauche de l'enveloppe le long duquel le chemin original sera courbé" #: ../src/live_effects/lpe-envelope.cpp:35 #, fuzzy @@ -9919,27 +8987,24 @@ msgid "Paths from which to take the original path data" msgstr "Chemin à partir duquel le chemin original sera cloné" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 -#, fuzzy msgid "Second path:" -msgstr "Chemin de courbure :" +msgstr "Deuxième chemin :" #: ../src/live_effects/lpe-fill-between-strokes.cpp:24 #, fuzzy msgid "Second path from which to take the original path data" -msgstr "Chemin à partir duquel le chemin original sera cloné" +msgstr "Second chemin à partir duquel le chemin original sera cloné" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 -#, fuzzy msgid "Reverse Second" -msgstr "Inverser le dégradé" +msgstr "Inverser le second chemin" #: ../src/live_effects/lpe-fill-between-strokes.cpp:25 #, fuzzy msgid "Reverses the second path order" msgstr "Inverser la direction du dégradé" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:41 -#: ../share/extensions/render_barcode_qrcode.inx.h:5 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:41 ../share/extensions/render_barcode_qrcode.inx.h:5 msgid "Auto" msgstr "Auto" @@ -10003,23 +9068,19 @@ msgstr "Taille du marquage de direction :" msgid "Helper size with direction" msgstr "Taille du marquage de direction" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:157 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:157 ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 msgid "Fillet" msgstr "Filet" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:161 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:161 ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 msgid "Inverse fillet" msgstr "Filet inversé" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:166 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:166 ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 msgid "Chamfer" msgstr "Chanfrein" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:170 -#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:170 ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 msgid "Inverse chamfer" msgstr "Chanfrein inversé" @@ -10028,16 +9089,14 @@ msgstr "Chanfrein inversé" msgid "Convert to fillet" msgstr "Convertir en Braille" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:246 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:246 ../src/live_effects/lpe-fillet-chamfer.cpp:270 #, fuzzy msgid "Convert to inverse fillet" msgstr "Convertir en Braille" #: ../src/live_effects/lpe-fillet-chamfer.cpp:262 -#, fuzzy msgid "Convert to chamfer" -msgstr "Convertir en tirets" +msgstr "Convertir en chanfrein" #: ../src/live_effects/lpe-fillet-chamfer.cpp:282 msgid "Knots and helper paths refreshed" @@ -10056,12 +9115,8 @@ msgid "_Phi:" msgstr "_Phi :" #: ../src/live_effects/lpe-gears.cpp:215 -msgid "" -"Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in " -"contact." -msgstr "" -"Angle de contact des dents (en général de 20 à 25 degrés). Représente la " -"fraction des dents qui ne sont pas en contact." +msgid "Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in contact." +msgstr "Angle de contact des dents (en général de 20 à 25 degrés). Représente la fraction des dents qui ne sont pas en contact." #: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Trajectory:" @@ -10077,8 +9132,7 @@ msgstr "I_ncrément :" #: ../src/live_effects/lpe-interpolate.cpp:32 msgid "Determines the number of steps from start to end path." -msgstr "" -"Définit le nombre d'étapes entre le chemin de début et le chemin de fin." +msgstr "Définit le nombre d'étapes entre le chemin de début et le chemin de fin." #: ../src/live_effects/lpe-interpolate.cpp:33 msgid "E_quidistant spacing" @@ -10086,65 +9140,46 @@ msgstr "Espacement é_quidistant" #: ../src/live_effects/lpe-interpolate.cpp:33 msgid "" -"If true, the spacing between intermediates is constant along the length of " -"the path. If false, the distance depends on the location of the nodes of the " -"trajectory path." +"If true, the spacing between intermediates is constant along the length of the path. If false, the distance depends on the location of the " +"nodes of the trajectory path." msgstr "" -"Si vrai, l'espacement entre les intermédiaires est constant tout au long de " -"la longueur du chemin. Si faux, la distance dépend du positionnement des " -"nœuds de la trajectoire." +"Si vrai, l'espacement entre les intermédiaires est constant tout au long de la longueur du chemin. Si faux, la distance dépend du " +"positionnement des nœuds de la trajectoire." -#: ../src/live_effects/lpe-interpolate_points.cpp:26 -#: ../src/live_effects/lpe-powerstroke.cpp:134 +#: ../src/live_effects/lpe-interpolate_points.cpp:26 ../src/live_effects/lpe-powerstroke.cpp:134 msgid "CubicBezierFit" msgstr "CubicBezierFit" -#: ../src/live_effects/lpe-interpolate_points.cpp:27 -#: ../src/live_effects/lpe-powerstroke.cpp:135 +#: ../src/live_effects/lpe-interpolate_points.cpp:27 ../src/live_effects/lpe-powerstroke.cpp:135 msgid "CubicBezierJohan" msgstr "CubicBezierJohan" -#: ../src/live_effects/lpe-interpolate_points.cpp:28 -#: ../src/live_effects/lpe-powerstroke.cpp:136 +#: ../src/live_effects/lpe-interpolate_points.cpp:28 ../src/live_effects/lpe-powerstroke.cpp:136 msgid "SpiroInterpolator" msgstr "SpiroInterpolator" -#: ../src/live_effects/lpe-interpolate_points.cpp:29 -#: ../src/live_effects/lpe-powerstroke.cpp:137 +#: ../src/live_effects/lpe-interpolate_points.cpp:29 ../src/live_effects/lpe-powerstroke.cpp:137 msgid "Centripetal Catmull-Rom" msgstr "Centripète Catmull-Rom" -#: ../src/live_effects/lpe-interpolate_points.cpp:37 -#: ../src/live_effects/lpe-powerstroke.cpp:179 +#: ../src/live_effects/lpe-interpolate_points.cpp:37 ../src/live_effects/lpe-powerstroke.cpp:179 msgid "Interpolator type:" msgstr "Type d'interpolateur :" -#: ../src/live_effects/lpe-interpolate_points.cpp:38 -#: ../src/live_effects/lpe-powerstroke.cpp:179 -msgid "" -"Determines which kind of interpolator will be used to interpolate between " -"stroke width along the path" -msgstr "" -"Définit quel type d'interpolateur sera utilisé pour déterminer l'épaisseur " -"du chemin" +#: ../src/live_effects/lpe-interpolate_points.cpp:38 ../src/live_effects/lpe-powerstroke.cpp:179 +msgid "Determines which kind of interpolator will be used to interpolate between stroke width along the path" +msgstr "Définit quel type d'interpolateur sera utilisé pour déterminer l'épaisseur du chemin" -#: ../src/live_effects/lpe-jointype.cpp:31 -#: ../src/live_effects/lpe-powerstroke.cpp:166 -#: ../src/live_effects/lpe-taperstroke.cpp:63 +#: ../src/live_effects/lpe-jointype.cpp:31 ../src/live_effects/lpe-powerstroke.cpp:166 ../src/live_effects/lpe-taperstroke.cpp:63 msgid "Beveled" msgstr "Biseauté" -#: ../src/live_effects/lpe-jointype.cpp:32 -#: ../src/live_effects/lpe-jointype.cpp:40 -#: ../src/live_effects/lpe-powerstroke.cpp:167 -#: ../src/live_effects/lpe-taperstroke.cpp:64 -#: ../src/widgets/star-toolbar.cpp:534 +#: ../src/live_effects/lpe-jointype.cpp:32 ../src/live_effects/lpe-jointype.cpp:40 ../src/live_effects/lpe-powerstroke.cpp:167 +#: ../src/live_effects/lpe-taperstroke.cpp:64 ../src/widgets/star-toolbar.cpp:534 msgid "Rounded" msgstr "Arrondi" -#: ../src/live_effects/lpe-jointype.cpp:33 -#: ../src/live_effects/lpe-powerstroke.cpp:170 -#: ../src/live_effects/lpe-taperstroke.cpp:65 +#: ../src/live_effects/lpe-jointype.cpp:33 ../src/live_effects/lpe-powerstroke.cpp:170 ../src/live_effects/lpe-taperstroke.cpp:65 msgid "Miter" msgstr "Raccordé" @@ -10154,23 +9189,19 @@ msgid "Miter Clip" msgstr "Limite du raccord :" #. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well -#: ../src/live_effects/lpe-jointype.cpp:35 -#: ../src/live_effects/lpe-powerstroke.cpp:169 +#: ../src/live_effects/lpe-jointype.cpp:35 ../src/live_effects/lpe-powerstroke.cpp:169 msgid "Extrapolated arc" msgstr "Arc extrapolé" -#: ../src/live_effects/lpe-jointype.cpp:39 -#: ../src/live_effects/lpe-powerstroke.cpp:149 +#: ../src/live_effects/lpe-jointype.cpp:39 ../src/live_effects/lpe-powerstroke.cpp:149 msgid "Butt" msgstr "Sur le nœud" -#: ../src/live_effects/lpe-jointype.cpp:41 -#: ../src/live_effects/lpe-powerstroke.cpp:150 +#: ../src/live_effects/lpe-jointype.cpp:41 ../src/live_effects/lpe-powerstroke.cpp:150 msgid "Square" msgstr "Carrée" -#: ../src/live_effects/lpe-jointype.cpp:42 -#: ../src/live_effects/lpe-powerstroke.cpp:152 +#: ../src/live_effects/lpe-jointype.cpp:42 ../src/live_effects/lpe-powerstroke.cpp:152 msgid "Peak" msgstr "En arête" @@ -10191,22 +9222,17 @@ msgstr "Orientation de la règle" #. Join type #. TRANSLATORS: The line join style specifies the shape to be used at the #. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-jointype.cpp:53 -#: ../src/live_effects/lpe-powerstroke.cpp:182 -#: ../src/widgets/stroke-style.cpp:227 +#: ../src/live_effects/lpe-jointype.cpp:53 ../src/live_effects/lpe-powerstroke.cpp:182 ../src/widgets/stroke-style.cpp:227 msgid "Join:" msgstr "Raccord :" -#: ../src/live_effects/lpe-jointype.cpp:53 -#: ../src/live_effects/lpe-powerstroke.cpp:182 +#: ../src/live_effects/lpe-jointype.cpp:53 ../src/live_effects/lpe-powerstroke.cpp:182 msgid "Determines the shape of the path's corners" msgstr "Définit la forme des coins du chemin" #. start_lean(_("Start path lean"), _("Start path lean"), "start_lean", &wr, this, 0.), #. end_lean(_("End path lean"), _("End path lean"), "end_lean", &wr, this, 0.), -#: ../src/live_effects/lpe-jointype.cpp:56 -#: ../src/live_effects/lpe-powerstroke.cpp:183 -#: ../src/live_effects/lpe-taperstroke.cpp:78 +#: ../src/live_effects/lpe-jointype.cpp:56 ../src/live_effects/lpe-powerstroke.cpp:183 ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Miter limit:" msgstr "Limite du raccord :" @@ -10239,9 +9265,7 @@ msgstr "Proport_ionnellement à la largeur du trait" #: ../src/live_effects/lpe-knot.cpp:352 msgid "Consider 'Interruption width' as a ratio of stroke width" -msgstr "" -"La largeur de l'interruption est exprimée en proportion de l'épaisseur du " -"trait" +msgstr "La largeur de l'interruption est exprimée en proportion de l'épaisseur du trait" #: ../src/live_effects/lpe-knot.cpp:353 msgid "St_roke width" @@ -10265,9 +9289,7 @@ msgstr "Taille du sé_lecteur :" #: ../src/live_effects/lpe-knot.cpp:355 msgid "Orientation indicator/switcher size" -msgstr "" -"Le sélecteur précise l'orientation des croisements et permet de la changer " -"(clic). Changer la sélection par cliquer-déplacer" +msgstr "Le sélecteur précise l'orientation des croisements et permet de la changer (clic). Changer la sélection par cliquer-déplacer" #: ../src/live_effects/lpe-knot.cpp:356 msgid "Crossing Signs" @@ -10286,14 +9308,12 @@ msgstr "Glisser pour sélectionner un croisement, cliquer pour le basculer" msgid "Change knot crossing" msgstr "Modifier le croisement de l'entrelacs" -#: ../src/live_effects/lpe-lattice2.cpp:47 -#: ../src/live_effects/lpe-perspective-envelope.cpp:43 +#: ../src/live_effects/lpe-lattice2.cpp:47 ../src/live_effects/lpe-perspective-envelope.cpp:43 #, fuzzy msgid "Mirror movements in horizontal" msgstr "Déplacer les nœuds horizontalement" -#: ../src/live_effects/lpe-lattice2.cpp:48 -#: ../src/live_effects/lpe-perspective-envelope.cpp:44 +#: ../src/live_effects/lpe-lattice2.cpp:48 ../src/live_effects/lpe-perspective-envelope.cpp:44 #, fuzzy msgid "Mirror movements in vertical" msgstr "Déplacer les nœuds verticalement" @@ -10304,9 +9324,7 @@ msgstr "Contrôle 0 :" #: ../src/live_effects/lpe-lattice2.cpp:49 msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 0 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 0 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 1:" @@ -10314,9 +9332,7 @@ msgstr "Contrôle 1 :" #: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 1 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 1 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 2:" @@ -10324,9 +9340,7 @@ msgstr "Contrôle 2 :" #: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 2 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 2 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 3:" @@ -10334,9 +9348,7 @@ msgstr "Contrôle 3 :" #: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 3 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 3 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 4:" @@ -10344,9 +9356,7 @@ msgstr "Contrôle 4 :" #: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 4 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 4 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 5:" @@ -10354,9 +9364,7 @@ msgstr "Contrôle 5 :" #: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 5 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 5 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 6:" @@ -10364,9 +9372,7 @@ msgstr "Contrôle 6 :" #: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 6 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 6 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 7:" @@ -10374,31 +9380,23 @@ msgstr "Contrôle 7 :" #: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 7 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 7 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 8x9:" msgstr "Contrôle 8x9 :" #: ../src/live_effects/lpe-lattice2.cpp:57 -msgid "" -"Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 8x9 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 8x9 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:58 msgid "Control 10x11:" msgstr "Contrôle 10x11 :" #: ../src/live_effects/lpe-lattice2.cpp:58 -msgid "" -"Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 10x11 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 10x11 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:59 msgid "Control 12:" @@ -10406,9 +9404,7 @@ msgstr "Contrôle 12 :" #: ../src/live_effects/lpe-lattice2.cpp:59 msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 12 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 12 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 13:" @@ -10416,9 +9412,7 @@ msgstr "Contrôle 13 :" #: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 13 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 13 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 14:" @@ -10426,9 +9420,7 @@ msgstr "Contrôle 14 :" #: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 14 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 14 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 15:" @@ -10436,9 +9428,7 @@ msgstr "Contrôle 15 :" #: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 15 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 15 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 16:" @@ -10446,9 +9436,7 @@ msgstr "Contrôle 16 :" #: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 16 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 16 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 17:" @@ -10456,9 +9444,7 @@ msgstr "Contrôle 17 :" #: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 17 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 17 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 18:" @@ -10466,9 +9452,7 @@ msgstr "Contrôle 18 :" #: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 18 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 18 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 19:" @@ -10476,94 +9460,69 @@ msgstr "Contrôle 19 :" #: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 19 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgstr "Contrôle 19 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 20x21:" msgstr "Contrôle 20x21 :" #: ../src/live_effects/lpe-lattice2.cpp:67 -msgid "" -"Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 20x21 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 20x21 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:68 msgid "Control 22x23:" msgstr "Contrôle 22x23 :" #: ../src/live_effects/lpe-lattice2.cpp:68 -msgid "" -"Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 22x23 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 22x23 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:69 msgid "Control 24x26:" msgstr "Contrôle 24x26 :" #: ../src/live_effects/lpe-lattice2.cpp:69 -msgid "" -"Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 24x26 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 24x26 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:70 msgid "Control 25x27:" msgstr "Contrôle 25x27 :" #: ../src/live_effects/lpe-lattice2.cpp:70 -msgid "" -"Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 25x27 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 25x27 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:71 msgid "Control 28x30:" msgstr "Contrôle 28x30 :" #: ../src/live_effects/lpe-lattice2.cpp:71 -msgid "" -"Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 28x30 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 28x30 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:72 msgid "Control 29x31:" msgstr "Contrôle 29x31 :" #: ../src/live_effects/lpe-lattice2.cpp:72 -msgid "" -"Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" -msgstr "" -"Contrôle 29x31 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour " -"déplacer le long des axes" +msgid "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 29x31 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:73 msgid "Control 32x33x34x35:" msgstr "Contrôle 32x33x34x35 :" #: ../src/live_effects/lpe-lattice2.cpp:73 -msgid "" -"Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " -"axes" -msgstr "" -"Contrôle 32x33x34x35 - Ctrl+Alt+clic pour réinitialiser, Ctrl " -"pour déplacer le long des axes" +msgid "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "Contrôle 32x33x34x35 - Ctrl+Alt+clic pour réinitialiser, Ctrl pour déplacer le long des axes" #: ../src/live_effects/lpe-lattice2.cpp:236 msgid "Reset grid" msgstr "Réinitaliser la grille" -#: ../src/live_effects/lpe-lattice2.cpp:268 -#: ../src/live_effects/lpe-lattice2.cpp:283 +#: ../src/live_effects/lpe-lattice2.cpp:268 ../src/live_effects/lpe-lattice2.cpp:283 msgid "Show Points" msgstr "Afficher les points" @@ -10571,23 +9530,19 @@ msgstr "Afficher les points" msgid "Hide Points" msgstr "Masquer les points" -#: ../src/live_effects/lpe-patternalongpath.cpp:50 -#: ../share/extensions/pathalongpath.inx.h:10 +#: ../src/live_effects/lpe-patternalongpath.cpp:50 ../share/extensions/pathalongpath.inx.h:10 msgid "Single" msgstr "Unique" -#: ../src/live_effects/lpe-patternalongpath.cpp:51 -#: ../share/extensions/pathalongpath.inx.h:11 +#: ../src/live_effects/lpe-patternalongpath.cpp:51 ../share/extensions/pathalongpath.inx.h:11 msgid "Single, stretched" msgstr "Unique, étiré" -#: ../src/live_effects/lpe-patternalongpath.cpp:52 -#: ../share/extensions/pathalongpath.inx.h:12 +#: ../src/live_effects/lpe-patternalongpath.cpp:52 ../share/extensions/pathalongpath.inx.h:12 msgid "Repeated" msgstr "Répété" -#: ../src/live_effects/lpe-patternalongpath.cpp:53 -#: ../share/extensions/pathalongpath.inx.h:13 +#: ../src/live_effects/lpe-patternalongpath.cpp:53 ../share/extensions/pathalongpath.inx.h:13 msgid "Repeated, stretched" msgstr "Répété, étiré" @@ -10625,12 +9580,8 @@ msgstr "Espa_cement :" #: ../src/live_effects/lpe-patternalongpath.cpp:68 #, no-c-format -msgid "" -"Space between copies of the pattern. Negative values allowed, but are " -"limited to -90% of pattern width." -msgstr "" -"Espace entre les exemplaires du motif. Les valeurs négatives sont " -"autorisées, mais limitées à -90 % de la largeur du motif." +msgid "Space between copies of the pattern. Negative values allowed, but are limited to -90% of pattern width." +msgstr "Espace entre les exemplaires du motif. Les valeurs négatives sont autorisées, mais limitées à -90 % de la largeur du motif." #: ../src/live_effects/lpe-patternalongpath.cpp:70 msgid "No_rmal offset:" @@ -10645,12 +9596,9 @@ msgid "Offsets in _unit of pattern size" msgstr "Décalages en _unité de taille de motif" #: ../src/live_effects/lpe-patternalongpath.cpp:73 -msgid "" -"Spacing, tangential and normal offset are expressed as a ratio of width/" -"height" +msgid "Spacing, tangential and normal offset are expressed as a ratio of width/height" msgstr "" -"L'espacement et le décalage tangentiel sont exprimés en proportion de la " -"longueur du motif, le décalage normal en proportion de sa largeur" +"L'espacement et le décalage tangentiel sont exprimés en proportion de la longueur du motif, le décalage normal en proportion de sa largeur" #: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "Pattern is _vertical" @@ -10666,12 +9614,9 @@ msgstr "_Fusionner les extrémités proches :" #: ../src/live_effects/lpe-patternalongpath.cpp:77 msgid "Fuse ends closer than this number. 0 means don't fuse." -msgstr "" -"Fusionne les extrémités plus proches que ce nombre. 0 indique de ne pas " -"fusionner." +msgstr "Fusionne les extrémités plus proches que ce nombre. 0 indique de ne pas fusionner." -#: ../src/live_effects/lpe-perspective-envelope.cpp:35 -#: ../share/extensions/perspective.inx.h:1 +#: ../src/live_effects/lpe-perspective-envelope.cpp:35 ../share/extensions/perspective.inx.h:1 msgid "Perspective" msgstr "Perspective" @@ -10732,8 +9677,7 @@ msgstr "Poignées :" msgid "CubicBezierSmooth" msgstr "CubicBezierJohan" -#: ../src/live_effects/lpe-powerstroke.cpp:151 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 +#: ../src/live_effects/lpe-powerstroke.cpp:151 ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 msgid "Round" msgstr "Arrondie" @@ -10741,8 +9685,7 @@ msgstr "Arrondie" msgid "Zero width" msgstr "Aucune épaisseur" -#: ../src/live_effects/lpe-powerstroke.cpp:171 -#: ../src/widgets/pencil-toolbar.cpp:115 +#: ../src/live_effects/lpe-powerstroke.cpp:171 ../src/widgets/pencil-toolbar.cpp:115 msgid "Spiro" msgstr "Spiro" @@ -10756,22 +9699,15 @@ msgstr "Trier les points" #: ../src/live_effects/lpe-powerstroke.cpp:178 msgid "Sort offset points according to their time value along the curve" -msgstr "" -"Trie les points de décalage en fonction de leur valeur temps le long de la " -"courbe" +msgstr "Trie les points de décalage en fonction de leur valeur temps le long de la courbe" -#: ../src/live_effects/lpe-powerstroke.cpp:180 -#: ../share/extensions/fractalize.inx.h:3 +#: ../src/live_effects/lpe-powerstroke.cpp:180 ../share/extensions/fractalize.inx.h:3 msgid "Smoothness:" msgstr "Lissage :" #: ../src/live_effects/lpe-powerstroke.cpp:180 -msgid "" -"Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear " -"interpolation, 1 = smooth" -msgstr "" -"Définit le lissage pour l'interpolateur CubicBezierJohan (0 pour " -"interpolation linéaire, 1 pour interpolation douce)" +msgid "Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear interpolation, 1 = smooth" +msgstr "Définit le lissage pour l'interpolateur CubicBezierJohan (0 pour interpolation linéaire, 1 pour interpolation douce)" #: ../src/live_effects/lpe-powerstroke.cpp:181 msgid "Start cap:" @@ -10781,8 +9717,7 @@ msgstr "Terminaison initiale :" msgid "Determines the shape of the path's start" msgstr "Définit la forme de début du chemin" -#: ../src/live_effects/lpe-powerstroke.cpp:183 -#: ../src/widgets/stroke-style.cpp:278 +#: ../src/live_effects/lpe-powerstroke.cpp:183 ../src/widgets/stroke-style.cpp:278 msgid "Maximum length of the miter (in units of stroke width)" msgstr "Longueur maximum du raccord (en unités de l'épaisseur du contour)" @@ -10816,48 +9751,32 @@ msgid "Half-turns smoothness: 1st side, in:" msgstr "Lissage des demi-tours : 1er côté, arrivée :" #: ../src/live_effects/lpe-rough-hatches.cpp:228 -msgid "" -"Set smoothness/sharpness of path when reaching a 'bottom' half-turn. " -"0=sharp, 1=default" -msgstr "" -"Définit le lissage du chemin lorsqu'il atteint un demi-tour inférieur. " -"0=net, 1=défaut" +msgid "Set smoothness/sharpness of path when reaching a 'bottom' half-turn. 0=sharp, 1=default" +msgstr "Définit le lissage du chemin lorsqu'il atteint un demi-tour inférieur. 0=net, 1=défaut" #: ../src/live_effects/lpe-rough-hatches.cpp:229 msgid "1st side, out:" msgstr "1er côté, départ :" #: ../src/live_effects/lpe-rough-hatches.cpp:229 -msgid "" -"Set smoothness/sharpness of path when leaving a 'bottom' half-turn. 0=sharp, " -"1=default" -msgstr "" -"Définit le lissage du chemin lorsqu'il quitte un demi-tour inférieur. 0=net, " -"1=défaut" +msgid "Set smoothness/sharpness of path when leaving a 'bottom' half-turn. 0=sharp, 1=default" +msgstr "Définit le lissage du chemin lorsqu'il quitte un demi-tour inférieur. 0=net, 1=défaut" #: ../src/live_effects/lpe-rough-hatches.cpp:230 msgid "2nd side, in:" msgstr "2e côté, arrivée :" #: ../src/live_effects/lpe-rough-hatches.cpp:230 -msgid "" -"Set smoothness/sharpness of path when reaching a 'top' half-turn. 0=sharp, " -"1=default" -msgstr "" -"Définit le lissage du chemin lorsqu'il atteint un demi-tour supérieur. " -"0=net, 1=défaut" +msgid "Set smoothness/sharpness of path when reaching a 'top' half-turn. 0=sharp, 1=default" +msgstr "Définit le lissage du chemin lorsqu'il atteint un demi-tour supérieur. 0=net, 1=défaut" #: ../src/live_effects/lpe-rough-hatches.cpp:231 msgid "2nd side, out:" msgstr "2e côté, départ :" #: ../src/live_effects/lpe-rough-hatches.cpp:231 -msgid "" -"Set smoothness/sharpness of path when leaving a 'top' half-turn. 0=sharp, " -"1=default" -msgstr "" -"Définit le lissage du chemin lorsqu'il quitte un demi-tour supérieur. 0=net, " -"1=défaut" +msgid "Set smoothness/sharpness of path when leaving a 'top' half-turn. 0=sharp, 1=default" +msgstr "Définit le lissage du chemin lorsqu'il quitte un demi-tour supérieur. 0=net, 1=défaut" #: ../src/live_effects/lpe-rough-hatches.cpp:232 msgid "Magnitude jitter: 1st side:" @@ -10865,41 +9784,27 @@ msgstr "Aléa d'amplitude : 1er côté :" #: ../src/live_effects/lpe-rough-hatches.cpp:232 msgid "Randomly moves 'bottom' half-turns to produce magnitude variations." -msgstr "" -"Déplace aléatoirement les demi-tours inférieurs pour produire des variations " -"d'amplitude." +msgstr "Déplace aléatoirement les demi-tours inférieurs pour produire des variations d'amplitude." -#: ../src/live_effects/lpe-rough-hatches.cpp:233 -#: ../src/live_effects/lpe-rough-hatches.cpp:235 -#: ../src/live_effects/lpe-rough-hatches.cpp:237 +#: ../src/live_effects/lpe-rough-hatches.cpp:233 ../src/live_effects/lpe-rough-hatches.cpp:235 ../src/live_effects/lpe-rough-hatches.cpp:237 msgid "2nd side:" msgstr "2e côté :" #: ../src/live_effects/lpe-rough-hatches.cpp:233 msgid "Randomly moves 'top' half-turns to produce magnitude variations." -msgstr "" -"Déplace aléatoirement les demi-tours supérieurs pour produire des variations " -"d'amplitude." +msgstr "Déplace aléatoirement les demi-tours supérieurs pour produire des variations d'amplitude." #: ../src/live_effects/lpe-rough-hatches.cpp:234 msgid "Parallelism jitter: 1st side:" msgstr "Aléa de parallélisme : 1er côté :" #: ../src/live_effects/lpe-rough-hatches.cpp:234 -msgid "" -"Add direction randomness by moving 'bottom' half-turns tangentially to the " -"boundary." -msgstr "" -"Ajoute un caractère aléatoire à la direction en déplaçant les demi-tours " -"inférieurs tangentiellement par rapport à la bordure." +msgid "Add direction randomness by moving 'bottom' half-turns tangentially to the boundary." +msgstr "Ajoute un caractère aléatoire à la direction en déplaçant les demi-tours inférieurs tangentiellement par rapport à la bordure." #: ../src/live_effects/lpe-rough-hatches.cpp:235 -msgid "" -"Add direction randomness by randomly moving 'top' half-turns tangentially to " -"the boundary." -msgstr "" -"Ajoute un caractère aléatoire à la direction en déplaçant les demi-tours " -"supérieurs tangentiellement par rapport à la bordure." +msgid "Add direction randomness by randomly moving 'top' half-turns tangentially to the boundary." +msgstr "Ajoute un caractère aléatoire à la direction en déplaçant les demi-tours supérieurs tangentiellement par rapport à la bordure." #: ../src/live_effects/lpe-rough-hatches.cpp:236 msgid "Variance: 1st side:" @@ -10977,21 +9882,16 @@ msgid "Global bending" msgstr "Flexion globale" #: ../src/live_effects/lpe-rough-hatches.cpp:249 -msgid "" -"Relative position to a reference point defines global bending direction and " -"amount" -msgstr "" -"La position relative à un point de référence définit globalement la " -"direction de la flexion et sa quantité" +msgid "Relative position to a reference point defines global bending direction and amount" +msgstr "La position relative à un point de référence définit globalement la direction de la flexion et sa quantité" #: ../src/live_effects/lpe-roughen.cpp:30 ../share/extensions/addnodes.inx.h:4 msgid "By number of segments" msgstr "Par nombre de segments" #: ../src/live_effects/lpe-roughen.cpp:31 -#, fuzzy msgid "By max. segment size" -msgstr "Par longueur maximum de segment" +msgstr "Par longueur maximale de segment" #: ../src/live_effects/lpe-roughen.cpp:37 #, fuzzy @@ -10999,14 +9899,12 @@ msgid "Along nodes" msgstr "Joindre les nœuds" #: ../src/live_effects/lpe-roughen.cpp:38 -#, fuzzy msgid "Rand" -msgstr "Aléatoirement" +msgstr "Aléa" #: ../src/live_effects/lpe-roughen.cpp:39 -#, fuzzy msgid "Retract" -msgstr "Extraire" +msgstr "Rétracter" #. initialise your parameters here: #: ../src/live_effects/lpe-roughen.cpp:48 @@ -11018,59 +9916,49 @@ msgid "Division method" msgstr "Méthode de division" #: ../src/live_effects/lpe-roughen.cpp:50 -#, fuzzy msgid "Max. segment size" -msgstr "Par longueur maximum de segment" +msgstr "Taille maximale de segment" #: ../src/live_effects/lpe-roughen.cpp:52 -#, fuzzy msgid "Number of segments" -msgstr "Nombre de segments :" +msgstr "Nombre de segments" #: ../src/live_effects/lpe-roughen.cpp:54 -#, fuzzy msgid "Max. displacement in X" -msgstr "Déplacement maximum sur l'axe X (px) :" +msgstr "Déplacement maximum sur l'axe X" #: ../src/live_effects/lpe-roughen.cpp:56 -#, fuzzy msgid "Max. displacement in Y" -msgstr "Déplacement maximum sur l'axe Y (px) :" +msgstr "Déplacement maximum sur l'axe Y" #: ../src/live_effects/lpe-roughen.cpp:58 -#, fuzzy msgid "Global randomize" -msgstr "sensiblement aléatoire" +msgstr "Aléa global" #: ../src/live_effects/lpe-roughen.cpp:60 -#, fuzzy msgid "Handles" -msgstr "Poignée" +msgstr "Poignées" #: ../src/live_effects/lpe-roughen.cpp:60 -#, fuzzy msgid "Handles options" -msgstr "Rendre les positions aléatoires" +msgstr "Options des poignées" #: ../src/live_effects/lpe-roughen.cpp:62 #, fuzzy msgid "Max. smooth handle angle" msgstr "Poignée de nœud doux" -#: ../src/live_effects/lpe-roughen.cpp:64 -#: ../share/extensions/radiusrand.inx.h:5 +#: ../src/live_effects/lpe-roughen.cpp:64 ../share/extensions/radiusrand.inx.h:5 msgid "Shift nodes" msgstr "Déplacer les nœuds" #: ../src/live_effects/lpe-roughen.cpp:66 -#, fuzzy msgid "Fixed displacement" -msgstr "Déplacement en X :" +msgstr "Déplacement fixe" #: ../src/live_effects/lpe-roughen.cpp:66 -#, fuzzy msgid "Fixed displacement, 1/3 of segment length" -msgstr "Déplacement en X :" +msgstr "Déplacement fixé à 1/3 de la longueur de segment" #: ../src/live_effects/lpe-roughen.cpp:68 #, fuzzy @@ -11079,7 +9967,7 @@ msgstr "Préférences de l'outil aérographe" #: ../src/live_effects/lpe-roughen.cpp:68 msgid "For use with spray tool" -msgstr "" +msgstr "Pour utiliser avec l'outil aérographe" #: ../src/live_effects/lpe-roughen.cpp:128 msgid "Add nodes Subdivide each segment" @@ -11097,17 +9985,13 @@ msgstr "" msgid "Options Modify options to rough" msgstr "" -#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27 -#: ../share/extensions/restack.inx.h:16 -#: ../share/extensions/text_extract.inx.h:8 -#: ../share/extensions/text_merge.inx.h:8 +#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27 ../share/extensions/restack.inx.h:16 +#: ../share/extensions/text_extract.inx.h:8 ../share/extensions/text_merge.inx.h:8 msgid "Left" msgstr "Gauche" -#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/measure.inx.h:29 -#: ../share/extensions/restack.inx.h:18 -#: ../share/extensions/text_extract.inx.h:10 -#: ../share/extensions/text_merge.inx.h:10 +#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/measure.inx.h:29 ../share/extensions/restack.inx.h:18 +#: ../share/extensions/text_extract.inx.h:10 ../share/extensions/text_merge.inx.h:10 msgid "Right" msgstr "Droite" @@ -11120,15 +10004,11 @@ msgctxt "Border mark" msgid "None" msgstr "Aucune" -#: ../src/live_effects/lpe-ruler.cpp:33 -#: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/widgets/arc-toolbar.cpp:319 +#: ../src/live_effects/lpe-ruler.cpp:33 ../src/live_effects/lpe-transform_2pts.cpp:37 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "Début" -#: ../src/live_effects/lpe-ruler.cpp:34 -#: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/widgets/arc-toolbar.cpp:332 +#: ../src/live_effects/lpe-ruler.cpp:34 ../src/live_effects/lpe-transform_2pts.cpp:38 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "Fin" @@ -11140,11 +10020,8 @@ msgstr "Distance entre _graduations :" msgid "Distance between successive ruler marks" msgstr "Distance entre deux graduations successives" -#: ../src/live_effects/lpe-ruler.cpp:42 -#: ../share/extensions/foldablebox.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:9 -#: ../share/extensions/layout_nup.inx.h:3 -#: ../share/extensions/printing_marks.inx.h:11 +#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7 ../share/extensions/interp_att_g.inx.h:9 +#: ../share/extensions/layout_nup.inx.h:3 ../share/extensions/printing_marks.inx.h:11 msgid "Unit:" msgstr "Unité :" @@ -11174,8 +10051,7 @@ msgstr "Graduations _principales :" #: ../src/live_effects/lpe-ruler.cpp:45 msgid "Draw a major mark every ... steps" -msgstr "" -"Dessine une graduation principale en fonction de ce nombre de graduations" +msgstr "Dessine une graduation principale en fonction de ce nombre de graduations" #: ../src/live_effects/lpe-ruler.cpp:46 msgid "Shift marks _by:" @@ -11191,9 +10067,7 @@ msgstr "Positionnement de la règle :" #: ../src/live_effects/lpe-ruler.cpp:47 msgid "Direction of marks (when viewing along the path from start to end)" -msgstr "" -"Positionnement de la règle, en regardant le long du chemin du début vers la " -"fin" +msgstr "Positionnement de la règle, en regardant le long du chemin du début vers la fin" #: ../src/live_effects/lpe-ruler.cpp:48 msgid "_Offset:" @@ -11209,41 +10083,33 @@ msgstr "Graduation à l'extrémité :" #: ../src/live_effects/lpe-ruler.cpp:49 msgid "Choose whether to draw marks at the beginning and end of the path" -msgstr "" -"Choisir si les graduations doivent être dessinées au début ou à la fin du " -"chemin" +msgstr "Choisir si les graduations doivent être dessinées au début ou à la fin du chemin" #: ../src/live_effects/lpe-show_handles.cpp:25 -#, fuzzy msgid "Show nodes" -msgstr "Afficher les poignées" +msgstr "Afficher les nœuds" #: ../src/live_effects/lpe-show_handles.cpp:27 -#, fuzzy msgid "Show path" -msgstr "Dessiner un chemin" +msgstr "Afficher le chemin" #: ../src/live_effects/lpe-show_handles.cpp:28 #, fuzzy msgid "Scale nodes and handles" msgstr "Aimanter aux nœuds, chemins et poignées" -#: ../src/live_effects/lpe-show_handles.cpp:29 -#: ../src/ui/tool/multi-path-manipulator.cpp:788 -#: ../src/ui/tool/multi-path-manipulator.cpp:791 +#: ../src/live_effects/lpe-show_handles.cpp:29 ../src/ui/tool/multi-path-manipulator.cpp:788 ../src/ui/tool/multi-path-manipulator.cpp:791 msgid "Rotate nodes" msgstr "Tourner les nœuds" #: ../src/live_effects/lpe-show_handles.cpp:55 msgid "" -"The \"show handles\" path effect will remove any custom style on the object " -"you are applying it to. If this is not what you want, click Cancel." +"The \"show handles\" path effect will remove any custom style on the object you are applying it to. If this is not what you want, click Cancel." msgstr "" #: ../src/live_effects/lpe-simplify.cpp:30 -#, fuzzy msgid "Steps:" -msgstr "I_ncrément :" +msgstr "Incréments :" #: ../src/live_effects/lpe-simplify.cpp:30 #, fuzzy @@ -11308,9 +10174,7 @@ msgstr "Variation de longueur des traits :" #: ../src/live_effects/lpe-sketch.cpp:42 msgid "Random variation of stroke length (relative to maximum length)" -msgstr "" -"Variation aléatoire de la longueur des traits (relative à la longueur " -"maximale)" +msgstr "Variation aléatoire de la longueur des traits (relative à la longueur maximale)" #: ../src/live_effects/lpe-sketch.cpp:43 msgid "Max. overlap:" @@ -11326,20 +10190,15 @@ msgstr "Variation de chevauchement :" #: ../src/live_effects/lpe-sketch.cpp:46 msgid "Random variation of overlap (relative to maximum overlap)" -msgstr "" -"Variation aléatoire de chevauchement (relatif au chevauchement maximum)" +msgstr "Variation aléatoire de chevauchement (relatif au chevauchement maximum)" #: ../src/live_effects/lpe-sketch.cpp:47 msgid "Max. end tolerance:" msgstr "Tolérance maximale de fin :" #: ../src/live_effects/lpe-sketch.cpp:48 -msgid "" -"Maximum distance between ends of original and approximating paths (relative " -"to maximum length)" -msgstr "" -"Distance maximale entre la fin de l'original et les chemins approximatifs " -"(relatif à la longueur maximale)" +msgid "Maximum distance between ends of original and approximating paths (relative to maximum length)" +msgstr "Distance maximale entre la fin de l'original et les chemins approximatifs (relatif à la longueur maximale)" #: ../src/live_effects/lpe-sketch.cpp:49 msgid "Average offset:" @@ -11373,19 +10232,14 @@ msgstr "Lignes de construction :" msgid "How many construction lines (tangents) to draw" msgstr "Nombre de lignes de construction (tangentes) à dessiner" -#: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2892 -#: ../share/extensions/render_alphabetsoup.inx.h:3 +#: ../src/live_effects/lpe-sketch.cpp:58 ../src/ui/dialog/filter-effects-dialog.cpp:2892 ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "Longueur/Courbure :" #: ../src/live_effects/lpe-sketch.cpp:59 -msgid "" -"Scale factor relating curvature and length of construction lines (try " -"5*offset)" +msgid "Scale factor relating curvature and length of construction lines (try 5*offset)" msgstr "" -"Coefficient de proportionnalité entre longueur des lignes de construction et " -"rayon de courbure du chemin (essayer 5 fois la valeur de décalage)" +"Coefficient de proportionnalité entre longueur des lignes de construction et rayon de courbure du chemin (essayer 5 fois la valeur de décalage)" #: ../src/live_effects/lpe-sketch.cpp:60 msgid "Max. length:" @@ -11409,9 +10263,7 @@ msgstr "Caractère aléatoire du placement :" #: ../src/live_effects/lpe-sketch.cpp:62 msgid "0: evenly distributed construction lines, 1: purely random placement" -msgstr "" -"0 : lignes de construction régulièrement distribuées, 1 : placement purement " -"aléatoire" +msgstr "0 : lignes de construction régulièrement distribuées, 1 : placement purement aléatoire" #: ../src/live_effects/lpe-sketch.cpp:64 msgid "k_min:" @@ -11433,8 +10285,7 @@ msgstr "courbure max." msgid "Extrapolated" msgstr "Extrapolé" -#: ../src/live_effects/lpe-taperstroke.cpp:73 -#: ../share/extensions/edge3d.inx.h:5 +#: ../src/live_effects/lpe-taperstroke.cpp:73 ../share/extensions/edge3d.inx.h:5 msgid "Stroke width:" msgstr "Épaisseur du contour :" @@ -11535,14 +10386,12 @@ msgid "Flip vertical" msgstr "Retourner verticalement" #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#, fuzzy msgid "Start point" -msgstr "Trier les points" +msgstr "Point de départ" #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#, fuzzy msgid "End point" -msgstr "Chemin de courbure :" +msgstr "Point final" #: ../src/live_effects/lpe-transform_2pts.cpp:39 #, fuzzy @@ -11579,12 +10428,8 @@ msgstr "Centres de rotation" msgid "Change index of knot" msgstr "Modifier le type de nœud" -#: ../src/live_effects/lpe-transform_2pts.cpp:350 -#: ../src/ui/dialog/inkscape-preferences.cpp:1610 -#: ../src/ui/dialog/pixelartdialog.cpp:296 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:699 -#: ../src/ui/dialog/tracedialog.cpp:813 -#: ../src/ui/widget/preferences-widget.cpp:746 +#: ../src/live_effects/lpe-transform_2pts.cpp:350 ../src/ui/dialog/inkscape-preferences.cpp:1610 ../src/ui/dialog/pixelartdialog.cpp:296 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:699 ../src/ui/dialog/tracedialog.cpp:813 ../src/ui/widget/preferences-widget.cpp:746 msgid "Reset" msgstr "Réinitialiser" @@ -11603,22 +10448,16 @@ msgstr "Chemin générateur :" #: ../src/live_effects/lpe-vonkoch.cpp:47 msgid "Path whose segments define the iterated transforms" msgstr "" -"La fractale est obtenue en itérant les transformations qui envoient le " -"chemin de référence sur chaque segment de celui-ci (un segment isolé définit " -"une transformation préservant les proportions, deux segments attachés " -"définissent une transformation générale)" +"La fractale est obtenue en itérant les transformations qui envoient le chemin de référence sur chaque segment de celui-ci (un segment isolé " +"définit une transformation préservant les proportions, deux segments attachés définissent une transformation générale)" #: ../src/live_effects/lpe-vonkoch.cpp:48 msgid "_Use uniform transforms only" msgstr "_Utiliser uniquement les transformations uniformes" #: ../src/live_effects/lpe-vonkoch.cpp:48 -msgid "" -"2 consecutive segments are used to reverse/preserve orientation only " -"(otherwise, they define a general transform)." -msgstr "" -"N'utiliser que des transformations qui préservent les proportions " -"(rotations, symétries, redimensionnements)." +msgid "2 consecutive segments are used to reverse/preserve orientation only (otherwise, they define a general transform)." +msgstr "N'utiliser que des transformations qui préservent les proportions (rotations, symétries, redimensionnements)." #: ../src/live_effects/lpe-vonkoch.cpp:49 msgid "Dra_w all generations" @@ -11635,9 +10474,7 @@ msgstr "Segment de référence :" #: ../src/live_effects/lpe-vonkoch.cpp:51 msgid "The reference segment. Defaults to the horizontal midline of the bbox." -msgstr "" -"Segment de référence. Par défaut centré horizontalement sur la boîte " -"englobante." +msgstr "Segment de référence. Par défaut centré horizontalement sur la boîte englobante." #. refA(_("Ref Start"), _("Left side middle of the reference box"), "refA", &wr, this), #. refB(_("Ref End"), _("Right side middle of the reference box"), "refB", &wr, this), @@ -11658,36 +10495,23 @@ msgstr "Modifier le paramètre booléen" msgid "Change enumeration parameter" msgstr "Changer le paramètre d'énumération" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:778 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:839 -msgid "" -"Chamfer: Ctrl+Click toggle type, Shift+Click open " -"dialog, Ctrl+Alt+Click reset" +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:778 ../src/live_effects/parameter/filletchamferpointarray.cpp:839 +msgid "Chamfer: Ctrl+Click toggle type, Shift+Click open dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 -msgid "" -"Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " -"open dialog, Ctrl+Alt+Click reset" +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 ../src/live_effects/parameter/filletchamferpointarray.cpp:843 +msgid "Inverse Chamfer: Ctrl+Click toggle type, Shift+Click open dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 -msgid "" -"Inverse Fillet: Ctrl+Click toggle type, Shift+Click " -"open dialog, Ctrl+Alt+Click reset" +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 ../src/live_effects/parameter/filletchamferpointarray.cpp:847 +msgid "Inverse Fillet: Ctrl+Click toggle type, Shift+Click open dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 -#: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 -msgid "" -"Fillet: Ctrl+Click toggle type, Shift+Click open " -"dialog, Ctrl+Alt+Click reset" +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 ../src/live_effects/parameter/filletchamferpointarray.cpp:851 +msgid "Fillet: Ctrl+Click toggle type, Shift+Click open dialog, Ctrl+Alt+Click reset" msgstr "" -#: ../src/live_effects/parameter/originalpath.cpp:67 -#: ../src/live_effects/parameter/originalpatharray.cpp:155 +#: ../src/live_effects/parameter/originalpath.cpp:67 ../src/live_effects/parameter/originalpatharray.cpp:155 msgid "Link to path" msgstr "Lier au chemin" @@ -11695,13 +10519,11 @@ msgstr "Lier au chemin" msgid "Select original" msgstr "Sélectionner l'original" -#: ../src/live_effects/parameter/originalpatharray.cpp:90 -#: ../src/widgets/gradient-toolbar.cpp:1208 +#: ../src/live_effects/parameter/originalpatharray.cpp:90 ../src/widgets/gradient-toolbar.cpp:1208 msgid "Reverse" msgstr "Inverser" -#: ../src/live_effects/parameter/originalpatharray.cpp:130 -#: ../src/live_effects/parameter/originalpatharray.cpp:315 +#: ../src/live_effects/parameter/originalpatharray.cpp:130 ../src/live_effects/parameter/originalpatharray.cpp:315 #: ../src/live_effects/parameter/path.cpp:481 msgid "Link path parameter to path" msgstr "Lier les paramètres de chemin au chemin" @@ -11711,14 +10533,12 @@ msgstr "Lier les paramètres de chemin au chemin" msgid "Remove Path" msgstr "_Retirer du chemin" -#: ../src/live_effects/parameter/originalpatharray.cpp:179 -#: ../src/ui/dialog/objects.cpp:1850 +#: ../src/live_effects/parameter/originalpatharray.cpp:179 ../src/ui/dialog/objects.cpp:1850 #, fuzzy msgid "Move Down" msgstr "Mode déplacement" -#: ../src/live_effects/parameter/originalpatharray.cpp:191 -#: ../src/ui/dialog/objects.cpp:1858 +#: ../src/live_effects/parameter/originalpatharray.cpp:191 ../src/ui/dialog/objects.cpp:1858 #, fuzzy msgid "Move Up" msgstr "Déplacer le chemin" @@ -11762,17 +10582,14 @@ msgstr "Coller le paramètre du chemin" msgid "Change point parameter" msgstr "Modifier le paramètre de point" -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 ../src/live_effects/parameter/powerstrokepointarray.cpp:256 #, fuzzy msgid "" -"Stroke width control point: drag to alter the stroke width. Ctrl" -"+click adds a control point, Ctrl+Alt+click deletes it, Shift" -"+click launches width dialog." +"Stroke width control point: drag to alter the stroke width. Ctrl+click adds a control point, Ctrl+Alt+click deletes it, " +"Shift+click launches width dialog." msgstr "" -"point de contrôle de l'épaisseur de contour : cliquer-glisser pour " -"modifier l'épaisseur ; Ctrl+clic ajouter un point de contrôle ; " -"Ctrl+Alt+clic supprime le point de contrôle" +"point de contrôle de l'épaisseur de contour : cliquer-glisser pour modifier l'épaisseur ; Ctrl+clic ajouter un point de " +"contrôle ; Ctrl+Alt+clic supprime le point de contrôle" #: ../src/live_effects/parameter/random.cpp:134 msgid "Change random parameter" @@ -11787,8 +10604,7 @@ msgstr "Modifier le paramètre de texte" msgid "Change togglebutton parameter" msgstr "Modifier le paramètre de texte" -#: ../src/live_effects/parameter/transformedpoint.cpp:98 -#: ../src/live_effects/parameter/vector.cpp:99 +#: ../src/live_effects/parameter/transformedpoint.cpp:98 ../src/live_effects/parameter/vector.cpp:99 msgid "Change vector parameter" msgstr "Modifier le paramètre de vecteur" @@ -11812,9 +10628,7 @@ msgstr "Afficher la version d'Inkscape" #: ../src/main.cpp:300 msgid "Do not use X server (only process files from console)" -msgstr "" -"Ne pas utiliser le serveur X (traiter les fichiers seulement depuis la " -"console)" +msgstr "Ne pas utiliser le serveur X (traiter les fichiers seulement depuis la console)" #: ../src/main.cpp:305 msgid "Try to use X server (even if $DISPLAY is not set)" @@ -11824,17 +10638,14 @@ msgstr "Essayer d'utiliser le serveur X (même si $DISPLAY n'est pas défini)" msgid "Open specified document(s) (option string may be excluded)" msgstr "Ouvrir les document(s) spécifiés (la chaîne d'option peut être exclue)" -#: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 -#: ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 -#: ../src/main.cpp:414 ../src/main.cpp:430 ../src/main.cpp:435 +#: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 ../src/main.cpp:414 +#: ../src/main.cpp:430 ../src/main.cpp:435 msgid "FILENAME" msgstr "NOMDEFICHIER" #: ../src/main.cpp:315 msgid "Print document(s) to specified output file (use '| program' for pipe)" -msgstr "" -"Imprimer les document(s) dans le fichier de sortie spécifié (utilisez '| " -"programme ' pour envoyer la sortie à un programme)" +msgstr "Imprimer les document(s) dans le fichier de sortie spécifié (utilisez '| programme ' pour envoyer la sortie à un programme)" #: ../src/main.cpp:320 msgid "Export document to a PNG file" @@ -11842,24 +10653,16 @@ msgstr "Exporter le document vers un fichier PNG" #: ../src/main.cpp:325 #, fuzzy -msgid "" -"Resolution for exporting to bitmap and for rasterization of filters in PS/" -"EPS/PDF (default 96)" -msgstr "" -"Résolution pour l'exportation de bitmap et la rastérisation des filtres en " -"PS/EPS/PDS (90 par défaut)" +msgid "Resolution for exporting to bitmap and for rasterization of filters in PS/EPS/PDF (default 96)" +msgstr "Résolution pour l'exportation de bitmap et la rastérisation des filtres en PS/EPS/PDS (90 par défaut)" #: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" msgstr "PPP" #: ../src/main.cpp:330 -msgid "" -"Exported area in SVG user units (default is the page; 0,0 is lower-left " -"corner)" -msgstr "" -"Zone à exporter, en unités utilisateur SVG (par défaut, la zone de travail " -"entière ; 0,0 est le coin inférieur gauche)" +msgid "Exported area in SVG user units (default is the page; 0,0 is lower-left corner)" +msgstr "Zone à exporter, en unités utilisateur SVG (par défaut, la zone de travail entière ; 0,0 est le coin inférieur gauche)" #: ../src/main.cpp:331 msgid "x0:y0:x1:y1" @@ -11875,21 +10678,15 @@ msgstr "La zone à exporter est la zone de travail entière" #: ../src/main.cpp:345 msgid "Only for PS/EPS/PDF, sets margin in mm around exported area (default 0)" -msgstr "" -"Seulement pour PS/EPS/PDF, définit une marge en mm autour de la zone " -"exportée (0 par défaut)" +msgstr "Seulement pour PS/EPS/PDF, définit une marge en mm autour de la zone exportée (0 par défaut)" #: ../src/main.cpp:346 ../src/main.cpp:388 msgid "VALUE" msgstr "VALEUR" #: ../src/main.cpp:350 -msgid "" -"Snap the bitmap export area outwards to the nearest integer values (in SVG " -"user units)" -msgstr "" -"Ajuster la zone à exporter en bitmap aux valeurs entières supérieures les " -"plus proches (en unités utilisateur SVG)" +msgid "Snap the bitmap export area outwards to the nearest integer values (in SVG user units)" +msgstr "Ajuster la zone à exporter en bitmap aux valeurs entières supérieures les plus proches (en unités utilisateur SVG)" #: ../src/main.cpp:355 msgid "The width of exported bitmap in pixels (overrides export-dpi)" @@ -11911,31 +10708,23 @@ msgstr "HAUTEUR" msgid "The ID of the object to export" msgstr "L'Id de l'objet à exporter" -#: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1556 +#: ../src/main.cpp:366 ../src/main.cpp:479 ../src/ui/dialog/inkscape-preferences.cpp:1556 msgid "ID" msgstr "Id" #. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". #. See "man inkscape" for details. #: ../src/main.cpp:372 -msgid "" -"Export just the object with export-id, hide all others (only with export-id)" -msgstr "" -"N'exporter que l'objet avec export-id, cacher tous les autres (seulement " -"avec export-id)" +msgid "Export just the object with export-id, hide all others (only with export-id)" +msgstr "N'exporter que l'objet avec export-id, cacher tous les autres (seulement avec export-id)" #: ../src/main.cpp:377 msgid "Use stored filename and DPI hints when exporting (only with export-id)" -msgstr "" -"Utiliser le nom de fichier et la résolution enregistrés lors de " -"l'exportation (seulement avec export-id)" +msgstr "Utiliser le nom de fichier et la résolution enregistrés lors de l'exportation (seulement avec export-id)" #: ../src/main.cpp:382 msgid "Background color of exported bitmap (any SVG-supported color string)" -msgstr "" -"Couleur de fond du bitmap exporté (n'importe quelle code de couleur permise " -"par SVG)" +msgstr "Couleur de fond du bitmap exporté (n'importe quelle code de couleur permise par SVG)" #: ../src/main.cpp:383 msgid "COLOR" @@ -11947,9 +10736,7 @@ msgstr "Opacité du fond du bitmap exporté (entre 0,0 et 1,0 ou 1 et 255))" #: ../src/main.cpp:392 msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" -msgstr "" -"Exporter le document en SVG simple (sans espace de nom de Sodipodi ou " -"d'Inkscape)" +msgstr "Exporter le document en SVG simple (sans espace de nom de Sodipodi ou d'Inkscape)" #: ../src/main.cpp:397 msgid "Export document to a PS file" @@ -11961,12 +10748,8 @@ msgstr "Exporter le document en fichier EPS" #: ../src/main.cpp:407 #, fuzzy -msgid "" -"Choose the PostScript Level used to export. Possible choices are 2 and 3 " -"(the default)" -msgstr "" -"Niveau PostScript utilisé pour l'exportation. Les choix possibles dont 2 " -"(par défaut) ou 3." +msgid "Choose the PostScript Level used to export. Possible choices are 2 and 3 (the default)" +msgstr "Niveau PostScript utilisé pour l'exportation. Les choix possibles dont 2 (par défaut) ou 3." #: ../src/main.cpp:409 msgid "PS Level" @@ -11979,12 +10762,11 @@ msgstr "Exporter le document en fichier PDF" #. TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:419 msgid "" -"Export PDF to given version. (hint: make sure to input the exact string " -"found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" +"Export PDF to given version. (hint: make sure to input the exact string found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a " +"conformant)" msgstr "" -"Exporter le PDF dans une version donnée (astuce : assurez-vous que la valeur " -"saisie corresponde bien à la chaîne présentée dans la boîte de dialogue " -"d'exportation PDF, par exemple \"PDF 1.4\" - conforme PDF-a)" +"Exporter le PDF dans une version donnée (astuce : assurez-vous que la valeur saisie corresponde bien à la chaîne présentée dans la boîte de " +"dialogue d'exportation PDF, par exemple \"PDF 1.4\" - conforme PDF-a)" #: ../src/main.cpp:420 msgid "PDF_VERSION" @@ -11992,13 +10774,11 @@ msgstr "VERSION_PDF" #: ../src/main.cpp:424 msgid "" -"Export PDF/PS/EPS without text. Besides the PDF/PS/EPS, a LaTeX file is " -"exported, putting the text on top of the PDF/PS/EPS file. Include the result " -"in LaTeX like: \\input{latexfile.tex}" +"Export PDF/PS/EPS without text. Besides the PDF/PS/EPS, a LaTeX file is exported, putting the text on top of the PDF/PS/EPS file. Include the " +"result in LaTeX like: \\input{latexfile.tex}" msgstr "" -"Exporte en PDF, PS ou EPS sans texte, celui-ci étant exporté dans un LaTex " -"séparé. Le résultat peut être intégré dans LaTeX avec : \\input{latexfile." -"tex}" +"Exporte en PDF, PS ou EPS sans texte, celui-ci étant exporté dans un LaTex séparé. Le résultat peut être intégré dans LaTeX avec : " +"\\input{latexfile.tex}" #: ../src/main.cpp:429 msgid "Export document to an Enhanced Metafile (EMF) File" @@ -12010,50 +10790,31 @@ msgstr "Exporter le document en fichier WMF (Métafichier Windows)" #: ../src/main.cpp:439 msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" -msgstr "" -"Convertir les objets texte en chemins lors de l'export (PS, EPS, PDF, SVG)" +msgstr "Convertir les objets texte en chemins lors de l'export (PS, EPS, PDF, SVG)" #: ../src/main.cpp:444 -msgid "" -"Render filtered objects without filters, instead of rasterizing (PS, EPS, " -"PDF)" -msgstr "" -"Les objets filtrés sont rendus sans filtres, plutôt que rastérisés (PS, EPS, " -"PDF)" +msgid "Render filtered objects without filters, instead of rasterizing (PS, EPS, PDF)" +msgstr "Les objets filtrés sont rendus sans filtres, plutôt que rastérisés (PS, EPS, PDF)" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:450 -msgid "" -"Query the X coordinate of the drawing or, if specified, of the object with --" -"query-id" -msgstr "" -"Demander l'abscisse (coordonnée X) du dessin ou, si spécifié avec --query-" -"id, de l'objet" +msgid "Query the X coordinate of the drawing or, if specified, of the object with --query-id" +msgstr "Demander l'abscisse (coordonnée X) du dessin ou, si spécifié avec --query-id, de l'objet" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:456 -msgid "" -"Query the Y coordinate of the drawing or, if specified, of the object with --" -"query-id" -msgstr "" -"Demander l'ordonnée (coordonnée Y) du dessin ou, si spécifié avec --query-" -"id, de l'objet" +msgid "Query the Y coordinate of the drawing or, if specified, of the object with --query-id" +msgstr "Demander l'ordonnée (coordonnée Y) du dessin ou, si spécifié avec --query-id, de l'objet" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:462 -msgid "" -"Query the width of the drawing or, if specified, of the object with --query-" -"id" -msgstr "" -"Demander la largeur du dessin ou, si spécifié avec --query-id, de l'objet" +msgid "Query the width of the drawing or, if specified, of the object with --query-id" +msgstr "Demander la largeur du dessin ou, si spécifié avec --query-id, de l'objet" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:468 -msgid "" -"Query the height of the drawing or, if specified, of the object with --query-" -"id" -msgstr "" -"Demander la hauteur du dessin ou, si spécifié avec --query-id, de l'objet" +msgid "Query the height of the drawing or, if specified, of the object with --query-id" +msgstr "Demander la hauteur du dessin ou, si spécifié avec --query-id, de l'objet" #: ../src/main.cpp:473 msgid "List id,x,y,w,h for all objects" @@ -12077,12 +10838,8 @@ msgid "Enter a listening loop for D-Bus messages in console mode" msgstr "Saisissez une boucle d'écoute pour les messages D-Bus en mode console" #: ../src/main.cpp:500 -msgid "" -"Specify the D-Bus bus name to listen for messages on (default is org." -"inkscape)" -msgstr "" -"Spécifie le nom du bus D-Bus sur lequel écouter les messages (org.inkscape " -"par défaut)" +msgid "Specify the D-Bus bus name to listen for messages on (default is org.inkscape)" +msgstr "Spécifie le nom du bus D-Bus sur lequel écouter les messages (org.inkscape par défaut)" #: ../src/main.cpp:501 msgid "BUS-NAME" @@ -12197,8 +10954,7 @@ msgstr "Moti_f" msgid "_Path" msgstr "_Chemin" -#: ../src/menus-skeleton.h:249 ../src/ui/dialog/find.cpp:78 -#: ../src/ui/dialog/text-edit.cpp:71 +#: ../src/menus-skeleton.h:249 ../src/ui/dialog/find.cpp:78 ../src/ui/dialog/text-edit.cpp:71 msgid "_Text" msgstr "_Texte" @@ -12315,8 +11071,7 @@ msgid "Tracing" msgstr "Gravure" #: ../src/preferences.cpp:136 -msgid "" -"Inkscape will run with default settings, and new settings will not be saved. " +msgid "Inkscape will run with default settings, and new settings will not be saved. " msgstr "" "Inkscape va démarrer avec les préférences par défaut.\n" "Les nouvelles préférences ne seront pas enregistrées." @@ -12383,9 +11138,7 @@ msgstr "CC Paternité - Pas d'utilisation commerciale" #: ../src/rdf.cpp:195 msgid "CC Attribution-NonCommercial-ShareAlike" -msgstr "" -"CC Paternité - Pas d'utilisation commerciale - Partage des conditions " -"initiales à l'identique" +msgstr "CC Paternité - Pas d'utilisation commerciale - Partage des conditions initiales à l'identique" #: ../src/rdf.cpp:200 msgid "CC Attribution-NonCommercial-NoDerivs" @@ -12405,8 +11158,7 @@ msgstr "Open Font Licence (Licence de police libre)" #. Create the Title label and edit control #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkTitleAttribute -#: ../src/rdf.cpp:235 ../src/ui/dialog/filedialogimpl-win32.cpp:1960 -#: ../src/ui/dialog/object-attributes.cpp:57 +#: ../src/rdf.cpp:235 ../src/ui/dialog/filedialogimpl-win32.cpp:1960 ../src/ui/dialog/object-attributes.cpp:57 msgid "Title:" msgstr "Titre :" @@ -12419,11 +11171,8 @@ msgid "Date:" msgstr "Date :" #: ../src/rdf.cpp:239 -msgid "" -"A point or period of time associated with an event in the lifecycle of the " -"resource" -msgstr "" -"Date ou période associée à un événement dans le cycle de vie du document" +msgid "A point or period of time associated with an event in the lifecycle of the resource" +msgstr "Date ou période associée à un événement dans le cycle de vie du document" #: ../src/rdf.cpp:241 ../share/extensions/webslicer_create_rect.inx.h:3 msgid "Format:" @@ -12505,11 +11254,9 @@ msgstr "Portée :" #: ../src/rdf.cpp:276 msgid "" -"The spatial or temporal topic of the resource, the spatial applicability of " -"the resource, or the jurisdiction under which the resource is relevant" -msgstr "" -"Sujet spacial ou temporel du document, l'applicabilité spaciale du document, " -"ou la juridiction dans laquelle le document s'inscrit" +"The spatial or temporal topic of the resource, the spatial applicability of the resource, or the jurisdiction under which the resource is " +"relevant" +msgstr "Sujet spacial ou temporel du document, l'applicabilité spaciale du document, ou la juridiction dans laquelle le document s'inscrit" #: ../src/rdf.cpp:279 msgid "Description:" @@ -12559,14 +11306,9 @@ msgstr "Supprimer le texte" msgid "Nothing was deleted." msgstr "Rien n'a été supprimé." -#: ../src/selection-chemistry.cpp:426 -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 -#: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:965 -#: ../src/widgets/eraser-toolbar.cpp:93 -#: ../src/widgets/gradient-toolbar.cpp:1184 -#: ../src/widgets/gradient-toolbar.cpp:1198 -#: ../src/widgets/gradient-toolbar.cpp:1212 -#: ../src/widgets/node-toolbar.cpp:401 +#: ../src/selection-chemistry.cpp:426 ../src/ui/dialog/calligraphic-profile-rename.cpp:75 ../src/ui/dialog/swatches.cpp:277 +#: ../src/ui/tools/text-tool.cpp:965 ../src/widgets/eraser-toolbar.cpp:93 ../src/widgets/gradient-toolbar.cpp:1184 +#: ../src/widgets/gradient-toolbar.cpp:1198 ../src/widgets/gradient-toolbar.cpp:1212 ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Supprimer" @@ -12600,8 +11342,7 @@ msgstr "Sélectionner un groupe à dégrouper." msgid "No groups to ungroup in the selection." msgstr "Aucun groupe à dégrouper dans la sélection." -#: ../src/selection-chemistry.cpp:869 ../src/sp-item-group.cpp:550 -#: ../src/ui/dialog/objects.cpp:1912 +#: ../src/selection-chemistry.cpp:869 ../src/sp-item-group.cpp:550 ../src/ui/dialog/objects.cpp:1912 msgid "Ungroup" msgstr "Dégrouper" @@ -12609,13 +11350,10 @@ msgstr "Dégrouper" msgid "Select object(s) to raise." msgstr "Sélectionner un ou des objet(s) à monter." -#: ../src/selection-chemistry.cpp:962 ../src/selection-chemistry.cpp:1015 -#: ../src/selection-chemistry.cpp:1041 ../src/selection-chemistry.cpp:1099 -msgid "" -"You cannot raise/lower objects from different groups or layers." -msgstr "" -"Vous ne pouvez pas monter/descendre des objets de différents groupes " -"ou calques." +#: ../src/selection-chemistry.cpp:962 ../src/selection-chemistry.cpp:1015 ../src/selection-chemistry.cpp:1041 +#: ../src/selection-chemistry.cpp:1099 +msgid "You cannot raise/lower objects from different groups or layers." +msgstr "Vous ne pouvez pas monter/descendre des objets de différents groupes ou calques." #. TRANSLATORS: "Raise" means "to raise an object" in the undo history #: ../src/selection-chemistry.cpp:999 @@ -12671,9 +11409,7 @@ msgstr "Coller l'effet de chemin en direct" #: ../src/selection-chemistry.cpp:1255 msgid "Select object(s) to remove live path effects from." -msgstr "" -"Sélectionner un ou des objet(s) sur lesquels supprimer des effets de " -"chemin." +msgstr "Sélectionner un ou des objet(s) sur lesquels supprimer des effets de chemin." #: ../src/selection-chemistry.cpp:1267 msgid "Remove live path effect" @@ -12683,8 +11419,7 @@ msgstr "Supprimer l'effet de chemin en direct" msgid "Select object(s) to remove filters from." msgstr "Sélectionner les objets pour en retirer les filtres." -#: ../src/selection-chemistry.cpp:1288 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1693 +#: ../src/selection-chemistry.cpp:1288 ../src/ui/dialog/filter-effects-dialog.cpp:1693 msgid "Remove filter" msgstr "Supprimer le filtre" @@ -12710,8 +11445,7 @@ msgstr "Plus de calque au-dessus." #: ../src/selection-chemistry.cpp:1378 msgid "Select object(s) to move to the layer below." -msgstr "" -"Sélectionner un ou des objet(s) à déplacer au calque du dessous." +msgstr "Sélectionner un ou des objet(s) à déplacer au calque du dessous." #: ../src/selection-chemistry.cpp:1403 msgid "Lower to previous layer" @@ -12747,8 +11481,7 @@ msgstr "Tourner de 90° dans le sens anti-horaire" msgid "Rotate 90° CW" msgstr "Tourner de 90° dans le sens horaire" -#: ../src/selection-chemistry.cpp:1824 ../src/seltrans.cpp:484 -#: ../src/ui/dialog/transformation.cpp:891 +#: ../src/selection-chemistry.cpp:1824 ../src/seltrans.cpp:484 ../src/ui/dialog/transformation.cpp:891 msgid "Rotate" msgstr "Tourner" @@ -12756,8 +11489,7 @@ msgstr "Tourner" msgid "Rotate by pixels" msgstr "Tourner par pixels" -#: ../src/selection-chemistry.cpp:2203 ../src/seltrans.cpp:481 -#: ../src/ui/dialog/transformation.cpp:865 ../src/ui/widget/page-sizer.cpp:450 +#: ../src/selection-chemistry.cpp:2203 ../src/seltrans.cpp:481 ../src/ui/dialog/transformation.cpp:865 ../src/ui/widget/page-sizer.cpp:450 #: ../share/extensions/interp_att_g.inx.h:14 msgid "Scale" msgstr "Échelle" @@ -12774,8 +11506,7 @@ msgstr "Déplacer verticalement" msgid "Move horizontally" msgstr "Déplacer horizontalement" -#: ../src/selection-chemistry.cpp:2249 ../src/selection-chemistry.cpp:2275 -#: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:802 +#: ../src/selection-chemistry.cpp:2249 ../src/selection-chemistry.cpp:2275 ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:802 msgid "Move" msgstr "Déplacer" @@ -12830,30 +11561,19 @@ msgstr "Délier le clone" #: ../src/selection-chemistry.cpp:2731 msgid "" -"Select a clone to go to its original. Select a linked offset " -"to go to its source. Select a text on path to go to the path. Select " -"a flowed text to go to its frame." +"Select a clone to go to its original. Select a linked offset to go to its source. Select a text on path to go to the " +"path. Select a flowed text to go to its frame." msgstr "" -"Sélectionner un clone pour sélectionner son original. Sélectionner un " -"offset lié pour sélectionner sa source. Sélectionner un texte " -"suivant un chemin pour sélectionner son chemin. Sélectionner un texte " -"encadré pour sélectionner son cadre." +"Sélectionner un clone pour sélectionner son original. Sélectionner un offset lié pour sélectionner sa source. Sélectionner un " +"texte suivant un chemin pour sélectionner son chemin. Sélectionner un texte encadré pour sélectionner son cadre." #: ../src/selection-chemistry.cpp:2781 -msgid "" -"Cannot find the object to select (orphaned clone, offset, textpath, " -"flowed text?)" -msgstr "" -"Impossible de trouver l'objet à sélectionner (clone orphelin, offset, " -"chemin de texte, texte encadré ?)" +msgid "Cannot find the object to select (orphaned clone, offset, textpath, flowed text?)" +msgstr "Impossible de trouver l'objet à sélectionner (clone orphelin, offset, chemin de texte, texte encadré ?)" #: ../src/selection-chemistry.cpp:2787 -msgid "" -"The object you're trying to select is not visible (it is in <" -"defs>)" -msgstr "" -"L'objet que vous essayez de sélectionner n'est pas visible (il est " -"dans <defs>)" +msgid "The object you're trying to select is not visible (it is in <defs>)" +msgstr "L'objet que vous essayez de sélectionner n'est pas visible (il est dans <defs>)" #: ../src/selection-chemistry.cpp:2877 #, fuzzy @@ -12890,9 +11610,7 @@ msgstr "Sélectionner un symbole pour en extraire des objets." #: ../src/selection-chemistry.cpp:3181 msgid "Select only one symbol in Symbol dialog to convert to group." -msgstr "" -"Sélectionner un seul symbole dans la boîte de dialogue pour le " -"convertir en groupe." +msgstr "Sélectionner un seul symbole dans la boîte de dialogue pour le convertir en groupe." #: ../src/selection-chemistry.cpp:3237 msgid "Group from symbol" @@ -12900,8 +11618,7 @@ msgstr "Groupe à partir d'un symbole" #: ../src/selection-chemistry.cpp:3255 msgid "Select object(s) to convert to pattern." -msgstr "" -"Sélectionner un ou des objet(s) à convertir en motif de remplissage." +msgstr "Sélectionner un ou des objet(s) à convertir en motif de remplissage." #: ../src/selection-chemistry.cpp:3351 msgid "Objects to pattern" @@ -12909,9 +11626,7 @@ msgstr "Objets en motif" #: ../src/selection-chemistry.cpp:3367 msgid "Select an object with pattern fill to extract objects from." -msgstr "" -"Sélectionner un objet rempli avec un motif pour en extraire des " -"objets." +msgstr "Sélectionner un objet rempli avec un motif pour en extraire des objets." #: ../src/selection-chemistry.cpp:3426 msgid "No pattern fills in the selection." @@ -12935,9 +11650,7 @@ msgstr "Créer un bitmap" #: ../src/selection-chemistry.cpp:3730 ../src/selection-chemistry.cpp:3842 msgid "Select object(s) to create clippath or mask from." -msgstr "" -"Sélectionner un ou des objet(s) à partir desquels un chemin de " -"découpe ou un masque sera créé." +msgstr "Sélectionner un ou des objet(s) à partir desquels un chemin de découpe ou un masque sera créé." #: ../src/selection-chemistry.cpp:3816 ../src/ui/dialog/objects.cpp:1918 #, fuzzy @@ -12946,9 +11659,7 @@ msgstr "Créer un clo_ne" #: ../src/selection-chemistry.cpp:3845 msgid "Select mask object and object(s) to apply clippath or mask to." -msgstr "" -"Sélectionner un objet masque et un ou des objet(s) auxquels appliquer " -"ce chemin de découpe ou masque." +msgstr "Sélectionner un objet masque et un ou des objet(s) auxquels appliquer ce chemin de découpe ou masque." #: ../src/selection-chemistry.cpp:3992 msgid "Set clipping path" @@ -12960,9 +11671,7 @@ msgstr "Définir un masque" #: ../src/selection-chemistry.cpp:4009 msgid "Select object(s) to remove clippath or mask from." -msgstr "" -"Sélectionner un ou des objet(s) pour en retirer le chemin de découpe " -"ou le masque." +msgstr "Sélectionner un ou des objet(s) pour en retirer le chemin de découpe ou le masque." #: ../src/selection-chemistry.cpp:4125 msgid "Release clipping path" @@ -12974,9 +11683,7 @@ msgstr "Retirer le masque" #: ../src/selection-chemistry.cpp:4146 msgid "Select object(s) to fit canvas to." -msgstr "" -"Sélectionner un ou des objet(s) pour y ajuster la taille de la zone " -"de travail." +msgstr "Sélectionner un ou des objet(s) pour y ajuster la taille de la zone de travail." #. Fit Page #: ../src/selection-chemistry.cpp:4166 ../src/verbs.cpp:2961 @@ -12995,8 +11702,7 @@ msgstr "Ajuster la page à la sélection ou au dessin" msgid "root" msgstr "racine" -#: ../src/selection-describer.cpp:140 ../src/widgets/ege-paint-def.cpp:66 -#: ../src/widgets/ege-paint-def.cpp:90 +#: ../src/selection-describer.cpp:140 ../src/widgets/ege-paint-def.cpp:66 ../src/widgets/ege-paint-def.cpp:90 msgid "none" msgstr "aucune" @@ -13083,44 +11789,26 @@ msgstr[0] "; %d objet filtré" msgstr[1] "; %d objets filtrés" #: ../src/seltrans-handles.cpp:9 -msgid "" -"Squeeze or stretch selection; with Ctrl to scale uniformly; " -"with Shift to scale around rotation center" +msgid "Squeeze or stretch selection; with Ctrl to scale uniformly; with Shift to scale around rotation center" msgstr "" -"Agrandir ou rétrécir la sélection ; Ctrl pour redimensionner " -"uniformément; Maj pour redimensionner autour du centre de rotation" +"Agrandir ou rétrécir la sélection ; Ctrl pour redimensionner uniformément; Maj pour redimensionner autour du centre de " +"rotation" #: ../src/seltrans-handles.cpp:10 -msgid "" -"Scale selection; with Ctrl to scale uniformly; with Shift to scale around rotation center" -msgstr "" -"Redimensionner la sélection ; Ctrl pour redimensionner " -"uniformément autour du centre de rotation" +msgid "Scale selection; with Ctrl to scale uniformly; with Shift to scale around rotation center" +msgstr "Redimensionner la sélection ; Ctrl pour redimensionner uniformément autour du centre de rotation" #: ../src/seltrans-handles.cpp:11 -msgid "" -"Skew selection; with Ctrl to snap angle; with Shift to " -"skew around the opposite side" -msgstr "" -"Incliner la sélection ; Ctrl pour incliner par incréments ; " -"Maj pour incliner autour du coin opposé" +msgid "Skew selection; with Ctrl to snap angle; with Shift to skew around the opposite side" +msgstr "Incliner la sélection ; Ctrl pour incliner par incréments ; Maj pour incliner autour du coin opposé" #: ../src/seltrans-handles.cpp:12 -msgid "" -"Rotate selection; with Ctrl to snap angle; with Shift " -"to rotate around the opposite corner" -msgstr "" -"Tourner la sélection ; Ctrl pour tourner par incréments ; " -"Maj pour tourner autour du coin opposé" +msgid "Rotate selection; with Ctrl to snap angle; with Shift to rotate around the opposite corner" +msgstr "Tourner la sélection ; Ctrl pour tourner par incréments ; Maj pour tourner autour du coin opposé" #: ../src/seltrans-handles.cpp:13 -msgid "" -"Center of rotation and skewing: drag to reposition; scaling with " -"Shift also uses this center" -msgstr "" -"Centre de rotation/inclinaison : cliquer-déplacer pour le déplacer ; " -"redimensionner avec Maj utilise aussi ce centre" +msgid "Center of rotation and skewing: drag to reposition; scaling with Shift also uses this center" +msgstr "Centre de rotation/inclinaison : cliquer-déplacer pour le déplacer ; redimensionner avec Maj utilise aussi ce centre" #: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:980 msgid "Skew" @@ -13141,25 +11829,21 @@ msgstr "Rétablir le centre" #: ../src/seltrans.cpp:961 ../src/seltrans.cpp:1065 #, c-format msgid "Scale: %0.2f%% x %0.2f%%; with Ctrl to lock ratio" -msgstr "" -"Redimensionnement : %0.2f%% x %0.2f%% ; Ctrl pour préserver le " -"ratio" +msgstr "Redimensionnement : %0.2f%% x %0.2f%% ; Ctrl pour préserver le ratio" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) #: ../src/seltrans.cpp:1202 #, c-format msgid "Skew: %0.2f°; with Ctrl to snap angle" -msgstr "" -"Inclinaison : %0.2f° ; Ctrl pour incliner par incréments" +msgstr "Inclinaison : %0.2f° ; Ctrl pour incliner par incréments" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) #: ../src/seltrans.cpp:1278 #, c-format msgid "Rotate: %0.2f°; with Ctrl to snap angle" -msgstr "" -"Rotation : %0.2f° ; Ctrl pour tourner par incréments" +msgstr "Rotation : %0.2f° ; Ctrl pour tourner par incréments" #: ../src/seltrans.cpp:1315 #, c-format @@ -13168,20 +11852,15 @@ msgstr "Déplacer le centre en %s, %s" #: ../src/seltrans.cpp:1461 #, c-format -msgid "" -"Move by %s, %s; with Ctrl to restrict to horizontal/vertical; " -"with Shift to disable snapping" -msgstr "" -"Déplacer de %s, %s ; Ctrl restreindre à l'horizontale/" -"verticale; Maj désactiver le magnétisme" +msgid "Move by %s, %s; with Ctrl to restrict to horizontal/vertical; with Shift to disable snapping" +msgstr "Déplacer de %s, %s ; Ctrl restreindre à l'horizontale/verticale; Maj désactiver le magnétisme" #: ../src/shortcuts.cpp:226 #, c-format msgid "Keyboard directory (%s) is unavailable." msgstr "Le dossier des raccourcis (%s) est indisponible." -#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305 -#: ../src/ui/dialog/export.cpp:1339 +#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305 ../src/ui/dialog/export.cpp:1339 msgid "Select a filename for exporting" msgstr "Sélectionner un nom de fichier pour exporter" @@ -13207,9 +11886,7 @@ msgid "Arc" msgstr "Arc" #. Ellipse -#: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 -#: ../src/ui/dialog/inkscape-preferences.cpp:412 -#: ../src/widgets/pencil-toolbar.cpp:181 +#: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 ../src/ui/dialog/inkscape-preferences.cpp:412 ../src/widgets/pencil-toolbar.cpp:181 msgid "Ellipse" msgstr "Ellipse" @@ -13238,8 +11915,7 @@ msgstr "Texte encadré" msgid "Linked Flowed Text" msgstr "Texte encadré lié" -#: ../src/sp-flowtext.cpp:288 ../src/sp-text.cpp:367 -#: ../src/ui/tools/text-tool.cpp:1556 +#: ../src/sp-flowtext.cpp:288 ../src/sp-text.cpp:367 ../src/ui/tools/text-tool.cpp:1556 msgid " [truncated]" msgstr " [tronqué]" @@ -13264,12 +11940,8 @@ msgid "Deleted" msgstr "Supprimé" #: ../src/sp-guide.cpp:461 -msgid "" -"Shift+drag to rotate, Ctrl+drag to move origin, Del to " -"delete" -msgstr "" -"Maj+déplacer pour pivoter, Ctrl+déplacer pour déplacer " -"l'origine, Del pour supprimer" +msgid "Shift+drag to rotate, Ctrl+drag to move origin, Del to delete" +msgstr "Maj+déplacer pour pivoter, Ctrl+déplacer pour déplacer l'origine, Del pour supprimer" #: ../src/sp-guide.cpp:465 #, c-format @@ -13401,8 +12073,7 @@ msgid "Rectangle" msgstr "Rectangle" #. Spiral -#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:420 -#: ../share/extensions/gcodetools_area.inx.h:11 +#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:420 ../share/extensions/gcodetools_area.inx.h:11 msgid "Spiral" msgstr "Spirale" @@ -13414,8 +12085,7 @@ msgid "with %3f turns" msgstr "à %3f tours" #. Star -#: ../src/sp-star.cpp:246 ../src/ui/dialog/inkscape-preferences.cpp:416 -#: ../src/widgets/star-toolbar.cpp:469 +#: ../src/sp-star.cpp:246 ../src/ui/dialog/inkscape-preferences.cpp:416 ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "Étoile" @@ -13440,17 +12110,10 @@ msgstr "à %d branche" msgid "Conditional Group" msgstr "Groupe conditionnel" -#: ../src/sp-text.cpp:351 ../src/verbs.cpp:347 -#: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 -#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 -#: ../share/extensions/text_extract.inx.h:14 -#: ../share/extensions/text_flipcase.inx.h:2 -#: ../share/extensions/text_lowercase.inx.h:2 -#: ../share/extensions/text_merge.inx.h:16 -#: ../share/extensions/text_randomcase.inx.h:2 -#: ../share/extensions/text_sentencecase.inx.h:2 -#: ../share/extensions/text_titlecase.inx.h:2 +#: ../src/sp-text.cpp:351 ../src/verbs.cpp:347 ../share/extensions/lorem_ipsum.inx.h:8 ../share/extensions/replace_font.inx.h:11 +#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 ../share/extensions/text_extract.inx.h:14 +#: ../share/extensions/text_flipcase.inx.h:2 ../share/extensions/text_lowercase.inx.h:2 ../share/extensions/text_merge.inx.h:16 +#: ../share/extensions/text_randomcase.inx.h:2 ../share/extensions/text_sentencecase.inx.h:2 ../share/extensions/text_titlecase.inx.h:2 #: ../share/extensions/text_uppercase.inx.h:2 msgid "Text" msgstr "Texte" @@ -13531,36 +12194,23 @@ msgstr "Sélectionner au moins 2 chemins pour une opération booléenne." #: ../src/splivarot.cpp:339 msgid "Select at least 1 path to perform a boolean union." -msgstr "" -"Sélectionner au moins 1 chemin pour réaliser une opération booléenne." +msgstr "Sélectionner au moins 1 chemin pour réaliser une opération booléenne." #: ../src/splivarot.cpp:347 -msgid "" -"Select exactly 2 paths to perform difference, division, or path cut." -msgstr "" -"Sélectionner exactement 2 chemins pour en faire une différence, une " -"division ou les découper." +msgid "Select exactly 2 paths to perform difference, division, or path cut." +msgstr "Sélectionner exactement 2 chemins pour en faire une différence, une division ou les découper." #: ../src/splivarot.cpp:363 ../src/splivarot.cpp:378 -msgid "" -"Unable to determine the z-order of the objects selected for " -"difference, XOR, division, or path cut." -msgstr "" -"Impossible de déterminer l'ordre en z des objets sélectionnés pour en " -"faire une différence, une exclusion ou les découper." +msgid "Unable to determine the z-order of the objects selected for difference, XOR, division, or path cut." +msgstr "Impossible de déterminer l'ordre en z des objets sélectionnés pour en faire une différence, une exclusion ou les découper." #: ../src/splivarot.cpp:408 -msgid "" -"One of the objects is not a path, cannot perform boolean operation." -msgstr "" -"Un des objets n'est pas un chemin, impossible d'effectuer une " -"opération booléenne." +msgid "One of the objects is not a path, cannot perform boolean operation." +msgstr "Un des objets n'est pas un chemin, impossible d'effectuer une opération booléenne." #: ../src/splivarot.cpp:1153 msgid "Select stroked path(s) to convert stroke to path." -msgstr "" -"Sélectionner des chemin(s) avec contour pour convertir les contours " -"en chemins." +msgstr "Sélectionner des chemin(s) avec contour pour convertir les contours en chemins." #: ../src/splivarot.cpp:1509 msgid "Convert stroke to path" @@ -13573,9 +12223,7 @@ msgstr "Aucun chemin avec contour dans la sélection." #: ../src/splivarot.cpp:1583 msgid "Selected object is not a path, cannot inset/outset." -msgstr "" -"L'objet sélectionné n'est pas un chemin, impossible de le contracter/" -"dilater." +msgstr "L'objet sélectionné n'est pas un chemin, impossible de le contracter/dilater." #: ../src/splivarot.cpp:1674 ../src/splivarot.cpp:1741 msgid "Create linked offset" @@ -13629,26 +12277,16 @@ msgstr "Aucun chemin à simplifier dans la sélection." #: ../src/text-chemistry.cpp:91 msgid "Select a text and a path to put text on path." -msgstr "" -"Sélectionner un texte et un chemin pour placer le texte le long du " -"chemin." +msgstr "Sélectionner un texte et un chemin pour placer le texte le long du chemin." #: ../src/text-chemistry.cpp:96 -msgid "" -"This text object is already put on a path. Remove it from the path " -"first. Use Shift+D to look up its path." -msgstr "" -"Cet objet texte est déjà placé le long d'un chemin. Le retirer du " -"chemin d'abord. Utiliser Maj+D pour trouver ce chemin." +msgid "This text object is already put on a path. Remove it from the path first. Use Shift+D to look up its path." +msgstr "Cet objet texte est déjà placé le long d'un chemin. Le retirer du chemin d'abord. Utiliser Maj+D pour trouver ce chemin." #. rect is the only SPShape which is not yet, and thus SVG forbids us from putting text on it #: ../src/text-chemistry.cpp:102 -msgid "" -"You cannot put text on a rectangle in this version. Convert rectangle to " -"path first." -msgstr "" -"Vous ne pouvez pas mettre du texte dans un rectangle (dans cette version). " -"Il faut convertir le rectangle en chemin avant." +msgid "You cannot put text on a rectangle in this version. Convert rectangle to path first." +msgstr "Vous ne pouvez pas mettre du texte dans un rectangle (dans cette version). Il faut convertir le rectangle en chemin avant." #: ../src/text-chemistry.cpp:112 msgid "The flowed text(s) must be visible in order to be put on a path." @@ -13660,9 +12298,7 @@ msgstr "Mettre le texte le long d'un chemin" #: ../src/text-chemistry.cpp:194 msgid "Select a text on path to remove it from path." -msgstr "" -"Sélectionner un texte le long d'un chemin pour le retirer de ce " -"chemin." +msgstr "Sélectionner un texte le long d'un chemin pour le retirer de ce chemin." #: ../src/text-chemistry.cpp:213 msgid "No texts-on-paths in the selection." @@ -13681,12 +12317,8 @@ msgid "Remove manual kerns" msgstr "Retirer les crénages manuels" #: ../src/text-chemistry.cpp:300 -msgid "" -"Select a text and one or more paths or shapes to flow text " -"into frame." -msgstr "" -"Sélectionner un texte et un ou plusieurs chemins ou formes " -"pour y encadrer le texte." +msgid "Select a text and one or more paths or shapes to flow text into frame." +msgstr "Sélectionner un texte et un ou plusieurs chemins ou formes pour y encadrer le texte." #: ../src/text-chemistry.cpp:369 msgid "Flow text into shape" @@ -13720,15 +12352,12 @@ msgstr "Aucun texte encadré à convertir dans la sélection." msgid "You cannot edit cloned character data." msgstr "Vous ne pouvez pas modifier des données de caractères clonés." -#: ../src/trace/potrace/inkscape-potrace.cpp:512 -#: ../src/trace/potrace/inkscape-potrace.cpp:575 +#: ../src/trace/potrace/inkscape-potrace.cpp:512 ../src/trace/potrace/inkscape-potrace.cpp:575 msgid "Trace: %1. %2 nodes" msgstr "Vectoriser : %1. %2 nœuds" -#: ../src/trace/trace.cpp:59 ../src/trace/trace.cpp:124 -#: ../src/trace/trace.cpp:132 ../src/trace/trace.cpp:225 -#: ../src/ui/dialog/pixelartdialog.cpp:370 -#: ../src/ui/dialog/pixelartdialog.cpp:402 +#: ../src/trace/trace.cpp:59 ../src/trace/trace.cpp:124 ../src/trace/trace.cpp:132 ../src/trace/trace.cpp:225 +#: ../src/ui/dialog/pixelartdialog.cpp:370 ../src/ui/dialog/pixelartdialog.cpp:402 msgid "Select an image to trace" msgstr "Sélectionner une image à vectoriser" @@ -13775,8 +12404,7 @@ msgstr "Vectorisation effectuée. %ld nœuds créés." msgid "Nothing was copied." msgstr "Rien n'a été copié." -#: ../src/ui/clipboard.cpp:394 ../src/ui/clipboard.cpp:608 -#: ../src/ui/clipboard.cpp:637 +#: ../src/ui/clipboard.cpp:394 ../src/ui/clipboard.cpp:608 ../src/ui/clipboard.cpp:637 msgid "Nothing on the clipboard." msgstr "Rien dans le presse-papiers." @@ -13790,8 +12418,7 @@ msgstr "Pas de style dans le presse-papiers." #: ../src/ui/clipboard.cpp:505 msgid "Select object(s) to paste size to." -msgstr "" -"Sélectionner un ou des objets sur lesquels coller des dimensions." +msgstr "Sélectionner un ou des objets sur lesquels coller des dimensions." #: ../src/ui/clipboard.cpp:512 msgid "No size on the clipboard." @@ -13799,9 +12426,7 @@ msgstr "Pas de dimension dans le presse-papiers." #: ../src/ui/clipboard.cpp:569 msgid "Select object(s) to paste live path effect to." -msgstr "" -"Sélectionner un ou des objet(s) sur lesquels coller un effet de " -"chemin." +msgstr "Sélectionner un ou des objet(s) sur lesquels coller un effet de chemin." #. no_effect: #: ../src/ui/clipboard.cpp:595 @@ -13865,13 +12490,11 @@ msgstr "" " Sophie Gousset (contact@sophieweb.com)\n" " Nicolas Dufour (nicoduf@yahoo.fr)" -#: ../src/ui/dialog/align-and-distribute.cpp:170 -#: ../src/ui/dialog/align-and-distribute.cpp:847 +#: ../src/ui/dialog/align-and-distribute.cpp:170 ../src/ui/dialog/align-and-distribute.cpp:847 msgid "Align" msgstr "Aligner" -#: ../src/ui/dialog/align-and-distribute.cpp:338 -#: ../src/ui/dialog/align-and-distribute.cpp:848 +#: ../src/ui/dialog/align-and-distribute.cpp:338 ../src/ui/dialog/align-and-distribute.cpp:848 msgid "Distribute" msgstr "Distribuer" @@ -13895,14 +12518,11 @@ msgctxt "Gap" msgid "_V:" msgstr "_V :" -#: ../src/ui/dialog/align-and-distribute.cpp:464 -#: ../src/ui/dialog/align-and-distribute.cpp:850 -#: ../src/widgets/connector-toolbar.cpp:407 +#: ../src/ui/dialog/align-and-distribute.cpp:464 ../src/ui/dialog/align-and-distribute.cpp:850 ../src/widgets/connector-toolbar.cpp:407 msgid "Remove overlaps" msgstr "Supprimer les chevauchements" -#: ../src/ui/dialog/align-and-distribute.cpp:495 -#: ../src/widgets/connector-toolbar.cpp:236 +#: ../src/ui/dialog/align-and-distribute.cpp:495 ../src/widgets/connector-toolbar.cpp:236 msgid "Arrange connector network" msgstr "Arranger le réseau de connecteurs" @@ -13930,8 +12550,7 @@ msgstr "Aligner les ancres de texte" msgid "Rearrange" msgstr "Organiser" -#: ../src/ui/dialog/align-and-distribute.cpp:851 -#: ../src/widgets/toolbox.cpp:1730 +#: ../src/ui/dialog/align-and-distribute.cpp:851 ../src/widgets/toolbox.cpp:1730 msgid "Nodes" msgstr "Nœuds" @@ -13944,54 +12563,43 @@ msgid "_Treat selection as group: " msgstr "_Manipuler la sélection comme un groupe :" #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:872 ../src/verbs.cpp:2993 -#: ../src/verbs.cpp:2994 +#: ../src/ui/dialog/align-and-distribute.cpp:872 ../src/verbs.cpp:2993 ../src/verbs.cpp:2994 msgid "Align right edges of objects to the left edge of the anchor" msgstr "Aligner les bords droits des objets au bord gauche de l'ancre" -#: ../src/ui/dialog/align-and-distribute.cpp:875 ../src/verbs.cpp:2995 -#: ../src/verbs.cpp:2996 +#: ../src/ui/dialog/align-and-distribute.cpp:875 ../src/verbs.cpp:2995 ../src/verbs.cpp:2996 msgid "Align left edges" msgstr "Aligner les bords gauches" -#: ../src/ui/dialog/align-and-distribute.cpp:878 ../src/verbs.cpp:2997 -#: ../src/verbs.cpp:2998 +#: ../src/ui/dialog/align-and-distribute.cpp:878 ../src/verbs.cpp:2997 ../src/verbs.cpp:2998 msgid "Center on vertical axis" msgstr "Centrer selon un axe vertical" -#: ../src/ui/dialog/align-and-distribute.cpp:881 ../src/verbs.cpp:2999 -#: ../src/verbs.cpp:3000 +#: ../src/ui/dialog/align-and-distribute.cpp:881 ../src/verbs.cpp:2999 ../src/verbs.cpp:3000 msgid "Align right sides" msgstr "Aligner les côtés droits" -#: ../src/ui/dialog/align-and-distribute.cpp:884 ../src/verbs.cpp:3001 -#: ../src/verbs.cpp:3002 +#: ../src/ui/dialog/align-and-distribute.cpp:884 ../src/verbs.cpp:3001 ../src/verbs.cpp:3002 msgid "Align left edges of objects to the right edge of the anchor" msgstr "Aligner les bords gauches des objets au bord droit de l'ancre" -#: ../src/ui/dialog/align-and-distribute.cpp:887 ../src/verbs.cpp:3003 -#: ../src/verbs.cpp:3004 +#: ../src/ui/dialog/align-and-distribute.cpp:887 ../src/verbs.cpp:3003 ../src/verbs.cpp:3004 msgid "Align bottom edges of objects to the top edge of the anchor" -msgstr "" -"Aligner les bords inférieurs des objets avec le bord supérieur de l'ancre" +msgstr "Aligner les bords inférieurs des objets avec le bord supérieur de l'ancre" -#: ../src/ui/dialog/align-and-distribute.cpp:890 ../src/verbs.cpp:3005 -#: ../src/verbs.cpp:3006 +#: ../src/ui/dialog/align-and-distribute.cpp:890 ../src/verbs.cpp:3005 ../src/verbs.cpp:3006 msgid "Align top edges" msgstr "Aligner les bords supérieurs" -#: ../src/ui/dialog/align-and-distribute.cpp:893 ../src/verbs.cpp:3007 -#: ../src/verbs.cpp:3008 +#: ../src/ui/dialog/align-and-distribute.cpp:893 ../src/verbs.cpp:3007 ../src/verbs.cpp:3008 msgid "Center on horizontal axis" msgstr "Centrer selon un axe horizontal" -#: ../src/ui/dialog/align-and-distribute.cpp:896 ../src/verbs.cpp:3009 -#: ../src/verbs.cpp:3010 +#: ../src/ui/dialog/align-and-distribute.cpp:896 ../src/verbs.cpp:3009 ../src/verbs.cpp:3010 msgid "Align bottom edges" msgstr "Aligner les bords inférieurs" -#: ../src/ui/dialog/align-and-distribute.cpp:899 ../src/verbs.cpp:3011 -#: ../src/verbs.cpp:3012 +#: ../src/ui/dialog/align-and-distribute.cpp:899 ../src/verbs.cpp:3011 ../src/verbs.cpp:3012 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "Aligner les bords supérieurs des objets avec le bas de l'ancre" @@ -14013,8 +12621,7 @@ msgstr "Distribuer des distances égales entre les bords gauches des objets" #: ../src/ui/dialog/align-and-distribute.cpp:919 msgid "Distribute centers equidistantly horizontally" -msgstr "" -"Distribuer des distances égales horizontalement entre les centres des objets" +msgstr "Distribuer des distances égales horizontalement entre les centres des objets" #: ../src/ui/dialog/align-and-distribute.cpp:922 msgid "Distribute right edges equidistantly" @@ -14030,8 +12637,7 @@ msgstr "Distribuer des distances égales entre les bords supérieurs des objets" #: ../src/ui/dialog/align-and-distribute.cpp:933 msgid "Distribute centers equidistantly vertically" -msgstr "" -"Distribuer des distances égales verticalement entre les centres des objets" +msgstr "Distribuer des distances égales verticalement entre les centres des objets" #: ../src/ui/dialog/align-and-distribute.cpp:936 msgid "Distribute bottom edges equidistantly" @@ -14039,17 +12645,13 @@ msgstr "Distribuer des distances égales entre les bords inférieurs des objets" #: ../src/ui/dialog/align-and-distribute.cpp:941 msgid "Distribute baseline anchors of texts horizontally" -msgstr "" -"Distribuer des distances égales horizontalement entre les ancres des objets " -"texte" +msgstr "Distribuer des distances égales horizontalement entre les ancres des objets texte" #: ../src/ui/dialog/align-and-distribute.cpp:944 msgid "Distribute baselines of texts vertically" -msgstr "" -"Distribuer des distances égales verticalement entre lignes de base des textes" +msgstr "Distribuer des distances égales verticalement entre lignes de base des textes" -#: ../src/ui/dialog/align-and-distribute.cpp:950 -#: ../src/widgets/connector-toolbar.cpp:369 +#: ../src/ui/dialog/align-and-distribute.cpp:950 ../src/widgets/connector-toolbar.cpp:369 msgid "Nicely arrange selected connector network" msgstr "Dispose le réseau de connecteurs sélectionnés de façon agréable" @@ -14071,16 +12673,11 @@ msgstr "Eparpiller aléatoirement les centres dans toutes les directions" #: ../src/ui/dialog/align-and-distribute.cpp:967 msgid "Unclump objects: try to equalize edge-to-edge distances" -msgstr "" -"Éparpiller les objets : tenter d'uniformiser les distances de bord à bord" +msgstr "Éparpiller les objets : tenter d'uniformiser les distances de bord à bord" #: ../src/ui/dialog/align-and-distribute.cpp:972 -msgid "" -"Move objects as little as possible so that their bounding boxes do not " -"overlap" -msgstr "" -"Déplacer les objets aussi peu que possible afin que leurs boîtes englobantes " -"ne se chevauchent pas" +msgid "Move objects as little as possible so that their bounding boxes do not overlap" +msgstr "Déplacer les objets aussi peu que possible afin que leurs boîtes englobantes ne se chevauchent pas" #: ../src/ui/dialog/align-and-distribute.cpp:980 msgid "Align selected nodes to a common horizontal line" @@ -14092,13 +12689,11 @@ msgstr "Aligner les nœuds sélectionnés selon une ligne verticale commune" #: ../src/ui/dialog/align-and-distribute.cpp:986 msgid "Distribute selected nodes horizontally" -msgstr "" -"Distribuer des distances égales horizontalement entre les nœuds sélectionnés" +msgstr "Distribuer des distances égales horizontalement entre les nœuds sélectionnés" #: ../src/ui/dialog/align-and-distribute.cpp:989 msgid "Distribute selected nodes vertically" -msgstr "" -"Distribuer des distances égales verticalement entre les nœuds sélectionnés" +msgstr "Distribuer des distances égales verticalement entre les nœuds sélectionnés" #. Rest of the widgetry #: ../src/ui/dialog/align-and-distribute.cpp:994 @@ -14121,8 +12716,7 @@ msgstr "Objet le plus petit" msgid "Selection Area" msgstr "Zone de sélection" -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 ../src/ui/dialog/calligraphic-profile-rename.cpp:138 msgid "Edit profile" msgstr "Éditer un profil" @@ -14234,14 +12828,12 @@ msgstr "Translation X :" #: ../src/ui/dialog/clonetiler.cpp:196 #, no-c-format msgid "Horizontal shift per row (in % of tile width)" -msgstr "" -"Translation horizontale à chaque ligne (en % de la largeur du pavé de base)" +msgstr "Translation horizontale à chaque ligne (en % de la largeur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:204 #, no-c-format msgid "Horizontal shift per column (in % of tile width)" -msgstr "" -"Translation horizontale à chaque colonne (en % de la largeur du pavé de base)" +msgstr "Translation horizontale à chaque colonne (en % de la largeur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:210 msgid "Randomize the horizontal shift by this percentage" @@ -14256,14 +12848,12 @@ msgstr "Translation Y :" #: ../src/ui/dialog/clonetiler.cpp:228 #, no-c-format msgid "Vertical shift per row (in % of tile height)" -msgstr "" -"Translation verticale à chaque ligne (en % de la hauteur du pavé de base)" +msgstr "Translation verticale à chaque ligne (en % de la hauteur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:236 #, no-c-format msgid "Vertical shift per column (in % of tile height)" -msgstr "" -"Translation verticale à chaque colonne (en % de la hauteur du pavé de base)" +msgstr "Translation verticale à chaque colonne (en % de la hauteur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:243 msgid "Randomize the vertical shift by this percentage" @@ -14275,20 +12865,15 @@ msgstr "Exposant :" #: ../src/ui/dialog/clonetiler.cpp:258 msgid "Whether rows are spaced evenly (1), converge (<1) or diverge (>1)" -msgstr "" -"Selon la valeur, l'inter ligne reste constant (1), converge (<1) ou diverge " -"(>1) " +msgstr "Selon la valeur, l'inter ligne reste constant (1), converge (<1) ou diverge (>1) " #: ../src/ui/dialog/clonetiler.cpp:265 msgid "Whether columns are spaced evenly (1), converge (<1) or diverge (>1)" -msgstr "" -"Selon la valeur, l'inter colonne reste constant (1), converge (<1) ou " -"diverge (>1) " +msgstr "Selon la valeur, l'inter colonne reste constant (1), converge (<1) ou diverge (>1) " #. TRANSLATORS: "Alternate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:273 ../src/ui/dialog/clonetiler.cpp:437 -#: ../src/ui/dialog/clonetiler.cpp:513 ../src/ui/dialog/clonetiler.cpp:586 -#: ../src/ui/dialog/clonetiler.cpp:632 ../src/ui/dialog/clonetiler.cpp:759 +#: ../src/ui/dialog/clonetiler.cpp:273 ../src/ui/dialog/clonetiler.cpp:437 ../src/ui/dialog/clonetiler.cpp:513 +#: ../src/ui/dialog/clonetiler.cpp:586 ../src/ui/dialog/clonetiler.cpp:632 ../src/ui/dialog/clonetiler.cpp:759 msgid "Alternate:" msgstr "Alterner :" @@ -14301,8 +12886,7 @@ msgid "Alternate the sign of shifts for each column" msgstr "Alterner le signe de la translation à chaque colonne" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:291 ../src/ui/dialog/clonetiler.cpp:455 -#: ../src/ui/dialog/clonetiler.cpp:531 +#: ../src/ui/dialog/clonetiler.cpp:291 ../src/ui/dialog/clonetiler.cpp:455 ../src/ui/dialog/clonetiler.cpp:531 msgid "Cumulate:" msgstr "Cumulatif :" @@ -14338,21 +12922,16 @@ msgstr "Échelle X :" #: ../src/ui/dialog/clonetiler.cpp:345 #, no-c-format msgid "Horizontal scale per row (in % of tile width)" -msgstr "" -"Redimensionnement horizontal à chaque ligne (en % de la largeur du pavé de " -"base)" +msgstr "Redimensionnement horizontal à chaque ligne (en % de la largeur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:353 #, no-c-format msgid "Horizontal scale per column (in % of tile width)" -msgstr "" -"Redimensionnement horizontal à chaque colonne (en % de la largeur du pavé de " -"base)" +msgstr "Redimensionnement horizontal à chaque colonne (en % de la largeur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:359 msgid "Randomize the horizontal scale by this percentage" -msgstr "" -"Introduire ce pourcentage de hasard dans le redimensionnement horizontal" +msgstr "Introduire ce pourcentage de hasard dans le redimensionnement horizontal" #: ../src/ui/dialog/clonetiler.cpp:367 msgid "Scale Y:" @@ -14361,16 +12940,12 @@ msgstr "Échelle Y :" #: ../src/ui/dialog/clonetiler.cpp:375 #, no-c-format msgid "Vertical scale per row (in % of tile height)" -msgstr "" -"Redimensionnement vertical à chaque ligne (en % de la hauteur du pavé de " -"base)" +msgstr "Redimensionnement vertical à chaque ligne (en % de la hauteur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:383 #, no-c-format msgid "Vertical scale per column (in % of tile height)" -msgstr "" -"Redimensionnement vertical à chaque colonne (en % de la largeur du pavé de " -"base)" +msgstr "Redimensionnement vertical à chaque colonne (en % de la largeur du pavé de base)" #: ../src/ui/dialog/clonetiler.cpp:389 msgid "Randomize the vertical scale by this percentage" @@ -14378,26 +12953,19 @@ msgstr "Introduire ce pourcentage de hasard dans le redimensionnement vertical" #: ../src/ui/dialog/clonetiler.cpp:403 msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" -msgstr "" -"Selon la valeur, le redimensionnement des lignes est uniforme (1), converge " -"(<1) ou diverge (>1) " +msgstr "Selon la valeur, le redimensionnement des lignes est uniforme (1), converge (<1) ou diverge (>1) " #: ../src/ui/dialog/clonetiler.cpp:409 msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" -msgstr "" -"Selon la valeur, le redimensionnement des colonnes est uniforme (1), " -"converge (<1) ou diverge (>1) " +msgstr "Selon la valeur, le redimensionnement des colonnes est uniforme (1), converge (<1) ou diverge (>1) " #: ../src/ui/dialog/clonetiler.cpp:417 msgid "Base:" msgstr "Base :" #: ../src/ui/dialog/clonetiler.cpp:423 ../src/ui/dialog/clonetiler.cpp:429 -msgid "" -"Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" -msgstr "" -"Base pour une spirale logarithmique : inutilisée (0), converge (<1), ou " -"diverge (>1)" +msgid "Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" +msgstr "Base pour une spirale logarithmique : inutilisée (0), converge (<1), ou diverge (>1)" #: ../src/ui/dialog/clonetiler.cpp:443 msgid "Alternate the sign of scales for each row" @@ -14518,12 +13086,8 @@ msgid "Initial color of tiled clones" msgstr "Couleur initiale des clones de pavage" #: ../src/ui/dialog/clonetiler.cpp:665 -msgid "" -"Initial color for clones (works only if the original has unset fill or " -"stroke)" -msgstr "" -"Couleur initiale pour les clones (ne fonctionne que si l'original a un " -"remplissage ou un contour indéfini)" +msgid "Initial color for clones (works only if the original has unset fill or stroke)" +msgstr "Couleur initiale pour les clones (ne fonctionne que si l'original a un remplissage ou un contour indéfini)" #: ../src/ui/dialog/clonetiler.cpp:680 msgid "H:" @@ -14590,12 +13154,8 @@ msgid "Trace the drawing under the tiles" msgstr "Calquer depuis le dessin sous les pavés" #: ../src/ui/dialog/clonetiler.cpp:794 -msgid "" -"For each clone, pick a value from the drawing in that clone's location and " -"apply it to the clone" -msgstr "" -"Pour chaque clone, capturer une valeur du dessin à l'emplacement du clone et " -"l'appliquer au clone" +msgid "For each clone, pick a value from the drawing in that clone's location and apply it to the clone" +msgstr "Pour chaque clone, capturer une valeur du dessin à l'emplacement du clone et l'appliquer au clone" #: ../src/ui/dialog/clonetiler.cpp:813 msgid "1. Pick from the drawing:" @@ -14675,8 +13235,7 @@ msgstr "Corriger le Gamma" #: ../src/ui/dialog/clonetiler.cpp:918 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" -msgstr "" -"Décaler le milieu de la valeur capturée vers le haut (>0) ou vers le bas (<0)" +msgstr "Décaler le milieu de la valeur capturée vers le haut (>0) ou vers le bas (<0)" #: ../src/ui/dialog/clonetiler.cpp:925 msgid "Randomize:" @@ -14703,12 +13262,8 @@ msgid "Presence" msgstr "Présence" #: ../src/ui/dialog/clonetiler.cpp:964 -msgid "" -"Each clone is created with the probability determined by the picked value in " -"that point" -msgstr "" -"Chaque clone est créé selon une probabilité déterminée par la valeur " -"capturée en ce point" +msgid "Each clone is created with the probability determined by the picked value in that point" +msgstr "Chaque clone est créé selon une probabilité déterminée par la valeur capturée en ce point" #: ../src/ui/dialog/clonetiler.cpp:971 msgid "Size" @@ -14716,22 +13271,15 @@ msgstr "Dimensions" #: ../src/ui/dialog/clonetiler.cpp:974 msgid "Each clone's size is determined by the picked value in that point" -msgstr "" -"Les dimensions de chaque clone sont déterminées selon la valeur capturée en " -"ce point " +msgstr "Les dimensions de chaque clone sont déterminées selon la valeur capturée en ce point " #: ../src/ui/dialog/clonetiler.cpp:984 -msgid "" -"Each clone is painted by the picked color (the original must have unset fill " -"or stroke)" -msgstr "" -"Chaque clone est peint selon la couleur capturée (l'original doit avoir un " -"remplissage ou un contour indéfini)" +msgid "Each clone is painted by the picked color (the original must have unset fill or stroke)" +msgstr "Chaque clone est peint selon la couleur capturée (l'original doit avoir un remplissage ou un contour indéfini)" #: ../src/ui/dialog/clonetiler.cpp:994 msgid "Each clone's opacity is determined by the picked value in that point" -msgstr "" -"L'opacité de chaque clone est déterminée par la valeur capturée en ce point" +msgstr "L'opacité de chaque clone est déterminée par la valeur capturée en ce point" #: ../src/ui/dialog/clonetiler.cpp:1042 msgid "How many rows in the tiling" @@ -14770,12 +13318,9 @@ msgid "Use saved size and position of the tile" msgstr "Utiliser les dimensions et position enregistrées du pavage" #: ../src/ui/dialog/clonetiler.cpp:1202 -msgid "" -"Pretend that the size and position of the tile are the same as the last time " -"you tiled it (if any), instead of using the current size" +msgid "Pretend that the size and position of the tile are the same as the last time you tiled it (if any), instead of using the current size" msgstr "" -"Utiliser les mêmes dimensions et position de pavés que lors du pavage " -"précédent (si possible), au lieu d'utiliser les paramètres courants" +"Utiliser les mêmes dimensions et position de pavés que lors du pavage précédent (si possible), au lieu d'utiliser les paramètres courants" #: ../src/ui/dialog/clonetiler.cpp:1236 msgid " _Create " @@ -14796,9 +13341,7 @@ msgstr "É_parpiller" #: ../src/ui/dialog/clonetiler.cpp:1259 msgid "Spread out clones to reduce clumping; can be applied repeatedly" -msgstr "" -"Disperser les clones de façon à reduire le rassemblement; peut être appliqué " -"plusieurs fois" +msgstr "Disperser les clones de façon à reduire le rassemblement; peut être appliqué plusieurs fois" #: ../src/ui/dialog/clonetiler.cpp:1265 msgid " Re_move " @@ -14806,9 +13349,7 @@ msgstr "_Supprimer" #: ../src/ui/dialog/clonetiler.cpp:1266 msgid "Remove existing tiled clones of the selected object (siblings only)" -msgstr "" -"Retirer les clones de pavage de l'objet sélectionné (seulement les « enfants " -"de mêmes parents »)" +msgstr "Retirer les clones de pavage de l'objet sélectionné (seulement les « enfants de mêmes parents »)" #: ../src/ui/dialog/clonetiler.cpp:1283 msgid " R_eset " @@ -14816,12 +13357,8 @@ msgstr " R-à-_z" #. TRANSLATORS: "change" is a noun here #: ../src/ui/dialog/clonetiler.cpp:1285 -msgid "" -"Reset all shifts, scales, rotates, opacity and color changes in the dialog " -"to zero" -msgstr "" -"Remise à zéro de tous les décalages, redimensionnements, rotation et " -"opacités dans la boîte de dialogue" +msgid "Reset all shifts, scales, rotates, opacity and color changes in the dialog to zero" +msgstr "Remise à zéro de tous les décalages, redimensionnements, rotation et opacités dans la boîte de dialogue" #: ../src/ui/dialog/clonetiler.cpp:1358 msgid "Nothing selected." @@ -14857,12 +13394,8 @@ msgid "Delete tiled clones" msgstr "Supprimer les clones de pavage" #: ../src/ui/dialog/clonetiler.cpp:2227 -msgid "" -"If you want to clone several objects, group them and clone the " -"group." -msgstr "" -"Si vous voulez cloner plusieurs objets, groupez-les puis clonez le " -"groupe." +msgid "If you want to clone several objects, group them and clone the group." +msgstr "Si vous voulez cloner plusieurs objets, groupez-les puis clonez le groupe." #: ../src/ui/dialog/clonetiler.cpp:2236 msgid "Creating tiled clones..." @@ -14886,11 +13419,8 @@ msgstr "Hasard :" #: ../src/ui/dialog/color-item.cpp:127 #, c-format -msgid "" -"Color: %s; Click to set fill, Shift+click to set stroke" -msgstr "" -"Couleur : %s ; Clic pour définir le remplissage, Maj + " -"clic pour définir le contour" +msgid "Color: %s; Click to set fill, Shift+click to set stroke" +msgstr "Couleur : %s ; Clic pour définir le remplissage, Maj + clic pour définir le contour" #: ../src/ui/dialog/color-item.cpp:505 msgid "Change color definition" @@ -14936,23 +13466,19 @@ msgstr "Capturer les messages de log" msgid "Release log messages" msgstr "Détacher les messages de log" -#: ../src/ui/dialog/document-metadata.cpp:88 -#: ../src/ui/dialog/document-properties.cpp:166 +#: ../src/ui/dialog/document-metadata.cpp:88 ../src/ui/dialog/document-properties.cpp:166 msgid "Metadata" msgstr "Métadonnées" -#: ../src/ui/dialog/document-metadata.cpp:89 -#: ../src/ui/dialog/document-properties.cpp:167 +#: ../src/ui/dialog/document-metadata.cpp:89 ../src/ui/dialog/document-properties.cpp:167 msgid "License" msgstr "Licence" -#: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:978 +#: ../src/ui/dialog/document-metadata.cpp:126 ../src/ui/dialog/document-properties.cpp:978 msgid "Dublin Core Entities" msgstr "Entités Dublin Core" -#: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1040 +#: ../src/ui/dialog/document-metadata.cpp:168 ../src/ui/dialog/document-properties.cpp:1040 msgid "License" msgstr "Licence" @@ -14994,12 +13520,9 @@ msgid "Back_ground color:" msgstr "Couleur de _fond :" #: ../src/ui/dialog/document-properties.cpp:122 -msgid "" -"Color of the page background. Note: transparency setting ignored while " -"editing but used when exporting to bitmap." +msgid "Color of the page background. Note: transparency setting ignored while editing but used when exporting to bitmap." msgstr "" -"Couleur du fond de page. Note : les paramètres de transparence sont ignorés " -"pendant l'édition, mais utilisées lors de l'exportation en PNG." +"Couleur du fond de page. Note : les paramètres de transparence sont ignorés pendant l'édition, mais utilisées lors de l'exportation en PNG." #: ../src/ui/dialog/document-properties.cpp:123 msgid "Border _color:" @@ -15050,8 +13573,7 @@ msgstr "Couleur d'emphase des lignes de guide" #: ../src/ui/dialog/document-properties.cpp:130 msgid "Color of a guideline when it is under mouse" -msgstr "" -"Couleur d'une ligne de guide quand elle est sous le curseur de la souris" +msgstr "Couleur d'une ligne de guide quand elle est sous le curseur de la souris" #. --------------------------------------------------------------- #: ../src/ui/dialog/document-properties.cpp:132 @@ -15062,9 +13584,7 @@ msgstr "Distance d'attraction" msgid "Snap only when _closer than:" msgstr "Aimanter seulement à moins d'une distance de :" -#: ../src/ui/dialog/document-properties.cpp:132 -#: ../src/ui/dialog/document-properties.cpp:137 -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:132 ../src/ui/dialog/document-properties.cpp:137 ../src/ui/dialog/document-properties.cpp:142 msgid "Always snap" msgstr "Toujours aimanter" @@ -15074,16 +13594,11 @@ msgstr "Distance d'attraction, en pixels d'écran, pour aimanter aux objets" #: ../src/ui/dialog/document-properties.cpp:133 msgid "Always snap to objects, regardless of their distance" -msgstr "" -"Toujours adhérer aux objets les plus proche, sans tenir compte de la distance" +msgstr "Toujours adhérer aux objets les plus proche, sans tenir compte de la distance" #: ../src/ui/dialog/document-properties.cpp:134 -msgid "" -"If set, objects only snap to another object when it's within the range " -"specified below" -msgstr "" -"Si la valeur est définie, les objets ne sont aimantés entre eux que s'ils " -"sont à une distance inférieure à cette valeur" +msgid "If set, objects only snap to another object when it's within the range specified below" +msgstr "Si la valeur est définie, les objets ne sont aimantés entre eux que s'ils sont à une distance inférieure à cette valeur" #. Options for snapping to grids #: ../src/ui/dialog/document-properties.cpp:137 @@ -15100,17 +13615,11 @@ msgstr "Distance d'attraction, en pixels d'écran, pour aimanter à la grille" #: ../src/ui/dialog/document-properties.cpp:138 msgid "Always snap to grids, regardless of the distance" -msgstr "" -"Toujours adhérer aux grilles les plus proches, sans tenir compte de la " -"distance" +msgstr "Toujours adhérer aux grilles les plus proches, sans tenir compte de la distance" #: ../src/ui/dialog/document-properties.cpp:139 -msgid "" -"If set, objects only snap to a grid line when it's within the range " -"specified below" -msgstr "" -"Si la valeur est définie, les objets ne sont aimantés à une ligne de la " -"grille que s'ils sont à une distance inférieure à cette valeur" +msgid "If set, objects only snap to a grid line when it's within the range specified below" +msgstr "Si la valeur est définie, les objets ne sont aimantés à une ligne de la grille que s'ils sont à une distance inférieure à cette valeur" #. Options for snapping to guides #: ../src/ui/dialog/document-properties.cpp:142 @@ -15127,17 +13636,11 @@ msgstr "Distance d'attraction, en pixels d'écran, pour aimanter aux guides" #: ../src/ui/dialog/document-properties.cpp:143 msgid "Always snap to guides, regardless of the distance" -msgstr "" -"Toujours adhérer aux guides les plus proches, sans tenir compte de la " -"distance" +msgstr "Toujours adhérer aux guides les plus proches, sans tenir compte de la distance" #: ../src/ui/dialog/document-properties.cpp:144 -msgid "" -"If set, objects only snap to a guide when it's within the range specified " -"below" -msgstr "" -"Si la valeur est définie, les objets ne sont aimantés à un guide que s'ils " -"sont à une distance inférieure à cette valeur" +msgid "If set, objects only snap to a guide when it's within the range specified below" +msgstr "Si la valeur est définie, les objets ne sont aimantés à un guide que s'ils sont à une distance inférieure à cette valeur" #. --------------------------------------------------------------- #: ../src/ui/dialog/document-properties.cpp:147 @@ -15146,9 +13649,7 @@ msgstr "Aimanter aux chemins de découpe" #: ../src/ui/dialog/document-properties.cpp:147 msgid "When snapping to paths, then also try snapping to clip paths" -msgstr "" -"Lorsque les chemins sont aimantés, essayer également d'aimanter aux chemins " -"de découpe" +msgstr "Lorsque les chemins sont aimantés, essayer également d'aimanter aux chemins de découpe" #: ../src/ui/dialog/document-properties.cpp:148 msgid "Snap to mask paths" @@ -15156,20 +13657,15 @@ msgstr "Aimanter aux chemins de masque" #: ../src/ui/dialog/document-properties.cpp:148 msgid "When snapping to paths, then also try snapping to mask paths" -msgstr "" -"Lorsque les chemins sont aimantés, essayer également d'aimanter aux chemins " -"de masque" +msgstr "Lorsque les chemins sont aimantés, essayer également d'aimanter aux chemins de masque" #: ../src/ui/dialog/document-properties.cpp:149 msgid "Snap perpendicularly" msgstr "Aimanter perpendiculairement" #: ../src/ui/dialog/document-properties.cpp:149 -msgid "" -"When snapping to paths or guides, then also try snapping perpendicularly" -msgstr "" -"Lorsque les chemins ou les guides sont aimantés, essayer également " -"d'aimanter perpendiculairement" +msgid "When snapping to paths or guides, then also try snapping perpendicularly" +msgstr "Lorsque les chemins ou les guides sont aimantés, essayer également d'aimanter perpendiculairement" #: ../src/ui/dialog/document-properties.cpp:150 msgid "Snap tangentially" @@ -15177,9 +13673,7 @@ msgstr "Aimanter tangentiellement" #: ../src/ui/dialog/document-properties.cpp:150 msgid "When snapping to paths or guides, then also try snapping tangentially" -msgstr "" -"Lorsque les chemins ou les guides sont aimantés, essayer également " -"d'aimanter tangentiellement" +msgstr "Lorsque les chemins ou les guides sont aimantés, essayer également d'aimanter tangentiellement" #: ../src/ui/dialog/document-properties.cpp:153 msgctxt "Grid" @@ -15199,8 +13693,7 @@ msgstr "Supp_rimer" msgid "Remove selected grid." msgstr "Supprimer la grille sélectionnée." -#: ../src/ui/dialog/document-properties.cpp:161 -#: ../src/widgets/toolbox.cpp:1837 +#: ../src/ui/dialog/document-properties.cpp:161 ../src/widgets/toolbox.cpp:1837 msgid "Guides" msgstr "Guides" @@ -15292,9 +13785,7 @@ msgstr "Fichier de programmation externe :" msgid "Add the current file name or browse for a file" msgstr "Choisir un fichier" -#: ../src/ui/dialog/document-properties.cpp:752 -#: ../src/ui/dialog/document-properties.cpp:829 -#: ../src/ui/widget/selected-style.cpp:356 +#: ../src/ui/dialog/document-properties.cpp:752 ../src/ui/dialog/document-properties.cpp:829 ../src/ui/widget/selected-style.cpp:356 msgid "Remove" msgstr "Supprimer" @@ -15306,8 +13797,7 @@ msgstr "Nom du fichier" msgid "Embedded script files:" msgstr "Fichier de programmation incorporés :" -#: ../src/ui/dialog/document-properties.cpp:826 -#: ../src/ui/dialog/objects.cpp:1890 +#: ../src/ui/dialog/document-properties.cpp:826 ../src/ui/dialog/objects.cpp:1890 msgid "New" msgstr "Nouvelle" @@ -15398,8 +13888,7 @@ msgstr "_Sélection" msgid "_Custom" msgstr "P_ersonnalisée" -#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:99 ../src/widgets/measure-toolbar.cpp:107 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "Unités :" @@ -15413,13 +13902,10 @@ msgid "B_atch export all selected objects" msgstr "Exporter les _objets sélectionnés en un lot" #: ../src/ui/dialog/export.cpp:170 -msgid "" -"Export each selected object into its own PNG file, using export hints if any " -"(caution, overwrites without asking!)" +msgid "Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)" msgstr "" -"Exporter chaque objet de la sélection dans son fichier PNG, en tenant compte " -"des indications d'export (attention, écrase les fichiers sans demander de " -"confirmation !)" +"Exporter chaque objet de la sélection dans son fichier PNG, en tenant compte des indications d'export (attention, écrase les fichiers sans " +"demander de confirmation !)" #: ../src/ui/dialog/export.cpp:172 msgid "Hide a_ll except selected" @@ -15427,8 +13913,7 @@ msgstr "_Cacher tout sauf la sélection" #: ../src/ui/dialog/export.cpp:172 msgid "In the exported image, hide all objects except those that are selected" -msgstr "" -"Dans l'image exportée, cacher tous les objets qui ne sont pas sélectionnés" +msgstr "Dans l'image exportée, cacher tous les objets qui ne sont pas sélectionnés" #: ../src/ui/dialog/export.cpp:173 msgid "Close when complete" @@ -15482,14 +13967,11 @@ msgstr "pixels à" msgid "dp_i" msgstr "_ppp" -#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:76 -#: ../src/ui/widget/page-sizer.cpp:238 +#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:76 ../src/ui/widget/page-sizer.cpp:238 msgid "_Height:" msgstr "_Hauteur :" -#: ../src/ui/dialog/export.cpp:304 -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 +#: ../src/ui/dialog/export.cpp:304 ../src/ui/dialog/inkscape-preferences.cpp:1485 ../src/ui/dialog/inkscape-preferences.cpp:1489 #: ../src/ui/dialog/inkscape-preferences.cpp:1513 msgid "dpi" msgstr "ppp" @@ -15503,9 +13985,8 @@ msgid "Export the bitmap file with these settings" msgstr "Exporter le fichier bitmap avec ces réglages" #: ../src/ui/dialog/export.cpp:479 -#, fuzzy msgid "bitmap" -msgstr "Bitmap" +msgstr "bitmap" #: ../src/ui/dialog/export.cpp:614 #, c-format @@ -15544,9 +14025,7 @@ msgstr "Impossible d'exporter dans le fichier %s." #: ../src/ui/dialog/export.cpp:1098 #, c-format msgid "Successfully exported %d files from %d selected items." -msgstr "" -"%d fichiers ont été exportés à partir des %d objets " -"sélectionnés." +msgstr "%d fichiers ont été exportés à partir des %d objets sélectionnés." #: ../src/ui/dialog/export.cpp:1109 msgid "You have to enter a filename." @@ -15583,14 +14062,11 @@ msgstr "Dessin exporté vers %s." msgid "Export aborted." msgstr "Exportation annulée." -#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1388 -#: ../src/widgets/desktop-widget.cpp:1122 -#: ../src/widgets/desktop-widget.cpp:1184 +#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1388 ../src/widgets/desktop-widget.cpp:1122 ../src/widgets/desktop-widget.cpp:1184 msgid "_Cancel" msgstr "_Annuler" -#: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2406 ../src/widgets/desktop-widget.cpp:1123 +#: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 ../src/verbs.cpp:2406 ../src/widgets/desktop-widget.cpp:1123 msgid "_Save" msgstr "_Enregistrer" @@ -15598,52 +14074,25 @@ msgstr "_Enregistrer" msgid "Information" msgstr "Information" -#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 -#: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 -#: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:6 -#: ../share/extensions/dots.inx.h:7 -#: ../share/extensions/draw_from_triangle.inx.h:35 -#: ../share/extensions/dxf_input.inx.h:10 -#: ../share/extensions/dxf_outlines.inx.h:24 -#: ../share/extensions/gcodetools_about.inx.h:3 -#: ../share/extensions/gcodetools_area.inx.h:53 -#: ../share/extensions/gcodetools_check_for_updates.inx.h:3 -#: ../share/extensions/gcodetools_dxf_points.inx.h:25 -#: ../share/extensions/gcodetools_engraving.inx.h:31 -#: ../share/extensions/gcodetools_graffiti.inx.h:42 -#: ../share/extensions/gcodetools_lathe.inx.h:46 -#: ../share/extensions/gcodetools_orientation_points.inx.h:14 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:35 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:17 -#: ../share/extensions/gcodetools_tools_library.inx.h:12 -#: ../share/extensions/generate_voronoi.inx.h:5 -#: ../share/extensions/gimp_xcf.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:29 -#: ../share/extensions/jessyInk_autoTexts.inx.h:8 -#: ../share/extensions/jessyInk_effects.inx.h:13 -#: ../share/extensions/jessyInk_export.inx.h:7 -#: ../share/extensions/jessyInk_install.inx.h:2 -#: ../share/extensions/jessyInk_keyBindings.inx.h:44 -#: ../share/extensions/jessyInk_masterSlide.inx.h:5 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:6 -#: ../share/extensions/jessyInk_summary.inx.h:2 -#: ../share/extensions/jessyInk_transitions.inx.h:12 -#: ../share/extensions/jessyInk_uninstall.inx.h:10 -#: ../share/extensions/jessyInk_video.inx.h:2 -#: ../share/extensions/jessyInk_view.inx.h:7 -#: ../share/extensions/layout_nup.inx.h:24 -#: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 -#: ../share/extensions/measure.inx.h:33 -#: ../share/extensions/pathalongpath.inx.h:16 -#: ../share/extensions/pathscatter.inx.h:18 -#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25 -#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:11 -#: ../share/extensions/web-set-att.inx.h:25 -#: ../share/extensions/web-transmit-att.inx.h:23 -#: ../share/extensions/webslicer_create_group.inx.h:11 -#: ../share/extensions/webslicer_export.inx.h:6 +#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 +#: ../share/extensions/color_custom.inx.h:7 ../share/extensions/color_randomize.inx.h:6 ../share/extensions/dots.inx.h:7 +#: ../share/extensions/draw_from_triangle.inx.h:35 ../share/extensions/dxf_input.inx.h:10 ../share/extensions/dxf_outlines.inx.h:24 +#: ../share/extensions/gcodetools_about.inx.h:3 ../share/extensions/gcodetools_area.inx.h:53 +#: ../share/extensions/gcodetools_check_for_updates.inx.h:3 ../share/extensions/gcodetools_dxf_points.inx.h:25 +#: ../share/extensions/gcodetools_engraving.inx.h:31 ../share/extensions/gcodetools_graffiti.inx.h:42 +#: ../share/extensions/gcodetools_lathe.inx.h:46 ../share/extensions/gcodetools_orientation_points.inx.h:14 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:35 ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:17 +#: ../share/extensions/gcodetools_tools_library.inx.h:12 ../share/extensions/generate_voronoi.inx.h:5 ../share/extensions/gimp_xcf.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:29 ../share/extensions/jessyInk_autoTexts.inx.h:8 ../share/extensions/jessyInk_effects.inx.h:13 +#: ../share/extensions/jessyInk_export.inx.h:7 ../share/extensions/jessyInk_install.inx.h:2 ../share/extensions/jessyInk_keyBindings.inx.h:44 +#: ../share/extensions/jessyInk_masterSlide.inx.h:5 ../share/extensions/jessyInk_mouseHandler.inx.h:6 +#: ../share/extensions/jessyInk_summary.inx.h:2 ../share/extensions/jessyInk_transitions.inx.h:12 +#: ../share/extensions/jessyInk_uninstall.inx.h:10 ../share/extensions/jessyInk_video.inx.h:2 ../share/extensions/jessyInk_view.inx.h:7 +#: ../share/extensions/layout_nup.inx.h:24 ../share/extensions/lindenmayer.inx.h:13 ../share/extensions/lorem_ipsum.inx.h:6 +#: ../share/extensions/measure.inx.h:33 ../share/extensions/pathalongpath.inx.h:16 ../share/extensions/pathscatter.inx.h:18 +#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25 ../share/extensions/split.inx.h:8 +#: ../share/extensions/voronoi2svg.inx.h:11 ../share/extensions/web-set-att.inx.h:25 ../share/extensions/web-transmit-att.inx.h:23 +#: ../share/extensions/webslicer_create_group.inx.h:11 ../share/extensions/webslicer_export.inx.h:6 msgid "Help" msgstr "Aide" @@ -15664,55 +14113,39 @@ msgstr "image trop grande pour un aperçu" msgid "Enable preview" msgstr "Activer l'aperçu" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:767 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:784 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:787 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:795 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:811 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:826 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:417 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:767 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:784 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:787 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:795 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:811 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:826 ../src/ui/dialog/filedialogimpl-win32.cpp:286 ../src/ui/dialog/filedialogimpl-win32.cpp:417 msgid "All Files" msgstr "Tous les fichiers" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:792 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:808 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:823 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:792 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:808 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:823 #: ../src/ui/dialog/filedialogimpl-win32.cpp:287 msgid "All Inkscape Files" msgstr "Tous les fichiers Inkscape" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:799 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:815 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:829 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:799 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:815 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:829 #: ../src/ui/dialog/filedialogimpl-win32.cpp:288 msgid "All Images" msgstr "Toutes les images" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:802 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:818 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:832 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:802 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:818 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:832 #: ../src/ui/dialog/filedialogimpl-win32.cpp:289 msgid "All Vectors" msgstr "Tous les formats vectoriels" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:821 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:835 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:821 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:835 #: ../src/ui/dialog/filedialogimpl-win32.cpp:290 msgid "All Bitmaps" msgstr "Toutes les images bitmap" #. ###### File options #. ###### Do we want the .xxx extension automatically added? -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1054 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1612 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1054 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1612 msgid "Append filename extension automatically" msgstr "Ajouter une extension automatiquement" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1227 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1480 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1227 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1480 msgid "Guess from extension" msgstr "Deviner le type de fichier par l'extension" @@ -15760,8 +14193,7 @@ msgstr "Résolution (point par pouce)" msgid "Document" msgstr "Document" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2002 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 ../src/widgets/desktop-widget.cpp:2002 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "Sélection" @@ -15810,19 +14242,15 @@ msgstr "St_yle du contour" #. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor #: ../src/ui/dialog/filter-effects-dialog.cpp:547 msgid "" -"This matrix determines a linear transform on color space. Each line affects " -"one of the color components. Each column determines how much of each color " -"component from the input is passed to the output. The last column does not " -"depend on input colors, so can be used to adjust a constant component value." -msgstr "" -"Cette matrice détermine une transformation linéaire de l'espace des " -"couleurs. Chaque ligne affecte une des composantes de la couleur. Chaque " -"colonne détermine quelle proportion de chaque composante de l'entrée est " -"passée à la sortie. La dernière colonne ne dépend pas de l'entrée. Elle sert " -"à ajouter une constante aux composantes." - -#: ../src/ui/dialog/filter-effects-dialog.cpp:550 -#: ../share/extensions/grid_polar.inx.h:4 +"This matrix determines a linear transform on color space. Each line affects one of the color components. Each column determines how much of " +"each color component from the input is passed to the output. The last column does not depend on input colors, so can be used to adjust a " +"constant component value." +msgstr "" +"Cette matrice détermine une transformation linéaire de l'espace des couleurs. Chaque ligne affecte une des composantes de la couleur. Chaque " +"colonne détermine quelle proportion de chaque composante de l'entrée est passée à la sortie. La dernière colonne ne dépend pas de l'entrée. " +"Elle sert à ajouter une constante aux composantes." + +#: ../src/ui/dialog/filter-effects-dialog.cpp:550 ../share/extensions/grid_polar.inx.h:4 msgctxt "Label" msgid "None" msgstr "Aucun" @@ -15874,36 +14302,30 @@ msgstr "Source de lumière :" #: ../src/ui/dialog/filter-effects-dialog.cpp:1196 msgid "Direction angle for the light source on the XY plane, in degrees" -msgstr "" -"Angle pour la direction de la source de lumière dans le plan XY, en degrés" +msgstr "Angle pour la direction de la source de lumière dans le plan XY, en degrés" #: ../src/ui/dialog/filter-effects-dialog.cpp:1197 msgid "Direction angle for the light source on the YZ plane, in degrees" -msgstr "" -"Angle pour la direction de la source de lumière dans le plan XY, en degrés" +msgstr "Angle pour la direction de la source de lumière dans le plan XY, en degrés" #. default x: #. default y: #. default z: -#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 ../src/ui/dialog/filter-effects-dialog.cpp:1203 msgid "Location:" msgstr "Localisation :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "X coordinate" msgstr "Coordonnées X" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Y coordinate" msgstr "Coordonnée Y" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 ../src/ui/dialog/filter-effects-dialog.cpp:1203 #: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Z coordinate" msgstr "Coordonnée Z" @@ -15927,13 +14349,11 @@ msgstr "Angle du cône" #: ../src/ui/dialog/filter-effects-dialog.cpp:1209 msgid "" -"This is the angle between the spot light axis (i.e. the axis between the " -"light source and the point to which it is pointing at) and the spot light " -"cone. No light is projected outside this cone." +"This is the angle between the spot light axis (i.e. the axis between the light source and the point to which it is pointing at) and the spot " +"light cone. No light is projected outside this cone." msgstr "" -"C'est l'ouverture du cône de lumière autour de l'axe de la source (la ligne " -"entre la source et le point vers lequel elle pointe). Aucune lumière n'est " -"projetée hors de ce cône." +"C'est l'ouverture du cône de lumière autour de l'axe de la source (la ligne entre la source et le point vers lequel elle pointe). Aucune " +"lumière n'est projetée hors de ce cône." #: ../src/ui/dialog/filter-effects-dialog.cpp:1275 msgid "New light source" @@ -16041,15 +14461,11 @@ msgstr "Hauteur de la zone d'action du filtre" #: ../src/ui/dialog/filter-effects-dialog.cpp:2856 msgid "" -"Indicates the type of matrix operation. The keyword 'matrix' indicates that " -"a full 5x4 matrix of values will be provided. The other keywords represent " -"convenience shortcuts to allow commonly used color operations to be " -"performed without specifying a complete matrix." +"Indicates the type of matrix operation. The keyword 'matrix' indicates that a full 5x4 matrix of values will be provided. The other keywords " +"represent convenience shortcuts to allow commonly used color operations to be performed without specifying a complete matrix." msgstr "" -"Indique le type d'opération matricielle. Le mot-clef « matrice » indique " -"qu'une matrice 5x4 sera donnée en entrée. Les autres mots-clés représentent " -"des raccourcis pour les opérations les plus fréquentes sur les couleurs sans " -"spécifier de matrice." +"Indique le type d'opération matricielle. Le mot-clef « matrice » indique qu'une matrice 5x4 sera donnée en entrée. Les autres mots-clés " +"représentent des raccourcis pour les opérations les plus fréquentes sur les couleurs sans spécifier de matrice." #: ../src/ui/dialog/filter-effects-dialog.cpp:2857 msgid "Value(s):" @@ -16060,8 +14476,7 @@ msgid "R:" msgstr "R :" # Green (in RGB) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 -#: ../src/ui/widget/color-icc-selector.cpp:180 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 ../src/ui/widget/color-icc-selector.cpp:180 msgid "G:" msgstr "V :" @@ -16075,8 +14490,7 @@ msgstr "B :" msgid "A:" msgstr "A :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "Operator:" msgstr "Opérateur :" @@ -16084,18 +14498,14 @@ msgstr "Opérateur :" msgid "K1:" msgstr "K1 :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 ../src/ui/dialog/filter-effects-dialog.cpp:2869 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 ../src/ui/dialog/filter-effects-dialog.cpp:2871 msgid "" -"If the arithmetic operation is chosen, each result pixel is computed using " -"the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " -"values of the first and second inputs respectively." +"If the arithmetic operation is chosen, each result pixel is computed using the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the " +"pixel values of the first and second inputs respectively." msgstr "" -"Si une opération arithmétique est sélectionnée, chaque pixel du résultat est " -"calculé par: k1*i1*i2 + k2*i1 + k3*i2 + k4. i1 et i2 sont les valeurs de la " -"première et de la deuxième entrée." +"Si une opération arithmétique est sélectionnée, chaque pixel du résultat est calculé par: k1*i1*i2 + k2*i1 + k3*i2 + k4. i1 et i2 sont les " +"valeurs de la première et de la deuxième entrée." #: ../src/ui/dialog/filter-effects-dialog.cpp:2869 msgid "K2:" @@ -16123,26 +14533,17 @@ msgstr "hauteur de la matrice de convolution" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 -#: ../src/ui/dialog/object-attributes.cpp:48 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "Cible :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2875 -msgid "" -"X coordinate of the target point in the convolve matrix. The convolution is " -"applied to pixels around this point." -msgstr "" -"Coordonnée X du point cible de la matrice de convolution. La convolution est " -"appliquée aux pixels qui entourent ce point." +msgid "X coordinate of the target point in the convolve matrix. The convolution is applied to pixels around this point." +msgstr "Coordonnée X du point cible de la matrice de convolution. La convolution est appliquée aux pixels qui entourent ce point." #: ../src/ui/dialog/filter-effects-dialog.cpp:2875 -msgid "" -"Y coordinate of the target point in the convolve matrix. The convolution is " -"applied to pixels around this point." -msgstr "" -"Coordonnée Y du point cible de la matrice de convolution. La convolution est " -"appliquée aux pixels qui entourent ce point." +msgid "Y coordinate of the target point in the convolve matrix. The convolution is applied to pixels around this point." +msgstr "Coordonnée Y du point cible de la matrice de convolution. La convolution est appliquée aux pixels qui entourent ce point." #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) #: ../src/ui/dialog/filter-effects-dialog.cpp:2877 @@ -16151,19 +14552,14 @@ msgstr "Kernel :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2877 msgid "" -"This matrix describes the convolve operation that is applied to the input " -"image in order to calculate the pixel colors at the output. Different " -"arrangements of values in this matrix result in various possible visual " -"effects. An identity matrix would lead to a motion blur effect (parallel to " -"the matrix diagonal) while a matrix filled with a constant non-zero value " -"would lead to a common blur effect." -msgstr "" -"Cette matrice décrit l'opération de convolution qui est appliquée à l'image " -"en entrée pour calculer les valeurs des pixels en sortie. Les organisations " -"différentes des valeurs dans cette matrice donnent divers effets visuels " -"possibles. Une matrice identité produira un effet de flou de mouvement " -"(parallèle à la diagonale de la matrice) alors qu'une matrice remplie d'une " -"valeur non-nulle constante produira un effet de flou simple." +"This matrix describes the convolve operation that is applied to the input image in order to calculate the pixel colors at the output. " +"Different arrangements of values in this matrix result in various possible visual effects. An identity matrix would lead to a motion blur " +"effect (parallel to the matrix diagonal) while a matrix filled with a constant non-zero value would lead to a common blur effect." +msgstr "" +"Cette matrice décrit l'opération de convolution qui est appliquée à l'image en entrée pour calculer les valeurs des pixels en sortie. Les " +"organisations différentes des valeurs dans cette matrice donnent divers effets visuels possibles. Une matrice identité produira un effet de " +"flou de mouvement (parallèle à la diagonale de la matrice) alors qu'une matrice remplie d'une valeur non-nulle constante produira un effet de " +"flou simple." #: ../src/ui/dialog/filter-effects-dialog.cpp:2879 msgid "Divisor:" @@ -16171,28 +14567,20 @@ msgstr "Diviseur :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2879 msgid "" -"After applying the kernelMatrix to the input image to yield a number, that " -"number is divided by divisor to yield the final destination color value. A " -"divisor that is the sum of all the matrix values tends to have an evening " -"effect on the overall color intensity of the result." +"After applying the kernelMatrix to the input image to yield a number, that number is divided by divisor to yield the final destination color " +"value. A divisor that is the sum of all the matrix values tends to have an evening effect on the overall color intensity of the result." msgstr "" -"Après l'application de la kernelMatrix à l'image en entrée pour obtenir un " -"nombre, ce nombre est divisé par le diviseur, ce qui donne la valeur de " -"couleur finale en sortie. Un diviseur d'une valeur égale à la somme de " -"toutes les valeurs de la matrice aura tendance à avoir un effet lissant sur " -"l'intensité globale de la couleur du résultat." +"Après l'application de la kernelMatrix à l'image en entrée pour obtenir un nombre, ce nombre est divisé par le diviseur, ce qui donne la " +"valeur de couleur finale en sortie. Un diviseur d'une valeur égale à la somme de toutes les valeurs de la matrice aura tendance à avoir un " +"effet lissant sur l'intensité globale de la couleur du résultat." #: ../src/ui/dialog/filter-effects-dialog.cpp:2880 msgid "Bias:" msgstr "Déviation :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2880 -msgid "" -"This value is added to each component. This is useful to define a constant " -"value as the zero response of the filter." -msgstr "" -"Cette valeur est ajoutée à chaque composant. Permet de définir une valeur " -"constante comme la réponse en zéro du filtre." +msgid "This value is added to each component. This is useful to define a constant value as the zero response of the filter." +msgstr "Cette valeur est ajoutée à chaque composant. Permet de définir une valeur constante comme la réponse en zéro du filtre." #: ../src/ui/dialog/filter-effects-dialog.cpp:2881 msgid "Edge Mode:" @@ -16200,13 +14588,11 @@ msgstr "Mode bordure :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2881 msgid "" -"Determines how to extend the input image as necessary with color values so " -"that the matrix operations can be applied when the kernel is positioned at " -"or near the edge of the input image." +"Determines how to extend the input image as necessary with color values so that the matrix operations can be applied when the kernel is " +"positioned at or near the edge of the input image." msgstr "" -"Détermine comment étendre l'image en entrée avec des valeurs de couleur si " -"besoin, pour que les opérations matricielles puissent être appliquées quand " -"le kernel est positionné au bord ou près du bord de l'image en entrée." +"Détermine comment étendre l'image en entrée avec des valeurs de couleur si besoin, pour que les opérations matricielles puissent être " +"appliquées quand le kernel est positionné au bord ou près du bord de l'image en entrée." #: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "Preserve Alpha" @@ -16214,46 +14600,34 @@ msgstr "Préserver l'opacité" #: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "If set, the alpha channel won't be altered by this filter primitive." -msgstr "" -"Si coché, la composante opacité (alpha) ne sera pas modifiée par cette " -"primitive de filtre." +msgstr "Si coché, la composante opacité (alpha) ne sera pas modifiée par cette primitive de filtre." #. default: white #: ../src/ui/dialog/filter-effects-dialog.cpp:2885 msgid "Diffuse Color:" msgstr "Diffusion de la couleur :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2885 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2885 ../src/ui/dialog/filter-effects-dialog.cpp:2918 msgid "Defines the color of the light source" msgstr "Définit la couleur de la source lumineuse" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Surface Scale:" msgstr "Relief de surface :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 -msgid "" -"This value amplifies the heights of the bump map defined by the input alpha " -"channel" -msgstr "" -"Cette valeur amplifie la hauteur du relief défini par la composante opacité " -"(alpha) en entrée" +#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 ../src/ui/dialog/filter-effects-dialog.cpp:2919 +msgid "This value amplifies the heights of the bump map defined by the input alpha channel" +msgstr "Cette valeur amplifie la hauteur du relief défini par la composante opacité (alpha) en entrée" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Constant:" msgstr "Constante :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "This constant affects the Phong lighting model." msgstr "Cette constante agit sur le modèle d'éclairage Phong." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 ../src/ui/dialog/filter-effects-dialog.cpp:2922 msgid "Kernel Unit Length:" msgstr "Unité de longueur du Kernel :" @@ -16284,8 +14658,7 @@ msgstr "Couleur de remplissage :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "The whole filter region will be filled with this color." -msgstr "" -"Toute la région affectée par le filtre sera remplie avec cette couleur." +msgstr "Toute la région affectée par le filtre sera remplie avec cette couleur." #: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "Standard Deviation:" @@ -16328,24 +14701,17 @@ msgstr "Distance du décalage de l'image vers le bas" msgid "Specular Color:" msgstr "Couleur spéculaire :" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 -#: ../share/extensions/interp.inx.h:2 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "Exposant :" #: ../src/ui/dialog/filter-effects-dialog.cpp:2921 msgid "Exponent for specular term, larger is more \"shiny\"." -msgstr "" -"Exposant pour le terme spéculaire. Plus il est grand, plus l'objet est " -"« brillant »." +msgstr "Exposant pour le terme spéculaire. Plus il est grand, plus l'objet est « brillant »." #: ../src/ui/dialog/filter-effects-dialog.cpp:2930 -msgid "" -"Indicates whether the filter primitive should perform a noise or turbulence " -"function." -msgstr "" -"Indique si la primitive de filtre doit effectuer une fonction de bruit ou de " -"turbulence." +msgid "Indicates whether the filter primitive should perform a noise or turbulence function." +msgstr "Indique si la primitive de filtre doit effectuer une fonction de bruit ou de turbulence." #: ../src/ui/dialog/filter-effects-dialog.cpp:2931 msgid "Base Frequency:" @@ -16368,177 +14734,127 @@ msgid "Add filter primitive" msgstr "Ajouter une primitive de filtre" #: ../src/ui/dialog/filter-effects-dialog.cpp:2962 -msgid "" -"The feBlend filter primitive provides 4 image blending modes: screen, " -"multiply, darken and lighten." -msgstr "" -"feBlend fournit quatre modes de fondu d'image : produit, " -"superposition, obscurcir et éclaircir." +msgid "The feBlend filter primitive provides 4 image blending modes: screen, multiply, darken and lighten." +msgstr "feBlend fournit quatre modes de fondu d'image : produit, superposition, obscurcir et éclaircir." #: ../src/ui/dialog/filter-effects-dialog.cpp:2966 msgid "" -"The feColorMatrix filter primitive applies a matrix transformation to " -"color of each rendered pixel. This allows for effects like turning object to " -"grayscale, modifying color saturation and changing color hue." +"The feColorMatrix filter primitive applies a matrix transformation to color of each rendered pixel. This allows for effects like " +"turning object to grayscale, modifying color saturation and changing color hue." msgstr "" -"feColorMatrix applique une transformation matricielle à la couleur de " -"chaque pixel. Cela permet des effets comme la transformation d'objets en " -"niveaux de gris, la modification de la saturation des couleurs et la " -"modification de la teinte des couleurs." +"feColorMatrix applique une transformation matricielle à la couleur de chaque pixel. Cela permet des effets comme la transformation " +"d'objets en niveaux de gris, la modification de la saturation des couleurs et la modification de la teinte des couleurs." #: ../src/ui/dialog/filter-effects-dialog.cpp:2970 msgid "" -"The feComponentTransfer filter primitive manipulates the input's " -"color components (red, green, blue, and alpha) according to particular " -"transfer functions, allowing operations like brightness and contrast " -"adjustment, color balance, and thresholding." +"The feComponentTransfer filter primitive manipulates the input's color components (red, green, blue, and alpha) according to particular " +"transfer functions, allowing operations like brightness and contrast adjustment, color balance, and thresholding." msgstr "" -"feComponentTransfer manipule les composantes de couleur de l'entrée " -"(rouge, vert, bleu et opacité) suivant des fonctions de tranfert. Cela " -"permet des opérations comme l'ajustement de luminosité et de contraste, la " -"balance des couleurs, et la détection de seuil." +"feComponentTransfer manipule les composantes de couleur de l'entrée (rouge, vert, bleu et opacité) suivant des fonctions de tranfert. " +"Cela permet des opérations comme l'ajustement de luminosité et de contraste, la balance des couleurs, et la détection de seuil." #: ../src/ui/dialog/filter-effects-dialog.cpp:2974 msgid "" -"The feComposite filter primitive composites two images using one of " -"the Porter-Duff blending modes or the arithmetic mode described in SVG " -"standard. Porter-Duff blending modes are essentially logical operations " -"between the corresponding pixel values of the images." +"The feComposite filter primitive composites two images using one of the Porter-Duff blending modes or the arithmetic mode described in " +"SVG standard. Porter-Duff blending modes are essentially logical operations between the corresponding pixel values of the images." msgstr "" -"La primitive feComposite fond deux images ensemble en utilisant un " -"des modes de fondu Porter-Duff ou le mode arithmétique décrit dans le " -"standard SVG. Les modes de fondu Porter-Duff sont en résumé des opérations " -"logiques entre les valeurs de pixels respectives des images." +"La primitive feComposite fond deux images ensemble en utilisant un des modes de fondu Porter-Duff ou le mode arithmétique décrit dans " +"le standard SVG. Les modes de fondu Porter-Duff sont en résumé des opérations logiques entre les valeurs de pixels respectives des images." #: ../src/ui/dialog/filter-effects-dialog.cpp:2978 msgid "" -"The feConvolveMatrix lets you specify a Convolution to be applied on " -"the image. Common effects created using convolution matrices are blur, " -"sharpening, embossing and edge detection. Note that while gaussian blur can " -"be created using this filter primitive, the special gaussian blur primitive " -"is faster and resolution-independent." -msgstr "" -"feConvolveMatrix vous permet de spécifier une matrice de convolution " -"à appliquer à l'image. Les effets courants créés par des matrices de " -"convolution sont le flou, la netteté, le gauffrage et la détection de bords. " -"Il faut noter que, bien qu'un flou gaussien puisse être créé en utilisant " -"cette primitive de filtre, la primitive dédiée au flou gaussien est plus " -"rapide et ne dépend pas de la résolution." +"The feConvolveMatrix lets you specify a Convolution to be applied on the image. Common effects created using convolution matrices are " +"blur, sharpening, embossing and edge detection. Note that while gaussian blur can be created using this filter primitive, the special gaussian " +"blur primitive is faster and resolution-independent." +msgstr "" +"feConvolveMatrix vous permet de spécifier une matrice de convolution à appliquer à l'image. Les effets courants créés par des matrices " +"de convolution sont le flou, la netteté, le gauffrage et la détection de bords. Il faut noter que, bien qu'un flou gaussien puisse être créé " +"en utilisant cette primitive de filtre, la primitive dédiée au flou gaussien est plus rapide et ne dépend pas de la résolution." #: ../src/ui/dialog/filter-effects-dialog.cpp:2982 msgid "" -"The feDiffuseLighting and feSpecularLighting filter primitives create " -"\"embossed\" shadings. The input's alpha channel is used to provide depth " -"information: higher opacity areas are raised toward the viewer and lower " -"opacity areas recede away from the viewer." +"The feDiffuseLighting and feSpecularLighting filter primitives create \"embossed\" shadings. The input's alpha channel is used to " +"provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer." msgstr "" -"feDiffuseLighting et feSpecularLighting créent des ombrages " -"« gauffrés ». La composante d'opacité (alpha) de l'entrée est utilisée pour " -"founir l'information de profondeur : les zones de forte opacité sont élevées " -"vers le point de vue et les zones de faible opacité sont reculées par " -"rapport au point de vue." +"feDiffuseLighting et feSpecularLighting créent des ombrages « gauffrés ». La composante d'opacité (alpha) de l'entrée est utilisée pour " +"founir l'information de profondeur : les zones de forte opacité sont élevées vers le point de vue et les zones de faible opacité sont reculées " +"par rapport au point de vue." #: ../src/ui/dialog/filter-effects-dialog.cpp:2986 msgid "" -"The feDisplacementMap filter primitive displaces the pixels in the " -"first input using the second input as a displacement map, that shows from " -"how far the pixel should come from. Classical examples are whirl and pinch " -"effects." +"The feDisplacementMap filter primitive displaces the pixels in the first input using the second input as a displacement map, that shows " +"from how far the pixel should come from. Classical examples are whirl and pinch effects." msgstr "" -"feDisplacementMap déplace les pixels de la première entrée en " -"utilisant la deuxième entrée comme displacement map, qui définit la distance " -"d'où le pixel doit venir. Les exemples les plus classiques sont les effets " -"de tourbillon et de contraction." +"feDisplacementMap déplace les pixels de la première entrée en utilisant la deuxième entrée comme displacement map, qui définit la " +"distance d'où le pixel doit venir. Les exemples les plus classiques sont les effets de tourbillon et de contraction." #: ../src/ui/dialog/filter-effects-dialog.cpp:2990 msgid "" -"The feFlood filter primitive fills the region with a given color and " -"opacity. It is usually used as an input to other filters to apply color to " -"a graphic." +"The feFlood filter primitive fills the region with a given color and opacity. It is usually used as an input to other filters to apply " +"color to a graphic." msgstr "" -"feFlood remplit la région avec une couleur et une opacité données. Il " -"est le plus souvent utilisé comme entrée pour d'autres filtres pour " -"appliquer une couleur à une ressource graphique." +"feFlood remplit la région avec une couleur et une opacité données. Il est le plus souvent utilisé comme entrée pour d'autres filtres " +"pour appliquer une couleur à une ressource graphique." #: ../src/ui/dialog/filter-effects-dialog.cpp:2994 msgid "" -"The feGaussianBlur filter primitive uniformly blurs its input. It is " -"commonly used together with feOffset to create a drop shadow effect." +"The feGaussianBlur filter primitive uniformly blurs its input. It is commonly used together with feOffset to create a drop shadow " +"effect." msgstr "" -"feGaussianBlur rend uniformément flou son entrée. Il est le plus " -"souvent utilisé avec feOffset pour créer un effet d'ombre portée." +"feGaussianBlur rend uniformément flou son entrée. Il est le plus souvent utilisé avec feOffset pour créer un effet d'ombre portée." #: ../src/ui/dialog/filter-effects-dialog.cpp:2998 -msgid "" -"The feImage filter primitive fills the region with an external image " -"or another part of the document." -msgstr "" -"feImage remplit la zone avec une image externe ou une autre partie du " -"document." +msgid "The feImage filter primitive fills the region with an external image or another part of the document." +msgstr "feImage remplit la zone avec une image externe ou une autre partie du document." #: ../src/ui/dialog/filter-effects-dialog.cpp:3002 msgid "" -"The feMerge filter primitive composites several temporary images " -"inside the filter primitive to a single image. It uses normal alpha " -"compositing for this. This is equivalent to using several feBlend primitives " -"in 'normal' mode or several feComposite primitives in 'over' mode." +"The feMerge filter primitive composites several temporary images inside the filter primitive to a single image. It uses normal alpha " +"compositing for this. This is equivalent to using several feBlend primitives in 'normal' mode or several feComposite primitives in 'over' mode." msgstr "" -"feMerge compose plusieurs images temporaires à l'intérieur du filtre " -"de primitive en une seule image. Il utilise la composition alpha normale " -"pour ce faire. Celà équivaut à utiliser plusieurs primitives feBlend en mode " -"'normal' ou plusieurs primitives feComposite en mode 'over'." +"feMerge compose plusieurs images temporaires à l'intérieur du filtre de primitive en une seule image. Il utilise la composition alpha " +"normale pour ce faire. Celà équivaut à utiliser plusieurs primitives feBlend en mode 'normal' ou plusieurs primitives feComposite en mode " +"'over'." #: ../src/ui/dialog/filter-effects-dialog.cpp:3006 msgid "" -"The feMorphology filter primitive provides erode and dilate effects. " -"For single-color objects erode makes the object thinner and dilate makes it " -"thicker." +"The feMorphology filter primitive provides erode and dilate effects. For single-color objects erode makes the object thinner and dilate " +"makes it thicker." msgstr "" -"feMorphology fournit des effets de contraction et de dilatation. Pour " -"des objets de couleur uniforme la contraction rend l'objet plus fin et la " -"dilatation le rend plus épais." +"feMorphology fournit des effets de contraction et de dilatation. Pour des objets de couleur uniforme la contraction rend l'objet plus " +"fin et la dilatation le rend plus épais." #: ../src/ui/dialog/filter-effects-dialog.cpp:3010 msgid "" -"The feOffset filter primitive offsets the image by an user-defined " -"amount. For example, this is useful for drop shadows, where the shadow is in " -"a slightly different position than the actual object." +"The feOffset filter primitive offsets the image by an user-defined amount. For example, this is useful for drop shadows, where the " +"shadow is in a slightly different position than the actual object." msgstr "" -"feOffset décale l'image d'une quantité définie par l'utilisateur. Par " -"example, il est utile dans le cas des ombres portées, où les ombres sont " -"dans une position légèrement différente de l'objet source de l'ombre." +"feOffset décale l'image d'une quantité définie par l'utilisateur. Par example, il est utile dans le cas des ombres portées, où les " +"ombres sont dans une position légèrement différente de l'objet source de l'ombre." #: ../src/ui/dialog/filter-effects-dialog.cpp:3014 msgid "" -"The feDiffuseLighting and feSpecularLighting filter primitives " -"create \"embossed\" shadings. The input's alpha channel is used to provide " -"depth information: higher opacity areas are raised toward the viewer and " -"lower opacity areas recede away from the viewer." -msgstr "" -"feDiffuseLighting et feSpecularLighting créent des ombrages " -"« gaufrés ». La composante d'opacité (alpha) de l'entrée est utilisée pour " -"fournir l'information de profondeur : les zones de forte opacité sont " -"élevées vers le point de vue et les zones de faible opacité sont reculées " -"par rapport au point de vue." +"The feDiffuseLighting and feSpecularLighting filter primitives create \"embossed\" shadings. The input's alpha channel is used " +"to provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer." +msgstr "" +"feDiffuseLighting et feSpecularLighting créent des ombrages « gaufrés ». La composante d'opacité (alpha) de l'entrée est utilisée pour " +"fournir l'information de profondeur : les zones de forte opacité sont élevées vers le point de vue et les zones de faible opacité sont " +"reculées par rapport au point de vue." #: ../src/ui/dialog/filter-effects-dialog.cpp:3018 #, fuzzy msgid "" -"The feTile filter primitive tiles a region with an input graphic. The " -"source tile is defined by the filter primitive subregion of the input." -msgstr "" -"feImage remplit la zone avec une image externe ou une autre partie du " -"document." +"The feTile filter primitive tiles a region with an input graphic. The source tile is defined by the filter primitive subregion of the " +"input." +msgstr "feImage remplit la zone avec une image externe ou une autre partie du document." #: ../src/ui/dialog/filter-effects-dialog.cpp:3022 msgid "" -"The feTurbulence filter primitive renders Perlin noise. This kind of " -"noise is useful in simulating several nature phenomena like clouds, fire and " -"smoke and in generating complex textures like marble or granite." +"The feTurbulence filter primitive renders Perlin noise. This kind of noise is useful in simulating several nature phenomena like " +"clouds, fire and smoke and in generating complex textures like marble or granite." msgstr "" -"feTurbulence crée du bruit de Perlin. Ce genre de bruit est utile " -"pour simuler les phénomènes naturels comme les nuages, le feu et la fumée, " -"et pour générer des textures complexes comme le marbre ou le granit." +"feTurbulence crée du bruit de Perlin. Ce genre de bruit est utile pour simuler les phénomènes naturels comme les nuages, le feu et la " +"fumée, et pour générer des textures complexes comme le marbre ou le granit." #: ../src/ui/dialog/filter-effects-dialog.cpp:3041 msgid "Duplicate filter primitive" @@ -16554,9 +14870,7 @@ msgstr "Re_chercher :" #: ../src/ui/dialog/find.cpp:72 msgid "Find objects by their content or properties (exact or partial match)" -msgstr "" -"Rechercher des objets par leur contenu ou propriétés (correspondance exacte " -"ou partielle)" +msgstr "Rechercher des objets par leur contenu ou propriétés (correspondance exacte ou partielle)" #: ../src/ui/dialog/find.cpp:73 msgid "R_eplace:" @@ -16600,9 +14914,7 @@ msgstr "_Propriétés" #: ../src/ui/dialog/find.cpp:79 msgid "Search in object properties, styles, attributes and IDs" -msgstr "" -"Rechercher dans les propriétés, les styles, les attributs et les " -"identifiants des objets" +msgstr "Rechercher dans les propriétés, les styles, les attributs et les identifiants des objets" #: ../src/ui/dialog/find.cpp:81 msgid "Search in" @@ -16766,8 +15078,7 @@ msgstr "Clones" msgid "Search clones" msgstr "Rechercher les clones" -#: ../src/ui/dialog/find.cpp:110 ../share/extensions/embedimage.inx.h:3 -#: ../share/extensions/extractimage.inx.h:5 +#: ../src/ui/dialog/find.cpp:110 ../share/extensions/embedimage.inx.h:3 ../share/extensions/extractimage.inx.h:5 #: ../share/extensions/image_attributes.inx.h:29 msgid "Images" msgstr "Images" @@ -16794,8 +15105,7 @@ msgstr "_Rechercher" #: ../src/ui/dialog/find.cpp:115 msgid "Select all objects matching the selection criteria" -msgstr "" -"Sélectionner tous les objets qui correspondent aux critères de sélection" +msgstr "Sélectionner tous les objets qui correspondent aux critères de sélection" #: ../src/ui/dialog/find.cpp:116 msgid "_Replace All" @@ -16919,8 +15229,7 @@ msgstr "Chérokî" msgid "Coptic" msgstr "Copte" -#: ../src/ui/dialog/glyphs.cpp:69 ../src/ui/dialog/glyphs.cpp:161 -#: ../share/extensions/hershey.inx.h:22 +#: ../src/ui/dialog/glyphs.cpp:69 ../src/ui/dialog/glyphs.cpp:161 ../share/extensions/hershey.inx.h:22 msgid "Cyrillic" msgstr "Cyrillique" @@ -17612,11 +15921,8 @@ msgstr "Ajouter le texte" msgid "Arrange in a grid" msgstr "Disposer selon une grille" -#: ../src/ui/dialog/grid-arrange-tab.cpp:571 -#: ../src/ui/dialog/object-attributes.cpp:66 -#: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:666 -#: ../src/widgets/node-toolbar.cpp:581 +#: ../src/ui/dialog/grid-arrange-tab.cpp:571 ../src/ui/dialog/object-attributes.cpp:66 ../src/ui/dialog/object-attributes.cpp:75 +#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:666 ../src/widgets/node-toolbar.cpp:581 msgid "X:" msgstr "X :" @@ -17624,11 +15930,8 @@ msgstr "X :" msgid "Horizontal spacing between columns." msgstr "Espace horizontal entre les colonnes." -#: ../src/ui/dialog/grid-arrange-tab.cpp:572 -#: ../src/ui/dialog/object-attributes.cpp:67 -#: ../src/ui/dialog/object-attributes.cpp:76 -#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:676 -#: ../src/widgets/node-toolbar.cpp:599 +#: ../src/ui/dialog/grid-arrange-tab.cpp:572 ../src/ui/dialog/object-attributes.cpp:67 ../src/ui/dialog/object-attributes.cpp:76 +#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:676 ../src/widgets/node-toolbar.cpp:599 msgid "Y:" msgstr "Y :" @@ -17650,9 +15953,7 @@ msgstr "Égaliser la _hauteur" #: ../src/ui/dialog/grid-arrange-tab.cpp:642 msgid "If not set, each row has the height of the tallest object in it" -msgstr "" -"Si décoché, chaque ligne a même la hauteur que l'objet le plus haut qu'elle " -"contient" +msgstr "Si décoché, chaque ligne a même la hauteur que l'objet le plus haut qu'elle contient" #. #### Number of columns #### #: ../src/ui/dialog/grid-arrange-tab.cpp:658 @@ -17669,9 +15970,7 @@ msgstr "Égaliser la _largeur" #: ../src/ui/dialog/grid-arrange-tab.cpp:681 msgid "If not set, each column has the width of the widest object in it" -msgstr "" -"Si décoché, chaque ligne a la même largeur que l'objet le plus large qu'elle " -"contient" +msgstr "Si décoché, chaque ligne a la même largeur que l'objet le plus large qu'elle contient" #. Anchor selection widget #: ../src/ui/dialog/grid-arrange-tab.cpp:692 @@ -17762,11 +16061,8 @@ msgid "Show selection cue" msgstr "Afficher les poignées de sélection" #: ../src/ui/dialog/inkscape-preferences.cpp:184 -msgid "" -"Whether selected objects display a selection cue (the same as in selector)" -msgstr "" -"Si coché, l'objet sélectionné affiche ses poignées de sélection (les mêmes " -"que dans le sélecteur)" +msgid "Whether selected objects display a selection cue (the same as in selector)" +msgstr "Si coché, l'objet sélectionné affiche ses poignées de sélection (les mêmes que dans le sélecteur)" #: ../src/ui/dialog/inkscape-preferences.cpp:190 msgid "Enable gradient editing" @@ -17774,23 +16070,17 @@ msgstr "Activer l'édition de dégradé" #: ../src/ui/dialog/inkscape-preferences.cpp:191 msgid "Whether selected objects display gradient editing controls" -msgstr "" -"Si coché, les objets sélectionnés affichent leurs poignées d'édition de " -"dégradés" +msgstr "Si coché, les objets sélectionnés affichent leurs poignées d'édition de dégradés" #: ../src/ui/dialog/inkscape-preferences.cpp:196 msgid "Conversion to guides uses edges instead of bounding box" -msgstr "" -"Utiliser les bords (plutôt que les boîtes englobantes) pour convertir en " -"guides" +msgstr "Utiliser les bords (plutôt que les boîtes englobantes) pour convertir en guides" #: ../src/ui/dialog/inkscape-preferences.cpp:197 -msgid "" -"Converting an object to guides places these along the object's true edges " -"(imitating the object's shape), not along the bounding box" +msgid "Converting an object to guides places these along the object's true edges (imitating the object's shape), not along the bounding box" msgstr "" -"La conversion d'un objet en guides place ceux-ci le long des bords réels de " -"l'objet (imitant la forme de l'objet), et non le long de sa boîte englobante" +"La conversion d'un objet en guides place ceux-ci le long des bords réels de l'objet (imitant la forme de l'objet), et non le long de sa boîte " +"englobante" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "Ctrl+click _dot size:" @@ -17802,21 +16092,15 @@ msgstr "fois l'épaisseur courante de contour" #: ../src/ui/dialog/inkscape-preferences.cpp:205 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" -msgstr "" -"Taille des points créés avec Ctrl+clic (par rapport à l'épaisseur courante " -"de contour)" +msgstr "Taille des points créés avec Ctrl+clic (par rapport à l'épaisseur courante de contour)" #: ../src/ui/dialog/inkscape-preferences.cpp:220 msgid "No objects selected to take the style from." msgstr "Aucun objet sélectionné pour en capturer le style." #: ../src/ui/dialog/inkscape-preferences.cpp:229 -msgid "" -"More than one object selected. Cannot take style from multiple " -"objects." -msgstr "" -"Plus d'un objet est sélectionné. Impossible de capturer le style de " -"plusieurs objets." +msgid "More than one object selected. Cannot take style from multiple objects." +msgstr "Plus d'un objet est sélectionné. Impossible de capturer le style de plusieurs objets." #: ../src/ui/dialog/inkscape-preferences.cpp:265 msgid "Style of new objects" @@ -17835,12 +16119,8 @@ msgid "This tool's own style:" msgstr "Style propre à l'outil :" #: ../src/ui/dialog/inkscape-preferences.cpp:278 -msgid "" -"Each tool may store its own style to apply to the newly created objects. Use " -"the button below to set it." -msgstr "" -"Chaque outil retient son propre style à appliquer aux nouveaux objets créés. " -"Utiliser le bouton ci-dessous pour le définir." +msgid "Each tool may store its own style to apply to the newly created objects. Use the button below to set it." +msgstr "Chaque outil retient son propre style à appliquer aux nouveaux objets créés. Utiliser le bouton ci-dessous pour le définir." #. style swatch #: ../src/ui/dialog/inkscape-preferences.cpp:282 @@ -17853,8 +16133,7 @@ msgstr "Style de cet outil pour les nouveaux objets" #: ../src/ui/dialog/inkscape-preferences.cpp:298 msgid "Remember the style of the (first) selected object as this tool's style" -msgstr "" -"Mémoriser le style du premier objet sélectionné comme style de cet outil" +msgstr "Mémoriser le style du premier objet sélectionné comme style de cet outil" #: ../src/ui/dialog/inkscape-preferences.cpp:303 msgid "Tools" @@ -17870,9 +16149,7 @@ msgstr "Boîte englobante visuelle" #: ../src/ui/dialog/inkscape-preferences.cpp:309 msgid "This bounding box includes stroke width, markers, filter margins, etc." -msgstr "" -"Cette boîte englobante comprend l'épaisseur du contour, les marqueurs, les " -"marges des filtres, etc." +msgstr "Cette boîte englobante comprend l'épaisseur du contour, les marqueurs, les marges des filtres, etc." #: ../src/ui/dialog/inkscape-preferences.cpp:310 msgid "Geometric bounding box" @@ -17891,24 +16168,18 @@ msgid "Keep objects after conversion to guides" msgstr "Conserver les objets après leur conversion en guides" #: ../src/ui/dialog/inkscape-preferences.cpp:317 -msgid "" -"When converting an object to guides, don't delete the object after the " -"conversion" -msgstr "" -"Lors de la conversion d'objets en guides, ne pas supprimer les objets après " -"la conversion" +msgid "When converting an object to guides, don't delete the object after the conversion" +msgstr "Lors de la conversion d'objets en guides, ne pas supprimer les objets après la conversion" #: ../src/ui/dialog/inkscape-preferences.cpp:318 msgid "Treat groups as a single object" msgstr "Manipule le groupe comme un objet unique" #: ../src/ui/dialog/inkscape-preferences.cpp:320 -msgid "" -"Treat groups as a single object during conversion to guides rather than " -"converting each child separately" +msgid "Treat groups as a single object during conversion to guides rather than converting each child separately" msgstr "" -"Lors de la conversion en guides, les groupes sont traités chacun comme un " -"objet unique (la conversion n'est pas appliquée à chaque enfant séparément)" +"Lors de la conversion en guides, les groupes sont traités chacun comme un objet unique (la conversion n'est pas appliquée à chaque enfant " +"séparément)" #: ../src/ui/dialog/inkscape-preferences.cpp:322 msgid "Average all sketches" @@ -17949,9 +16220,7 @@ msgstr "Silhouette rectangulaire" #: ../src/ui/dialog/inkscape-preferences.cpp:339 msgid "Show only a box outline of the objects when moving or transforming" -msgstr "" -"N'afficher que la silhouette rectangulaire des objets lors de leurs " -"déplacements ou transformations" +msgstr "N'afficher que la silhouette rectangulaire des objets lors de leurs déplacements ou transformations" #: ../src/ui/dialog/inkscape-preferences.cpp:340 msgid "Per-object selection cue" @@ -17972,9 +16241,7 @@ msgstr "Marque" #: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Each selected object has a diamond mark in the top left corner" -msgstr "" -"Chaque objet sélectionné est marqué d'un losange dans le coin en haut à " -"gauche" +msgstr "Chaque objet sélectionné est marqué d'un losange dans le coin en haut à gauche" #: ../src/ui/dialog/inkscape-preferences.cpp:347 msgid "Box" @@ -18007,21 +16274,16 @@ msgstr "Toujours afficher le contour" #: ../src/ui/dialog/inkscape-preferences.cpp:359 msgid "Show outlines for all paths, not only invisible paths" -msgstr "" -"Affiche les contours pour tous les chemins, pas seulement les chemins " -"invisibles" +msgstr "Affiche les contours pour tous les chemins, pas seulement les chemins invisibles" #: ../src/ui/dialog/inkscape-preferences.cpp:360 msgid "Update outline when dragging nodes" msgstr "Mettre à jour le contour pendant le déplacement des nœuds" #: ../src/ui/dialog/inkscape-preferences.cpp:361 -msgid "" -"Update the outline when dragging or transforming nodes; if this is off, the " -"outline will only update when completing a drag" +msgid "Update the outline when dragging or transforming nodes; if this is off, the outline will only update when completing a drag" msgstr "" -"Met à jour le contour pendant le déplacement ou la transformation des " -"nœuds ; lorsque cette option est désactivée, le contour n'est mis à jour " +"Met à jour le contour pendant le déplacement ou la transformation des nœuds ; lorsque cette option est désactivée, le contour n'est mis à jour " "qu'à la fin du déplacement" #: ../src/ui/dialog/inkscape-preferences.cpp:362 @@ -18029,25 +16291,18 @@ msgid "Update paths when dragging nodes" msgstr "Mettre à jour les chemins pendant le déplacement des nœuds" #: ../src/ui/dialog/inkscape-preferences.cpp:363 -msgid "" -"Update paths when dragging or transforming nodes; if this is off, paths will " -"only be updated when completing a drag" +msgid "Update paths when dragging or transforming nodes; if this is off, paths will only be updated when completing a drag" msgstr "" -"Met à jour les chemins pendant le déplacement ou la transformation des " -"nœuds ; lorsque cette option est désactivée, les chemins ne sont mis à jour " -"qu'à la fin du déplacement" +"Met à jour les chemins pendant le déplacement ou la transformation des nœuds ; lorsque cette option est désactivée, les chemins ne sont mis à " +"jour qu'à la fin du déplacement" #: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Show path direction on outlines" msgstr "Afficher la direction des chemins sur le contour" #: ../src/ui/dialog/inkscape-preferences.cpp:365 -msgid "" -"Visualize the direction of selected paths by drawing small arrows in the " -"middle of each outline segment" -msgstr "" -"Visualise la direction des chemins sélectionnés en dessinant de petites " -"flèches au milieu de chaque segment de contour" +msgid "Visualize the direction of selected paths by drawing small arrows in the middle of each outline segment" +msgstr "Visualise la direction des chemins sélectionnés en dessinant de petites flèches au milieu de chaque segment de contour" #: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "Show temporary path outline" @@ -18063,9 +16318,7 @@ msgstr "Afficher temporairement le contour des chemins sélectionnés" #: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "Show temporary outline even when a path is selected for editing" -msgstr "" -"Affiche temporairement le contour même lorsqu'un chemin est sélectionné pour " -"édition" +msgstr "Affiche temporairement le contour même lorsqu'un chemin est sélectionné pour édition" #: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "_Flash time:" @@ -18073,13 +16326,11 @@ msgstr "Durée de _clignotement :" #: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "" -"Specifies how long the path outline will be visible after a mouse-over (in " -"milliseconds); specify 0 to have the outline shown until mouse leaves the " -"path" +"Specifies how long the path outline will be visible after a mouse-over (in milliseconds); specify 0 to have the outline shown until mouse " +"leaves the path" msgstr "" -"Définit combien de temps le contour sera visible après son survol par la " -"souris (en millisecondes) ; choisissez 0 pour garder le contour visible " -"jusqu'à ce que la souris quitte le chemin." +"Définit combien de temps le contour sera visible après son survol par la souris (en millisecondes) ; choisissez 0 pour garder le contour " +"visible jusqu'à ce que la souris quitte le chemin." #: ../src/ui/dialog/inkscape-preferences.cpp:372 msgid "Editing preferences" @@ -18091,21 +16342,15 @@ msgstr "Afficher les poignées de transformation pour un nœud seul" #: ../src/ui/dialog/inkscape-preferences.cpp:374 msgid "Show transform handles even when only a single node is selected" -msgstr "" -"Affiche les poignées de transformation même lorsqu'un seul nœud est " -"sélectionné" +msgstr "Affiche les poignées de transformation même lorsqu'un seul nœud est sélectionné" #: ../src/ui/dialog/inkscape-preferences.cpp:375 msgid "Deleting nodes preserves shape" msgstr "La suppression des nœuds préserve la forme" #: ../src/ui/dialog/inkscape-preferences.cpp:376 -msgid "" -"Move handles next to deleted nodes to resemble original shape; hold Ctrl to " -"get the other behavior" -msgstr "" -"Déplace les poignées près des nœuds supprimés pour conserver la forme " -"originale ; maintenir Ctrl pour désactiver cette fonctionnalité" +msgid "Move handles next to deleted nodes to resemble original shape; hold Ctrl to get the other behavior" +msgstr "Déplace les poignées près des nœuds supprimés pour conserver la forme originale ; maintenir Ctrl pour désactiver cette fonctionnalité" #. Tweak #: ../src/ui/dialog/inkscape-preferences.cpp:379 @@ -18117,8 +16362,7 @@ msgid "Object paint style" msgstr "Style de l'outil" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:385 -#: ../src/widgets/desktop-widget.cpp:631 +#: ../src/ui/dialog/inkscape-preferences.cpp:385 ../src/widgets/desktop-widget.cpp:631 msgid "Zoom" msgstr "Zoom" @@ -18134,13 +16378,11 @@ msgstr "Ignorer le premier et le dernier point" #: ../src/ui/dialog/inkscape-preferences.cpp:393 msgid "" -"The start and end of the measurement tool's control line will not be " -"considered for calculating lengths. Only lengths between actual curve " +"The start and end of the measurement tool's control line will not be considered for calculating lengths. Only lengths between actual curve " "intersections will be displayed." msgstr "" -"Le début et la fin de la ligne de contrôle de l'outil de mesure ne sont pas " -"pris en compte dans le calcul des longueurs. Seules les longueurs entre les " -"intersections des chemins sont affichées." +"Le début et la fin de la ligne de contrôle de l'outil de mesure ne sont pas pris en compte dans le calcul des longueurs. Seules les longueurs " +"entre les intersections des chemins sont affichées." #. Shapes #: ../src/ui/dialog/inkscape-preferences.cpp:396 @@ -18152,17 +16394,13 @@ msgid "Sketch mode" msgstr "Mode croquis" #: ../src/ui/dialog/inkscape-preferences.cpp:430 -msgid "" -"If on, the sketch result will be the normal average of all sketches made, " -"instead of averaging the old result with the new sketch" +msgid "If on, the sketch result will be the normal average of all sketches made, instead of averaging the old result with the new sketch" msgstr "" -"Si coché, le résultat du croquis sera moyenné avec tous les autres croquis ; " -"sinon, la moyenne sera effectuée entre l'ancien résultat et le nouveau " -"croquis" +"Si coché, le résultat du croquis sera moyenné avec tous les autres croquis ; sinon, la moyenne sera effectuée entre l'ancien résultat et le " +"nouveau croquis" #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:433 -#: ../src/ui/dialog/input.cpp:1485 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 ../src/ui/dialog/input.cpp:1485 msgid "Pen" msgstr "Stylo" @@ -18172,21 +16410,14 @@ msgid "Calligraphy" msgstr "Plume calligraphique" #: ../src/ui/dialog/inkscape-preferences.cpp:443 -msgid "" -"If on, pen width is in absolute units (px) independent of zoom; otherwise " -"pen width depends on zoom so that it looks the same at any zoom" +msgid "If on, pen width is in absolute units (px) independent of zoom; otherwise pen width depends on zoom so that it looks the same at any zoom" msgstr "" -"Si coché, la largeur de la plume est en unités absolues (px) indépendemment " -"du zoom; sinon, la largeur de plume dépend du zoom afin de paraître la même " -"quel que soit le zoom" +"Si coché, la largeur de la plume est en unités absolues (px) indépendemment du zoom; sinon, la largeur de plume dépend du zoom afin de " +"paraître la même quel que soit le zoom" #: ../src/ui/dialog/inkscape-preferences.cpp:445 -msgid "" -"If on, each newly created object will be selected (deselecting previous " -"selection)" -msgstr "" -"Activer pour que les nouveaux objets soient automatiquement sélectionnés (à " -"la place de l'ancienne sélection)" +msgid "If on, each newly created object will be selected (deselecting previous selection)" +msgstr "Activer pour que les nouveaux objets soient automatiquement sélectionnés (à la place de l'ancienne sélection)" #. Text #: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2722 @@ -18199,23 +16430,16 @@ msgid "Show font samples in the drop-down list" msgstr "Afficher les échantillons de police dans la liste déroulante" #: ../src/ui/dialog/inkscape-preferences.cpp:454 -msgid "" -"Show font samples alongside font names in the drop-down list in Text bar" -msgstr "" -"Affiche les échantillons de police à côté du nom dans la liste déroulante de " -"la barre de texte" +msgid "Show font samples alongside font names in the drop-down list in Text bar" +msgstr "Affiche les échantillons de police à côté du nom dans la liste déroulante de la barre de texte" #: ../src/ui/dialog/inkscape-preferences.cpp:456 msgid "Show font substitution warning dialog" msgstr "Afficher un avertissement lors du remplacement de polices" #: ../src/ui/dialog/inkscape-preferences.cpp:457 -msgid "" -"Show font substitution warning dialog when requested fonts are not available " -"on the system" -msgstr "" -"Afficher un avertissement de remplacement de police lorsque les polices " -"demandées ne sont pas disponibles" +msgid "Show font substitution warning dialog when requested fonts are not available on the system" +msgstr "Afficher un avertissement de remplacement de police lorsque les polices demandées ne sont pas disponibles" #: ../src/ui/dialog/inkscape-preferences.cpp:460 msgid "Pixel" @@ -18253,9 +16477,7 @@ msgstr "Unité de mesure pour la taille du texte :" #: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Set the type of unit used in the text toolbar and text dialogs" -msgstr "" -"Définir le type d'unité utilisée dans la boîte de dialogue Texte et police " -"et la barre de commande de l'outil texte" +msgstr "Définir le type d'unité utilisée dans la boîte de dialogue Texte et police et la barre de commande de l'outil texte" #: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "Always output text size in pixels (px)" @@ -18277,9 +16499,7 @@ msgid "Paint Bucket" msgstr "Remplissage au seau" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:487 -#: ../src/widgets/gradient-selector.cpp:148 -#: ../src/widgets/gradient-selector.cpp:299 +#: ../src/ui/dialog/inkscape-preferences.cpp:487 ../src/widgets/gradient-selector.cpp:148 ../src/widgets/gradient-selector.cpp:299 msgid "Gradient" msgstr "Dégradé" @@ -18289,14 +16509,11 @@ msgstr "Interdire le partage des définitions de dégradé" #: ../src/ui/dialog/inkscape-preferences.cpp:491 msgid "" -"When on, shared gradient definitions are automatically forked on change; " -"uncheck to allow sharing of gradient definitions so that editing one object " -"may affect other objects using the same gradient" +"When on, shared gradient definitions are automatically forked on change; uncheck to allow sharing of gradient definitions so that editing one " +"object may affect other objects using the same gradient" msgstr "" -"Si coché, les définitions communes de dégradés sont automatiquement " -"dupliquées lors d'une modification; décocher pour autoriser le partage des " -"définitions de dégradé de manière à ce que la modification d'un objet puisse " -"affecter tous les objets utilisant le même dégradé" +"Si coché, les définitions communes de dégradés sont automatiquement dupliquées lors d'une modification; décocher pour autoriser le partage des " +"définitions de dégradé de manière à ce que la modification d'un objet puisse affecter tous les objets utilisant le même dégradé" #: ../src/ui/dialog/inkscape-preferences.cpp:492 msgid "Use legacy Gradient Editor" @@ -18304,8 +16521,8 @@ msgstr "Utiliser l'ancien éditeur de dégradé" #: ../src/ui/dialog/inkscape-preferences.cpp:494 msgid "" -"When on, the Gradient Edit button in the Fill & Stroke dialog will show the " -"legacy Gradient Editor dialog, when off the Gradient Tool will be used" +"When on, the Gradient Edit button in the Fill & Stroke dialog will show the legacy Gradient Editor dialog, when off the Gradient Tool will be " +"used" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:497 @@ -18313,11 +16530,8 @@ msgid "Linear gradient _angle:" msgstr "_Angle de dégradé linéaire :" #: ../src/ui/dialog/inkscape-preferences.cpp:498 -msgid "" -"Default angle of new linear gradients in degrees (clockwise from horizontal)" -msgstr "" -"Angle par défaut des nouveaux gradients linéaires (en degrés, dans le sens " -"horaire à partir de l'horizontale)" +msgid "Default angle of new linear gradients in degrees (clockwise from horizontal)" +msgstr "Angle par défaut des nouveaux gradients linéaires (en degrés, dans le sens horaire à partir de l'horizontale)" #. Dropper #: ../src/ui/dialog/inkscape-preferences.cpp:502 @@ -18331,9 +16545,7 @@ msgstr "Connecteur" #: ../src/ui/dialog/inkscape-preferences.cpp:510 msgid "If on, connector attachment points will not be shown for text objects" -msgstr "" -"Si coché, les points d'accroche de connecteur ne sont pas montrés pour des " -"objets texte" +msgstr "Si coché, les points d'accroche de connecteur ne sont pas montrés pour des objets texte" #. LPETool #. disabled, because the LPETool is not finished yet. @@ -18742,42 +16954,31 @@ msgstr "Taille des icônes de la barre d'outils :" #: ../src/ui/dialog/inkscape-preferences.cpp:609 msgid "Set the size for the tool icons (requires restart)" -msgstr "" -"Définit la taille des icônes de la barre d'outils (nécessite un redémarrage)" +msgstr "Définit la taille des icônes de la barre d'outils (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:612 msgid "Control bar icon size:" msgstr "Taille des icônes de la barre de contrôle des outils :" #: ../src/ui/dialog/inkscape-preferences.cpp:613 -msgid "" -"Set the size for the icons in tools' control bars to use (requires restart)" -msgstr "" -"Définit la taille des icônes de la barre de contrôle des outils (nécessite " -"un redémarrage)" +msgid "Set the size for the icons in tools' control bars to use (requires restart)" +msgstr "Définit la taille des icônes de la barre de contrôle des outils (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:616 msgid "Secondary toolbar icon size:" msgstr "Taille des icônes de la barre d'outils secondaire :" #: ../src/ui/dialog/inkscape-preferences.cpp:617 -msgid "" -"Set the size for the icons in secondary toolbars to use (requires restart)" -msgstr "" -"Définit la taille des icônes de la barre d'outils secondaire (nécessite un " -"redémarrage)" +msgid "Set the size for the icons in secondary toolbars to use (requires restart)" +msgstr "Définit la taille des icônes de la barre d'outils secondaire (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:620 msgid "Work-around color sliders not drawing" msgstr "Contourner le non affichage des barres de défilement de couleur" #: ../src/ui/dialog/inkscape-preferences.cpp:622 -msgid "" -"When on, will attempt to work around bugs in certain GTK themes drawing " -"color sliders" -msgstr "" -"Si activé, essayera de contourner un défaut d'affichage des barres de " -"défilement de couleur lié à certains thèmes GTK" +msgid "When on, will attempt to work around bugs in certain GTK themes drawing color sliders" +msgstr "Si activé, essayera de contourner un défaut d'affichage des barres de défilement de couleur lié à certains thèmes GTK" #: ../src/ui/dialog/inkscape-preferences.cpp:627 msgid "Clear list" @@ -18788,12 +16989,8 @@ msgid "Maximum documents in Open _Recent:" msgstr "Nombre maximum de documents _récents :" #: ../src/ui/dialog/inkscape-preferences.cpp:631 -msgid "" -"Set the maximum length of the Open Recent list in the File menu, or clear " -"the list" -msgstr "" -"Définit la longueur maximum de la liste « Documents récents » dans le menu " -"« Fichier », ou efface la liste" +msgid "Set the maximum length of the Open Recent list in the File menu, or clear the list" +msgstr "Définit la longueur maximum de la liste « Documents récents » dans le menu « Fichier », ou efface la liste" #: ../src/ui/dialog/inkscape-preferences.cpp:634 msgid "_Zoom correction factor (in %):" @@ -18801,53 +16998,38 @@ msgstr "Niveau de correction du _zoom (en %) :" #: ../src/ui/dialog/inkscape-preferences.cpp:635 msgid "" -"Adjust the slider until the length of the ruler on your screen matches its " -"real length. This information is used when zooming to 1:1, 1:2, etc., to " -"display objects in their true sizes" +"Adjust the slider until the length of the ruler on your screen matches its real length. This information is used when zooming to 1:1, 1:2, " +"etc., to display objects in their true sizes" msgstr "" -"Ajuster le curseur pour faire correspondre la longueur de la règle sur " -"l'écran avec sa vraie valeur. Cette information est utilisée lors des zoom " -"de niveau 1:1, 1:2, etc. pour afficher les objets avec leur taille exacte" +"Ajuster le curseur pour faire correspondre la longueur de la règle sur l'écran avec sa vraie valeur. Cette information est utilisée lors des " +"zoom de niveau 1:1, 1:2, etc. pour afficher les objets avec leur taille exacte" #: ../src/ui/dialog/inkscape-preferences.cpp:638 msgid "Enable dynamic relayout for incomplete sections" msgstr "Activer la remise en forme dynamique des sections incomplètes" #: ../src/ui/dialog/inkscape-preferences.cpp:640 -msgid "" -"When on, will allow dynamic layout of components that are not completely " -"finished being refactored" -msgstr "" -"Lorsqu'activé, autorise la mise en forme dynamique des composants dont le " -"réusinage n'est pas complètement achevé" +msgid "When on, will allow dynamic layout of components that are not completely finished being refactored" +msgstr "Lorsqu'activé, autorise la mise en forme dynamique des composants dont le réusinage n'est pas complètement achevé" #. show infobox #: ../src/ui/dialog/inkscape-preferences.cpp:643 msgid "Show filter primitives infobox (requires restart)" -msgstr "" -"Affiche la boîte d'information des primitives de filtre (nécessite un " -"redémarrage)" +msgstr "Affiche la boîte d'information des primitives de filtre (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:645 -msgid "" -"Show icons and descriptions for the filter primitives available at the " -"filter effects dialog" -msgstr "" -"Afficher les icônes et les descriptions pour les primitives de filtre " -"disponibles dans la boîte de dialogue des effets de filtre" +msgid "Show icons and descriptions for the filter primitives available at the filter effects dialog" +msgstr "Afficher les icônes et les descriptions pour les primitives de filtre disponibles dans la boîte de dialogue des effets de filtre" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Icons only" msgstr "Icônes seulement" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Text only" msgstr "Texte seulement" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Icons and text" msgstr "Icônes et texte" @@ -18856,29 +17038,21 @@ msgid "Dockbar style (requires restart):" msgstr "Style de barre détachable (nécessite un redémarrage) :" #: ../src/ui/dialog/inkscape-preferences.cpp:654 -msgid "" -"Selects whether the vertical bars on the dockbar will show text labels, " -"icons, or both" -msgstr "" -"Défini si les barres verticales affichent dans la barre détachable des " -"labels, des icônes, ou les deux" +msgid "Selects whether the vertical bars on the dockbar will show text labels, icons, or both" +msgstr "Défini si les barres verticales affichent dans la barre détachable des labels, des icônes, ou les deux" #: ../src/ui/dialog/inkscape-preferences.cpp:661 msgid "Switcher style (requires restart):" msgstr "Style de bouton de commutation (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:662 -msgid "" -"Selects whether the dockbar switcher will show text labels, icons, or both" -msgstr "" -"Défini si les sélecteurs de boîtes de dialogue affichent dans la barre " -"détachable des labels, des icônes, ou les deux" +msgid "Selects whether the dockbar switcher will show text labels, icons, or both" +msgstr "Défini si les sélecteurs de boîtes de dialogue affichent dans la barre détachable des labels, des icônes, ou les deux" #. Windows #: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Save and restore window geometry for each document" -msgstr "" -"Enregistrer et restaurer la géométrie de la fenêtre pour chaque document" +msgstr "Enregistrer et restaurer la géométrie de la fenêtre pour chaque document" #: ../src/ui/dialog/inkscape-preferences.cpp:667 msgid "Remember and use last window's geometry" @@ -18892,13 +17066,11 @@ msgstr "Ne pas enregistrer la géométrie de la fenêtre" msgid "Save and restore dialogs status" msgstr "Enregistrer et restaurer l'état des boîtes de dialogue" -#: ../src/ui/dialog/inkscape-preferences.cpp:671 -#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:671 ../src/ui/dialog/inkscape-preferences.cpp:707 msgid "Don't save dialogs status" msgstr "Ne pas enregistrer l'état des boîtes de dialogue" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 -#: ../src/ui/dialog/inkscape-preferences.cpp:715 +#: ../src/ui/dialog/inkscape-preferences.cpp:673 ../src/ui/dialog/inkscape-preferences.cpp:715 msgid "Dockable" msgstr "Attachable" @@ -18967,32 +17139,20 @@ msgid "Let the window manager determine placement of all windows" msgstr "Laisser le gestionnaire de fenêtre placer toutes les fenêtres" #: ../src/ui/dialog/inkscape-preferences.cpp:701 -msgid "" -"Remember and use the last window's geometry (saves geometry to user " -"preferences)" -msgstr "" -"Mémoriser et utiliser la géométrie de la dernière fenêtre (enregistre la " -"géométrie dans les préférences utilisateur)" +msgid "Remember and use the last window's geometry (saves geometry to user preferences)" +msgstr "Mémoriser et utiliser la géométrie de la dernière fenêtre (enregistre la géométrie dans les préférences utilisateur)" #: ../src/ui/dialog/inkscape-preferences.cpp:703 -msgid "" -"Save and restore window geometry for each document (saves geometry in the " -"document)" -msgstr "" -"Sauver et restaurer la géométrie de la fenêtre pour chaque document " -"(enregistre la géométrie avec le document)" +msgid "Save and restore window geometry for each document (saves geometry in the document)" +msgstr "Sauver et restaurer la géométrie de la fenêtre pour chaque document (enregistre la géométrie avec le document)" #: ../src/ui/dialog/inkscape-preferences.cpp:705 msgid "Saving dialogs status" msgstr "Enregistrer l'état des fenêtres" #: ../src/ui/dialog/inkscape-preferences.cpp:709 -msgid "" -"Save and restore dialogs status (the last open windows dialogs are saved " -"when it closes)" -msgstr "" -"Enregistrer et restaurer l'état des boîtes de dialogue (dans l'état de la " -"dernière fenêtre fermée)" +msgid "Save and restore dialogs status (the last open windows dialogs are saved when it closes)" +msgstr "Enregistrer et restaurer l'état des boîtes de dialogue (dans l'état de la dernière fenêtre fermée)" #: ../src/ui/dialog/inkscape-preferences.cpp:713 msgid "Dialog behavior (requires restart)" @@ -19004,15 +17164,11 @@ msgstr "Intégration au bureau" #: ../src/ui/dialog/inkscape-preferences.cpp:721 msgid "Use Windows like open and save dialogs" -msgstr "" -"Utiliser des boîtes de dialogue à la Windows pour l'ouverture et " -"l'enregistrement de fichiers" +msgstr "Utiliser des boîtes de dialogue à la Windows pour l'ouverture et l'enregistrement de fichiers" #: ../src/ui/dialog/inkscape-preferences.cpp:723 msgid "Use GTK open and save dialogs " -msgstr "" -"Utiliser les boîtes de dialogue GTK pour l'ouverture et l'enregistrement de " -"fichiers" +msgstr "Utiliser les boîtes de dialogue GTK pour l'ouverture et l'enregistrement de fichiers" #: ../src/ui/dialog/inkscape-preferences.cpp:727 msgid "Dialogs on top:" @@ -19028,9 +17184,7 @@ msgstr "Les dialogues restent au-dessus des fenêtres de document" #: ../src/ui/dialog/inkscape-preferences.cpp:734 msgid "Same as Normal but may work better with some window managers" -msgstr "" -"Comme Normal, mais fonctionne peut-être mieux avec certains gestionnaires de " -"fenêtres" +msgstr "Comme Normal, mais fonctionne peut-être mieux avec certains gestionnaires de fenêtres" #: ../src/ui/dialog/inkscape-preferences.cpp:737 msgid "Dialog Transparency" @@ -19054,32 +17208,23 @@ msgstr "Divers" #: ../src/ui/dialog/inkscape-preferences.cpp:749 msgid "Whether dialog windows are to be hidden in the window manager taskbar" -msgstr "" -"Si coché, les boîtes de dialogue sont cachées dans la barre des tâches du " -"gestionnaire de fenêtre" +msgstr "Si coché, les boîtes de dialogue sont cachées dans la barre des tâches du gestionnaire de fenêtre" #: ../src/ui/dialog/inkscape-preferences.cpp:752 msgid "" -"Zoom drawing when document window is resized, to keep the same area visible " -"(this is the default which can be changed in any window using the button " -"above the right scrollbar)" +"Zoom drawing when document window is resized, to keep the same area visible (this is the default which can be changed in any window using the " +"button above the right scrollbar)" msgstr "" -"Si coché, le dessin est rezoomé quand la fenêtre est redimensionnée, pour " -"garder visible la même aire (c'est l'option par défaut qui peut être changée " -"dans toute fenêtre en utilisant le boutton au dessus de la barre de " -"défilement de droite)" +"Si coché, le dessin est rezoomé quand la fenêtre est redimensionnée, pour garder visible la même aire (c'est l'option par défaut qui peut être " +"changée dans toute fenêtre en utilisant le boutton au dessus de la barre de défilement de droite)" #: ../src/ui/dialog/inkscape-preferences.cpp:754 -msgid "" -"Save documents viewport (zoom and panning position). Useful to turn off when " -"sharing version controlled files." +msgid "Save documents viewport (zoom and panning position). Useful to turn off when sharing version controlled files." msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:756 msgid "Whether dialog windows have a close button (requires restart)" -msgstr "" -"Si coché, les boîtes de dialogue ont un bouton de fermeture (nécessite un " -"redémarrage)" +msgstr "Si coché, les boîtes de dialogue ont un bouton de fermeture (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:757 msgid "Windows" @@ -19092,30 +17237,25 @@ msgstr "Couleur des lignes pendant le zoom arrière" #: ../src/ui/dialog/inkscape-preferences.cpp:763 msgid "The gridlines will be shown in minor grid line color" -msgstr "" -"Les lignes de grille seront affichées avec la couleur de grille secondaire" +msgstr "Les lignes de grille seront affichées avec la couleur de grille secondaire" #: ../src/ui/dialog/inkscape-preferences.cpp:765 msgid "The gridlines will be shown in major grid line color" -msgstr "" -"Les lignes de grille seront affichées avec la couleur de grille principale" +msgstr "Les lignes de grille seront affichées avec la couleur de grille principale" #: ../src/ui/dialog/inkscape-preferences.cpp:767 msgid "Default grid settings" msgstr "Réglages par défaut de la grille" -#: ../src/ui/dialog/inkscape-preferences.cpp:773 -#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:773 ../src/ui/dialog/inkscape-preferences.cpp:798 msgid "Grid units:" msgstr "Unités de la grille :" -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:778 ../src/ui/dialog/inkscape-preferences.cpp:803 msgid "Origin X:" msgstr "Origine X :" -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:779 ../src/ui/dialog/inkscape-preferences.cpp:804 msgid "Origin Y:" msgstr "Origine Y :" @@ -19123,37 +17263,29 @@ msgstr "Origine Y :" msgid "Spacing X:" msgstr "Espacement X :" -#: ../src/ui/dialog/inkscape-preferences.cpp:785 -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/ui/dialog/inkscape-preferences.cpp:785 ../src/ui/dialog/inkscape-preferences.cpp:807 msgid "Spacing Y:" msgstr "Espacement Y :" -#: ../src/ui/dialog/inkscape-preferences.cpp:787 -#: ../src/ui/dialog/inkscape-preferences.cpp:788 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 +#: ../src/ui/dialog/inkscape-preferences.cpp:787 ../src/ui/dialog/inkscape-preferences.cpp:788 ../src/ui/dialog/inkscape-preferences.cpp:812 #: ../src/ui/dialog/inkscape-preferences.cpp:813 msgid "Minor grid line color:" msgstr "Couleur de la grille secondaire :" -#: ../src/ui/dialog/inkscape-preferences.cpp:788 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:788 ../src/ui/dialog/inkscape-preferences.cpp:813 msgid "Color used for normal grid lines" msgstr "Sélectionner la couleur utilisée pour les lignes de la grille normale" -#: ../src/ui/dialog/inkscape-preferences.cpp:789 -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:814 +#: ../src/ui/dialog/inkscape-preferences.cpp:789 ../src/ui/dialog/inkscape-preferences.cpp:790 ../src/ui/dialog/inkscape-preferences.cpp:814 #: ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "Major grid line color:" msgstr "Couleur de la grille principale :" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "Color used for major (highlighted) grid lines" msgstr "Couleur des lignes de la grille principale (mise en valeur)" -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Major grid line every:" msgstr "Grille principale toutes les :" @@ -19163,9 +17295,7 @@ msgstr "Afficher des points plutôt que des lignes" #: ../src/ui/dialog/inkscape-preferences.cpp:794 msgid "If set, display dots at gridpoints instead of gridlines" -msgstr "" -"Cocher pour afficher des points aux intersections de la grille plutôt que " -"des lignes" +msgstr "Cocher pour afficher des points aux intersections de la grille plutôt que des lignes" #: ../src/ui/dialog/inkscape-preferences.cpp:875 msgid "Input/Output" @@ -19177,40 +17307,29 @@ msgstr "« Enregistrer sous... » utilise le dossier courant " #: ../src/ui/dialog/inkscape-preferences.cpp:880 msgid "" -"When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " -"will always open in the directory where the currently open document is; when " -"it's off, each will open in the directory where you last saved a file using " -"it" +"When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs will always open in the directory where the currently open document " +"is; when it's off, each will open in the directory where you last saved a file using it" msgstr "" -"Lorsque cette option est active, les boîtes de dialogue « Enregistrer " -"sous... » et « Enregistrer une copie... » s'ouvrent toujours dans le dossier " -"contenant le document actuellement ouvert ; si l'option est désactivée, " -"elles ouvrent alors le dernier dossier dans lequel un fichier a été " -"enregistré avec ces boîtes de dialogue" +"Lorsque cette option est active, les boîtes de dialogue « Enregistrer sous... » et « Enregistrer une copie... » s'ouvrent toujours dans le " +"dossier contenant le document actuellement ouvert ; si l'option est désactivée, elles ouvrent alors le dernier dossier dans lequel un fichier " +"a été enregistré avec ces boîtes de dialogue" #: ../src/ui/dialog/inkscape-preferences.cpp:882 msgid "Add label comments to printing output" msgstr "Ajouter les labels de commentaires à l'impression" #: ../src/ui/dialog/inkscape-preferences.cpp:884 -msgid "" -"When on, a comment will be added to the raw print output, marking the " -"rendered output for an object with its label" -msgstr "" -"Si coché, un commentaire est ajouté à l'impression brute, signalant le rendu " -"d'un objet avec son label" +msgid "When on, a comment will be added to the raw print output, marking the rendered output for an object with its label" +msgstr "Si coché, un commentaire est ajouté à l'impression brute, signalant le rendu d'un objet avec son label" #: ../src/ui/dialog/inkscape-preferences.cpp:886 msgid "Add default metadata to new documents" msgstr "Ajouter les métadonnées par défaut aux nouveaux documents" #: ../src/ui/dialog/inkscape-preferences.cpp:888 -msgid "" -"Add default metadata to new documents. Default metadata can be set from " -"Document Properties->Metadata." +msgid "Add default metadata to new documents. Default metadata can be set from Document Properties->Metadata." msgstr "" -"Ajoute les métadonnées par défaut dans les nouveaux documents. Ces " -"métadonnées peuvent être définies dans Propriétés du document>Métadonnées." +"Ajoute les métadonnées par défaut dans les nouveaux documents. Ces métadonnées peuvent être définies dans Propriétés du document>Métadonnées." #: ../src/ui/dialog/inkscape-preferences.cpp:892 msgid "_Grab sensitivity:" @@ -19221,30 +17340,21 @@ msgid "pixels (requires restart)" msgstr "pixels (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:893 -msgid "" -"How close on the screen you need to be to an object to be able to grab it " -"with mouse (in screen pixels)" -msgstr "" -"Distance à partir de laquelle on peut saisir un objet à l'écran avec la " -"souris (en pixels d'écran)" +msgid "How close on the screen you need to be to an object to be able to grab it with mouse (in screen pixels)" +msgstr "Distance à partir de laquelle on peut saisir un objet à l'écran avec la souris (en pixels d'écran)" #: ../src/ui/dialog/inkscape-preferences.cpp:895 msgid "_Click/drag threshold:" msgstr "_Seuil de cliquer-déplacer :" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +#: ../src/ui/dialog/inkscape-preferences.cpp:895 ../src/ui/dialog/inkscape-preferences.cpp:1237 ../src/ui/dialog/inkscape-preferences.cpp:1241 #: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "pixels" msgstr "pixels" #: ../src/ui/dialog/inkscape-preferences.cpp:896 -msgid "" -"Maximum mouse drag (in screen pixels) which is considered a click, not a drag" -msgstr "" -"Déplacement maximal de la souris (en pixels d'écran) considéré comme un clic " -"et non comme un déplacement" +msgid "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" +msgstr "Déplacement maximal de la souris (en pixels d'écran) considéré comme un clic et non comme un déplacement" #: ../src/ui/dialog/inkscape-preferences.cpp:899 msgid "_Handle size:" @@ -19256,33 +17366,23 @@ msgstr "Définir la taille relative des poignées de nœuds" #: ../src/ui/dialog/inkscape-preferences.cpp:902 msgid "Use pressure-sensitive tablet (requires restart)" -msgstr "" -"Utiliser une tablette graphique sensible à la pression (nécessite un " -"redémarrage)" +msgstr "Utiliser une tablette graphique sensible à la pression (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:904 msgid "" -"Use the capabilities of a tablet or other pressure-sensitive device. Disable " -"this only if you have problems with the tablet (you can still use it as a " -"mouse)" +"Use the capabilities of a tablet or other pressure-sensitive device. Disable this only if you have problems with the tablet (you can still use " +"it as a mouse)" msgstr "" -"Utiliser les possibilités offertes par une tablette graphique ou un autre " -"périphérique sensible à la pression. Désactivez ceci uniquement si vous " -"rencontrez des problèmes avec la tablette (vous pourrez néanmoins continuer " -"à l'utiliser comme souris)" +"Utiliser les possibilités offertes par une tablette graphique ou un autre périphérique sensible à la pression. Désactivez ceci uniquement si " +"vous rencontrez des problèmes avec la tablette (vous pourrez néanmoins continuer à l'utiliser comme souris)" #: ../src/ui/dialog/inkscape-preferences.cpp:906 msgid "Switch tool based on tablet device (requires restart)" -msgstr "" -"Change d'outil en fonction des dispositifs de tablette (nécessite un " -"redémarrage)" +msgstr "Change d'outil en fonction des dispositifs de tablette (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:908 -msgid "" -"Change tool as different devices are used on the tablet (pen, eraser, mouse)" -msgstr "" -"Change d'outil lorsque des dispositifs différents sont utilisés sur la " -"tablette (crayon, gomme, souris)" +msgid "Change tool as different devices are used on the tablet (pen, eraser, mouse)" +msgstr "Change d'outil lorsque des dispositifs différents sont utilisés sur la tablette (crayon, gomme, souris)" #: ../src/ui/dialog/inkscape-preferences.cpp:909 msgid "Input devices" @@ -19294,12 +17394,8 @@ msgid "Use named colors" msgstr "Utiliser les couleurs nommées" #: ../src/ui/dialog/inkscape-preferences.cpp:913 -msgid "" -"If set, write the CSS name of the color when available (e.g. 'red' or " -"'magenta') instead of the numeric value" -msgstr "" -"Si coché, écrit le nom CSS de la couleur si elle est disponible (rouge ou " -"magenta, par exemple) à la place de sa valeur numérique" +msgid "If set, write the CSS name of the color when available (e.g. 'red' or 'magenta') instead of the numeric value" +msgstr "Si coché, écrit le nom CSS de la couleur si elle est disponible (rouge ou magenta, par exemple) à la place de sa valeur numérique" #: ../src/ui/dialog/inkscape-preferences.cpp:915 msgid "XML formatting" @@ -19318,12 +17414,8 @@ msgid "_Indent, spaces:" msgstr "_Distance d'indentation (en espaces) :" #: ../src/ui/dialog/inkscape-preferences.cpp:921 -msgid "" -"The number of spaces to use for indenting nested elements; set to 0 for no " -"indentation" -msgstr "" -"Le nombre d'espaces utilisés pour l'indentation d'éléments imbriqués ; " -"définir à 0 pour désactiver l'indentation" +msgid "The number of spaces to use for indenting nested elements; set to 0 for no indentation" +msgstr "Le nombre d'espaces utilisés pour l'indentation d'éléments imbriqués ; définir à 0 pour désactiver l'indentation" #: ../src/ui/dialog/inkscape-preferences.cpp:923 msgid "Path data" @@ -19337,8 +17429,7 @@ msgstr "Absolu" msgid "Relative" msgstr "Relatif" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:926 ../src/ui/dialog/inkscape-preferences.cpp:1216 msgid "Optimized" msgstr "Optimisé" @@ -19348,26 +17439,19 @@ msgstr "Format de la chaîne du chemin :" #: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "" -"Path data should be written: only with absolute coordinates, only with " -"relative coordinates, or optimized for string length (mixed absolute and " -"relative coordinates)" +"Path data should be written: only with absolute coordinates, only with relative coordinates, or optimized for string length (mixed absolute " +"and relative coordinates)" msgstr "" -"Les données de chemin doivent être écrite : seulement avec des coordonnées " -"absolues, seulement avec des coordonnées relatives, ou optimisées en " -"fonction de la longueur de la chaîne (mélange de coordonnées relatives et " -"absolues)" +"Les données de chemin doivent être écrite : seulement avec des coordonnées absolues, seulement avec des coordonnées relatives, ou optimisées " +"en fonction de la longueur de la chaîne (mélange de coordonnées relatives et absolues)" #: ../src/ui/dialog/inkscape-preferences.cpp:932 msgid "Force repeat commands" msgstr "Imposer les commandes répétitives" #: ../src/ui/dialog/inkscape-preferences.cpp:933 -msgid "" -"Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " -"of 'L 1,2 3,4')" -msgstr "" -"Si coché, impose la répétition de la même commande de chemin (écrit 'L 1,2 L " -"3,4' à la place de 'L 1,2 3,4')." +msgid "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead of 'L 1,2 3,4')" +msgstr "Si coché, impose la répétition de la même commande de chemin (écrit 'L 1,2 L 3,4' à la place de 'L 1,2 3,4')." #: ../src/ui/dialog/inkscape-preferences.cpp:935 msgid "Numbers" @@ -19379,20 +17463,15 @@ msgstr "_Précision numérique :" #: ../src/ui/dialog/inkscape-preferences.cpp:938 msgid "Significant figures of the values written to the SVG file" -msgstr "" -"Nombre de chiffres significatifs des valeurs écrites dans le fichier SVG" +msgstr "Nombre de chiffres significatifs des valeurs écrites dans le fichier SVG" #: ../src/ui/dialog/inkscape-preferences.cpp:941 msgid "Minimum _exponent:" msgstr "Exposant _minimum :" #: ../src/ui/dialog/inkscape-preferences.cpp:941 -msgid "" -"The smallest number written to SVG is 10 to the power of this exponent; " -"anything smaller is written as zero" -msgstr "" -"La taille minimale d'un nombre écrite dans le SVG est 10 à la puissance de " -"cet exposant ; les nombres plus petits s'écriront zéro" +msgid "The smallest number written to SVG is 10 to the power of this exponent; anything smaller is written as zero" +msgstr "La taille minimale d'un nombre écrite dans le SVG est 10 à la puissance de cet exposant ; les nombres plus petits s'écriront zéro" #. Code to add controls for attribute checking options #. Add incorrect style properties options @@ -19400,19 +17479,14 @@ msgstr "" msgid "Improper Attributes Actions" msgstr "En cas d'attributs inappropriés" -#: ../src/ui/dialog/inkscape-preferences.cpp:948 -#: ../src/ui/dialog/inkscape-preferences.cpp:956 -#: ../src/ui/dialog/inkscape-preferences.cpp:964 +#: ../src/ui/dialog/inkscape-preferences.cpp:948 ../src/ui/dialog/inkscape-preferences.cpp:956 ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Print warnings" msgstr "Afficher un avertissement" #: ../src/ui/dialog/inkscape-preferences.cpp:949 -msgid "" -"Print warning if invalid or non-useful attributes found. Database files " -"located in inkscape_data_dir/attributes." +msgid "Print warning if invalid or non-useful attributes found. Database files located in inkscape_data_dir/attributes." msgstr "" -"Affiche un avertissement si des attributs invalides ou inappropriés sont " -"détectés. Le fichier de données est disponible dans inkscape_data_dir/" +"Affiche un avertissement si des attributs invalides ou inappropriés sont détectés. Le fichier de données est disponible dans inkscape_data_dir/" "attributes." #: ../src/ui/dialog/inkscape-preferences.cpp:950 @@ -19430,15 +17504,13 @@ msgstr "En cas de propriétés de style inappropriées" #: ../src/ui/dialog/inkscape-preferences.cpp:957 msgid "" -"Print warning if inappropriate style properties found (i.e. 'font-family' " -"set on a ). Database files located in inkscape_data_dir/attributes." +"Print warning if inappropriate style properties found (i.e. 'font-family' set on a ). Database files located in inkscape_data_dir/" +"attributes." msgstr "" -"Affiche un avertissement si des propriétés de style inappropriés sont " -"détectés (par exemple 'font-family' dans un élément . Le fichier de " -"données est disponible dans inkscape_data_dir/attributes." +"Affiche un avertissement si des propriétés de style inappropriés sont détectés (par exemple 'font-family' dans un élément . Le fichier " +"de données est disponible dans inkscape_data_dir/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:958 -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:958 ../src/ui/dialog/inkscape-preferences.cpp:966 msgid "Remove style properties" msgstr "Supprimer les propriétés de style" @@ -19453,15 +17525,11 @@ msgstr "En cas de propriétés de style inutiles" #: ../src/ui/dialog/inkscape-preferences.cpp:965 msgid "" -"Print warning if redundant style properties found (i.e. if a property has " -"the default value and a different value is not inherited or if value is the " -"same as would be inherited). Database files located in inkscape_data_dir/" -"attributes." +"Print warning if redundant style properties found (i.e. if a property has the default value and a different value is not inherited or if value " +"is the same as would be inherited). Database files located in inkscape_data_dir/attributes." msgstr "" -"Affiche un avertissement si des propriétés de style inutiles sont détectés " -"(par exemple si une propriété est définie avec sa valeur par défaut et que " -"cette valeur ne modifie pas l'héritage). Le fichier de données est " -"disponible dans inkscape_data_dir/attributes." +"Affiche un avertissement si des propriétés de style inutiles sont détectés (par exemple si une propriété est définie avec sa valeur par défaut " +"et que cette valeur ne modifie pas l'héritage). Le fichier de données est disponible dans inkscape_data_dir/attributes." #: ../src/ui/dialog/inkscape-preferences.cpp:967 msgid "Delete redundant style properties" @@ -19476,26 +17544,20 @@ msgid "Reading" msgstr "Lors de la lecture" #: ../src/ui/dialog/inkscape-preferences.cpp:972 -msgid "" -"Check attributes and style properties on reading in SVG files (including " -"those internal to Inkscape which will slow down startup)" +msgid "Check attributes and style properties on reading in SVG files (including those internal to Inkscape which will slow down startup)" msgstr "" -"Vérifier les attributs et les propriétés de style lors de la lecture des " -"fichiers SVG (y compris les fichiers internes à Inkscape, ce qui ralentira " -"le démarrage de l'application)" +"Vérifier les attributs et les propriétés de style lors de la lecture des fichiers SVG (y compris les fichiers internes à Inkscape, ce qui " +"ralentira le démarrage de l'application)" #: ../src/ui/dialog/inkscape-preferences.cpp:973 msgid "Editing" msgstr "Lors de l'édition" #: ../src/ui/dialog/inkscape-preferences.cpp:974 -msgid "" -"Check attributes and style properties while editing SVG files (may slow down " -"Inkscape, mostly useful for debugging)" +msgid "Check attributes and style properties while editing SVG files (may slow down Inkscape, mostly useful for debugging)" msgstr "" -"Vérifier les attributs et les propriétés de style lors de l'édition des " -"fichiers SVG (peut ralentir Inkscape, à utiliser principalement pour le " -"débogage)" +"Vérifier les attributs et les propriétés de style lors de l'édition des fichiers SVG (peut ralentir Inkscape, à utiliser principalement pour " +"le débogage)" #: ../src/ui/dialog/inkscape-preferences.cpp:975 msgid "Writing" @@ -19503,9 +17565,7 @@ msgstr "Lors de l'écriture" #: ../src/ui/dialog/inkscape-preferences.cpp:976 msgid "Check attributes and style properties on writing out SVG files" -msgstr "" -"Vérifier les attributs et les propriétés de style lors de l'écriture des " -"fichiers SVG" +msgstr "Vérifier les attributs et les propriétés de style lors de l'écriture des fichiers SVG" #: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "SVG output" @@ -19526,9 +17586,7 @@ msgstr "Colorimétrie absolue" #: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "(Note: Color management has been disabled in this build)" -msgstr "" -"(NB : les fonctionnalités colorimétriques sont désactivées dans cette " -"version)" +msgstr "(NB : les fonctionnalités colorimétriques sont désactivées dans cette version)" #: ../src/ui/dialog/inkscape-preferences.cpp:992 msgid "Display adjustment" @@ -19553,14 +17611,11 @@ msgstr "Utiliser le profil proposé par le périphérique d'affichage." #: ../src/ui/dialog/inkscape-preferences.cpp:1011 msgid "Retrieve profiles from those attached to displays via XICC" -msgstr "" -"Utiliser un profil parmi ceux correspondant aux périphériques d'affichage " -"grâce à XICC" +msgstr "Utiliser un profil parmi ceux correspondant aux périphériques d'affichage grâce à XICC" #: ../src/ui/dialog/inkscape-preferences.cpp:1013 msgid "Retrieve profiles from those attached to displays" -msgstr "" -"Utiliser un profil parmi ceux correspondant aux périphériques d'affichage" +msgstr "Utiliser un profil parmi ceux correspondant aux périphériques d'affichage" #: ../src/ui/dialog/inkscape-preferences.cpp:1018 msgid "Display rendering intent:" @@ -19588,9 +17643,7 @@ msgstr "Marquer les couleurs hors-gamut" #: ../src/ui/dialog/inkscape-preferences.cpp:1029 msgid "Highlights colors that are out of gamut for the target device" -msgstr "" -"Mettre en exergue les couleurs qui sont en-dehors du gamut pour le " -"périphérique cible" +msgstr "Mettre en exergue les couleurs qui sont en-dehors du gamut pour le périphérique cible" #: ../src/ui/dialog/inkscape-preferences.cpp:1041 msgid "Out of gamut warning color:" @@ -19614,8 +17667,7 @@ msgstr "Intention de rendu du périphérique :" #: ../src/ui/dialog/inkscape-preferences.cpp:1049 msgid "The rendering intent to use to calibrate device output" -msgstr "" -"L'intention de rendu à utiliser pour calibrer le périphérique de sortie" +msgstr "L'intention de rendu à utiliser pour calibrer le périphérique de sortie" #: ../src/ui/dialog/inkscape-preferences.cpp:1051 msgid "Black point compensation" @@ -19637,9 +17689,7 @@ msgstr "(LittleCMS 1.15 ou version supérieure requis)" msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "Préserver la composante N dans les transformaitons CMJN > CMJN" -#: ../src/ui/dialog/inkscape-preferences.cpp:1078 -#: ../src/ui/widget/color-icc-selector.cpp:395 -#: ../src/ui/widget/color-icc-selector.cpp:674 +#: ../src/ui/dialog/inkscape-preferences.cpp:1078 ../src/ui/widget/color-icc-selector.cpp:395 ../src/ui/widget/color-icc-selector.cpp:674 msgid "" msgstr "" @@ -19653,12 +17703,10 @@ msgid "Enable autosave (requires restart)" msgstr "Activer l'enregistrement automatique (nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:1127 -msgid "" -"Automatically save the current document(s) at a given interval, thus " -"minimizing loss in case of a crash" +msgid "Automatically save the current document(s) at a given interval, thus minimizing loss in case of a crash" msgstr "" -"Enregistre automatiquement les documents en cours, à intervalle donné, pour " -"diminuer les risques de perte de données en cas de plantage de l'application" +"Enregistre automatiquement les documents en cours, à intervalle donné, pour diminuer les risques de perte de données en cas de plantage de " +"l'application" #: ../src/ui/dialog/inkscape-preferences.cpp:1133 msgctxt "Filesystem" @@ -19667,12 +17715,11 @@ msgstr "_Dossier des enregistrements automatiques :" #: ../src/ui/dialog/inkscape-preferences.cpp:1133 msgid "" -"The directory where autosaves will be written. This should be an absolute " -"path (starts with / on UNIX or a drive letter such as C: on Windows). " +"The directory where autosaves will be written. This should be an absolute path (starts with / on UNIX or a drive letter such as C: on " +"Windows). " msgstr "" -"Dossier dans lequel les enregistrements automatiques sont écrits. Il s'agit " -"d'un chemin absolu (commençant par / sur les systèmes Gnu/Linux ou Unix, ou " -"par la lettre du lecteur, C: par exemple, sous Windows)." +"Dossier dans lequel les enregistrements automatiques sont écrits. Il s'agit d'un chemin absolu (commençant par / sur les systèmes Gnu/Linux ou " +"Unix, ou par la lettre du lecteur, C: par exemple, sous Windows)." #: ../src/ui/dialog/inkscape-preferences.cpp:1135 msgid "_Interval (in minutes):" @@ -19680,20 +17727,15 @@ msgstr "_Intervalle (en minutes) :" #: ../src/ui/dialog/inkscape-preferences.cpp:1135 msgid "Interval (in minutes) at which document will be autosaved" -msgstr "" -"Définit l'intervalle (en minutes) auquel l'espace de travail sera enregistré " -"automatiquement" +msgstr "Définit l'intervalle (en minutes) auquel l'espace de travail sera enregistré automatiquement" #: ../src/ui/dialog/inkscape-preferences.cpp:1137 msgid "_Maximum number of autosaves:" msgstr "Nombre _maximum d'enregistrements :" #: ../src/ui/dialog/inkscape-preferences.cpp:1137 -msgid "" -"Maximum number of autosaved files; use this to limit the storage space used" -msgstr "" -"Nombre maximum d'enregistrements automatiques ; utiliser cette valeur pour " -"limiter l'espace de stockage utilisé" +msgid "Maximum number of autosaved files; use this to limit the storage space used" +msgstr "Nombre maximum d'enregistrements automatiques ; utiliser cette valeur pour limiter l'espace de stockage utilisé" #. When changing the interval or enabling/disabling the autosave function, #. * update our running configuration @@ -19716,12 +17758,8 @@ msgid "Open Clip Art Library _Server Name:" msgstr "Nom du _serveur de bibliothèque Open Clip Art :" #: ../src/ui/dialog/inkscape-preferences.cpp:1157 -msgid "" -"The server name of the Open Clip Art Library webdav server; it's used by the " -"Import and Export to OCAL function" -msgstr "" -"Le nom du serveur webdav de la bibliothèque Open Clip Art ; il est utilisé " -"par la fonction d'import et export vers OCAL." +msgid "The server name of the Open Clip Art Library webdav server; it's used by the Import and Export to OCAL function" +msgstr "Le nom du serveur webdav de la bibliothèque Open Clip Art ; il est utilisé par la fonction d'import et export vers OCAL." #: ../src/ui/dialog/inkscape-preferences.cpp:1159 msgid "Open Clip Art Library _Username:" @@ -19753,12 +17791,10 @@ msgstr "_Seuil de simplification :" #: ../src/ui/dialog/inkscape-preferences.cpp:1174 msgid "" -"How strong is the Node tool's Simplify command by default. If you invoke " -"this command several times in quick succession, it will act more and more " -"aggressively; invoking it again after a pause restores the default threshold." +"How strong is the Node tool's Simplify command by default. If you invoke this command several times in quick succession, it will act more and " +"more aggressively; invoking it again after a pause restores the default threshold." msgstr "" -"Force par défaut de la commande Simplifier. En faisant appel à cette " -"commande plusieurs fois de suite, elle agira de façon de plus en plus " +"Force par défaut de la commande Simplifier. En faisant appel à cette commande plusieurs fois de suite, elle agira de façon de plus en plus " "agressive ; un appel après une pause restaurera la valeur par défaut." #: ../src/ui/dialog/inkscape-preferences.cpp:1176 @@ -19769,12 +17805,9 @@ msgstr "Colorer les marqueurs par défaut avec la même couleur que l'objet" msgid "Color custom markers the same color as object" msgstr "Colorer les marqueurs personnalisés avec la même couleur que l'objet" -#: ../src/ui/dialog/inkscape-preferences.cpp:1178 -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +#: ../src/ui/dialog/inkscape-preferences.cpp:1178 ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Update marker color when object color changes" -msgstr "" -"Mettre à jour la couleur du marqueur lorsque la couleur de l'objet est " -"modifiée" +msgstr "Mettre à jour la couleur du marqueur lorsque la couleur de l'objet est modifiée" #. Selecting options #: ../src/ui/dialog/inkscape-preferences.cpp:1181 @@ -19802,12 +17835,8 @@ msgid "Deselect upon layer change" msgstr "Désélectionner en changeant de calque" #: ../src/ui/dialog/inkscape-preferences.cpp:1189 -msgid "" -"Uncheck this to be able to keep the current objects selected when the " -"current layer changes" -msgstr "" -"Si décoché, les objets sélectionnés restent sélectionnés lorsque vous passez " -"du calque courant à un autre" +msgid "Uncheck this to be able to keep the current objects selected when the current layer changes" +msgstr "Si décoché, les objets sélectionnés restent sélectionnés lorsque vous passez du calque courant à un autre" #: ../src/ui/dialog/inkscape-preferences.cpp:1191 msgid "Ctrl+A, Tab, Shift+Tab" @@ -19815,39 +17844,23 @@ msgstr "Ctrl+A, Tab, Maj+Tab" #: ../src/ui/dialog/inkscape-preferences.cpp:1193 msgid "Make keyboard selection commands work on objects in all layers" -msgstr "" -"Les commandes de sélection au clavier s'appliquent aux objets dans tous les " -"calques" +msgstr "Les commandes de sélection au clavier s'appliquent aux objets dans tous les calques" #: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Make keyboard selection commands work on objects in current layer only" -msgstr "" -"Les commandes de sélection au clavier s'appliquent seulement dans le calque " -"courant" +msgstr "Les commandes de sélection au clavier s'appliquent seulement dans le calque courant" #: ../src/ui/dialog/inkscape-preferences.cpp:1197 -msgid "" -"Make keyboard selection commands work on objects in current layer and all " -"its sublayers" -msgstr "" -"Les commandes de sélection au clavier s'appliquent seulement dans le calque " -"courant et dans ses sous-calques" +msgid "Make keyboard selection commands work on objects in current layer and all its sublayers" +msgstr "Les commandes de sélection au clavier s'appliquent seulement dans le calque courant et dans ses sous-calques" #: ../src/ui/dialog/inkscape-preferences.cpp:1199 -msgid "" -"Uncheck this to be able to select objects that are hidden (either by " -"themselves or by being in a hidden layer)" -msgstr "" -"Si décoché, la sélection des objets cachés est possible (objets cachés " -"isolés ou appartenant à calque caché)" +msgid "Uncheck this to be able to select objects that are hidden (either by themselves or by being in a hidden layer)" +msgstr "Si décoché, la sélection des objets cachés est possible (objets cachés isolés ou appartenant à calque caché)" #: ../src/ui/dialog/inkscape-preferences.cpp:1201 -msgid "" -"Uncheck this to be able to select objects that are locked (either by " -"themselves or by being in a locked layer)" -msgstr "" -"Si décoché, la sélection des objets verrouillés est possible (objets " -"verrouillés isolés ou appartenant à un calque verrouillé)" +msgid "Uncheck this to be able to select objects that are locked (either by themselves or by being in a locked layer)" +msgstr "Si décoché, la sélection des objets verrouillés est possible (objets verrouillés isolés ou appartenant à un calque verrouillé)" #: ../src/ui/dialog/inkscape-preferences.cpp:1203 msgid "Wrap when cycling objects in z-order" @@ -19859,17 +17872,14 @@ msgstr "Alt+molette" #: ../src/ui/dialog/inkscape-preferences.cpp:1207 msgid "Wrap around at start and end when cycling objects in z-order" -msgstr "" -"Défile la sélection des objets dans le plan en continu, sans arrêt aux " -"objets placés aux extrémités du plan" +msgstr "Défile la sélection des objets dans le plan en continu, sans arrêt aux objets placés aux extrémités du plan" #: ../src/ui/dialog/inkscape-preferences.cpp:1209 msgid "Selecting" msgstr "Sélection" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 -#: ../src/widgets/select-toolbar.cpp:572 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 ../src/widgets/select-toolbar.cpp:572 msgid "Scale stroke width" msgstr "Redimensionner l'épaisseur du contour" @@ -19889,49 +17899,33 @@ msgstr "Transformer les motifs de remplissage" msgid "Preserved" msgstr "Préservé" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 -#: ../src/widgets/select-toolbar.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 ../src/widgets/select-toolbar.cpp:573 msgid "When scaling objects, scale the stroke width by the same proportion" -msgstr "" -"Lors d'un redimensionnement des objets, préserver la proportion des " -"épaisseurs des contours" +msgstr "Lors d'un redimensionnement des objets, préserver la proportion des épaisseurs des contours" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 -#: ../src/widgets/select-toolbar.cpp:584 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 ../src/widgets/select-toolbar.cpp:584 msgid "When scaling rectangles, scale the radii of rounded corners" -msgstr "" -"Lors du redimensionnements d'un rectangle, préserver la proportion des " -"rayons des coins arrondis" +msgstr "Lors du redimensionnements d'un rectangle, préserver la proportion des rayons des coins arrondis" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 -#: ../src/widgets/select-toolbar.cpp:595 +#: ../src/ui/dialog/inkscape-preferences.cpp:1224 ../src/widgets/select-toolbar.cpp:595 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "Transformer les dégradés avec les objets (remplissage et contour)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 -#: ../src/widgets/select-toolbar.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 ../src/widgets/select-toolbar.cpp:606 msgid "Move patterns (in fill or stroke) along with the objects" -msgstr "" -"Transformer les motifs de remplissage avec les objets (remplissage et " -"contour)" +msgstr "Transformer les motifs de remplissage avec les objets (remplissage et contour)" #: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "Store transformation" msgstr "Enregistrement des transformations" #: ../src/ui/dialog/inkscape-preferences.cpp:1229 -msgid "" -"If possible, apply transformation to objects without adding a transform= " -"attribute" -msgstr "" -"Si possible, appliquer des transformations aux objets sans ajouter " -"l'attribut transform=" +msgid "If possible, apply transformation to objects without adding a transform= attribute" +msgstr "Si possible, appliquer des transformations aux objets sans ajouter l'attribut transform=" #: ../src/ui/dialog/inkscape-preferences.cpp:1231 msgid "Always store transformation as a transform= attribute on objects" -msgstr "" -"Toujours enregistrer les transformations dans l'attribut transform= des " -"objets" +msgstr "Toujours enregistrer les transformations dans l'attribut transform= des objets" #: ../src/ui/dialog/inkscape-preferences.cpp:1233 msgid "Transforms" @@ -19942,12 +17936,8 @@ msgid "Mouse _wheel scrolls by:" msgstr "La _molette de la souris défile de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1238 -msgid "" -"One mouse wheel notch scrolls by this distance in screen pixels " -"(horizontally with Shift)" -msgstr "" -"Un cran de la molette de la souris fait défiler de tant de pixels " -"(horizontalement avec Maj)" +msgid "One mouse wheel notch scrolls by this distance in screen pixels (horizontally with Shift)" +msgstr "Un cran de la molette de la souris fait défiler de tant de pixels (horizontalement avec Maj)" #: ../src/ui/dialog/inkscape-preferences.cpp:1239 msgid "Ctrl+arrows" @@ -19959,20 +17949,15 @@ msgstr "Défile_r de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1242 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" -msgstr "" -"Appuyer sur Ctrl+flèches fait défiler de cette distance (en pixels d'écran)" +msgstr "Appuyer sur Ctrl+flèches fait défiler de cette distance (en pixels d'écran)" #: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "_Acceleration:" msgstr "_Accélération :" #: ../src/ui/dialog/inkscape-preferences.cpp:1245 -msgid "" -"Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " -"acceleration)" -msgstr "" -"Garder appuyé Ctrl+flèches accélère graduellement la vitesse du défilement " -"(0 pour aucune accélération)" +msgid "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no acceleration)" +msgstr "Garder appuyé Ctrl+flèches accélère graduellement la vitesse du défilement (0 pour aucune accélération)" #: ../src/ui/dialog/inkscape-preferences.cpp:1246 msgid "Autoscrolling" @@ -19983,33 +17968,26 @@ msgid "_Speed:" msgstr "_Vitesse :" #: ../src/ui/dialog/inkscape-preferences.cpp:1249 -msgid "" -"How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " -"autoscroll off)" +msgid "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn autoscroll off)" msgstr "" -"Vitesse du défilement automatique de la zone de travail lors que l'on tire " -"un objet au dehors de la zone (0 pour aucun défilement automatique)" +"Vitesse du défilement automatique de la zone de travail lors que l'on tire un objet au dehors de la zone (0 pour aucun défilement automatique)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 -#: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 msgid "_Threshold:" msgstr "_Seuil :" #: ../src/ui/dialog/inkscape-preferences.cpp:1252 msgid "" -"How far (in screen pixels) you need to be from the canvas edge to trigger " -"autoscroll; positive is outside the canvas, negative is within the canvas" +"How far (in screen pixels) you need to be from the canvas edge to trigger autoscroll; positive is outside the canvas, negative is within the " +"canvas" msgstr "" -"Distance (en pixels d'écran) à laquelle il faut être du bord de la zone de " -"travail pour activer le défilement automatique; les valeurs positives sont " -"en dehors de la zone, les négatives à l'intérieur" +"Distance (en pixels d'écran) à laquelle il faut être du bord de la zone de travail pour activer le défilement automatique; les valeurs " +"positives sont en dehors de la zone, les négatives à l'intérieur" #: ../src/ui/dialog/inkscape-preferences.cpp:1253 #, fuzzy msgid "Mouse move pans when Space is pressed" -msgstr "" -"Le bouton gauche de la souris fait défiler horizontalement quand la touche " -"Espace est pressée" +msgstr "Le bouton gauche de la souris fait défiler horizontalement quand la touche Espace est pressée" #: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "When on, pressing and holding Space and dragging pans canvas" @@ -20020,13 +17998,10 @@ msgid "Mouse wheel zooms by default" msgstr "La molette de la souris zoome par défaut" #: ../src/ui/dialog/inkscape-preferences.cpp:1258 -msgid "" -"When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " -"off, it zooms with Ctrl and scrolls without Ctrl" +msgid "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when off, it zooms with Ctrl and scrolls without Ctrl" msgstr "" -"Si coché, la molette de la souris zoome sans la touche Ctrl et fait défiler " -"la zone de travail avec Ctrl ; si décoché, elle zoome avec Ctrl et fait " -"défiler sans Ctrl." +"Si coché, la molette de la souris zoome sans la touche Ctrl et fait défiler la zone de travail avec Ctrl ; si décoché, elle zoome avec Ctrl et " +"fait défiler sans Ctrl." #: ../src/ui/dialog/inkscape-preferences.cpp:1259 msgid "Scrolling" @@ -20050,9 +18025,7 @@ msgid "Snap indicator persistence (in seconds):" msgstr "Durée de l'indicateur de magnétisme (en secondes) :" #: ../src/ui/dialog/inkscape-preferences.cpp:1272 -msgid "" -"Controls how long the snap indicator message will be shown, before it " -"disappears" +msgid "Controls how long the snap indicator message will be shown, before it disappears" msgstr "Fixe la durée d'affichage du message de l'indicateur de magnétisme" #: ../src/ui/dialog/inkscape-preferences.cpp:1274 @@ -20064,8 +18037,7 @@ msgid "Only snap the node closest to the pointer" msgstr "Aimanter seulement le nœud le plus proche du pointeur" #: ../src/ui/dialog/inkscape-preferences.cpp:1278 -msgid "" -"Only try to snap the node that is initially closest to the mouse pointer" +msgid "Only try to snap the node that is initially closest to the mouse pointer" msgstr "Essayer d'aimanter le nœud initialement le plus proche du pointeur" #: ../src/ui/dialog/inkscape-preferences.cpp:1281 @@ -20074,13 +18046,11 @@ msgstr "_Coefficient de pondération :" #: ../src/ui/dialog/inkscape-preferences.cpp:1282 msgid "" -"When multiple snap solutions are found, then Inkscape can either prefer the " -"closest transformation (when set to 0), or prefer the node that was " -"initially the closest to the pointer (when set to 1)" +"When multiple snap solutions are found, then Inkscape can either prefer the closest transformation (when set to 0), or prefer the node that " +"was initially the closest to the pointer (when set to 1)" msgstr "" -"Lorsque plusieurs aimantations sont possibles, Inkscape choisit soit la " -"transformation la plus proche (si positionné à 0), soit le nœud qui était " -"initialement le plus proche du pointeur (si positionné à 1)" +"Lorsque plusieurs aimantations sont possibles, Inkscape choisit soit la transformation la plus proche (si positionné à 0), soit le nœud qui " +"était initialement le plus proche du pointeur (si positionné à 1)" #: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "Snap the mouse pointer when dragging a constrained knot" @@ -20088,13 +18058,11 @@ msgstr "Aimanter le pointeur de souris lors du déplacement d'un nœud contraint #: ../src/ui/dialog/inkscape-preferences.cpp:1286 msgid "" -"When dragging a knot along a constraint line, then snap the position of the " -"mouse pointer instead of snapping the projection of the knot onto the " -"constraint line" +"When dragging a knot along a constraint line, then snap the position of the mouse pointer instead of snapping the projection of the knot onto " +"the constraint line" msgstr "" -"Lorsqu'un nœud est déplacé le long d'une ligne de contrainte, alors aimanter " -"la position du pointeur de souris plutôt que la projection du nœud sur la " -"ligne de contrainte" +"Lorsqu'un nœud est déplacé le long d'une ligne de contrainte, alors aimanter la position du pointeur de souris plutôt que la projection du " +"nœud sur la ligne de contrainte" #: ../src/ui/dialog/inkscape-preferences.cpp:1288 msgid "Delayed snap" @@ -20106,14 +18074,11 @@ msgstr "Délai (en secondes) :" #: ../src/ui/dialog/inkscape-preferences.cpp:1292 msgid "" -"Postpone snapping as long as the mouse is moving, and then wait an " -"additional fraction of a second. This additional delay is specified here. " +"Postpone snapping as long as the mouse is moving, and then wait an additional fraction of a second. This additional delay is specified here. " "When set to zero or to a very small number, snapping will be immediate." msgstr "" -"Diffère le magnétisme aussi longtemps que la souris est en mouvement, puis " -"attend encore une fraction de seconde supplémentaire. Ce délai additionnel " -"est défini ici. Si la valeur est nulle ou très faible, l'aimantation est " -"immédiate." +"Diffère le magnétisme aussi longtemps que la souris est en mouvement, puis attend encore une fraction de seconde supplémentaire. Ce délai " +"additionnel est défini ici. Si la valeur est nulle ou très faible, l'aimantation est immédiate." #: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "Snapping" @@ -20125,11 +18090,8 @@ msgid "_Arrow keys move by:" msgstr "Les _flèches déplacent de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1300 -msgid "" -"Pressing an arrow key moves selected object(s) or node(s) by this distance" -msgstr "" -"Appuyer sur une flèche déplace les objet(s) ou les nœud(s) sélectionnés de " -"cette distance" +msgid "Pressing an arrow key moves selected object(s) or node(s) by this distance" +msgstr "Appuyer sur une flèche déplace les objet(s) ou les nœud(s) sélectionnés de cette distance" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here #: ../src/ui/dialog/inkscape-preferences.cpp:1303 @@ -20146,8 +18108,7 @@ msgstr "_Contracter/dilater de :" #: ../src/ui/dialog/inkscape-preferences.cpp:1307 msgid "Inset and Outset commands displace the path by this distance" -msgstr "" -"Les commandes contracter et dilater déplacent le chemin de cette distance" +msgstr "Les commandes contracter et dilater déplacent le chemin de cette distance" #: ../src/ui/dialog/inkscape-preferences.cpp:1308 msgid "Compass-like display of angles" @@ -20155,13 +18116,11 @@ msgstr "Afficher les angles comme sur une boussole" #: ../src/ui/dialog/inkscape-preferences.cpp:1310 msgid "" -"When on, angles are displayed with 0 at north, 0 to 360 range, positive " -"clockwise; otherwise with 0 at east, -180 to 180 range, positive " +"When on, angles are displayed with 0 at north, 0 to 360 range, positive clockwise; otherwise with 0 at east, -180 to 180 range, positive " "counterclockwise" msgstr "" -"Si coché, les angles sont affichés en sens horaire de 0 (au nord) à 360; si " -"décoché, ils sont affichés de -180 à 180 en sens anti-horaire (0 étant à " -"l'est)" +"Si coché, les angles sont affichés en sens horaire de 0 (au nord) à 360; si décoché, ils sont affichés de -180 à 180 en sens anti-horaire (0 " +"étant à l'est)" #: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgctxt "Rotation angle" @@ -20177,42 +18136,28 @@ msgid "degrees" msgstr "degrés" #: ../src/ui/dialog/inkscape-preferences.cpp:1317 -msgid "" -"Rotating with Ctrl pressed snaps every that much degrees; also, pressing " -"[ or ] rotates by this amount" -msgstr "" -"Ctrl appuyé forcera des rotations de tant de degrés; de même en appuyant sur " -"[ ou ], les rotations se feront selon cet incrément" +msgid "Rotating with Ctrl pressed snaps every that much degrees; also, pressing [ or ] rotates by this amount" +msgstr "Ctrl appuyé forcera des rotations de tant de degrés; de même en appuyant sur [ ou ], les rotations se feront selon cet incrément" #: ../src/ui/dialog/inkscape-preferences.cpp:1318 msgid "Relative snapping of guideline angles" msgstr "Aimanter relativement aux angles des guides" #: ../src/ui/dialog/inkscape-preferences.cpp:1320 -msgid "" -"When on, the snap angles when rotating a guideline will be relative to the " -"original angle" -msgstr "" -"Si coché, l'angle de magnétisme lors de la rotation d'un guide est relatif à " -"l'angle d'origine" +msgid "When on, the snap angles when rotating a guideline will be relative to the original angle" +msgstr "Si coché, l'angle de magnétisme lors de la rotation d'un guide est relatif à l'angle d'origine" #: ../src/ui/dialog/inkscape-preferences.cpp:1322 msgid "_Zoom in/out by:" msgstr "(Dé)_Zoomer de :" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 -#: ../src/ui/dialog/objects.cpp:1626 -#: ../src/ui/widget/filter-effect-chooser.cpp:27 +#: ../src/ui/dialog/inkscape-preferences.cpp:1322 ../src/ui/dialog/objects.cpp:1626 ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "%" #: ../src/ui/dialog/inkscape-preferences.cpp:1323 -msgid "" -"Zoom tool click, +/- keys, and middle click zoom in and out by this " -"multiplier" -msgstr "" -"Les outils de zoom (clic en mode zoom, touches +/-, clic bouton du milieu) " -"zooment ou dézooment selon ce facteur" +msgid "Zoom tool click, +/- keys, and middle click zoom in and out by this multiplier" +msgstr "Les outils de zoom (clic en mode zoom, touches +/-, clic bouton du milieu) zooment ou dézooment selon ce facteur" #: ../src/ui/dialog/inkscape-preferences.cpp:1324 msgid "Steps" @@ -20253,11 +18198,10 @@ msgstr "Les clones restent sur place quand leur original est déplacé" #: ../src/ui/dialog/inkscape-preferences.cpp:1344 msgid "" -"Each clone moves according to the value of its transform= attribute; for " -"example, a rotated clone will move in a different direction than its original" +"Each clone moves according to the value of its transform= attribute; for example, a rotated clone will move in a different direction than its " +"original" msgstr "" -"Chaque clone est déplacé en fonction de son attribut transform= ; par " -"exemple, un clone qui a déjà été tourné sera déplacé dans une direction " +"Chaque clone est déplacé en fonction de son attribut transform= ; par exemple, un clone qui a déjà été tourné sera déplacé dans une direction " "différente de celle de son original" #: ../src/ui/dialog/inkscape-preferences.cpp:1345 @@ -20274,8 +18218,7 @@ msgstr "Les clones orphelins sont supprimés en même temps que leur original" #: ../src/ui/dialog/inkscape-preferences.cpp:1351 msgid "Duplicating original+clones/linked offset" -msgstr "" -"Lors de la duplication d'un original et de ses clones ou de ses offsets liés" +msgstr "Lors de la duplication d'un original et de ses clones ou de ses offsets liés" #: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Relink duplicated clones" @@ -20283,13 +18226,11 @@ msgstr "Relier les clones dupliqués" #: ../src/ui/dialog/inkscape-preferences.cpp:1355 msgid "" -"When duplicating a selection containing both a clone and its original " -"(possibly in groups), relink the duplicated clone to the duplicated original " -"instead of the old original" +"When duplicating a selection containing both a clone and its original (possibly in groups), relink the duplicated clone to the duplicated " +"original instead of the old original" msgstr "" -"Lorsque la sélection dupliquée contient un clone et son original (dans un " -"groupe par exemple), relier le clone dupliqué à l'objet original dupliqué " -"plutôt qu'à l'original initial" +"Lorsque la sélection dupliquée contient un clone et son original (dans un groupe par exemple), relier le clone dupliqué à l'objet original " +"dupliqué plutôt qu'à l'original initial" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page #: ../src/ui/dialog/inkscape-preferences.cpp:1358 @@ -20299,28 +18240,19 @@ msgstr "Clones" #. Clip paths and masks options #: ../src/ui/dialog/inkscape-preferences.cpp:1361 msgid "When applying, use the topmost selected object as clippath/mask" -msgstr "" -"Utiliser l'objet le plus haut comme chemin de découpe ou masque lors de " -"l'application" +msgstr "Utiliser l'objet le plus haut comme chemin de découpe ou masque lors de l'application" #: ../src/ui/dialog/inkscape-preferences.cpp:1363 -msgid "" -"Uncheck this to use the bottom selected object as the clipping path or mask" -msgstr "" -"Si décoché, l'objet le plus en-dessous de la sélection est utilisé comme " -"chemin de découpe ou masque" +msgid "Uncheck this to use the bottom selected object as the clipping path or mask" +msgstr "Si décoché, l'objet le plus en-dessous de la sélection est utilisé comme chemin de découpe ou masque" #: ../src/ui/dialog/inkscape-preferences.cpp:1364 msgid "Remove clippath/mask object after applying" msgstr "Supprimer le chemin de découpe ou le masque après application" #: ../src/ui/dialog/inkscape-preferences.cpp:1366 -msgid "" -"After applying, remove the object used as the clipping path or mask from the " -"drawing" -msgstr "" -"Si coché, le chemin de découpe ou masque est supprimé du dessin après avoir " -"été appliqué" +msgid "After applying, remove the object used as the clipping path or mask from the drawing" +msgstr "Si coché, le chemin de découpe ou masque est supprimé du dessin après avoir été appliqué" #: ../src/ui/dialog/inkscape-preferences.cpp:1368 msgid "Before applying" @@ -20360,9 +18292,7 @@ msgstr "Dégrouper les groupes créés automatiquement" #: ../src/ui/dialog/inkscape-preferences.cpp:1387 msgid "Ungroup groups created when setting clip/mask" -msgstr "" -"Dégrouper les groupes créés lors de la mise en place de la découpe ou du " -"masque" +msgstr "Dégrouper les groupes créés lors de la mise en place de la découpe ou du masque" #: ../src/ui/dialog/inkscape-preferences.cpp:1389 msgid "Clippaths and masks" @@ -20372,15 +18302,11 @@ msgstr "Chemins de découpe et masques" msgid "Stroke Style Markers" msgstr "Style de contour des marqueurs" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 -msgid "" -"Stroke color same as object, fill color either object fill color or marker " -"fill color" +#: ../src/ui/dialog/inkscape-preferences.cpp:1394 ../src/ui/dialog/inkscape-preferences.cpp:1396 +msgid "Stroke color same as object, fill color either object fill color or marker fill color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 -#: ../share/extensions/hershey.inx.h:27 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 ../share/extensions/hershey.inx.h:27 msgid "Markers" msgstr "Marqueurs" @@ -20388,12 +18314,9 @@ msgstr "Marqueurs" msgid "Document cleanup" msgstr "Nettoyage du document" -#: ../src/ui/dialog/inkscape-preferences.cpp:1404 -#: ../src/ui/dialog/inkscape-preferences.cpp:1406 +#: ../src/ui/dialog/inkscape-preferences.cpp:1404 ../src/ui/dialog/inkscape-preferences.cpp:1406 msgid "Remove unused swatches when doing a document cleanup" -msgstr "" -"Supprimer les palettes inutilisées lorsqu'un nettoyage de document est " -"effectué" +msgstr "Supprimer les palettes inutilisées lorsqu'un nettoyage de document est effectué" #. tooltip #: ../src/ui/dialog/inkscape-preferences.cpp:1407 @@ -20404,16 +18327,13 @@ msgstr "Nettoyage" msgid "Number of _Threads:" msgstr "Nombre de _threads :" -#: ../src/ui/dialog/inkscape-preferences.cpp:1415 -#: ../src/ui/dialog/inkscape-preferences.cpp:1951 +#: ../src/ui/dialog/inkscape-preferences.cpp:1415 ../src/ui/dialog/inkscape-preferences.cpp:1951 msgid "(requires restart)" msgstr "(nécessite un redémarrage)" #: ../src/ui/dialog/inkscape-preferences.cpp:1416 msgid "Configure number of processors/threads to use when rendering filters" -msgstr "" -"Configure le nombre de processeurs/threads à utiliser pour le rendu des " -"filtres" +msgstr "Configure le nombre de processeurs/threads à utiliser pour le rendu des filtres" #: ../src/ui/dialog/inkscape-preferences.cpp:1420 msgid "Rendering _cache size:" @@ -20426,37 +18346,30 @@ msgstr "Mio" #: ../src/ui/dialog/inkscape-preferences.cpp:1420 msgid "" -"Set the amount of memory per document which can be used to store rendered " -"parts of the drawing for later reuse; set to zero to disable caching" +"Set the amount of memory per document which can be used to store rendered parts of the drawing for later reuse; set to zero to disable caching" msgstr "" -"Configure la quantité de mémoire par document pouvant être utilisée pour " -"stocker les parties affichées du dessin pour une réutilisation ultérieure ; " -"positionnez cette valeur à zéro pour désactiver le cache" +"Configure la quantité de mémoire par document pouvant être utilisée pour stocker les parties affichées du dessin pour une réutilisation " +"ultérieure ; positionnez cette valeur à zéro pour désactiver le cache" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1423 -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 +#: ../src/ui/dialog/inkscape-preferences.cpp:1423 ../src/ui/dialog/inkscape-preferences.cpp:1447 msgid "Best quality (slowest)" msgstr "Haute qualité (le plus lent)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1425 -#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1425 ../src/ui/dialog/inkscape-preferences.cpp:1449 msgid "Better quality (slower)" msgstr "Bonne qualité (plus lent)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1427 ../src/ui/dialog/inkscape-preferences.cpp:1451 msgid "Average quality" msgstr "Qualité moyenne" -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 -#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1429 ../src/ui/dialog/inkscape-preferences.cpp:1453 msgid "Lower quality (faster)" msgstr "Basse qualité (plus rapide)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1431 ../src/ui/dialog/inkscape-preferences.cpp:1455 msgid "Lowest quality (fastest)" msgstr "Qualité médiocre (le plus rapide)" @@ -20464,50 +18377,39 @@ msgstr "Qualité médiocre (le plus rapide)" msgid "Gaussian blur quality for display" msgstr "Qualité d'affichage du flou gaussien" -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 -#: ../src/ui/dialog/inkscape-preferences.cpp:1460 -msgid "" -"Best quality, but display may be very slow at high zooms (bitmap export " -"always uses best quality)" +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 ../src/ui/dialog/inkscape-preferences.cpp:1460 +msgid "Best quality, but display may be very slow at high zooms (bitmap export always uses best quality)" msgstr "" -"La plus haute qualité, mais l'affichage peut être très lent pour des zooms " -"importants (l'export en bitmap utilise toujours la plus haute qualité)" +"La plus haute qualité, mais l'affichage peut être très lent pour des zooms importants (l'export en bitmap utilise toujours la plus haute " +"qualité)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 -#: ../src/ui/dialog/inkscape-preferences.cpp:1462 +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 ../src/ui/dialog/inkscape-preferences.cpp:1462 msgid "Better quality, but slower display" msgstr "Meilleure qualité, mais affichage plus lent" -#: ../src/ui/dialog/inkscape-preferences.cpp:1440 -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#: ../src/ui/dialog/inkscape-preferences.cpp:1440 ../src/ui/dialog/inkscape-preferences.cpp:1464 msgid "Average quality, acceptable display speed" msgstr "Qualité moyenne, vitesse d'affichage acceptable" -#: ../src/ui/dialog/inkscape-preferences.cpp:1442 -#: ../src/ui/dialog/inkscape-preferences.cpp:1466 +#: ../src/ui/dialog/inkscape-preferences.cpp:1442 ../src/ui/dialog/inkscape-preferences.cpp:1466 msgid "Lower quality (some artifacts), but display is faster" msgstr "Qualité plus faible (présence d'artefacts), mais affichage plus rapide" -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#: ../src/ui/dialog/inkscape-preferences.cpp:1444 ../src/ui/dialog/inkscape-preferences.cpp:1468 msgid "Lowest quality (considerable artifacts), but display is fastest" -msgstr "" -"La plus mauvaise qualité (nombreux artefacts), mais l'affichage est bien " -"plus rapide" +msgstr "La plus mauvaise qualité (nombreux artefacts), mais l'affichage est bien plus rapide" #: ../src/ui/dialog/inkscape-preferences.cpp:1458 msgid "Filter effects quality for display" msgstr "Qualité d'affichage des effets de filtre" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 -#: ../src/ui/dialog/print.cpp:215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1470 ../src/ui/dialog/print.cpp:215 msgid "Rendering" msgstr "Rendu" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1476 ../src/verbs.cpp:156 -#: ../src/widgets/calligraphy-toolbar.cpp:626 +#: ../src/ui/dialog/inkscape-preferences.cpp:1476 ../src/verbs.cpp:156 ../src/widgets/calligraphy-toolbar.cpp:626 msgid "Edit" msgstr "Édition" @@ -20517,16 +18419,13 @@ msgstr "Recharger automatiquement les bitmaps" #: ../src/ui/dialog/inkscape-preferences.cpp:1479 msgid "Automatically reload linked images when file is changed on disk" -msgstr "" -"Active le rechargement automatique des images liées lorsqu'elles ont été " -"modifiées sur le disque" +msgstr "Active le rechargement automatique des images liées lorsqu'elles ont été modifiées sur le disque" #: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "_Bitmap editor:" msgstr "Éditeur de _bitmap :" -#: ../src/ui/dialog/inkscape-preferences.cpp:1483 -#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 +#: ../src/ui/dialog/inkscape-preferences.cpp:1483 ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "Exporter" @@ -20537,11 +18436,9 @@ msgstr "_Résolution par défaut d'exportation :" #: ../src/ui/dialog/inkscape-preferences.cpp:1486 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" -msgstr "" -"Résolution par défaut (point par pouce) dans la boîte de dialogue exporter" +msgstr "Résolution par défaut (point par pouce) dans la boîte de dialogue exporter" -#: ../src/ui/dialog/inkscape-preferences.cpp:1487 -#: ../src/ui/dialog/xml-tree.cpp:920 +#: ../src/ui/dialog/inkscape-preferences.cpp:1487 ../src/ui/dialog/xml-tree.cpp:920 msgid "Create" msgstr "Créer" @@ -20555,14 +18452,13 @@ msgstr "Résolution utilisée par la commande Créer une copie bitmap" #: ../src/ui/dialog/inkscape-preferences.cpp:1493 msgid "Ask about linking and scaling when importing" -msgstr "" -"Demander les options de lien et de mise à l'échelle lors de l'importation" +msgstr "Demander les options de lien et de mise à l'échelle lors de l'importation" #: ../src/ui/dialog/inkscape-preferences.cpp:1495 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "" -"Fait apparaître une boîte de dialogue pour sélectionner les options de lien " -"et de mise à l'échelle chaque fois qu'une image matricielle est importée." +"Fait apparaître une boîte de dialogue pour sélectionner les options de lien et de mise à l'échelle chaque fois qu'une image matricielle est " +"importée." #: ../src/ui/dialog/inkscape-preferences.cpp:1501 msgid "Bitmap link:" @@ -20578,9 +18474,7 @@ msgstr "Résolution par défaut d'_importation :" #: ../src/ui/dialog/inkscape-preferences.cpp:1514 msgid "Default bitmap resolution (in dots per inch) for bitmap import" -msgstr "" -"Résolution bitmap par défaut (point par pouce) dans la boîte de dialogue " -"importer" +msgstr "Résolution bitmap par défaut (point par pouce) dans la boîte de dialogue importer" #: ../src/ui/dialog/inkscape-preferences.cpp:1515 msgid "Override file resolution" @@ -20588,9 +18482,7 @@ msgstr "Écraser la résolution du fichier" #: ../src/ui/dialog/inkscape-preferences.cpp:1517 msgid "Use default bitmap resolution in favor of information from file" -msgstr "" -"Utilise la résolution matricielle par défaut à la place de celle contenue " -"dans le fichier" +msgstr "Utilise la résolution matricielle par défaut à la place de celle contenue dans le fichier" #. rendering outlines for pixmap image tags #: ../src/ui/dialog/inkscape-preferences.cpp:1521 @@ -20598,12 +18490,8 @@ msgid "Images in Outline Mode" msgstr "Images en mode contour" #: ../src/ui/dialog/inkscape-preferences.cpp:1522 -msgid "" -"When active will render images while in outline mode instead of a red box " -"with an x. This is useful for manual tracing." -msgstr "" -"Si coché, les images sont affichées en mode contour (à la place de l'image " -"par défaut). Utile pour effectuer une vectorisation manuelle." +msgid "When active will render images while in outline mode instead of a red box with an x. This is useful for manual tracing." +msgstr "Si coché, les images sont affichées en mode contour (à la place de l'image par défaut). Utile pour effectuer une vectorisation manuelle." #: ../src/ui/dialog/inkscape-preferences.cpp:1524 msgid "Bitmaps" @@ -20611,19 +18499,14 @@ msgstr "Bitmaps" #: ../src/ui/dialog/inkscape-preferences.cpp:1536 #, fuzzy -msgid "" -"Select a file of predefined shortcuts to use. Any customized shortcuts you " -"create will be added separately to " -msgstr "" -"Sélectionnez un fichier de raccourcis prédéfinis à utiliser. Vos " -"modifications seront ajoutées séparément" +msgid "Select a file of predefined shortcuts to use. Any customized shortcuts you create will be added separately to " +msgstr "Sélectionnez un fichier de raccourcis prédéfinis à utiliser. Vos modifications seront ajoutées séparément" #: ../src/ui/dialog/inkscape-preferences.cpp:1539 msgid "Shortcut file:" msgstr "Fichier des raccourcis :" -#: ../src/ui/dialog/inkscape-preferences.cpp:1542 -#: ../src/ui/dialog/template-load-tab.cpp:48 +#: ../src/ui/dialog/inkscape-preferences.cpp:1542 ../src/ui/dialog/template-load-tab.cpp:48 msgid "Search:" msgstr "Rechercher :" @@ -20631,18 +18514,13 @@ msgstr "Rechercher :" msgid "Shortcut" msgstr "Raccourci" -#: ../src/ui/dialog/inkscape-preferences.cpp:1555 -#: ../src/ui/widget/page-sizer.cpp:287 +#: ../src/ui/dialog/inkscape-preferences.cpp:1555 ../src/ui/widget/page-sizer.cpp:287 msgid "Description" msgstr "Description" #: ../src/ui/dialog/inkscape-preferences.cpp:1610 -msgid "" -"Remove all your customized keyboard shortcuts, and revert to the shortcuts " -"in the shortcut file listed above" -msgstr "" -"Remplace tous les raccourcis clavier personnalisés par ceux définis dans le " -"fichier choisi" +msgid "Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above" +msgstr "Remplace tous les raccourcis clavier personnalisés par ceux définis dans le fichier choisi" #: ../src/ui/dialog/inkscape-preferences.cpp:1614 msgid "Import ..." @@ -20683,24 +18561,20 @@ msgid "Second language:" msgstr "Deuxième langue :" #: ../src/ui/dialog/inkscape-preferences.cpp:1917 -msgid "" -"Set the second spell check language; checking will only stop on words " -"unknown in ALL chosen languages" +msgid "Set the second spell check language; checking will only stop on words unknown in ALL chosen languages" msgstr "" -"Définit la deuxième langue du correcteur orthographique ; la vérification ne " -"s'arrêtera que sur les mots inconnus de toutes les langues sélectionnées" +"Définit la deuxième langue du correcteur orthographique ; la vérification ne s'arrêtera que sur les mots inconnus de toutes les langues " +"sélectionnées" #: ../src/ui/dialog/inkscape-preferences.cpp:1920 msgid "Third language:" msgstr "Troisième langue :" #: ../src/ui/dialog/inkscape-preferences.cpp:1921 -msgid "" -"Set the third spell check language; checking will only stop on words unknown " -"in ALL chosen languages" +msgid "Set the third spell check language; checking will only stop on words unknown in ALL chosen languages" msgstr "" -"Définit la troisième langue du correcteur orthographique ; la vérification " -"ne s'arrêtera que sur les mots inconnus de toutes les langues sélectionnées" +"Définit la troisième langue du correcteur orthographique ; la vérification ne s'arrêtera que sur les mots inconnus de toutes les langues " +"sélectionnées" #: ../src/ui/dialog/inkscape-preferences.cpp:1923 msgid "Ignore words with digits" @@ -20727,25 +18601,18 @@ msgid "Latency _skew:" msgstr "_Décalage temporel :" #: ../src/ui/dialog/inkscape-preferences.cpp:1952 -msgid "" -"Factor by which the event clock is skewed from the actual time (0.9766 on " -"some systems)" -msgstr "" -"Facteur de décalage entre l'horloge de l'événement et le temps réel (0,9766 " -"sur certains systèmes)" +msgid "Factor by which the event clock is skewed from the actual time (0.9766 on some systems)" +msgstr "Facteur de décalage entre l'horloge de l'événement et le temps réel (0,9766 sur certains systèmes)" #: ../src/ui/dialog/inkscape-preferences.cpp:1954 msgid "Pre-render named icons" msgstr "Préafficher les icônes nommées" #: ../src/ui/dialog/inkscape-preferences.cpp:1956 -msgid "" -"When on, named icons will be rendered before displaying the ui. This is for " -"working around bugs in GTK+ named icon notification" +msgid "When on, named icons will be rendered before displaying the ui. This is for working around bugs in GTK+ named icon notification" msgstr "" -"Si coché, les icônes nommées sont rendues avant l'affichage de l'interface " -"utilisateur. Il s'agit du contournement d'un bug sur la notification des " -"icônes nommées dans GTK+." +"Si coché, les icônes nommées sont rendues avant l'affichage de l'interface utilisateur. Il s'agit du contournement d'un bug sur la " +"notification des icônes nommées dans GTK+." #: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "System info" @@ -20789,9 +18656,7 @@ msgstr "Fichiers temporaires :" #: ../src/ui/dialog/inkscape-preferences.cpp:1988 msgid "Location of the temporary files used for autosave" -msgstr "" -"Emplacement des fichiers temporaires utilisés pour l'enregistrement " -"automatique" +msgstr "Emplacement des fichiers temporaires utilisés pour l'enregistrement automatique" #: ../src/ui/dialog/inkscape-preferences.cpp:1992 msgid "Inkscape data: " @@ -20829,8 +18694,7 @@ msgstr "Emplacement des thèmes d'icône" msgid "System" msgstr "Système" -#: ../src/ui/dialog/input.cpp:360 ../src/ui/dialog/input.cpp:381 -#: ../src/ui/dialog/input.cpp:1641 +#: ../src/ui/dialog/input.cpp:360 ../src/ui/dialog/input.cpp:381 ../src/ui/dialog/input.cpp:1641 msgid "Disabled" msgstr "Désactivé" @@ -20863,8 +18727,7 @@ msgstr "Matériel" msgid "Link:" msgstr "Lien :" -#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 -#: ../src/ui/dialog/input.cpp:1571 ../src/ui/widget/color-scales.cpp:46 +#: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 ../src/ui/dialog/input.cpp:1571 ../src/ui/widget/color-scales.cpp:46 #: ../share/extensions/plotter.inx.h:24 msgid "None" msgstr "Aucun" @@ -20891,9 +18754,7 @@ msgstr "pad" #: ../src/ui/dialog/input.cpp:1081 msgid "_Use pressure-sensitive tablet (requires restart)" -msgstr "" -"_Utiliser une tablette graphique sensible à la pression (nécessite un " -"redémarrage)" +msgstr "_Utiliser une tablette graphique sensible à la pression (nécessite un redémarrage)" #: ../src/ui/dialog/input.cpp:1086 msgid "Axes" @@ -20904,16 +18765,13 @@ msgid "Keys" msgstr "Touches" #: ../src/ui/dialog/input.cpp:1170 -msgid "" -"A device can be 'Disabled', its co-ordinates mapped to the whole 'Screen', " -"or to a single (usually focused) 'Window'" +msgid "A device can be 'Disabled', its co-ordinates mapped to the whole 'Screen', or to a single (usually focused) 'Window'" msgstr "" -"Un périphérique peut être désactivé, ou ses coordonnées peuvent être " -"appliquées à l'ensemble de l'écran ou à une seule fenêtre (généralement " +"Un périphérique peut être désactivé, ou ses coordonnées peuvent être appliquées à l'ensemble de l'écran ou à une seule fenêtre (généralement " "sélectionnée)" -#: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 -#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372 +#: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 ../src/widgets/spray-toolbar.cpp:224 +#: ../src/widgets/tweak-toolbar.cpp:372 msgid "Pressure" msgstr "Pression" @@ -20925,8 +18783,7 @@ msgstr "Inclinaison X" msgid "Y tilt" msgstr "Inclinaison Y" -#: ../src/ui/dialog/input.cpp:1616 -#: ../src/ui/widget/color-wheel-selector.cpp:29 +#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "Roue" @@ -20960,9 +18817,7 @@ msgid "Rename Layer" msgstr "Renommer le calque" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" -#: ../src/ui/dialog/layer-properties.cpp:354 -#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2337 +#: ../src/ui/dialog/layer-properties.cpp:354 ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 ../src/verbs.cpp:2337 msgid "Layer" msgstr "Calque" @@ -20995,9 +18850,7 @@ msgstr "Nouveau calque créé." msgid "Move to Layer" msgstr "Déplacer vers le calque" -#: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 -#: ../src/ui/dialog/transformation.cpp:108 +#: ../src/ui/dialog/layer-properties.cpp:411 ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 ../src/ui/dialog/transformation.cpp:108 msgid "_Move" msgstr "Déplace_ment" @@ -21017,13 +18870,11 @@ msgstr "Verrouiller le calque" msgid "Unlock layer" msgstr "Déverrouiller le calque" -#: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 -#: ../src/verbs.cpp:1407 +#: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 ../src/verbs.cpp:1407 msgid "Toggle layer solo" msgstr "Afficher ou masquer les autres calques" -#: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 -#: ../src/verbs.cpp:1431 +#: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 ../src/verbs.cpp:1431 msgid "Lock other layers" msgstr "Verrouiller les autres calques" @@ -21088,9 +18939,7 @@ msgstr "Cliquez sur le bouton pour ajouter un effet" msgid "Click add button to convert clone" msgstr "Cliquez sur le bouton ajouter pour convertir un clone" -#: ../src/ui/dialog/livepatheffect-editor.cpp:321 -#: ../src/ui/dialog/livepatheffect-editor.cpp:325 -#: ../src/ui/dialog/livepatheffect-editor.cpp:334 +#: ../src/ui/dialog/livepatheffect-editor.cpp:321 ../src/ui/dialog/livepatheffect-editor.cpp:325 ../src/ui/dialog/livepatheffect-editor.cpp:334 msgid "Select a path or shape" msgstr "Sélectionnez un chemin ou une forme" @@ -21188,8 +19037,7 @@ msgstr "Inutilisée" msgid "Total" msgstr "Total" -#: ../src/ui/dialog/memory.cpp:141 ../src/ui/dialog/memory.cpp:147 -#: ../src/ui/dialog/memory.cpp:154 ../src/ui/dialog/memory.cpp:186 +#: ../src/ui/dialog/memory.cpp:141 ../src/ui/dialog/memory.cpp:147 ../src/ui/dialog/memory.cpp:154 ../src/ui/dialog/memory.cpp:186 msgid "Unknown" msgstr "Inconnu" @@ -21241,8 +19089,7 @@ msgstr "Rôle :" msgid "Arcrole:" msgstr "Arc-rôle :" -#: ../src/ui/dialog/object-attributes.cpp:58 -#: ../share/extensions/polyhedron_3d.inx.h:47 +#: ../src/ui/dialog/object-attributes.cpp:58 ../share/extensions/polyhedron_3d.inx.h:47 msgid "Show:" msgstr "Afficher :" @@ -21259,9 +19106,7 @@ msgstr "URL :" msgid "Image Rendering:" msgstr "Rendu de l'image :" -#: ../src/ui/dialog/object-properties.cpp:58 -#: ../src/ui/dialog/object-properties.cpp:399 -#: ../src/ui/dialog/object-properties.cpp:470 +#: ../src/ui/dialog/object-properties.cpp:58 ../src/ui/dialog/object-properties.cpp:399 ../src/ui/dialog/object-properties.cpp:470 #: ../src/ui/dialog/object-properties.cpp:477 msgid "_ID:" msgstr "_ID :" @@ -21284,11 +19129,8 @@ msgstr "Verr_ouiller" #. Create the entry box for the object id #: ../src/ui/dialog/object-properties.cpp:139 -msgid "" -"The id= attribute (only letters, digits, and the characters .-_: allowed)" -msgstr "" -"L'attribut id= (seuls les chiffres, lettres, et les caractères .-_: sont " -"autorisés)" +msgid "The id= attribute (only letters, digits, and the characters .-_: allowed)" +msgstr "L'attribut id= (seuls les chiffres, lettres, et les caractères .-_: sont autorisés)" #. Create the entry box for the object label #: ../src/ui/dialog/object-properties.cpp:174 @@ -21306,15 +19148,13 @@ msgid "" "\t'auto' no preference;\n" "\t'optimizeQuality' smooth;\n" "\t'optimizeSpeed' blocky.\n" -"Note that this behaviour is not defined in the SVG 1.1 specification and not " -"all browsers follow this interpretation." +"Note that this behaviour is not defined in the SVG 1.1 specification and not all browsers follow this interpretation." msgstr "" "Ce paramètre peut joueur sur la façon dont un bitmap est agrandi :\n" "\t'auto' pas de préférence;\n" "\t'optimizeQuality' lissé;\n" "\t'optimizeSpeed' pixélisé.\n" -"Notez que ce comportement n'est pas défini dans la spécification SVG 1.1 et " -"que tous les navigateurs ne suivent pas cette interprétation." +"Notez que ce comportement n'est pas défini dans la spécification SVG 1.1 et que tous les navigateurs ne suivent pas cette interprétation." #. Hide #: ../src/ui/dialog/object-properties.cpp:293 @@ -21328,8 +19168,7 @@ msgid "Check to make the object insensitive (not selectable by mouse)" msgstr "Si coché, l'objet devient insensible (non sélectionnable à la souris)" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2680 -#: ../src/verbs.cpp:2686 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2680 ../src/verbs.cpp:2686 msgid "_Set" msgstr "_Définir" @@ -21338,8 +19177,7 @@ msgstr "_Définir" msgid "_Interactivity" msgstr "_Interactivité" -#: ../src/ui/dialog/object-properties.cpp:386 -#: ../src/ui/dialog/object-properties.cpp:391 +#: ../src/ui/dialog/object-properties.cpp:386 ../src/ui/dialog/object-properties.cpp:391 msgid "Ref" msgstr "Réf" @@ -21415,8 +19253,7 @@ msgstr "Groupe vers calque" msgid "Moved objects" msgstr "Objets déplacés" -#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:857 -#: ../src/ui/dialog/tags.cpp:864 +#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:857 ../src/ui/dialog/tags.cpp:864 msgid "Rename object" msgstr "Renommer l'objet" @@ -21476,9 +19313,7 @@ msgid "Toggle lock of Layer, Group, or Object." msgstr "" #: ../src/ui/dialog/objects.cpp:1689 -msgid "" -"Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " -"between the two types." +msgid "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles between the two types." msgstr "" #: ../src/ui/dialog/objects.cpp:1708 @@ -21486,15 +19321,11 @@ msgid "Is object clipped and/or masked?" msgstr "" #: ../src/ui/dialog/objects.cpp:1719 -msgid "" -"Highlight color of outline in Node tool. Click to set. If alpha is zero, use " -"inherited color." +msgid "Highlight color of outline in Node tool. Click to set. If alpha is zero, use inherited color." msgstr "" #: ../src/ui/dialog/objects.cpp:1730 -msgid "" -"Layer/Group/Object label (inkscape:label). Double-click to set. Default " -"value is object 'id'." +msgid "Layer/Group/Object label (inkscape:label). Double-click to set. Default value is object 'id'." msgstr "" #: ../src/ui/dialog/objects.cpp:1827 @@ -21621,12 +19452,8 @@ msgid "No clipart named %1 was found." msgstr "Aucun clipart nommé %1 n'a été trouvé." #: ../src/ui/dialog/ocaldialogs.cpp:1179 -msgid "" -"Please make sure all keywords are spelled correctly, or try again with " -"different keywords." -msgstr "" -"Veuillez vous assurer que les mots clé ont été correctement épelé, ou " -"essayez avec des mots clé différents." +msgid "Please make sure all keywords are spelled correctly, or try again with different keywords." +msgstr "Veuillez vous assurer que les mots clé ont été correctement épelé, ou essayez avec des mots clé différents." #: ../src/ui/dialog/ocaldialogs.cpp:1231 msgid "Search" @@ -21708,31 +19535,26 @@ msgstr "Algorithme de Kopf-Lischinski" msgid "Output" msgstr "Résultat" -#: ../src/ui/dialog/pixelartdialog.cpp:297 -#: ../src/ui/dialog/tracedialog.cpp:814 +#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814 msgid "Reset all settings to defaults" msgstr "Rétablir toutes les valeurs par défaut" -#: ../src/ui/dialog/pixelartdialog.cpp:302 -#: ../src/ui/dialog/tracedialog.cpp:819 +#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819 msgid "Abort a trace in progress" msgstr "Annuler une vectorisation en cours" -#: ../src/ui/dialog/pixelartdialog.cpp:306 -#: ../src/ui/dialog/tracedialog.cpp:823 +#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823 msgid "Execute the trace" msgstr "Lancer la vectorisation" -#: ../src/ui/dialog/pixelartdialog.cpp:388 -#: ../src/ui/dialog/pixelartdialog.cpp:422 +#: ../src/ui/dialog/pixelartdialog.cpp:388 ../src/ui/dialog/pixelartdialog.cpp:422 msgid "" -"Image looks too big. Process may take a while and it is wise to save your " -"document before continuing.\n" +"Image looks too big. Process may take a while and it is wise to save your document before continuing.\n" "\n" "Continue the procedure (without saving)?" msgstr "" -"L'image semble trop grosse. Le traitement risque de prendre assez longtemps " -"et il serait préférable d'enregistrer votre document avant de continuer.\n" +"L'image semble trop grosse. Le traitement risque de prendre assez longtemps et il serait préférable d'enregistrer votre document avant de " +"continuer.\n" "\n" "Continuer (sans enregistrer) ?" @@ -21741,40 +19563,34 @@ msgid "Trace pixel art" msgstr "Vectoriser en pixel art" #: ../src/ui/dialog/polar-arrange-tab.cpp:41 -#, fuzzy msgctxt "Polar arrange tab" msgid "Y coordinate of the center" -msgstr "Coordonnée Y de la sélection" +msgstr "Coordonnée Y du centre" #: ../src/ui/dialog/polar-arrange-tab.cpp:42 -#, fuzzy msgctxt "Polar arrange tab" msgid "X coordinate of the center" -msgstr "Coordonnée X de la sélection" +msgstr "Coordonnée X du centre" #: ../src/ui/dialog/polar-arrange-tab.cpp:43 -#, fuzzy msgctxt "Polar arrange tab" msgid "Y coordinate of the radius" -msgstr "Coordonnée Y de la sélection" +msgstr "Coordonnée Y du rayon" #: ../src/ui/dialog/polar-arrange-tab.cpp:44 -#, fuzzy msgctxt "Polar arrange tab" msgid "X coordinate of the radius" -msgstr "Coordonnée X de la sélection" +msgstr "Coordonnée X du rayon" #: ../src/ui/dialog/polar-arrange-tab.cpp:45 -#, fuzzy msgctxt "Polar arrange tab" msgid "Starting angle" -msgstr "Angle de rotation :" +msgstr "Angle de départ" #: ../src/ui/dialog/polar-arrange-tab.cpp:46 -#, fuzzy msgctxt "Polar arrange tab" msgid "End angle" -msgstr "Angle du cône" +msgstr "Angle de fin" #: ../src/ui/dialog/polar-arrange-tab.cpp:48 msgctxt "Polar arrange tab" @@ -21812,13 +19628,11 @@ msgid "Parameterized:" msgstr "Paramétré :" #: ../src/ui/dialog/polar-arrange-tab.cpp:83 -#, fuzzy msgctxt "Polar arrange tab" msgid "Center X/Y:" msgstr "Centre X/Y :" #: ../src/ui/dialog/polar-arrange-tab.cpp:105 -#, fuzzy msgctxt "Polar arrange tab" msgid "Radius X/Y:" msgstr "Rayon X/Y :" @@ -21959,13 +19773,11 @@ msgstr "glyphe" msgid "Add glyph" msgstr "Ajouter un glyphe" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:522 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:564 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:522 ../src/ui/dialog/svg-fonts-dialog.cpp:564 msgid "Select a path to define the curves of a glyph" msgstr "Sélectionner un chemin(s) pour définir les courbes du glyphe" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:530 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:572 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:530 ../src/ui/dialog/svg-fonts-dialog.cpp:572 msgid "The selected object does not have a path description." msgstr "L'objet sélectionné n'est pas décrit comme un chemin." @@ -21973,8 +19785,7 @@ msgstr "L'objet sélectionné n'est pas décrit comme un chemin." msgid "No glyph selected in the SVGFonts dialog." msgstr "Aucun glyphe n'est sélectionné dans la boîte de dialogue Fontes SVG." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:548 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:587 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:548 ../src/ui/dialog/svg-fonts-dialog.cpp:587 msgid "Set glyph curves" msgstr "Définir les courbes du glyphe" @@ -22088,8 +19899,7 @@ msgstr "_Glyphes" msgid "_Kerning" msgstr "_Crénage" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:930 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:931 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:930 ../src/ui/dialog/svg-fonts-dialog.cpp:931 msgid "Sample Text" msgstr "Texte exemple" @@ -22097,8 +19907,7 @@ msgstr "Texte exemple" msgid "Preview Text:" msgstr "Texte de l'aperçu :" -#: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 -#: ../src/ui/tools/gradient-tool.cpp:458 +#: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 ../src/ui/tools/gradient-tool.cpp:458 #: ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "Ajouter un stop au dégradé" @@ -22168,20 +19977,17 @@ msgstr "Rendre les icônes plus petites en zoomant" msgid "Unnamed Symbols" msgstr "Symboles sans nom" -#: ../src/ui/dialog/tags.cpp:274 ../src/ui/dialog/tags.cpp:573 -#: ../src/ui/dialog/tags.cpp:687 -#, fuzzy +#: ../src/ui/dialog/tags.cpp:274 ../src/ui/dialog/tags.cpp:573 ../src/ui/dialog/tags.cpp:687 msgid "Remove from selection set" -msgstr "Retirer le masque de la sélection" +msgstr "Retirer de l'ensemble de sélection" #: ../src/ui/dialog/tags.cpp:431 msgid "Items" msgstr "Éléments" #: ../src/ui/dialog/tags.cpp:670 -#, fuzzy msgid "Add selection to set" -msgstr "Monter la sélection au premier plan" +msgstr "Ajouter la sélection à l'ensemble" #: ../src/ui/dialog/tags.cpp:828 #, fuzzy @@ -22194,9 +20000,8 @@ msgid "Add a new selection set" msgstr "Ajouter un nouveau point de connexion" #: ../src/ui/dialog/tags.cpp:1007 -#, fuzzy msgid "Remove Item/Set" -msgstr "Retirer les effets" +msgstr "Retirer l'élément ou l'ensemble" #: ../src/ui/dialog/template-widget.cpp:37 msgid "More info" @@ -22233,23 +20038,19 @@ msgstr "Définir comme valeur par _défaut" # Do not try to translate. This is a test string used in text and font dialog, when no text has been typed in order to get a preview of the font. # Simply copying it. #: ../src/ui/dialog/text-edit.cpp:87 -#, fuzzy msgid "AaBbCcIiPpQq12369$€¢?.;/()" -msgstr "AaBbCcIiPpQq12369$ےے?.;/()" +msgstr "AaBbCcIiPpQq12369$€¢?.;/()" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1339 -#: ../src/widgets/text-toolbar.cpp:1340 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1339 ../src/widgets/text-toolbar.cpp:1340 msgid "Align left" msgstr "Aligner à gauche" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1347 -#: ../src/widgets/text-toolbar.cpp:1348 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1347 ../src/widgets/text-toolbar.cpp:1348 msgid "Align center" msgstr "Centrer" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1355 -#: ../src/widgets/text-toolbar.cpp:1356 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1355 ../src/widgets/text-toolbar.cpp:1356 msgid "Align right" msgstr "Aligner à droite" @@ -22274,8 +20075,7 @@ msgstr "Espacement entre les lignes (pourcentage de la taille de la police)" msgid "Text path offset" msgstr "Décalage du chemin de texte" -#: ../src/ui/dialog/text-edit.cpp:612 ../src/ui/dialog/text-edit.cpp:699 -#: ../src/ui/tools/text-tool.cpp:1446 +#: ../src/ui/dialog/text-edit.cpp:612 ../src/ui/dialog/text-edit.cpp:699 ../src/ui/tools/text-tool.cpp:1446 msgid "Set text style" msgstr "Appliquer un style à un texte" @@ -22331,9 +20131,7 @@ msgstr "Vectoriser en utilisant l'algorithme détection d'arêtes de J. Canny" #: ../src/ui/dialog/tracedialog.cpp:556 msgid "Brightness cutoff for adjacent pixels (determines edge thickness)" -msgstr "" -"Limite de luminosité pour déterminer les pixels adjacents (détermine la " -"finesse des arrêtes)" +msgstr "Limite de luminosité pour déterminer les pixels adjacents (détermine la finesse des arrêtes)" #: ../src/ui/dialog/tracedialog.cpp:559 msgid "T_hreshold:" @@ -22417,12 +20215,8 @@ msgid "Stac_k scans" msgstr "Em_piler les passes" #: ../src/ui/dialog/tracedialog.cpp:661 -msgid "" -"Stack scans on top of one another (no gaps) instead of tiling (usually with " -"gaps)" -msgstr "" -"Empiler les passes verticalement (sans espacement) au lieu de les juxtaposer " -"(souvent avec de l'espacement)" +msgid "Stack scans on top of one another (no gaps) instead of tiling (usually with gaps)" +msgstr "Empiler les passes verticalement (sans espacement) au lieu de les juxtaposer (souvent avec de l'espacement)" #: ../src/ui/dialog/tracedialog.cpp:665 msgid "Remo_ve background" @@ -22479,17 +20273,11 @@ msgstr "_Optimiser les chemins" #: ../src/ui/dialog/tracedialog.cpp:729 msgid "Try to optimize paths by joining adjacent Bezier curve segments" -msgstr "" -"Tenter d'optimiser les chemins en joignant les segments de courbes de Bézier " -"adjacents" +msgstr "Tenter d'optimiser les chemins en joignant les segments de courbes de Bézier adjacents" #: ../src/ui/dialog/tracedialog.cpp:737 -msgid "" -"Increase this to reduce the number of nodes in the trace by more aggressive " -"optimization" -msgstr "" -"Augmenter ce paramètre pour diminuer le nombre de nœuds de la vectorisation " -"avec une optimisation plus aggressive" +msgid "Increase this to reduce the number of nodes in the trace by more aggressive optimization" +msgstr "Augmenter ce paramètre pour diminuer le nombre de nœuds de la vectorisation avec une optimisation plus aggressive" #: ../src/ui/dialog/tracedialog.cpp:739 msgid "To_lerance:" @@ -22539,19 +20327,14 @@ msgstr "_Mettre à jour" #. I guess it's correct to call the "intermediate bitmap" a preview of the trace #: ../src/ui/dialog/tracedialog.cpp:796 -msgid "" -"Preview the intermediate bitmap with the current settings, without actual " -"tracing" -msgstr "" -"Aperçu du bitmap intermédiaire avec les paramètres définis, sans " -"vectorisation effective" +msgid "Preview the intermediate bitmap with the current settings, without actual tracing" +msgstr "Aperçu du bitmap intermédiaire avec les paramètres définis, sans vectorisation effective" #: ../src/ui/dialog/tracedialog.cpp:800 msgid "Preview" msgstr "Aperçu" -#: ../src/ui/dialog/transformation.cpp:70 -#: ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/dialog/transformation.cpp:70 ../src/ui/dialog/transformation.cpp:80 msgid "_Horizontal:" msgstr "_Horizontal :" @@ -22559,8 +20342,7 @@ msgstr "_Horizontal :" msgid "Horizontal displacement (relative) or position (absolute)" msgstr "Déplacement (relatif) ou position (absolue) horizontal(e)" -#: ../src/ui/dialog/transformation.cpp:72 -#: ../src/ui/dialog/transformation.cpp:82 +#: ../src/ui/dialog/transformation.cpp:72 ../src/ui/dialog/transformation.cpp:82 msgid "_Vertical:" msgstr "_Vertical :" @@ -22580,26 +20362,17 @@ msgstr "Dimension verticals (absolue ou pourcentage de l'existant)" msgid "A_ngle:" msgstr "A_ngle :" -#: ../src/ui/dialog/transformation.cpp:78 -#: ../src/ui/dialog/transformation.cpp:1103 +#: ../src/ui/dialog/transformation.cpp:78 ../src/ui/dialog/transformation.cpp:1103 msgid "Rotation angle (positive = counterclockwise)" msgstr "Angle de rotation (positif = sens anti-horaire)" #: ../src/ui/dialog/transformation.cpp:80 -msgid "" -"Horizontal skew angle (positive = counterclockwise), or absolute " -"displacement, or percentage displacement" -msgstr "" -"Angle d'inclinaison horizontal (positif = sens anti-horaire) ou déplacement " -"absolu, ou pourcentage de déplacement" +msgid "Horizontal skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement" +msgstr "Angle d'inclinaison horizontal (positif = sens anti-horaire) ou déplacement absolu, ou pourcentage de déplacement" #: ../src/ui/dialog/transformation.cpp:82 -msgid "" -"Vertical skew angle (positive = counterclockwise), or absolute displacement, " -"or percentage displacement" -msgstr "" -"Angle d'inclinaison vertical (positif = sens anti-horaire) ou déplacement " -"absolu, ou pourcentage de déplacement" +msgid "Vertical skew angle (positive = counterclockwise), or absolute displacement, or percentage displacement" +msgstr "Angle d'inclinaison vertical (positif = sens anti-horaire) ou déplacement absolu, ou pourcentage de déplacement" #: ../src/ui/dialog/transformation.cpp:85 msgid "Transformation matrix element A" @@ -22630,12 +20403,8 @@ msgid "Rela_tive move" msgstr "Déplacement rela_tif" #: ../src/ui/dialog/transformation.cpp:95 -msgid "" -"Add the specified relative displacement to the current position; otherwise, " -"edit the current absolute position directly" -msgstr "" -"Ajoute le déplacement relatif spécifié à la position courante; sinon, " -"modifie directement la position absolue courante" +msgid "Add the specified relative displacement to the current position; otherwise, edit the current absolute position directly" +msgstr "Ajoute le déplacement relatif spécifié à la position courante; sinon, modifie directement la position absolue courante" #: ../src/ui/dialog/transformation.cpp:96 msgid "_Scale proportionally" @@ -22650,24 +20419,16 @@ msgid "Apply to each _object separately" msgstr "Appliquer à chaque _objet séparément" #: ../src/ui/dialog/transformation.cpp:97 -msgid "" -"Apply the scale/rotate/skew to each selected object separately; otherwise, " -"transform the selection as a whole" -msgstr "" -"Appliquer la transformation à chaque objet séparément; sinon, transformer la " -"sélection comme un tout" +msgid "Apply the scale/rotate/skew to each selected object separately; otherwise, transform the selection as a whole" +msgstr "Appliquer la transformation à chaque objet séparément; sinon, transformer la sélection comme un tout" #: ../src/ui/dialog/transformation.cpp:98 msgid "Edit c_urrent matrix" msgstr "Editer la matrice co_urante" #: ../src/ui/dialog/transformation.cpp:98 -msgid "" -"Edit the current transform= matrix; otherwise, post-multiply transform= by " -"this matrix" -msgstr "" -"Si coché, édite la matrice de la transformation courante; sinon, post-" -"multiplie la transformation courante par cette matrice." +msgid "Edit the current transform= matrix; otherwise, post-multiply transform= by this matrix" +msgstr "Si coché, édite la matrice de la transformation courante; sinon, post-multiplie la transformation courante par cette matrice." #: ../src/ui/dialog/transformation.cpp:111 msgid "_Scale" @@ -22701,12 +20462,8 @@ msgstr "Tourner dans le sens anti-horaire" msgid "Rotate in a clockwise direction" msgstr "Tourner dans le sens horaire" -#: ../src/ui/dialog/transformation.cpp:906 -#: ../src/ui/dialog/transformation.cpp:917 -#: ../src/ui/dialog/transformation.cpp:931 -#: ../src/ui/dialog/transformation.cpp:950 -#: ../src/ui/dialog/transformation.cpp:961 -#: ../src/ui/dialog/transformation.cpp:971 +#: ../src/ui/dialog/transformation.cpp:906 ../src/ui/dialog/transformation.cpp:917 ../src/ui/dialog/transformation.cpp:931 +#: ../src/ui/dialog/transformation.cpp:950 ../src/ui/dialog/transformation.cpp:961 ../src/ui/dialog/transformation.cpp:971 #: ../src/ui/dialog/transformation.cpp:995 msgid "Transform matrix is singular, not used." msgstr "" @@ -22731,13 +20488,11 @@ msgstr "Nouveau nœud texte" msgid "nodeAsInXMLdialogTooltip|Delete node" msgstr "Supprimer le nœud" -#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:138 -#: ../src/ui/dialog/xml-tree.cpp:985 +#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:138 ../src/ui/dialog/xml-tree.cpp:985 msgid "Duplicate node" msgstr "Dupliquer le nœud" -#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:199 -#: ../src/ui/dialog/xml-tree.cpp:1021 +#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:199 ../src/ui/dialog/xml-tree.cpp:1021 msgid "Delete attribute" msgstr "Supprimer l'attribut" @@ -22749,23 +20504,19 @@ msgstr "Définir" msgid "Drag to reorder nodes" msgstr "Cliquer-déplacer pour réorganiser les nœuds" -#: ../src/ui/dialog/xml-tree.cpp:154 ../src/ui/dialog/xml-tree.cpp:155 -#: ../src/ui/dialog/xml-tree.cpp:1143 +#: ../src/ui/dialog/xml-tree.cpp:154 ../src/ui/dialog/xml-tree.cpp:155 ../src/ui/dialog/xml-tree.cpp:1143 msgid "Unindent node" msgstr "Désindenter le nœud" -#: ../src/ui/dialog/xml-tree.cpp:161 ../src/ui/dialog/xml-tree.cpp:162 -#: ../src/ui/dialog/xml-tree.cpp:1121 +#: ../src/ui/dialog/xml-tree.cpp:161 ../src/ui/dialog/xml-tree.cpp:162 ../src/ui/dialog/xml-tree.cpp:1121 msgid "Indent node" msgstr "Indenter le nœud" -#: ../src/ui/dialog/xml-tree.cpp:168 ../src/ui/dialog/xml-tree.cpp:169 -#: ../src/ui/dialog/xml-tree.cpp:1072 +#: ../src/ui/dialog/xml-tree.cpp:168 ../src/ui/dialog/xml-tree.cpp:169 ../src/ui/dialog/xml-tree.cpp:1072 msgid "Raise node" msgstr "Monter le nœud" -#: ../src/ui/dialog/xml-tree.cpp:175 ../src/ui/dialog/xml-tree.cpp:176 -#: ../src/ui/dialog/xml-tree.cpp:1090 +#: ../src/ui/dialog/xml-tree.cpp:175 ../src/ui/dialog/xml-tree.cpp:176 ../src/ui/dialog/xml-tree.cpp:1090 msgid "Lower node" msgstr "Descendre le nœud" @@ -22779,9 +20530,7 @@ msgstr "Valeur de l'attribut" #: ../src/ui/dialog/xml-tree.cpp:319 msgid "Click to select nodes, drag to rearrange." -msgstr "" -"Cliquer pour sélectionner des nœuds, cliquer-déplacer pour les " -"déplacer." +msgstr "Cliquer pour sélectionner des nœuds, cliquer-déplacer pour les déplacer." #: ../src/ui/dialog/xml-tree.cpp:330 msgid "Click attribute to edit." @@ -22789,12 +20538,8 @@ msgstr "Cliquer sur les attributs pour pouvoir les éditer." #: ../src/ui/dialog/xml-tree.cpp:334 #, c-format -msgid "" -"Attribute %s selected. Press Ctrl+Enter when done editing to " -"commit changes." -msgstr "" -"Attribut %s sélectionné. Appuyer sur Ctrl+Enter après édition " -"pour valider." +msgid "Attribute %s selected. Press Ctrl+Enter when done editing to commit changes." +msgstr "Attribut %s sélectionné. Appuyer sur Ctrl+Enter après édition pour valider." #: ../src/ui/dialog/xml-tree.cpp:574 msgid "Drag XML subtree" @@ -22860,8 +20605,7 @@ msgstr "Verbe « %s » inconnu" msgid "Open _Recent" msgstr "Documents _récents" -#: ../src/ui/interface.cpp:1005 ../src/ui/interface.cpp:1091 -#: ../src/ui/interface.cpp:1194 ../src/ui/widget/selected-style.cpp:544 +#: ../src/ui/interface.cpp:1005 ../src/ui/interface.cpp:1091 ../src/ui/interface.cpp:1194 ../src/ui/widget/selected-style.cpp:544 msgid "Drop color" msgstr "Déposer la couleur" @@ -22888,8 +20632,7 @@ msgstr "Déposer une image bitmap" #: ../src/ui/interface.cpp:1382 #, c-format msgid "" -"A file named \"%s\" already exists. Do " -"you want to replace it?\n" +"A file named \"%s\" already exists. Do you want to replace it?\n" "\n" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" @@ -22898,8 +20641,7 @@ msgstr "" "\n" "Le fichier existe déjà dans « %s ». Le remplacer écrase son contenu." -#: ../src/ui/interface.cpp:1389 ../share/extensions/web-set-att.inx.h:21 -#: ../share/extensions/web-transmit-att.inx.h:19 +#: ../src/ui/interface.cpp:1389 ../share/extensions/web-set-att.inx.h:21 ../share/extensions/web-transmit-att.inx.h:19 msgid "Replace" msgstr "Remplacer" @@ -23033,7 +20775,7 @@ msgstr "Vec_toriser le bitmap..." #. Trace Pixel Art #: ../src/ui/interface.cpp:1993 msgid "Trace Pixel Art" -msgstr "Vectoriser en Pixel Art" +msgstr "Vectoriser du pixel art" #: ../src/ui/interface.cpp:2003 msgctxt "Context menu" @@ -23047,8 +20789,7 @@ msgstr "Extraire une image..." #. Item dialog #. Fill and Stroke dialog -#: ../src/ui/interface.cpp:2158 ../src/ui/interface.cpp:2178 -#: ../src/verbs.cpp:2864 +#: ../src/ui/interface.cpp:2158 ../src/ui/interface.cpp:2178 ../src/verbs.cpp:2864 msgid "_Fill and Stroke..." msgstr "_Remplissage et contour..." @@ -23063,49 +20804,30 @@ msgid "Check Spellin_g..." msgstr "Vérification ortho_graphique..." #: ../src/ui/object-edit.cpp:450 -msgid "" -"Adjust the horizontal rounding radius; with Ctrl to make the " -"vertical radius the same" -msgstr "" -"Ajuster le rayon d'arrondi horizontal; Ctrl que le rayon " -"vertical soit identique" +msgid "Adjust the horizontal rounding radius; with Ctrl to make the vertical radius the same" +msgstr "Ajuster le rayon d'arrondi horizontal; Ctrl que le rayon vertical soit identique" #: ../src/ui/object-edit.cpp:455 -msgid "" -"Adjust the vertical rounding radius; with Ctrl to make the " -"horizontal radius the same" -msgstr "" -"Ajuster le rayon d'arrondi vertical; Ctrl pour que le rayon " -"horizontal soit identique" +msgid "Adjust the vertical rounding radius; with Ctrl to make the horizontal radius the same" +msgstr "Ajuster le rayon d'arrondi vertical; Ctrl pour que le rayon horizontal soit identique" #: ../src/ui/object-edit.cpp:460 ../src/ui/object-edit.cpp:465 -msgid "" -"Adjust the width and height of the rectangle; with Ctrl to " -"lock ratio or stretch in one dimension only" +msgid "Adjust the width and height of the rectangle; with Ctrl to lock ratio or stretch in one dimension only" msgstr "" -"Ajuster la hauteur et la largeur du rectangle ; Ctrl " -"pour verrouiller le rapport des dimensions ou incliner dans une seule " -"dimension" +"Ajuster la hauteur et la largeur du rectangle ; Ctrl pour verrouiller le rapport des dimensions ou incliner dans une " +"seule dimension" -#: ../src/ui/object-edit.cpp:712 ../src/ui/object-edit.cpp:716 -#: ../src/ui/object-edit.cpp:720 ../src/ui/object-edit.cpp:724 -msgid "" -"Resize box in X/Y direction; with Shift along the Z axis; with " -"Ctrl to constrain to the directions of edges or diagonals" +#: ../src/ui/object-edit.cpp:712 ../src/ui/object-edit.cpp:716 ../src/ui/object-edit.cpp:720 ../src/ui/object-edit.cpp:724 +msgid "Resize box in X/Y direction; with Shift along the Z axis; with Ctrl to constrain to the directions of edges or diagonals" msgstr "" -"Redimensionner la boîte suivant les axes X/Y. Avec Shift, suivant " -"l'axe Z; avec Ctrl pour préserver les directions des arêtes ou des " -"diagonales." +"Redimensionner la boîte suivant les axes X/Y. Avec Shift, suivant l'axe Z; avec Ctrl pour préserver les directions des arêtes ou " +"des diagonales." -#: ../src/ui/object-edit.cpp:728 ../src/ui/object-edit.cpp:732 -#: ../src/ui/object-edit.cpp:736 ../src/ui/object-edit.cpp:740 -msgid "" -"Resize box along the Z axis; with Shift in X/Y direction; with " -"Ctrl to constrain to the directions of edges or diagonals" +#: ../src/ui/object-edit.cpp:728 ../src/ui/object-edit.cpp:732 ../src/ui/object-edit.cpp:736 ../src/ui/object-edit.cpp:740 +msgid "Resize box along the Z axis; with Shift in X/Y direction; with Ctrl to constrain to the directions of edges or diagonals" msgstr "" -"Redimensionner la boîte suivant l'axe Z. Avec Shift, suivant les axes " -"X/Y; avec Ctrl pour préserver les directions des arêtes ou des " -"diagonales." +"Redimensionner la boîte suivant l'axe Z. Avec Shift, suivant les axes X/Y; avec Ctrl pour préserver les directions des arêtes ou " +"des diagonales." #: ../src/ui/object-edit.cpp:744 msgid "Move the box in perspective" @@ -23113,68 +20835,51 @@ msgstr "Déplacer la boîte en perspective." #: ../src/ui/object-edit.cpp:983 msgid "Adjust ellipse width, with Ctrl to make circle" -msgstr "" -"Ajuster la largeur de l'ellipse; Ctrl pour en faire un cercle" +msgstr "Ajuster la largeur de l'ellipse; Ctrl pour en faire un cercle" #: ../src/ui/object-edit.cpp:987 msgid "Adjust ellipse height, with Ctrl to make circle" -msgstr "" -"Ajuster la hauteur de l'ellipse; Ctrl pour en faire un cercle" +msgstr "Ajuster la hauteur de l'ellipse; Ctrl pour en faire un cercle" #: ../src/ui/object-edit.cpp:991 msgid "" -"Position the start point of the arc or segment; with Ctrl to " -"snap angle; drag inside the ellipse for arc, outside for " -"segment" +"Position the start point of the arc or segment; with Ctrl to snap angle; drag inside the ellipse for arc, outside " +"for segment" msgstr "" -"Positionner le point de départ de l'arc ou du camembert ; Ctrl " -"pour tourner par incréments ; déplacer vers l'intérieur de l'ellipse " -"pour un arc, vers l'extérieur pour un camembert" +"Positionner le point de départ de l'arc ou du camembert ; Ctrl pour tourner par incréments ; déplacer vers l'intérieur de " +"l'ellipse pour un arc, vers l'extérieur pour un camembert" #: ../src/ui/object-edit.cpp:996 msgid "" -"Position the end point of the arc or segment; with Ctrl to " -"snap angle; drag inside the ellipse for arc, outside for " -"segment" +"Position the end point of the arc or segment; with Ctrl to snap angle; drag inside the ellipse for arc, outside " +"for segment" msgstr "" -"Positionner le point final de l'arc ou du camembert; Ctrl pour " -"tourner par incréments; déplacer vers l'intérieur de l'ellipse pour " -"un arc, vers l'extérieur pour un camembert" +"Positionner le point final de l'arc ou du camembert; Ctrl pour tourner par incréments; déplacer vers l'intérieur de " +"l'ellipse pour un arc, vers l'extérieur pour un camembert" #: ../src/ui/object-edit.cpp:1142 -msgid "" -"Adjust the tip radius of the star or polygon; with Shift to " -"round; with Alt to randomize" -msgstr "" -"Ajuster le rayon des sommets de l'étoile ou du polygone; Maj " -"pour arrondir; Alt pour rendre aléatoire" +msgid "Adjust the tip radius of the star or polygon; with Shift to round; with Alt to randomize" +msgstr "Ajuster le rayon des sommets de l'étoile ou du polygone; Maj pour arrondir; Alt pour rendre aléatoire" #: ../src/ui/object-edit.cpp:1150 msgid "" -"Adjust the base radius of the star; with Ctrl to keep star " -"rays radial (no skew); with Shift to round; with Alt to " +"Adjust the base radius of the star; with Ctrl to keep star rays radial (no skew); with Shift to round; with Alt to " "randomize" msgstr "" -"Ajuster le rayon de base de l'étoile; Ctrl pour garder " -"l'étoile parfaitement radiale (pas d'inclinaison); Maj pour arrondir; " -"Alt pour rendre aléatoire" +"Ajuster le rayon de base de l'étoile; Ctrl pour garder l'étoile parfaitement radiale (pas d'inclinaison); Maj pour " +"arrondir; Alt pour rendre aléatoire" #: ../src/ui/object-edit.cpp:1345 -msgid "" -"Roll/unroll the spiral from inside; with Ctrl to snap angle; " -"with Alt to converge/diverge" +msgid "Roll/unroll the spiral from inside; with Ctrl to snap angle; with Alt to converge/diverge" msgstr "" -"Enrouler/dérouler la spirale depuis l'intérieur; Ctrl pour " -"tourner par incréments; Alt pour la faire converger/diverger" +"Enrouler/dérouler la spirale depuis l'intérieur; Ctrl pour tourner par incréments; Alt pour la faire converger/diverger" #: ../src/ui/object-edit.cpp:1349 msgid "" -"Roll/unroll the spiral from outside; with Ctrl to snap angle; " -"with Shift to scale/rotate; with Alt to lock radius" +"Roll/unroll the spiral from outside; with Ctrl to snap angle; with Shift to scale/rotate; with Alt to lock radius" msgstr "" -"Enrouler/dérouler la spirale depuis l'extérieur ; Ctrl pour " -"tourner par incréments ; Maj pour redimensionner/ tourner ; Alt pour verrouiller le rayon" +"Enrouler/dérouler la spirale depuis l'extérieur ; Ctrl pour tourner par incréments ; Maj pour redimensionner/ tourner ; " +"Alt pour verrouiller le rayon" #: ../src/ui/object-edit.cpp:1398 msgid "Adjust the offset distance" @@ -23207,33 +20912,24 @@ msgstr "Ctrl+Alt : cliquer pour insérer un nœud" #: ../src/ui/tool/curve-drag-point.cpp:204 #, fuzzy msgctxt "Path segment tip" -msgid "" -"BSpline segment: drag to shape the segment, doubleclick to insert " -"node, click to select (more: Shift, Ctrl+Alt)" +msgid "BSpline segment: drag to shape the segment, doubleclick to insert node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segment de Bézier : cliquer-déplacer pour modeler le segment, double-" -"cliquer pour insérer un nœud, cliquer pour sélectionner (modificateurs : " -"Maj, Ctrl+Alt)" +"Segment de Bézier : cliquer-déplacer pour modeler le segment, double-cliquer pour insérer un nœud, cliquer pour sélectionner " +"(modificateurs : Maj, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:209 msgctxt "Path segment tip" -msgid "" -"Linear segment: drag to convert to a Bezier segment, doubleclick to " -"insert node, click to select (more: Shift, Ctrl+Alt)" +msgid "Linear segment: drag to convert to a Bezier segment, doubleclick to insert node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segment linéaire : cliquer-déplacer pour convertir en segment de " -"Bézier, double-cliquer pour insérer un nœud, cliquer pour sélectionner " +"Segment linéaire : cliquer-déplacer pour convertir en segment de Bézier, double-cliquer pour insérer un nœud, cliquer pour sélectionner " "(modificateurs : Maj, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:213 msgctxt "Path segment tip" -msgid "" -"Bezier segment: drag to shape the segment, doubleclick to insert " -"node, click to select (more: Shift, Ctrl+Alt)" +msgid "Bezier segment: drag to shape the segment, doubleclick to insert node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Segment de Bézier : cliquer-déplacer pour modeler le segment, double-" -"cliquer pour insérer un nœud, cliquer pour sélectionner (modificateurs : " -"Maj, Ctrl+Alt)" +"Segment de Bézier : cliquer-déplacer pour modeler le segment, double-cliquer pour insérer un nœud, cliquer pour sélectionner " +"(modificateurs : Maj, Ctrl+Alt)" #: ../src/ui/tool/multi-path-manipulator.cpp:315 msgid "Retract handles" @@ -23251,8 +20947,7 @@ msgstr "Rendre les segments droits" msgid "Make segments curves" msgstr "Rendre courbes les segments sélectionnés" -#: ../src/ui/tool/multi-path-manipulator.cpp:333 -#: ../src/ui/tool/multi-path-manipulator.cpp:347 +#: ../src/ui/tool/multi-path-manipulator.cpp:333 ../src/ui/tool/multi-path-manipulator.cpp:347 msgid "Add nodes" msgstr "Ajouter des nœuds" @@ -23264,13 +20959,11 @@ msgstr "Ajouter des nœuds aux extrémités" msgid "Duplicate nodes" msgstr "Dupliquer les nœuds" -#: ../src/ui/tool/multi-path-manipulator.cpp:417 -#: ../src/widgets/node-toolbar.cpp:408 +#: ../src/ui/tool/multi-path-manipulator.cpp:417 ../src/widgets/node-toolbar.cpp:408 msgid "Join nodes" msgstr "Joindre les nœuds" -#: ../src/ui/tool/multi-path-manipulator.cpp:424 -#: ../src/widgets/node-toolbar.cpp:419 +#: ../src/ui/tool/multi-path-manipulator.cpp:424 ../src/widgets/node-toolbar.cpp:419 msgid "Break nodes" msgstr "Séparer les nœuds" @@ -23290,8 +20983,7 @@ msgstr "Déplacer les nœuds horizontalement" msgid "Move nodes vertically" msgstr "Déplacer les nœuds verticalement" -#: ../src/ui/tool/multi-path-manipulator.cpp:795 -#: ../src/ui/tool/multi-path-manipulator.cpp:801 +#: ../src/ui/tool/multi-path-manipulator.cpp:795 ../src/ui/tool/multi-path-manipulator.cpp:801 msgid "Scale nodes uniformly" msgstr "Redimensionner les nœuds uniformément" @@ -23358,28 +21050,19 @@ msgstr "modificateurs : Ctrl, Alt" #: ../src/ui/tool/node.cpp:504 #, c-format msgctxt "Path handle tip" -msgid "" -"Shift+Ctrl+Alt: preserve length and snap rotation angle to %g° " -"increments while rotating both handles" -msgstr "" -"Maj+Ctrl+Alt : préserver la longueur et forcer l'incrément de l'angle " -"de rotation à %g ° lorsque les deux poignées sont tournées" +msgid "Shift+Ctrl+Alt: preserve length and snap rotation angle to %g° increments while rotating both handles" +msgstr "Maj+Ctrl+Alt : préserver la longueur et forcer l'incrément de l'angle de rotation à %g ° lorsque les deux poignées sont tournées" #: ../src/ui/tool/node.cpp:509 #, c-format msgctxt "Path handle tip" -msgid "" -"Ctrl+Alt: preserve length and snap rotation angle to %g° increments" -msgstr "" -"Ctrl+Alt : préserver la longueur et forcer l'incrément de l'angle de " -"rotation à %g °" +msgid "Ctrl+Alt: preserve length and snap rotation angle to %g° increments" +msgstr "Ctrl+Alt : préserver la longueur et forcer l'incrément de l'angle de rotation à %g °" #: ../src/ui/tool/node.cpp:515 msgctxt "Path handle tip" msgid "Shift+Alt: preserve handle length and rotate both handles" -msgstr "" -"Maj+Alt : préserver la longueur des poignées et tourner les deux " -"poignées" +msgstr "Maj+Alt : préserver la longueur des poignées et tourner les deux poignées" #: ../src/ui/tool/node.cpp:518 msgctxt "Path handle tip" @@ -23389,12 +21072,8 @@ msgstr "Alt : préserver la longueur des poignées lors des déplacement #: ../src/ui/tool/node.cpp:525 #, c-format msgctxt "Path handle tip" -msgid "" -"Shift+Ctrl: snap rotation angle to %g° increments and rotate both " -"handles" -msgstr "" -"Maj+Ctrl : forcer l'incrément de l'angle de rotation à %g ° et " -"tourner les deux poignées" +msgid "Shift+Ctrl: snap rotation angle to %g° increments and rotate both handles" +msgstr "Maj+Ctrl : forcer l'incrément de l'angle de rotation à %g ° et tourner les deux poignées" #: ../src/ui/tool/node.cpp:529 msgctxt "Path handle tip" @@ -23405,9 +21084,7 @@ msgstr "" #, c-format msgctxt "Path handle tip" msgid "Ctrl: snap rotation angle to %g° increments, click to retract" -msgstr "" -"Ctrl : forcer l'incrément de l'angle de rotation à %g °, cliquer pour " -"rétracter" +msgstr "Ctrl : forcer l'incrément de l'angle de rotation à %g °, cliquer pour rétracter" #: ../src/ui/tool/node.cpp:537 msgctxt "Path hande tip" @@ -23424,19 +21101,13 @@ msgstr "Déplacer les poignées de nœuds" #, c-format msgctxt "Path handle tip" msgid "Auto node handle: drag to convert to smooth node (%s)" -msgstr "" -"Poignées de nœud automatique : cliquer-déplacer pour convertir en " -"nœud doux (%s)" +msgstr "Poignées de nœud automatique : cliquer-déplacer pour convertir en nœud doux (%s)" #: ../src/ui/tool/node.cpp:554 #, fuzzy, c-format msgctxt "Path handle tip" -msgid "" -"BSpline node handle: Shift to drag, double click to reset (%s). %g " -"power" -msgstr "" -"Poignées de nœud automatique : cliquer-déplacer pour convertir en " -"nœud doux (%s)" +msgid "BSpline node handle: Shift to drag, double click to reset (%s). %g power" +msgstr "Poignées de nœud automatique : cliquer-déplacer pour convertir en nœud doux (%s)" #: ../src/ui/tool/node.cpp:574 #, c-format @@ -23447,9 +21118,7 @@ msgstr "Déplacement des poignées de %s, %s; angle %.2f°, longueur %s" #: ../src/ui/tool/node.cpp:1425 msgctxt "Path node tip" msgid "Shift: drag out a handle, click to toggle selection" -msgstr "" -"Maj : cliquer-déplacer pour étirer une poignée, cliquer pour inverser " -"l'état de sélection" +msgstr "Maj : cliquer-déplacer pour étirer une poignée, cliquer pour inverser l'état de sélection" #: ../src/ui/tool/node.cpp:1427 msgctxt "Path node tip" @@ -23459,15 +21128,12 @@ msgstr "Maj : cliquer pour inverser l'état de sélection" #: ../src/ui/tool/node.cpp:1432 msgctxt "Path node tip" msgid "Ctrl+Alt: move along handle lines, click to delete node" -msgstr "" -"Ctrl+Alt : déplacer le long des lignes des poignées, cliquer pour " -"effacer le nœud" +msgstr "Ctrl+Alt : déplacer le long des lignes des poignées, cliquer pour effacer le nœud" #: ../src/ui/tool/node.cpp:1435 msgctxt "Path node tip" msgid "Ctrl: move along axes, click to change node type" -msgstr "" -"Ctrl : déplacer le long des axes, cliquer pour changer de type de nœud" +msgstr "Ctrl : déplacer le long des axes, cliquer pour changer de type de nœud" #: ../src/ui/tool/node.cpp:1439 msgctxt "Path node tip" @@ -23478,50 +21144,33 @@ msgstr "Alt : sculpter les nœuds" #, c-format msgctxt "Path node tip" msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" -msgstr "" -"%s : cliquer-déplacer pour modeler le chemin (modificateurs : Maj, " -"Ctrl, Alt)" +msgstr "%s : cliquer-déplacer pour modeler le chemin (modificateurs : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1451 #, fuzzy, c-format msgctxt "Path node tip" -msgid "" -"BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " -"power" -msgstr "" -"%s : cliquer-déplacer pour modeler le chemin (modificateurs : Maj, " -"Ctrl, Alt)" +msgid "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g power" +msgstr "%s : cliquer-déplacer pour modeler le chemin (modificateurs : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1454 #, c-format msgctxt "Path node tip" -msgid "" -"%s: drag to shape the path, click to toggle scale/rotation handles " -"(more: Shift, Ctrl, Alt)" +msgid "%s: drag to shape the path, click to toggle scale/rotation handles (more: Shift, Ctrl, Alt)" msgstr "" -"%s : cliquer-déplacer pour modeler le chemin, cliquer pour basculer " -"entre les poignées de sélection et de rotation (modificateurs : Maj, Ctrl, " -"Alt)" +"%s : cliquer-déplacer pour modeler le chemin, cliquer pour basculer entre les poignées de sélection et de rotation (modificateurs : " +"Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1458 #, c-format msgctxt "Path node tip" -msgid "" -"%s: drag to shape the path, click to select only this node (more: " -"Shift, Ctrl, Alt)" -msgstr "" -"%s : cliquer-déplacer pour modeler le chemin, cliquer pour " -"sélectionner seulement ce nœud (modificateurs : Maj, Ctrl, Alt)" +msgid "%s: drag to shape the path, click to select only this node (more: Shift, Ctrl, Alt)" +msgstr "%s : cliquer-déplacer pour modeler le chemin, cliquer pour sélectionner seulement ce nœud (modificateurs : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1461 #, fuzzy, c-format msgctxt "Path node tip" -msgid "" -"BSpline node: drag to shape the path, click to select only this node " -"(more: Shift, Ctrl, Alt). %g power" -msgstr "" -"%s : cliquer-déplacer pour modeler le chemin, cliquer pour " -"sélectionner seulement ce nœud (modificateurs : Maj, Ctrl, Alt)" +msgid "BSpline node: drag to shape the path, click to select only this node (more: Shift, Ctrl, Alt). %g power" +msgstr "%s : cliquer-déplacer pour modeler le chemin, cliquer pour sélectionner seulement ce nœud (modificateurs : Maj, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -23550,8 +21199,7 @@ msgid "Rotate handle" msgstr "Faire tourner la poignée" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1555 -#: ../src/widgets/node-toolbar.cpp:397 +#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Supprimer le nœud" @@ -23570,8 +21218,7 @@ msgstr "Retracter la poignée" #: ../src/ui/tool/transform-handle-set.cpp:203 msgctxt "Transform handle tip" msgid "Shift+Ctrl: scale uniformly about the rotation center" -msgstr "" -"Maj+Ctrl : redimensionne uniformément autour du centre de rotation" +msgstr "Maj+Ctrl : redimensionne uniformément autour du centre de rotation" #: ../src/ui/tool/transform-handle-set.cpp:205 msgctxt "Transform handle tip" @@ -23580,11 +21227,8 @@ msgstr "Ctrl : redimensionner uniformément" #: ../src/ui/tool/transform-handle-set.cpp:210 msgctxt "Transform handle tip" -msgid "" -"Shift+Alt: scale using an integer ratio about the rotation center" -msgstr "" -"Maj+Alt : redimensionne conformément à un rapport entier autour du " -"centre de rotation" +msgid "Shift+Alt: scale using an integer ratio about the rotation center" +msgstr "Maj+Alt : redimensionne conformément à un rapport entier autour du centre de rotation" #: ../src/ui/tool/transform-handle-set.cpp:212 msgctxt "Transform handle tip" @@ -23599,9 +21243,7 @@ msgstr "Alt : redimensionne conformément à un rapport entier" #: ../src/ui/tool/transform-handle-set.cpp:217 msgctxt "Transform handle tip" msgid "Scale handle: drag to scale the selection" -msgstr "" -"Poignée de redimensionnement : cliquer-déplacer pour redimensionner " -"la sélection" +msgstr "Poignée de redimensionnement : cliquer-déplacer pour redimensionner la sélection" #: ../src/ui/tool/transform-handle-set.cpp:222 #, c-format @@ -23612,9 +21254,7 @@ msgstr "Redimensionnement de %.2f%% x %.2f%%" #: ../src/ui/tool/transform-handle-set.cpp:449 #, c-format msgctxt "Transform handle tip" -msgid "" -"Shift+Ctrl: rotate around the opposite corner and snap angle to %f° " -"increments" +msgid "Shift+Ctrl: rotate around the opposite corner and snap angle to %f° increments" msgstr "Maj+Ctrl : tourne autour du coin opposé par incréments de %f °" #: ../src/ui/tool/transform-handle-set.cpp:452 @@ -23630,12 +21270,8 @@ msgstr "Ctrl : tourner par incréments de %f °" #: ../src/ui/tool/transform-handle-set.cpp:458 msgctxt "Transform handle tip" -msgid "" -"Rotation handle: drag to rotate the selection around the rotation " -"center" -msgstr "" -"Poignée de rotation : cliquer-déplacer pour faire tourner la " -"sélection autour du centre de rotation" +msgid "Rotation handle: drag to rotate the selection around the rotation center" +msgstr "Poignée de rotation : cliquer-déplacer pour faire tourner la sélection autour du centre de rotation" #. event #: ../src/ui/tool/transform-handle-set.cpp:463 @@ -23647,12 +21283,8 @@ msgstr "Rotation de %.2f °" #: ../src/ui/tool/transform-handle-set.cpp:588 #, c-format msgctxt "Transform handle tip" -msgid "" -"Shift+Ctrl: skew about the rotation center with snapping to %f° " -"increments" -msgstr "" -"Maj+Ctrl : incliner par rapport au centre de rotation par incréments " -"de %f °" +msgid "Shift+Ctrl: skew about the rotation center with snapping to %f° increments" +msgstr "Maj+Ctrl : incliner par rapport au centre de rotation par incréments de %f °" #: ../src/ui/tool/transform-handle-set.cpp:591 msgctxt "Transform handle tip" @@ -23667,11 +21299,8 @@ msgstr "Ctrl : incliner par incréments de %f °" #: ../src/ui/tool/transform-handle-set.cpp:598 msgctxt "Transform handle tip" -msgid "" -"Skew handle: drag to skew (shear) selection about the opposite handle" -msgstr "" -"Poignée d'inclinaison : cliquer-déplacer pour incliner la sélection " -"par rapport à la poignée opposée" +msgid "Skew handle: drag to skew (shear) selection about the opposite handle" +msgstr "Poignée d'inclinaison : cliquer-déplacer pour incliner la sélection par rapport à la poignée opposée" #: ../src/ui/tool/transform-handle-set.cpp:604 #, c-format @@ -23688,17 +21317,11 @@ msgstr "Incline verticalement de %.2f °" #: ../src/ui/tool/transform-handle-set.cpp:666 msgctxt "Transform handle tip" msgid "Rotation center: drag to change the origin of transforms" -msgstr "" -"Centre de rotation : cliquer-déplacer pour modifier l'origine des " -"transformations" +msgstr "Centre de rotation : cliquer-déplacer pour modifier l'origine des transformations" #: ../src/ui/tools-switch.cpp:95 -msgid "" -"Click to Select and Transform objects, Drag to select many " -"objects." -msgstr "" -"Cliquer pour sélectionner et transformer des objets, cliquer-" -"déplacer pour sélectionner plusieurs objets." +msgid "Click to Select and Transform objects, Drag to select many objects." +msgstr "Cliquer pour sélectionner et transformer des objets, cliquer-déplacer pour sélectionner plusieurs objets." #: ../src/ui/tools-switch.cpp:96 msgid "Modify selected path points (nodes) directly." @@ -23706,119 +21329,81 @@ msgstr "Modifier les points du chemin (nœuds) sélectionnés directement." #: ../src/ui/tools-switch.cpp:97 msgid "To tweak a path by pushing, select it and drag over it." -msgstr "" -"Pour perturber un chemin en le poussant, sélectionnez-le et faites glisser " -"la souris dessus." +msgstr "Pour perturber un chemin en le poussant, sélectionnez-le et faites glisser la souris dessus." #: ../src/ui/tools-switch.cpp:98 -msgid "" -"Drag, click or click and scroll to spray the selected " -"objects." -msgstr "" -"Cliquer-déplacer, cliquer ou défiler pour pulvériser " -"les objets sélectionnés." +msgid "Drag, click or click and scroll to spray the selected objects." +msgstr "Cliquer-déplacer, cliquer ou défiler pour pulvériser les objets sélectionnés." #: ../src/ui/tools-switch.cpp:99 -msgid "" -"Drag to create a rectangle. Drag controls to round corners and " -"resize. Click to select." -msgstr "" -"Cliquer-déplacer pour créer un rectangle. Déplacer les poignées pour arrondir les coins. Cliquer pour sélectionner." +msgid "Drag to create a rectangle. Drag controls to round corners and resize. Click to select." +msgstr "Cliquer-déplacer pour créer un rectangle. Déplacer les poignées pour arrondir les coins. Cliquer pour sélectionner." #: ../src/ui/tools-switch.cpp:100 msgid "" -"Drag to create a 3D box. Drag controls to resize in " -"perspective. Click to select (with Ctrl+Alt for single faces)." +"Drag to create a 3D box. Drag controls to resize in perspective. Click to select (with Ctrl+Alt for single faces)." msgstr "" -"Cliquer-déplacer pour créer une boîte 3D. Déplacer les poignées pour redimensionner en perspective. Cliquer pour sélectionner " -"(avec Ctrl+Alt pour sélectionner les faces)." +"Cliquer-déplacer pour créer une boîte 3D. Déplacer les poignées pour redimensionner en perspective. Cliquer pour " +"sélectionner (avec Ctrl+Alt pour sélectionner les faces)." #: ../src/ui/tools-switch.cpp:101 -msgid "" -"Drag to create an ellipse. Drag controls to make an arc or " -"segment. Click to select." +msgid "Drag to create an ellipse. Drag controls to make an arc or segment. Click to select." msgstr "" -"Cliquer-déplacer pour créer une ellipse. Déplacer les poignées " -"pour faire des arcs ou des camemberts. Cliquer pour sélectionner." +"Cliquer-déplacer pour créer une ellipse. Déplacer les poignées pour faire des arcs ou des camemberts. Cliquer pour " +"sélectionner." #: ../src/ui/tools-switch.cpp:102 -msgid "" -"Drag to create a star. Drag controls to edit the star shape. " -"Click to select." +msgid "Drag to create a star. Drag controls to edit the star shape. Click to select." msgstr "" -"Cliquer-déplacer pour créer une étoile. Déplacer les poignées " -"pour éditer la forme de l'étoile. Cliquer pour sélectionner." +"Cliquer-déplacer pour créer une étoile. Déplacer les poignées pour éditer la forme de l'étoile. Cliquer pour sélectionner." #: ../src/ui/tools-switch.cpp:103 -msgid "" -"Drag to create a spiral. Drag controls to edit the spiral " -"shape. Click to select." +msgid "Drag to create a spiral. Drag controls to edit the spiral shape. Click to select." msgstr "" -"Cliquer-déplacer pour créer une spirale. Déplacer les poignées " -"pour modifier la forme de la spirale. Cliquer pour sélectionner." +"Cliquer-déplacer pour créer une spirale. Déplacer les poignées pour modifier la forme de la spirale. Cliquer pour " +"sélectionner." #: ../src/ui/tools-switch.cpp:104 -msgid "" -"Drag to create a freehand line. Shift appends to selected " -"path, Alt activates sketch mode." +msgid "Drag to create a freehand line. Shift appends to selected path, Alt activates sketch mode." msgstr "" -"Cliquer-déplacer pour créer une ligne à main levée. Maj pour " -"l'ajouter au chemin sélectionné. Alt pour activer le mode croquis." +"Cliquer-déplacer pour créer une ligne à main levée. Maj pour l'ajouter au chemin sélectionné. Alt pour activer le mode " +"croquis." #: ../src/ui/tools-switch.cpp:105 msgid "" -"Click or click and drag to start a path; with Shift to " -"append to selected path. Ctrl+click to create single dots (straight " -"line modes only)." +"Click or click and drag to start a path; with Shift to append to selected path. Ctrl+click to create single dots " +"(straight line modes only)." msgstr "" -"Cliquer ou cliquer-déplacer pour commencer un chemin; Maj pour ajouter au chemin sélectionné; Ctrl+clic pour créer des " -"points isolés (avec les modes lignes droites)." +"Cliquer ou cliquer-déplacer pour commencer un chemin; Maj pour ajouter au chemin sélectionné; Ctrl+clic pour créer " +"des points isolés (avec les modes lignes droites)." #: ../src/ui/tools-switch.cpp:106 msgid "" -"Drag to draw a calligraphic stroke; with Ctrl to track a guide " -"path. Arrow keys adjust width (left/right) and angle (up/down)." +"Drag to draw a calligraphic stroke; with Ctrl to track a guide path. Arrow keys adjust width (left/right) and angle (up/" +"down)." msgstr "" -"Cliquer-déplacer pour calligraphier; Ctrl pour suivre un " -"guide. Les flèches gauche/droite ajustent la largeur de la " -"plume, haut/bas son angle." +"Cliquer-déplacer pour calligraphier; Ctrl pour suivre un guide. Les flèches gauche/droite ajustent la largeur de " +"la plume, haut/bas son angle." #: ../src/ui/tools-switch.cpp:107 ../src/ui/tools/text-tool.cpp:1583 -msgid "" -"Click to select or create text, drag to create flowed text; " -"then type." -msgstr "" -"Cliquer pour sélectionner ou créer un texte, cliquer-déplacer " -"pour créer un texte encadré; puis taper le texte." +msgid "Click to select or create text, drag to create flowed text; then type." +msgstr "Cliquer pour sélectionner ou créer un texte, cliquer-déplacer pour créer un texte encadré; puis taper le texte." #: ../src/ui/tools-switch.cpp:108 -msgid "" -"Drag or double click to create a gradient on selected objects, " -"drag handles to adjust gradients." +msgid "Drag or double click to create a gradient on selected objects, drag handles to adjust gradients." msgstr "" -"Cliquer-déplacer ou double-cliquer pour créer un dégradé sur " -"les objets sélectionnés, déplacer les poignées pour ajuster les " -"dégradés." +"Cliquer-déplacer ou double-cliquer pour créer un dégradé sur les objets sélectionnés, déplacer les poignées pour ajuster " +"les dégradés." #: ../src/ui/tools-switch.cpp:109 -msgid "" -"Drag or double click to create a mesh on selected objects, " -"drag handles to adjust meshes." +msgid "Drag or double click to create a mesh on selected objects, drag handles to adjust meshes." msgstr "" -"Cliquer-déplacer ou double-cliquer pour créer une toile sur " -"les objets sélectionnés, déplacer les poignées pour ajuster les " -"toiles." +"Cliquer-déplacer ou double-cliquer pour créer une toile sur les objets sélectionnés, déplacer les poignées pour ajuster " +"les toiles." #: ../src/ui/tools-switch.cpp:110 -msgid "" -"Click or drag around an area to zoom in, Shift+click to " -"zoom out." -msgstr "" -"Cliquer ou cliquer-déplacer sur une zone pour zoomer, Maj" -"+clic pour dézoomer." +msgid "Click or drag around an area to zoom in, Shift+click to zoom out." +msgstr "Cliquer ou cliquer-déplacer sur une zone pour zoomer, Maj+clic pour dézoomer." #: ../src/ui/tools-switch.cpp:111 msgid "Drag to measure the dimensions of objects." @@ -23826,15 +21411,12 @@ msgstr "Cliquer-glisser pour mesurer les dimensions des objets." #: ../src/ui/tools-switch.cpp:112 ../src/ui/tools/dropper-tool.cpp:274 msgid "" -"Click to set fill, Shift+click to set stroke; drag to " -"average color in area; with Alt to pick inverse color; Ctrl+C " -"to copy the color under mouse to clipboard" +"Click to set fill, Shift+click to set stroke; drag to average color in area; with Alt to pick inverse color; " +"Ctrl+C to copy the color under mouse to clipboard" msgstr "" -"Cliquer pour appliquer au remplissage, Maj+clic pour appliquer " -"au contour; cliquer-déplacer pour capturer la couleur moyenne sur une " -"zone; à combiner avec Alt pour capturer la couleur inverse; Ctrl" -"+C pour copier la couleur sous le curseur de la souris vers le presse-" -"papiers " +"Cliquer pour appliquer au remplissage, Maj+clic pour appliquer au contour; cliquer-déplacer pour capturer la couleur " +"moyenne sur une zone; à combiner avec Alt pour capturer la couleur inverse; Ctrl+C pour copier la couleur sous le curseur de la " +"souris vers le presse-papiers " #: ../src/ui/tools-switch.cpp:113 msgid "Click and drag between shapes to create a connector." @@ -23842,13 +21424,11 @@ msgstr "Cliquer et déplacer entre des formes pour créer un connecteur." #: ../src/ui/tools-switch.cpp:114 msgid "" -"Click to paint a bounded area, Shift+click to union the new " -"fill with the current selection, Ctrl+click to change the clicked " -"object's fill and stroke to the current setting." +"Click to paint a bounded area, Shift+click to union the new fill with the current selection, Ctrl+click to change the " +"clicked object's fill and stroke to the current setting." msgstr "" -"Cliquer pour remplir une région bornée. Maj+Clic pour faire " -"une union du remplissage avec la sélection courante, Ctrl+Clic pour " -"changer le trait et le remplissage de l'objet désigné" +"Cliquer pour remplir une région bornée. Maj+Clic pour faire une union du remplissage avec la sélection courante, Ctrl+Clic pour changer le trait et le remplissage de l'objet désigné" #: ../src/ui/tools-switch.cpp:115 msgid "Drag to erase." @@ -23859,11 +21439,8 @@ msgid "Choose a subtool from the toolbar" msgstr "Sélectionner un outil secondaire dans la barre d'outils" #: ../src/ui/tools/arc-tool.cpp:242 -msgid "" -"Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle" -msgstr "" -"Ctrl : dessiner des cercles ou des ellipses de ratio entier, forcer " -"la modification des angles des arcs/camemberts par incréments" +msgid "Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle" +msgstr "Ctrl : dessiner des cercles ou des ellipses de ratio entier, forcer la modification des angles des arcs/camemberts par incréments" #: ../src/ui/tools/arc-tool.cpp:243 ../src/ui/tools/rect-tool.cpp:278 msgid "Shift: draw around the starting point" @@ -23871,28 +21448,22 @@ msgstr "Maj : dessiner autour du point de départ" #: ../src/ui/tools/arc-tool.cpp:412 #, c-format -msgid "" -"Ellipse: %s × %s (constrained to ratio %d:%d); with Shift " -"to draw around the starting point" -msgstr "" -"Ellipse : %s × %s; (contrainte de ratio %d:%d); Maj pour " -"dessiner autour du point de départ" +msgid "Ellipse: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point" +msgstr "Ellipse : %s × %s; (contrainte de ratio %d:%d); Maj pour dessiner autour du point de départ" #: ../src/ui/tools/arc-tool.cpp:414 #, c-format msgid "" -"Ellipse: %s × %s; with Ctrl to make square or integer-" -"ratio ellipse; with Shift to draw around the starting point" +"Ellipse: %s × %s; with Ctrl to make square or integer-ratio ellipse; with Shift to draw around the starting point" msgstr "" -"Ellipse : %s × %s; Ctrl pour dessiner des cercles ou des " -"ellipses de ratio entier, Maj pour dessiner autour du point de départ" +"Ellipse : %s × %s; Ctrl pour dessiner des cercles ou des ellipses de ratio entier, Maj pour dessiner autour du point " +"de départ" #: ../src/ui/tools/arc-tool.cpp:437 msgid "Create ellipse" msgstr "Créer une ellipse" -#: ../src/ui/tools/box3d-tool.cpp:360 ../src/ui/tools/box3d-tool.cpp:367 -#: ../src/ui/tools/box3d-tool.cpp:374 ../src/ui/tools/box3d-tool.cpp:381 +#: ../src/ui/tools/box3d-tool.cpp:360 ../src/ui/tools/box3d-tool.cpp:367 ../src/ui/tools/box3d-tool.cpp:374 ../src/ui/tools/box3d-tool.cpp:381 #: ../src/ui/tools/box3d-tool.cpp:388 ../src/ui/tools/box3d-tool.cpp:395 msgid "Change perspective (angle of PLs)" msgstr "Changer la perspective (angle des LP)" @@ -23907,11 +21478,8 @@ msgid "Create 3D box" msgstr "Créer une boîte 3D" #: ../src/ui/tools/calligraphic-tool.cpp:525 -msgid "" -"Guide path selected; start drawing along the guide with Ctrl" -msgstr "" -"Guide sélectionné; commencer à dessiner le long du guide avec " -"Ctrl" +msgid "Guide path selected; start drawing along the guide with Ctrl" +msgstr "Guide sélectionné; commencer à dessiner le long du guide avec Ctrl" #: ../src/ui/tools/calligraphic-tool.cpp:527 msgid "Select a guide path to track with Ctrl" @@ -23955,21 +21523,17 @@ msgstr "Tracé du connecteur terminé" #: ../src/ui/tools/connector-tool.cpp:1181 msgid "Connector endpoint: drag to reroute or connect to new shapes" -msgstr "" -"Fin de connecteur : déplacer pour rerouter ou connecter à de " -"nouvelles formes" +msgstr "Fin de connecteur : déplacer pour rerouter ou connecter à de nouvelles formes" #: ../src/ui/tools/connector-tool.cpp:1324 msgid "Select at least one non-connector object." msgstr "Sélectionner au moins un objet non connecteur." -#: ../src/ui/tools/connector-tool.cpp:1329 -#: ../src/widgets/connector-toolbar.cpp:310 +#: ../src/ui/tools/connector-tool.cpp:1329 ../src/widgets/connector-toolbar.cpp:310 msgid "Make connectors avoid selected objects" msgstr "Faire que les connecteurs évitent les objets sélectionnés" -#: ../src/ui/tools/connector-tool.cpp:1330 -#: ../src/widgets/connector-toolbar.cpp:320 +#: ../src/ui/tools/connector-tool.cpp:1330 ../src/widgets/connector-toolbar.cpp:320 msgid "Make connectors ignore selected objects" msgstr "Faire que les connecteurs ignorent les objets sélectionnés" @@ -24037,14 +21601,10 @@ msgstr "Trop de contraction, le résultat est vide." #: ../src/ui/tools/flood-tool.cpp:456 #, c-format -msgid "" -"Area filled, path with %d node created and unioned with selection." -msgid_plural "" -"Area filled, path with %d nodes created and unioned with selection." -msgstr[0] "" -"Zone remplie, création d'un chemin de %d nœud, ajouté à la sélection." -msgstr[1] "" -"Zone remplie, création d'un chemin de %d nœuds, ajouté à la sélection." +msgid "Area filled, path with %d node created and unioned with selection." +msgid_plural "Area filled, path with %d nodes created and unioned with selection." +msgstr[0] "Zone remplie, création d'un chemin de %d nœud, ajouté à la sélection." +msgstr[1] "Zone remplie, création d'un chemin de %d nœuds, ajouté à la sélection." #: ../src/ui/tools/flood-tool.cpp:462 #, c-format @@ -24058,12 +21618,8 @@ msgid "Area is not bounded, cannot fill." msgstr "Zone non bornée, impossible de remplir." #: ../src/ui/tools/flood-tool.cpp:1045 -msgid "" -"Only the visible part of the bounded area was filled. If you want to " -"fill all of the area, undo, zoom out, and fill again." -msgstr "" -"Seule la partie visible de la zone a été remplie. Pour remplir toute " -"la zone, annulez, dézoomez et remplissez à nouveau." +msgid "Only the visible part of the bounded area was filled. If you want to fill all of the area, undo, zoom out, and fill again." +msgstr "Seule la partie visible de la zone a été remplie. Pour remplir toute la zone, annulez, dézoomez et remplissez à nouveau." #: ../src/ui/tools/flood-tool.cpp:1063 ../src/ui/tools/flood-tool.cpp:1214 msgid "Fill bounded area" @@ -24075,9 +21631,7 @@ msgstr "Appliquer un style à l'objet" #: ../src/ui/tools/flood-tool.cpp:1139 msgid "Draw over areas to add to fill, hold Alt for touch fill" -msgstr "" -"Dessiner au-dessus d'une zone pour la remplir, avec Alt pour " -"remplir au toucher" +msgstr "Dessiner au-dessus d'une zone pour la remplir, avec Alt pour remplir au toucher" #. We hit green anchor, closing Green-Blue-Red #: ../src/ui/tools/freehand-base.cpp:669 @@ -24116,9 +21670,8 @@ msgstr[0] " sur %d poignée de dégradé" msgstr[1] " sur %d poignées de dégradé" #. TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:124 ../src/ui/tools/gradient-tool.cpp:133 -#: ../src/ui/tools/gradient-tool.cpp:140 ../src/ui/tools/mesh-tool.cpp:123 -#: ../src/ui/tools/mesh-tool.cpp:134 ../src/ui/tools/mesh-tool.cpp:142 +#: ../src/ui/tools/gradient-tool.cpp:124 ../src/ui/tools/gradient-tool.cpp:133 ../src/ui/tools/gradient-tool.cpp:140 +#: ../src/ui/tools/mesh-tool.cpp:123 ../src/ui/tools/mesh-tool.cpp:134 ../src/ui/tools/mesh-tool.cpp:142 #, c-format msgid " on %d selected object" msgid_plural " on %d selected objects" @@ -24128,16 +21681,10 @@ msgstr[1] " dans %d objets sélectionnés" #. TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count) #: ../src/ui/tools/gradient-tool.cpp:130 ../src/ui/tools/mesh-tool.cpp:130 #, c-format -msgid "" -"One handle merging %d stop (drag with Shift to separate) selected" -msgid_plural "" -"One handle merging %d stops (drag with Shift to separate) selected" -msgstr[0] "" -"Une poignée de dégradé rassemblant %d stops (cliquer-glissser avec Maj pour les séparer) sélectionnée" -msgstr[1] "" -"Une poignée de dégradé rassemblant %d stops (cliquer-glissser avec Maj pour les séparer) sélectionnée" +msgid "One handle merging %d stop (drag with Shift to separate) selected" +msgid_plural "One handle merging %d stops (drag with Shift to separate) selected" +msgstr[0] "Une poignée de dégradé rassemblant %d stops (cliquer-glissser avec Maj pour les séparer) sélectionnée" +msgstr[1] "Une poignée de dégradé rassemblant %d stops (cliquer-glissser avec Maj pour les séparer) sélectionnée" #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) #: ../src/ui/tools/gradient-tool.cpp:138 @@ -24151,11 +21698,9 @@ msgstr[1] "%d poignées de dégradé sélectionnées sur %d" #: ../src/ui/tools/gradient-tool.cpp:145 #, c-format msgid "No gradient handles selected out of %d on %d selected object" -msgid_plural "" -"No gradient handles selected out of %d on %d selected objects" +msgid_plural "No gradient handles selected out of %d on %d selected objects" msgstr[0] "Aucune poignée sélectionnée sur %d dans %d objet sélectionné" -msgstr[1] "" -"Aucune poignée sélectionnée sur %d dans %d objets sélectionnés" +msgstr[1] "Aucune poignée sélectionnée sur %d dans %d objets sélectionnés" #: ../src/ui/tools/gradient-tool.cpp:433 msgid "Simplify gradient" @@ -24171,9 +21716,7 @@ msgstr "Dessiner autour des poignées pour les sélectionner" #: ../src/ui/tools/gradient-tool.cpp:692 msgid "Ctrl: snap gradient angle" -msgstr "" -"Ctrl : pour forcer la modification de l'inclinaison du dégradé par " -"incréments" +msgstr "Ctrl : pour forcer la modification de l'inclinaison du dégradé par incréments" #: ../src/ui/tools/gradient-tool.cpp:693 msgid "Shift: draw gradient around the starting point" @@ -24183,12 +21726,8 @@ msgstr "Maj : pour dessiner le dégradé autour du point de départ" #, c-format msgid "Gradient for %d object; with Ctrl to snap angle" msgid_plural "Gradient for %d objects; with Ctrl to snap angle" -msgstr[0] "" -"Dégradé appliqué à %d objet; déplacer avec Ctrl pour forcer la " -"modification de l'inclinaison par incréments" -msgstr[1] "" -"Dégradé appliqué à %d objets; déplacer avec Ctrl pour forcer " -"la modification de l'inclinaison par incréments" +msgstr[0] "Dégradé appliqué à %d objet; déplacer avec Ctrl pour forcer la modification de l'inclinaison par incréments" +msgstr[1] "Dégradé appliqué à %d objets; déplacer avec Ctrl pour forcer la modification de l'inclinaison par incréments" #: ../src/ui/tools/gradient-tool.cpp:951 ../src/ui/tools/mesh-tool.cpp:988 msgid "Select objects on which to create gradient." @@ -24218,11 +21757,8 @@ msgstr[1] "%d poignées de filet sélectionnées sur %d" #, c-format msgid "No mesh handles selected out of %d on %d selected object" msgid_plural "No mesh handles selected out of %d on %d selected objects" -msgstr[0] "" -"Aucune poignée de filet sélectionnée sur %d dans %d objet sélectionné" -msgstr[1] "" -"Aucune poignée de filet sélectionnée sur %d dans %d objets " -"sélectionnés" +msgstr[0] "Aucune poignée de filet sélectionnée sur %d dans %d objet sélectionné" +msgstr[1] "Aucune poignée de filet sélectionnée sur %d dans %d objets sélectionnés" #: ../src/ui/tools/mesh-tool.cpp:311 msgid "Split mesh row/column" @@ -24262,12 +21798,8 @@ msgstr "Maj : dessiner le filet autour du point de départ" #: ../src/ui/tools/node-tool.cpp:653 msgctxt "Node tool tip" -msgid "" -"Shift: drag to add nodes to the selection, click to toggle object " -"selection" -msgstr "" -"Maj : cliquer-déplacer pour ajouter des nœuds à la sélection, cliquer " -"pour inverser l'état de sélection de l'objet" +msgid "Shift: drag to add nodes to the selection, click to toggle object selection" +msgstr "Maj : cliquer-déplacer pour ajouter des nœuds à la sélection, cliquer pour inverser l'état de sélection de l'objet" #: ../src/ui/tools/node-tool.cpp:657 msgctxt "Node tool tip" @@ -24285,38 +21817,28 @@ msgstr[1] "%u objets sur %u sélectionnés" #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click to edit only this object (more: Shift)" -msgstr "" -"%s Cliquer-glisser pour sélectionner des nœuds, cliquer pour sélectionner " -"seulement cet objet (plus d'actions avec Maj)" +msgstr "%s Cliquer-glisser pour sélectionner des nœuds, cliquer pour sélectionner seulement cet objet (plus d'actions avec Maj)" #: ../src/ui/tools/node-tool.cpp:699 #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click clear the selection" -msgstr "" -"%s Cliquer-glisser pour sélectionner des nœuds, cliquer pour libérer la " -"sélection" +msgstr "%s Cliquer-glisser pour sélectionner des nœuds, cliquer pour libérer la sélection" #: ../src/ui/tools/node-tool.cpp:708 msgctxt "Node tool tip" msgid "Drag to select nodes, click to edit only this object" -msgstr "" -"Cliquer-glisser pour sélectionner des nœuds, cliquer pour sélectionner " -"seulement cet objet" +msgstr "Cliquer-glisser pour sélectionner des nœuds, cliquer pour sélectionner seulement cet objet" #: ../src/ui/tools/node-tool.cpp:711 msgctxt "Node tool tip" msgid "Drag to select nodes, click to clear the selection" -msgstr "" -"Cliquer-glisser pour sélectionner des nœuds, cliquer pour libérer la " -"sélection" +msgstr "Cliquer-glisser pour sélectionner des nœuds, cliquer pour libérer la sélection" #: ../src/ui/tools/node-tool.cpp:716 msgctxt "Node tool tip" msgid "Drag to select objects to edit, click to edit this object (more: Shift)" -msgstr "" -"Cliquer-glisser pour sélectionner les objets à éditer, cliquer pour éditer " -"les objets (modificateur : Maj)" +msgstr "Cliquer-glisser pour sélectionner les objets à éditer, cliquer pour éditer les objets (modificateur : Maj)" #: ../src/ui/tools/node-tool.cpp:719 msgctxt "Node tool tip" @@ -24341,97 +21863,64 @@ msgstr "Ajout au chemin sélectionné" #: ../src/ui/tools/pen-tool.cpp:640 msgid "Click or click and drag to close and finish the path." -msgstr "" -"Cliquer ou cliquer-déplacer pour fermer et terminer le chemin." +msgstr "Cliquer ou cliquer-déplacer pour fermer et terminer le chemin." #: ../src/ui/tools/pen-tool.cpp:642 #, fuzzy -msgid "" -"Click or click and drag to close and finish the path. Shift" -"+Click make a cusp node" -msgstr "" -"Cliquer ou cliquer-déplacer pour fermer et terminer le chemin." +msgid "Click or click and drag to close and finish the path. Shift+Click make a cusp node" +msgstr "Cliquer ou cliquer-déplacer pour fermer et terminer le chemin." #: ../src/ui/tools/pen-tool.cpp:654 -msgid "" -"Click or click and drag to continue the path from this point." -msgstr "" -"Cliquer ou cliquer-déplacer pour prolonger le chemin à partir " -"de ce point." +msgid "Click or click and drag to continue the path from this point." +msgstr "Cliquer ou cliquer-déplacer pour prolonger le chemin à partir de ce point." #: ../src/ui/tools/pen-tool.cpp:656 #, fuzzy -msgid "" -"Click or click and drag to continue the path from this point. " -"Shift+Click make a cusp node" -msgstr "" -"Cliquer ou cliquer-déplacer pour prolonger le chemin à partir " -"de ce point." +msgid "Click or click and drag to continue the path from this point. Shift+Click make a cusp node" +msgstr "Cliquer ou cliquer-déplacer pour prolonger le chemin à partir de ce point." #: ../src/ui/tools/pen-tool.cpp:1786 #, c-format -msgid "" -"Curve segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +msgid "Curve segment: angle %3.2f°, distance %s; with Ctrl to snap angle, Enter to finish the path" msgstr "" -"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour tourner par incréments ; Entrée pour terminer le chemin" #: ../src/ui/tools/pen-tool.cpp:1787 #, c-format -msgid "" -"Line segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +msgid "Line segment: angle %3.2f°, distance %s; with Ctrl to snap angle, Enter to finish the path" msgstr "" -"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour tourner par incréments ; Entrée pour terminer le chemin" #: ../src/ui/tools/pen-tool.cpp:1790 #, fuzzy, c-format -msgid "" -"Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" +msgid "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" msgstr "" -"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de courbe : angle %3.2f°, distance %s ; Ctrl pour tourner par incréments ; Entrée pour terminer le chemin" #: ../src/ui/tools/pen-tool.cpp:1791 #, fuzzy, c-format -msgid "" -"Line segment: angle %3.2f°, distance %s; with Shift+Click " -"make a cusp node, Enter to finish the path" +msgid "Line segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" msgstr "" -"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour " -"tourner par incréments ; Entrée pour terminer le chemin" +"Segment de droite : angle %3.2f°, distance %s ; Ctrl pour tourner par incréments ; Entrée pour terminer le chemin" #: ../src/ui/tools/pen-tool.cpp:1808 #, c-format -msgid "" -"Curve handle: angle %3.2f°, length %s; with Ctrl to snap " -"angle" -msgstr "" -"Poignée de contrôle: angle %3.2f°, longueur %s; Ctrl pour " -"tourner par incréments" +msgid "Curve handle: angle %3.2f°, length %s; with Ctrl to snap angle" +msgstr "Poignée de contrôle: angle %3.2f°, longueur %s; Ctrl pour tourner par incréments" #: ../src/ui/tools/pen-tool.cpp:1832 #, c-format -msgid "" -"Curve handle, symmetric: angle %3.2f°, length %s; with Ctrl to snap angle, with Shift to move this handle only" +msgid "Curve handle, symmetric: angle %3.2f°, length %s; with Ctrl to snap angle, with Shift to move this handle only" msgstr "" -"Poignée de la courbe, symétrique : angle %3.2f°, longueur %s ; " -"avec Ctrl pour tourner par incréments ; Maj pour ne déplacer " -"que cette poignée" +"Poignée de la courbe, symétrique : angle %3.2f°, longueur %s ; avec Ctrl pour tourner par incréments ; Maj pour ne " +"déplacer que cette poignée" #: ../src/ui/tools/pen-tool.cpp:1833 #, c-format -msgid "" -"Curve handle: angle %3.2f°, length %s; with Ctrl to snap " -"angle, with Shift to move this handle only" +msgid "Curve handle: angle %3.2f°, length %s; with Ctrl to snap angle, with Shift to move this handle only" msgstr "" -"Poignée de la courbe : angle %3.2f°, longueur %s ; avec Ctrl pour tourner par incréments ; Maj pour ne déplacer que cette " -"poignée" +"Poignée de la courbe : angle %3.2f°, longueur %s ; avec Ctrl pour tourner par incréments ; Maj pour ne déplacer que " +"cette poignée" #: ../src/ui/tools/pen-tool.cpp:1967 msgid "Drawing finished" @@ -24455,60 +21944,38 @@ msgid "Finishing freehand" msgstr "Dessin à main levée terminé" #: ../src/ui/tools/pencil-tool.cpp:504 -msgid "" -"Sketch mode: holding Alt interpolates between sketched paths. " -"Release Alt to finalize." +msgid "Sketch mode: holding Alt interpolates between sketched paths. Release Alt to finalize." msgstr "" -"Mode croquis : maintenir Alt pour réaliser une interpolation " -"entre les chemins croqués. Relacher Alt pour finaliser." +"Mode croquis : maintenir Alt pour réaliser une interpolation entre les chemins croqués. Relacher Alt pour finaliser." #: ../src/ui/tools/pencil-tool.cpp:531 msgid "Finishing freehand sketch" msgstr "Croquis à main levée terminé" #: ../src/ui/tools/rect-tool.cpp:277 -msgid "" -"Ctrl: make square or integer-ratio rect, lock a rounded corner " -"circular" -msgstr "" -"Ctrl : forcer un rectangle carré ou de ratio entier, préserver le " -"rayon d'arrondi d'un coin" +msgid "Ctrl: make square or integer-ratio rect, lock a rounded corner circular" +msgstr "Ctrl : forcer un rectangle carré ou de ratio entier, préserver le rayon d'arrondi d'un coin" #: ../src/ui/tools/rect-tool.cpp:438 #, c-format -msgid "" -"Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point" -msgstr "" -"Rectangle : %s × %s; (contraint de ratio %d:%d) ; Maj " -"pour dessiner autour du point de départ" +msgid "Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point" +msgstr "Rectangle : %s × %s; (contraint de ratio %d:%d) ; Maj pour dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:441 #, c-format -msgid "" -"Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with " -"Shift to draw around the starting point" -msgstr "" -"Rectangle : %s × %s; (contraint au ratio du Nombre d'Or 1.618 : " -"1) ; Maj dessiner autour du point de départ" +msgid "Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with Shift to draw around the starting point" +msgstr "Rectangle : %s × %s; (contraint au ratio du Nombre d'Or 1.618 : 1) ; Maj dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:443 #, c-format -msgid "" -"Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with " -"Shift to draw around the starting point" -msgstr "" -"Rectangle : %s × %s; (contraint au ratio du Nombre d'Or 1 : " -"1.618) ; Maj pour dessiner autour du point de départ" +msgid "Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with Shift to draw around the starting point" +msgstr "Rectangle : %s × %s; (contraint au ratio du Nombre d'Or 1 : 1.618) ; Maj pour dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:447 #, c-format msgid "" -"Rectangle: %s × %s; with Ctrl to make square or integer-" -"ratio rectangle; with Shift to draw around the starting point" -msgstr "" -"Rectangle : %s × %s; Ctrl forcer un rectangle carré ou de " -"ratio entier; Maj dessiner autour du point de départ" +"Rectangle: %s × %s; with Ctrl to make square or integer-ratio rectangle; with Shift to draw around the starting point" +msgstr "Rectangle : %s × %s; Ctrl forcer un rectangle carré ou de ratio entier; Maj dessiner autour du point de départ" #: ../src/ui/tools/rect-tool.cpp:470 msgid "Create rectangle" @@ -24516,17 +21983,12 @@ msgstr "Créer un rectangle" #: ../src/ui/tools/select-tool.cpp:160 msgid "Click selection to toggle scale/rotation handles" -msgstr "" -"Cliquer sur la sélection pour alterner entre poignées de redimensionnement " -"et de rotation" +msgstr "Cliquer sur la sélection pour alterner entre poignées de redimensionnement et de rotation" #: ../src/ui/tools/select-tool.cpp:161 -msgid "" -"No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " -"or drag around objects to select." +msgid "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, or drag around objects to select." msgstr "" -"Aucun objet sélectionné. Sélectionnez des objets par Clic, Maj+Clic ou Alt" -"+molette, ou cliquez-déplacez autour des objets à sélectionner." +"Aucun objet sélectionné. Sélectionnez des objets par Clic, Maj+Clic ou Alt+molette, ou cliquez-déplacez autour des objets à sélectionner." #: ../src/ui/tools/select-tool.cpp:214 msgid "Move canceled." @@ -24537,40 +21999,26 @@ msgid "Selection canceled." msgstr "Sélection annulée." #: ../src/ui/tools/select-tool.cpp:644 -msgid "" -"Draw over objects to select them; release Alt to switch to " -"rubberband selection" +msgid "Draw over objects to select them; release Alt to switch to rubberband selection" msgstr "" -"Tracer un trait passant par des objets pour les sélectionner. Lâcher " -"la touche Alt pour repasser en mode sélection rectangle" +"Tracer un trait passant par des objets pour les sélectionner. Lâcher la touche Alt pour repasser en mode sélection rectangle" #: ../src/ui/tools/select-tool.cpp:646 -msgid "" -"Drag around objects to select them; press Alt to switch to " -"touch selection" -msgstr "" -"Entourer les objets pour les sélectionner; appuyer sur Alt " -"pour passer en « toucher pour sélectionner »" +msgid "Drag around objects to select them; press Alt to switch to touch selection" +msgstr "Entourer les objets pour les sélectionner; appuyer sur Alt pour passer en « toucher pour sélectionner »" #: ../src/ui/tools/select-tool.cpp:939 msgid "Ctrl: click to select in groups; drag to move hor/vert" -msgstr "" -"Ctrl : Cliquer pour sélectionner dans les groupes; cliquer-déplacer " -"pour déplacer horizontalement/verticalment" +msgstr "Ctrl : Cliquer pour sélectionner dans les groupes; cliquer-déplacer pour déplacer horizontalement/verticalment" #: ../src/ui/tools/select-tool.cpp:940 msgid "Shift: click to toggle select; drag for rubberband selection" -msgstr "" -"Maj : cliquer pour inverser l'état de sélection, cliquer-déplacer " -"pour activer la sélection rectangle" +msgstr "Maj : cliquer pour inverser l'état de sélection, cliquer-déplacer pour activer la sélection rectangle" #: ../src/ui/tools/select-tool.cpp:941 -msgid "" -"Alt: click to select under; scroll mouse-wheel to cycle-select; drag " -"to move selected or select by touch" +msgid "Alt: click to select under; scroll mouse-wheel to cycle-select; drag to move selected or select by touch" msgstr "" -"Alt : cliquer pour sélectionner sous, utiliser la molette pour " -"sélectionner cycliquement, cliquer-déplacer pour déplacer ou passer en " +"Alt : cliquer pour sélectionner sous, utiliser la molette pour sélectionner cycliquement, cliquer-déplacer pour déplacer ou passer en " "« toucher pour sélectionner »" #: ../src/ui/tools/select-tool.cpp:1149 @@ -24587,11 +22035,8 @@ msgstr "Alt : verrouiller le rayon de la spirale" #: ../src/ui/tools/spiral-tool.cpp:390 #, c-format -msgid "" -"Spiral: radius %s, angle %5g°; with Ctrl to snap angle" -msgstr "" -"Spirale : rayon %s, angle %5g° ; avec Ctrl pour tourner " -"par incréments" +msgid "Spiral: radius %s, angle %5g°; with Ctrl to snap angle" +msgstr "Spirale : rayon %s, angle %5g° ; avec Ctrl pour tourner par incréments" #: ../src/ui/tools/spiral-tool.cpp:411 msgid "Create spiral" @@ -24610,30 +22055,18 @@ msgstr "Rien n'a été sélectionné." #: ../src/ui/tools/spray-tool.cpp:180 #, c-format -msgid "" -"%s. Drag, click or click and scroll to spray copies of the initial " -"selection." -msgstr "" -"%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser des copies " -"de la sélection initiale." +msgid "%s. Drag, click or click and scroll to spray copies of the initial selection." +msgstr "%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser des copies de la sélection initiale." #: ../src/ui/tools/spray-tool.cpp:183 #, c-format -msgid "" -"%s. Drag, click or click and scroll to spray clones of the initial " -"selection." -msgstr "" -"%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser des clones " -"de la sélection initiale." +msgid "%s. Drag, click or click and scroll to spray clones of the initial selection." +msgstr "%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser des clones de la sélection initiale." #: ../src/ui/tools/spray-tool.cpp:186 #, c-format -msgid "" -"%s. Drag, click or click and scroll to spray in a single path of the " -"initial selection." -msgstr "" -"%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser dans un chemin " -"unique la sélection initiale." +msgid "%s. Drag, click or click and scroll to spray in a single path of the initial selection." +msgstr "%s. Cliquer-déplacer, cliquer ou défiler pour pulvériser dans un chemin unique la sélection initiale." #: ../src/ui/tools/spray-tool.cpp:618 msgid "Nothing selected! Select objects to spray." @@ -24653,23 +22086,17 @@ msgstr "Pulvérisation par union des formes" #: ../src/ui/tools/star-tool.cpp:261 msgid "Ctrl: snap angle; keep rays radial" -msgstr "" -"Ctrl pour tourner par incréments; forcer la radialité des branches" +msgstr "Ctrl pour tourner par incréments; forcer la radialité des branches" #: ../src/ui/tools/star-tool.cpp:407 #, c-format -msgid "" -"Polygon: radius %s, angle %5g°; with Ctrl to snap angle" -msgstr "" -"Polygone : rayon %s, angle %5g° ; Ctrl pour tourner par " -"incréments" +msgid "Polygon: radius %s, angle %5g°; with Ctrl to snap angle" +msgstr "Polygone : rayon %s, angle %5g° ; Ctrl pour tourner par incréments" #: ../src/ui/tools/star-tool.cpp:408 #, c-format msgid "Star: radius %s, angle %5g°; with Ctrl to snap angle" -msgstr "" -"Étoile : rayon %s, angle %5g° ; Ctrl pour tourner/" -"incliner par incréments" +msgstr "Étoile : rayon %s, angle %5g° ; Ctrl pour tourner/incliner par incréments" #: ../src/ui/tools/star-tool.cpp:436 msgid "Create star" @@ -24677,16 +22104,11 @@ msgstr "Créer une étoile" #: ../src/ui/tools/text-tool.cpp:370 msgid "Click to edit the text, drag to select part of the text." -msgstr "" -"Cliquer pour éditer le texte, cliquer-déplacer pour " -"sélectionner une partie du texte." +msgstr "Cliquer pour éditer le texte, cliquer-déplacer pour sélectionner une partie du texte." #: ../src/ui/tools/text-tool.cpp:372 -msgid "" -"Click to edit the flowed text, drag to select part of the text." -msgstr "" -"Cliquer pour éditer le texte encadré, cliquer-déplacer pour " -"sélectionner une partie du texte." +msgid "Click to edit the flowed text, drag to select part of the text." +msgstr "Cliquer pour éditer le texte encadré, cliquer-déplacer pour sélectionner une partie du texte." #: ../src/ui/tools/text-tool.cpp:426 msgid "Create text" @@ -24727,12 +22149,8 @@ msgid "Create flowed text" msgstr "Créer un texte encadré" #: ../src/ui/tools/text-tool.cpp:658 -msgid "" -"The frame is too small for the current font size. Flowed text not " -"created." -msgstr "" -"Le cadre est trop petit pour la taille de police courante. Le texte " -"encadré n'a pas été créé." +msgid "The frame is too small for the current font size. Flowed text not created." +msgstr "Le cadre est trop petit pour la taille de police courante. Le texte encadré n'a pas été créé." #: ../src/ui/tools/text-tool.cpp:794 msgid "No-break space" @@ -24804,30 +22222,17 @@ msgstr "Coller le texte" #: ../src/ui/tools/text-tool.cpp:1573 #, c-format -msgid "" -"Type or edit flowed text (%d character%s); Enter to start new " -"paragraph." -msgid_plural "" -"Type or edit flowed text (%d characters%s); Enter to start new " -"paragraph." -msgstr[0] "" -"Saisir ou modifier le texte encadré (%d caractère%s) ; Entrée pour " -"commencer un nouveau paragraphe." -msgstr[1] "" -"Saisir ou modifier le texte encadré (%d caractères%s) ; Entrée pour " -"commencer un nouveau paragraphe." +msgid "Type or edit flowed text (%d character%s); Enter to start new paragraph." +msgid_plural "Type or edit flowed text (%d characters%s); Enter to start new paragraph." +msgstr[0] "Saisir ou modifier le texte encadré (%d caractère%s) ; Entrée pour commencer un nouveau paragraphe." +msgstr[1] "Saisir ou modifier le texte encadré (%d caractères%s) ; Entrée pour commencer un nouveau paragraphe." #: ../src/ui/tools/text-tool.cpp:1575 #, c-format msgid "Type or edit text (%d character%s); Enter to start new line." -msgid_plural "" -"Type or edit text (%d characters%s); Enter to start new line." -msgstr[0] "" -"Saisir ou modifier le texte (%d caractère%s) ; Entrée pour commencer " -"une nouvelle ligne." -msgstr[1] "" -"Saisir ou modifier le texte (%d caractères%s) ; Entrée pour commencer " -"une nouvelle ligne." +msgid_plural "Type or edit text (%d characters%s); Enter to start new line." +msgstr[0] "Saisir ou modifier le texte (%d caractère%s) ; Entrée pour commencer une nouvelle ligne." +msgstr[1] "Saisir ou modifier le texte (%d caractères%s) ; Entrée pour commencer une nouvelle ligne." #: ../src/ui/tools/text-tool.cpp:1685 msgid "Type text" @@ -24845,9 +22250,7 @@ msgstr "%s. Cliquer-glisser pour déplacer." #: ../src/ui/tools/tweak-tool.cpp:168 #, c-format msgid "%s. Drag or click to move in; with Shift to move out." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour rapprocher; avec Maj pour " -"éloigner." +msgstr "%s. Cliquer-glisser ou cliquer pour rapprocher; avec Maj pour éloigner." #: ../src/ui/tools/tweak-tool.cpp:176 #, c-format @@ -24857,24 +22260,17 @@ msgstr "%s. Glisser ou cliquer pour déplacer aléatoirement." #: ../src/ui/tools/tweak-tool.cpp:180 #, c-format msgid "%s. Drag or click to scale down; with Shift to scale up." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour réduire; avec Maj pour " -"agrandir." +msgstr "%s. Cliquer-glisser ou cliquer pour réduire; avec Maj pour agrandir." #: ../src/ui/tools/tweak-tool.cpp:188 #, c-format -msgid "" -"%s. Drag or click to rotate clockwise; with Shift, " -"counterclockwise." -msgstr "" -"%s. Glisser ou cliquer pour pivoter dans le sens horaire ; avec Maj, " -"dans le sens anti-horaire." +msgid "%s. Drag or click to rotate clockwise; with Shift, counterclockwise." +msgstr "%s. Glisser ou cliquer pour pivoter dans le sens horaire ; avec Maj, dans le sens anti-horaire." #: ../src/ui/tools/tweak-tool.cpp:196 #, c-format msgid "%s. Drag or click to duplicate; with Shift, delete." -msgstr "" -"%s. Glisser ou cliquer pour dupliquer ; avec Maj, supprime." +msgstr "%s. Glisser ou cliquer pour dupliquer ; avec Maj, supprime." #: ../src/ui/tools/tweak-tool.cpp:204 #, c-format @@ -24884,16 +22280,12 @@ msgstr "%s. Glisser pour pousser les chemins." #: ../src/ui/tools/tweak-tool.cpp:208 #, c-format msgid "%s. Drag or click to inset paths; with Shift to outset." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour rétrécir les chemins; avec Maj " -"pour les élargir." +msgstr "%s. Cliquer-glisser ou cliquer pour rétrécir les chemins; avec Maj pour les élargir." #: ../src/ui/tools/tweak-tool.cpp:216 #, c-format msgid "%s. Drag or click to attract paths; with Shift to repel." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour attirer les chemins; avec Maj " -"pour les repousser." +msgstr "%s. Cliquer-glisser ou cliquer pour attirer les chemins; avec Maj pour les repousser." #: ../src/ui/tools/tweak-tool.cpp:224 #, c-format @@ -24903,24 +22295,17 @@ msgstr "%s. Cliquer-glisser ou cliquer pour rendre les chemins rugueux." #: ../src/ui/tools/tweak-tool.cpp:228 #, c-format msgid "%s. Drag or click to paint objects with color." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour peindre les objets avec une " -"couleur." +msgstr "%s. Cliquer-glisser ou cliquer pour peindre les objets avec une couleur." #: ../src/ui/tools/tweak-tool.cpp:232 #, c-format msgid "%s. Drag or click to randomize colors." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour peindre avec une couleur aléatoire." +msgstr "%s. Cliquer-glisser ou cliquer pour peindre avec une couleur aléatoire." #: ../src/ui/tools/tweak-tool.cpp:236 #, c-format -msgid "" -"%s. Drag or click to increase blur; with Shift to decrease." -msgstr "" -"%s. Cliquer-glisser ou cliquer pour augmenter le flou; avec Maj pour " -"le diminuer." +msgid "%s. Drag or click to increase blur; with Shift to decrease." +msgstr "%s. Cliquer-glisser ou cliquer pour augmenter le flou; avec Maj pour le diminuer." #: ../src/ui/tools/tweak-tool.cpp:1191 msgid "Nothing selected! Select objects to tweak." @@ -24983,21 +22368,18 @@ msgid "Hexadecimal RGBA value of the color" msgstr "Valeur hexadécimale RVBA de la couleur" # Red (in RGB) -#: ../src/ui/widget/color-icc-selector.cpp:176 -#: ../src/ui/widget/color-scales.cpp:378 +#: ../src/ui/widget/color-icc-selector.cpp:176 ../src/ui/widget/color-scales.cpp:378 msgid "_R:" msgstr "_R :" # Green (in RGB) #. TYPE_RGB_16 -#: ../src/ui/widget/color-icc-selector.cpp:177 -#: ../src/ui/widget/color-scales.cpp:381 +#: ../src/ui/widget/color-icc-selector.cpp:177 ../src/ui/widget/color-scales.cpp:381 msgid "_G:" msgstr "_V :" # Blue (in RGB) -#: ../src/ui/widget/color-icc-selector.cpp:178 -#: ../src/ui/widget/color-scales.cpp:384 +#: ../src/ui/widget/color-icc-selector.cpp:178 ../src/ui/widget/color-scales.cpp:384 msgid "_B:" msgstr "_B :" @@ -25007,52 +22389,40 @@ msgstr "Niveaux de gris" # Hue (in HSL) #. TYPE_GRAY_16 -#: ../src/ui/widget/color-icc-selector.cpp:182 -#: ../src/ui/widget/color-icc-selector.cpp:186 -#: ../src/ui/widget/color-scales.cpp:404 +#: ../src/ui/widget/color-icc-selector.cpp:182 ../src/ui/widget/color-icc-selector.cpp:186 ../src/ui/widget/color-scales.cpp:404 msgid "_H:" msgstr "_T :" # Saturation (in HSL) #. TYPE_HSV_16 -#: ../src/ui/widget/color-icc-selector.cpp:183 -#: ../src/ui/widget/color-icc-selector.cpp:188 -#: ../src/ui/widget/color-scales.cpp:407 +#: ../src/ui/widget/color-icc-selector.cpp:183 ../src/ui/widget/color-icc-selector.cpp:188 ../src/ui/widget/color-scales.cpp:407 msgid "_S:" msgstr "_S :" # Luminosity (in HSL) #. TYPE_HLS_16 -#: ../src/ui/widget/color-icc-selector.cpp:187 -#: ../src/ui/widget/color-scales.cpp:410 +#: ../src/ui/widget/color-icc-selector.cpp:187 ../src/ui/widget/color-scales.cpp:410 msgid "_L:" msgstr "_L :" # Cyan (in CYMK) -#: ../src/ui/widget/color-icc-selector.cpp:190 -#: ../src/ui/widget/color-icc-selector.cpp:195 -#: ../src/ui/widget/color-scales.cpp:432 +#: ../src/ui/widget/color-icc-selector.cpp:190 ../src/ui/widget/color-icc-selector.cpp:195 ../src/ui/widget/color-scales.cpp:432 msgid "_C:" msgstr "_C :" # Magenta (in CYMK) #. TYPE_CMYK_16 #. TYPE_CMY_16 -#: ../src/ui/widget/color-icc-selector.cpp:191 -#: ../src/ui/widget/color-icc-selector.cpp:196 -#: ../src/ui/widget/color-scales.cpp:435 +#: ../src/ui/widget/color-icc-selector.cpp:191 ../src/ui/widget/color-icc-selector.cpp:196 ../src/ui/widget/color-scales.cpp:435 msgid "_M:" msgstr "_M :" -#: ../src/ui/widget/color-icc-selector.cpp:192 -#: ../src/ui/widget/color-icc-selector.cpp:197 -#: ../src/ui/widget/color-scales.cpp:438 +#: ../src/ui/widget/color-icc-selector.cpp:192 ../src/ui/widget/color-icc-selector.cpp:197 ../src/ui/widget/color-scales.cpp:438 msgid "_Y:" msgstr "_J :" # BlacK (in CYMK) -#: ../src/ui/widget/color-icc-selector.cpp:193 -#: ../src/ui/widget/color-scales.cpp:441 +#: ../src/ui/widget/color-icc-selector.cpp:193 ../src/ui/widget/color-scales.cpp:441 msgid "_K:" msgstr "_N :" @@ -25066,24 +22436,18 @@ msgstr "Fixer" #: ../src/ui/widget/color-icc-selector.cpp:379 msgid "Fix RGB fallback to match icc-color() value." -msgstr "" -"Fixer une valeur RVB de secours pour correspondre à la valeur icc-color()." +msgstr "Fixer une valeur RVB de secours pour correspondre à la valeur icc-color()." # Alpha (opacity) #. Label -#: ../src/ui/widget/color-icc-selector.cpp:491 -#: ../src/ui/widget/color-scales.cpp:387 ../src/ui/widget/color-scales.cpp:413 -#: ../src/ui/widget/color-scales.cpp:444 -#: ../src/ui/widget/color-wheel-selector.cpp:83 +#: ../src/ui/widget/color-icc-selector.cpp:491 ../src/ui/widget/color-scales.cpp:387 ../src/ui/widget/color-scales.cpp:413 +#: ../src/ui/widget/color-scales.cpp:444 ../src/ui/widget/color-wheel-selector.cpp:83 msgid "_A:" msgstr "_A :" -#: ../src/ui/widget/color-icc-selector.cpp:502 -#: ../src/ui/widget/color-icc-selector.cpp:513 -#: ../src/ui/widget/color-scales.cpp:388 ../src/ui/widget/color-scales.cpp:389 -#: ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 -#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 -#: ../src/ui/widget/color-wheel-selector.cpp:112 +#: ../src/ui/widget/color-icc-selector.cpp:502 ../src/ui/widget/color-icc-selector.cpp:513 ../src/ui/widget/color-scales.cpp:388 +#: ../src/ui/widget/color-scales.cpp:389 ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 +#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 ../src/ui/widget/color-wheel-selector.cpp:112 #: ../src/ui/widget/color-wheel-selector.cpp:142 msgid "Alpha (opacity)" msgstr "Alpha (opacité)" @@ -25349,8 +22713,7 @@ msgid "Small-caps (lowercase). OpenType table: 'smcp'" msgstr "" #: ../src/ui/widget/font-variants.cpp:140 -msgid "" -"All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" +msgid "All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" msgstr "" #: ../src/ui/widget/font-variants.cpp:141 @@ -25358,20 +22721,15 @@ msgid "Petite-caps (lowercase). OpenType table: 'pcap'" msgstr "" #: ../src/ui/widget/font-variants.cpp:142 -msgid "" -"All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" +msgid "All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" msgstr "" #: ../src/ui/widget/font-variants.cpp:143 -msgid "" -"Unicase (small caps for uppercase, normal for lowercase). OpenType table: " -"'unic'" +msgid "Unicase (small caps for uppercase, normal for lowercase). OpenType table: 'unic'" msgstr "" #: ../src/ui/widget/font-variants.cpp:144 -msgid "" -"Titling caps (lighter-weight uppercase for use in titles). OpenType table: " -"'titl'" +msgid "Titling caps (lighter-weight uppercase for use in titles). OpenType table: 'titl'" msgstr "" #. Numeric ------------------------------ @@ -25458,9 +22816,7 @@ msgstr "Autre" msgid "Document license updated" msgstr "Nettoyage du document" -#: ../src/ui/widget/object-composite-settings.cpp:47 -#: ../src/ui/widget/selected-style.cpp:1119 -#: ../src/ui/widget/selected-style.cpp:1120 +#: ../src/ui/widget/object-composite-settings.cpp:47 ../src/ui/widget/selected-style.cpp:1119 ../src/ui/widget/selected-style.cpp:1120 msgid "Opacity (%)" msgstr "Opacité (%)" @@ -25468,9 +22824,7 @@ msgstr "Opacité (%)" msgid "Change blur" msgstr "Modifier le flou" -#: ../src/ui/widget/object-composite-settings.cpp:200 -#: ../src/ui/widget/selected-style.cpp:943 -#: ../src/ui/widget/selected-style.cpp:1245 +#: ../src/ui/widget/object-composite-settings.cpp:200 ../src/ui/widget/selected-style.cpp:943 ../src/ui/widget/selected-style.cpp:1245 msgid "Change opacity" msgstr "Modifier l'opacité" @@ -25560,18 +22914,13 @@ msgid "_Resize page to drawing or selection" msgstr "A_juster la page au dessin ou à la sélection" #: ../src/ui/widget/page-sizer.cpp:448 -msgid "" -"Resize the page to fit the current selection, or the entire drawing if there " -"is no selection" -msgstr "" -"Redimensionner la page pour l'ajuster à la sélection, ou au dessin entier " -"s'il n'y a pas de sélection" +msgid "Resize the page to fit the current selection, or the entire drawing if there is no selection" +msgstr "Redimensionner la page pour l'ajuster à la sélection, ou au dessin entier s'il n'y a pas de sélection" #: ../src/ui/widget/page-sizer.cpp:479 msgid "" -"While SVG allows non-uniform scaling it is recommended to use only uniform " -"scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " -"directly." +"While SVG allows non-uniform scaling it is recommended to use only uniform scaling in Inkscape. To set a non-uniform scaling, set the " +"'viewBox' directly." msgstr "" #: ../src/ui/widget/page-sizer.cpp:483 @@ -25695,12 +23044,8 @@ msgid "Select a bitmap editor" msgstr "Sélectionnez un éditeur de bitmap" #: ../src/ui/widget/random.cpp:84 -msgid "" -"Reseed the random number generator; this creates a different sequence of " -"random numbers." -msgstr "" -"Réinitialiser le générateur pseudo-aléatoire; cela crée une nouvelle suite " -"de nombre aléatoires." +msgid "Reseed the random number generator; this creates a different sequence of random numbers." +msgstr "Réinitialiser le générateur pseudo-aléatoire; cela crée une nouvelle suite de nombre aléatoires." #: ../src/ui/widget/rendering-options.cpp:33 msgid "Backend" @@ -25724,26 +23069,21 @@ msgstr "Résolution préférée (point par pouce) du rendu." #: ../src/ui/widget/rendering-options.cpp:47 msgid "" -"Render using Cairo vector operations. The resulting image is usually " -"smaller in file size and can be arbitrarily scaled, but some filter effects " -"will not be correctly rendered." +"Render using Cairo vector operations. The resulting image is usually smaller in file size and can be arbitrarily scaled, but some filter " +"effects will not be correctly rendered." msgstr "" -"Utiliser les opérateurs vectoriels Cairo. Le fichier image résultant est en " -"général moins volumineux et reste redimensionnable; cependant les motifs de " -"remplissage seront perdus." +"Utiliser les opérateurs vectoriels Cairo. Le fichier image résultant est en général moins volumineux et reste redimensionnable; cependant les " +"motifs de remplissage seront perdus." #: ../src/ui/widget/rendering-options.cpp:52 msgid "" -"Render everything as bitmap. The resulting image is usually larger in file " -"size and cannot be arbitrarily scaled without quality loss, but all objects " -"will be rendered exactly as displayed." +"Render everything as bitmap. The resulting image is usually larger in file size and cannot be arbitrarily scaled without quality loss, but " +"all objects will be rendered exactly as displayed." msgstr "" -"Tout imprimer en tant que bitmap. Le fichier image résultant sera en général " -"plus volumineux et n'est plus redimensionnable sans perte de qualité, " -"cependant tous les objets seront rendus tels qu'affichés." +"Tout imprimer en tant que bitmap. Le fichier image résultant sera en général plus volumineux et n'est plus redimensionnable sans perte de " +"qualité, cependant tous les objets seront rendus tels qu'affichés." -#: ../src/ui/widget/selected-style.cpp:131 -#: ../src/ui/widget/style-swatch.cpp:127 +#: ../src/ui/widget/selected-style.cpp:131 ../src/ui/widget/style-swatch.cpp:127 msgid "Fill:" msgstr "Remplissage :" @@ -25756,9 +23096,7 @@ msgstr "O :" msgid "N/A" msgstr "N/A" -#: ../src/ui/widget/selected-style.cpp:181 -#: ../src/ui/widget/selected-style.cpp:1112 -#: ../src/ui/widget/selected-style.cpp:1113 +#: ../src/ui/widget/selected-style.cpp:181 ../src/ui/widget/selected-style.cpp:1112 ../src/ui/widget/selected-style.cpp:1113 #: ../src/widgets/gradient-toolbar.cpp:163 msgid "Nothing selected" msgstr "Aucune sélection" @@ -25773,30 +23111,25 @@ msgctxt "Stroke" msgid "None" msgstr "Aucun" -#: ../src/ui/widget/selected-style.cpp:190 -#: ../src/ui/widget/style-swatch.cpp:321 +#: ../src/ui/widget/selected-style.cpp:190 ../src/ui/widget/style-swatch.cpp:321 msgctxt "Fill and stroke" msgid "No fill" msgstr "Aucun remplissage" -#: ../src/ui/widget/selected-style.cpp:190 -#: ../src/ui/widget/style-swatch.cpp:321 +#: ../src/ui/widget/selected-style.cpp:190 ../src/ui/widget/style-swatch.cpp:321 msgctxt "Fill and stroke" msgid "No stroke" msgstr "Aucun contour" -#: ../src/ui/widget/selected-style.cpp:192 -#: ../src/ui/widget/style-swatch.cpp:300 ../src/widgets/paint-selector.cpp:231 +#: ../src/ui/widget/selected-style.cpp:192 ../src/ui/widget/style-swatch.cpp:300 ../src/widgets/paint-selector.cpp:231 msgid "Pattern" msgstr "Motif" -#: ../src/ui/widget/selected-style.cpp:195 -#: ../src/ui/widget/style-swatch.cpp:302 +#: ../src/ui/widget/selected-style.cpp:195 ../src/ui/widget/style-swatch.cpp:302 msgid "Pattern fill" msgstr "Motif de remplissage" -#: ../src/ui/widget/selected-style.cpp:195 -#: ../src/ui/widget/style-swatch.cpp:302 +#: ../src/ui/widget/selected-style.cpp:195 ../src/ui/widget/style-swatch.cpp:302 msgid "Pattern stroke" msgstr "Motif de contour" @@ -25804,13 +23137,11 @@ msgstr "Motif de contour" msgid "L" msgstr "L" -#: ../src/ui/widget/selected-style.cpp:200 -#: ../src/ui/widget/style-swatch.cpp:294 +#: ../src/ui/widget/selected-style.cpp:200 ../src/ui/widget/style-swatch.cpp:294 msgid "Linear gradient fill" msgstr "Dégradé linéaire de remplissage" -#: ../src/ui/widget/selected-style.cpp:200 -#: ../src/ui/widget/style-swatch.cpp:294 +#: ../src/ui/widget/selected-style.cpp:200 ../src/ui/widget/style-swatch.cpp:294 msgid "Linear gradient stroke" msgstr "Dégradé linéaire de contour" @@ -25818,13 +23149,11 @@ msgstr "Dégradé linéaire de contour" msgid "R" msgstr "R" -#: ../src/ui/widget/selected-style.cpp:210 -#: ../src/ui/widget/style-swatch.cpp:298 +#: ../src/ui/widget/selected-style.cpp:210 ../src/ui/widget/style-swatch.cpp:298 msgid "Radial gradient fill" msgstr "Dégradé radial de remplissage" -#: ../src/ui/widget/selected-style.cpp:210 -#: ../src/ui/widget/style-swatch.cpp:298 +#: ../src/ui/widget/selected-style.cpp:210 ../src/ui/widget/style-swatch.cpp:298 msgid "Radial gradient stroke" msgstr "Dégradé radial de contour" @@ -25855,22 +23184,17 @@ msgstr "Remplissages différents" msgid "Different strokes" msgstr "Contours différents" -#: ../src/ui/widget/selected-style.cpp:234 -#: ../src/ui/widget/style-swatch.cpp:324 +#: ../src/ui/widget/selected-style.cpp:234 ../src/ui/widget/style-swatch.cpp:324 msgid "Unset" msgstr "Indéfini" #. TRANSLATORS COMMENT: unset is a verb here -#: ../src/ui/widget/selected-style.cpp:237 -#: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:575 +#: ../src/ui/widget/selected-style.cpp:237 ../src/ui/widget/selected-style.cpp:295 ../src/ui/widget/selected-style.cpp:575 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset fill" msgstr "Ne pas définir le remplissage" -#: ../src/ui/widget/selected-style.cpp:237 -#: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:591 +#: ../src/ui/widget/selected-style.cpp:237 ../src/ui/widget/selected-style.cpp:295 ../src/ui/widget/selected-style.cpp:591 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset stroke" msgstr "Ne pas définir le contour" @@ -25933,14 +23257,11 @@ msgstr "Copier la couleur" msgid "Paste color" msgstr "Coller la couleur" -#: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:868 +#: ../src/ui/widget/selected-style.cpp:286 ../src/ui/widget/selected-style.cpp:868 msgid "Swap fill and stroke" msgstr "Intervertir remplissage et contour" -#: ../src/ui/widget/selected-style.cpp:290 -#: ../src/ui/widget/selected-style.cpp:600 -#: ../src/ui/widget/selected-style.cpp:609 +#: ../src/ui/widget/selected-style.cpp:290 ../src/ui/widget/selected-style.cpp:600 ../src/ui/widget/selected-style.cpp:609 msgid "Make fill opaque" msgstr "Rendre le remplissage opaque" @@ -25948,13 +23269,11 @@ msgstr "Rendre le remplissage opaque" msgid "Make stroke opaque" msgstr "Rendre le contour opaque" -#: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:557 ../src/widgets/fill-style.cpp:503 +#: ../src/ui/widget/selected-style.cpp:299 ../src/ui/widget/selected-style.cpp:557 ../src/widgets/fill-style.cpp:503 msgid "Remove fill" msgstr "Supprimer le remplissage" -#: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:566 ../src/widgets/fill-style.cpp:503 +#: ../src/ui/widget/selected-style.cpp:299 ../src/ui/widget/selected-style.cpp:566 ../src/widgets/fill-style.cpp:503 msgid "Remove stroke" msgstr "Supprimer le contour" @@ -26038,13 +23357,11 @@ msgstr "Ajuster l'opacité" #: ../src/ui/widget/selected-style.cpp:1388 #, c-format msgid "" -"Adjusting alpha: was %.3g, now %.3g (diff %.3g); with Ctrl to adjust lightness, with Shift to adjust saturation, without " -"modifiers to adjust hue" +"Adjusting alpha: was %.3g, now %.3g (diff %.3g); with Ctrl to adjust lightness, with Shift to adjust saturation, " +"without modifiers to adjust hue" msgstr "" -"Ajustement de l'opacité : valeur précédente %.3g, désormais %.3g (diff. %.3g) ; Ctrl pour ajuster la luminosité, Maj pour " -"ajuster la saturation, sans touche modificatrice pour ajuster la teinte" +"Ajustement de l'opacité : valeur précédente %.3g, désormais %.3g (diff. %.3g) ; Ctrl pour ajuster la luminosité, Maj pour ajuster la saturation, sans touche modificatrice pour ajuster la teinte" #: ../src/ui/widget/selected-style.cpp:1392 msgid "Adjust saturation" @@ -26053,13 +23370,11 @@ msgstr "Ajuster la saturation" #: ../src/ui/widget/selected-style.cpp:1394 #, c-format msgid "" -"Adjusting saturation: was %.3g, now %.3g (diff %.3g); with " -"Ctrl to adjust lightness, with Alt to adjust alpha, without " -"modifiers to adjust hue" +"Adjusting saturation: was %.3g, now %.3g (diff %.3g); with Ctrl to adjust lightness, with Alt to adjust alpha, " +"without modifiers to adjust hue" msgstr "" -"Ajustement de la saturation : valeur précédente %.3g, désormais " -"%.3g (diff. %.3g) ; Ctrl pour ajuster la luminosité, csans touche " -"modificatrice pour ajuster la teinte" +"Ajustement de la saturation : valeur précédente %.3g, désormais %.3g (diff. %.3g) ; Ctrl pour ajuster la luminosité, " +"csans touche modificatrice pour ajuster la teinte" #: ../src/ui/widget/selected-style.cpp:1398 msgid "Adjust lightness" @@ -26068,13 +23383,11 @@ msgstr "Ajuster la luminosité" #: ../src/ui/widget/selected-style.cpp:1400 #, c-format msgid "" -"Adjusting lightness: was %.3g, now %.3g (diff %.3g); with " -"Shift to adjust saturation, with Alt to adjust alpha, without " -"modifiers to adjust hue" +"Adjusting lightness: was %.3g, now %.3g (diff %.3g); with Shift to adjust saturation, with Alt to adjust alpha, " +"without modifiers to adjust hue" msgstr "" -"Ajustement de la luminosité : valeur précédente %.3g, désormais " -"%.3g (diff. %.3g) ; Maj pour ajuster la saturation, Alt " -"pour ajuster l'opacité, sans touche modificatrice pour ajuster la teinte" +"Ajustement de la luminosité : valeur précédente %.3g, désormais %.3g (diff. %.3g) ; Maj pour ajuster la saturation, " +"Alt pour ajuster l'opacité, sans touche modificatrice pour ajuster la teinte" #: ../src/ui/widget/selected-style.cpp:1404 msgid "Adjust hue" @@ -26083,25 +23396,20 @@ msgstr "Ajuster la teinte" #: ../src/ui/widget/selected-style.cpp:1406 #, c-format msgid "" -"Adjusting hue: was %.3g, now %.3g (diff %.3g); with Shift to adjust saturation, with Alt to adjust alpha, with Ctrl " -"to adjust lightness" +"Adjusting hue: was %.3g, now %.3g (diff %.3g); with Shift to adjust saturation, with Alt to adjust alpha, with " +"Ctrl to adjust lightness" msgstr "" -"Ajustement de la teinte : valeur précédente %.3g, désormais %.3g (diff. %.3g) ; Maj pour ajuster la saturation, Ctrl pour " -"ajuster la luminosité, Alt pour ajuster l'opacité" +"Ajustement de la teinte : valeur précédente %.3g, désormais %.3g (diff. %.3g) ; Maj pour ajuster la saturation, Ctrl pour ajuster la luminosité, Alt pour ajuster l'opacité" -#: ../src/ui/widget/selected-style.cpp:1524 -#: ../src/ui/widget/selected-style.cpp:1538 +#: ../src/ui/widget/selected-style.cpp:1524 ../src/ui/widget/selected-style.cpp:1538 msgid "Adjust stroke width" msgstr "Ajustement de l'épaisseur du contour" #: ../src/ui/widget/selected-style.cpp:1525 #, c-format msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" -msgstr "" -"Ajustement de l'épaisseur du contour : de %.3g vers %.3g (diff " -"%.3g)" +msgstr "Ajustement de l'épaisseur du contour : de %.3g vers %.3g (diff %.3g)" #. TRANSLATORS: "Link" means to _link_ two sliders together #: ../src/ui/widget/spin-scale.cpp:138 ../src/ui/widget/spin-slider.cpp:156 @@ -26162,40 +23470,25 @@ msgstr "Boîte 3D : déplacer le point de fuite" #: ../src/vanishing-point.cpp:330 #, c-format msgid "Finite vanishing point shared by %d box" -msgid_plural "" -"Finite vanishing point shared by %d boxes; drag with Shift to separate selected box(es)" +msgid_plural "Finite vanishing point shared by %d boxes; drag with Shift to separate selected box(es)" msgstr[0] "Point de fuite fini partagé par %d boîte" -msgstr[1] "" -"Point de fuite fini partagé par %d boîtes; cliquer-déplacer " -"avec Maj pour séparer les boîte(s) sélectionnée(s)" +msgstr[1] "Point de fuite fini partagé par %d boîtes; cliquer-déplacer avec Maj pour séparer les boîte(s) sélectionnée(s)" #. This won't make sense any more when infinite VPs are not shown on the canvas, #. but currently we update the status message anyway #: ../src/vanishing-point.cpp:337 #, c-format msgid "Infinite vanishing point shared by %d box" -msgid_plural "" -"Infinite vanishing point shared by %d boxes; drag with " -"Shift to separate selected box(es)" +msgid_plural "Infinite vanishing point shared by %d boxes; drag with Shift to separate selected box(es)" msgstr[0] "Point de fuite infini partagé par %d boîte" -msgstr[1] "" -"Point de fuite infini partagé par %d boîtes; cliquer-déplacer " -"avec Maj pour séparer les boîte(s) sélectionnée(s)" +msgstr[1] "Point de fuite infini partagé par %d boîtes; cliquer-déplacer avec Maj pour séparer les boîte(s) sélectionnée(s)" #: ../src/vanishing-point.cpp:345 #, c-format -msgid "" -"shared by %d box; drag with Shift to separate selected box(es)" -msgid_plural "" -"shared by %d boxes; drag with Shift to separate selected " -"box(es)" -msgstr[0] "" -"partagé par %d boîte; déplacer avec Maj pour séparer les " -"boîte(s) sélectionnée(s)" -msgstr[1] "" -"partagé par %d boîtes; déplacer avec Maj pour séparer la boîte " -"sélectionnée" +msgid "shared by %d box; drag with Shift to separate selected box(es)" +msgid_plural "shared by %d boxes; drag with Shift to separate selected box(es)" +msgstr[0] "partagé par %d boîte; déplacer avec Maj pour séparer les boîte(s) sélectionnée(s)" +msgstr[1] "partagé par %d boîtes; déplacer avec Maj pour séparer la boîte sélectionnée" #: ../src/verbs.cpp:137 msgid "File" @@ -26209,9 +23502,7 @@ msgstr "Étiquette" msgid "Context" msgstr "Contexte" -#: ../src/verbs.cpp:270 ../src/verbs.cpp:2271 -#: ../share/extensions/jessyInk_view.inx.h:1 -#: ../share/extensions/polyhedron_3d.inx.h:26 +#: ../src/verbs.cpp:270 ../src/verbs.cpp:2271 ../share/extensions/jessyInk_view.inx.h:1 ../share/extensions/polyhedron_3d.inx.h:26 msgid "View" msgstr "Vue" @@ -26243,8 +23534,7 @@ msgstr "Transféré sur le calque précédent." msgid "Cannot go before first layer." msgstr "Impossible de transférer sous le premier calque." -#: ../src/verbs.cpp:1295 ../src/verbs.cpp:1362 ../src/verbs.cpp:1398 -#: ../src/verbs.cpp:1404 ../src/verbs.cpp:1428 ../src/verbs.cpp:1443 +#: ../src/verbs.cpp:1295 ../src/verbs.cpp:1362 ../src/verbs.cpp:1398 ../src/verbs.cpp:1404 ../src/verbs.cpp:1428 ../src/verbs.cpp:1443 msgid "No current layer." msgstr "Aucun calque courant." @@ -26429,9 +23719,7 @@ msgstr "_Recharger" #: ../src/verbs.cpp:2405 msgid "Revert to the last saved version of document (changes will be lost)" -msgstr "" -"Recharger le dernier enregistrement du document (les changements seront " -"perdus)" +msgstr "Recharger le dernier enregistrement du document (les changements seront perdus)" #: ../src/verbs.cpp:2406 msgid "Save document" @@ -26467,12 +23755,8 @@ msgid "Clean _up document" msgstr "Nettoyer le doc_ument" #: ../src/verbs.cpp:2415 -msgid "" -"Remove unused definitions (such as gradients or clipping paths) from the <" -"defs> of the document" -msgstr "" -"Retirer les définitions inutilisées (comme des dégradés ou des chemins de " -"découpe) des <defs> du document" +msgid "Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document" +msgstr "Retirer les définitions inutilisées (comme des dégradés ou des chemins de découpe) des <defs> du document" #: ../src/verbs.cpp:2417 msgid "_Import..." @@ -26563,9 +23847,7 @@ msgstr "C_oller" #: ../src/verbs.cpp:2443 msgid "Paste objects from clipboard to mouse point, or paste text" -msgstr "" -"Coller les objets du presse-papiers sous le pointeur de souris, ou coller du " -"texte" +msgstr "Coller les objets du presse-papiers sous le pointeur de souris, ou coller du texte" #: ../src/verbs.cpp:2444 msgid "Paste _Style" @@ -26577,9 +23859,7 @@ msgstr "Appliquer le style de l'objet copié à la sélection" #: ../src/verbs.cpp:2447 msgid "Scale selection to match the size of the copied object" -msgstr "" -"Redimensionner la sélection afin de correspondre aux dimensions de l'objet " -"sélectionné" +msgstr "Redimensionner la sélection afin de correspondre aux dimensions de l'objet sélectionné" #: ../src/verbs.cpp:2448 msgid "Paste _Width" @@ -26587,9 +23867,7 @@ msgstr "Coller la _largeur" #: ../src/verbs.cpp:2449 msgid "Scale selection horizontally to match the width of the copied object" -msgstr "" -"Redimensionne horizontalement la sélection afin d'avoir la largeur de " -"l'objet copié" +msgstr "Redimensionne horizontalement la sélection afin d'avoir la largeur de l'objet copié" #: ../src/verbs.cpp:2450 msgid "Paste _Height" @@ -26597,9 +23875,7 @@ msgstr "Coller la _hauteur" #: ../src/verbs.cpp:2451 msgid "Scale selection vertically to match the height of the copied object" -msgstr "" -"Redimensionne verticalement la sélection afin d'avoir la hauteur de l'objet " -"copié" +msgstr "Redimensionne verticalement la sélection afin d'avoir la hauteur de l'objet copié" #: ../src/verbs.cpp:2452 msgid "Paste Size Separately" @@ -26607,33 +23883,23 @@ msgstr "Coller les dimensions séparément" #: ../src/verbs.cpp:2453 msgid "Scale each selected object to match the size of the copied object" -msgstr "" -"Redimensionner chaque objet sélectionné afin de correspondre aux dimensions " -"de l'objet copié" +msgstr "Redimensionner chaque objet sélectionné afin de correspondre aux dimensions de l'objet copié" #: ../src/verbs.cpp:2454 msgid "Paste Width Separately" msgstr "Coller la largeur séparément" #: ../src/verbs.cpp:2455 -msgid "" -"Scale each selected object horizontally to match the width of the copied " -"object" -msgstr "" -"Redimensionner horizontalement chaque objet sélectionné afin de correspondre " -"à la largeur de l'objet copié" +msgid "Scale each selected object horizontally to match the width of the copied object" +msgstr "Redimensionner horizontalement chaque objet sélectionné afin de correspondre à la largeur de l'objet copié" #: ../src/verbs.cpp:2456 msgid "Paste Height Separately" msgstr "Coller la hauteur séparément" #: ../src/verbs.cpp:2457 -msgid "" -"Scale each selected object vertically to match the height of the copied " -"object" -msgstr "" -"Redimensionner verticalement chaque objet sélectionné afin de correspondre à " -"la hauteur de l'objet copié" +msgid "Scale each selected object vertically to match the height of the copied object" +msgstr "Redimensionner verticalement chaque objet sélectionné afin de correspondre à la hauteur de l'objet copié" #: ../src/verbs.cpp:2458 msgid "Paste _In Place" @@ -26696,12 +23962,8 @@ msgid "Unlin_k Clone" msgstr "_Délier le clone" #: ../src/verbs.cpp:2473 -msgid "" -"Cut the selected clones' links to the originals, turning them into " -"standalone objects" -msgstr "" -"Couper le lien entre le clone sélectionné et son original, le transformant " -"en objet indépendant" +msgid "Cut the selected clones' links to the originals, turning them into standalone objects" +msgstr "Couper le lien entre le clone sélectionné et son original, le transformant en objet indépendant" #: ../src/verbs.cpp:2474 msgid "Relink to Copied" @@ -26709,9 +23971,7 @@ msgstr "Relier à la copie" #: ../src/verbs.cpp:2475 msgid "Relink the selected clones to the object currently on the clipboard" -msgstr "" -"Relier les clones sélectionnés à l'objet actuellement placé dans le presse-" -"papier" +msgstr "Relier les clones sélectionnés à l'objet actuellement placé dans le presse-papier" #: ../src/verbs.cpp:2476 msgid "Select _Original" @@ -26726,9 +23986,7 @@ msgid "Clone original path (LPE)" msgstr "Cloner le chemin original (LPE)" #: ../src/verbs.cpp:2479 -msgid "" -"Creates a new path, applies the Clone original LPE, and refers it to the " -"selected path" +msgid "Creates a new path, applies the Clone original LPE, and refers it to the selected path" msgstr "" #: ../src/verbs.cpp:2480 @@ -26744,12 +24002,8 @@ msgid "Objects to Gu_ides" msgstr "Objets en gu_ides" #: ../src/verbs.cpp:2483 -msgid "" -"Convert selected objects to a collection of guidelines aligned with their " -"edges" -msgstr "" -"Convertir les objets sélectionnés en une collection de guides alignés avec " -"leurs bords" +msgid "Convert selected objects to a collection of guidelines aligned with their edges" +msgstr "Convertir les objets sélectionnés en une collection de guides alignés avec leurs bords" #: ../src/verbs.cpp:2484 msgid "Objects to Patter_n" @@ -26805,19 +24059,15 @@ msgstr "Tout s_électionner dans tous les calques" #: ../src/verbs.cpp:2497 msgid "Select all objects in all visible and unlocked layers" -msgstr "" -"Sélectionner tous les objets dans tous les calques visibles et non " -"verrouillés" +msgstr "Sélectionner tous les objets dans tous les calques visibles et non verrouillés" #: ../src/verbs.cpp:2498 msgid "Fill _and Stroke" msgstr "Remplissage _et contour" #: ../src/verbs.cpp:2499 -msgid "" -"Select all objects with the same fill and stroke as the selected objects" -msgstr "" -"Sélectionner tous les objets de même remplissage et contour que la sélection" +msgid "Select all objects with the same fill and stroke as the selected objects" +msgstr "Sélectionner tous les objets de même remplissage et contour que la sélection" #: ../src/verbs.cpp:2500 msgid "_Fill Color" @@ -26840,24 +24090,16 @@ msgid "Stroke St_yle" msgstr "St_yle du contour" #: ../src/verbs.cpp:2505 -msgid "" -"Select all objects with the same stroke style (width, dash, markers) as the " -"selected objects" -msgstr "" -"Sélectionner tous les objets de même style de contour (épaisseur, " -"pointillés, marqueurs) que la sélection" +msgid "Select all objects with the same stroke style (width, dash, markers) as the selected objects" +msgstr "Sélectionner tous les objets de même style de contour (épaisseur, pointillés, marqueurs) que la sélection" #: ../src/verbs.cpp:2506 msgid "_Object Type" msgstr "Type d'_objet" #: ../src/verbs.cpp:2507 -msgid "" -"Select all objects with the same object type (rect, arc, text, path, bitmap " -"etc) as the selected objects" -msgstr "" -"Sélectionner tous les objets de même type (rectangle, arc, texte, chemin, " -"bitmap, etc.) que la sélection" +msgid "Select all objects with the same object type (rect, arc, text, path, bitmap etc) as the selected objects" +msgstr "Sélectionner tous les objets de même type (rectangle, arc, texte, chemin, bitmap, etc.) que la sélection" #: ../src/verbs.cpp:2508 msgid "In_vert Selection" @@ -26865,9 +24107,7 @@ msgstr "In_verser la sélection" #: ../src/verbs.cpp:2509 msgid "Invert selection (unselect what is selected and select everything else)" -msgstr "" -"Inverser la sélection (désélectionner tout ce qui était sélectionné, et " -"sélectionner tout le reste)" +msgstr "Inverser la sélection (désélectionner tout ce qui était sélectionné, et sélectionner tout le reste)" #: ../src/verbs.cpp:2510 msgid "Invert in All Layers" @@ -26875,8 +24115,7 @@ msgstr "Inverser dans tous les calques" #: ../src/verbs.cpp:2511 msgid "Invert selection in all visible and unlocked layers" -msgstr "" -"Inverser la sélection dans tous les calques visibles et non verrouillés" +msgstr "Inverser la sélection dans tous les calques visibles et non verrouillés" #: ../src/verbs.cpp:2512 msgid "Select Next" @@ -27010,12 +24249,8 @@ msgid "E_xclusion" msgstr "E_xclusion" #: ../src/verbs.cpp:2555 -msgid "" -"Create exclusive OR of selected paths (those parts that belong to only one " -"path)" -msgstr "" -"Créer un OU exclusif des chemins sélectionnés (seules les parties qui " -"n'appartiennent qu'à un seul chemin)" +msgid "Create exclusive OR of selected paths (those parts that belong to only one path)" +msgstr "Créer un OU exclusif des chemins sélectionnés (seules les parties qui n'appartiennent qu'à un seul chemin)" #: ../src/verbs.cpp:2556 msgid "Di_vision" @@ -27127,9 +24362,7 @@ msgstr "Invers_er" #: ../src/verbs.cpp:2595 msgid "Reverse the direction of selected paths (useful for flipping markers)" -msgstr "" -"Inverser la direction des chemins sélectionnés (utile pour retourner des " -"marqueurs)" +msgstr "Inverser la direction des chemins sélectionnés (utile pour retourner des marqueurs)" #: ../src/verbs.cpp:2598 msgid "Create one or more paths from a bitmap by tracing it" @@ -27137,13 +24370,11 @@ msgstr "Créer un ou plusieurs chemin en vectorisant un bitmap" #: ../src/verbs.cpp:2599 msgid "Trace Pixel Art..." -msgstr "Vec_toriser en pixel art..." +msgstr "Vec_toriser du pixel art..." #: ../src/verbs.cpp:2600 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" -msgstr "" -"Créer des chemins en utilisant l'algorithme de Kopt-Lischinski pour " -"vectoriser en pixel art" +msgstr "Créer des chemins en utilisant l'algorithme de Kopt-Lischinski pour vectoriser en pixel art" #: ../src/verbs.cpp:2601 msgid "Make a _Bitmap Copy" @@ -27386,12 +24617,8 @@ msgid "_Flow into Frame" msgstr "_Encadrer" #: ../src/verbs.cpp:2669 -msgid "" -"Put text into a frame (path or shape), creating a flowed text linked to the " -"frame object" -msgstr "" -"Placer du texte dans un cadre (chemin ou forme), créant un texte encadré lié " -"à l'objet cadre" +msgid "Put text into a frame (path or shape), creating a flowed text linked to the frame object" +msgstr "Placer du texte dans un cadre (chemin ou forme), créant un texte encadré lié à l'objet cadre" #: ../src/verbs.cpp:2670 msgid "_Unflow" @@ -27407,8 +24634,7 @@ msgstr "_Convertir en texte" #: ../src/verbs.cpp:2673 msgid "Convert flowed text to regular text object (preserves appearance)" -msgstr "" -"Convertir du texte encadré en objet texte normal (en préservant l'apparence)" +msgstr "Convertir du texte encadré en objet texte normal (en préservant l'apparence)" #: ../src/verbs.cpp:2675 msgid "Flip _Horizontal" @@ -27428,9 +24654,7 @@ msgstr "Retourner verticalement les objets sélectionnés" #: ../src/verbs.cpp:2681 msgid "Apply mask to selection (using the topmost object as mask)" -msgstr "" -"Appliquer un masque à la sélection (en utilisant l'objet le plus au-dessus " -"comme masque)" +msgstr "Appliquer un masque à la sélection (en utilisant l'objet le plus au-dessus comme masque)" #: ../src/verbs.cpp:2683 msgid "Edit mask" @@ -27445,11 +24669,8 @@ msgid "Remove mask from selection" msgstr "Retirer le masque de la sélection" #: ../src/verbs.cpp:2687 -msgid "" -"Apply clipping path to selection (using the topmost object as clipping path)" -msgstr "" -"Appliquer un chemin de découpe à la sélection (en utilisant l'objet le plus " -"au-dessus comme chemin de découpe)" +msgid "Apply clipping path to selection (using the topmost object as clipping path)" +msgstr "Appliquer un chemin de découpe à la sélection (en utilisant l'objet le plus au-dessus comme chemin de découpe)" #: ../src/verbs.cpp:2688 #, fuzzy @@ -27888,9 +25109,7 @@ msgstr "G_uides" #: ../src/verbs.cpp:2795 msgid "Show or hide guides (drag from a ruler to create a guide)" -msgstr "" -"Afficher ou non les guides (pour créer un guide, effectuer un cliquer-" -"déplacer depuis une règle)" +msgstr "Afficher ou non les guides (pour créer un guide, effectuer un cliquer-déplacer depuis une règle)" #: ../src/verbs.cpp:2796 msgid "Enable snapping" @@ -28069,8 +25288,7 @@ msgstr "Passer en mode d'affichage niveaux de gris" #: ../src/verbs.cpp:2841 msgid "Toggle between normal and grayscale color display modes" -msgstr "" -"Alterner entre les modes d'affichage de couleur normal et niveaux de gris" +msgstr "Alterner entre les modes d'affichage de couleur normal et niveaux de gris" #: ../src/verbs.cpp:2843 msgid "Color-managed view" @@ -28078,9 +25296,7 @@ msgstr "Affichage avec gestion des couleurs" #: ../src/verbs.cpp:2844 msgid "Toggle color-managed display for this document window" -msgstr "" -"Alterner entre le mode d'affichage avec gestion des couleurs et le mode " -"normal pour cette fenêtre de document" +msgstr "Alterner entre le mode d'affichage avec gestion des couleurs et le mode normal pour cette fenêtre de document" #: ../src/verbs.cpp:2846 msgid "Ico_n Preview..." @@ -28088,8 +25304,7 @@ msgstr "Aperçu d'_icône..." #: ../src/verbs.cpp:2847 msgid "Open a window to preview objects at different icon resolutions" -msgstr "" -"Ouvrir une fenêtre d'aperçu des objets en icônes à différentes résolutions" +msgstr "Ouvrir une fenêtre d'aperçu des objets en icônes à différentes résolutions" #: ../src/verbs.cpp:2849 msgid "Zoom to fit page in window" @@ -28137,12 +25352,8 @@ msgid "Edit document metadata (to be saved with the document)" msgstr "Éditer les métadonnées du document (enregistrées avec celui-ci)" #: ../src/verbs.cpp:2865 -msgid "" -"Edit objects' colors, gradients, arrowheads, and other fill and stroke " -"properties..." -msgstr "" -"Éditer les couleurs de l'objet, ses dégradés, les têtes de flèches, et " -"autres propriétés de remplissage et contour..." +msgid "Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..." +msgstr "Éditer les couleurs de l'objet, ses dégradés, les têtes de flèches, et autres propriétés de remplissage et contour..." #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon #: ../src/verbs.cpp:2867 @@ -28205,9 +25416,7 @@ msgstr "Historique des annulations" #: ../src/verbs.cpp:2884 msgid "View and select font family, font size and other text properties" -msgstr "" -"Voir et sélectionner une police, une taille de police et autres propriétés " -"de texte" +msgstr "Voir et sélectionner une police, une taille de police et autres propriétés de texte" #: ../src/verbs.cpp:2885 msgid "_XML Editor..." @@ -28258,12 +25467,8 @@ msgid "Create Tiled Clones..." msgstr "Créer un pavage avec des clones..." #: ../src/verbs.cpp:2898 -msgid "" -"Create multiple clones of selected object, arranging them into a pattern or " -"scattering" -msgstr "" -"Créer des clones multiple d'un objet, et les arranger selon un motif ou les " -"disperser" +msgid "Create multiple clones of selected object, arranging them into a pattern or scattering" +msgstr "Créer des clones multiple d'un objet, et les arranger selon un motif ou les disperser" #: ../src/verbs.cpp:2899 msgid "_Object attributes..." @@ -28275,9 +25480,7 @@ msgstr "Éditer les attributs de l'objet..." #: ../src/verbs.cpp:2902 msgid "Edit the ID, locked and visible status, and other object properties" -msgstr "" -"Editer l'Id, les statuts de visibilité et de verrouillage et autres " -"propriétés des objets" +msgstr "Editer l'Id, les statuts de visibilité et de verrouillage et autres propriétés des objets" #: ../src/verbs.cpp:2903 msgid "_Input Devices..." @@ -28285,8 +25488,7 @@ msgstr "Périp_hériques de saisie..." #: ../src/verbs.cpp:2904 msgid "Configure extended input devices, such as a graphics tablet" -msgstr "" -"Configurer les périphériques de saisie étendus, comme une tablette graphique" +msgstr "Configurer les périphériques de saisie étendus, comme une tablette graphique" #: ../src/verbs.cpp:2905 msgid "_Extensions..." @@ -28352,11 +25554,8 @@ msgid "Print Colors..." msgstr "Imprimer les couleurs..." #: ../src/verbs.cpp:2920 -msgid "" -"Select which color separations to render in Print Colors Preview rendermode" -msgstr "" -"Sélectionner quelles séparations de couleur afficher en mode aperçu des " -"couleurs d'impression" +msgid "Select which color separations to render in Print Colors Preview rendermode" +msgstr "Sélectionner quelles séparations de couleur afficher en mode aperçu des couleurs d'impression" #: ../src/verbs.cpp:2921 msgid "_Export PNG Image..." @@ -28432,7 +25631,7 @@ msgstr "Vectorisation de bitmap" #. "tutorial_tracing" #: ../src/verbs.cpp:2943 msgid "Inkscape: Tracing Pixel Art" -msgstr "Inkscape : vectorisation en pixel art" +msgstr "Inkscape : vectoriser du pixel art" #: ../src/verbs.cpp:2944 msgid "Using Trace Pixel Art dialog" @@ -28499,11 +25698,8 @@ msgid "Fit the page to the drawing" msgstr "Ajuster la page au dessin" #: ../src/verbs.cpp:2966 -msgid "" -"Fit the page to the current selection or the drawing if there is no selection" -msgstr "" -"Ajuster la page à la sélection courante ou au dessin s'il n'y a pas de " -"sélection" +msgid "Fit the page to the current selection or the drawing if there is no selection" +msgstr "Ajuster la page à la sélection courante ou au dessin s'il n'y a pas de sélection" #: ../src/verbs.cpp:2970 msgid "Unlock All in All Layers" @@ -28581,19 +25777,16 @@ msgstr "Arc : déplacer début/fin" msgid "Arc: Change open/closed" msgstr "Arc : modifier ouvert/fermé" -#: ../src/widgets/arc-toolbar.cpp:280 ../src/widgets/arc-toolbar.cpp:310 -#: ../src/widgets/rect-toolbar.cpp:260 ../src/widgets/rect-toolbar.cpp:299 -#: ../src/widgets/spiral-toolbar.cpp:210 ../src/widgets/spiral-toolbar.cpp:234 -#: ../src/widgets/star-toolbar.cpp:382 ../src/widgets/star-toolbar.cpp:444 +#: ../src/widgets/arc-toolbar.cpp:280 ../src/widgets/arc-toolbar.cpp:310 ../src/widgets/rect-toolbar.cpp:260 ../src/widgets/rect-toolbar.cpp:299 +#: ../src/widgets/spiral-toolbar.cpp:210 ../src/widgets/spiral-toolbar.cpp:234 ../src/widgets/star-toolbar.cpp:382 +#: ../src/widgets/star-toolbar.cpp:444 msgid "New:" msgstr "Créer :" #. FIXME: implement averaging of all parameters for multiple selected #. gtk_label_set_markup(GTK_LABEL(l), _("Average:")); -#: ../src/widgets/arc-toolbar.cpp:283 ../src/widgets/arc-toolbar.cpp:294 -#: ../src/widgets/rect-toolbar.cpp:268 ../src/widgets/rect-toolbar.cpp:286 -#: ../src/widgets/spiral-toolbar.cpp:212 ../src/widgets/spiral-toolbar.cpp:223 -#: ../src/widgets/star-toolbar.cpp:384 +#: ../src/widgets/arc-toolbar.cpp:283 ../src/widgets/arc-toolbar.cpp:294 ../src/widgets/rect-toolbar.cpp:268 ../src/widgets/rect-toolbar.cpp:286 +#: ../src/widgets/spiral-toolbar.cpp:212 ../src/widgets/spiral-toolbar.cpp:223 ../src/widgets/star-toolbar.cpp:384 msgid "Change:" msgstr "Modifier :" @@ -28659,9 +25852,7 @@ msgstr "État du point de fuite dans la direction X" #: ../src/widgets/box3d-toolbar.cpp:327 msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" -msgstr "" -"Alterner le point de fuite dans la direction X entre « fini » et " -"« infini » (=parallèles)" +msgstr "Alterner le point de fuite dans la direction X entre « fini » et « infini » (=parallèles)" #: ../src/widgets/box3d-toolbar.cpp:342 msgid "Angle in Y direction" @@ -28683,9 +25874,7 @@ msgstr "État du point de fuite dans la direction Y" #: ../src/widgets/box3d-toolbar.cpp:366 msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" -msgstr "" -"Alterner le point de fuite dans la direction Y entre « fini » et " -"« infini » (=parallèles)" +msgstr "Alterner le point de fuite dans la direction Y entre « fini » et « infini » (=parallèles)" #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle in Z direction" @@ -28703,44 +25892,34 @@ msgstr "État du point de fuite dans la direction Z" #: ../src/widgets/box3d-toolbar.cpp:405 msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" -msgstr "" -"Alterner le point de fuite dans la direction Z entre « fini » et " -"« infini » (=parallèles)" +msgstr "Alterner le point de fuite dans la direction Z entre « fini » et « infini » (=parallèles)" #. gint preset_index = ege_select_one_action_get_active( sel ); -#: ../src/widgets/calligraphy-toolbar.cpp:218 -#: ../src/widgets/calligraphy-toolbar.cpp:262 -#: ../src/widgets/calligraphy-toolbar.cpp:267 +#: ../src/widgets/calligraphy-toolbar.cpp:218 ../src/widgets/calligraphy-toolbar.cpp:262 ../src/widgets/calligraphy-toolbar.cpp:267 msgid "No preset" msgstr "Aucune présélection" #. Width -#: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/calligraphy-toolbar.cpp:427 ../src/widgets/eraser-toolbar.cpp:125 msgid "(hairline)" msgstr "(sans épaisseur)" #. Mean #. Rotation #. Scale -#: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:374 -#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 -#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 -#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 -#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 +#: ../src/widgets/calligraphy-toolbar.cpp:427 ../src/widgets/calligraphy-toolbar.cpp:460 ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/pencil-toolbar.cpp:374 ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 +#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 ../src/widgets/spray-toolbar.cpp:235 +#: ../src/widgets/spray-toolbar.cpp:253 ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 #: ../src/widgets/tweak-toolbar.cpp:350 msgid "(default)" msgstr "(défaut)" -#: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/calligraphy-toolbar.cpp:427 ../src/widgets/eraser-toolbar.cpp:125 msgid "(broad stroke)" msgstr " (trait large)" -#: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 +#: ../src/widgets/calligraphy-toolbar.cpp:430 ../src/widgets/eraser-toolbar.cpp:128 msgid "Pen Width" msgstr "Largeur du stylo" @@ -28778,12 +25957,8 @@ msgid "Thinning:" msgstr "Amincissement :" #: ../src/widgets/calligraphy-toolbar.cpp:448 -msgid "" -"How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " -"makes them broader, 0 makes width independent of velocity)" -msgstr "" -"Largeur du tracé en fonction de la vélocité. (>0 la vitesse du tracé diminue " -"sa largeur, <0 l'augmente, 0 ne l'influence pas)" +msgid "How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 makes them broader, 0 makes width independent of velocity)" +msgstr "Largeur du tracé en fonction de la vélocité. (>0 la vitesse du tracé diminue sa largeur, <0 l'augmente, 0 ne l'influence pas)" #. Angle #: ../src/widgets/calligraphy-toolbar.cpp:460 @@ -28802,18 +25977,13 @@ msgstr "(bord droit vers le haut)" msgid "Pen Angle" msgstr "Angle du stylo" -#: ../src/widgets/calligraphy-toolbar.cpp:463 -#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5 +#: ../src/widgets/calligraphy-toolbar.cpp:463 ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5 msgid "Angle:" msgstr "Angle :" #: ../src/widgets/calligraphy-toolbar.cpp:464 -msgid "" -"The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " -"fixation = 0)" -msgstr "" -"Angle de la plume (en degrés; 0 = horizontal; n'a pas d'effet si orientation " -"= 0)" +msgid "The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if fixation = 0)" +msgstr "Angle de la plume (en degrés; 0 = horizontal; n'a pas d'effet si orientation = 0)" #. Fixation #: ../src/widgets/calligraphy-toolbar.cpp:478 @@ -28837,12 +26007,8 @@ msgid "Fixation:" msgstr "Fixité :" #: ../src/widgets/calligraphy-toolbar.cpp:482 -msgid "" -"Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " -"fixed angle)" -msgstr "" -"Comportement de l'angle de la plume (0 = toujours perpendiculaire à la " -"direction du tracé, 100 = invariant)" +msgid "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = fixed angle)" +msgstr "Comportement de l'angle de la plume (0 = toujours perpendiculaire à la direction du tracé, 100 = invariant)" #. Cap Rounding #: ../src/widgets/calligraphy-toolbar.cpp:494 @@ -28870,12 +26036,8 @@ msgid "Caps:" msgstr "Terminaisons :" #: ../src/widgets/calligraphy-toolbar.cpp:499 -msgid "" -"Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " -"round caps)" -msgstr "" -"Augmenter ce paramètre pour que les extrémités du tracé soient plus " -"proéminentes (0 = pas de terminaison, 1 = terminaison arrondie)" +msgid "Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = round caps)" +msgstr "Augmenter ce paramètre pour que les extrémités du tracé soient plus proéminentes (0 = pas de terminaison, 1 = terminaison arrondie)" #. Tremor #: ../src/widgets/calligraphy-toolbar.cpp:511 @@ -28958,26 +26120,19 @@ msgstr "Inertie :" #: ../src/widgets/calligraphy-toolbar.cpp:550 msgid "Increase to make the pen drag behind, as if slowed by inertia" -msgstr "" -"Augmenter ce paramètre pour que la plume traîne, ralentie par son inertie" +msgstr "Augmenter ce paramètre pour que la plume traîne, ralentie par son inertie" #: ../src/widgets/calligraphy-toolbar.cpp:565 msgid "Trace Background" msgstr "Tracer selon le fond" #: ../src/widgets/calligraphy-toolbar.cpp:566 -msgid "" -"Trace the lightness of the background by the width of the pen (white - " -"minimum width, black - maximum width)" -msgstr "" -"Imiter la luminosité de l'arrière-plan avec l'épaisseur du trait (blanc - " -"trait fin, noir - trait épais)" +msgid "Trace the lightness of the background by the width of the pen (white - minimum width, black - maximum width)" +msgstr "Imiter la luminosité de l'arrière-plan avec l'épaisseur du trait (blanc - trait fin, noir - trait épais)" #: ../src/widgets/calligraphy-toolbar.cpp:579 msgid "Use the pressure of the input device to alter the width of the pen" -msgstr "" -"Utiliser la pression du périphérique d'entrée pour modifier la largeur de la " -"plume" +msgstr "Utiliser la pression du périphérique d'entrée pour modifier la largeur de la plume" #: ../src/widgets/calligraphy-toolbar.cpp:591 msgid "Tilt" @@ -28985,9 +26140,7 @@ msgstr "Inclinaison" #: ../src/widgets/calligraphy-toolbar.cpp:592 msgid "Use the tilt of the input device to alter the angle of the pen's nib" -msgstr "" -"Utiliser l'inclinaison du périphérique d'entrée pour modifier l'angle de la " -"plume" +msgstr "Utiliser l'inclinaison du périphérique d'entrée pour modifier l'angle de la plume" #: ../src/widgets/calligraphy-toolbar.cpp:607 msgid "Choose a preset" @@ -29055,8 +26208,7 @@ msgstr "Espacement :" #: ../src/widgets/connector-toolbar.cpp:357 msgid "The amount of space left around objects by auto-routing connectors" -msgstr "" -"Espace laissé autour des objets par les connecteurs routés automatiquement" +msgstr "Espace laissé autour des objets par les connecteurs routés automatiquement" #: ../src/widgets/connector-toolbar.cpp:368 msgid "Graph" @@ -29080,9 +26232,7 @@ msgstr "Vers le bas" #: ../src/widgets/connector-toolbar.cpp:392 msgid "Make connectors with end-markers (arrows) point downwards" -msgstr "" -"Faire que les connecteurs avec des marqueurs de fin (des flèches) pointent " -"vers le bas" +msgstr "Faire que les connecteurs avec des marqueurs de fin (des flèches) pointent vers le bas" #: ../src/widgets/connector-toolbar.cpp:408 msgid "Do not allow overlapping shapes" @@ -29110,13 +26260,10 @@ msgstr "Z :" #. display the initial welcome message in the statusbar #: ../src/widgets/desktop-widget.cpp:734 -msgid "" -"Welcome to Inkscape! Use shape or freehand tools to create objects; " -"use selector (arrow) to move or transform them." +msgid "Welcome to Inkscape! Use shape or freehand tools to create objects; use selector (arrow) to move or transform them." msgstr "" -"Bienvenue dans Inkscape! Utilisez les formes ou l'outil de dessin à " -"main levée pour créer des objets; utilisez les sélecteurs (flèches) pour les " -"déplacer ou les modifier." +"Bienvenue dans Inkscape! Utilisez les formes ou l'outil de dessin à main levée pour créer des objets; utilisez les sélecteurs (flèches) " +"pour les déplacer ou les modifier." #: ../src/widgets/desktop-widget.cpp:828 msgid "grayscale" @@ -29174,42 +26321,35 @@ msgstr "%s%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:1051 msgid "Color-managed display is enabled in this window" -msgstr "" -"L'affichage avec gestion des couleurs est activé dans cette fenêtre" +msgstr "L'affichage avec gestion des couleurs est activé dans cette fenêtre" #: ../src/widgets/desktop-widget.cpp:1053 msgid "Color-managed display is disabled in this window" -msgstr "" -"L'affichage avec gestion des couleurs est désactivé dans cette fenêtre" +msgstr "L'affichage avec gestion des couleurs est désactivé dans cette fenêtre" #: ../src/widgets/desktop-widget.cpp:1108 #, c-format msgid "" -"Save changes to document \"%s\" before " -"closing?\n" +"Save changes to document \"%s\" before closing?\n" "\n" "If you close without saving, your changes will be discarded." msgstr "" -"Enregistrer les modifications du " -"document « %s » avant de fermer ?\n" +"Enregistrer les modifications du document « %s » avant de fermer ?\n" "\n" "Si vous fermez sans enregistrer, vos modifications seront perdues." -#: ../src/widgets/desktop-widget.cpp:1118 -#: ../src/widgets/desktop-widget.cpp:1177 +#: ../src/widgets/desktop-widget.cpp:1118 ../src/widgets/desktop-widget.cpp:1177 msgid "Close _without saving" msgstr "Fermer _sans enregistrer" #: ../src/widgets/desktop-widget.cpp:1167 #, c-format msgid "" -"The file \"%s\" was saved with a " -"format that may cause data loss!\n" +"The file \"%s\" was saved with a format that may cause data loss!\n" "\n" "Do you want to save this file as Inkscape SVG?" msgstr "" -"Le fichier « %s » a été enregistré " -"dans un format qui peut causer des pertes de données !\n" +"Le fichier « %s » a été enregistré dans un format qui peut causer des pertes de données !\n" "\n" "Voulez-vous enregistrer ce fichier au format SVG Inkscape ?" @@ -29226,12 +26366,8 @@ msgid "Pick opacity" msgstr "Capturer l'opacité" #: ../src/widgets/dropper-toolbar.cpp:91 -msgid "" -"Pick both the color and the alpha (transparency) under cursor; otherwise, " -"pick only the visible color premultiplied by alpha" -msgstr "" -"Capturer à la fois la couleur et l'alpha (opacité) sous le curseur; Sinon, " -"ne capturer que la couleur visible prémultipliée par l'alpha" +msgid "Pick both the color and the alpha (transparency) under cursor; otherwise, pick only the visible color premultiplied by alpha" +msgstr "Capturer à la fois la couleur et l'alpha (opacité) sous le curseur; Sinon, ne capturer que la couleur visible prémultipliée par l'alpha" #: ../src/widgets/dropper-toolbar.cpp:94 msgid "Pick" @@ -29242,11 +26378,8 @@ msgid "Assign opacity" msgstr "Appliquer l'opacité" #: ../src/widgets/dropper-toolbar.cpp:104 -msgid "" -"If alpha was picked, assign it to selection as fill or stroke transparency" -msgstr "" -"Si l'alpha a été capturé, l'appliquer comme transparence de remplissage ou " -"de contour à la sélection" +msgid "If alpha was picked, assign it to selection as fill or stroke transparency" +msgstr "Si l'alpha a été capturé, l'appliquer comme transparence de remplissage ou de contour à la sélection" #: ../src/widgets/dropper-toolbar.cpp:107 msgid "Assign" @@ -29300,8 +26433,7 @@ msgstr "Appliquer un motif de remplissage" msgid "Set pattern on stroke" msgstr "Appliquer un motif à un contour" -#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:953 -#: ../src/widgets/text-toolbar.cpp:1265 +#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:953 ../src/widgets/text-toolbar.cpp:1265 msgid "Font size" msgstr "Taille de police" @@ -29333,8 +26465,7 @@ msgstr "Dupliquer un dégradé" msgid "Edit gradient" msgstr "Éditer le dégradé" -#: ../src/widgets/gradient-selector.cpp:285 -#: ../src/widgets/paint-selector.cpp:233 +#: ../src/widgets/gradient-selector.cpp:285 ../src/widgets/paint-selector.cpp:233 msgid "Swatch" msgstr "Échantillon" @@ -29342,9 +26473,7 @@ msgstr "Échantillon" msgid "Rename gradient" msgstr "Renommer le dégradé" -#: ../src/widgets/gradient-toolbar.cpp:157 -#: ../src/widgets/gradient-toolbar.cpp:170 -#: ../src/widgets/gradient-toolbar.cpp:761 +#: ../src/widgets/gradient-toolbar.cpp:157 ../src/widgets/gradient-toolbar.cpp:170 ../src/widgets/gradient-toolbar.cpp:761 #: ../src/widgets/gradient-toolbar.cpp:1100 msgid "No gradient" msgstr "Pas de dégradés" @@ -29357,8 +26486,7 @@ msgstr "Plusieurs dégradés" msgid "Multiple stops" msgstr "Plusieurs stops" -#: ../src/widgets/gradient-toolbar.cpp:779 -#: ../src/widgets/gradient-vector.cpp:614 +#: ../src/widgets/gradient-toolbar.cpp:779 ../src/widgets/gradient-vector.cpp:614 msgid "No stops in gradient" msgstr "Il n'y a pas de stop dans le dégradé" @@ -29370,8 +26498,7 @@ msgstr "Appliquer un dégradé à un objet" msgid "Set gradient repeat" msgstr "Défini la répétition du dégradé" -#: ../src/widgets/gradient-toolbar.cpp:993 -#: ../src/widgets/gradient-vector.cpp:727 +#: ../src/widgets/gradient-toolbar.cpp:993 ../src/widgets/gradient-vector.cpp:727 msgid "Change gradient stop offset" msgstr "Modifier le décalage d'un stop de dégradé" @@ -29391,33 +26518,27 @@ msgstr "radial" msgid "Create radial (elliptic or circular) gradient" msgstr "Créer un dégradé radial (elliptique ou circulaire)" -#: ../src/widgets/gradient-toolbar.cpp:1047 -#: ../src/widgets/mesh-toolbar.cpp:384 +#: ../src/widgets/gradient-toolbar.cpp:1047 ../src/widgets/mesh-toolbar.cpp:384 msgid "New:" msgstr "Créer :" -#: ../src/widgets/gradient-toolbar.cpp:1070 -#: ../src/widgets/mesh-toolbar.cpp:407 +#: ../src/widgets/gradient-toolbar.cpp:1070 ../src/widgets/mesh-toolbar.cpp:407 msgid "fill" msgstr "remplissage" -#: ../src/widgets/gradient-toolbar.cpp:1070 -#: ../src/widgets/mesh-toolbar.cpp:407 +#: ../src/widgets/gradient-toolbar.cpp:1070 ../src/widgets/mesh-toolbar.cpp:407 msgid "Create gradient in the fill" msgstr "Appliquer le dégradé au remplissage" -#: ../src/widgets/gradient-toolbar.cpp:1074 -#: ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:411 msgid "stroke" msgstr "contour" -#: ../src/widgets/gradient-toolbar.cpp:1074 -#: ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:411 msgid "Create gradient in the stroke" msgstr "Appliquer le dégradé au contour" -#: ../src/widgets/gradient-toolbar.cpp:1077 -#: ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1077 ../src/widgets/mesh-toolbar.cpp:414 msgid "on:" msgstr "sur :" @@ -29453,15 +26574,11 @@ msgstr "Répétition :" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute #: ../src/widgets/gradient-toolbar.cpp:1128 msgid "" -"Whether to fill with flat color beyond the ends of the gradient vector " -"(spreadMethod=\"pad\"), or repeat the gradient in the same direction " -"(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " -"directions (spreadMethod=\"reflect\")" +"Whether to fill with flat color beyond the ends of the gradient vector (spreadMethod=\"pad\"), or repeat the gradient in the same direction " +"(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite directions (spreadMethod=\"reflect\")" msgstr "" -"Prolongement du dégradé au delà de la définition de son vecteur : prolonger " -"par une zone uniforme de la dernière couleur (aucune, spreadMethod=\"pad\"), " -"répéter le dégradé (directe, spreadMethod=\"repeat\") ou le réfléchir " -"(réflection, spreadMethod=\"reflect\")" +"Prolongement du dégradé au delà de la définition de son vecteur : prolonger par une zone uniforme de la dernière couleur (aucune, spreadMethod=" +"\"pad\"), répéter le dégradé (directe, spreadMethod=\"repeat\") ou le réfléchir (réflection, spreadMethod=\"reflect\")" #: ../src/widgets/gradient-toolbar.cpp:1133 msgid "Repeat:" @@ -29484,8 +26601,7 @@ msgid "Stops:" msgstr "Stops :" #. Label -#: ../src/widgets/gradient-toolbar.cpp:1162 -#: ../src/widgets/gradient-vector.cpp:916 +#: ../src/widgets/gradient-toolbar.cpp:1162 ../src/widgets/gradient-vector.cpp:916 msgctxt "Gradient" msgid "Offset:" msgstr "Décalage :" @@ -29494,14 +26610,11 @@ msgstr "Décalage :" msgid "Offset of selected stop" msgstr "Décalage du stop sélectionné" -#: ../src/widgets/gradient-toolbar.cpp:1180 -#: ../src/widgets/gradient-toolbar.cpp:1181 +#: ../src/widgets/gradient-toolbar.cpp:1180 ../src/widgets/gradient-toolbar.cpp:1181 msgid "Insert new stop" msgstr "Insérer un stop" -#: ../src/widgets/gradient-toolbar.cpp:1194 -#: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-vector.cpp:898 +#: ../src/widgets/gradient-toolbar.cpp:1194 ../src/widgets/gradient-toolbar.cpp:1195 ../src/widgets/gradient-vector.cpp:898 msgid "Delete stop" msgstr "Supprimer un stop" @@ -29517,9 +26630,7 @@ msgstr "Lier les dégradés" msgid "Link gradients to change all related gradients" msgstr "Lier et modifier tous les dégradés associés" -#: ../src/widgets/gradient-vector.cpp:317 -#: ../src/widgets/paint-selector.cpp:965 -#: ../src/widgets/stroke-marker-selector.cpp:154 +#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965 ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "Aucun document sélectionné" @@ -29594,12 +26705,8 @@ msgid "Get limiting bounding box from selection" msgstr "Obtenir la boîte englobante limite à partir de la sélection" #: ../src/widgets/lpe-toolbar.cpp:348 -msgid "" -"Set limiting bounding box (used to cut infinite lines) to the bounding box " -"of current selection" -msgstr "" -"Définir la boîte englobante limite (utilisée pour couper les lignes " -"infinies) à la boîte englobante de la sélection" +msgid "Set limiting bounding box (used to cut infinite lines) to the bounding box of current selection" +msgstr "Définir la boîte englobante limite (utilisée pour couper les lignes infinies) à la boîte englobante de la sélection" #: ../src/widgets/lpe-toolbar.cpp:360 msgid "Choose a line segment type" @@ -29614,8 +26721,7 @@ msgid "Display measuring info for selected items" msgstr "Affiche les informations de mesure pour la sélection" #. Add the units menu. -#: ../src/widgets/lpe-toolbar.cpp:387 ../src/widgets/node-toolbar.cpp:613 -#: ../src/widgets/paintbucket-toolbar.cpp:167 +#: ../src/widgets/lpe-toolbar.cpp:387 ../src/widgets/node-toolbar.cpp:613 ../src/widgets/paintbucket-toolbar.cpp:167 #: ../src/widgets/rect-toolbar.cpp:378 ../src/widgets/select-toolbar.cpp:538 msgid "Units" msgstr "Unités" @@ -29626,9 +26732,7 @@ msgstr "Ouvrir la boîte de dialogue des effets de chemin" #: ../src/widgets/lpe-toolbar.cpp:398 msgid "Open LPE dialog (to adapt parameters numerically)" -msgstr "" -"Ouvrir la boîte de dialogue des effets de chemin (pour adapter les " -"paramètres numériquement)" +msgstr "Ouvrir la boîte de dialogue des effets de chemin (pour adapter les paramètres numériquement)" #: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1268 msgid "Font Size" @@ -29642,8 +26746,7 @@ msgstr "Taille de police :" msgid "The font size to be used in the measurement labels" msgstr "Taille de police à utiliser pour les labels des mesures" -#: ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/widgets/measure-toolbar.cpp:99 ../src/widgets/measure-toolbar.cpp:107 msgid "The units to be used for the measurements" msgstr "Unité à utiliser pour les mesures" @@ -29672,9 +26775,7 @@ msgstr "Créer un dégradé conique" msgid "Rows" msgstr "Lignes" -#: ../src/widgets/mesh-toolbar.cpp:436 -#: ../share/extensions/guides_creator.inx.h:5 -#: ../share/extensions/layout_nup.inx.h:12 +#: ../src/widgets/mesh-toolbar.cpp:436 ../share/extensions/guides_creator.inx.h:5 ../share/extensions/layout_nup.inx.h:12 msgid "Rows:" msgstr "Lignes :" @@ -29686,8 +26787,7 @@ msgstr "Nombre de lignes dans le nouveau filet" msgid "Columns" msgstr "Colonnes" -#: ../src/widgets/mesh-toolbar.cpp:452 -#: ../share/extensions/guides_creator.inx.h:4 +#: ../src/widgets/mesh-toolbar.cpp:452 ../share/extensions/guides_creator.inx.h:4 msgid "Columns:" msgstr "Colonnes :" @@ -29765,9 +26865,7 @@ msgid "Make elliptical" msgstr "Rendre italique" #: ../src/widgets/mesh-toolbar.cpp:546 -msgid "" -"Make selected sides elliptical by changing length of handles. Works best if " -"handles already approximate ellipse." +msgid "Make selected sides elliptical by changing length of handles. Works best if handles already approximate ellipse." msgstr "" #: ../src/widgets/mesh-toolbar.cpp:549 @@ -29807,8 +26905,7 @@ msgstr "Insérer un nœud à l'abscisse minimale" #: ../src/widgets/node-toolbar.cpp:357 msgid "Insert new nodes at min X into selected segments" -msgstr "" -"Insérer de nouveaux nœuds à l'abscisse minimale des segments sélectionnés" +msgstr "Insérer de nouveaux nœuds à l'abscisse minimale des segments sélectionnés" #: ../src/widgets/node-toolbar.cpp:360 msgid "Insert min X" @@ -29820,8 +26917,7 @@ msgstr "Insérer un nœud à l'abscisse maximale" #: ../src/widgets/node-toolbar.cpp:367 msgid "Insert new nodes at max X into selected segments" -msgstr "" -"Insérer de nouveaux nœuds à l'abscisse maximale des segments sélectionnés" +msgstr "Insérer de nouveaux nœuds à l'abscisse maximale des segments sélectionnés" #: ../src/widgets/node-toolbar.cpp:370 msgid "Insert max X" @@ -29833,8 +26929,7 @@ msgstr "Insérer un nœud à l'ordonnée minimale" #: ../src/widgets/node-toolbar.cpp:377 msgid "Insert new nodes at min Y into selected segments" -msgstr "" -"Insérer de nouveaux nœuds à l'ordonnée minimale des segments sélectionnés" +msgstr "Insérer de nouveaux nœuds à l'ordonnée minimale des segments sélectionnés" #: ../src/widgets/node-toolbar.cpp:380 msgid "Insert min Y" @@ -29846,8 +26941,7 @@ msgstr "Insérer un nœud à l'ordonnée maximale" #: ../src/widgets/node-toolbar.cpp:387 msgid "Insert new nodes at max Y into selected segments" -msgstr "" -"Insérer de nouveaux nœuds à l'ordonnée maximale des segments sélectionnés" +msgstr "Insérer de nouveaux nœuds à l'ordonnée maximale des segments sélectionnés" #: ../src/widgets/node-toolbar.cpp:390 msgid "Insert max Y" @@ -30012,20 +27106,14 @@ msgstr "Remplissage indéfini (permettant ainsi qu'il soit hérité)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty #: ../src/widgets/paint-selector.cpp:252 -msgid "" -"Any path self-intersections or subpaths create holes in the fill (fill-rule: " -"evenodd)" +msgid "Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)" msgstr "" -"Toute intersection d'un chemin avec lui-même ou avec un de ses sous-chemins " -"engendrera des lacunes dans le remplissage (fill-rule: evenodd)" +"Toute intersection d'un chemin avec lui-même ou avec un de ses sous-chemins engendrera des lacunes dans le remplissage (fill-rule: evenodd)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty #: ../src/widgets/paint-selector.cpp:263 -msgid "" -"Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" -msgstr "" -"Le remplissage est sans lacune, sauf si un sous-chemin est en sens inverse " -"(fill-rule: nonzero)" +msgid "Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" +msgstr "Le remplissage est sans lacune, sauf si un sous-chemin est en sens inverse (fill-rule: nonzero)" #: ../src/widgets/paint-selector.cpp:605 msgid "No objects" @@ -30063,13 +27151,11 @@ msgstr "Dégradé linéaire" #: ../src/widgets/paint-selector.cpp:1098 msgid "" -"Use the Node tool to adjust position, scale, and rotation of the " -"pattern on canvas. Use Object > Pattern > Objects to Pattern to " -"create a new pattern from selection." +"Use the Node tool to adjust position, scale, and rotation of the pattern on canvas. Use Object > Pattern > Objects to Pattern to create a new pattern from selection." msgstr "" -"Utiliser l'outil nœud pour ajuster la position, l'échelle et l'angle " -"du motif sur la zone de travail. Utiliser Objet > Motifs > Objets " -"en Motif pour créer un nouveau motif à partir de la sélection." +"Utiliser l'outil nœud pour ajuster la position, l'échelle et l'angle du motif sur la zone de travail. Utiliser Objet > Motifs " +"> Objets en Motif pour créer un nouveau motif à partir de la sélection." #: ../src/widgets/paint-selector.cpp:1111 msgid "Pattern fill" @@ -30092,12 +27178,8 @@ msgid "Fill Threshold" msgstr "Seuil de remplissage :" #: ../src/widgets/paintbucket-toolbar.cpp:148 -msgid "" -"The maximum allowed difference between the clicked pixel and the neighboring " -"pixels to be counted in the fill" -msgstr "" -"La différence maximale entre le pixel du clic et les pixels voisins pour " -"qu'ils soient ajoutés dans le remplissage" +msgid "The maximum allowed difference between the clicked pixel and the neighboring pixels to be counted in the fill" +msgstr "La différence maximale entre le pixel du clic et les pixels voisins pour qu'ils soient ajoutés dans le remplissage" #: ../src/widgets/paintbucket-toolbar.cpp:175 msgid "Grow/shrink by" @@ -30108,11 +27190,8 @@ msgid "Grow/shrink by:" msgstr "Agrandir/rétrécir de :" #: ../src/widgets/paintbucket-toolbar.cpp:176 -msgid "" -"The amount to grow (positive) or shrink (negative) the created fill path" -msgstr "" -"Agrandit (si positif) ou rétrécit (si négatif) de cette quantité le chemin " -"créé par remplissage." +msgid "The amount to grow (positive) or shrink (negative) the created fill path" +msgstr "Agrandit (si positif) ou rétrécit (si négatif) de cette quantité le chemin créé par remplissage." #: ../src/widgets/paintbucket-toolbar.cpp:199 msgid "Close gaps" @@ -30122,19 +27201,14 @@ msgstr "Combler les vides" msgid "Close gaps:" msgstr "Combler les vides :" -#: ../src/widgets/paintbucket-toolbar.cpp:211 -#: ../src/widgets/pencil-toolbar.cpp:398 ../src/widgets/spiral-toolbar.cpp:285 +#: ../src/widgets/paintbucket-toolbar.cpp:211 ../src/widgets/pencil-toolbar.cpp:398 ../src/widgets/spiral-toolbar.cpp:285 #: ../src/widgets/star-toolbar.cpp:564 msgid "Defaults" msgstr "R-à-z" #: ../src/widgets/paintbucket-toolbar.cpp:212 -msgid "" -"Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " -"to change defaults)" -msgstr "" -"Restaurer les préférences par défaut de l'outil de remplissage au seau " -"(changez les valeurs par défaut dans Inkscape Préférences>Outils)" +msgid "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools to change defaults)" +msgstr "Restaurer les préférences par défaut de l'outil de remplissage au seau (changez les valeurs par défaut dans Inkscape Préférences>Outils)" #: ../src/widgets/pencil-toolbar.cpp:108 msgid "Bezier" @@ -30225,12 +27299,8 @@ msgid "How much smoothing (simplifying) is applied to the line" msgstr "Quel niveau de lissage (simplification) est appliqué à la ligne" #: ../src/widgets/pencil-toolbar.cpp:399 -msgid "" -"Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " -"change defaults)" -msgstr "" -"Restaurer les préférences du crayon par défaut (changez les valeurs par " -"défaut dans Préférences d'Inkscape>Outils)" +msgid "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to change defaults)" +msgstr "Restaurer les préférences du crayon par défaut (changez les valeurs par défaut dans Préférences d'Inkscape>Outils)" #: ../src/widgets/pencil-toolbar.cpp:409 ../src/widgets/pencil-toolbar.cpp:410 msgid "LPE based interactive simplify" @@ -30338,65 +27408,43 @@ msgstr "Transformer via la barre d'outils" #: ../src/widgets/select-toolbar.cpp:341 msgid "Now stroke width is scaled when objects are scaled." -msgstr "" -"Maintenant l'épaisseur de contour est redimensionnée quand les " -"objets sont redimensionnés." +msgstr "Maintenant l'épaisseur de contour est redimensionnée quand les objets sont redimensionnés." #: ../src/widgets/select-toolbar.cpp:343 msgid "Now stroke width is not scaled when objects are scaled." -msgstr "" -"Maintenant l'épaisseur de contour n'est pas redimensionnée " -"quand les objets sont redimensionnés." +msgstr "Maintenant l'épaisseur de contour n'est pas redimensionnée quand les objets sont redimensionnés." #: ../src/widgets/select-toolbar.cpp:354 -msgid "" -"Now rounded rectangle corners are scaled when rectangles are " -"scaled." -msgstr "" -"Maintenant les coins arrondis de rectangles sont redimensionnés quand les rectangles sont redimensionnés." +msgid "Now rounded rectangle corners are scaled when rectangles are scaled." +msgstr "Maintenant les coins arrondis de rectangles sont redimensionnés quand les rectangles sont redimensionnés." #: ../src/widgets/select-toolbar.cpp:356 -msgid "" -"Now rounded rectangle corners are not scaled when rectangles " -"are scaled." -msgstr "" -"Maintenant les coins arrondis de rectangles ne sont pas " -"redimensionnés quand les rectangles sont redimensionnés." +msgid "Now rounded rectangle corners are not scaled when rectangles are scaled." +msgstr "Maintenant les coins arrondis de rectangles ne sont pas redimensionnés quand les rectangles sont redimensionnés." #: ../src/widgets/select-toolbar.cpp:367 -msgid "" -"Now gradients are transformed along with their objects when " -"those are transformed (moved, scaled, rotated, or skewed)." +msgid "Now gradients are transformed along with their objects when those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -"Maintenant les dégradés sont transformés lors des " -"transformations de leurs objets (déplacement, redimensionnement, rotation ou " +"Maintenant les dégradés sont transformés lors des transformations de leurs objets (déplacement, redimensionnement, rotation ou " "inclinaison)." #: ../src/widgets/select-toolbar.cpp:369 -msgid "" -"Now gradients remain fixed when objects are transformed " -"(moved, scaled, rotated, or skewed)." +msgid "Now gradients remain fixed when objects are transformed (moved, scaled, rotated, or skewed)." msgstr "" -"Maintenant les dégradés restent fixes lors des transformations " -"de leurs objets (déplacement, redimensionnement, rotation, ou inclinaison)." +"Maintenant les dégradés restent fixes lors des transformations de leurs objets (déplacement, redimensionnement, rotation, ou " +"inclinaison)." #: ../src/widgets/select-toolbar.cpp:380 -msgid "" -"Now patterns are transformed along with their objects when " -"those are transformed (moved, scaled, rotated, or skewed)." +msgid "Now patterns are transformed along with their objects when those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -"Maintenant les motifs sont transformés lors des " -"transformations de leurs objets (déplacement, redimensionnement, rotation ou " +"Maintenant les motifs sont transformés lors des transformations de leurs objets (déplacement, redimensionnement, rotation ou " "inclinaison)." #: ../src/widgets/select-toolbar.cpp:382 -msgid "" -"Now patterns remain fixed when objects are transformed (moved, " -"scaled, rotated, or skewed)." +msgid "Now patterns remain fixed when objects are transformed (moved, scaled, rotated, or skewed)." msgstr "" -"Maintenant les motifs restent fixes lors des transformations " -"de leurs objets (déplacement, redimensionnement, rotation, ou inclinaison)." +"Maintenant les motifs restent fixes lors des transformations de leurs objets (déplacement, redimensionnement, rotation, ou " +"inclinaison)." #. four spinbuttons #: ../src/widgets/select-toolbar.cpp:500 @@ -30447,8 +27495,7 @@ msgstr "Verrouiller la largeur et la hauteur" #: ../src/widgets/select-toolbar.cpp:522 msgid "When locked, change both width and height by the same proportion" -msgstr "" -"Si coché, la hauteur et la largeur sont modifiées selon la même proportion" +msgstr "Si coché, la hauteur et la largeur sont modifiées selon la même proportion" #: ../src/widgets/select-toolbar.cpp:531 msgctxt "Select toolbar" @@ -30574,16 +27621,11 @@ msgstr "Rayon intérieur :" #: ../src/widgets/spiral-toolbar.cpp:273 msgid "Radius of the innermost revolution (relative to the spiral size)" -msgstr "" -"Rayon de la révolution intérieure (relatif aux dimensions de la spirale)" +msgstr "Rayon de la révolution intérieure (relatif aux dimensions de la spirale)" #: ../src/widgets/spiral-toolbar.cpp:286 ../src/widgets/star-toolbar.cpp:565 -msgid "" -"Reset shape parameters to defaults (use Inkscape Preferences > Tools to " -"change defaults)" -msgstr "" -"Restaurer les préférences de la forme par défaut (changez les valeurs par " -"défaut dans Inkscape Préférences>Outils)" +msgid "Reset shape parameters to defaults (use Inkscape Preferences > Tools to change defaults)" +msgstr "Restaurer les préférences de la forme par défaut (changez les valeurs par défaut dans Inkscape Préférences>Outils)" #. Width #: ../src/widgets/spray-toolbar.cpp:113 @@ -30596,9 +27638,7 @@ msgstr "(pulvérisation large)" #: ../src/widgets/spray-toolbar.cpp:116 msgid "The width of the spray area (relative to the visible canvas area)" -msgstr "" -"Largeur de la zone de pulvérisation (relativement à la zone de travail " -"visible)" +msgstr "Largeur de la zone de pulvérisation (relativement à la zone de travail visible)" #: ../src/widgets/spray-toolbar.cpp:129 msgid "(maximum mean)" @@ -30614,9 +27654,7 @@ msgstr "Rayon :" #: ../src/widgets/spray-toolbar.cpp:132 msgid "0 to spray a spot; increase to enlarge the ring radius" -msgstr "" -"0 pour pulvériser sur un seul endroit ; augmenter pour élargir le rayon de " -"pulvérisation" +msgstr "0 pour pulvériser sur un seul endroit ; augmenter pour élargir le rayon de pulvérisation" #. Standard_deviation #: ../src/widgets/spray-toolbar.cpp:145 @@ -30679,11 +27717,8 @@ msgid "Adjusts the number of items sprayed per click" msgstr "Ajuste le nombre de d'éléments pulvérisés par clic" #: ../src/widgets/spray-toolbar.cpp:225 -msgid "" -"Use the pressure of the input device to alter the amount of sprayed objects" -msgstr "" -"Utiliser la pression du périphérique d'entrée pour modifier la quantité " -"d'objets pulvérisés" +msgid "Use the pressure of the input device to alter the amount of sprayed objects" +msgstr "Utiliser la pression du périphérique d'entrée pour modifier la quantité d'objets pulvérisés" #: ../src/widgets/spray-toolbar.cpp:235 msgid "(high rotation variation)" @@ -30699,12 +27734,8 @@ msgstr "Rotation :" #: ../src/widgets/spray-toolbar.cpp:240 #, no-c-format -msgid "" -"Variation of the rotation of the sprayed objects; 0% for the same rotation " -"than the original object" -msgstr "" -"Variation de rotation des objets pulvérisés ; 0 % pour utiliser la même " -"rotation que l'objet original" +msgid "Variation of the rotation of the sprayed objects; 0% for the same rotation than the original object" +msgstr "Variation de rotation des objets pulvérisés ; 0 % pour utiliser la même rotation que l'objet original" #: ../src/widgets/spray-toolbar.cpp:253 msgid "(high scale variation)" @@ -30722,12 +27753,8 @@ msgstr "Échelle :" #: ../src/widgets/spray-toolbar.cpp:258 #, no-c-format -msgid "" -"Variation in the scale of the sprayed objects; 0% for the same scale than " -"the original object" -msgstr "" -"Variation de l'échelle des objets pulvérisés ; 0 % pour utiliser la même " -"taille que l'objet original" +msgid "Variation in the scale of the sprayed objects; 0% for the same scale than the original object" +msgstr "Variation de l'échelle des objets pulvérisés ; 0 % pour utiliser la même taille que l'objet original" #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" @@ -30977,21 +28004,15 @@ msgstr "Marqueurs :" #: ../src/widgets/stroke-style.cpp:358 msgid "Start Markers are drawn on the first node of a path or shape" -msgstr "" -"Les marqueurs de début sont dessinés sur le premier nœud d'un chemin ou objet" +msgstr "Les marqueurs de début sont dessinés sur le premier nœud d'un chemin ou objet" #: ../src/widgets/stroke-style.cpp:367 -msgid "" -"Mid Markers are drawn on every node of a path or shape except the first and " -"last nodes" -msgstr "" -"Les marqueurs intermédiaires sont dessinés sur chaque nœud d'un chemin ou " -"objet, à l'exception du premier et du dernier" +msgid "Mid Markers are drawn on every node of a path or shape except the first and last nodes" +msgstr "Les marqueurs intermédiaires sont dessinés sur chaque nœud d'un chemin ou objet, à l'exception du premier et du dernier" #: ../src/widgets/stroke-style.cpp:376 msgid "End Markers are drawn on the last node of a path or shape" -msgstr "" -"Les marqueurs de fin sont dessinés sur le dernier nœud d'un chemin ou objet" +msgstr "Les marqueurs de fin sont dessinés sur le dernier nœud d'un chemin ou objet" #: ../src/widgets/stroke-style.cpp:498 msgid "Set markers" @@ -31135,8 +28156,7 @@ msgstr "Orientation du texte" msgid "Smaller spacing" msgstr "Espacement plus faible" -#: ../src/widgets/text-toolbar.cpp:1435 ../src/widgets/text-toolbar.cpp:1466 -#: ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1435 ../src/widgets/text-toolbar.cpp:1466 ../src/widgets/text-toolbar.cpp:1497 msgctxt "Text tool" msgid "Normal" msgstr "Normal" @@ -31358,8 +28378,7 @@ msgstr "Nœuds doux" #: ../src/widgets/toolbox.cpp:1765 msgid "Snap smooth nodes, incl. quadrant points of ellipses" -msgstr "" -"Aimanter aux points de rebroussement, points de quadrant des ellipses inclus" +msgstr "Aimanter aux points de rebroussement, points de quadrant des ellipses inclus" #: ../src/widgets/toolbox.cpp:1774 msgid "Line Midpoints" @@ -31375,9 +28394,7 @@ msgstr "Autres" #: ../src/widgets/toolbox.cpp:1783 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" -msgstr "" -"Aimanter à d'autres points (centres, origines de guide, poignées de " -"gradients, etc.)" +msgstr "Aimanter à d'autres points (centres, origines de guide, poignées de gradients, etc.)" #: ../src/widgets/toolbox.cpp:1791 msgid "Object Centers" @@ -31430,8 +28447,7 @@ msgstr "(ajustement large)" #: ../src/widgets/tweak-toolbar.cpp:128 msgid "The width of the tweak area (relative to the visible canvas area)" -msgstr "" -"Largeur de la zone d'ajustement (relativement à la zone de travail visible)" +msgstr "Largeur de la zone d'ajustement (relativement à la zone de travail visible)" #. Force #: ../src/widgets/tweak-toolbar.cpp:142 @@ -31492,8 +28508,7 @@ msgstr "Mode rotation" #: ../src/widgets/tweak-toolbar.cpp:192 msgid "Rotate objects, with Shift counterclockwise" -msgstr "" -"Applique une rotation dans le sens horaire ; avec Maj, le sens est inversé" +msgstr "Applique une rotation dans le sens horaire ; avec Maj, le sens est inversé" #: ../src/widgets/tweak-toolbar.cpp:198 msgid "Duplicate/delete mode" @@ -31525,8 +28540,7 @@ msgstr "Mode attraction/répulsion" #: ../src/widgets/tweak-toolbar.cpp:220 msgid "Attract parts of paths towards cursor; with Shift from cursor" -msgstr "" -"Attire les chemins vers le curseur ; avec Maj, éloigne les chemins du curseur" +msgstr "Attire les chemins vers le curseur ; avec Maj, éloigne les chemins du curseur" #: ../src/widgets/tweak-toolbar.cpp:226 msgid "Roughen mode" @@ -31625,18 +28639,12 @@ msgid "Fidelity:" msgstr "Fidélité:" #: ../src/widgets/tweak-toolbar.cpp:354 -msgid "" -"Low fidelity simplifies paths; high fidelity preserves path features but may " -"generate a lot of new nodes" -msgstr "" -"Une basse fidélité simplifie les chemins; Une haute fidélité préserve les " -"propriétés des chemins mais peut ajouter de nombreux nœuds." +msgid "Low fidelity simplifies paths; high fidelity preserves path features but may generate a lot of new nodes" +msgstr "Une basse fidélité simplifie les chemins; Une haute fidélité préserve les propriétés des chemins mais peut ajouter de nombreux nœuds." #: ../src/widgets/tweak-toolbar.cpp:373 msgid "Use the pressure of the input device to alter the force of tweak action" -msgstr "" -"Utiliser la pression du périphérique d'entrée pour modifier la force de " -"l'outil" +msgstr "Utiliser la pression du périphérique d'entrée pour modifier la force de l'outil" #: ../share/extensions/convert2dashes.py:100 msgid "" @@ -31652,9 +28660,7 @@ msgstr "Veuillez sélectionner un objet." #: ../share/extensions/dimension.py:134 msgid "Unable to process this object. Try changing it into a path first." -msgstr "" -"Traitement de l'objet impossible. Essayer tout d'abord de le transformer en " -"chemin." +msgstr "Traitement de l'objet impossible. Essayer tout d'abord de le transformer en chemin." #. report to the Inkscape console using errormsg #: ../share/extensions/draw_from_triangle.py:180 @@ -31691,23 +28697,15 @@ msgstr "Aire (px²) :" #: ../share/extensions/dxf_input.py:528 #, python-format -msgid "" -"%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert " -"to Release 13 format using QCad." +msgid "%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert to Release 13 format using QCad." msgstr "" #: ../share/extensions/dxf_outlines.py:49 -msgid "" -"Failed to import the numpy or numpy.linalg modules. These modules are " -"required by this extension. Please install them and try again." -msgstr "" -"Échec lors de l'import des modules numpy.linalg. Ces modules sont " -"nécessaires à cette extension. Veuillez les installer et réessayer." +msgid "Failed to import the numpy or numpy.linalg modules. These modules are required by this extension. Please install them and try again." +msgstr "Échec lors de l'import des modules numpy.linalg. Ces modules sont nécessaires à cette extension. Veuillez les installer et réessayer." #: ../share/extensions/dxf_outlines.py:315 -msgid "" -"Error: Field 'Layer match name' must be filled when using 'By name match' " -"option" +msgid "Error: Field 'Layer match name' must be filled when using 'By name match' option" msgstr "" #: ../share/extensions/dxf_outlines.py:356 @@ -31716,12 +28714,9 @@ msgid "Warning: Layer '%s' not found!" msgstr "Attention : calque '%s' introuvable !" #: ../share/extensions/embedimage.py:84 -msgid "" -"No xlink:href or sodipodi:absref attributes found, or they do not point to " -"an existing file! Unable to embed image." +msgid "No xlink:href or sodipodi:absref attributes found, or they do not point to an existing file! Unable to embed image." msgstr "" -"Les attributs xlink:href et sodipodi:absref n'ont pas été trouvés, ou " -"n'indiquent pas un fichier existant ! Impossible d'incorporer l'image." +"Les attributs xlink:href et sodipodi:absref n'ont pas été trouvés, ou n'indiquent pas un fichier existant ! Impossible d'incorporer l'image." #: ../share/extensions/embedimage.py:86 #, python-format @@ -31730,20 +28725,12 @@ msgstr "Désolé, nous ne pouvons pas localiser %s" #: ../share/extensions/embedimage.py:111 #, python-format -msgid "" -"%s is not of type image/png, image/jpeg, image/bmp, image/gif, image/tiff, " -"or image/x-icon" -msgstr "" -"%s n'est pas du type image/png, image/jpeg, image/bmp, image/gif, image/" -"tiff, ou image/x-icon" +msgid "%s is not of type image/png, image/jpeg, image/bmp, image/gif, image/tiff, or image/x-icon" +msgstr "%s n'est pas du type image/png, image/jpeg, image/bmp, image/gif, image/tiff, ou image/x-icon" #: ../share/extensions/export_gimp_palette.py:16 -msgid "" -"The export_gpl.py module requires PyXML. Please download the latest version " -"from http://pyxml.sourceforge.net/." -msgstr "" -"Le module d'exportation _gpl.py nécessite PyXML. Veuillez en télécharger la " -"dernière version à l'adresse http://pyxml.sourceforge.net/." +msgid "The export_gpl.py module requires PyXML. Please download the latest version from http://pyxml.sourceforge.net/." +msgstr "Le module d'exportation _gpl.py nécessite PyXML. Veuillez en télécharger la dernière version à l'adresse http://pyxml.sourceforge.net/." #: ../share/extensions/extractimage.py:68 #, python-format @@ -31760,46 +28747,30 @@ msgstr "Au moins deux chemins doivent être sélectionnés" #: ../share/extensions/funcplot.py:48 #, fuzzy -msgid "" -"x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" -msgstr "" -"L'intervalle en X ne peut être nul. Veuillez modifier la valeur X de début " -"ou la valeur X de fin" +msgid "x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" +msgstr "L'intervalle en X ne peut être nul. Veuillez modifier la valeur X de début ou la valeur X de fin" #: ../share/extensions/funcplot.py:60 #, fuzzy -msgid "" -"y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y " -"value of rectangle's bottom'" -msgstr "" -"L'intervalle en Y ne peut être nul. Veuillez modifier la valeur Y basse ou " -"la valeur Y haute" +msgid "y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y value of rectangle's bottom'" +msgstr "L'intervalle en Y ne peut être nul. Veuillez modifier la valeur Y basse ou la valeur Y haute" #: ../share/extensions/funcplot.py:315 msgid "Please select a rectangle" msgstr "Veuillez sélectionner un rectangle" -#: ../share/extensions/gcodetools.py:3321 -#: ../share/extensions/gcodetools.py:4526 -#: ../share/extensions/gcodetools.py:4699 -#: ../share/extensions/gcodetools.py:6232 -#: ../share/extensions/gcodetools.py:6427 +#: ../share/extensions/gcodetools.py:3321 ../share/extensions/gcodetools.py:4526 ../share/extensions/gcodetools.py:4699 +#: ../share/extensions/gcodetools.py:6232 ../share/extensions/gcodetools.py:6427 msgid "No paths are selected! Trying to work on all available paths." -msgstr "" -"Aucun chemin n'est sélectionné ! Tentative d'utilisation de tous les chemins " -"disponibles." +msgstr "Aucun chemin n'est sélectionné ! Tentative d'utilisation de tous les chemins disponibles." #: ../share/extensions/gcodetools.py:3324 msgid "Nothing is selected. Please select something." msgstr "Rien n'est sélectionné. Veuillez de sélectionner quelque chose." #: ../share/extensions/gcodetools.py:3864 -msgid "" -"Directory does not exist! Please specify existing directory at Preferences " -"tab!" -msgstr "" -"Le dossier n'existe pas ! Veuillez spécifier un dossier existant dans " -"l'onglet Préférences." +msgid "Directory does not exist! Please specify existing directory at Preferences tab!" +msgstr "Le dossier n'existe pas ! Veuillez spécifier un dossier existant dans l'onglet Préférences." #: ../share/extensions/gcodetools.py:3894 #, python-format @@ -31812,82 +28783,55 @@ msgstr "" #: ../share/extensions/gcodetools.py:4040 #, python-format -msgid "" -"Orientation points for '%s' layer have not been found! Please add " -"orientation points using Orientation tab!" -msgstr "" -"Les points d'orientation n'ont pas été définis pour le calque '%s'. Veuillez " -"ajouter des points d'orientation avec l'onglet Orientation." +msgid "Orientation points for '%s' layer have not been found! Please add orientation points using Orientation tab!" +msgstr "Les points d'orientation n'ont pas été définis pour le calque '%s'. Veuillez ajouter des points d'orientation avec l'onglet Orientation." #: ../share/extensions/gcodetools.py:4047 #, python-format msgid "There are more than one orientation point groups in '%s' layer" msgstr "Le calque '%s' contient plus d'un groupe de points d'orientation" -#: ../share/extensions/gcodetools.py:4078 -#: ../share/extensions/gcodetools.py:4080 +#: ../share/extensions/gcodetools.py:4078 ../share/extensions/gcodetools.py:4080 msgid "" -"Orientation points are wrong! (if there are two orientation points they " -"should not be the same. If there are three orientation points they should " -"not be in a straight line.)" +"Orientation points are wrong! (if there are two orientation points they should not be the same. If there are three orientation points they " +"should not be in a straight line.)" msgstr "" #: ../share/extensions/gcodetools.py:4250 #, python-format -msgid "" -"Warning! Found bad orientation points in '%s' layer. Resulting Gcode could " -"be corrupt!" -msgstr "" -"Attention ! Des mauvais points d'orientation ont été trouvés dans le calque " -"'%s'. Le Gcode généré pourrait être corrompu !" +msgid "Warning! Found bad orientation points in '%s' layer. Resulting Gcode could be corrupt!" +msgstr "Attention ! Des mauvais points d'orientation ont été trouvés dans le calque '%s'. Le Gcode généré pourrait être corrompu !" #: ../share/extensions/gcodetools.py:4263 #, python-format -msgid "" -"Warning! Found bad graffiti reference point in '%s' layer. Resulting Gcode " -"could be corrupt!" -msgstr "" -"Attention ! Un mauvais point de référence graffiti a été trouvé dans le " -"calque '%s'. Le Gcode généré pourrait être corrompu !" +msgid "Warning! Found bad graffiti reference point in '%s' layer. Resulting Gcode could be corrupt!" +msgstr "Attention ! Un mauvais point de référence graffiti a été trouvé dans le calque '%s'. Le Gcode généré pourrait être corrompu !" #. xgettext:no-pango-format #: ../share/extensions/gcodetools.py:4284 msgid "" -"This extension works with Paths and Dynamic Offsets and groups of them only! " -"All other objects will be ignored!\n" +"This extension works with Paths and Dynamic Offsets and groups of them only! All other objects will be ignored!\n" "Solution 1: press Path->Object to path or Shift+Ctrl+C.\n" "Solution 2: Path->Dynamic offset or Ctrl+J.\n" -"Solution 3: export all contours to PostScript level 2 (File->Save As->.ps) " -"and File->Import this file." +"Solution 3: export all contours to PostScript level 2 (File->Save As->.ps) and File->Import this file." msgstr "" -"Cette extension ne fonctionne qu'avec des chemins ou des offsets dynamiques " -"(ou des groupes contenant seulement ces types d'objets). Tout autre objet " -"sera ignoré.\n" +"Cette extension ne fonctionne qu'avec des chemins ou des offsets dynamiques (ou des groupes contenant seulement ces types d'objets). Tout " +"autre objet sera ignoré.\n" "Solution 1 : lancez la commande Chemin>Objet en chemin (ou Maj+Ctrl+C).\n" "Solution 2 : Chemin>Offset dynamique (ou Ctrl+J).\n" -"Solution 3 : exportez tous les contours en PostScript niveau 2 " -"(Fichier>Enregistrer sous>.ps) puis réimportez le fichier avec " -"Fichier>Importer." +"Solution 3 : exportez tous les contours en PostScript niveau 2 (Fichier>Enregistrer sous>.ps) puis réimportez le fichier avec Fichier>Importer." #: ../share/extensions/gcodetools.py:4290 -msgid "" -"Document has no layers! Add at least one layer using layers panel (Ctrl+Shift" -"+L)" -msgstr "" -"Le document n'a pas de calque ! Veuillez en ajouter au moins un avec la " -"boîte de dialogue des calques (Maj+Ctrl+L)" +msgid "Document has no layers! Add at least one layer using layers panel (Ctrl+Shift+L)" +msgstr "Le document n'a pas de calque ! Veuillez en ajouter au moins un avec la boîte de dialogue des calques (Maj+Ctrl+L)" #: ../share/extensions/gcodetools.py:4294 -msgid "" -"Warning! There are some paths in the root of the document, but not in any " -"layer! Using bottom-most layer for them." +msgid "Warning! There are some paths in the root of the document, but not in any layer! Using bottom-most layer for them." msgstr "" #: ../share/extensions/gcodetools.py:4371 #, python-format -msgid "" -"Warning! Tool's and default tool's parameter's (%s) types are not the same " -"( type('%s') != type('%s') )." +msgid "Warning! Tool's and default tool's parameter's (%s) types are not the same ( type('%s') != type('%s') )." msgstr "" #: ../share/extensions/gcodetools.py:4374 @@ -31902,43 +28846,28 @@ msgstr "Le calque '%s' contient plus d'un outil !" #: ../share/extensions/gcodetools.py:4391 #, python-format -msgid "" -"Can not find tool for '%s' layer! Please add one with Tools library tab!" +msgid "Can not find tool for '%s' layer! Please add one with Tools library tab!" msgstr "" -#: ../share/extensions/gcodetools.py:4553 -#: ../share/extensions/gcodetools.py:4708 -msgid "" -"Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl" -"+Shift+G) and Object to Path (Ctrl+Shift+C)!" -msgstr "" -"Attention : au moins un chemin n'a pas de paramètre 'd'. Veuillez dégrouper " -"(Maj+Ctrl+G) et transformer l'objet en chemin (Maj+Ctrl+C)." +#: ../share/extensions/gcodetools.py:4553 ../share/extensions/gcodetools.py:4708 +msgid "Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl+Shift+G) and Object to Path (Ctrl+Shift+C)!" +msgstr "Attention : au moins un chemin n'a pas de paramètre 'd'. Veuillez dégrouper (Maj+Ctrl+G) et transformer l'objet en chemin (Maj+Ctrl+C)." #: ../share/extensions/gcodetools.py:4667 #, fuzzy -msgid "" -"Nothing is selected. Please select something to convert to drill point " -"(dxfpoint) or clear point sign." -msgstr "" -"Rien n'est sélectionné. Veuillez sélectionner quelque chose à convertir en " +msgid "Nothing is selected. Please select something to convert to drill point (dxfpoint) or clear point sign." +msgstr "Rien n'est sélectionné. Veuillez sélectionner quelque chose à convertir en " -#: ../share/extensions/gcodetools.py:4750 -#: ../share/extensions/gcodetools.py:4996 +#: ../share/extensions/gcodetools.py:4750 ../share/extensions/gcodetools.py:4996 msgid "This extension requires at least one selected path." msgstr "Cette extension nécessite la sélection d'un chemin." -#: ../share/extensions/gcodetools.py:4756 -#: ../share/extensions/gcodetools.py:5002 +#: ../share/extensions/gcodetools.py:4756 ../share/extensions/gcodetools.py:5002 #, python-format msgid "Tool diameter must be > 0 but tool's diameter on '%s' layer is not!" -msgstr "" -"Le diamètre d'outil doit être supérieur à 0, ce qui n'est pas le cas pour " -"l'outil du calque '%s' !" +msgstr "Le diamètre d'outil doit être supérieur à 0, ce qui n'est pas le cas pour l'outil du calque '%s' !" -#: ../share/extensions/gcodetools.py:4767 -#: ../share/extensions/gcodetools.py:4956 -#: ../share/extensions/gcodetools.py:5011 +#: ../share/extensions/gcodetools.py:4767 ../share/extensions/gcodetools.py:4956 ../share/extensions/gcodetools.py:5011 msgid "Warning: omitting non-path" msgstr "Attention : tout ce qui n'est pas chemin n'est pas pris en compte" @@ -31955,8 +28884,7 @@ msgstr "Aucune unité n'a été sélectionnée. mm utilisés par défaut." msgid "Tool '%s' has no shape. 45 degree cone assumed!" msgstr "L'outil '%s' n'a pas de forme. Un cône de 45 degrés sera utilisé !" -#: ../share/extensions/gcodetools.py:5611 -#: ../share/extensions/gcodetools.py:5616 +#: ../share/extensions/gcodetools.py:5611 ../share/extensions/gcodetools.py:5616 msgid "csp_normalised_normal error. See log." msgstr "" @@ -31965,18 +28893,12 @@ msgid "No need to engrave sharp angles." msgstr "Il n'est pas nécessaire de graver les angles aigus." #: ../share/extensions/gcodetools.py:5848 -msgid "" -"Active layer already has orientation points! Remove them or select another " -"layer!" -msgstr "" -"Le calque actif possède déjà des points d'orientation. Veuillez les " -"supprimer ou sélectionner un autre calque." +msgid "Active layer already has orientation points! Remove them or select another layer!" +msgstr "Le calque actif possède déjà des points d'orientation. Veuillez les supprimer ou sélectionner un autre calque." #: ../share/extensions/gcodetools.py:5893 msgid "Active layer already has a tool! Remove it or select another layer!" -msgstr "" -"Le calque actif possède déjà un outil. Veuillez le supprimer ou sélectionner " -"un autre calque." +msgstr "Le calque actif possède déjà un outil. Veuillez le supprimer ou sélectionner un autre calque." #: ../share/extensions/gcodetools.py:6008 msgid "Selection is empty! Will compute whole drawing." @@ -32007,37 +28929,23 @@ msgstr "" #: ../share/extensions/gcodetools.py:6662 #, python-format msgid "" -"Select one of the action tabs - Path to Gcode, Area, Engraving, DXF points, " -"Orientation, Offset, Lathe or Tools library.\n" +"Select one of the action tabs - Path to Gcode, Area, Engraving, DXF points, Orientation, Offset, Lathe or Tools library.\n" " Current active tab id is %s" msgstr "" -"Sélectionnez un des onglets d'action : Chemin vers G-code, Aire, Gravure, " -"Points DXF, Orientation, Tour ou Bibliothèque d'outils.\n" +"Sélectionnez un des onglets d'action : Chemin vers G-code, Aire, Gravure, Points DXF, Orientation, Tour ou Bibliothèque d'outils.\n" " L'onglet actif est actuellement %s" #: ../share/extensions/gcodetools.py:6668 -msgid "" -"Orientation points have not been defined! A default set of orientation " -"points has been automatically added." -msgstr "" -"Aucun point d'orientation n'a été défini. Un ensemble de points " -"d'orientation par défaut a été automatiquement ajouté." +msgid "Orientation points have not been defined! A default set of orientation points has been automatically added." +msgstr "Aucun point d'orientation n'a été défini. Un ensemble de points d'orientation par défaut a été automatiquement ajouté." #: ../share/extensions/gcodetools.py:6672 -msgid "" -"Cutting tool has not been defined! A default tool has been automatically " -"added." -msgstr "" -"Aucun outil de découpe n'a été défini. Un outil par défaut a été " -"automatiquement ajouté." +msgid "Cutting tool has not been defined! A default tool has been automatically added." +msgstr "Aucun outil de découpe n'a été défini. Un outil par défaut a été automatiquement ajouté." #: ../share/extensions/generate_voronoi.py:35 -msgid "" -"Failed to import the subprocess module. Please report this as a bug at: " -"https://bugs.launchpad.net/inkscape." -msgstr "" -"Échec lors de l'importation du module subprocess. Veuillez rapporter ce " -"défaut à : https://bugs.launchpad.net/inkscape." +msgid "Failed to import the subprocess module. Please report this as a bug at: https://bugs.launchpad.net/inkscape." +msgstr "Échec lors de l'importation du module subprocess. Veuillez rapporter ce défaut à : https://bugs.launchpad.net/inkscape." #: ../share/extensions/generate_voronoi.py:36 msgid "Python version is: " @@ -32083,35 +28991,27 @@ msgid "No HPGL data found." msgstr "Aucune donnée HPGL n'a été trouvée." #: ../share/extensions/hpgl_input.py:66 -msgid "" -"The HPGL data contained unknown (unsupported) commands, there is a " -"possibility that the drawing is missing some content." +msgid "The HPGL data contained unknown (unsupported) commands, there is a possibility that the drawing is missing some content." msgstr "" -"Les données HPGL contiennent des commandes inconnues (et non supportées), et " -"certains contenus pourraient ne pas apparaître sur le dessin." +"Les données HPGL contiennent des commandes inconnues (et non supportées), et certains contenus pourraient ne pas apparaître sur le dessin." #. issue error if no paths found #: ../share/extensions/hpgl_output.py:58 -msgid "" -"No paths where found. Please convert all objects you want to save into paths." +msgid "No paths where found. Please convert all objects you want to save into paths." msgstr "" #: ../share/extensions/inkex.py:116 #, python-format msgid "" -"The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " -"this extension. Please download and install the latest version from http://" -"cheeseshop.python.org/pypi/lxml/, or install it through your package manager " -"by a command like: sudo apt-get install python-lxml\n" +"The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension. Please download and install the latest version " +"from http://cheeseshop.python.org/pypi/lxml/, or install it through your package manager by a command like: sudo apt-get install python-lxml\n" "\n" "Technical details:\n" "%s" msgstr "" -"La fantastique classe lxml pour libxml2 est nécessaire à inkex.py et par " -"conséquent à cette extension. Veuillez en télécharger et installer la " -"dernière version à partir du site http://cheeseshop.python.org/pypi/lxml/, " -"ou l'installer directement avec votre gestionnaire de paquet avec une " -"commande du type : sudo apt-get install python-lxml\n" +"La fantastique classe lxml pour libxml2 est nécessaire à inkex.py et par conséquent à cette extension. Veuillez en télécharger et installer la " +"dernière version à partir du site http://cheeseshop.python.org/pypi/lxml/, ou l'installer directement avec votre gestionnaire de paquet avec " +"une commande du type : sudo apt-get install python-lxml\n" "\n" "Détails techniques :\n" "%s" @@ -32139,27 +29039,17 @@ msgstr "" msgid "There is no selection to interpolate" msgstr "Aucune sélection à interpoler" -#: ../share/extensions/jessyInk_autoTexts.py:45 -#: ../share/extensions/jessyInk_effects.py:50 -#: ../share/extensions/jessyInk_export.py:96 -#: ../share/extensions/jessyInk_keyBindings.py:188 -#: ../share/extensions/jessyInk_masterSlide.py:46 -#: ../share/extensions/jessyInk_mouseHandler.py:48 -#: ../share/extensions/jessyInk_summary.py:64 -#: ../share/extensions/jessyInk_transitions.py:50 -#: ../share/extensions/jessyInk_video.py:49 -#: ../share/extensions/jessyInk_view.py:67 +#: ../share/extensions/jessyInk_autoTexts.py:45 ../share/extensions/jessyInk_effects.py:50 ../share/extensions/jessyInk_export.py:96 +#: ../share/extensions/jessyInk_keyBindings.py:188 ../share/extensions/jessyInk_masterSlide.py:46 +#: ../share/extensions/jessyInk_mouseHandler.py:48 ../share/extensions/jessyInk_summary.py:64 ../share/extensions/jessyInk_transitions.py:50 +#: ../share/extensions/jessyInk_video.py:49 ../share/extensions/jessyInk_view.py:67 msgid "" -"The JessyInk script is not installed in this SVG file or has a different " -"version than the JessyInk extensions. Please select \"install/update...\" " -"from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or " -"update the JessyInk script.\n" +"The JessyInk script is not installed in this SVG file or has a different version than the JessyInk extensions. Please select \"install/" +"update...\" from the \"JessyInk\" sub-menu of the \"Extensions\" menu to install or update the JessyInk script.\n" "\n" msgstr "" -"Le script JessyInk n'est pas installé dans ce fichier SVG ou est d'une " -"version différente de l'extension. Veuillez utiliser la commande " -"Extensions>JessyInk>Installation/mise à jour pour installer ou mettre à jour " -"le script.\n" +"Le script JessyInk n'est pas installé dans ce fichier SVG ou est d'une version différente de l'extension. Veuillez utiliser la commande " +"Extensions>JessyInk>Installation/mise à jour pour installer ou mettre à jour le script.\n" "\n" #: ../share/extensions/jessyInk_autoTexts.py:48 @@ -32176,17 +29066,12 @@ msgid "" "Node with id '{0}' is not a suitable text node and was therefore ignored.\n" "\n" msgstr "" -"Le nœud d'id '{0}' n'est pas un nœud texte approprié et a été de fait " -"ignoré.\n" +"Le nœud d'id '{0}' n'est pas un nœud texte approprié et a été de fait ignoré.\n" "\n" #: ../share/extensions/jessyInk_effects.py:53 -msgid "" -"No object selected. Please select the object you want to assign an effect to " -"and then press apply.\n" -msgstr "" -"Aucun objet sélectionné. Veuillez préalablement sélectionner l'objet auquel " -"vous souhaitez assigner un effet.\n" +msgid "No object selected. Please select the object you want to assign an effect to and then press apply.\n" +msgstr "Aucun objet sélectionné. Veuillez préalablement sélectionner l'objet auquel vous souhaitez assigner un effet.\n" #: ../share/extensions/jessyInk_export.py:82 msgid "Could not find Inkscape command.\n" @@ -32197,9 +29082,7 @@ msgid "Layer not found. Removed current master slide selection.\n" msgstr "" #: ../share/extensions/jessyInk_masterSlide.py:58 -msgid "" -"More than one layer with this name found. Removed current master slide " -"selection.\n" +msgid "More than one layer with this name found. Removed current master slide selection.\n" msgstr "" #: ../share/extensions/jessyInk_summary.py:69 @@ -32262,8 +29145,7 @@ msgstr "" #: ../share/extensions/jessyInk_summary.py:123 #, python-brace-format msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"." -msgstr "" -"{0}\t\"{1}\" (l'objet d'identifiant \"{2}\") sera remplacé par \"{3}\"." +msgstr "{0}\t\"{1}\" (l'objet d'identifiant \"{2}\") sera remplacé par \"{3}\"." #: ../share/extensions/jessyInk_summary.py:168 #, python-brace-format @@ -32315,14 +29197,13 @@ msgstr "Calque introuvable.\n" #: ../share/extensions/jessyInk_transitions.py:57 msgid "More than one layer with this name found.\n" -msgstr "" +msgstr "Plusieurs calques portent ce même nom. \n" #: ../share/extensions/jessyInk_transitions.py:70 msgid "Please enter a layer name.\n" msgstr "Veuillez entrer un nom de calque.\n" -#: ../share/extensions/jessyInk_video.py:54 -#: ../share/extensions/jessyInk_video.py:59 +#: ../share/extensions/jessyInk_video.py:54 ../share/extensions/jessyInk_video.py:59 msgid "" "Could not obtain the selected layer for inclusion of the video element.\n" "\n" @@ -32330,13 +29211,10 @@ msgstr "" #: ../share/extensions/jessyInk_view.py:75 msgid "More than one object selected. Please select only one object.\n" -msgstr "" -"Plus d'un objet est sélectionné. Veuillez sélectionner un seul objet.\n" +msgstr "Plus d'un objet est sélectionné. Veuillez sélectionner un seul objet.\n" #: ../share/extensions/jessyInk_view.py:79 -msgid "" -"No object selected. Please select the object you want to assign a view to " -"and then press apply.\n" +msgid "No object selected. Please select the object you want to assign a view to and then press apply.\n" msgstr "" #: ../share/extensions/markers_strokepaint.py:83 @@ -32351,22 +29229,17 @@ msgstr "Impossible de localiser le marqueur %s" #: ../share/extensions/measure.py:58 msgid "" -"Failed to import the numpy modules. These modules are required by this " -"extension. Please install them and try again. On a Debian-like system this " -"can be done with the command, sudo apt-get install python-numpy." +"Failed to import the numpy modules. These modules are required by this extension. Please install them and try again. On a Debian-like system " +"this can be done with the command, sudo apt-get install python-numpy." msgstr "" -"Échec lors de l'importation des modules numpy. Ces modules sont nécessaires " -"à cette extension. Veuillez les installer et réessayer. Sur un système de " -"type Debian, cette installation peut être réalisée avec la commande : sudo " -"apt-get install python-numpy." +"Échec lors de l'importation des modules numpy. Ces modules sont nécessaires à cette extension. Veuillez les installer et réessayer. Sur un " +"système de type Debian, cette installation peut être réalisée avec la commande : sudo apt-get install python-numpy." #: ../share/extensions/measure.py:120 msgid "Area is zero, cannot calculate Center of Mass" msgstr "L'aire est nulle, calcul du barycentre impossible" -#: ../share/extensions/pathalongpath.py:208 -#: ../share/extensions/pathscatter.py:228 -#: ../share/extensions/perspective.py:53 +#: ../share/extensions/pathalongpath.py:208 ../share/extensions/pathscatter.py:228 ../share/extensions/perspective.py:53 msgid "This extension requires two selected paths." msgstr "Cette extension nécessite la sélection de deux chemins." @@ -32376,8 +29249,7 @@ msgid "" "Please choose a larger object or set 'Space between copies' > 0" msgstr "" "La taille du motif est trop petite.\n" -"Veuillez choisir un objet plus grand ou paramétrer « Espacement entre les " -"copies » avec une valeur supérieure à zéro." +"Veuillez choisir un objet plus grand ou paramétrer « Espacement entre les copies » avec une valeur supérieure à zéro." #: ../share/extensions/pathalongpath.py:277 msgid "" @@ -32392,18 +29264,13 @@ msgstr "Veuillez d'abord convertir les objets en chemins ! (Obtenu [%s].)" #: ../share/extensions/perspective.py:45 msgid "" -"Failed to import the numpy or numpy.linalg modules. These modules are " -"required by this extension. Please install them and try again. On a Debian-" -"like system this can be done with the command, sudo apt-get install python-" -"numpy." -msgstr "" -"Échec lors de l'import des modules numpy.linalg. Ces modules sont " -"nécessaires à cette extension. Veuillez les installer et réessayer. Sur un " -"système de type Debian, cette installation peut être réalisée avec la " -"commande : sudo apt-get install python-numpy." - -#: ../share/extensions/perspective.py:61 -#: ../share/extensions/summersnight.py:52 +"Failed to import the numpy or numpy.linalg modules. These modules are required by this extension. Please install them and try again. On a " +"Debian-like system this can be done with the command, sudo apt-get install python-numpy." +msgstr "" +"Échec lors de l'import des modules numpy.linalg. Ces modules sont nécessaires à cette extension. Veuillez les installer et réessayer. Sur un " +"système de type Debian, cette installation peut être réalisée avec la commande : sudo apt-get install python-numpy." + +#: ../share/extensions/perspective.py:61 ../share/extensions/summersnight.py:52 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -32412,16 +29279,11 @@ msgstr "" "Le premier objet sélectionné est de type '%s'.\n" "Essayez la commande Chemin>Objet en chemin." -#: ../share/extensions/perspective.py:68 -#: ../share/extensions/summersnight.py:60 -msgid "" -"This extension requires that the second selected path be four nodes long." -msgstr "" -"Cette extension exige que le second chemin sélectionné contienne quatre " -"nœuds." +#: ../share/extensions/perspective.py:68 ../share/extensions/summersnight.py:60 +msgid "This extension requires that the second selected path be four nodes long." +msgstr "Cette extension exige que le second chemin sélectionné contienne quatre nœuds." -#: ../share/extensions/perspective.py:94 -#: ../share/extensions/summersnight.py:93 +#: ../share/extensions/perspective.py:94 ../share/extensions/summersnight.py:93 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -32429,8 +29291,7 @@ msgstr "" "Le second objet sélectionné n'est pas un chemin mais un groupe.\n" "Essayez la commande Objet>Dégrouper." -#: ../share/extensions/perspective.py:96 -#: ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32438,8 +29299,7 @@ msgstr "" "Le second objet sélectionné n'est pas un chemin.\n" "Essayez la commande Chemin>Objet en chemin." -#: ../share/extensions/perspective.py:99 -#: ../share/extensions/summersnight.py:98 +#: ../share/extensions/perspective.py:99 ../share/extensions/summersnight.py:98 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -32449,37 +29309,29 @@ msgstr "" #. issue error if no paths found #: ../share/extensions/plotter.py:69 -msgid "" -"No paths where found. Please convert all objects you want to plot into paths." +msgid "No paths where found. Please convert all objects you want to plot into paths." msgstr "" #: ../share/extensions/plotter.py:147 msgid "" "pySerial is not installed.\n" "\n" -"1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/pypi/" -"pyserial\n" -"2. Extract the \"serial\" subfolder from the zip to the following folder: C:" -"\\[Program files]\\inkscape\\python\\Lib\\\n" +"1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/pypi/pyserial\n" +"2. Extract the \"serial\" subfolder from the zip to the following folder: C:\\[Program files]\\inkscape\\python\\Lib\\\n" "3. Restart Inkscape." msgstr "" #: ../share/extensions/plotter.py:199 -msgid "" -"Could not open port. Please check that your plotter is running, connected " -"and the settings are correct." +msgid "Could not open port. Please check that your plotter is running, connected and the settings are correct." msgstr "" #: ../share/extensions/polyhedron_3d.py:65 msgid "" -"Failed to import the numpy module. This module is required by this " -"extension. Please install it and try again. On a Debian-like system this " +"Failed to import the numpy module. This module is required by this extension. Please install it and try again. On a Debian-like system this " "can be done with the command 'sudo apt-get install python-numpy'." msgstr "" -"Échec lors de l'import du module numpy. Ce module est nécessaire à cette " -"extension. Veuillez l'installer et réessayer. Sur un système de type Debian, " -"cette installation peut être réalisée avec la commande : sudo apt-get " -"install python-numpy." +"Échec lors de l'import du module numpy. Ce module est nécessaire à cette extension. Veuillez l'installer et réessayer. Sur un système de type " +"Debian, cette installation peut être réalisée avec la commande : sudo apt-get install python-numpy." #: ../share/extensions/polyhedron_3d.py:336 msgid "No face data found in specified file." @@ -32487,9 +29339,7 @@ msgstr "Le fichier spécifié ne contient aucune donnée de facette." #: ../share/extensions/polyhedron_3d.py:337 msgid "Try selecting \"Edge Specified\" in the Model File tab.\n" -msgstr "" -"Essayez de sélectionner « défini par les bords » dans l'onglet Fichier " -"modèle .\n" +msgstr "Essayez de sélectionner « défini par les bords » dans l'onglet Fichier modèle .\n" #: ../share/extensions/polyhedron_3d.py:343 msgid "No edge data found in specified file." @@ -32497,19 +29347,14 @@ msgstr "Le fichier spécifié ne contient aucune donnée de bord." #: ../share/extensions/polyhedron_3d.py:344 msgid "Try selecting \"Face Specified\" in the Model File tab.\n" -msgstr "" -"Essayez de sélectionner « défini par les facettes » dans l'onglet Fichier " -"modèle .\n" +msgstr "Essayez de sélectionner « défini par les facettes » dans l'onglet Fichier modèle .\n" #. we cannot generate a list of faces from the edges without a lot of computation #: ../share/extensions/polyhedron_3d.py:522 -msgid "" -"Face Data Not Found. Ensure file contains face data, and check the file is " -"imported as \"Face-Specified\" under the \"Model File\" tab.\n" +msgid "Face Data Not Found. Ensure file contains face data, and check the file is imported as \"Face-Specified\" under the \"Model File\" tab.\n" msgstr "" -"Aucune donnée de facette. Vérifiez que le fichier contient bien ces données, " -"et qu'il est bien importé avec l'option « Défini par les facettes » dans " -"l'onglet « Fichier modèle ».\n" +"Aucune donnée de facette. Vérifiez que le fichier contient bien ces données, et qu'il est bien importé avec l'option « Défini par les " +"facettes » dans l'onglet « Fichier modèle ».\n" #: ../share/extensions/polyhedron_3d.py:524 msgid "Internal Error. No view type selected\n" @@ -32543,26 +29388,19 @@ msgid "Please enter an input text" msgstr "Veuillez saisir une chaîne de caractères" #: ../share/extensions/replace_font.py:133 -msgid "" -"Couldn't find anything using that font, please ensure the spelling and " -"spacing is correct." -msgstr "" -"Aucune correspondance avec cette fonte, veuillez vous assurer que " -"l'orthographe et l'espacement sont corrects." +msgid "Couldn't find anything using that font, please ensure the spelling and spacing is correct." +msgstr "Aucune correspondance avec cette fonte, veuillez vous assurer que l'orthographe et l'espacement sont corrects." -#: ../share/extensions/replace_font.py:140 -#: ../share/extensions/svg_and_media_zip_output.py:193 +#: ../share/extensions/replace_font.py:140 ../share/extensions/svg_and_media_zip_output.py:193 msgid "Didn't find any fonts in this document/selection." msgstr "Le document (ou la sélection) ne contient aucune police." -#: ../share/extensions/replace_font.py:143 -#: ../share/extensions/svg_and_media_zip_output.py:196 +#: ../share/extensions/replace_font.py:143 ../share/extensions/svg_and_media_zip_output.py:196 #, python-format msgid "Found the following font only: %s" msgstr "Une seule police utilisée : %s" -#: ../share/extensions/replace_font.py:145 -#: ../share/extensions/svg_and_media_zip_output.py:198 +#: ../share/extensions/replace_font.py:145 ../share/extensions/svg_and_media_zip_output.py:198 #, python-format msgid "" "Found the following fonts:\n" @@ -32581,14 +29419,11 @@ msgstr "Veuillez saisir une chaîne de caractères dans le champs Rechercher." #: ../share/extensions/replace_font.py:248 msgid "Please enter a replacement font in the replace with box." -msgstr "" -"Veuillez saisir une police de remplacement dans le champs Remplacer par." +msgstr "Veuillez saisir une police de remplacement dans le champs Remplacer par." #: ../share/extensions/replace_font.py:253 msgid "Please enter a replacement font in the replace all box." -msgstr "" -"Veuillez saisir une police de remplacement dans le champs Remplacer toutes " -"les polices par." +msgstr "Veuillez saisir une police de remplacement dans le champs Remplacer toutes les polices par." #: ../share/extensions/restack.py:76 #, fuzzy @@ -32599,22 +29434,18 @@ msgstr "Aucune sélection à interpoler" msgid "" "This extension requires two selected paths. \n" "The second path must be exactly four nodes long." -msgstr "" -"Cette extension nécessite la sélection de deux chemins. Le second chemin " -"sélectionné doit contenir exactement quatre nœuds." +msgstr "Cette extension nécessite la sélection de deux chemins. Le second chemin sélectionné doit contenir exactement quatre nœuds." #: ../share/extensions/svg_and_media_zip_output.py:128 #, python-format msgid "Could not locate file: %s" msgstr "Impossible de localiser le fichier %s" -#: ../share/extensions/svgcalendar.py:266 -#: ../share/extensions/svgcalendar.py:288 +#: ../share/extensions/svgcalendar.py:266 ../share/extensions/svgcalendar.py:288 msgid "You must select a correct system encoding." msgstr "Vous devez sélectionner un système d'encodage valide." -#: ../share/extensions/uniconv-ext.py:56 -#: ../share/extensions/uniconv_output.py:122 +#: ../share/extensions/uniconv-ext.py:56 ../share/extensions/uniconv_output.py:122 msgid "" "You need to install the UniConvertor software.\n" "For GNU/Linux: install the package python-uniconvertor.\n" @@ -32627,24 +29458,17 @@ msgstr "" msgid "Please select objects!" msgstr "Veuillez sélectionner des objets !" -#: ../share/extensions/web-set-att.py:58 -#: ../share/extensions/web-transmit-att.py:54 +#: ../share/extensions/web-set-att.py:58 ../share/extensions/web-transmit-att.py:54 msgid "You must select at least two elements." msgstr "Vous devez sélectionner au moins deux éléments." #: ../share/extensions/webslicer_create_group.py:57 -msgid "" -"You must create and select some \"Slicer rectangles\" before trying to group." -msgstr "" -"Vous devez créer et sélectionner des « Rectangles de découpe » avant " -"d'essayer de grouper." +msgid "You must create and select some \"Slicer rectangles\" before trying to group." +msgstr "Vous devez créer et sélectionner des « Rectangles de découpe » avant d'essayer de grouper." #: ../share/extensions/webslicer_create_group.py:72 -msgid "" -"You must to select some \"Slicer rectangles\" or other \"Layout groups\"." -msgstr "" -"Vous devez sélectionner des « Rectangles de découpe » ou d'autres « Groupes " -"de mise en page »." +msgid "You must to select some \"Slicer rectangles\" or other \"Layout groups\"." +msgstr "Vous devez sélectionner des « Rectangles de découpe » ou d'autres « Groupes de mise en page »." #: ../share/extensions/webslicer_create_group.py:76 #, python-format @@ -32711,17 +29535,10 @@ msgstr "Longueur maximum de segment (px) :" msgid "Number of segments:" msgstr "Nombre de segments :" -#: ../share/extensions/addnodes.inx.h:7 -#: ../share/extensions/convert2dashes.inx.h:2 -#: ../share/extensions/edge3d.inx.h:9 ../share/extensions/flatten.inx.h:3 -#: ../share/extensions/fractalize.inx.h:4 -#: ../share/extensions/interp_att_g.inx.h:31 -#: ../share/extensions/markers_strokepaint.inx.h:13 -#: ../share/extensions/perspective.inx.h:2 -#: ../share/extensions/pixelsnap.inx.h:3 -#: ../share/extensions/radiusrand.inx.h:10 -#: ../share/extensions/rubberstretch.inx.h:6 -#: ../share/extensions/straightseg.inx.h:4 +#: ../share/extensions/addnodes.inx.h:7 ../share/extensions/convert2dashes.inx.h:2 ../share/extensions/edge3d.inx.h:9 +#: ../share/extensions/flatten.inx.h:3 ../share/extensions/fractalize.inx.h:4 ../share/extensions/interp_att_g.inx.h:31 +#: ../share/extensions/markers_strokepaint.inx.h:13 ../share/extensions/perspective.inx.h:2 ../share/extensions/pixelsnap.inx.h:3 +#: ../share/extensions/radiusrand.inx.h:10 ../share/extensions/rubberstretch.inx.h:6 ../share/extensions/straightseg.inx.h:4 #: ../share/extensions/summersnight.inx.h:2 ../share/extensions/whirl.inx.h:4 msgid "Modify Path" msgstr "Modifer le chemin" @@ -32843,8 +29660,7 @@ msgstr "Luminosité aléatoire" #: ../share/extensions/color_HSL_adjust.inx.h:13 #, no-c-format msgid "" -"Adjusts hue, saturation and lightness in the HSL representation of the " -"selected objects's color.\n" +"Adjusts hue, saturation and lightness in the HSL representation of the selected objects's color.\n" "Options:\n" " * Hue: rotate by degrees (wraps around).\n" " * Saturation: add/subtract % (min=-100, max=100).\n" @@ -32889,8 +29705,7 @@ msgstr "Plage des couleurs en entrée :" #: ../share/extensions/color_custom.inx.h:8 msgid "" "Allows you to evaluate different functions for each channel.\n" -"r, g and b are the normalized values of the red, green and blue channels. " -"The resulting RGB values are automatically clamped.\n" +"r, g and b are the normalized values of the red, green and blue channels. The resulting RGB values are automatically clamped.\n" " \n" "Example (half the red, swap green and blue):\n" " Red Function: r*0.5 \n" @@ -32898,8 +29713,7 @@ msgid "" " Blue Function: g" msgstr "" "Permet l'évaluation de différentes fonctions pour chaque canal.\n" -"r, g et b sont les valeurs normalisées pour les canaux rouge, vert et bleu. " -"Les valeurs RGB résultantes sont recalculées automatiquement.\n" +"r, g et b sont les valeurs normalisées pour les canaux rouge, vert et bleu. Les valeurs RGB résultantes sont recalculées automatiquement.\n" "\n" "Exemple (division du rouge par deux, échange du vert et du bleu) :\n" " Fonction pour le rouge : r*0.5\n" @@ -32914,8 +29728,7 @@ msgstr "Plus foncé" msgid "Desaturate" msgstr "Désaturer" -#: ../share/extensions/color_grayscale.inx.h:1 -#: ../share/extensions/webslicer_create_rect.inx.h:15 +#: ../share/extensions/color_grayscale.inx.h:1 ../share/extensions/webslicer_create_rect.inx.h:15 msgid "Grayscale" msgstr "Niveaux de gris" @@ -32947,18 +29760,13 @@ msgstr "Augmenter la saturation" msgid "Negative" msgstr "Négatif" -#: ../share/extensions/color_randomize.inx.h:1 -#: ../share/extensions/render_alphabetsoup.inx.h:4 +#: ../share/extensions/color_randomize.inx.h:1 ../share/extensions/render_alphabetsoup.inx.h:4 msgid "Randomize" msgstr "Aléatoire" #: ../share/extensions/color_randomize.inx.h:7 -msgid "" -"Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB." -msgstr "" -"Convertit en TSL, modifie aléatoirement la teinte, la saturation ou la " -"luminosité, puis convertit le résultat en RVB." +msgid "Converts to HSL, randomizes hue and/or saturation and/or lightness and converts it back to RGB." +msgstr "Convertit en TSL, modifie aléatoirement la teinte, la saturation ou la luminosité, puis convertit le résultat en RVB." #: ../share/extensions/color_removeblue.inx.h:1 msgid "Remove Blue" @@ -33018,21 +29826,15 @@ msgstr "Entrée Dia" #: ../share/extensions/dia.inx.h:2 msgid "" -"The dia2svg.sh script should be installed with your Inkscape distribution. " -"If you do not have it, there is likely to be something wrong with your " -"Inkscape installation." +"The dia2svg.sh script should be installed with your Inkscape distribution. If you do not have it, there is likely to be something wrong with " +"your Inkscape installation." msgstr "" -"Le script dia2svg devrait être installé avec votre distribution d'Inkscape. " -"Si ce n'est pas le cas, il y a sans doute un problème avec votre " +"Le script dia2svg devrait être installé avec votre distribution d'Inkscape. Si ce n'est pas le cas, il y a sans doute un problème avec votre " "installation d'Inkscape." #: ../share/extensions/dia.inx.h:3 -msgid "" -"In order to import Dia files, Dia itself must be installed. You can get Dia " -"at http://live.gnome.org/Dia" -msgstr "" -"Pour pouvoir importer des fichiers Dia, Dia doit aussi être installé. Vous " -"pouvez obtenir Dia sur http://www.gnome.org/projects/dia/ " +msgid "In order to import Dia files, Dia itself must be installed. You can get Dia at http://live.gnome.org/Dia" +msgstr "Pour pouvoir importer des fichiers Dia, Dia doit aussi être installé. Vous pouvez obtenir Dia sur http://www.gnome.org/projects/dia/ " #: ../share/extensions/dia.inx.h:4 msgid "Dia Diagram (*.dia)" @@ -33067,8 +29869,8 @@ msgstr "Géométrique" msgid "Visual" msgstr "Visuelle" -#: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13 -#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:42 +#: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13 ../share/extensions/handles.inx.h:2 +#: ../share/extensions/measure.inx.h:42 msgid "Visualize Path" msgstr "Visualisation de chemin" @@ -33090,21 +29892,16 @@ msgstr "Incrément :" #: ../share/extensions/dots.inx.h:8 msgid "" -"This extension replaces the selection's nodes with numbered dots according " -"to the following options:\n" +"This extension replaces the selection's nodes with numbered dots according to the following options:\n" " * Font size: size of the node number labels (20px, 12pt...).\n" " * Dot size: diameter of the dots placed at path nodes (10px, 2mm...).\n" -" * Starting dot number: first number in the sequence, assigned to the " -"first node of the path.\n" +" * Starting dot number: first number in the sequence, assigned to the first node of the path.\n" " * Step: numbering step between two nodes." msgstr "" -"Cette extension remplace les nœuds de la sélection par des points numérotés " -"en fonction des options suivantes :\n" +"Cette extension remplace les nœuds de la sélection par des points numérotés en fonction des options suivantes :\n" " * Taille de police : taille du label de numéro de nœud (20px, 12pt...).\n" -" * Taille de point : diamètre des points placés sur les nœuds du chemin " -"(10px, 2mm...)\n" -" * Numéro du nœud de départ : premier numéro de la séquence, assigné au " -"premier nœud du chemin.\n" +" * Taille de point : diamètre des points placés sur les nœuds du chemin (10px, 2mm...)\n" +" * Numéro du nœud de départ : premier numéro de la séquence, assigné au premier nœud du chemin.\n" " * Incrément : incrément de numérotation entre deux nœuds." #: ../share/extensions/draw_from_triangle.inx.h:1 @@ -33219,8 +30016,7 @@ msgstr "Tracer un repère à ce point" msgid "Draw Circle Around This Point" msgstr "Tracer un cercle autour de ce point" -#: ../share/extensions/draw_from_triangle.inx.h:29 -#: ../share/extensions/wireframe_sphere.inx.h:6 +#: ../share/extensions/draw_from_triangle.inx.h:29 ../share/extensions/wireframe_sphere.inx.h:6 msgid "Radius (px):" msgstr "Rayon (px) :" @@ -33246,19 +30042,16 @@ msgstr "Fonction triangle" #: ../share/extensions/draw_from_triangle.inx.h:36 msgid "" -"This extension draws constructions about a triangle defined by the first 3 " -"nodes of a selected path. You may select one of preset objects or create " -"your own ones.\n" +"This extension draws constructions about a triangle defined by the first 3 nodes of a selected path. You may select one of preset objects or " +"create your own ones.\n" " \n" "All units are the Inkscape's pixel unit. Angles are all in radians.\n" -"You can specify a point by trilinear coordinates or by a triangle centre " -"function.\n" +"You can specify a point by trilinear coordinates or by a triangle centre function.\n" "Enter as functions of the side length or angles.\n" "Trilinear elements should be separated by a colon: ':'.\n" "Side lengths are represented as 's_a', 's_b' and 's_c'.\n" "Angles corresponding to these are 'a_a', 'a_b', and 'a_c'.\n" -"You can also use the semi-perimeter and area of the triangle as constants. " -"Write 'area' or 'semiperim' for these.\n" +"You can also use the semi-perimeter and area of the triangle as constants. Write 'area' or 'semiperim' for these.\n" "\n" "You can use any standard Python math function:\n" "ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" @@ -33270,26 +30063,20 @@ msgid "" "Also available are the inverse trigonometric functions:\n" "sec(x); csc(x); cot(x)\n" "\n" -"You can specify the radius of a circle around a custom point using a " -"formula, which may also contain the side lengths, angles, etc. You can also " -"plot the isogonal and isotomic conjugate of the point. Be aware that this " -"may cause a divide-by-zero error for certain points.\n" +"You can specify the radius of a circle around a custom point using a formula, which may also contain the side lengths, angles, etc. You can " +"also plot the isogonal and isotomic conjugate of the point. Be aware that this may cause a divide-by-zero error for certain points.\n" " " msgstr "" -"Cette extension trace une construction à partir d'un triangle défini par les " -"trois premiers nœuds d'un chemin sélectionné. Vous devez sélectionner un " -"objet prédéfini ou en créer un nouveau.\n" +"Cette extension trace une construction à partir d'un triangle défini par les trois premiers nœuds d'un chemin sélectionné. Vous devez " +"sélectionner un objet prédéfini ou en créer un nouveau.\n" " \n" -"Toutes les unités de mesure sont exprimées en pixels Inkscape. Les angles " -"sont en radians.\n" -"Vous pouvez spécifier un point par coordonnées trilinéaires ou une fonction " -"du centre du triangle.\n" +"Toutes les unités de mesure sont exprimées en pixels Inkscape. Les angles sont en radians.\n" +"Vous pouvez spécifier un point par coordonnées trilinéaires ou une fonction du centre du triangle.\n" "Entrez comme fonction la taille des côtés ou les angles.\n" "Les éléments trilinéaires doivent être séparés par un deux-points (:).\n" "Les tailles de côté sont représentées sous la forme 's_a', 's_b' et 's_c'.\n" "Les angles correspondants sont sous la forme 'a_a', 'a_b' et 'a_c'.\n" -"Vous pouvez également utiliser le semi-périmètre ou l'aire du triangle comme " -"constante. Dans ce cas, écrivez 'area' ou 'semiperim'.\n" +"Vous pouvez également utiliser le semi-périmètre ou l'aire du triangle comme constante. Dans ce cas, écrivez 'area' ou 'semiperim'.\n" "\n" "Vous pouvez utiliser les fonctions mathématiques standard de Python :\n" "ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i);\n" @@ -33301,11 +30088,9 @@ msgstr "" "Les fonctions trigonométriques inverses sont également disponibles :\n" "sec(x); csc(x); cot(x)\n" "\n" -"Vous pouvez spécifier le rayon d'un cercle autour d'un point personnalisé en " -"utilisant une fonction pouvant également contenir les tailles de côté, les " -"angles, etc. Vous pouvez également tracer les conjuguées isogonales et " -"isotomiques du point. Soyez conscient que cela peut provoquer une erreur de " -"type division par zéro pour certains points. " +"Vous pouvez spécifier le rayon d'un cercle autour d'un point personnalisé en utilisant une fonction pouvant également contenir les tailles de " +"côté, les angles, etc. Vous pouvez également tracer les conjuguées isogonales et isotomiques du point. Soyez conscient que cela peut provoquer " +"une erreur de type division par zéro pour certains points. " #: ../share/extensions/dxf_input.inx.h:1 msgid "DXF Input" @@ -33332,8 +30117,7 @@ msgstr "Origine manuelle de l'axe y (mm) :" msgid "Gcodetools compatible point import" msgstr "Point d'importation compatible avec les outils G-code" -#: ../share/extensions/dxf_input.inx.h:8 -#: ../share/extensions/render_barcode_qrcode.inx.h:16 +#: ../share/extensions/dxf_input.inx.h:8 ../share/extensions/render_barcode_qrcode.inx.h:16 msgid "Character encoding:" msgstr "Encodage de caractère :" @@ -33356,12 +30140,9 @@ msgstr "" "Pour AutoCAD version R13 ou plus récente.\n" "- Le dessin dxf doit être en mm.\n" "- Le dessin svg est en pixels, à 90 ppp.\n" -"- Le facteur d'échelle et l'origine ne s'applique qu'au redimensionnement " -"manuel.\n" -"- Les calques sont préservés par l'utilisation du menu Fichier>Ouvrir, mais " -"pas par Import.\n" -"- Le support des BLOCKS est limité. Préférez l'utilisation de AutoCAD " -"Explode Blocks si nécessaire." +"- Le facteur d'échelle et l'origine ne s'applique qu'au redimensionnement manuel.\n" +"- Les calques sont préservés par l'utilisation du menu Fichier>Ouvrir, mais pas par Import.\n" +"- Le support des BLOCKS est limité. Préférez l'utilisation de AutoCAD Explode Blocks si nécessaire." #: ../share/extensions/dxf_input.inx.h:19 msgid "AutoCAD DXF R13 (*.dxf)" @@ -33411,20 +30192,14 @@ msgstr "pt" msgid "pc" msgstr "pc" -#: ../share/extensions/dxf_outlines.inx.h:11 -#: ../share/extensions/render_gears.inx.h:7 +#: ../share/extensions/dxf_outlines.inx.h:11 ../share/extensions/render_gears.inx.h:7 msgid "px" msgstr "px" -#: ../share/extensions/dxf_outlines.inx.h:12 -#: ../share/extensions/gcodetools_area.inx.h:46 -#: ../share/extensions/gcodetools_dxf_points.inx.h:18 -#: ../share/extensions/gcodetools_engraving.inx.h:24 -#: ../share/extensions/gcodetools_graffiti.inx.h:18 -#: ../share/extensions/gcodetools_lathe.inx.h:39 -#: ../share/extensions/gcodetools_orientation_points.inx.h:11 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:28 -#: ../share/extensions/render_gears.inx.h:9 +#: ../share/extensions/dxf_outlines.inx.h:12 ../share/extensions/gcodetools_area.inx.h:46 ../share/extensions/gcodetools_dxf_points.inx.h:18 +#: ../share/extensions/gcodetools_engraving.inx.h:24 ../share/extensions/gcodetools_graffiti.inx.h:18 +#: ../share/extensions/gcodetools_lathe.inx.h:39 ../share/extensions/gcodetools_orientation_points.inx.h:11 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:28 ../share/extensions/render_gears.inx.h:9 msgid "mm" msgstr "mm" @@ -33436,15 +30211,10 @@ msgstr "cm" msgid "m" msgstr "m" -#: ../share/extensions/dxf_outlines.inx.h:15 -#: ../share/extensions/gcodetools_area.inx.h:47 -#: ../share/extensions/gcodetools_dxf_points.inx.h:19 -#: ../share/extensions/gcodetools_engraving.inx.h:25 -#: ../share/extensions/gcodetools_graffiti.inx.h:19 -#: ../share/extensions/gcodetools_lathe.inx.h:40 -#: ../share/extensions/gcodetools_orientation_points.inx.h:12 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:29 -#: ../share/extensions/render_gears.inx.h:8 +#: ../share/extensions/dxf_outlines.inx.h:15 ../share/extensions/gcodetools_area.inx.h:47 ../share/extensions/gcodetools_dxf_points.inx.h:19 +#: ../share/extensions/gcodetools_engraving.inx.h:25 ../share/extensions/gcodetools_graffiti.inx.h:19 +#: ../share/extensions/gcodetools_lathe.inx.h:40 ../share/extensions/gcodetools_orientation_points.inx.h:12 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:29 ../share/extensions/render_gears.inx.h:8 msgid "in" msgstr "in" @@ -33484,32 +30254,24 @@ msgstr "Correspondance par nom" #, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" -"- The base unit parameter specifies in what unit the coordinates are output " -"(96 px = 1 in).\n" +"- The base unit parameter specifies in what unit the coordinates are output (96 px = 1 in).\n" "- Supported element types\n" " - paths (lines and splines)\n" " - rectangles\n" " - clones (the crossreference to the original is lost)\n" -"- ROBO-Master spline output is a specialized spline readable only by ROBO-" -"Master and AutoDesk viewers, not Inkscape.\n" -"- LWPOLYLINE output is a multiply-connected polyline, disable it to use a " -"legacy version of the LINE output.\n" -"- You can choose to export all layers, only visible ones or by name match " -"(case insensitive and use comma ',' as separator)" +"- ROBO-Master spline output is a specialized spline readable only by ROBO-Master and AutoDesk viewers, not Inkscape.\n" +"- LWPOLYLINE output is a multiply-connected polyline, disable it to use a legacy version of the LINE output.\n" +"- You can choose to export all layers, only visible ones or by name match (case insensitive and use comma ',' as separator)" msgstr "" "Format AutoCAD DXF Release 14.\n" -"- Le paramètre unité de base spécifie dans quelle unité les coordonnées sont " -"générées (90 px = 1 in).\n" +"- Le paramètre unité de base spécifie dans quelle unité les coordonnées sont générées (90 px = 1 in).\n" "- Types d'éléments supportés :\n" " - chemins (lignes et splines) ;\n" " - rectangles ;\n" " - clones (la référence croisée vers l'original est perdue).\n" -"- L'option ROBO-Master génère une spline spécialisée qui ne peut être " -"utilisée que par des lecteurs ROBO-Master et AutoDesk, pas Inkscape.\n" -"- La sortie LWPOLYLINE est une polyligne multi-connectée. Désactivez cette " -"option pour utiliser une ancienne version de la sortie LINE.\n" -"- Vous pouvez choisir d'exporter tous les calques ou seulement ceux qui sont " -"visibles." +"- L'option ROBO-Master génère une spline spécialisée qui ne peut être utilisée que par des lecteurs ROBO-Master et AutoDesk, pas Inkscape.\n" +"- La sortie LWPOLYLINE est une polyligne multi-connectée. Désactivez cette option pour utiliser une ancienne version de la sortie LINE.\n" +"- Vous pouvez choisir d'exporter tous les calques ou seulement ceux qui sont visibles." #: ../share/extensions/dxf_outlines.inx.h:34 msgid "Desktop Cutting Plotter (AutoCAD DXF R14) (*.dxf)" @@ -33521,9 +30283,7 @@ msgstr "Sortie DXF" #: ../share/extensions/dxf_output.inx.h:2 msgid "pstoedit must be installed to run; see http://www.pstoedit.net/pstoedit" -msgstr "" -"pstoedit doit être installé pour être exécuté; consultez le site http://www." -"pstoedit.net/pstoedit" +msgstr "pstoedit doit être installé pour être exécuté; consultez le site http://www.pstoedit.net/pstoedit" #: ../share/extensions/dxf_output.inx.h:3 msgid "AutoCAD DXF R12 (*.dxf)" @@ -33565,8 +30325,7 @@ msgstr "Hauteur de flou :" msgid "Embed Images" msgstr "Incorporer les images" -#: ../share/extensions/embedimage.inx.h:2 -#: ../share/extensions/embedselectedimages.inx.h:2 +#: ../share/extensions/embedimage.inx.h:2 ../share/extensions/embedselectedimages.inx.h:2 msgid "Embed only selected images" msgstr "Incorporer seulement les images sélectionnées" @@ -33595,16 +30354,12 @@ msgid "Desktop size:" msgstr "Dimensions des points :" #. Maximum size is '16k' -#: ../share/extensions/empty_desktop.inx.h:4 -#: ../share/extensions/empty_generic.inx.h:2 -#: ../share/extensions/empty_video.inx.h:4 +#: ../share/extensions/empty_desktop.inx.h:4 ../share/extensions/empty_generic.inx.h:2 ../share/extensions/empty_video.inx.h:4 #, fuzzy msgid "Custom Width:" msgstr "Dimensions personnalisées" -#: ../share/extensions/empty_desktop.inx.h:5 -#: ../share/extensions/empty_generic.inx.h:3 -#: ../share/extensions/empty_video.inx.h:5 +#: ../share/extensions/empty_desktop.inx.h:5 ../share/extensions/empty_generic.inx.h:3 ../share/extensions/empty_video.inx.h:5 #, fuzzy msgid "Custom Height:" msgstr "Hauteur de capitale :" @@ -33635,8 +30390,7 @@ msgstr "Unité SCG :" msgid "Canvas background:" msgstr "Tracer selon le fond" -#: ../share/extensions/empty_generic.inx.h:6 -#: ../share/extensions/empty_page.inx.h:5 +#: ../share/extensions/empty_generic.inx.h:6 ../share/extensions/empty_page.inx.h:5 #, fuzzy msgid "Hide border" msgstr "Contour en arête" @@ -33711,12 +30465,10 @@ msgstr "Répertoire où enregistrer l'image :" #: ../share/extensions/extractimage.inx.h:3 msgid "" "* Don't type the file extension, it is appended automatically.\n" -"* A relative path (or a filename without path) is relative to the user's " -"home directory." +"* A relative path (or a filename without path) is relative to the user's home directory." msgstr "" "* Ne pas saisir l'extension du fichier, elle est ajoutée automatiquement.\n" -"* Un chemin relatif (ou un nom de fichier seul) est relatif au dossier " -"personnel de l'utilisateur." +"* Un chemin relatif (ou un nom de fichier seul) est relatif au dossier personnel de l'utilisateur." #: ../share/extensions/extrude.inx.h:3 msgid "Lines" @@ -33806,8 +30558,7 @@ msgstr "Valeur Y du haut du rectangle :" msgid "Number of samples:" msgstr "Nombre d'échantillons :" -#: ../share/extensions/funcplot.inx.h:9 -#: ../share/extensions/param_curves.inx.h:11 +#: ../share/extensions/funcplot.inx.h:9 ../share/extensions/param_curves.inx.h:11 msgid "Isotropic scaling" msgstr "Redimensionnement isotrope" @@ -33815,24 +30566,18 @@ msgstr "Redimensionnement isotrope" msgid "Use polar coordinates" msgstr "Utiliser les coordonnées polaires" -#: ../share/extensions/funcplot.inx.h:11 -#: ../share/extensions/param_curves.inx.h:12 -msgid "" -"When set, Isotropic scaling uses smallest of width/xrange or height/yrange" -msgstr "" -"Lorsqu'il est activé, le redimensionnement isotrope utilise le plus petit " -"de : largeur/amplitude en X ou hauteur/amplitude en Y" +#: ../share/extensions/funcplot.inx.h:11 ../share/extensions/param_curves.inx.h:12 +msgid "When set, Isotropic scaling uses smallest of width/xrange or height/yrange" +msgstr "Lorsqu'il est activé, le redimensionnement isotrope utilise le plus petit de : largeur/amplitude en X ou hauteur/amplitude en Y" -#: ../share/extensions/funcplot.inx.h:12 -#: ../share/extensions/param_curves.inx.h:13 +#: ../share/extensions/funcplot.inx.h:12 ../share/extensions/param_curves.inx.h:13 msgid "Use" msgstr "Utiliser" #: ../share/extensions/funcplot.inx.h:13 msgid "" "Select a rectangle before calling the extension,\n" -"it will determine X and Y scales. If you wish to fill the area, then add x-" -"axis endpoints.\n" +"it will determine X and Y scales. If you wish to fill the area, then add x-axis endpoints.\n" "\n" "With polar coordinates:\n" " Start and end X values define the angle range in radians.\n" @@ -33841,24 +30586,19 @@ msgid "" " First derivative is always determined numerically." msgstr "" "Sélectionner un rectangle avant d'appeler l'extension.\n" -"Le rectangle détermine les échelles X et Y. Si vous souhaitez remplir la " -"zone, ajoutez des points terminaux sur l'axe X.\n" +"Le rectangle détermine les échelles X et Y. Si vous souhaitez remplir la zone, ajoutez des points terminaux sur l'axe X.\n" "\n" "Avec des coordonnées polaires :\n" -" Les valeurs X de début et de fin définissent l'amplitude d'angle en " -"radians.\n" -" L'échelle X est fixée de manière à ce que les bords gauche et droit du " -"rectangle soient à +/-1.\n" +" Les valeurs X de début et de fin définissent l'amplitude d'angle en radians.\n" +" L'échelle X est fixée de manière à ce que les bords gauche et droit du rectangle soient à +/-1.\n" " Le redimensionnement isotrope est désactivé.\n" " La dérivée première est toujours déterminée numériquement." -#: ../share/extensions/funcplot.inx.h:21 -#: ../share/extensions/param_curves.inx.h:16 +#: ../share/extensions/funcplot.inx.h:21 ../share/extensions/param_curves.inx.h:16 msgid "Functions" msgstr "Fonctions" -#: ../share/extensions/funcplot.inx.h:22 -#: ../share/extensions/param_curves.inx.h:17 +#: ../share/extensions/funcplot.inx.h:22 ../share/extensions/param_curves.inx.h:17 msgid "" "Standard Python math functions are available:\n" "\n" @@ -33896,13 +30636,11 @@ msgstr "Dérivée première :" msgid "Clip with rectangle" msgstr "Découper avec le rectangle" -#: ../share/extensions/funcplot.inx.h:35 -#: ../share/extensions/param_curves.inx.h:28 +#: ../share/extensions/funcplot.inx.h:35 ../share/extensions/param_curves.inx.h:28 msgid "Remove rectangle" msgstr "Supprimer le rectangle" -#: ../share/extensions/funcplot.inx.h:36 -#: ../share/extensions/param_curves.inx.h:29 +#: ../share/extensions/funcplot.inx.h:36 ../share/extensions/param_curves.inx.h:29 msgid "Draw Axes" msgstr "Dessiner les axes" @@ -33916,52 +30654,33 @@ msgstr "À propos" #: ../share/extensions/gcodetools_about.inx.h:2 msgid "" -"Gcodetools was developed to make simple Gcode from Inkscape's paths. Gcode " -"is a special format which is used in most of CNC machines. So Gcodetools " -"allows you to use Inkscape as CAM program. It can be use with a lot of " -"machine types: Mills Lathes Laser and Plasma cutters and engravers Mill " -"engravers Plotters etc. To get more info visit developers page at http://www." -"cnc-club.ru/gcodetools" -msgstr "" -"Gcodetools a été développé pour réaliser du code Gcode simple à partir des " -"chemins d'Inkscape. Gcode est un format spécial utilisé dans la plupart des " -"machines-outils à commande numérique. Ainsi Gcodetools vous permet " -"d'utiliser Inkscape comme un programme de fabrication assistée par " -"ordinateur. Il peut être utilisé avec un grand nombre de machines. Pour de " -"plus amples informations, visitez la page des développeurs sur le site " -"http://www.cnc-club.ru/gcodetools" - -#: ../share/extensions/gcodetools_about.inx.h:4 -#: ../share/extensions/gcodetools_area.inx.h:54 -#: ../share/extensions/gcodetools_check_for_updates.inx.h:4 -#: ../share/extensions/gcodetools_dxf_points.inx.h:26 -#: ../share/extensions/gcodetools_engraving.inx.h:32 -#: ../share/extensions/gcodetools_graffiti.inx.h:43 -#: ../share/extensions/gcodetools_lathe.inx.h:47 -#: ../share/extensions/gcodetools_orientation_points.inx.h:15 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:36 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:18 +"Gcodetools was developed to make simple Gcode from Inkscape's paths. Gcode is a special format which is used in most of CNC machines. So " +"Gcodetools allows you to use Inkscape as CAM program. It can be use with a lot of machine types: Mills Lathes Laser and Plasma cutters and " +"engravers Mill engravers Plotters etc. To get more info visit developers page at http://www.cnc-club.ru/gcodetools" +msgstr "" +"Gcodetools a été développé pour réaliser du code Gcode simple à partir des chemins d'Inkscape. Gcode est un format spécial utilisé dans la " +"plupart des machines-outils à commande numérique. Ainsi Gcodetools vous permet d'utiliser Inkscape comme un programme de fabrication assistée " +"par ordinateur. Il peut être utilisé avec un grand nombre de machines. Pour de plus amples informations, visitez la page des développeurs sur " +"le site http://www.cnc-club.ru/gcodetools" + +#: ../share/extensions/gcodetools_about.inx.h:4 ../share/extensions/gcodetools_area.inx.h:54 +#: ../share/extensions/gcodetools_check_for_updates.inx.h:4 ../share/extensions/gcodetools_dxf_points.inx.h:26 +#: ../share/extensions/gcodetools_engraving.inx.h:32 ../share/extensions/gcodetools_graffiti.inx.h:43 +#: ../share/extensions/gcodetools_lathe.inx.h:47 ../share/extensions/gcodetools_orientation_points.inx.h:15 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:36 ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:18 #: ../share/extensions/gcodetools_tools_library.inx.h:13 msgid "" -"Gcodetools plug-in: converts paths to Gcode (using circular interpolation), " -"makes offset paths and engraves sharp corners using cone cutters. This plug-" -"in calculates Gcode for paths using circular interpolation or linear motion " -"when needed. Tutorials, manuals and support can be found at English support " -"forum: http://www.cnc-club.ru/gcodetools and Russian support forum: http://" -"www.cnc-club.ru/gcodetoolsru Credits: Nick Drobchenko, Vladimir Kalyaev, " -"John Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" -msgstr "" - -#: ../share/extensions/gcodetools_about.inx.h:5 -#: ../share/extensions/gcodetools_area.inx.h:55 -#: ../share/extensions/gcodetools_check_for_updates.inx.h:5 -#: ../share/extensions/gcodetools_dxf_points.inx.h:27 -#: ../share/extensions/gcodetools_engraving.inx.h:33 -#: ../share/extensions/gcodetools_graffiti.inx.h:44 -#: ../share/extensions/gcodetools_lathe.inx.h:48 -#: ../share/extensions/gcodetools_orientation_points.inx.h:16 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:37 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:19 +"Gcodetools plug-in: converts paths to Gcode (using circular interpolation), makes offset paths and engraves sharp corners using cone cutters. " +"This plug-in calculates Gcode for paths using circular interpolation or linear motion when needed. Tutorials, manuals and support can be found " +"at English support forum: http://www.cnc-club.ru/gcodetools and Russian support forum: http://www.cnc-club.ru/gcodetoolsru Credits: Nick " +"Drobchenko, Vladimir Kalyaev, John Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" +msgstr "" + +#: ../share/extensions/gcodetools_about.inx.h:5 ../share/extensions/gcodetools_area.inx.h:55 +#: ../share/extensions/gcodetools_check_for_updates.inx.h:5 ../share/extensions/gcodetools_dxf_points.inx.h:27 +#: ../share/extensions/gcodetools_engraving.inx.h:33 ../share/extensions/gcodetools_graffiti.inx.h:44 +#: ../share/extensions/gcodetools_lathe.inx.h:48 ../share/extensions/gcodetools_orientation_points.inx.h:16 +#: ../share/extensions/gcodetools_path_to_gcode.inx.h:37 ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:19 #: ../share/extensions/gcodetools_tools_library.inx.h:14 msgid "Gcodetools" msgstr "Programmation de commande numérique" @@ -33984,11 +30703,9 @@ msgstr "Superposition d'outil de zone (0..0.9) :" #: ../share/extensions/gcodetools_area.inx.h:5 msgid "" -"\"Create area offset\": creates several Inkscape path offsets to fill " -"original path's area up to \"Area radius\" value. Outlines start from \"1/2 D" -"\" up to \"Area width\" total width with \"D\" steps where D is taken from " -"the nearest tool definition (\"Tool diameter\" value). Only one offset will " -"be created if the \"Area width\" is equal to \"1/2 D\"." +"\"Create area offset\": creates several Inkscape path offsets to fill original path's area up to \"Area radius\" value. Outlines start from " +"\"1/2 D\" up to \"Area width\" total width with \"D\" steps where D is taken from the nearest tool definition (\"Tool diameter\" value). Only " +"one offset will be created if the \"Area width\" is equal to \"1/2 D\"." msgstr "" #: ../share/extensions/gcodetools_area.inx.h:6 @@ -34038,259 +30755,188 @@ msgstr "supprimer" #: ../share/extensions/gcodetools_area.inx.h:18 msgid "" -"Usage: 1. Select all Area Offsets (gray outlines) 2. Object/Ungroup (Shift" -"+Ctrl+G) 3. Press Apply Suspected small objects will be marked out by " -"colored arrows." +"Usage: 1. Select all Area Offsets (gray outlines) 2. Object/Ungroup (Shift+Ctrl+G) 3. Press Apply Suspected small objects will be marked out " +"by colored arrows." msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:19 -#: ../share/extensions/gcodetools_lathe.inx.h:12 +#: ../share/extensions/gcodetools_area.inx.h:19 ../share/extensions/gcodetools_lathe.inx.h:12 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:1 msgid "Path to Gcode" msgstr "Chemin vers G-code" -#: ../share/extensions/gcodetools_area.inx.h:20 -#: ../share/extensions/gcodetools_lathe.inx.h:13 +#: ../share/extensions/gcodetools_area.inx.h:20 ../share/extensions/gcodetools_lathe.inx.h:13 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:2 msgid "Biarc interpolation tolerance:" msgstr "Tolérance de l'interpolation biarc :" -#: ../share/extensions/gcodetools_area.inx.h:21 -#: ../share/extensions/gcodetools_lathe.inx.h:14 +#: ../share/extensions/gcodetools_area.inx.h:21 ../share/extensions/gcodetools_lathe.inx.h:14 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:3 msgid "Maximum splitting depth:" msgstr "Profondeur de division maximale :" -#: ../share/extensions/gcodetools_area.inx.h:22 -#: ../share/extensions/gcodetools_lathe.inx.h:15 +#: ../share/extensions/gcodetools_area.inx.h:22 ../share/extensions/gcodetools_lathe.inx.h:15 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:4 msgid "Cutting order:" msgstr "Ordre de découpe :" -#: ../share/extensions/gcodetools_area.inx.h:23 -#: ../share/extensions/gcodetools_lathe.inx.h:16 +#: ../share/extensions/gcodetools_area.inx.h:23 ../share/extensions/gcodetools_lathe.inx.h:16 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:5 msgid "Depth function:" msgstr "Fonction de profondeur :" -#: ../share/extensions/gcodetools_area.inx.h:24 -#: ../share/extensions/gcodetools_lathe.inx.h:17 +#: ../share/extensions/gcodetools_area.inx.h:24 ../share/extensions/gcodetools_lathe.inx.h:17 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:6 msgid "Sort paths to reduse rapid distance" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:25 -#: ../share/extensions/gcodetools_lathe.inx.h:18 +#: ../share/extensions/gcodetools_area.inx.h:25 ../share/extensions/gcodetools_lathe.inx.h:18 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:7 msgid "Subpath by subpath" msgstr "Sous-chemin par sous-chemin" -#: ../share/extensions/gcodetools_area.inx.h:26 -#: ../share/extensions/gcodetools_lathe.inx.h:19 +#: ../share/extensions/gcodetools_area.inx.h:26 ../share/extensions/gcodetools_lathe.inx.h:19 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:8 msgid "Path by path" msgstr "Chemin par chemin" -#: ../share/extensions/gcodetools_area.inx.h:27 -#: ../share/extensions/gcodetools_lathe.inx.h:20 +#: ../share/extensions/gcodetools_area.inx.h:27 ../share/extensions/gcodetools_lathe.inx.h:20 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:9 msgid "Pass by Pass" msgstr "Passe par passe" -#: ../share/extensions/gcodetools_area.inx.h:28 -#: ../share/extensions/gcodetools_lathe.inx.h:21 +#: ../share/extensions/gcodetools_area.inx.h:28 ../share/extensions/gcodetools_lathe.inx.h:21 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:10 msgid "" -"Biarc interpolation tolerance is the maximum distance between path and its " -"approximation. The segment will be split into two segments if the distance " -"between path's segment and its approximation exceeds biarc interpolation " -"tolerance. For depth function c=color intensity from 0.0 (white) to 1.0 " -"(black), d is the depth defined by orientation points, s - surface defined " -"by orientation points." -msgstr "" - -#: ../share/extensions/gcodetools_area.inx.h:30 -#: ../share/extensions/gcodetools_engraving.inx.h:8 -#: ../share/extensions/gcodetools_graffiti.inx.h:22 -#: ../share/extensions/gcodetools_lathe.inx.h:23 +"Biarc interpolation tolerance is the maximum distance between path and its approximation. The segment will be split into two segments if the " +"distance between path's segment and its approximation exceeds biarc interpolation tolerance. For depth function c=color intensity from 0.0 " +"(white) to 1.0 (black), d is the depth defined by orientation points, s - surface defined by orientation points." +msgstr "" + +#: ../share/extensions/gcodetools_area.inx.h:30 ../share/extensions/gcodetools_engraving.inx.h:8 +#: ../share/extensions/gcodetools_graffiti.inx.h:22 ../share/extensions/gcodetools_lathe.inx.h:23 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:12 msgid "Scale along Z axis:" msgstr "Échelle sur l'axe Z :" -#: ../share/extensions/gcodetools_area.inx.h:31 -#: ../share/extensions/gcodetools_engraving.inx.h:9 -#: ../share/extensions/gcodetools_graffiti.inx.h:23 -#: ../share/extensions/gcodetools_lathe.inx.h:24 +#: ../share/extensions/gcodetools_area.inx.h:31 ../share/extensions/gcodetools_engraving.inx.h:9 +#: ../share/extensions/gcodetools_graffiti.inx.h:23 ../share/extensions/gcodetools_lathe.inx.h:24 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:13 msgid "Offset along Z axis:" msgstr "Décalage sur l'axe Z :" -#: ../share/extensions/gcodetools_area.inx.h:32 -#: ../share/extensions/gcodetools_engraving.inx.h:10 -#: ../share/extensions/gcodetools_graffiti.inx.h:24 -#: ../share/extensions/gcodetools_lathe.inx.h:25 +#: ../share/extensions/gcodetools_area.inx.h:32 ../share/extensions/gcodetools_engraving.inx.h:10 +#: ../share/extensions/gcodetools_graffiti.inx.h:24 ../share/extensions/gcodetools_lathe.inx.h:25 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:14 msgid "Select all paths if nothing is selected" msgstr "Sélectionner tous les chemins si rien n'est sélectionné" -#: ../share/extensions/gcodetools_area.inx.h:33 -#: ../share/extensions/gcodetools_engraving.inx.h:11 -#: ../share/extensions/gcodetools_graffiti.inx.h:25 -#: ../share/extensions/gcodetools_lathe.inx.h:26 +#: ../share/extensions/gcodetools_area.inx.h:33 ../share/extensions/gcodetools_engraving.inx.h:11 +#: ../share/extensions/gcodetools_graffiti.inx.h:25 ../share/extensions/gcodetools_lathe.inx.h:26 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:15 msgid "Minimum arc radius:" msgstr "Rayon d'arc minimum :" -#: ../share/extensions/gcodetools_area.inx.h:34 -#: ../share/extensions/gcodetools_engraving.inx.h:12 -#: ../share/extensions/gcodetools_graffiti.inx.h:26 -#: ../share/extensions/gcodetools_lathe.inx.h:27 +#: ../share/extensions/gcodetools_area.inx.h:34 ../share/extensions/gcodetools_engraving.inx.h:12 +#: ../share/extensions/gcodetools_graffiti.inx.h:26 ../share/extensions/gcodetools_lathe.inx.h:27 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:16 msgid "Comment Gcode:" msgstr "Commenter le Gcode :" -#: ../share/extensions/gcodetools_area.inx.h:35 -#: ../share/extensions/gcodetools_engraving.inx.h:13 -#: ../share/extensions/gcodetools_graffiti.inx.h:27 -#: ../share/extensions/gcodetools_lathe.inx.h:28 +#: ../share/extensions/gcodetools_area.inx.h:35 ../share/extensions/gcodetools_engraving.inx.h:13 +#: ../share/extensions/gcodetools_graffiti.inx.h:27 ../share/extensions/gcodetools_lathe.inx.h:28 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:17 msgid "Get additional comments from object's properties" msgstr "Obtenir des commentaires supplémentaire des propriétés de l'objet" -#: ../share/extensions/gcodetools_area.inx.h:36 -#: ../share/extensions/gcodetools_dxf_points.inx.h:8 -#: ../share/extensions/gcodetools_engraving.inx.h:14 -#: ../share/extensions/gcodetools_graffiti.inx.h:28 -#: ../share/extensions/gcodetools_lathe.inx.h:29 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:18 +#: ../share/extensions/gcodetools_area.inx.h:36 ../share/extensions/gcodetools_dxf_points.inx.h:8 +#: ../share/extensions/gcodetools_engraving.inx.h:14 ../share/extensions/gcodetools_graffiti.inx.h:28 +#: ../share/extensions/gcodetools_lathe.inx.h:29 ../share/extensions/gcodetools_path_to_gcode.inx.h:18 msgid "Preferences" msgstr "Préférences" -#: ../share/extensions/gcodetools_area.inx.h:37 -#: ../share/extensions/gcodetools_dxf_points.inx.h:9 -#: ../share/extensions/gcodetools_engraving.inx.h:15 -#: ../share/extensions/gcodetools_graffiti.inx.h:29 -#: ../share/extensions/gcodetools_lathe.inx.h:30 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:19 +#: ../share/extensions/gcodetools_area.inx.h:37 ../share/extensions/gcodetools_dxf_points.inx.h:9 +#: ../share/extensions/gcodetools_engraving.inx.h:15 ../share/extensions/gcodetools_graffiti.inx.h:29 +#: ../share/extensions/gcodetools_lathe.inx.h:30 ../share/extensions/gcodetools_path_to_gcode.inx.h:19 msgid "File:" msgstr "Fichier :" -#: ../share/extensions/gcodetools_area.inx.h:38 -#: ../share/extensions/gcodetools_dxf_points.inx.h:10 -#: ../share/extensions/gcodetools_engraving.inx.h:16 -#: ../share/extensions/gcodetools_graffiti.inx.h:30 -#: ../share/extensions/gcodetools_lathe.inx.h:31 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:20 +#: ../share/extensions/gcodetools_area.inx.h:38 ../share/extensions/gcodetools_dxf_points.inx.h:10 +#: ../share/extensions/gcodetools_engraving.inx.h:16 ../share/extensions/gcodetools_graffiti.inx.h:30 +#: ../share/extensions/gcodetools_lathe.inx.h:31 ../share/extensions/gcodetools_path_to_gcode.inx.h:20 msgid "Add numeric suffix to filename" msgstr "Ajouter un suffixe numérique au nom de fichier" -#: ../share/extensions/gcodetools_area.inx.h:39 -#: ../share/extensions/gcodetools_dxf_points.inx.h:11 -#: ../share/extensions/gcodetools_engraving.inx.h:17 -#: ../share/extensions/gcodetools_graffiti.inx.h:31 -#: ../share/extensions/gcodetools_lathe.inx.h:32 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:21 +#: ../share/extensions/gcodetools_area.inx.h:39 ../share/extensions/gcodetools_dxf_points.inx.h:11 +#: ../share/extensions/gcodetools_engraving.inx.h:17 ../share/extensions/gcodetools_graffiti.inx.h:31 +#: ../share/extensions/gcodetools_lathe.inx.h:32 ../share/extensions/gcodetools_path_to_gcode.inx.h:21 msgid "Directory:" msgstr "Dossier :" -#: ../share/extensions/gcodetools_area.inx.h:40 -#: ../share/extensions/gcodetools_dxf_points.inx.h:12 -#: ../share/extensions/gcodetools_engraving.inx.h:18 -#: ../share/extensions/gcodetools_graffiti.inx.h:32 -#: ../share/extensions/gcodetools_lathe.inx.h:33 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:22 +#: ../share/extensions/gcodetools_area.inx.h:40 ../share/extensions/gcodetools_dxf_points.inx.h:12 +#: ../share/extensions/gcodetools_engraving.inx.h:18 ../share/extensions/gcodetools_graffiti.inx.h:32 +#: ../share/extensions/gcodetools_lathe.inx.h:33 ../share/extensions/gcodetools_path_to_gcode.inx.h:22 msgid "Z safe height for G00 move over blank:" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:41 -#: ../share/extensions/gcodetools_dxf_points.inx.h:13 -#: ../share/extensions/gcodetools_engraving.inx.h:19 -#: ../share/extensions/gcodetools_graffiti.inx.h:13 -#: ../share/extensions/gcodetools_lathe.inx.h:34 -#: ../share/extensions/gcodetools_orientation_points.inx.h:6 +#: ../share/extensions/gcodetools_area.inx.h:41 ../share/extensions/gcodetools_dxf_points.inx.h:13 +#: ../share/extensions/gcodetools_engraving.inx.h:19 ../share/extensions/gcodetools_graffiti.inx.h:13 +#: ../share/extensions/gcodetools_lathe.inx.h:34 ../share/extensions/gcodetools_orientation_points.inx.h:6 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:23 msgid "Units (mm or in):" msgstr "Unité (mm ou in) :" -#: ../share/extensions/gcodetools_area.inx.h:42 -#: ../share/extensions/gcodetools_dxf_points.inx.h:14 -#: ../share/extensions/gcodetools_engraving.inx.h:20 -#: ../share/extensions/gcodetools_graffiti.inx.h:33 -#: ../share/extensions/gcodetools_lathe.inx.h:35 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:24 +#: ../share/extensions/gcodetools_area.inx.h:42 ../share/extensions/gcodetools_dxf_points.inx.h:14 +#: ../share/extensions/gcodetools_engraving.inx.h:20 ../share/extensions/gcodetools_graffiti.inx.h:33 +#: ../share/extensions/gcodetools_lathe.inx.h:35 ../share/extensions/gcodetools_path_to_gcode.inx.h:24 msgid "Post-processor:" msgstr "Post-processeur :" -#: ../share/extensions/gcodetools_area.inx.h:43 -#: ../share/extensions/gcodetools_dxf_points.inx.h:15 -#: ../share/extensions/gcodetools_engraving.inx.h:21 -#: ../share/extensions/gcodetools_graffiti.inx.h:34 -#: ../share/extensions/gcodetools_lathe.inx.h:36 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:25 +#: ../share/extensions/gcodetools_area.inx.h:43 ../share/extensions/gcodetools_dxf_points.inx.h:15 +#: ../share/extensions/gcodetools_engraving.inx.h:21 ../share/extensions/gcodetools_graffiti.inx.h:34 +#: ../share/extensions/gcodetools_lathe.inx.h:36 ../share/extensions/gcodetools_path_to_gcode.inx.h:25 msgid "Additional post-processor:" msgstr "Pré-processeur supplémentaire :" -#: ../share/extensions/gcodetools_area.inx.h:44 -#: ../share/extensions/gcodetools_dxf_points.inx.h:16 -#: ../share/extensions/gcodetools_engraving.inx.h:22 -#: ../share/extensions/gcodetools_graffiti.inx.h:35 -#: ../share/extensions/gcodetools_lathe.inx.h:37 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:26 +#: ../share/extensions/gcodetools_area.inx.h:44 ../share/extensions/gcodetools_dxf_points.inx.h:16 +#: ../share/extensions/gcodetools_engraving.inx.h:22 ../share/extensions/gcodetools_graffiti.inx.h:35 +#: ../share/extensions/gcodetools_lathe.inx.h:37 ../share/extensions/gcodetools_path_to_gcode.inx.h:26 msgid "Generate log file" msgstr "Générer un fichier journal" -#: ../share/extensions/gcodetools_area.inx.h:45 -#: ../share/extensions/gcodetools_dxf_points.inx.h:17 -#: ../share/extensions/gcodetools_engraving.inx.h:23 -#: ../share/extensions/gcodetools_graffiti.inx.h:36 -#: ../share/extensions/gcodetools_lathe.inx.h:38 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:27 +#: ../share/extensions/gcodetools_area.inx.h:45 ../share/extensions/gcodetools_dxf_points.inx.h:17 +#: ../share/extensions/gcodetools_engraving.inx.h:23 ../share/extensions/gcodetools_graffiti.inx.h:36 +#: ../share/extensions/gcodetools_lathe.inx.h:38 ../share/extensions/gcodetools_path_to_gcode.inx.h:27 msgid "Full path to log file:" msgstr "Chemin du fichier journal :" -#: ../share/extensions/gcodetools_area.inx.h:48 -#: ../share/extensions/gcodetools_dxf_points.inx.h:20 -#: ../share/extensions/gcodetools_engraving.inx.h:26 -#: ../share/extensions/gcodetools_graffiti.inx.h:37 -#: ../share/extensions/gcodetools_lathe.inx.h:41 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:30 +#: ../share/extensions/gcodetools_area.inx.h:48 ../share/extensions/gcodetools_dxf_points.inx.h:20 +#: ../share/extensions/gcodetools_engraving.inx.h:26 ../share/extensions/gcodetools_graffiti.inx.h:37 +#: ../share/extensions/gcodetools_lathe.inx.h:41 ../share/extensions/gcodetools_path_to_gcode.inx.h:30 msgctxt "GCode postprocessor" msgid "None" msgstr "Aucun" -#: ../share/extensions/gcodetools_area.inx.h:49 -#: ../share/extensions/gcodetools_dxf_points.inx.h:21 -#: ../share/extensions/gcodetools_engraving.inx.h:27 -#: ../share/extensions/gcodetools_graffiti.inx.h:38 -#: ../share/extensions/gcodetools_lathe.inx.h:42 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:31 +#: ../share/extensions/gcodetools_area.inx.h:49 ../share/extensions/gcodetools_dxf_points.inx.h:21 +#: ../share/extensions/gcodetools_engraving.inx.h:27 ../share/extensions/gcodetools_graffiti.inx.h:38 +#: ../share/extensions/gcodetools_lathe.inx.h:42 ../share/extensions/gcodetools_path_to_gcode.inx.h:31 msgid "Parameterize Gcode" msgstr "Paramétrer G-code" -#: ../share/extensions/gcodetools_area.inx.h:50 -#: ../share/extensions/gcodetools_dxf_points.inx.h:22 -#: ../share/extensions/gcodetools_engraving.inx.h:28 -#: ../share/extensions/gcodetools_graffiti.inx.h:39 -#: ../share/extensions/gcodetools_lathe.inx.h:43 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:32 +#: ../share/extensions/gcodetools_area.inx.h:50 ../share/extensions/gcodetools_dxf_points.inx.h:22 +#: ../share/extensions/gcodetools_engraving.inx.h:28 ../share/extensions/gcodetools_graffiti.inx.h:39 +#: ../share/extensions/gcodetools_lathe.inx.h:43 ../share/extensions/gcodetools_path_to_gcode.inx.h:32 msgid "Flip y axis and parameterize Gcode" msgstr "" -#: ../share/extensions/gcodetools_area.inx.h:51 -#: ../share/extensions/gcodetools_dxf_points.inx.h:23 -#: ../share/extensions/gcodetools_engraving.inx.h:29 -#: ../share/extensions/gcodetools_graffiti.inx.h:40 -#: ../share/extensions/gcodetools_lathe.inx.h:44 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:33 +#: ../share/extensions/gcodetools_area.inx.h:51 ../share/extensions/gcodetools_dxf_points.inx.h:23 +#: ../share/extensions/gcodetools_engraving.inx.h:29 ../share/extensions/gcodetools_graffiti.inx.h:40 +#: ../share/extensions/gcodetools_lathe.inx.h:44 ../share/extensions/gcodetools_path_to_gcode.inx.h:33 msgid "Round all values to 4 digits" msgstr "Arrondir toutes les valeurs à 4 chiffres" -#: ../share/extensions/gcodetools_area.inx.h:52 -#: ../share/extensions/gcodetools_dxf_points.inx.h:24 -#: ../share/extensions/gcodetools_engraving.inx.h:30 -#: ../share/extensions/gcodetools_graffiti.inx.h:41 -#: ../share/extensions/gcodetools_lathe.inx.h:45 -#: ../share/extensions/gcodetools_path_to_gcode.inx.h:34 +#: ../share/extensions/gcodetools_area.inx.h:52 ../share/extensions/gcodetools_dxf_points.inx.h:24 +#: ../share/extensions/gcodetools_engraving.inx.h:30 ../share/extensions/gcodetools_graffiti.inx.h:41 +#: ../share/extensions/gcodetools_lathe.inx.h:45 ../share/extensions/gcodetools_path_to_gcode.inx.h:34 msgid "Fast pre-penetrate" msgstr "Pré-pénétration rapide" @@ -34316,10 +30962,8 @@ msgstr "Convertir la sélection :" #: ../share/extensions/gcodetools_dxf_points.inx.h:4 msgid "" -"Convert selected objects to drill points (as dxf_import plugin does). Also " -"you can save original shape. Only the start point of each curve will be " -"used. Also you can manually select object, open XML editor (Shift+Ctrl+X) " -"and add or remove XML tag 'dxfpoint' with any value." +"Convert selected objects to drill points (as dxf_import plugin does). Also you can save original shape. Only the start point of each curve " +"will be used. Also you can manually select object, open XML editor (Shift+Ctrl+X) and add or remove XML tag 'dxfpoint' with any value." msgstr "" #: ../share/extensions/gcodetools_dxf_points.inx.h:5 @@ -34356,12 +31000,9 @@ msgstr "" #: ../share/extensions/gcodetools_engraving.inx.h:6 msgid "" -"This function creates path to engrave letters or any shape with sharp " -"angles. Cutter's depth as a function of radius is defined by the tool. Depth " -"may be any Python expression. For instance: cone....(45 " -"degrees)......................: w cone....(height/diameter=10/3)..: 10*w/3 " -"sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) " -"ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" +"This function creates path to engrave letters or any shape with sharp angles. Cutter's depth as a function of radius is defined by the tool. " +"Depth may be any Python expression. For instance: cone....(45 degrees)......................: w cone....(height/diameter=10/3)..: 10*w/3 " +"sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" msgstr "" #: ../share/extensions/gcodetools_graffiti.inx.h:1 @@ -34396,63 +31037,47 @@ msgstr "Taille de l'aperçu (px) :" msgid "Preview's paint emmit (pts/s):" msgstr "" -#: ../share/extensions/gcodetools_graffiti.inx.h:10 -#: ../share/extensions/gcodetools_orientation_points.inx.h:3 +#: ../share/extensions/gcodetools_graffiti.inx.h:10 ../share/extensions/gcodetools_orientation_points.inx.h:3 msgid "Orientation type:" msgstr "Type d'orientation :" -#: ../share/extensions/gcodetools_graffiti.inx.h:11 -#: ../share/extensions/gcodetools_orientation_points.inx.h:4 +#: ../share/extensions/gcodetools_graffiti.inx.h:11 ../share/extensions/gcodetools_orientation_points.inx.h:4 msgid "Z surface:" msgstr "Surface Z :" -#: ../share/extensions/gcodetools_graffiti.inx.h:12 -#: ../share/extensions/gcodetools_orientation_points.inx.h:5 +#: ../share/extensions/gcodetools_graffiti.inx.h:12 ../share/extensions/gcodetools_orientation_points.inx.h:5 msgid "Z depth:" msgstr "Profondeur sur l'axe Z :" -#: ../share/extensions/gcodetools_graffiti.inx.h:14 -#: ../share/extensions/gcodetools_orientation_points.inx.h:7 +#: ../share/extensions/gcodetools_graffiti.inx.h:14 ../share/extensions/gcodetools_orientation_points.inx.h:7 msgid "2-points mode (move and rotate, maintained aspect ratio X/Y)" msgstr "Mode 2 points (déplacement et rotation, rapport X/Y maintenu)" -#: ../share/extensions/gcodetools_graffiti.inx.h:15 -#: ../share/extensions/gcodetools_orientation_points.inx.h:8 +#: ../share/extensions/gcodetools_graffiti.inx.h:15 ../share/extensions/gcodetools_orientation_points.inx.h:8 msgid "3-points mode (move, rotate and mirror, different X/Y scale)" msgstr "Mode 3 points (déplacement, rotation et miroir, rapport X/Y différent)" -#: ../share/extensions/gcodetools_graffiti.inx.h:16 -#: ../share/extensions/gcodetools_orientation_points.inx.h:9 +#: ../share/extensions/gcodetools_graffiti.inx.h:16 ../share/extensions/gcodetools_orientation_points.inx.h:9 msgid "graffiti points" msgstr "Points graffiti" -#: ../share/extensions/gcodetools_graffiti.inx.h:17 -#: ../share/extensions/gcodetools_orientation_points.inx.h:10 +#: ../share/extensions/gcodetools_graffiti.inx.h:17 ../share/extensions/gcodetools_orientation_points.inx.h:10 msgid "in-out reference point" msgstr "Point de référence d'entrée-sortie" -#: ../share/extensions/gcodetools_graffiti.inx.h:20 -#: ../share/extensions/gcodetools_orientation_points.inx.h:13 +#: ../share/extensions/gcodetools_graffiti.inx.h:20 ../share/extensions/gcodetools_orientation_points.inx.h:13 msgid "" -"Orientation points are used to calculate transformation (offset,scale,mirror," -"rotation in XY plane) of the path. 3-points mode only: do not put all three " -"into one line (use 2-points mode instead). You can modify Z surface, Z depth " -"values later using text tool (3rd coordinates). If there are no orientation " -"points inside current layer they are taken from the upper layer. Do not " -"ungroup orientation points! You can select them using double click to enter " -"the group or by Ctrl+Click. Now press apply to create control points " -"(independent set for each layer)." -msgstr "" -"Les points d'orientation sont utilisés pour calculer la transformation " -"(décalage, échelle, miroir, rotation dans le plan XY) du chemin. En mode 3 " -"points seulement : ne pas disposer les trois points sur une ligne (utilisez " -"alors le mode 2 points). Vous pouvez modifier les valeurs de surface et de " -"profondeur sur l'axe Z plus tard avec l'outil texte (3e coordonnée). En " -"l'absence de points d'orientation dans le calque courant, ils sont récupérés " -"dans le calque supérieur. Ne dégroupez pas les points d'orientation. Vous " -"pouvez les sélectionner en double-cliquant pour rentrer dans le groupe, ou " -"avec la combinaison Ctrl+clic. Appuyez sur Appliquer pour créer des points " -"de contrôles (un ensemble indépendant pour chaque calque)." +"Orientation points are used to calculate transformation (offset,scale,mirror,rotation in XY plane) of the path. 3-points mode only: do not put " +"all three into one line (use 2-points mode instead). You can modify Z surface, Z depth values later using text tool (3rd coordinates). If " +"there are no orientation points inside current layer they are taken from the upper layer. Do not ungroup orientation points! You can select " +"them using double click to enter the group or by Ctrl+Click. Now press apply to create control points (independent set for each layer)." +msgstr "" +"Les points d'orientation sont utilisés pour calculer la transformation (décalage, échelle, miroir, rotation dans le plan XY) du chemin. En " +"mode 3 points seulement : ne pas disposer les trois points sur une ligne (utilisez alors le mode 2 points). Vous pouvez modifier les valeurs " +"de surface et de profondeur sur l'axe Z plus tard avec l'outil texte (3e coordonnée). En l'absence de points d'orientation dans le calque " +"courant, ils sont récupérés dans le calque supérieur. Ne dégroupez pas les points d'orientation. Vous pouvez les sélectionner en double-" +"cliquant pour rentrer dans le groupe, ou avec la combinaison Ctrl+clic. Appuyez sur Appliquer pour créer des points de contrôles (un ensemble " +"indépendant pour chaque calque)." #: ../share/extensions/gcodetools_lathe.inx.h:1 msgid "Lathe" @@ -34496,12 +31121,8 @@ msgid "Lathe modify path" msgstr "Modifer le chemin" #: ../share/extensions/gcodetools_lathe.inx.h:11 -msgid "" -"This function modifies path so it will be able to be cut with the " -"rectangular cutter." -msgstr "" -"Cette fonction modifie le chemin de façon à ce qu'il soit possible de le " -"découper avec un coupoir rectangulaire." +msgid "This function modifies path so it will be able to be cut with the rectangular cutter." +msgstr "Cette fonction modifie le chemin de façon à ce qu'il soit possible de le découper avec un coupoir rectangulaire." #: ../share/extensions/gcodetools_orientation_points.inx.h:1 msgid "Orientation points" @@ -34525,9 +31146,7 @@ msgstr "Longueur du chemin d'entrée-sortie :" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:5 msgid "In-out path max distance to reference point:" -msgstr "" -"Distance maximale du chemin d'entrée-sortie par rapport au point de " -"référence :" +msgstr "Distance maximale du chemin d'entrée-sortie par rapport au point de référence :" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:6 msgid "In-out path type:" @@ -34612,17 +31231,12 @@ msgstr "vérifier seulement les outils" #: ../share/extensions/gcodetools_tools_library.inx.h:11 msgid "" -"Selected tool type fills appropriate default values. You can change these " -"values using the Text tool later on. The topmost (z order) tool in the " -"active layer is used. If there is no tool inside the current layer it is " -"taken from the upper layer. Press Apply to create new tool." -msgstr "" -"Le type d'outil sélectionné s'initialise avec des valeurs par défaut " -"appropriées. Vous pouvez modifier ces valeurs en utilisant l'outil Texte par " -"la suite. L'outil le plus haut (dans l'ordre des plans) dans le calque actif " -"est utilisé. Si aucun outil n'est présent dans le calque, un outil est " -"sélectionné dans la couche supérieure. Appuyez sur Appliquer pour créer un " -"nouvel outil." +"Selected tool type fills appropriate default values. You can change these values using the Text tool later on. The topmost (z order) tool in " +"the active layer is used. If there is no tool inside the current layer it is taken from the upper layer. Press Apply to create new tool." +msgstr "" +"Le type d'outil sélectionné s'initialise avec des valeurs par défaut appropriées. Vous pouvez modifier ces valeurs en utilisant l'outil Texte " +"par la suite. L'outil le plus haut (dans l'ordre des plans) dans le calque actif est utilisé. Si aucun outil n'est présent dans le calque, un " +"outil est sélectionné dans la couche supérieure. Appuyez sur Appliquer pour créer un nouvel outil." #: ../share/extensions/generate_voronoi.inx.h:1 msgid "Voronoi Pattern" @@ -34638,22 +31252,18 @@ msgstr "Taille de la bordure (px) :" #: ../share/extensions/generate_voronoi.inx.h:6 msgid "" -"Generate a random pattern of Voronoi cells. The pattern will be accessible " -"in the Fill and Stroke dialog. You must select an object or a group.\n" +"Generate a random pattern of Voronoi cells. The pattern will be accessible in the Fill and Stroke dialog. You must select an object or a " +"group.\n" "\n" -"If border is zero, the pattern will be discontinuous at the edges. Use a " -"positive border, preferably greater than the cell size, to produce a smooth " -"join of the pattern at the edges. Use a negative border to reduce the size " -"of the pattern and get an empty border." +"If border is zero, the pattern will be discontinuous at the edges. Use a positive border, preferably greater than the cell size, to produce a " +"smooth join of the pattern at the edges. Use a negative border to reduce the size of the pattern and get an empty border." msgstr "" -"Génère un motif de cellules de Voronoï aléatoire. Le motif pourra être " -"utilisé dans la boîte de dialogue Remplissage et contour. Vous devez " +"Génère un motif de cellules de Voronoï aléatoire. Le motif pourra être utilisé dans la boîte de dialogue Remplissage et contour. Vous devez " "sélectionner un objet ou un groupe.\n" "\n" -"Si la bordure est nulle, le motif sera discontinu sur ses bords. Utilisez " -"une valeur positive, de préférence plus grande que la taille de cellule, " -"pour produire un joint lisse du motif sur ses bords. Utilisez une valeur " -"négative pour réduire la taille du motif et obtenir une bordure vide." +"Si la bordure est nulle, le motif sera discontinu sur ses bords. Utilisez une valeur positive, de préférence plus grande que la taille de " +"cellule, pour produire un joint lisse du motif sur ses bords. Utilisez une valeur négative pour réduire la taille du motif et obtenir une " +"bordure vide." #: ../share/extensions/gimp_xcf.inx.h:1 msgid "GIMP XCF" @@ -34677,29 +31287,23 @@ msgstr "Résolution du fichier :" #: ../share/extensions/gimp_xcf.inx.h:8 msgid "" -"This extension exports the document to Gimp XCF format according to the " -"following options:\n" +"This extension exports the document to Gimp XCF format according to the following options:\n" " * Save Guides: convert all guides to Gimp guides.\n" -" * Save Grid: convert the first rectangular grid to a Gimp grid (note " -"that the default Inkscape grid is very narrow when shown in Gimp).\n" +" * Save Grid: convert the first rectangular grid to a Gimp grid (note that the default Inkscape grid is very narrow when shown in Gimp).\n" " * Save Background: add the document background to each converted layer.\n" " * File Resolution: XCF file resolution, in DPI.\n" "\n" -"Each first level layer is converted to a Gimp layer. Sublayers are " -"concatenated and converted with their first level parent layer into a single " -"Gimp layer." +"Each first level layer is converted to a Gimp layer. Sublayers are concatenated and converted with their first level parent layer into a " +"single Gimp layer." msgstr "" -"Cette extension exporte le document au format Gimp XCF en fonction des " -"options suivantes :\n" +"Cette extension exporte le document au format Gimp XCF en fonction des options suivantes :\n" " * Enregistrer les guides : converti tous les guides en guides Gimp.\n" -" * Enregistrer la grille : converti la première grille rectangulaire en une " -"grille Gimp (notez que la grille par défaut d'Inkscape est particulièrement " -"étroite lorsque visualisée dans Gimp).\n" +" * Enregistrer la grille : converti la première grille rectangulaire en une grille Gimp (notez que la grille par défaut d'Inkscape est " +"particulièrement étroite lorsque visualisée dans Gimp).\n" " * Exporter le fond : ajoute le fond du document à chaque calque converti.\n" " * Résolution du fichier : résolution du fichier XCF en DPI.\n" "\n" -"Chaque calque de premier niveau est converti en calque Gimp. Les sous-" -"calques sont concaténés et converti avec le calque de premier niveau " +"Chaque calque de premier niveau est converti en calque Gimp. Les sous-calques sont concaténés et converti avec le calque de premier niveau " "supérieur en un calque Gimp unique." #: ../share/extensions/gimp_xcf.inx.h:15 @@ -34710,8 +31314,7 @@ msgstr "GIMP XCF avec conservation des calques (*.xcf)" msgid "Cartesian Grid" msgstr "Grille cartésienne" -#: ../share/extensions/grid_cartesian.inx.h:2 -#: ../share/extensions/grid_isometric.inx.h:10 +#: ../share/extensions/grid_cartesian.inx.h:2 ../share/extensions/grid_isometric.inx.h:10 msgid "Border Thickness (px):" msgstr "Épaisseur de la bordure (px) :" @@ -34733,8 +31336,7 @@ msgstr "Subdivisions par marque principale sur l'axe X :" #: ../share/extensions/grid_cartesian.inx.h:7 msgid "Logarithmic X Subdiv. (Base given by entry above)" -msgstr "" -"Subdivision logarithmique sur l'axe X (base donnée par l'entrée précédente)" +msgstr "Subdivision logarithmique sur l'axe X (base donnée par l'entrée précédente)" #: ../share/extensions/grid_cartesian.inx.h:8 msgid "Subsubdivs. per X Subdivision:" @@ -34742,9 +31344,7 @@ msgstr "Sous-subdivisions par subdivision sur l'axe X :" #: ../share/extensions/grid_cartesian.inx.h:9 msgid "Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):" -msgstr "" -"Diviser par deux la fréquence des sous-subdivisions sur l'axe X après « n » " -"subdibvisions (log seulement) :" +msgstr "Diviser par deux la fréquence des sous-subdivisions sur l'axe X après « n » subdibvisions (log seulement) :" #: ../share/extensions/grid_cartesian.inx.h:10 msgid "Major X Division Thickness (px):" @@ -34776,8 +31376,7 @@ msgstr "Subdivisions par marque principale sur l'axe Y :" #: ../share/extensions/grid_cartesian.inx.h:17 msgid "Logarithmic Y Subdiv. (Base given by entry above)" -msgstr "" -"Subdivision logarithmique sur l'axe Y (base donnée par l'entrée ci-dessus)" +msgstr "Subdivision logarithmique sur l'axe Y (base donnée par l'entrée ci-dessus)" #: ../share/extensions/grid_cartesian.inx.h:18 msgid "Subsubdivs. per Y Subdivision:" @@ -34785,9 +31384,7 @@ msgstr "Sous-subdivisions par subdivision sur l'axe Y :" #: ../share/extensions/grid_cartesian.inx.h:19 msgid "Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):" -msgstr "" -"Diviser par deux la fréquence des sous-subdivisions sur l'axe Y après « n » " -"subdibvisions (log seulement) :" +msgstr "Diviser par deux la fréquence des sous-subdivisions sur l'axe Y après « n » subdibvisions (log seulement) :" #: ../share/extensions/grid_cartesian.inx.h:20 msgid "Major Y Division Thickness (px):" @@ -35036,9 +31633,7 @@ msgstr "Texte Hershey" msgid "Render Text" msgstr "Rendu du texte" -#: ../share/extensions/hershey.inx.h:3 -#: ../share/extensions/render_alphabetsoup.inx.h:2 -#: ../share/extensions/render_barcode_datamatrix.inx.h:2 +#: ../share/extensions/hershey.inx.h:3 ../share/extensions/render_alphabetsoup.inx.h:2 ../share/extensions/render_barcode_datamatrix.inx.h:2 #: ../share/extensions/render_barcode_qrcode.inx.h:3 msgid "Text:" msgstr "Texte :" @@ -35178,14 +31773,12 @@ msgid "" " www.evilmadscientist.com/go/hershey" msgstr "" "\n" -"Cette extension compose une ligne de texte en utilisant les fontes " -"« Hershey » pour traceurs, dérivées de NBS SP-424 1976-04, « A contribution " -"to computer typesetting techniques: Tables of Coordinates for Hershey's " -"Repertory of Occidental Type Fonts and Graphic Symbols. »\n" +"Cette extension compose une ligne de texte en utilisant les fontes « Hershey » pour traceurs, dérivées de NBS SP-424 1976-04, « A " +"contribution to computer typesetting techniques: Tables of Coordinates for Hershey's Repertory of Occidental Type Fonts and Graphic " +"Symbols. »\n" "\n" -"Il ne s'agit pas de fontes de contour traditionnelles, mais de fontes à " -"contour simple ou de fontes de gravure ou les caractères sont formés par " -"leur contour (et sans remplissage).\n" +"Il ne s'agit pas de fontes de contour traditionnelles, mais de fontes à contour simple ou de fontes de gravure ou les caractères sont formés " +"par leur contour (et sans remplissage).\n" "\n" "Des information supplémentaires sont disponible sur le site :\n" "www.evilmadscientist.com/go/hershey" @@ -35196,45 +31789,27 @@ msgstr "Entrée HPGL" #: ../share/extensions/hpgl_input.inx.h:2 msgid "" -"Please note that you can only open HPGL files written by Inkscape, to open " -"other HPGL files please change their file extension to .plt, make sure you " -"have UniConverter installed and open them again." +"Please note that you can only open HPGL files written by Inkscape, to open other HPGL files please change their file extension to .plt, make " +"sure you have UniConverter installed and open them again." msgstr "" -"Notez que vous ne pouvez ouvrir que des fichiers HPGL écrits avec Inkscape. " -"Pour utiliser un autre fichier HPGL, modifiez son extension en .plt (assurez-" -"vous qu'UniConvertor est installé sur votre machine)." +"Notez que vous ne pouvez ouvrir que des fichiers HPGL écrits avec Inkscape. Pour utiliser un autre fichier HPGL, modifiez son extension en ." +"plt (assurez-vous qu'UniConvertor est installé sur votre machine)." -#: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 -#: ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hpgl_input.inx.h:3 ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "Résolution X (ppp) :" -#: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 -#: ../share/extensions/plotter.inx.h:33 -msgid "" -"The amount of steps the plotter moves if it moves for 1 inch on the X axis " -"(Default: 1016.0)" -msgstr "" -"Le nombre de pas effectués par votre traceur lorsqu'il se déplace d'un pouce " -"sur l'axe X (par défaut, 1016)" +#: ../share/extensions/hpgl_input.inx.h:4 ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33 +msgid "The amount of steps the plotter moves if it moves for 1 inch on the X axis (Default: 1016.0)" +msgstr "Le nombre de pas effectués par votre traceur lorsqu'il se déplace d'un pouce sur l'axe X (par défaut, 1016)" -#: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 -#: ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/hpgl_input.inx.h:5 ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "Résolution Y (ppp) :" -#: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 -#: ../share/extensions/plotter.inx.h:35 -msgid "" -"The amount of steps the plotter moves if it moves for 1 inch on the Y axis " -"(Default: 1016.0)" -msgstr "" -"Le nombre de pas effectués par votre traceur lorsqu'il se déplace d'un pouce " -"sur l'axe Y (par défaut, 1016)" +#: ../share/extensions/hpgl_input.inx.h:6 ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35 +msgid "The amount of steps the plotter moves if it moves for 1 inch on the Y axis (Default: 1016.0)" +msgstr "Le nombre de pas effectués par votre traceur lorsqu'il se déplace d'un pouce sur l'axe Y (par défaut, 1016)" #: ../share/extensions/hpgl_input.inx.h:7 msgid "Show movements between paths" @@ -35242,11 +31817,9 @@ msgstr "Montrer les déplacements entre les chemins" #: ../share/extensions/hpgl_input.inx.h:8 msgid "Check this to show movements between paths (Default: Unchecked)" -msgstr "" -"Cocher pour montrer les déplacements entre les chemins (décoché par défaut)" +msgstr "Cocher pour montrer les déplacements entre les chemins (décoché par défaut)" -#: ../share/extensions/hpgl_input.inx.h:9 -#: ../share/extensions/hpgl_output.inx.h:35 +#: ../share/extensions/hpgl_input.inx.h:9 ../share/extensions/hpgl_output.inx.h:35 msgid "HP Graphics Language file (*.hpgl)" msgstr "Fichier HP Graphics Language (*.hpgl)" @@ -35260,187 +31833,138 @@ msgstr "Sortie HPGL" #: ../share/extensions/hpgl_output.inx.h:2 msgid "" -"Please make sure that all objects you want to save are converted to paths. " -"Please use the plotter extension (Extensions menu) to plot directly over a " -"serial connection." +"Please make sure that all objects you want to save are converted to paths. Please use the plotter extension (Extensions menu) to plot directly " +"over a serial connection." msgstr "" -"Assurez-vous que tous les objets que vous souhaitez enregistrer sont " -"convertis en chemins. Veuillez utiliser l'extension Traceur (dans le menu " +"Assurez-vous que tous les objets que vous souhaitez enregistrer sont convertis en chemins. Veuillez utiliser l'extension Traceur (dans le menu " "Extensions>Exporter) pour tracer directement au travers du port série." -#: ../share/extensions/hpgl_output.inx.h:3 -#: ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 msgid "Plotter Settings " msgstr "Paramètres du traceur" -#: ../share/extensions/hpgl_output.inx.h:8 -#: ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36 msgid "Pen number:" msgstr "Numéro de stylo :" -#: ../share/extensions/hpgl_output.inx.h:9 -#: ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "Le numéro du stylo (outil) à utiliser (en standard : 1)" -#: ../share/extensions/hpgl_output.inx.h:10 -#: ../share/extensions/plotter.inx.h:38 +#: ../share/extensions/hpgl_output.inx.h:10 ../share/extensions/plotter.inx.h:38 msgid "Pen force (g):" msgstr "Force du stylo (g) :" -#: ../share/extensions/hpgl_output.inx.h:11 -#: ../share/extensions/plotter.inx.h:39 -msgid "" -"The amount of force pushing down the pen in grams, set to 0 to omit command; " -"most plotters ignore this command (Default: 0)" +#: ../share/extensions/hpgl_output.inx.h:11 ../share/extensions/plotter.inx.h:39 +msgid "The amount of force pushing down the pen in grams, set to 0 to omit command; most plotters ignore this command (Default: 0)" msgstr "" -"La force d'appui du stylo, en grammes, ignorée lorsque la valeur est à 0 ; " -"la plupart des traceurs ignorent cette commande (par défaut : 0)" +"La force d'appui du stylo, en grammes, ignorée lorsque la valeur est à 0 ; la plupart des traceurs ignorent cette commande (par défaut : 0)" -#: ../share/extensions/hpgl_output.inx.h:12 -#: ../share/extensions/plotter.inx.h:40 +#: ../share/extensions/hpgl_output.inx.h:12 ../share/extensions/plotter.inx.h:40 msgid "Pen speed (cm/s or mm/s):" msgstr "Vitesse du stylo (cm/s ou mm/s) :" #: ../share/extensions/hpgl_output.inx.h:13 #, fuzzy msgid "" -"The speed the pen will move with in centimeters or millimeters per second " -"(depending on your plotter model), set to 0 to omit command; most plotters " -"ignore this command (Default: 0)" +"The speed the pen will move with in centimeters or millimeters per second (depending on your plotter model), set to 0 to omit command; most " +"plotters ignore this command (Default: 0)" msgstr "" -"La force d'appui du stylo, en grammes, ignorée lorsque la valeur est à 0 ; " -"la plupart des traceurs ignorent cette commande (par défaut : 0)" +"La force d'appui du stylo, en grammes, ignorée lorsque la valeur est à 0 ; la plupart des traceurs ignorent cette commande (par défaut : 0)" #: ../share/extensions/hpgl_output.inx.h:14 msgid "Rotation (°, Clockwise):" msgstr "Rotation (°, sens horaire) :" -#: ../share/extensions/hpgl_output.inx.h:15 -#: ../share/extensions/plotter.inx.h:43 +#: ../share/extensions/hpgl_output.inx.h:15 ../share/extensions/plotter.inx.h:43 msgid "Rotation of the drawing (Default: 0°)" msgstr "Rotation du dessin (par défaut : 0 °)" -#: ../share/extensions/hpgl_output.inx.h:16 -#: ../share/extensions/plotter.inx.h:44 +#: ../share/extensions/hpgl_output.inx.h:16 ../share/extensions/plotter.inx.h:44 msgid "Mirror X axis" msgstr "Refléter sur l'axe Y" -#: ../share/extensions/hpgl_output.inx.h:17 -#: ../share/extensions/plotter.inx.h:45 +#: ../share/extensions/hpgl_output.inx.h:17 ../share/extensions/plotter.inx.h:45 msgid "Check this to mirror the X axis (Default: Unchecked)" msgstr "Cocher pour refléter l'axe X (décoché par défaut)" -#: ../share/extensions/hpgl_output.inx.h:18 -#: ../share/extensions/plotter.inx.h:46 +#: ../share/extensions/hpgl_output.inx.h:18 ../share/extensions/plotter.inx.h:46 msgid "Mirror Y axis" msgstr "Refléter sur l'axe Y" -#: ../share/extensions/hpgl_output.inx.h:19 -#: ../share/extensions/plotter.inx.h:47 +#: ../share/extensions/hpgl_output.inx.h:19 ../share/extensions/plotter.inx.h:47 msgid "Check this to mirror the Y axis (Default: Unchecked)" msgstr "Cocher pour refléter l'axe Y (décoché par défaut)" -#: ../share/extensions/hpgl_output.inx.h:20 -#: ../share/extensions/plotter.inx.h:48 +#: ../share/extensions/hpgl_output.inx.h:20 ../share/extensions/plotter.inx.h:48 msgid "Center zero point" msgstr "Centrer le point zéro" -#: ../share/extensions/hpgl_output.inx.h:21 -#: ../share/extensions/plotter.inx.h:49 -msgid "" -"Check this if your plotter uses a centered zero point (Default: Unchecked)" -msgstr "" -"Cocher si votre traceur utilise un point zéro centré (décoché par défaut)" +#: ../share/extensions/hpgl_output.inx.h:21 ../share/extensions/plotter.inx.h:49 +msgid "Check this if your plotter uses a centered zero point (Default: Unchecked)" +msgstr "Cocher si votre traceur utilise un point zéro centré (décoché par défaut)" -#: ../share/extensions/hpgl_output.inx.h:22 -#: ../share/extensions/plotter.inx.h:50 +#: ../share/extensions/hpgl_output.inx.h:22 ../share/extensions/plotter.inx.h:50 msgid "" -"If you want to use multiple pens on your pen plotter create one layer for " -"each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " -"in the corresponding layers. This overrules the pen number option above." +"If you want to use multiple pens on your pen plotter create one layer for each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your " +"drawings in the corresponding layers. This overrules the pen number option above." msgstr "" -#: ../share/extensions/hpgl_output.inx.h:23 -#: ../share/extensions/plotter.inx.h:51 +#: ../share/extensions/hpgl_output.inx.h:23 ../share/extensions/plotter.inx.h:51 msgid "Plot Features " msgstr "Fonctionnalités du traceur" -#: ../share/extensions/hpgl_output.inx.h:24 -#: ../share/extensions/plotter.inx.h:52 +#: ../share/extensions/hpgl_output.inx.h:24 ../share/extensions/plotter.inx.h:52 msgid "Overcut (mm):" msgstr "Surcoupe (mm) :" -#: ../share/extensions/hpgl_output.inx.h:25 -#: ../share/extensions/plotter.inx.h:53 -msgid "" -"The distance in mm that will be cut over the starting point of the path to " -"prevent open paths, set to 0.0 to omit command (Default: 1.00)" +#: ../share/extensions/hpgl_output.inx.h:25 ../share/extensions/plotter.inx.h:53 +msgid "The distance in mm that will be cut over the starting point of the path to prevent open paths, set to 0.0 to omit command (Default: 1.00)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:26 -#: ../share/extensions/plotter.inx.h:54 +#: ../share/extensions/hpgl_output.inx.h:26 ../share/extensions/plotter.inx.h:54 #, fuzzy msgid "Tool (Knife) offset correction (mm):" msgstr "Décalage de l'outil (mm) :" -#: ../share/extensions/hpgl_output.inx.h:27 -#: ../share/extensions/plotter.inx.h:55 -msgid "" -"The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " -"command (Default: 0.25)" +#: ../share/extensions/hpgl_output.inx.h:27 ../share/extensions/plotter.inx.h:55 +msgid "The offset from the tool tip to the tool axis in mm, set to 0.0 to omit command (Default: 0.25)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:28 -#: ../share/extensions/plotter.inx.h:56 +#: ../share/extensions/hpgl_output.inx.h:28 ../share/extensions/plotter.inx.h:56 #, fuzzy msgid "Precut" msgstr "Prédécouper" -#: ../share/extensions/hpgl_output.inx.h:29 -#: ../share/extensions/plotter.inx.h:57 -msgid "" -"Check this to cut a small line before the real drawing starts to correctly " -"align the tool orientation. (Default: Checked)" +#: ../share/extensions/hpgl_output.inx.h:29 ../share/extensions/plotter.inx.h:57 +msgid "Check this to cut a small line before the real drawing starts to correctly align the tool orientation. (Default: Checked)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:30 -#: ../share/extensions/plotter.inx.h:58 +#: ../share/extensions/hpgl_output.inx.h:30 ../share/extensions/plotter.inx.h:58 msgid "Curve flatness:" msgstr "Écrasement des courbes :" -#: ../share/extensions/hpgl_output.inx.h:31 -#: ../share/extensions/plotter.inx.h:59 -msgid "" -"Curves are divided into lines, this number controls how fine the curves will " -"be reproduced, the smaller the finer (Default: '1.2')" +#: ../share/extensions/hpgl_output.inx.h:31 ../share/extensions/plotter.inx.h:59 +msgid "Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Default: '1.2')" msgstr "" -"Les courbes étant divisées en lignes, ce nombre contrôle la finesse de la " -"courbe qui sera reproduite ; plus le nombre est petit, plus la courbe est " -"précise (par défaut : 1.2)" +"Les courbes étant divisées en lignes, ce nombre contrôle la finesse de la courbe qui sera reproduite ; plus le nombre est petit, plus la " +"courbe est précise (par défaut : 1.2)" -#: ../share/extensions/hpgl_output.inx.h:32 -#: ../share/extensions/plotter.inx.h:60 +#: ../share/extensions/hpgl_output.inx.h:32 ../share/extensions/plotter.inx.h:60 msgid "Auto align" msgstr "Aligner automatiquement" -#: ../share/extensions/hpgl_output.inx.h:33 -#: ../share/extensions/plotter.inx.h:61 +#: ../share/extensions/hpgl_output.inx.h:33 ../share/extensions/plotter.inx.h:61 msgid "" -"Check this to auto align the drawing to the zero point (Plus the tool offset " -"if used). If unchecked you have to make sure that all parts of your drawing " -"are within the document border! (Default: Checked)" +"Check this to auto align the drawing to the zero point (Plus the tool offset if used). If unchecked you have to make sure that all parts of " +"your drawing are within the document border! (Default: Checked)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:34 -#: ../share/extensions/plotter.inx.h:64 -msgid "" -"All these settings depend on the plotter you use, for more information " -"please consult the manual or homepage for your plotter." +#: ../share/extensions/hpgl_output.inx.h:34 ../share/extensions/plotter.inx.h:64 +msgid "All these settings depend on the plotter you use, for more information please consult the manual or homepage for your plotter." msgstr "" -"Tous ces paramètres dépendent du traceur que vous utilisez. Pour de plus " -"amples informations, veuillez consulter le manuel ou la documentation en " -"ligne de votre traceur.." +"Tous ces paramètres dépendent du traceur que vous utilisez. Pour de plus amples informations, veuillez consulter le manuel ou la documentation " +"en ligne de votre traceur.." #: ../share/extensions/hpgl_output.inx.h:36 msgid "Export an HP Graphics Language file" @@ -35470,11 +31994,8 @@ msgstr "Affiche les images pixélisées" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:9 -msgid "" -"Render all bitmap images like in older Inskcape versions. Available options:" -msgstr "" -"Affiche toutes les images matricielles come dans les anciennes versions " -"d'Inkscape. Options disponibles :" +msgid "Render all bitmap images like in older Inskcape versions. Available options:" +msgstr "Affiche toutes les images matricielles come dans les anciennes versions d'Inkscape. Options disponibles :" #. image aspect ratio #: ../share/extensions/image_attributes.inx.h:11 @@ -35629,14 +32150,12 @@ msgstr "Dupliquer les extrémités" msgid "Interpolate style" msgstr "Interpoler le style" -#: ../share/extensions/interp.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:10 +#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 #, fuzzy msgid "Use Z-order" msgstr "Contour surélevé" -#: ../share/extensions/interp.inx.h:8 -#: ../share/extensions/interp_att_g.inx.h:11 +#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" @@ -35676,8 +32195,7 @@ msgstr "Translation en X" msgid "Translate Y" msgstr "Translation en Y" -#: ../share/extensions/interp_att_g.inx.h:17 -#: ../share/extensions/markers_strokepaint.inx.h:9 +#: ../share/extensions/interp_att_g.inx.h:17 ../share/extensions/markers_strokepaint.inx.h:9 msgid "Fill" msgstr "Fond" @@ -35686,12 +32204,8 @@ msgid "Other" msgstr "Autre" #: ../share/extensions/interp_att_g.inx.h:20 -msgid "" -"If you select \"Other\", you must know the SVG attributes to identify here " -"this \"other\"." -msgstr "" -"Si vous sélectionnez « Autre », vous devez connaître les attributs SVG " -"nécessaires pour identifier ici cet « autre »." +msgid "If you select \"Other\", you must know the SVG attributes to identify here this \"other\"." +msgstr "Si vous sélectionnez « Autre », vous devez connaître les attributs SVG nécessaires pour identifier ici cet « autre »." #: ../share/extensions/interp_att_g.inx.h:22 msgid "Integer Number" @@ -35701,8 +32215,7 @@ msgstr "Nombre entier" msgid "Float Number" msgstr "Nombre réel" -#: ../share/extensions/interp_att_g.inx.h:25 -#: ../share/extensions/polyhedron_3d.inx.h:33 +#: ../share/extensions/interp_att_g.inx.h:25 ../share/extensions/polyhedron_3d.inx.h:33 msgid "Style" msgstr "Style" @@ -35720,23 +32233,16 @@ msgstr "Pas d'unité" #: ../share/extensions/interp_att_g.inx.h:30 msgid "" -"This effect applies a value for any interpolatable attribute for all " -"elements inside the selected group or for all elements in a multiple " +"This effect applies a value for any interpolatable attribute for all elements inside the selected group or for all elements in a multiple " "selection." -msgstr "" -"Cet effet applique une valeur sur les attributs interpolables de l'ensemble " -"des éléments de la sélection." +msgstr "Cet effet applique une valeur sur les attributs interpolables de l'ensemble des éléments de la sélection." #: ../share/extensions/jessyInk_autoTexts.inx.h:1 msgid "Auto-texts" msgstr "Textes automatiques" -#: ../share/extensions/jessyInk_autoTexts.inx.h:2 -#: ../share/extensions/jessyInk_effects.inx.h:2 -#: ../share/extensions/jessyInk_export.inx.h:2 -#: ../share/extensions/jessyInk_masterSlide.inx.h:2 -#: ../share/extensions/jessyInk_transitions.inx.h:2 -#: ../share/extensions/jessyInk_view.inx.h:2 +#: ../share/extensions/jessyInk_autoTexts.inx.h:2 ../share/extensions/jessyInk_effects.inx.h:2 ../share/extensions/jessyInk_export.inx.h:2 +#: ../share/extensions/jessyInk_masterSlide.inx.h:2 ../share/extensions/jessyInk_transitions.inx.h:2 ../share/extensions/jessyInk_view.inx.h:2 msgid "Settings" msgstr "Paramètres" @@ -35762,24 +32268,16 @@ msgstr "Nombre de diapositives" #: ../share/extensions/jessyInk_autoTexts.inx.h:9 msgid "" -"This extension allows you to install, update and remove auto-texts for a " -"JessyInk presentation. Please see code.google.com/p/jessyink for more " +"This extension allows you to install, update and remove auto-texts for a JessyInk presentation. Please see code.google.com/p/jessyink for more " "details." msgstr "" -"Cette extension vous permet d'installer, mettre à jour ou supprimer des " -"textes automatiques pour une présentation JessyInk. Des informations " +"Cette extension vous permet d'installer, mettre à jour ou supprimer des textes automatiques pour une présentation JessyInk. Des informations " "complémentaires sont disponibles sur le site code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_autoTexts.inx.h:10 -#: ../share/extensions/jessyInk_effects.inx.h:15 -#: ../share/extensions/jessyInk_install.inx.h:4 -#: ../share/extensions/jessyInk_keyBindings.inx.h:46 -#: ../share/extensions/jessyInk_masterSlide.inx.h:7 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:8 -#: ../share/extensions/jessyInk_summary.inx.h:4 -#: ../share/extensions/jessyInk_transitions.inx.h:14 -#: ../share/extensions/jessyInk_uninstall.inx.h:12 -#: ../share/extensions/jessyInk_video.inx.h:4 +#: ../share/extensions/jessyInk_autoTexts.inx.h:10 ../share/extensions/jessyInk_effects.inx.h:15 ../share/extensions/jessyInk_install.inx.h:4 +#: ../share/extensions/jessyInk_keyBindings.inx.h:46 ../share/extensions/jessyInk_masterSlide.inx.h:7 +#: ../share/extensions/jessyInk_mouseHandler.inx.h:8 ../share/extensions/jessyInk_summary.inx.h:4 +#: ../share/extensions/jessyInk_transitions.inx.h:14 ../share/extensions/jessyInk_uninstall.inx.h:12 ../share/extensions/jessyInk_video.inx.h:4 #: ../share/extensions/jessyInk_view.inx.h:9 msgid "JessyInk" msgstr "JessyInk" @@ -35788,9 +32286,7 @@ msgstr "JessyInk" msgid "Effects" msgstr "Effets" -#: ../share/extensions/jessyInk_effects.inx.h:4 -#: ../share/extensions/jessyInk_transitions.inx.h:4 -#: ../share/extensions/jessyInk_view.inx.h:4 +#: ../share/extensions/jessyInk_effects.inx.h:4 ../share/extensions/jessyInk_transitions.inx.h:4 ../share/extensions/jessyInk_view.inx.h:4 msgid "Duration in seconds:" msgstr "Durée en secondes :" @@ -35802,8 +32298,7 @@ msgstr "Effet entrant" msgid "None (default)" msgstr "Aucun (défaut)" -#: ../share/extensions/jessyInk_effects.inx.h:8 -#: ../share/extensions/jessyInk_transitions.inx.h:8 +#: ../share/extensions/jessyInk_effects.inx.h:8 ../share/extensions/jessyInk_transitions.inx.h:8 msgid "Appear" msgstr "Apparition" @@ -35811,8 +32306,7 @@ msgstr "Apparition" msgid "Fade in" msgstr "Ouverture en fondu" -#: ../share/extensions/jessyInk_effects.inx.h:10 -#: ../share/extensions/jessyInk_transitions.inx.h:10 +#: ../share/extensions/jessyInk_effects.inx.h:10 ../share/extensions/jessyInk_transitions.inx.h:10 msgid "Pop" msgstr "Pop" @@ -35826,12 +32320,10 @@ msgstr "Fermeture en fondu" #: ../share/extensions/jessyInk_effects.inx.h:14 msgid "" -"This extension allows you to install, update and remove object effects for a " -"JessyInk presentation. Please see code.google.com/p/jessyink for more " -"details." +"This extension allows you to install, update and remove object effects for a JessyInk presentation. Please see code.google.com/p/jessyink for " +"more details." msgstr "" -"Cette extension vous permet d'installer, mettre à jour ou supprimer des " -"effets d'objet pour une présentation JessyInk. Des informations " +"Cette extension vous permet d'installer, mettre à jour ou supprimer des effets d'objet pour une présentation JessyInk. Des informations " "complémentaires sont disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_export.inx.h:1 @@ -35852,25 +32344,19 @@ msgstr "PNG" #: ../share/extensions/jessyInk_export.inx.h:8 msgid "" -"This extension allows you to export a JessyInk presentation once you created " -"an export layer in your browser. Please see code.google.com/p/jessyink for " -"more details." +"This extension allows you to export a JessyInk presentation once you created an export layer in your browser. Please see code.google.com/p/" +"jessyink for more details." msgstr "" -"Cette extension vous permet d'exporter une présentation JessyInk, après " -"avoir créé un calque d'exportation, vers un navigateur. Des informations " -"complémentaires sont disponibles sur le site code.google.com/p/jessyink." +"Cette extension vous permet d'exporter une présentation JessyInk, après avoir créé un calque d'exportation, vers un navigateur. Des " +"informations complémentaires sont disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_export.inx.h:9 msgid "JessyInk zipped pdf or png output (*.zip)" msgstr "Exportation JessyInk PDF ou PNG compressée (*.zip)" #: ../share/extensions/jessyInk_export.inx.h:10 -msgid "" -"Creates a zip file containing pdfs or pngs of all slides of a JessyInk " -"presentation." -msgstr "" -"Crée un fichier zip contenant des PDF ou des PNG de toutes les diapositives " -"de la présentation JessyInk." +msgid "Creates a zip file containing pdfs or pngs of all slides of a JessyInk presentation." +msgstr "Crée un fichier zip contenant des PDF ou des PNG de toutes les diapositives de la présentation JessyInk." #: ../share/extensions/jessyInk_install.inx.h:1 msgid "Install/update" @@ -35878,13 +32364,11 @@ msgstr "Installation/mise à jour" #: ../share/extensions/jessyInk_install.inx.h:3 msgid "" -"This extension allows you to install or update the JessyInk script in order " -"to turn your SVG file into a presentation. Please see code.google.com/p/" -"jessyink for more details." +"This extension allows you to install or update the JessyInk script in order to turn your SVG file into a presentation. Please see code.google." +"com/p/jessyink for more details." msgstr "" -"Cette extension vous permet d'installer ou mettre à jour le script JessyInk " -"pour transformer le fichier SVG en une présentation. Des informations " -"complémentaires sont disponibles sur le site code.google.com/p/jessyink." +"Cette extension vous permet d'installer ou mettre à jour le script JessyInk pour transformer le fichier SVG en une présentation. Des " +"informations complémentaires sont disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_keyBindings.inx.h:1 msgid "Key bindings" @@ -36055,36 +32539,28 @@ msgid "Set number of columns to default:" msgstr "Définir le nombre de colonnes avec la valeur par défaut :" #: ../share/extensions/jessyInk_keyBindings.inx.h:45 -msgid "" -"This extension allows you customise the key bindings JessyInk uses. Please " -"see code.google.com/p/jessyink for more details." +msgid "This extension allows you customise the key bindings JessyInk uses. Please see code.google.com/p/jessyink for more details." msgstr "" -"Cette extension vous permet de personnaliser les raccourcis clavier utilisés " -"par JessyInk. Des informations complémentaires sont disponibles sur le site " -"code.google.com/p/jessyink." +"Cette extension vous permet de personnaliser les raccourcis clavier utilisés par JessyInk. Des informations complémentaires sont disponibles " +"sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_masterSlide.inx.h:1 msgid "Master slide" msgstr "Diapositive maîtresse" -#: ../share/extensions/jessyInk_masterSlide.inx.h:3 -#: ../share/extensions/jessyInk_transitions.inx.h:3 +#: ../share/extensions/jessyInk_masterSlide.inx.h:3 ../share/extensions/jessyInk_transitions.inx.h:3 msgid "Name of layer:" msgstr "Nom du calque :" #: ../share/extensions/jessyInk_masterSlide.inx.h:4 msgid "If no layer name is supplied, the master slide is unset." -msgstr "" -"En l'absence d'un nom de calque, la diapositive maîtresse est désactivée." +msgstr "En l'absence d'un nom de calque, la diapositive maîtresse est désactivée." #: ../share/extensions/jessyInk_masterSlide.inx.h:6 -msgid "" -"This extension allows you to change the master slide JessyInk uses. Please " -"see code.google.com/p/jessyink for more details." +msgid "This extension allows you to change the master slide JessyInk uses. Please see code.google.com/p/jessyink for more details." msgstr "" -"Cette extension vous permet de modifier la diapositive maîtresse utilisée " -"par JessyInk. Des informations complémentaires sont disponibles sur le site " -"code.google.com/p/jessyink." +"Cette extension vous permet de modifier la diapositive maîtresse utilisée par JessyInk. Des informations complémentaires sont disponibles sur " +"le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_mouseHandler.inx.h:1 msgid "Mouse handler" @@ -36103,13 +32579,10 @@ msgid "Dragging/zoom" msgstr "Déplacement/zoom" #: ../share/extensions/jessyInk_mouseHandler.inx.h:7 -msgid "" -"This extension allows you customise the mouse handler JessyInk uses. Please " -"see code.google.com/p/jessyink for more details." +msgid "This extension allows you customise the mouse handler JessyInk uses. Please see code.google.com/p/jessyink for more details." msgstr "" -"Cette extension vous permet de personnaliser la gestion de la souris par " -"JessyInk. Des informations complémentaires sont disponibles sur le site code." -"google.com/p/jessyink." +"Cette extension vous permet de personnaliser la gestion de la souris par JessyInk. Des informations complémentaires sont disponibles sur le " +"site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_summary.inx.h:1 msgid "Summary" @@ -36117,14 +32590,11 @@ msgstr "Résumé" #: ../share/extensions/jessyInk_summary.inx.h:3 msgid "" -"This extension allows you to obtain information about the JessyInk script, " -"effects and transitions contained in this SVG file. Please see code.google." -"com/p/jessyink for more details." +"This extension allows you to obtain information about the JessyInk script, effects and transitions contained in this SVG file. Please see code." +"google.com/p/jessyink for more details." msgstr "" -"Cette extension vous permet d'obtenir des informations sur le script " -"JessyInk et les effets et transitions contenus dans le fichier SVG. Des " -"informations complémentaires sont disponibles sur le site code.google.com/p/" -"jessyink." +"Cette extension vous permet d'obtenir des informations sur le script JessyInk et les effets et transitions contenus dans le fichier SVG. Des " +"informations complémentaires sont disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_transitions.inx.h:1 msgid "Transitions" @@ -36144,11 +32614,10 @@ msgstr "Effets de transition sortante" #: ../share/extensions/jessyInk_transitions.inx.h:13 msgid "" -"This extension allows you to change the transition JessyInk uses for the " -"selected layer. Please see code.google.com/p/jessyink for more details." +"This extension allows you to change the transition JessyInk uses for the selected layer. Please see code.google.com/p/jessyink for more " +"details." msgstr "" -"Cette extension vous permet de modifier la transition utilisée par JessyInk " -"pour le calque sélectionné. Des informations complémentaires sont " +"Cette extension vous permet de modifier la transition utilisée par JessyInk pour le calque sélectionné. Des informations complémentaires sont " "disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_uninstall.inx.h:1 @@ -36181,18 +32650,13 @@ msgstr "Retirer les vues" #: ../share/extensions/jessyInk_uninstall.inx.h:9 msgid "Please select the parts of JessyInk you want to uninstall/remove." -msgstr "" -"Veuillez sélectionner les parties de JessyInk que vous souhaitez " -"désinstaller ou retirer." +msgstr "Veuillez sélectionner les parties de JessyInk que vous souhaitez désinstaller ou retirer." #: ../share/extensions/jessyInk_uninstall.inx.h:11 -msgid "" -"This extension allows you to uninstall the JessyInk script. Please see code." -"google.com/p/jessyink for more details." +msgid "This extension allows you to uninstall the JessyInk script. Please see code.google.com/p/jessyink for more details." msgstr "" -"Cette extension vous permet de désinstaller le script JessyInk. Des " -"informations complémentaires sont disponibles sur le site code.google.com/p/" -"jessyink." +"Cette extension vous permet de désinstaller le script JessyInk. Des informations complémentaires sont disponibles sur le site code.google.com/" +"p/jessyink." #: ../share/extensions/jessyInk_video.inx.h:1 msgid "Video" @@ -36200,14 +32664,11 @@ msgstr "Vidéo" #: ../share/extensions/jessyInk_video.inx.h:3 msgid "" -"This extension puts a JessyInk video element on the current slide (layer). " -"This element allows you to integrate a video into your JessyInk " +"This extension puts a JessyInk video element on the current slide (layer). This element allows you to integrate a video into your JessyInk " "presentation. Please see code.google.com/p/jessyink for more details." msgstr "" -"Cette extension dépose un élément vidéo JessyInk sur la diapositive (calque) " -"courant. Cet élément peut ensuite être utilisé pour intégrer une vidéo dans " -"la présentation. Des informations complémentaires sont disponibles sur le " -"site code.google.com/p/jessyink." +"Cette extension dépose un élément vidéo JessyInk sur la diapositive (calque) courant. Cet élément peut ensuite être utilisé pour intégrer une " +"vidéo dans la présentation. Des informations complémentaires sont disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/jessyInk_view.inx.h:5 msgid "Remove view" @@ -36215,27 +32676,21 @@ msgstr "Retirer la vue" #: ../share/extensions/jessyInk_view.inx.h:6 msgid "Choose order number 0 to set the initial view of a slide." -msgstr "" -"Choisir un numéro d'ordre 0 pour définir la vue initiale d'une diapositive." +msgstr "Choisir un numéro d'ordre 0 pour définir la vue initiale d'une diapositive." #: ../share/extensions/jessyInk_view.inx.h:8 msgid "" -"This extension allows you to set, update and remove views for a JessyInk " -"presentation. Please see code.google.com/p/jessyink for more details." +"This extension allows you to set, update and remove views for a JessyInk presentation. Please see code.google.com/p/jessyink for more details." msgstr "" -"Cette extension vous permet de définir, mettre à jour ou supprimer des vues " -"de la présentation JessyInk. Des informations complémentaires sont " +"Cette extension vous permet de définir, mettre à jour ou supprimer des vues de la présentation JessyInk. Des informations complémentaires sont " "disponibles sur le site code.google.com/p/jessyink." #: ../share/extensions/layers2svgfont.inx.h:1 msgid "3 - Convert Glyph Layers to SVG Font" msgstr "3 - Convertir les calques de glyphe en police SVG" -#: ../share/extensions/layers2svgfont.inx.h:2 -#: ../share/extensions/new_glyph_layer.inx.h:3 -#: ../share/extensions/next_glyph_layer.inx.h:2 -#: ../share/extensions/previous_glyph_layer.inx.h:2 -#: ../share/extensions/setup_typography_canvas.inx.h:7 +#: ../share/extensions/layers2svgfont.inx.h:2 ../share/extensions/new_glyph_layer.inx.h:3 ../share/extensions/next_glyph_layer.inx.h:2 +#: ../share/extensions/previous_glyph_layer.inx.h:2 ../share/extensions/setup_typography_canvas.inx.h:7 #: ../share/extensions/svgfont2layers.inx.h:3 msgid "Typography" msgstr "Typographie" @@ -36256,23 +32711,19 @@ msgstr "Dimension X :" msgid "Size Y:" msgstr "Dimension Y :" -#: ../share/extensions/layout_nup.inx.h:6 -#: ../share/extensions/printing_marks.inx.h:13 +#: ../share/extensions/layout_nup.inx.h:6 ../share/extensions/printing_marks.inx.h:13 msgid "Top:" msgstr "Haut :" -#: ../share/extensions/layout_nup.inx.h:7 -#: ../share/extensions/printing_marks.inx.h:14 +#: ../share/extensions/layout_nup.inx.h:7 ../share/extensions/printing_marks.inx.h:14 msgid "Bottom:" msgstr "Bas :" -#: ../share/extensions/layout_nup.inx.h:8 -#: ../share/extensions/printing_marks.inx.h:15 +#: ../share/extensions/layout_nup.inx.h:8 ../share/extensions/printing_marks.inx.h:15 msgid "Left:" msgstr "Gauche :" -#: ../share/extensions/layout_nup.inx.h:9 -#: ../share/extensions/printing_marks.inx.h:16 +#: ../share/extensions/layout_nup.inx.h:9 ../share/extensions/printing_marks.inx.h:16 msgid "Right:" msgstr "Droite :" @@ -36300,8 +32751,7 @@ msgstr "Marges interne de la mise en page" msgid "Layout margins" msgstr "Marges de la mise en page" -#: ../share/extensions/layout_nup.inx.h:17 -#: ../share/extensions/printing_marks.inx.h:2 +#: ../share/extensions/layout_nup.inx.h:17 ../share/extensions/printing_marks.inx.h:2 msgid "Marks" msgstr "Repères" @@ -36353,9 +32803,7 @@ msgstr "" " * Layout margins: white space around each part of the layout.\n" " * Layout padding: inner padding for each part of the layout.\n" -#: ../share/extensions/layout_nup.inx.h:36 -#: ../share/extensions/perfectboundcover.inx.h:20 -#: ../share/extensions/printing_marks.inx.h:21 +#: ../share/extensions/layout_nup.inx.h:36 ../share/extensions/perfectboundcover.inx.h:20 ../share/extensions/printing_marks.inx.h:21 #: ../share/extensions/svgcalendar.inx.h:13 msgid "Layout" msgstr "Mise en page" @@ -36421,9 +32869,8 @@ msgid "" "]: return to remembered point\n" msgstr "" "\n" -"Le chemin est généré en appliquant des règles à un axiome, sur plusieurs " -"générations. Les commandes suivantes sont reconnues dans les champs Axiome " -"et Règles :\n" +"Le chemin est généré en appliquant des règles à un axiome, sur plusieurs générations. Les commandes suivantes sont reconnues dans les champs " +"Axiome et Règles :\n" "\n" "A, B, C, D, E ou F : dessiner d'un pas en avant ;\n" "G, H, I, J, K ou L : déplacer d'un pas en avant ;\n" @@ -36450,13 +32897,11 @@ msgstr "Fluctuation de la longueur des paragraphes (en phrases) :" #: ../share/extensions/lorem_ipsum.inx.h:7 msgid "" -"This effect creates the standard \"Lorem Ipsum\" pseudolatin placeholder " -"text. If a flowed text is selected, Lorem Ipsum is added to it; otherwise a " -"new flowed text object, the size of the page, is created in a new layer." +"This effect creates the standard \"Lorem Ipsum\" pseudolatin placeholder text. If a flowed text is selected, Lorem Ipsum is added to it; " +"otherwise a new flowed text object, the size of the page, is created in a new layer." msgstr "" -"Cette effet crée un texte bouche-trou « Lorem Ipsum » (du pseudo-latin). Si " -"un cadre de texte est sélectionné, y ajoute Lorem Ipsum; sinon, un nouveau " -"cadre de texte de la taille de la page est créé dans un nouveau calque." +"Cette effet crée un texte bouche-trou « Lorem Ipsum » (du pseudo-latin). Si un cadre de texte est sélectionné, y ajoute Lorem Ipsum; sinon, un " +"nouveau cadre de texte de la taille de la page est créé dans un nouveau calque." #: ../share/extensions/markers_strokepaint.inx.h:1 msgid "Color Markers" @@ -36610,35 +33055,25 @@ msgstr "Barycentre" #: ../share/extensions/measure.inx.h:35 #, fuzzy, no-c-format msgid "" -"This effect measures the length, area, or center-of-mass of the selected " -"paths. Length and area are added as a text object with the selected units. " -"Center-of-mass is shown as a cross symbol.\n" +"This effect measures the length, area, or center-of-mass of the selected paths. Length and area are added as a text object with the selected " +"units. Center-of-mass is shown as a cross symbol.\n" "\n" -" * Text display format can be either Text-On-Path, or stand-alone text at a " -"specified angle.\n" -" * The number of significant digits can be controlled by the Precision " -"field.\n" +" * Text display format can be either Text-On-Path, or stand-alone text at a specified angle.\n" +" * The number of significant digits can be controlled by the Precision field.\n" " * The Offset field controls the distance from the text to the path.\n" -" * The Scale factor can be used to make measurements in scaled drawings. " -"For example, if 1 cm in the drawing equals 2.5 m in the real world, Scale " -"must be set to 250.\n" -" * When calculating area, the result should be precise for polygons and " -"Bezier curves. If a circle is used, the area may be too high by as much as " -"0.03%." -msgstr "" -"Cet effet mesure la longueur ou l'aire du chemin sélectionné et l'ajoute " -"comme un objet texte avec l'unité sélectionnée.\n" +" * The Scale factor can be used to make measurements in scaled drawings. For example, if 1 cm in the drawing equals 2.5 m in the real world, " +"Scale must be set to 250.\n" +" * When calculating area, the result should be precise for polygons and Bezier curves. If a circle is used, the area may be too high by as " +"much as 0.03%." +msgstr "" +"Cet effet mesure la longueur ou l'aire du chemin sélectionné et l'ajoute comme un objet texte avec l'unité sélectionnée.\n" "\n" -" * L'affichage peut s'effectuer sur le chemin, ou comme texte indépendant " -"sur un angle choisi.\n" -" * Le nombre de chiffres affichés peut être contrôlé par le champ " -"Précision.\n" +" * L'affichage peut s'effectuer sur le chemin, ou comme texte indépendant sur un angle choisi.\n" +" * Le nombre de chiffres affichés peut être contrôlé par le champ Précision.\n" " * Le champ Décalage contrôle la distance entre le texte et le chemin.\n" -" * Le facteur d'échelle peut être utilisé pour réaliser des mesures dans " -"des dessins à l'échelle. Par exemple, si 1 cm dans le dessin est égal à 2,5 " -"m en réalité, le facteur d'échelle doit être réglé à 250.\n" -" * Lors du calcul de l'aire, le résultat devrait être précis pour les " -"polygones et les courbes de Bézier. Si un cercle est utilisé, l'aire " +" * Le facteur d'échelle peut être utilisé pour réaliser des mesures dans des dessins à l'échelle. Par exemple, si 1 cm dans le dessin est " +"égal à 2,5 m en réalité, le facteur d'échelle doit être réglé à 250.\n" +" * Lors du calcul de l'aire, le résultat devrait être précis pour les polygones et les courbes de Bézier. Si un cercle est utilisé, l'aire " "pourrait être jusqu'à 0,03 % supérieure à la valeur attendue." #: ../share/extensions/merge_styles.inx.h:1 @@ -36647,15 +33082,11 @@ msgstr "Fusionner les styles dans une feuille de styles" #: ../share/extensions/merge_styles.inx.h:2 msgid "" -"All selected nodes will be grouped together and their common style " -"attributes will create a new class, this class will replace the existing " -"inline style attributes. Please use a name which best describes the kinds of " -"objects and their common context for best effect." +"All selected nodes will be grouped together and their common style attributes will create a new class, this class will replace the existing " +"inline style attributes. Please use a name which best describes the kinds of objects and their common context for best effect." msgstr "" -"Tous les nœuds sélectionnés seront groupés et leurs attributs de style " -"communs seront remplacés par une nouvelle classe de styles. Veuillez " -"utiliser un nom décrivant au mieux le type d'objets et leur contexte pour un " -"meilleur effet." +"Tous les nœuds sélectionnés seront groupés et leurs attributs de style communs seront remplacés par une nouvelle classe de styles. Veuillez " +"utiliser un nom décrivant au mieux le type d'objets et leur contexte pour un meilleur effet." #: ../share/extensions/merge_styles.inx.h:3 msgid "New Class Name:" @@ -36727,12 +33158,10 @@ msgstr "Échantillons :" #: ../share/extensions/param_curves.inx.h:14 msgid "" -"Select a rectangle before calling the extension, it will determine X and Y " -"scales.\n" +"Select a rectangle before calling the extension, it will determine X and Y scales.\n" "First derivatives are always determined numerically." msgstr "" -"Sélectionner un rectangle avant de lancer l'extension ; il déterminera les " -"échelles X et Y.\n" +"Sélectionner un rectangle avant de lancer l'extension ; il déterminera les échelles X et Y.\n" "Les dérivées premières sont toujours déterminées numériquement." #: ../share/extensions/param_curves.inx.h:26 @@ -36755,28 +33184,23 @@ msgstr "Copies du motif :" msgid "Deformation type:" msgstr "Type de déformation :" -#: ../share/extensions/pathalongpath.inx.h:5 -#: ../share/extensions/pathscatter.inx.h:5 +#: ../share/extensions/pathalongpath.inx.h:5 ../share/extensions/pathscatter.inx.h:5 msgid "Space between copies:" msgstr "Espacement entre les copies :" -#: ../share/extensions/pathalongpath.inx.h:6 -#: ../share/extensions/pathscatter.inx.h:6 +#: ../share/extensions/pathalongpath.inx.h:6 ../share/extensions/pathscatter.inx.h:6 msgid "Normal offset:" msgstr "Décalage normal :" -#: ../share/extensions/pathalongpath.inx.h:7 -#: ../share/extensions/pathscatter.inx.h:7 +#: ../share/extensions/pathalongpath.inx.h:7 ../share/extensions/pathscatter.inx.h:7 msgid "Tangential offset:" msgstr "Décalage tangentiel :" -#: ../share/extensions/pathalongpath.inx.h:8 -#: ../share/extensions/pathscatter.inx.h:8 +#: ../share/extensions/pathalongpath.inx.h:8 ../share/extensions/pathscatter.inx.h:8 msgid "Pattern is vertical" msgstr "Motif vertical" -#: ../share/extensions/pathalongpath.inx.h:9 -#: ../share/extensions/pathscatter.inx.h:10 +#: ../share/extensions/pathalongpath.inx.h:9 ../share/extensions/pathscatter.inx.h:10 msgid "Duplicate the pattern before deformation" msgstr "Dupliquer le motif avant déformation" @@ -36790,13 +33214,11 @@ msgstr "Ruban" #: ../share/extensions/pathalongpath.inx.h:17 msgid "" -"This effect scatters or bends a pattern along arbitrary \"skeleton\" paths. " -"The pattern is the topmost object in the selection. Groups of paths, shapes " -"or clones are allowed." +"This effect scatters or bends a pattern along arbitrary \"skeleton\" paths. The pattern is the topmost object in the selection. Groups of " +"paths, shapes or clones are allowed." msgstr "" -"Cet effet disperse ou déforme un motif le long de chemins « squelettes » " -"arbitraires. Le motif doit être l'objet le plus haut dans la sélection. Les " -"groupes de chemins, formes et clones sont permis." +"Cet effet disperse ou déforme un motif le long de chemins « squelettes » arbitraires. Le motif doit être l'objet le plus haut dans la " +"sélection. Les groupes de chemins, formes et clones sont permis." #: ../share/extensions/pathscatter.inx.h:3 msgid "Follow path orientation" @@ -36840,13 +33262,11 @@ msgstr "Séquentiellement" #: ../share/extensions/pathscatter.inx.h:19 msgid "" -"This effect scatters a pattern along arbitrary \"skeleton\" paths. The " -"pattern must be the topmost object in the selection. Groups of paths, " +"This effect scatters a pattern along arbitrary \"skeleton\" paths. The pattern must be the topmost object in the selection. Groups of paths, " "shapes, clones are allowed." msgstr "" -"Cet effet disperse un motif le long de chemins « squelettes » arbitraires. " -"Le motif doit être l'objet le plus haut dans la sélection. Les groupes de " -"chemins, formes et clones sont permis." +"Cet effet disperse un motif le long de chemins « squelettes » arbitraires. Le motif doit être l'objet le plus haut dans la sélection. Les " +"groupes de chemins, formes et clones sont permis." #: ../share/extensions/perfectboundcover.inx.h:1 msgid "Perfect-Bound Cover Template" @@ -36919,30 +33339,23 @@ msgstr "Fond perdu (pouces) :" #: ../share/extensions/perfectboundcover.inx.h:18 msgid "Note: Bond Weight # calculations are a best-guess estimate." -msgstr "" -"Note : le calcul du poids de « bond » est la meilleure estimation possible" +msgstr "Note : le calcul du poids de « bond » est la meilleure estimation possible" #: ../share/extensions/pixelsnap.inx.h:1 msgid "PixelSnap" msgstr "Aligner au pixel" #: ../share/extensions/pixelsnap.inx.h:2 -msgid "" -"Snap all paths in selection to pixels. Snaps borders to half-points and " -"fills to full points." -msgstr "" -"Aligne les chemins de la sélection sur les pixels. Les bordures sont " -"alignées sur des demi-points, et les remplissages sur des points." +msgid "Snap all paths in selection to pixels. Snaps borders to half-points and fills to full points." +msgstr "Aligne les chemins de la sélection sur les pixels. Les bordures sont alignées sur des demi-points, et les remplissages sur des points." #: ../share/extensions/plotter.inx.h:1 msgid "Plot" msgstr "Traceur" #: ../share/extensions/plotter.inx.h:2 -msgid "" -"Please make sure that all objects you want to plot are converted to paths." -msgstr "" -"Veuillez vous assurer que tous les objets à tracer sont convertis en chemins." +msgid "Please make sure that all objects you want to plot are converted to paths." +msgstr "Veuillez vous assurer que tous les objets à tracer sont convertis en chemins." #: ../share/extensions/plotter.inx.h:3 msgid "Connection Settings " @@ -36953,12 +33366,8 @@ msgid "Serial port:" msgstr "Port série :" #: ../share/extensions/plotter.inx.h:5 -msgid "" -"The port of your serial connection, on Windows something like 'COM1', on " -"Linux something like: '/dev/ttyUSB0' (Default: COM1)" -msgstr "" -"Le port de votre connexion série ; avec Windows, quelque-chose comme " -"« COM1 » ; avec Linux, comme « /dev/ttyUSB0 » (par défaut : COM1)" +msgid "The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Default: COM1)" +msgstr "Le port de votre connexion série ; avec Windows, quelque-chose comme « COM1 » ; avec Linux, comme « /dev/ttyUSB0 » (par défaut : COM1)" #: ../share/extensions/plotter.inx.h:6 msgid "Serial baud rate:" @@ -36974,12 +33383,8 @@ msgstr "Taille d'octets série :" #: ../share/extensions/plotter.inx.h:10 #, no-c-format -msgid "" -"The Byte size of your serial connection, 99% of all plotters use the default " -"setting (Default: 8 Bits)" -msgstr "" -"La taille d'octet de votre connexion série. 99 % des traceurs utilisent le " -"paramètre par défaut (8 bits)" +msgid "The Byte size of your serial connection, 99% of all plotters use the default setting (Default: 8 Bits)" +msgstr "La taille d'octet de votre connexion série. 99 % des traceurs utilisent le paramètre par défaut (8 bits)" #: ../share/extensions/plotter.inx.h:11 msgid "Serial stop bits:" @@ -36987,12 +33392,8 @@ msgstr "Bits de stop série :" #: ../share/extensions/plotter.inx.h:13 #, no-c-format -msgid "" -"The Stop bits of your serial connection, 99% of all plotters use the default " -"setting (Default: 1 Bit)" -msgstr "" -"Les bits d'arrêt de votre connexion série. 99 % des traceurs utilisent le " -"paramètre par défaut (1 bit)" +msgid "The Stop bits of your serial connection, 99% of all plotters use the default setting (Default: 1 Bit)" +msgstr "Les bits d'arrêt de votre connexion série. 99 % des traceurs utilisent le paramètre par défaut (1 bit)" #: ../share/extensions/plotter.inx.h:14 msgid "Serial parity:" @@ -37000,23 +33401,16 @@ msgstr "Parité série :" #: ../share/extensions/plotter.inx.h:16 #, no-c-format -msgid "" -"The Parity of your serial connection, 99% of all plotters use the default " -"setting (Default: None)" -msgstr "" -"La parité de votre connexion série. 99 % des traceurs utilisent le paramètre " -"par défaut (aucune)" +msgid "The Parity of your serial connection, 99% of all plotters use the default setting (Default: None)" +msgstr "La parité de votre connexion série. 99 % des traceurs utilisent le paramètre par défaut (aucune)" #: ../share/extensions/plotter.inx.h:17 msgid "Serial flow control:" msgstr "Contrôle du flux série :" #: ../share/extensions/plotter.inx.h:18 -msgid "" -"The Software / Hardware flow control of your serial connection (Default: " -"Software)" -msgstr "" -"Le type de contrôle de flux de votre connexion série (par défaut : logiciel)" +msgid "The Software / Hardware flow control of your serial connection (Default: Software)" +msgstr "Le type de contrôle de flux de votre connexion série (par défaut : logiciel)" #: ../share/extensions/plotter.inx.h:19 msgid "Command language:" @@ -37051,21 +33445,15 @@ msgid "KNK Plotter (HPGL variant)" msgstr "Traceur KNK (une variante d'HPGL)" #: ../share/extensions/plotter.inx.h:28 -msgid "" -"Using wrong settings can under certain circumstances cause Inkscape to " -"freeze. Always save your work before plotting!" +msgid "Using wrong settings can under certain circumstances cause Inkscape to freeze. Always save your work before plotting!" msgstr "" -"L'utilisation de mauvais paramètres peut dans certaines circonstances causer " -"des plantages de l'application. Sauvegardez toujours votre travail avant " -"d'utiliser cette extension !" +"L'utilisation de mauvais paramètres peut dans certaines circonstances causer des plantages de l'application. Sauvegardez toujours votre " +"travail avant d'utiliser cette extension !" #: ../share/extensions/plotter.inx.h:29 -msgid "" -"This can be a physical serial connection or a USB-to-Serial bridge. Ask your " -"plotter manufacturer for drivers if needed." +msgid "This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed." msgstr "" -"La connexion peut s'effectuer par l'intermédiaire d'un port série ou d'un " -"pont USB-série. Si besoin, demandez les pilotes de périphérique au " +"La connexion peut s'effectuer par l'intermédiaire d'un port série ou d'un pont USB-série. Si besoin, demandez les pilotes de périphérique au " "fabriquant de votre traceur." #: ../share/extensions/plotter.inx.h:30 @@ -37074,13 +33462,11 @@ msgstr "Les connexions sur port parallèle (LPT) ne sont pas supportées." #: ../share/extensions/plotter.inx.h:41 msgid "" -"The speed the pen will move with in centimeters or millimeters per second " -"(depending on your plotter model), set to 0 to omit command. Most plotters " -"ignore this command. (Default: 0)" +"The speed the pen will move with in centimeters or millimeters per second (depending on your plotter model), set to 0 to omit command. Most " +"plotters ignore this command. (Default: 0)" msgstr "" -"La vitesse du stylo est exprimée en cm/s ou en mm/s en fonction du modèle de " -"traceur. La plupart des traceurs ignorent cette commande (Défaut à 0 pour " -"ignorer la commande)." +"La vitesse du stylo est exprimée en cm/s ou en mm/s en fonction du modèle de traceur. La plupart des traceurs ignorent cette commande (Défaut " +"à 0 pour ignorer la commande)." #: ../share/extensions/plotter.inx.h:42 msgid "Rotation (°, clockwise):" @@ -37092,16 +33478,14 @@ msgstr "Afficher les informations de débogage" #: ../share/extensions/plotter.inx.h:63 msgid "" -"Check this to get verbose information about the plot without actually " -"sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" +"Check this to get verbose information about the plot without actually sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" msgstr "" #: ../share/extensions/plt_input.inx.h:1 msgid "AutoCAD Plot Input" msgstr "Entrée AutoCAD Plot" -#: ../share/extensions/plt_input.inx.h:2 -#: ../share/extensions/plt_output.inx.h:2 +#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2 msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" msgstr "Fichier HP Graphics Language pour table traçante (*.plt)" @@ -37221,9 +33605,7 @@ msgstr "Défini par les bords" msgid "Rotate around:" msgstr "Tourner autour de :" -#: ../share/extensions/polyhedron_3d.inx.h:28 -#: ../share/extensions/spirograph.inx.h:8 -#: ../share/extensions/wireframe_sphere.inx.h:5 +#: ../share/extensions/polyhedron_3d.inx.h:28 ../share/extensions/spirograph.inx.h:8 ../share/extensions/wireframe_sphere.inx.h:5 msgid "Rotation (deg):" msgstr "Rotation (deg) :" @@ -37398,12 +33780,8 @@ msgid "Use normal distribution" msgstr "Utiliser une distribution normale" #: ../share/extensions/radiusrand.inx.h:9 -msgid "" -"This effect randomly shifts the nodes (and optionally node handles) of the " -"selected path." -msgstr "" -"Cet effet décale les nœuds du chemin sélectionné. Il peut aussi agir sur les " -"poignées." +msgid "This effect randomly shifts the nodes (and optionally node handles) of the selected path." +msgstr "Cet effet décale les nœuds du chemin sélectionné. Il peut aussi agir sur les poignées." #: ../share/extensions/render_alphabetsoup.inx.h:1 msgid "Alphabet Soup" @@ -37425,8 +33803,7 @@ msgstr "Données du code-barres :" msgid "Bar Height:" msgstr "Hauteur des barres :" -#: ../share/extensions/render_barcode.inx.h:6 -#: ../share/extensions/render_barcode_datamatrix.inx.h:6 +#: ../share/extensions/render_barcode.inx.h:6 ../share/extensions/render_barcode_datamatrix.inx.h:6 #: ../share/extensions/render_barcode_qrcode.inx.h:19 msgid "Barcode" msgstr "Code-barres" @@ -37435,8 +33812,7 @@ msgstr "Code-barres" msgid "Datamatrix" msgstr "Datamatrix" -#: ../share/extensions/render_barcode_datamatrix.inx.h:3 -#: ../share/extensions/render_barcode_qrcode.inx.h:4 +#: ../share/extensions/render_barcode_datamatrix.inx.h:3 ../share/extensions/render_barcode_qrcode.inx.h:4 msgid "Size, in unit squares:" msgstr "Taille, en nombre de carrés :" @@ -37450,17 +33826,11 @@ msgstr "QR Code" #: ../share/extensions/render_barcode_qrcode.inx.h:2 msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" -msgstr "" -"Voir http://www.denso-wave.com/qrcode/index-e.html pour de plus amples " -"détails" +msgstr "Voir http://www.denso-wave.com/qrcode/index-e.html pour de plus amples détails" #: ../share/extensions/render_barcode_qrcode.inx.h:6 -msgid "" -"With \"Auto\", the size of the barcode depends on the length of the text and " -"the error correction level" -msgstr "" -"Avec \"Auto\", la taille du code-barres dépend de la longueur du texte et du " -"niveau de correction d'erreur" +msgid "With \"Auto\", the size of the barcode depends on the length of the text and the error correction level" +msgstr "Avec \"Auto\", la taille du code-barres dépend de la longueur du texte et du niveau de correction d'erreur" #: ../share/extensions/render_barcode_qrcode.inx.h:7 msgid "Error correction level:" @@ -37506,8 +33876,7 @@ msgstr "Espacement des dents :" msgid "Contact Angle:" msgstr "Angle de contact :" -#: ../share/extensions/render_gear_rack.inx.h:6 -#: ../share/extensions/render_gears.inx.h:1 +#: ../share/extensions/render_gear_rack.inx.h:6 ../share/extensions/render_gears.inx.h:1 msgid "Gear" msgstr "Engrenage" @@ -37556,11 +33925,8 @@ msgid "List all fonts" msgstr "Lister toutes les polices" #: ../share/extensions/replace_font.inx.h:7 -msgid "" -"Choose this tab if you would like to see a list of the fonts used/found." -msgstr "" -"Choisissez cet onglet pour lister les polices utilisées ou trouvées dans le " -"document." +msgid "Choose this tab if you would like to see a list of the fonts used/found." +msgstr "Choisissez cet onglet pour lister les polices utilisées ou trouvées dans le document." #: ../share/extensions/replace_font.inx.h:8 msgid "Work on:" @@ -37626,38 +33992,29 @@ msgstr "Radial vers l'intérieur" msgid "Object Reference Point" msgstr "Point de référence de l'objet" -#: ../share/extensions/restack.inx.h:17 -#: ../share/extensions/text_extract.inx.h:9 -#: ../share/extensions/text_merge.inx.h:9 +#: ../share/extensions/restack.inx.h:17 ../share/extensions/text_extract.inx.h:9 ../share/extensions/text_merge.inx.h:9 msgid "Middle" msgstr "Milieu" -#: ../share/extensions/restack.inx.h:19 -#: ../share/extensions/text_extract.inx.h:12 -#: ../share/extensions/text_merge.inx.h:12 +#: ../share/extensions/restack.inx.h:19 ../share/extensions/text_extract.inx.h:12 ../share/extensions/text_merge.inx.h:12 msgid "Top" msgstr "Haut" -#: ../share/extensions/restack.inx.h:20 -#: ../share/extensions/text_extract.inx.h:13 -#: ../share/extensions/text_merge.inx.h:13 +#: ../share/extensions/restack.inx.h:20 ../share/extensions/text_extract.inx.h:13 ../share/extensions/text_merge.inx.h:13 msgid "Bottom" msgstr "Bas" #: ../share/extensions/restack.inx.h:21 -#, fuzzy msgid "Based on Z-Order" -msgstr "Contour surélevé" +msgstr "Basé sur l'ordre z" #: ../share/extensions/restack.inx.h:22 -#, fuzzy msgid "Restack Mode" -msgstr "Ré-empiler" +msgstr "Mode ré-empilage" #: ../share/extensions/restack.inx.h:23 -#, fuzzy msgid "Reverse Z-Order" -msgstr "Inverser le dégradé" +msgstr "Ordre z inversé" #: ../share/extensions/restack.inx.h:24 msgid "Shuffle Z-Order" @@ -37665,10 +34022,8 @@ msgstr "" #: ../share/extensions/restack.inx.h:26 msgid "" -"This extension changes the z-order of objects based on their position on the " -"canvas or their current z-order. Selection: The extension restacks either " -"objects inside a single selected group, or a selection of multiple objects " -"on the current drawing level (layer or group)." +"This extension changes the z-order of objects based on their position on the canvas or their current z-order. Selection: The extension " +"restacks either objects inside a single selected group, or a selection of multiple objects on the current drawing level (layer or group)." msgstr "" #: ../share/extensions/restack.inx.h:27 @@ -37688,9 +34043,8 @@ msgid "Minimum size:" msgstr "Taille minimum :" #: ../share/extensions/rtree.inx.h:4 -#, fuzzy msgid "Omit redundant segments" -msgstr "Rendre les segments droits" +msgstr "Éliminer les segments superflus" #: ../share/extensions/rtree.inx.h:5 msgid "Lift pen for backward steps" @@ -37793,8 +34147,7 @@ msgstr "Raccourcir les identifiants" #: ../share/extensions/scour.inx.h:22 msgid "Preserve manually created ID names not ending with digits" -msgstr "" -"Préserver les identifiants manuels qui ne se terminent pas par un chiffre" +msgstr "Préserver les identifiants manuels qui ne se terminent pas par un chiffre" #: ../share/extensions/scour.inx.h:23 msgid "Preserve these ID names, comma-separated:" @@ -37813,65 +34166,43 @@ msgstr "Aide (options)" msgid "" "This extension optimizes the SVG file according to the following options:\n" " * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -" * Convert CSS attributes to XML attributes: convert styles from style " -"tags and inline style=\"\" declarations into XML attributes.\n" -" * Group collapsing: removes useless g elements, promoting their contents " -"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" -" * Create groups for similar attributes: create g elements for runs of " -"elements having at least one attribute in common (e.g. fill color, stroke " -"opacity, ...).\n" +" * Convert CSS attributes to XML attributes: convert styles from style tags and inline style=\"\" declarations into XML attributes.\n" +" * Group collapsing: removes useless g elements, promoting their contents up one level. Requires \"Remove unused ID names for elements\" to " +"be set.\n" +" * Create groups for similar attributes: create g elements for runs of elements having at least one attribute in common (e.g. fill color, " +"stroke opacity, ...).\n" " * Embed rasters: embed raster images as base64-encoded data URLs.\n" -" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " -"elements and attributes.\n" -" * Remove metadata: remove metadata tags along with all the information " -"in them, which may include license metadata, alternate versions for non-SVG-" -"enabled browsers, etc.\n" +" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator elements and attributes.\n" +" * Remove metadata: remove metadata tags along with all the information in them, which may include license metadata, alternate versions for " +"non-SVG-enabled browsers, etc.\n" " * Remove comments: remove comment tags.\n" -" * Work around renderer bugs: emits slightly larger SVG data, but works " -"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " -"various applications.\n" +" * Work around renderer bugs: emits slightly larger SVG data, but works around a bug in librsvg's renderer, which is used in Eye of GNOME " +"and other various applications.\n" " * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" -" * Number of significant digits for coords: all coordinates are output " -"with that number of significant digits. For example, if 3 is specified, the " -"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " -"472.\n" -" * XML indentation (pretty-printing): either None for no indentation, " -"Space to use one space per nesting level, or Tab to use one tab per nesting " -"level." +" * Number of significant digits for coords: all coordinates are output with that number of significant digits. For example, if 3 is " +"specified, the coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as 472.\n" +" * XML indentation (pretty-printing): either None for no indentation, Space to use one space per nesting level, or Tab to use one tab per " +"nesting level." msgstr "" "Cette extension optimise le fichier SVG en fonction des options suivantes :\n" -" * Raccourcir les valeurs de couleur : convertit toutes les couleurs au " -"format #RRGGBB ou #RGB.\n" -" * Convertir les attributs CSS en attributs XML : convertit les styles " -"défini à partir de l'étiquette style et des déclarations en ligne style=\"\" " -"en attributs XML.\n" -" * Réduire les groupes : supprime des éléments g inutiles, tout en " -"remontant leur contenu d'un niveau. L'option \"Supprimer les identifiants " -"d'éléments inutilisés\" doit également être activée.\n" -" * Créer des groupes pour les attributs similaires : crée des éléments g " -"pour les séries d'éléments ayant au moins un attribut en commun (couleur de " -"remplissage ou opacité du contour par exemple).\n" -" * Incorporer les images : incorpore les images matricielles sous la " -"forme de données encodées en base 64.\n" -" * Conserver les données d'édition : ne supprime pas les éléments et " -"attributs issus d'Inkscape, Sodipodi ou Adobe Illustrator.\n" -" * Supprimer les métadonnées : supprime les éléments de type metadata " -"ainsi que toutes les informations qu'ils contiennent, ce qui peut inclure " -"les métadonnées de licence, les versions alternatives pour les navigateurs " -"ne supportant pas SVG, etc.\n" -" * Supprimer les commentaires : supprime les éléments de type " -"commentaire.\n" -" * Contourner les défauts de rendu : génère des données SVG légèrement " -"plus volumineuses, mais contourne un défaut du moteur de rendu libsvg, qui " -"est utilisé par Eye of Gnome et diverses autres applications.\n" -" * Activer une viewBox : dimensionne l'image à 100 % et ajoute une " -"viewBox.\n" -" * Nombre de chiffres significatifs pour les coordonnées : toutes les " -"coordonnées sont générées avec une certain nombre de décimales " -"significatives. Si la valeur 3 est choisie, par exemple, la coordonnée " -"3.5153 sera réduite à 3.51 et la coordonnée 471.55 réduite à 472.\n" -" * Indentation du code XML (impression formatée) : type d'indentation de " -"l'exportation : aucune, espace ou tabulation (espace par défaut)." +" * Raccourcir les valeurs de couleur : convertit toutes les couleurs au format #RRGGBB ou #RGB.\n" +" * Convertir les attributs CSS en attributs XML : convertit les styles défini à partir de l'étiquette style et des déclarations en ligne " +"style=\"\" en attributs XML.\n" +" * Réduire les groupes : supprime des éléments g inutiles, tout en remontant leur contenu d'un niveau. L'option \"Supprimer les " +"identifiants d'éléments inutilisés\" doit également être activée.\n" +" * Créer des groupes pour les attributs similaires : crée des éléments g pour les séries d'éléments ayant au moins un attribut en commun " +"(couleur de remplissage ou opacité du contour par exemple).\n" +" * Incorporer les images : incorpore les images matricielles sous la forme de données encodées en base 64.\n" +" * Conserver les données d'édition : ne supprime pas les éléments et attributs issus d'Inkscape, Sodipodi ou Adobe Illustrator.\n" +" * Supprimer les métadonnées : supprime les éléments de type metadata ainsi que toutes les informations qu'ils contiennent, ce qui peut " +"inclure les métadonnées de licence, les versions alternatives pour les navigateurs ne supportant pas SVG, etc.\n" +" * Supprimer les commentaires : supprime les éléments de type commentaire.\n" +" * Contourner les défauts de rendu : génère des données SVG légèrement plus volumineuses, mais contourne un défaut du moteur de rendu " +"libsvg, qui est utilisé par Eye of Gnome et diverses autres applications.\n" +" * Activer une viewBox : dimensionne l'image à 100 % et ajoute une viewBox.\n" +" * Nombre de chiffres significatifs pour les coordonnées : toutes les coordonnées sont générées avec une certain nombre de décimales " +"significatives. Si la valeur 3 est choisie, par exemple, la coordonnée 3.5153 sera réduite à 3.51 et la coordonnée 471.55 réduite à 472.\n" +" * Indentation du code XML (impression formatée) : type d'indentation de l'exportation : aucune, espace ou tabulation (espace par défaut)." #: ../share/extensions/scour.inx.h:40 msgid "Help (Ids)" @@ -37880,38 +34211,26 @@ msgstr "Aide (identifiants)" #: ../share/extensions/scour.inx.h:41 msgid "" "Ids specific options:\n" -" * Remove unused ID names for elements: remove all unreferenced ID " -"attributes.\n" -" * Shorten IDs: reduce the length of all ID attributes, assigning the " -"shortest to the most-referenced elements. For instance, #linearGradient5621, " -"referenced 100 times, can become #a.\n" -" * Preserve manually created ID names not ending with digits: usually, " -"optimised SVG output removes these, but if they're needed for referencing (e." -"g. #middledot), you may use this option.\n" -" * Preserve these ID names, comma-separated: you can use this in " -"conjunction with the other preserve options if you wish to preserve some " +" * Remove unused ID names for elements: remove all unreferenced ID attributes.\n" +" * Shorten IDs: reduce the length of all ID attributes, assigning the shortest to the most-referenced elements. For instance, " +"#linearGradient5621, referenced 100 times, can become #a.\n" +" * Preserve manually created ID names not ending with digits: usually, optimised SVG output removes these, but if they're needed for " +"referencing (e.g. #middledot), you may use this option.\n" +" * Preserve these ID names, comma-separated: you can use this in conjunction with the other preserve options if you wish to preserve some " "more specific ID names.\n" -" * Preserve ID names starting with: usually, optimised SVG output removes " -"all unused ID names, but if all of your preserved ID names start with the " -"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +" * Preserve ID names starting with: usually, optimised SVG output removes all unused ID names, but if all of your preserved ID names start " +"with the same prefix (e.g. #flag-mx, #flag-pt), you may use this option." msgstr "" "Options spécifiques aux identifiants :\n" -" * Supprimer les identifiants d'éléments inutilisés : supprimer tous les " -"attributs ID sans référence.\n" -" * Raccourcir les identifiants : réduit la longueur de tous les attributs " -"ID, en assignant les plus courts aux éléments les plus référencés. Par " -"exemple, un attribut #linearGradient5621 référencé 100 fois peut devenir " -"#a.\n" -" * Préserver les identifiants manuels qui ne se terminent pas par un " -"chiffre : normalement supprimés par l'extension, cochez cette option si ces " -"identifiants sont utilisés comme référence (par exemple #pointcentral).\n" -" * Préserver les identifiants suivants (séparés par des virgules) : vous " -"pouvez utiliser cette option en conjonction avec les autres options de " -"préservation si vous souhaitez conserver certain identifiants spécifiques.\n" -" * Préserver les identifiants débutant par : normalement, cette extension " -"supprime tous les identifiants inutilisés, mais si tous vos identifiants à " -"préserver commencent par le même préfixe, (#page-debut, #page-fin, par " -"exemple), vous pouvez utiliser cette option." +" * Supprimer les identifiants d'éléments inutilisés : supprimer tous les attributs ID sans référence.\n" +" * Raccourcir les identifiants : réduit la longueur de tous les attributs ID, en assignant les plus courts aux éléments les plus " +"référencés. Par exemple, un attribut #linearGradient5621 référencé 100 fois peut devenir #a.\n" +" * Préserver les identifiants manuels qui ne se terminent pas par un chiffre : normalement supprimés par l'extension, cochez cette option " +"si ces identifiants sont utilisés comme référence (par exemple #pointcentral).\n" +" * Préserver les identifiants suivants (séparés par des virgules) : vous pouvez utiliser cette option en conjonction avec les autres " +"options de préservation si vous souhaitez conserver certain identifiants spécifiques.\n" +" * Préserver les identifiants débutant par : normalement, cette extension supprime tous les identifiants inutilisés, mais si tous vos " +"identifiants à préserver commencent par le même préfixe, (#page-debut, #page-fin, par exemple), vous pouvez utiliser cette option." #: ../share/extensions/scour.inx.h:47 msgid "Optimized SVG (*.svg)" @@ -37926,14 +34245,12 @@ msgstr "Scalable Vector Graphics" msgid "Seamless Pattern" msgstr "Motifs Braille" -#: ../share/extensions/seamless_pattern.inx.h:2 -#: ../share/extensions/seamless_pattern_procedural.inx.h:2 +#: ../share/extensions/seamless_pattern.inx.h:2 ../share/extensions/seamless_pattern_procedural.inx.h:2 #, fuzzy msgid "Custom Width (px):" msgstr "Épaisseur du contour (px) :" -#: ../share/extensions/seamless_pattern.inx.h:3 -#: ../share/extensions/seamless_pattern_procedural.inx.h:3 +#: ../share/extensions/seamless_pattern.inx.h:3 ../share/extensions/seamless_pattern_procedural.inx.h:3 #, fuzzy msgid "Custom Height (px):" msgstr "Droite (px) :" @@ -37974,15 +34291,13 @@ msgstr "Jambage inférieur :" msgid "sK1 vector graphics files input" msgstr "Fichiers d'entrée graphiques vectoriels sK1" -#: ../share/extensions/sk1_input.inx.h:2 -#: ../share/extensions/sk1_output.inx.h:2 +#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" msgstr "Fichiers graphiques vectoriels sK1 (.sk1)" #: ../share/extensions/sk1_input.inx.h:3 msgid "Open files saved in sK1 vector graphics editor" -msgstr "" -"Ouvrir des fichiers enregistrés avec l'éditeur de graphismes vectoriels sK1" +msgstr "Ouvrir des fichiers enregistrés avec l'éditeur de graphismes vectoriels sK1" #: ../share/extensions/sk1_output.inx.h:1 msgid "sK1 vector graphics files output" @@ -38128,12 +34443,8 @@ msgid "Compressed Inkscape SVG with media (*.zip)" msgstr "SVG Inkscape compressé avec média (*.zip)" #: ../share/extensions/svg_and_media_zip_output.inx.h:5 -msgid "" -"Inkscape's native file format compressed with Zip and including all media " -"files" -msgstr "" -"Format de fichier natif d'Inkscape compressé avec Zip et incluant d'autres " -"fichiers de média" +msgid "Inkscape's native file format compressed with Zip and including all media files" +msgstr "Format de fichier natif d'Inkscape compressé avec Zip et incluant d'autres fichiers de média" #: ../share/extensions/svgcalendar.inx.h:1 msgid "Calendar" @@ -38197,8 +34508,7 @@ msgstr "Marge des mois :" #: ../share/extensions/svgcalendar.inx.h:18 msgid "The options below have no influence when the above is checked." -msgstr "" -"Les options suivantes ne s'appliquent pas si la case précédente est cochée." +msgstr "Les options suivantes ne s'appliquent pas si la case précédente est cochée." #: ../share/extensions/svgcalendar.inx.h:20 msgid "Year color:" @@ -38253,12 +34563,8 @@ msgid "You may change the names for other languages:" msgstr "Ajuster les noms en fonction de votre langue :" #: ../share/extensions/svgcalendar.inx.h:33 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre " -"Décembre" +msgid "January February March April May June July August September October November December" +msgstr "Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre Décembre" #: ../share/extensions/svgcalendar.inx.h:34 msgid "Sun Mon Tue Wed Thu Fri Sat" @@ -38273,12 +34579,9 @@ msgid "Wk" msgstr "S" #: ../share/extensions/svgcalendar.inx.h:37 -msgid "" -"Select your system encoding. More information at http://docs.python.org/" -"library/codecs.html#standard-encodings." +msgid "Select your system encoding. More information at http://docs.python.org/library/codecs.html#standard-encodings." msgstr "" -"Sélectionnez votre encodage système. De plus amples informations à l'adresse " -"http://docs.python.org/library/codecs.html#standard-encodings." +"Sélectionnez votre encodage système. De plus amples informations à l'adresse http://docs.python.org/library/codecs.html#standard-encodings." #: ../share/extensions/svgfont2layers.inx.h:1 msgid "Convert SVG Font to Glyph Layers" @@ -38309,12 +34612,8 @@ msgid "Layers as Separate SVG (*.tar)" msgstr "Calques en SVG séparés (*.tar)" #: ../share/extensions/tar_layers.inx.h:3 -msgid "" -"Each layer split into it's own svg file and collected as a tape archive (tar " -"file)" -msgstr "" -"Chaque calque est enregistrée dans son propre fichier SVG, le tout regroupé " -"dans un fichier archive au format tar." +msgid "Each layer split into it's own svg file and collected as a tape archive (tar file)" +msgstr "Chaque calque est enregistrée dans son propre fichier SVG, le tout regroupé dans un fichier archive au format tar." #: ../share/extensions/text_braille.inx.h:1 msgid "Convert to Braille" @@ -38324,38 +34623,31 @@ msgstr "Convertir en Braille" msgid "Extract" msgstr "Extraire" -#: ../share/extensions/text_extract.inx.h:2 -#: ../share/extensions/text_merge.inx.h:2 +#: ../share/extensions/text_extract.inx.h:2 ../share/extensions/text_merge.inx.h:2 msgid "Text direction:" msgstr "Direction du texte :" -#: ../share/extensions/text_extract.inx.h:3 -#: ../share/extensions/text_merge.inx.h:3 +#: ../share/extensions/text_extract.inx.h:3 ../share/extensions/text_merge.inx.h:3 msgid "Left to right" msgstr "De gauche à droite" -#: ../share/extensions/text_extract.inx.h:4 -#: ../share/extensions/text_merge.inx.h:4 +#: ../share/extensions/text_extract.inx.h:4 ../share/extensions/text_merge.inx.h:4 msgid "Bottom to top" msgstr "De bas en haut" -#: ../share/extensions/text_extract.inx.h:5 -#: ../share/extensions/text_merge.inx.h:5 +#: ../share/extensions/text_extract.inx.h:5 ../share/extensions/text_merge.inx.h:5 msgid "Right to left" msgstr "De droite à gauche" -#: ../share/extensions/text_extract.inx.h:6 -#: ../share/extensions/text_merge.inx.h:6 +#: ../share/extensions/text_extract.inx.h:6 ../share/extensions/text_merge.inx.h:6 msgid "Top to bottom" msgstr "De haut en bas" -#: ../share/extensions/text_extract.inx.h:7 -#: ../share/extensions/text_merge.inx.h:7 +#: ../share/extensions/text_extract.inx.h:7 ../share/extensions/text_merge.inx.h:7 msgid "Horizontal point:" msgstr "Point horizontal :" -#: ../share/extensions/text_extract.inx.h:11 -#: ../share/extensions/text_merge.inx.h:11 +#: ../share/extensions/text_extract.inx.h:11 ../share/extensions/text_merge.inx.h:11 msgid "Vertical point:" msgstr "Point vertical :" @@ -38363,12 +34655,8 @@ msgstr "Point vertical :" msgid "fLIP cASE" msgstr "iNVERSER lA cASSE" -#: ../share/extensions/text_flipcase.inx.h:3 -#: ../share/extensions/text_lowercase.inx.h:3 -#: ../share/extensions/text_randomcase.inx.h:3 -#: ../share/extensions/text_sentencecase.inx.h:3 -#: ../share/extensions/text_titlecase.inx.h:3 -#: ../share/extensions/text_uppercase.inx.h:3 +#: ../share/extensions/text_flipcase.inx.h:3 ../share/extensions/text_lowercase.inx.h:3 ../share/extensions/text_randomcase.inx.h:3 +#: ../share/extensions/text_sentencecase.inx.h:3 ../share/extensions/text_titlecase.inx.h:3 ../share/extensions/text_uppercase.inx.h:3 msgid "Change Case" msgstr "Modifier la casse" @@ -38478,12 +34766,9 @@ msgid "Automatic from selected objects" msgstr "Automatique à partir des objets sélectionnés" #: ../share/extensions/voronoi2svg.inx.h:12 -msgid "" -"Select a set of objects. Their centroids will be used as the sites of the " -"Voronoi diagram. Text objects are not handled." +msgid "Select a set of objects. Their centroids will be used as the sites of the Voronoi diagram. Text objects are not handled." msgstr "" -"Sélectionnez un ensemble d'objets. Leurs barycentres seront utilisés comme " -"sites du diagramme de Voronoï. Les objets de type texte ne sont pas " +"Sélectionnez un ensemble d'objets. Leurs barycentres seront utilisés comme sites du diagramme de Voronoï. Les objets de type texte ne sont pas " "supportés." #: ../share/extensions/web-set-att.inx.h:1 @@ -38502,8 +34787,7 @@ msgstr "Appliquer la définition :" msgid "Value to set:" msgstr "Valeur à définir :" -#: ../share/extensions/web-set-att.inx.h:6 -#: ../share/extensions/web-transmit-att.inx.h:5 +#: ../share/extensions/web-set-att.inx.h:6 ../share/extensions/web-transmit-att.inx.h:5 msgid "Compatibility with previews code to this event:" msgstr "Compatibilité avec le code de prévisualisation pour cet événement :" @@ -38511,76 +34795,61 @@ msgstr "Compatibilité avec le code de prévisualisation pour cet événement : msgid "Source and destination of setting:" msgstr "Source et destination de la définition :" -#: ../share/extensions/web-set-att.inx.h:8 -#: ../share/extensions/web-transmit-att.inx.h:7 +#: ../share/extensions/web-set-att.inx.h:8 ../share/extensions/web-transmit-att.inx.h:7 msgid "on click" msgstr "on click" -#: ../share/extensions/web-set-att.inx.h:9 -#: ../share/extensions/web-transmit-att.inx.h:8 +#: ../share/extensions/web-set-att.inx.h:9 ../share/extensions/web-transmit-att.inx.h:8 msgid "on focus" msgstr "on focus" -#: ../share/extensions/web-set-att.inx.h:10 -#: ../share/extensions/web-transmit-att.inx.h:9 +#: ../share/extensions/web-set-att.inx.h:10 ../share/extensions/web-transmit-att.inx.h:9 msgid "on blur" msgstr "on blur" -#: ../share/extensions/web-set-att.inx.h:11 -#: ../share/extensions/web-transmit-att.inx.h:10 +#: ../share/extensions/web-set-att.inx.h:11 ../share/extensions/web-transmit-att.inx.h:10 msgid "on activate" msgstr "on activate" -#: ../share/extensions/web-set-att.inx.h:12 -#: ../share/extensions/web-transmit-att.inx.h:11 +#: ../share/extensions/web-set-att.inx.h:12 ../share/extensions/web-transmit-att.inx.h:11 msgid "on mouse down" msgstr "on mouse down" -#: ../share/extensions/web-set-att.inx.h:13 -#: ../share/extensions/web-transmit-att.inx.h:12 +#: ../share/extensions/web-set-att.inx.h:13 ../share/extensions/web-transmit-att.inx.h:12 msgid "on mouse up" msgstr "on mouse up" -#: ../share/extensions/web-set-att.inx.h:14 -#: ../share/extensions/web-transmit-att.inx.h:13 +#: ../share/extensions/web-set-att.inx.h:14 ../share/extensions/web-transmit-att.inx.h:13 msgid "on mouse over" msgstr "on mouse over" -#: ../share/extensions/web-set-att.inx.h:15 -#: ../share/extensions/web-transmit-att.inx.h:14 +#: ../share/extensions/web-set-att.inx.h:15 ../share/extensions/web-transmit-att.inx.h:14 msgid "on mouse move" msgstr "on mouse move" -#: ../share/extensions/web-set-att.inx.h:16 -#: ../share/extensions/web-transmit-att.inx.h:15 +#: ../share/extensions/web-set-att.inx.h:16 ../share/extensions/web-transmit-att.inx.h:15 msgid "on mouse out" msgstr "on mouse out" -#: ../share/extensions/web-set-att.inx.h:17 -#: ../share/extensions/web-transmit-att.inx.h:16 +#: ../share/extensions/web-set-att.inx.h:17 ../share/extensions/web-transmit-att.inx.h:16 msgid "on element loaded" msgstr "on element loaded" #: ../share/extensions/web-set-att.inx.h:18 msgid "The list of values must have the same size as the attributes list." -msgstr "" -"La liste des valeurs doit avoir la même taille que la liste des attributs." +msgstr "La liste des valeurs doit avoir la même taille que la liste des attributs." -#: ../share/extensions/web-set-att.inx.h:19 -#: ../share/extensions/web-transmit-att.inx.h:17 +#: ../share/extensions/web-set-att.inx.h:19 ../share/extensions/web-transmit-att.inx.h:17 msgid "Run it after" msgstr "Exécuter après" -#: ../share/extensions/web-set-att.inx.h:20 -#: ../share/extensions/web-transmit-att.inx.h:18 +#: ../share/extensions/web-set-att.inx.h:20 ../share/extensions/web-transmit-att.inx.h:18 msgid "Run it before" msgstr "Exécuter avant" -#: ../share/extensions/web-set-att.inx.h:22 -#: ../share/extensions/web-transmit-att.inx.h:20 +#: ../share/extensions/web-set-att.inx.h:22 ../share/extensions/web-transmit-att.inx.h:20 msgid "The next parameter is useful when you select more than two elements" -msgstr "" -"Le paramètre suivant est utile si plus de deux éléments sont sélectionnés" +msgstr "Le paramètre suivant est utile si plus de deux éléments sont sélectionnés" #: ../share/extensions/web-set-att.inx.h:23 msgid "All selected ones set an attribute in the last one" @@ -38590,36 +34859,20 @@ msgstr "Tous les sélectionnés définissent un attribut dans le dernier" msgid "The first selected sets an attribute in all others" msgstr "Le premier sélectionné définit un attribut pour tous les autres" -#: ../share/extensions/web-set-att.inx.h:26 -#: ../share/extensions/web-transmit-att.inx.h:24 -msgid "" -"This effect adds a feature visible (or usable) only on a SVG enabled web " -"browser (like Firefox)." -msgstr "" -"L'élément ajouté par cet effet sera visible (ou utilisable) seulement avec " -"un navigateur internet supportant SVG (comme Firefox)." +#: ../share/extensions/web-set-att.inx.h:26 ../share/extensions/web-transmit-att.inx.h:24 +msgid "This effect adds a feature visible (or usable) only on a SVG enabled web browser (like Firefox)." +msgstr "L'élément ajouté par cet effet sera visible (ou utilisable) seulement avec un navigateur internet supportant SVG (comme Firefox)." #: ../share/extensions/web-set-att.inx.h:27 -msgid "" -"This effect sets one or more attributes in the second selected element, when " -"a defined event occurs on the first selected element." -msgstr "" -"Cet effet définit un ou plusieurs attributs sur le deuxième élément " -"sélectionné lorsqu'un événement intervient sur le premier." +msgid "This effect sets one or more attributes in the second selected element, when a defined event occurs on the first selected element." +msgstr "Cet effet définit un ou plusieurs attributs sur le deuxième élément sélectionné lorsqu'un événement intervient sur le premier." #: ../share/extensions/web-set-att.inx.h:28 -msgid "" -"If you want to set more than one attribute, you must separate this with a " -"space, and only with a space." -msgstr "" -"Si vous souhaitez définir plusieurs attributs, vous devez les séparer avec " -"le caractère « espace »." +msgid "If you want to set more than one attribute, you must separate this with a space, and only with a space." +msgstr "Si vous souhaitez définir plusieurs attributs, vous devez les séparer avec le caractère « espace »." -#: ../share/extensions/web-set-att.inx.h:29 -#: ../share/extensions/web-transmit-att.inx.h:27 -#: ../share/extensions/webslicer_create_group.inx.h:13 -#: ../share/extensions/webslicer_create_rect.inx.h:41 -#: ../share/extensions/webslicer_export.inx.h:8 +#: ../share/extensions/web-set-att.inx.h:29 ../share/extensions/web-transmit-att.inx.h:27 ../share/extensions/webslicer_create_group.inx.h:13 +#: ../share/extensions/webslicer_create_rect.inx.h:41 ../share/extensions/webslicer_export.inx.h:8 msgid "Web" msgstr "Web" @@ -38648,32 +34901,22 @@ msgid "The first selected transmits to all others" msgstr "Le premier sélectionné transmet à tous les autres" #: ../share/extensions/web-transmit-att.inx.h:25 -msgid "" -"This effect transmits one or more attributes from the first selected element " -"to the second when an event occurs." -msgstr "" -"Cet effet transmet un ou plusieurs attributs du premier élément sélectionné " -"vers le deuxième lorsqu'un événement intervient." +msgid "This effect transmits one or more attributes from the first selected element to the second when an event occurs." +msgstr "Cet effet transmet un ou plusieurs attributs du premier élément sélectionné vers le deuxième lorsqu'un événement intervient." #: ../share/extensions/web-transmit-att.inx.h:26 -msgid "" -"If you want to transmit more than one attribute, you should separate this " -"with a space, and only with a space." -msgstr "" -"Si vous souhaitez transmettre plusieurs attributs, vous devez les séparer " -"avec le caractère « espace »." +msgid "If you want to transmit more than one attribute, you should separate this with a space, and only with a space." +msgstr "Si vous souhaitez transmettre plusieurs attributs, vous devez les séparer avec le caractère « espace »." #: ../share/extensions/webslicer_create_group.inx.h:1 msgid "Set a layout group" msgstr "Définir un groupe de composants" -#: ../share/extensions/webslicer_create_group.inx.h:3 -#: ../share/extensions/webslicer_create_rect.inx.h:18 +#: ../share/extensions/webslicer_create_group.inx.h:3 ../share/extensions/webslicer_create_rect.inx.h:18 msgid "HTML id attribute:" msgstr "Attribut d'Id HTML :" -#: ../share/extensions/webslicer_create_group.inx.h:4 -#: ../share/extensions/webslicer_create_rect.inx.h:19 +#: ../share/extensions/webslicer_create_group.inx.h:4 ../share/extensions/webslicer_create_rect.inx.h:19 msgid "HTML class attribute:" msgstr "Attribut de classe HTML :" @@ -38685,8 +34928,7 @@ msgstr "Unité de largeur :" msgid "Height unit:" msgstr "Unité de hauteur :" -#: ../share/extensions/webslicer_create_group.inx.h:7 -#: ../share/extensions/webslicer_create_rect.inx.h:9 +#: ../share/extensions/webslicer_create_group.inx.h:7 ../share/extensions/webslicer_create_rect.inx.h:9 msgid "Background color:" msgstr "Couleur de fond :" @@ -38704,11 +34946,9 @@ msgstr "Indéfini (relatif à une taille de contenu fixe)" #: ../share/extensions/webslicer_create_group.inx.h:12 msgid "" -"Layout Group is only about to help a better code generation (if you need " -"it). To use this, you must to select some \"Slicer rectangles\" first." +"Layout Group is only about to help a better code generation (if you need it). To use this, you must to select some \"Slicer rectangles\" first." msgstr "" -"Le but du groupe de composants est d'aider à générer un meilleur code (si " -"nécessaire). Pour l'utiliser, vous devez d'abord sélectionner des " +"Le but du groupe de composants est d'aider à générer un meilleur code (si nécessaire). Pour l'utiliser, vous devez d'abord sélectionner des " "« Rectangles de découpe »." #: ../share/extensions/webslicer_create_group.inx.h:14 @@ -38730,8 +34970,7 @@ msgstr "Imposer la dimension :" #. i18n. Description duplicated in a fake value attribute in order to make it translatable #: ../share/extensions/webslicer_create_rect.inx.h:7 msgid "Force Dimension must be set as x" -msgstr "" -"La dimension imposée doit être définie sous la forme « x »" +msgstr "La dimension imposée doit être définie sous la forme « x »" #: ../share/extensions/webslicer_create_rect.inx.h:8 msgid "If set, this will replace DPI." @@ -38746,13 +34985,9 @@ msgid "Quality:" msgstr "Qualité :" #: ../share/extensions/webslicer_create_rect.inx.h:12 -msgid "" -"0 is the lowest image quality and highest compression, and 100 is the best " -"quality but least effective compression" +msgid "0 is the lowest image quality and highest compression, and 100 is the best quality but least effective compression" msgstr "" -"0 correspond à la plus faible qualité d'image et à la plus forte " -"compression, 100 à la meilleure qualité mais à une compression moins " -"efficace." +"0 correspond à la plus faible qualité d'image et à la plus forte compression, 100 à la meilleure qualité mais à une compression moins efficace." #: ../share/extensions/webslicer_create_rect.inx.h:13 msgid "GIF specific options" @@ -38867,12 +35102,8 @@ msgid "With HTML and CSS" msgstr "Avec HTML et CSS" #: ../share/extensions/webslicer_export.inx.h:7 -msgid "" -"All sliced images, and optionally - code, will be generated as you had " -"configured and saved to one directory." -msgstr "" -"Les images découpées, et éventuellement le code, seront générés comme " -"configuré et enregistrés dans un dossier." +msgid "All sliced images, and optionally - code, will be generated as you had configured and saved to one directory." +msgstr "Les images découpées, et éventuellement le code, seront générés comme configuré et enregistrés dans un dossier." #: ../share/extensions/whirl.inx.h:1 msgid "Whirl" @@ -38906,13 +35137,11 @@ msgstr "Inclinaison (deg) :" msgid "Hide lines behind the sphere" msgstr "Cacher les lignes derrière la sphère" -#: ../share/extensions/wmf_input.inx.h:1 -#: ../share/extensions/wmf_output.inx.h:1 +#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1 msgid "Windows Metafile Input" msgstr "Entrée métafichier Windows (*.wmf)" -#: ../share/extensions/wmf_input.inx.h:3 -#: ../share/extensions/wmf_output.inx.h:3 +#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3 msgid "A popular graphics file format for clipart" msgstr "Un format graphique populaire pour les cliparts" @@ -38924,11 +35153,8 @@ msgstr "Entrée XAML" #~ msgid "None" #~ msgstr "Aucun" -#~ msgid "" -#~ "The feTile filter primitive tiles a region with its input graphic" -#~ msgstr "" -#~ "feTile pave une région avec la ressource graphique fournie en " -#~ "entrée." +#~ msgid "The feTile filter primitive tiles a region with its input graphic" +#~ msgstr "feTile pave une région avec la ressource graphique fournie en entrée." #~ msgid "Text Orientation: " #~ msgstr "Orientation du texte :" @@ -39017,12 +35243,10 @@ msgstr "Entrée XAML" #~ msgstr "http://wiki.inkscape.org/wiki/index.php/FrFAQ" #~ msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" -#~ msgstr "" -#~ "PS+LaTeX : exclure le texte du fichier PS, et créer un fichier LaTeX" +#~ msgstr "PS+LaTeX : exclure le texte du fichier PS, et créer un fichier LaTeX" #~ msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" -#~ msgstr "" -#~ "EPS+LaTeX : exclure le texte du fichier EPS, et créer un fichier LaTeX" +#~ msgstr "EPS+LaTeX : exclure le texte du fichier EPS, et créer un fichier LaTeX" #~ msgid "_Templates..." #~ msgstr "_Modèles..." @@ -39041,12 +35265,8 @@ msgstr "Entrée XAML" #~ msgid "(%s):" #~ msgstr "(%s) :" -#~ msgid "" -#~ "Always convert the text size units above into pixels (px) before saving " -#~ "to file" -#~ msgstr "" -#~ "Toujours convertir la taille du texte en pixels (px) avant d'enregistrer " -#~ "dans un fichier" +#~ msgid "Always convert the text size units above into pixels (px) before saving to file" +#~ msgstr "Toujours convertir la taille du texte en pixels (px) avant d'enregistrer dans un fichier" #~ msgid "A4 Landscape Page" #~ msgstr "Page A4 paysage" @@ -39303,13 +35523,11 @@ msgstr "Entrée XAML" #, fuzzy #~ msgid "" -#~ "Image looks too big. Process may take a while and it is wise to save your " -#~ "document before continue.\n" +#~ "Image looks too big. Process may take a while and it is wise to save your document before continue.\n" #~ "\n" #~ "Continue the procedure (without saving)?" #~ msgstr "" -#~ "L'image semble trop grosse. Le traitement risque de prendre assez " -#~ "longtemps et il serait préférable d'enregistrer votre document avant de " +#~ "L'image semble trop grosse. Le traitement risque de prendre assez longtemps et il serait préférable d'enregistrer votre document avant de " #~ "continuer.\n" #~ "\n" #~ "Continuer (sans enregistrer) ?" @@ -40290,35 +36508,24 @@ msgstr "Entrée XAML" #~ msgid "Type of document (DCMI Type)" #~ msgstr "Type du document (type DCMI)" -#~ msgid "" -#~ "Name of entity with rights to the Intellectual Property of this document" -#~ msgstr "" -#~ "Nom de l'entité possédant les droits de Propriété Intellectuelle sur ce " -#~ "document" +#~ msgid "Name of entity with rights to the Intellectual Property of this document" +#~ msgstr "Nom de l'entité possédant les droits de Propriété Intellectuelle sur ce document" #~ msgid "Unique URI to reference this document" #~ msgstr "URI unique pour référencer ce document" #~ msgid "Unique URI to reference the source of this document" -#~ msgstr "" -#~ "URI unique pour référencer la ressource dont le document actuel est dérivé" +#~ msgstr "URI unique pour référencer la ressource dont le document actuel est dérivé" #~ msgid "Unique URI to a related document" #~ msgstr "URI unique vers un document apparenté" -#~ msgid "" -#~ "Two-letter language tag with optional subtags for the language of this " -#~ "document (e.g. 'en-GB')" +#~ msgid "Two-letter language tag with optional subtags for the language of this document (e.g. 'en-GB')" #~ msgstr "" -#~ "Balise de deux lettres spécifiant la langue de ce document, avec une sous-" -#~ "balise optionnelle de spécification régionale (ex. « fr-FR » )" +#~ "Balise de deux lettres spécifiant la langue de ce document, avec une sous-balise optionnelle de spécification régionale (ex. « fr-FR » )" -#~ msgid "" -#~ "The topic of this document as comma-separated key words, phrases, or " -#~ "classifications" -#~ msgstr "" -#~ "Le sujet de ce document sous forme de mots clés, phrases ou éléments de " -#~ "classification, séparés par des virgules" +#~ msgid "The topic of this document as comma-separated key words, phrases, or classifications" +#~ msgstr "Le sujet de ce document sous forme de mots clés, phrases ou éléments de classification, séparés par des virgules" #~ msgid "Extent or scope of this document" #~ msgstr "Étendue ou portée de ce document" @@ -40419,9 +36626,7 @@ msgstr "Entrée XAML" #~ msgstr "Autoriser les coordonnées relatives" #~ msgid "If set, relative coordinates may be used in path data" -#~ msgstr "" -#~ "Si coché, les coordonnées relatives peuvent être utilisées dans les " -#~ "données du chemin" +#~ msgstr "Si coché, les coordonnées relatives peuvent être utilisées dans les données du chemin" #~ msgid "_Execute Javascript" #~ msgstr "_Exécuter Javascript" @@ -40598,16 +36803,12 @@ msgstr "Entrée XAML" #~ msgstr "Tableau _blanc" #~ msgid "" -#~ "The feDiffuseLighting and feSpecularLighting filter primitives " -#~ "create \"embossed\" shadings. The input's alpha channel is used to " -#~ "provide depth information: higher opacity areas are raised toward the " -#~ "viewer and lower opacity areas recede away from the viewer." +#~ "The feDiffuseLighting and feSpecularLighting filter primitives create \"embossed\" shadings. The input's alpha channel is used to " +#~ "provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer." #~ msgstr "" -#~ "feDiffuseLighting et feSpecularLighting créent des ombrages " -#~ "« gauffrés ». La composante d'opacité (alpha) de l'entrée est utilisée " -#~ "pour founir l'information de profondeur : les zones de forte opacité sont " -#~ "élevées vers le point de vue et les zones de faible opacité sont reculées " -#~ "par rapport au point de vue." +#~ "feDiffuseLighting et feSpecularLighting créent des ombrages « gauffrés ». La composante d'opacité (alpha) de l'entrée est " +#~ "utilisée pour founir l'information de profondeur : les zones de forte opacité sont élevées vers le point de vue et les zones de faible " +#~ "opacité sont reculées par rapport au point de vue." #~ msgid "Failed to find font matching: %s\n" #~ msgstr "Impossible de trouver une police correspondant à : %s\n" @@ -40622,12 +36823,10 @@ msgstr "Entrée XAML" #~ msgstr "Origine de l'axe Y (px)" #~ msgid "" -#~ "This effect bends a pattern object along arbitrary \"skeleton\" paths. " -#~ "The pattern is the topmost object in the selection (groups of paths/" +#~ "This effect bends a pattern object along arbitrary \"skeleton\" paths. The pattern is the topmost object in the selection (groups of paths/" #~ "shapes/clones... allowed)." #~ msgstr "" -#~ "Cet effet courbe un objet de motif le long de chemins « squelettes » " -#~ "arbitraire. Le motif est l'objet le plus haut dans la sélection (les " +#~ "Cet effet courbe un objet de motif le long de chemins « squelettes » arbitraire. Le motif est l'objet le plus haut dans la sélection (les " #~ "groupes de chemins, les formes et les clones sont permis)." #~ msgid "Blur type:" @@ -40643,14 +36842,10 @@ msgstr "Entrée XAML" #~ msgstr "Supprimer un point de connexion" #~ msgid "Connection point: click or drag to create a new connector" -#~ msgstr "" -#~ "Point de connnection : cliquer ou déplacer pour créer un nouveau " -#~ "connecteur" +#~ msgstr "Point de connnection : cliquer ou déplacer pour créer un nouveau connecteur" #~ msgid "Connection point: click to select, drag to move" -#~ msgstr "" -#~ "Point de connexion : cliquer pour sélectionner, glisser pour " -#~ "déplacer" +#~ msgstr "Point de connexion : cliquer pour sélectionner, glisser pour déplacer" #~ msgid "Connection point drag cancelled." #~ msgstr "Déplacement du point de connexion annulé." @@ -40659,32 +36854,22 @@ msgstr "Entrée XAML" #~ msgstr "_Texte :" #~ msgid "Find objects by their text content (exact or partial match)" -#~ msgstr "" -#~ "Rechercher des objets par le texte qu'ils contiennent (correspondance " -#~ "exacte ou partielle)" +#~ msgstr "Rechercher des objets par le texte qu'ils contiennent (correspondance exacte ou partielle)" -#~ msgid "" -#~ "Find objects by the value of the id attribute (exact or partial match)" -#~ msgstr "" -#~ "Rechercher des objets par la valeur de l'attribut id (correspondance " -#~ "exacte ou partielle)" +#~ msgid "Find objects by the value of the id attribute (exact or partial match)" +#~ msgstr "Rechercher des objets par la valeur de l'attribut id (correspondance exacte ou partielle)" #~ msgid "_Style:" #~ msgstr "_Style :" -#~ msgid "" -#~ "Find objects by the value of the style attribute (exact or partial match)" -#~ msgstr "" -#~ "Rechercher des objets par la valeur de l'attribut style (correspondance " -#~ "exacte ou partielle)" +#~ msgid "Find objects by the value of the style attribute (exact or partial match)" +#~ msgstr "Rechercher des objets par la valeur de l'attribut style (correspondance exacte ou partielle)" #~ msgid "_Attribute:" #~ msgstr "_Attribut :" #~ msgid "Find objects by the name of an attribute (exact or partial match)" -#~ msgstr "" -#~ "Rechercher des objets par le nom d'un attribut (correspondance exacte ou " -#~ "partielle)" +#~ msgstr "Rechercher des objets par le nom d'un attribut (correspondance exacte ou partielle)" #~ msgid "Search in s_election" #~ msgstr "R_echercher dans la sélection" @@ -40699,34 +36884,24 @@ msgstr "Entrée XAML" #~ msgstr "Effacer les valeurs" #~ msgid "Select objects matching all of the fields you filled in" -#~ msgstr "" -#~ "Sélectionner les objets qui correspondent à tous les champs que vous avez " -#~ "remplis" +#~ msgstr "Sélectionner les objets qui correspondent à tous les champs que vous avez remplis" -#~ msgid "" -#~ "Color and transparency of the page background (also used for bitmap " -#~ "export)" -#~ msgstr "" -#~ "Couleur et opacité du fond de page (également utilisé lors de " -#~ "l'exportation en bitmap)" +#~ msgid "Color and transparency of the page background (also used for bitmap export)" +#~ msgstr "Couleur et opacité du fond de page (également utilisé lors de l'exportation en bitmap)" #~ msgid "" -#~ "When on, pressing and holding Space and dragging with left mouse button " -#~ "pans canvas (as in Adobe Illustrator); when off, Space temporarily " +#~ "When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily " #~ "switches to Selector tool (default)" #~ msgstr "" -#~ "Si coché, maintenir pressée la touche Espace tout en cliquant-déplaçant " -#~ "avec le bouton gauche de la souris fait défiler horizontalement la zone " -#~ "de travail (comme dans Adobe Illustrator) ; si décoché, la touche Espace " -#~ "active temporairement l'outil de Sélection (réglage par défaut)." +#~ "Si coché, maintenir pressée la touche Espace tout en cliquant-déplaçant avec le bouton gauche de la souris fait défiler horizontalement la " +#~ "zone de travail (comme dans Adobe Illustrator) ; si décoché, la touche Espace active temporairement l'outil de Sélection (réglage par " +#~ "défaut)." #~ msgid "EditMode" #~ msgstr "ModeÉdition" #~ msgid "Switch between connection point editing and connector drawing mode" -#~ msgstr "" -#~ "Alterner entre le mode Édition de point de connexion et le mode Tracé de " -#~ "connecteur" +#~ msgstr "Alterner entre le mode Édition de point de connexion et le mode Tracé de connecteur" #~ msgid "New connection point" #~ msgstr "Nouveau point de connexion" @@ -41021,11 +37196,10 @@ msgstr "Entrée XAML" #~ msgstr "Affecter :" #~ msgid "" -#~ "Control whether or not to scale stroke widths, scale rectangle corners, " -#~ "transform gradient fills, and transform pattern fills with the object" +#~ "Control whether or not to scale stroke widths, scale rectangle corners, transform gradient fills, and transform pattern fills with the " +#~ "object" #~ msgstr "" -#~ "Définit si l'épaisseur des contours, les coins des rectangles, et les " -#~ "remplissages par gradient ou par motif doivent être affectés par le " +#~ "Définit si l'épaisseur des contours, les coins des rectangles, et les remplissages par gradient ou par motif doivent être affectés par le " #~ "redimensionnement de l'objet" #~ msgid "Link Properties" @@ -41052,12 +37226,8 @@ msgstr "Entrée XAML" #~ msgid "Expand direction" #~ msgstr "Direction d'expansion" -#~ msgid "" -#~ "Allow the master's dock items to expand their container dock objects in " -#~ "the given direction" -#~ msgstr "" -#~ "Permet aux éléments détachables du maître d'élargir les objets d'attache " -#~ "qu'ils contiennent dans la direction donnée" +#~ msgid "Allow the master's dock items to expand their container dock objects in the given direction" +#~ msgstr "Permet aux éléments détachables du maître d'élargir les objets d'attache qu'ils contiennent dans la direction donnée" #~ msgid "Mouse" #~ msgstr "Souris" @@ -41089,24 +37259,18 @@ msgstr "Entrée XAML" #~ msgid "No effect applied" #~ msgstr "Pas d'effet appliqué" -#~ msgid "" -#~ "Enable log display by setting dialogs.debug 'redirect' attribute to 1 in " -#~ "preferences.xml" -#~ msgstr "" -#~ "Activer l'affichage des logs en attribuant 1 à dialogs.debug 'redirect' " -#~ "dans preferences.xml" +#~ msgid "Enable log display by setting dialogs.debug 'redirect' attribute to 1 in preferences.xml" +#~ msgstr "Activer l'affichage des logs en attribuant 1 à dialogs.debug 'redirect' dans preferences.xml" #~ msgid "Error while reading the Open Clip Art RSS feed" #~ msgstr "Erreur à la lecture du fil RSS de Open Clip Art" #~ msgid "" -#~ "Failed to receive the Open Clip Art Library RSS feed. Verify if the " -#~ "server name is correct in Configuration->Import/Export (e.g.: openclipart." -#~ "org)" +#~ "Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Import/Export (e.g.: " +#~ "openclipart.org)" #~ msgstr "" -#~ "Échec de réception du fil RSS de la bibliothèque Open Clip Art. Veuillez " -#~ "vérifier si le nom de serveur est correct dans Configuration>Importer/" -#~ "Exporter (par exemple : openclipart.org)" +#~ "Échec de réception du fil RSS de la bibliothèque Open Clip Art. Veuillez vérifier si le nom de serveur est correct dans " +#~ "Configuration>Importer/Exporter (par exemple : openclipart.org)" #~ msgid "Server supplied malformed Clip Art feed" #~ msgstr "Le serveur a fourni un fil RSS de Clip Art invalide" @@ -41190,9 +37354,7 @@ msgstr "Entrée XAML" #~ msgstr "Contour, double" #~ msgid "Draws a smooth line inside colorized with the color it overlays" -#~ msgstr "" -#~ "Dessine une ligne intérieure lissée, colorée avec la couleur qu'elle " -#~ "recouvre" +#~ msgstr "Dessine une ligne intérieure lissée, colorée avec la couleur qu'elle recouvre" #~ msgid "Adds a glowing blur and removes the shape" #~ msgstr "Ajoute un flou lumineux et supprime la forme" @@ -41201,9 +37363,7 @@ msgstr "Entrée XAML" #~ msgstr "Soulignement du contour, interne" #~ msgid "A colorizable inner outline with adjustable width and blur" -#~ msgstr "" -#~ "Un soulignement du contour interne qu'il est possible de colorer, avec " -#~ "une épaisseur ajustable et un flou" +#~ msgstr "Un soulignement du contour interne qu'il est possible de colorer, avec une épaisseur ajustable et un flou" #~ msgid "handle" #~ msgstr "poignée" @@ -41218,14 +37378,11 @@ msgstr "Entrée XAML" #~ msgstr "Aimanter les guides en déplaçant" #~ msgid "" -#~ "While dragging a guide, snap to object nodes or bounding box corners " -#~ "('Snap to nodes' or 'snap to bounding box corners' must be enabled; only " -#~ "a small part of the guide near the cursor will snap)" +#~ "While dragging a guide, snap to object nodes or bounding box corners ('Snap to nodes' or 'snap to bounding box corners' must be enabled; " +#~ "only a small part of the guide near the cursor will snap)" #~ msgstr "" -#~ "Quand un guide est déplacé, l'aimanter aux nœuds des objets ou aux boîtes " -#~ "englobantes ('Aimanter aux nœuds d'objets' ou 'Aimanter aux coins des " -#~ "boîtes englobantes' doit être activé ; seule une petite partie du guide " -#~ "proche du curseur sera aimantée)" +#~ "Quand un guide est déplacé, l'aimanter aux nœuds des objets ou aux boîtes englobantes ('Aimanter aux nœuds d'objets' ou 'Aimanter aux coins " +#~ "des boîtes englobantes' doit être activé ; seule une petite partie du guide proche du curseur sera aimantée)" #~ msgid "Snap to bounding box corners" #~ msgstr "Aimanter aux coins des boîtes englobantes" @@ -41245,22 +37402,14 @@ msgstr "Entrée XAML" #~ msgid "Motion blur, horizontal" #~ msgstr "Flou cinétique horizontal" -#~ msgid "" -#~ "Blur as if the object flies horizontally; adjust Standard Deviation to " -#~ "vary force" -#~ msgstr "" -#~ "Rendre flou comme si l'objet volait horizontalement ; ajuster la variance " -#~ "pour en modifier la force" +#~ msgid "Blur as if the object flies horizontally; adjust Standard Deviation to vary force" +#~ msgstr "Rendre flou comme si l'objet volait horizontalement ; ajuster la variance pour en modifier la force" #~ msgid "Motion blur, vertical" #~ msgstr "Flou cinétique vertical" -#~ msgid "" -#~ "Blur as if the object flies vertically; adjust Standard Deviation to vary " -#~ "force" -#~ msgstr "" -#~ "Rendre flou comme si l'objet volait verticalement ; ajuster la variance " -#~ "pour en modifier la force" +#~ msgid "Blur as if the object flies vertically; adjust Standard Deviation to vary force" +#~ msgstr "Rendre flou comme si l'objet volait verticalement ; ajuster la variance pour en modifier la force" #~ msgid "Drop shadow under the cut-out of the shape" #~ msgstr "Ombre portée sous la découpe de la forme" @@ -41293,18 +37442,13 @@ msgstr "Entrée XAML" #~ msgstr "Bosselage TSL" #~ msgid "Highly flexible bump combining diffuse and specular lightings" -#~ msgstr "" -#~ "Bosselage extrêmement flexible combinant une lumière diffuse et une " -#~ "lumière spéculaire" +#~ msgstr "Bosselage extrêmement flexible combinant une lumière diffuse et une lumière spéculaire" #~ msgid "Blur inner borders and intersections" #~ msgstr "Rend flou les bordures intérieures et les intersections" -#~ msgid "" -#~ "Blend image or object with a flood color and set lightness and contrast" -#~ msgstr "" -#~ "Mélange un image ou un objet avec une couleur de remplissage, et définit " -#~ "sa luminosité et son contraste" +#~ msgid "Blend image or object with a flood color and set lightness and contrast" +#~ msgstr "Mélange un image ou un objet avec une couleur de remplissage, et définit sa luminosité et son contraste" #~ msgid "Invert hue, or rotate it" #~ msgstr "Inverse ou permute la teinte" @@ -41313,26 +37457,19 @@ msgstr "Entrée XAML" #~ msgstr "Flou fantaisie" #~ msgid "Smooth colorized contour which allows desaturation and hue rotation" -#~ msgstr "" -#~ "Contour coloré lissé, qui permet la désaturation et la rotation de teinte" +#~ msgstr "Contour coloré lissé, qui permet la désaturation et la rotation de teinte" #~ msgid "Glow of object's own color at the edges" #~ msgstr "Rayonnement de la couleur de l'objet sur ses bords" #~ msgid "Classic or colorized emboss effect: grayscale, color and 3D relief" -#~ msgstr "" -#~ "Effet de bosselage classique ou coloré : niveaux de gris, couleur et " -#~ "relief en 3D" +#~ msgstr "Effet de bosselage classique ou coloré : niveaux de gris, couleur et relief en 3D" #~ msgid "Classical photographic solarization effect" #~ msgstr "Effet de solarisation photographique classique" -#~ msgid "" -#~ "An effect between solarize and invert which often preserves sky and water " -#~ "lights" -#~ msgstr "" -#~ "Un effet à mi-chemin de solarisation et inversion, qui préserve souvent " -#~ "les lumières du ciel et de l'eau" +#~ msgid "An effect between solarize and invert which often preserves sky and water lights" +#~ msgstr "Un effet à mi-chemin de solarisation et inversion, qui préserve souvent les lumières du ciel et de l'eau" #~ msgid "Image effects, transparent" #~ msgstr "Effets d'image transparents" @@ -41340,8 +37477,7 @@ msgstr "Entrée XAML" #~ msgid "Smooth edges" #~ msgstr "Lissage du pourtour" -#~ msgid "" -#~ "Smooth the outside of shapes and pictures without altering their contents" +#~ msgid "Smooth the outside of shapes and pictures without altering their contents" #~ msgstr "Lisse l'extérieur des formes et images sans en altérer le contenu" #~ msgid "Specular light" @@ -41359,27 +37495,17 @@ msgstr "Entrée XAML" #~ msgid "HSL Bumps, matte" #~ msgstr "Bosselage TSL mat" -#~ msgid "" -#~ "Same as HSL bumps but with a diffuse reflection instead of a specular one" -#~ msgstr "" -#~ "Identique à Bosselage TSL, mais avec une réflexion diffuse et non pas " -#~ "spéculaire" +#~ msgid "Same as HSL bumps but with a diffuse reflection instead of a specular one" +#~ msgstr "Identique à Bosselage TSL, mais avec une réflexion diffuse et non pas spéculaire" #~ msgid "Simple blur" #~ msgstr "Flou" -#~ msgid "" -#~ "Simple Gaussian blur, same as the blur slider in Fill and Stroke dialog" -#~ msgstr "" -#~ "Flou gaussien simple, identique au réglage de flou dans la boite de " -#~ "dialogue Remplissage et contour" +#~ msgid "Simple Gaussian blur, same as the blur slider in Fill and Stroke dialog" +#~ msgstr "Flou gaussien simple, identique au réglage de flou dans la boite de dialogue Remplissage et contour" -#~ msgid "" -#~ "Emboss effect : Colors of the original images are preserved or modified " -#~ "by Blend" -#~ msgstr "" -#~ "Effet d'embossage : les couleurs de l'image originale sont préservées ou " -#~ "modifiées par Fondre" +#~ msgid "Emboss effect : Colors of the original images are preserved or modified by Blend" +#~ msgstr "Effet d'embossage : les couleurs de l'image originale sont préservées ou modifiées par Fondre" #~ msgid "Inkblot" #~ msgstr "Tache d'encre" @@ -41394,9 +37520,7 @@ msgstr "Entrée XAML" #~ msgstr "Chrome profond" #~ msgid "Dark version of chrome shading with a ground reflection simulation" -#~ msgstr "" -#~ "Version sombre de l'ombrage chrome avec une simulation de réflexion par " -#~ "le sol" +#~ msgstr "Version sombre de l'ombrage chrome avec une simulation de réflexion par le sol" #~ msgid "3D wood" #~ msgstr "Bois en 3D" @@ -41408,8 +37532,7 @@ msgstr "Entrée XAML" #~ msgstr "Flou agité" #~ msgid "Small-scale roughening and blurring to edges and content" -#~ msgstr "" -#~ "Agite et rend flous les bords et le contenu, sur une petite amplitude" +#~ msgstr "Agite et rend flous les bords et le contenu, sur une petite amplitude" #~ msgid "HSL Bumps, transparent" #~ msgstr "Bosselage TSL transparent" @@ -41417,12 +37540,8 @@ msgstr "Entrée XAML" #~ msgid "Highly flexible specular bump with transparency" #~ msgstr "Bosselage spéculaire extrêmement flexible avec transparence" -#~ msgid "" -#~ "Give lead pencil or chromolithography or engraving or other effects to " -#~ "images and material filled objects" -#~ msgstr "" -#~ "Donne un effet crayon gras, chromolithographie, gravure ou d'autres " -#~ "effets aux images et ou objets remplis avec une matière" +#~ msgid "Give lead pencil or chromolithography or engraving or other effects to images and material filled objects" +#~ msgstr "Donne un effet crayon gras, chromolithographie, gravure ou d'autres effets aux images et ou objets remplis avec une matière" #~ msgid "Alpha draw" #~ msgstr "Dessin transparent" @@ -41434,9 +37553,7 @@ msgstr "Entrée XAML" #~ msgstr "Dessin en couleur transparent" #~ msgid "Gives a transparent color fill effect to bitmaps and materials" -#~ msgstr "" -#~ "Donne un effet de remplissage transparent et coloré aux bitmaps et " -#~ "matières" +#~ msgstr "Donne un effet de remplissage transparent et coloré aux bitmaps et matières" #~ msgid "Black outline" #~ msgstr "Soulignement du contour, noir" @@ -41460,8 +37577,7 @@ msgstr "Entrée XAML" #~ msgstr "Lueur trouble" #~ msgid "Overlays a semi-transparent shifted copy to a blurred one" -#~ msgstr "" -#~ "Superpose une copie semi-transparente et décalée à l'original flouté" +#~ msgstr "Superpose une copie semi-transparente et décalée à l'original flouté" #~ msgid "Change colors to a duotone palette" #~ msgstr "Modifie les couleurs avec une palette à deux tons" @@ -41484,12 +37600,8 @@ msgstr "Entrée XAML" #~ msgid "Copper and chocolate" #~ msgstr "Cuivre et chocolat" -#~ msgid "" -#~ "Specular bump which can be easily converted from metallic to molded " -#~ "plastic effects" -#~ msgstr "" -#~ "Bosselage spéculaire dont l'effet métallique peut être facilement " -#~ "converti en effet de plastique moulé" +#~ msgid "Specular bump which can be easily converted from metallic to molded plastic effects" +#~ msgstr "Bosselage spéculaire dont l'effet métallique peut être facilement converti en effet de plastique moulé" #~ msgid "Inner Glow" #~ msgstr "Lueur interne" @@ -41498,9 +37610,7 @@ msgstr "Entrée XAML" #~ msgstr "Ajoute une lueur interne qui peut être colorée" #~ msgid "Create a tritone palette with hue selectable by flood" -#~ msgstr "" -#~ "Crée une palette à trois tons avec une teinte que l'on peut sélectionner " -#~ "par remplissage" +#~ msgstr "Crée une palette à trois tons avec une teinte que l'on peut sélectionner par remplissage" #~ msgid "Image Blur" #~ msgstr "Flou par image" @@ -41677,50 +37787,36 @@ msgstr "Entrée XAML" #~ msgstr "Style en XML" #~ msgid "" -#~ "This extension optimizes the SVG file according to the following " -#~ "options:\n" +#~ "This extension optimizes the SVG file according to the following options:\n" #~ " * Simplify colors: convert all colors to #RRGGBB format.\n" #~ " * Style to xml: convert styles into XML attributes.\n" #~ " * Group collapsing: collapse group elements.\n" #~ " * Enable id stripping: remove all un-referenced ID attributes.\n" #~ " * Embed rasters: embed rasters as base64-encoded data.\n" -#~ " * Keep editor data: don't remove Inkscape, Sodipodi or Adobe " -#~ "Illustrator elements and attributes.\n" -#~ " * Enable viewboxing: size image to 100%/100% and introduce a " -#~ "viewBox.\n" +#~ " * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator elements and attributes.\n" +#~ " * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" #~ " * Strip xml prolog: don't output the xml prolog.\n" #~ " * Set precision: set number of significant digits (default: 5).\n" -#~ " * Indent: indentation of the output: none, space, tab (default: " -#~ "space)." +#~ " * Indent: indentation of the output: none, space, tab (default: space)." #~ msgstr "" -#~ "Cette extension optimise le fichier SVG en fonction des options " -#~ "suivantes :\n" -#~ " * Simplifier les couleurs : convertit toutes les couleurs au format " -#~ "#RRVVBB.\n" +#~ "Cette extension optimise le fichier SVG en fonction des options suivantes :\n" +#~ " * Simplifier les couleurs : convertit toutes les couleurs au format #RRVVBB.\n" #~ " * Style en XML : convertit les styles en attributs XML.\n" #~ " * Réduire les groupes : réduit les éléments de type groupe.\n" -#~ " * Supprimer les identifiants : supprime tous les attributs ID non " -#~ "référencés.\n" -#~ " * Incorporer les images matricielles : incorpore les images " -#~ "matricielles sous la forme de données encodées en base 64.\n" -#~ " * Conserver les données d'édition : ne supprime pas les éléments et " -#~ "attributs issus d'Inkscape, Sodipodi ou Adobe Illustrator.\n" -#~ " * Activer une viewBox : dimensionne l'image à 100 % et ajoute une " -#~ "viewBox.\n" +#~ " * Supprimer les identifiants : supprime tous les attributs ID non référencés.\n" +#~ " * Incorporer les images matricielles : incorpore les images matricielles sous la forme de données encodées en base 64.\n" +#~ " * Conserver les données d'édition : ne supprime pas les éléments et attributs issus d'Inkscape, Sodipodi ou Adobe Illustrator.\n" +#~ " * Activer une viewBox : dimensionne l'image à 100 % et ajoute une viewBox.\n" #~ " * Supprimer le prologue xml : n'exporte pas le prologue xml.\n" -#~ " * Précision : définit le nombre de chiffres significatifs (5 par " -#~ "défaut).\n" -#~ " * Indentation : type d'indentation de l'exportation : aucune, espace " -#~ "ou tabulation (espace par défaut)." +#~ " * Précision : définit le nombre de chiffres significatifs (5 par défaut).\n" +#~ " * Indentation : type d'indentation de l'exportation : aucune, espace ou tabulation (espace par défaut)." #, fuzzy #~ msgid "Y frequency:" #~ msgstr "Fréquence de base :" #~ msgid "To spray a path by pushing, select it and drag over it." -#~ msgstr "" -#~ "Pour pulvériser un chemin en le poussant, sélectionnez-le et faites " -#~ "glisser la souris dessus." +#~ msgstr "Pour pulvériser un chemin en le poussant, sélectionnez-le et faites glisser la souris dessus." #~ msgid "(minimum mean)" #~ msgstr "(moyenne minimale)" @@ -42615,17 +38711,11 @@ msgstr "Entrée XAML" #~ msgstr "Gris 6" #~ msgctxt "Node tool tip" -#~ msgid "" -#~ "%u of %u nodes selected. Drag to select nodes, click to edit only " -#~ "this object (more: Shift)" +#~ msgid "%u of %u nodes selected. Drag to select nodes, click to edit only this object (more: Shift)" #~ msgstr "" -#~ "%u sur %u nœuds sélectionnés. Cliquer-glisser pour sélectionner " -#~ "des nœuds, cliquer pour éditer seulement cet objet (modificateur : Maj)" +#~ "%u sur %u nœuds sélectionnés. Cliquer-glisser pour sélectionner des nœuds, cliquer pour éditer seulement cet objet (modificateur : " +#~ "Maj)" #~ msgctxt "Node tool tip" -#~ msgid "" -#~ "%u of %u nodes selected. Drag to select nodes, click clear the " -#~ "selection" -#~ msgstr "" -#~ "%u sur %u nœuds sélectionnés. Cliquer-glisser pour sélectionner " -#~ "des nœuds, cliquer libérer la sélection" +#~ msgid "%u of %u nodes selected. Drag to select nodes, click clear the selection" +#~ msgstr "%u sur %u nœuds sélectionnés. Cliquer-glisser pour sélectionner des nœuds, cliquer libérer la sélection" -- cgit v1.2.3 From f25ef0abb04f72f71fae039c78313cc700818e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Tue, 22 Mar 2016 08:41:26 +0100 Subject: Correct typo (bzr r14733) --- src/extension/dbus/document-interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp index d64bdbc5c..121a49a25 100644 --- a/src/extension/dbus/document-interface.cpp +++ b/src/extension/dbus/document-interface.cpp @@ -1,7 +1,7 @@ /* * This is where the implementation of the DBus based document API lives. * All the methods in here (except in the helper section) are - * designed to be called remotly via DBus. application-interface.cpp + * designed to be called remotely via DBus. application-interface.cpp * has the methods used to connect to the bus and get a document instance. * * Documentation for these methods is in document-interface.xml -- cgit v1.2.3 From 80b839da8794031d95bb2ce6fe0b39329496833d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Tue, 22 Mar 2016 08:43:05 +0100 Subject: inkex.py code simplification (more compact if conditions, unreachable code) (bzr r14734) --- share/extensions/inkex.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index e1602f918..99f8c6a77 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -106,10 +106,7 @@ def errormsg(msg): def are_near_relative(a, b, eps): - if (a-b <= a*eps) and (a-b >= -a*eps): - return True - else: - return False + return (a-b <= a*eps) and (a-b >= -a*eps) # third party library @@ -246,7 +243,6 @@ class Effect: for parent in self.document.getiterator(): if node in parent.getchildren(): return parent - break def getdocids(self): docIdNodes = self.document.xpath('//@id', namespaces=NSS) -- cgit v1.2.3 From 4cce40a79ab973a3609cd5ee7666673bc2337fef Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 22 Mar 2016 14:56:36 +0100 Subject: Add line-height unit selector to text toolbar. Remove 'm' and 'ft' non-CSS lengths. (bzr r14716.1.3) --- share/ui/units.xml | 14 -- src/desktop-style.cpp | 96 ++++++++++--- src/style.cpp | 3 +- src/svg/svg-length-test.h | 5 +- src/svg/svg-length.cpp | 20 --- src/svg/svg-length.h | 2 - src/ui/widget/preferences-widget.cpp | 4 - src/widgets/text-toolbar.cpp | 256 +++++++++++++++++++++++++++++++++-- src/widgets/toolbox.cpp | 1 + 9 files changed, 320 insertions(+), 81 deletions(-) diff --git a/share/ui/units.xml b/share/ui/units.xml index 364515679..713a538d7 100644 --- a/share/ui/units.xml +++ b/share/ui/units.xml @@ -49,20 +49,6 @@ 37.79527559055119 Centimeters (10 mm/cm) - - meter - meters - m - 3779.527559055119 - Meters (100 cm/m) - - - foot - feet - ft - 1152 - Feet (12 in/ft) - degree degrees diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 7f9670af3..5f6441aa7 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1036,19 +1036,24 @@ int objects_query_fontnumbers (const std::vector &objects, SPStyle *style_res) { bool different = false; + bool different_lineheight = false; + bool different_lineheight_unit = false; double size = 0; double letterspacing = 0; double wordspacing = 0; - double linespacing = 0; + double lineheight = 0; bool letterspacing_normal = false; bool wordspacing_normal = false; - bool linespacing_normal = false; + bool lineheight_normal = false; + bool lineheight_unit_proportional = false; + bool lineheight_unit_absolute = false; double size_prev = 0; double letterspacing_prev = 0; double wordspacing_prev = 0; - double linespacing_prev = 0; + double lineheight_prev = 0; + int lineheight_unit_prev = -1; int texts = 0; int no_size = 0; @@ -1093,31 +1098,55 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r wordspacing_normal = false; } - double linespacing_current; + // If all line spacing units the same, use that (average line spacing). + // Else if all line spacings absolute, use 'px' (average line spacing). + // Else if all line spacings proportional, use % (average line spacing). + // Else use default. + double lineheight_current; + int lineheight_unit_current; if (style->line_height.normal) { - linespacing_current = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; - if (!different && (linespacing_prev == 0 || linespacing_prev == linespacing_current)) - linespacing_normal = true; - } else if (style->line_height.unit == SP_CSS_UNIT_PERCENT || style->font_size.computed == 0) { - linespacing_current = style->line_height.value; - linespacing_normal = false; + lineheight_current = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; + lineheight_unit_current = SP_CSS_UNIT_NONE; + if (!different_lineheight && + (lineheight_prev == 0 || lineheight_prev == lineheight_current)) + lineheight_normal = true; + } else if (style->line_height.unit == SP_CSS_UNIT_NONE || + style->line_height.unit == SP_CSS_UNIT_PERCENT || + style->line_height.unit == SP_CSS_UNIT_EM || + style->line_height.unit == SP_CSS_UNIT_EX || + style->font_size.computed == 0) { + lineheight_current = style->line_height.value; + lineheight_unit_current = style->line_height.unit; + lineheight_unit_proportional = true; + lineheight_normal = false; } else { - linespacing_current = style->line_height.computed; - linespacing_normal = false; + // Always 'px' internally + lineheight_current = style->line_height.computed; + lineheight_unit_current = style->line_height.unit; + lineheight_unit_absolute = true; + lineheight_normal = false; } - linespacing += linespacing_current; + lineheight += lineheight_current; if ((size_prev != 0 && style->font_size.computed != size_prev) || (letterspacing_prev != 0 && style->letter_spacing.computed != letterspacing_prev) || - (wordspacing_prev != 0 && style->word_spacing.computed != wordspacing_prev) || - (linespacing_prev != 0 && linespacing_current != linespacing_prev)) { + (wordspacing_prev != 0 && style->word_spacing.computed != wordspacing_prev)) { different = true; } + if (lineheight_prev != 0 && lineheight_current != lineheight_prev) { + different_lineheight = true; + } + + if (lineheight_unit_prev != -1 && lineheight_unit_current != lineheight_unit_prev) { + different_lineheight_unit = true; + } + size_prev = style->font_size.computed; letterspacing_prev = style->letter_spacing.computed; wordspacing_prev = style->word_spacing.computed; - linespacing_prev = linespacing_current; + lineheight_prev = lineheight_current; + lineheight_unit_prev = lineheight_unit_current; // FIXME: we must detect MULTIPLE_DIFFERENT for these too style_res->text_anchor.computed = style->text_anchor.computed; @@ -1133,7 +1162,7 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r } letterspacing /= texts; wordspacing /= texts; - linespacing /= texts; + lineheight /= texts; } style_res->font_size.computed = size; @@ -1145,13 +1174,36 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r style_res->word_spacing.normal = wordspacing_normal; style_res->word_spacing.computed = wordspacing; - style_res->line_height.normal = linespacing_normal; - style_res->line_height.computed = linespacing; - style_res->line_height.value = linespacing; - style_res->line_height.unit = SP_CSS_UNIT_PERCENT; + style_res->line_height.normal = lineheight_normal; + style_res->line_height.computed = lineheight; + style_res->line_height.value = lineheight; + if (different_lineheight_unit) { + if (lineheight_unit_absolute && !lineheight_unit_proportional) { + // Mixture of absolute units + style_res->line_height.unit = SP_CSS_UNIT_PX; + } else { + // Mixture of relative units + style_res->line_height.unit = SP_CSS_UNIT_PERCENT; + } + if (lineheight_unit_absolute && lineheight_unit_proportional) { + // Mixed types of units, fallback to default + style_res->line_height.computed = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL * 100.0; + style_res->line_height.value = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL * 100.0; + } + } else { + // Same units. + if (lineheight_unit_prev != -1) { + style_res->line_height.unit = lineheight_unit_prev; + } else { + // No text object... use default. + style_res->line_height.unit = SP_CSS_UNIT_NONE; + style_res->line_height.computed = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; + style_res->line_height.value = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; + } + } if (texts > 1) { - if (different) { + if (different || different_lineheight) { return QUERY_STYLE_MULTIPLE_AVERAGED; } else { return QUERY_STYLE_MULTIPLE_SAME; diff --git a/src/style.cpp b/src/style.cpp index 35138d25b..1f98a50a3 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1510,7 +1510,8 @@ gchar const * sp_style_get_css_unit_string(int unit) { // specify px by default, see inkscape bug 1221626, mozilla bug 234789 - + // This is a problematic fix as some properties (e.g. 'line-height') have + // different behaviour if there is no unit. switch (unit) { case SP_CSS_UNIT_NONE: return "px"; diff --git a/src/svg/svg-length-test.h b/src/svg/svg-length-test.h index 0dac4854a..e73211ade 100644 --- a/src/svg/svg-length-test.h +++ b/src/svg/svg-length-test.h @@ -102,10 +102,7 @@ public: for ( int i = (static_cast(SVGLength::NONE) + 1); i <= static_cast(SVGLength::LAST_UNIT); i++ ) { SVGLength::Unit target = static_cast(i); // PX is a special case where we don't have a unit string - // FOOT and MITRE are not CSS/SVG Units - if ( (target != SVGLength::PX) && - (target != SVGLength::FOOT) && - (target != SVGLength::MITRE) ) { + if ( (target != SVGLength::PX) ) { gchar const* val = sp_svg_length_get_css_units(target); TSM_ASSERT_DIFFERS(i, val, ""); } diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp index cd995582d..d22da69cd 100644 --- a/src/svg/svg-length.cpp +++ b/src/svg/svg-length.cpp @@ -411,14 +411,6 @@ So after the number, the string does not necessarily have a \0 or a unit, it mig *computed = Inkscape::Util::Quantity::convert(v, "in", "px"); } break; - case UVAL('f','t'): - if (unit) { - *unit = SVGLength::FOOT; - } - if (computed) { - *computed = Inkscape::Util::Quantity::convert(v, "ft", "px"); - } - break; case UVAL('e','m'): if (unit) { *unit = SVGLength::EM; @@ -495,12 +487,6 @@ void SVGLength::set(SVGLength::Unit u, float v) case INCH: hack = "pt"; break; - case FOOT: - hack = "pt"; - break; - case MITRE: - hack = "m"; - break; default: break; } @@ -572,8 +558,6 @@ gchar const *sp_svg_length_get_css_units(SVGLength::Unit unit) case SVGLength::MM: return "mm"; case SVGLength::CM: return "cm"; case SVGLength::INCH: return "in"; - case SVGLength::FOOT: return ""; // Not in SVG/CSS specification. - case SVGLength::MITRE: return ""; // Not in SVG/CSS specification. case SVGLength::EM: return "em"; case SVGLength::EX: return "ex"; case SVGLength::PERCENT: return "%"; @@ -590,10 +574,6 @@ std::string sp_svg_length_write_with_units(SVGLength const &length) Inkscape::SVGOStringStream os; if (length.unit == SVGLength::PERCENT) { os << 100*length.value << sp_svg_length_get_css_units(length.unit); - } else if (length.unit == SVGLength::FOOT) { - os << 12*length.value << sp_svg_length_get_css_units(SVGLength::INCH); - } else if (length.unit == SVGLength::MITRE) { - os << 100*length.value << sp_svg_length_get_css_units(SVGLength::CM); } else { os << length.value << sp_svg_length_get_css_units(length.unit); } diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h index 2aaf248b1..bd3435ca6 100644 --- a/src/svg/svg-length.h +++ b/src/svg/svg-length.h @@ -27,8 +27,6 @@ public: MM, CM, INCH, - FOOT, - MITRE, EM, EX, PERCENT, diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index e906762e3..d56506d62 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -468,12 +468,8 @@ ZoomCorrRuler::on_draw(const Cairo::RefPtr& cr) { Glib::ustring abbr = prefs->getString("/options/zoomcorrection/unit"); if (abbr == "cm") { draw_marks(cr, 0.1, 10); - } else if (abbr == "ft") { - draw_marks(cr, 1/12.0, 12); } else if (abbr == "in") { draw_marks(cr, 0.25, 4); - } else if (abbr == "m") { - draw_marks(cr, 1/10.0, 10); } else if (abbr == "mm") { draw_marks(cr, 10, 10); } else if (abbr == "pc") { diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 5ca92b4c0..8df80d2b6 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -54,12 +54,18 @@ #include "ui/icon-names.h" #include "ui/tools/text-tool.h" #include "ui/tools/tool-base.h" +#include "ui/widget/unit-tracker.h" +#include "util/units.h" #include "verbs.h" #include "xml/repr.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; using Inkscape::UI::PrefPusher; +using Inkscape::Util::Unit; +using Inkscape::Util::Quantity; +using Inkscape::Util::unit_table; +using Inkscape::UI::Widget::UnitTracker; //#define DEBUG_TEXT @@ -510,25 +516,48 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) } g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); - // At the moment this handles only numerical values (i.e. no percent). + + // Get user selected unit and save as preference + UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); + Unit const *unit = tracker->getActiveUnit(); + g_return_if_fail(unit != NULL); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + + + // This nonsense is to get SP_CSS_UNIT_xx value corresponding to unit so + // we can save it (allows us to adjust line height value when unit changes). + SPILength temp_length; + Inkscape::CSSOStringStream temp_stream; + temp_stream << 1 << unit->abbr; + temp_length.read(temp_stream.str().c_str()); + prefs->setInt("/tools/text/lineheight/display_unit", temp_length.unit); + g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(temp_length.unit)); + + // Set css line height. SPCSSAttr *css = sp_repr_css_attr_new (); Inkscape::CSSOStringStream osfs; - osfs << gtk_adjustment_get_value(adj)*100 << "%"; + // We should handle unitless values as well as 'em' and 'ex' + if ((unit->abbr) == "em" || unit->abbr == "ex" || unit->abbr == "%") { + osfs << gtk_adjustment_get_value(adj) << unit->abbr; + } else { + // Inside SVG file, always use "px" for absolute units. + osfs << Quantity::convert(gtk_adjustment_get_value(adj), unit, "px") << "px"; + } sp_repr_css_set_property (css, "line-height", osfs.str().c_str()); + // Apply line-height to selected objects. SPDesktop *desktop = SP_ACTIVE_DESKTOP; sp_desktop_set_style (desktop, css, true, false); - // Until deprecated sodipodi:linespacing purged: + // Only need to save for undo if a text item has been changed. Inkscape::Selection *selection = desktop->getSelection(); bool modmade = false; std::vector itemlist=selection->itemList(); for(std::vector::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){ if (SP_IS_TEXT (*i)) { - (*i)->getRepr()->setAttribute("sodipodi:linespacing", sp_repr_css_property (css, "line-height", NULL)); modmade = true; } } @@ -554,6 +583,153 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } + +static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) +{ + // quit if run by the _changed callbacks + if (g_object_get_data(G_OBJECT(tbl), "freeze")) { + return; + } + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); + + // Get old saved unit + int old_unit = GPOINTER_TO_INT( g_object_get_data(tbl, "lineheight_unit")); + + // Get user selected unit and save as preference + UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); + Unit const *unit = tracker->getActiveUnit(); + g_return_if_fail(unit != NULL); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + + // This nonsense is to get SP_CSS_UNIT_xx value corresponding to unit. + SPILength temp_length; + Inkscape::CSSOStringStream temp_stream; + temp_stream << 1 << unit->abbr; + temp_length.read(temp_stream.str().c_str()); + prefs->setInt("/tools/text/lineheight/display_unit", temp_length.unit); + g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(temp_length.unit)); + + // Read current line height value + EgeAdjustmentAction *line_height_act = + reinterpret_cast(g_object_get_data(tbl, "TextLineHeightAction")); + GtkAdjustment *line_height_adj = ege_adjustment_action_get_adjustment( line_height_act ); + double line_height = gtk_adjustment_get_value(line_height_adj); + + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + Inkscape::Selection *selection = desktop->getSelection(); + std::vector itemlist=selection->itemList(); + + // Convert between units + if ((unit->abbr) == "em" && old_unit == SP_CSS_UNIT_EX) { + line_height *= 0.5; + } else if ((unit->abbr) == "ex" && old_unit == SP_CSS_UNIT_EM) { + line_height *= 2.0; + } else if ((unit->abbr) == "em" && old_unit == SP_CSS_UNIT_PERCENT) { + line_height /= 100.0; + } else if ((unit->abbr) == "%" && old_unit == SP_CSS_UNIT_EM) { + line_height *= 100; + } else if ((unit->abbr) == "ex" && old_unit == SP_CSS_UNIT_PERCENT) { + line_height /= 50.0; + } else if ((unit->abbr) == "%" && old_unit == SP_CSS_UNIT_EX) { + line_height *= 50; + } else if ((unit->abbr) == "%" || (unit->abbr) == "em" || (unit->abbr) == "ex") { + // Convert absolute to relative... for the moment use average font-size + double font_size = 0; + int count = 0; + for(std::vector::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){ + if (SP_IS_TEXT (*i)) { + font_size += (*i)->style->font_size.computed; + ++count; + } + } + if (count > 0) { + font_size /= count; + } else { + font_size = 20; + } + line_height = Quantity::convert(line_height, sp_style_get_css_unit_string(old_unit), "px"); + if (font_size > 0) { + line_height /= font_size; + } + if ((unit->abbr) == "%") { + line_height *= 100; + } else if ((unit->abbr) == "ex") { + line_height *= 2; + } + } else if (old_unit==SP_CSS_UNIT_PERCENT || old_unit==SP_CSS_UNIT_EM || old_unit==SP_CSS_UNIT_EX) { + // Convert relative to absolute... for the moment use average font-size + double font_size = 0; + int count = 0; + for(std::vector::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){ + if (SP_IS_TEXT (*i)) { + font_size += (*i)->style->font_size.computed; + ++count; + } + } + if (count > 0) { + font_size /= count; + } else { + font_size = 20; + } + line_height *= font_size; + if (old_unit == SP_CSS_UNIT_PERCENT) { + line_height /= 100.0; + } else if (old_unit == SP_CSS_UNIT_EX) { + line_height /= 2.0; + } + line_height = Quantity::convert(line_height, "px", unit); + } else { + // Convert between different absolute units (only used in GUI) + line_height = Quantity::convert(line_height, sp_style_get_css_unit_string(old_unit), unit); + } + + // Set css line height. + SPCSSAttr *css = sp_repr_css_attr_new (); + Inkscape::CSSOStringStream osfs; + // We should handle unitless values as well as 'em' and 'ex' + if ((unit->abbr) == "em" || unit->abbr == "ex" || unit->abbr == "%") { + osfs << line_height << unit->abbr; + } else { + osfs << Quantity::convert(line_height, unit, "px") << "px"; + } + sp_repr_css_set_property (css, "line-height", osfs.str().c_str()); + + // Update GUI with line_height value. + gtk_adjustment_set_value(line_height_adj, line_height); + + // Apply line-height to selected objects. + sp_desktop_set_style (desktop, css, true, false); + + // Only need to save for undo if a text item has been changed. + bool modmade = false; + for(std::vector::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){ + if (SP_IS_TEXT (*i)) { + modmade = true; + } + } + + // Save for undo + if(modmade) { + DocumentUndo::maybeDone(SP_ACTIVE_DESKTOP->getDocument(), "ttb:line-height", SP_VERB_NONE, + _("Text: Change line-height unit")); + } + + // If no selected objects, set default. + SPStyle query(SP_ACTIVE_DOCUMENT); + int result_numbers = + sp_desktop_query_style (SP_ACTIVE_DESKTOP, &query, QUERY_STYLE_PROPERTY_FONTNUMBERS); + if (result_numbers == QUERY_STYLE_NOTHING) + { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->mergeStyle("/tools/text/style", css); + } + + sp_repr_css_attr_unref (css); + + g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); +} + + static void sp_text_wordspacing_value_changed( GtkAdjustment *adj, GObject *tbl ) { // quit if run by the _changed callbacks @@ -1064,6 +1240,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ { activeButton = 3; } else { + // This should take 'direction' into account if (query.text_anchor.computed == SP_CSS_TEXT_ANCHOR_START) activeButton = 0; if (query.text_anchor.computed == SP_CSS_TEXT_ANCHOR_MIDDLE) activeButton = 1; if (query.text_anchor.computed == SP_CSS_TEXT_ANCHOR_END) activeButton = 2; @@ -1071,16 +1248,47 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ ege_select_one_action_set_active( textAlignAction, activeButton ); - // Line height (spacing) + // Line height (spacing) and line height unit double height; + int line_height_unit = -1; if (query.line_height.normal) { + std::cout << " normal" << std::endl; height = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; + line_height_unit = SP_CSS_UNIT_NONE; } else { - if (query.line_height.unit == SP_CSS_UNIT_PERCENT) { - height = query.line_height.value; - } else { - height = query.line_height.computed; - } + height = query.line_height.value; + line_height_unit = query.line_height.unit; + } + + switch (line_height_unit) { + case SP_CSS_UNIT_NONE: + // tracker can't show no unit... use 'em' + line_height_unit = SP_CSS_UNIT_EM; + case SP_CSS_UNIT_EM: + case SP_CSS_UNIT_EX: + break; + case SP_CSS_UNIT_PERCENT: + height *= 100.0; // Inkscape store % as fraction in .value + break; + case SP_CSS_UNIT_PX: + // If unit is set to 'px', use the preferred display unit (if absolute). + line_height_unit = + prefs->getInt("/tools/text/lineheight/display_unit", SP_CSS_UNIT_PT); + if (line_height_unit != SP_CSS_UNIT_EM && + line_height_unit != SP_CSS_UNIT_EX && + line_height_unit != SP_CSS_UNIT_PERCENT) { + height = + Quantity::convert(height, "px", sp_style_get_css_unit_string(line_height_unit)); + } else { + line_height_unit = SP_CSS_UNIT_PX; + } + break; + default: + // If unit has been set by an external program to something other than 'px', use + // that unit. But height is average of computed values (px) so we need to convert + // back. + height = + Quantity::convert(height, "px", sp_style_get_css_unit_string(line_height_unit)); } GtkAction* lineHeightAction = GTK_ACTION( g_object_get_data( tbl, "TextLineHeightAction" ) ); @@ -1088,7 +1296,11 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ ege_adjustment_action_get_adjustment(EGE_ADJUSTMENT_ACTION( lineHeightAction )); gtk_adjustment_set_value( lineHeightAdjustment, height ); - + UnitTracker* tracker = reinterpret_cast( g_object_get_data( tbl, "tracker" ) ); + tracker->setActiveUnitByAbbr(sp_style_get_css_unit_string(line_height_unit)); + // Save unit so we can do convertions between new/old units. + g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(line_height_unit)); + // Word spacing double wordSpacing; if (query.word_spacing.normal) wordSpacing = 0.0; @@ -1231,7 +1443,6 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ #endif g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); - } static void sp_text_toolbox_selection_modified(Inkscape::Selection *selection, guint /*flags*/, GObject *tbl) @@ -1582,6 +1793,15 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_text_orientation_changed), holder ); } + /* Line height unit tracker */ + UnitTracker* tracker = new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR); + tracker->addUnit(unit_table.getUnit("%")); + tracker->addUnit(unit_table.getUnit("em")); + tracker->addUnit(unit_table.getUnit("ex")); + // tracker->addUnit(unit_table.getUnit("None")); + tracker->setActiveUnit(unit_table.getUnit("%")); + g_object_set_data( holder, "tracker", tracker ); + /* Line height */ { // Drop down menu @@ -1599,20 +1819,28 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje holder, /* dataKludge */ FALSE, /* set alt-x keyboard shortcut? */ NULL, /* altx_mark */ - 0.0, 10.0, 0.01, 0.10, /* lower, upper, step (arrow up/down), page up/down */ + 0.0, 1000.0, 1.0, 10.0, /* lower, upper, step (arrow up/down), page up/down */ labels, values, G_N_ELEMENTS(labels), /* drop down menu */ sp_text_lineheight_value_changed, /* callback */ - NULL, /* unit tracker */ + NULL, // tracker, /* unit tracker */ 0.1, /* step (used?) */ 2, /* digits to show */ 1.0 /* factor (multiplies default) */ ); + //tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) ); gtk_action_group_add_action( mainActions, GTK_ACTION(eact) ); gtk_action_set_sensitive( GTK_ACTION(eact), TRUE ); g_object_set_data( holder, "TextLineHeightAction", eact ); g_object_set( G_OBJECT(eact), "iconId", "text_line_spacing", NULL ); } + /* Line height units */ + { + GtkAction* act = tracker->createAction( "TextLineHeightUnitsAction", _("Units"), ("") ); + gtk_action_group_add_action( mainActions, act ); + g_signal_connect_after( G_OBJECT(act), "changed", G_CALLBACK(sp_text_lineheight_unit_changed), holder ); + } + /* Word spacing */ { // Drop down menu diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 72537f727..705c16d1f 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -515,6 +515,7 @@ static gchar const * ui_descr = " " " " " " + " " " " " " " " -- cgit v1.2.3 From 35acdcff45adf06faf74f4f09a9b428aebd1c591 Mon Sep 17 00:00:00 2001 From: Martin Owens <> Date: Tue, 22 Mar 2016 19:56:20 +0100 Subject: Code cleanup. Removal of rogue copy of "create_adjustment_action". (bzr r14736) --- src/widgets/select-toolbar.cpp | 160 ++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 84 deletions(-) diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index e49c4c00a..9851b0606 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -136,13 +136,13 @@ sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection * } static void -sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) +sp_object_layout_any_value_changed(GtkAdjustment *adj, GObject *tbl) { - if (g_object_get_data(G_OBJECT(spw), "update")) { + if (g_object_get_data(tbl, "update")) { return; } - UnitTracker *tracker = reinterpret_cast(g_object_get_data(G_OBJECT(spw), "tracker")); + UnitTracker *tracker = reinterpret_cast(g_object_get_data(tbl, "tracker")); if ( !tracker || tracker->isUpdating() ) { /* * When only units are being changed, don't treat changes @@ -150,7 +150,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) */ return; } - g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(TRUE)); + g_object_set_data(tbl, "update", GINT_TO_POINTER(TRUE)); SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::Selection *selection = desktop->getSelection(); @@ -168,7 +168,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) Geom::OptRect bbox_user = selection->bounds(bbox_type); if ( !bbox_user ) { - g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); + g_object_set_data(tbl, "update", GINT_TO_POINTER(FALSE)); return; } @@ -181,10 +181,10 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) Unit const *unit = tracker->getActiveUnit(); g_return_if_fail(unit != NULL); - GtkAdjustment* a_x = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "X" ) ); - GtkAdjustment* a_y = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "Y" ) ); - GtkAdjustment* a_w = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "width" ) ); - GtkAdjustment* a_h = GTK_ADJUSTMENT( g_object_get_data( G_OBJECT(spw), "height" ) ); + GtkAdjustment* a_x = GTK_ADJUSTMENT( g_object_get_data( tbl, "X" ) ); + GtkAdjustment* a_y = GTK_ADJUSTMENT( g_object_get_data( tbl, "Y" ) ); + GtkAdjustment* a_w = GTK_ADJUSTMENT( g_object_get_data( tbl, "width" ) ); + GtkAdjustment* a_h = GTK_ADJUSTMENT( g_object_get_data( tbl, "height" ) ); if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) { x0 = Quantity::convert(gtk_adjustment_get_value(a_x), unit, "px"); @@ -205,7 +205,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) } // Keep proportions if lock is on - GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(G_OBJECT(spw), "lock") ); + GtkToggleAction *lock = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "lock") ); if ( gtk_toggle_action_get_active(lock) ) { if (adj == a_h) { x1 = x0 + yrel * bbox_user->dimensions()[Geom::X]; @@ -265,68 +265,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) desktop->getCanvas()->endForcedFullRedraws(); } - g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); -} - -static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker ) -{ -#if WITH_GTKMM_3_0 - Glib::RefPtr adj = Glib::wrap(adjustment, true); - Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(adj, climbRate, digits); -#else - Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(*Glib::wrap(adjustment, true), climbRate, digits); -#endif - inkSpinner->addUnitTracker(unit_tracker); - inkSpinner = Gtk::manage( inkSpinner ); - GtkWidget *widget = GTK_WIDGET( inkSpinner->gobj() ); - return widget; -} - -// TODO create_adjustment_action appears to be a rogue tile copy from toolbox.cpp. Resolve it to be unified: - -static EgeAdjustmentAction * create_adjustment_action( gchar const *name, - gchar const *label, - gchar const *shortLabel, - gchar const *data, - gdouble lower, - GtkWidget* focusTarget, - UnitTracker* tracker, - GtkWidget* spw, - gchar const *tooltip, - gboolean altx ) -{ - static bool init = false; - if ( !init ) { - init = true; - ege_adjustment_action_set_compact_tool_factory( createCustomSlider ); - } - - GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0.0, lower, 1e6, SPIN_STEP, SPIN_PAGE_STEP, 0 ) ); - if (tracker) { - tracker->addAdjustment(adj); - } - if ( spw ) { - g_object_set_data( G_OBJECT(spw), data, adj ); - } - - EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, Q_(label), tooltip, 0, SPIN_STEP, 3, tracker ); - if ( shortLabel ) { - g_object_set( act, "short_label", Q_(shortLabel), NULL ); - } - - g_signal_connect( G_OBJECT(adj), "value_changed", G_CALLBACK(sp_object_layout_any_value_changed), spw ); - if ( focusTarget ) { - ege_adjustment_action_set_focuswidget( act, focusTarget ); - } - - if ( altx ) { // this spinbutton will be activated by alt-x - g_object_set( G_OBJECT(act), "self-id", "altx", NULL ); - } - - // Using a cast just to make sure we pass in the right kind of function pointer - g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); - - return act; + g_object_set_data(tbl, "update", GINT_TO_POINTER(FALSE)); } // toggle button callbacks and updaters @@ -497,21 +436,60 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb // four spinbuttons - eact = create_adjustment_action( "XAction", C_("Select toolbar", "X position"), C_("Select toolbar", "X:"), "X", - -1e6, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Horizontal coordinate of selection"), TRUE ); + eact = create_adjustment_action( + "XAction", /* name */ + C_("Select toolbar", "X position"), /* label */ + C_("Select toolbar", "X:"), /* shortLabel */ + C_("Select toolbar", "Horizontal coordinate of selection"), /* tooltip */ + "/tools/select/X", /* path */ + 0.0, /* def(default) */ + GTK_WIDGET(desktop->canvas), /* focusTarget */ + G_OBJECT(spw), /* dataKludge */ + TRUE, "altx", /* altx, altx_mark */ + -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, uppper, step, page */ + 0, 0, 0, /* descrLabels, descrValues, descrCount */ + sp_object_layout_any_value_changed, /* callback */ + tracker, /* unit_tracker */ + SPIN_STEP, 3, 1); /* climb, digits, factor */ + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); - eact = create_adjustment_action( "YAction", C_("Select toolbar", "Y position"), C_("Select toolbar", "Y:"), "Y", - -1e6, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Vertical coordinate of selection"), FALSE ); + eact = create_adjustment_action( + "YAction", /* name */ + C_("Select toolbar", "Y position"), /* label */ + C_("Select toolbar", "Y:"), /* shortLabel */ + C_("Select toolbar", "Vertical coordinate of selection"), /* tooltip */ + "/tools/select/Y", /* path */ + 0.0, /* def(default) */ + GTK_WIDGET(desktop->canvas), /* focusTarget */ + G_OBJECT(spw), /* dataKludge */ + TRUE, "altx", /* altx, altx_mark */ + -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, uppper, step, page */ + 0, 0, 0, /* descrLabels, descrValues, descrCount */ + sp_object_layout_any_value_changed, /* callback */ + tracker, /* unit_tracker */ + SPIN_STEP, 3, 1); /* climb, digits, factor */ + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); - eact = create_adjustment_action( "WidthAction", C_("Select toolbar", "Width"), C_("Select toolbar", "W:"), "width", - 0.0, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Width of selection"), FALSE ); + eact = create_adjustment_action( + "WidthAction", /* name */ + C_("Select toolbar", "Width"), /* label */ + C_("Select toolbar", "W:"), /* shortLabel */ + C_("Select toolbar", "Width of selection"), /* tooltip */ + "/tools/select/width", /* path */ + 0.0, /* def(default) */ + GTK_WIDGET(desktop->canvas), /* focusTarget */ + G_OBJECT(spw), /* dataKludge */ + TRUE, "altx", /* altx, altx_mark */ + 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, uppper, step, page */ + 0, 0, 0, /* descrLabels, descrValues, descrCount */ + sp_object_layout_any_value_changed, /* callback */ + tracker, /* unit_tracker */ + SPIN_STEP, 3, 1); /* climb, digits, factor */ + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); @@ -528,9 +506,23 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb gtk_action_group_add_action( mainActions, GTK_ACTION(itact) ); } - eact = create_adjustment_action( "HeightAction", C_("Select toolbar", "Height"), C_("Select toolbar", "H:"), "height", - 0.0, GTK_WIDGET(desktop->canvas), tracker, spw, - _("Height of selection"), FALSE ); + eact = create_adjustment_action( + "HeightAction", /* name */ + C_("Select toolbar", "Height"), /* label */ + C_("Select toolbar", "H:"), /* shortLabel */ + C_("Select toolbar", "Height of selection"), /* tooltip */ + "/tools/select/height", /* path */ + 0.0, /* def(default) */ + GTK_WIDGET(desktop->canvas), /* focusTarget */ + G_OBJECT(spw), /* dataKludge */ + TRUE, "altx", /* altx, altx_mark */ + 0.0, 1e6, SPIN_STEP, SPIN_PAGE_STEP, /* lower, uppper, step, page */ + 0, 0, 0, /* descrLabels, descrValues, descrCount */ + sp_object_layout_any_value_changed, /* callback */ + tracker, /* unit_tracker */ + SPIN_STEP, 3, 1); /* climb, digits, factor */ + + gtk_action_group_add_action( selectionActions, GTK_ACTION(eact) ); contextActions->push_back( GTK_ACTION(eact) ); -- cgit v1.2.3 From 41751706dc695123b53136bd4fe3d069f5321337 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 22 Mar 2016 15:10:16 -0400 Subject: Add prependUnit function (bzr r14737) --- src/ui/widget/unit-tracker.cpp | 10 ++++++++++ src/ui/widget/unit-tracker.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp index c6318db25..a1501c229 100644 --- a/src/ui/widget/unit-tracker.cpp +++ b/src/ui/widget/unit-tracker.cpp @@ -12,6 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include "style-internal.h" #include "unit-tracker.h" #include "widgets/ege-select-one-action.h" @@ -121,6 +122,15 @@ void UnitTracker::addUnit(Inkscape::Util::Unit const *u) gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1); } +void UnitTracker::prependUnit(Inkscape::Util::Unit const *u) +{ + GtkTreeIter iter; + gtk_list_store_prepend(_store, &iter); + gtk_list_store_set(_store, &iter, COLUMN_STRING, u ? u->abbr.c_str() : "NULL", -1); + /* Re-shuffle our default selection here (_active gets out of sync) */ + setActiveUnit(_activeUnit); +} + void UnitTracker::setFullVal(GtkAdjustment *adj, gdouble val) { _priorValues[adj] = val; diff --git a/src/ui/widget/unit-tracker.h b/src/ui/widget/unit-tracker.h index 06245930e..8fa9ff304 100644 --- a/src/ui/widget/unit-tracker.h +++ b/src/ui/widget/unit-tracker.h @@ -43,6 +43,7 @@ public: void addUnit(Inkscape::Util::Unit const *u); void addAdjustment(GtkAdjustment *adj); + void prependUnit(Inkscape::Util::Unit const *u); void setFullVal(GtkAdjustment *adj, gdouble val); GtkAction *createAction(gchar const *name, gchar const *label, gchar const *tooltip); -- cgit v1.2.3 From 66aeeb4707125e2d45ba460f84edfc6516773d7f Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 22 Mar 2016 15:10:37 -0400 Subject: Make sure adjustment is attached to spin button (bzr r14738) --- src/widgets/toolbox.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 705c16d1f..3389f82f9 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -55,6 +55,7 @@ #include "ui/tools-switch.h" #include "../ui/icon-names.h" #include "../ui/widget/style-swatch.h" +#include "../ui/widget/unit-tracker.h" #include "../verbs.h" #include "../widgets/button.h" #include "../widgets/spinbutton-events.h" @@ -1123,6 +1124,10 @@ EgeAdjustmentAction * create_adjustment_action( gchar const *name, g_object_set_data( dataKludge, prefs->getEntry(path).getEntryName().data(), adj ); } + if (unit_tracker) { + unit_tracker->addAdjustment(adj); + } + // Using a cast just to make sure we pass in the right kind of function pointer g_object_set( G_OBJECT(act), "tool-post", static_cast(sp_set_font_size_smaller), NULL ); -- cgit v1.2.3 From c7d0b04c70397faadf0131ab5d846068f44d5062 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 22 Mar 2016 15:17:52 -0400 Subject: Un-revert: Allow Unit object to do conversions, pipe Quality class method via that. (bzr r14739) --- src/util/units.cpp | 37 +++++++++++++++++++++++++------------ src/util/units.h | 5 +++++ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/util/units.cpp b/src/util/units.cpp index 2c72ec3ae..cf4bfd146 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -231,6 +231,30 @@ int Unit::svgUnit() const return 0; } +double Unit::convert(double from_dist, Unit const *to) const +{ + // Percentage + if (to->type == UNIT_TYPE_DIMENSIONLESS) { + return from_dist * to->factor; + } + + // Incompatible units + if (type != to->type) { + return -1; + } + + // Compatible units + return from_dist * factor / to->factor; +} +double Unit::convert(double from_dist, Glib::ustring const &to) const +{ + return convert(from_dist, unit_table.getUnit(to)); +} +double Unit::convert(double from_dist, char const *to) const +{ + return convert(from_dist, unit_table.getUnit(to)); +} + Unit UnitTable::_empty_unit; @@ -505,18 +529,7 @@ Glib::ustring Quantity::string() const { double Quantity::convert(double from_dist, Unit const *from, Unit const *to) { - // Percentage - if (to->type == UNIT_TYPE_DIMENSIONLESS) { - return from_dist * to->factor; - } - - // Incompatible units - if (from->type != to->type) { - return -1; - } - - // Compatible units - return from_dist * from->factor / to->factor; + return from->convert(from_dist, to); } double Quantity::convert(double from_dist, Glib::ustring const &from, Unit const *to) { diff --git a/src/util/units.h b/src/util/units.h index 13777fd1b..fa70058ba 100644 --- a/src/util/units.h +++ b/src/util/units.h @@ -75,6 +75,11 @@ public: /** Get SVG unit code. */ int svgUnit() const; + + /** Convert value from this unit **/ + double convert(double from_dist, Unit const *to) const; + double convert(double from_dist, Glib::ustring const &to) const; + double convert(double from_dist, char const *to) const; }; class Quantity -- cgit v1.2.3 From 3de7e5dc56d38f9f52575f8ed47334d68e6223ad Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 24 Mar 2016 02:25:49 +0100 Subject: "Backport" some Krzysztof review parts of mirror symmetry LPE also hapens on rotate copies LPE (bzr r14740) --- src/live_effects/lpe-copy_rotate.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp index d2dd437cb..efea76039 100644 --- a/src/live_effects/lpe-copy_rotate.cpp +++ b/src/live_effects/lpe-copy_rotate.cpp @@ -44,14 +44,6 @@ public: } // namespace CR -int -pointSideOfLine(Geom::Point const &A, Geom::Point const &B, Geom::Point const &X) -{ - //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (B[Geom::X]-A[Geom::X])*(X[Geom::Y]-A[Geom::Y]) - (B[Geom::Y]-A[Geom::Y])*(X[Geom::X]-A[Geom::X]); - return (pos < 0) ? -1 : (pos > 0); -} - bool pointInTriangle(Geom::Point const &p, Geom::Point const &p1, Geom::Point const &p2, Geom::Point const &p3) { @@ -188,7 +180,7 @@ LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) Geom::Path portion_original = original.portion(time_start,time_end); if (!portion_original.empty()) { Geom::Point side_checker = portion_original.pointAt(0.0001); - position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), side_checker); + position = Geom::sgn(Geom::cross(divider[1].finalPoint() - divider[0].finalPoint(), side_checker - divider[0].finalPoint())); if (rotation_angle != 180) { position = pointInTriangle(side_checker, divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } @@ -199,7 +191,7 @@ LPECopyRotate::split(Geom::PathVector &path_on, Geom::Path const ÷r) time_start = time_end; } } - position = pointSideOfLine(divider[0].finalPoint(), divider[1].finalPoint(), original.finalPoint()); + position = Geom::sgn(Geom::cross(divider[1].finalPoint() - divider[0].finalPoint(), original.finalPoint() - divider[0].finalPoint())); if (rotation_angle != 180) { position = pointInTriangle(original.finalPoint(), divider.initialPoint(), divider[0].finalPoint(), divider[1].finalPoint()); } @@ -246,13 +238,13 @@ LPECopyRotate::setFusion(Geom::PathVector &path_on, Geom::Path divider, double s if (i%2 != 0) { Geom::Point A = (Geom::Point)origin; Geom::Point B = origin + dir * Geom::Rotate(-Geom::rad_from_deg((rotation_angle*i)+starting_angle)) * size_divider; - Geom::Affine m1(1.0, 0.0, 0.0, 1.0, A[0], A[1]); + Geom::Translate m1(A[0], A[1]); double hyp = Geom::distance(A, B); double c = (B[0] - A[0]) / hyp; // cos(alpha) double s = (B[1] - A[1]) / hyp; // sin(alpha) Geom::Affine m2(c, -s, s, c, 0.0, 0.0); - Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); + Geom::Scale sca(1.0, -1.0); Geom::Affine tmp_m = m1.inverse() * m2; m = tmp_m; -- cgit v1.2.3 From 13783613a9af3770294713af80a8e17b51089266 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 24 Mar 2016 02:27:33 +0100 Subject: Fixing Krzysztof review (bzr r13682.1.36) --- src/live_effects/lpe-mirror_symmetry.cpp | 66 +++++++++++++++----------------- src/live_effects/lpe-mirror_symmetry.h | 1 - 2 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index d25225797..60ad13fc8 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -83,23 +83,28 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) Point point_a(boundingbox_X.max(), boundingbox_Y.min()); Point point_b(boundingbox_X.max(), boundingbox_Y.max()); Point point_c(boundingbox_X.max(), boundingbox_Y.middle()); - if(mode == MT_Y) { + if (mode == MT_Y) { point_a = Geom::Point(boundingbox_X.min(),center[Y]); point_b = Geom::Point(boundingbox_X.max(),center[Y]); } - if(mode == MT_X) { + if (mode == MT_X) { point_a = Geom::Point(center[X],boundingbox_Y.min()); point_b = Geom::Point(center[X],boundingbox_Y.max()); } - if( mode == MT_X || mode == MT_Y ) { + if ( mode == MT_X || mode == MT_Y ) { Geom::Path path; path.start( point_a ); path.appendNew( point_b ); reflection_line.set_new_value(path.toPwSb(), true); line_separation.setPoints(point_a, point_b); center.param_setValue(path.pointAt(0.5), true); - } else if( mode == MT_FREE) { + } else if ( mode == MT_FREE) { Geom::PathVector line_m(reflection_line.get_pathvector()); + Geom::Line line_symm; + line_symm->setPoints(line_m->initialPoint(), line_m->finalPoint()); + Geom::GenericRect bbox(boundingbox_X.min(), boundingbox_Y.min(), boundingbox_X.max(), boundingbox_Y.max()); + line_m[0].initialPoint = bbox->nearestEdgePoint(line_m->initialPoint()); + line_m[0].finalPoint = bbox->nearestEdgePoint(line_m->finalPoint()) if(!are_near(previous_center,center, 0.01)) { Geom::Point trans = center - line_m[0].pointAt(0.5); line_m[0] *= Geom::Affine(1,0,0,1,trans[X],trans[Y]); @@ -111,6 +116,7 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) center.param_setValue(line_m[0].pointAt(0.5), true); point_a = line_m[0].initialPoint(); point_b = line_m[0].finalPoint(); + reflection_line.set_new_value(line_m[0].toPwSb(), true); line_separation.setPoints(point_a, point_b); } previous_center = center; @@ -138,52 +144,42 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) previous_center = center; } -int -LPEMirrorSymmetry::pointSideOfLine(Geom::Point point_a, Geom::Point point_b, Geom::Point point_x) -{ - //http://stackoverflow.com/questions/1560492/how-to-tell-whether-a-point-is-to-the-right-or-left-side-of-a-line - double pos = (point_b[Geom::X]-point_a[Geom::X])*(point_x[Geom::Y]-point_a[Geom::Y]) - (point_b[Geom::Y]-point_a[Geom::Y])*(point_x[Geom::X]-point_a[Geom::X]); - return (pos < 0) ? -1 : (pos > 0); -} Geom::PathVector LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) { // Don't allow empty path parameter: - if ( reflection_line.get_pathvector().empty() ) { + Geom::PathVector line_m(reflection_line.get_pathvector()); + if ( line_m.empty() ) { return path_in; } Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); Geom::PathVector path_out; - Geom::Path line_m_expanded; - Geom::Point line_start = line_separation.pointAt(-100000.0); - Geom::Point line_end = line_separation.pointAt(100000.0); - line_m_expanded.start( line_start); - line_m_expanded.appendNew( line_end); - + if (!discard_orig_path && !fuse_paths) { path_out = path_in; } - Geom::Point point_a(line_start); - Geom::Point point_b(line_end); + Geom::Point point_a(line_separation.initialPoint()); + Geom::Point point_b(line_separation.finalPoint()); - Geom::Affine m1(1.0, 0.0, 0.0, 1.0, point_a[0], point_a[1]); + Geom::Translate m1(point_a[0], point_a[1]); double hyp = Geom::distance(point_a, point_b); double c = (point_b[0] - point_a[0]) / hyp; // cos(alpha) double s = (point_b[1] - point_a[1]) / hyp; // sin(alpha) Geom::Affine m2(c, -s, s, c, 0.0, 0.0); - Geom::Affine sca(1.0, 0.0, 0.0, -1.0, 0.0, 0.0); + Geom::Scale sca(1.0, -1.0); Geom::Affine m = m1.inverse() * m2; m = m * sca; m = m * m2.inverse(); m = m * m1; - if(fuse_paths && !discard_orig_path) { + if (fuse_paths && !discard_orig_path) { for (Geom::PathVector::const_iterator path_it = original_pathv.begin(); - path_it != original_pathv.end(); ++path_it) { + path_it != original_pathv.end(); ++path_it) + { if (path_it->empty()) { continue; } @@ -197,22 +193,22 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) end_open = true; } } - Geom::Path original = (Geom::Path)(*path_it); - if(end_open && path_it->closed()) { + Geom::Path original = path_it; + if (end_open && path_it->closed()) { original.close(false); original.appendNew( original.initialPoint() ); original.close(true); } - Geom::Crossings cs = crossings(original, line_m_expanded); - for(unsigned int i = 0; i < cs.size(); i++) { + Geom::Crossings cs = crossings(original, line_m); + for (unsigned int i = 0; i < cs.size(); i++) { double timeEnd = cs[i].ta; Geom::Path portion = original.portion(time_start, timeEnd); Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = pointSideOfLine(line_start, line_end, middle); - if(oposite_fuse) { + position = Geom::sgn(Geom::cross(point_b - point_a, middle - point_a)); + if (oposite_fuse) { position *= -1; } - if(position == 1) { + if (position == 1) { Geom::Path mirror = portion.reversed() * m; mirror.setInitial(portion.finalPoint()); portion.append(mirror); @@ -225,11 +221,11 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) portion.clear(); time_start = timeEnd; } - position = pointSideOfLine(line_start, line_end, original.finalPoint()); - if(oposite_fuse) { + position = position = Geom::sgn(Geom::cross(point_b - point_a, original.finalPoint() - point_a )); + if (oposite_fuse) { position *= -1; } - if(cs.size()!=0 && position == 1) { + if (cs.size()!=0 && position == 1) { Geom::Path portion = original.portion(time_start, original.size()); portion = portion.reversed(); Geom::Path mirror = portion.reversed() * m; @@ -250,7 +246,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) } portion.clear(); } - if(cs.size() == 0 && position == 1) { + if (cs.size() == 0 && position == 1) { temp_path.push_back(original); temp_path.push_back(original * m); } diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index f4e4678a7..cd6f2a0ce 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -44,7 +44,6 @@ public: virtual ~LPEMirrorSymmetry(); virtual void doOnApply (SPLPEItem const* lpeitem); virtual void doBeforeEffect (SPLPEItem const* lpeitem); - virtual int pointSideOfLine(Geom::Point A, Geom::Point B, Geom::Point X); virtual Geom::PathVector doEffect_path (Geom::PathVector const & path_in); /* the knotholder entity classes must be declared friends */ friend class MS::KnotHolderEntityCenterMirrorSymmetry; -- cgit v1.2.3 From f72d5b89423864be61cf0399f6177986fc7ccd3b Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 24 Mar 2016 18:37:34 +0100 Subject: Fixes and added horizontal and vertical page mode (bzr r13682.1.38) --- src/live_effects/lpe-mirror_symmetry.cpp | 255 +++++++++++++++++++------------ src/live_effects/lpe-mirror_symmetry.h | 7 +- 2 files changed, 159 insertions(+), 103 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 60ad13fc8..9a2a54a13 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -27,11 +27,14 @@ #include <2geom/affine.h> #include "knot-holder-entity.h" #include "knotholder.h" +#include "inkscape.h" namespace Inkscape { namespace LivePathEffect { static const Util::EnumData ModeTypeData[MT_END] = { + { MT_V, N_("Vertical Page Center"), "Vertical Page Center, use select tool to move item instead line" }, + { MT_H, N_("Horizontal Page Center"), "Horizontal Page Center, use select tool to move item instead line" }, { MT_FREE, N_("Free from reflection line"), "Free from path" }, { MT_X, N_("X from middle knot"), "X from middle knot" }, { MT_Y, N_("Y from middle knot"), "Y from middle knot" } @@ -48,24 +51,38 @@ public: virtual Geom::Point knot_get() const; }; +class KnotHolderEntityStartMirrorSymmetry : public LPEKnotHolderEntity { +public: + KnotHolderEntityStartMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect){}; + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); + virtual Geom::Point knot_get() const; +}; + +class KnotHolderEntityEndMirrorSymmetry : public LPEKnotHolderEntity { +public: + KnotHolderEntityEndMirrorSymmetry(LPEMirrorSymmetry *effect) : LPEKnotHolderEntity(effect){}; + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); + virtual Geom::Point knot_get() const; +}; + } // namespace MS LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : Effect(lpeobject), mode(_("Mode"), _("Symmetry move mode"), "mode", MTConverter, &wr, this, MT_FREE), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), - fuse_paths(_("Fuse paths"), _("Fuse original and the reflection into a single path"), "fuse_paths", &wr, this, true), + fuse_paths(_("Fuse paths"), _("Fuse original and the reflection into a single path"), "fuse_paths", &wr, this, false), oposite_fuse(_("Oposite fuse"), _("Picks the other side of the mirror as the original"), "oposite_fuse", &wr, this, false), - reflection_line(_("Axis of reflection:"), _("Line which serves as 'mirror' for the reflection"), "reflection_line", &wr, this, "M0,0 L1,0"), - center(_("Center of mirroring"), _("Center of the mirror"), "center", &wr, this, "Adjust the center of mirroring") + start_point(_("Start mirror line"), _("Start mirror line"), "start_point", &wr, this, "Adjust the start of mirroring"), + end_point(_("End mirror line"), _("End mirror line"), "end_point", &wr, this, "Adjust end of mirroring") { show_orig_path = true; registerParameter(&mode); registerParameter( &discard_orig_path); registerParameter( &fuse_paths); registerParameter( &oposite_fuse); - registerParameter( &reflection_line); - registerParameter( ¢er); + registerParameter( &start_point); + registerParameter( &end_point); apply_to_clippath_and_mask = true; } @@ -79,51 +96,60 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) { using namespace Geom; - SPLPEItem * item = const_cast(lpeitem); Point point_a(boundingbox_X.max(), boundingbox_Y.min()); Point point_b(boundingbox_X.max(), boundingbox_Y.max()); Point point_c(boundingbox_X.max(), boundingbox_Y.middle()); if (mode == MT_Y) { - point_a = Geom::Point(boundingbox_X.min(),center[Y]); - point_b = Geom::Point(boundingbox_X.max(),center[Y]); + point_a = Geom::Point(boundingbox_X.min(),center_point[Y]); + point_b = Geom::Point(boundingbox_X.max(),center_point[Y]); } if (mode == MT_X) { - point_a = Geom::Point(center[X],boundingbox_Y.min()); - point_b = Geom::Point(center[X],boundingbox_Y.max()); + point_a = Geom::Point(center_point[X],boundingbox_Y.min()); + point_b = Geom::Point(center_point[X],boundingbox_Y.max()); } + line_separation.setPoints(point_a, point_b); if ( mode == MT_X || mode == MT_Y ) { - Geom::Path path; - path.start( point_a ); - path.appendNew( point_b ); - reflection_line.set_new_value(path.toPwSb(), true); - line_separation.setPoints(point_a, point_b); - center.param_setValue(path.pointAt(0.5), true); + start_point.param_setValue(point_a); + end_point.param_setValue(point_b); + center_point = Geom::middle_point(point_a, point_b); } else if ( mode == MT_FREE) { - Geom::PathVector line_m(reflection_line.get_pathvector()); - Geom::Line line_symm; - line_symm->setPoints(line_m->initialPoint(), line_m->finalPoint()); - Geom::GenericRect bbox(boundingbox_X.min(), boundingbox_Y.min(), boundingbox_X.max(), boundingbox_Y.max()); - line_m[0].initialPoint = bbox->nearestEdgePoint(line_m->initialPoint()); - line_m[0].finalPoint = bbox->nearestEdgePoint(line_m->finalPoint()) - if(!are_near(previous_center,center, 0.01)) { - Geom::Point trans = center - line_m[0].pointAt(0.5); - line_m[0] *= Geom::Affine(1,0,0,1,trans[X],trans[Y]); - point_a = line_m[0].initialPoint(); - point_b = line_m[0].finalPoint(); - reflection_line.set_new_value(line_m[0].toPwSb(), true); - line_separation.setPoints(point_a, point_b); + if(!are_near(previous_center,center_point, 0.01)) { + Geom::Point trans = center_point - previous_center; + start_point.param_setValue(start_point * trans); + end_point.param_setValue(end_point * trans); + line_separation.setPoints(start_point, end_point); } else { - center.param_setValue(line_m[0].pointAt(0.5), true); - point_a = line_m[0].initialPoint(); - point_b = line_m[0].finalPoint(); - reflection_line.set_new_value(line_m[0].toPwSb(), true); - line_separation.setPoints(point_a, point_b); + center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); + line_separation.setPoints(start_point, end_point); + } + } else if ( mode == MT_V){ + if(SP_ACTIVE_DESKTOP){ + SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument(); + Geom::Rect view_box_rect = doc->getViewBox(); + Geom::Point sp = Geom::Point(view_box_rect.width()/2.0, 0); + sp *= lpeitem->transform.inverse(); + start_point.param_setValue(sp); + Geom::Point ep = Geom::Point(view_box_rect.width()/2.0, view_box_rect.height()); + ep *= lpeitem->transform.inverse(); + end_point.param_setValue(ep); + center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); + line_separation.setPoints(start_point, end_point); + } + } else { //horizontal page + if(SP_ACTIVE_DESKTOP){ + SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument(); + Geom::Rect view_box_rect = doc->getViewBox(); + Geom::Point sp = Geom::Point(0, view_box_rect.height()/2.0); + sp *= lpeitem->transform.inverse(); + start_point.param_setValue(sp); + Geom::Point ep = Geom::Point(view_box_rect.width(), view_box_rect.height()/2.0); + ep *= lpeitem->transform.inverse(); + end_point.param_setValue(ep); + center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); + line_separation.setPoints(start_point, end_point); } - previous_center = center; } - - item->apply_to_clippath(item); - item->apply_to_mask(item); + previous_center = center_point; } void @@ -136,23 +162,18 @@ LPEMirrorSymmetry::doOnApply (SPLPEItem const* lpeitem) Point point_a(boundingbox_X.max(), boundingbox_Y.min()); Point point_b(boundingbox_X.max(), boundingbox_Y.max()); Point point_c(boundingbox_X.max(), boundingbox_Y.middle()); - Geom::Path path; - path.start( point_a ); - path.appendNew( point_b ); - reflection_line.set_new_value(path.toPwSb(), true); - center.param_setValue(point_c); - previous_center = center; + start_point.param_setValue(point_a); + start_point.param_update_default(point_a); + end_point.param_setValue(point_b); + end_point.param_update_default(point_b); + center_point = point_c; + previous_center = center_point; } Geom::PathVector LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) { - // Don't allow empty path parameter: - Geom::PathVector line_m(reflection_line.get_pathvector()); - if ( line_m.empty() ) { - return path_in; - } Geom::PathVector const original_pathv = pathv_to_linear_and_cubic_beziers(path_in); Geom::PathVector path_out; @@ -183,7 +204,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) if (path_it->empty()) { continue; } - Geom::PathVector temp_path; + Geom::PathVector tmp_path; double time_start = 0.0; int position = 0; bool end_open = false; @@ -193,65 +214,88 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) end_open = true; } } - Geom::Path original = path_it; + Geom::Path original = *path_it; if (end_open && path_it->closed()) { original.close(false); original.appendNew( original.initialPoint() ); original.close(true); } - Geom::Crossings cs = crossings(original, line_m); - for (unsigned int i = 0; i < cs.size(); i++) { - double timeEnd = cs[i].ta; - Geom::Path portion = original.portion(time_start, timeEnd); - Geom::Point middle = portion.pointAt((double)portion.size()/2.0); - position = Geom::sgn(Geom::cross(point_b - point_a, middle - point_a)); - if (oposite_fuse) { - position *= -1; - } - if (position == 1) { - Geom::Path mirror = portion.reversed() * m; - mirror.setInitial(portion.finalPoint()); - portion.append(mirror); - if(i!=0) { - portion.setFinal(portion.initialPoint()); - portion.close(); + Geom::Point s = start_point; + Geom::Point e = end_point; + double dir = line_separation.angle(); + double diagonal = Geom::distance(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + Geom::Rect bbox(Geom::Point(boundingbox_X.min(),boundingbox_Y.min()),Geom::Point(boundingbox_X.max(),boundingbox_Y.max())); + double size_divider = Geom::distance(center_point, bbox) + diagonal; + s = Geom::Point::polar(dir,size_divider) + center_point; + e = Geom::Point::polar(dir + Geom::rad_from_deg(180),size_divider) + center_point; + Geom::Path divider = Geom::Path(s); + divider.appendNew(e); + Geom::Crossings cs = crossings(original, divider); + std::vector crossed; + for(unsigned int i = 0; i < cs.size(); i++) { + crossed.push_back(cs[i].ta); + } + std::sort(crossed.begin(), crossed.end()); + for (unsigned int i = 0; i < crossed.size(); i++) { + double time_end = crossed[i]; + if (time_start != time_end && time_end - time_start > Geom::EPSILON) { + Geom::Path portion = original.portion(time_start, time_end); + if (!portion.empty()) { + Geom::Point middle = portion.pointAt((double)portion.size()/2.0); + position = Geom::sgn(Geom::cross(e - s, middle - s)); + if (!oposite_fuse) { + position *= -1; + } + if (position == 1) { + Geom::Path mirror = portion.reversed() * m; + mirror.setInitial(portion.finalPoint()); + portion.append(mirror); + if(i!=0) { + portion.setFinal(portion.initialPoint()); + portion.close(); + } + tmp_path.push_back(portion); + } + portion.clear(); } - temp_path.push_back(portion); } - portion.clear(); - time_start = timeEnd; + time_start = time_end; } - position = position = Geom::sgn(Geom::cross(point_b - point_a, original.finalPoint() - point_a )); - if (oposite_fuse) { + position = Geom::sgn(Geom::cross(e - s, original.finalPoint() - s)); + if (!oposite_fuse) { position *= -1; } if (cs.size()!=0 && position == 1) { - Geom::Path portion = original.portion(time_start, original.size()); - portion = portion.reversed(); - Geom::Path mirror = portion.reversed() * m; - mirror.setInitial(portion.finalPoint()); - portion.append(mirror); - portion = portion.reversed(); - if (!original.closed()) { - temp_path.push_back(portion); - } else { - if(cs.size() >1 ) { - portion.setFinal(temp_path[0].initialPoint()); - portion.setInitial(temp_path[0].finalPoint()); - temp_path[0].append(portion); - } else { - temp_path.push_back(portion); + if (time_start != original.size() && original.size() - time_start > Geom::EPSILON) { + Geom::Path portion = original.portion(time_start, original.size()); + if (!portion.empty()) { + portion = portion.reversed(); + Geom::Path mirror = portion.reversed() * m; + mirror.setInitial(portion.finalPoint()); + portion.append(mirror); + portion = portion.reversed(); + if (!original.closed()) { + tmp_path.push_back(portion); + } else { + if (cs.size() > 1 && tmp_path.size() > 0 && tmp_path[0].size() > 0 ) { + portion.setFinal(tmp_path[0].initialPoint()); + portion.setInitial(tmp_path[0].finalPoint()); + tmp_path[0].append(portion); + } else { + tmp_path.push_back(portion); + } + tmp_path[0].close(); + } + portion.clear(); } - temp_path[0].close(); } - portion.clear(); } if (cs.size() == 0 && position == 1) { - temp_path.push_back(original); - temp_path.push_back(original * m); + tmp_path.push_back(original); + tmp_path.push_back(original * m); } - path_out.insert(path_out.end(), temp_path.begin(), temp_path.end()); - temp_path.clear(); + path_out.insert(path_out.end(), tmp_path.begin(), tmp_path.end()); + tmp_path.clear(); } } @@ -269,19 +313,28 @@ LPEMirrorSymmetry::addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector { using namespace Geom; hp_vec.clear(); - hp_vec.push_back(reflection_line.get_pathvector()); + Geom::Path path; + Geom::Point s = start_point; + Geom::Point e = end_point; + path.start( s ); + path.appendNew( e ); + Geom::PathVector helper; + helper.push_back(path); + hp_vec.push_back(helper); } void LPEMirrorSymmetry::addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item) { + SPKnotShapeType knot_shape = SP_KNOT_SHAPE_CIRCLE; + SPKnotModeType knot_mode = SP_KNOT_MODE_XOR; + guint32 knot_color = 0x0000ff00; { - KnotHolderEntity *e = new MS::KnotHolderEntityCenterMirrorSymmetry(this); - e->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, - _("Adjust the center") ); - knotholder->add(e); + KnotHolderEntity *c = new MS::KnotHolderEntityCenterMirrorSymmetry(this); + c->create( desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, + _("Adjust the center"), knot_shape, knot_mode, knot_color ); + knotholder->add(c); } - }; namespace MS { @@ -293,7 +346,7 @@ KnotHolderEntityCenterMirrorSymmetry::knot_set(Geom::Point const &p, Geom::Point { LPEMirrorSymmetry* lpe = dynamic_cast(_effect); Geom::Point const s = snap_knot_position(p, state); - lpe->center.param_setValue(s); + lpe->center_point = s; // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating. sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true); @@ -303,7 +356,7 @@ Geom::Point KnotHolderEntityCenterMirrorSymmetry::knot_get() const { LPEMirrorSymmetry const *lpe = dynamic_cast(_effect); - return lpe->center; + return lpe->center_point; } } // namespace CR diff --git a/src/live_effects/lpe-mirror_symmetry.h b/src/live_effects/lpe-mirror_symmetry.h index cd6f2a0ce..3a244cb7e 100644 --- a/src/live_effects/lpe-mirror_symmetry.h +++ b/src/live_effects/lpe-mirror_symmetry.h @@ -32,6 +32,8 @@ class KnotHolderEntityCenterMirrorSymmetry; } enum ModeType { + MT_V, + MT_H, MT_FREE, MT_X, MT_Y, @@ -57,10 +59,11 @@ private: BoolParam discard_orig_path; BoolParam fuse_paths; BoolParam oposite_fuse; - PathParam reflection_line; + PointParam start_point; + PointParam end_point; Geom::Line line_separation; Geom::Point previous_center; - PointParam center; + Geom::Point center_point; LPEMirrorSymmetry(const LPEMirrorSymmetry&); LPEMirrorSymmetry& operator=(const LPEMirrorSymmetry&); -- cgit v1.2.3 From 861ad5fe4e858b218e9260011b6f128ec1410e24 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Thu, 24 Mar 2016 19:04:10 +0100 Subject: Revert revision #14156 because problems with offsets, see coments added (bzr r14741) --- src/sp-offset.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp index 7c3d0bd03..d84bdbdd3 100644 --- a/src/sp-offset.cpp +++ b/src/sp-offset.cpp @@ -83,7 +83,9 @@ static void sp_offset_source_modified (SPObject *iSource, guint flags, SPItem *i // fast is not mathematically correct, because computing the offset of a single // cubic bezier patch is not trivial; in particular, there are problems with holes // reappearing in offset when the radius becomes too large -static bool use_slow_but_correct_offset_method=true; +//TODO: need fix for bug: #384688 with fix released in r.14156 +//but reverted because bug #1507049 seems has more priority. +static bool use_slow_but_correct_offset_method = false; SPOffset::SPOffset() : SPShape() { this->rad = 1.0; -- cgit v1.2.3 From 17495e1131c0e2159b1e42adbf8e0a505ce6de8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Fri, 25 Mar 2016 19:14:41 +0100 Subject: Remove deprecated has_key method in inkex.py (bzr r14742) --- share/extensions/inkex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 99f8c6a77..0aee3c21a 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -132,7 +132,7 @@ def check_inkbool(option, opt, value): def addNS(tag, ns=None): val = tag - if ns is not None and len(ns) > 0 and NSS.has_key(ns) and len(tag) > 0 and tag[0] != '{': + if ns is not None and len(ns) > 0 and ns in NSS and len(tag) > 0 and tag[0] != '{': val = "{%s}%s" % (NSS[ns], tag) return val -- cgit v1.2.3 From 2a72b54dadf9d8ca7cc1391b5eedb6396cb97fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Fri, 25 Mar 2016 19:18:31 +0100 Subject: Cosmetics to make inkex.py pep8 compliant (bzr r14743) --- share/extensions/inkex.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 0aee3c21a..8a51734c3 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -35,7 +35,7 @@ import re import sys from math import * -#a dictionary of all of the xmlns prefixes in a standard inkscape doc +# a dictionary of all of the xmlns prefixes in a standard inkscape doc NSS = { u'sodipodi' :u'http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd', u'cc' :u'http://creativecommons.org/ns#', @@ -100,9 +100,9 @@ def errormsg(msg): inkex.errormsg(_("This extension requires two selected paths.")) """ if isinstance(msg, unicode): - sys.stderr.write(msg.encode("UTF-8") + "\n") + sys.stderr.write(msg.encode("utf-8") + "\n") else: - sys.stderr.write((unicode(msg, "utf-8", errors='replace') + "\n").encode("UTF-8")) + sys.stderr.write((unicode(msg, "utf-8", errors='replace') + "\n").encode("utf-8")) def are_near_relative(a, b, eps): @@ -205,7 +205,7 @@ class Effect: def getposinlayer(self): #defaults self.current_layer = self.document.getroot() - self.view_center = (0.0,0.0) + self.view_center = (0.0, 0.0) layerattr = self.document.xpath('//sodipodi:namedview/@inkscape:current-layer', namespaces=NSS) if layerattr: @@ -278,7 +278,8 @@ class Effect: self.getselected() self.getdocids() self.effect() - if output: self.output() + if output: + self.output() def uniqueId(self, old_id, make_new_id=True): new_id = old_id @@ -297,8 +298,8 @@ class Effect: return retval # a dictionary of unit to user unit conversion factors - __uuconv = {'in':96.0, 'pt':1.33333333333, 'px':1.0, 'mm':3.77952755913, 'cm':37.7952755913, - 'm':3779.52755913, 'km':3779527.55913, 'pc':16.0, 'yd':3456.0 , 'ft':1152.0} + __uuconv = {'in': 96.0, 'pt': 1.33333333333, 'px': 1.0, 'mm': 3.77952755913, 'cm': 37.7952755913, + 'm': 3779.52755913, 'km': 3779527.55913, 'pc': 16.0, 'yd': 3456.0, 'ft': 1152.0} # Fault tolerance for lazily defined SVG def getDocumentWidth(self): -- cgit v1.2.3 From f960eda72b309f3079a3c5d31f57e2219da769ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Fri, 25 Mar 2016 19:24:38 +0100 Subject: Switch too broad Exception exceptions to more specific ones (IOError, ImportError) (bzr r14744) --- share/extensions/inkex.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index 8a51734c3..fbf1d3208 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -112,12 +112,12 @@ def are_near_relative(a, b, eps): # third party library try: from lxml import etree -except Exception, e: +except ImportError as e: localize() errormsg(_("The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore this extension." "Please download and install the latest version from http://cheeseshop.python.org/pypi/lxml/, " "or install it through your package manager by a command like: sudo apt-get install " - "python-lxml\n\nTechnical details:\n%s" % (e,))) + "python-lxml\n\nTechnical details:\n%s" % (e, ))) sys.exit() @@ -178,7 +178,7 @@ class Effect: if filename is not None: try: stream = open(filename, 'r') - except Exception: + except IOError: errormsg(_("Unable to open specified file: %s") % filename) sys.exit() @@ -187,7 +187,7 @@ class Effect: elif self.svg_file is not None: try: stream = open(self.svg_file, 'r') - except Exception: + except IOError: errormsg(_("Unable to open object member file: %s") % self.svg_file) sys.exit() -- cgit v1.2.3 From 9e0e250ae29cee879eba68fc07a4cd06edac5f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= Date: Fri, 25 Mar 2016 19:42:17 +0100 Subject: Improve documentation (bzr r14745) --- share/extensions/inkex.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py index fbf1d3208..264ae0ff4 100755 --- a/share/extensions/inkex.py +++ b/share/extensions/inkex.py @@ -165,6 +165,9 @@ class Effect: # TODO write a parser for this def effect(self): + """Apply some effects on the document. Extensions subclassing Effect + must override this function and define the transformations + in it.""" pass def getoptions(self,args=sys.argv[1:]): @@ -315,6 +318,10 @@ class Effect: # Fault tolerance for lazily defined SVG def getDocumentHeight(self): + """Returns a string corresponding to the height of the document, as + defined in the SVG file. If it is not defined, returns the height + as defined by the viewBox attribute. If viewBox is not defined, + returns the string '0'.""" height = self.document.getroot().get('height') if height: return height @@ -326,9 +333,10 @@ class Effect: return '0' def getDocumentUnit(self): - """Function returns the unit used for the values in SVG. - For lack of an attribute in SVG that explicitly defines what units are used for SVG coordinates, - Try to calculate the unit from the SVG width and SVG viewbox. + """Returns the unit used for in the SVG document. + In the case the SVG document lacks an attribute that explicitly + defines what units are used for SVG coordinates, it tries to calculate + the unit from the SVG width and viewBox attributes. Defaults to 'px' units.""" svgunit = 'px' # default to pixels -- cgit v1.2.3 From 466d02d3896bae50fc380e8050b1c56e03794dca Mon Sep 17 00:00:00 2001 From: happyaron <> Date: Sun, 27 Mar 2016 09:10:16 +0200 Subject: Translations. zh_CN translation update. Fixed bugs: - https://launchpad.net/bugs/1520884 (bzr r14746) --- po/zh_CN.po | 9131 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 5042 insertions(+), 4089 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index eb04fdb56..ec1a763ae 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,37 +8,63 @@ # Junde Yi , 2015. # liushuyu011 , 2015. # Mingye Wang , 2015. +# Aron Xu , 2016. # +#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" "Project-Id-Version: Inkscape 0.92.x\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-11-01 13:46+0100\n" -"PO-Revision-Date: 2015-11-29 03:17-0500\n" -"Last-Translator: Mingye Wang (Arthur2e5) \n" -"Language-Team: Chinese (China) @ AOSC \n" +"POT-Creation-Date: 2016-03-08 14:37+0100\n" +"PO-Revision-Date: 2016-03-26 16:54+0800\n" +"Last-Translator: Aron Xu \n" +"Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8.6\n" -#: ../inkscape.desktop.in.h:1 +#: ../inkscape.appdata.xml.in.h:1 ../inkscape.desktop.in.h:1 msgid "Inkscape" msgstr "Inkscape" -#: ../inkscape.desktop.in.h:2 +#: ../inkscape.appdata.xml.in.h:2 ../inkscape.desktop.in.h:2 msgid "Vector Graphics Editor" msgstr "矢量图形编辑器" +#: ../inkscape.appdata.xml.in.h:3 +msgid "" +"An Open Source vector graphics editor, with capabilities similar to " +"Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " +"Graphics (SVG) file format." +msgstr "" +"一个开源的矢量图形编辑器,功能类似于 Illustrator、CorelDRAW 或 Xara X," +"使用 W3C 标准的 SVG 文件格式。" + +#: ../inkscape.appdata.xml.in.h:4 +msgid "" +"Inkscape supports many advanced SVG features (markers, clones, alpha " +"blending, etc.) and great care is taken in designing a streamlined " +"interface. It is very easy to edit nodes, perform complex path operations, " +"trace bitmaps and much more. We also aim to maintain a thriving user and " +"developer community by using open, community-oriented development." +msgstr "" +"Inkscape 支持众多高级 SVG 特性(标记、克隆等),并且注重保证流水线式的界面。" +"因而易于进行编辑节点、执行复杂的路径操作、临摹位图等工作。我们还致力于采用" +"开放的社区开发方式维护一个健康活跃的用户和开发者社区。" + +#: ../inkscape.appdata.xml.in.h:5 +msgid "Main application window" +msgstr "主应用程序窗口" + #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" msgstr "Inkscape 矢量绘图软件" #: ../inkscape.desktop.in.h:4 msgid "Create and edit Scalable Vector Graphics images" -msgstr "创建并编辑可缩放矢量图形图像" +msgstr "创建、编辑可缩放矢量图形图像" #: ../inkscape.desktop.in.h:5 msgid "image;editor;vector;drawing;" @@ -71,7 +97,7 @@ msgstr "倒角" #: ../share/filters/filters.svg.h:4 msgid "Same as Matte jelly but with more controls" -msgstr "与哑光啫喱相同,但控制更多" +msgstr "与哑光啫喱相同,但可控选项更多" #: ../share/filters/filters.svg.h:6 msgid "Metal Casting" @@ -97,7 +123,7 @@ msgstr "模糊" #: ../share/filters/filters.svg.h:12 msgid "Edges are partly feathered out" -msgstr "边向外部分羽化" +msgstr "边缘向外部分羽化" #: ../share/filters/filters.svg.h:14 msgid "Jigsaw Piece" @@ -163,7 +189,7 @@ msgstr "丰润" #: ../share/filters/filters.svg.h:32 msgid "Soft, cushion-like bevel with matte highlights" -msgstr "柔和的,垫子一样的凸起,有不均匀的高光" +msgstr "垫子一样的柔和凸起,有不均匀的高光" #: ../share/filters/filters.svg.h:34 msgid "Ridged Border" @@ -231,7 +257,7 @@ msgstr "材质" #: ../share/filters/filters.svg.h:56 msgid "Leopard spots (loses object's own color)" -msgstr "美洲豹斑点 (覆盖对象自身色彩)" +msgstr "美洲豹斑点(覆盖对象自身色彩)" #: ../share/filters/filters.svg.h:58 msgid "Zebra" @@ -303,7 +329,7 @@ msgstr "模拟油画风格" #. Pencil #: ../share/filters/filters.svg.h:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:424 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 msgid "Pencil" msgstr "铅笔" @@ -329,7 +355,7 @@ msgstr "模仿老照片" #: ../share/filters/filters.svg.h:90 msgid "Organic" -msgstr "有机的" +msgstr "有机" #: ../share/filters/filters.svg.h:91 ../share/filters/filters.svg.h:119 #: ../share/filters/filters.svg.h:127 ../share/filters/filters.svg.h:187 @@ -346,7 +372,7 @@ msgstr "纹理" #: ../share/filters/filters.svg.h:92 msgid "Bulging, knotty, slick 3D surface" -msgstr "膨胀的,光滑的节状3D表面" +msgstr "膨胀而光滑的节状3D表面" #: ../share/filters/filters.svg.h:94 msgid "Barbed Wire" @@ -354,7 +380,7 @@ msgstr "铁刺丝" #: ../share/filters/filters.svg.h:96 msgid "Gray bevelled wires with drop shadows" -msgstr "灰色倒角凸起的线缆, 投射阴影" +msgstr "灰色倒角凸起的线缆,投射阴影" #: ../share/filters/filters.svg.h:98 msgid "Swiss Cheese" @@ -417,11 +443,11 @@ msgstr "像素涂抹" #: ../share/filters/filters.svg.h:124 msgid "Van Gogh painting effect for bitmaps" -msgstr "位图产生梵高绘画效果" +msgstr "位图梵高绘画效果" #: ../share/filters/filters.svg.h:126 msgid "Cracked Glass" -msgstr "碎裂玻璃" +msgstr "碎玻璃" #: ../share/filters/filters.svg.h:128 msgid "Under a cracked glass" @@ -429,7 +455,7 @@ msgstr "置于碎玻璃下" #: ../share/filters/filters.svg.h:130 msgid "Bubbly Bumps" -msgstr "气泡凸凹" +msgstr "凸凹气泡" #: ../share/filters/filters.svg.h:131 ../share/filters/filters.svg.h:307 #: ../share/filters/filters.svg.h:311 ../share/filters/filters.svg.h:347 @@ -487,7 +513,7 @@ msgstr "对象融化,平滑的凸起和辉光" #: ../share/filters/filters.svg.h:146 msgid "Pressed Steel" -msgstr "压制钢铁" +msgstr "压制钢" #: ../share/filters/filters.svg.h:148 msgid "Pressed metal with a rolled edge" @@ -740,7 +766,7 @@ msgstr "粗糙和光滑" #: ../share/filters/filters.svg.h:264 msgid "" "Crumpled glossy paper effect which can be used for pictures as for objects" -msgstr "可以用于图片的褶皱蜡光纸效果(与应用于对象一样)" +msgstr "可以用于图片的褶皱蜡光纸效果(与应用于对象一样)" #: ../share/filters/filters.svg.h:266 msgid "In and Out" @@ -1068,9 +1094,9 @@ msgstr "黑色光" #: ../src/extension/internal/filter/paint.h:717 #: ../src/extension/internal/filter/shadows.h:73 #: ../src/extension/internal/filter/transparency.h:345 -#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:830 -#: ../src/ui/dialog/clonetiler.cpp:981 -#: ../src/ui/dialog/document-properties.cpp:164 +#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:828 +#: ../src/ui/dialog/clonetiler.cpp:979 +#: ../src/ui/dialog/document-properties.cpp:165 #: ../share/extensions/color_HSL_adjust.inx.h:20 #: ../share/extensions/color_blackandwhite.inx.h:3 #: ../share/extensions/color_brighter.inx.h:2 @@ -1085,7 +1111,7 @@ msgstr "黑色光" #: ../share/extensions/color_morelight.inx.h:2 #: ../share/extensions/color_moresaturation.inx.h:2 #: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_randomize.inx.h:14 #: ../share/extensions/color_removeblue.inx.h:2 #: ../share/extensions/color_removegreen.inx.h:2 #: ../share/extensions/color_removered.inx.h:2 @@ -1138,7 +1164,7 @@ msgstr "漫画式奶油" #: ../share/filters/filters.svg.h:787 ../share/filters/filters.svg.h:791 #: ../share/filters/filters.svg.h:795 msgid "Non realistic 3D shaders" -msgstr "不真实的3D阴影" +msgstr "非逼真 3D 着色器" #: ../share/filters/filters.svg.h:428 msgid "Comics shader with creamy waves transparency" @@ -1335,7 +1361,7 @@ msgstr "层叠" #: ../share/filters/filters.svg.h:520 msgid "Something like a water noise" -msgstr "类似水纹噪声" +msgstr "类似水纹噪点" #: ../share/filters/filters.svg.h:522 msgid "Monochrome Transparency" @@ -1497,7 +1523,7 @@ msgstr "像素工具" #: ../share/filters/filters.svg.h:592 msgid "Reduce or remove antialiasing around shapes" -msgstr "形状周围减少或移除反锯齿" +msgstr "形状周围减少或移除抗锯齿" #: ../share/filters/filters.svg.h:594 msgid "Basic Diffuse Bump" @@ -1599,7 +1625,7 @@ msgstr "大理石剪影" #: ../share/filters/filters.svg.h:644 msgid "Basic noise transparency texture" -msgstr "基本的噪声透明度纹理" +msgstr "基本的噪点透明度纹理" #: ../share/filters/filters.svg.h:646 msgid "Fill Background" @@ -1645,19 +1671,19 @@ msgstr "加强和重绘海报化区域的边缘" #: ../share/filters/filters.svg.h:666 msgid "Cross Noise Poster" -msgstr "交叠噪声海报" +msgstr "交叠噪点海报" #: ../share/filters/filters.svg.h:668 msgid "Overlay with a small scale screen like noise" -msgstr "用小尺寸缩放屏幕外观的噪声覆盖" +msgstr "用小尺寸缩放屏幕外观的噪点覆盖" #: ../share/filters/filters.svg.h:670 msgid "Cross Noise Poster B" -msgstr "交叠噪声海报 B" +msgstr "交叠噪点海报 B" #: ../share/filters/filters.svg.h:672 msgid "Adds a small scale screen like noise locally" -msgstr "加入类似局部性噪声的小比例滤色" +msgstr "加入类似局部性噪点的小比例滤色" #: ../share/filters/filters.svg.h:674 msgid "Poster Color Fun" @@ -1679,7 +1705,7 @@ msgstr "碎裂的透明单色" #: ../share/filters/filters.svg.h:692 ../share/filters/filters.svg.h:704 #: ../share/filters/filters.svg.h:708 ../share/filters/filters.svg.h:712 msgid "Basic noise fill texture; adjust color in Flood" -msgstr "简单的噪声填充纹理;在 浸漫(Flood) 中调整颜色" +msgstr "简单的噪点填充纹理;在 浸漫(Flood) 中调整颜色" #: ../share/filters/filters.svg.h:686 msgid "Alpha Turbulent" @@ -1691,7 +1717,7 @@ msgstr "彩色湍流" #: ../share/filters/filters.svg.h:694 msgid "Cross Noise B" -msgstr "交叠噪声 B" +msgstr "交叠噪点 B" #: ../share/filters/filters.svg.h:696 msgid "Adds a small scale crossy graininess" @@ -1699,7 +1725,7 @@ msgstr "加入小比例的交叠式颗粒" #: ../share/filters/filters.svg.h:698 msgid "Cross Noise" -msgstr "交叠噪声" +msgstr "交叠噪点" #: ../share/filters/filters.svg.h:700 msgid "Adds a small scale screen like graininess" @@ -1891,11 +1917,11 @@ msgstr "雕刻浮雕效果" #: ../share/filters/filters.svg.h:802 msgid "Chromolitho Alternate" -msgstr "交替式多彩噪声" +msgstr "交替式多彩噪点" #: ../share/filters/filters.svg.h:804 msgid "Old chromolithographic effect" -msgstr "旧式多彩噪声效果" +msgstr "旧式多彩噪点效果" #: ../share/filters/filters.svg.h:806 msgid "Convoluted Bump" @@ -2077,133 +2103,133 @@ msgstr "白色" #: ../share/palettes/palettes.h:16 msgctxt "Palette" msgid "Maroon (#800000)" -msgstr "栗子色 (#800000)" +msgstr "栗色(#800000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:17 msgctxt "Palette" msgid "Red (#FF0000)" -msgstr "红 (#FF0000)" +msgstr "红(#FF0000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:18 msgctxt "Palette" msgid "Olive (#808000)" -msgstr "橄榄色 (#808000)" +msgstr "橄榄色(#808000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:19 msgctxt "Palette" msgid "Yellow (#FFFF00)" -msgstr "黄 (#FFFF00)" +msgstr "黄(#FFFF00)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:20 msgctxt "Palette" msgid "Green (#008000)" -msgstr "绿色 (#008000)" +msgstr "绿(#008000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:21 msgctxt "Palette" msgid "Lime (#00FF00)" -msgstr "绿黄 (#00FF00)" +msgstr "绿黄(#00FF00)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:22 msgctxt "Palette" msgid "Teal (#008080)" -msgstr "青 (#008080)" +msgstr "青(#008080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:23 msgctxt "Palette" msgid "Aqua (#00FFFF)" -msgstr "水绿 (#00FFFF)" +msgstr "水绿(#00FFFF)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:24 msgctxt "Palette" msgid "Navy (#000080)" -msgstr "海军蓝 (#000080)" +msgstr "海军蓝(#000080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:25 msgctxt "Palette" msgid "Blue (#0000FF)" -msgstr "蓝 (#0000FF)" +msgstr "蓝(#0000FF)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:26 msgctxt "Palette" msgid "Purple (#800080)" -msgstr "紫 (#800080)" +msgstr "紫(#800080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:27 msgctxt "Palette" msgid "Fuchsia (#FF00FF)" -msgstr "紫红 (#FF00FF)" +msgstr "紫红(#FF00FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:28 msgctxt "Palette" msgid "black (#000000)" -msgstr "黑 (#000000)" +msgstr "黑(#000000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:29 msgctxt "Palette" msgid "dimgray (#696969)" -msgstr "暗灰 (#696969)" +msgstr "暗灰(#696969)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:30 msgctxt "Palette" msgid "gray (#808080)" -msgstr "灰色 (#808080)" +msgstr "灰(#808080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:31 msgctxt "Palette" msgid "darkgray (#A9A9A9)" -msgstr "深灰 (#A9A9A9)" +msgstr "深灰(#A9A9A9)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:32 msgctxt "Palette" msgid "silver (#C0C0C0)" -msgstr "银白色 (#C0C0C0)" +msgstr "银色(#C0C0C0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:33 msgctxt "Palette" msgid "lightgray (#D3D3D3)" -msgstr "浅灰 (#D3D3D3)" +msgstr "浅灰(#D3D3D3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:34 msgctxt "Palette" msgid "gainsboro (#DCDCDC)" -msgstr "亮灰 (#DCDCDC)" +msgstr "亮灰(#DCDCDC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:35 msgctxt "Palette" msgid "whitesmoke (#F5F5F5)" -msgstr "烟白 (#F5F5F5)" +msgstr "烟白(#F5F5F5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:36 msgctxt "Palette" msgid "white (#FFFFFF)" -msgstr "白色 (#FFFFFF)" +msgstr "白(#FFFFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:37 msgctxt "Palette" msgid "rosybrown (#BC8F8F)" -msgstr "玫瑰棕色 (#BC8F8F)" +msgstr "玫瑰棕色(#BC8F8F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:38 @@ -2263,13 +2289,13 @@ msgstr "粉玫瑰红 (#FFE4E1)" #: ../share/palettes/palettes.h:47 msgctxt "Palette" msgid "salmon (#FA8072)" -msgstr "三文鱼色 (#FA8072)" +msgstr "三文鱼色(#FA8072)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:48 msgctxt "Palette" msgid "tomato (#FF6347)" -msgstr "西红柿色 (#FF6347)" +msgstr "西红柿色(#FF6347)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:49 @@ -2299,7 +2325,7 @@ msgstr "浅三文鱼 (#FFA07A)" #: ../share/palettes/palettes.h:53 msgctxt "Palette" msgid "sienna (#A0522D)" -msgstr "赭色 (#A0522D)" +msgstr "赭色(#A0522D)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:54 @@ -2323,7 +2349,7 @@ msgstr "马鞍褐 (#8B4513)" #: ../share/palettes/palettes.h:57 msgctxt "Palette" msgid "sandybrown (#F4A460)" -msgstr "沙褐色 (#F4A460)" +msgstr "沙褐色(#F4A460)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:58 @@ -2335,37 +2361,37 @@ msgstr "粉桃红 (#FFDAB9)" #: ../share/palettes/palettes.h:59 msgctxt "Palette" msgid "peru (#CD853F)" -msgstr "秘鲁色 (#CD853F)" +msgstr "秘鲁色(#CD853F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:60 msgctxt "Palette" msgid "linen (#FAF0E6)" -msgstr "亚麻色 (#FAF0E6)" +msgstr "亚麻色(#FAF0E6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:61 msgctxt "Palette" msgid "bisque (#FFE4C4)" -msgstr "黄褐色 (#FFE4C4)" +msgstr "黄褐色(#FFE4C4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:62 msgctxt "Palette" msgid "darkorange (#FF8C00)" -msgstr "暗橙色 (#FF8C00)" +msgstr "暗橙色(#FF8C00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:63 msgctxt "Palette" msgid "burlywood (#DEB887)" -msgstr "原木色 (#DEB887)" +msgstr "原木色(#DEB887)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:64 msgctxt "Palette" msgid "tan (#D2B48C)" -msgstr "棕褐色 (#D2B48C)" +msgstr "棕褐色(#D2B48C)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:65 @@ -2389,13 +2415,13 @@ msgstr "白杏仁 (#FFEBCD)" #: ../share/palettes/palettes.h:68 msgctxt "Palette" msgid "papayawhip (#FFEFD5)" -msgstr "木瓜色 (#FFEFD5)" +msgstr "木瓜色(#FFEFD5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:69 msgctxt "Palette" msgid "moccasin (#FFE4B5)" -msgstr "莫卡辛鞋色 (#FFE4B5)" +msgstr "莫卡辛鞋色(#FFE4B5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:70 @@ -2407,7 +2433,7 @@ msgstr "橙 (#FFA500)" #: ../share/palettes/palettes.h:71 msgctxt "Palette" msgid "wheat (#F5DEB3)" -msgstr "小麦色 (#F5DEB3)" +msgstr "小麦色(#F5DEB3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:72 @@ -2431,7 +2457,7 @@ msgstr "暗金黄 (#B8860B)" #: ../share/palettes/palettes.h:75 msgctxt "Palette" msgid "goldenrod (#DAA520)" -msgstr "秋天色 (#DAA520)" +msgstr "秋天色(#DAA520)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:76 @@ -2449,7 +2475,7 @@ msgstr "金 (#FFD700)" #: ../share/palettes/palettes.h:78 msgctxt "Palette" msgid "khaki (#F0E68C)" -msgstr "卡其色 (#F0E68C)" +msgstr "卡其色(#F0E68C)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:79 @@ -2467,13 +2493,13 @@ msgstr "秋天灰 (#EEE8AA)" #: ../share/palettes/palettes.h:81 msgctxt "Palette" msgid "darkkhaki (#BDB76B)" -msgstr "深卡其色 (#BDB76B)" +msgstr "深卡其色(#BDB76B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:82 msgctxt "Palette" msgid "beige (#F5F5DC)" -msgstr "米色 (#F5F5DC)" +msgstr "米色(#F5F5DC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:83 @@ -2581,7 +2607,7 @@ msgstr "暗绿 (#006400)" #: ../share/palettes/palettes.h:100 msgctxt "Palette" msgid "green (#008000)" -msgstr "绿色 (#008000)" +msgstr "绿色(#008000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:101 @@ -2677,25 +2703,25 @@ msgstr "鸭绿 (#008080)" #: ../share/palettes/palettes.h:116 msgctxt "Palette" msgid "darkcyan (#008B8B)" -msgstr "暗青色 (#008B8B)" +msgstr "暗青色(#008B8B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:117 msgctxt "Palette" msgid "cyan (#00FFFF)" -msgstr "青色 (#00FFFF)" +msgstr "青色(#00FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:118 msgctxt "Palette" msgid "lightcyan (#E0FFFF)" -msgstr "淡青色 (#E0FFFF)" +msgstr "淡青色(#E0FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:119 msgctxt "Palette" msgid "azure (#F0FFFF)" -msgstr "天蓝色 (#F0FFFF)" +msgstr "天蓝色(#F0FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:120 @@ -2719,7 +2745,7 @@ msgstr "粉蓝 (#B0E0E6)" #: ../share/palettes/palettes.h:123 msgctxt "Palette" msgid "lightblue (#ADD8E6)" -msgstr "亮蓝色 (#ADD8E6)" +msgstr "亮蓝色(#ADD8E6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:124 @@ -2731,7 +2757,7 @@ msgstr "深天蓝 (#00BFFF)" #: ../share/palettes/palettes.h:125 msgctxt "Palette" msgid "skyblue (#87CEEB)" -msgstr "天蓝色 (#87CEEB)" +msgstr "天蓝色(#87CEEB)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:126 @@ -2743,7 +2769,7 @@ msgstr "浅天蓝 (#87CEFA)" #: ../share/palettes/palettes.h:127 msgctxt "Palette" msgid "steelblue (#4682B4)" -msgstr "钢青色 (#4682B4)" +msgstr "钢青色(#4682B4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:128 @@ -2821,7 +2847,7 @@ msgstr "中蓝 (#0000CD)" #: ../share/palettes/palettes.h:140 msgctxt "Palette" msgid "blue (#0000FF)" -msgstr "蓝色 (#0000FF)" +msgstr "蓝色(#0000FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:141 @@ -2851,133 +2877,133 @@ msgstr "中板岩蓝" #: ../share/palettes/palettes.h:145 msgctxt "Palette" msgid "mediumpurple (#9370DB)" -msgstr "中紫色 (#9370DB)" +msgstr "中紫色(#9370DB)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:146 msgctxt "Palette" msgid "blueviolet (#8A2BE2)" -msgstr "蓝紫色 (#8A2BE2)" +msgstr "蓝紫色(#8A2BE2)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:147 msgctxt "Palette" msgid "indigo (#4B0082)" -msgstr "靛青 (#4B0082)" +msgstr "靛青(#4B0082)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:148 msgctxt "Palette" msgid "darkorchid (#9932CC)" -msgstr "暗淡紫 (#9932CC)" +msgstr "暗淡紫(#9932CC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:149 msgctxt "Palette" msgid "darkviolet (#9400D3)" -msgstr "暗紫罗兰 (#9400D3)" +msgstr "暗紫罗兰(#9400D3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:150 msgctxt "Palette" msgid "mediumorchid (#BA55D3)" -msgstr "中淡紫 (#BA55D3)" +msgstr "中淡紫(#BA55D3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:151 msgctxt "Palette" msgid "thistle (#D8BFD8)" -msgstr "蓟色 (#D8BFD8)" +msgstr "蓟色(#D8BFD8)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:152 msgctxt "Palette" msgid "plum (#DDA0DD)" -msgstr "梅红 (#DDA0DD)" +msgstr "梅红(#DDA0DD)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:153 msgctxt "Palette" msgid "violet (#EE82EE)" -msgstr "紫罗兰 (#EE82EE)" +msgstr "紫罗兰(#EE82EE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:154 msgctxt "Palette" msgid "purple (#800080)" -msgstr "紫色 (#800080)" +msgstr "紫色(#800080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:155 msgctxt "Palette" msgid "darkmagenta (#8B008B)" -msgstr "暗洋红 (#8B008B)" +msgstr "暗洋红(#8B008B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:156 msgctxt "Palette" msgid "magenta (#FF00FF)" -msgstr "洋红 (#FF00FF)" +msgstr "洋红(#FF00FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:157 msgctxt "Palette" msgid "orchid (#DA70D6)" -msgstr "淡紫 (#DA70D6)" +msgstr "淡紫(#DA70D6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:158 msgctxt "Palette" msgid "mediumvioletred (#C71585)" -msgstr "中紫罗兰 (#C71585)" +msgstr "中紫罗兰(#C71585)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:159 msgctxt "Palette" msgid "deeppink (#FF1493)" -msgstr "深粉红 (#FF1493)" +msgstr "深粉红(#FF1493)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:160 msgctxt "Palette" msgid "hotpink (#FF69B4)" -msgstr "亮粉红 (#FF69B4)" +msgstr "亮粉红(#FF69B4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:161 msgctxt "Palette" msgid "lavenderblush (#FFF0F5)" -msgstr "淡紫红 (#FFF0F5)" +msgstr "淡紫红(#FFF0F5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:162 msgctxt "Palette" msgid "palevioletred (#DB7093)" -msgstr "苍紫罗兰 (#DB7093)" +msgstr "苍紫罗兰(#DB7093)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:163 msgctxt "Palette" msgid "crimson (#DC143C)" -msgstr "绯红 (#DC143C)" +msgstr "绯红(#DC143C)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:164 msgctxt "Palette" msgid "pink (#FFC0CB)" -msgstr "粉色 (#FFC0CB)" +msgstr "粉色(#FFC0CB)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:165 msgctxt "Palette" msgid "lightpink (#FFB6C1)" -msgstr "亮粉色 (#FFB6C1)" +msgstr "亮粉色(#FFB6C1)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:166 msgctxt "Palette" msgid "rebeccapurple (#663399)" -msgstr "瑞贝卡紫 (#663399)" +msgstr "瑞贝卡紫(#663399)" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:167 @@ -3291,11 +3317,11 @@ msgstr "圆点花纹,大,白" #: ../share/patterns/patterns.svg.h:1 msgid "Wavy" -msgstr "波动" +msgstr "波浪" #: ../share/patterns/patterns.svg.h:1 msgid "Wavy white" -msgstr "波动的白色" +msgstr "波浪,白色" #: ../share/patterns/patterns.svg.h:1 msgid "Camouflage" @@ -3307,21 +3333,21 @@ msgstr "貂皮" #: ../share/patterns/patterns.svg.h:1 msgid "Sand (bitmap)" -msgstr "沙砾(位图)" +msgstr "沙砾(位图)" #: ../share/patterns/patterns.svg.h:1 msgid "Cloth (bitmap)" -msgstr "布纹(位图)" +msgstr "布纹(位图)" #: ../share/patterns/patterns.svg.h:1 msgid "Old paint (bitmap)" -msgstr "古画(位图)" +msgstr "古画(位图)" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:2 msgctxt "Symbol" msgid "AIGA Symbol Signs" -msgstr "AIGA 符号标志" +msgstr "AIGA 符号标记" #. Symbols: ./AigaSymbols.svg #. Symbols: ./MapSymbolsNPS.svg @@ -3341,13 +3367,13 @@ msgstr "邮件" #: ../share/symbols/symbols.h:7 ../share/symbols/symbols.h:8 msgctxt "Symbol" msgid "Currency Exchange" -msgstr "外汇兑换" +msgstr "货币兑换" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:9 ../share/symbols/symbols.h:10 msgctxt "Symbol" msgid "Currency Exchange - Euro" -msgstr "外汇兑换 - 欧洲" +msgstr "货币兑换 - 欧元" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:11 ../share/symbols/symbols.h:12 @@ -3367,7 +3393,7 @@ msgstr "急救" #: ../share/symbols/symbols.h:15 ../share/symbols/symbols.h:16 msgctxt "Symbol" msgid "Lost and Found" -msgstr "失物认领" +msgstr "失物招领" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:17 ../share/symbols/symbols.h:18 @@ -3379,7 +3405,7 @@ msgstr "衣物认领" #: ../share/symbols/symbols.h:19 ../share/symbols/symbols.h:20 msgctxt "Symbol" msgid "Baggage Lockers" -msgstr "行李寄存处" +msgstr "行李寄存" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:21 ../share/symbols/symbols.h:22 @@ -3445,13 +3471,13 @@ msgstr "厕所" #: ../share/symbols/symbols.h:41 ../share/symbols/symbols.h:42 msgctxt "Symbol" msgid "Nursery" -msgstr "护士站" +msgstr "幼儿园" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:43 ../share/symbols/symbols.h:44 msgctxt "Symbol" msgid "Drinking Fountain" -msgstr "饮水台" +msgstr "饮水器" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:45 ../share/symbols/symbols.h:46 @@ -3465,7 +3491,7 @@ msgstr "休息室" #: ../share/symbols/symbols.h:231 ../share/symbols/symbols.h:232 msgctxt "Symbol" msgid "Information" -msgstr "咨询处" +msgstr "服务台" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:49 ../share/symbols/symbols.h:50 @@ -3477,7 +3503,7 @@ msgstr "酒店信息" #: ../share/symbols/symbols.h:51 ../share/symbols/symbols.h:52 msgctxt "Symbol" msgid "Air Transportation" -msgstr "空运" +msgstr "航空运输" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:53 ../share/symbols/symbols.h:54 @@ -3519,7 +3545,7 @@ msgstr "水上交通" #: ../share/symbols/symbols.h:65 ../share/symbols/symbols.h:66 msgctxt "Symbol" msgid "Car Rental" -msgstr "汽车出租" +msgstr "汽车租赁" #. Symbols: ./AigaSymbols.svg #: ../share/symbols/symbols.h:67 ../share/symbols/symbols.h:68 @@ -3781,6 +3807,7 @@ msgctxt "Symbol" msgid "Flow Chart Shapes" msgstr "流程图形状" +# aim../share/symbols/symbols.h:143 #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:143 msgctxt "Symbol" @@ -3941,13 +3968,13 @@ msgstr "预定义处理" #: ../share/symbols/symbols.h:169 msgctxt "Symbol" msgid "Magnetic Disk (Database)" -msgstr "磁盘(数据库)" +msgstr "磁盘(数据库)" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:170 msgctxt "Symbol" msgid "Magnetic Drum (Direct Access)" -msgstr "磁鼓(直接访问)" +msgstr "磁鼓(直接访问)" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:171 @@ -3959,13 +3986,13 @@ msgstr "离线存储" #: ../share/symbols/symbols.h:172 msgctxt "Symbol" msgid "Logical Or" -msgstr "“或”逻辑" +msgstr "逻辑“或”" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:173 msgctxt "Symbol" msgid "Logical And" -msgstr "“与”逻辑" +msgstr "逻辑“与”" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:174 @@ -3977,13 +4004,13 @@ msgstr "延迟" #: ../share/symbols/symbols.h:175 msgctxt "Symbol" msgid "Loop Limit Begin" -msgstr "环路限值起点" +msgstr "环路限制起点" #. Symbols: ./FlowSymbols.svg #: ../share/symbols/symbols.h:176 msgctxt "Symbol" msgid "Loop Limit End" -msgstr "环路限值终点" +msgstr "环路限制终点" #. Symbols: ./LogicSymbols.svg #: ../share/symbols/symbols.h:177 @@ -4043,13 +4070,13 @@ msgstr "非门" #: ../share/symbols/symbols.h:186 msgctxt "Symbol" msgid "Buffer Small" -msgstr "缓冲区(小)" +msgstr "缓冲区(小)" #. Symbols: ./LogicSymbols.svg #: ../share/symbols/symbols.h:187 msgctxt "Symbol" msgid "Not Gate Small" -msgstr "非门(小)" +msgstr "非门(小)" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:188 @@ -4079,7 +4106,7 @@ msgstr "自行车道" #: ../share/symbols/symbols.h:195 ../share/symbols/symbols.h:196 msgctxt "Symbol" msgid "Boat Launch" -msgstr "船舶下水装置" +msgstr "码头" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:197 ../share/symbols/symbols.h:198 @@ -4151,7 +4178,7 @@ msgstr "四轮驱动车道" #: ../share/symbols/symbols.h:221 ../share/symbols/symbols.h:222 msgctxt "Symbol" msgid "Gas Station" -msgstr "加油站" +msgstr "加气站" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:223 ../share/symbols/symbols.h:224 @@ -4235,7 +4262,7 @@ msgstr "邮局" #: ../share/symbols/symbols.h:253 ../share/symbols/symbols.h:254 msgctxt "Symbol" msgid "Ranger Station" -msgstr "守林者站" +msgstr "公园管理处" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:255 ../share/symbols/symbols.h:256 @@ -4289,13 +4316,13 @@ msgstr "淋浴" #: ../share/symbols/symbols.h:271 ../share/symbols/symbols.h:272 msgctxt "Symbol" msgid "Sledding" -msgstr "滑雪" +msgstr "乘坐雪橇" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:273 ../share/symbols/symbols.h:274 msgctxt "Symbol" msgid "SnowmobileTrail" -msgstr "雪车道" +msgstr "雪上车道" #. Symbols: ./MapSymbolsNPS.svg #: ../share/symbols/symbols.h:275 ../share/symbols/symbols.h:276 @@ -4347,7 +4374,7 @@ msgstr "空白" #: ../share/templates/templates.h:1 msgid "CD Label 120mmx120mm " -msgstr "120mm x 120mm 的 CD 标签" +msgstr "CD 标签 120mmx120mm" #: ../share/templates/templates.h:1 msgid "Simple CD Label template with disc's pattern." @@ -4394,19 +4421,19 @@ msgid "guidelines typography canvas" msgstr "参考线印刷画布" #. 3D box -#: ../src/box3d.cpp:250 ../src/box3d.cpp:1304 -#: ../src/ui/dialog/inkscape-preferences.cpp:407 +#: ../src/box3d.cpp:255 ../src/box3d.cpp:1309 +#: ../src/ui/dialog/inkscape-preferences.cpp:416 msgid "3D Box" msgstr "3D 盒子" #: ../src/color-profile.cpp:842 #, c-format msgid "Color profiles directory (%s) is unavailable." -msgstr "色彩配置文件目录(%s)不可用。" +msgstr "色彩配置文件目录(%s)不可用。" #: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 msgid "(invalid UTF-8 string)" -msgstr "(无效的 UTF-8 字串)" +msgstr "(无效的 UTF-8 字串)" #: ../src/color-profile.cpp:903 msgctxt "Profile name" @@ -4415,35 +4442,35 @@ msgstr "无" #: ../src/context-fns.cpp:33 ../src/context-fns.cpp:62 msgid "Current layer is hidden. Unhide it to be able to draw on it." -msgstr "当前图层已被隐藏。解除隐藏以在此图层上绘制。" +msgstr "当前图层已隐藏。解除隐藏以在此图层上绘制。" #: ../src/context-fns.cpp:39 ../src/context-fns.cpp:68 msgid "Current layer is locked. Unlock it to be able to draw on it." -msgstr "当前图层已被锁定。解锁以在此图层上绘制。" +msgstr "当前图层已锁定。解锁以在此图层上绘制。" -#: ../src/desktop-events.cpp:242 +#: ../src/desktop-events.cpp:244 msgid "Create guide" msgstr "创建辅助线" -#: ../src/desktop-events.cpp:498 +#: ../src/desktop-events.cpp:500 msgid "Move guide" msgstr "移动辅助线" -#: ../src/desktop-events.cpp:505 ../src/desktop-events.cpp:563 -#: ../src/ui/dialog/guides.cpp:138 +#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:572 +#: ../src/ui/dialog/guides.cpp:147 msgid "Delete guide" msgstr "删除辅助线" -#: ../src/desktop-events.cpp:543 +#: ../src/desktop-events.cpp:552 #, c-format msgid "Guideline: %s" msgstr "辅助线:%s" -#: ../src/desktop.cpp:873 +#: ../src/desktop.cpp:875 msgid "No previous zoom." msgstr "无缩放记录。" -#: ../src/desktop.cpp:894 +#: ../src/desktop.cpp:896 msgid "No next zoom." msgstr "无缩放记录。" @@ -4453,21 +4480,21 @@ msgstr "网格单位(_U):" #: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 msgid "_Origin X:" -msgstr "起始 X 座标(_O):" +msgstr "原点 X 座标(_O):" #: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "X coordinate of grid origin" msgstr "网格原点的 X 坐标" #: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 msgid "O_rigin Y:" -msgstr "起始 Y 座标(_R):" +msgstr "原点 Y 座标(_R):" #: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Y coordinate of grid origin" msgstr "网格原点的 Y 坐标" @@ -4476,29 +4503,29 @@ msgid "Spacing _Y:" msgstr "间隔 _Y:" #: ../src/display/canvas-axonomgrid.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/ui/dialog/inkscape-preferences.cpp:819 msgid "Base length of z-axis" msgstr "Z 轴的基础长度" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/ui/dialog/inkscape-preferences.cpp:822 #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "角度 X:" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/ui/dialog/inkscape-preferences.cpp:822 msgid "Angle of x-axis" msgstr "X 轴角度" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:811 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "角度 Z:" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:811 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 msgid "Angle of z-axis" msgstr "Z 轴角度" @@ -4507,7 +4534,7 @@ msgid "Minor grid line _color:" msgstr "次要网格线颜色(_C):" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:762 +#: ../src/ui/dialog/inkscape-preferences.cpp:774 msgid "Minor grid line color" msgstr "次要网格线颜色" @@ -4520,13 +4547,13 @@ msgid "Ma_jor grid line color:" msgstr "主网格线颜色(_J):" #: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 msgid "Major grid line color" msgstr "主网格线颜色" #: ../src/display/canvas-axonomgrid.cpp:380 ../src/display/canvas-grid.cpp:719 msgid "Color of the major (highlighted) grid lines" -msgstr "主(高亮)网格线的颜色" +msgstr "主(高亮)网格线的颜色" #: ../src/display/canvas-axonomgrid.cpp:384 ../src/display/canvas-grid.cpp:723 msgid "_Major grid line every:" @@ -4550,7 +4577,7 @@ msgstr "创建新网格" #: ../src/display/canvas-grid.cpp:312 msgid "_Enabled" -msgstr "开启(_E)" +msgstr "启用(_E)" #: ../src/display/canvas-grid.cpp:313 msgid "" @@ -4580,15 +4607,15 @@ msgstr "决定是否显示网格。对象仍然能够粘附到不可见的网格 #: ../src/display/canvas-grid.cpp:705 msgid "Spacing _X:" -msgstr "间隔 _X:" +msgstr "间隔(_X):" #: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:784 +#: ../src/ui/dialog/inkscape-preferences.cpp:796 msgid "Distance between vertical grid lines" msgstr "垂直网格线之间的距离" #: ../src/display/canvas-grid.cpp:708 -#: ../src/ui/dialog/inkscape-preferences.cpp:785 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Distance between horizontal grid lines" msgstr "水平网格线之间的距离" @@ -4616,7 +4643,7 @@ msgstr "格线交点" #: ../src/display/snap-indicator.cpp:85 msgid "grid line (perpendicular)" -msgstr "格线(垂直)" +msgstr "格线(垂直)" #: ../src/display/snap-indicator.cpp:88 msgid "guide" @@ -4632,7 +4659,7 @@ msgstr "参考线原点" #: ../src/display/snap-indicator.cpp:97 msgid "guide (perpendicular)" -msgstr "参考线(垂直)" +msgstr "参考线(垂直)" #: ../src/display/snap-indicator.cpp:100 msgid "grid-guide intersection" @@ -4652,11 +4679,11 @@ msgstr "路径" #: ../src/display/snap-indicator.cpp:112 msgid "path (perpendicular)" -msgstr "路径(垂直)" +msgstr "路径(垂直)" #: ../src/display/snap-indicator.cpp:115 msgid "path (tangential)" -msgstr "路径(相切)" +msgstr "路径(相切)" #: ../src/display/snap-indicator.cpp:118 msgid "path intersection" @@ -4806,21 +4833,21 @@ msgstr "格线间距的倍数" msgid " to " msgstr " 至 " -#: ../src/document.cpp:544 +#: ../src/document.cpp:530 #, c-format msgid "New document %d" msgstr "新建文档 %d" -#: ../src/document.cpp:549 +#: ../src/document.cpp:535 #, c-format msgid "Memory document %d" msgstr "记忆文档 %d" -#: ../src/document.cpp:578 +#: ../src/document.cpp:564 msgid "Memory document %1" msgstr "记忆文档 %1" -#: ../src/document.cpp:886 +#: ../src/document.cpp:872 #, c-format msgid "Unnamed document %d" msgstr "未命名文档 %d" @@ -4830,11 +4857,11 @@ msgid "[Unchanged]" msgstr "[未改变]" #. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2434 +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2461 msgid "_Undo" msgstr "撤销(_U)" -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2436 +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2463 msgid "_Redo" msgstr "重做(_R)" @@ -4860,9 +4887,9 @@ msgstr " 描述:" #: ../src/extension/effect.cpp:41 msgid " (No preferences)" -msgstr "(无首选项)" +msgstr "(无首选项)" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2208 +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2235 msgid "Extensions" msgstr "扩展" @@ -4886,10 +4913,10 @@ msgstr "" msgid "Show dialog on startup" msgstr "启动时显示对话框" -#: ../src/extension/execution-env.cpp:138 +#: ../src/extension/execution-env.cpp:136 #, c-format msgid "'%s' working, please wait..." -msgstr "'%s' 正在进行工作,请稍候…" +msgstr "%s 正在进行工作,请稍候..." #. static int i = 0; #. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; @@ -4932,7 +4959,7 @@ msgstr "扩展“" #: ../src/extension/extension.cpp:321 msgid "\" failed to load because " -msgstr "”加载失败,原因为 " +msgstr "”加载失败,原因为:" #: ../src/extension/extension.cpp:670 #, c-format @@ -4973,7 +5000,7 @@ msgstr "" "该扩展暂时没有可用的帮助信息。如有关于此扩展的疑问,请前往 Inkscape 网站查找" "相关信息,或在邮件列表中提问。" -#: ../src/extension/implementation/script.cpp:1063 +#: ../src/extension/implementation/script.cpp:1112 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -4992,7 +5019,7 @@ msgstr "外部模块目录名称为空。将不会加载模块。" msgid "" "Modules directory (%s) is unavailable. External modules in that directory " "will not be loaded." -msgstr "模块目录(%s)不可用。将不加载此目录中存放的外部模块。" +msgstr "模块目录(%s)不可用。将不加载此目录中存放的外部模块。" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:39 msgid "Adaptive Threshold" @@ -5001,13 +5028,13 @@ msgstr "自适应阈值" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 #: ../src/extension/internal/bitmap/raise.cpp:42 #: ../src/extension/internal/bitmap/sample.cpp:41 -#: ../src/extension/internal/bluredge.cpp:136 +#: ../src/extension/internal/bluredge.cpp:134 #: ../src/ui/dialog/lpe-powerstroke-properties.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:68 #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 #: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "宽度:" @@ -5022,6 +5049,7 @@ msgid "Height:" msgstr "高度:" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 +#: ../src/widgets/measure-toolbar.cpp:328 #: ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "偏移:" @@ -5070,7 +5098,7 @@ msgstr "为选中的位图应用可调整阈值" #: ../src/extension/internal/bitmap/addNoise.cpp:45 msgid "Add Noise" -msgstr "添加噪声" +msgstr "添加噪点" #. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch"); #: ../src/extension/internal/bitmap/addNoise.cpp:47 @@ -5079,8 +5107,8 @@ msgstr "添加噪声" #: ../src/extension/internal/filter/color.h:1660 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2930 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 #: ../src/ui/dialog/object-attributes.cpp:49 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5091,31 +5119,31 @@ msgstr "类型:" #: ../src/extension/internal/bitmap/addNoise.cpp:48 msgid "Uniform Noise" -msgstr "标准噪声" +msgstr "标准噪点" #: ../src/extension/internal/bitmap/addNoise.cpp:49 msgid "Gaussian Noise" -msgstr "高斯噪声" +msgstr "高斯噪点" #: ../src/extension/internal/bitmap/addNoise.cpp:50 msgid "Multiplicative Gaussian Noise" -msgstr "倍乘高斯噪声" +msgstr "倍乘高斯噪点" #: ../src/extension/internal/bitmap/addNoise.cpp:51 msgid "Impulse Noise" -msgstr "脉冲噪声" +msgstr "脉冲噪点" #: ../src/extension/internal/bitmap/addNoise.cpp:52 msgid "Laplacian Noise" -msgstr "拉普拉斯噪声" +msgstr "拉普拉斯噪点" #: ../src/extension/internal/bitmap/addNoise.cpp:53 msgid "Poisson Noise" -msgstr "泊松噪声" +msgstr "泊松噪点" #: ../src/extension/internal/bitmap/addNoise.cpp:60 msgid "Add random noise to selected bitmap(s)" -msgstr "为选中的位图加入随机噪声" +msgstr "为选中的位图加入随机噪点" #: ../src/extension/internal/bitmap/blur.cpp:38 #: ../src/extension/internal/filter/blurs.h:54 @@ -5132,7 +5160,7 @@ msgstr "模糊" #: ../src/extension/internal/bitmap/oilPaint.cpp:39 #: ../src/extension/internal/bitmap/sharpen.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2909 msgid "Radius:" msgstr "半径:" @@ -5143,7 +5171,7 @@ msgstr "半径:" #: ../src/extension/internal/bitmap/sharpen.cpp:41 #: ../src/extension/internal/bitmap/unsharpmask.cpp:44 msgid "Sigma:" -msgstr "总和:" +msgstr "求和:" #: ../src/extension/internal/bitmap/blur.cpp:47 msgid "Blur selected bitmap(s)" @@ -5175,22 +5203,22 @@ msgstr "蓝色通道" #: ../src/extension/internal/bitmap/channel.cpp:54 #: ../src/extension/internal/bitmap/levelChannel.cpp:58 msgid "Cyan Channel" -msgstr "Cyan(青色)通道" +msgstr "青色通道" #: ../src/extension/internal/bitmap/channel.cpp:55 #: ../src/extension/internal/bitmap/levelChannel.cpp:59 msgid "Magenta Channel" -msgstr "Magenta(洋红)通道" +msgstr "洋红通道" #: ../src/extension/internal/bitmap/channel.cpp:56 #: ../src/extension/internal/bitmap/levelChannel.cpp:60 msgid "Yellow Channel" -msgstr "Yellow(黄色)通道" +msgstr "黄色通道" #: ../src/extension/internal/bitmap/channel.cpp:57 #: ../src/extension/internal/bitmap/levelChannel.cpp:61 msgid "Black Channel" -msgstr "Black(黑色)通道" +msgstr "黑色通道" #: ../src/extension/internal/bitmap/channel.cpp:58 #: ../src/extension/internal/bitmap/levelChannel.cpp:62 @@ -5244,19 +5272,19 @@ msgstr "剪裁" #: ../src/extension/internal/bitmap/crop.cpp:68 msgid "Top (px):" -msgstr "顶端 (px):" +msgstr "顶部(像素):" #: ../src/extension/internal/bitmap/crop.cpp:69 msgid "Bottom (px):" -msgstr "底端 (px):" +msgstr "底部(像素):" #: ../src/extension/internal/bitmap/crop.cpp:70 msgid "Left (px):" -msgstr "左 (px):" +msgstr "左侧(像素):" #: ../src/extension/internal/bitmap/crop.cpp:71 msgid "Right (px):" -msgstr "右 (px):" +msgstr "右侧(像素):" #: ../src/extension/internal/bitmap/crop.cpp:77 msgid "Crop selected bitmap(s)" @@ -5269,7 +5297,7 @@ msgstr "循环颜色表" #: ../src/extension/internal/bitmap/cycleColormap.cpp:39 #: ../src/extension/internal/bitmap/spread.cpp:39 #: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:208 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount:" msgstr "数量:" @@ -5279,11 +5307,11 @@ msgstr "循环所选位图的颜色表。" #: ../src/extension/internal/bitmap/despeckle.cpp:36 msgid "Despeckle" -msgstr "去斑" +msgstr "去除杂点" #: ../src/extension/internal/bitmap/despeckle.cpp:43 msgid "Reduce speckle noise of selected bitmap(s)" -msgstr "减少所选位图的斑点噪声。" +msgstr "减少所选位图的斑点噪点。" #: ../src/extension/internal/bitmap/edge.cpp:37 msgid "Edge" @@ -5307,7 +5335,7 @@ msgstr "增强" #: ../src/extension/internal/bitmap/enhance.cpp:42 msgid "Enhance selected bitmap(s); minimize noise" -msgstr "增强所选位图;最小化其噪声" +msgstr "增强所选位图;最小化其噪点" #: ../src/extension/internal/bitmap/equalize.cpp:35 msgid "Equalize" @@ -5371,7 +5399,7 @@ msgstr "用落在给定范围至全部色彩范围之间的缩放数值来调整 #: ../src/extension/internal/bitmap/levelChannel.cpp:52 msgid "Level (with Channel)" -msgstr "色阶(含颜色通道)" +msgstr "色阶(带有通道)" #: ../src/extension/internal/bitmap/levelChannel.cpp:54 #: ../src/extension/internal/filter/color.h:711 @@ -5421,17 +5449,17 @@ msgstr "反相" #: ../src/extension/internal/bitmap/negate.cpp:43 msgid "Negate (take inverse) selected bitmap(s)" -msgstr "反相(获得负片效果)选中的位图" +msgstr "反相(获得负片效果)选中的位图" #: ../src/extension/internal/bitmap/normalize.cpp:36 msgid "Normalize" -msgstr "归一化" +msgstr "正常化" #: ../src/extension/internal/bitmap/normalize.cpp:43 msgid "" "Normalize selected bitmap(s), expanding color range to the full possible " "range of color" -msgstr "将所选位图归一化,将色彩范围扩展到最大" +msgstr "将所选位图正常化,将色彩范围扩展到最大" #: ../src/extension/internal/bitmap/oilPaint.cpp:37 msgid "Oil Paint" @@ -5444,15 +5472,15 @@ msgstr "风格化选中的位图,产生像用油画绘制的效果" #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/blurs.h:333 #: ../src/extension/internal/filter/transparency.h:279 -#: ../src/ui/dialog/clonetiler.cpp:838 ../src/ui/dialog/clonetiler.cpp:991 +#: ../src/ui/dialog/clonetiler.cpp:836 ../src/ui/dialog/clonetiler.cpp:989 #: ../src/widgets/tweak-toolbar.cpp:334 #: ../share/extensions/interp_att_g.inx.h:18 msgid "Opacity" msgstr "不透明度" #: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 -#: ../src/ui/dialog/objects.cpp:1625 ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2899 +#: ../src/ui/dialog/objects.cpp:1629 ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "不透明度:" @@ -5475,9 +5503,12 @@ msgstr "通过改变位图的边缘亮度来创建凸起的外观" #: ../src/extension/internal/bitmap/reduceNoise.cpp:40 msgid "Reduce Noise" -msgstr "减少噪声" +msgstr "减少噪点" +#. Paint order +#. TRANSLATORS: Paint order determines the order the 'fill', 'stroke', and 'markers are painted. #: ../src/extension/internal/bitmap/reduceNoise.cpp:42 +#: ../src/widgets/stroke-style.cpp:384 #: ../share/extensions/jessyInk_effects.inx.h:3 #: ../share/extensions/jessyInk_view.inx.h:3 #: ../share/extensions/lindenmayer.inx.h:5 @@ -5487,7 +5518,7 @@ msgstr "次序:" #: ../src/extension/internal/bitmap/reduceNoise.cpp:48 msgid "" "Reduce noise in selected bitmap(s) using a noise peak elimination filter" -msgstr "使用噪声高峰值排除滤镜来减少选中位图的噪声" +msgstr "使用噪点高峰值排除滤镜来减少选中位图的噪点" #: ../src/extension/internal/bitmap/sample.cpp:39 msgid "Resample" @@ -5571,7 +5602,7 @@ msgstr "取消锐化蒙版" #: ../src/extension/internal/bitmap/unsharpmask.cpp:52 msgid "Sharpen selected bitmap(s) using unsharp mask algorithms" -msgstr "使用取消锐化(unsharp)蒙版算法来锐化选中的位图" +msgstr "使用取消锐化蒙版算法来锐化选中的位图" #: ../src/extension/internal/bitmap/wave.cpp:38 msgid "Wave" @@ -5589,23 +5620,23 @@ msgstr "波长:" msgid "Alter selected bitmap(s) along sine wave" msgstr "沿着正波弦改变选中的位图" -#: ../src/extension/internal/bluredge.cpp:134 +#: ../src/extension/internal/bluredge.cpp:132 msgid "Inset/Outset Halo" msgstr "内/外光晕" -#: ../src/extension/internal/bluredge.cpp:136 +#: ../src/extension/internal/bluredge.cpp:134 msgid "Width in px of the halo" msgstr "光晕的像素宽度" -#: ../src/extension/internal/bluredge.cpp:137 +#: ../src/extension/internal/bluredge.cpp:135 msgid "Number of steps:" msgstr "层次数:" -#: ../src/extension/internal/bluredge.cpp:137 +#: ../src/extension/internal/bluredge.cpp:135 msgid "Number of inset/outset copies of the object to make" msgstr "在对象的内外产生偏移副本的数量" -#: ../src/extension/internal/bluredge.cpp:141 +#: ../src/extension/internal/bluredge.cpp:139 #: ../share/extensions/extrude.inx.h:5 #: ../share/extensions/generate_voronoi.inx.h:9 #: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 @@ -5669,7 +5700,7 @@ msgstr "栅格化滤镜效果" #: ../src/extension/internal/cairo-ps-out.cpp:381 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256 msgid "Resolution for rasterization (dpi):" -msgstr "点阵化使用的分辨率 (dpi):" +msgstr "点阵化使用的分辨率(dpi):" #: ../src/extension/internal/cairo-ps-out.cpp:340 #: ../src/extension/internal/cairo-ps-out.cpp:382 @@ -5691,7 +5722,7 @@ msgstr "使用导出对象的尺寸" #: ../src/extension/internal/cairo-ps-out.cpp:344 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:261 msgid "Bleed/margin (mm):" -msgstr "出血/边距(毫米):" +msgstr "出血/边距(毫米):" #: ../src/extension/internal/cairo-ps-out.cpp:345 #: ../src/extension/internal/cairo-ps-out.cpp:387 @@ -5715,7 +5746,7 @@ msgstr "已封装的 PostScript" #: ../src/extension/internal/cairo-ps-out.cpp:386 msgid "Bleed/margin (mm)" -msgstr "出血/边距(毫米)" +msgstr "出血/边距(毫米)" #: ../src/extension/internal/cairo-ps-out.cpp:391 #: ../share/extensions/eps_input.inx.h:2 @@ -5809,79 +5840,79 @@ msgstr "Corel DRAW Presentation Exchange 文件 (*.cmx)" msgid "Open presentation exchange files saved in Corel DRAW" msgstr "打开使用 Corel DRAW 创建的 Presentation Exchange 文件" -#: ../src/extension/internal/emf-inout.cpp:3581 +#: ../src/extension/internal/emf-inout.cpp:3601 msgid "EMF Input" msgstr "EMF 输入" -#: ../src/extension/internal/emf-inout.cpp:3586 +#: ../src/extension/internal/emf-inout.cpp:3606 msgid "Enhanced Metafiles (*.emf)" msgstr "增强型图元文件 (*.emf)" -#: ../src/extension/internal/emf-inout.cpp:3587 +#: ../src/extension/internal/emf-inout.cpp:3607 msgid "Enhanced Metafiles" msgstr "增强型图元文件" -#: ../src/extension/internal/emf-inout.cpp:3595 +#: ../src/extension/internal/emf-inout.cpp:3615 msgid "EMF Output" msgstr "EMF 输出" -#: ../src/extension/internal/emf-inout.cpp:3597 -#: ../src/extension/internal/wmf-inout.cpp:3176 +#: ../src/extension/internal/emf-inout.cpp:3617 +#: ../src/extension/internal/wmf-inout.cpp:3196 msgid "Convert texts to paths" msgstr "将文字转换为路径" -#: ../src/extension/internal/emf-inout.cpp:3598 -#: ../src/extension/internal/wmf-inout.cpp:3177 +#: ../src/extension/internal/emf-inout.cpp:3618 +#: ../src/extension/internal/wmf-inout.cpp:3197 msgid "Map Unicode to Symbol font" msgstr "将万国码映射至符号字体" -#: ../src/extension/internal/emf-inout.cpp:3599 -#: ../src/extension/internal/wmf-inout.cpp:3178 +#: ../src/extension/internal/emf-inout.cpp:3619 +#: ../src/extension/internal/wmf-inout.cpp:3198 msgid "Map Unicode to Wingdings" msgstr "将万国码映射至 Wingdings" -#: ../src/extension/internal/emf-inout.cpp:3600 -#: ../src/extension/internal/wmf-inout.cpp:3179 +#: ../src/extension/internal/emf-inout.cpp:3620 +#: ../src/extension/internal/wmf-inout.cpp:3199 msgid "Map Unicode to Zapf Dingbats" msgstr "将万国码映射至 Zapf Dingbats" -#: ../src/extension/internal/emf-inout.cpp:3601 -#: ../src/extension/internal/wmf-inout.cpp:3180 +#: ../src/extension/internal/emf-inout.cpp:3621 +#: ../src/extension/internal/wmf-inout.cpp:3200 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" msgstr "为转换后的字符使用 Microsoft Unicode PUA (0xF020-0xF0FF)" -#: ../src/extension/internal/emf-inout.cpp:3602 -#: ../src/extension/internal/wmf-inout.cpp:3181 +#: ../src/extension/internal/emf-inout.cpp:3622 +#: ../src/extension/internal/wmf-inout.cpp:3201 msgid "Compensate for PPT font bug" msgstr "PPT 字体错误补偿" -#: ../src/extension/internal/emf-inout.cpp:3603 -#: ../src/extension/internal/wmf-inout.cpp:3182 +#: ../src/extension/internal/emf-inout.cpp:3623 +#: ../src/extension/internal/wmf-inout.cpp:3202 msgid "Convert dashed/dotted lines to single lines" msgstr "将虚线/点线转换为实线" -#: ../src/extension/internal/emf-inout.cpp:3604 -#: ../src/extension/internal/wmf-inout.cpp:3183 +#: ../src/extension/internal/emf-inout.cpp:3624 +#: ../src/extension/internal/wmf-inout.cpp:3203 msgid "Convert gradients to colored polygon series" msgstr "将渐变色转换为一系列的彩色多边形" -#: ../src/extension/internal/emf-inout.cpp:3605 +#: ../src/extension/internal/emf-inout.cpp:3625 msgid "Use native rectangular linear gradients" msgstr "使用原生线性矩形渐变" -#: ../src/extension/internal/emf-inout.cpp:3606 +#: ../src/extension/internal/emf-inout.cpp:3626 msgid "Map all fill patterns to standard EMF hatches" msgstr "将所有填充图案映射至标准 EMF 剖面线" -#: ../src/extension/internal/emf-inout.cpp:3607 +#: ../src/extension/internal/emf-inout.cpp:3627 msgid "Ignore image rotations" msgstr "忽略图片旋转" -#: ../src/extension/internal/emf-inout.cpp:3611 +#: ../src/extension/internal/emf-inout.cpp:3631 msgid "Enhanced Metafile (*.emf)" msgstr "增强型图元文件 (*.emf)" -#: ../src/extension/internal/emf-inout.cpp:3612 +#: ../src/extension/internal/emf-inout.cpp:3632 msgid "Enhanced Metafile" msgstr "增强型图元文件" @@ -5901,13 +5932,13 @@ msgstr "平滑度" #: ../src/extension/internal/filter/bevels.h:137 #: ../src/extension/internal/filter/bevels.h:221 msgid "Elevation (°)" -msgstr "仰角 (°)" +msgstr "仰角(°)" #: ../src/extension/internal/filter/bevels.h:57 #: ../src/extension/internal/filter/bevels.h:138 #: ../src/extension/internal/filter/bevels.h:222 msgid "Azimuth (°)" -msgstr "方位角 (°)" +msgstr "方位角(°)" #: ../src/extension/internal/filter/bevels.h:58 #: ../src/extension/internal/filter/bevels.h:139 @@ -5946,7 +5977,7 @@ msgstr "光照颜色" #: ../src/extension/internal/filter/distort.h:95 #: ../src/extension/internal/filter/distort.h:204 #: ../src/extension/internal/filter/filter-file.cpp:151 -#: ../src/extension/internal/filter/filter.cpp:212 +#: ../src/extension/internal/filter/filter.cpp:211 #: ../src/extension/internal/filter/image.h:61 #: ../src/extension/internal/filter/morphology.h:75 #: ../src/extension/internal/filter/morphology.h:202 @@ -5967,7 +5998,7 @@ msgstr "光照颜色" #: ../src/extension/internal/filter/transparency.h:214 #: ../src/extension/internal/filter/transparency.h:287 #: ../src/extension/internal/filter/transparency.h:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1793 +#: ../src/ui/dialog/inkscape-preferences.cpp:1805 #, c-format msgid "Filters" msgstr "滤镜" @@ -6154,7 +6185,7 @@ msgstr "侵蚀" #: ../src/extension/internal/filter/blurs.h:336 #: ../src/extension/internal/filter/color.h:1280 #: ../src/extension/internal/filter/color.h:1392 -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:123 msgid "Background color" msgstr "背景色" @@ -6178,7 +6209,7 @@ msgstr "混合类型:" #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:685 +#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:697 msgid "Normal" msgstr "正常" @@ -6281,12 +6312,13 @@ msgstr "高度" #: ../src/ui/widget/color-icc-selector.cpp:187 #: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 #: ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 +#: ../share/extensions/color_randomize.inx.h:9 msgid "Lightness" msgstr "亮度" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 +#: ../src/widgets/measure-toolbar.cpp:302 msgid "Precision" msgstr "精度" @@ -6303,7 +6335,7 @@ msgid "Distant" msgstr "远处灯光" #: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Point" msgstr "点" @@ -6469,18 +6501,18 @@ msgstr "亮度滤镜" #: ../src/extension/internal/filter/color.h:153 msgid "Channel Painting" -msgstr "频道涂绘" +msgstr "通道涂绘" #: ../src/extension/internal/filter/color.h:157 #: ../src/extension/internal/filter/color.h:332 #: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 #: ../src/ui/tools/flood-tool.cpp:95 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 #: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 #: ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 +#: ../share/extensions/color_randomize.inx.h:6 msgid "Saturation" msgstr "饱和度" @@ -6504,35 +6536,35 @@ msgstr "色盲类型:" #: ../src/extension/internal/filter/color.h:259 msgid "Rod monochromacy (atypical achromatopsia)" -msgstr "视杆细胞全色盲(非典型色盲)" +msgstr "视杆细胞全色盲(非典型色盲)" #: ../src/extension/internal/filter/color.h:260 msgid "Cone monochromacy (typical achromatopsia)" -msgstr "视锥细胞全色盲(典型色盲)" +msgstr "视锥细胞全色盲(典型色盲)" #: ../src/extension/internal/filter/color.h:261 msgid "Green weak (deuteranomaly)" -msgstr "绿色弱(Deuteranomaly)" +msgstr "绿色弱(Deuteranomaly)" #: ../src/extension/internal/filter/color.h:262 msgid "Green blind (deuteranopia)" -msgstr "绿色盲(Deuteranopia)" +msgstr "绿色盲(Deuteranopia)" #: ../src/extension/internal/filter/color.h:263 msgid "Red weak (protanomaly)" -msgstr "红色弱(Protanomaly)" +msgstr "红色弱(Protanomaly)" #: ../src/extension/internal/filter/color.h:264 msgid "Red blind (protanopia)" -msgstr "红色盲(Protanopia)" +msgstr "红色盲(Protanopia)" #: ../src/extension/internal/filter/color.h:265 msgid "Blue weak (tritanomaly)" -msgstr "蓝色弱(Tritanomaly)" +msgstr "蓝色弱(Tritanomaly)" #: ../src/extension/internal/filter/color.h:266 msgid "Blue blind (tritanopia)" -msgstr "蓝色盲(Tritanopia)" +msgstr "蓝色盲(Tritanopia)" #: ../src/extension/internal/filter/color.h:286 msgid "Simulate color blindness" @@ -6544,7 +6576,7 @@ msgstr "色移" #: ../src/extension/internal/filter/color.h:331 msgid "Shift (°)" -msgstr "偏移 (°)" +msgstr "偏移(°)" #: ../src/extension/internal/filter/color.h:340 msgid "Rotate and desaturate hue" @@ -6732,11 +6764,11 @@ msgstr "反转" #: ../src/extension/internal/filter/color.h:982 msgid "Invert channels:" -msgstr "反相通道:" +msgstr "反转通道:" #: ../src/extension/internal/filter/color.h:983 msgid "No inversion" -msgstr "无反相" +msgstr "无反转" #: ../src/extension/internal/filter/color.h:984 msgid "Red and blue" @@ -6783,13 +6815,14 @@ msgstr "阴影" #: ../src/live_effects/effect.cpp:108 #: ../src/live_effects/lpe-transform_2pts.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:1048 -#: ../src/widgets/gradient-toolbar.cpp:1162 +#: ../src/widgets/gradient-toolbar.cpp:1159 +#: ../src/widgets/measure-toolbar.cpp:328 msgid "Offset" msgstr "偏移" #: ../src/extension/internal/filter/color.h:1127 msgid "Modify lights and shadows separately" -msgstr "分别修改高光和阴影" +msgstr "分别修改光照和阴影" #: ../src/extension/internal/filter/color.h:1186 msgid "Lightness-Contrast" @@ -6801,7 +6834,7 @@ msgstr "分别修改亮度和对比度" #: ../src/extension/internal/filter/color.h:1265 msgid "Nudge RGB" -msgstr "微调 RGB" +msgstr "RGB 微调" #: ../src/extension/internal/filter/color.h:1269 msgid "Red offset" @@ -6844,7 +6877,7 @@ msgstr "分别微调 RGB 通道并将其与不同背景类型混合" #: ../src/extension/internal/filter/color.h:1377 msgid "Nudge CMY" -msgstr "微调 CMY" +msgstr "CMY 微调" #: ../src/extension/internal/filter/color.h:1381 msgid "Cyan offset" @@ -6870,7 +6903,7 @@ msgstr "四色调奇幻" #: ../src/extension/internal/filter/color.h:1485 msgid "Hue distribution (°)" -msgstr "色调分布 (°)" +msgstr "色调分布(°)" #: ../src/extension/internal/filter/color.h:1486 #: ../share/extensions/svgcalendar.inx.h:19 @@ -6883,7 +6916,7 @@ msgstr "用两种颜色替代色调" #: ../src/extension/internal/filter/color.h:1571 msgid "Hue rotation (°)" -msgstr "色调旋转 (°)" +msgstr "色调旋转(°)" #: ../src/extension/internal/filter/color.h:1574 msgid "Moonarize" @@ -6935,7 +6968,7 @@ msgstr "全局照明" #: ../src/extension/internal/filter/color.h:1683 msgid "Hue distribution (°):" -msgstr "色调分布 (°):" +msgstr "色调分布(°):" #: ../src/extension/internal/filter/color.h:1694 msgid "" @@ -6957,7 +6990,7 @@ msgstr "输出" #: ../src/ui/widget/selected-style.cpp:132 #: ../src/ui/widget/style-swatch.cpp:128 msgid "Stroke:" -msgstr "笔廓:" +msgstr "笔刷:" #: ../src/extension/internal/filter/distort.h:79 #: ../src/extension/internal/filter/textures.h:76 @@ -6982,7 +7015,7 @@ msgstr "湍流:" #: ../src/extension/internal/filter/overlays.h:61 #: ../src/extension/internal/filter/paint.h:692 msgid "Fractal noise" -msgstr "分形噪声" +msgstr "分形噪点" #: ../src/extension/internal/filter/distort.h:85 #: ../src/extension/internal/filter/distort.h:194 @@ -7108,7 +7141,7 @@ msgstr "开口" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 #: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317 -#: ../src/widgets/spray-toolbar.cpp:116 ../src/widgets/tweak-toolbar.cpp:128 +#: ../src/widgets/spray-toolbar.cpp:297 ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/interp_att_g.inx.h:12 msgid "Width" msgstr "宽度" @@ -7194,7 +7227,7 @@ msgid "Erosion 2" msgstr "侵蚀 2" #: ../src/extension/internal/filter/morphology.h:191 -#: ../src/live_effects/lpe-roughen.cpp:40 +#: ../src/live_effects/lpe-roughen.cpp:41 msgid "Smooth" msgstr "光滑" @@ -7204,7 +7237,7 @@ msgstr "填充不透明度:" #: ../src/extension/internal/filter/morphology.h:196 msgid "Stroke opacity:" -msgstr "笔廓不透明度:" +msgstr "笔刷不透明度:" #: ../src/extension/internal/filter/morphology.h:206 msgid "Adds a colorizable outline" @@ -7212,7 +7245,7 @@ msgstr "添加彩色轮廓" #: ../src/extension/internal/filter/overlays.h:56 msgid "Noise Fill" -msgstr "噪声填充" +msgstr "噪点填充" #: ../src/extension/internal/filter/overlays.h:59 #: ../src/extension/internal/filter/paint.h:690 @@ -7272,15 +7305,15 @@ msgstr "侵蚀:" #: ../src/extension/internal/filter/overlays.h:72 msgid "Noise color" -msgstr "噪声颜色" +msgstr "噪点颜色" #: ../src/extension/internal/filter/overlays.h:83 msgid "Basic noise fill and transparency texture" -msgstr "基本的噪声填充和透明纹理" +msgstr "基本的噪点填充和透明纹理" #: ../src/extension/internal/filter/paint.h:71 msgid "Chromolitho" -msgstr "多彩噪声" +msgstr "多彩噪点" #: ../src/extension/internal/filter/paint.h:75 #: ../share/extensions/jessyInk_keyBindings.inx.h:16 @@ -7341,8 +7374,8 @@ msgid "Convert image to an engraving made of vertical and horizontal lines" msgstr "将图像转换成用垂直线及水平线产生的版画效果" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:999 -#: ../src/widgets/desktop-widget.cpp:1998 +#: ../src/ui/dialog/align-and-distribute.cpp:1041 +#: ../src/widgets/desktop-widget.cpp:2049 msgid "Drawing" msgstr "绘图" @@ -7376,11 +7409,11 @@ msgstr "图像在填充上面" #: ../src/extension/internal/filter/paint.h:354 msgid "Stroke color" -msgstr "笔廓颜色" +msgstr "笔刷颜色" #: ../src/extension/internal/filter/paint.h:355 msgid "Image on stroke" -msgstr "笔廓图像" +msgstr "笔刷图像" #: ../src/extension/internal/filter/paint.h:366 msgid "Convert images to duochrome drawings" @@ -7422,7 +7455,7 @@ msgid "Contrasted" msgstr "醒目" #: ../src/extension/internal/filter/paint.h:591 -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Line width" msgstr "线条宽度" @@ -7434,7 +7467,7 @@ msgstr "混合模式:" #: ../src/extension/internal/filter/paint.h:605 msgid "Posterize and draw smooth lines around color shapes" -msgstr "色调分离(海报效果)并色彩形状周围绘制平滑线条" +msgstr "色调分离(海报效果)并色彩形状周围绘制平滑线条" #: ../src/extension/internal/filter/paint.h:687 msgid "Point Engraving" @@ -7442,7 +7475,7 @@ msgstr "网点版画" #: ../src/extension/internal/filter/paint.h:700 msgid "Noise blend:" -msgstr "噪声混合:" +msgstr "噪点混合:" #: ../src/extension/internal/filter/paint.h:708 msgid "Grain lightness" @@ -7478,11 +7511,11 @@ msgstr "油画" #: ../src/extension/internal/filter/paint.h:868 msgid "Simplify (primary)" -msgstr "简化 (主要)" +msgstr "简化(主要)" #: ../src/extension/internal/filter/paint.h:869 msgid "Simplify (secondary)" -msgstr "简化 (次要)" +msgstr "简化(次要)" #: ../src/extension/internal/filter/paint.h:870 msgid "Pre-saturation" @@ -7494,7 +7527,7 @@ msgstr "处理后饱和度" #: ../src/extension/internal/filter/paint.h:872 msgid "Simulate antialiasing" -msgstr "仿真反锯齿效果" +msgstr "仿真抗锯齿效果" #: ../src/extension/internal/filter/paint.h:880 msgid "Poster and painting effects" @@ -7502,7 +7535,7 @@ msgstr "海报和绘画效果" #: ../src/extension/internal/filter/paint.h:973 msgid "Posterize Basic" -msgstr "基本色调分离(海报风格)" +msgstr "基本色调分离(海报风格)" #: ../src/extension/internal/filter/paint.h:984 msgid "Simple posterizing effect" @@ -7526,15 +7559,15 @@ msgstr "投射阴影" #: ../src/extension/internal/filter/shadows.h:61 msgid "Blur radius (px)" -msgstr "模糊半径 (px)" +msgstr "模糊半径(像素)" #: ../src/extension/internal/filter/shadows.h:62 msgid "Horizontal offset (px)" -msgstr "水平偏移 (px)" +msgstr "水平偏移(像素)" #: ../src/extension/internal/filter/shadows.h:63 msgid "Vertical offset (px)" -msgstr "垂直偏移 (px)" +msgstr "垂直偏移(像素)" #: ../src/extension/internal/filter/shadows.h:64 msgid "Shadow type:" @@ -7600,7 +7633,7 @@ msgstr "自定义" #: ../src/extension/internal/filter/textures.h:83 msgid "Custom stroke options" -msgstr "自定义笔廓选项" +msgstr "自定义笔刷选项" #: ../src/extension/internal/filter/textures.h:84 msgid "k1:" @@ -7633,9 +7666,9 @@ msgid "Background" msgstr "背景" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2853 -#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:144 ../src/widgets/spray-toolbar.cpp:186 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 +#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:133 +#: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:389 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 #: ../share/extensions/triangle.inx.h:8 msgid "Mode:" @@ -7682,17 +7715,17 @@ msgstr "挖剪" msgid "Repaint anything visible monochrome" msgstr "重绘任何可见对象为灰阶" -#: ../src/extension/internal/gdkpixbuf-input.cpp:183 +#: ../src/extension/internal/gdkpixbuf-input.cpp:188 #, c-format msgid "%s bitmap image import" msgstr "导入 %s 位图图像" -#: ../src/extension/internal/gdkpixbuf-input.cpp:190 +#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format msgid "Image Import Type:" msgstr "图片导入类型:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:190 +#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format msgid "" "Embed results in stand-alone, larger SVG files. Link references a file " @@ -7701,76 +7734,76 @@ msgstr "" "内嵌将得到较大的单个 SVG 文件。链接则会引用这个 SVG 文档外的一个文件,且所有" "文件必须一起移动。" -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 -#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +#: ../src/ui/dialog/inkscape-preferences.cpp:1510 #, c-format msgid "Embed" msgstr "内嵌" -#: ../src/extension/internal/gdkpixbuf-input.cpp:192 ../src/sp-anchor.cpp:105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/extension/internal/gdkpixbuf-input.cpp:197 ../src/sp-anchor.cpp:105 +#: ../src/ui/dialog/inkscape-preferences.cpp:1510 #, c-format msgid "Link" msgstr "链接" -#: ../src/extension/internal/gdkpixbuf-input.cpp:195 +#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #, c-format msgid "Image DPI:" msgstr "图片 DPI:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:195 +#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #, c-format msgid "" "Take information from file or use default bitmap import resolution as " "defined in the preferences." msgstr "从文件获取信息惑使用缺省位图导入分辨率作为首选项中定义的分辨率。" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +#: ../src/extension/internal/gdkpixbuf-input.cpp:201 #, c-format msgid "From file" msgstr "从文件" -#: ../src/extension/internal/gdkpixbuf-input.cpp:197 +#: ../src/extension/internal/gdkpixbuf-input.cpp:202 #, c-format msgid "Default import resolution" msgstr "缺省导入分辨率" -#: ../src/extension/internal/gdkpixbuf-input.cpp:200 +#: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format msgid "Image Rendering Mode:" msgstr "图形渲染模式:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:200 +#: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format msgid "" "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " "not work in all browsers.)" msgstr "当图片放大时,应用平滑或维持块状 (像素)。(并不适用所有的浏览器。)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/extension/internal/gdkpixbuf-input.cpp:206 +#: ../src/ui/dialog/inkscape-preferences.cpp:1517 #, c-format msgid "None (auto)" -msgstr "无(auto)" +msgstr "无(自动)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:202 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/extension/internal/gdkpixbuf-input.cpp:207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1517 #, c-format msgid "Smooth (optimizeQuality)" -msgstr "平滑(optimizeQuality)" +msgstr "平滑(优化品质)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:203 -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/extension/internal/gdkpixbuf-input.cpp:208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1517 #, c-format msgid "Blocky (optimizeSpeed)" -msgstr "块状(optimizeSpeed)" +msgstr "块状(优化速度)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:206 +#: ../src/extension/internal/gdkpixbuf-input.cpp:211 #, c-format msgid "Hide the dialog next time and always apply the same actions." msgstr "下次隐藏对话窗并都应用相同动作。" -#: ../src/extension/internal/gdkpixbuf-input.cpp:206 +#: ../src/extension/internal/gdkpixbuf-input.cpp:211 #, c-format msgid "Don't ask again" msgstr "不再询问" @@ -7781,38 +7814,38 @@ msgstr "GIMP 渐变" #: ../src/extension/internal/gimpgrad.cpp:277 msgid "GIMP Gradient (*.ggr)" -msgstr "GIMP 渐变 (*.ggr)" +msgstr "GIMP 渐变(*.ggr)" #: ../src/extension/internal/gimpgrad.cpp:278 msgid "Gradients used in GIMP" msgstr "GIMP 中使用的渐变" -#: ../src/extension/internal/grid.cpp:205 ../src/ui/widget/panel.cpp:114 +#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:114 msgid "Grid" msgstr "网格" -#: ../src/extension/internal/grid.cpp:207 +#: ../src/extension/internal/grid.cpp:206 msgid "Line Width:" msgstr "线条宽度:" -#: ../src/extension/internal/grid.cpp:208 +#: ../src/extension/internal/grid.cpp:207 msgid "Horizontal Spacing:" msgstr "水平间距:" -#: ../src/extension/internal/grid.cpp:209 +#: ../src/extension/internal/grid.cpp:208 msgid "Vertical Spacing:" msgstr "垂直间距:" -#: ../src/extension/internal/grid.cpp:210 +#: ../src/extension/internal/grid.cpp:209 msgid "Horizontal Offset:" msgstr "水平偏移:" -#: ../src/extension/internal/grid.cpp:211 +#: ../src/extension/internal/grid.cpp:210 msgid "Vertical Offset:" msgstr "垂直偏移:" -#: ../src/extension/internal/grid.cpp:215 -#: ../src/ui/dialog/inkscape-preferences.cpp:1519 +#: ../src/extension/internal/grid.cpp:214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1531 #: ../share/extensions/draw_from_triangle.inx.h:58 #: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 #: ../share/extensions/funcplot.inx.h:38 @@ -7840,14 +7873,14 @@ msgstr "垂直偏移:" msgid "Render" msgstr "渲染" -#: ../src/extension/internal/grid.cpp:216 -#: ../src/ui/dialog/document-properties.cpp:162 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 -#: ../src/widgets/toolbox.cpp:1828 +#: ../src/extension/internal/grid.cpp:215 +#: ../src/ui/dialog/document-properties.cpp:163 +#: ../src/ui/dialog/inkscape-preferences.cpp:831 +#: ../src/widgets/toolbox.cpp:1879 msgid "Grids" msgstr "网格" -#: ../src/extension/internal/grid.cpp:219 +#: ../src/extension/internal/grid.cpp:218 msgid "Draw a path which is a grid" msgstr "绘制网格路径" @@ -7885,7 +7918,7 @@ msgstr "开放文档绘图输出" #: ../src/extension/internal/odf.cpp:2146 msgid "OpenDocument drawing (*.odg)" -msgstr "开放文档绘图 (*.odg)" +msgstr "开放文档绘图(*.odg)" #: ../src/extension/internal/odf.cpp:2147 msgid "OpenDocument drawing file" @@ -7916,7 +7949,7 @@ msgstr "插图框" #. Crop settings #: ../src/extension/internal/pdfinput/pdf-input.cpp:117 msgid "Clip to:" -msgstr "剪裁到:" +msgstr "剪切到:" #: ../src/extension/internal/pdfinput/pdf-input.cpp:128 msgid "Page settings" @@ -8009,7 +8042,7 @@ msgstr "PDF 输入" #: ../src/extension/internal/pdfinput/pdf-input.cpp:942 msgid "Adobe PDF (*.pdf)" -msgstr "Adobe PDF(*.pdf)" +msgstr "Adobe PDF(*.pdf)" #: ../src/extension/internal/pdfinput/pdf-input.cpp:943 msgid "Adobe Portable Document Format" @@ -8025,7 +8058,7 @@ msgstr "Adobe Illustrator 9.0 及以上版本 (*.ai)" #: ../src/extension/internal/pdfinput/pdf-input.cpp:956 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" -msgstr "打开使用 Adobe Illustrator 9.0(或更新版本)保存的文件" +msgstr "打开使用 Adobe Illustrator 9.0(或更新版本)保存的文件" #: ../src/extension/internal/pov-out.cpp:714 msgid "PovRay Output" @@ -8033,7 +8066,7 @@ msgstr "PovRay 输出" #: ../src/extension/internal/pov-out.cpp:719 msgid "PovRay (*.pov) (paths and shapes only)" -msgstr "PovRay (*.pov)(仅路径和形状)" +msgstr "PovRay (*.pov)(仅路径和形状)" #: ../src/extension/internal/pov-out.cpp:720 msgid "PovRay Raytracer File" @@ -8045,7 +8078,7 @@ msgstr "SVG 输入" #: ../src/extension/internal/svg.cpp:105 msgid "Scalable Vector Graphic (*.svg)" -msgstr "可缩放矢量图形 (*.svg)" +msgstr "可缩放矢量图形(*.svg)" #: ../src/extension/internal/svg.cpp:106 msgid "Inkscape native file format and W3C standard" @@ -8063,7 +8096,7 @@ msgstr "Inkscape SVG (*.svg)" msgid "SVG format with Inkscape extensions" msgstr "带有 Inkscape 扩展的 SVG 格式" -#: ../src/extension/internal/svg.cpp:128 +#: ../src/extension/internal/svg.cpp:128 ../share/extensions/scour.inx.h:19 msgid "SVG Output" msgstr "SVG 输出" @@ -8109,7 +8142,7 @@ msgstr "VSD 输入" #: ../src/extension/internal/vsd-input.cpp:306 msgid "Microsoft Visio Diagram (*.vsd)" -msgstr "微软 Visio 图表 (*.vsd)" +msgstr "微软 Visio 图表(*.vsd)" #: ../src/extension/internal/vsd-input.cpp:307 msgid "File format used by Microsoft Visio 6 and later" @@ -8121,7 +8154,7 @@ msgstr "VDX 输入" #: ../src/extension/internal/vsd-input.cpp:319 msgid "Microsoft Visio XML Diagram (*.vdx)" -msgstr "微软 Visio XML 图表 (*.vdx)" +msgstr "微软 Visio XML 图表(*.vdx)" #: ../src/extension/internal/vsd-input.cpp:320 msgid "File format used by Microsoft Visio 2010 and later" @@ -8133,7 +8166,7 @@ msgstr "VSDM 输入" #: ../src/extension/internal/vsd-input.cpp:332 msgid "Microsoft Visio 2013 drawing (*.vsdm)" -msgstr "微软 Visio 2013 绘图文件 (*.vsdm)" +msgstr "微软 Visio 2013 绘图文件(*.vsdm)" #: ../src/extension/internal/vsd-input.cpp:333 #: ../src/extension/internal/vsd-input.cpp:346 @@ -8146,34 +8179,34 @@ msgstr "VSDX 输入" #: ../src/extension/internal/vsd-input.cpp:345 msgid "Microsoft Visio 2013 drawing (*.vsdx)" -msgstr "微软 Visio 2013 绘图文件 (*.vsdx)" +msgstr "微软 Visio 2013 绘图文件(*.vsdx)" -#: ../src/extension/internal/wmf-inout.cpp:3160 +#: ../src/extension/internal/wmf-inout.cpp:3180 msgid "WMF Input" msgstr "WMF 输入" -#: ../src/extension/internal/wmf-inout.cpp:3165 +#: ../src/extension/internal/wmf-inout.cpp:3185 msgid "Windows Metafiles (*.wmf)" -msgstr "Windows 图元文件 (*.wmf)" +msgstr "Windows 图元文件(*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3166 +#: ../src/extension/internal/wmf-inout.cpp:3186 msgid "Windows Metafiles" msgstr "Windows 图元文件" -#: ../src/extension/internal/wmf-inout.cpp:3174 +#: ../src/extension/internal/wmf-inout.cpp:3194 msgid "WMF Output" msgstr "WMF 输出" -#: ../src/extension/internal/wmf-inout.cpp:3184 +#: ../src/extension/internal/wmf-inout.cpp:3204 msgid "Map all fill patterns to standard WMF hatches" msgstr "将全部填充图样对应到标准 WMF 剖面线" -#: ../src/extension/internal/wmf-inout.cpp:3188 +#: ../src/extension/internal/wmf-inout.cpp:3208 #: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" -msgstr "Windows 图元文件 (*.wmf)" +msgstr "Windows 图元文件(*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3189 +#: ../src/extension/internal/wmf-inout.cpp:3209 msgid "Windows Metafile" msgstr "Windows 元文件" @@ -8183,7 +8216,7 @@ msgstr "WPG 输入" #: ../src/extension/internal/wpg-input.cpp:149 msgid "WordPerfect Graphics (*.wpg)" -msgstr "WordPerfect 图形 (*.wpg)" +msgstr "WordPerfect 图形(*.wpg)" #: ../src/extension/internal/wpg-input.cpp:150 msgid "Vector graphics format used by Corel WordPerfect" @@ -8201,119 +8234,119 @@ msgstr "该效果会在画布上实时预览吗?" msgid "Format autodetect failed. The file is being opened as SVG." msgstr "自动探测文件格式失败。将以 SVG 格式打开此文件。" -#: ../src/file.cpp:183 +#: ../src/file.cpp:185 msgid "default.svg" msgstr "default.svg" -#: ../src/file.cpp:328 +#: ../src/file.cpp:332 msgid "Broken links have been changed to point to existing files." msgstr "无效的链接已变成指向现有文件。" -#: ../src/file.cpp:339 ../src/file.cpp:1274 +#: ../src/file.cpp:343 ../src/file.cpp:1278 #, c-format msgid "Failed to load the requested file %s" msgstr "请求的文件 %s 加载失败" -#: ../src/file.cpp:365 +#: ../src/file.cpp:369 msgid "Document not saved yet. Cannot revert." msgstr "文档未保存。不能还原。" -#: ../src/file.cpp:371 +#: ../src/file.cpp:375 msgid "Changes will be lost! Are you sure you want to reload document %1?" -msgstr "更改将会遗失!你确定要重新加载文件 %1?" +msgstr "更改将会遗失!您确定要重新加载文件 %1?" -#: ../src/file.cpp:397 +#: ../src/file.cpp:401 msgid "Document reverted." msgstr "文档已还原。" -#: ../src/file.cpp:399 +#: ../src/file.cpp:403 msgid "Document not reverted." msgstr "文档未还原。" -#: ../src/file.cpp:549 +#: ../src/file.cpp:553 msgid "Select file to open" msgstr "选择要打开的文件" -#: ../src/file.cpp:631 +#: ../src/file.cpp:635 msgid "Clean up document" msgstr "清理文档" -#: ../src/file.cpp:638 +#: ../src/file.cpp:642 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." msgstr[0] "去除了 %i 个在 <defs> 中的未使用定义。" -#: ../src/file.cpp:643 +#: ../src/file.cpp:647 msgid "No unused definitions in <defs>." msgstr "在 <defs> 没有未使用定义." -#: ../src/file.cpp:675 +#: ../src/file.cpp:679 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " "caused by an unknown filename extension." -msgstr "没有找到 Inkscape 扩展名来保存文档(%s)。可能是未知文件扩展名导致的。" +msgstr "没有找到 Inkscape 扩展名来保存文档(%s)。可能是未知文件扩展名导致的。" -#: ../src/file.cpp:676 ../src/file.cpp:684 ../src/file.cpp:692 -#: ../src/file.cpp:698 ../src/file.cpp:703 +#: ../src/file.cpp:680 ../src/file.cpp:688 ../src/file.cpp:696 +#: ../src/file.cpp:702 ../src/file.cpp:707 msgid "Document not saved." msgstr "文档未保存." -#: ../src/file.cpp:683 +#: ../src/file.cpp:687 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." msgstr "文件 %s 受写保护。请移除写保护后重试。" -#: ../src/file.cpp:691 +#: ../src/file.cpp:695 #, c-format msgid "File %s could not be saved." msgstr "无法保存文件 %s。" -#: ../src/file.cpp:721 ../src/file.cpp:723 +#: ../src/file.cpp:725 ../src/file.cpp:727 msgid "Document saved." msgstr "文档已保存。" #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:866 ../src/file.cpp:1433 +#: ../src/file.cpp:870 ../src/file.cpp:1437 msgid "drawing" msgstr "绘图" -#: ../src/file.cpp:871 +#: ../src/file.cpp:875 msgid "drawing-%1" msgstr "绘图-%1" -#: ../src/file.cpp:888 +#: ../src/file.cpp:892 msgid "Select file to save a copy to" msgstr "选择要保存副本的文件" -#: ../src/file.cpp:890 +#: ../src/file.cpp:894 msgid "Select file to save to" msgstr "选择要保存的文件" -#: ../src/file.cpp:995 ../src/file.cpp:997 +#: ../src/file.cpp:999 ../src/file.cpp:1001 msgid "No changes need to be saved." msgstr "没有需要保存的更改。" -#: ../src/file.cpp:1016 +#: ../src/file.cpp:1020 msgid "Saving document..." -msgstr "正在保存文档…" +msgstr "正在保存文档..." -#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1492 +#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1504 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "导入" -#: ../src/file.cpp:1321 +#: ../src/file.cpp:1325 msgid "Select file to import" msgstr "选择要导入的文件" -#: ../src/file.cpp:1454 +#: ../src/file.cpp:1458 msgid "Select file to export to" msgstr "选择要导出的文件" -#: ../src/file.cpp:1707 +#: ../src/file.cpp:1711 msgid "Import Clip Art" msgstr "导入剪贴画" @@ -8375,7 +8408,7 @@ msgstr "填充绘制" #: ../src/filter-enums.cpp:46 msgid "Stroke Paint" -msgstr "笔廓绘制" +msgstr "笔刷绘制" #. New in Compositing and Blending Level 1 #: ../src/filter-enums.cpp:58 @@ -8479,7 +8512,7 @@ msgid "Arithmetic" msgstr "算术运算" #: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:545 -#: ../src/ui/dialog/objects.cpp:1889 +#: ../src/ui/dialog/objects.cpp:1893 msgid "Duplicate" msgstr "再制" @@ -8502,7 +8535,7 @@ msgstr "膨胀" #: ../src/filter-enums.cpp:144 msgid "Fractal Noise" -msgstr "不规则噪声" +msgstr "不规则噪点" #: ../src/filter-enums.cpp:151 msgid "Distant Light" @@ -8524,7 +8557,7 @@ msgstr "反转渐变颜色" msgid "Reverse gradient" msgstr "反转渐变" -#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:226 +#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:222 msgid "Delete swatch" msgstr "删除色盘" @@ -8572,24 +8605,24 @@ msgstr "网面渐变控制点" msgid "Mesh gradient tensor" msgstr "网面渐变张量" -#: ../src/gradient-drag.cpp:567 +#: ../src/gradient-drag.cpp:565 msgid "Added patch row or column" msgstr "加入的网面区块行或列" -#: ../src/gradient-drag.cpp:799 +#: ../src/gradient-drag.cpp:798 msgid "Merge gradient handles" msgstr "合并渐变控制柄" #. we did an undoable action -#: ../src/gradient-drag.cpp:1105 +#: ../src/gradient-drag.cpp:1101 msgid "Move gradient handle" msgstr "移动渐变柄" -#: ../src/gradient-drag.cpp:1164 ../src/widgets/gradient-vector.cpp:834 +#: ../src/gradient-drag.cpp:1160 ../src/widgets/gradient-vector.cpp:834 msgid "Delete gradient stop" msgstr "删除渐变分段点" -#: ../src/gradient-drag.cpp:1427 +#: ../src/gradient-drag.cpp:1423 #, c-format msgid "" "%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl" @@ -8598,11 +8631,11 @@ msgstr "" "%s %d 属于:%s%s;按住Ctrl拖动吸附偏移;按住Ctrl+Alt单击删除分" "段点" -#: ../src/gradient-drag.cpp:1431 ../src/gradient-drag.cpp:1438 +#: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434 msgid " (stroke)" -msgstr "(笔廓)" +msgstr " (笔刷)" -#: ../src/gradient-drag.cpp:1435 +#: ../src/gradient-drag.cpp:1431 #, c-format msgid "" "%s for: %s%s; drag with Ctrl to snap angle, with Ctrl+Alt to " @@ -8611,13 +8644,13 @@ msgstr "" "%s 属于:%s%s;按住Ctrl拖动吸附角,按住Ctrl+Alt保持角度,按住" "Ctrl+Shift以中心缩放" -#: ../src/gradient-drag.cpp:1443 +#: ../src/gradient-drag.cpp:1439 msgid "" "Radial gradient center and focus; drag with Shift to " "separate focus" msgstr "辐向渐变中心焦点;按住 Shift 拖动分开焦点" -#: ../src/gradient-drag.cpp:1446 +#: ../src/gradient-drag.cpp:1442 #, c-format msgid "" "Gradient point shared by %d gradient; drag with Shift to " @@ -8627,15 +8660,15 @@ msgid_plural "" "separate" msgstr[0] "渐变点由%d个渐变共享;按住 Shift 拖动分开" -#: ../src/gradient-drag.cpp:2379 +#: ../src/gradient-drag.cpp:2364 msgid "Move gradient handle(s)" msgstr "移动渐变控制柄" -#: ../src/gradient-drag.cpp:2415 +#: ../src/gradient-drag.cpp:2398 msgid "Move gradient mid stop(s)" msgstr "移动渐变中间分段点" -#: ../src/gradient-drag.cpp:2704 +#: ../src/gradient-drag.cpp:2687 msgid "Delete gradient stop(s)" msgstr "删除渐变分段点" @@ -8649,7 +8682,7 @@ msgstr "自动保存失败!无法打开目录 %1。" #: ../src/inkscape.cpp:267 msgid "Autosaving documents..." -msgstr "正在自动保存…" +msgstr "正在自动保存..." #: ../src/inkscape.cpp:335 msgid "Autosave failed! Could not find inkscape extension to save document." @@ -8706,7 +8739,7 @@ msgstr "缩放图案填充;Ctrl统一缩放填充" #: ../src/knotholder.cpp:285 ../src/knotholder.cpp:307 msgid "Rotate the pattern fill; with Ctrl to snap angle" -msgstr "旋转图案填充;按住 Ctrl 吸附角度" +msgstr "旋转图案填充;按住Ctrl吸附角度" #: ../src/libgdl/gdl-dock-bar.c:105 msgid "Master" @@ -8740,9 +8773,7 @@ msgstr "控制面板项" msgid "Dockitem which 'owns' this grip" msgstr "拖动柄所属的面板项" -#. Name -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:192 -#: ../src/widgets/text-toolbar.cpp:1411 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:197 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 msgid "Orientation" @@ -8768,7 +8799,7 @@ msgstr "项目行为" msgid "" "General behavior for the dock item (i.e. whether it can float, if it's " "locked, etc.)" -msgstr "面板项的一般行为(例如:是否可浮动、是否锁定等)" +msgstr "面板项的一般行为(例如是否可浮动、是否锁定等)" #: ../src/libgdl/gdl-dock-item.c:331 ../src/libgdl/gdl-dock-master.c:148 msgid "Locked" @@ -8801,7 +8832,7 @@ msgid "" "You can't add a dock object (%p of type %s) inside a %s. Use a GdlDock or " "some other compound dock object." msgstr "" -"不能将面板对象(%p,类型 %s)添加到 %s。请使用 GdlDock 或其它匹配面板对象." +"不能将面板对象(%p,类型 %s)添加到 %s。请使用 GdlDock 或其他匹配面板对象." #: ../src/libgdl/gdl-dock-item.c:723 #, c-format @@ -8866,7 +8897,7 @@ msgstr "开关按钮样式" msgid "" "master %p: unable to add object %p[%s] to the hash. There already is an " "item with that name (%p)." -msgstr "主栏 %p:无法将对象 %p[%s] 添加到 hash。已有同名的项目(%p)。" +msgstr "主栏 %p:无法将对象 %p[%s] 添加到 hash。已有同名的项目(%p)。" #: ../src/libgdl/gdl-dock-master.c:955 #, c-format @@ -8876,10 +8907,10 @@ msgid "" msgstr "新的面板控制栏 %p 是自动的。只有手动面板对象能作为命名的控制栏。" #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:998 -#: ../src/ui/dialog/document-properties.cpp:160 +#: ../src/ui/dialog/align-and-distribute.cpp:1040 +#: ../src/ui/dialog/document-properties.cpp:161 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 -#: ../src/widgets/desktop-widget.cpp:1994 +#: ../src/widgets/desktop-widget.cpp:2045 #: ../share/extensions/empty_page.inx.h:1 #: ../share/extensions/voronoi2svg.inx.h:9 msgid "Page" @@ -8891,8 +8922,8 @@ msgstr "当前页的索引" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 -#: ../src/ui/dialog/inkscape-preferences.cpp:1553 -#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:154 +#: ../src/ui/dialog/inkscape-preferences.cpp:1565 +#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "名称" @@ -8938,14 +8969,14 @@ msgstr "该停靠对象绑定到的面板" msgid "" "Call to gdl_dock_object_dock in a dock object %p (object type is %s) which " "hasn't implemented this method" -msgstr "尚未实现在面板对象 %p(对象类型 %s)中调用 gdl_dock_object_dock" +msgstr "尚未实现在面板对象 %p (对象类型 %s)中调用 gdl_dock_object_dock" #: ../src/libgdl/gdl-dock-object.c:602 #, c-format msgid "" "Dock operation requested in a non-bound object %p. The application might " "crash" -msgstr "在非捆绑(自由)对象 %p 中请求了停靠操作。程序可能崩溃" +msgstr "在非捆绑(自由)对象 %p 中请求了停靠操作。程序可能崩溃" #: ../src/libgdl/gdl-dock-object.c:609 #, c-format @@ -8956,9 +8987,9 @@ msgstr "不能将 %p 停靠到 %p,因为他们属于不同的主栏" #, c-format msgid "" "Attempt to bind to %p an already bound dock object %p (current master: %p)" -msgstr "试图向 %p 中捆绑一个已经绑定的面板对象 %p(当前主栏:%p)" +msgstr "试图向 %p 中捆绑一个已经绑定的面板对象 %p (当前主栏:%p)" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:230 +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:235 msgid "Position" msgstr "位置" @@ -9033,7 +9064,7 @@ msgstr "试图将一个面板对象停靠到一个自由占位栏" #: ../src/libgdl/gdl-dock-placeholder.c:611 #, c-format msgid "Got a detach signal from an object (%p) who is not our host %p" -msgstr "从非我方主机(%2$p)的对象(%1$p)收到分离信号" +msgstr "从非我方主机(%2$p)的对象(%1$p)收到分离信号" #: ../src/libgdl/gdl-dock-placeholder.c:636 #, c-format @@ -9046,8 +9077,8 @@ msgstr "从父对象 %1$p 中为 %2$p 获取子位置时发生意外" msgid "Dockitem which 'owns' this tablabel" msgstr "工具栏项目“拥有”这个分页标签" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:674 -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:729 msgid "Floating" msgstr "浮动" @@ -9104,15 +9135,15 @@ msgstr "角度二等分线" #: ../src/live_effects/effect.cpp:101 msgid "Circle (by center and radius)" -msgstr "圆 (通过中心和半径)" +msgstr "圆(通过中心和半径)" #: ../src/live_effects/effect.cpp:102 msgid "Circle by 3 points" -msgstr "圆 (三点法)" +msgstr "圆(三点法)" #: ../src/live_effects/effect.cpp:103 msgid "Dynamic stroke" -msgstr "动态笔廓" +msgstr "动态笔刷" #: ../src/live_effects/effect.cpp:104 ../share/extensions/extrude.inx.h:1 msgid "Extrude" @@ -9207,7 +9238,7 @@ msgstr "内插子路径" #: ../src/live_effects/effect.cpp:130 msgid "Hatches (rough)" -msgstr "影线(粗糙)" +msgstr "影线(粗糙)" #: ../src/live_effects/effect.cpp:131 msgid "Sketch" @@ -9220,7 +9251,7 @@ msgstr "标尺" #. 0.91 #: ../src/live_effects/effect.cpp:134 msgid "Power stroke" -msgstr "神奇笔廓" +msgstr "神奇笔刷" #: ../src/live_effects/effect.cpp:135 msgid "Clone original path" @@ -9232,7 +9263,7 @@ msgstr "复制原本路径" msgid "Show handles" msgstr "显示控制柄" -#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:121 +#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:118 msgid "BSpline" msgstr "B 样条" @@ -9242,7 +9273,7 @@ msgstr "接合类型" #: ../src/live_effects/effect.cpp:141 msgid "Taper stroke" -msgstr "笔廓锥化" +msgstr "笔刷锥化" #. Ponyscape #: ../src/live_effects/effect.cpp:143 @@ -9251,9 +9282,9 @@ msgstr "贴附路径" #: ../src/live_effects/effect.cpp:144 msgid "Fill between strokes" -msgstr "笔廓间填充" +msgstr "笔刷间填充" -#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2871 +#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2874 msgid "Fill between many" msgstr "填充多对象间隙" @@ -9285,31 +9316,31 @@ msgstr "插入点" msgid "Transform by 2 points" msgstr "变换渐变" -#: ../src/live_effects/effect.cpp:361 +#: ../src/live_effects/effect.cpp:362 msgid "Is visible?" msgstr "可见?" -#: ../src/live_effects/effect.cpp:361 +#: ../src/live_effects/effect.cpp:362 msgid "" "If unchecked, the effect remains applied to the object but is temporarily " "disabled on canvas" msgstr "如果不选中,对象仍然拥有该效果,但暂时不显示在画布上" -#: ../src/live_effects/effect.cpp:386 +#: ../src/live_effects/effect.cpp:387 msgid "No effect" msgstr "没有效果" -#: ../src/live_effects/effect.cpp:494 +#: ../src/live_effects/effect.cpp:495 #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" -msgstr "请为 LPE“%s”指定参数路径,通过 %d 次鼠标单击" +msgstr "请为 LPE “%s”指定参数路径,通过 %d 次鼠标单击" -#: ../src/live_effects/effect.cpp:761 +#: ../src/live_effects/effect.cpp:762 #, c-format msgid "Editing parameter %s." -msgstr "正在编辑参数 %s。" +msgstr "正在编辑参数%s。" -#: ../src/live_effects/effect.cpp:766 +#: ../src/live_effects/effect.cpp:767 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "已经应用的路径效果的参数都不能在画布上修改。" @@ -9374,41 +9405,46 @@ msgstr "结束路径曲线起点:" msgid "End path curve end:" msgstr "结束路径曲线末端:" -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Bend path:" msgstr "弯曲路径:" -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Path along which to bend the original path" msgstr "沿该路径弯曲原始路径" -#: ../src/live_effects/lpe-bendpath.cpp:54 -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/transformation.cpp:74 +#: ../src/live_effects/lpe-bendpath.cpp:71 +#: ../src/live_effects/lpe-patternalongpath.cpp:74 +#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/transformation.cpp:73 #: ../src/ui/widget/page-sizer.cpp:237 msgid "_Width:" msgstr "宽度(_W):" -#: ../src/live_effects/lpe-bendpath.cpp:54 +#: ../src/live_effects/lpe-bendpath.cpp:71 msgid "Width of the path" msgstr "路径宽度" -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/live_effects/lpe-bendpath.cpp:72 msgid "W_idth in units of length" msgstr "宽度随长度的单位(_I)" -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/live_effects/lpe-bendpath.cpp:72 msgid "Scale the width of the path in units of its length" msgstr "根据其长度缩放路径宽度" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/live_effects/lpe-bendpath.cpp:73 msgid "_Original path is vertical" msgstr "原始路径为垂直方向(_O)" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/live_effects/lpe-bendpath.cpp:73 msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "在沿弯曲路径弯曲之前,先旋转90度" +#: ../src/live_effects/lpe-bendpath.cpp:178 +#: ../src/live_effects/lpe-patternalongpath.cpp:278 +msgid "Change the width" +msgstr "改变宽度" + #: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 #: ../src/live_effects/lpe-fill-between-many.cpp:25 @@ -9487,8 +9523,8 @@ msgid "Change to 0 weight" msgstr "更改为 0 的权重" #: ../src/live_effects/lpe-bspline.cpp:160 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:232 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:240 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:262 #: ../src/live_effects/parameter/parameter.cpp:170 msgid "Change scalar parameter" msgstr "修改标量参数" @@ -9623,7 +9659,7 @@ msgstr "沿该左侧路径弯曲原始路径" #: ../src/live_effects/lpe-envelope.cpp:35 msgid "_Enable left & right paths" -msgstr "启用左边和右边路径(_E)" +msgstr "启用左右路径(_E)" #: ../src/live_effects/lpe-envelope.cpp:35 msgid "Enable the left and right deformation paths" @@ -9631,7 +9667,7 @@ msgstr "使用左右两侧的变形路径" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "_Enable top & bottom paths" -msgstr "启用顶端和底端路径(_E)" +msgstr "启用上下路径(_E)" #: ../src/live_effects/lpe-envelope.cpp:36 msgid "Enable the top and bottom deformation paths" @@ -9666,6 +9702,7 @@ msgid "Reverses the second path order" msgstr "反转第二条路径顺序" #: ../src/live_effects/lpe-fillet-chamfer.cpp:41 +#: ../src/widgets/text-toolbar.cpp:1540 #: ../share/extensions/render_barcode_qrcode.inx.h:5 msgid "Auto" msgstr "自动" @@ -9708,7 +9745,7 @@ msgstr "圆角方式" #: ../src/live_effects/lpe-fillet-chamfer.cpp:60 msgid "Radius (unit or %):" -msgstr "半径(单位或 %):" +msgstr "半径(单位或 %):" #: ../src/live_effects/lpe-fillet-chamfer.cpp:60 msgid "Radius, in unit or %" @@ -9730,40 +9767,48 @@ msgstr "方向性辅助标示尺寸:" msgid "Helper size with direction" msgstr "方向性辅助标示尺寸" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:157 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:103 +msgid "IMPORTANT! New version soon..." +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:107 +msgid "Not compatible. Convert to path after." +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 msgid "Fillet" msgstr "圆角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:161 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:169 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 msgid "Inverse fillet" msgstr "反向圆角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:166 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:174 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 msgid "Chamfer" msgstr "倒角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:170 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:178 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 msgid "Inverse chamfer" msgstr "反向倒角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:239 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:247 msgid "Convert to fillet" msgstr "转换为圆角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:246 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:278 msgid "Convert to inverse fillet" msgstr "转换为反向圆角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:262 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 msgid "Convert to chamfer" msgstr "转换为倒角" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:282 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:290 msgid "Knots and helper paths refreshed" msgstr "" @@ -9783,29 +9828,29 @@ msgstr "压力角(_P):" msgid "" "Tooth pressure angle (typically 20-25 deg). The ratio of teeth not in " "contact." -msgstr "轮齿的压力角(通常为 20-25 度)。决定非接触齿面的比例。" +msgstr "轮齿的压力角(通常为 20-25 度)。决定非接触齿面的比例。" -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Trajectory:" msgstr "轨道:" -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Path along which intermediate steps are created." msgstr "沿该路径插入过渡子路径。" -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Steps_:" msgstr "阶层数(_:):" -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Determines the number of steps from start to end path." msgstr "从起点到终点的步数。" -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "E_quidistant spacing" msgstr "等距(_Q)" -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "" "If true, the spacing between intermediates is constant along the length of " "the path. If false, the distance depends on the location of the nodes of the " @@ -9844,7 +9889,7 @@ msgstr "内插法类型:" msgid "" "Determines which kind of interpolator will be used to interpolate between " "stroke width along the path" -msgstr "决定笔廓宽度之间沿着路径内插要使用哪一种内插法" +msgstr "决定笔刷宽度之间沿着路径内插要使用哪一种内插法" #: ../src/live_effects/lpe-jointype.cpp:31 #: ../src/live_effects/lpe-powerstroke.cpp:166 @@ -9853,7 +9898,7 @@ msgid "Beveled" msgstr "斜面" #: ../src/live_effects/lpe-jointype.cpp:32 -#: ../src/live_effects/lpe-jointype.cpp:40 +#: ../src/live_effects/lpe-jointype.cpp:43 #: ../src/live_effects/lpe-powerstroke.cpp:167 #: ../src/live_effects/lpe-taperstroke.cpp:64 #: ../src/widgets/star-toolbar.cpp:534 @@ -9876,122 +9921,137 @@ msgstr "\t斜接剪裁" msgid "Extrapolated arc" msgstr "外推弧" -#: ../src/live_effects/lpe-jointype.cpp:39 +#: ../src/live_effects/lpe-jointype.cpp:36 +#, fuzzy +msgid "Extrapolated arc Alt1" +msgstr "外推弧" + +#: ../src/live_effects/lpe-jointype.cpp:37 +#, fuzzy +msgid "Extrapolated arc Alt2" +msgstr "外推弧" + +#: ../src/live_effects/lpe-jointype.cpp:38 +#, fuzzy +msgid "Extrapolated arc Alt3" +msgstr "外推弧" + +#: ../src/live_effects/lpe-jointype.cpp:42 #: ../src/live_effects/lpe-powerstroke.cpp:149 msgid "Butt" msgstr "平端" -#: ../src/live_effects/lpe-jointype.cpp:41 +#: ../src/live_effects/lpe-jointype.cpp:44 #: ../src/live_effects/lpe-powerstroke.cpp:150 msgid "Square" msgstr "方" -#: ../src/live_effects/lpe-jointype.cpp:42 +#: ../src/live_effects/lpe-jointype.cpp:45 #: ../src/live_effects/lpe-powerstroke.cpp:152 msgid "Peak" msgstr "峰" -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Thickness of the stroke" -msgstr "笔廓粗细" +msgstr "笔刷粗细" -#: ../src/live_effects/lpe-jointype.cpp:52 +#: ../src/live_effects/lpe-jointype.cpp:55 msgid "Line cap" msgstr "线端" -#: ../src/live_effects/lpe-jointype.cpp:52 +#: ../src/live_effects/lpe-jointype.cpp:55 msgid "The end shape of the stroke" -msgstr "笔廓端点形状" +msgstr "笔刷端点形状" #. Join type #. TRANSLATORS: The line join style specifies the shape to be used at the #. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-jointype.cpp:53 +#: ../src/live_effects/lpe-jointype.cpp:56 #: ../src/live_effects/lpe-powerstroke.cpp:182 -#: ../src/widgets/stroke-style.cpp:227 +#: ../src/widgets/stroke-style.cpp:288 msgid "Join:" msgstr "交点:" -#: ../src/live_effects/lpe-jointype.cpp:53 +#: ../src/live_effects/lpe-jointype.cpp:56 #: ../src/live_effects/lpe-powerstroke.cpp:182 msgid "Determines the shape of the path's corners" msgstr "决定路径转角的形状" #. start_lean(_("Start path lean"), _("Start path lean"), "start_lean", &wr, this, 0.), #. end_lean(_("End path lean"), _("End path lean"), "end_lean", &wr, this, 0.), -#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-jointype.cpp:59 #: ../src/live_effects/lpe-powerstroke.cpp:183 #: ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Miter limit:" msgstr "斜切限制:" -#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-jointype.cpp:59 msgid "Maximum length of the miter join (in units of stroke width)" -msgstr "斜切接合的最大长度(单位为笔廓宽度单位)" +msgstr "斜切接合的最大长度(单位为笔刷宽度单位)" -#: ../src/live_effects/lpe-jointype.cpp:57 +#: ../src/live_effects/lpe-jointype.cpp:60 msgid "Force miter" msgstr "强制斜切" -#: ../src/live_effects/lpe-jointype.cpp:57 +#: ../src/live_effects/lpe-jointype.cpp:60 msgid "Overrides the miter limit and forces a join." msgstr "覆盖斜切限制并强制接合。" #. initialise your parameters here: -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/live_effects/lpe-knot.cpp:350 msgid "Fi_xed width:" msgstr "固定宽度(_X):" -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/live_effects/lpe-knot.cpp:350 msgid "Size of hidden region of lower string" msgstr "下方绳子的隐藏长度" -#: ../src/live_effects/lpe-knot.cpp:352 +#: ../src/live_effects/lpe-knot.cpp:351 msgid "_In units of stroke width" -msgstr "使用笔廓宽度的单位(_I)" +msgstr "使用笔刷宽度的单位(_I)" -#: ../src/live_effects/lpe-knot.cpp:352 +#: ../src/live_effects/lpe-knot.cpp:351 msgid "Consider 'Interruption width' as a ratio of stroke width" -msgstr "将“间断宽度”设置为笔廓宽度的比例" +msgstr "将“间断宽度”设置为笔刷宽度的比例" -#: ../src/live_effects/lpe-knot.cpp:353 +#: ../src/live_effects/lpe-knot.cpp:352 msgid "St_roke width" -msgstr "笔廓宽度(_R)" +msgstr "笔刷宽度(_R)" -#: ../src/live_effects/lpe-knot.cpp:353 +#: ../src/live_effects/lpe-knot.cpp:352 msgid "Add the stroke width to the interruption size" -msgstr "将笔廓宽度添加到间断长度中" +msgstr "将笔刷宽度添加到间断长度中" -#: ../src/live_effects/lpe-knot.cpp:354 +#: ../src/live_effects/lpe-knot.cpp:353 msgid "_Crossing path stroke width" -msgstr "交叉路径的笔廓宽度(_C)" +msgstr "交叉路径的笔刷宽度(_C)" -#: ../src/live_effects/lpe-knot.cpp:354 +#: ../src/live_effects/lpe-knot.cpp:353 msgid "Add crossed stroke width to the interruption size" -msgstr "将交叉线的笔廓宽度添加到间断长度中" +msgstr "将交叉线的笔刷宽度添加到间断长度中" -#: ../src/live_effects/lpe-knot.cpp:355 +#: ../src/live_effects/lpe-knot.cpp:354 msgid "S_witcher size:" msgstr "切换开关尺寸(_W):" -#: ../src/live_effects/lpe-knot.cpp:355 +#: ../src/live_effects/lpe-knot.cpp:354 msgid "Orientation indicator/switcher size" msgstr "方向指示/开关的大小" -#: ../src/live_effects/lpe-knot.cpp:356 +#: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossing Signs" msgstr "交叉点符号" -#: ../src/live_effects/lpe-knot.cpp:356 +#: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossings signs" msgstr "交叉点符号" -#: ../src/live_effects/lpe-knot.cpp:627 +#: ../src/live_effects/lpe-knot.cpp:626 msgid "Drag to select a crossing, click to flip it" msgstr "拖曳可选取交叉点,单击可翻转交叉点" #. / @todo Is this the right verb? -#: ../src/live_effects/lpe-knot.cpp:665 +#: ../src/live_effects/lpe-knot.cpp:664 msgid "Change knot crossing" msgstr "更改环结交叉点" @@ -10006,318 +10066,322 @@ msgid "Mirror movements in vertical" msgstr "垂直移动节点" #: ../src/live_effects/lpe-lattice2.cpp:49 +msgid "Update while moving knots (maybe slow)" +msgstr "" + +#: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" msgstr "控制柄 0:" -#: ../src/live_effects/lpe-lattice2.cpp:49 +#: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 0 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1:" msgstr "控制柄 1:" -#: ../src/live_effects/lpe-lattice2.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 1 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:51 +#: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2:" msgstr "控制柄 2:" -#: ../src/live_effects/lpe-lattice2.cpp:51 +#: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 2 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:52 +#: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3:" msgstr "控制柄 3:" -#: ../src/live_effects/lpe-lattice2.cpp:52 +#: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 3 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:53 +#: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4:" msgstr "控制柄 4:" -#: ../src/live_effects/lpe-lattice2.cpp:53 +#: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 4 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:54 +#: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5:" msgstr "控制柄 5:" -#: ../src/live_effects/lpe-lattice2.cpp:54 +#: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 5 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:55 +#: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6:" msgstr "控制柄 6:" -#: ../src/live_effects/lpe-lattice2.cpp:55 +#: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 6 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:56 +#: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7:" msgstr "控制柄 7:" -#: ../src/live_effects/lpe-lattice2.cpp:56 +#: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 7 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:57 +#: ../src/live_effects/lpe-lattice2.cpp:58 msgid "Control 8x9:" msgstr "控制柄 8x9:" -#: ../src/live_effects/lpe-lattice2.cpp:57 +#: ../src/live_effects/lpe-lattice2.cpp:58 msgid "" "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 8x9 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:58 +#: ../src/live_effects/lpe-lattice2.cpp:59 msgid "Control 10x11:" msgstr "控制柄 10x11:" -#: ../src/live_effects/lpe-lattice2.cpp:58 +#: ../src/live_effects/lpe-lattice2.cpp:59 msgid "" "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 10x11 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:59 +#: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12:" msgstr "控制柄 12:" -#: ../src/live_effects/lpe-lattice2.cpp:59 +#: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 12 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:60 +#: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13:" msgstr "控制柄 13:" -#: ../src/live_effects/lpe-lattice2.cpp:60 +#: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 13 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:61 +#: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14:" msgstr "控制柄 14:" -#: ../src/live_effects/lpe-lattice2.cpp:61 +#: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 14 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:62 +#: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15:" msgstr "控制柄 15:" -#: ../src/live_effects/lpe-lattice2.cpp:62 +#: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 15 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:63 +#: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16:" msgstr "控制柄 16:" -#: ../src/live_effects/lpe-lattice2.cpp:63 +#: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 16 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:64 +#: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17:" msgstr "控制柄 17:" -#: ../src/live_effects/lpe-lattice2.cpp:64 +#: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 17 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:65 +#: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18:" msgstr "控制柄 18:" -#: ../src/live_effects/lpe-lattice2.cpp:65 +#: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 18 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:66 +#: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19:" msgstr "控制柄 19:" -#: ../src/live_effects/lpe-lattice2.cpp:66 +#: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 19 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:67 +#: ../src/live_effects/lpe-lattice2.cpp:68 msgid "Control 20x21:" msgstr "控制柄 20x21:" -#: ../src/live_effects/lpe-lattice2.cpp:67 +#: ../src/live_effects/lpe-lattice2.cpp:68 msgid "" "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 20x21 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:68 +#: ../src/live_effects/lpe-lattice2.cpp:69 msgid "Control 22x23:" msgstr "控制柄 22x23:" -#: ../src/live_effects/lpe-lattice2.cpp:68 +#: ../src/live_effects/lpe-lattice2.cpp:69 msgid "" "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 22x23 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:69 +#: ../src/live_effects/lpe-lattice2.cpp:70 msgid "Control 24x26:" msgstr "控制柄 24x26:" -#: ../src/live_effects/lpe-lattice2.cpp:69 +#: ../src/live_effects/lpe-lattice2.cpp:70 msgid "" "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 24x26 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:70 +#: ../src/live_effects/lpe-lattice2.cpp:71 msgid "Control 25x27:" msgstr "控制柄 15x27:" -#: ../src/live_effects/lpe-lattice2.cpp:70 +#: ../src/live_effects/lpe-lattice2.cpp:71 msgid "" "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 25x27 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:71 +#: ../src/live_effects/lpe-lattice2.cpp:72 msgid "Control 28x30:" msgstr "控制柄 18x30:" -#: ../src/live_effects/lpe-lattice2.cpp:71 +#: ../src/live_effects/lpe-lattice2.cpp:72 msgid "" "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 28x30 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:72 +#: ../src/live_effects/lpe-lattice2.cpp:73 msgid "Control 29x31:" msgstr "控制柄 29x31:" -#: ../src/live_effects/lpe-lattice2.cpp:72 +#: ../src/live_effects/lpe-lattice2.cpp:73 msgid "" "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "控制柄 29x31 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:73 +#: ../src/live_effects/lpe-lattice2.cpp:74 msgid "Control 32x33x34x35:" msgstr "控制柄 32x33x34x35:" -#: ../src/live_effects/lpe-lattice2.cpp:73 +#: ../src/live_effects/lpe-lattice2.cpp:74 msgid "" "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " "axes" msgstr "控制柄 32x33x34x35 - Ctrl+Alt+单击:重置,Ctrl:沿轴移动" -#: ../src/live_effects/lpe-lattice2.cpp:236 +#: ../src/live_effects/lpe-lattice2.cpp:239 msgid "Reset grid" msgstr "重置网格" -#: ../src/live_effects/lpe-lattice2.cpp:268 -#: ../src/live_effects/lpe-lattice2.cpp:283 +#: ../src/live_effects/lpe-lattice2.cpp:271 +#: ../src/live_effects/lpe-lattice2.cpp:286 msgid "Show Points" msgstr "方向" -#: ../src/live_effects/lpe-lattice2.cpp:281 +#: ../src/live_effects/lpe-lattice2.cpp:284 msgid "Hide Points" msgstr "点" -#: ../src/live_effects/lpe-patternalongpath.cpp:50 +#: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 msgid "Single" msgstr "单" -#: ../src/live_effects/lpe-patternalongpath.cpp:51 +#: ../src/live_effects/lpe-patternalongpath.cpp:64 #: ../share/extensions/pathalongpath.inx.h:11 msgid "Single, stretched" msgstr "单个,拉伸" -#: ../src/live_effects/lpe-patternalongpath.cpp:52 +#: ../src/live_effects/lpe-patternalongpath.cpp:65 #: ../share/extensions/pathalongpath.inx.h:12 msgid "Repeated" msgstr "重复" -#: ../src/live_effects/lpe-patternalongpath.cpp:53 +#: ../src/live_effects/lpe-patternalongpath.cpp:66 #: ../share/extensions/pathalongpath.inx.h:13 msgid "Repeated, stretched" msgstr "重复,拉伸" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 msgid "Pattern source:" msgstr "图样来源:" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 msgid "Path to put along the skeleton path" msgstr "要沿该骨架线分布的路径" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#: ../src/live_effects/lpe-patternalongpath.cpp:74 +msgid "Width of the pattern" +msgstr "图案宽度" + +#: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "Pattern copies:" msgstr "图样复制数量:" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "How many pattern copies to place along the skeleton path" msgstr "沿骨架线分布的图案的数目" -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -msgid "Width of the pattern" -msgstr "图案宽度" - -#: ../src/live_effects/lpe-patternalongpath.cpp:63 +#: ../src/live_effects/lpe-patternalongpath.cpp:77 msgid "Wid_th in units of length" msgstr "宽度以长度为单位(_T)" -#: ../src/live_effects/lpe-patternalongpath.cpp:64 +#: ../src/live_effects/lpe-patternalongpath.cpp:78 msgid "Scale the width of the pattern in units of its length" msgstr "根据其长度缩放图案的宽度" -#: ../src/live_effects/lpe-patternalongpath.cpp:66 +#: ../src/live_effects/lpe-patternalongpath.cpp:80 msgid "Spa_cing:" msgstr "间距(_C):" -#: ../src/live_effects/lpe-patternalongpath.cpp:68 +#: ../src/live_effects/lpe-patternalongpath.cpp:82 #, no-c-format msgid "" "Space between copies of the pattern. Negative values allowed, but are " "limited to -90% of pattern width." msgstr "图案副本间的距离。可以使用负值,但不可小于图案宽度的 -90%。" -#: ../src/live_effects/lpe-patternalongpath.cpp:70 +#: ../src/live_effects/lpe-patternalongpath.cpp:84 msgid "No_rmal offset:" msgstr "法向偏移(_R):" -#: ../src/live_effects/lpe-patternalongpath.cpp:71 +#: ../src/live_effects/lpe-patternalongpath.cpp:85 msgid "Tan_gential offset:" msgstr "切向偏移(_G):" -#: ../src/live_effects/lpe-patternalongpath.cpp:72 +#: ../src/live_effects/lpe-patternalongpath.cpp:86 msgid "Offsets in _unit of pattern size" msgstr "偏移以图样大小为单位(_U)" -#: ../src/live_effects/lpe-patternalongpath.cpp:73 +#: ../src/live_effects/lpe-patternalongpath.cpp:87 msgid "" "Spacing, tangential and normal offset are expressed as a ratio of width/" "height" msgstr "间距,切向和法向偏移量的为宽度/高度的比例." -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/live_effects/lpe-patternalongpath.cpp:89 msgid "Pattern is _vertical" msgstr "图案是垂直的(_V)" -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/live_effects/lpe-patternalongpath.cpp:89 msgid "Rotate pattern 90 deg before applying" msgstr "应用前将图案旋转 90 度" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/live_effects/lpe-patternalongpath.cpp:91 msgid "_Fuse nearby ends:" msgstr "熔合接近的端点(_F):" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/live_effects/lpe-patternalongpath.cpp:91 msgid "Fuse ends closer than this number. 0 means don't fuse." msgstr "熔合距离小于该数值的端点。0 表示不熔合。" @@ -10370,7 +10434,7 @@ msgstr "右下" msgid "Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "右下 - Ctrl+Alt+单击:重置;Ctrl:沿坐标轴移动" -#: ../src/live_effects/lpe-perspective-envelope.cpp:268 +#: ../src/live_effects/lpe-perspective-envelope.cpp:269 msgid "Handles:" msgstr "控制点:" @@ -10388,7 +10452,7 @@ msgid "Zero width" msgstr "凹端" #: ../src/live_effects/lpe-powerstroke.cpp:171 -#: ../src/widgets/pencil-toolbar.cpp:115 +#: ../src/widgets/pencil-toolbar.cpp:112 msgid "Spiro" msgstr "螺线" @@ -10424,9 +10488,9 @@ msgid "Determines the shape of the path's start" msgstr "决定路径起始的形状" #: ../src/live_effects/lpe-powerstroke.cpp:183 -#: ../src/widgets/stroke-style.cpp:278 +#: ../src/widgets/stroke-style.cpp:335 msgid "Maximum length of the miter (in units of stroke width)" -msgstr "斜面最大长度(以笔廓宽度为单位)" +msgstr "斜面最大长度(以笔刷宽度为单位)" #: ../src/live_effects/lpe-powerstroke.cpp:184 msgid "End cap:" @@ -10442,7 +10506,7 @@ msgstr "频率随机性:" #: ../src/live_effects/lpe-rough-hatches.cpp:225 msgid "Variation of distance between hatches, in %." -msgstr "影线间距的变化,%。" +msgstr "影线间距的变化,按百分比计。" #: ../src/live_effects/lpe-rough-hatches.cpp:226 msgid "Growth:" @@ -10546,7 +10610,7 @@ msgstr "创建粗/细路径" #: ../src/live_effects/lpe-rough-hatches.cpp:239 msgid "Simulate a stroke of varying width" -msgstr "模拟一个宽度有变化的笔廓" +msgstr "模拟一个宽度有变化的笔刷" #: ../src/live_effects/lpe-rough-hatches.cpp:240 msgid "Bend hatches" @@ -10554,7 +10618,7 @@ msgstr "弯折影线" #: ../src/live_effects/lpe-rough-hatches.cpp:240 msgid "Add a global bend to the hatches (slower)" -msgstr "为影线添加一个全局的弯曲(更慢)" +msgstr "为影线添加一个全局的弯曲(较慢)" #: ../src/live_effects/lpe-rough-hatches.cpp:241 msgid "Thickness: at 1st side:" @@ -10579,7 +10643,7 @@ msgstr "从第二个边到第一个边:" #: ../src/live_effects/lpe-rough-hatches.cpp:244 msgid "Width from 'top' to 'bottom'" -msgstr "从“顶部”到“底部”的宽度" +msgstr "从顶部到底部的宽度" #: ../src/live_effects/lpe-rough-hatches.cpp:245 msgid "From 1st to 2nd side:" @@ -10587,7 +10651,7 @@ msgstr "从第一个边到第二个边:" #: ../src/live_effects/lpe-rough-hatches.cpp:245 msgid "Width from 'bottom' to 'top'" -msgstr "从“底部”到“顶部”的宽度" +msgstr "从底部到顶部的宽度" #: ../src/live_effects/lpe-rough-hatches.cpp:247 msgid "Hatches width and dir" @@ -10608,101 +10672,98 @@ msgid "" "amount" msgstr "由参考点的相对位置定义总体弯曲程度和方向" -#: ../src/live_effects/lpe-roughen.cpp:30 ../share/extensions/addnodes.inx.h:4 +#: ../src/live_effects/lpe-roughen.cpp:31 ../share/extensions/addnodes.inx.h:4 msgid "By number of segments" msgstr "根据线段数" -#: ../src/live_effects/lpe-roughen.cpp:31 +#: ../src/live_effects/lpe-roughen.cpp:32 msgid "By max. segment size" msgstr "根据最大线段尺寸" -#: ../src/live_effects/lpe-roughen.cpp:37 +#: ../src/live_effects/lpe-roughen.cpp:38 msgid "Along nodes" msgstr "沿节点" -#: ../src/live_effects/lpe-roughen.cpp:38 +#: ../src/live_effects/lpe-roughen.cpp:39 msgid "Rand" -msgstr "" +msgstr "随机" -#: ../src/live_effects/lpe-roughen.cpp:39 +#: ../src/live_effects/lpe-roughen.cpp:40 msgid "Retract" msgstr "收回" #. initialise your parameters here: -#: ../src/live_effects/lpe-roughen.cpp:48 +#: ../src/live_effects/lpe-roughen.cpp:49 msgid "Method" msgstr "方法" -#: ../src/live_effects/lpe-roughen.cpp:48 +#: ../src/live_effects/lpe-roughen.cpp:49 msgid "Division method" msgstr "分割方式" -#: ../src/live_effects/lpe-roughen.cpp:50 +#: ../src/live_effects/lpe-roughen.cpp:51 msgid "Max. segment size" msgstr "最大线段尺寸" -#: ../src/live_effects/lpe-roughen.cpp:52 +#: ../src/live_effects/lpe-roughen.cpp:53 msgid "Number of segments" msgstr "线段数量" -#: ../src/live_effects/lpe-roughen.cpp:54 +#: ../src/live_effects/lpe-roughen.cpp:55 msgid "Max. displacement in X" msgstr "X 方向最大位移" -#: ../src/live_effects/lpe-roughen.cpp:56 +#: ../src/live_effects/lpe-roughen.cpp:57 msgid "Max. displacement in Y" msgstr "Y 方向最大位移" -#: ../src/live_effects/lpe-roughen.cpp:58 +#: ../src/live_effects/lpe-roughen.cpp:59 msgid "Global randomize" msgstr "全局随机化" -#: ../src/live_effects/lpe-roughen.cpp:60 +#: ../src/live_effects/lpe-roughen.cpp:61 msgid "Handles" msgstr "控制柄" -#: ../src/live_effects/lpe-roughen.cpp:60 +#: ../src/live_effects/lpe-roughen.cpp:61 msgid "Handles options" msgstr "控制柄选项" -#: ../src/live_effects/lpe-roughen.cpp:62 -msgid "Max. smooth handle angle" -msgstr "最大平滑控制柄角度" - -#: ../src/live_effects/lpe-roughen.cpp:64 +#: ../src/live_effects/lpe-roughen.cpp:63 #: ../share/extensions/radiusrand.inx.h:5 msgid "Shift nodes" msgstr "移动节点" -#: ../src/live_effects/lpe-roughen.cpp:66 +#: ../src/live_effects/lpe-roughen.cpp:65 msgid "Fixed displacement" msgstr "固定位移" -#: ../src/live_effects/lpe-roughen.cpp:66 +#: ../src/live_effects/lpe-roughen.cpp:65 msgid "Fixed displacement, 1/3 of segment length" msgstr "固定位移,线段长度的 1/3" -#: ../src/live_effects/lpe-roughen.cpp:68 +#: ../src/live_effects/lpe-roughen.cpp:67 msgid "Spray Tool friendly" msgstr "喷绘工具友好" -#: ../src/live_effects/lpe-roughen.cpp:68 -msgid "For use with spray tool" +#: ../src/live_effects/lpe-roughen.cpp:67 +#, fuzzy +msgid "For use with spray tool in copy mode" msgstr "用以与喷绘工具共用" -#: ../src/live_effects/lpe-roughen.cpp:128 +#: ../src/live_effects/lpe-roughen.cpp:121 msgid "Add nodes Subdivide each segment" msgstr "加入节点会细分每个线段" -#: ../src/live_effects/lpe-roughen.cpp:137 +#: ../src/live_effects/lpe-roughen.cpp:130 msgid "Jitter nodes Move nodes/handles" msgstr "抖动节点会移动节点/控制柄" -#: ../src/live_effects/lpe-roughen.cpp:146 +#: ../src/live_effects/lpe-roughen.cpp:139 msgid "Extra roughen Add a extra layer of rough" msgstr "加强型粗糙化会加入额外的粗糙图层" -#: ../src/live_effects/lpe-roughen.cpp:155 +#: ../src/live_effects/lpe-roughen.cpp:148 msgid "Options Modify options to rough" msgstr "" @@ -10731,13 +10792,13 @@ msgstr "无" #: ../src/live_effects/lpe-ruler.cpp:33 #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/widgets/arc-toolbar.cpp:319 +#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "起点" #: ../src/live_effects/lpe-ruler.cpp:34 #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/widgets/arc-toolbar.cpp:332 +#: ../src/ui/tools/measure-tool.cpp:757 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "终点" @@ -10756,7 +10817,7 @@ msgstr "相邻两个标尺刻度间的距离" msgid "Unit:" msgstr "单位:" -#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:202 +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:207 msgid "Unit" msgstr "单位" @@ -10782,7 +10843,7 @@ msgstr "主要阶数(_:):" #: ../src/live_effects/lpe-ruler.cpp:45 msgid "Draw a major mark every ... steps" -msgstr "每隔 … 显示一个主刻度" +msgstr "每隔几阶显示一个主刻度" #: ../src/live_effects/lpe-ruler.cpp:46 msgid "Shift marks _by:" @@ -10798,7 +10859,7 @@ msgstr "刻度方向:" #: ../src/live_effects/lpe-ruler.cpp:47 msgid "Direction of marks (when viewing along the path from start to end)" -msgstr "刻度的方向(视线沿路径起始至终点)" +msgstr "刻度的方向(视线沿路径起始至终点)" #: ../src/live_effects/lpe-ruler.cpp:48 msgid "_Offset:" @@ -10839,7 +10900,7 @@ msgid "" "The \"show handles\" path effect will remove any custom style on the object " "you are applying it to. If this is not what you want, click Cancel." msgstr "" -"“显示控制柄”路径特效会移除你应用在对象上的所有自定义样式。若这个效果不是你想" +"“显示控制柄”路径特效会移除您应用在对象上的所有自定义样式。若这个效果不是您想" "要的,请单击取消。" #: ../src/live_effects/lpe-simplify.cpp:30 @@ -10882,7 +10943,7 @@ msgstr "简化仅合并" #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Strokes:" -msgstr "笔廓:" +msgstr "笔刷:" #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Draw that many approximating strokes" @@ -10890,7 +10951,7 @@ msgstr "绘制这么多条近似笔迹" #: ../src/live_effects/lpe-sketch.cpp:39 msgid "Max stroke length:" -msgstr "笔廓最大长度:" +msgstr "笔刷最大长度:" #: ../src/live_effects/lpe-sketch.cpp:40 msgid "Maximum length of approximating strokes" @@ -10898,11 +10959,11 @@ msgstr "近似笔迹的最大长度" #: ../src/live_effects/lpe-sketch.cpp:41 msgid "Stroke length variation:" -msgstr "笔廓长度变化量:" +msgstr "笔刷长度变化量:" #: ../src/live_effects/lpe-sketch.cpp:42 msgid "Random variation of stroke length (relative to maximum length)" -msgstr "笔廓长度的随机变化量(相对于最大长度)" +msgstr "笔刷长度的随机变化量(相对于最大长度)" #: ../src/live_effects/lpe-sketch.cpp:43 msgid "Max. overlap:" @@ -10910,7 +10971,7 @@ msgstr "重叠最大值:" #: ../src/live_effects/lpe-sketch.cpp:44 msgid "How much successive strokes should overlap (relative to maximum length)" -msgstr "相邻笔廓的重叠量(相对于最大长度)" +msgstr "相邻笔刷的重叠量(相对于最大长度)" #: ../src/live_effects/lpe-sketch.cpp:45 msgid "Overlap variation:" @@ -10918,7 +10979,7 @@ msgstr "重叠变化量:" #: ../src/live_effects/lpe-sketch.cpp:46 msgid "Random variation of overlap (relative to maximum overlap)" -msgstr "重叠量的随机偏差(相对于最大重叠量)" +msgstr "重叠量的随机偏差(相对于最大重叠量)" #: ../src/live_effects/lpe-sketch.cpp:47 msgid "Max. end tolerance:" @@ -10928,7 +10989,7 @@ msgstr "最大末端容差:" msgid "" "Maximum distance between ends of original and approximating paths (relative " "to maximum length)" -msgstr "原始终点与近似笔迹的端点间的最大距离(相对于最大长度)" +msgstr "原始终点与近似笔迹的端点间的最大距离(相对于最大长度)" #: ../src/live_effects/lpe-sketch.cpp:49 msgid "Average offset:" @@ -10936,7 +10997,7 @@ msgstr "平均偏移量:" #: ../src/live_effects/lpe-sketch.cpp:50 msgid "Average distance each stroke is away from the original path" -msgstr "每个笔廓与原始路径的平均距离" +msgstr "每个笔刷与原始路径的平均距离" #: ../src/live_effects/lpe-sketch.cpp:51 msgid "Max. tremble:" @@ -10963,7 +11024,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "要绘制的结构线的数目 (切线)" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2892 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "缩放:" @@ -10972,7 +11033,7 @@ msgstr "缩放:" msgid "" "Scale factor relating curvature and length of construction lines (try " "5*offset)" -msgstr "曲率与结构线长度相关的缩放因子(试试 5×偏移)" +msgstr "曲率与结构线长度相关的缩放因子(尝试五倍偏移)" #: ../src/live_effects/lpe-sketch.cpp:60 msgid "Max. length:" @@ -11021,11 +11082,11 @@ msgstr "外推" #: ../src/live_effects/lpe-taperstroke.cpp:73 #: ../share/extensions/edge3d.inx.h:5 msgid "Stroke width:" -msgstr "笔廓宽度:" +msgstr "笔刷宽度:" #: ../src/live_effects/lpe-taperstroke.cpp:73 msgid "The (non-tapered) width of the path" -msgstr "该路径的(非锥化)宽度" +msgstr "该路径的(非锥化)宽度" #: ../src/live_effects/lpe-taperstroke.cpp:74 msgid "Start offset:" @@ -11135,12 +11196,12 @@ msgstr "最后一结" msgid "Rotation helper size" msgstr "旋转辅助标示尺寸" -#: ../src/live_effects/lpe-transform_2pts.cpp:197 +#: ../src/live_effects/lpe-transform_2pts.cpp:196 msgid "Change index of knot" msgstr "更改结索引" -#: ../src/live_effects/lpe-transform_2pts.cpp:350 -#: ../src/ui/dialog/inkscape-preferences.cpp:1610 +#: ../src/live_effects/lpe-transform_2pts.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1622 #: ../src/ui/dialog/pixelartdialog.cpp:296 #: ../src/ui/dialog/svg-fonts-dialog.cpp:699 #: ../src/ui/dialog/tracedialog.cpp:813 @@ -11154,7 +11215,7 @@ msgstr "世代数(_R):" #: ../src/live_effects/lpe-vonkoch.cpp:46 msgid "Depth of the recursion --- keep low!!" -msgstr "递归的深度——要低!!" +msgstr "递归的深度——要小!!" #: ../src/live_effects/lpe-vonkoch.cpp:47 msgid "Generating path:" @@ -11172,7 +11233,7 @@ msgstr "只用整体变形(_U)" msgid "" "2 consecutive segments are used to reverse/preserve orientation only " "(otherwise, they define a general transform)." -msgstr "两个线段仅用来保持/颠倒方向(否则的话将定义一般变换)。" +msgstr "两个线段仅用来保持/颠倒方向(否则的话将定义一般变换)。" #: ../src/live_effects/lpe-vonkoch.cpp:49 msgid "Dra_w all generations" @@ -11180,7 +11241,7 @@ msgstr "绘制所有世代(_W)" #: ../src/live_effects/lpe-vonkoch.cpp:49 msgid "If unchecked, draw only the last generation" -msgstr "如果不选,则只绘制最后一层" +msgstr "如果不选,则只绘制最后一代" #. ,draw_boxes(_("Display boxes"), _("Display boxes instead of paths only"), "draw_boxes", &wr, this, true) #: ../src/live_effects/lpe-vonkoch.cpp:51 @@ -11256,7 +11317,7 @@ msgid "Select original" msgstr "选择原对象" #: ../src/live_effects/parameter/originalpatharray.cpp:90 -#: ../src/widgets/gradient-toolbar.cpp:1208 +#: ../src/widgets/gradient-toolbar.cpp:1205 msgid "Reverse" msgstr "反向" @@ -11271,12 +11332,12 @@ msgid "Remove Path" msgstr "删除路径" #: ../src/live_effects/parameter/originalpatharray.cpp:179 -#: ../src/ui/dialog/objects.cpp:1850 +#: ../src/ui/dialog/objects.cpp:1854 msgid "Move Down" msgstr "下移" #: ../src/live_effects/parameter/originalpatharray.cpp:191 -#: ../src/ui/dialog/objects.cpp:1858 +#: ../src/ui/dialog/objects.cpp:1862 msgid "Move Up" msgstr "上移" @@ -11312,18 +11373,19 @@ msgstr "链接到剪贴板的路径" msgid "Paste path parameter" msgstr "粘贴路径参数" -#: ../src/live_effects/parameter/point.cpp:124 +#: ../src/live_effects/parameter/point.cpp:132 msgid "Change point parameter" msgstr "修改点的参数" #: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 #: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 +#, fuzzy msgid "" "Stroke width control point: drag to alter the stroke width. Ctrl" "+click adds a control point, Ctrl+Alt+click deletes it, Shift" "+click launches width dialog." msgstr "" -"笔廓宽度控制点:拖动以更改笔廓宽度。Ctrl+单击添加控制点," +"笔刷宽度控制点:拖动以更改笔刷宽度。Ctrl+单击添加控制点," "Ctrl+Alt+单击删除,Shift+单击启动宽度对话框。" #: ../src/live_effects/parameter/random.cpp:134 @@ -11363,25 +11425,25 @@ msgstr "打印 Inkscape 版本号" #: ../src/main.cpp:300 msgid "Do not use X server (only process files from console)" -msgstr "不使用 X 服务器(只通过控制台处理文件)" +msgstr "不使用 X 服务器(只通过控制台处理文件)" #: ../src/main.cpp:305 msgid "Try to use X server (even if $DISPLAY is not set)" -msgstr "试着使用 X 服务器(即使 $DISPLAY 没有)置)" +msgstr "试着使用 X 服务器(即使 $DISPLAY 没有)置)" #: ../src/main.cpp:310 msgid "Open specified document(s) (option string may be excluded)" -msgstr "打开指定的文档(可能排除选项字符串)" +msgstr "打开指定的文档(可能排除选项字符串)" #: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 #: ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 #: ../src/main.cpp:414 ../src/main.cpp:430 ../src/main.cpp:435 msgid "FILENAME" -msgstr "文件名" +msgstr "FILENAME" #: ../src/main.cpp:315 msgid "Print document(s) to specified output file (use '| program' for pipe)" -msgstr "打印文档到指定输出文件(用“| 程序名”以使用管道)" +msgstr "打印文档到指定输出文件(用“| 程序名”以使用管道)" #: ../src/main.cpp:320 msgid "Export document to a PNG file" @@ -11391,7 +11453,7 @@ msgstr "把文档导出到 PNG 文件" msgid "" "Resolution for exporting to bitmap and for rasterization of filters in PS/" "EPS/PDF (default 96)" -msgstr "PS/EPS/PDF 格式中导出位图和滤镜点阵化的分辨率(默认为 96)" +msgstr "PS/EPS/PDF 格式中导出位图和滤镜点阵化的分辨率(默认为 96)" #: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" @@ -11401,7 +11463,7 @@ msgstr "DPI" msgid "" "Exported area in SVG user units (default is the page; 0,0 is lower-left " "corner)" -msgstr "按照 SVG 用户设置单位导出区域(默认是页面;0,0 是左下角)" +msgstr "按照 SVG 用户设置单位导出区域(默认是页面;0,0 是左下角)" #: ../src/main.cpp:331 msgid "x0:y0:x1:y1" @@ -11409,7 +11471,7 @@ msgstr "x0:y0:x1:y1" #: ../src/main.cpp:335 msgid "Exported area is the entire drawing (not page)" -msgstr "导出区域是整个绘图(不是页面)" +msgstr "导出区域是整个绘图(不是页面)" #: ../src/main.cpp:340 msgid "Exported area is the entire page" @@ -11417,40 +11479,40 @@ msgstr "导出区域是整个页面" #: ../src/main.cpp:345 msgid "Only for PS/EPS/PDF, sets margin in mm around exported area (default 0)" -msgstr "只适用于 PS/EPS/PDF,设置导出区域周围的边距(缺省为 0,以毫米计)" +msgstr "只适用于 PS/EPS/PDF,设置导出区域周围的边距(缺省为 0,以毫米计)" #: ../src/main.cpp:346 ../src/main.cpp:388 msgid "VALUE" -msgstr "值" +msgstr "VALUE" #: ../src/main.cpp:350 msgid "" "Snap the bitmap export area outwards to the nearest integer values (in SVG " "user units)" -msgstr "吸附位图导出区域到靠外的最接近的整数(按照 SVG 用户单位)" +msgstr "吸附位图导出区域到靠外的最接近的整数(按照 SVG 用户单位)" #: ../src/main.cpp:355 msgid "The width of exported bitmap in pixels (overrides export-dpi)" -msgstr "导出位图的像素宽度(覆盖导出-dpi)" +msgstr "导出位图的像素宽度(覆盖导出-dpi)" #: ../src/main.cpp:356 msgid "WIDTH" -msgstr "宽度" +msgstr "WIDTH" #: ../src/main.cpp:360 msgid "The height of exported bitmap in pixels (overrides export-dpi)" -msgstr "导出位图的像素高度(覆盖导出-dpi)" +msgstr "导出位图的像素高度(覆盖导出-dpi)" #: ../src/main.cpp:361 msgid "HEIGHT" -msgstr "高度" +msgstr "HEIGHT" #: ../src/main.cpp:365 msgid "The ID of the object to export" msgstr "要导出的对象的 ID" #: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1556 +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 msgid "ID" msgstr "ID" @@ -11459,27 +11521,27 @@ msgstr "ID" #: ../src/main.cpp:372 msgid "" "Export just the object with export-id, hide all others (only with export-id)" -msgstr "只导出有导出 ID 的对象,隐藏其它的(只包括导出 ID)" +msgstr "只导出有导出 ID 的对象,隐藏其他的(只包括导出 ID)" #: ../src/main.cpp:377 msgid "Use stored filename and DPI hints when exporting (only with export-id)" -msgstr "导出时使用保存的文件名和 DPI(只包括导出 ID)" +msgstr "导出时使用保存的文件名和 DPI(只包括导出 ID)" #: ../src/main.cpp:382 msgid "Background color of exported bitmap (any SVG-supported color string)" -msgstr "导出位图的背景色(任何 SVG 支持的颜色字符串)" +msgstr "导出位图的背景色(任何 SVG 支持的颜色字符串)" #: ../src/main.cpp:383 msgid "COLOR" -msgstr "颜色" +msgstr "COLOR" #: ../src/main.cpp:387 msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" -msgstr "导出位图的背景不透明度(0.0 到 1.0,或者 1 到 255)" +msgstr "导出位图的背景不透明度(0.0 到 1.0,或者 1 到 255)" #: ../src/main.cpp:392 msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" -msgstr "把文档导出到普通 SVG 文件(没有 sodipodi 或者 inkscape 命名空间)" +msgstr "把文档导出到普通 SVG 文件(没有 sodipodi 或者 inkscape 命名空间)" #: ../src/main.cpp:397 msgid "Export document to a PS file" @@ -11493,7 +11555,7 @@ msgstr "导出文档到 EPS 文件" msgid "" "Choose the PostScript Level used to export. Possible choices are 2 and 3 " "(the default)" -msgstr "选择导出要使用的 PostScript 等级(版本)。选择有 2 和 3(默认)" +msgstr "选择导出要使用的 PostScript 等级(版本)。选择有 2 和 3(默认)" #: ../src/main.cpp:409 msgid "PS Level" @@ -11527,21 +11589,21 @@ msgstr "" #: ../src/main.cpp:429 msgid "Export document to an Enhanced Metafile (EMF) File" -msgstr "导出文档到增强型图元(EMF)文件" +msgstr "导出文档到增强型图元(EMF)文件" #: ../src/main.cpp:434 msgid "Export document to a Windows Metafile (WMF) File" -msgstr "将文档导出成 Windows 图元文件(WMF)" +msgstr "将文档导出成 Windows 图元文件(WMF)" #: ../src/main.cpp:439 msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" -msgstr "导出时将文本对象转成路径(PS、EPS、PDF、SVG)" +msgstr "导出时将文本对象转成路径(PS、EPS、PDF、SVG)" #: ../src/main.cpp:444 msgid "" "Render filtered objects without filters, instead of rasterizing (PS, EPS, " "PDF)" -msgstr "渲染滤镜对象时不包括滤镜效果,而不是执行栅格化(PS、EPS、PDF)" +msgstr "渲染滤镜对象时不包括滤镜效果,而不是执行栅格化(PS、EPS、PDF)" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:450 @@ -11596,7 +11658,7 @@ msgstr "在控制台模式中进入一个用于 D-Bus 消息的监听循环" msgid "" "Specify the D-Bus bus name to listen for messages on (default is org." "inkscape)" -msgstr "指定用于消息监听的 D-Bus BUS 名称(默认值为 org.inkscape)" +msgstr "指定用于消息监听的 D-Bus BUS 名称(默认值为 org.inkscape)" #: ../src/main.cpp:501 msgid "BUS-NAME" @@ -11604,7 +11666,7 @@ msgstr "BUS-NAME" #: ../src/main.cpp:506 msgid "List the IDs of all the verbs in Inkscape" -msgstr "列出 Inkscape 中所有动作的标识符(ID)" +msgstr "列出 Inkscape 中所有动作的标识符(ID)" #: ../src/main.cpp:511 msgid "Verb to call when Inkscape opens." @@ -11612,7 +11674,7 @@ msgstr "Inkscape 启动时调用的动作。" #: ../src/main.cpp:512 msgid "VERB-ID" -msgstr "动作-ID" +msgstr "VERB-ID" #: ../src/main.cpp:516 msgid "Object ID to select when Inkscape opens." @@ -11620,115 +11682,115 @@ msgstr "Inkscape 启动时选择的对象 ID。" #: ../src/main.cpp:517 msgid "OBJECT-ID" -msgstr "对象-ID" +msgstr "OBJECT-ID" #: ../src/main.cpp:521 msgid "Start Inkscape in interactive shell mode." msgstr "以交互式 shell 模式启动 Inkscape。" -#: ../src/main.cpp:871 ../src/main.cpp:1280 +#: ../src/main.cpp:871 ../src/main.cpp:1284 msgid "" "[OPTIONS...] [FILE...]\n" "\n" "Available options:" msgstr "" -"[选项…] [文件…]\n" +"[选项...] [文件...]\n" "\n" "可用选项:" #. ## Add a menu for clear() -#: ../src/menus-skeleton.h:16 ../src/ui/dialog/debug.cpp:79 +#: ../src/menus-skeleton.h:18 ../src/ui/dialog/debug.cpp:79 msgid "_File" msgstr "文件(_F)" #. " \n" #. " \n" -#: ../src/menus-skeleton.h:41 ../src/verbs.cpp:2682 ../src/verbs.cpp:2690 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2714 ../src/verbs.cpp:2722 msgid "_Edit" msgstr "编辑(_E)" -#: ../src/menus-skeleton.h:51 ../src/verbs.cpp:2446 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2473 msgid "Paste Si_ze" msgstr "粘贴尺寸(_Z)" -#: ../src/menus-skeleton.h:63 +#: ../src/menus-skeleton.h:65 msgid "Clo_ne" msgstr "克隆(_N)" -#: ../src/menus-skeleton.h:77 +#: ../src/menus-skeleton.h:79 msgid "Select Sa_me" msgstr "选取相同对象(_M)" -#: ../src/menus-skeleton.h:95 +#: ../src/menus-skeleton.h:98 msgid "_View" msgstr "视图(_V)" -#: ../src/menus-skeleton.h:96 +#: ../src/menus-skeleton.h:99 msgid "_Zoom" msgstr "缩放(_Z)" -#: ../src/menus-skeleton.h:112 +#: ../src/menus-skeleton.h:115 msgid "_Display mode" msgstr "显示模式(_D)" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:121 +#: ../src/menus-skeleton.h:124 msgid "_Color display mode" msgstr "色彩显示模式(_C)" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:134 +#: ../src/menus-skeleton.h:137 msgid "Sh_ow/Hide" msgstr "显示/隐藏(_W)" #. Not quite ready to be in the menus. #. " \n" -#: ../src/menus-skeleton.h:154 +#: ../src/menus-skeleton.h:157 msgid "_Layer" msgstr "图层(_L)" -#: ../src/menus-skeleton.h:178 +#: ../src/menus-skeleton.h:181 msgid "_Object" msgstr "对象(_O)" -#: ../src/menus-skeleton.h:189 +#: ../src/menus-skeleton.h:192 msgid "Cli_p" msgstr "剪裁(_P)" -#: ../src/menus-skeleton.h:193 +#: ../src/menus-skeleton.h:196 msgid "Mas_k" msgstr "蒙版(_K)" -#: ../src/menus-skeleton.h:197 +#: ../src/menus-skeleton.h:200 msgid "Patter_n" msgstr "图案(_N)" -#: ../src/menus-skeleton.h:221 +#: ../src/menus-skeleton.h:224 msgid "_Path" msgstr "路径(_P)" -#: ../src/menus-skeleton.h:249 ../src/ui/dialog/find.cpp:78 +#: ../src/menus-skeleton.h:256 ../src/ui/dialog/find.cpp:78 #: ../src/ui/dialog/text-edit.cpp:71 msgid "_Text" msgstr "文字(_T)" -#: ../src/menus-skeleton.h:267 +#: ../src/menus-skeleton.h:274 msgid "Filter_s" msgstr "滤镜(_S)" -#: ../src/menus-skeleton.h:273 +#: ../src/menus-skeleton.h:280 msgid "Exte_nsions" msgstr "扩展(_N)" -#: ../src/menus-skeleton.h:279 +#: ../src/menus-skeleton.h:286 msgid "_Help" msgstr "帮助(_H)" -#: ../src/menus-skeleton.h:283 +#: ../src/menus-skeleton.h:290 msgid "Tutorials" msgstr "教程" @@ -11738,7 +11800,7 @@ msgstr "选择对象合并。" #: ../src/path-chemistry.cpp:67 msgid "Combining paths..." -msgstr "合并路径…" +msgstr "合并路径..." #: ../src/path-chemistry.cpp:177 msgid "Combine" @@ -11754,45 +11816,45 @@ msgstr "选择要分离的路径." #: ../src/path-chemistry.cpp:200 msgid "Breaking apart paths..." -msgstr "分离路径…" +msgstr "分离路径..." -#: ../src/path-chemistry.cpp:287 +#: ../src/path-chemistry.cpp:288 msgid "Break apart" msgstr "分离" -#: ../src/path-chemistry.cpp:289 +#: ../src/path-chemistry.cpp:291 msgid "No path(s) to break apart in the selection." msgstr "选区里面没有路径可以分离。" -#: ../src/path-chemistry.cpp:299 +#: ../src/path-chemistry.cpp:301 msgid "Select object(s) to convert to path." msgstr "选择要转换到路径的对象。" -#: ../src/path-chemistry.cpp:305 +#: ../src/path-chemistry.cpp:307 msgid "Converting objects to paths..." -msgstr "正在将对象转化成路径…" +msgstr "正在将对象转化成路径..." -#: ../src/path-chemistry.cpp:324 +#: ../src/path-chemistry.cpp:326 msgid "Object to path" msgstr "对象转化成路径" -#: ../src/path-chemistry.cpp:326 +#: ../src/path-chemistry.cpp:328 msgid "No objects to convert to path in the selection." msgstr "选区里没有对象可以转化到路径。" -#: ../src/path-chemistry.cpp:613 +#: ../src/path-chemistry.cpp:615 msgid "Select path(s) to reverse." msgstr "选择要反向的路径。" -#: ../src/path-chemistry.cpp:622 +#: ../src/path-chemistry.cpp:624 msgid "Reversing paths..." -msgstr "反向路径…" +msgstr "反向路径..." -#: ../src/path-chemistry.cpp:657 +#: ../src/path-chemistry.cpp:659 msgid "Reverse path" msgstr "反向路径" -#: ../src/path-chemistry.cpp:659 +#: ../src/path-chemistry.cpp:661 msgid "No paths to reverse in the selection." msgstr "选区里没有路径可以反向。" @@ -11972,7 +12034,7 @@ msgstr "为发布此资源承担法律负责的个体" #: ../src/rdf.cpp:258 msgid "Identifier:" -msgstr "识别码:" +msgstr "标识:" #: ../src/rdf.cpp:259 msgid "An unambiguous reference to the resource within a given context" @@ -11990,7 +12052,7 @@ msgstr "相关:" msgid "A related resource" msgstr "相关资源" -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1912 +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1924 msgid "Language:" msgstr "语言:" @@ -12043,7 +12105,7 @@ msgstr "URI:" #. TRANSLATORS: this is where you put a URL to a page that defines the license #: ../src/rdf.cpp:291 msgid "URI to this document's license's namespace definition" -msgstr "这份文档授权命名空间定义的通用资源标识 (URI)" +msgstr "这份文档授权命名空间定义的通用资源标识(URI)" #. TRANSLATORS: fragment of XML representing the license of the document #: ../src/rdf.cpp:295 @@ -12052,7 +12114,7 @@ msgstr "片段:" #: ../src/rdf.cpp:296 msgid "XML fragment for the RDF 'License' section" -msgstr "RDF“License”部分的 XML 片段。" +msgstr "RDF的 License 部分的 XML 片段。" #: ../src/resource-manager.cpp:336 msgid "Fixup broken links" @@ -12069,10 +12131,10 @@ msgstr "什么也没有删除。" #: ../src/selection-chemistry.cpp:426 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 #: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:965 -#: ../src/widgets/eraser-toolbar.cpp:93 -#: ../src/widgets/gradient-toolbar.cpp:1184 -#: ../src/widgets/gradient-toolbar.cpp:1198 -#: ../src/widgets/gradient-toolbar.cpp:1212 ../src/widgets/node-toolbar.cpp:401 +#: ../src/widgets/eraser-toolbar.cpp:120 +#: ../src/widgets/gradient-toolbar.cpp:1181 +#: ../src/widgets/gradient-toolbar.cpp:1195 +#: ../src/widgets/gradient-toolbar.cpp:1209 ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "删除" @@ -12107,7 +12169,7 @@ msgid "No groups to ungroup in the selection." msgstr "选区里没有群组可以解除组合。" #: ../src/selection-chemistry.cpp:869 ../src/sp-item-group.cpp:550 -#: ../src/ui/dialog/objects.cpp:1912 +#: ../src/ui/dialog/objects.cpp:1916 msgid "Ungroup" msgstr "解除群组" @@ -12186,7 +12248,7 @@ msgid "Select object(s) to remove filters from." msgstr "选择要移除滤镜的对象。" #: ../src/selection-chemistry.cpp:1288 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1693 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 msgid "Remove filter" msgstr "移除滤镜" @@ -12202,134 +12264,134 @@ msgstr "分别粘贴尺寸" msgid "Select object(s) to move to the layer above." msgstr "选择对象移动到上面的层。" -#: ../src/selection-chemistry.cpp:1360 +#: ../src/selection-chemistry.cpp:1361 msgid "Raise to next layer" msgstr "升高到上面的图层" -#: ../src/selection-chemistry.cpp:1367 +#: ../src/selection-chemistry.cpp:1368 msgid "No more layers above." msgstr "上面没有图层了。" -#: ../src/selection-chemistry.cpp:1378 +#: ../src/selection-chemistry.cpp:1379 msgid "Select object(s) to move to the layer below." msgstr "选择对象移动到下面的图层。" -#: ../src/selection-chemistry.cpp:1403 +#: ../src/selection-chemistry.cpp:1405 msgid "Lower to previous layer" msgstr "降低到下面的图层" -#: ../src/selection-chemistry.cpp:1410 +#: ../src/selection-chemistry.cpp:1412 msgid "No more layers below." msgstr "下面没有图层了。" -#: ../src/selection-chemistry.cpp:1420 +#: ../src/selection-chemistry.cpp:1422 msgid "Select object(s) to move." msgstr "选择要移动的对象。" -#: ../src/selection-chemistry.cpp:1437 ../src/verbs.cpp:2625 +#: ../src/selection-chemistry.cpp:1440 ../src/verbs.cpp:2657 msgid "Move selection to layer" msgstr "将选取对象移到图层" #. An SVG element cannot have a transform. We could change 'x' and 'y' in response #. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1526 ../src/seltrans.cpp:391 +#: ../src/selection-chemistry.cpp:1529 ../src/seltrans.cpp:391 msgid "Cannot transform an embedded SVG." msgstr "无法变形内嵌的 SVG。" -#: ../src/selection-chemistry.cpp:1696 +#: ../src/selection-chemistry.cpp:1699 msgid "Remove transform" msgstr "移除变换" -#: ../src/selection-chemistry.cpp:1803 +#: ../src/selection-chemistry.cpp:1806 msgid "Rotate 90° CCW" msgstr "逆时针旋转 90°" -#: ../src/selection-chemistry.cpp:1803 +#: ../src/selection-chemistry.cpp:1806 msgid "Rotate 90° CW" msgstr "顺时针旋转 90°" -#: ../src/selection-chemistry.cpp:1824 ../src/seltrans.cpp:484 -#: ../src/ui/dialog/transformation.cpp:891 +#: ../src/selection-chemistry.cpp:1827 ../src/seltrans.cpp:484 +#: ../src/ui/dialog/transformation.cpp:890 msgid "Rotate" msgstr "旋转" -#: ../src/selection-chemistry.cpp:2173 +#: ../src/selection-chemistry.cpp:2176 msgid "Rotate by pixels" msgstr "按像素旋转" -#: ../src/selection-chemistry.cpp:2203 ../src/seltrans.cpp:481 -#: ../src/ui/dialog/transformation.cpp:865 ../src/ui/widget/page-sizer.cpp:450 +#: ../src/selection-chemistry.cpp:2206 ../src/seltrans.cpp:481 +#: ../src/ui/dialog/transformation.cpp:864 ../src/ui/widget/page-sizer.cpp:450 #: ../share/extensions/interp_att_g.inx.h:14 msgid "Scale" msgstr "缩放" -#: ../src/selection-chemistry.cpp:2228 +#: ../src/selection-chemistry.cpp:2231 msgid "Scale by whole factor" msgstr "按整个比例缩放" -#: ../src/selection-chemistry.cpp:2243 +#: ../src/selection-chemistry.cpp:2246 msgid "Move vertically" msgstr "垂直移动" -#: ../src/selection-chemistry.cpp:2246 +#: ../src/selection-chemistry.cpp:2249 msgid "Move horizontally" msgstr "水平移动" -#: ../src/selection-chemistry.cpp:2249 ../src/selection-chemistry.cpp:2275 -#: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:802 +#: ../src/selection-chemistry.cpp:2252 ../src/selection-chemistry.cpp:2278 +#: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:801 msgid "Move" msgstr "移动" -#: ../src/selection-chemistry.cpp:2269 +#: ../src/selection-chemistry.cpp:2272 msgid "Move vertically by pixels" msgstr "按像素垂直移动" -#: ../src/selection-chemistry.cpp:2272 +#: ../src/selection-chemistry.cpp:2275 msgid "Move horizontally by pixels" msgstr "按像素水平移动" -#: ../src/selection-chemistry.cpp:2475 +#: ../src/selection-chemistry.cpp:2478 msgid "The selection has no applied path effect." msgstr "被选对象没有被应用过路径效果。" -#: ../src/selection-chemistry.cpp:2567 ../src/ui/dialog/clonetiler.cpp:2221 +#: ../src/selection-chemistry.cpp:2570 ../src/ui/dialog/clonetiler.cpp:2230 msgid "Select an object to clone." msgstr "选择一个要克隆的对象。" -#: ../src/selection-chemistry.cpp:2602 +#: ../src/selection-chemistry.cpp:2605 msgctxt "Action" msgid "Clone" msgstr "克隆" -#: ../src/selection-chemistry.cpp:2616 +#: ../src/selection-chemistry.cpp:2619 msgid "Select clones to relink." msgstr "选择要重新链接的多个克隆。" -#: ../src/selection-chemistry.cpp:2623 +#: ../src/selection-chemistry.cpp:2626 msgid "Copy an object to clipboard to relink clones to." msgstr "复制重新链接克隆到的对象到剪贴板。" -#: ../src/selection-chemistry.cpp:2644 +#: ../src/selection-chemistry.cpp:2647 msgid "No clones to relink in the selection." msgstr "选区里没有克隆可重新链接。" -#: ../src/selection-chemistry.cpp:2647 +#: ../src/selection-chemistry.cpp:2650 msgid "Relink clone" msgstr "重新链接克隆" -#: ../src/selection-chemistry.cpp:2661 +#: ../src/selection-chemistry.cpp:2664 msgid "Select clones to unlink." msgstr "选择多个克隆断开。" -#: ../src/selection-chemistry.cpp:2714 +#: ../src/selection-chemistry.cpp:2717 msgid "No clones to unlink in the selection." msgstr "选区里没有克隆可断开。" -#: ../src/selection-chemistry.cpp:2718 +#: ../src/selection-chemistry.cpp:2721 msgid "Unlink clone" msgstr "断开克隆" -#: ../src/selection-chemistry.cpp:2731 +#: ../src/selection-chemistry.cpp:2734 msgid "" "Select a clone to go to its original. Select a linked offset " "to go to its source. Select a text on path to go to the path. Select " @@ -12338,136 +12400,136 @@ msgstr "" "选择一个克隆来移动到其原版。选择链接偏移找到源。选择路径上的" "文字来走到路径上。选择浮动文字到达框架。" -#: ../src/selection-chemistry.cpp:2781 +#: ../src/selection-chemistry.cpp:2784 msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" -msgstr "找不到要选择的目标(孤立克隆、偏移、文字路径、浮动文字?)" +msgstr "找不到要选择的目标(孤立克隆、偏移、文字路径、浮动文字?)" -#: ../src/selection-chemistry.cpp:2787 +#: ../src/selection-chemistry.cpp:2790 msgid "" "The object you're trying to select is not visible (it is in <" "defs>)" -msgstr "试图图选择的对象不可见(位于 <defs> 内)" +msgstr "试图图选择的对象不可见(位于 <defs> 内)" -#: ../src/selection-chemistry.cpp:2877 +#: ../src/selection-chemistry.cpp:2880 msgid "Select path(s) to fill." msgstr "选取要填充的路径。" -#: ../src/selection-chemistry.cpp:2895 +#: ../src/selection-chemistry.cpp:2898 msgid "Select object(s) to convert to marker." msgstr "选择要转化成标记的对象。" -#: ../src/selection-chemistry.cpp:2969 +#: ../src/selection-chemistry.cpp:2972 msgid "Objects to marker" msgstr "对象转化成标记" -#: ../src/selection-chemistry.cpp:2995 +#: ../src/selection-chemistry.cpp:2998 msgid "Select object(s) to convert to guides." msgstr "选择要转化成参考线的对象。" -#: ../src/selection-chemistry.cpp:3016 +#: ../src/selection-chemistry.cpp:3019 msgid "Objects to guides" msgstr "对象转化为参考线" -#: ../src/selection-chemistry.cpp:3052 +#: ../src/selection-chemistry.cpp:3055 msgid "Select objects to convert to symbol." msgstr "选取要转换成符号的对象。" -#: ../src/selection-chemistry.cpp:3153 +#: ../src/selection-chemistry.cpp:3156 msgid "Group to symbol" msgstr "群组转成符号" -#: ../src/selection-chemistry.cpp:3172 +#: ../src/selection-chemistry.cpp:3175 msgid "Select a symbol to extract objects from." msgstr "选取一个符号从里面提取对象。" -#: ../src/selection-chemistry.cpp:3181 +#: ../src/selection-chemistry.cpp:3184 msgid "Select only one symbol in Symbol dialog to convert to group." msgstr "只在符号对话窗中选取一个要转换成群组的符号。" -#: ../src/selection-chemistry.cpp:3237 +#: ../src/selection-chemistry.cpp:3240 msgid "Group from symbol" msgstr "从符号转成群组" -#: ../src/selection-chemistry.cpp:3255 +#: ../src/selection-chemistry.cpp:3258 msgid "Select object(s) to convert to pattern." msgstr "选择对象转化成图案。" -#: ../src/selection-chemistry.cpp:3351 +#: ../src/selection-chemistry.cpp:3354 msgid "Objects to pattern" msgstr "对象转化成图案" -#: ../src/selection-chemistry.cpp:3367 +#: ../src/selection-chemistry.cpp:3370 msgid "Select an object with pattern fill to extract objects from." msgstr "选择一个使用图案填充的对象,从中提取对象形状." -#: ../src/selection-chemistry.cpp:3426 +#: ../src/selection-chemistry.cpp:3429 msgid "No pattern fills in the selection." msgstr "选区没有图案填充." -#: ../src/selection-chemistry.cpp:3429 +#: ../src/selection-chemistry.cpp:3432 msgid "Pattern to objects" msgstr "图案转化成对象" -#: ../src/selection-chemistry.cpp:3516 +#: ../src/selection-chemistry.cpp:3518 msgid "Select object(s) to make a bitmap copy." msgstr "选择对象生成位图副本。" -#: ../src/selection-chemistry.cpp:3520 +#: ../src/selection-chemistry.cpp:3522 msgid "Rendering bitmap..." -msgstr "渲染位图…" +msgstr "渲染位图..." -#: ../src/selection-chemistry.cpp:3705 +#: ../src/selection-chemistry.cpp:3707 msgid "Create bitmap" msgstr "创建位图" -#: ../src/selection-chemistry.cpp:3730 ../src/selection-chemistry.cpp:3842 +#: ../src/selection-chemistry.cpp:3732 ../src/selection-chemistry.cpp:3844 msgid "Select object(s) to create clippath or mask from." msgstr "选择对象创建剪裁路径或者蒙版。" -#: ../src/selection-chemistry.cpp:3816 ../src/ui/dialog/objects.cpp:1918 +#: ../src/selection-chemistry.cpp:3818 ../src/ui/dialog/objects.cpp:1922 msgid "Create Clip Group" msgstr "创建剪裁群组" -#: ../src/selection-chemistry.cpp:3845 +#: ../src/selection-chemistry.cpp:3847 msgid "Select mask object and object(s) to apply clippath or mask to." msgstr "选择蒙版对象和对象应用剪裁路径或者蒙版。" -#: ../src/selection-chemistry.cpp:3992 +#: ../src/selection-chemistry.cpp:3994 msgid "Set clipping path" msgstr "设置剪裁路径" -#: ../src/selection-chemistry.cpp:3994 +#: ../src/selection-chemistry.cpp:3996 msgid "Set mask" msgstr "设置蒙版" -#: ../src/selection-chemistry.cpp:4009 +#: ../src/selection-chemistry.cpp:4011 msgid "Select object(s) to remove clippath or mask from." msgstr "选择对象去除剪裁路径或者蒙版。" -#: ../src/selection-chemistry.cpp:4125 +#: ../src/selection-chemistry.cpp:4127 msgid "Release clipping path" msgstr "释放剪裁路径" -#: ../src/selection-chemistry.cpp:4127 +#: ../src/selection-chemistry.cpp:4129 msgid "Release mask" msgstr "释放蒙版" -#: ../src/selection-chemistry.cpp:4146 +#: ../src/selection-chemistry.cpp:4148 msgid "Select object(s) to fit canvas to." msgstr "选择对象来缩放以适应画布." #. Fit Page -#: ../src/selection-chemistry.cpp:4166 ../src/verbs.cpp:2961 +#: ../src/selection-chemistry.cpp:4168 ../src/verbs.cpp:3003 msgid "Fit Page to Selection" msgstr "页面适合选区" -#: ../src/selection-chemistry.cpp:4195 ../src/verbs.cpp:2963 +#: ../src/selection-chemistry.cpp:4197 ../src/verbs.cpp:3005 msgid "Fit Page to Drawing" msgstr "页面适合绘图" -#: ../src/selection-chemistry.cpp:4216 ../src/verbs.cpp:2965 +#: ../src/selection-chemistry.cpp:4218 ../src/verbs.cpp:3007 msgid "Fit Page to Selection or Drawing" msgstr "适合页面到选区或绘图" @@ -12507,18 +12569,18 @@ msgstr " 在定义中隐藏" #: ../src/selection-describer.cpp:179 #, c-format msgid " in group %s (%s)" -msgstr " 在组 %s(%s)中" +msgstr " 在组 %s (%s)中" #: ../src/selection-describer.cpp:181 #, c-format msgid " in unnamed group (%s)" -msgstr " 在未命名的群组(%s)" +msgstr " 在未命名的群组(%s)" #: ../src/selection-describer.cpp:183 #, c-format msgid " in %i parent (%s)" msgid_plural " in %i parents (%s)" -msgstr[0] " 在%i 上层(%s)" +msgstr[0] " 在%i 上层(%s)" #: ../src/selection-describer.cpp:186 #, c-format @@ -12593,7 +12655,7 @@ msgid "" "Shift also uses this center" msgstr "中心旋转错切:拖动调整位置;使用 Shift 缩放也使用此中心" -#: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:980 +#: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:979 msgid "Skew" msgstr "错切" @@ -12645,7 +12707,7 @@ msgstr "" #: ../src/shortcuts.cpp:226 #, c-format msgid "Keyboard directory (%s) is unavailable." -msgstr "键盘目录(%s)无法使用。" +msgstr "键盘目录(%s)无法使用。" #: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305 #: ../src/ui/dialog/export.cpp:1339 @@ -12675,8 +12737,8 @@ msgstr "弧" #. Ellipse #: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 -#: ../src/ui/dialog/inkscape-preferences.cpp:412 -#: ../src/widgets/pencil-toolbar.cpp:181 +#: ../src/ui/dialog/inkscape-preferences.cpp:421 +#: ../src/widgets/pencil-toolbar.cpp:179 msgid "Ellipse" msgstr "椭圆" @@ -12697,55 +12759,55 @@ msgstr "流动区域" msgid "Flow Excluded Region" msgstr "流动排除区域" -#: ../src/sp-flowtext.cpp:280 +#: ../src/sp-flowtext.cpp:282 msgid "Flowed Text" msgstr "流动文本" -#: ../src/sp-flowtext.cpp:282 +#: ../src/sp-flowtext.cpp:284 msgid "Linked Flowed Text" msgstr "链接式流动文本" -#: ../src/sp-flowtext.cpp:288 ../src/sp-text.cpp:367 +#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:380 #: ../src/ui/tools/text-tool.cpp:1556 msgid " [truncated]" msgstr " [已截断]" -#: ../src/sp-flowtext.cpp:290 +#: ../src/sp-flowtext.cpp:292 #, c-format msgid "(%d character%s)" msgid_plural "(%d characters%s)" -msgstr[0] "(%d 个字符%s)" +msgstr[0] "(%d 个字符%s)" -#: ../src/sp-guide.cpp:253 +#: ../src/sp-guide.cpp:261 msgid "Create Guides Around the Page" msgstr "在页面周围创建参考线" -#: ../src/sp-guide.cpp:265 ../src/verbs.cpp:2518 +#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2545 msgid "Delete All Guides" msgstr "删除全部参考线" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:452 +#: ../src/sp-guide.cpp:485 msgid "Deleted" msgstr "已删除" -#: ../src/sp-guide.cpp:461 +#: ../src/sp-guide.cpp:494 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" msgstr "Shift+拖动 旋转,Ctrl+拖动移动本体,Del删除" -#: ../src/sp-guide.cpp:465 +#: ../src/sp-guide.cpp:498 #, c-format msgid "vertical, at %s" msgstr "垂直,位于 %s" -#: ../src/sp-guide.cpp:468 +#: ../src/sp-guide.cpp:501 #, c-format msgid "horizontal, at %s" msgstr "水平,位于 %s" -#: ../src/sp-guide.cpp:473 +#: ../src/sp-guide.cpp:506 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "在 %d 度,通过 (%s,%s)" @@ -12764,7 +12826,7 @@ msgstr "[不良的引用]:%s" msgid "%d × %d: %s" msgstr "%d × %d: %s" -#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1911 +#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1915 msgid "Group" msgstr "群组" @@ -12806,9 +12868,9 @@ msgstr "%s;已应用滤镜" msgid "Line" msgstr "线" -#: ../src/sp-lpe-item.cpp:260 +#: ../src/sp-lpe-item.cpp:263 ../src/sp-lpe-item.cpp:710 msgid "An exception occurred during execution of the Path Effect." -msgstr "执行路径效果时出错." +msgstr "执行路径效果时出错。" #: ../src/sp-offset.cpp:329 msgid "Linked Offset" @@ -12860,12 +12922,12 @@ msgid "Polyline" msgstr "折线" #. Rectangle -#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:402 +#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:411 msgid "Rectangle" msgstr "矩形" #. Spiral -#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:420 +#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:429 #: ../share/extensions/gcodetools_area.inx.h:11 msgid "Spiral" msgstr "螺旋" @@ -12878,24 +12940,24 @@ msgid "with %3f turns" msgstr "有 %3f 个圈" #. Star -#: ../src/sp-star.cpp:246 ../src/ui/dialog/inkscape-preferences.cpp:416 +#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:425 #: ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "星形" -#: ../src/sp-star.cpp:247 ../src/widgets/star-toolbar.cpp:462 +#: ../src/sp-star.cpp:248 ../src/widgets/star-toolbar.cpp:462 msgid "Polygon" msgstr "多边形" #. while there will never be less than 3 vertices, we still need to #. make calls to ngettext because the pluralization may be different #. for various numbers >=3. The singular form is used as the index. -#: ../src/sp-star.cpp:254 +#: ../src/sp-star.cpp:255 #, c-format msgid "with %d vertex" msgstr "具备 %d 个顶点" -#: ../src/sp-star.cpp:254 +#: ../src/sp-star.cpp:255 #, c-format msgid "with %d vertices" msgstr "具备 %d 个顶点" @@ -12904,7 +12966,7 @@ msgstr "具备 %d 个顶点" msgid "Conditional Group" msgstr "条件群组" -#: ../src/sp-text.cpp:351 ../src/verbs.cpp:347 +#: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 #: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10 #: ../share/extensions/text_braille.inx.h:2 @@ -12919,12 +12981,12 @@ msgstr "条件群组" msgid "Text" msgstr "文字" -#: ../src/sp-text.cpp:371 +#: ../src/sp-text.cpp:384 #, c-format msgid "on path%s (%s, %s)" msgstr "文本路径 %s (%s, %s)" -#: ../src/sp-text.cpp:372 +#: ../src/sp-text.cpp:385 #, c-format msgid "%s (%s, %s)" msgstr "%s (%s, %s)" @@ -12935,13 +12997,13 @@ msgstr "克隆的字符数据" #: ../src/sp-tref.cpp:234 msgid " from " -msgstr " 从" +msgstr " 从 " #: ../src/sp-tref.cpp:240 ../src/sp-use.cpp:271 msgid "[orphaned]" msgstr "[孤立]" -#: ../src/sp-tspan.cpp:203 +#: ../src/sp-tspan.cpp:217 msgid "Text Span" msgstr "文本不换行区块" @@ -12966,7 +13028,7 @@ msgstr "未命名的符号" #. * "Clone of: Clone of: ... in Layer 1". #: ../src/sp-use.cpp:257 msgid "..." -msgstr "…" +msgstr "..." #: ../src/sp-use.cpp:266 #, c-format @@ -12981,27 +13043,22 @@ msgstr "并集" msgid "Intersection" msgstr "交集" -#: ../src/splivarot.cpp:106 +#: ../src/splivarot.cpp:106 ../src/splivarot.cpp:112 msgid "Division" msgstr "除" -#: ../src/splivarot.cpp:111 +#: ../src/splivarot.cpp:118 msgid "Cut path" msgstr "剪切路径" -#: ../src/splivarot.cpp:335 +#: ../src/splivarot.cpp:342 msgid "Select at least 2 paths to perform a boolean operation." msgstr "选择至少两条路径执行布尔操作。" -#: ../src/splivarot.cpp:339 +#: ../src/splivarot.cpp:346 msgid "Select at least 1 path to perform a boolean union." msgstr "选择至少一条路径执行布尔操作。" -#: ../src/splivarot.cpp:347 -msgid "" -"Select exactly 2 paths to perform difference, division, or path cut." -msgstr "选择正好两个路径执行差集、分割或者剪切路径。" - #: ../src/splivarot.cpp:363 ../src/splivarot.cpp:378 msgid "" "Unable to determine the z-order of the objects selected for " @@ -13015,16 +13072,16 @@ msgstr "对象中有一个不是路径,不能执行布尔操作。" #: ../src/splivarot.cpp:1153 msgid "Select stroked path(s) to convert stroke to path." -msgstr "选择带笔廓的路径把笔廓转换到路径。" +msgstr "选择带笔刷的路径把笔刷转换到路径。" #: ../src/splivarot.cpp:1509 msgid "Convert stroke to path" -msgstr "把笔廓转化成路径" +msgstr "把笔刷转化成路径" #. TRANSLATORS: "to outline" means "to convert stroke to path" #: ../src/splivarot.cpp:1512 msgid "No stroked paths in the selection." -msgstr "所选内容中没有带笔廓的路径。" +msgstr "所选内容中没有带笔刷的路径。" #: ../src/splivarot.cpp:1583 msgid "Selected object is not a path, cannot inset/outset." @@ -13056,7 +13113,7 @@ msgstr "选区里没有路径可以向内/向外偏移。" #: ../src/splivarot.cpp:2124 msgid "Simplifying paths (separately):" -msgstr "正在(分别)简化路径:" +msgstr "正在(分别)简化路径:" #: ../src/splivarot.cpp:2126 msgid "Simplifying paths:" @@ -13065,7 +13122,7 @@ msgstr "简化路径:" #: ../src/splivarot.cpp:2163 #, c-format msgid "%s %d of %d paths simplified..." -msgstr "%s 简化了 %d 条,共 %d 条路径…" +msgstr "%s 简化了 %d 条,共 %d 条路径..." #: ../src/splivarot.cpp:2176 #, c-format @@ -13103,7 +13160,7 @@ msgstr "在这个版本里不能在矩形上放置文字。请先把矩形转化 msgid "The flowed text(s) must be visible in order to be put on a path." msgstr "浮动文本必须是可见的,然后才能安置在路径上。" -#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2540 +#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2568 msgid "Put text on path" msgstr "在路径上放置文字" @@ -13115,7 +13172,7 @@ msgstr "选择路径上的文字从中删除。" msgid "No texts-on-paths in the selection." msgstr "选区里没有附加在路径上的文字。" -#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2542 +#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2570 msgid "Remove text from path" msgstr "从路径上释放文字" @@ -13165,8 +13222,8 @@ msgstr "选区里没有浮动文字可以转化。" msgid "You cannot edit cloned character data." msgstr "不能够编辑克隆的字符数据。" -#: ../src/trace/potrace/inkscape-potrace.cpp:512 -#: ../src/trace/potrace/inkscape-potrace.cpp:575 +#: ../src/trace/potrace/inkscape-potrace.cpp:511 +#: ../src/trace/potrace/inkscape-potrace.cpp:574 msgid "Trace: %1. %2 nodes" msgstr "临摹:%1。%2 个节点" @@ -13203,7 +13260,7 @@ msgstr "临摹:图像没有位图数据" #: ../src/trace/trace.cpp:445 msgid "Trace: Starting trace..." -msgstr "临摹:开始提取轮廓…" +msgstr "临摹:开始提取轮廓..." #. ## inform the document, so we can undo #: ../src/trace/trace.cpp:548 @@ -13227,7 +13284,7 @@ msgstr "剪贴板是空的。" #: ../src/ui/clipboard.cpp:452 msgid "Select object(s) to paste style to." -msgstr "选择对象来粘贴样式。" +msgstr "选择对象来粘贴样式。" #: ../src/ui/clipboard.cpp:463 ../src/ui/clipboard.cpp:480 msgid "No style on the clipboard." @@ -13235,7 +13292,7 @@ msgstr "剪贴板不包含样式。" #: ../src/ui/clipboard.cpp:505 msgid "Select object(s) to paste size to." -msgstr "选择对象来粘贴大小。" +msgstr "选择对象来粘贴大小。" #: ../src/ui/clipboard.cpp:512 msgid "No size on the clipboard." @@ -13303,250 +13360,251 @@ msgstr "" "Shuyu Liu (liushuyu_011@163.com), 2015.\n" "Junde Yi (lmy441900@gmail.com), 2015.\n" "Mingye Wang (arthur200126@gmail.com), 2015.\n" -"Jeff Bai (jeffbai@aosc.xyz), 2015." +"Jeff Bai (jeffbai@aosc.xyz), 2015.\n" +"Aron Xu (happyaron.xu@gmail.com), 2016." -#: ../src/ui/dialog/align-and-distribute.cpp:170 -#: ../src/ui/dialog/align-and-distribute.cpp:847 +#: ../src/ui/dialog/align-and-distribute.cpp:169 +#: ../src/ui/dialog/align-and-distribute.cpp:889 msgid "Align" msgstr "对齐" -#: ../src/ui/dialog/align-and-distribute.cpp:338 -#: ../src/ui/dialog/align-and-distribute.cpp:848 +#: ../src/ui/dialog/align-and-distribute.cpp:337 +#: ../src/ui/dialog/align-and-distribute.cpp:890 msgid "Distribute" msgstr "分布" -#: ../src/ui/dialog/align-and-distribute.cpp:417 +#: ../src/ui/dialog/align-and-distribute.cpp:416 msgid "Minimum horizontal gap (in px units) between bounding boxes" msgstr "边界之间的最小水平间隙(以像素为单位)" #. TRANSLATORS: "H:" stands for horizontal gap -#: ../src/ui/dialog/align-and-distribute.cpp:419 +#: ../src/ui/dialog/align-and-distribute.cpp:418 msgctxt "Gap" msgid "_H:" msgstr "_H:" -#: ../src/ui/dialog/align-and-distribute.cpp:427 +#: ../src/ui/dialog/align-and-distribute.cpp:426 msgid "Minimum vertical gap (in px units) between bounding boxes" msgstr "边界之间的最小垂直间隙(以像素为单位)" #. TRANSLATORS: Vertical gap -#: ../src/ui/dialog/align-and-distribute.cpp:429 +#: ../src/ui/dialog/align-and-distribute.cpp:428 msgctxt "Gap" msgid "_V:" msgstr "_V:" -#: ../src/ui/dialog/align-and-distribute.cpp:464 -#: ../src/ui/dialog/align-and-distribute.cpp:850 -#: ../src/widgets/connector-toolbar.cpp:407 +#: ../src/ui/dialog/align-and-distribute.cpp:463 +#: ../src/ui/dialog/align-and-distribute.cpp:892 +#: ../src/widgets/connector-toolbar.cpp:405 msgid "Remove overlaps" msgstr "去除重叠" -#: ../src/ui/dialog/align-and-distribute.cpp:495 -#: ../src/widgets/connector-toolbar.cpp:236 +#: ../src/ui/dialog/align-and-distribute.cpp:494 +#: ../src/widgets/connector-toolbar.cpp:234 msgid "Arrange connector network" msgstr "整理连接器网络" -#: ../src/ui/dialog/align-and-distribute.cpp:588 +#: ../src/ui/dialog/align-and-distribute.cpp:587 msgid "Exchange Positions" msgstr "交换位置" -#: ../src/ui/dialog/align-and-distribute.cpp:622 +#: ../src/ui/dialog/align-and-distribute.cpp:621 msgid "Unclump" msgstr "解散" -#: ../src/ui/dialog/align-and-distribute.cpp:693 +#: ../src/ui/dialog/align-and-distribute.cpp:692 msgid "Randomize positions" msgstr "随机化位置" -#: ../src/ui/dialog/align-and-distribute.cpp:795 +#: ../src/ui/dialog/align-and-distribute.cpp:793 msgid "Distribute text baselines" msgstr "分布文本基线" -#: ../src/ui/dialog/align-and-distribute.cpp:819 +#: ../src/ui/dialog/align-and-distribute.cpp:861 msgid "Align text baselines" msgstr "对齐文本基线" -#: ../src/ui/dialog/align-and-distribute.cpp:849 +#: ../src/ui/dialog/align-and-distribute.cpp:891 msgid "Rearrange" msgstr "重新安排" -#: ../src/ui/dialog/align-and-distribute.cpp:851 -#: ../src/widgets/toolbox.cpp:1730 +#: ../src/ui/dialog/align-and-distribute.cpp:893 +#: ../src/widgets/toolbox.cpp:1781 msgid "Nodes" msgstr "节点" -#: ../src/ui/dialog/align-and-distribute.cpp:865 +#: ../src/ui/dialog/align-and-distribute.cpp:907 msgid "Relative to: " msgstr "相对于:" -#: ../src/ui/dialog/align-and-distribute.cpp:866 +#: ../src/ui/dialog/align-and-distribute.cpp:908 msgid "_Treat selection as group: " msgstr "将选区视为群组(_T):" #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:872 ../src/verbs.cpp:2993 -#: ../src/verbs.cpp:2994 +#: ../src/ui/dialog/align-and-distribute.cpp:914 ../src/verbs.cpp:3035 +#: ../src/verbs.cpp:3036 msgid "Align right edges of objects to the left edge of the anchor" msgstr "将对象的右侧边沿对齐到锚的左边" -#: ../src/ui/dialog/align-and-distribute.cpp:875 ../src/verbs.cpp:2995 -#: ../src/verbs.cpp:2996 +#: ../src/ui/dialog/align-and-distribute.cpp:917 ../src/verbs.cpp:3037 +#: ../src/verbs.cpp:3038 msgid "Align left edges" msgstr "对齐左侧边沿" -#: ../src/ui/dialog/align-and-distribute.cpp:878 ../src/verbs.cpp:2997 -#: ../src/verbs.cpp:2998 +#: ../src/ui/dialog/align-and-distribute.cpp:920 ../src/verbs.cpp:3039 +#: ../src/verbs.cpp:3040 msgid "Center on vertical axis" msgstr "垂直居中" -#: ../src/ui/dialog/align-and-distribute.cpp:881 ../src/verbs.cpp:2999 -#: ../src/verbs.cpp:3000 +#: ../src/ui/dialog/align-and-distribute.cpp:923 ../src/verbs.cpp:3041 +#: ../src/verbs.cpp:3042 msgid "Align right sides" msgstr "对齐右侧" -#: ../src/ui/dialog/align-and-distribute.cpp:884 ../src/verbs.cpp:3001 -#: ../src/verbs.cpp:3002 +#: ../src/ui/dialog/align-and-distribute.cpp:926 ../src/verbs.cpp:3043 +#: ../src/verbs.cpp:3044 msgid "Align left edges of objects to the right edge of the anchor" msgstr "对齐对象的左边沿到锚的右边" -#: ../src/ui/dialog/align-and-distribute.cpp:887 ../src/verbs.cpp:3003 -#: ../src/verbs.cpp:3004 +#: ../src/ui/dialog/align-and-distribute.cpp:929 ../src/verbs.cpp:3045 +#: ../src/verbs.cpp:3046 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "对齐对象的底边沿到锚的顶端" -#: ../src/ui/dialog/align-and-distribute.cpp:890 ../src/verbs.cpp:3005 -#: ../src/verbs.cpp:3006 +#: ../src/ui/dialog/align-and-distribute.cpp:932 ../src/verbs.cpp:3047 +#: ../src/verbs.cpp:3048 msgid "Align top edges" msgstr "对齐顶部边沿" -#: ../src/ui/dialog/align-and-distribute.cpp:893 ../src/verbs.cpp:3007 -#: ../src/verbs.cpp:3008 +#: ../src/ui/dialog/align-and-distribute.cpp:935 ../src/verbs.cpp:3049 +#: ../src/verbs.cpp:3050 msgid "Center on horizontal axis" msgstr "水平居中" -#: ../src/ui/dialog/align-and-distribute.cpp:896 ../src/verbs.cpp:3009 -#: ../src/verbs.cpp:3010 +#: ../src/ui/dialog/align-and-distribute.cpp:938 ../src/verbs.cpp:3051 +#: ../src/verbs.cpp:3052 msgid "Align bottom edges" msgstr "对齐底部边沿" -#: ../src/ui/dialog/align-and-distribute.cpp:899 ../src/verbs.cpp:3011 -#: ../src/verbs.cpp:3012 +#: ../src/ui/dialog/align-and-distribute.cpp:941 ../src/verbs.cpp:3053 +#: ../src/verbs.cpp:3054 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "将对象的顶端边沿对齐到锚的底侧" -#: ../src/ui/dialog/align-and-distribute.cpp:904 +#: ../src/ui/dialog/align-and-distribute.cpp:946 msgid "Align baseline anchors of texts horizontally" msgstr "水平对齐文字的基准锚" -#: ../src/ui/dialog/align-and-distribute.cpp:907 +#: ../src/ui/dialog/align-and-distribute.cpp:949 msgid "Align baselines of texts" msgstr "文字基线对齐" -#: ../src/ui/dialog/align-and-distribute.cpp:912 +#: ../src/ui/dialog/align-and-distribute.cpp:954 msgid "Make horizontal gaps between objects equal" msgstr "使对象之间的水平间隙相等" -#: ../src/ui/dialog/align-and-distribute.cpp:916 +#: ../src/ui/dialog/align-and-distribute.cpp:958 msgid "Distribute left edges equidistantly" msgstr "左侧边沿等距分布" -#: ../src/ui/dialog/align-and-distribute.cpp:919 +#: ../src/ui/dialog/align-and-distribute.cpp:961 msgid "Distribute centers equidistantly horizontally" msgstr "水平方向中心等距分开" -#: ../src/ui/dialog/align-and-distribute.cpp:922 +#: ../src/ui/dialog/align-and-distribute.cpp:964 msgid "Distribute right edges equidistantly" msgstr "右侧边沿等距分布" -#: ../src/ui/dialog/align-and-distribute.cpp:926 +#: ../src/ui/dialog/align-and-distribute.cpp:968 msgid "Make vertical gaps between objects equal" msgstr "使对象之间的垂直间隙相等" -#: ../src/ui/dialog/align-and-distribute.cpp:930 +#: ../src/ui/dialog/align-and-distribute.cpp:972 msgid "Distribute top edges equidistantly" msgstr "顶部边沿等距分布" -#: ../src/ui/dialog/align-and-distribute.cpp:933 +#: ../src/ui/dialog/align-and-distribute.cpp:975 msgid "Distribute centers equidistantly vertically" msgstr "垂直方向中心等距分开" -#: ../src/ui/dialog/align-and-distribute.cpp:936 +#: ../src/ui/dialog/align-and-distribute.cpp:978 msgid "Distribute bottom edges equidistantly" msgstr "底部边沿等距分布" -#: ../src/ui/dialog/align-and-distribute.cpp:941 +#: ../src/ui/dialog/align-and-distribute.cpp:983 msgid "Distribute baseline anchors of texts horizontally" msgstr "水平对齐文字的基准锚" -#: ../src/ui/dialog/align-and-distribute.cpp:944 +#: ../src/ui/dialog/align-and-distribute.cpp:986 msgid "Distribute baselines of texts vertically" msgstr "文本基线垂直分布" -#: ../src/ui/dialog/align-and-distribute.cpp:950 -#: ../src/widgets/connector-toolbar.cpp:369 +#: ../src/ui/dialog/align-and-distribute.cpp:992 +#: ../src/widgets/connector-toolbar.cpp:367 msgid "Nicely arrange selected connector network" msgstr "优化安排选择的连接器网络" -#: ../src/ui/dialog/align-and-distribute.cpp:953 +#: ../src/ui/dialog/align-and-distribute.cpp:995 msgid "Exchange positions of selected objects - selection order" msgstr "交换选取对象的位置 - 选取顺序" -#: ../src/ui/dialog/align-and-distribute.cpp:956 +#: ../src/ui/dialog/align-and-distribute.cpp:998 msgid "Exchange positions of selected objects - stacking order" msgstr "交换选取对象的位置 - 堆叠顺序" -#: ../src/ui/dialog/align-and-distribute.cpp:959 +#: ../src/ui/dialog/align-and-distribute.cpp:1001 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "交换选取对象的位置 - 顺时针旋转" -#: ../src/ui/dialog/align-and-distribute.cpp:964 +#: ../src/ui/dialog/align-and-distribute.cpp:1006 msgid "Randomize centers in both dimensions" msgstr "两个方向任意居中" -#: ../src/ui/dialog/align-and-distribute.cpp:967 +#: ../src/ui/dialog/align-and-distribute.cpp:1009 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "解散聚合对象:尝试做到边边等距" -#: ../src/ui/dialog/align-and-distribute.cpp:972 +#: ../src/ui/dialog/align-and-distribute.cpp:1014 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" msgstr "移动对象尽可能小,以便边界不重叠" -#: ../src/ui/dialog/align-and-distribute.cpp:980 +#: ../src/ui/dialog/align-and-distribute.cpp:1022 msgid "Align selected nodes to a common horizontal line" msgstr "将选择节点对齐到水平线" -#: ../src/ui/dialog/align-and-distribute.cpp:983 +#: ../src/ui/dialog/align-and-distribute.cpp:1025 msgid "Align selected nodes to a common vertical line" msgstr "将选择节点对齐到垂直线" -#: ../src/ui/dialog/align-and-distribute.cpp:986 +#: ../src/ui/dialog/align-and-distribute.cpp:1028 msgid "Distribute selected nodes horizontally" msgstr "水平方向分布选择的节点" -#: ../src/ui/dialog/align-and-distribute.cpp:989 +#: ../src/ui/dialog/align-and-distribute.cpp:1031 msgid "Distribute selected nodes vertically" msgstr "垂直方向分布选择的节点" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:994 +#: ../src/ui/dialog/align-and-distribute.cpp:1036 msgid "Last selected" msgstr "最近选区" -#: ../src/ui/dialog/align-and-distribute.cpp:995 +#: ../src/ui/dialog/align-and-distribute.cpp:1037 msgid "First selected" msgstr "最初选区" -#: ../src/ui/dialog/align-and-distribute.cpp:996 +#: ../src/ui/dialog/align-and-distribute.cpp:1038 msgid "Biggest object" msgstr "最大对象" -#: ../src/ui/dialog/align-and-distribute.cpp:997 +#: ../src/ui/dialog/align-and-distribute.cpp:1039 msgid "Smallest object" msgstr "最小对象" -#: ../src/ui/dialog/align-and-distribute.cpp:1000 +#: ../src/ui/dialog/align-and-distribute.cpp:1042 msgid "Selection Area" msgstr "选取范围" @@ -13659,12 +13717,12 @@ msgstr "X 偏移:" #: ../src/ui/dialog/clonetiler.cpp:196 #, no-c-format msgid "Horizontal shift per row (in % of tile width)" -msgstr "每行水平偏移(宽度的百分比)" +msgstr "每行水平偏移(宽度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:204 #, no-c-format msgid "Horizontal shift per column (in % of tile width)" -msgstr "每列水平偏移(宽度的百分比)" +msgstr "每列水平偏移(宽度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:210 msgid "Randomize the horizontal shift by this percentage" @@ -13679,12 +13737,12 @@ msgstr " Y 偏移:" #: ../src/ui/dialog/clonetiler.cpp:228 #, no-c-format msgid "Vertical shift per row (in % of tile height)" -msgstr "每行水平偏移(高度的百分比)" +msgstr "每行水平偏移(高度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:236 #, no-c-format msgid "Vertical shift per column (in % of tile height)" -msgstr "每列水平偏移(高度的百分比)" +msgstr "每列水平偏移(高度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:243 msgid "Randomize the vertical shift by this percentage" @@ -13755,12 +13813,12 @@ msgstr "X 缩放:" #: ../src/ui/dialog/clonetiler.cpp:345 #, no-c-format msgid "Horizontal scale per row (in % of tile width)" -msgstr "每行水平缩放(宽度的百分比)" +msgstr "每行水平缩放(宽度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:353 #, no-c-format msgid "Horizontal scale per column (in % of tile width)" -msgstr "每列水平缩放(宽度的百分比)" +msgstr "每列水平缩放(宽度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:359 msgid "Randomize the horizontal scale by this percentage" @@ -13773,12 +13831,12 @@ msgstr "Y 缩放:" #: ../src/ui/dialog/clonetiler.cpp:375 #, no-c-format msgid "Vertical scale per row (in % of tile height)" -msgstr "每行垂直缩放(高度的百分比)" +msgstr "每行垂直缩放(高度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:383 #, no-c-format msgid "Vertical scale per column (in % of tile height)" -msgstr "每列水平缩放(高度的百分比)" +msgstr "每列水平缩放(高度的百分比)" #: ../src/ui/dialog/clonetiler.cpp:389 msgid "Randomize the vertical scale by this percentage" @@ -13786,11 +13844,11 @@ msgstr "使用当前百分比在垂直方向随机缩放" #: ../src/ui/dialog/clonetiler.cpp:403 msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" -msgstr "行缩放是均匀的 (1),收敛的 (<1) 还是发散的 (>1)" +msgstr "行缩放是均匀的(1),收敛的 (<1) 还是发散的 (>1)" #: ../src/ui/dialog/clonetiler.cpp:409 msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" -msgstr "列缩放是均匀的 (1),收敛的 (<1) 还是发散的 (>1)" +msgstr "列缩放是均匀的(1),收敛的 (<1) 还是发散的 (>1)" #: ../src/ui/dialog/clonetiler.cpp:417 msgid "Base:" @@ -13922,8 +13980,8 @@ msgstr "平铺克隆的初始颜色" #: ../src/ui/dialog/clonetiler.cpp:665 msgid "" "Initial color for clones (works only if the original has unset fill or " -"stroke)" -msgstr "克隆的初始颜色(只有原始对象没有设置填充或绘制属性才起作用)" +"stroke or on spray tool in copy mode)" +msgstr "克隆的初始颜色(只有原始对象没有设置填充或绘制属性才起作用)" #: ../src/ui/dialog/clonetiler.cpp:680 msgid "H:" @@ -13985,186 +14043,191 @@ msgstr "交替每一列的颜色变化量符号" msgid "_Trace" msgstr "临摹(_T)" -#: ../src/ui/dialog/clonetiler.cpp:790 -msgid "Trace the drawing under the tiles" +#: ../src/ui/dialog/clonetiler.cpp:788 +msgid "Trace the drawing under the clones/sprayed items" msgstr "临摹网格下的绘画" -#: ../src/ui/dialog/clonetiler.cpp:794 +#: ../src/ui/dialog/clonetiler.cpp:792 +#, fuzzy msgid "" -"For each clone, pick a value from the drawing in that clone's location and " -"apply it to the clone" +"For each clone/sprayed item, pick a value from the drawing in its location " +"and apply it" msgstr "对于每个克隆对象,从绘画中在此位置拾取一个值然后应用到克隆对象" -#: ../src/ui/dialog/clonetiler.cpp:813 +#: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" msgstr "1. 从绘画中拾取:" -#: ../src/ui/dialog/clonetiler.cpp:831 +#: ../src/ui/dialog/clonetiler.cpp:829 msgid "Pick the visible color and opacity" msgstr "拾取可见颜色和不透明度" -#: ../src/ui/dialog/clonetiler.cpp:839 +#: ../src/ui/dialog/clonetiler.cpp:837 msgid "Pick the total accumulated opacity" msgstr "拾取总累加的不透明度" -#: ../src/ui/dialog/clonetiler.cpp:846 +#: ../src/ui/dialog/clonetiler.cpp:844 msgid "R" msgstr "红" -#: ../src/ui/dialog/clonetiler.cpp:847 +#: ../src/ui/dialog/clonetiler.cpp:845 msgid "Pick the Red component of the color" msgstr "拾取颜色的红色组分" -#: ../src/ui/dialog/clonetiler.cpp:854 +#: ../src/ui/dialog/clonetiler.cpp:852 msgid "G" msgstr "绿" -#: ../src/ui/dialog/clonetiler.cpp:855 +#: ../src/ui/dialog/clonetiler.cpp:853 msgid "Pick the Green component of the color" msgstr "拾取颜色的绿色组分" -#: ../src/ui/dialog/clonetiler.cpp:862 +#: ../src/ui/dialog/clonetiler.cpp:860 msgid "B" msgstr "蓝" -#: ../src/ui/dialog/clonetiler.cpp:863 +#: ../src/ui/dialog/clonetiler.cpp:861 msgid "Pick the Blue component of the color" msgstr "拾取颜色的蓝色组分" -#: ../src/ui/dialog/clonetiler.cpp:870 +#: ../src/ui/dialog/clonetiler.cpp:868 msgctxt "Clonetiler color hue" msgid "H" msgstr "色" -#: ../src/ui/dialog/clonetiler.cpp:871 +#: ../src/ui/dialog/clonetiler.cpp:869 msgid "Pick the hue of the color" msgstr "拾取颜色的色调" -#: ../src/ui/dialog/clonetiler.cpp:878 +#: ../src/ui/dialog/clonetiler.cpp:876 msgctxt "Clonetiler color saturation" msgid "S" msgstr "饱" -#: ../src/ui/dialog/clonetiler.cpp:879 +#: ../src/ui/dialog/clonetiler.cpp:877 msgid "Pick the saturation of the color" msgstr "拾取颜色的饱和度" -#: ../src/ui/dialog/clonetiler.cpp:886 +#: ../src/ui/dialog/clonetiler.cpp:884 msgctxt "Clonetiler color lightness" msgid "L" msgstr "亮" -#: ../src/ui/dialog/clonetiler.cpp:887 +#: ../src/ui/dialog/clonetiler.cpp:885 msgid "Pick the lightness of the color" msgstr "拾取颜色的亮度" -#: ../src/ui/dialog/clonetiler.cpp:897 +#: ../src/ui/dialog/clonetiler.cpp:895 msgid "2. Tweak the picked value:" msgstr "2. 调整拾取的值:" -#: ../src/ui/dialog/clonetiler.cpp:914 +#: ../src/ui/dialog/clonetiler.cpp:912 msgid "Gamma-correct:" msgstr "伽马校正:" -#: ../src/ui/dialog/clonetiler.cpp:918 +#: ../src/ui/dialog/clonetiler.cpp:916 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "向上 (>0) 或者向下 (<0) 移动拾取值的中间范围" -#: ../src/ui/dialog/clonetiler.cpp:925 +#: ../src/ui/dialog/clonetiler.cpp:923 msgid "Randomize:" msgstr "随机:" -#: ../src/ui/dialog/clonetiler.cpp:929 +#: ../src/ui/dialog/clonetiler.cpp:927 msgid "Randomize the picked value by this percentage" msgstr "按照这个百分比随机化拾取的颜色" -#: ../src/ui/dialog/clonetiler.cpp:936 +#: ../src/ui/dialog/clonetiler.cpp:934 msgid "Invert:" msgstr "反转:" -#: ../src/ui/dialog/clonetiler.cpp:940 +#: ../src/ui/dialog/clonetiler.cpp:938 msgid "Invert the picked value" msgstr "反转拾取值" -#: ../src/ui/dialog/clonetiler.cpp:946 +#: ../src/ui/dialog/clonetiler.cpp:944 msgid "3. Apply the value to the clones':" msgstr "3. 应用数值到克隆的对象:" -#: ../src/ui/dialog/clonetiler.cpp:961 +#: ../src/ui/dialog/clonetiler.cpp:959 msgid "Presence" msgstr "外观" -#: ../src/ui/dialog/clonetiler.cpp:964 +#: ../src/ui/dialog/clonetiler.cpp:962 msgid "" "Each clone is created with the probability determined by the picked value in " "that point" msgstr "每一个克隆对象的创建可能性由拾取值得那个点的值决定" -#: ../src/ui/dialog/clonetiler.cpp:971 +#: ../src/ui/dialog/clonetiler.cpp:969 msgid "Size" msgstr "尺寸" -#: ../src/ui/dialog/clonetiler.cpp:974 +#: ../src/ui/dialog/clonetiler.cpp:972 msgid "Each clone's size is determined by the picked value in that point" msgstr "每一个克隆对象的大小由拾取值得那个点的值决定" -#: ../src/ui/dialog/clonetiler.cpp:984 +#: ../src/ui/dialog/clonetiler.cpp:982 msgid "" "Each clone is painted by the picked color (the original must have unset fill " "or stroke)" -msgstr "每一个克隆对象通过拾取的颜色绘制(原始对象没有设置填充或者笔廓属性)" +msgstr "每一个克隆对象通过拾取的颜色绘制(原始对象没有设置填充或者笔刷属性)" -#: ../src/ui/dialog/clonetiler.cpp:994 +#: ../src/ui/dialog/clonetiler.cpp:992 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "每一个克隆对象的不透明度由拾取值得那个点的值决定" -#: ../src/ui/dialog/clonetiler.cpp:1042 +#: ../src/ui/dialog/clonetiler.cpp:1011 +msgid "Apply to tiled clones:" +msgstr "应用到平铺克隆:" + +#: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" msgstr "平铺里有多少行" -#: ../src/ui/dialog/clonetiler.cpp:1072 +#: ../src/ui/dialog/clonetiler.cpp:1082 msgid "How many columns in the tiling" msgstr "平铺里有多少列" -#: ../src/ui/dialog/clonetiler.cpp:1117 +#: ../src/ui/dialog/clonetiler.cpp:1127 msgid "Width of the rectangle to be filled" msgstr "被填充矩形的宽度" -#: ../src/ui/dialog/clonetiler.cpp:1150 +#: ../src/ui/dialog/clonetiler.cpp:1160 msgid "Height of the rectangle to be filled" msgstr "被填充矩形的高度" -#: ../src/ui/dialog/clonetiler.cpp:1167 +#: ../src/ui/dialog/clonetiler.cpp:1177 msgid "Rows, columns: " msgstr "行,列:" -#: ../src/ui/dialog/clonetiler.cpp:1168 +#: ../src/ui/dialog/clonetiler.cpp:1178 msgid "Create the specified number of rows and columns" msgstr "创建指定数目的行和列" -#: ../src/ui/dialog/clonetiler.cpp:1177 +#: ../src/ui/dialog/clonetiler.cpp:1187 msgid "Width, height: " msgstr "宽,高:" -#: ../src/ui/dialog/clonetiler.cpp:1178 +#: ../src/ui/dialog/clonetiler.cpp:1188 msgid "Fill the specified width and height with the tiling" msgstr "使用平铺填充指定的宽度和高度" -#: ../src/ui/dialog/clonetiler.cpp:1199 +#: ../src/ui/dialog/clonetiler.cpp:1209 msgid "Use saved size and position of the tile" msgstr "使用保存下来的平铺的尺寸和位置" -#: ../src/ui/dialog/clonetiler.cpp:1202 +#: ../src/ui/dialog/clonetiler.cpp:1212 msgid "" "Pretend that the size and position of the tile are the same as the last time " "you tiled it (if any), instead of using the current size" -msgstr "假装平铺的尺寸和位置与上次平铺的一样(如果有的话),而非当前使用的尺寸" +msgstr "假装平铺的尺寸和位置与上次平铺的一样(如果有的话),而非当前使用的尺寸" -#: ../src/ui/dialog/clonetiler.cpp:1236 +#: ../src/ui/dialog/clonetiler.cpp:1246 msgid " _Create " msgstr " 创建(_C) " -#: ../src/ui/dialog/clonetiler.cpp:1238 +#: ../src/ui/dialog/clonetiler.cpp:1248 msgid "Create and tile the clones of the selection" msgstr "创建并平铺选择区的克隆" @@ -14173,89 +14236,89 @@ msgstr "创建并平铺选择区的克隆" #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1258 +#: ../src/ui/dialog/clonetiler.cpp:1268 msgid " _Unclump " msgstr " 解散(_U) " -#: ../src/ui/dialog/clonetiler.cpp:1259 +#: ../src/ui/dialog/clonetiler.cpp:1269 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "散开克隆以减少组合; 可以重复应用" -#: ../src/ui/dialog/clonetiler.cpp:1265 +#: ../src/ui/dialog/clonetiler.cpp:1275 msgid " Re_move " msgstr " 去除(_M) " -#: ../src/ui/dialog/clonetiler.cpp:1266 +#: ../src/ui/dialog/clonetiler.cpp:1276 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "去除选择的对象的已存在平铺克隆(只有兄弟对象)" -#: ../src/ui/dialog/clonetiler.cpp:1283 +#: ../src/ui/dialog/clonetiler.cpp:1293 msgid " R_eset " msgstr " 重置(_E) " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1285 +#: ../src/ui/dialog/clonetiler.cpp:1295 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" msgstr "重置对话框中所有偏移、缩放、旋转、不透明度和颜色为零" -#: ../src/ui/dialog/clonetiler.cpp:1358 +#: ../src/ui/dialog/clonetiler.cpp:1367 msgid "Nothing selected." msgstr "未选择任何内容。" -#: ../src/ui/dialog/clonetiler.cpp:1364 +#: ../src/ui/dialog/clonetiler.cpp:1373 msgid "More than one object selected." msgstr "超过一个对象已选。" -#: ../src/ui/dialog/clonetiler.cpp:1371 +#: ../src/ui/dialog/clonetiler.cpp:1380 #, c-format msgid "Object has %d tiled clones." msgstr "对象有%d个平铺克隆。" -#: ../src/ui/dialog/clonetiler.cpp:1376 +#: ../src/ui/dialog/clonetiler.cpp:1385 msgid "Object has no tiled clones." msgstr "对象没有平铺克隆。" -#: ../src/ui/dialog/clonetiler.cpp:2100 +#: ../src/ui/dialog/clonetiler.cpp:2109 msgid "Select one object whose tiled clones to unclump." msgstr "选择一个对象,解散其平铺克隆。" -#: ../src/ui/dialog/clonetiler.cpp:2120 +#: ../src/ui/dialog/clonetiler.cpp:2129 msgid "Unclump tiled clones" msgstr "解散平铺克隆" -#: ../src/ui/dialog/clonetiler.cpp:2149 +#: ../src/ui/dialog/clonetiler.cpp:2158 msgid "Select one object whose tiled clones to remove." msgstr "选择一个对象,去除其平铺克隆。" -#: ../src/ui/dialog/clonetiler.cpp:2174 +#: ../src/ui/dialog/clonetiler.cpp:2183 msgid "Delete tiled clones" msgstr "删除平铺克隆" -#: ../src/ui/dialog/clonetiler.cpp:2227 +#: ../src/ui/dialog/clonetiler.cpp:2236 msgid "" "If you want to clone several objects, group them and clone the " "group." msgstr "如果要克隆几个对象,先组合然后再克隆群组。" -#: ../src/ui/dialog/clonetiler.cpp:2236 +#: ../src/ui/dialog/clonetiler.cpp:2245 msgid "Creating tiled clones..." -msgstr "创建平铺克隆…" +msgstr "创建平铺克隆..." -#: ../src/ui/dialog/clonetiler.cpp:2652 +#: ../src/ui/dialog/clonetiler.cpp:2661 msgid "Create tiled clones" msgstr "创建平铺克隆" -#: ../src/ui/dialog/clonetiler.cpp:2885 +#: ../src/ui/dialog/clonetiler.cpp:2894 msgid "Per row:" msgstr "每行:" -#: ../src/ui/dialog/clonetiler.cpp:2903 +#: ../src/ui/dialog/clonetiler.cpp:2912 msgid "Per column:" msgstr "每列:" -#: ../src/ui/dialog/clonetiler.cpp:2911 +#: ../src/ui/dialog/clonetiler.cpp:2920 msgid "Randomize:" msgstr "随机:" @@ -14263,7 +14326,7 @@ msgstr "随机:" #, c-format msgid "" "Color: %s; Click to set fill, Shift+click to set stroke" -msgstr "颜色:%s单击 设置填充,Shift+单击 设置笔廓" +msgstr "颜色:%s单击 设置填充,Shift+单击 设置笔刷" #: ../src/ui/dialog/color-item.cpp:505 msgid "Change color definition" @@ -14271,7 +14334,7 @@ msgstr "改变颜色定义" #: ../src/ui/dialog/color-item.cpp:675 msgid "Remove stroke color" -msgstr "移除笔廓颜色" +msgstr "移除笔刷颜色" #: ../src/ui/dialog/color-item.cpp:675 msgid "Remove fill color" @@ -14279,7 +14342,7 @@ msgstr "移除填充色" #: ../src/ui/dialog/color-item.cpp:680 msgid "Set stroke color to none" -msgstr "设置笔廓颜色为无" +msgstr "设置笔刷颜色为无" #: ../src/ui/dialog/color-item.cpp:680 msgid "Set fill color to none" @@ -14287,7 +14350,7 @@ msgstr "设置填充颜色为无" #: ../src/ui/dialog/color-item.cpp:698 msgid "Set stroke color from swatch" -msgstr "从色盘中设置笔廓颜色" +msgstr "从色盘中设置笔刷颜色" #: ../src/ui/dialog/color-item.cpp:698 msgid "Set fill color from swatch" @@ -14310,286 +14373,306 @@ msgid "Release log messages" msgstr "释放日志消息" #: ../src/ui/dialog/document-metadata.cpp:88 -#: ../src/ui/dialog/document-properties.cpp:166 +#: ../src/ui/dialog/document-properties.cpp:167 msgid "Metadata" msgstr "元数据" #: ../src/ui/dialog/document-metadata.cpp:89 -#: ../src/ui/dialog/document-properties.cpp:167 +#: ../src/ui/dialog/document-properties.cpp:168 msgid "License" msgstr "许可" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:978 +#: ../src/ui/dialog/document-properties.cpp:994 msgid "Dublin Core Entities" msgstr "都柏林核心实体" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1040 +#: ../src/ui/dialog/document-properties.cpp:1056 msgid "License" msgstr "许可" #. --------------------------------------------------------------- #: ../src/ui/dialog/document-properties.cpp:118 msgid "Use antialiasing" -msgstr "使用反锯齿" +msgstr "使用抗锯齿" #: ../src/ui/dialog/document-properties.cpp:118 msgid "If unset, no antialiasing will be done on the drawing" -msgstr "如果取消设置,则图形绘制不会使用反锯齿" +msgstr "如果取消设置,则图形绘制不会使用抗锯齿" + +#: ../src/ui/dialog/document-properties.cpp:119 +msgid "Checkerboard background" +msgstr "跳棋盘背景" #: ../src/ui/dialog/document-properties.cpp:119 +msgid "" +"If set, use checkerboard for background, otherwise use background color at " +"full opacity." +msgstr "" + +#: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" msgstr "显示页面边界(_B)" -#: ../src/ui/dialog/document-properties.cpp:119 +#: ../src/ui/dialog/document-properties.cpp:120 msgid "If set, rectangular page border is shown" msgstr "如果设置,矩形页面边界可见" -#: ../src/ui/dialog/document-properties.cpp:120 +#: ../src/ui/dialog/document-properties.cpp:121 msgid "Border on _top of drawing" msgstr "绘图的顶部边界(_T)" -#: ../src/ui/dialog/document-properties.cpp:120 +#: ../src/ui/dialog/document-properties.cpp:121 msgid "If set, border is always on top of the drawing" msgstr "如果设置,边界始终在绘图的顶部" -#: ../src/ui/dialog/document-properties.cpp:121 +#: ../src/ui/dialog/document-properties.cpp:122 msgid "_Show border shadow" msgstr "显示边界阴影(_S)" -#: ../src/ui/dialog/document-properties.cpp:121 +#: ../src/ui/dialog/document-properties.cpp:122 msgid "If set, page border shows a shadow on its right and lower side" msgstr "如果设置,页面边界会在右下边显示阴影" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:123 msgid "Back_ground color:" msgstr "背景颜色(_G):" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:123 +#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " -"editing but used when exporting to bitmap." +"editing if 'Checkerboard background' unset (but used when exporting to " +"bitmap)." msgstr "页面背景颜色。备注:编辑时会忽略透明度设置值,但导出成位图时会使用。" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" msgstr "边界颜色(_C):" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Page border color" msgstr "页面边界色" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Color of the page border" msgstr "页面边界的颜色" -#: ../src/ui/dialog/document-properties.cpp:124 +#: ../src/ui/dialog/document-properties.cpp:125 msgid "Display _units:" msgstr "网格单位(_U):" #. --------------------------------------------------------------- #. General snap options -#: ../src/ui/dialog/document-properties.cpp:128 +#: ../src/ui/dialog/document-properties.cpp:129 msgid "Show _guides" msgstr "显示参考线(_G)" -#: ../src/ui/dialog/document-properties.cpp:128 +#: ../src/ui/dialog/document-properties.cpp:129 msgid "Show or hide guides" msgstr "显示或隐藏参考线" -#: ../src/ui/dialog/document-properties.cpp:129 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Guide co_lor:" msgstr "参考线颜色(_L)" -#: ../src/ui/dialog/document-properties.cpp:129 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Guideline color" msgstr "参考线颜色" -#: ../src/ui/dialog/document-properties.cpp:129 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Color of guidelines" msgstr "参考线的颜色" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "_Highlight color:" msgstr "高亮色(_H):" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "Highlighted guideline color" msgstr "高亮参考线颜色" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "Color of a guideline when it is under mouse" msgstr "鼠标移上去的参考线颜色" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:132 +#: ../src/ui/dialog/document-properties.cpp:133 msgid "Snap _distance" msgstr "吸附距离(_D)" -#: ../src/ui/dialog/document-properties.cpp:132 +#: ../src/ui/dialog/document-properties.cpp:133 msgid "Snap only when _closer than:" msgstr "吸附距离范围(_C):" -#: ../src/ui/dialog/document-properties.cpp:132 -#: ../src/ui/dialog/document-properties.cpp:137 -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Always snap" msgstr "总是吸附" -#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:134 msgid "Snapping distance, in screen pixels, for snapping to objects" msgstr "吸附的有效距离,以屏幕像素计,吸附到对象时有效" -#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:134 msgid "Always snap to objects, regardless of their distance" msgstr "不论距离远近,总是吸附到对象" -#: ../src/ui/dialog/document-properties.cpp:134 +#: ../src/ui/dialog/document-properties.cpp:135 msgid "" "If set, objects only snap to another object when it's within the range " "specified below" msgstr "选择后,对象之间的距离在指定的范围内才会吸附" #. Options for snapping to grids -#: ../src/ui/dialog/document-properties.cpp:137 +#: ../src/ui/dialog/document-properties.cpp:138 msgid "Snap d_istance" msgstr "吸附距离(_I)" -#: ../src/ui/dialog/document-properties.cpp:137 +#: ../src/ui/dialog/document-properties.cpp:138 msgid "Snap only when c_loser than:" msgstr "吸附距离范围(_L):" -#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:139 msgid "Snapping distance, in screen pixels, for snapping to grid" msgstr "吸附的有效距离,以屏幕像素计,吸附到网格时有效" -#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:139 msgid "Always snap to grids, regardless of the distance" msgstr "不论距离远近,总是吸附到网格" -#: ../src/ui/dialog/document-properties.cpp:139 +#: ../src/ui/dialog/document-properties.cpp:140 msgid "" "If set, objects only snap to a grid line when it's within the range " "specified below" msgstr "激活时,对象到网格线的距离在指定范围内时才吸附" #. Options for snapping to guides -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Snap dist_ance" msgstr "吸附距离(_A)" -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Snap only when close_r than:" msgstr "吸附距离范围(_R):" -#: ../src/ui/dialog/document-properties.cpp:143 +#: ../src/ui/dialog/document-properties.cpp:144 msgid "Snapping distance, in screen pixels, for snapping to guides" msgstr "吸附的有效距离,以屏幕像素计,吸附到参考线时有效" -#: ../src/ui/dialog/document-properties.cpp:143 +#: ../src/ui/dialog/document-properties.cpp:144 msgid "Always snap to guides, regardless of the distance" msgstr "不论距离远近,总是吸附到参考线" -#: ../src/ui/dialog/document-properties.cpp:144 +#: ../src/ui/dialog/document-properties.cpp:145 msgid "" "If set, objects only snap to a guide when it's within the range specified " "below" msgstr "激活时,对象到参考线的距离在指定范围内时才吸附" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:147 +#: ../src/ui/dialog/document-properties.cpp:148 msgid "Snap to clip paths" msgstr "贴齐剪裁路径" -#: ../src/ui/dialog/document-properties.cpp:147 +#: ../src/ui/dialog/document-properties.cpp:148 msgid "When snapping to paths, then also try snapping to clip paths" msgstr "贴齐路径的时候也会试着贴齐剪裁路径" -#: ../src/ui/dialog/document-properties.cpp:148 +#: ../src/ui/dialog/document-properties.cpp:149 msgid "Snap to mask paths" msgstr "贴齐蒙版路径" -#: ../src/ui/dialog/document-properties.cpp:148 +#: ../src/ui/dialog/document-properties.cpp:149 msgid "When snapping to paths, then also try snapping to mask paths" msgstr "贴齐路径的时候也会试着贴齐蒙版路径" -#: ../src/ui/dialog/document-properties.cpp:149 +#: ../src/ui/dialog/document-properties.cpp:150 msgid "Snap perpendicularly" msgstr "贴齐垂直方向" -#: ../src/ui/dialog/document-properties.cpp:149 +#: ../src/ui/dialog/document-properties.cpp:150 msgid "" "When snapping to paths or guides, then also try snapping perpendicularly" msgstr "贴齐路径或参考现的时候也会试着贴齐垂直方向" -#: ../src/ui/dialog/document-properties.cpp:150 +#: ../src/ui/dialog/document-properties.cpp:151 msgid "Snap tangentially" msgstr "贴齐切线方向" -#: ../src/ui/dialog/document-properties.cpp:150 +#: ../src/ui/dialog/document-properties.cpp:151 msgid "When snapping to paths or guides, then also try snapping tangentially" msgstr "贴齐路径或参考现的时候也会试着贴齐切线方向" -#: ../src/ui/dialog/document-properties.cpp:153 +#: ../src/ui/dialog/document-properties.cpp:154 msgctxt "Grid" msgid "_New" msgstr "新建(_N)" -#: ../src/ui/dialog/document-properties.cpp:153 +#: ../src/ui/dialog/document-properties.cpp:154 msgid "Create new grid." msgstr "创建新网格。" -#: ../src/ui/dialog/document-properties.cpp:154 +#: ../src/ui/dialog/document-properties.cpp:155 msgctxt "Grid" msgid "_Remove" msgstr "移除(_R)" -#: ../src/ui/dialog/document-properties.cpp:154 +#: ../src/ui/dialog/document-properties.cpp:155 msgid "Remove selected grid." msgstr "移除选中的网格。" -#: ../src/ui/dialog/document-properties.cpp:161 ../src/widgets/toolbox.cpp:1837 +#: ../src/ui/dialog/document-properties.cpp:162 ../src/widgets/toolbox.cpp:1888 msgid "Guides" msgstr "参考线" -#: ../src/ui/dialog/document-properties.cpp:163 ../src/verbs.cpp:2796 +#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2836 msgid "Snap" msgstr "吸附" -#: ../src/ui/dialog/document-properties.cpp:165 +#: ../src/ui/dialog/document-properties.cpp:166 msgid "Scripting" msgstr "脚本" -#: ../src/ui/dialog/document-properties.cpp:329 +#: ../src/ui/dialog/document-properties.cpp:330 msgid "General" msgstr "一般" -#: ../src/ui/dialog/document-properties.cpp:331 +#: ../src/ui/dialog/document-properties.cpp:333 msgid "Page Size" msgstr "页面大小" -#: ../src/ui/dialog/document-properties.cpp:333 +#: ../src/ui/dialog/document-properties.cpp:336 +msgid "Background" +msgstr "背景" + +#: ../src/ui/dialog/document-properties.cpp:339 +msgid "Border" +msgstr "边缘" + +#: ../src/ui/dialog/document-properties.cpp:342 msgid "Display" msgstr "显示" -#: ../src/ui/dialog/document-properties.cpp:368 +#: ../src/ui/dialog/document-properties.cpp:381 msgid "Guides" msgstr "参考线" -#: ../src/ui/dialog/document-properties.cpp:386 +#: ../src/ui/dialog/document-properties.cpp:399 msgid "Snap to objects" msgstr "吸附到对象" -#: ../src/ui/dialog/document-properties.cpp:388 +#: ../src/ui/dialog/document-properties.cpp:401 msgid "Snap to grids" msgstr "吸附到网格" -#: ../src/ui/dialog/document-properties.cpp:390 +#: ../src/ui/dialog/document-properties.cpp:403 msgid "Snap to guides" msgstr "吸附到参考线" -#: ../src/ui/dialog/document-properties.cpp:392 +#: ../src/ui/dialog/document-properties.cpp:405 msgid "Miscellaneous" msgstr "杂项" @@ -14597,164 +14680,164 @@ msgstr "杂项" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:505 ../src/verbs.cpp:2977 +#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3019 msgid "Link Color Profile" -msgstr "链接色彩配置文件" +msgstr "连接色彩配置文件" -#: ../src/ui/dialog/document-properties.cpp:606 +#: ../src/ui/dialog/document-properties.cpp:623 msgid "Remove linked color profile" -msgstr "移除链接的色彩配置文件" +msgstr "移除已连接的色彩配置文件" -#: ../src/ui/dialog/document-properties.cpp:620 +#: ../src/ui/dialog/document-properties.cpp:636 msgid "Linked Color Profiles:" -msgstr "已链接色彩配置文件:" +msgstr "已连接色彩配置文件:" -#: ../src/ui/dialog/document-properties.cpp:622 +#: ../src/ui/dialog/document-properties.cpp:638 msgid "Available Color Profiles:" msgstr "可用的色彩配置文件:" -#: ../src/ui/dialog/document-properties.cpp:624 +#: ../src/ui/dialog/document-properties.cpp:640 msgid "Link Profile" -msgstr "链接配置文件" +msgstr "连接配置文件" -#: ../src/ui/dialog/document-properties.cpp:627 +#: ../src/ui/dialog/document-properties.cpp:643 msgid "Unlink Profile" -msgstr "取消链接配置文件" +msgstr "取消连接配置文件" -#: ../src/ui/dialog/document-properties.cpp:705 +#: ../src/ui/dialog/document-properties.cpp:721 msgid "Profile Name" msgstr "配置文件名" -#: ../src/ui/dialog/document-properties.cpp:741 +#: ../src/ui/dialog/document-properties.cpp:757 msgid "External scripts" msgstr "外部脚本" -#: ../src/ui/dialog/document-properties.cpp:742 +#: ../src/ui/dialog/document-properties.cpp:758 msgid "Embedded scripts" msgstr "内嵌脚本" -#: ../src/ui/dialog/document-properties.cpp:747 +#: ../src/ui/dialog/document-properties.cpp:763 msgid "External script files:" msgstr "外部脚本文件:" -#: ../src/ui/dialog/document-properties.cpp:749 +#: ../src/ui/dialog/document-properties.cpp:765 msgid "Add the current file name or browse for a file" msgstr "加入当前文件名称或浏览文件" -#: ../src/ui/dialog/document-properties.cpp:752 -#: ../src/ui/dialog/document-properties.cpp:829 +#: ../src/ui/dialog/document-properties.cpp:768 +#: ../src/ui/dialog/document-properties.cpp:845 #: ../src/ui/widget/selected-style.cpp:356 msgid "Remove" msgstr "移除" -#: ../src/ui/dialog/document-properties.cpp:816 +#: ../src/ui/dialog/document-properties.cpp:832 msgid "Filename" msgstr "文件名" -#: ../src/ui/dialog/document-properties.cpp:824 +#: ../src/ui/dialog/document-properties.cpp:840 msgid "Embedded script files:" msgstr "内嵌的脚本文件:" -#: ../src/ui/dialog/document-properties.cpp:826 -#: ../src/ui/dialog/objects.cpp:1890 +#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "新建" -#: ../src/ui/dialog/document-properties.cpp:893 +#: ../src/ui/dialog/document-properties.cpp:909 msgid "Script id" -msgstr "脚本识别码" +msgstr "脚本标识" -#: ../src/ui/dialog/document-properties.cpp:899 +#: ../src/ui/dialog/document-properties.cpp:915 msgid "Content:" msgstr "内容:" -#: ../src/ui/dialog/document-properties.cpp:1016 +#: ../src/ui/dialog/document-properties.cpp:1032 msgid "_Save as default" msgstr "保存成默认值(_S)" -#: ../src/ui/dialog/document-properties.cpp:1017 +#: ../src/ui/dialog/document-properties.cpp:1033 msgid "Save this metadata as the default metadata" msgstr "将此中继数据保存为缺省中继数据" -#: ../src/ui/dialog/document-properties.cpp:1018 +#: ../src/ui/dialog/document-properties.cpp:1034 msgid "Use _default" msgstr "使用默认值(_D)" -#: ../src/ui/dialog/document-properties.cpp:1019 +#: ../src/ui/dialog/document-properties.cpp:1035 msgid "Use the previously saved default metadata here" msgstr "这里使用上次保存的缺省中继数据" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1092 +#: ../src/ui/dialog/document-properties.cpp:1108 msgid "Add external script..." -msgstr "添加外部脚本…" +msgstr "添加外部脚本..." -#: ../src/ui/dialog/document-properties.cpp:1131 +#: ../src/ui/dialog/document-properties.cpp:1147 msgid "Select a script to load" msgstr "选择要加载的脚本" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1159 +#: ../src/ui/dialog/document-properties.cpp:1175 msgid "Add embedded script..." -msgstr "加入内嵌脚本…" +msgstr "加入内嵌脚本..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1190 +#: ../src/ui/dialog/document-properties.cpp:1206 msgid "Remove external script" -msgstr "移除外部脚本…" +msgstr "移除外部脚本..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1220 +#: ../src/ui/dialog/document-properties.cpp:1235 msgid "Remove embedded script" msgstr "移除内嵌脚本" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1317 +#: ../src/ui/dialog/document-properties.cpp:1331 msgid "Edit embedded script" msgstr "编辑内嵌脚本" -#: ../src/ui/dialog/document-properties.cpp:1405 +#: ../src/ui/dialog/document-properties.cpp:1415 msgid "Creation" msgstr "创建" -#: ../src/ui/dialog/document-properties.cpp:1406 +#: ../src/ui/dialog/document-properties.cpp:1416 msgid "Defined grids" msgstr "已定义的网格" -#: ../src/ui/dialog/document-properties.cpp:1654 +#: ../src/ui/dialog/document-properties.cpp:1660 msgid "Remove grid" msgstr "移除网格" -#: ../src/ui/dialog/document-properties.cpp:1746 +#: ../src/ui/dialog/document-properties.cpp:1752 msgid "Changed default display unit" -msgstr "未命名文档 %d" +msgstr "已更改默认显示单位" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2848 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2886 msgid "_Page" msgstr "页面(_P)" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2852 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2890 msgid "_Drawing" msgstr "绘图(_D)" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2854 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2892 msgid "_Selection" -msgstr "选择(_S)" +msgstr "选区(_S)" #: ../src/ui/dialog/export.cpp:147 msgid "_Custom" msgstr "自定义(_C)" -#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "单位:" #: ../src/ui/dialog/export.cpp:167 msgid "_Export As..." -msgstr "导出为(_E)…" +msgstr "导出为(_E)..." #: ../src/ui/dialog/export.cpp:170 msgid "B_atch export all selected objects" @@ -14765,8 +14848,8 @@ msgid "" "Export each selected object into its own PNG file, using export hints if any " "(caution, overwrites without asking!)" msgstr "" -"将选定的对象根据导出设置逐个导出到单独的PNG文件,如果有导出设置的话(注意:覆" -"盖文件时没有提示!)" +"将选定的对象根据导出设置逐个导出到单独的PNG文件,如果有导出设置的话(注意:覆" +"盖文件时没有提示!)" #: ../src/ui/dialog/export.cpp:172 msgid "Hide a_ll except selected" @@ -14822,21 +14905,21 @@ msgstr "图片尺寸" #: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/export.cpp:296 msgid "pixels at" -msgstr "像素 于" +msgstr "像素" #: ../src/ui/dialog/export.cpp:291 msgid "dp_i" msgstr "dp_i" -#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:76 +#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:75 #: ../src/ui/widget/page-sizer.cpp:238 msgid "_Height:" msgstr "高度(_H):" #: ../src/ui/dialog/export.cpp:304 -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 -#: ../src/ui/dialog/inkscape-preferences.cpp:1513 +#: ../src/ui/dialog/inkscape-preferences.cpp:1497 +#: ../src/ui/dialog/inkscape-preferences.cpp:1501 +#: ../src/ui/dialog/inkscape-preferences.cpp:1525 msgid "dpi" msgstr "dpi" @@ -14856,7 +14939,7 @@ msgstr "位图" #, c-format msgid "B_atch export %d selected object" msgid_plural "B_atch export %d selected objects" -msgstr[0] "批次导出 %d 选择的对象" +msgstr[0] "批次导出 %d 选择的对象(_A)" #: ../src/ui/dialog/export.cpp:930 msgid "Export in progress" @@ -14873,7 +14956,7 @@ msgstr "正在导出 %1 个文件" #: ../src/ui/dialog/export.cpp:1069 ../src/ui/dialog/export.cpp:1071 #, c-format msgid "Exporting file %s..." -msgstr "正在导出文件 %s…" +msgstr "正在导出文件 %s..." #: ../src/ui/dialog/export.cpp:1080 ../src/ui/dialog/export.cpp:1172 #, c-format @@ -14892,7 +14975,7 @@ msgstr "已成功从 %d 个选中项导出 %d 个文件。" #: ../src/ui/dialog/export.cpp:1109 msgid "You have to enter a filename." -msgstr "你必须输入文件名。" +msgstr "您必须输入文件名。" #: ../src/ui/dialog/export.cpp:1110 msgid "You have to enter a filename" @@ -14927,14 +15010,14 @@ msgstr "绘图已导出成 %s。" msgid "Export aborted." msgstr "导出已中止。" -#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1388 -#: ../src/widgets/desktop-widget.cpp:1122 -#: ../src/widgets/desktop-widget.cpp:1184 +#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1389 +#: ../src/widgets/desktop-widget.cpp:1172 +#: ../src/widgets/desktop-widget.cpp:1234 msgid "_Cancel" msgstr "取消(_C)" #: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2406 ../src/widgets/desktop-widget.cpp:1123 +#: ../src/verbs.cpp:2433 ../src/widgets/desktop-widget.cpp:1173 msgid "_Save" msgstr "保存(_S)" @@ -14945,7 +15028,8 @@ msgstr "信息" #: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 #: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:6 ../share/extensions/dots.inx.h:7 +#: ../share/extensions/color_randomize.inx.h:12 +#: ../share/extensions/dots.inx.h:7 #: ../share/extensions/draw_from_triangle.inx.h:35 #: ../share/extensions/dxf_input.inx.h:10 #: ../share/extensions/dxf_outlines.inx.h:24 @@ -15004,7 +15088,7 @@ msgstr "太大不能预览" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:617 msgid "Enable preview" -msgstr "允许预览" +msgstr "启用预览" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:767 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 @@ -15064,7 +15148,7 @@ msgstr "源的左边" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1500 msgid "Top edge of source" -msgstr "源的定边" +msgstr "源的顶边" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 msgid "Right edge of source" @@ -15092,7 +15176,7 @@ msgstr "目标高度" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1507 msgid "Resolution (dots per inch)" -msgstr "分辨率(点/英寸)" +msgstr "分辨率(点/英寸)" #. ######################################### #. ## EXTRA WIDGET -- SOURCE SIDE @@ -15103,7 +15187,7 @@ msgid "Document" msgstr "文档" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2002 +#: ../src/widgets/desktop-widget.cpp:2053 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "选择" @@ -15123,7 +15207,7 @@ msgstr "Cairo" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600 msgid "Antialias" -msgstr "反锯齿" +msgstr "抗锯齿" #: ../src/ui/dialog/filedialogimpl-win32.cpp:418 msgid "All Executable Files" @@ -15143,11 +15227,11 @@ msgstr "填充(_F)" #: ../src/ui/dialog/fill-and-stroke.cpp:63 msgid "Stroke _paint" -msgstr "笔廓绘制(_P)" +msgstr "笔刷绘制(_P)" #: ../src/ui/dialog/fill-and-stroke.cpp:64 msgid "Stroke st_yle" -msgstr "笔廓样式(_Y)" +msgstr "笔刷样式(_Y)" #. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor #: ../src/ui/dialog/filter-effects-dialog.cpp:547 @@ -15268,8 +15352,8 @@ msgid "" "light source and the point to which it is pointing at) and the spot light " "cone. No light is projected outside this cone." msgstr "" -"聚光灯光轴(即从光源到目标点间的轴线)和锥形光束间的角度。灯光不会超出该锥形" -"光束。" +"聚光灯光轴(即从光源到目标点间的轴线)和锥形光束间的角度。灯光不会超出该锥形光" +"束。" #: ../src/ui/dialog/filter-effects-dialog.cpp:1275 msgid "New light source" @@ -15295,130 +15379,130 @@ msgstr "重命名滤镜" msgid "Apply filter" msgstr "应用滤镜" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1652 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1653 msgid "filter" msgstr "滤镜" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1659 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1660 msgid "Add filter" msgstr "添加滤镜" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1709 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1710 msgid "Duplicate filter" msgstr "再制滤镜" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1808 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1809 msgid "_Effect" msgstr "效果(_E)" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1818 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1819 msgid "Connections" msgstr "连接" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1956 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1957 msgid "Remove filter primitive" msgstr "移除滤镜基元" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2543 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2544 msgid "Remove merge node" msgstr "移除合并节点" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2663 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2664 msgid "Reorder filter primitive" msgstr "重新排序滤镜基元" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2743 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2744 msgid "Add Effect:" msgstr "添加效果:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2744 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 msgid "No effect selected" msgstr "没有选择效果" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 msgid "No filter selected" msgstr "没有选择滤镜" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2790 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2791 msgid "Effect parameters" msgstr "效果参数" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2791 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2792 msgid "Filter General Settings" msgstr "滤镜通用选项" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2849 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 msgid "Coordinates:" msgstr "坐标:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2849 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 msgid "X coordinate of the left corners of filter effects region" msgstr "滤镜效果区域左侧顶点的 X 坐标" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2849 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 msgid "Y coordinate of the upper corners of filter effects region" msgstr "滤镜效果区域上方的 Y 坐标" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 msgid "Dimensions:" msgstr "尺寸:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 msgid "Width of filter effects region" msgstr "滤镜效果区域的宽度" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 msgid "Height of filter effects region" msgstr "滤镜效果区域的高度" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 msgid "" "Indicates the type of matrix operation. The keyword 'matrix' indicates that " "a full 5x4 matrix of values will be provided. The other keywords represent " "convenience shortcuts to allow commonly used color operations to be " "performed without specifying a complete matrix." msgstr "" -"显示矩阵操作类型。“矩阵”表示将提供一个完整的 5×4 矩阵。其它选项对应不需要指定" +"显示矩阵操作类型。“矩阵”表示将提供一个完整的 5×4 矩阵。其他选项对应不需要指定" "完整矩阵的一般色彩操作。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2858 msgid "Value(s):" msgstr "值:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 msgid "R:" msgstr "红:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 #: ../src/ui/widget/color-icc-selector.cpp:180 msgid "G:" msgstr "绿:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2864 msgid "B:" msgstr "蓝:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2864 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 msgid "A:" msgstr "透:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "Operator:" msgstr "操作:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 msgid "K1:" msgstr "K1:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 #: ../src/ui/dialog/filter-effects-dialog.cpp:2869 #: ../src/ui/dialog/filter-effects-dialog.cpp:2870 #: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 msgid "" "If the arithmetic operation is chosen, each result pixel is computed using " "the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " @@ -15427,55 +15511,55 @@ msgstr "" "如果使用该算法操作,每个结果像素通过 k1*i1*i2 + k2*i1 + k3*i2 + k4 得到,其" "中 i1 和 i2 分别是第一个和第二个输入的像素值。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 msgid "K2:" msgstr "K2:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 msgid "K3:" msgstr "K3:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 msgid "K4:" msgstr "K4:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2874 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Size:" msgstr "尺寸:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2874 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "width of the convolve matrix" msgstr "卷积矩阵的宽度" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2874 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "height of the convolve matrix" msgstr "卷积矩形的高度" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 #: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "目标:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "" "X coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." msgstr "目标点在卷积矩阵中的 X 坐标。卷积施加到该点周围的像素上。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "" "Y coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." msgstr "目标点在卷积矩阵中的 Y 坐标。卷积施加到该点周围的像素上。" #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2877 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 msgid "Kernel:" msgstr "核:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2877 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 msgid "" "This matrix describes the convolve operation that is applied to the input " "image in order to calculate the pixel colors at the output. Different " @@ -15485,14 +15569,14 @@ msgid "" "would lead to a common blur effect." msgstr "" "使用该矩阵对输入图像进行卷积来计算输出像素的颜色。不同的取值能够获得区别很大" -"的视觉效果。单位矩阵能够产生运动模糊效果(平行于对角线),而使用同一非零数填" -"充的矩阵产生一般的模糊效果。" +"的视觉效果。单位矩阵能够产生运动模糊效果(平行于对角线),而使用同一非零数填充" +"的矩阵产生一般的模糊效果。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 msgid "Divisor:" msgstr "除数:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 msgid "" "After applying the kernelMatrix to the input image to yield a number, that " "number is divided by divisor to yield the final destination color value. A " @@ -15502,110 +15586,110 @@ msgstr "" "将核矩阵应用到输入图像后将产生一个数,除以该除数产生最终的目标颜色值。除数为" "矩阵中所有元素的和时倾向于对整体结果的色彩强度产生昏暗效果。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 msgid "Bias:" msgstr "偏差:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 msgid "" "This value is added to each component. This is useful to define a constant " "value as the zero response of the filter." msgstr "该值叠加到每个元素上。这样,滤镜的输出为 0 时可以用一个常量来代替。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "Edge Mode:" msgstr "边沿模式:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "" "Determines how to extend the input image as necessary with color values so " "that the matrix operations can be applied when the kernel is positioned at " "or near the edge of the input image." msgstr "选择怎样扩展输入图像的颜色值,使得在图像的边沿也能够应用该矩阵。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "Preserve Alpha" msgstr "保持 Alpha" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "如果选中,alpha 通道将不受该滤镜基元的影响。" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2885 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 msgid "Diffuse Color:" msgstr "散射颜色:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2885 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Defines the color of the light source" msgstr "设置光源的颜色" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Surface Scale:" msgstr "表面缩放:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" msgstr "该值放大由输入 alpha 通道确定的凸凹贴图的高度" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 msgid "Constant:" msgstr "常数:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 msgid "This constant affects the Phong lighting model." msgstr "该常量影响 Phong 光照模型。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "Kernel Unit Length:" msgstr "核单元长度:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2892 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 msgid "This defines the intensity of the displacement effect." msgstr "该值定义位移效果的强度。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 msgid "X displacement:" msgstr "X 位移:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 msgid "Color component that controls the displacement in the X direction" msgstr "控制 X 方向位移的色彩分量" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 msgid "Y displacement:" msgstr "Y 位移:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 msgid "Color component that controls the displacement in the Y direction" msgstr "控制 Y 方向位移的色彩分量" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 msgid "Flood Color:" msgstr "浸漫颜色:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 msgid "The whole filter region will be filled with this color." msgstr "滤镜的整个区域都将用这种颜色填充。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 msgid "Standard Deviation:" msgstr "标准差:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 msgid "The standard deviation for the blur operation." msgstr "模糊操作的标准差。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." @@ -15613,74 +15697,74 @@ msgstr "" "侵蚀:对输出图像进行“窄薄”处理。\n" "膨胀:对输出图像进行“加厚”处理。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 msgid "Source of Image:" msgstr "图像来源:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2914 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 msgid "Delta X:" msgstr "△X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2914 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 msgid "This is how far the input image gets shifted to the right" msgstr "输入图像向右偏移的距离" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 msgid "Delta Y:" msgstr "△Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 msgid "This is how far the input image gets shifted downwards" msgstr "输入图像向下偏移的距离" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Specular Color:" msgstr "高光颜色:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 #: ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "指数:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "镜面反射指数,大值更“光亮”。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2930 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." -msgstr "指示滤镜基元是否需要执行噪声或湍流功能。" +msgstr "指示滤镜基元是否需要执行噪点或湍流功能。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 msgid "Base Frequency:" msgstr "基频:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "Octaves:" msgstr "倍频程:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 msgid "Seed:" msgstr "种子:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 msgid "The starting number for the pseudo random number generator." msgstr "伪随机数产生器的初始值" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "Add filter primitive" msgstr "添加滤镜基元" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2962 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2963 msgid "" "The feBlend filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." msgstr "" "滤镜基元 feBlend 提供了4种图像混合模式:遮蔽、增强、变暗和变亮。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2966 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2967 msgid "" "The feColorMatrix filter primitive applies a matrix transformation to " "color of each rendered pixel. This allows for effects like turning object to " @@ -15689,18 +15773,17 @@ msgstr "" "滤镜基元 feColorMatrix 对每个像素的颜色进行矩阵变换。可以产生类似于转" "换到灰度,更改饱和度和色调等的效果。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2970 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 msgid "" "The feComponentTransfer filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " "transfer functions, allowing operations like brightness and contrast " "adjustment, color balance, and thresholding." msgstr "" -"滤镜基元 feComponentTransfer 根据特定的转换方式修改输入的色彩成分" -"(红、绿、蓝和不透明度),操作效果类似于亮度和对比度调整、色彩平衡、以及色阈" -"值。" +"滤镜基元 feComponentTransfer 根据特定的转换方式修改输入的色彩成分(红、" +"绿、蓝和不透明度),操作效果类似于亮度和对比度调整、色彩平衡、以及色阈值。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2974 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2975 msgid "" "The feComposite filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -15710,7 +15793,7 @@ msgstr "" "滤镜基元 feComposite 使用 Porter-Duff 混合模式或者 SVG 标准中描述的算" "法对两个图像进行组合。Porter-Duff 模式就是对图像中的对应像素进行逻辑操作。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2978 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2979 msgid "" "The feConvolveMatrix lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -15722,7 +15805,7 @@ msgstr "" "括模糊、锐化、浮雕和边沿检测。尽管高斯模糊也可以用这种方式产生,但专用的高斯" "模糊滤镜基元速度更快并且与分辨率无关。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2982 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2983 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -15733,7 +15816,7 @@ msgstr "" "输入的 alpha 通道用来提供深度信息:不透明的区域向观察者凸出,透明区域则向内凹" "陷。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2986 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2987 msgid "" "The feDisplacementMap filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -15743,16 +15826,16 @@ msgstr "" "滤镜基元 feDisplacementMap 使用第二个输入作为位移贴图来平移第一个输入" "上的像素,第二个输入确定了每个像素的距离。经典例子包括回旋和收缩。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2990 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2991 msgid "" "The feFlood filter primitive fills the region with a given color and " "opacity. It is usually used as an input to other filters to apply color to " "a graphic." msgstr "" -"滤镜基元 feFlood(浸漫)用指定的颜色和透明度填充区域。经常用来作为其它" -"滤镜的输入,来为图形着色。" +"滤镜基元 feFlood(浸漫)用指定的颜色和透明度填充区域。经常用来作为其他滤" +"镜的输入,来为图形着色。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2994 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2995 msgid "" "The feGaussianBlur filter primitive uniformly blurs its input. It is " "commonly used together with feOffset to create a drop shadow effect." @@ -15760,13 +15843,13 @@ msgstr "" "滤镜基元 feGaussianBlur 对输入进行均一模糊。通常与 feOffset 组合使用构" "成阴影投射效果。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2998 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2999 msgid "" "The feImage filter primitive fills the region with an external image " "or another part of the document." msgstr "滤镜基元 feImage 用另外一幅图像或文档的另外一部分来填充区域。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3002 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3003 msgid "" "The feMerge filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -15777,7 +15860,7 @@ msgstr "" "像。与通过多次执行 feBlend 中的“标准”模式和 feComposite 中“over”模式合并图像" "是等效的。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3006 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3007 msgid "" "The feMorphology filter primitive provides erode and dilate effects. " "For single-color objects erode makes the object thinner and dilate makes it " @@ -15786,7 +15869,7 @@ msgstr "" "滤镜基元 feMorphology 提供了浸蚀与膨胀效果。对于单色对象,浸蚀使其窄" "薄,而膨胀使其变厚。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3010 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3011 msgid "" "The feOffset filter primitive offsets the image by an user-defined " "amount. For example, this is useful for drop shadows, where the shadow is in " @@ -15795,7 +15878,7 @@ msgstr "" "滤镜基元 feOffset 将图像偏移指定的距离。例如,在投射阴影时,阴影要略微" "偏离实际对象的位置。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3014 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3015 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives " "create \"embossed\" shadings. The input's alpha channel is used to provide " @@ -15806,7 +15889,7 @@ msgstr "" "阴影。输入的 alpha 通道用来提供深度信息:不透明的区域向观察者凸出,透明区域则" "向内凹陷。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3018 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3019 msgid "" "The feTile filter primitive tiles a region with an input graphic. The " "source tile is defined by the filter primitive subregion of the input." @@ -15814,20 +15897,20 @@ msgstr "" "滤镜基元 feTile 用输入图像平铺填充区域。源平铺由输入的滤镜基元子区域决" "定。" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3022 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3023 msgid "" "The feTurbulence filter primitive renders Perlin noise. This kind of " "noise is useful in simulating several nature phenomena like clouds, fire and " "smoke and in generating complex textures like marble or granite." msgstr "" -"滤镜基元 feTurbulence渲染柏林噪声. 同样用于模拟一些自然现象, 例如云、" +"滤镜基元 feTurbulence渲染柏林噪点. 同样用于模拟一些自然现象, 例如云、" "火焰和烟雾, 以及产生类似大理石或花岗石的复杂纹理." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3041 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 msgid "Duplicate filter primitive" msgstr "再制滤镜基元" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3094 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3095 msgid "Set filter primitive attribute" msgstr "设置滤镜基元属性" @@ -15837,7 +15920,7 @@ msgstr "查找(_F):" #: ../src/ui/dialog/find.cpp:72 msgid "Find objects by their content or properties (exact or partial match)" -msgstr "依照内容或属性查找对象 (完全匹配或部分匹配)" +msgstr "依照内容或属性查找对象 (完整匹配或部分匹配)" #: ../src/ui/dialog/find.cpp:73 msgid "R_eplace:" @@ -15861,7 +15944,7 @@ msgstr "当前图层(_L)" #: ../src/ui/dialog/find.cpp:76 msgid "Limit search to the current layer" -msgstr "搜索限制在当前层" +msgstr "搜索限制在当前图层" #: ../src/ui/dialog/find.cpp:77 msgid "Sele_ction" @@ -15901,11 +15984,11 @@ msgstr "匹配大小写" #: ../src/ui/dialog/find.cpp:85 msgid "E_xact match" -msgstr "完全匹配(_X)" +msgstr "完整匹配(_X)" #: ../src/ui/dialog/find.cpp:85 msgid "Match whole objects only" -msgstr "只有完全匹配的对象" +msgstr "仅完整匹配的对象" #: ../src/ui/dialog/find.cpp:86 msgid "Include _hidden" @@ -16013,7 +16096,7 @@ msgstr "螺旋" msgid "Search spirals" msgstr "搜索螺旋" -#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1738 +#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1789 msgid "Paths" msgstr "路径" @@ -16203,7 +16286,7 @@ msgstr "西里尔字母" #: ../src/ui/dialog/glyphs.cpp:70 msgid "Deseret" -msgstr "" +msgstr "犹他字母" #: ../src/ui/dialog/glyphs.cpp:71 ../src/ui/dialog/glyphs.cpp:171 msgid "Devanagari" @@ -16427,7 +16510,7 @@ msgstr "腓尼基语" #: ../src/ui/dialog/glyphs.cpp:126 ../src/ui/dialog/glyphs.cpp:275 msgid "Phags-pa" -msgstr "潘贾比语 (pa)" +msgstr "潘贾比语(pa)" #: ../src/ui/dialog/glyphs.cpp:127 msgid "N'Ko" @@ -16719,7 +16802,7 @@ msgstr "附加的注音符号" #: ../src/ui/dialog/glyphs.cpp:258 msgid "CJK Strokes" -msgstr "CJK 笔廓" +msgstr "CJK 笔刷" #: ../src/ui/dialog/glyphs.cpp:259 msgid "Katakana Phonetic Extensions" @@ -16892,7 +16975,7 @@ msgstr "安排到网格" #: ../src/ui/dialog/grid-arrange-tab.cpp:571 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:666 +#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:694 #: ../src/widgets/node-toolbar.cpp:581 msgid "X:" msgstr "X:" @@ -16904,7 +16987,7 @@ msgstr "列间的水平间隔。" #: ../src/ui/dialog/grid-arrange-tab.cpp:572 #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:76 -#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:676 +#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:704 #: ../src/widgets/node-toolbar.cpp:599 msgid "Y:" msgstr "Y:" @@ -16961,49 +17044,57 @@ msgid "_Set spacing:" msgstr "设置间距(_S):" #: ../src/ui/dialog/guides.cpp:47 +msgid "Lo_cked" +msgstr "已锁定(_C)" + +#: ../src/ui/dialog/guides.cpp:47 +msgid "Lock the movement of guides" +msgstr "锁定参考线" + +#: ../src/ui/dialog/guides.cpp:48 msgid "Rela_tive change" msgstr "相对变化(_T)" -#: ../src/ui/dialog/guides.cpp:47 +#: ../src/ui/dialog/guides.cpp:48 msgid "Move and/or rotate the guide relative to current settings" msgstr "相对当前设置移动/旋转参考线" -#: ../src/ui/dialog/guides.cpp:48 +#: ../src/ui/dialog/guides.cpp:49 msgctxt "Guides" msgid "_X:" msgstr "_X:" -#: ../src/ui/dialog/guides.cpp:49 +#: ../src/ui/dialog/guides.cpp:50 msgctxt "Guides" msgid "_Y:" msgstr "_Y:" -#: ../src/ui/dialog/guides.cpp:50 ../src/ui/dialog/object-properties.cpp:59 +#: ../src/ui/dialog/guides.cpp:51 ../src/ui/dialog/object-properties.cpp:59 msgid "_Label:" msgstr "标签(_L):" -#: ../src/ui/dialog/guides.cpp:50 +#: ../src/ui/dialog/guides.cpp:51 msgid "Optionally give this guideline a name" msgstr "可选地赋予这个辅助线一个名称" -#: ../src/ui/dialog/guides.cpp:51 +#: ../src/ui/dialog/guides.cpp:52 msgid "_Angle:" msgstr "角度(_A):" -#: ../src/ui/dialog/guides.cpp:130 +#: ../src/ui/dialog/guides.cpp:139 msgid "Set guide properties" msgstr "设置引导线属性" -#: ../src/ui/dialog/guides.cpp:160 +#: ../src/ui/dialog/guides.cpp:169 msgid "Guideline" msgstr "参考线" -#: ../src/ui/dialog/guides.cpp:311 +#: ../src/ui/dialog/guides.cpp:336 #, c-format msgid "Guideline ID: %s" msgstr "参考线 ID:%s" -#: ../src/ui/dialog/guides.cpp:317 +#: ../src/ui/dialog/guides.cpp:342 #, c-format msgid "Current: %s" msgstr "当前:%s" @@ -17037,7 +17128,7 @@ msgstr "显示选区提示" #: ../src/ui/dialog/inkscape-preferences.cpp:184 msgid "" "Whether selected objects display a selection cue (the same as in selector)" -msgstr "已选对象是否显示提示(与选择器相同)" +msgstr "已选对象是否显示提示(与选择器相同)" #: ../src/ui/dialog/inkscape-preferences.cpp:190 msgid "Enable gradient editing" @@ -17056,7 +17147,7 @@ msgid "" "Converting an object to guides places these along the object's true edges " "(imitating the object's shape), not along the bounding box" msgstr "" -"将对象转变为参考线,参考线沿对象的实际边(模仿对象的形状),而不是沿边界框" +"将对象转变为参考线,参考线沿对象的实际边(模仿对象的形状),而不是沿边界框" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "Ctrl+click _dot size:" @@ -17064,306 +17155,318 @@ msgstr "Ctrl+单击“点”尺寸(_D):" #: ../src/ui/dialog/inkscape-preferences.cpp:204 msgid "times current stroke width" -msgstr "倍于当前轮廓宽度" +msgstr "倍于当前笔刷宽度" #: ../src/ui/dialog/inkscape-preferences.cpp:205 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" -msgstr "使用 Ctrl+单击 时创建的点的大小(相对当前笔廓宽度)" +msgstr "使用 Ctrl+单击 时创建的点的大小(相对当前笔刷宽度)" -#: ../src/ui/dialog/inkscape-preferences.cpp:220 +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "Base simplify:" +msgstr "基本简化:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "on dinamic LPE simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:214 +msgid "Base simplify of dinamic LPE based simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." msgstr "没有可从中获取此样式的已选对象。" -#: ../src/ui/dialog/inkscape-preferences.cpp:229 +#: ../src/ui/dialog/inkscape-preferences.cpp:238 msgid "" "More than one object selected. Cannot take style from multiple " "objects." msgstr "超过一个对象已选。不能得到多个对象的样式。" -#: ../src/ui/dialog/inkscape-preferences.cpp:265 +#: ../src/ui/dialog/inkscape-preferences.cpp:274 msgid "Style of new objects" msgstr "新对象的样式" -#: ../src/ui/dialog/inkscape-preferences.cpp:267 +#: ../src/ui/dialog/inkscape-preferences.cpp:276 msgid "Last used style" msgstr "最近使用的样式" -#: ../src/ui/dialog/inkscape-preferences.cpp:269 +#: ../src/ui/dialog/inkscape-preferences.cpp:278 msgid "Apply the style you last set on an object" msgstr "应用最近设置对象的样式" -#: ../src/ui/dialog/inkscape-preferences.cpp:274 +#: ../src/ui/dialog/inkscape-preferences.cpp:283 msgid "This tool's own style:" msgstr "此工具自己的样式:" -#: ../src/ui/dialog/inkscape-preferences.cpp:278 +#: ../src/ui/dialog/inkscape-preferences.cpp:287 msgid "" "Each tool may store its own style to apply to the newly created objects. Use " "the button below to set it." msgstr "每个工具保存自己的样式,应用到新创建的对象。使用下面的按钮设置。" #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:282 +#: ../src/ui/dialog/inkscape-preferences.cpp:291 msgid "Take from selection" msgstr "从选区得到" -#: ../src/ui/dialog/inkscape-preferences.cpp:291 +#: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This tool's style of new objects" msgstr "使用该工具新创建的对象的样式" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 +#: ../src/ui/dialog/inkscape-preferences.cpp:307 msgid "Remember the style of the (first) selected object as this tool's style" -msgstr "记住(第一个)已选对象的样式作为此工具的样式" +msgstr "记住(第一个)已选对象的样式作为此工具的样式" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:312 msgid "Tools" msgstr "工具" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Bounding box to use" msgstr "要使用的边界框" -#: ../src/ui/dialog/inkscape-preferences.cpp:307 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Visual bounding box" msgstr "视觉边界框" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:318 msgid "This bounding box includes stroke width, markers, filter margins, etc." msgstr "边界范围包括轮廓宽度、标记、滤镜边缘等。" -#: ../src/ui/dialog/inkscape-preferences.cpp:310 +#: ../src/ui/dialog/inkscape-preferences.cpp:319 msgid "Geometric bounding box" msgstr "几何边界框" -#: ../src/ui/dialog/inkscape-preferences.cpp:312 +#: ../src/ui/dialog/inkscape-preferences.cpp:321 msgid "This bounding box includes only the bare path" msgstr "边界范围仅包含路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 +#: ../src/ui/dialog/inkscape-preferences.cpp:323 msgid "Conversion to guides" msgstr "转换为参考线" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 +#: ../src/ui/dialog/inkscape-preferences.cpp:324 msgid "Keep objects after conversion to guides" msgstr "在转为参考线后仍然保留对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:317 +#: ../src/ui/dialog/inkscape-preferences.cpp:326 msgid "" "When converting an object to guides, don't delete the object after the " "conversion" msgstr "将对象转换为参考线后,不要删除原对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:318 +#: ../src/ui/dialog/inkscape-preferences.cpp:327 msgid "Treat groups as a single object" msgstr "将群组作为单个的对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:320 +#: ../src/ui/dialog/inkscape-preferences.cpp:329 msgid "" "Treat groups as a single object during conversion to guides rather than " "converting each child separately" msgstr "" "转换为参考线时,将群组作为一个单独的对象,而不是对其中的每个子项单独进行转换" -#: ../src/ui/dialog/inkscape-preferences.cpp:322 +#: ../src/ui/dialog/inkscape-preferences.cpp:331 msgid "Average all sketches" msgstr "平均所有草图线" -#: ../src/ui/dialog/inkscape-preferences.cpp:323 +#: ../src/ui/dialog/inkscape-preferences.cpp:332 msgid "Width is in absolute units" msgstr "宽度是绝对单位" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 +#: ../src/ui/dialog/inkscape-preferences.cpp:333 msgid "Select new path" msgstr "选择新路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:334 msgid "Don't attach connectors to text objects" msgstr "不要在文字对象上附加连接器" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:328 +#: ../src/ui/dialog/inkscape-preferences.cpp:337 msgid "Selector" msgstr "选择器" -#: ../src/ui/dialog/inkscape-preferences.cpp:333 +#: ../src/ui/dialog/inkscape-preferences.cpp:342 msgid "When transforming, show" msgstr "当变形时,显示" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 +#: ../src/ui/dialog/inkscape-preferences.cpp:343 msgid "Objects" msgstr "对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:336 +#: ../src/ui/dialog/inkscape-preferences.cpp:345 msgid "Show the actual objects when moving or transforming" msgstr "移动或变换时显示实际对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:337 +#: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Box outline" msgstr "边界框轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:339 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Show only a box outline of the objects when moving or transforming" msgstr "移动或变换时显示对象的边界框轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:349 msgid "Per-object selection cue" msgstr "每个对象选择线索" -#: ../src/ui/dialog/inkscape-preferences.cpp:341 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgctxt "Selection cue" msgid "None" msgstr "无" -#: ../src/ui/dialog/inkscape-preferences.cpp:343 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "No per-object selection indication" msgstr "无单个对象选择指示" -#: ../src/ui/dialog/inkscape-preferences.cpp:344 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 msgid "Mark" msgstr "标记" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:355 msgid "Each selected object has a diamond mark in the top left corner" msgstr "每一个已选对象在左上角有一个钻石标记" -#: ../src/ui/dialog/inkscape-preferences.cpp:347 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "Box" msgstr "边框" -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "Each selected object displays its bounding box" msgstr "每个已选对象显示其边界" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:352 +#: ../src/ui/dialog/inkscape-preferences.cpp:361 msgid "Node" msgstr "节点" -#: ../src/ui/dialog/inkscape-preferences.cpp:355 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Path outline" msgstr "路径轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Path outline color" msgstr "路径轮廓颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "Selects the color used for showing the path outline" msgstr "选择路径轮廓的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:358 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 msgid "Always show outline" msgstr "总是显示轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:368 msgid "Show outlines for all paths, not only invisible paths" msgstr "显示所有路径的轮廓,不仅仅是隐藏的路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 +#: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "Update outline when dragging nodes" msgstr "拖动节点时更新轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:361 +#: ../src/ui/dialog/inkscape-preferences.cpp:370 msgid "" "Update the outline when dragging or transforming nodes; if this is off, the " "outline will only update when completing a drag" msgstr "当拖动或改变节点时更新轮廓;如果关闭,只有拖动结束时轮廓才更新" -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "Update paths when dragging nodes" msgstr "拖动节点时更新路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:363 +#: ../src/ui/dialog/inkscape-preferences.cpp:372 msgid "" "Update paths when dragging or transforming nodes; if this is off, paths will " "only be updated when completing a drag" msgstr "拖动或改变节点时更新路径;如果关闭,拖动结束时才更新路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:373 msgid "Show path direction on outlines" msgstr "在轮廓上显示路径方向" -#: ../src/ui/dialog/inkscape-preferences.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:374 msgid "" "Visualize the direction of selected paths by drawing small arrows in the " "middle of each outline segment" msgstr "在每段轮廓的中间显示一个箭头标明路径方向" -#: ../src/ui/dialog/inkscape-preferences.cpp:366 +#: ../src/ui/dialog/inkscape-preferences.cpp:375 msgid "Show temporary path outline" msgstr "显示临时路径轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:367 +#: ../src/ui/dialog/inkscape-preferences.cpp:376 msgid "When hovering over a path, briefly flash its outline" msgstr "当鼠标悬停在路径上时, 短暂地闪烁其轮廓." -#: ../src/ui/dialog/inkscape-preferences.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:377 msgid "Show temporary outline for selected paths" msgstr "显示所选路径的临时轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:369 +#: ../src/ui/dialog/inkscape-preferences.cpp:378 msgid "Show temporary outline even when a path is selected for editing" msgstr "即使路径选中进行编辑时仍然显示临时轮廓" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "_Flash time:" msgstr "闪烁时间(_F):" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "" "Specifies how long the path outline will be visible after a mouse-over (in " "milliseconds); specify 0 to have the outline shown until mouse leaves the " "path" -msgstr "鼠标悬停时路径轮廓的可见时间(毫秒);设置为 0 时一直显示直到鼠标移开" +msgstr "鼠标悬停时路径轮廓的可见时间(毫秒);设置为 0 时一直显示直到鼠标移开" -#: ../src/ui/dialog/inkscape-preferences.cpp:372 +#: ../src/ui/dialog/inkscape-preferences.cpp:381 msgid "Editing preferences" -msgstr "改变设置" +msgstr "编辑首选项" -#: ../src/ui/dialog/inkscape-preferences.cpp:373 +#: ../src/ui/dialog/inkscape-preferences.cpp:382 msgid "Show transform handles for single nodes" msgstr "显示单独节点的变形控制柄" -#: ../src/ui/dialog/inkscape-preferences.cpp:374 +#: ../src/ui/dialog/inkscape-preferences.cpp:383 msgid "Show transform handles even when only a single node is selected" msgstr "即使只选中了一个节点,也显示变形控制柄" -#: ../src/ui/dialog/inkscape-preferences.cpp:375 +#: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "Deleting nodes preserves shape" -msgstr "删除节点同时保持形状" +msgstr "删除节点时保持形状" -#: ../src/ui/dialog/inkscape-preferences.cpp:376 +#: ../src/ui/dialog/inkscape-preferences.cpp:385 msgid "" "Move handles next to deleted nodes to resemble original shape; hold Ctrl to " "get the other behavior" -msgstr "移动删除节点旁边的手柄来使之类似原始形状;按住 Ctrl 获得其它行为" +msgstr "移动删除节点旁边的手柄来使之类似原始形状;按住 Ctrl 获得其他行为" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:379 +#: ../src/ui/dialog/inkscape-preferences.cpp:388 msgid "Tweak" -msgstr "扭曲" +msgstr "调整" -#: ../src/ui/dialog/inkscape-preferences.cpp:380 +#: ../src/ui/dialog/inkscape-preferences.cpp:389 msgid "Object paint style" msgstr "对象绘制样式" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:385 -#: ../src/widgets/desktop-widget.cpp:631 +#: ../src/ui/dialog/inkscape-preferences.cpp:394 +#: ../src/widgets/desktop-widget.cpp:659 msgid "Zoom" msgstr "缩放" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:390 ../src/verbs.cpp:2730 +#: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2762 msgctxt "ContextVerb" msgid "Measure" msgstr "测量" -#: ../src/ui/dialog/inkscape-preferences.cpp:392 +#: ../src/ui/dialog/inkscape-preferences.cpp:401 msgid "Ignore first and last points" -msgstr "忽略第一个和最后的点" +msgstr "忽略第一个和最后一个的点" -#: ../src/ui/dialog/inkscape-preferences.cpp:393 +#: ../src/ui/dialog/inkscape-preferences.cpp:402 msgid "" "The start and end of the measurement tool's control line will not be " "considered for calculating lengths. Only lengths between actual curve " @@ -17373,139 +17476,139 @@ msgstr "" "长度会显示。" #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:396 +#: ../src/ui/dialog/inkscape-preferences.cpp:405 msgid "Shapes" msgstr "形状" -#: ../src/ui/dialog/inkscape-preferences.cpp:428 +#: ../src/ui/dialog/inkscape-preferences.cpp:438 msgid "Sketch mode" msgstr "草图模式" -#: ../src/ui/dialog/inkscape-preferences.cpp:430 +#: ../src/ui/dialog/inkscape-preferences.cpp:440 msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" msgstr "如果选择,草图的结果是平均所有的草图笔迹,而不是将旧的结果与新笔迹平均" #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:433 +#: ../src/ui/dialog/inkscape-preferences.cpp:443 #: ../src/ui/dialog/input.cpp:1485 msgid "Pen" msgstr "钢笔" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:439 +#: ../src/ui/dialog/inkscape-preferences.cpp:449 msgid "Calligraphy" msgstr "书法" -#: ../src/ui/dialog/inkscape-preferences.cpp:443 +#: ../src/ui/dialog/inkscape-preferences.cpp:453 msgid "" "If on, pen width is in absolute units (px) independent of zoom; otherwise " "pen width depends on zoom so that it looks the same at any zoom" msgstr "" -"如果打开,笔廓宽度是与缩放无关的绝对单位(像素);否则笔廓宽度取决于缩放以便" -"在不同缩放比例下看起来一样" +"如果打开,笔刷宽度是与缩放无关的绝对单位(像素);否则笔刷宽度取决于缩放以便在" +"不同缩放比例下看起来一样" -#: ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/ui/dialog/inkscape-preferences.cpp:455 msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" -msgstr "如果打开,每一个新创建的对象都自动被选中(以前的选择将取消)。" +msgstr "如果打开,每一个新创建的对象都自动被选中(以前的选择将取消)。" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2722 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2754 msgctxt "ContextVerb" msgid "Text" msgstr "文本文字" -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:463 msgid "Show font samples in the drop-down list" msgstr "下拉列表中显示字体示例" -#: ../src/ui/dialog/inkscape-preferences.cpp:454 +#: ../src/ui/dialog/inkscape-preferences.cpp:464 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "在文本工具栏的下拉列表中字体的名称旁边显示字体示例" -#: ../src/ui/dialog/inkscape-preferences.cpp:456 +#: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Show font substitution warning dialog" msgstr "显示字体替换警告对话框" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" msgstr "当需要的字体在系统上不可用时显示字体替换警告对话框" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pixel" msgstr "像素" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pica" msgstr "12 点" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Millimeter" msgstr "毫米" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Centimeter" msgstr "厘米" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Inch" msgstr "英寸" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Em square" msgstr "Em 平方" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:463 +#: ../src/ui/dialog/inkscape-preferences.cpp:473 msgid "Text units" msgstr "文本单位" -#: ../src/ui/dialog/inkscape-preferences.cpp:465 +#: ../src/ui/dialog/inkscape-preferences.cpp:475 msgid "Text size unit type:" msgstr "文本大小单位类型:" -#: ../src/ui/dialog/inkscape-preferences.cpp:466 +#: ../src/ui/dialog/inkscape-preferences.cpp:476 msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "设置在文本工具栏和文本对话框中使用的单位的类型" -#: ../src/ui/dialog/inkscape-preferences.cpp:467 +#: ../src/ui/dialog/inkscape-preferences.cpp:477 msgid "Always output text size in pixels (px)" -msgstr "总以像素(px)为单位输出文本大小" +msgstr "总以像素为单位输出文本大小" #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:473 +#: ../src/ui/dialog/inkscape-preferences.cpp:483 msgid "Spray" msgstr "喷绘" #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:478 +#: ../src/ui/dialog/inkscape-preferences.cpp:488 msgid "Eraser" msgstr "橡皮擦" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:482 +#: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "Paint Bucket" msgstr "油漆桶" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:487 -#: ../src/widgets/gradient-selector.cpp:148 -#: ../src/widgets/gradient-selector.cpp:299 +#: ../src/ui/dialog/inkscape-preferences.cpp:499 +#: ../src/widgets/gradient-selector.cpp:144 +#: ../src/widgets/gradient-selector.cpp:295 msgid "Gradient" msgstr "渐变" -#: ../src/ui/dialog/inkscape-preferences.cpp:489 +#: ../src/ui/dialog/inkscape-preferences.cpp:501 msgid "Prevent sharing of gradient definitions" msgstr "防止渐变参数共享" -#: ../src/ui/dialog/inkscape-preferences.cpp:491 +#: ../src/ui/dialog/inkscape-preferences.cpp:503 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " @@ -17514,497 +17617,497 @@ msgstr "" "选定时,修改时共享的渐变将自动分离;如果不选定,修改时将影响到所有共享该渐变" "的对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:492 +#: ../src/ui/dialog/inkscape-preferences.cpp:504 msgid "Use legacy Gradient Editor" msgstr "使用旧式的渐变编辑器" -#: ../src/ui/dialog/inkscape-preferences.cpp:494 +#: ../src/ui/dialog/inkscape-preferences.cpp:506 msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" msgstr "" -"当打开时,在填充和笔廓对话框中的渐变编辑按钮将会显示旧式渐变编辑器对话框;当" +"当打开时,在填充和笔刷对话框中的渐变编辑按钮将会显示旧式渐变编辑器对话框;当" "关闭时则使用渐变工具" -#: ../src/ui/dialog/inkscape-preferences.cpp:497 +#: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Linear gradient _angle:" msgstr "线性渐变角度(_A):" -#: ../src/ui/dialog/inkscape-preferences.cpp:498 +#: ../src/ui/dialog/inkscape-preferences.cpp:510 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" -msgstr "新线性渐变的默认角度(从水平开始顺时针)" +msgstr "新线性渐变的默认角度(从水平开始顺时针)" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:502 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Dropper" msgstr "吸管" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:507 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Connector" msgstr "连接器" -#: ../src/ui/dialog/inkscape-preferences.cpp:510 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "If on, connector attachment points will not be shown for text objects" msgstr "如果打开,对于文字对象连接器的附着点不显示" #. LPETool #. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "LPE Tool" msgstr "LPE 工具" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Interface" msgstr "界面" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "System default" msgstr "系统默认" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Albanian (sq)" -msgstr "阿尔巴尼亚语 (sq)" +msgstr "阿尔巴尼亚语(sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Amharic (am)" -msgstr "阿姆哈拉语 (am)" +msgstr "阿姆哈拉语(am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Arabic (ar)" -msgstr "阿拉伯语 (ar)" +msgstr "阿拉伯语(ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Armenian (hy)" -msgstr "亚美尼亚语 (hy)" +msgstr "亚美尼亚语(hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Assamese (as)" -msgstr "阿萨姆语 (as)" +msgstr "阿萨姆语(as)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Azerbaijani (az)" -msgstr "阿塞拜疆语 (az)" +msgstr "阿塞拜疆语(az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Basque (eu)" -msgstr "巴斯克语 (eu)" +msgstr "巴斯克语(eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Belarusian (be)" -msgstr "白俄罗斯语 (be)" +msgstr "白俄罗斯语(be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bulgarian (bg)" -msgstr "保加利亚语 (bg)" +msgstr "保加利亚语(bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali (bn)" -msgstr "孟加拉语 (bn)" +msgstr "孟加拉语(bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali/Bangladesh (bn_BD)" msgstr "孟加拉语/西孟加拉 (bn_BD)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bodo (brx)" -msgstr "博多语(brx)" +msgstr "博多语(brx)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Breton (br)" -msgstr "布利托尼语 (br)" +msgstr "布利托尼语(br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Catalan (ca)" -msgstr "加泰罗尼亚语 (ca)" +msgstr "加泰罗尼亚语(ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Valencian Catalan (ca@valencia)" -msgstr "瓦伦西亚加泰罗尼亚语 (ca@valencia)" +msgstr "瓦伦西亚加泰罗尼亚语(ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/China (zh_CN)" -msgstr "中文/中国 (zh_CN)" +msgstr "中文/中国(zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/Taiwan (zh_TW)" -msgstr "中文/台湾 (zh_TW)" +msgstr "中文/台湾(zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Croatian (hr)" -msgstr "克罗地亚语 (hr)" +msgstr "克罗地亚语(hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Czech (cs)" -msgstr "捷克语 (cs)" +msgstr "捷克语(cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Danish (da)" -msgstr "丹麦语 (da)" +msgstr "丹麦语(da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dogri (doi)" -msgstr "多格拉语(doi)" +msgstr "多格拉语(doi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dutch (nl)" -msgstr "荷兰语 (nl)" +msgstr "荷兰语(nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dzongkha (dz)" -msgstr "不丹语 (dz)" +msgstr "不丹语(dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "German (de)" -msgstr "德语 (de)" +msgstr "德语(de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "Greek (el)" -msgstr "希腊语 (el)" +msgstr "希腊语(el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English (en)" -msgstr "英语 (en)" +msgstr "英语(en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Australia (en_AU)" -msgstr "英语/澳大利亚 (en_AU)" +msgstr "英语/澳大利亚(en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Canada (en_CA)" -msgstr "英语/加拿大 (en_CA)" +msgstr "英语/加拿大(en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Great Britain (en_GB)" -msgstr "英语/英国 (en_GB)" +msgstr "英语/英国(en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Pig Latin (en_US@piglatin)" -msgstr "儿童黑话 (en_US@piglatin)" +msgstr "大拉丁语(en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Esperanto (eo)" -msgstr "世界语 (eo)" +msgstr "世界语(eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Estonian (et)" -msgstr "爱沙尼亚语 (et)" +msgstr "爱沙尼亚语(et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Farsi (fa)" -msgstr "波斯语 (fa)" +msgstr "波斯语(fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Finnish (fi)" -msgstr "芬兰语 (fi)" +msgstr "芬兰语(fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "French (fr)" -msgstr "法语 (fr)" +msgstr "法语(fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Galician (gl)" -msgstr "加利西亚语 (gl)" +msgstr "加利西亚语(gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Gujarati (gu)" -msgstr "古吉拉特语 (gu)" +msgstr "古吉拉特语(gu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hebrew (he)" -msgstr "希伯来语 (he)" +msgstr "希伯来语(he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hindi (hi)" -msgstr "印地语 (hi)" +msgstr "印地语(hi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hungarian (hu)" -msgstr "匈牙利语 (hu)" +msgstr "匈牙利语(hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Icelandic (is)" -msgstr "冰岛语(is)" +msgstr "冰岛语(is)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Indonesian (id)" -msgstr "印度尼西亚语 (id)" +msgstr "印度尼西亚语(id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Irish (ga)" -msgstr "爱尔兰语 (ga)" +msgstr "爱尔兰语(ga)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Italian (it)" -msgstr "意大利语 (it)" +msgstr "意大利语(it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Japanese (ja)" -msgstr "日语 (ja)" +msgstr "日语(ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kannada (kn)" msgstr "坎那达文 (kn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Peso-Arabic script (ks@aran)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Devanagari script (ks@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Khmer (km)" -msgstr "柬埔寨语 (km)" +msgstr "柬埔寨语(km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kinyarwanda (rw)" -msgstr "卢旺达语 (rw)" +msgstr "卢旺达语(rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Konkani (kok)" -msgstr "孔卡尼语 (kok)" +msgstr "孔卡尼语(kok)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Konkani in Latin script (kok@latin)" msgstr "孔卡尼语,拉丁字书写(sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Korean (ko)" -msgstr "韩语 (ko)" +msgstr "韩语(ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:538 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Latvian (lv)" -msgstr "拉脱维亚语(lv)" +msgstr "拉脱维亚语(lv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:538 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Lithuanian (lt)" -msgstr "立陶宛语 (lt)" +msgstr "立陶宛语(lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Macedonian (mk)" -msgstr "马其顿语 (mk)" +msgstr "马其顿语(mk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Maithili (mai)" -msgstr "迈蒂利语 (mai)" +msgstr "迈蒂利语(mai)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Malayalam (ml)" -msgstr "马拉雅拉姆语 (ml)" +msgstr "马拉雅拉姆语(ml)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri (mni)" -msgstr "曼尼普尔语(mni)" +msgstr "曼尼普尔语(mni)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri in Bengali script (mni@beng)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Marathi (mr)" -msgstr "马拉地语 (mr)" +msgstr "马拉地语(mr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Mongolian (mn)" -msgstr "蒙古语 (mn)" +msgstr "蒙古语(mn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Nepali (ne)" -msgstr "尼泊尔语 (ne)" +msgstr "尼泊尔语(ne)" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Bokmål (nb)" -msgstr "挪威巴克摩语 (nb)" +msgstr "挪威巴克摩语(nb)" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Nynorsk (nn)" -msgstr "挪威尼诺斯克语 (nn)" +msgstr "挪威尼诺斯克语(nn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:553 msgid "Odia (or)" -msgstr "奥里亚语(or)" +msgstr "奥里亚语(or)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Panjabi (pa)" -msgstr "潘贾比语 (pa)" +msgstr "潘贾比语(pa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Polish (pl)" -msgstr "波兰语 (pl)" +msgstr "波兰语(pl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese (pt)" -msgstr "葡萄牙语 (pt)" +msgstr "葡萄牙语(pt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese/Brazil (pt_BR)" -msgstr "葡萄牙语/巴西 (pt_BR)" +msgstr "葡萄牙语/巴西(pt_BR)" -#: ../src/ui/dialog/inkscape-preferences.cpp:543 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Romanian (ro)" -msgstr "罗马尼亚语 (ro)" +msgstr "罗马尼亚语(ro)" -#: ../src/ui/dialog/inkscape-preferences.cpp:543 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Russian (ru)" -msgstr "俄语 (ru)" +msgstr "俄语(ru)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Sanskrit (sa)" -msgstr "梵语 (sa)" +msgstr "梵语(sa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Santali (sat)" -msgstr "桑塔尔语(sat)" +msgstr "桑塔尔语(sat)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Santali in Devanagari script (sat@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian (sr)" -msgstr "塞尔维亚语 (sr)" +msgstr "塞尔维亚语(sr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian in Latin script (sr@latin)" msgstr "塞尔维亚语,拉丁字书写(sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi (sd)" -msgstr "信德语(sd)" +msgstr "信德语(sd)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi in Devanagari script (sd@deva)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovak (sk)" -msgstr "斯洛伐克语 (sk)" +msgstr "斯洛伐克语(sk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovenian (sl)" -msgstr "斯洛文尼亚语 (sl)" +msgstr "斯洛文尼亚语(sl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish (es)" -msgstr "西班牙语 (es)" +msgstr "西班牙语(es)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish/Mexico (es_MX)" -msgstr "西班牙语/墨西哥 (es_MX)" +msgstr "西班牙语/墨西哥(es_MX)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Swedish (sv)" -msgstr "瑞典语 (sv)" +msgstr "瑞典语(sv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Tamil (ta)" -msgstr "泰米尔语 (ta)" +msgstr "泰米尔语(ta)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Telugu (te)" -msgstr "泰卢固语 (te)" +msgstr "泰卢固语(te)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Thai (th)" -msgstr "泰语 (th)" +msgstr "泰语(th)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Turkish (tr)" -msgstr "土耳其语 (tr)" +msgstr "土耳其语(tr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Ukrainian (uk)" -msgstr "乌克兰语 (uk)" +msgstr "乌克兰语(uk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Urdu (ur)" -msgstr "乌尔都语 (ur)" +msgstr "乌尔都语(ur)" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Vietnamese (vi)" -msgstr "越南语 (vi)" +msgstr "越南语(vi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:600 +#: ../src/ui/dialog/inkscape-preferences.cpp:612 msgid "Language (requires restart):" -msgstr "语言(需要重启程序):" +msgstr "语言(需重启程序):" -#: ../src/ui/dialog/inkscape-preferences.cpp:601 +#: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "Set the language for menus and number formats" msgstr "设置菜单和数字格式的语言" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Large" msgstr "大" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Small" msgstr "小" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Smaller" msgstr "更小" -#: ../src/ui/dialog/inkscape-preferences.cpp:608 +#: ../src/ui/dialog/inkscape-preferences.cpp:620 msgid "Toolbox icon size:" msgstr "工具栏图标大小:" -#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "Set the size for the tool icons (requires restart)" -msgstr "设置工具栏图标的大小(需要重启)" +msgstr "设置工具栏图标的大小(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/inkscape-preferences.cpp:624 msgid "Control bar icon size:" msgstr "控制栏图标大小:" -#: ../src/ui/dialog/inkscape-preferences.cpp:613 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" -msgstr "设置工具的控制栏图标大小(需要重启)" +msgstr "设置工具的控制栏图标大小(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:628 msgid "Secondary toolbar icon size:" msgstr "第二工具栏图标大小:" -#: ../src/ui/dialog/inkscape-preferences.cpp:617 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" -msgstr "设置第二工具栏中的图标大小(需要重启)" +msgstr "设置第二工具栏中的图标大小(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:620 +#: ../src/ui/dialog/inkscape-preferences.cpp:632 msgid "Work-around color sliders not drawing" msgstr "避免色彩滑块不显示" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:634 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" msgstr "选中时,将会试图避开一些 GTK 主题中色彩滑块的显示 bug" -#: ../src/ui/dialog/inkscape-preferences.cpp:627 +#: ../src/ui/dialog/inkscape-preferences.cpp:639 msgid "Clear list" msgstr "清除列表" -#: ../src/ui/dialog/inkscape-preferences.cpp:630 +#: ../src/ui/dialog/inkscape-preferences.cpp:642 msgid "Maximum documents in Open _Recent:" msgstr "打开最近文件的最大文档数(_R):" -#: ../src/ui/dialog/inkscape-preferences.cpp:631 +#: ../src/ui/dialog/inkscape-preferences.cpp:643 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" msgstr "文件菜单中最近打开列表中的文件数目,或者清除列表" -#: ../src/ui/dialog/inkscape-preferences.cpp:634 +#: ../src/ui/dialog/inkscape-preferences.cpp:646 msgid "_Zoom correction factor (in %):" -msgstr "缩放纠正系数(%)(_Z):" +msgstr "缩放纠正系数(%)(_Z):" -#: ../src/ui/dialog/inkscape-preferences.cpp:635 +#: ../src/ui/dialog/inkscape-preferences.cpp:647 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " @@ -18013,523 +18116,524 @@ msgstr "" "调整滑块,直到下面的尺子在屏幕上的长度与实际尺寸一致。该因子为缩放到 1:1、" "1:2 等比例时显示对象的实际大小" -#: ../src/ui/dialog/inkscape-preferences.cpp:638 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 msgid "Enable dynamic relayout for incomplete sections" msgstr "启用对不完整部分的动态重新布局" -#: ../src/ui/dialog/inkscape-preferences.cpp:640 +#: ../src/ui/dialog/inkscape-preferences.cpp:652 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" msgstr "当打开时,将会允许未完全完成分解的组件的动态布局" #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:655 msgid "Show filter primitives infobox (requires restart)" -msgstr "显示滤镜原型信息框(需要重启)" +msgstr "显示滤镜原型信息框(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:657 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" msgstr "在滤镜效果对话框中显示滤镜基元的图标和描述" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Icons only" msgstr "仅图标" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Text only" msgstr "仅文本" -#: ../src/ui/dialog/inkscape-preferences.cpp:648 -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Icons and text" msgstr "图标和文本" -#: ../src/ui/dialog/inkscape-preferences.cpp:653 +#: ../src/ui/dialog/inkscape-preferences.cpp:665 msgid "Dockbar style (requires restart):" -msgstr "面板栏样式(需要重启):" +msgstr "面板栏样式(需重启程序):" -#: ../src/ui/dialog/inkscape-preferences.cpp:654 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" msgstr "选择在面板栏上的垂直栏是否显示文本标签、图标" -#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:673 msgid "Switcher style (requires restart):" -msgstr "切换器样式(需要重启)" +msgstr "切换器样式(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:662 +#: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "选择面板栏切换器是否显示文本标签、图标等" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:666 +#: ../src/ui/dialog/inkscape-preferences.cpp:678 msgid "Save and restore window geometry for each document" msgstr "在每个文件中保存和恢复窗口的位置和大小" -#: ../src/ui/dialog/inkscape-preferences.cpp:667 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Remember and use last window's geometry" msgstr "记住并使用上次的窗口配置" -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "Don't save window geometry" msgstr "不保存窗口形态" -#: ../src/ui/dialog/inkscape-preferences.cpp:670 +#: ../src/ui/dialog/inkscape-preferences.cpp:682 msgid "Save and restore dialogs status" msgstr "保存并恢复对话框状态" -#: ../src/ui/dialog/inkscape-preferences.cpp:671 -#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:719 msgid "Don't save dialogs status" msgstr "不保存窗口状态" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 -#: ../src/ui/dialog/inkscape-preferences.cpp:715 +#: ../src/ui/dialog/inkscape-preferences.cpp:685 +#: ../src/ui/dialog/inkscape-preferences.cpp:727 msgid "Dockable" msgstr "可停靠" -#: ../src/ui/dialog/inkscape-preferences.cpp:677 +#: ../src/ui/dialog/inkscape-preferences.cpp:689 msgid "Native open/save dialogs" msgstr "原生打开/保存对话框" -#: ../src/ui/dialog/inkscape-preferences.cpp:678 +#: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "GTK open/save dialogs" msgstr "GTK 打开/保存对话框" -#: ../src/ui/dialog/inkscape-preferences.cpp:680 +#: ../src/ui/dialog/inkscape-preferences.cpp:692 msgid "Dialogs are hidden in taskbar" msgstr "对话框在任务栏隐藏" -#: ../src/ui/dialog/inkscape-preferences.cpp:681 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Save and restore documents viewport" msgstr "保存并恢复文档视口" -#: ../src/ui/dialog/inkscape-preferences.cpp:682 +#: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "Zoom when window is resized" msgstr "窗口尺寸变化时缩放" -#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Show close button on dialogs" msgstr "对话框上显示关闭按钮" -#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 msgctxt "Dialog on top" msgid "None" msgstr "不透明" -#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:698 msgid "Aggressive" msgstr "激进" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgctxt "Window size" msgid "Small" msgstr "小" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgctxt "Window size" msgid "Large" msgstr "大" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 +#: ../src/ui/dialog/inkscape-preferences.cpp:701 msgctxt "Window size" msgid "Maximized" -msgstr "已最大化" +msgstr "最大化" -#: ../src/ui/dialog/inkscape-preferences.cpp:693 +#: ../src/ui/dialog/inkscape-preferences.cpp:705 msgid "Default window size:" msgstr "默认窗口大小:" -#: ../src/ui/dialog/inkscape-preferences.cpp:694 +#: ../src/ui/dialog/inkscape-preferences.cpp:706 msgid "Set the default window size" msgstr "设置默认窗口大小" -#: ../src/ui/dialog/inkscape-preferences.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:709 msgid "Saving window geometry (size and position)" -msgstr "保存窗口的几何信息(大小和位置)" +msgstr "保存窗口的几何信息(大小和位置)" -#: ../src/ui/dialog/inkscape-preferences.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:711 msgid "Let the window manager determine placement of all windows" msgstr "让窗口管理器决定所有窗口的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:713 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" -msgstr "记录上次窗口的位置和大小(窗口配置保存到用户配置)" +msgstr "记录上次窗口的位置和大小(窗口配置保存到用户配置)" -#: ../src/ui/dialog/inkscape-preferences.cpp:703 +#: ../src/ui/dialog/inkscape-preferences.cpp:715 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" -msgstr "在每个文件中保存和恢复窗口的位置和大小(窗口配置保存到该文件)" +msgstr "在每个文件中保存和恢复窗口的位置和大小(窗口配置保存到该文件)" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:717 msgid "Saving dialogs status" msgstr "保存对话框状态" -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:721 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" -msgstr "保存并恢复对话框状态(当关闭时保存最后打开的窗口对话框)" +msgstr "保存并恢复对话框状态(当关闭时保存最后打开的窗口对话框)" -#: ../src/ui/dialog/inkscape-preferences.cpp:713 +#: ../src/ui/dialog/inkscape-preferences.cpp:725 msgid "Dialog behavior (requires restart)" -msgstr "对话框行为(需要重新启动)" +msgstr "对话框行为(需要重新启动)" -#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/ui/dialog/inkscape-preferences.cpp:731 msgid "Desktop integration" msgstr "桌面整合" -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:733 msgid "Use Windows like open and save dialogs" msgstr "使用类似 Windows 的打开和关闭对话框" -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:735 msgid "Use GTK open and save dialogs " msgstr "使用 GTK 打开和关闭对话框" -#: ../src/ui/dialog/inkscape-preferences.cpp:727 +#: ../src/ui/dialog/inkscape-preferences.cpp:739 msgid "Dialogs on top:" msgstr "对话框在顶层:" -#: ../src/ui/dialog/inkscape-preferences.cpp:730 +#: ../src/ui/dialog/inkscape-preferences.cpp:742 msgid "Dialogs are treated as regular windows" msgstr "对话框作为一般窗口" -#: ../src/ui/dialog/inkscape-preferences.cpp:732 +#: ../src/ui/dialog/inkscape-preferences.cpp:744 msgid "Dialogs stay on top of document windows" msgstr "对话框在文档窗口之上" -#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:746 msgid "Same as Normal but may work better with some window managers" msgstr "通常相同但是某些窗口管理器下工作的更好" -#: ../src/ui/dialog/inkscape-preferences.cpp:737 +#: ../src/ui/dialog/inkscape-preferences.cpp:749 msgid "Dialog Transparency" msgstr "对话框透明度" -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:751 msgid "_Opacity when focused:" msgstr "聚焦时不透明度(_O):" -#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:753 msgid "Opacity when _unfocused:" msgstr "失焦时不透明度(_U):" -#: ../src/ui/dialog/inkscape-preferences.cpp:743 +#: ../src/ui/dialog/inkscape-preferences.cpp:755 msgid "_Time of opacity change animation:" msgstr "更改不透明度的动画时间(_T):" -#: ../src/ui/dialog/inkscape-preferences.cpp:746 +#: ../src/ui/dialog/inkscape-preferences.cpp:758 msgid "Miscellaneous" msgstr "杂项" -#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:761 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "对话框窗口是否要隐藏在窗口管理器任务栏" -#: ../src/ui/dialog/inkscape-preferences.cpp:752 +#: ../src/ui/dialog/inkscape-preferences.cpp:764 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " "above the right scrollbar)" msgstr "" -"当窗口尺寸改变时缩放绘图,保持相同的可视面积(此为默认,可用右边滚动条上的按" -"钮改变)" +"当窗口尺寸改变时缩放绘图,保持相同的可视面积(此为默认,可用右边滚动条上的按钮" +"改变)" -#: ../src/ui/dialog/inkscape-preferences.cpp:754 +#: ../src/ui/dialog/inkscape-preferences.cpp:766 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." -msgstr "保存文档视口(缩放和平移位置)。当共享版本控制文件时关掉会很有用。" +msgstr "保存文档视口(缩放和平移位置)。当共享版本控制文件时关掉会很有用。" -#: ../src/ui/dialog/inkscape-preferences.cpp:756 +#: ../src/ui/dialog/inkscape-preferences.cpp:768 msgid "Whether dialog windows have a close button (requires restart)" -msgstr "对话框窗口是否有关闭按钮(需要重启)" +msgstr "对话框窗口是否有关闭按钮(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:757 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Windows" msgstr "窗口" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:760 +#: ../src/ui/dialog/inkscape-preferences.cpp:772 msgid "Line color when zooming out" msgstr "当缩小时线条颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:763 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 msgid "The gridlines will be shown in minor grid line color" msgstr "网格线将会使用次要的网格线颜色显示" -#: ../src/ui/dialog/inkscape-preferences.cpp:765 +#: ../src/ui/dialog/inkscape-preferences.cpp:777 msgid "The gridlines will be shown in major grid line color" msgstr "网格线将会使用主要的网格线颜色显示" -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:779 msgid "Default grid settings" msgstr "默认网格设置" -#: ../src/ui/dialog/inkscape-preferences.cpp:773 -#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:785 +#: ../src/ui/dialog/inkscape-preferences.cpp:810 msgid "Grid units:" msgstr "网格单位:" -#: ../src/ui/dialog/inkscape-preferences.cpp:778 -#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "Origin X:" msgstr "起点 X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Origin Y:" msgstr "起点 Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:784 +#: ../src/ui/dialog/inkscape-preferences.cpp:796 msgid "Spacing X:" msgstr "间距 X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:785 -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 +#: ../src/ui/dialog/inkscape-preferences.cpp:819 msgid "Spacing Y:" msgstr "间距 Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:787 -#: ../src/ui/dialog/inkscape-preferences.cpp:788 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:799 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 +#: ../src/ui/dialog/inkscape-preferences.cpp:825 msgid "Minor grid line color:" msgstr "次要网格线颜色:" -#: ../src/ui/dialog/inkscape-preferences.cpp:788 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:825 msgid "Color used for normal grid lines" msgstr "普通网格线的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:789 -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:814 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 +#: ../src/ui/dialog/inkscape-preferences.cpp:827 msgid "Major grid line color:" msgstr "主要网格线颜色:" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 +#: ../src/ui/dialog/inkscape-preferences.cpp:827 msgid "Color used for major (highlighted) grid lines" -msgstr "主(高亮)网格线所使用的颜色" +msgstr "主(高亮)网格线所使用的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:804 +#: ../src/ui/dialog/inkscape-preferences.cpp:829 msgid "Major grid line every:" msgstr "主网格线间距:" -#: ../src/ui/dialog/inkscape-preferences.cpp:793 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 msgid "Show dots instead of lines" msgstr "显示点而不是线" -#: ../src/ui/dialog/inkscape-preferences.cpp:794 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "如果选定,显示网格点而非网格线" -#: ../src/ui/dialog/inkscape-preferences.cpp:875 +#: ../src/ui/dialog/inkscape-preferences.cpp:887 msgid "Input/Output" msgstr "输入/输出" -#: ../src/ui/dialog/inkscape-preferences.cpp:878 +#: ../src/ui/dialog/inkscape-preferences.cpp:890 msgid "Use current directory for \"Save As ...\"" -msgstr "“另存为…”使用当前路径" +msgstr "“另存为...”使用当前路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 +#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#, fuzzy msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " "it's off, each will open in the directory where you last saved a file using " "it" msgstr "" -"当这个选项打开时,“另存为…”和“保存一个副本…”对话框将总是打开当前打开的文档所" -"在的目录;当它关闭时,每次将会打开你最后保存文件所使用的目录" +"当这个选项打开时,“另存为...”和“保存一个副本...”对话框将总是打开当前打开的文" +"档所在的目录;当它关闭时,每次将会打开您最后保存文件所使用的目录" -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:894 msgid "Add label comments to printing output" msgstr "打印输出时添加标签注释" -#: ../src/ui/dialog/inkscape-preferences.cpp:884 +#: ../src/ui/dialog/inkscape-preferences.cpp:896 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" msgstr "启用时,原始打印输出将会添加注释,标记渲染输出作为标签对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:898 msgid "Add default metadata to new documents" msgstr "添加默认元数据到新文档" -#: ../src/ui/dialog/inkscape-preferences.cpp:888 +#: ../src/ui/dialog/inkscape-preferences.cpp:900 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." msgstr "添加默认元数据到新文档。默认元数据可以从“文档属性->元数据”中设置。" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:904 msgid "_Grab sensitivity:" msgstr "采集敏感度(_G):" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:904 msgid "pixels (requires restart)" -msgstr "像素(需要重启)" +msgstr "像素(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:893 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" msgstr "在屏幕上使一个对象能够用鼠标抓取需要多近(屏幕像素单位)" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:907 msgid "_Click/drag threshold:" msgstr "单击/拖动阈值(_C):" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:907 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 msgid "pixels" msgstr "像素" -#: ../src/ui/dialog/inkscape-preferences.cpp:896 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" -msgstr "单击所允许的最大鼠标拖动距离(屏幕像素),超过此数值将被认为是拖动" +msgstr "单击所允许的最大鼠标拖动距离(屏幕像素),超过此数值将被认为是拖动" -#: ../src/ui/dialog/inkscape-preferences.cpp:899 +#: ../src/ui/dialog/inkscape-preferences.cpp:911 msgid "_Handle size:" msgstr "控制柄大小(_H):" -#: ../src/ui/dialog/inkscape-preferences.cpp:900 +#: ../src/ui/dialog/inkscape-preferences.cpp:912 msgid "Set the relative size of node handles" msgstr "设置节点控制柄的相对大小" -#: ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/ui/dialog/inkscape-preferences.cpp:914 msgid "Use pressure-sensitive tablet (requires restart)" -msgstr "使用压力敏感绘图板(需要重启)" +msgstr "使用压力敏感绘图板(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:904 +#: ../src/ui/dialog/inkscape-preferences.cpp:916 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " "mouse)" msgstr "" -"使用手写板或者其它压力敏感设备.如果使用手写板出现问题, 请禁用(仍然可以作为鼠" +"使用手写板或者其他压力敏感设备.如果使用手写板出现问题, 请禁用(仍然可以作为鼠" "标使用)." -#: ../src/ui/dialog/inkscape-preferences.cpp:906 +#: ../src/ui/dialog/inkscape-preferences.cpp:918 msgid "Switch tool based on tablet device (requires restart)" -msgstr "根据绘图板设备切换工具(需要重启)" +msgstr "根据绘图板设备切换工具(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:920 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" -msgstr "当在绘图板上使用不同的设备(笔、橡皮擦、鼠标)时改变工具栏" +msgstr "当在绘图板上使用不同的设备(笔、橡皮擦、鼠标)时改变工具栏" -#: ../src/ui/dialog/inkscape-preferences.cpp:909 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "Input devices" msgstr "输入设备" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:912 +#: ../src/ui/dialog/inkscape-preferences.cpp:924 msgid "Use named colors" msgstr "使用已命名的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:913 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" -msgstr "如果选中, 尽量写入颜色的 CSS 名称(如 red、magenta),而不用数值" +msgstr "如果选中, 尽量写入颜色的 CSS 名称(如 red、magenta),而不用数值" -#: ../src/ui/dialog/inkscape-preferences.cpp:915 +#: ../src/ui/dialog/inkscape-preferences.cpp:927 msgid "XML formatting" msgstr "XML 格式化" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:929 msgid "Inline attributes" msgstr "内联属性" -#: ../src/ui/dialog/inkscape-preferences.cpp:918 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Put attributes on the same line as the element tag" msgstr "将属性与元素的标签置于同一行" -#: ../src/ui/dialog/inkscape-preferences.cpp:921 +#: ../src/ui/dialog/inkscape-preferences.cpp:933 msgid "_Indent, spaces:" msgstr "缩进、空格数(_I):" -#: ../src/ui/dialog/inkscape-preferences.cpp:921 +#: ../src/ui/dialog/inkscape-preferences.cpp:933 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" msgstr "嵌入单元缩进时的空格数目;0 为无缩进" -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:935 msgid "Path data" msgstr "路径数据" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 +#: ../src/ui/dialog/inkscape-preferences.cpp:938 msgid "Absolute" msgstr "绝对" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 +#: ../src/ui/dialog/inkscape-preferences.cpp:938 msgid "Relative" msgstr "相对" -#: ../src/ui/dialog/inkscape-preferences.cpp:926 -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 msgid "Optimized" msgstr "优化" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:942 msgid "Path string format:" msgstr "路径字符串格式:" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:942 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " "relative coordinates)" msgstr "" -"路径数据应该这样写入:只使用绝对坐标、只使用相对坐标、或者最优字符串长度(混" -"合绝对和相对坐标)" +"路径数据应该这样写入:只使用绝对坐标、只使用相对坐标、或者最优字符串长度(混合" +"绝对和相对坐标)" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:944 msgid "Force repeat commands" msgstr "强制重复命令" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" -msgstr "强制重复相同的路径命令(例如,“L 1,2 L 3,4”代替“L 1,2 3,4”)" +msgstr "强制重复相同的路径命令(例如,“L 1,2 L 3,4”代替“L 1,2 3,4”)" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 +#: ../src/ui/dialog/inkscape-preferences.cpp:947 msgid "Numbers" msgstr "数字" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:950 msgid "_Numeric precision:" msgstr "数字精度(_N):" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:950 msgid "Significant figures of the values written to the SVG file" msgstr "指定写入到 SVG 文件的有效位数" -#: ../src/ui/dialog/inkscape-preferences.cpp:941 +#: ../src/ui/dialog/inkscape-preferences.cpp:953 msgid "Minimum _exponent:" msgstr "最小指数(_E):" -#: ../src/ui/dialog/inkscape-preferences.cpp:941 +#: ../src/ui/dialog/inkscape-preferences.cpp:953 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -18537,17 +18641,17 @@ msgstr "写入 SVG 中的最小数字为 10 的该指数次幂;更小的数字 #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:946 +#: ../src/ui/dialog/inkscape-preferences.cpp:958 msgid "Improper Attributes Actions" msgstr "不正确的属性操作" -#: ../src/ui/dialog/inkscape-preferences.cpp:948 -#: ../src/ui/dialog/inkscape-preferences.cpp:956 -#: ../src/ui/dialog/inkscape-preferences.cpp:964 +#: ../src/ui/dialog/inkscape-preferences.cpp:960 +#: ../src/ui/dialog/inkscape-preferences.cpp:968 +#: ../src/ui/dialog/inkscape-preferences.cpp:976 msgid "Print warnings" msgstr "打印警告" -#: ../src/ui/dialog/inkscape-preferences.cpp:949 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." @@ -18555,116 +18659,115 @@ msgstr "" "如果发现无效或不实用的属性则打印警告。数据库文件位于 inkscape_data_dir/" "attributes 中。" -#: ../src/ui/dialog/inkscape-preferences.cpp:950 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "Remove attributes" msgstr "移除属性" -#: ../src/ui/dialog/inkscape-preferences.cpp:951 +#: ../src/ui/dialog/inkscape-preferences.cpp:963 msgid "Delete invalid or non-useful attributes from element tag" msgstr "从元素标记中删除无效或者无用的属性" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:954 +#: ../src/ui/dialog/inkscape-preferences.cpp:966 msgid "Inappropriate Style Properties Actions" msgstr "不恰当的样式属性操作" -#: ../src/ui/dialog/inkscape-preferences.cpp:957 +#: ../src/ui/dialog/inkscape-preferences.cpp:969 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." msgstr "" -"警告不恰当的样式属性(譬如在 上设置“font-family”)。元素样式数据库文件" -"位于 inkscape_data_dir/attributes。" +"警告不恰当的样式属性(譬如在 上设置“font-family”)。元素样式数据库文件位" +"于 inkscape_data_dir/attributes。" -#: ../src/ui/dialog/inkscape-preferences.cpp:958 -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:970 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "Remove style properties" msgstr "删除样式顺序" -#: ../src/ui/dialog/inkscape-preferences.cpp:959 +#: ../src/ui/dialog/inkscape-preferences.cpp:971 msgid "Delete inappropriate style properties" msgstr "删除不恰当的样式属性" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:962 +#: ../src/ui/dialog/inkscape-preferences.cpp:974 msgid "Non-useful Style Properties Actions" msgstr "非有用样式属性操作" -#: ../src/ui/dialog/inkscape-preferences.cpp:965 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " "same as would be inherited). Database files located in inkscape_data_dir/" "attributes." msgstr "" -"如果发现多余的样式属性则打印警告(譬如如果一个属性有默认值而且没有继承不同的" -"值或者取值和将要继承的一样)。数据库文件位于 inkscape_data_dir/attributes。" +"如果发现多余的样式属性则打印警告(譬如如果一个属性有默认值而且没有继承不同的值" +"或者取值和将要继承的一样)。数据库文件位于 inkscape_data_dir/attributes。" -#: ../src/ui/dialog/inkscape-preferences.cpp:967 +#: ../src/ui/dialog/inkscape-preferences.cpp:979 msgid "Delete redundant style properties" msgstr "删除多余样式属性" -#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:981 msgid "Check Attributes and Style Properties on" msgstr "检查属性和样式属性于" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:983 msgid "Reading" msgstr "读取" -#: ../src/ui/dialog/inkscape-preferences.cpp:972 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" msgstr "" -"在读取 SVG 时检查属性和样式属性(包括那些将会减慢启动的内置于 Inkscape 的属" -"性)" +"在读取 SVG 时检查属性和样式属性(包括那些将会减慢启动的内置于 Inkscape 的属性)" -#: ../src/ui/dialog/inkscape-preferences.cpp:973 +#: ../src/ui/dialog/inkscape-preferences.cpp:985 msgid "Editing" msgstr "编辑" -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" msgstr "" -"在编辑 SVG 文件时检查属性和样式属性(可能会减慢 Inkscape,大多数对调试有用)" +"在编辑 SVG 文件时检查属性和样式属性(可能会减慢 Inkscape,大多数对调试有用)" -#: ../src/ui/dialog/inkscape-preferences.cpp:975 +#: ../src/ui/dialog/inkscape-preferences.cpp:987 msgid "Writing" msgstr "写入" -#: ../src/ui/dialog/inkscape-preferences.cpp:976 +#: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "Check attributes and style properties on writing out SVG files" msgstr "在写入到 SVG 文件时检查属性和样式属性" -#: ../src/ui/dialog/inkscape-preferences.cpp:978 +#: ../src/ui/dialog/inkscape-preferences.cpp:990 msgid "SVG output" msgstr "SVG 输出" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 msgid "Perceptual" msgstr "百分比" -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 msgid "Relative Colorimetric" msgstr "相对色调" -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:996 msgid "Absolute Colorimetric" msgstr "绝对色调" -#: ../src/ui/dialog/inkscape-preferences.cpp:988 +#: ../src/ui/dialog/inkscape-preferences.cpp:1000 msgid "(Note: Color management has been disabled in this build)" -msgstr "(注意:色彩管理在当前版本中未启用)" +msgstr "(注意:色彩管理在当前版本中未启用)" -#: ../src/ui/dialog/inkscape-preferences.cpp:992 +#: ../src/ui/dialog/inkscape-preferences.cpp:1004 msgid "Display adjustment" msgstr "显示模式" -#: ../src/ui/dialog/inkscape-preferences.cpp:1002 +#: ../src/ui/dialog/inkscape-preferences.cpp:1014 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" @@ -18673,141 +18776,141 @@ msgstr "" "用于校准显示输出的 ICC 配置。\n" "已搜索目录:%s" -#: ../src/ui/dialog/inkscape-preferences.cpp:1003 +#: ../src/ui/dialog/inkscape-preferences.cpp:1015 msgid "Display profile:" msgstr "显示模式:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1008 +#: ../src/ui/dialog/inkscape-preferences.cpp:1020 msgid "Retrieve profile from display" msgstr "从显示中提取配置文件" -#: ../src/ui/dialog/inkscape-preferences.cpp:1011 +#: ../src/ui/dialog/inkscape-preferences.cpp:1023 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "从那些附加到通过 XICC 的显示中检索配置文件" -#: ../src/ui/dialog/inkscape-preferences.cpp:1013 +#: ../src/ui/dialog/inkscape-preferences.cpp:1025 msgid "Retrieve profiles from those attached to displays" msgstr "从那些附加到显示中的检索配置文件" -#: ../src/ui/dialog/inkscape-preferences.cpp:1018 +#: ../src/ui/dialog/inkscape-preferences.cpp:1030 msgid "Display rendering intent:" msgstr "显示渲染对应:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1019 +#: ../src/ui/dialog/inkscape-preferences.cpp:1031 msgid "The rendering intent to use to calibrate display output" msgstr "用于矫正显示输出的渲染对应方式" -#: ../src/ui/dialog/inkscape-preferences.cpp:1021 +#: ../src/ui/dialog/inkscape-preferences.cpp:1033 msgid "Proofing" msgstr "打样" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 +#: ../src/ui/dialog/inkscape-preferences.cpp:1035 msgid "Simulate output on screen" msgstr "在屏幕上模拟输出" -#: ../src/ui/dialog/inkscape-preferences.cpp:1025 +#: ../src/ui/dialog/inkscape-preferences.cpp:1037 msgid "Simulates output of target device" msgstr "模拟目标设备的输出" -#: ../src/ui/dialog/inkscape-preferences.cpp:1027 +#: ../src/ui/dialog/inkscape-preferences.cpp:1039 msgid "Mark out of gamut colors" msgstr "标识出色彩范围" -#: ../src/ui/dialog/inkscape-preferences.cpp:1029 +#: ../src/ui/dialog/inkscape-preferences.cpp:1041 msgid "Highlights colors that are out of gamut for the target device" msgstr "高亮超出目标设备允许范围的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:1041 +#: ../src/ui/dialog/inkscape-preferences.cpp:1053 msgid "Out of gamut warning color:" msgstr "超出色彩范围时的警告色:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1042 +#: ../src/ui/dialog/inkscape-preferences.cpp:1054 msgid "Selects the color used for out of gamut warning" msgstr "选择超出色彩范围时的警告色" -#: ../src/ui/dialog/inkscape-preferences.cpp:1044 +#: ../src/ui/dialog/inkscape-preferences.cpp:1056 msgid "Device profile:" msgstr "设备配置:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1045 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 msgid "The ICC profile to use to simulate device output" msgstr "用于模拟设备输出的 ICC 配置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1048 +#: ../src/ui/dialog/inkscape-preferences.cpp:1060 msgid "Device rendering intent:" msgstr "设备色彩对应方式:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1049 +#: ../src/ui/dialog/inkscape-preferences.cpp:1061 msgid "The rendering intent to use to calibrate device output" msgstr "用于矫正显示输出的色彩对应方式" -#: ../src/ui/dialog/inkscape-preferences.cpp:1051 +#: ../src/ui/dialog/inkscape-preferences.cpp:1063 msgid "Black point compensation" msgstr "黑点补偿" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1065 msgid "Enables black point compensation" msgstr "允许黑点补偿" -#: ../src/ui/dialog/inkscape-preferences.cpp:1055 +#: ../src/ui/dialog/inkscape-preferences.cpp:1067 msgid "Preserve black" msgstr "保持黑色" -#: ../src/ui/dialog/inkscape-preferences.cpp:1062 +#: ../src/ui/dialog/inkscape-preferences.cpp:1074 msgid "(LittleCMS 1.15 or later required)" -msgstr "(需要 LittleCMS 1.15 或以上)" +msgstr "(需要 LittleCMS 1.15 或以上)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1064 +#: ../src/ui/dialog/inkscape-preferences.cpp:1076 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "在 CMYK -> CMYK 转换中保持 K 通道" -#: ../src/ui/dialog/inkscape-preferences.cpp:1078 +#: ../src/ui/dialog/inkscape-preferences.cpp:1090 #: ../src/ui/widget/color-icc-selector.cpp:395 #: ../src/ui/widget/color-icc-selector.cpp:674 msgid "" msgstr "<无>" -#: ../src/ui/dialog/inkscape-preferences.cpp:1123 +#: ../src/ui/dialog/inkscape-preferences.cpp:1135 msgid "Color management" msgstr "色彩管理" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1126 +#: ../src/ui/dialog/inkscape-preferences.cpp:1138 msgid "Enable autosave (requires restart)" -msgstr "启用自动保存(需要重启)" +msgstr "启用自动保存(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1127 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" msgstr "在指定的间隔时间内自动保存当前文档,减小程序崩溃时的损失" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "自动保存目录(_D):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " msgstr "" -"用于写入自动保存将数据的目录。此目录应使用绝对路径(在 UNIX 上以 / 开始,在 " -"Windows 上以类似 C: 的一个盘符开始)。" +"用于写入自动保存将数据的目录。此目录应使用绝对路径(在 UNIX 上以 / 开始,在 " +"Windows 上以类似 C: 的一个盘符开始)。" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1147 msgid "_Interval (in minutes):" msgstr "间隔时间 (分钟)(_I):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1147 msgid "Interval (in minutes) at which document will be autosaved" -msgstr "自动保存文档的间隔时间(分钟)" +msgstr "自动保存文档的间隔时间(分钟)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1149 msgid "_Maximum number of autosaves:" msgstr "自动保存的最大数量(_M):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1149 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "自动保存的文件数目;防止过多占用存储空间" @@ -18824,50 +18927,50 @@ msgstr "自动保存的文件数目;防止过多占用存储空间" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1152 +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 msgid "Autosave" msgstr "自动保存" -#: ../src/ui/dialog/inkscape-preferences.cpp:1156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1168 msgid "Open Clip Art Library _Server Name:" msgstr "Open Clip Art Library 服务器名(_S):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1157 +#: ../src/ui/dialog/inkscape-preferences.cpp:1169 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" msgstr "" "Open Clip Art Library WebDAV 服务器的名称;在导入和导出 OCAL 的功能中需要用到" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1171 msgid "Open Clip Art Library _Username:" msgstr "Open Clip Art Library 用户名(_U):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1160 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "The username used to log into Open Clip Art Library" msgstr "登录到 Open Clip Art Library 的用户名称" -#: ../src/ui/dialog/inkscape-preferences.cpp:1162 +#: ../src/ui/dialog/inkscape-preferences.cpp:1174 msgid "Open Clip Art Library _Password:" msgstr "Open Clip Art Library 密码(_P):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1163 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "The password used to log into Open Clip Art Library" msgstr "登录到 Open Clip Art Library 的密码" -#: ../src/ui/dialog/inkscape-preferences.cpp:1164 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "Open Clip Art" msgstr "开放剪贴画" -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 +#: ../src/ui/dialog/inkscape-preferences.cpp:1181 msgid "Behavior" msgstr "行为" -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 +#: ../src/ui/dialog/inkscape-preferences.cpp:1185 msgid "_Simplification threshold:" msgstr "简化阈值(_S):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1174 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " "this command several times in quick succession, it will act more and more " @@ -18876,290 +18979,290 @@ msgstr "" "节点工具的简化命令的默认强度。如果快速连续调用此命令数次,强度将会逐次剧增;" "调用之后暂停一下以恢复默认阈值。" -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1188 msgid "Color stock markers the same color as object" msgstr "颜色槽标记,和对象一样的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:1177 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "Color custom markers the same color as object" msgstr "颜色自定义标记,和对象一样的颜色" -#: ../src/ui/dialog/inkscape-preferences.cpp:1178 -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 +#: ../src/ui/dialog/inkscape-preferences.cpp:1410 msgid "Update marker color when object color changes" msgstr "当对象颜色变化时更新标记颜色" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 +#: ../src/ui/dialog/inkscape-preferences.cpp:1193 msgid "Select in all layers" msgstr "在所有层选择" -#: ../src/ui/dialog/inkscape-preferences.cpp:1182 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 msgid "Select only within current layer" -msgstr "在当前层选择" +msgstr "在当前图层选择" -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Select in current layer and sublayers" -msgstr "在当前层和子层选择" +msgstr "在当前图层和子层选择" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Ignore hidden objects and layers" msgstr "忽略隐藏对象和层" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Ignore locked objects and layers" msgstr "忽略锁定对象和层" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 msgid "Deselect upon layer change" msgstr "取消层的改变" -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1201 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" -msgstr "不选此项当前层更改时保持当前已选对象" +msgstr "不选此项当前图层更改时保持当前已选对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1203 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Ctrl+A, Tab, Shift+Tab" -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 msgid "Make keyboard selection commands work on objects in all layers" msgstr "在所有层上使键盘的选择对象命令生效" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1207 msgid "Make keyboard selection commands work on objects in current layer only" -msgstr "只在当前层上使键盘的选择对象命令生效" +msgstr "只在当前图层上使键盘的选择对象命令生效" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1209 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" -msgstr "在当前层和它的子层上使键盘的选择对象命令生效" +msgstr "在当前图层和它的子层上使键盘的选择对象命令生效" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1211 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" -msgstr "不选中这项即可选择隐藏对象(不管是自身隐藏还是所在的层隐藏)" +msgstr "不选中这项即可选择隐藏对象(不管是自身隐藏还是所在的层隐藏)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1213 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" -msgstr "不选中这项即可选择锁定对象(不管是自身锁定还是所在的层锁定)" +msgstr "不选中这项即可选择锁定对象(不管是自身锁定还是所在的层锁定)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1215 msgid "Wrap when cycling objects in z-order" msgstr "在循环对象时以 Z 顺序切换" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1217 msgid "Alt+Scroll Wheel" msgstr "Alt+鼠标滚轮" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "当循环对象时按 Z 是顺序在开始和结束点切换" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1221 msgid "Selecting" msgstr "选择" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 +#: ../src/ui/dialog/inkscape-preferences.cpp:1224 #: ../src/widgets/select-toolbar.cpp:572 msgid "Scale stroke width" -msgstr "缩放笔廓宽度" +msgstr "缩放笔刷宽度" -#: ../src/ui/dialog/inkscape-preferences.cpp:1213 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 msgid "Scale rounded corners in rectangles" msgstr "缩放矩形圆角" -#: ../src/ui/dialog/inkscape-preferences.cpp:1214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Transform gradients" msgstr "变换渐变" -#: ../src/ui/dialog/inkscape-preferences.cpp:1215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "Transform patterns" msgstr "变换图案" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Preserved" msgstr "保持" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1232 #: ../src/widgets/select-toolbar.cpp:573 msgid "When scaling objects, scale the stroke width by the same proportion" -msgstr "缩放对象时,按照相同比例缩放笔廓宽度" +msgstr "缩放对象时,按照相同比例缩放笔刷宽度" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/ui/dialog/inkscape-preferences.cpp:1234 #: ../src/widgets/select-toolbar.cpp:584 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "缩放矩形时,缩放圆角半径" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 +#: ../src/ui/dialog/inkscape-preferences.cpp:1236 #: ../src/widgets/select-toolbar.cpp:595 msgid "Move gradients (in fill or stroke) along with the objects" -msgstr "随对象缩放渐变(填充或笔廓)" +msgstr "随对象缩放渐变(填充或笔刷)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1238 #: ../src/widgets/select-toolbar.cpp:606 msgid "Move patterns (in fill or stroke) along with the objects" -msgstr "随对象缩放图案(填充或笔廓)" +msgstr "随对象缩放图案(填充或笔刷)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1227 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 msgid "Store transformation" msgstr "存储变换" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1241 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" msgstr "如果可能, 应用变换时不给对象增加 transform= 属性" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 msgid "Always store transformation as a transform= attribute on objects" msgstr "总是以 transform= 属性保存对象上的变换" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1245 msgid "Transforms" msgstr "变换" -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 msgid "Mouse _wheel scrolls by:" msgstr "鼠标滚轮滚动距离(_W):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" -msgstr "鼠标滚轮滚动一个的屏幕像素距离(使用 Shift 水平滚动)" +msgstr "鼠标滚轮滚动一个的屏幕像素距离(使用 Shift 水平滚动)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "Ctrl+arrows" msgstr "Ctrl+方向键" -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 msgid "Sc_roll by:" msgstr "滚动距离(_R):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1242 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" -msgstr "按住 Ctrl+方向键以此距离(屏幕像素)滚动" +msgstr "按住 Ctrl+方向键以此距离(屏幕像素)滚动" -#: ../src/ui/dialog/inkscape-preferences.cpp:1244 +#: ../src/ui/dialog/inkscape-preferences.cpp:1256 msgid "_Acceleration:" msgstr "加速度(_A):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1245 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" -msgstr "按住并不放 Ctrl+方向键逐渐提高滚动速度(0 不加速)" +msgstr "按住并不放 Ctrl+方向键逐渐提高滚动速度(0 不加速)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1246 +#: ../src/ui/dialog/inkscape-preferences.cpp:1258 msgid "Autoscrolling" msgstr "自动滚动" -#: ../src/ui/dialog/inkscape-preferences.cpp:1248 +#: ../src/ui/dialog/inkscape-preferences.cpp:1260 msgid "_Speed:" msgstr "速度(_S):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" -msgstr "当你在画布边界拖动时自动滚动的速度(0 禁用自动滚动)" +msgstr "当您在画布边界拖动时自动滚动的速度(0 禁用自动滚动)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 msgid "_Threshold:" msgstr "阈值(_T):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1252 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" msgstr "从画布边缘到触发自动滚动需要多远;正值远离画布,负值在画布内" -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "Mouse move pans when Space is pressed" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +#: ../src/ui/dialog/inkscape-preferences.cpp:1267 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1256 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "Mouse wheel zooms by default" msgstr "鼠标滚轮默认为缩放" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1270 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" msgstr "" "打开时,鼠标滚轮控制缩放,Ctrl+滚轮 滚屏;关闭时,滚轮滚屏,Ctrl+滚轮 缩放" -#: ../src/ui/dialog/inkscape-preferences.cpp:1259 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 msgid "Scrolling" msgstr "滚动" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1262 +#: ../src/ui/dialog/inkscape-preferences.cpp:1274 msgid "Snap indicator" msgstr "吸附指示" -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1276 msgid "Enable snap indicator" msgstr "打开吸附指示" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1278 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "吸附到点后,在该点上显示一个标记" -#: ../src/ui/dialog/inkscape-preferences.cpp:1271 +#: ../src/ui/dialog/inkscape-preferences.cpp:1283 msgid "Snap indicator persistence (in seconds):" -msgstr "吸附指示器持续时长(秒)" +msgstr "吸附指示器持续时长(秒)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1272 +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "" "Controls how long the snap indicator message will be shown, before it " "disappears" msgstr "控制吸附指示器消息的显示时长" -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 +#: ../src/ui/dialog/inkscape-preferences.cpp:1286 msgid "What should snap" msgstr "需要吸附的对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 +#: ../src/ui/dialog/inkscape-preferences.cpp:1288 msgid "Only snap the node closest to the pointer" msgstr "仅吸附离指针最近的节点" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 +#: ../src/ui/dialog/inkscape-preferences.cpp:1290 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "仅吸附到一开始离鼠标指针最近的节点" -#: ../src/ui/dialog/inkscape-preferences.cpp:1281 +#: ../src/ui/dialog/inkscape-preferences.cpp:1293 msgid "_Weight factor:" msgstr "权重系数(_W):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1282 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "" "When multiple snap solutions are found, then Inkscape can either prefer the " "closest transformation (when set to 0), or prefer the node that was " "initially the closest to the pointer (when set to 1)" msgstr "" -"当有多种吸附方式时,Inkscape可以优先选择最接近变换后的(设置为 0),或者一开" -"始最接近指针的点(设置为 1)" +"当有多种吸附方式时,Inkscape可以优先选择最接近变换后的(设置为 0),或者一开始" +"最接近指针的点(设置为 1)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +#: ../src/ui/dialog/inkscape-preferences.cpp:1296 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "当拖动一个约束结时,吸附鼠标指针" -#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +#: ../src/ui/dialog/inkscape-preferences.cpp:1298 msgid "" "When dragging a knot along a constraint line, then snap the position of the " "mouse pointer instead of snapping the projection of the knot onto the " @@ -19168,15 +19271,15 @@ msgstr "" "当沿着一条约束线拖动一个结时,那么吸附鼠标指针的位置而不是吸附结的投影到约束" "线上" -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1300 msgid "Delayed snap" msgstr "延时吸附" -#: ../src/ui/dialog/inkscape-preferences.cpp:1291 +#: ../src/ui/dialog/inkscape-preferences.cpp:1303 msgid "Delay (in seconds):" -msgstr "延迟 (秒):" +msgstr "延迟(秒):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1292 +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 msgid "" "Postpone snapping as long as the mouse is moving, and then wait an " "additional fraction of a second. This additional delay is specified here. " @@ -19185,42 +19288,42 @@ msgstr "" "鼠标移动时将暂停吸附,并另延几秒。在这里指定另外的延迟时。如果设置为 0 或者非" "常小的数,将立即进行吸附。" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1306 msgid "Snapping" msgstr "吸附" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1299 +#: ../src/ui/dialog/inkscape-preferences.cpp:1311 msgid "_Arrow keys move by:" msgstr "方向键移动距离(_A):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1300 +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" msgstr "按住一个方向键,按这个距离移动选择的对象或节点" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1303 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgid "> and < _scale by:" msgstr "> 和 < 缩放比例(_S):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1304 +#: ../src/ui/dialog/inkscape-preferences.cpp:1316 msgid "Pressing > or < scales selection up or down by this increment" msgstr "按住 > 或 < 使选区以此数值向上或下缩放" -#: ../src/ui/dialog/inkscape-preferences.cpp:1306 +#: ../src/ui/dialog/inkscape-preferences.cpp:1318 msgid "_Inset/Outset by:" msgstr "内外偏移距离(_I):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1307 +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "Inset and Outset commands displace the path by this distance" msgstr "向内偏移和向外偏移命令按这个距离移动路径" -#: ../src/ui/dialog/inkscape-preferences.cpp:1308 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 msgid "Compass-like display of angles" msgstr "指南针式角度显示" -#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1322 msgid "" "When on, angles are displayed with 0 at north, 0 to 360 range, positive " "clockwise; otherwise with 0 at east, -180 to 180 range, positive " @@ -19229,89 +19332,89 @@ msgstr "" "当打开时,角度将会按照 0 度在北部、范围 0 到 360 度、顺时针方向显示;否则 0 " "度在东方,范围 -180 到 180 度,逆时针方向" -#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +#: ../src/ui/dialog/inkscape-preferences.cpp:1324 msgctxt "Rotation angle" msgid "None" msgstr "无" -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 +#: ../src/ui/dialog/inkscape-preferences.cpp:1328 msgid "_Rotation snaps every:" msgstr "旋转捕捉周期(_R):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 +#: ../src/ui/dialog/inkscape-preferences.cpp:1328 msgid "degrees" msgstr "度" -#: ../src/ui/dialog/inkscape-preferences.cpp:1317 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" msgstr "按住 Ctrl 旋转每隔指定度数吸附;同样还可按住 [ 或者 ] 按照此度数旋转" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "Relative snapping of guideline angles" msgstr "辅助线角度的相对吸附" -#: ../src/ui/dialog/inkscape-preferences.cpp:1320 +#: ../src/ui/dialog/inkscape-preferences.cpp:1332 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" msgstr "当打开时,当旋转一条辅助线时将会相对于原始角度吸附角度" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 msgid "_Zoom in/out by:" msgstr "缩放比例(_Z):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 -#: ../src/ui/dialog/objects.cpp:1626 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 +#: ../src/ui/dialog/objects.cpp:1630 #: ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "%" -#: ../src/ui/dialog/inkscape-preferences.cpp:1323 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" msgstr "缩放工具单击,+/- 键和鼠标中键单击按照此系数缩放" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 msgid "Steps" msgstr "步数" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1327 +#: ../src/ui/dialog/inkscape-preferences.cpp:1339 msgid "Move in parallel" msgstr "平行移动" -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +#: ../src/ui/dialog/inkscape-preferences.cpp:1341 msgid "Stay unmoved" msgstr "保持未移动" -#: ../src/ui/dialog/inkscape-preferences.cpp:1331 +#: ../src/ui/dialog/inkscape-preferences.cpp:1343 msgid "Move according to transform" msgstr "根据变换移动" -#: ../src/ui/dialog/inkscape-preferences.cpp:1333 +#: ../src/ui/dialog/inkscape-preferences.cpp:1345 msgid "Are unlinked" msgstr "是未链接的" -#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1347 msgid "Are deleted" msgstr "是未删除的" -#: ../src/ui/dialog/inkscape-preferences.cpp:1338 +#: ../src/ui/dialog/inkscape-preferences.cpp:1350 msgid "Moving original: clones and linked offsets" msgstr "移动原件:克隆和链接的偏移" -#: ../src/ui/dialog/inkscape-preferences.cpp:1340 +#: ../src/ui/dialog/inkscape-preferences.cpp:1352 msgid "Clones are translated by the same vector as their original" msgstr "克隆与原对象以相同的向量变化" -#: ../src/ui/dialog/inkscape-preferences.cpp:1342 +#: ../src/ui/dialog/inkscape-preferences.cpp:1354 msgid "Clones preserve their positions when their original is moved" msgstr "当原始对象移动时,克隆保持自己的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1344 +#: ../src/ui/dialog/inkscape-preferences.cpp:1356 msgid "" "Each clone moves according to the value of its transform= attribute; for " "example, a rotated clone will move in a different direction than its original" @@ -19319,157 +19422,157 @@ msgstr "" "每个克隆的移动量依据 transform= 属性的值决定。例如,旋转过的克隆与原对象移动" "方向不同" -#: ../src/ui/dialog/inkscape-preferences.cpp:1345 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 msgid "Deleting original: clones" msgstr "正在删除原件:克隆" -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 +#: ../src/ui/dialog/inkscape-preferences.cpp:1359 msgid "Orphaned clones are converted to regular objects" msgstr "孤立克隆转化成一般对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:1349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1361 msgid "Orphaned clones are deleted along with their original" msgstr "孤立克隆随原对象一起删除" -#: ../src/ui/dialog/inkscape-preferences.cpp:1351 +#: ../src/ui/dialog/inkscape-preferences.cpp:1363 msgid "Duplicating original+clones/linked offset" msgstr "再制原件+克隆/链接的偏移" -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1365 msgid "Relink duplicated clones" msgstr "重新链接再制的克隆" -#: ../src/ui/dialog/inkscape-preferences.cpp:1355 +#: ../src/ui/dialog/inkscape-preferences.cpp:1367 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " "instead of the old original" msgstr "" -"当再制的选区同时包含原始和其克隆对象时(比如同时在群组中),将再制的克隆链接" -"到再制的原始对象上,而不是旧的原始对象。" +"当再制的选区同时包含原始和其克隆对象时(比如同时在群组中),将再制的克隆链接到" +"再制的原始对象上,而不是旧的原始对象。" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1358 +#: ../src/ui/dialog/inkscape-preferences.cpp:1370 msgid "Clones" msgstr "克隆" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1361 +#: ../src/ui/dialog/inkscape-preferences.cpp:1373 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "使用最上面的已选对象作为剪裁路径或蒙版" -#: ../src/ui/dialog/inkscape-preferences.cpp:1363 +#: ../src/ui/dialog/inkscape-preferences.cpp:1375 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "不选定这项以使用底层已选对象作为剪裁路径或蒙版" -#: ../src/ui/dialog/inkscape-preferences.cpp:1364 +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 msgid "Remove clippath/mask object after applying" msgstr "在应用后,去除剪裁路径或蒙版" -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1378 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" msgstr "在应用后, 从绘图中去除作为剪裁路径或蒙版的对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:1368 +#: ../src/ui/dialog/inkscape-preferences.cpp:1380 msgid "Before applying" msgstr "在应用前" -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1382 msgid "Do not group clipped/masked objects" msgstr "不组合剪裁/蒙版的对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1383 msgid "Put every clipped/masked object in its own group" msgstr "把每个剪裁/蒙版的对象放在它自己的组中" -#: ../src/ui/dialog/inkscape-preferences.cpp:1372 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Put all clipped/masked objects into one group" msgstr "把所有剪裁/蒙版的对象放在一个组中" -#: ../src/ui/dialog/inkscape-preferences.cpp:1375 +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 msgid "Apply clippath/mask to every object" msgstr "应用剪裁路径/蒙版到每个对象" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Apply clippath/mask to groups containing single object" msgstr "应用剪裁路径/蒙版到包含单一对象的组" -#: ../src/ui/dialog/inkscape-preferences.cpp:1381 +#: ../src/ui/dialog/inkscape-preferences.cpp:1393 msgid "Apply clippath/mask to group containing all objects" msgstr "应用剪裁路径/蒙版到包含所有对象的组" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 +#: ../src/ui/dialog/inkscape-preferences.cpp:1395 msgid "After releasing" -msgstr "在释放后" +msgstr "释放后" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +#: ../src/ui/dialog/inkscape-preferences.cpp:1397 msgid "Ungroup automatically created groups" msgstr "解除自动创建的群组" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1399 msgid "Ungroup groups created when setting clip/mask" msgstr "当设置剪裁/蒙板时取消创建的分组" -#: ../src/ui/dialog/inkscape-preferences.cpp:1389 +#: ../src/ui/dialog/inkscape-preferences.cpp:1401 msgid "Clippaths and masks" msgstr "剪裁路径和蒙版" -#: ../src/ui/dialog/inkscape-preferences.cpp:1392 +#: ../src/ui/dialog/inkscape-preferences.cpp:1404 msgid "Stroke Style Markers" -msgstr "笔廓样式标记" +msgstr "笔刷样式标记" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 +#: ../src/ui/dialog/inkscape-preferences.cpp:1406 +#: ../src/ui/dialog/inkscape-preferences.cpp:1408 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" -msgstr "笔廓颜色和对象一样,填充颜色和对象填充色或者标记填充色系统" +msgstr "笔刷颜色和对象一样,填充颜色和对象填充色或者标记填充色系统" -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 +#: ../src/ui/dialog/inkscape-preferences.cpp:1412 #: ../share/extensions/hershey.inx.h:27 msgid "Markers" msgstr "标记" -#: ../src/ui/dialog/inkscape-preferences.cpp:1403 +#: ../src/ui/dialog/inkscape-preferences.cpp:1415 msgid "Document cleanup" msgstr "文档清理" -#: ../src/ui/dialog/inkscape-preferences.cpp:1404 -#: ../src/ui/dialog/inkscape-preferences.cpp:1406 +#: ../src/ui/dialog/inkscape-preferences.cpp:1416 +#: ../src/ui/dialog/inkscape-preferences.cpp:1418 msgid "Remove unused swatches when doing a document cleanup" msgstr "当完成一次文档清理时删除未使用的色盘" #. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1407 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 msgid "Cleanup" msgstr "清理" -#: ../src/ui/dialog/inkscape-preferences.cpp:1415 +#: ../src/ui/dialog/inkscape-preferences.cpp:1427 msgid "Number of _Threads:" msgstr "线程数(_T):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1415 -#: ../src/ui/dialog/inkscape-preferences.cpp:1951 +#: ../src/ui/dialog/inkscape-preferences.cpp:1427 +#: ../src/ui/dialog/inkscape-preferences.cpp:1963 msgid "(requires restart)" -msgstr "(需要重启)" +msgstr "(需重启程序)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1416 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Configure number of processors/threads to use when rendering filters" msgstr "配置在渲染滤镜时要使用的进程/线程的数量" -#: ../src/ui/dialog/inkscape-preferences.cpp:1420 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgid "Rendering _cache size:" msgstr "渲染缓存大小(_C):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1420 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "MiB" -#: ../src/ui/dialog/inkscape-preferences.cpp:1420 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgid "" "Set the amount of memory per document which can be used to store rendered " "parts of the drawing for later reuse; set to zero to disable caching" @@ -19479,155 +19582,155 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1423 -#: ../src/ui/dialog/inkscape-preferences.cpp:1447 +#: ../src/ui/dialog/inkscape-preferences.cpp:1435 +#: ../src/ui/dialog/inkscape-preferences.cpp:1459 msgid "Best quality (slowest)" -msgstr "最佳质量(最慢)" +msgstr "最佳质量(最慢)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1425 -#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1437 +#: ../src/ui/dialog/inkscape-preferences.cpp:1461 msgid "Better quality (slower)" -msgstr "较好质量(较慢)" +msgstr "较好质量(较慢)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1439 +#: ../src/ui/dialog/inkscape-preferences.cpp:1463 msgid "Average quality" msgstr "普通质量" -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 -#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1441 +#: ../src/ui/dialog/inkscape-preferences.cpp:1465 msgid "Lower quality (faster)" -msgstr "较低质量(较快)" +msgstr "较低质量(较快)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1443 +#: ../src/ui/dialog/inkscape-preferences.cpp:1467 msgid "Lowest quality (fastest)" -msgstr "最差质量(最快)" +msgstr "最差质量(最快)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1434 +#: ../src/ui/dialog/inkscape-preferences.cpp:1446 msgid "Gaussian blur quality for display" msgstr "用于显示的高斯模糊质量" -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 -#: ../src/ui/dialog/inkscape-preferences.cpp:1460 +#: ../src/ui/dialog/inkscape-preferences.cpp:1448 +#: ../src/ui/dialog/inkscape-preferences.cpp:1472 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" -msgstr "最佳质量,但是放大倍数大的时候非常慢(导出位图始终使用最佳质量)" +msgstr "最佳质量,但是放大倍数大的时候非常慢(导出位图始终使用最佳质量)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 -#: ../src/ui/dialog/inkscape-preferences.cpp:1462 +#: ../src/ui/dialog/inkscape-preferences.cpp:1450 +#: ../src/ui/dialog/inkscape-preferences.cpp:1474 msgid "Better quality, but slower display" msgstr "较好质量,但是显示较慢" -#: ../src/ui/dialog/inkscape-preferences.cpp:1440 -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#: ../src/ui/dialog/inkscape-preferences.cpp:1452 +#: ../src/ui/dialog/inkscape-preferences.cpp:1476 msgid "Average quality, acceptable display speed" msgstr "普通质量,可接受的显示速度" -#: ../src/ui/dialog/inkscape-preferences.cpp:1442 -#: ../src/ui/dialog/inkscape-preferences.cpp:1466 +#: ../src/ui/dialog/inkscape-preferences.cpp:1454 +#: ../src/ui/dialog/inkscape-preferences.cpp:1478 msgid "Lower quality (some artifacts), but display is faster" -msgstr "较差质量(有一些失真),但是显示较快" +msgstr "较差质量(有一些失真),但是显示较快" -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#: ../src/ui/dialog/inkscape-preferences.cpp:1456 +#: ../src/ui/dialog/inkscape-preferences.cpp:1480 msgid "Lowest quality (considerable artifacts), but display is fastest" -msgstr "最差质量(大量图像失真),但是显示最快" +msgstr "最差质量(明显失真),但是显示最快" -#: ../src/ui/dialog/inkscape-preferences.cpp:1458 +#: ../src/ui/dialog/inkscape-preferences.cpp:1470 msgid "Filter effects quality for display" msgstr "用于显示的滤镜效果质量" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#: ../src/ui/dialog/inkscape-preferences.cpp:1482 #: ../src/ui/dialog/print.cpp:215 msgid "Rendering" msgstr "渲染" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1476 ../src/verbs.cpp:156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1488 ../src/verbs.cpp:156 #: ../src/widgets/calligraphy-toolbar.cpp:626 msgid "Edit" msgstr "编辑" -#: ../src/ui/dialog/inkscape-preferences.cpp:1477 +#: ../src/ui/dialog/inkscape-preferences.cpp:1489 msgid "Automatically reload bitmaps" msgstr "自动重载位图" -#: ../src/ui/dialog/inkscape-preferences.cpp:1479 +#: ../src/ui/dialog/inkscape-preferences.cpp:1491 msgid "Automatically reload linked images when file is changed on disk" msgstr "当磁盘文件改变时, 自动重新加载链接的图像" -#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +#: ../src/ui/dialog/inkscape-preferences.cpp:1493 msgid "_Bitmap editor:" msgstr "位图编辑器(_B):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1483 +#: ../src/ui/dialog/inkscape-preferences.cpp:1495 #: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "导出" -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 +#: ../src/ui/dialog/inkscape-preferences.cpp:1497 msgid "Default export _resolution:" msgstr "默认导出分辨率(_R):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1486 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" -msgstr "导出对话框里的默认位图分辨率(按 dpi 计)" +msgstr "导出对话框里的默认位图分辨率(按 dpi 计)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1487 +#: ../src/ui/dialog/inkscape-preferences.cpp:1499 #: ../src/ui/dialog/xml-tree.cpp:920 msgid "Create" msgstr "创建" -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 +#: ../src/ui/dialog/inkscape-preferences.cpp:1501 msgid "Resolution for Create Bitmap _Copy:" msgstr "创建位图副本的分辨率(_C):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1490 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 msgid "Resolution used by the Create Bitmap Copy command" msgstr "创建位图副本命令所使用的分辨率" -#: ../src/ui/dialog/inkscape-preferences.cpp:1493 +#: ../src/ui/dialog/inkscape-preferences.cpp:1505 msgid "Ask about linking and scaling when importing" msgstr "在导入时询问链接和缩放" -#: ../src/ui/dialog/inkscape-preferences.cpp:1495 +#: ../src/ui/dialog/inkscape-preferences.cpp:1507 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "当导入位图图像时弹出链接和缩放对话框。" -#: ../src/ui/dialog/inkscape-preferences.cpp:1501 +#: ../src/ui/dialog/inkscape-preferences.cpp:1513 msgid "Bitmap link:" msgstr "位图链接:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1508 +#: ../src/ui/dialog/inkscape-preferences.cpp:1520 msgid "Bitmap scale (image-rendering):" msgstr "位图缩放(图像渲染):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1513 +#: ../src/ui/dialog/inkscape-preferences.cpp:1525 msgid "Default _import resolution:" msgstr "默认导入分辨率(_I):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1514 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "Default bitmap resolution (in dots per inch) for bitmap import" -msgstr "用于位图导入的默认位图分辨率(按 dpi 计)" +msgstr "用于位图导入的默认位图分辨率(按 dpi 计)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1515 +#: ../src/ui/dialog/inkscape-preferences.cpp:1527 msgid "Override file resolution" msgstr "忽略文件分辨率" -#: ../src/ui/dialog/inkscape-preferences.cpp:1517 +#: ../src/ui/dialog/inkscape-preferences.cpp:1529 msgid "Use default bitmap resolution in favor of information from file" msgstr "使用来自文件所支持的默认位图分辨率" #. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1521 +#: ../src/ui/dialog/inkscape-preferences.cpp:1533 msgid "Images in Outline Mode" msgstr "轮廓模式显示图片" -#: ../src/ui/dialog/inkscape-preferences.cpp:1522 +#: ../src/ui/dialog/inkscape-preferences.cpp:1534 msgid "" "When active will render images while in outline mode instead of a red box " "with an x. This is useful for manual tracing." @@ -19635,221 +19738,221 @@ msgstr "" "当启用时轮廓模式会显示图片而不是显示红色方框里面中间一个 x。此选项对手动临摹" "时很帮助。" -#: ../src/ui/dialog/inkscape-preferences.cpp:1524 +#: ../src/ui/dialog/inkscape-preferences.cpp:1536 msgid "Bitmaps" msgstr "位图" -#: ../src/ui/dialog/inkscape-preferences.cpp:1536 +#: ../src/ui/dialog/inkscape-preferences.cpp:1548 msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1539 +#: ../src/ui/dialog/inkscape-preferences.cpp:1551 msgid "Shortcut file:" msgstr "快捷键文件:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1542 +#: ../src/ui/dialog/inkscape-preferences.cpp:1554 #: ../src/ui/dialog/template-load-tab.cpp:48 msgid "Search:" msgstr "搜索:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1554 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 msgid "Shortcut" msgstr "快捷键" -#: ../src/ui/dialog/inkscape-preferences.cpp:1555 +#: ../src/ui/dialog/inkscape-preferences.cpp:1567 #: ../src/ui/widget/page-sizer.cpp:287 msgid "Description" msgstr "描述" -#: ../src/ui/dialog/inkscape-preferences.cpp:1610 +#: ../src/ui/dialog/inkscape-preferences.cpp:1622 msgid "" "Remove all your customized keyboard shortcuts, and revert to the shortcuts " "in the shortcut file listed above" msgstr "移除全部自定义的键盘快捷键,并用上面呈列的快捷键文件还原快捷键" -#: ../src/ui/dialog/inkscape-preferences.cpp:1614 +#: ../src/ui/dialog/inkscape-preferences.cpp:1626 msgid "Import ..." -msgstr "导入…" +msgstr "导入..." -#: ../src/ui/dialog/inkscape-preferences.cpp:1614 +#: ../src/ui/dialog/inkscape-preferences.cpp:1626 msgid "Import custom keyboard shortcuts from a file" msgstr "从文件导入自定义键盘快捷键" -#: ../src/ui/dialog/inkscape-preferences.cpp:1617 +#: ../src/ui/dialog/inkscape-preferences.cpp:1629 msgid "Export ..." -msgstr "导出…" +msgstr "导出..." -#: ../src/ui/dialog/inkscape-preferences.cpp:1617 +#: ../src/ui/dialog/inkscape-preferences.cpp:1629 msgid "Export custom keyboard shortcuts to a file" msgstr "将自定义键盘快捷键导出到文件" -#: ../src/ui/dialog/inkscape-preferences.cpp:1627 +#: ../src/ui/dialog/inkscape-preferences.cpp:1639 msgid "Keyboard Shortcuts" msgstr "快捷键" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1790 +#: ../src/ui/dialog/inkscape-preferences.cpp:1802 msgid "Misc" msgstr "杂项" -#: ../src/ui/dialog/inkscape-preferences.cpp:1892 +#: ../src/ui/dialog/inkscape-preferences.cpp:1904 msgctxt "Spellchecker language" msgid "None" msgstr "无" -#: ../src/ui/dialog/inkscape-preferences.cpp:1913 +#: ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "Set the main spell check language" msgstr "设置拼写检查的首选语言" -#: ../src/ui/dialog/inkscape-preferences.cpp:1916 +#: ../src/ui/dialog/inkscape-preferences.cpp:1928 msgid "Second language:" msgstr "第二语言:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1917 +#: ../src/ui/dialog/inkscape-preferences.cpp:1929 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" msgstr "" "设置第二种拼写检查语言;当单词在在所有选定的语言中均找不到时,检查才会停止" -#: ../src/ui/dialog/inkscape-preferences.cpp:1920 +#: ../src/ui/dialog/inkscape-preferences.cpp:1932 msgid "Third language:" msgstr "第三语言:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1921 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" msgstr "" "设置第三种拼写检查语言;当单词在在所有选定的语言中均找不到时,检查才会停止" -#: ../src/ui/dialog/inkscape-preferences.cpp:1923 +#: ../src/ui/dialog/inkscape-preferences.cpp:1935 msgid "Ignore words with digits" msgstr "忽略含有数字的词" -#: ../src/ui/dialog/inkscape-preferences.cpp:1925 +#: ../src/ui/dialog/inkscape-preferences.cpp:1937 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "忽略含有数字的单词, 例如“R2D2”" -#: ../src/ui/dialog/inkscape-preferences.cpp:1927 +#: ../src/ui/dialog/inkscape-preferences.cpp:1939 msgid "Ignore words in ALL CAPITALS" msgstr "忽略全部大写的词" -#: ../src/ui/dialog/inkscape-preferences.cpp:1929 +#: ../src/ui/dialog/inkscape-preferences.cpp:1941 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "忽略全部大写的词, 例如“IUPAC”" -#: ../src/ui/dialog/inkscape-preferences.cpp:1931 +#: ../src/ui/dialog/inkscape-preferences.cpp:1943 msgid "Spellcheck" msgstr "拼写检查" -#: ../src/ui/dialog/inkscape-preferences.cpp:1951 +#: ../src/ui/dialog/inkscape-preferences.cpp:1963 msgid "Latency _skew:" msgstr "延时偏差(_S):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1952 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" -msgstr "事件时钟和实际时间的偏差的系数(在某些系统上是 0.9766)" +msgstr "事件时钟和实际时间的偏差的系数(在某些系统上是 0.9766)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1954 +#: ../src/ui/dialog/inkscape-preferences.cpp:1966 msgid "Pre-render named icons" msgstr "预先渲染命名图标" -#: ../src/ui/dialog/inkscape-preferences.cpp:1956 +#: ../src/ui/dialog/inkscape-preferences.cpp:1968 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" msgstr "" "选中时, 命名图标将在显示用户界面前就渲染. 用来避免GTK+中命名图标通知的bug" -#: ../src/ui/dialog/inkscape-preferences.cpp:1964 +#: ../src/ui/dialog/inkscape-preferences.cpp:1976 msgid "System info" msgstr "系统信息" -#: ../src/ui/dialog/inkscape-preferences.cpp:1968 +#: ../src/ui/dialog/inkscape-preferences.cpp:1980 msgid "User config: " msgstr "用户设置:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1968 +#: ../src/ui/dialog/inkscape-preferences.cpp:1980 msgid "Location of users configuration" msgstr "用户配置的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1972 +#: ../src/ui/dialog/inkscape-preferences.cpp:1984 msgid "User preferences: " msgstr "用户首选项:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1972 +#: ../src/ui/dialog/inkscape-preferences.cpp:1984 msgid "Location of the users preferences file" msgstr "用户首选项文件的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1976 +#: ../src/ui/dialog/inkscape-preferences.cpp:1988 msgid "User extensions: " msgstr "用户扩展:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1976 +#: ../src/ui/dialog/inkscape-preferences.cpp:1988 msgid "Location of the users extensions" msgstr "用户扩展的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1980 +#: ../src/ui/dialog/inkscape-preferences.cpp:1992 msgid "User cache: " msgstr "用户缓存:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1980 +#: ../src/ui/dialog/inkscape-preferences.cpp:1992 msgid "Location of users cache" msgstr "用户缓存的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1988 +#: ../src/ui/dialog/inkscape-preferences.cpp:2000 msgid "Temporary files: " msgstr "临时文件:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1988 +#: ../src/ui/dialog/inkscape-preferences.cpp:2000 msgid "Location of the temporary files used for autosave" msgstr "用于自动保存的临时文件的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1992 +#: ../src/ui/dialog/inkscape-preferences.cpp:2004 msgid "Inkscape data: " msgstr "Inkscape 数据:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1992 +#: ../src/ui/dialog/inkscape-preferences.cpp:2004 msgid "Location of Inkscape data" msgstr "Inkscape 数据的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:1996 +#: ../src/ui/dialog/inkscape-preferences.cpp:2008 msgid "Inkscape extensions: " msgstr "Inkscape 扩展:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1996 +#: ../src/ui/dialog/inkscape-preferences.cpp:2008 msgid "Location of the Inkscape extensions" msgstr "Inkscape 扩展的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:2005 +#: ../src/ui/dialog/inkscape-preferences.cpp:2017 msgid "System data: " msgstr "系统数据:" -#: ../src/ui/dialog/inkscape-preferences.cpp:2005 +#: ../src/ui/dialog/inkscape-preferences.cpp:2017 msgid "Locations of system data" msgstr "系统数据的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:2029 +#: ../src/ui/dialog/inkscape-preferences.cpp:2041 msgid "Icon theme: " msgstr "图标主题:" -#: ../src/ui/dialog/inkscape-preferences.cpp:2029 +#: ../src/ui/dialog/inkscape-preferences.cpp:2041 msgid "Locations of icon themes" msgstr "图标主题的位置" -#: ../src/ui/dialog/inkscape-preferences.cpp:2031 +#: ../src/ui/dialog/inkscape-preferences.cpp:2043 msgid "System" msgstr "系统" #: ../src/ui/dialog/input.cpp:360 ../src/ui/dialog/input.cpp:381 #: ../src/ui/dialog/input.cpp:1641 msgid "Disabled" -msgstr "禁止" +msgstr "已禁用" #: ../src/ui/dialog/input.cpp:361 msgctxt "Input device" @@ -19908,7 +20011,7 @@ msgstr "平板" #: ../src/ui/dialog/input.cpp:1081 msgid "_Use pressure-sensitive tablet (requires restart)" -msgstr "使用压力敏感绘图板(需要重启)(_U)" +msgstr "使用压力敏感绘图板(需重启程序)(_U)" #: ../src/ui/dialog/input.cpp:1086 msgid "Axes" @@ -19923,11 +20026,12 @@ msgid "" "A device can be 'Disabled', its co-ordinates mapped to the whole 'Screen', " "or to a single (usually focused) 'Window'" msgstr "" -"可以“禁用”的设备,它的坐标映射到整个“屏幕”,或者一个单一(通常是聚焦的)的“窗" +"可以“禁用”的设备,它的坐标映射到整个“屏幕”,或者一个单一(通常是聚焦的)的“窗" "口”" #: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 -#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:311 ../src/widgets/spray-toolbar.cpp:427 +#: ../src/widgets/spray-toolbar.cpp:476 ../src/widgets/tweak-toolbar.cpp:372 msgid "Pressure" msgstr "压力" @@ -19948,6 +20052,35 @@ msgctxt "Input device axe" msgid "None" msgstr "无" +#: ../src/ui/dialog/knot-properties.cpp:59 +msgid "Position X:" +msgstr "位置 X:" + +#: ../src/ui/dialog/knot-properties.cpp:66 +msgid "Position Y:" +msgstr "位置 Y:" + +#: ../src/ui/dialog/knot-properties.cpp:120 +msgid "Modify Knot Position" +msgstr "修改节点位置" + +#: ../src/ui/dialog/knot-properties.cpp:121 +#: ../src/ui/dialog/layer-properties.cpp:411 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 +#: ../src/ui/dialog/transformation.cpp:107 +msgid "_Move" +msgstr "移动(_M)" + +#: ../src/ui/dialog/knot-properties.cpp:180 +#, c-format +msgid "Position X (%s):" +msgstr "位置 X (%s):" + +#: ../src/ui/dialog/knot-properties.cpp:181 +#, c-format +msgid "Position Y (%s):" +msgstr "位置 Y (%s):" + #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "层名:" @@ -19975,7 +20108,7 @@ msgstr "重命名图层" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:354 #: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2337 +#: ../src/verbs.cpp:2364 msgid "Layer" msgstr "图层" @@ -20008,15 +20141,9 @@ msgstr "新图层已创建。" msgid "Move to Layer" msgstr "移到图层" -#: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 -#: ../src/ui/dialog/transformation.cpp:108 -msgid "_Move" -msgstr "移动(_M)" - #: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 msgid "Unhide layer" -msgstr "撤销隐藏图层" +msgstr "显示图层" #: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 msgid "Hide layer" @@ -20028,15 +20155,15 @@ msgstr "锁定图层" #: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 msgid "Unlock layer" -msgstr "撤销锁定图层" +msgstr "解锁图层" #: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 -#: ../src/verbs.cpp:1407 +#: ../src/verbs.cpp:1424 msgid "Toggle layer solo" msgstr "仅当前图层可见" #: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 -#: ../src/verbs.cpp:1431 +#: ../src/verbs.cpp:1448 msgid "Lock other layers" msgstr "锁定其他图层" @@ -20232,11 +20359,11 @@ msgstr "日志捕获停止。" #: ../src/ui/dialog/new-from-template.cpp:27 msgid "Create from template" -msgstr "从模板创建" +msgstr "从模板新建" #: ../src/ui/dialog/new-from-template.cpp:29 msgid "New From Template" -msgstr "由模板新建" +msgstr "从模板新建" #: ../src/ui/dialog/object-attributes.cpp:47 msgid "Href:" @@ -20262,7 +20389,7 @@ msgstr "显示:" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkActuateAttribute #: ../src/ui/dialog/object-attributes.cpp:60 msgid "Actuate:" -msgstr "开动:" +msgstr "激活:" #: ../src/ui/dialog/object-attributes.cpp:65 msgid "URL:" @@ -20299,7 +20426,7 @@ msgstr "锁定(_O)" #: ../src/ui/dialog/object-properties.cpp:139 msgid "" "The id= attribute (only letters, digits, and the characters .-_: allowed)" -msgstr "id= 属性(只允许字母、数字和字符 .-_:)" +msgstr "id= 属性(只允许字母、数字和字符 .-_:)" #. Create the entry box for the object label #: ../src/ui/dialog/object-properties.cpp:174 @@ -20336,11 +20463,11 @@ msgstr "勾选使对象不可见" #. TRANSLATORS: "Lock" is a verb here #: ../src/ui/dialog/object-properties.cpp:309 msgid "Check to make the object insensitive (not selectable by mouse)" -msgstr "勾选使对象不可操作(不能通过鼠标选择)" +msgstr "勾选使对象不可操作(不能通过鼠标选择)" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2680 -#: ../src/verbs.cpp:2686 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2718 msgid "_Set" msgstr "设置(_S)" @@ -20396,7 +20523,7 @@ msgstr "隐藏对象" #: ../src/ui/dialog/object-properties.cpp:570 msgid "Unhide object" -msgstr "撤销隐藏对象" +msgstr "显示对象" #: ../src/ui/dialog/objects.cpp:874 msgid "Unhide objects" @@ -20426,8 +20553,8 @@ msgstr "群组转图层" msgid "Moved objects" msgstr "移动的对象" -#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:857 -#: ../src/ui/dialog/tags.cpp:864 +#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:853 +#: ../src/ui/dialog/tags.cpp:860 msgid "Rename object" msgstr "重命名对象" @@ -20447,143 +20574,143 @@ msgstr "设置对象混合模式" msgid "Set object blur" msgstr "设置对象模糊" -#: ../src/ui/dialog/objects.cpp:1617 +#: ../src/ui/dialog/objects.cpp:1621 msgctxt "Visibility" msgid "V" msgstr "见" -#: ../src/ui/dialog/objects.cpp:1618 +#: ../src/ui/dialog/objects.cpp:1622 msgctxt "Lock" msgid "L" msgstr "锁" -#: ../src/ui/dialog/objects.cpp:1619 +#: ../src/ui/dialog/objects.cpp:1623 msgctxt "Type" msgid "T" msgstr "类" -#: ../src/ui/dialog/objects.cpp:1620 +#: ../src/ui/dialog/objects.cpp:1624 msgctxt "Clip and mask" msgid "CM" msgstr "蒙" -#: ../src/ui/dialog/objects.cpp:1621 +#: ../src/ui/dialog/objects.cpp:1625 msgctxt "Highlight" msgid "HL" msgstr "高" -#: ../src/ui/dialog/objects.cpp:1622 +#: ../src/ui/dialog/objects.cpp:1626 msgid "Label" msgstr "标签" #. In order to get tooltips on header, we must create our own label. -#: ../src/ui/dialog/objects.cpp:1664 +#: ../src/ui/dialog/objects.cpp:1668 msgid "Toggle visibility of Layer, Group, or Object." msgstr "切换图层、组或对象的可见性。" -#: ../src/ui/dialog/objects.cpp:1677 +#: ../src/ui/dialog/objects.cpp:1681 msgid "Toggle lock of Layer, Group, or Object." msgstr "切换图层、组或对象的锁。" -#: ../src/ui/dialog/objects.cpp:1689 +#: ../src/ui/dialog/objects.cpp:1693 msgid "" "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " "between the two types." msgstr "类型:图层、组或对象。点击图层或组图标,在这两种类型间切换。" -#: ../src/ui/dialog/objects.cpp:1708 +#: ../src/ui/dialog/objects.cpp:1712 msgid "Is object clipped and/or masked?" msgstr "对象是否被裁剪或遮蔽?" -#: ../src/ui/dialog/objects.cpp:1719 +#: ../src/ui/dialog/objects.cpp:1723 msgid "" "Highlight color of outline in Node tool. Click to set. If alpha is zero, use " "inherited color." msgstr "" -#: ../src/ui/dialog/objects.cpp:1730 +#: ../src/ui/dialog/objects.cpp:1734 msgid "" "Layer/Group/Object label (inkscape:label). Double-click to set. Default " "value is object 'id'." msgstr "" -#: ../src/ui/dialog/objects.cpp:1827 +#: ../src/ui/dialog/objects.cpp:1831 msgid "Add layer..." -msgstr "增加层…" +msgstr "增加层..." -#: ../src/ui/dialog/objects.cpp:1834 +#: ../src/ui/dialog/objects.cpp:1838 msgid "Remove object" msgstr "删除对象" -#: ../src/ui/dialog/objects.cpp:1842 +#: ../src/ui/dialog/objects.cpp:1846 msgid "Move To Bottom" msgstr "移到底部" -#: ../src/ui/dialog/objects.cpp:1866 +#: ../src/ui/dialog/objects.cpp:1870 msgid "Move To Top" msgstr "移到顶部" -#: ../src/ui/dialog/objects.cpp:1874 +#: ../src/ui/dialog/objects.cpp:1878 msgid "Collapse All" msgstr "全部折叠" -#: ../src/ui/dialog/objects.cpp:1888 +#: ../src/ui/dialog/objects.cpp:1892 msgid "Rename" msgstr "重命名" -#: ../src/ui/dialog/objects.cpp:1894 +#: ../src/ui/dialog/objects.cpp:1898 msgid "Solo" msgstr "独立" -#: ../src/ui/dialog/objects.cpp:1895 +#: ../src/ui/dialog/objects.cpp:1899 msgid "Show All" msgstr "显示全部" -#: ../src/ui/dialog/objects.cpp:1896 +#: ../src/ui/dialog/objects.cpp:1900 msgid "Hide All" msgstr "隐藏所有" -#: ../src/ui/dialog/objects.cpp:1900 +#: ../src/ui/dialog/objects.cpp:1904 msgid "Lock Others" msgstr "锁定其他" -#: ../src/ui/dialog/objects.cpp:1901 +#: ../src/ui/dialog/objects.cpp:1905 msgid "Lock All" msgstr "全部锁定" #. LockAndHide -#: ../src/ui/dialog/objects.cpp:1902 ../src/verbs.cpp:2968 +#: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3010 msgid "Unlock All" msgstr "撤销所有锁定" -#: ../src/ui/dialog/objects.cpp:1906 +#: ../src/ui/dialog/objects.cpp:1910 msgid "Up" msgstr "向上" -#: ../src/ui/dialog/objects.cpp:1907 +#: ../src/ui/dialog/objects.cpp:1911 msgid "Down" msgstr "向下" -#: ../src/ui/dialog/objects.cpp:1916 +#: ../src/ui/dialog/objects.cpp:1920 msgid "Set Clip" msgstr "设置剪裁" #. will never be implemented #. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) ); -#: ../src/ui/dialog/objects.cpp:1922 +#: ../src/ui/dialog/objects.cpp:1926 msgid "Unset Clip" msgstr "取消剪裁" #. Set mask -#: ../src/ui/dialog/objects.cpp:1926 ../src/ui/interface.cpp:1735 +#: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1736 msgid "Set Mask" msgstr "设置蒙版" -#: ../src/ui/dialog/objects.cpp:1927 +#: ../src/ui/dialog/objects.cpp:1931 msgid "Unset Mask" msgstr "取消蒙版" -#: ../src/ui/dialog/objects.cpp:1949 +#: ../src/ui/dialog/objects.cpp:1953 msgid "Select Highlight Color" msgstr "选择高亮色" @@ -20593,7 +20720,7 @@ msgstr "找到剪贴画" #: ../src/ui/dialog/ocaldialogs.cpp:764 msgid "Downloading image..." -msgstr "正在下载图像…" +msgstr "正在下载图像..." #: ../src/ui/dialog/ocaldialogs.cpp:912 msgid "Could not download image" @@ -20613,7 +20740,7 @@ msgstr "无描述" #: ../src/ui/dialog/ocaldialogs.cpp:1079 msgid "Searching clipart..." -msgstr "正在搜索剪贴画…" +msgstr "正在搜索剪贴画..." #: ../src/ui/dialog/ocaldialogs.cpp:1099 ../src/ui/dialog/ocaldialogs.cpp:1120 msgid "Could not connect to the Open Clip Art Library" @@ -20643,7 +20770,7 @@ msgstr "关闭" #: ../src/ui/dialog/pixelartdialog.cpp:190 msgid "_Curves (multiplier):" -msgstr "曲线(倍数)(_C):" +msgstr "曲线(倍数)(_C):" #: ../src/ui/dialog/pixelartdialog.cpp:193 msgid "Favors connections that are part of a long curve" @@ -20651,7 +20778,7 @@ msgstr "偏爱为长曲线的一部分的连接" #: ../src/ui/dialog/pixelartdialog.cpp:204 msgid "_Islands (weight):" -msgstr "岛(权重)(_I):" +msgstr "孤岛(权重)(_I):" #: ../src/ui/dialog/pixelartdialog.cpp:207 msgid "Avoid single disconnected pixels" @@ -20663,7 +20790,7 @@ msgstr "恒定票值" #: ../src/ui/dialog/pixelartdialog.cpp:219 msgid "Sparse pixels (window _radius):" -msgstr "稀疏像素(窗口半径)(_R):" +msgstr "稀疏像素(窗口半径)(_R):" #: ../src/ui/dialog/pixelartdialog.cpp:228 msgid "The radius of the window analyzed" @@ -20671,7 +20798,7 @@ msgstr "分析的窗口的半径" #: ../src/ui/dialog/pixelartdialog.cpp:229 msgid "Sparse pixels (_multiplier):" -msgstr "稀疏像素(倍数)(_M):" +msgstr "稀疏像素(倍数)(_M):" #: ../src/ui/dialog/pixelartdialog.cpp:240 msgid "Favors connections that are part of foreground color" @@ -20733,9 +20860,9 @@ msgid "" "\n" "Continue the procedure (without saving)?" msgstr "" -"图像尺寸太大。该过程可能会需要一些时间并且最好在继续处理前先保存你的文档。\n" +"图像尺寸太大。该过程可能会需要一些时间并且最好在继续处理前先保存您的文档。\n" "\n" -"继续处理动作吗 (不保存)?" +"继续处理动作吗(不保存)?" #: ../src/ui/dialog/pixelartdialog.cpp:499 msgid "Trace pixel art" @@ -20917,11 +21044,11 @@ msgstr "完成,未找到可疑项" #: ../src/ui/dialog/spellcheck.cpp:578 #, c-format msgid "Not in dictionary (%s): %s" -msgstr "不在词典中(%s):%s" +msgstr "不在词典中(%s):%s" #: ../src/ui/dialog/spellcheck.cpp:727 msgid "Checking..." -msgstr "正在检查…" +msgstr "正在检查..." #: ../src/ui/dialog/spellcheck.cpp:796 msgid "Fix spelling" @@ -21001,7 +21128,7 @@ msgstr "丢失的字型:" #: ../src/ui/dialog/svg-fonts-dialog.cpp:697 msgid "From selection..." -msgstr "从选择中…" +msgstr "从选择中..." #: ../src/ui/dialog/svg-fonts-dialog.cpp:710 msgid "Glyph name" @@ -21017,7 +21144,7 @@ msgstr "添加字型" #: ../src/ui/dialog/svg-fonts-dialog.cpp:721 msgid "Get curves from selection..." -msgstr "从选区中获得曲线…" +msgstr "从选区中获得曲线..." #: ../src/ui/dialog/svg-fonts-dialog.cpp:770 msgid "Add kerning pair" @@ -21107,7 +21234,7 @@ msgstr "设置轮廓" #: ../src/ui/dialog/swatches.cpp:286 msgid "Edit..." -msgstr "编辑…" +msgstr "编辑..." #: ../src/ui/dialog/swatches.cpp:298 msgid "Convert" @@ -21116,7 +21243,7 @@ msgstr "转换" #: ../src/ui/dialog/swatches.cpp:542 #, c-format msgid "Palettes directory (%s) is unavailable." -msgstr "调色板目录 (%s)不可用." +msgstr "调色板目录(%s)不可用。" #. ******************* Symbol Sets ************************ #: ../src/ui/dialog/symbols.cpp:135 @@ -21160,28 +21287,28 @@ msgstr "通过放大使符号更大。" msgid "Unnamed Symbols" msgstr "未命名符号" -#: ../src/ui/dialog/tags.cpp:274 ../src/ui/dialog/tags.cpp:573 -#: ../src/ui/dialog/tags.cpp:687 +#: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 +#: ../src/ui/dialog/tags.cpp:683 msgid "Remove from selection set" msgstr "从选择集合中移除" -#: ../src/ui/dialog/tags.cpp:431 +#: ../src/ui/dialog/tags.cpp:427 msgid "Items" msgstr "条目" -#: ../src/ui/dialog/tags.cpp:670 +#: ../src/ui/dialog/tags.cpp:666 msgid "Add selection to set" msgstr "添加选择内容到集合" -#: ../src/ui/dialog/tags.cpp:828 +#: ../src/ui/dialog/tags.cpp:824 msgid "Moved sets" msgstr "移动的集合" -#: ../src/ui/dialog/tags.cpp:998 +#: ../src/ui/dialog/tags.cpp:994 msgid "Add a new selection set" msgstr "添加一个新的选择集合" -#: ../src/ui/dialog/tags.cpp:1007 +#: ../src/ui/dialog/tags.cpp:1003 msgid "Remove Item/Set" msgstr "移除项目/集合" @@ -21222,37 +21349,37 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/() “東国三力今,書鷹酬鬱愛袋;永。”" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1339 -#: ../src/widgets/text-toolbar.cpp:1340 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1432 +#: ../src/widgets/text-toolbar.cpp:1433 msgid "Align left" msgstr "左对齐" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1347 -#: ../src/widgets/text-toolbar.cpp:1348 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1440 +#: ../src/widgets/text-toolbar.cpp:1441 msgid "Align center" msgstr "中心对齐" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1355 -#: ../src/widgets/text-toolbar.cpp:1356 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1448 +#: ../src/widgets/text-toolbar.cpp:1449 msgid "Align right" msgstr "右对齐" -#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1364 +#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1457 msgid "Justify (only flowed text)" -msgstr "对齐(仅浮动文本)" +msgstr "对齐(仅浮动文本)" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1399 +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1492 msgid "Horizontal text" msgstr "水平文字" -#: ../src/ui/dialog/text-edit.cpp:110 ../src/widgets/text-toolbar.cpp:1406 +#: ../src/ui/dialog/text-edit.cpp:110 msgid "Vertical text" msgstr "垂直文字" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -msgid "Spacing between lines (percent of font size)" -msgstr "行距(字体大小的百分比)" +msgid "Spacing between baselines (percent of font size)" +msgstr "行距(字号的百分比)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -21315,7 +21442,7 @@ msgstr "使用 J. Canny 的最优边缘检测算法临摹轮廓" #: ../src/ui/dialog/tracedialog.cpp:556 msgid "Brightness cutoff for adjacent pixels (determines edge thickness)" -msgstr "邻近像素亮度截断(决定边缘厚度)" +msgstr "邻近像素亮度截断(决定边缘厚度)" #: ../src/ui/dialog/tracedialog.cpp:559 msgid "T_hreshold:" @@ -21402,7 +21529,7 @@ msgstr "堆叠扫描数(_K)" msgid "" "Stack scans on top of one another (no gaps) instead of tiling (usually with " "gaps)" -msgstr "用互相重叠的堆叠(没有间隙)代替水平平铺(常有间隙)" +msgstr "用互相重叠的堆叠(没有间隙)代替水平平铺(常有间隙)" #: ../src/ui/dialog/tracedialog.cpp:665 msgid "Remo_ve background" @@ -21411,7 +21538,7 @@ msgstr "删除背景(_V)" #. TRANSLATORS: "Layer" refers to one of the stacked paths in the multiscan #: ../src/ui/dialog/tracedialog.cpp:670 msgid "Remove bottom (background) layer when done" -msgstr "完成后清除最底层(背景)" +msgstr "完成后清除最底层(背景)" #: ../src/ui/dialog/tracedialog.cpp:675 msgid "Multiple scans: creates a group of paths" @@ -21486,7 +21613,7 @@ msgid "" "http://potrace.sourceforge.net" msgstr "" "Inkscape 位图边缘临摹\n" -"基于 Peter Seligner 编写的 Potrace,\n" +"基于 Peter Seligner 编写的 Potrace\n" "\n" "http://potrace.sourceforge.net" @@ -21502,7 +21629,7 @@ msgstr "SIOX 前景选择(_F)" #: ../src/ui/dialog/tracedialog.cpp:777 msgid "Cover the area you want to select as the foreground" -msgstr "覆盖你需要选择的区域作为前景" +msgstr "覆盖您需要选择的区域作为前景" #: ../src/ui/dialog/tracedialog.cpp:782 msgid "Live Preview" @@ -21523,164 +21650,164 @@ msgstr "不实际进行临摹而使用当前设置预览中间位图" msgid "Preview" msgstr "预览" -#: ../src/ui/dialog/transformation.cpp:70 -#: ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/dialog/transformation.cpp:69 +#: ../src/ui/dialog/transformation.cpp:79 msgid "_Horizontal:" msgstr "水平(_H):" -#: ../src/ui/dialog/transformation.cpp:70 +#: ../src/ui/dialog/transformation.cpp:69 msgid "Horizontal displacement (relative) or position (absolute)" -msgstr "水平位移(相对)或者位置(绝对)" +msgstr "水平位移(相对)或者位置(绝对)" -#: ../src/ui/dialog/transformation.cpp:72 -#: ../src/ui/dialog/transformation.cpp:82 +#: ../src/ui/dialog/transformation.cpp:71 +#: ../src/ui/dialog/transformation.cpp:81 msgid "_Vertical:" msgstr "垂直(_V):" -#: ../src/ui/dialog/transformation.cpp:72 +#: ../src/ui/dialog/transformation.cpp:71 msgid "Vertical displacement (relative) or position (absolute)" -msgstr "垂直位移(相对)或者位置(绝对)" +msgstr "垂直位移(相对)或者位置(绝对)" -#: ../src/ui/dialog/transformation.cpp:74 +#: ../src/ui/dialog/transformation.cpp:73 msgid "Horizontal size (absolute or percentage of current)" -msgstr "水平尺寸(绝对或相对于当前的百分比)" +msgstr "水平尺寸(绝对或相对于当前的百分比)" -#: ../src/ui/dialog/transformation.cpp:76 +#: ../src/ui/dialog/transformation.cpp:75 msgid "Vertical size (absolute or percentage of current)" -msgstr "垂直尺寸(绝对或相对于当前的百分比)" +msgstr "垂直尺寸(绝对或相对于当前的百分比)" -#: ../src/ui/dialog/transformation.cpp:78 +#: ../src/ui/dialog/transformation.cpp:77 msgid "A_ngle:" msgstr "角度(_N):" -#: ../src/ui/dialog/transformation.cpp:78 -#: ../src/ui/dialog/transformation.cpp:1103 +#: ../src/ui/dialog/transformation.cpp:77 +#: ../src/ui/dialog/transformation.cpp:1102 msgid "Rotation angle (positive = counterclockwise)" -msgstr "旋转角度(正值=逆时针)" +msgstr "旋转角度(正值=逆时针)" -#: ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/dialog/transformation.cpp:79 msgid "" "Horizontal skew angle (positive = counterclockwise), or absolute " "displacement, or percentage displacement" -msgstr "水平错切角度(正值=逆时针),或绝对位移,或百分比位移" +msgstr "水平错切角度(正值=逆时针),或绝对位移,或百分比位移" -#: ../src/ui/dialog/transformation.cpp:82 +#: ../src/ui/dialog/transformation.cpp:81 msgid "" "Vertical skew angle (positive = counterclockwise), or absolute displacement, " "or percentage displacement" -msgstr "垂直错切角度(正值=逆时针),或绝对位移,或百分比位移" +msgstr "垂直错切角度(正值=逆时针),或绝对位移,或百分比位移" -#: ../src/ui/dialog/transformation.cpp:85 +#: ../src/ui/dialog/transformation.cpp:84 msgid "Transformation matrix element A" msgstr "变换矩阵元素 A" -#: ../src/ui/dialog/transformation.cpp:86 +#: ../src/ui/dialog/transformation.cpp:85 msgid "Transformation matrix element B" msgstr "变换矩阵元素 B" -#: ../src/ui/dialog/transformation.cpp:87 +#: ../src/ui/dialog/transformation.cpp:86 msgid "Transformation matrix element C" msgstr "变换矩阵元素 C" -#: ../src/ui/dialog/transformation.cpp:88 +#: ../src/ui/dialog/transformation.cpp:87 msgid "Transformation matrix element D" msgstr "变换矩阵元素 D" -#: ../src/ui/dialog/transformation.cpp:89 +#: ../src/ui/dialog/transformation.cpp:88 msgid "Transformation matrix element E" msgstr "变换矩阵元素 E" -#: ../src/ui/dialog/transformation.cpp:90 +#: ../src/ui/dialog/transformation.cpp:89 msgid "Transformation matrix element F" msgstr "变换矩阵元素 F" -#: ../src/ui/dialog/transformation.cpp:95 +#: ../src/ui/dialog/transformation.cpp:94 msgid "Rela_tive move" msgstr "相对移动(_T)" -#: ../src/ui/dialog/transformation.cpp:95 +#: ../src/ui/dialog/transformation.cpp:94 msgid "" "Add the specified relative displacement to the current position; otherwise, " "edit the current absolute position directly" msgstr "给当前位置添加指定的相对位移;否则直接编辑当前绝对位置" -#: ../src/ui/dialog/transformation.cpp:96 +#: ../src/ui/dialog/transformation.cpp:95 msgid "_Scale proportionally" -msgstr "等比例缩放(_S):" +msgstr "等比例缩放(_S)" -#: ../src/ui/dialog/transformation.cpp:96 +#: ../src/ui/dialog/transformation.cpp:95 msgid "Preserve the width/height ratio of the scaled objects" msgstr "保持缩放对象的宽高比" -#: ../src/ui/dialog/transformation.cpp:97 +#: ../src/ui/dialog/transformation.cpp:96 msgid "Apply to each _object separately" msgstr "单独应用到每一个对象(_O)" -#: ../src/ui/dialog/transformation.cpp:97 +#: ../src/ui/dialog/transformation.cpp:96 msgid "" "Apply the scale/rotate/skew to each selected object separately; otherwise, " "transform the selection as a whole" msgstr "分开应用缩放/旋转/错切到每一个已选对象;否则, 选择作为整体变换" -#: ../src/ui/dialog/transformation.cpp:98 +#: ../src/ui/dialog/transformation.cpp:97 msgid "Edit c_urrent matrix" msgstr "编辑当前矩阵(_U)" -#: ../src/ui/dialog/transformation.cpp:98 +#: ../src/ui/dialog/transformation.cpp:97 msgid "" "Edit the current transform= matrix; otherwise, post-multiply transform= by " "this matrix" msgstr "编辑当前 transform= 矩阵;否则,右乘此 transform= 矩阵" -#: ../src/ui/dialog/transformation.cpp:111 +#: ../src/ui/dialog/transformation.cpp:110 msgid "_Scale" msgstr "缩放(_S)" -#: ../src/ui/dialog/transformation.cpp:114 +#: ../src/ui/dialog/transformation.cpp:113 msgid "_Rotate" msgstr "旋转(_R)" -#: ../src/ui/dialog/transformation.cpp:117 +#: ../src/ui/dialog/transformation.cpp:116 msgid "Ske_w" msgstr "错切(_W)" -#: ../src/ui/dialog/transformation.cpp:120 +#: ../src/ui/dialog/transformation.cpp:119 msgid "Matri_x" msgstr "矩阵(_X)" -#: ../src/ui/dialog/transformation.cpp:144 +#: ../src/ui/dialog/transformation.cpp:143 msgid "Reset the values on the current tab to defaults" msgstr "当前选项页的值恢复默认" -#: ../src/ui/dialog/transformation.cpp:151 +#: ../src/ui/dialog/transformation.cpp:150 msgid "Apply transformation to selection" msgstr "应用变换到已选对象" -#: ../src/ui/dialog/transformation.cpp:327 +#: ../src/ui/dialog/transformation.cpp:326 msgid "Rotate in a counterclockwise direction" msgstr "按逆时针方向旋转" -#: ../src/ui/dialog/transformation.cpp:333 +#: ../src/ui/dialog/transformation.cpp:332 msgid "Rotate in a clockwise direction" msgstr "按顺时针方向旋转" -#: ../src/ui/dialog/transformation.cpp:906 -#: ../src/ui/dialog/transformation.cpp:917 -#: ../src/ui/dialog/transformation.cpp:931 -#: ../src/ui/dialog/transformation.cpp:950 -#: ../src/ui/dialog/transformation.cpp:961 -#: ../src/ui/dialog/transformation.cpp:971 -#: ../src/ui/dialog/transformation.cpp:995 +#: ../src/ui/dialog/transformation.cpp:905 +#: ../src/ui/dialog/transformation.cpp:916 +#: ../src/ui/dialog/transformation.cpp:930 +#: ../src/ui/dialog/transformation.cpp:949 +#: ../src/ui/dialog/transformation.cpp:960 +#: ../src/ui/dialog/transformation.cpp:970 +#: ../src/ui/dialog/transformation.cpp:994 msgid "Transform matrix is singular, not used." msgstr "变换矩阵是奇异的,未被使用。" -#: ../src/ui/dialog/transformation.cpp:1011 +#: ../src/ui/dialog/transformation.cpp:1010 msgid "Edit transformation matrix" msgstr "编辑变换矩阵" -#: ../src/ui/dialog/transformation.cpp:1110 +#: ../src/ui/dialog/transformation.cpp:1109 msgid "Rotation angle (positive = clockwise)" -msgstr "旋转角度(正值=顺时针)" +msgstr "旋转角度(正值=顺时针)" #: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:126 msgid "New element node" @@ -21761,7 +21888,7 @@ msgstr "拖动 XML 子树" #: ../src/ui/dialog/xml-tree.cpp:876 msgid "New element node..." -msgstr "新元素节点…" +msgstr "新元素节点..." #: ../src/ui/dialog/xml-tree.cpp:914 msgid "Cancel" @@ -21783,68 +21910,68 @@ msgstr "删除节点" msgid "Change attribute" msgstr "改变属性" -#: ../src/ui/interface.cpp:748 +#: ../src/ui/interface.cpp:751 msgctxt "Interface setup" msgid "Default" msgstr "默认" -#: ../src/ui/interface.cpp:748 +#: ../src/ui/interface.cpp:751 msgid "Default interface setup" msgstr "默认的界面设置" -#: ../src/ui/interface.cpp:749 +#: ../src/ui/interface.cpp:752 msgctxt "Interface setup" msgid "Custom" msgstr "自定义" -#: ../src/ui/interface.cpp:749 +#: ../src/ui/interface.cpp:752 msgid "Setup for custom task" msgstr "自定义任务设置" -#: ../src/ui/interface.cpp:750 +#: ../src/ui/interface.cpp:753 msgctxt "Interface setup" msgid "Wide" msgstr "宽" -#: ../src/ui/interface.cpp:750 +#: ../src/ui/interface.cpp:753 msgid "Setup for widescreen work" msgstr "宽屏工作模式" -#: ../src/ui/interface.cpp:862 +#: ../src/ui/interface.cpp:863 #, c-format msgid "Verb \"%s\" Unknown" msgstr "动词“%s”未知" -#: ../src/ui/interface.cpp:897 +#: ../src/ui/interface.cpp:898 msgid "Open _Recent" -msgstr "打开最近文件(_R)" +msgstr "最近文档(_R)" -#: ../src/ui/interface.cpp:1005 ../src/ui/interface.cpp:1091 -#: ../src/ui/interface.cpp:1194 ../src/ui/widget/selected-style.cpp:544 +#: ../src/ui/interface.cpp:1006 ../src/ui/interface.cpp:1092 +#: ../src/ui/interface.cpp:1195 ../src/ui/widget/selected-style.cpp:544 msgid "Drop color" msgstr "放置颜色" -#: ../src/ui/interface.cpp:1044 ../src/ui/interface.cpp:1154 +#: ../src/ui/interface.cpp:1045 ../src/ui/interface.cpp:1155 msgid "Drop color on gradient" msgstr "将颜色放置到渐变上" -#: ../src/ui/interface.cpp:1207 +#: ../src/ui/interface.cpp:1208 msgid "Could not parse SVG data" msgstr "不能解析 SVG 数据" -#: ../src/ui/interface.cpp:1246 +#: ../src/ui/interface.cpp:1247 msgid "Drop SVG" msgstr "丢弃 SVG" -#: ../src/ui/interface.cpp:1259 +#: ../src/ui/interface.cpp:1260 msgid "Drop Symbol" msgstr "丢弃符号" -#: ../src/ui/interface.cpp:1290 +#: ../src/ui/interface.cpp:1291 msgid "Drop bitmap image" msgstr "丢弃位图图像" -#: ../src/ui/interface.cpp:1382 +#: ../src/ui/interface.cpp:1383 #, c-format msgid "" "A file named \"%s\" already exists. Do " @@ -21856,168 +21983,168 @@ msgstr "" "\n" "已存在文件“%s”。替换将覆盖其内容。" -#: ../src/ui/interface.cpp:1389 ../share/extensions/web-set-att.inx.h:21 +#: ../src/ui/interface.cpp:1390 ../share/extensions/web-set-att.inx.h:21 #: ../share/extensions/web-transmit-att.inx.h:19 msgid "Replace" msgstr "替换" -#: ../src/ui/interface.cpp:1460 +#: ../src/ui/interface.cpp:1461 msgid "Go to parent" msgstr "转至父级" #. TRANSLATORS: #%1 is the id of the group e.g. , not a number. -#: ../src/ui/interface.cpp:1501 +#: ../src/ui/interface.cpp:1502 msgid "Enter group #%1" msgstr "输入组号 #%1" #. Item dialog -#: ../src/ui/interface.cpp:1637 ../src/verbs.cpp:2901 +#: ../src/ui/interface.cpp:1638 ../src/verbs.cpp:2939 msgid "_Object Properties..." -msgstr "对象属性(_O)…" +msgstr "对象属性(_O)..." -#: ../src/ui/interface.cpp:1646 +#: ../src/ui/interface.cpp:1647 msgid "_Select This" msgstr "选择这个(_S)" -#: ../src/ui/interface.cpp:1657 +#: ../src/ui/interface.cpp:1658 msgid "Select Same" msgstr "选择相同扩展名的全部" #. Select same fill and stroke -#: ../src/ui/interface.cpp:1667 +#: ../src/ui/interface.cpp:1668 msgid "Fill and Stroke" -msgstr "填充和笔廓" +msgstr "填充和笔刷" #. Select same fill color -#: ../src/ui/interface.cpp:1674 +#: ../src/ui/interface.cpp:1675 msgid "Fill Color" msgstr "填充颜色" #. Select same stroke color -#: ../src/ui/interface.cpp:1681 +#: ../src/ui/interface.cpp:1682 msgid "Stroke Color" -msgstr "笔廓颜色" +msgstr "笔刷颜色" #. Select same stroke style -#: ../src/ui/interface.cpp:1688 +#: ../src/ui/interface.cpp:1689 msgid "Stroke Style" -msgstr "笔廓样式" +msgstr "笔刷样式" #. Select same stroke style -#: ../src/ui/interface.cpp:1695 +#: ../src/ui/interface.cpp:1696 msgid "Object type" msgstr "对象类型" #. Move to layer -#: ../src/ui/interface.cpp:1702 +#: ../src/ui/interface.cpp:1703 msgid "_Move to layer ..." -msgstr "移到层(_M)…" +msgstr "移到层(_M)..." #. Create link -#: ../src/ui/interface.cpp:1712 +#: ../src/ui/interface.cpp:1713 msgid "Create _Link" msgstr "创建链接(_L)" #. Release mask -#: ../src/ui/interface.cpp:1746 +#: ../src/ui/interface.cpp:1747 msgid "Release Mask" msgstr "释放蒙版" #. SSet Clip Group -#: ../src/ui/interface.cpp:1757 +#: ../src/ui/interface.cpp:1758 msgid "Create Clip G_roup" msgstr "创建剪裁组(_R)" #. Set Clip -#: ../src/ui/interface.cpp:1764 +#: ../src/ui/interface.cpp:1765 msgid "Set Cl_ip" msgstr "设置剪裁(_I)" #. Release Clip -#: ../src/ui/interface.cpp:1775 +#: ../src/ui/interface.cpp:1776 msgid "Release C_lip" msgstr "释放剪裁(_L)" #. Group -#: ../src/ui/interface.cpp:1786 ../src/verbs.cpp:2534 +#: ../src/ui/interface.cpp:1787 ../src/verbs.cpp:2562 msgid "_Group" msgstr "群组(_G)" -#: ../src/ui/interface.cpp:1857 +#: ../src/ui/interface.cpp:1858 msgid "Create link" msgstr "创建链接" #. Ungroup -#: ../src/ui/interface.cpp:1892 ../src/verbs.cpp:2536 +#: ../src/ui/interface.cpp:1893 ../src/verbs.cpp:2564 msgid "_Ungroup" msgstr "解除群组(_U)" #. Link dialog -#: ../src/ui/interface.cpp:1916 +#: ../src/ui/interface.cpp:1917 msgid "Link _Properties..." -msgstr "链接属性(_P)…" +msgstr "链接属性(_P)..." #. Select item -#: ../src/ui/interface.cpp:1922 +#: ../src/ui/interface.cpp:1923 msgid "_Follow Link" msgstr "跟随链接(_F)" #. Reset transformations -#: ../src/ui/interface.cpp:1928 +#: ../src/ui/interface.cpp:1929 msgid "_Remove Link" msgstr "去除链接(_R)" -#: ../src/ui/interface.cpp:1959 +#: ../src/ui/interface.cpp:1960 msgid "Remove link" msgstr "移除链接" #. Image properties -#: ../src/ui/interface.cpp:1969 +#: ../src/ui/interface.cpp:1970 msgid "Image _Properties..." -msgstr "图像属性(_P)…" +msgstr "图像属性(_P)..." #. Edit externally -#: ../src/ui/interface.cpp:1975 +#: ../src/ui/interface.cpp:1976 msgid "Edit Externally..." -msgstr "外部编辑…" +msgstr "外部编辑..." #. Trace Bitmap #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/ui/interface.cpp:1984 ../src/verbs.cpp:2597 +#: ../src/ui/interface.cpp:1985 ../src/verbs.cpp:2627 msgid "_Trace Bitmap..." -msgstr "临摹位图轮廓(_T)…" +msgstr "临摹位图轮廓(_T)..." #. Trace Pixel Art -#: ../src/ui/interface.cpp:1993 +#: ../src/ui/interface.cpp:1994 msgid "Trace Pixel Art" msgstr "临摹像素画" -#: ../src/ui/interface.cpp:2003 +#: ../src/ui/interface.cpp:2004 msgctxt "Context menu" msgid "Embed Image" msgstr "嵌入图像" -#: ../src/ui/interface.cpp:2014 +#: ../src/ui/interface.cpp:2015 msgctxt "Context menu" msgid "Extract Image..." -msgstr "提取图像…" +msgstr "提取图像..." #. Item dialog #. Fill and Stroke dialog -#: ../src/ui/interface.cpp:2158 ../src/ui/interface.cpp:2178 -#: ../src/verbs.cpp:2864 +#: ../src/ui/interface.cpp:2159 ../src/ui/interface.cpp:2179 +#: ../src/verbs.cpp:2902 msgid "_Fill and Stroke..." -msgstr "填充和笔廓(_F)…" +msgstr "填充和笔刷(_F)..." #. Edit Text dialog -#: ../src/ui/interface.cpp:2184 ../src/verbs.cpp:2883 +#: ../src/ui/interface.cpp:2185 ../src/verbs.cpp:2921 msgid "_Text and Font..." -msgstr "文字和字体(_T)…" +msgstr "文字和字体(_T)..." #. Spellcheck dialog -#: ../src/ui/interface.cpp:2190 ../src/verbs.cpp:2891 +#: ../src/ui/interface.cpp:2191 ../src/verbs.cpp:2929 msgid "Check Spellin_g..." -msgstr "检查拼写(_G)…" +msgstr "检查拼写(_G)..." #: ../src/ui/object-edit.cpp:450 msgid "" @@ -22099,7 +22226,7 @@ msgid "" "rays radial (no skew); with Shift to round; with Alt to " "randomize" msgstr "" -"调节星形的基准半径; 按住 Ctrl 保持星形线半径(没有歪斜);按住 " +"调节星形的基准半径; 按住 Ctrl 保持星形线半径(没有歪斜);按住 " "Shift 舍入;按住 Alt 随机化" #: ../src/ui/object-edit.cpp:1345 @@ -22359,7 +22486,7 @@ msgctxt "Path handle tip" msgid "" "BSpline node handle: Shift to drag, double click to reset (%s). %g " "power" -msgstr "B 样条节点控制柄:Shift 以拖动,双击以重置(%s)。%g 力量" +msgstr "B 样条节点控制柄:Shift 以拖动,双击以重置(%s)。%g 力量" #: ../src/ui/tool/node.cpp:574 #, c-format @@ -22396,7 +22523,7 @@ msgstr "Alt:定型节点" #, c-format msgctxt "Path node tip" msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" -msgstr "%s:拖动塑造路径形状(更多:Shift、Ctrl、Alt)" +msgstr "%s:拖动塑造路径形状(更多:Shift、Ctrl、Alt)" #: ../src/ui/tool/node.cpp:1451 #, c-format @@ -22404,7 +22531,7 @@ msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " "power" -msgstr "B 样条节点:拖动塑造路径形状(更多:Shift、Ctrl、Alt)。%g 力量" +msgstr "B 样条节点:拖动塑造路径形状(更多:Shift、Ctrl、Alt)。%g 力量" #: ../src/ui/tool/node.cpp:1454 #, c-format @@ -22413,8 +22540,7 @@ msgid "" "%s: drag to shape the path, click to toggle scale/rotation handles " "(more: Shift, Ctrl, Alt)" msgstr "" -"%s:拖动塑造路径形状,单击切换缩放/旋转控制柄(更多:Shift、Ctrl、" -"Alt)" +"%s:拖动塑造路径形状,单击切换缩放/旋转控制柄(更多:Shift、Ctrl、Alt)" #: ../src/ui/tool/node.cpp:1458 #, c-format @@ -22423,7 +22549,7 @@ msgid "" "%s: drag to shape the path, click to select only this node (more: " "Shift, Ctrl, Alt)" msgstr "" -"%s:拖动改变路径形状,单击仅选择这个节点(更多:Shift、Ctrl、Alt)" +"%s:拖动改变路径形状,单击仅选择这个节点(更多:Shift、Ctrl、Alt)" #: ../src/ui/tool/node.cpp:1461 #, c-format @@ -22432,8 +22558,8 @@ msgid "" "BSpline node: drag to shape the path, click to select only this node " "(more: Shift, Ctrl, Alt). %g power" msgstr "" -"B 样条节点:拖动塑造路径形状,单击仅选择此节点(更多:Shift、Ctrl、" -"Alt)。%g 力量" +"B 样条节点:拖动塑造路径形状,单击仅选择此节点(更多:Shift、Ctrl、" +"Alt)。%g 力量" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -22571,7 +22697,7 @@ msgstr "Ctrl:吸附增量为 %f° 的角度" msgctxt "Transform handle tip" msgid "" "Skew handle: drag to skew (shear) selection about the opposite handle" -msgstr "扭转控制柄:拖动以根据相对控制柄扭曲(切变)选中对象" +msgstr "扭转控制柄:拖动以根据相对控制柄扭曲(切变)选中对象" #: ../src/ui/tool/transform-handle-set.cpp:604 #, c-format @@ -22590,27 +22716,27 @@ msgctxt "Transform handle tip" msgid "Rotation center: drag to change the origin of transforms" msgstr "旋转中心:拖动以修改变换的起始点" -#: ../src/ui/tools-switch.cpp:95 +#: ../src/ui/tools-switch.cpp:101 msgid "" "Click to Select and Transform objects, Drag to select many " "objects." msgstr "单击以选择并变换对象,拖动以选择多个对象。" -#: ../src/ui/tools-switch.cpp:96 +#: ../src/ui/tools-switch.cpp:102 msgid "Modify selected path points (nodes) directly." -msgstr "直接修改选中路径点(节点)。" +msgstr "直接修改选中路径点(节点)。" -#: ../src/ui/tools-switch.cpp:97 +#: ../src/ui/tools-switch.cpp:103 msgid "To tweak a path by pushing, select it and drag over it." msgstr "单击,选中并拖动以调整路径。" -#: ../src/ui/tools-switch.cpp:98 +#: ../src/ui/tools-switch.cpp:104 msgid "" "Drag, click or click and scroll to spray the selected " "objects." msgstr "拖动单击单击并滚动以喷涂选中对象。" -#: ../src/ui/tools-switch.cpp:99 +#: ../src/ui/tools-switch.cpp:105 msgid "" "Drag to create a rectangle. Drag controls to round corners and " "resize. Click to select." @@ -22618,15 +22744,15 @@ msgstr "" "拖动以创建矩形。拖动控制组件以圆整边角或改变尺寸。单击以" "选择。" -#: ../src/ui/tools-switch.cpp:100 +#: ../src/ui/tools-switch.cpp:106 msgid "" "Drag to create a 3D box. Drag controls to resize in " "perspective. Click to select (with Ctrl+Alt for single faces)." msgstr "" "拖动以创建 3D 盒子。拖动控制组件以改变透视大小。单击以选" -"择(Ctrl+Alt 以选择单个面)。" +"择(Ctrl+Alt 以选择单个面)。" -#: ../src/ui/tools-switch.cpp:101 +#: ../src/ui/tools-switch.cpp:107 msgid "" "Drag to create an ellipse. Drag controls to make an arc or " "segment. Click to select." @@ -22634,21 +22760,21 @@ msgstr "" "拖动以创建椭圆。拖动控制组件以创建圆弧或线段。单击以选" "择。" -#: ../src/ui/tools-switch.cpp:102 +#: ../src/ui/tools-switch.cpp:108 msgid "" "Drag to create a star. Drag controls to edit the star shape. " "Click to select." msgstr "" "拖动以创建星形。拖动控制组件以编辑星形形状。单击以选择。" -#: ../src/ui/tools-switch.cpp:103 +#: ../src/ui/tools-switch.cpp:109 msgid "" "Drag to create a spiral. Drag controls to edit the spiral " "shape. Click to select." msgstr "" "拖动以创建螺旋。拖动控制组件以编辑螺旋形状。单击以选择。" -#: ../src/ui/tools-switch.cpp:104 +#: ../src/ui/tools-switch.cpp:110 msgid "" "Drag to create a freehand line. Shift appends to selected " "path, Alt activates sketch mode." @@ -22656,24 +22782,24 @@ msgstr "" "拖动以创建手绘线。按住 Shift 以附加到选中路径,Alt 以激" "活草图模式。" -#: ../src/ui/tools-switch.cpp:105 +#: ../src/ui/tools-switch.cpp:111 msgid "" "Click or click and drag to start a path; with Shift to " "append to selected path. Ctrl+click to create single dots (straight " "line modes only)." msgstr "" "单击单击并拖动以开始绘制路径;按住 Shift 以附加到选中" -"路径。Ctrl+单击以创建单个点(仅直线模式)。" +"路径。Ctrl+单击以创建单个点(仅直线模式)。" -#: ../src/ui/tools-switch.cpp:106 +#: ../src/ui/tools-switch.cpp:112 msgid "" "Drag to draw a calligraphic stroke; with Ctrl to track a guide " "path. Arrow keys adjust width (left/right) and angle (up/down)." msgstr "" "拖动以绘制书法轮廓;Ctrl 以沿参考线绘制,使用方向键调整" -"宽度(左/右)和角度(上/下)。" +"宽度(左/右)和角度(上/下)。" -#: ../src/ui/tools-switch.cpp:107 ../src/ui/tools/text-tool.cpp:1583 +#: ../src/ui/tools-switch.cpp:113 ../src/ui/tools/text-tool.cpp:1583 msgid "" "Click to select or create text, drag to create flowed text; " "then type." @@ -22681,7 +22807,7 @@ msgstr "" "单击以选择或者创建文字,拖动以创建浮动文字;然后输入需要的文" "字。" -#: ../src/ui/tools-switch.cpp:108 +#: ../src/ui/tools-switch.cpp:114 msgid "" "Drag or double click to create a gradient on selected objects, " "drag handles to adjust gradients." @@ -22689,7 +22815,7 @@ msgstr "" "拖动双击以在选择的对象上创建渐变,拖动控制组件以调节渐" "变。" -#: ../src/ui/tools-switch.cpp:109 +#: ../src/ui/tools-switch.cpp:115 msgid "" "Drag or double click to create a mesh on selected objects, " "drag handles to adjust meshes." @@ -22697,43 +22823,43 @@ msgstr "" "拖动双击以在选择的对象上创建网孔,拖动控制点 以调节网" "孔。" -#: ../src/ui/tools-switch.cpp:110 +#: ../src/ui/tools-switch.cpp:116 msgid "" "Click or drag around an area to zoom in, Shift+click to " "zoom out." msgstr "单击在区域附近拖动以放大,Shift+单击 以缩小。" -#: ../src/ui/tools-switch.cpp:111 +#: ../src/ui/tools-switch.cpp:117 msgid "Drag to measure the dimensions of objects." msgstr "拖动以测量对象的尺寸。" -#: ../src/ui/tools-switch.cpp:112 ../src/ui/tools/dropper-tool.cpp:274 +#: ../src/ui/tools-switch.cpp:118 ../src/ui/tools/dropper-tool.cpp:274 msgid "" "Click to set fill, Shift+click to set stroke; drag to " "average color in area; with Alt to pick inverse color; Ctrl+C " "to copy the color under mouse to clipboard" msgstr "" -"单击以设置填充,Shift+单击以设置笔廓;拖动以平均区域里颜" +"单击以设置填充,Shift+单击以设置笔刷;拖动以平均区域里颜" "色;按住 Alt 拾取反色;按 Ctrl+C 以复制鼠标下的颜色到剪贴板" -#: ../src/ui/tools-switch.cpp:113 +#: ../src/ui/tools-switch.cpp:119 msgid "Click and drag between shapes to create a connector." msgstr "在两个形状之间单击并拖动以创建连接器。" -#: ../src/ui/tools-switch.cpp:114 +#: ../src/ui/tools-switch.cpp:121 msgid "" "Click to paint a bounded area, Shift+click to union the new " "fill with the current selection, Ctrl+click to change the clicked " "object's fill and stroke to the current setting." msgstr "" "单击以填充一个被包围的区域,Shift+单击以联合当前选区和新的填充" -"内容,Ctrl+单击以使用当前设置替换单击对象的填充和笔廓设置。" +"内容,Ctrl+单击以使用当前设置替换单击对象的填充和笔刷设置。" -#: ../src/ui/tools-switch.cpp:115 +#: ../src/ui/tools-switch.cpp:123 msgid "Drag to erase." msgstr "拖动以擦除。" -#: ../src/ui/tools-switch.cpp:116 +#: ../src/ui/tools-switch.cpp:124 msgid "Choose a subtool from the toolbar" msgstr "从工具栏中选择一个子工具" @@ -22771,7 +22897,7 @@ msgstr "创建椭圆" #: ../src/ui/tools/box3d-tool.cpp:374 ../src/ui/tools/box3d-tool.cpp:381 #: ../src/ui/tools/box3d-tool.cpp:388 ../src/ui/tools/box3d-tool.cpp:395 msgid "Change perspective (angle of PLs)" -msgstr "更改透视(透视线角度)" +msgstr "更改透视(透视线角度)" #. status text #: ../src/ui/tools/box3d-tool.cpp:573 @@ -22836,12 +22962,12 @@ msgid "Select at least one non-connector object." msgstr "请选择 至少一个非连接器对象." #: ../src/ui/tools/connector-tool.cpp:1329 -#: ../src/widgets/connector-toolbar.cpp:310 +#: ../src/widgets/connector-toolbar.cpp:308 msgid "Make connectors avoid selected objects" msgstr "让连接器避开选中对象" #: ../src/ui/tools/connector-tool.cpp:1330 -#: ../src/widgets/connector-toolbar.cpp:320 +#: ../src/widgets/connector-toolbar.cpp:318 msgid "Make connectors ignore selected objects" msgstr "让连接器忽略选中对象" @@ -22860,7 +22986,7 @@ msgstr ",已平均为半径 %d" #: ../src/ui/tools/dropper-tool.cpp:272 msgid " under cursor" -msgstr "在光标下" +msgstr " 在光标下" #. message, to show in the statusbar #: ../src/ui/tools/dropper-tool.cpp:274 @@ -22871,13 +22997,13 @@ msgstr "松开鼠标 以设置颜色。" msgid "Set picked color" msgstr "设置拾取的颜色" -#: ../src/ui/tools/eraser-tool.cpp:427 +#: ../src/ui/tools/eraser-tool.cpp:436 msgid "Drawing an eraser stroke" -msgstr "正在 绘制 橡皮擦笔廓" +msgstr "正在 绘制 橡皮擦笔刷" -#: ../src/ui/tools/eraser-tool.cpp:753 +#: ../src/ui/tools/eraser-tool.cpp:797 msgid "Draw eraser stroke" -msgstr "绘制橡皮擦笔廓" +msgstr "绘制橡皮擦笔刷" #: ../src/ui/tools/flood-tool.cpp:90 msgid "Visible Colors" @@ -22923,7 +23049,7 @@ msgstr[0] "区域已填充,已创建带有 %d 个节点的路径。" #: ../src/ui/tools/flood-tool.cpp:730 ../src/ui/tools/flood-tool.cpp:1040 msgid "Area is not bounded, cannot fill." -msgstr "区域未封闭,无法填充。" +msgstr "区域未闭合,无法填充。" #: ../src/ui/tools/flood-tool.cpp:1045 msgid "" @@ -22943,27 +23069,27 @@ msgstr "为对象指定样式" #: ../src/ui/tools/flood-tool.cpp:1139 msgid "Draw over areas to add to fill, hold Alt for touch fill" -msgstr "在区域上拖动填充, 配合Alt触碰填充" +msgstr "在区域上拖动填充, 按住Alt可触碰填充" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:669 +#: ../src/ui/tools/freehand-base.cpp:674 msgid "Path is closed." -msgstr "路径已闭合." +msgstr "路径已闭合。" #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:684 +#: ../src/ui/tools/freehand-base.cpp:689 msgid "Closing path." -msgstr "关闭路径." +msgstr "关闭路径。" -#: ../src/ui/tools/freehand-base.cpp:823 +#: ../src/ui/tools/freehand-base.cpp:828 msgid "Draw path" msgstr "绘制路径" -#: ../src/ui/tools/freehand-base.cpp:976 +#: ../src/ui/tools/freehand-base.cpp:981 msgid "Creating single dot" msgstr "正在创建点" -#: ../src/ui/tools/freehand-base.cpp:977 +#: ../src/ui/tools/freehand-base.cpp:982 msgid "Create single dot" msgstr "创建单独的点" @@ -22996,7 +23122,7 @@ msgid "" "One handle merging %d stop (drag with Shift to separate) selected" msgid_plural "" "One handle merging %d stops (drag with Shift to separate) selected" -msgstr[0] "一个控制柄合并%d个分段点(按住Shift拖动分离)" +msgstr[0] "一个控制柄合并%d个分段点(按住Shift拖动分离)" #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) #: ../src/ui/tools/gradient-tool.cpp:138 @@ -23011,7 +23137,7 @@ msgstr[0] "已选择%d个渐变控制柄, 共%d个" msgid "No gradient handles selected out of %d on %d selected object" msgid_plural "" "No gradient handles selected out of %d on %d selected objects" -msgstr[0] "没有选择渐变控制柄(共%d个, 已选择%d个对象)" +msgstr[0] "没有选择渐变控制柄(共%d个, 已选择%d个对象)" #: ../src/ui/tools/gradient-tool.cpp:433 msgid "Simplify gradient" @@ -23025,21 +23151,21 @@ msgstr "创建缺省渐变" msgid "Draw around handles to select them" msgstr "在控制柄周围拖动来选择" -#: ../src/ui/tools/gradient-tool.cpp:692 +#: ../src/ui/tools/gradient-tool.cpp:690 msgid "Ctrl: snap gradient angle" msgstr "Ctrl:吸附渐变角度" -#: ../src/ui/tools/gradient-tool.cpp:693 +#: ../src/ui/tools/gradient-tool.cpp:691 msgid "Shift: draw gradient around the starting point" msgstr "Shift:在起点附近绘制渐变" -#: ../src/ui/tools/gradient-tool.cpp:947 ../src/ui/tools/mesh-tool.cpp:984 +#: ../src/ui/tools/gradient-tool.cpp:945 ../src/ui/tools/mesh-tool.cpp:977 #, c-format msgid "Gradient for %d object; with Ctrl to snap angle" msgid_plural "Gradient for %d objects; with Ctrl to snap angle" msgstr[0] "%d个对象渐变;按住 Ctrl 吸附角" -#: ../src/ui/tools/gradient-tool.cpp:951 ../src/ui/tools/mesh-tool.cpp:988 +#: ../src/ui/tools/gradient-tool.cpp:949 ../src/ui/tools/mesh-tool.cpp:981 msgid "Select objects on which to create gradient." msgstr "选择对象创建渐变。" @@ -23047,6 +23173,44 @@ msgstr "选择对象创建渐变。" msgid "Choose a construction tool from the toolbar." msgstr "从工具栏中选择一个构造工具。" +#. create the knots +#: ../src/ui/tools/measure-tool.cpp:349 +msgid "Measure start, Shift+Click for position dialog" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:355 +msgid "Measure end, Shift+Click for position dialog" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 +msgid "Measure" +msgstr "测量" + +#: ../src/ui/tools/measure-tool.cpp:752 +msgid "Base" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:761 +msgid "Add guides from measure tool" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:781 +msgid "Add Stored to measure tool" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:801 +msgid "Convert measure to items" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:839 +msgid "Add global measure line" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:1291 ../src/ui/tools/measure-tool.cpp:1293 +#, fuzzy, c-format +msgid "Crossing %u" +msgstr "交叉点符号" + #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 #, c-format @@ -23095,14 +23259,18 @@ msgstr "选取网格角颜色。" msgid "Create default mesh" msgstr "创建默认网格" -#: ../src/ui/tools/mesh-tool.cpp:709 +#: ../src/ui/tools/mesh-tool.cpp:713 msgid "FIXMECtrl: snap mesh angle" msgstr "FIXMECtrl:吸附网格角度" -#: ../src/ui/tools/mesh-tool.cpp:710 +#: ../src/ui/tools/mesh-tool.cpp:714 msgid "FIXMEShift: draw mesh around the starting point" msgstr "FIXMEShift:围绕开始点绘制网格" +#: ../src/ui/tools/mesh-tool.cpp:971 +msgid "Create mesh" +msgstr "" + #: ../src/ui/tools/node-tool.cpp:653 msgctxt "Node tool tip" msgid "" @@ -23125,7 +23293,7 @@ msgstr[0] "选中了 %u 个节点,共 %u 个。" #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click to edit only this object (more: Shift)" -msgstr "%s 拖动选择节点,单击仅编辑这个对象(更多: Shift)" +msgstr "%s 拖动选择节点,单击仅编辑这个对象(更多: Shift)" #: ../src/ui/tools/node-tool.cpp:699 #, c-format @@ -23146,7 +23314,7 @@ msgstr "拖动选择节点,单击清除选择" #: ../src/ui/tools/node-tool.cpp:716 msgctxt "Node tool tip" msgid "Drag to select objects to edit, click to edit this object (more: Shift)" -msgstr "拖动选择要编辑的对象,单击以编辑这个对象(更多: Shift)" +msgstr "拖动选择要编辑的对象,单击以编辑这个对象(更多: Shift)" #: ../src/ui/tools/node-tool.cpp:719 msgctxt "Node tool tip" @@ -23297,8 +23465,8 @@ msgid "" "Rectangle: %s × %s (constrained to ratio %d:%d); with Shift to draw around the starting point" msgstr "" -"矩形:%s × %s(约束到长宽比 %d:%d);按住 Shift 在起点附近" -"绘制" +"矩形:%s × %s(约束到长宽比 %d:%d);按住 Shift 在起点附近绘" +"制" #: ../src/ui/tools/rect-tool.cpp:441 #, c-format @@ -23306,8 +23474,8 @@ msgid "" "Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with " "Shift to draw around the starting point" msgstr "" -"矩形:%s × %s(约束到黄金分割比 1.618:1);按住 Shift 在起" -"点附近绘制" +"矩形:%s × %s(约束到黄金分割比 1.618:1);按住 Shift 在起点" +"附近绘制" #: ../src/ui/tools/rect-tool.cpp:443 #, c-format @@ -23315,8 +23483,8 @@ msgid "" "Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with " "Shift to draw around the starting point" msgstr "" -"矩形:%s × %s(约束到黄金分割比 1:1.618);按住 Shift 在起" -"点附近绘制" +"矩形:%s × %s(约束到黄金分割比 1:1.618);按住 Shift 在起点" +"附近绘制" #: ../src/ui/tools/rect-tool.cpp:447 #, c-format @@ -23331,11 +23499,11 @@ msgstr "" msgid "Create rectangle" msgstr "创建矩形" -#: ../src/ui/tools/select-tool.cpp:160 +#: ../src/ui/tools/select-tool.cpp:156 msgid "Click selection to toggle scale/rotation handles" msgstr "单击选区切换缩放/旋转控制柄" -#: ../src/ui/tools/select-tool.cpp:161 +#: ../src/ui/tools/select-tool.cpp:157 msgid "" "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " "or drag around objects to select." @@ -23343,35 +23511,35 @@ msgstr "" "未选择对象。单击、Shift+单击、Alt+滚动鼠标于对象顶部、或绕着对象拖动进行选" "择。" -#: ../src/ui/tools/select-tool.cpp:214 +#: ../src/ui/tools/select-tool.cpp:210 msgid "Move canceled." msgstr "移动已取消。" -#: ../src/ui/tools/select-tool.cpp:222 +#: ../src/ui/tools/select-tool.cpp:218 msgid "Selection canceled." msgstr "选择已取消。" -#: ../src/ui/tools/select-tool.cpp:644 +#: ../src/ui/tools/select-tool.cpp:638 msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" msgstr "在对象周围拖动以选择,松开 Alt 以切换到弹性选区选择模式" -#: ../src/ui/tools/select-tool.cpp:646 +#: ../src/ui/tools/select-tool.cpp:640 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" msgstr "在对象周围拖动以选择,按下 Alt 以切换到触碰摸式选择" -#: ../src/ui/tools/select-tool.cpp:939 +#: ../src/ui/tools/select-tool.cpp:921 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "Ctrl:在组内选择,拖动以水平/垂直移动" -#: ../src/ui/tools/select-tool.cpp:940 +#: ../src/ui/tools/select-tool.cpp:922 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "Shift:单击切换选择,拖动以进行弹性选择" -#: ../src/ui/tools/select-tool.cpp:941 +#: ../src/ui/tools/select-tool.cpp:923 msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" @@ -23379,7 +23547,7 @@ msgstr "" "Alt:单击为选择其下;滚动鼠标滑轮为循环选择;拖动为移动选择项或者按触" "碰选择" -#: ../src/ui/tools/select-tool.cpp:1149 +#: ../src/ui/tools/select-tool.cpp:1131 msgid "Selected object is not a group. Cannot enter." msgstr "选择的对象不在一个组。不能进入。" @@ -23401,50 +23569,50 @@ msgstr "螺旋:半径 %s,角度 %5g°;按住 Ctrl 吸附 msgid "Create spiral" msgstr "创建螺旋" -#: ../src/ui/tools/spray-tool.cpp:173 ../src/ui/tools/tweak-tool.cpp:157 +#: ../src/ui/tools/spray-tool.cpp:214 ../src/ui/tools/tweak-tool.cpp:157 #, c-format msgid "%i object selected" msgid_plural "%i objects selected" msgstr[0] "%i 个对象已选中" -#: ../src/ui/tools/spray-tool.cpp:175 ../src/ui/tools/tweak-tool.cpp:159 +#: ../src/ui/tools/spray-tool.cpp:216 ../src/ui/tools/tweak-tool.cpp:159 msgid "Nothing selected" msgstr "什么也没有选中。" -#: ../src/ui/tools/spray-tool.cpp:180 +#: ../src/ui/tools/spray-tool.cpp:221 #, c-format msgid "" "%s. Drag, click or click and scroll to spray copies of the initial " "selection." msgstr "%s。拖动、单击或单击并滚动来喷射初始选择的副本。" -#: ../src/ui/tools/spray-tool.cpp:183 +#: ../src/ui/tools/spray-tool.cpp:224 #, c-format msgid "" "%s. Drag, click or click and scroll to spray clones of the initial " "selection." msgstr "%s。拖动、单击或单击并滚动来喷射初始选择的克隆。" -#: ../src/ui/tools/spray-tool.cpp:186 +#: ../src/ui/tools/spray-tool.cpp:227 #, c-format msgid "" "%s. Drag, click or click and scroll to spray in a single path of the " "initial selection." msgstr "%s。拖动、单击或单击并滚动来喷射在初始选择的一个单一路径中。" -#: ../src/ui/tools/spray-tool.cpp:618 +#: ../src/ui/tools/spray-tool.cpp:1305 msgid "Nothing selected! Select objects to spray." msgstr "没有选择对象! 请选择对象然后喷绘。" -#: ../src/ui/tools/spray-tool.cpp:693 ../src/widgets/spray-toolbar.cpp:166 +#: ../src/ui/tools/spray-tool.cpp:1380 ../src/widgets/spray-toolbar.cpp:360 msgid "Spray with copies" msgstr "副本喷绘" -#: ../src/ui/tools/spray-tool.cpp:697 ../src/widgets/spray-toolbar.cpp:173 +#: ../src/ui/tools/spray-tool.cpp:1384 ../src/widgets/spray-toolbar.cpp:367 msgid "Spray with clones" msgstr "克隆喷绘" -#: ../src/ui/tools/spray-tool.cpp:701 +#: ../src/ui/tools/spray-tool.cpp:1388 msgid "Spray in single path" msgstr "单一路径喷绘" @@ -23491,11 +23659,11 @@ msgstr "插入宽字符" #: ../src/ui/tools/text-tool.cpp:501 #, c-format msgid "Unicode (Enter to finish): %s: %s" -msgstr "宽字符(回车结束):%s:%s" +msgstr "宽字符(回车结束):%s:%s" #: ../src/ui/tools/text-tool.cpp:503 ../src/ui/tools/text-tool.cpp:808 msgid "Unicode (Enter to finish): " -msgstr "宽字符(回车结束):" +msgstr "宽字符(回车结束):" #: ../src/ui/tools/text-tool.cpp:586 #, c-format @@ -23542,7 +23710,7 @@ msgstr "换行" #: ../src/ui/tools/text-tool.cpp:927 msgid "Backspace" -msgstr "回格" +msgstr "退格" #: ../src/ui/tools/text-tool.cpp:981 msgid "Kern to the left" @@ -23596,15 +23764,14 @@ msgid "" msgid_plural "" "Type or edit flowed text (%d characters%s); Enter to start new " "paragraph." -msgstr[0] "" -"输入或编辑流动文本(%d 个字符%s);按 Enter 键可开始新的段落。" +msgstr[0] "输入或编辑流动文本(%d 个字符%s);按 Enter 键可开始新的段落。" #: ../src/ui/tools/text-tool.cpp:1575 #, c-format msgid "Type or edit text (%d character%s); Enter to start new line." msgid_plural "" "Type or edit text (%d characters%s); Enter to start new line." -msgstr[0] "输入或编辑文本(%d 个字符%s);按 Enter 键可换行。" +msgstr[0] "输入或编辑文本(%d 个字符%s);按 Enter 键可换行。" #: ../src/ui/tools/text-tool.cpp:1685 msgid "Type text" @@ -23684,7 +23851,7 @@ msgstr "%s。拖动或单击增强模糊;配合 Shift 减弱。" #: ../src/ui/tools/tweak-tool.cpp:1191 msgid "Nothing selected! Select objects to tweak." -msgstr "没有选择对象!请选择对象然后扭曲(tweak)。" +msgstr "没有选择对象!请选择对象然后扭曲(tweak)。" #: ../src/ui/tools/tweak-tool.cpp:1225 msgid "Move tweak" @@ -23813,11 +23980,11 @@ msgstr "CMS" #: ../src/ui/widget/color-icc-selector.cpp:375 msgid "Fix" -msgstr "限定" +msgstr "修正" #: ../src/ui/widget/color-icc-selector.cpp:379 msgid "Fix RGB fallback to match icc-color() value." -msgstr "修复 RGB 回落匹配 icc-color() 值。" +msgstr "修正 RGB 回落匹配 icc-color() 值。" #. Label #: ../src/ui/widget/color-icc-selector.cpp:491 @@ -23835,7 +24002,7 @@ msgstr "_A:" #: ../src/ui/widget/color-wheel-selector.cpp:112 #: ../src/ui/widget/color-wheel-selector.cpp:142 msgid "Alpha (opacity)" -msgstr "Alpha(不透明度)" +msgstr "Alpha(不透明度)" #: ../src/ui/widget/color-notebook.cpp:182 msgid "Color Managed" @@ -23849,7 +24016,7 @@ msgstr "超出色域!" msgid "Too much ink!" msgstr "太多墨水!" -#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2733 +#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2765 msgid "Pick colors from image" msgstr "从图像中拾取颜色" @@ -24066,33 +24233,33 @@ msgstr "一般大小写。" #: ../src/ui/widget/font-variants.cpp:139 msgid "Small-caps (lowercase). OpenType table: 'smcp'" -msgstr "小型大写字母(对小写字使用)。OpenType 表:smcp" +msgstr "小型大写字母(对小写字使用)。OpenType 表:smcp" #: ../src/ui/widget/font-variants.cpp:140 msgid "" "All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" -msgstr "全部小型大写(大小写皆有)。OpenType 表:c2sc、smcp" +msgstr "全部小型大写(大小写皆有)。OpenType 表:c2sc、smcp" #: ../src/ui/widget/font-variants.cpp:141 msgid "Petite-caps (lowercase). OpenType table: 'pcap'" -msgstr "极小大写字母(对小写字使用)。OpenType 表:pcap" +msgstr "极小大写字母(对小写字使用)。OpenType 表:pcap" #: ../src/ui/widget/font-variants.cpp:142 msgid "" "All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" -msgstr "全部极小大写(大小写皆有)。OpenType 表:c2sc、pcap" +msgstr "全部极小大写(大小写皆有)。OpenType 表:c2sc、pcap" #: ../src/ui/widget/font-variants.cpp:143 msgid "" "Unicase (small caps for uppercase, normal for lowercase). OpenType table: " "'unic'" -msgstr "大小写等大(大写用小型大写,小写照常)。OpenType 表:unic" +msgstr "大小写等大(大写用小型大写,小写照常)。OpenType 表:unic" #: ../src/ui/widget/font-variants.cpp:144 msgid "" "Titling caps (lighter-weight uppercase for use in titles). OpenType table: " "'titl'" -msgstr "标题大写(供标题用的较细大写字母)。OpenType 表:titl" +msgstr "标题大写(供标题用的较细大写字母)。OpenType 表:titl" #. Numeric ------------------------------ #. Add tooltips @@ -24134,7 +24301,7 @@ msgstr "堆叠分数。OpenType 表:afrc" #: ../src/ui/widget/font-variants.cpp:189 msgid "Ordinals (raised 'th', etc.). OpenType table: 'ordn'" -msgstr "序数词(th 升起等)。OpenType 表:ordn" +msgstr "序数词(th 升起等)。OpenType 表:ordn" #: ../src/ui/widget/font-variants.cpp:190 msgid "Slashed zeros. OpenType table: 'zero'" @@ -24148,19 +24315,19 @@ msgstr "特性设置以 CSS 指定。不进行健全检查。" #: ../src/ui/widget/layer-selector.cpp:118 msgid "Toggle current layer visibility" -msgstr "切换当前层的可见状态" +msgstr "切换当前图层的可见状态" #: ../src/ui/widget/layer-selector.cpp:139 msgid "Lock or unlock current layer" -msgstr "锁定或解锁当前层" +msgstr "锁定或解锁当前图层" #: ../src/ui/widget/layer-selector.cpp:142 msgid "Current layer" -msgstr "当前层" +msgstr "当前图层" #: ../src/ui/widget/layer-selector.cpp:583 msgid "(root)" -msgstr "(根)" +msgstr "(根)" #: ../src/ui/widget/licensor.cpp:40 msgid "Proprietary" @@ -24168,7 +24335,7 @@ msgstr "专有" #: ../src/ui/widget/licensor.cpp:43 msgid "MetadataLicence|Other" -msgstr "其它" +msgstr "其他" #: ../src/ui/widget/licensor.cpp:72 msgid "Document license updated" @@ -24178,7 +24345,7 @@ msgstr "文档许可已更新" #: ../src/ui/widget/selected-style.cpp:1119 #: ../src/ui/widget/selected-style.cpp:1120 msgid "Opacity (%)" -msgstr "不透明度(%)" +msgstr "不透明度(%)" #: ../src/ui/widget/object-composite-settings.cpp:160 msgid "Change blur" @@ -24269,7 +24436,7 @@ msgstr "自定义尺寸" #: ../src/ui/widget/page-sizer.cpp:395 msgid "Resi_ze page to content..." -msgstr "缩放页面到内容(_Z)…" +msgstr "缩放页面到内容(_Z)..." #: ../src/ui/widget/page-sizer.cpp:447 msgid "_Resize page to drawing or selection" @@ -24288,7 +24455,7 @@ msgid "" "directly." msgstr "" "SVG 允许非一致缩放,但在 Inkscape 中我们只推荐使用一致缩放。要设置不一致的缩" -"放,直接设置视口(viewbox)。" +"放,直接设置视口(viewbox)。" #: ../src/ui/widget/page-sizer.cpp:483 msgid "_Viewbox..." @@ -24322,7 +24489,7 @@ msgstr "大小" #: ../src/ui/widget/panel.cpp:140 msgctxt "Swatches height" msgid "Tiny" -msgstr "细小" +msgstr "很小" #: ../src/ui/widget/panel.cpp:141 msgctxt "Swatches height" @@ -24342,7 +24509,7 @@ msgstr "大" #: ../src/ui/widget/panel.cpp:144 msgctxt "Swatches height" msgid "Huge" -msgstr "庞大" +msgstr "很大" #: ../src/ui/widget/panel.cpp:166 msgctxt "Swatches" @@ -24352,7 +24519,7 @@ msgstr "宽度" #: ../src/ui/widget/panel.cpp:170 msgctxt "Swatches width" msgid "Narrower" -msgstr "更窄" +msgstr "较窄" #: ../src/ui/widget/panel.cpp:171 msgctxt "Swatches width" @@ -24372,7 +24539,7 @@ msgstr "宽" #: ../src/ui/widget/panel.cpp:174 msgctxt "Swatches width" msgid "Wider" -msgstr "更宽" +msgstr "较宽" #: ../src/ui/widget/panel.cpp:204 msgctxt "Swatches" @@ -24402,7 +24569,7 @@ msgstr "折行" #: ../src/ui/widget/preferences-widget.cpp:799 msgid "_Browse..." -msgstr "浏览(_B)…" +msgstr "浏览(_B)..." #: ../src/ui/widget/preferences-widget.cpp:885 msgid "Select a bitmap editor" @@ -24463,12 +24630,12 @@ msgstr "O:" #: ../src/ui/widget/selected-style.cpp:178 msgid "N/A" -msgstr "不可用" +msgstr "N/A" #: ../src/ui/widget/selected-style.cpp:181 #: ../src/ui/widget/selected-style.cpp:1112 #: ../src/ui/widget/selected-style.cpp:1113 -#: ../src/widgets/gradient-toolbar.cpp:163 +#: ../src/widgets/gradient-toolbar.cpp:162 msgid "Nothing selected" msgstr "选区空" @@ -24492,7 +24659,7 @@ msgstr "无填充" #: ../src/ui/widget/style-swatch.cpp:321 msgctxt "Fill and stroke" msgid "No stroke" -msgstr "无笔廓" +msgstr "无笔刷" #: ../src/ui/widget/selected-style.cpp:192 #: ../src/ui/widget/style-swatch.cpp:300 ../src/widgets/paint-selector.cpp:231 @@ -24507,7 +24674,7 @@ msgstr "填充图案" #: ../src/ui/widget/selected-style.cpp:195 #: ../src/ui/widget/style-swatch.cpp:302 msgid "Pattern stroke" -msgstr "笔廓图案" +msgstr "笔刷图案" #: ../src/ui/widget/selected-style.cpp:197 msgid "L" @@ -24521,7 +24688,7 @@ msgstr "线性渐变填充" #: ../src/ui/widget/selected-style.cpp:200 #: ../src/ui/widget/style-swatch.cpp:294 msgid "Linear gradient stroke" -msgstr "线性渐变笔廓" +msgstr "线性渐变笔刷" #: ../src/ui/widget/selected-style.cpp:207 msgid "R" @@ -24547,7 +24714,7 @@ msgstr "网格渐变填充" #: ../src/ui/widget/selected-style.cpp:221 msgid "Mesh gradient stroke" -msgstr "网格渐变笔廓" +msgstr "网格渐变笔刷" #: ../src/ui/widget/selected-style.cpp:229 msgid "Different" @@ -24559,7 +24726,7 @@ msgstr "相差填充" #: ../src/ui/widget/selected-style.cpp:232 msgid "Different strokes" -msgstr "相差笔廓" +msgstr "相差笔刷" #: ../src/ui/widget/selected-style.cpp:234 #: ../src/ui/widget/style-swatch.cpp:324 @@ -24579,7 +24746,7 @@ msgstr "取消填充" #: ../src/ui/widget/selected-style.cpp:591 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset stroke" -msgstr "取消笔廓" +msgstr "取消笔刷" #: ../src/ui/widget/selected-style.cpp:240 msgid "Flat color fill" @@ -24587,7 +24754,7 @@ msgstr "平面颜色填充" #: ../src/ui/widget/selected-style.cpp:240 msgid "Flat color stroke" -msgstr "平面颜色笔廓" +msgstr "平面颜色笔刷" #. TRANSLATOR COMMENT: A means "Averaged" #: ../src/ui/widget/selected-style.cpp:243 @@ -24600,7 +24767,7 @@ msgstr "平均填充已选对象" #: ../src/ui/widget/selected-style.cpp:246 msgid "Stroke is averaged over selected objects" -msgstr "平均笔廓已选对象" +msgstr "平均笔刷已选对象" #. TRANSLATOR COMMENT: M means "Multiple" #: ../src/ui/widget/selected-style.cpp:249 @@ -24613,15 +24780,15 @@ msgstr "多选对象填充相同" #: ../src/ui/widget/selected-style.cpp:252 msgid "Multiple selected objects have the same stroke" -msgstr "多选对象笔廓相同" +msgstr "多选对象笔刷相同" #: ../src/ui/widget/selected-style.cpp:254 msgid "Edit fill..." -msgstr "编辑填充…" +msgstr "编辑填充..." #: ../src/ui/widget/selected-style.cpp:254 msgid "Edit stroke..." -msgstr "编辑笔廓…" +msgstr "编辑笔刷..." #: ../src/ui/widget/selected-style.cpp:258 msgid "Last set color" @@ -24642,7 +24809,7 @@ msgstr "粘贴颜色" #: ../src/ui/widget/selected-style.cpp:286 #: ../src/ui/widget/selected-style.cpp:868 msgid "Swap fill and stroke" -msgstr "交换填充和笔廓" +msgstr "交换填充和笔刷" #: ../src/ui/widget/selected-style.cpp:290 #: ../src/ui/widget/selected-style.cpp:600 @@ -24652,7 +24819,7 @@ msgstr "使填充不透明" #: ../src/ui/widget/selected-style.cpp:290 msgid "Make stroke opaque" -msgstr "使笔廓不透明" +msgstr "使笔刷不透明" #: ../src/ui/widget/selected-style.cpp:299 #: ../src/ui/widget/selected-style.cpp:557 ../src/widgets/fill-style.cpp:503 @@ -24662,7 +24829,7 @@ msgstr "移除填充" #: ../src/ui/widget/selected-style.cpp:299 #: ../src/ui/widget/selected-style.cpp:566 ../src/widgets/fill-style.cpp:503 msgid "Remove stroke" -msgstr "移除笔廓" +msgstr "移除笔刷" #: ../src/ui/widget/selected-style.cpp:621 msgid "Apply last set color to fill" @@ -24670,7 +24837,7 @@ msgstr "应用最近设置的颜色填充" #: ../src/ui/widget/selected-style.cpp:633 msgid "Apply last set color to stroke" -msgstr "应用最近设置的颜色到笔廓" +msgstr "应用最近设置的颜色到笔刷" #: ../src/ui/widget/selected-style.cpp:644 msgid "Apply last selected color to fill" @@ -24678,7 +24845,7 @@ msgstr "应用最近选择的颜色填充" #: ../src/ui/widget/selected-style.cpp:655 msgid "Apply last selected color to stroke" -msgstr "应用最近选择的颜色到笔廓" +msgstr "应用最近选择的颜色到笔刷" #: ../src/ui/widget/selected-style.cpp:681 msgid "Invert fill" @@ -24686,7 +24853,7 @@ msgstr "反向填充" #: ../src/ui/widget/selected-style.cpp:705 msgid "Invert stroke" -msgstr "反向笔廓" +msgstr "反向笔刷" #: ../src/ui/widget/selected-style.cpp:717 msgid "White fill" @@ -24694,7 +24861,7 @@ msgstr "白色填充" #: ../src/ui/widget/selected-style.cpp:729 msgid "White stroke" -msgstr "白色笔廓" +msgstr "白色笔刷" #: ../src/ui/widget/selected-style.cpp:741 msgid "Black fill" @@ -24702,7 +24869,7 @@ msgstr "黑色填充" #: ../src/ui/widget/selected-style.cpp:753 msgid "Black stroke" -msgstr "黑色笔廓" +msgstr "黑色笔刷" #: ../src/ui/widget/selected-style.cpp:796 msgid "Paste fill" @@ -24710,11 +24877,11 @@ msgstr "粘贴填充" #: ../src/ui/widget/selected-style.cpp:814 msgid "Paste stroke" -msgstr "粘贴笔廓" +msgstr "粘贴笔刷" #: ../src/ui/widget/selected-style.cpp:970 msgid "Change stroke width" -msgstr "改变笔廓宽度" +msgstr "改变笔刷宽度" #: ../src/ui/widget/selected-style.cpp:1073 msgid ", drag to adjust" @@ -24723,19 +24890,19 @@ msgstr ",拖动以调整" #: ../src/ui/widget/selected-style.cpp:1158 #, c-format msgid "Stroke width: %.5g%s%s" -msgstr "笔廓宽度:%.5g%s%s" +msgstr "笔刷宽度:%.5g%s%s" #: ../src/ui/widget/selected-style.cpp:1162 msgid " (averaged)" -msgstr "(平均)" +msgstr " (平均)" #: ../src/ui/widget/selected-style.cpp:1188 msgid "0 (transparent)" -msgstr "0(透明)" +msgstr "0(透明)" #: ../src/ui/widget/selected-style.cpp:1212 msgid "100% (opaque)" -msgstr "100%(不透明)" +msgstr "100%(不透明)" #: ../src/ui/widget/selected-style.cpp:1386 msgid "Adjust alpha" @@ -24748,8 +24915,8 @@ msgid "" "b> to adjust lightness, with Shift to adjust saturation, without " "modifiers to adjust hue" msgstr "" -"正在调整 alpha:从 %.3g 到 %.3g(差异 %.3g);按下 Ctrl " -"调整亮度,按住 Shift 调整饱和度,不带修改键调整色调" +"正在调整 alpha:从 %.3g 到 %.3g(差异 %.3g);按下 Ctrl 调" +"整亮度,按住 Shift 调整饱和度,不带修改键调整色调" #: ../src/ui/widget/selected-style.cpp:1392 msgid "Adjust saturation" @@ -24762,8 +24929,8 @@ msgid "" "Ctrl to adjust lightness, with Alt to adjust alpha, without " "modifiers to adjust hue" msgstr "" -"正在调整饱和度:从 %.3g 到 %.3g(差异 %.3g);按住 Ctrl " -"调整亮度,按住 Alt 调整 alpha,不带修改键调整色调" +"正在调整饱和度:从 %.3g 到 %.3g(差异 %.3g);按住 Ctrl 调" +"整亮度,按住 Alt 调整 alpha,不带修改键调整色调" #: ../src/ui/widget/selected-style.cpp:1398 msgid "Adjust lightness" @@ -24776,8 +24943,8 @@ msgid "" "Shift to adjust saturation, with Alt to adjust alpha, without " "modifiers to adjust hue" msgstr "" -"正在调整亮度:从 %.3g 到 %.3g(差异 %.3g);按住 Shift " -"调整饱和度,按住 Alt 调整 alpha,不带修改键调整色调" +"正在调整亮度:从 %.3g 到 %.3g(差异 %.3g);按住 Shift 调" +"整饱和度,按住 Alt 调整 alpha,不带修改键调整色调" #: ../src/ui/widget/selected-style.cpp:1404 msgid "Adjust hue" @@ -24790,24 +24957,24 @@ msgid "" "b> to adjust saturation, with Alt to adjust alpha, with Ctrl " "to adjust lightness" msgstr "" -"正在调整色调:从 %.3g 到 %.3g(差异 %.3g);按住 Shift " -"调整饱和度,按住 Alt 调整 alpha,按住 Ctrl 调整亮度" +"正在调整色调:从 %.3g 到 %.3g(差异 %.3g);按住 Shift 调" +"整饱和度,按住 Alt 调整 alpha,按住 Ctrl 调整亮度" #: ../src/ui/widget/selected-style.cpp:1524 #: ../src/ui/widget/selected-style.cpp:1538 msgid "Adjust stroke width" -msgstr "调整笔廓宽度" +msgstr "调整笔刷宽度" #: ../src/ui/widget/selected-style.cpp:1525 #, c-format msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" -msgstr "调整 笔廓宽度:从 %.3g 到 %.3g(相差 %.3g)" +msgstr "调整 笔刷宽度:从 %.3g 到 %.3g(相差 %.3g)" #. TRANSLATORS: "Link" means to _link_ two sliders together #: ../src/ui/widget/spin-scale.cpp:138 ../src/ui/widget/spin-slider.cpp:156 msgctxt "Sliders" msgid "Link" -msgstr "链接" +msgstr "连接" #: ../src/ui/widget/style-swatch.cpp:292 msgid "L Gradient" @@ -24825,7 +24992,7 @@ msgstr "填充:%06x/%.3g" #: ../src/ui/widget/style-swatch.cpp:314 #, c-format msgid "Stroke: %06x/%.3g" -msgstr "笔廓:%06x/%.3g" +msgstr "笔刷:%06x/%.3g" #: ../src/ui/widget/style-swatch.cpp:319 msgctxt "Fill and stroke" @@ -24835,7 +25002,7 @@ msgstr "" #: ../src/ui/widget/style-swatch.cpp:346 #, c-format msgid "Stroke width: %.5g%s" -msgstr "笔廓宽度:%.5g%s" +msgstr "笔刷宽度:%.5g%s" #: ../src/ui/widget/style-swatch.cpp:362 #, c-format @@ -24859,7 +25026,7 @@ msgstr "合并消失点" msgid "3D box: Move vanishing point" msgstr "3D 盒子:移动消失点" -#: ../src/vanishing-point.cpp:330 +#: ../src/vanishing-point.cpp:329 #, c-format msgid "Finite vanishing point shared by %d box" msgid_plural "" @@ -24871,7 +25038,7 @@ msgstr[0] "" #. This won't make sense any more when infinite VPs are not shown on the canvas, #. but currently we update the status message anyway -#: ../src/vanishing-point.cpp:337 +#: ../src/vanishing-point.cpp:336 #, c-format msgid "Infinite vanishing point shared by %d box" msgid_plural "" @@ -24881,7 +25048,7 @@ msgstr[0] "" "%d 个盒子共享无限消失点;按下 Shift 拖动以分开选定的多个" "盒子" -#: ../src/vanishing-point.cpp:345 +#: ../src/vanishing-point.cpp:344 #, c-format msgid "" "shared by %d box; drag with Shift to separate selected box(es)" @@ -24902,7 +25069,7 @@ msgstr "标签" msgid "Context" msgstr "上下文" -#: ../src/verbs.cpp:270 ../src/verbs.cpp:2271 +#: ../src/verbs.cpp:270 ../src/verbs.cpp:2298 #: ../share/extensions/jessyInk_view.inx.h:1 #: ../share/extensions/polyhedron_3d.inx.h:26 msgid "View" @@ -24912,2275 +25079,2286 @@ msgstr "视图" msgid "Dialog" msgstr "对话框" -#: ../src/verbs.cpp:1259 +#: ../src/verbs.cpp:1276 msgid "Switch to next layer" msgstr "切换到下一层" -#: ../src/verbs.cpp:1260 +#: ../src/verbs.cpp:1277 msgid "Switched to next layer." msgstr "已切换到下一层" -#: ../src/verbs.cpp:1262 +#: ../src/verbs.cpp:1279 msgid "Cannot go past last layer." msgstr "不能切换到最后一层之后。" -#: ../src/verbs.cpp:1271 +#: ../src/verbs.cpp:1288 msgid "Switch to previous layer" msgstr "切换到前一层" -#: ../src/verbs.cpp:1272 +#: ../src/verbs.cpp:1289 msgid "Switched to previous layer." msgstr "已切换到前一层" -#: ../src/verbs.cpp:1274 +#: ../src/verbs.cpp:1291 msgid "Cannot go before first layer." msgstr "不能切换到第一层之前。" -#: ../src/verbs.cpp:1295 ../src/verbs.cpp:1362 ../src/verbs.cpp:1398 -#: ../src/verbs.cpp:1404 ../src/verbs.cpp:1428 ../src/verbs.cpp:1443 +#: ../src/verbs.cpp:1312 ../src/verbs.cpp:1379 ../src/verbs.cpp:1415 +#: ../src/verbs.cpp:1421 ../src/verbs.cpp:1445 ../src/verbs.cpp:1460 msgid "No current layer." -msgstr "没有当前层。" +msgstr "没有当前图层。" -#: ../src/verbs.cpp:1324 ../src/verbs.cpp:1328 +#: ../src/verbs.cpp:1341 ../src/verbs.cpp:1345 #, c-format msgid "Raised layer %s." msgstr "升高层 %s。" -#: ../src/verbs.cpp:1325 +#: ../src/verbs.cpp:1342 msgid "Layer to top" msgstr "置顶层" -#: ../src/verbs.cpp:1329 +#: ../src/verbs.cpp:1346 msgid "Raise layer" msgstr "升高层" -#: ../src/verbs.cpp:1332 ../src/verbs.cpp:1336 +#: ../src/verbs.cpp:1349 ../src/verbs.cpp:1353 #, c-format msgid "Lowered layer %s." msgstr "降低层 %s。" -#: ../src/verbs.cpp:1333 +#: ../src/verbs.cpp:1350 msgid "Layer to bottom" msgstr "置底层" -#: ../src/verbs.cpp:1337 +#: ../src/verbs.cpp:1354 msgid "Lower layer" msgstr "降低层" -#: ../src/verbs.cpp:1346 +#: ../src/verbs.cpp:1363 msgid "Cannot move layer any further." msgstr "不能再移动层。" -#: ../src/verbs.cpp:1357 +#: ../src/verbs.cpp:1374 msgid "Duplicate layer" msgstr "再制层" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1360 +#: ../src/verbs.cpp:1377 msgid "Duplicated layer." msgstr "已再制层。" -#: ../src/verbs.cpp:1393 +#: ../src/verbs.cpp:1410 msgid "Delete layer" msgstr "删除层" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1396 +#: ../src/verbs.cpp:1413 msgid "Deleted layer." msgstr "已删除层。" -#: ../src/verbs.cpp:1413 +#: ../src/verbs.cpp:1430 msgid "Show all layers" msgstr "显示所有层" -#: ../src/verbs.cpp:1418 +#: ../src/verbs.cpp:1435 msgid "Hide all layers" msgstr "隐藏所有层" -#: ../src/verbs.cpp:1423 +#: ../src/verbs.cpp:1440 msgid "Lock all layers" msgstr "锁定所有层" -#: ../src/verbs.cpp:1437 +#: ../src/verbs.cpp:1454 msgid "Unlock all layers" msgstr "解锁所有层" -#: ../src/verbs.cpp:1521 +#: ../src/verbs.cpp:1538 msgid "Flip horizontally" msgstr "水平翻转" -#: ../src/verbs.cpp:1526 +#: ../src/verbs.cpp:1543 msgid "Flip vertically" msgstr "垂直翻转" -#: ../src/verbs.cpp:1583 ../src/verbs.cpp:2696 +#: ../src/verbs.cpp:1591 +#, c-format +msgid "Set %d" +msgstr "设置 %d" + +#: ../src/verbs.cpp:1600 ../src/verbs.cpp:2728 msgid "Create new selection set" msgstr "创建新的选择集合" #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language #. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2153 +#: ../src/verbs.cpp:2176 msgid "tutorial-basic.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2157 +#: ../src/verbs.cpp:2180 msgid "tutorial-shapes.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2161 +#: ../src/verbs.cpp:2184 msgid "tutorial-advanced.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2165 +#: ../src/verbs.cpp:2190 msgid "tutorial-tracing.svg" msgstr "" -#: ../src/verbs.cpp:2168 +#: ../src/verbs.cpp:2195 msgid "tutorial-tracing-pixelart.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2172 +#: ../src/verbs.cpp:2199 msgid "tutorial-calligraphy.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2176 +#: ../src/verbs.cpp:2203 msgid "tutorial-interpolate.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2180 +#: ../src/verbs.cpp:2207 msgid "tutorial-elements.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2184 +#: ../src/verbs.cpp:2211 msgid "tutorial-tips.svg" msgstr "" -#: ../src/verbs.cpp:2370 ../src/verbs.cpp:2969 +#: ../src/verbs.cpp:2397 ../src/verbs.cpp:3011 msgid "Unlock all objects in the current layer" -msgstr "解锁当前层上的所有锁定对象" +msgstr "解锁当前图层上的所有锁定对象" -#: ../src/verbs.cpp:2374 ../src/verbs.cpp:2971 +#: ../src/verbs.cpp:2401 ../src/verbs.cpp:3013 msgid "Unlock all objects in all layers" msgstr "解锁所有层上的锁定对象" -#: ../src/verbs.cpp:2378 ../src/verbs.cpp:2973 +#: ../src/verbs.cpp:2405 ../src/verbs.cpp:3015 msgid "Unhide all objects in the current layer" -msgstr "显示当前层上的所有隐藏对象" +msgstr "显示当前图层上的所有隐藏对象" -#: ../src/verbs.cpp:2382 ../src/verbs.cpp:2975 +#: ../src/verbs.cpp:2409 ../src/verbs.cpp:3017 msgid "Unhide all objects in all layers" msgstr "显示所有层上的隐藏对象" -#: ../src/verbs.cpp:2397 +#: ../src/verbs.cpp:2424 msgctxt "Verb" msgid "None" msgstr "无" -#: ../src/verbs.cpp:2397 +#: ../src/verbs.cpp:2424 msgid "Does nothing" msgstr "什么也不做" #. File #. Tag -#: ../src/verbs.cpp:2400 ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2427 ../src/verbs.cpp:2727 msgid "_New" msgstr "新建(_N)" -#: ../src/verbs.cpp:2400 +#: ../src/verbs.cpp:2427 msgid "Create new document from the default template" msgstr "使用默认模板创建新文档" -#: ../src/verbs.cpp:2402 +#: ../src/verbs.cpp:2429 msgid "_Open..." -msgstr "打开(_O)…" +msgstr "打开(_O)..." -#: ../src/verbs.cpp:2403 +#: ../src/verbs.cpp:2430 msgid "Open an existing document" msgstr "打开已存在文档" -#: ../src/verbs.cpp:2404 +#: ../src/verbs.cpp:2431 msgid "Re_vert" msgstr "恢复(_V)" -#: ../src/verbs.cpp:2405 +#: ../src/verbs.cpp:2432 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "返回到文档最后保存的版本(更改将丢失)" -#: ../src/verbs.cpp:2406 +#: ../src/verbs.cpp:2433 msgid "Save document" msgstr "保存文档" -#: ../src/verbs.cpp:2408 +#: ../src/verbs.cpp:2435 msgid "Save _As..." -msgstr "另存为(_A)…" +msgstr "另存为(_A)..." -#: ../src/verbs.cpp:2409 +#: ../src/verbs.cpp:2436 msgid "Save document under a new name" msgstr "使用新名字保存文档" -#: ../src/verbs.cpp:2410 +#: ../src/verbs.cpp:2437 msgid "Save a Cop_y..." -msgstr "保存副本(_Y)…" +msgstr "保存副本(_Y)..." -#: ../src/verbs.cpp:2411 +#: ../src/verbs.cpp:2438 msgid "Save a copy of the document under a new name" msgstr "使用新名字保存文档副本" -#: ../src/verbs.cpp:2412 +#: ../src/verbs.cpp:2439 msgid "_Print..." -msgstr "打印(_P)…" +msgstr "打印(_P)..." -#: ../src/verbs.cpp:2412 +#: ../src/verbs.cpp:2439 msgid "Print document" msgstr "打印文档" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2415 +#: ../src/verbs.cpp:2442 msgid "Clean _up document" msgstr "清理文档(_U)" -#: ../src/verbs.cpp:2415 +#: ../src/verbs.cpp:2442 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" -msgstr "从文档的 <defs> 中移除未使用的定义(比如渐变或剪裁路径)" +msgstr "从文档的 <defs> 中移除未使用的定义(比如渐变或剪裁路径)" -#: ../src/verbs.cpp:2417 +#: ../src/verbs.cpp:2444 msgid "_Import..." -msgstr "导入(_I)…" +msgstr "导入(_I)..." -#: ../src/verbs.cpp:2418 +#: ../src/verbs.cpp:2445 msgid "Import a bitmap or SVG image into this document" msgstr "把位图或者 SVG 图像导入此文档" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2420 +#: ../src/verbs.cpp:2447 msgid "Import Clip Art..." -msgstr "导入剪贴画…" +msgstr "导入剪贴画..." -#: ../src/verbs.cpp:2421 +#: ../src/verbs.cpp:2448 msgid "Import clipart from Open Clip Art Library" msgstr "从 Open Clip Art Library 导入剪贴画" #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2423 +#: ../src/verbs.cpp:2450 msgid "N_ext Window" msgstr "下一个窗口(_E)" -#: ../src/verbs.cpp:2424 +#: ../src/verbs.cpp:2451 msgid "Switch to the next document window" msgstr "切换到下一个文档窗口" -#: ../src/verbs.cpp:2425 +#: ../src/verbs.cpp:2452 msgid "P_revious Window" msgstr "上一个窗口(_R)" -#: ../src/verbs.cpp:2426 +#: ../src/verbs.cpp:2453 msgid "Switch to the previous document window" msgstr "切换到上一个文档窗口" -#: ../src/verbs.cpp:2427 +#: ../src/verbs.cpp:2454 msgid "_Close" msgstr "关闭(_C)" -#: ../src/verbs.cpp:2428 +#: ../src/verbs.cpp:2455 msgid "Close this document window" msgstr "关闭此文档" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2456 msgid "_Quit" msgstr "退出(_Q)" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2456 msgid "Quit Inkscape" msgstr "退出 Inkscape" -#: ../src/verbs.cpp:2430 +#: ../src/verbs.cpp:2457 msgid "New from _Template..." -msgstr "从模板新建(_T)…" +msgstr "由模板新建(_T)..." -#: ../src/verbs.cpp:2431 +#: ../src/verbs.cpp:2458 msgid "Create new project from template" msgstr "从模板创建新工程" -#: ../src/verbs.cpp:2434 +#: ../src/verbs.cpp:2461 msgid "Undo last action" msgstr "撤销最后操作" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2464 msgid "Do again the last undone action" msgstr "重复最近撤销的操作" -#: ../src/verbs.cpp:2438 +#: ../src/verbs.cpp:2465 msgid "Cu_t" msgstr "剪切(_T)" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2466 msgid "Cut selection to clipboard" msgstr "把选区剪切到剪贴板" -#: ../src/verbs.cpp:2440 +#: ../src/verbs.cpp:2467 msgid "_Copy" msgstr "复制(_C)" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2468 msgid "Copy selection to clipboard" msgstr "把选区复制到剪贴板" -#: ../src/verbs.cpp:2442 +#: ../src/verbs.cpp:2469 msgid "_Paste" msgstr "粘贴(_P)" -#: ../src/verbs.cpp:2443 +#: ../src/verbs.cpp:2470 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "从剪贴板粘贴对象到鼠标点, 或者粘贴文字" -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2471 msgid "Paste _Style" msgstr "粘贴样式(_S)" -#: ../src/verbs.cpp:2445 +#: ../src/verbs.cpp:2472 msgid "Apply the style of the copied object to selection" msgstr "应用已复制对象的样式到选区" -#: ../src/verbs.cpp:2447 +#: ../src/verbs.cpp:2474 msgid "Scale selection to match the size of the copied object" msgstr "缩放选区以匹配已复制对象的尺寸" -#: ../src/verbs.cpp:2448 +#: ../src/verbs.cpp:2475 msgid "Paste _Width" msgstr "粘贴宽度(_W)" -#: ../src/verbs.cpp:2449 +#: ../src/verbs.cpp:2476 msgid "Scale selection horizontally to match the width of the copied object" msgstr "水平缩放选区以匹配已复制对象的宽度" -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2477 msgid "Paste _Height" msgstr "粘贴高度(_H)" -#: ../src/verbs.cpp:2451 +#: ../src/verbs.cpp:2478 msgid "Scale selection vertically to match the height of the copied object" msgstr "垂直缩放选区以匹配已复制对象的高度" -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2479 msgid "Paste Size Separately" msgstr "分别粘贴尺寸" -#: ../src/verbs.cpp:2453 +#: ../src/verbs.cpp:2480 msgid "Scale each selected object to match the size of the copied object" msgstr "缩放每个已选对象以匹配已复制对象的尺寸" -#: ../src/verbs.cpp:2454 +#: ../src/verbs.cpp:2481 msgid "Paste Width Separately" msgstr "分别粘贴宽度" -#: ../src/verbs.cpp:2455 +#: ../src/verbs.cpp:2482 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" msgstr "水平地缩放每个已选对象以匹配已复制对象的宽度" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2483 msgid "Paste Height Separately" msgstr "分别粘贴高度" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2484 msgid "" "Scale each selected object vertically to match the height of the copied " "object" msgstr "垂直地缩放每个已选对象以匹配已复制对象的高度" -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2485 msgid "Paste _In Place" msgstr "原地粘贴(_I)" -#: ../src/verbs.cpp:2459 +#: ../src/verbs.cpp:2486 msgid "Paste objects from clipboard to the original location" msgstr "从剪贴板粘贴对象到原始位置" -#: ../src/verbs.cpp:2460 +#: ../src/verbs.cpp:2487 msgid "Paste Path _Effect" msgstr "粘贴路径效果(_E)" -#: ../src/verbs.cpp:2461 +#: ../src/verbs.cpp:2488 msgid "Apply the path effect of the copied object to selection" msgstr "将已复制对象的路径效果应用到所选对象" -#: ../src/verbs.cpp:2462 +#: ../src/verbs.cpp:2489 msgid "Remove Path _Effect" msgstr "移除路径效果(_E)" -#: ../src/verbs.cpp:2463 +#: ../src/verbs.cpp:2490 msgid "Remove any path effects from selected objects" msgstr "从选择对象中移除所有路径效果" -#: ../src/verbs.cpp:2464 +#: ../src/verbs.cpp:2491 msgid "_Remove Filters" msgstr "删除滤镜(_R)" -#: ../src/verbs.cpp:2465 +#: ../src/verbs.cpp:2492 msgid "Remove any filters from selected objects" msgstr "从选择对象中移除所有滤镜" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2493 msgid "_Delete" msgstr "删除(_D)" -#: ../src/verbs.cpp:2467 +#: ../src/verbs.cpp:2494 msgid "Delete selection" msgstr "删除选区" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2495 msgid "Duplic_ate" msgstr "再制(_A)" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2496 msgid "Duplicate selected objects" msgstr "已选对象复制成双份" -#: ../src/verbs.cpp:2470 +#: ../src/verbs.cpp:2497 msgid "Create Clo_ne" msgstr "创建克隆(_N)" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2498 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "创建所选对象的一个克隆(与原始对象链接的副本)" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2499 msgid "Unlin_k Clone" msgstr "断开克隆(_K)" -#: ../src/verbs.cpp:2473 +#: ../src/verbs.cpp:2500 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" -msgstr "断开已选克隆与原始对象的链接,分别转化成单独的对象" +msgstr "断开已选克隆与原始对象的连接,分别转化成单独的对象" -#: ../src/verbs.cpp:2474 +#: ../src/verbs.cpp:2501 msgid "Relink to Copied" -msgstr "重新链接到副本" +msgstr "重新连接到副本" -#: ../src/verbs.cpp:2475 +#: ../src/verbs.cpp:2502 msgid "Relink the selected clones to the object currently on the clipboard" -msgstr "将选定的克隆重新链接到剪贴板中的对象" +msgstr "将选定的克隆重新连接到剪贴板中的对象" -#: ../src/verbs.cpp:2476 +#: ../src/verbs.cpp:2503 msgid "Select _Original" msgstr "选择原始对象(_O)" -#: ../src/verbs.cpp:2477 +#: ../src/verbs.cpp:2504 msgid "Select the object to which the selected clone is linked" -msgstr "选择与已选克隆链接的对象" +msgstr "选择与已选克隆连接的对象" -#: ../src/verbs.cpp:2478 +#: ../src/verbs.cpp:2505 msgid "Clone original path (LPE)" -msgstr "克隆原始路径(LPE)" +msgstr "克隆原始路径(LPE)" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2506 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" msgstr "创建一个新路径,应用克隆的原始 LPE,并引用它到选择的路径" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2507 msgid "Objects to _Marker" msgstr "对象转化成标记(_M)" -#: ../src/verbs.cpp:2481 +#: ../src/verbs.cpp:2508 msgid "Convert selection to a line marker" msgstr "把选区转为直线的标记样式" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2509 msgid "Objects to Gu_ides" msgstr "对象转化成参考线(_I)" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2510 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" msgstr "沿对象的边的方向, 将其转化为一组参考线" -#: ../src/verbs.cpp:2484 +#: ../src/verbs.cpp:2511 msgid "Objects to Patter_n" msgstr "对象转化成图案(_N)" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2512 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "将选区转换为使用图案平铺填充的矩形" -#: ../src/verbs.cpp:2486 +#: ../src/verbs.cpp:2513 msgid "Pattern to _Objects" msgstr "图案转化成对象(_O)" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2514 msgid "Extract objects from a tiled pattern fill" msgstr "从平铺填充图案提取对象" -#: ../src/verbs.cpp:2488 +#: ../src/verbs.cpp:2515 msgid "Group to Symbol" msgstr "群组转化为符号" -#: ../src/verbs.cpp:2489 +#: ../src/verbs.cpp:2516 msgid "Convert group to a symbol" msgstr "将群组转换为一个符号" -#: ../src/verbs.cpp:2490 +#: ../src/verbs.cpp:2517 msgid "Symbol to Group" msgstr "符号转化为组" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2518 msgid "Extract group from a symbol" msgstr "从一个符号提取组" -#: ../src/verbs.cpp:2492 +#: ../src/verbs.cpp:2519 msgid "Clea_r All" msgstr "清空(_R)" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2520 msgid "Delete all objects from document" msgstr "从文档中删除所有对象" -#: ../src/verbs.cpp:2494 +#: ../src/verbs.cpp:2521 msgid "Select Al_l" msgstr "全选(_L)" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2522 msgid "Select all objects or all nodes" msgstr "选择所有对象或所有节点" -#: ../src/verbs.cpp:2496 +#: ../src/verbs.cpp:2523 msgid "Select All in All La_yers" -msgstr "选中所有层中所有对象(_Y)" +msgstr "选中所有层中全部对象(_Y)" -#: ../src/verbs.cpp:2497 +#: ../src/verbs.cpp:2524 msgid "Select all objects in all visible and unlocked layers" msgstr "在所有可见并且未锁定的层中全选" -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2525 msgid "Fill _and Stroke" -msgstr "填充和笔廓(_A)…" +msgstr "填充和笔刷(_A)..." -#: ../src/verbs.cpp:2499 +#: ../src/verbs.cpp:2526 msgid "" "Select all objects with the same fill and stroke as the selected objects" -msgstr "选择所有带有系统填充和笔廓的对象作为选择的对象" +msgstr "选择所有带有系统填充和笔刷的对象作为选择的对象" -#: ../src/verbs.cpp:2500 +#: ../src/verbs.cpp:2527 msgid "_Fill Color" msgstr "填充颜色(_F)" -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2528 msgid "Select all objects with the same fill as the selected objects" msgstr "选择带有相同填充的所有对象为选择的对象" -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2529 msgid "_Stroke Color" -msgstr "笔廓颜色(_S)" +msgstr "笔刷颜色(_S)" -#: ../src/verbs.cpp:2503 +#: ../src/verbs.cpp:2530 msgid "Select all objects with the same stroke as the selected objects" -msgstr "选择所有带有相同笔廓的对象作为选择对象" +msgstr "选择所有带有相同笔刷的对象作为选择对象" -#: ../src/verbs.cpp:2504 +#: ../src/verbs.cpp:2531 msgid "Stroke St_yle" -msgstr "笔廓样式(_Y)" +msgstr "笔刷样式(_Y)" -#: ../src/verbs.cpp:2505 +#: ../src/verbs.cpp:2532 msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " "selected objects" -msgstr "选择所有带有相同笔廓样式(宽度、画线、标记)的对象为选择的对象" +msgstr "选择所有带有相同笔刷样式(宽度、画线、标记)的对象为选择的对象" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2533 msgid "_Object Type" msgstr "对象类型(_O)" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2534 msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " "etc) as the selected objects" msgstr "" -"选择所有带有相同对象类型(矩形、弧、文本、路径、位图等)的对象作为选择的对象" +"选择所有带有相同对象类型(矩形、弧、文本、路径、位图等)的对象作为选择的对象" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2535 msgid "In_vert Selection" msgstr "反选(_V)" -#: ../src/verbs.cpp:2509 +#: ../src/verbs.cpp:2536 msgid "Invert selection (unselect what is selected and select everything else)" -msgstr "反向选择(取消选中的,选择其余的)" +msgstr "反向选择(取消选中的,选择其余的)" -#: ../src/verbs.cpp:2510 +#: ../src/verbs.cpp:2537 msgid "Invert in All Layers" msgstr "所有层反选" -#: ../src/verbs.cpp:2511 +#: ../src/verbs.cpp:2538 msgid "Invert selection in all visible and unlocked layers" msgstr "在所有可见并且未锁定的层中反选" -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2539 msgid "Select Next" msgstr "选择下一个" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2540 msgid "Select next object or node" msgstr "选择下一个对象或节点" -#: ../src/verbs.cpp:2514 +#: ../src/verbs.cpp:2541 msgid "Select Previous" msgstr "选择前一个" -#: ../src/verbs.cpp:2515 +#: ../src/verbs.cpp:2542 msgid "Select previous object or node" msgstr "选择前一个对象或节点" -#: ../src/verbs.cpp:2516 +#: ../src/verbs.cpp:2543 msgid "D_eselect" msgstr "撤销选择(_E)" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2544 msgid "Deselect any selected objects or nodes" msgstr "撤销已选对象或节点" -#: ../src/verbs.cpp:2519 +#: ../src/verbs.cpp:2546 msgid "Delete all the guides in the document" msgstr "删除文档中的所有辅助" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2547 +msgid "Lock All Guides" +msgstr "锁定全部参考线" + +#: ../src/verbs.cpp:2547 ../src/widgets/desktop-widget.cpp:402 +msgid "Toggle lock of all guides in the document" +msgstr "切换文档中的全部参考线" + +#: ../src/verbs.cpp:2548 msgid "Create _Guides Around the Page" msgstr "环绕页面创建参考线(_G)" -#: ../src/verbs.cpp:2521 +#: ../src/verbs.cpp:2549 msgid "Create four guides aligned with the page borders" msgstr "沿页面边界创建四条参考线" -#: ../src/verbs.cpp:2522 +#: ../src/verbs.cpp:2550 msgid "Next path effect parameter" msgstr "下一个路径效果的参数" -#: ../src/verbs.cpp:2523 +#: ../src/verbs.cpp:2551 msgid "Show next editable path effect parameter" msgstr "显示路径效果的下一个可编辑参数" #. Selection -#: ../src/verbs.cpp:2526 +#: ../src/verbs.cpp:2554 msgid "Raise to _Top" msgstr "置于顶层(_T)" -#: ../src/verbs.cpp:2527 +#: ../src/verbs.cpp:2555 msgid "Raise selection to top" msgstr "升高选区到顶层" -#: ../src/verbs.cpp:2528 +#: ../src/verbs.cpp:2556 msgid "Lower to _Bottom" msgstr "置于底层(_B)" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2557 msgid "Lower selection to bottom" msgstr "降低选区到底层" -#: ../src/verbs.cpp:2530 +#: ../src/verbs.cpp:2558 msgid "_Raise" msgstr "升高(_R)" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2559 msgid "Raise selection one step" msgstr "选区升高一步" -#: ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2560 msgid "_Lower" msgstr "降低(_L)" -#: ../src/verbs.cpp:2533 +#: ../src/verbs.cpp:2561 msgid "Lower selection one step" msgstr "选区降低一步" -#: ../src/verbs.cpp:2535 +#: ../src/verbs.cpp:2563 msgid "Group selected objects" msgstr "组合选中对象" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2565 msgid "Ungroup selected groups" msgstr "解除选择的群组" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2567 msgid "_Put on Path" msgstr "在路径上放置(_P)" -#: ../src/verbs.cpp:2541 +#: ../src/verbs.cpp:2569 msgid "_Remove from Path" msgstr "从路径上释放(_R)" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2571 msgid "Remove Manual _Kerns" msgstr "移除手工字距调整(_K)" #. TRANSLATORS: "glyph": An image used in the visual representation of characters; #. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2574 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "从文字对象中移除所有手工间隙和图元旋转信息" -#: ../src/verbs.cpp:2548 +#: ../src/verbs.cpp:2576 msgid "_Union" msgstr "并集(_U)" -#: ../src/verbs.cpp:2549 +#: ../src/verbs.cpp:2577 msgid "Create union of selected paths" msgstr "创建所选路径的并集" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2578 msgid "_Intersection" msgstr "交集(_I)" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2579 msgid "Create intersection of selected paths" msgstr "创建所选路径的交集" -#: ../src/verbs.cpp:2552 +#: ../src/verbs.cpp:2580 msgid "_Difference" msgstr "差集(_D)" -#: ../src/verbs.cpp:2553 +#: ../src/verbs.cpp:2581 msgid "Create difference of selected paths (bottom minus top)" msgstr "创建所选路径的差集(底部减去顶部)" -#: ../src/verbs.cpp:2554 +#: ../src/verbs.cpp:2582 msgid "E_xclusion" msgstr "互斥(_X)" -#: ../src/verbs.cpp:2555 +#: ../src/verbs.cpp:2583 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" msgstr "对所选路径进行异或操作 (结果合并到一个路径)" -#: ../src/verbs.cpp:2556 +#: ../src/verbs.cpp:2584 msgid "Di_vision" msgstr "分割(_V)" -#: ../src/verbs.cpp:2557 +#: ../src/verbs.cpp:2585 msgid "Cut the bottom path into pieces" msgstr "把底部路径分割成片" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2560 +#: ../src/verbs.cpp:2588 msgid "Cut _Path" msgstr "剪切路径(_P)" -#: ../src/verbs.cpp:2561 +#: ../src/verbs.cpp:2589 msgid "Cut the bottom path's stroke into pieces, removing fill" -msgstr "把底部路径的笔廓分割成片, 去除填充" +msgstr "把底部路径的笔刷分割成片, 去除填充" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2593 msgid "Outs_et" msgstr "向外偏移(_E)" -#: ../src/verbs.cpp:2566 +#: ../src/verbs.cpp:2594 msgid "Outset selected paths" msgstr "向外偏移已选路径" -#: ../src/verbs.cpp:2568 +#: ../src/verbs.cpp:2596 msgid "O_utset Path by 1 px" msgstr "以 1 像素向外偏移路径(_U)" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2597 msgid "Outset selected paths by 1 px" msgstr "以 1 像素向外偏移已选路径" -#: ../src/verbs.cpp:2571 +#: ../src/verbs.cpp:2599 msgid "O_utset Path by 10 px" msgstr "以 10 像素向外偏移路径(_U)" -#: ../src/verbs.cpp:2572 +#: ../src/verbs.cpp:2600 msgid "Outset selected paths by 10 px" msgstr "以 10 像素向外偏移已选路径" #. TRANSLATORS: "inset": contract a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2604 msgid "I_nset" msgstr "向内偏移(_N)" -#: ../src/verbs.cpp:2577 +#: ../src/verbs.cpp:2605 msgid "Inset selected paths" msgstr "向内偏移已选路径" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2607 msgid "I_nset Path by 1 px" msgstr "以 1 像素向内偏移路径(_N)" -#: ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2608 msgid "Inset selected paths by 1 px" msgstr "以 1 像素向内偏移已选路径" -#: ../src/verbs.cpp:2582 +#: ../src/verbs.cpp:2610 msgid "I_nset Path by 10 px" msgstr "以 10 像素向内偏移路径(_N)" -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2611 msgid "Inset selected paths by 10 px" msgstr "以 10 像素向内偏移已选路径" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2613 msgid "D_ynamic Offset" msgstr "动态偏移(_Y)" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2613 msgid "Create a dynamic offset object" msgstr "创建动态偏移对象" -#: ../src/verbs.cpp:2587 +#: ../src/verbs.cpp:2615 msgid "_Linked Offset" msgstr "链接偏移(_L)" -#: ../src/verbs.cpp:2588 +#: ../src/verbs.cpp:2616 msgid "Create a dynamic offset object linked to the original path" msgstr "创建一个链接到原始路径的动态偏移对象" -#: ../src/verbs.cpp:2590 +#: ../src/verbs.cpp:2618 msgid "_Stroke to Path" -msgstr "笔廓转化成路径(_S)" +msgstr "笔刷转化成路径(_S)" -#: ../src/verbs.cpp:2591 +#: ../src/verbs.cpp:2619 msgid "Convert selected object's stroke to paths" -msgstr "把已选对象的笔廓转化成路径" +msgstr "把已选对象的笔刷转化成路径" -#: ../src/verbs.cpp:2592 +#: ../src/verbs.cpp:2620 msgid "Si_mplify" msgstr "简化(_M)" -#: ../src/verbs.cpp:2593 +#: ../src/verbs.cpp:2621 msgid "Simplify selected paths (remove extra nodes)" -msgstr "简化已选路径(移除多余节点)" +msgstr "简化已选路径(移除多余节点)" -#: ../src/verbs.cpp:2594 +#: ../src/verbs.cpp:2622 msgid "_Reverse" msgstr "反向(_R)" -#: ../src/verbs.cpp:2595 +#: ../src/verbs.cpp:2623 msgid "Reverse the direction of selected paths (useful for flipping markers)" -msgstr "将所选路径反向(可以翻转标记的方向)" +msgstr "将所选路径反向(可以翻转标记的方向)" -#: ../src/verbs.cpp:2598 +#: ../src/verbs.cpp:2628 msgid "Create one or more paths from a bitmap by tracing it" msgstr "通过临摹位图轮廓创建一个或多个路径" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2631 msgid "Trace Pixel Art..." -msgstr "临摹像素画…" +msgstr "临摹像素画..." -#: ../src/verbs.cpp:2600 +#: ../src/verbs.cpp:2632 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" msgstr "使用 Kopf-Lischinski 算法创建路径来矢量化像素画" -#: ../src/verbs.cpp:2601 +#: ../src/verbs.cpp:2633 msgid "Make a _Bitmap Copy" msgstr "制作一个位图副本(_B)" -#: ../src/verbs.cpp:2602 +#: ../src/verbs.cpp:2634 msgid "Export selection to a bitmap and insert it into document" msgstr "把选区导出到位图,然后再加入文档" -#: ../src/verbs.cpp:2603 +#: ../src/verbs.cpp:2635 msgid "_Combine" msgstr "合并(_C)" -#: ../src/verbs.cpp:2604 +#: ../src/verbs.cpp:2636 msgid "Combine several paths into one" msgstr "把数个路径合并为一个" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2607 +#: ../src/verbs.cpp:2639 msgid "Break _Apart" msgstr "分离(_A)" -#: ../src/verbs.cpp:2608 +#: ../src/verbs.cpp:2640 msgid "Break selected paths into subpaths" msgstr "把选择路径分成各个子路径" -#: ../src/verbs.cpp:2609 +#: ../src/verbs.cpp:2641 msgid "_Arrange..." -msgstr "安排(_A)…" +msgstr "安排(_A)..." -#: ../src/verbs.cpp:2610 +#: ../src/verbs.cpp:2642 msgid "Arrange selected objects in a table or circle" msgstr "在一个表格或圆圈中安排选择的对象" #. Layer -#: ../src/verbs.cpp:2612 +#: ../src/verbs.cpp:2644 msgid "_Add Layer..." -msgstr "增加层(_A)…" +msgstr "添加图层(_A)..." -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2645 msgid "Create a new layer" -msgstr "创建新层" +msgstr "新建图层" -#: ../src/verbs.cpp:2614 +#: ../src/verbs.cpp:2646 msgid "Re_name Layer..." -msgstr "重命名图层(_N)…" +msgstr "重命名图层(_N)..." -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2647 msgid "Rename the current layer" msgstr "重命名当前图层" -#: ../src/verbs.cpp:2616 +#: ../src/verbs.cpp:2648 msgid "Switch to Layer Abov_e" msgstr "切换到上一层(_E)" -#: ../src/verbs.cpp:2617 +#: ../src/verbs.cpp:2649 msgid "Switch to the layer above the current" msgstr "从当前位置切换到上一层" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2650 msgid "Switch to Layer Belo_w" msgstr "切换到下一层(_W)" -#: ../src/verbs.cpp:2619 +#: ../src/verbs.cpp:2651 msgid "Switch to the layer below the current" msgstr "从当前位置切换到下一层" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2652 msgid "Move Selection to Layer Abo_ve" -msgstr "把选区移动到上一层(_V)" +msgstr "移动选区至上一层(_V)" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2653 msgid "Move selection to the layer above the current" -msgstr "把选区从当前层移动到上一层" +msgstr "把选区从当前图层移动到上一层" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2654 msgid "Move Selection to Layer Bel_ow" -msgstr "把选区移动到下一层(_O)" +msgstr "移动选区至下一层(_O)" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2655 msgid "Move selection to the layer below the current" -msgstr "把选区从当前层移动到下一层" +msgstr "把选区从当前图层移动到下一层" -#: ../src/verbs.cpp:2624 +#: ../src/verbs.cpp:2656 msgid "Move Selection to Layer..." -msgstr "移动选择到层…" +msgstr "移动选区到层..." -#: ../src/verbs.cpp:2626 +#: ../src/verbs.cpp:2658 msgid "Layer to _Top" msgstr "层置顶(_T)" -#: ../src/verbs.cpp:2627 +#: ../src/verbs.cpp:2659 msgid "Raise the current layer to the top" -msgstr "把当前层升高到顶层" +msgstr "把当前图层升高到顶层" -#: ../src/verbs.cpp:2628 +#: ../src/verbs.cpp:2660 msgid "Layer to _Bottom" msgstr "层置底(_B)" -#: ../src/verbs.cpp:2629 +#: ../src/verbs.cpp:2661 msgid "Lower the current layer to the bottom" -msgstr "把当前层降低到底层" +msgstr "把当前图层降低到底层" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2662 msgid "_Raise Layer" msgstr "升高层(_R)" -#: ../src/verbs.cpp:2631 +#: ../src/verbs.cpp:2663 msgid "Raise the current layer" -msgstr "升高当前层" +msgstr "升高当前图层" -#: ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2664 msgid "_Lower Layer" msgstr "降低层(_L)" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2665 msgid "Lower the current layer" -msgstr "降低当前层" +msgstr "降低当前图层" -#: ../src/verbs.cpp:2634 +#: ../src/verbs.cpp:2666 msgid "D_uplicate Current Layer" msgstr "再制当前图层(_U)" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2667 msgid "Duplicate an existing layer" msgstr "再制一个已有的层" -#: ../src/verbs.cpp:2636 +#: ../src/verbs.cpp:2668 msgid "_Delete Current Layer" -msgstr "删除当前层(_D)" +msgstr "删除当前图层(_D)" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2669 msgid "Delete the current layer" -msgstr "删除当前层" +msgstr "删除当前图层" -#: ../src/verbs.cpp:2638 +#: ../src/verbs.cpp:2670 msgid "_Show/hide other layers" -msgstr "显示/隐藏其它层(_S)" +msgstr "显示/隐藏其他层(_S)" -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2671 msgid "Solo the current layer" -msgstr "仅显示当前层" +msgstr "仅显示当前图层" -#: ../src/verbs.cpp:2640 +#: ../src/verbs.cpp:2672 msgid "_Show all layers" msgstr "显示所有层(_S)" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2673 msgid "Show all the layers" msgstr "显示所有层" -#: ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2674 msgid "_Hide all layers" msgstr "隐藏所有层(_H)" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2675 msgid "Hide all the layers" msgstr "隐藏所有层" -#: ../src/verbs.cpp:2644 +#: ../src/verbs.cpp:2676 msgid "_Lock all layers" msgstr "锁定所有层(_L)" -#: ../src/verbs.cpp:2645 +#: ../src/verbs.cpp:2677 msgid "Lock all the layers" msgstr "锁定所有层" -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2678 msgid "Lock/Unlock _other layers" -msgstr "锁定/解锁其它层(_O)" +msgstr "锁定/解锁其他层(_O)" -#: ../src/verbs.cpp:2647 +#: ../src/verbs.cpp:2679 msgid "Lock all the other layers" -msgstr "锁定所有其它层" +msgstr "锁定所有其他层" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2680 msgid "_Unlock all layers" msgstr "解锁所有层(_U)" -#: ../src/verbs.cpp:2649 +#: ../src/verbs.cpp:2681 msgid "Unlock all the layers" msgstr "解锁所有层" -#: ../src/verbs.cpp:2650 +#: ../src/verbs.cpp:2682 msgid "_Lock/Unlock Current Layer" -msgstr "锁定/解锁当前层(_L)" +msgstr "锁定/解锁当前图层(_L)" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2683 msgid "Toggle lock on current layer" -msgstr "锁定或解锁当前层" +msgstr "锁定或解锁当前图层" -#: ../src/verbs.cpp:2652 +#: ../src/verbs.cpp:2684 msgid "_Show/hide Current Layer" -msgstr "显示/隐藏当前层(_S)" +msgstr "显示/隐藏当前图层(_S)" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2685 msgid "Toggle visibility of current layer" -msgstr "切换当前层的可见状态" +msgstr "切换当前图层的可见状态" #. Object -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2688 msgid "Rotate _90° CW" msgstr "顺时针旋转 _90°" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2659 +#: ../src/verbs.cpp:2691 msgid "Rotate selection 90° clockwise" msgstr "顺时针旋转选区 90°" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2692 msgid "Rotate 9_0° CCW" msgstr "逆时针旋转 9_0°" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2695 msgid "Rotate selection 90° counter-clockwise" msgstr "逆时针旋转选区 90°" -#: ../src/verbs.cpp:2664 +#: ../src/verbs.cpp:2696 msgid "Remove _Transformations" msgstr "移除变换(_T)" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2697 msgid "Remove transformations from object" msgstr "移除对象上的变换" -#: ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2698 msgid "_Object to Path" msgstr "对象转化成路径(_O)" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2699 msgid "Convert selected object to path" msgstr "把已选对象转化成路径" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2700 msgid "_Flow into Frame" msgstr "浮动转化成框架(_F)" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2701 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" -msgstr "把文字放到框架(路径或形形状)里,创建链接到框架对象的浮动文字" +msgstr "把文字放到框架(路径或形形状)里,创建链接到框架对象的浮动文字" -#: ../src/verbs.cpp:2670 +#: ../src/verbs.cpp:2702 msgid "_Unflow" msgstr "解除浮动(_U)" -#: ../src/verbs.cpp:2671 +#: ../src/verbs.cpp:2703 msgid "Remove text from frame (creates a single-line text object)" -msgstr "从框架中移除文字(创建一个单行文字对象)" +msgstr "从框架中移除文字(创建一个单行文字对象)" -#: ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2704 msgid "_Convert to Text" msgstr "转换为文字(_C)" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2705 msgid "Convert flowed text to regular text object (preserves appearance)" -msgstr "把浮动文字转化成一般文字对象(保持外观)" +msgstr "把浮动文字转化成一般文字对象(保持外观)" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2707 msgid "Flip _Horizontal" msgstr "水平翻转(_H)" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2707 msgid "Flip selected objects horizontally" msgstr "水平地翻转已选对象" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2710 msgid "Flip _Vertical" msgstr "垂直翻转(_V)" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2710 msgid "Flip selected objects vertically" msgstr "垂直地翻转已选对象" -#: ../src/verbs.cpp:2681 +#: ../src/verbs.cpp:2713 msgid "Apply mask to selection (using the topmost object as mask)" -msgstr "应用蒙版到选区(用最顶层对象作为蒙版)" +msgstr "应用蒙版到选区(用最顶层对象作为蒙版)" -#: ../src/verbs.cpp:2683 +#: ../src/verbs.cpp:2715 msgid "Edit mask" msgstr "编辑蒙版" -#: ../src/verbs.cpp:2684 ../src/verbs.cpp:2692 +#: ../src/verbs.cpp:2716 ../src/verbs.cpp:2724 msgid "_Release" msgstr "释放(_R)" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2717 msgid "Remove mask from selection" msgstr "从选区中移除蒙版" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2719 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" -msgstr "应用剪裁路径到选区(使用最顶层对象作为剪裁路径)" +msgstr "应用剪裁路径到选区(使用最顶层对象作为剪裁路径)" -#: ../src/verbs.cpp:2688 +#: ../src/verbs.cpp:2720 msgid "Create Cl_ip Group" msgstr "创建剪裁组(_I)" -#: ../src/verbs.cpp:2689 +#: ../src/verbs.cpp:2721 msgid "Creates a clip group using the selected objects as a base" msgstr "使用选择的对象作为一个基础创建一个剪裁组" -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2723 msgid "Edit clipping path" msgstr "编辑剪裁路径" -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2725 msgid "Remove clipping path from selection" msgstr "从选区中移除剪裁路径" #. Tools -#: ../src/verbs.cpp:2698 +#: ../src/verbs.cpp:2730 msgctxt "ContextVerb" msgid "Select" msgstr "选择" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2731 msgid "Select and transform objects" msgstr "选择并变换对象" -#: ../src/verbs.cpp:2700 +#: ../src/verbs.cpp:2732 msgctxt "ContextVerb" msgid "Node Edit" msgstr "节点编辑" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2733 msgid "Edit paths by nodes" msgstr "通过节点编辑路径" -#: ../src/verbs.cpp:2702 +#: ../src/verbs.cpp:2734 msgctxt "ContextVerb" msgid "Tweak" msgstr "扭曲" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2735 msgid "Tweak objects by sculpting or painting" msgstr "通过描绘和雕刻扭曲对象" -#: ../src/verbs.cpp:2704 +#: ../src/verbs.cpp:2736 msgctxt "ContextVerb" msgid "Spray" msgstr "喷绘" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2737 msgid "Spray objects by sculpting or painting" msgstr "通过描绘和雕刻装饰对象" -#: ../src/verbs.cpp:2706 +#: ../src/verbs.cpp:2738 msgctxt "ContextVerb" msgid "Rectangle" msgstr "矩形" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2739 msgid "Create rectangles and squares" msgstr "创建矩形或正方形" -#: ../src/verbs.cpp:2708 +#: ../src/verbs.cpp:2740 msgctxt "ContextVerb" msgid "3D Box" msgstr "3D 盒子" -#: ../src/verbs.cpp:2709 +#: ../src/verbs.cpp:2741 msgid "Create 3D boxes" msgstr "创建 3D 盒子" -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2742 msgctxt "ContextVerb" msgid "Ellipse" msgstr "椭圆" -#: ../src/verbs.cpp:2711 +#: ../src/verbs.cpp:2743 msgid "Create circles, ellipses, and arcs" msgstr "创建圆、椭圆或圆弧" -#: ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2744 msgctxt "ContextVerb" msgid "Star" msgstr "星形" -#: ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2745 msgid "Create stars and polygons" msgstr "创建星形或多边形" -#: ../src/verbs.cpp:2714 +#: ../src/verbs.cpp:2746 msgctxt "ContextVerb" msgid "Spiral" msgstr "螺旋" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2747 msgid "Create spirals" msgstr "创建螺旋" -#: ../src/verbs.cpp:2716 +#: ../src/verbs.cpp:2748 msgctxt "ContextVerb" msgid "Pencil" msgstr "铅笔" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2749 msgid "Draw freehand lines" msgstr "绘制手绘线" -#: ../src/verbs.cpp:2718 +#: ../src/verbs.cpp:2750 msgctxt "ContextVerb" msgid "Pen" msgstr "钢笔" -#: ../src/verbs.cpp:2719 +#: ../src/verbs.cpp:2751 msgid "Draw Bezier curves and straight lines" msgstr "绘制贝塞尔曲线和直线" -#: ../src/verbs.cpp:2720 +#: ../src/verbs.cpp:2752 msgctxt "ContextVerb" msgid "Calligraphy" msgstr "书法" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2753 msgid "Draw calligraphic or brush strokes" msgstr "创建书法或笔刷轮廓" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2755 msgid "Create and edit text objects" msgstr "创建编辑文字对象" -#: ../src/verbs.cpp:2724 +#: ../src/verbs.cpp:2756 msgctxt "ContextVerb" msgid "Gradient" msgstr "梯度" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2757 msgid "Create and edit gradients" msgstr "创建编辑渐变" -#: ../src/verbs.cpp:2726 +#: ../src/verbs.cpp:2758 msgctxt "ContextVerb" msgid "Mesh" msgstr "网状" -#: ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2759 msgid "Create and edit meshes" msgstr "创建并编辑网状" -#: ../src/verbs.cpp:2728 +#: ../src/verbs.cpp:2760 msgctxt "ContextVerb" msgid "Zoom" msgstr "缩放" -#: ../src/verbs.cpp:2729 +#: ../src/verbs.cpp:2761 msgid "Zoom in or out" msgstr "放大或缩小" -#: ../src/verbs.cpp:2731 +#: ../src/verbs.cpp:2763 msgid "Measurement tool" msgstr "测量工具" -#: ../src/verbs.cpp:2732 +#: ../src/verbs.cpp:2764 msgctxt "ContextVerb" msgid "Dropper" msgstr "吸管" -#: ../src/verbs.cpp:2734 +#: ../src/verbs.cpp:2766 msgctxt "ContextVerb" msgid "Connector" msgstr "连接器" -#: ../src/verbs.cpp:2735 +#: ../src/verbs.cpp:2767 msgid "Create diagram connectors" msgstr "创建流程图连接器" -#: ../src/verbs.cpp:2736 +#: ../src/verbs.cpp:2770 msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "油漆桶" -#: ../src/verbs.cpp:2737 +#: ../src/verbs.cpp:2771 msgid "Fill bounded areas" msgstr "填充封闭区域" -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2774 msgctxt "ContextVerb" msgid "LPE Edit" msgstr "LPE 编辑" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2775 msgid "Edit Path Effect parameters" msgstr "编辑路径效果的参数" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2776 msgctxt "ContextVerb" msgid "Eraser" msgstr "橡皮" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2777 msgid "Erase existing paths" msgstr "擦除现有路径" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2778 msgctxt "ContextVerb" msgid "LPE Tool" msgstr "LPE 工具" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2779 msgid "Do geometric constructions" msgstr "执行几何构造" #. Tool prefs -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2781 msgid "Selector Preferences" msgstr "选择器首选项" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2782 msgid "Open Preferences for the Selector tool" msgstr "打开选择工具的首选项" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2783 msgid "Node Tool Preferences" msgstr "节点工具首选项" -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2784 msgid "Open Preferences for the Node tool" msgstr "打开节点工具的首选项" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2785 msgid "Tweak Tool Preferences" msgstr "扭曲工具设置" -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2786 msgid "Open Preferences for the Tweak tool" msgstr "打开扭曲工具的首选项" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2787 msgid "Spray Tool Preferences" msgstr "喷绘工具设置" -#: ../src/verbs.cpp:2752 +#: ../src/verbs.cpp:2788 msgid "Open Preferences for the Spray tool" msgstr "打开喷绘工具的首选项" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2789 msgid "Rectangle Preferences" msgstr "矩形首选项" -#: ../src/verbs.cpp:2754 +#: ../src/verbs.cpp:2790 msgid "Open Preferences for the Rectangle tool" msgstr "打开矩形工具的首选项" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2791 msgid "3D Box Preferences" msgstr "3D 盒子设置" -#: ../src/verbs.cpp:2756 +#: ../src/verbs.cpp:2792 msgid "Open Preferences for the 3D Box tool" msgstr "打开 3D 盒子的首选项" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2793 msgid "Ellipse Preferences" msgstr "椭圆首选项" -#: ../src/verbs.cpp:2758 +#: ../src/verbs.cpp:2794 msgid "Open Preferences for the Ellipse tool" msgstr "打开椭圆工具的首选项" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2795 msgid "Star Preferences" msgstr "星形首选项" -#: ../src/verbs.cpp:2760 +#: ../src/verbs.cpp:2796 msgid "Open Preferences for the Star tool" msgstr "打开星形工具的首选项" -#: ../src/verbs.cpp:2761 +#: ../src/verbs.cpp:2797 msgid "Spiral Preferences" msgstr "螺旋首选项" -#: ../src/verbs.cpp:2762 +#: ../src/verbs.cpp:2798 msgid "Open Preferences for the Spiral tool" msgstr "打开螺旋工具的首选项" -#: ../src/verbs.cpp:2763 +#: ../src/verbs.cpp:2799 msgid "Pencil Preferences" msgstr "铅笔首选项" -#: ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2800 msgid "Open Preferences for the Pencil tool" msgstr "打开铅笔工具的首选项" -#: ../src/verbs.cpp:2765 +#: ../src/verbs.cpp:2801 msgid "Pen Preferences" msgstr "钢笔首选项" -#: ../src/verbs.cpp:2766 +#: ../src/verbs.cpp:2802 msgid "Open Preferences for the Pen tool" msgstr "打开钢笔工具的首选项" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2803 msgid "Calligraphic Preferences" msgstr "书法首选项" -#: ../src/verbs.cpp:2768 +#: ../src/verbs.cpp:2804 msgid "Open Preferences for the Calligraphy tool" msgstr "打开书法工具的首选项" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2805 msgid "Text Preferences" msgstr "文字首选项" -#: ../src/verbs.cpp:2770 +#: ../src/verbs.cpp:2806 msgid "Open Preferences for the Text tool" msgstr "打开文字工具的首选项" -#: ../src/verbs.cpp:2771 +#: ../src/verbs.cpp:2807 msgid "Gradient Preferences" msgstr "渐变首选项" -#: ../src/verbs.cpp:2772 +#: ../src/verbs.cpp:2808 msgid "Open Preferences for the Gradient tool" msgstr "打开渐变工具的首选项" -#: ../src/verbs.cpp:2773 +#: ../src/verbs.cpp:2809 msgid "Mesh Preferences" msgstr "网格设置" -#: ../src/verbs.cpp:2774 +#: ../src/verbs.cpp:2810 msgid "Open Preferences for the Mesh tool" msgstr "打开网状工具的首选项" -#: ../src/verbs.cpp:2775 +#: ../src/verbs.cpp:2811 msgid "Zoom Preferences" msgstr "缩放首选项" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2812 msgid "Open Preferences for the Zoom tool" msgstr "打开缩放工具的首选项" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2813 msgid "Measure Preferences" msgstr "测量首选项" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2814 msgid "Open Preferences for the Measure tool" msgstr "打开测量工具的首选项" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2815 msgid "Dropper Preferences" -msgstr "取色器首选项" +msgstr "拾色器首选项" -#: ../src/verbs.cpp:2780 +#: ../src/verbs.cpp:2816 msgid "Open Preferences for the Dropper tool" -msgstr "打开取色器工具的首选项" +msgstr "打开拾色器工具的首选项" -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2817 msgid "Connector Preferences" msgstr "连接器首选项" -#: ../src/verbs.cpp:2782 +#: ../src/verbs.cpp:2818 msgid "Open Preferences for the Connector tool" msgstr "打开连接器工具的首选项" -#: ../src/verbs.cpp:2783 +#: ../src/verbs.cpp:2821 msgid "Paint Bucket Preferences" msgstr "油漆桶设置" -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2822 msgid "Open Preferences for the Paint Bucket tool" msgstr "打开油漆桶设置工具" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2825 msgid "Eraser Preferences" msgstr "橡皮擦配置" -#: ../src/verbs.cpp:2786 +#: ../src/verbs.cpp:2826 msgid "Open Preferences for the Eraser tool" msgstr "打开橡皮擦工具的首选项" -#: ../src/verbs.cpp:2787 +#: ../src/verbs.cpp:2827 msgid "LPE Tool Preferences" msgstr "LPE 工具首选项" -#: ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2828 msgid "Open Preferences for the LPETool tool" msgstr "打开 LPE 工具的首选项" #. Zoom/View -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2830 msgid "Zoom In" msgstr "放大" -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2830 msgid "Zoom in" msgstr "放大" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2831 msgid "Zoom Out" msgstr "缩小" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2831 msgid "Zoom out" msgstr "缩小" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2832 msgid "_Rulers" msgstr "标尺(_R)" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2832 msgid "Show or hide the canvas rulers" msgstr "显示或隐藏画布标尺" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2833 msgid "Scroll_bars" msgstr "滚动条(_B)" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2833 msgid "Show or hide the canvas scrollbars" msgstr "显示或隐藏画布滚动条" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2834 msgid "Page _Grid" msgstr "页面网格(_G)" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2834 msgid "Show or hide the page grid" msgstr "显示或隐藏页面网格" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2835 msgid "G_uides" msgstr "标尺(_U)" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2835 msgid "Show or hide guides (drag from a ruler to create a guide)" -msgstr "显示或隐藏参考线(从标尺拖动即可创建)" +msgstr "显示或隐藏参考线(从标尺拖动即可创建)" -#: ../src/verbs.cpp:2796 +#: ../src/verbs.cpp:2836 msgid "Enable snapping" msgstr "打开吸附" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2837 msgid "_Commands Bar" msgstr "命令栏(_C)" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2837 msgid "Show or hide the Commands bar (under the menu)" -msgstr "显示或隐藏命令栏(到菜单下)" +msgstr "显示或隐藏命令栏(到菜单下)" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2838 msgid "Sn_ap Controls Bar" msgstr "吸附控制栏(_A)" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2838 msgid "Show or hide the snapping controls" msgstr "显示或隐藏吸附控制栏" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2839 msgid "T_ool Controls Bar" msgstr "工具控制栏(_O)" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2839 msgid "Show or hide the Tool Controls bar" msgstr "显示或隐藏工具控制栏" -#: ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2840 msgid "_Toolbox" msgstr "工具箱(_T)" -#: ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2840 msgid "Show or hide the main toolbox (on the left)" -msgstr "显示或隐藏主工具箱(到左边)" +msgstr "显示或隐藏主工具箱(到左边)" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2841 msgid "_Palette" msgstr "调色板(_P)" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2841 msgid "Show or hide the color palette" msgstr "显示或隐藏颜色调色板" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2842 msgid "_Statusbar" msgstr "状态栏(_S)" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2842 msgid "Show or hide the statusbar (at the bottom of the window)" -msgstr "显示或隐藏状态栏(到窗口底部)" +msgstr "显示或隐藏状态栏(到窗口底部)" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2843 msgid "Nex_t Zoom" msgstr "下一缩放(_T)" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2843 msgid "Next zoom (from the history of zooms)" -msgstr "下一缩放(来自缩放历史)" +msgstr "下一缩放(来自缩放历史)" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2845 msgid "Pre_vious Zoom" msgstr "前一缩放(_V)" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2845 msgid "Previous zoom (from the history of zooms)" -msgstr "前一缩放(来自缩放历史)" +msgstr "前一缩放(来自缩放历史)" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2847 msgid "Zoom 1:_1" msgstr "1:_1 缩放" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2847 msgid "Zoom to 1:1" msgstr "缩放到 1:1" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2849 msgid "Zoom 1:_2" msgstr "1:_2 缩放" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2849 msgid "Zoom to 1:2" msgstr "缩放到 1:2" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2851 msgid "_Zoom 2:1" msgstr "2:1 缩放(_Z)" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2851 msgid "Zoom to 2:1" msgstr "缩放到 2:1" -#: ../src/verbs.cpp:2814 +#: ../src/verbs.cpp:2853 msgid "_Fullscreen" msgstr "全屏(_F)" -#: ../src/verbs.cpp:2814 ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2853 ../src/verbs.cpp:2855 msgid "Stretch this document window to full screen" msgstr "拉伸文档窗口到全屏" -#: ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2855 msgid "Fullscreen & Focus Mode" -msgstr "全屏和焦点模式" +msgstr "全屏和专注模式" -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2857 msgid "Toggle _Focus Mode" -msgstr "切换激活模式(_F)" +msgstr "切换专注模式(_F)" -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2857 msgid "Remove excess toolbars to focus on drawing" -msgstr "移除过多的工具栏,以专注于绘图" +msgstr "移除过多的工具栏以专注于绘图" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2859 msgid "Duplic_ate Window" msgstr "再制窗口(_A)" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2859 msgid "Open a new window with the same document" msgstr "打开同一个文档的新窗口" -#: ../src/verbs.cpp:2823 +#: ../src/verbs.cpp:2861 msgid "_New View Preview" msgstr "新预览视图(_N)" -#: ../src/verbs.cpp:2824 +#: ../src/verbs.cpp:2862 msgid "New View Preview" msgstr "新预览视图" #. "view_new_preview" -#: ../src/verbs.cpp:2826 ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2864 ../src/verbs.cpp:2872 msgid "_Normal" msgstr "正常(_N)" -#: ../src/verbs.cpp:2827 +#: ../src/verbs.cpp:2865 msgid "Switch to normal display mode" msgstr "切换到正常显示模式" -#: ../src/verbs.cpp:2828 +#: ../src/verbs.cpp:2866 msgid "No _Filters" msgstr "无滤镜(_F)" -#: ../src/verbs.cpp:2829 +#: ../src/verbs.cpp:2867 msgid "Switch to normal display without filters" msgstr "切换到正常显示模式,不显示滤镜" -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2868 msgid "_Outline" msgstr "轮廓(_O)" -#: ../src/verbs.cpp:2831 +#: ../src/verbs.cpp:2869 msgid "Switch to outline (wireframe) display mode" msgstr "切换到轮廓显示模式" #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), #. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2832 ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2870 ../src/verbs.cpp:2878 msgid "_Toggle" msgstr "切换(_T)" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2871 msgid "Toggle between normal and outline display modes" msgstr "在普通和轮廓显示模式之间切换" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2873 msgid "Switch to normal color display mode" msgstr "切换到正常颜色显示模式" -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2874 msgid "_Grayscale" msgstr "灰度(_G)" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2875 msgid "Switch to grayscale display mode" msgstr "切换到灰色显示模式" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2879 msgid "Toggle between normal and grayscale color display modes" msgstr "在正常和灰色显示模式之间切换" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2881 msgid "Color-managed view" msgstr "颜色控制视图" -#: ../src/verbs.cpp:2844 +#: ../src/verbs.cpp:2882 msgid "Toggle color-managed display for this document window" msgstr "切换该文档窗口的受控色彩显示" -#: ../src/verbs.cpp:2846 +#: ../src/verbs.cpp:2884 msgid "Ico_n Preview..." -msgstr "图标预览(_N)…" +msgstr "图标预览(_N)..." -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2885 msgid "Open a window to preview objects at different icon resolutions" msgstr "以不同的图标分辨率打开窗口预览对象" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2887 msgid "Zoom to fit page in window" msgstr "缩放页面以适合窗口" -#: ../src/verbs.cpp:2850 +#: ../src/verbs.cpp:2888 msgid "Page _Width" msgstr "页面宽度(_W)" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2889 msgid "Zoom to fit page width in window" msgstr "缩放页面宽度以适合窗口" -#: ../src/verbs.cpp:2853 +#: ../src/verbs.cpp:2891 msgid "Zoom to fit drawing in window" msgstr "缩放绘图以适合窗口" -#: ../src/verbs.cpp:2855 +#: ../src/verbs.cpp:2893 msgid "Zoom to fit selection in window" msgstr "缩放选区以适合窗口" #. Dialogs -#: ../src/verbs.cpp:2858 +#: ../src/verbs.cpp:2896 msgid "P_references..." -msgstr "首选项(_P)…" +msgstr "首选项(_P)..." -#: ../src/verbs.cpp:2859 +#: ../src/verbs.cpp:2897 msgid "Edit global Inkscape preferences" msgstr "编辑 Inkscape 全局首选项" -#: ../src/verbs.cpp:2860 +#: ../src/verbs.cpp:2898 msgid "_Document Properties..." -msgstr "文档属性(_D)…" +msgstr "文档属性(_D)..." -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2899 msgid "Edit properties of this document (to be saved with the document)" -msgstr "编辑文档的属性(同文档一起保存)" +msgstr "编辑文档的属性(同文档一起保存)" -#: ../src/verbs.cpp:2862 +#: ../src/verbs.cpp:2900 msgid "Document _Metadata..." -msgstr "文档元数据(_M)…" +msgstr "文档元数据(_M)..." -#: ../src/verbs.cpp:2863 +#: ../src/verbs.cpp:2901 msgid "Edit document metadata (to be saved with the document)" -msgstr "编辑文档元数据(同文档一起保存)" +msgstr "编辑文档元数据(同文档一起保存)" -#: ../src/verbs.cpp:2865 +#: ../src/verbs.cpp:2903 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " "properties..." -msgstr "编辑对象的颜色、渐变、箭头和其它填充和笔廓属性…" +msgstr "编辑对象的颜色、渐变、箭头和其他填充和笔刷属性..." #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2867 +#: ../src/verbs.cpp:2905 msgid "Gl_yphs..." -msgstr "字符(_Y)…" +msgstr "字符(_Y)..." -#: ../src/verbs.cpp:2868 +#: ../src/verbs.cpp:2906 msgid "Select characters from a glyphs palette" msgstr "从象形文字板中选择字符" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2871 +#: ../src/verbs.cpp:2909 msgid "S_watches..." -msgstr "色盘(_W)…" +msgstr "色盘(_W)..." -#: ../src/verbs.cpp:2872 +#: ../src/verbs.cpp:2910 msgid "Select colors from a swatches palette" msgstr "从色盘中选择颜色" -#: ../src/verbs.cpp:2873 +#: ../src/verbs.cpp:2911 msgid "S_ymbols..." -msgstr "符号(_Y)…" +msgstr "符号(_Y)..." -#: ../src/verbs.cpp:2874 +#: ../src/verbs.cpp:2912 msgid "Select symbol from a symbols palette" msgstr "从符号板中选择符号" -#: ../src/verbs.cpp:2875 +#: ../src/verbs.cpp:2913 msgid "Transfor_m..." -msgstr "变换(_M)…" +msgstr "变换(_M)..." -#: ../src/verbs.cpp:2876 +#: ../src/verbs.cpp:2914 msgid "Precisely control objects' transformations" msgstr "精确控制对象的变换" -#: ../src/verbs.cpp:2877 +#: ../src/verbs.cpp:2915 msgid "_Align and Distribute..." -msgstr "对齐和分散(_A)…" +msgstr "对齐和分散(_A)..." -#: ../src/verbs.cpp:2878 +#: ../src/verbs.cpp:2916 msgid "Align and distribute objects" msgstr "对齐散开对象" -#: ../src/verbs.cpp:2879 +#: ../src/verbs.cpp:2917 msgid "_Spray options..." -msgstr "喷绘选项(_S)…" +msgstr "喷绘选项(_S)..." -#: ../src/verbs.cpp:2880 +#: ../src/verbs.cpp:2918 msgid "Some options for the spray" msgstr "喷绘的一些选项" -#: ../src/verbs.cpp:2881 +#: ../src/verbs.cpp:2919 msgid "Undo _History..." -msgstr "撤销历史(_H)…" +msgstr "撤销历史(_H)..." -#: ../src/verbs.cpp:2882 +#: ../src/verbs.cpp:2920 msgid "Undo History" msgstr "撤销历史" -#: ../src/verbs.cpp:2884 +#: ../src/verbs.cpp:2922 msgid "View and select font family, font size and other text properties" -msgstr "显示选择字体名称、字体大小和其它文本属性" +msgstr "显示选择字体名称、字体大小和其他文本属性" -#: ../src/verbs.cpp:2885 +#: ../src/verbs.cpp:2923 msgid "_XML Editor..." -msgstr "_XML 编辑器…" +msgstr "_XML 编辑器..." -#: ../src/verbs.cpp:2886 +#: ../src/verbs.cpp:2924 msgid "View and edit the XML tree of the document" msgstr "显示并编辑文档的 XML 树" -#: ../src/verbs.cpp:2887 +#: ../src/verbs.cpp:2925 msgid "_Find/Replace..." -msgstr "查找/替换(_F)…" +msgstr "查找/替换(_F)..." -#: ../src/verbs.cpp:2888 +#: ../src/verbs.cpp:2926 msgid "Find objects in document" msgstr "查找文档中的对象" -#: ../src/verbs.cpp:2889 +#: ../src/verbs.cpp:2927 msgid "Find and _Replace Text..." -msgstr "查找并替换文本(_R)…" +msgstr "查找并替换文本(_R)..." -#: ../src/verbs.cpp:2890 +#: ../src/verbs.cpp:2928 msgid "Find and replace text in document" msgstr "查找并替换文档中的文本" -#: ../src/verbs.cpp:2892 +#: ../src/verbs.cpp:2930 msgid "Check spelling of text in document" msgstr "检查文档中的文本拼写" -#: ../src/verbs.cpp:2893 +#: ../src/verbs.cpp:2931 msgid "_Messages..." -msgstr "消息(_M)…" +msgstr "消息(_M)..." -#: ../src/verbs.cpp:2894 +#: ../src/verbs.cpp:2932 msgid "View debug messages" msgstr "显示调试消息" -#: ../src/verbs.cpp:2895 +#: ../src/verbs.cpp:2933 msgid "Show/Hide D_ialogs" msgstr "显示/隐藏对话框(_I)" -#: ../src/verbs.cpp:2896 +#: ../src/verbs.cpp:2934 msgid "Show or hide all open dialogs" msgstr "显示或隐藏所有打开的对话框" -#: ../src/verbs.cpp:2897 +#: ../src/verbs.cpp:2935 msgid "Create Tiled Clones..." -msgstr "创建平铺克隆…" +msgstr "创建平铺克隆..." -#: ../src/verbs.cpp:2898 +#: ../src/verbs.cpp:2936 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" msgstr "创建选择对象的多个克隆, 按照图案或者分散的安排" -#: ../src/verbs.cpp:2899 +#: ../src/verbs.cpp:2937 msgid "_Object attributes..." -msgstr "对象属性(_O)…" +msgstr "对象属性(_O)..." -#: ../src/verbs.cpp:2900 +#: ../src/verbs.cpp:2938 msgid "Edit the object attributes..." -msgstr "编辑对象属性…" +msgstr "编辑对象属性..." -#: ../src/verbs.cpp:2902 +#: ../src/verbs.cpp:2940 msgid "Edit the ID, locked and visible status, and other object properties" -msgstr "编辑对象的 ID、锁定和可见状态、以及其它属性" +msgstr "编辑对象的 ID、锁定和可见状态、以及其他属性" -#: ../src/verbs.cpp:2903 +#: ../src/verbs.cpp:2941 msgid "_Input Devices..." msgstr "输入设备(_I)" -#: ../src/verbs.cpp:2904 +#: ../src/verbs.cpp:2942 msgid "Configure extended input devices, such as a graphics tablet" msgstr "配置扩展输入设备,例如绘图板" -#: ../src/verbs.cpp:2905 +#: ../src/verbs.cpp:2943 msgid "_Extensions..." -msgstr "扩展(_E)…" +msgstr "扩展(_E)..." -#: ../src/verbs.cpp:2906 +#: ../src/verbs.cpp:2944 msgid "Query information about extensions" msgstr "查询扩展的信息" -#: ../src/verbs.cpp:2907 +#: ../src/verbs.cpp:2945 msgid "Layer_s..." -msgstr "图层(_S)…" +msgstr "图层(_S)..." -#: ../src/verbs.cpp:2908 +#: ../src/verbs.cpp:2946 msgid "View Layers" msgstr "显示图层" -#: ../src/verbs.cpp:2909 +#: ../src/verbs.cpp:2947 msgid "Object_s..." -msgstr "对象(_S)…" +msgstr "对象(_S)..." -#: ../src/verbs.cpp:2910 +#: ../src/verbs.cpp:2948 msgid "View Objects" msgstr "查看对象" -#: ../src/verbs.cpp:2911 +#: ../src/verbs.cpp:2949 msgid "Selection se_ts..." -msgstr "选区集合(_T)…" +msgstr "选区集合(_T)..." -#: ../src/verbs.cpp:2912 +#: ../src/verbs.cpp:2950 msgid "View Tags" msgstr "查看标记" -#: ../src/verbs.cpp:2913 +#: ../src/verbs.cpp:2951 msgid "Path E_ffects ..." -msgstr "路径效果(_F)…" +msgstr "路径效果(_F)..." -#: ../src/verbs.cpp:2914 +#: ../src/verbs.cpp:2952 msgid "Manage, edit, and apply path effects" msgstr "管理、编辑并应用路径效果" -#: ../src/verbs.cpp:2915 +#: ../src/verbs.cpp:2953 msgid "Filter _Editor..." -msgstr "滤镜编辑器(_E)…" +msgstr "滤镜编辑器(_E)..." -#: ../src/verbs.cpp:2916 +#: ../src/verbs.cpp:2954 msgid "Manage, edit, and apply SVG filters" msgstr "管理、编辑并应用 SVG 滤镜效果" -#: ../src/verbs.cpp:2917 +#: ../src/verbs.cpp:2955 msgid "SVG Font Editor..." -msgstr "SVG 字体编辑器…" +msgstr "SVG 字体编辑器..." -#: ../src/verbs.cpp:2918 +#: ../src/verbs.cpp:2956 msgid "Edit SVG fonts" msgstr "编辑 SVG 字体" -#: ../src/verbs.cpp:2919 +#: ../src/verbs.cpp:2957 msgid "Print Colors..." -msgstr "打印色彩…" +msgstr "打印色彩..." -#: ../src/verbs.cpp:2920 +#: ../src/verbs.cpp:2958 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "选择要使用“打印颜色预览”渲染模式渲染的色彩分离模式" -#: ../src/verbs.cpp:2921 +#: ../src/verbs.cpp:2959 msgid "_Export PNG Image..." -msgstr "导出 PNG 图像(_E)…" +msgstr "导出 PNG 图像(_E)..." -#: ../src/verbs.cpp:2922 +#: ../src/verbs.cpp:2960 msgid "Export this document or a selection as a PNG image" msgstr "导出本文档或选区为 PNG 图像" #. Help -#: ../src/verbs.cpp:2924 +#: ../src/verbs.cpp:2962 msgid "About E_xtensions" msgstr "关于扩展(_X)" -#: ../src/verbs.cpp:2925 +#: ../src/verbs.cpp:2963 msgid "Information on Inkscape extensions" msgstr "Inkscape 扩展信息" -#: ../src/verbs.cpp:2926 +#: ../src/verbs.cpp:2964 msgid "About _Memory" msgstr "关于内存(_M)" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:2965 msgid "Memory usage information" msgstr "内存使用信息" -#: ../src/verbs.cpp:2928 +#: ../src/verbs.cpp:2966 msgid "_About Inkscape" msgstr "关于 Inkscape(_A)" -#: ../src/verbs.cpp:2929 +#: ../src/verbs.cpp:2967 msgid "Inkscape version, authors, license" msgstr "Inscape 版本、作者、许可" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2934 +#: ../src/verbs.cpp:2972 msgid "Inkscape: _Basic" msgstr "Inkscape:基础(_B)" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:2973 msgid "Getting started with Inkscape" msgstr "开始学习 Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2936 +#: ../src/verbs.cpp:2974 msgid "Inkscape: _Shapes" msgstr "Inkscape:形状(_S)" -#: ../src/verbs.cpp:2937 +#: ../src/verbs.cpp:2975 msgid "Using shape tools to create and edit shapes" msgstr "使用形状工具创建和编辑形状" -#: ../src/verbs.cpp:2938 +#: ../src/verbs.cpp:2976 msgid "Inkscape: _Advanced" msgstr "Inkscape:高级(_A)" -#: ../src/verbs.cpp:2939 +#: ../src/verbs.cpp:2977 msgid "Advanced Inkscape topics" msgstr "高级 Inkscape 话题" -#. "tutorial_advanced" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2941 +#: ../src/verbs.cpp:2981 msgid "Inkscape: T_racing" msgstr "Inkscape:临摹(_R)" -#: ../src/verbs.cpp:2942 +#: ../src/verbs.cpp:2982 msgid "Using bitmap tracing" msgstr "位图临摹" -#. "tutorial_tracing" -#: ../src/verbs.cpp:2943 +#: ../src/verbs.cpp:2985 msgid "Inkscape: Tracing Pixel Art" msgstr "Inkscape:临摹像素画" -#: ../src/verbs.cpp:2944 +#: ../src/verbs.cpp:2986 msgid "Using Trace Pixel Art dialog" msgstr "使用临摹像素画对话框" -#: ../src/verbs.cpp:2945 +#: ../src/verbs.cpp:2987 msgid "Inkscape: _Calligraphy" msgstr "Inkscape:书法(_C)" -#: ../src/verbs.cpp:2946 +#: ../src/verbs.cpp:2988 msgid "Using the Calligraphy pen tool" msgstr "使用书法工具" -#: ../src/verbs.cpp:2947 +#: ../src/verbs.cpp:2989 msgid "Inkscape: _Interpolate" msgstr "Inkscape:插值(_I)" -#: ../src/verbs.cpp:2948 +#: ../src/verbs.cpp:2990 msgid "Using the interpolate extension" msgstr "使用插值扩展" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2949 +#: ../src/verbs.cpp:2991 msgid "_Elements of Design" msgstr "设计元素(_E)" -#: ../src/verbs.cpp:2950 +#: ../src/verbs.cpp:2992 msgid "Principles of design in the tutorial form" msgstr "以向导方式介绍设计原理" #. "tutorial_design" -#: ../src/verbs.cpp:2951 +#: ../src/verbs.cpp:2993 msgid "_Tips and Tricks" msgstr "提示与技巧(_T)" -#: ../src/verbs.cpp:2952 +#: ../src/verbs.cpp:2994 msgid "Miscellaneous tips and tricks" msgstr "杂项提示与技巧" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2955 +#: ../src/verbs.cpp:2997 msgid "Previous Exte_nsion" msgstr "上一个扩展(_N)" -#: ../src/verbs.cpp:2956 +#: ../src/verbs.cpp:2998 msgid "Repeat the last extension with the same settings" msgstr "使用相同的设置重复上次的扩展" -#: ../src/verbs.cpp:2957 +#: ../src/verbs.cpp:2999 msgid "_Previous Extension Settings..." -msgstr "先前的扩展设置(_P)…" +msgstr "先前的扩展设置(_P)..." -#: ../src/verbs.cpp:2958 +#: ../src/verbs.cpp:3000 msgid "Repeat the last extension with new settings" msgstr "使用新的设置重复上次的扩展" -#: ../src/verbs.cpp:2962 +#: ../src/verbs.cpp:3004 msgid "Fit the page to the current selection" msgstr "当前选区适合页面" -#: ../src/verbs.cpp:2964 +#: ../src/verbs.cpp:3006 msgid "Fit the page to the drawing" msgstr "适合画布到绘图" -#: ../src/verbs.cpp:2966 +#: ../src/verbs.cpp:3008 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "没有选区时适合页面到当前选区或者绘图" -#: ../src/verbs.cpp:2970 +#: ../src/verbs.cpp:3012 msgid "Unlock All in All Layers" msgstr "在所有层中撤销所有锁定" -#: ../src/verbs.cpp:2972 +#: ../src/verbs.cpp:3014 msgid "Unhide All" msgstr "撤销所有隐藏" -#: ../src/verbs.cpp:2974 +#: ../src/verbs.cpp:3016 msgid "Unhide All in All Layers" msgstr "所有层中撤销所有隐藏" -#: ../src/verbs.cpp:2978 +#: ../src/verbs.cpp:3020 msgid "Link an ICC color profile" msgstr "链接一个 ICC 色彩配置文件" -#: ../src/verbs.cpp:2979 +#: ../src/verbs.cpp:3021 msgid "Remove Color Profile" msgstr "移除色彩配置文件" -#: ../src/verbs.cpp:2980 +#: ../src/verbs.cpp:3022 msgid "Remove a linked ICC color profile" msgstr "移除已链接的 ICC 色彩配置文件" -#: ../src/verbs.cpp:2983 +#: ../src/verbs.cpp:3025 msgid "Add External Script" msgstr "添加外部脚本" -#: ../src/verbs.cpp:2983 +#: ../src/verbs.cpp:3025 msgid "Add an external script" msgstr "添加一个外部脚本" -#: ../src/verbs.cpp:2985 +#: ../src/verbs.cpp:3027 msgid "Add Embedded Script" msgstr "添加嵌入脚本" -#: ../src/verbs.cpp:2985 +#: ../src/verbs.cpp:3027 msgid "Add an embedded script" msgstr "添加一个嵌入脚本" -#: ../src/verbs.cpp:2987 +#: ../src/verbs.cpp:3029 msgid "Edit Embedded Script" msgstr "编辑嵌入脚本" -#: ../src/verbs.cpp:2987 +#: ../src/verbs.cpp:3029 msgid "Edit an embedded script" msgstr "编辑一个嵌入脚本" -#: ../src/verbs.cpp:2989 +#: ../src/verbs.cpp:3031 msgid "Remove External Script" msgstr "移除外部脚本" -#: ../src/verbs.cpp:2989 +#: ../src/verbs.cpp:3031 msgid "Remove an external script" msgstr "移除一个外部脚本" -#: ../src/verbs.cpp:2991 +#: ../src/verbs.cpp:3033 msgid "Remove Embedded Script" msgstr "移除嵌入脚本" -#: ../src/verbs.cpp:2991 +#: ../src/verbs.cpp:3033 msgid "Remove an embedded script" msgstr "移除一个嵌入脚本" -#: ../src/verbs.cpp:3013 ../src/verbs.cpp:3014 +#: ../src/verbs.cpp:3055 ../src/verbs.cpp:3056 msgid "Center on horizontal and vertical axis" msgstr "水平和垂直轴上的中心" @@ -27214,7 +27392,7 @@ msgstr "起点:" #: ../src/widgets/arc-toolbar.cpp:320 msgid "The angle (in degrees) from the horizontal to the arc's start point" -msgstr "水平方向到弧起点的角度(°)" +msgstr "水平方向到弧起点的角度(°)" #: ../src/widgets/arc-toolbar.cpp:332 msgid "End:" @@ -27222,7 +27400,7 @@ msgstr "终止:" #: ../src/widgets/arc-toolbar.cpp:333 msgid "The angle (in degrees) from the horizontal to the arc's end point" -msgstr "水平方向到弧终点的角度(°)" +msgstr "水平方向到弧终点的角度(°)" #: ../src/widgets/arc-toolbar.cpp:349 msgid "Closed arc" @@ -27230,7 +27408,7 @@ msgstr "封闭圆弧" #: ../src/widgets/arc-toolbar.cpp:350 msgid "Switch to segment (closed shape with two radii)" -msgstr "切换为线段(用两个半径线闭合形状)" +msgstr "切换为线段(用两个半径线闭合形状)" #: ../src/widgets/arc-toolbar.cpp:356 msgid "Open Arc" @@ -27238,7 +27416,7 @@ msgstr "开口圆弧" #: ../src/widgets/arc-toolbar.cpp:357 msgid "Switch to arc (unclosed shape)" -msgstr "变为弧线(非封闭形状)" +msgstr "变为弧线(非封闭形状)" #: ../src/widgets/arc-toolbar.cpp:380 msgid "Make whole" @@ -27251,7 +27429,7 @@ msgstr "把形状做成整个椭圆,而非不是弧或线段" #. TODO: use the correct axis here, too #: ../src/widgets/box3d-toolbar.cpp:233 msgid "3D Box: Change perspective (angle of infinite axis)" -msgstr "3D 盒子:改变透视(无限轴的角度)" +msgstr "3D 盒子:改变透视(无限轴的角度)" #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle in X direction" @@ -27265,11 +27443,11 @@ msgstr "X 向透视线的角度" #. Translators: VP is short for 'vanishing point' #: ../src/widgets/box3d-toolbar.cpp:326 msgid "State of VP in X direction" -msgstr "X 向消失点(VP)的状态" +msgstr "X 向消失点(VP)的状态" #: ../src/widgets/box3d-toolbar.cpp:327 msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" -msgstr "X 向消失点(VP)设置为“有限”或“无限”(=平行)" +msgstr "X 向消失点(VP)设置为“有限”或“无限”(=平行)" #: ../src/widgets/box3d-toolbar.cpp:342 msgid "Angle in Y direction" @@ -27291,7 +27469,7 @@ msgstr "Y 向消失点的状态" #: ../src/widgets/box3d-toolbar.cpp:366 msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" -msgstr "Y 向消失点设置为“有限”或“无限”(相当于平行)" +msgstr "Y 向消失点设置为“有限”或“无限”(相当于平行)" #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle in Z direction" @@ -27309,7 +27487,7 @@ msgstr "Z 向消失点的状态" #: ../src/widgets/box3d-toolbar.cpp:405 msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" -msgstr "Z 向消失点VP设置为“有限”或“无限”(相当于平行)" +msgstr "Z 向消失点VP设置为“有限”或“无限”(相当于平行)" #. gint preset_index = ege_select_one_action_get_active( sel ); #: ../src/widgets/calligraphy-toolbar.cpp:218 @@ -27320,58 +27498,58 @@ msgstr "无预置" #. Width #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(hairline)" -msgstr "(毛细)" +msgstr "(毛细)" #. Mean #. Rotation #. Scale #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:374 -#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 -#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 -#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 -#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 -#: ../src/widgets/tweak-toolbar.cpp:350 +#: ../src/widgets/eraser-toolbar.cpp:151 ../src/widgets/pencil-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 +#: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:408 +#: ../src/widgets/spray-toolbar.cpp:438 ../src/widgets/spray-toolbar.cpp:456 +#: ../src/widgets/spray-toolbar.cpp:605 ../src/widgets/tweak-toolbar.cpp:125 +#: ../src/widgets/tweak-toolbar.cpp:142 ../src/widgets/tweak-toolbar.cpp:350 msgid "(default)" -msgstr "(默认)" +msgstr "(默认)" #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(broad stroke)" -msgstr "(宽笔画)" +msgstr "(宽笔画)" #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 +#: ../src/widgets/eraser-toolbar.cpp:154 msgid "Pen Width" msgstr "笔宽" #: ../src/widgets/calligraphy-toolbar.cpp:431 msgid "The width of the calligraphic pen (relative to the visible canvas area)" -msgstr "书法笔刷宽度(相对于可见画布面积)" +msgstr "书法笔刷宽度(相对于可见画布面积)" #. Thinning #: ../src/widgets/calligraphy-toolbar.cpp:444 msgid "(speed blows up stroke)" -msgstr "(加速炸开笔画)" +msgstr "(加速炸开笔画)" #: ../src/widgets/calligraphy-toolbar.cpp:444 msgid "(slight widening)" -msgstr "(略微变宽)" +msgstr "(略微变宽)" #: ../src/widgets/calligraphy-toolbar.cpp:444 msgid "(constant width)" -msgstr "(恒定宽度)" +msgstr "(恒定宽度)" #: ../src/widgets/calligraphy-toolbar.cpp:444 msgid "(slight thinning, default)" -msgstr "(略微变窄,默认)" +msgstr "(略微变窄,默认)" #: ../src/widgets/calligraphy-toolbar.cpp:444 msgid "(speed deflates stroke)" -msgstr "(加速缩紧笔画)" +msgstr "(加速缩紧笔画)" #: ../src/widgets/calligraphy-toolbar.cpp:447 msgid "Stroke Thinning" @@ -27385,20 +27563,20 @@ msgstr "细:" msgid "" "How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " "makes them broader, 0 makes width independent of velocity)" -msgstr "笔画变细和速度的关系(> 0 越快越细,< 0 越快越粗,0 宽度与速度无关)" +msgstr "笔画变细和速度的关系(> 0 越快越细,< 0 越快越粗,0 宽度与速度无关)" #. Angle #: ../src/widgets/calligraphy-toolbar.cpp:460 msgid "(left edge up)" -msgstr "(左边升高)" +msgstr "(左边升高)" #: ../src/widgets/calligraphy-toolbar.cpp:460 msgid "(horizontal)" -msgstr "(水平)" +msgstr "(水平)" #: ../src/widgets/calligraphy-toolbar.cpp:460 msgid "(right edge up)" -msgstr "(右边升高)" +msgstr "(右边升高)" #: ../src/widgets/calligraphy-toolbar.cpp:463 msgid "Pen Angle" @@ -27413,20 +27591,20 @@ msgstr "角度:" msgid "" "The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " "fixation = 0)" -msgstr "笔尖角度(°;0=水平;固定=0 时没有效果)" +msgstr "笔尖角度(°;0=水平;固定=0 时没有效果)" #. Fixation #: ../src/widgets/calligraphy-toolbar.cpp:478 msgid "(perpendicular to stroke, \"brush\")" -msgstr "(垂直于笔廓, “笔刷”)" +msgstr "(垂直于笔刷, “笔刷”)" #: ../src/widgets/calligraphy-toolbar.cpp:478 msgid "(almost fixed, default)" -msgstr "(几乎固定,默认)" +msgstr "(几乎固定,默认)" #: ../src/widgets/calligraphy-toolbar.cpp:478 msgid "(fixed by Angle, \"pen\")" -msgstr "(按角度固定,“钢笔”)" +msgstr "(按角度固定,“钢笔”)" #: ../src/widgets/calligraphy-toolbar.cpp:481 msgid "Fixation" @@ -27440,24 +27618,24 @@ msgstr "固定:" msgid "" "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " "fixed angle)" -msgstr "角度行为(0 = 笔尖总是垂直于笔廓方向,100 = 固定角度)" +msgstr "角度行为(0 = 笔尖总是垂直于笔刷方向,100 = 固定角度)" #. Cap Rounding #: ../src/widgets/calligraphy-toolbar.cpp:494 msgid "(blunt caps, default)" -msgstr "(平头端点,默认)" +msgstr "(平头端点,默认)" #: ../src/widgets/calligraphy-toolbar.cpp:494 msgid "(slightly bulging)" -msgstr "(略微膨胀)" +msgstr "(略微膨胀)" #: ../src/widgets/calligraphy-toolbar.cpp:494 msgid "(approximately round)" -msgstr "(近似圆形)" +msgstr "(近似圆形)" #: ../src/widgets/calligraphy-toolbar.cpp:494 msgid "(long protruding caps)" -msgstr "(长突出端点)" +msgstr "(长突出端点)" #: ../src/widgets/calligraphy-toolbar.cpp:498 msgid "Cap rounding" @@ -27471,24 +27649,24 @@ msgstr "端点:" msgid "" "Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " "round caps)" -msgstr "增大此值使端点凸凹程度增加(0 = 无封口,1 = 圆角封口)" +msgstr "增大此值使端点凸凹程度增加(0 = 无封口,1 = 圆角封口)" #. Tremor #: ../src/widgets/calligraphy-toolbar.cpp:511 msgid "(smooth line)" -msgstr "(平滑线)" +msgstr "(平滑线)" #: ../src/widgets/calligraphy-toolbar.cpp:511 msgid "(slight tremor)" -msgstr "(轻微抖动)" +msgstr "(轻微抖动)" #: ../src/widgets/calligraphy-toolbar.cpp:511 msgid "(noticeable tremor)" -msgstr "(明显抖动)" +msgstr "(明显抖动)" #: ../src/widgets/calligraphy-toolbar.cpp:511 msgid "(maximum tremor)" -msgstr "(最大抖动)" +msgstr "(最大抖动)" #: ../src/widgets/calligraphy-toolbar.cpp:514 msgid "Stroke Tremor" @@ -27505,15 +27683,15 @@ msgstr "增大此值使笔画更加凸凹并且抖动" #. Wiggle #: ../src/widgets/calligraphy-toolbar.cpp:529 msgid "(no wiggle)" -msgstr "(无摆动)" +msgstr "(无摆动)" #: ../src/widgets/calligraphy-toolbar.cpp:529 msgid "(slight deviation)" -msgstr "(略微偏离)" +msgstr "(略微偏离)" #: ../src/widgets/calligraphy-toolbar.cpp:529 msgid "(wild waves and curls)" -msgstr "(剧烈的波浪和卷曲)" +msgstr "(剧烈的波浪和卷曲)" #: ../src/widgets/calligraphy-toolbar.cpp:532 msgid "Pen Wiggle" @@ -27529,26 +27707,31 @@ msgstr "增大此值使笔画更加波浪回旋" #. Mass #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(no inertia)" -msgstr "(无惯性)" +msgstr "(无惯性)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(slight smoothing, default)" -msgstr "(略微平滑, 默认)" +msgstr "(略微平滑, 默认)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(noticeable lagging)" -msgstr "(明显滞后)" +msgstr "(明显滞后)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(maximum inertia)" -msgstr "(最大惯性)" +msgstr "(最大惯性)" #: ../src/widgets/calligraphy-toolbar.cpp:549 msgid "Pen Mass" msgstr "笔的质量" #: ../src/widgets/calligraphy-toolbar.cpp:549 +#: ../src/widgets/eraser-toolbar.cpp:171 msgid "Mass:" msgstr "质量:" @@ -27564,7 +27747,7 @@ msgstr "临摹背景" msgid "" "Trace the lightness of the background by the width of the pen (white - " "minimum width, black - maximum width)" -msgstr "使用笔的宽度临摹背景的亮度(白色-最细,黑色-最粗)" +msgstr "使用笔的宽度临摹背景的亮度(白色-最细,黑色-最粗)" #: ../src/widgets/calligraphy-toolbar.cpp:579 msgid "Use the pressure of the input device to alter the width of the pen" @@ -27602,75 +27785,75 @@ msgstr "设置连接器类型:折线" msgid "Change connector curvature" msgstr "改变连接器弯曲度" -#: ../src/widgets/connector-toolbar.cpp:216 +#: ../src/widgets/connector-toolbar.cpp:214 msgid "Change connector spacing" msgstr "改变连接器间距" -#: ../src/widgets/connector-toolbar.cpp:309 +#: ../src/widgets/connector-toolbar.cpp:307 msgid "Avoid" msgstr "避免" -#: ../src/widgets/connector-toolbar.cpp:319 +#: ../src/widgets/connector-toolbar.cpp:317 msgid "Ignore" msgstr "忽略" -#: ../src/widgets/connector-toolbar.cpp:330 +#: ../src/widgets/connector-toolbar.cpp:328 msgid "Orthogonal" msgstr "正交" -#: ../src/widgets/connector-toolbar.cpp:331 +#: ../src/widgets/connector-toolbar.cpp:329 msgid "Make connector orthogonal or polyline" msgstr "使连接器为正交或折线" -#: ../src/widgets/connector-toolbar.cpp:345 +#: ../src/widgets/connector-toolbar.cpp:343 msgid "Connector Curvature" msgstr "连接器弯曲" -#: ../src/widgets/connector-toolbar.cpp:345 +#: ../src/widgets/connector-toolbar.cpp:343 msgid "Curvature:" msgstr "弯曲:" -#: ../src/widgets/connector-toolbar.cpp:346 +#: ../src/widgets/connector-toolbar.cpp:344 msgid "The amount of connectors curvature" msgstr "连接器的弯曲度" -#: ../src/widgets/connector-toolbar.cpp:356 +#: ../src/widgets/connector-toolbar.cpp:354 msgid "Connector Spacing" msgstr "连接器间距" -#: ../src/widgets/connector-toolbar.cpp:356 +#: ../src/widgets/connector-toolbar.cpp:354 msgid "Spacing:" msgstr "空隙:" -#: ../src/widgets/connector-toolbar.cpp:357 +#: ../src/widgets/connector-toolbar.cpp:355 msgid "The amount of space left around objects by auto-routing connectors" msgstr "自动布线连接器周围的空隙" -#: ../src/widgets/connector-toolbar.cpp:368 +#: ../src/widgets/connector-toolbar.cpp:366 msgid "Graph" msgstr "图" -#: ../src/widgets/connector-toolbar.cpp:378 +#: ../src/widgets/connector-toolbar.cpp:376 msgid "Connector Length" msgstr "连接器长度" -#: ../src/widgets/connector-toolbar.cpp:378 +#: ../src/widgets/connector-toolbar.cpp:376 msgid "Length:" msgstr "长度:" -#: ../src/widgets/connector-toolbar.cpp:379 +#: ../src/widgets/connector-toolbar.cpp:377 msgid "Ideal length for connectors when layout is applied" msgstr "应用布局后调整连接器的长度" -#: ../src/widgets/connector-toolbar.cpp:391 +#: ../src/widgets/connector-toolbar.cpp:389 msgid "Downwards" msgstr "向下" -#: ../src/widgets/connector-toolbar.cpp:392 +#: ../src/widgets/connector-toolbar.cpp:390 msgid "Make connectors with end-markers (arrows) point downwards" msgstr "使带有末尾标记(箭头)的连接器指向下方" -#: ../src/widgets/connector-toolbar.cpp:408 +#: ../src/widgets/connector-toolbar.cpp:406 msgid "Do not allow overlapping shapes" msgstr "不允许重叠形状" @@ -27682,90 +27865,98 @@ msgstr "点图案" msgid "Pattern offset" msgstr "图案偏移" -#: ../src/widgets/desktop-widget.cpp:466 +#: ../src/widgets/desktop-widget.cpp:494 msgid "Zoom drawing if window size changes" msgstr "如果窗口尺寸改变缩放绘图" -#: ../src/widgets/desktop-widget.cpp:665 +#: ../src/widgets/desktop-widget.cpp:693 msgid "Cursor coordinates" msgstr "光标位置" -#: ../src/widgets/desktop-widget.cpp:691 +#: ../src/widgets/desktop-widget.cpp:719 msgid "Z:" msgstr "Z:" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:734 +#: ../src/widgets/desktop-widget.cpp:762 msgid "" "Welcome to Inkscape! Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." msgstr "" -"欢迎来到 Inkscape!使用形状或手绘工具创建对象;使用选择器(箭头)移动" -"或者变换对象" +"欢迎来到 Inkscape!使用形状或手绘工具创建对象;使用选择器(箭头)移动或" +"者变换对象" -#: ../src/widgets/desktop-widget.cpp:828 +#: ../src/widgets/desktop-widget.cpp:856 msgid "grayscale" msgstr "灰阶" -#: ../src/widgets/desktop-widget.cpp:829 +#: ../src/widgets/desktop-widget.cpp:857 msgid ", grayscale" msgstr ", 灰阶" -#: ../src/widgets/desktop-widget.cpp:830 +#: ../src/widgets/desktop-widget.cpp:858 msgid "print colors preview" msgstr "打印颜色预览" -#: ../src/widgets/desktop-widget.cpp:831 +#: ../src/widgets/desktop-widget.cpp:859 msgid ", print colors preview" msgstr ",打印颜色预览" -#: ../src/widgets/desktop-widget.cpp:832 +#: ../src/widgets/desktop-widget.cpp:860 msgid "outline" msgstr "轮廓" -#: ../src/widgets/desktop-widget.cpp:833 +#: ../src/widgets/desktop-widget.cpp:861 msgid "no filters" msgstr "无滤镜" -#: ../src/widgets/desktop-widget.cpp:860 +#: ../src/widgets/desktop-widget.cpp:888 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" -msgstr "%s%s:%d(%s%s)- Inkscape" +msgstr "%s%s:%d(%s%s)- Inkscape" -#: ../src/widgets/desktop-widget.cpp:862 ../src/widgets/desktop-widget.cpp:866 +#: ../src/widgets/desktop-widget.cpp:890 ../src/widgets/desktop-widget.cpp:894 #, c-format msgid "%s%s: %d (%s) - Inkscape" -msgstr "%s%s:%d(%s)- Inkscape" +msgstr "%s%s:%d(%s)- Inkscape" -#: ../src/widgets/desktop-widget.cpp:868 +#: ../src/widgets/desktop-widget.cpp:896 #, c-format msgid "%s%s: %d - Inkscape" msgstr "%s%s:%d - Inkscape" -#: ../src/widgets/desktop-widget.cpp:874 +#: ../src/widgets/desktop-widget.cpp:902 #, c-format msgid "%s%s (%s%s) - Inkscape" -msgstr "%s%s(%s%s)- Inkscape" +msgstr "%s%s(%s%s)- Inkscape" -#: ../src/widgets/desktop-widget.cpp:876 ../src/widgets/desktop-widget.cpp:880 +#: ../src/widgets/desktop-widget.cpp:904 ../src/widgets/desktop-widget.cpp:908 #, c-format msgid "%s%s (%s) - Inkscape" -msgstr "%s%s(%s)- Inkscape" +msgstr "%s%s(%s)- Inkscape" -#: ../src/widgets/desktop-widget.cpp:882 +#: ../src/widgets/desktop-widget.cpp:910 #, c-format msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" -#: ../src/widgets/desktop-widget.cpp:1051 +#: ../src/widgets/desktop-widget.cpp:1082 +msgid "Locked all guides" +msgstr "锁定所有参考线" + +#: ../src/widgets/desktop-widget.cpp:1084 +msgid "Unlocked all guides" +msgstr "解锁所有参考线" + +#: ../src/widgets/desktop-widget.cpp:1101 msgid "Color-managed display is enabled in this window" msgstr "本窗口中启用了色彩管理的显示" -#: ../src/widgets/desktop-widget.cpp:1053 +#: ../src/widgets/desktop-widget.cpp:1103 msgid "Color-managed display is disabled in this window" msgstr "本窗口中禁用了色彩管理的显示" -#: ../src/widgets/desktop-widget.cpp:1108 +#: ../src/widgets/desktop-widget.cpp:1158 #, c-format msgid "" "Save changes to document \"%s\" before " @@ -27778,12 +27969,12 @@ msgstr "" "\n" "如果没有保存关闭文档,所作的更改将会丢失。" -#: ../src/widgets/desktop-widget.cpp:1118 -#: ../src/widgets/desktop-widget.cpp:1177 +#: ../src/widgets/desktop-widget.cpp:1168 +#: ../src/widgets/desktop-widget.cpp:1227 msgid "Close _without saving" msgstr "关闭而不保存(_W)" -#: ../src/widgets/desktop-widget.cpp:1167 +#: ../src/widgets/desktop-widget.cpp:1217 #, c-format msgid "" "The file \"%s\" was saved with a " @@ -27794,13 +27985,13 @@ msgstr "" "此文件“%s”用此格式保存可能会导致数据遗" "失!\n" "\n" -"你是否要将这个文件保存成 Inkscape SVG?" +"您是否要将这个文件保存成 Inkscape SVG?" -#: ../src/widgets/desktop-widget.cpp:1179 +#: ../src/widgets/desktop-widget.cpp:1229 msgid "_Save as Inkscape SVG" msgstr "保存为 Inkscape _SVG" -#: ../src/widgets/desktop-widget.cpp:1392 +#: ../src/widgets/desktop-widget.cpp:1442 msgid "Note:" msgstr "备注:" @@ -27825,7 +28016,7 @@ msgstr "指定不透明度" #: ../src/widgets/dropper-toolbar.cpp:104 msgid "" "If alpha was picked, assign it to selection as fill or stroke transparency" -msgstr "如果透明通道已拾取, 把它传给选区作为填充或笔廓的透明度" +msgstr "如果透明通道已拾取, 把它传给选区作为填充或笔刷的透明度" #: ../src/widgets/dropper-toolbar.cpp:107 msgid "Assign" @@ -27835,21 +28026,45 @@ msgstr "指定" msgid "remove" msgstr "移除" -#: ../src/widgets/eraser-toolbar.cpp:94 +#: ../src/widgets/eraser-toolbar.cpp:121 msgid "Delete objects touched by the eraser" msgstr "删除橡皮擦接触的对象" -#: ../src/widgets/eraser-toolbar.cpp:100 +#: ../src/widgets/eraser-toolbar.cpp:127 msgid "Cut" msgstr "剪切" -#: ../src/widgets/eraser-toolbar.cpp:101 +#: ../src/widgets/eraser-toolbar.cpp:128 msgid "Cut out from objects" msgstr "从对象中剪去" -#: ../src/widgets/eraser-toolbar.cpp:129 +#. Width +#: ../src/widgets/eraser-toolbar.cpp:151 +msgid "(no width)" +msgstr "(无宽度)" + +#: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" -msgstr "橡皮擦宽度 (相对于可见画布)" +msgstr "橡皮擦宽度(相对于可见画布)" + +#: ../src/widgets/eraser-toolbar.cpp:171 +msgid "Eraser Mass" +msgstr "橡皮质量" + +#: ../src/widgets/eraser-toolbar.cpp:172 +#, fuzzy +msgid "Increase to make the eraser drag behind, as if slowed by inertia" +msgstr "增大此值使笔拖到后面,好像由于惯性变慢一样" + +#: ../src/widgets/eraser-toolbar.cpp:186 +#, fuzzy +msgid "Break appart cutted items" +msgstr "在已选节点上断开路径" + +#: ../src/widgets/eraser-toolbar.cpp:187 +#, fuzzy +msgid "Break appart cutted itemss" +msgstr "在已选节点上断开路径" #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" @@ -27861,7 +28076,7 @@ msgstr "设置填充颜色" #: ../src/widgets/fill-style.cpp:440 ../src/widgets/fill-style.cpp:518 msgid "Set stroke color" -msgstr "设置笔廓颜色" +msgstr "设置笔刷颜色" #: ../src/widgets/fill-style.cpp:616 msgid "Set gradient on fill" @@ -27869,7 +28084,7 @@ msgstr "设置填充渐变" #: ../src/widgets/fill-style.cpp:616 msgid "Set gradient on stroke" -msgstr "设置笔廓渐变" +msgstr "设置笔刷渐变" #: ../src/widgets/fill-style.cpp:676 msgid "Set pattern on fill" @@ -27877,10 +28092,10 @@ msgstr "设置填充图案" #: ../src/widgets/fill-style.cpp:677 msgid "Set pattern on stroke" -msgstr "设置笔廓图案" +msgstr "设置笔刷图案" -#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:953 -#: ../src/widgets/text-toolbar.cpp:1265 +#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1017 +#: ../src/widgets/text-toolbar.cpp:1358 msgid "Font size" msgstr "字体大小" @@ -27903,187 +28118,187 @@ msgstr "形貌" msgid "Font size:" msgstr "字体大小:" -#: ../src/widgets/gradient-selector.cpp:205 +#: ../src/widgets/gradient-selector.cpp:201 msgid "Create a duplicate gradient" msgstr "创建一个重复的渐变" -#: ../src/widgets/gradient-selector.cpp:216 +#: ../src/widgets/gradient-selector.cpp:212 msgid "Edit gradient" msgstr "编辑渐变" -#: ../src/widgets/gradient-selector.cpp:285 +#: ../src/widgets/gradient-selector.cpp:281 #: ../src/widgets/paint-selector.cpp:233 msgid "Swatch" msgstr "色盘" -#: ../src/widgets/gradient-selector.cpp:335 +#: ../src/widgets/gradient-selector.cpp:331 msgid "Rename gradient" msgstr "重命名渐变" -#: ../src/widgets/gradient-toolbar.cpp:157 -#: ../src/widgets/gradient-toolbar.cpp:170 -#: ../src/widgets/gradient-toolbar.cpp:761 -#: ../src/widgets/gradient-toolbar.cpp:1100 +#: ../src/widgets/gradient-toolbar.cpp:156 +#: ../src/widgets/gradient-toolbar.cpp:169 +#: ../src/widgets/gradient-toolbar.cpp:758 +#: ../src/widgets/gradient-toolbar.cpp:1097 msgid "No gradient" msgstr "无渐变" -#: ../src/widgets/gradient-toolbar.cpp:177 +#: ../src/widgets/gradient-toolbar.cpp:176 msgid "Multiple gradients" msgstr "多渐变" -#: ../src/widgets/gradient-toolbar.cpp:681 +#: ../src/widgets/gradient-toolbar.cpp:678 msgid "Multiple stops" msgstr "多个终止色" -#: ../src/widgets/gradient-toolbar.cpp:779 +#: ../src/widgets/gradient-toolbar.cpp:776 #: ../src/widgets/gradient-vector.cpp:614 msgid "No stops in gradient" msgstr "渐变中没有分段点" -#: ../src/widgets/gradient-toolbar.cpp:933 +#: ../src/widgets/gradient-toolbar.cpp:930 msgid "Assign gradient to object" msgstr "把渐变赋值给对象" -#: ../src/widgets/gradient-toolbar.cpp:955 +#: ../src/widgets/gradient-toolbar.cpp:952 msgid "Set gradient repeat" msgstr "设置渐变重复" -#: ../src/widgets/gradient-toolbar.cpp:993 +#: ../src/widgets/gradient-toolbar.cpp:990 #: ../src/widgets/gradient-vector.cpp:727 msgid "Change gradient stop offset" msgstr "改变渐变分段点偏移" -#: ../src/widgets/gradient-toolbar.cpp:1040 +#: ../src/widgets/gradient-toolbar.cpp:1037 msgid "linear" msgstr "线性" -#: ../src/widgets/gradient-toolbar.cpp:1040 +#: ../src/widgets/gradient-toolbar.cpp:1037 msgid "Create linear gradient" msgstr "创建线性渐变" -#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/gradient-toolbar.cpp:1041 msgid "radial" msgstr "径向" -#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/gradient-toolbar.cpp:1041 msgid "Create radial (elliptic or circular) gradient" -msgstr "创建辐向(椭圆或圆形)渐变" +msgstr "创建辐向(椭圆或圆形)渐变" -#: ../src/widgets/gradient-toolbar.cpp:1047 ../src/widgets/mesh-toolbar.cpp:384 +#: ../src/widgets/gradient-toolbar.cpp:1044 ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "新建:" -#: ../src/widgets/gradient-toolbar.cpp:1070 ../src/widgets/mesh-toolbar.cpp:407 +#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "填充" -#: ../src/widgets/gradient-toolbar.cpp:1070 ../src/widgets/mesh-toolbar.cpp:407 +#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "在填充里面创建渐变" -#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" -msgstr "笔廓" +msgstr "笔刷" -#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:411 +#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" -msgstr "在笔廓里面创建渐变" +msgstr "在笔刷里面创建渐变" -#: ../src/widgets/gradient-toolbar.cpp:1077 ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "于:" -#: ../src/widgets/gradient-toolbar.cpp:1102 +#: ../src/widgets/gradient-toolbar.cpp:1099 msgid "Select" msgstr "选择" -#: ../src/widgets/gradient-toolbar.cpp:1102 +#: ../src/widgets/gradient-toolbar.cpp:1099 msgid "Choose a gradient" msgstr "选择一种渐变" -#: ../src/widgets/gradient-toolbar.cpp:1103 +#: ../src/widgets/gradient-toolbar.cpp:1100 msgid "Select:" msgstr "选择:" -#: ../src/widgets/gradient-toolbar.cpp:1118 +#: ../src/widgets/gradient-toolbar.cpp:1115 msgctxt "Gradient repeat type" msgid "None" msgstr "无" -#: ../src/widgets/gradient-toolbar.cpp:1121 +#: ../src/widgets/gradient-toolbar.cpp:1118 msgid "Reflected" msgstr "反射" -#: ../src/widgets/gradient-toolbar.cpp:1124 +#: ../src/widgets/gradient-toolbar.cpp:1121 msgid "Direct" msgstr "直接" -#: ../src/widgets/gradient-toolbar.cpp:1126 +#: ../src/widgets/gradient-toolbar.cpp:1123 msgid "Repeat" msgstr "重复" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute -#: ../src/widgets/gradient-toolbar.cpp:1128 +#: ../src/widgets/gradient-toolbar.cpp:1125 msgid "" "Whether to fill with flat color beyond the ends of the gradient vector " "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " "(spreadMethod=\"repeat\"), or repeat the gradient in alternating opposite " "directions (spreadMethod=\"reflect\")" msgstr "" -"是要使用渐变向量的终点颜色填充(spreadMethod=\"pad\"),还是在相同的方向重复" -"渐变(spreadMethod=\"repeat\")还是交替反向渐变(spreadMethod=\"reflect\")" +"是要使用渐变向量的终点颜色填充(spreadMethod=\"pad\"),还是在相同的方向重复渐" +"变(spreadMethod=\"repeat\")还是交替反向渐变(spreadMethod=\"reflect\")" -#: ../src/widgets/gradient-toolbar.cpp:1133 +#: ../src/widgets/gradient-toolbar.cpp:1130 msgid "Repeat:" msgstr "重复:" -#: ../src/widgets/gradient-toolbar.cpp:1147 +#: ../src/widgets/gradient-toolbar.cpp:1144 msgid "No stops" -msgstr "没有分段点" +msgstr "无分段点" -#: ../src/widgets/gradient-toolbar.cpp:1149 +#: ../src/widgets/gradient-toolbar.cpp:1146 msgid "Stops" msgstr "分段点" -#: ../src/widgets/gradient-toolbar.cpp:1149 +#: ../src/widgets/gradient-toolbar.cpp:1146 msgid "Select a stop for the current gradient" msgstr "为当前的渐变选择一个分段点" -#: ../src/widgets/gradient-toolbar.cpp:1150 +#: ../src/widgets/gradient-toolbar.cpp:1147 msgid "Stops:" msgstr "分段点:" #. Label -#: ../src/widgets/gradient-toolbar.cpp:1162 +#: ../src/widgets/gradient-toolbar.cpp:1159 #: ../src/widgets/gradient-vector.cpp:916 msgctxt "Gradient" msgid "Offset:" msgstr "偏移量:" -#: ../src/widgets/gradient-toolbar.cpp:1162 +#: ../src/widgets/gradient-toolbar.cpp:1159 msgid "Offset of selected stop" msgstr "选定分段点的偏移" -#: ../src/widgets/gradient-toolbar.cpp:1180 -#: ../src/widgets/gradient-toolbar.cpp:1181 +#: ../src/widgets/gradient-toolbar.cpp:1177 +#: ../src/widgets/gradient-toolbar.cpp:1178 msgid "Insert new stop" msgstr "插入新分段点" -#: ../src/widgets/gradient-toolbar.cpp:1194 -#: ../src/widgets/gradient-toolbar.cpp:1195 +#: ../src/widgets/gradient-toolbar.cpp:1191 +#: ../src/widgets/gradient-toolbar.cpp:1192 #: ../src/widgets/gradient-vector.cpp:898 msgid "Delete stop" msgstr "删除分段点" -#: ../src/widgets/gradient-toolbar.cpp:1209 +#: ../src/widgets/gradient-toolbar.cpp:1206 msgid "Reverse the direction of the gradient" msgstr "颠倒渐变色的方向" -#: ../src/widgets/gradient-toolbar.cpp:1223 +#: ../src/widgets/gradient-toolbar.cpp:1220 msgid "Link gradients" msgstr "链接渐变" -#: ../src/widgets/gradient-toolbar.cpp:1224 +#: ../src/widgets/gradient-toolbar.cpp:1221 msgid "Link gradients to change all related gradients" msgstr "链接渐变为更改所有相关的渐变" @@ -28156,7 +28371,7 @@ msgstr "显示约束边界框" #: ../src/widgets/lpe-toolbar.cpp:336 msgid "Show bounding box (used to cut infinite lines)" -msgstr "显示范围框(用来切割无限直线)" +msgstr "显示范围框(用来切割无限直线)" #: ../src/widgets/lpe-toolbar.cpp:347 msgid "Get limiting bounding box from selection" @@ -28166,7 +28381,7 @@ msgstr "从选区中建立约束边界框" msgid "" "Set limiting bounding box (used to cut infinite lines) to the bounding box " "of current selection" -msgstr "将约束边界框(用来切割无限直线)的设置为当前选择对象的边界框" +msgstr "将约束边界框(用来切割无限直线)的设置为当前选择对象的边界框" #: ../src/widgets/lpe-toolbar.cpp:360 msgid "Choose a line segment type" @@ -28193,155 +28408,266 @@ msgstr "打开 LPE 对话框" #: ../src/widgets/lpe-toolbar.cpp:398 msgid "Open LPE dialog (to adapt parameters numerically)" -msgstr "打开 LPE 对话框(通过数字修改参数)" +msgstr "打开 LPE 对话框(通过数字修改参数)" + +#: ../src/widgets/measure-toolbar.cpp:157 +msgid "Start and end measures inactive." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:159 +msgid "Start and end measures active." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:175 +#, fuzzy +msgid "Show all crossings." +msgstr "显示所有层" + +#: ../src/widgets/measure-toolbar.cpp:177 +msgid "Show visible crossings." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:193 +msgid "Use all layers in the measure." +msgstr "" -#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1268 +#: ../src/widgets/measure-toolbar.cpp:195 +#, fuzzy +msgid "Use current layer in the measure." +msgstr "把当前图层升高到顶层" + +#: ../src/widgets/measure-toolbar.cpp:211 +#, fuzzy +msgid "Compute all elements." +msgstr "您需要选择至少两个对象." + +#: ../src/widgets/measure-toolbar.cpp:213 +msgid "Compute max length." +msgstr "计算最大长度。" + +#: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1361 msgid "Font Size" msgstr "字体大小" -#: ../src/widgets/measure-toolbar.cpp:86 +#: ../src/widgets/measure-toolbar.cpp:274 msgid "Font Size:" msgstr "字体大小:" -#: ../src/widgets/measure-toolbar.cpp:87 +#: ../src/widgets/measure-toolbar.cpp:275 msgid "The font size to be used in the measurement labels" msgstr "在测量标签中使用的字体大小" -#: ../src/widgets/measure-toolbar.cpp:99 ../src/widgets/measure-toolbar.cpp:107 +#: ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 msgid "The units to be used for the measurements" msgstr "用于测量的单位" -#: ../src/widgets/mesh-toolbar.cpp:315 +#: ../src/widgets/measure-toolbar.cpp:302 ../share/extensions/measure.inx.h:14 +msgid "Precision:" +msgstr "精确度:" + +#: ../src/widgets/measure-toolbar.cpp:303 +msgid "Decimal precision of measure" +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:315 +msgid "Scale %" +msgstr "缩放 %" + +#: ../src/widgets/measure-toolbar.cpp:315 +msgid "Scale %:" +msgstr "缩放 %:" + +#: ../src/widgets/measure-toolbar.cpp:316 +msgid "Scale the results" +msgstr "缩放最终输出" + +#: ../src/widgets/measure-toolbar.cpp:329 +msgid "The offset size" +msgstr "偏移尺寸" + +#: ../src/widgets/measure-toolbar.cpp:341 +#: ../src/widgets/measure-toolbar.cpp:342 +msgid "Ignore first and last" +msgstr "忽略第一个和最后一个" + +#: ../src/widgets/measure-toolbar.cpp:352 +#: ../src/widgets/measure-toolbar.cpp:353 +#, fuzzy +msgid "Show hidden intersections" +msgstr "参考线交点" + +#: ../src/widgets/measure-toolbar.cpp:363 +#: ../src/widgets/measure-toolbar.cpp:364 +#, fuzzy +msgid "Show measures between items" +msgstr "显示路径之间的移动" + +#: ../src/widgets/measure-toolbar.cpp:374 +#: ../src/widgets/measure-toolbar.cpp:375 +#, fuzzy +msgid "Measure all layers" +msgstr "搜索所有图层" + +#: ../src/widgets/measure-toolbar.cpp:385 +#: ../src/widgets/measure-toolbar.cpp:386 +#, fuzzy +msgid "Reverse measure" +msgstr "反向路径" + +#: ../src/widgets/measure-toolbar.cpp:395 +#: ../src/widgets/measure-toolbar.cpp:396 +msgid "Phantom measure" +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:405 +#: ../src/widgets/measure-toolbar.cpp:406 +msgid "To guides" +msgstr "到参考线" + +#: ../src/widgets/measure-toolbar.cpp:415 +#: ../src/widgets/measure-toolbar.cpp:416 +msgid "Mark Dimension" +msgstr "蒙版维度" + +#: ../src/widgets/measure-toolbar.cpp:425 +#: ../src/widgets/measure-toolbar.cpp:426 +msgid "Convert to item" +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:318 msgid "Set mesh type" msgstr "设置网格类型" -#: ../src/widgets/mesh-toolbar.cpp:377 +#: ../src/widgets/mesh-toolbar.cpp:380 msgid "normal" msgstr "正常" -#: ../src/widgets/mesh-toolbar.cpp:377 +#: ../src/widgets/mesh-toolbar.cpp:380 msgid "Create mesh gradient" msgstr "创建网格渐变" -#: ../src/widgets/mesh-toolbar.cpp:381 +#: ../src/widgets/mesh-toolbar.cpp:384 msgid "conical" msgstr "圆锥形" -#: ../src/widgets/mesh-toolbar.cpp:381 +#: ../src/widgets/mesh-toolbar.cpp:384 msgid "Create conical gradient" msgstr "创建锥形渐变" -#: ../src/widgets/mesh-toolbar.cpp:436 +#: ../src/widgets/mesh-toolbar.cpp:439 msgid "Rows" msgstr "行" -#: ../src/widgets/mesh-toolbar.cpp:436 +#: ../src/widgets/mesh-toolbar.cpp:439 #: ../share/extensions/guides_creator.inx.h:5 #: ../share/extensions/layout_nup.inx.h:12 msgid "Rows:" msgstr "行:" -#: ../src/widgets/mesh-toolbar.cpp:436 +#: ../src/widgets/mesh-toolbar.cpp:439 msgid "Number of rows in new mesh" msgstr "在新网格中的行数" -#: ../src/widgets/mesh-toolbar.cpp:452 +#: ../src/widgets/mesh-toolbar.cpp:455 msgid "Columns" msgstr "列" -#: ../src/widgets/mesh-toolbar.cpp:452 +#: ../src/widgets/mesh-toolbar.cpp:455 #: ../share/extensions/guides_creator.inx.h:4 msgid "Columns:" msgstr "列:" -#: ../src/widgets/mesh-toolbar.cpp:452 +#: ../src/widgets/mesh-toolbar.cpp:455 msgid "Number of columns in new mesh" msgstr "在新网格中的列数" -#: ../src/widgets/mesh-toolbar.cpp:466 +#: ../src/widgets/mesh-toolbar.cpp:469 msgid "Edit Fill" msgstr "编辑填充" -#: ../src/widgets/mesh-toolbar.cpp:467 +#: ../src/widgets/mesh-toolbar.cpp:470 msgid "Edit fill mesh" msgstr "编辑填充网格" -#: ../src/widgets/mesh-toolbar.cpp:478 +#: ../src/widgets/mesh-toolbar.cpp:481 msgid "Edit Stroke" -msgstr "编辑笔廓" +msgstr "编辑笔刷" -#: ../src/widgets/mesh-toolbar.cpp:479 +#: ../src/widgets/mesh-toolbar.cpp:482 msgid "Edit stroke mesh" -msgstr "编辑笔廓网格" +msgstr "编辑笔刷网格" -#: ../src/widgets/mesh-toolbar.cpp:490 ../src/widgets/node-toolbar.cpp:521 +#: ../src/widgets/mesh-toolbar.cpp:493 ../src/widgets/node-toolbar.cpp:521 msgid "Show Handles" msgstr "显示控制柄" -#: ../src/widgets/mesh-toolbar.cpp:491 +#: ../src/widgets/mesh-toolbar.cpp:494 msgid "Show side and tensor handles" msgstr "显示边和张量手柄" -#: ../src/widgets/mesh-toolbar.cpp:506 +#: ../src/widgets/mesh-toolbar.cpp:509 msgid "WARNING: Mesh SVG Syntax Subject to Change" msgstr "警告:网格 SVG 语法受更改" -#: ../src/widgets/mesh-toolbar.cpp:516 +#: ../src/widgets/mesh-toolbar.cpp:519 msgctxt "Type" msgid "Coons" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:519 +#: ../src/widgets/mesh-toolbar.cpp:522 msgid "Bicubic" msgstr "双立方" -#: ../src/widgets/mesh-toolbar.cpp:521 +#: ../src/widgets/mesh-toolbar.cpp:524 msgid "Coons" msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:522 +#: ../src/widgets/mesh-toolbar.cpp:525 msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." msgstr "Coons:无平滑。Bicubic:跨路径界限的平滑。" -#: ../src/widgets/mesh-toolbar.cpp:524 ../src/widgets/pencil-toolbar.cpp:377 +#: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing:" msgstr "平滑:" -#: ../src/widgets/mesh-toolbar.cpp:534 +#: ../src/widgets/mesh-toolbar.cpp:537 msgid "Toggle Sides" msgstr "切换边" -#: ../src/widgets/mesh-toolbar.cpp:535 +#: ../src/widgets/mesh-toolbar.cpp:538 msgid "Toggle selected sides between Beziers and lines." msgstr "在贝塞尔线条和直线间切换选中的边。" -#: ../src/widgets/mesh-toolbar.cpp:538 +#: ../src/widgets/mesh-toolbar.cpp:541 msgid "Toggle side:" msgstr "切换边:" -#: ../src/widgets/mesh-toolbar.cpp:545 +#: ../src/widgets/mesh-toolbar.cpp:548 +#, fuzzy msgid "Make elliptical" -msgstr "" +msgstr "斜体" -#: ../src/widgets/mesh-toolbar.cpp:546 +#: ../src/widgets/mesh-toolbar.cpp:549 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:549 +#: ../src/widgets/mesh-toolbar.cpp:552 +#, fuzzy msgid "Make elliptical:" -msgstr "" +msgstr "斜体" -#: ../src/widgets/mesh-toolbar.cpp:556 +#: ../src/widgets/mesh-toolbar.cpp:559 msgid "Pick colors:" msgstr "拾取颜色:" -#: ../src/widgets/mesh-toolbar.cpp:557 +#: ../src/widgets/mesh-toolbar.cpp:560 msgid "Pick colors for selected corner nodes from underneath mesh." msgstr "" -#: ../src/widgets/mesh-toolbar.cpp:560 +#: ../src/widgets/mesh-toolbar.cpp:563 msgid "Pick Color" msgstr "拾取颜色" @@ -28503,7 +28829,7 @@ msgstr "显示轮廓" #: ../src/widgets/node-toolbar.cpp:533 msgid "Show path outline (without path effects)" -msgstr "显示路径的轮廓(不带路径效果)" +msgstr "显示路径的轮廓(不带路径效果)" #: ../src/widgets/node-toolbar.cpp:555 msgid "Edit clipping paths" @@ -28559,21 +28885,20 @@ msgstr "网格渐变" #: ../src/widgets/paint-selector.cpp:235 msgid "Unset paint (make it undefined so it can be inherited)" -msgstr "取消绘图设置(变成未定义状态以便继承)" +msgstr "取消绘图设置(变成未定义状态以便继承)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty #: ../src/widgets/paint-selector.cpp:252 msgid "" "Any path self-intersections or subpaths create holes in the fill (fill-rule: " "evenodd)" -msgstr "" -"任何自相交的路径或子路径将在填充里面创建孔洞(奇偶,fill-rule: evenodd)" +msgstr "任何自相交的路径或子路径将在填充里面创建孔洞(奇偶,fill-rule: evenodd)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty #: ../src/widgets/paint-selector.cpp:263 msgid "" "Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" -msgstr "全部填充除非子路径反向(非零,fill-rule: nonzero)" +msgstr "全部填充除非子路径反向(非零,fill-rule: nonzero)" #: ../src/widgets/paint-selector.cpp:605 msgid "No objects" @@ -28654,7 +28979,7 @@ msgstr "扩张/收缩:" #: ../src/widgets/paintbucket-toolbar.cpp:176 msgid "" "The amount to grow (positive) or shrink (negative) the created fill path" -msgstr "创建的填充路径的扩张(正值)或收缩(负值)量" +msgstr "创建的填充路径的扩张(正值)或收缩(负值)量" #: ../src/widgets/paintbucket-toolbar.cpp:199 msgid "Close gaps" @@ -28665,7 +28990,7 @@ msgid "Close gaps:" msgstr "闭合缺口:" #: ../src/widgets/paintbucket-toolbar.cpp:211 -#: ../src/widgets/pencil-toolbar.cpp:398 ../src/widgets/spiral-toolbar.cpp:285 +#: ../src/widgets/pencil-toolbar.cpp:396 ../src/widgets/spiral-toolbar.cpp:285 #: ../src/widgets/star-toolbar.cpp:564 msgid "Defaults" msgstr "默认" @@ -28674,104 +28999,104 @@ msgstr "默认" msgid "" "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " "to change defaults)" -msgstr "重置油漆桶参数为默认值(使用“Inkscape 首选项→工具”来改变默认值)" +msgstr "重置油漆桶参数为默认值(使用“Inkscape 首选项→工具”来改变默认值)" -#: ../src/widgets/pencil-toolbar.cpp:108 +#: ../src/widgets/pencil-toolbar.cpp:105 msgid "Bezier" msgstr "贝塞尔曲线" -#: ../src/widgets/pencil-toolbar.cpp:109 +#: ../src/widgets/pencil-toolbar.cpp:106 msgid "Create regular Bezier path" msgstr "创建规则贝塞尔路径" -#: ../src/widgets/pencil-toolbar.cpp:116 +#: ../src/widgets/pencil-toolbar.cpp:113 msgid "Create Spiro path" msgstr "创建螺线路径" -#: ../src/widgets/pencil-toolbar.cpp:122 +#: ../src/widgets/pencil-toolbar.cpp:119 msgid "Create BSpline path" msgstr "创建 B 样条路径" -#: ../src/widgets/pencil-toolbar.cpp:128 +#: ../src/widgets/pencil-toolbar.cpp:125 msgid "Zigzag" msgstr "曲折" -#: ../src/widgets/pencil-toolbar.cpp:129 +#: ../src/widgets/pencil-toolbar.cpp:126 msgid "Create a sequence of straight line segments" msgstr "创建一个直线段构成的折线" -#: ../src/widgets/pencil-toolbar.cpp:135 +#: ../src/widgets/pencil-toolbar.cpp:132 msgid "Paraxial" msgstr "傍轴" -#: ../src/widgets/pencil-toolbar.cpp:136 +#: ../src/widgets/pencil-toolbar.cpp:133 msgid "Create a sequence of paraxial line segments" msgstr "创建一个沿坐标轴线段构成的折线" -#: ../src/widgets/pencil-toolbar.cpp:144 +#: ../src/widgets/pencil-toolbar.cpp:141 msgid "Mode of new lines drawn by this tool" msgstr "该工具绘制新线条的模式" -#: ../src/widgets/pencil-toolbar.cpp:178 +#: ../src/widgets/pencil-toolbar.cpp:176 msgctxt "Freehand shape" msgid "None" -msgstr "不透明" +msgstr "无" -#: ../src/widgets/pencil-toolbar.cpp:179 +#: ../src/widgets/pencil-toolbar.cpp:177 msgid "Triangle in" msgstr "三角入" -#: ../src/widgets/pencil-toolbar.cpp:180 +#: ../src/widgets/pencil-toolbar.cpp:178 msgid "Triangle out" msgstr "三角出" -#: ../src/widgets/pencil-toolbar.cpp:182 +#: ../src/widgets/pencil-toolbar.cpp:180 msgid "From clipboard" msgstr "从剪贴板" -#: ../src/widgets/pencil-toolbar.cpp:183 +#: ../src/widgets/pencil-toolbar.cpp:181 msgid "Bend from clipboard" msgstr "从剪贴板弯折" -#: ../src/widgets/pencil-toolbar.cpp:184 +#: ../src/widgets/pencil-toolbar.cpp:182 msgid "Last applied" msgstr "最近应用" -#: ../src/widgets/pencil-toolbar.cpp:209 ../src/widgets/pencil-toolbar.cpp:210 +#: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" msgstr "形状:" -#: ../src/widgets/pencil-toolbar.cpp:209 +#: ../src/widgets/pencil-toolbar.cpp:207 msgid "Shape of new paths drawn by this tool" msgstr "该工具绘制的新路径的形状" -#: ../src/widgets/pencil-toolbar.cpp:374 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(many nodes, rough)" -msgstr "(很多节点,粗糙)" +msgstr "(很多节点,粗糙)" -#: ../src/widgets/pencil-toolbar.cpp:374 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(few nodes, smooth)" -msgstr "(很少节点,光滑)" +msgstr "(很少节点,光滑)" -#: ../src/widgets/pencil-toolbar.cpp:377 +#: ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing: " msgstr "平滑:" -#: ../src/widgets/pencil-toolbar.cpp:378 +#: ../src/widgets/pencil-toolbar.cpp:376 msgid "How much smoothing (simplifying) is applied to the line" -msgstr "线的平滑(简化)程度" +msgstr "线的平滑(简化)程度" -#: ../src/widgets/pencil-toolbar.cpp:399 +#: ../src/widgets/pencil-toolbar.cpp:397 msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" -msgstr "重置铅笔的参数为默认值(使用“Inkscape 首选项→工具”来改变默认值)" +msgstr "重置铅笔的参数为默认值(使用“Inkscape 首选项→工具”来改变默认值)" -#: ../src/widgets/pencil-toolbar.cpp:409 ../src/widgets/pencil-toolbar.cpp:410 +#: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" msgstr "" -#: ../src/widgets/pencil-toolbar.cpp:420 ../src/widgets/pencil-toolbar.cpp:421 +#: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" msgstr "" @@ -28831,39 +29156,39 @@ msgstr "不进行舍入" msgid "Make corners sharp" msgstr "使角度锐利" -#: ../src/widgets/ruler.cpp:193 +#: ../src/widgets/ruler.cpp:198 msgid "The orientation of the ruler" msgstr "标尺的方向" -#: ../src/widgets/ruler.cpp:203 +#: ../src/widgets/ruler.cpp:208 msgid "Unit of the ruler" msgstr "标尺的单位" -#: ../src/widgets/ruler.cpp:210 +#: ../src/widgets/ruler.cpp:215 msgid "Lower" msgstr "下" -#: ../src/widgets/ruler.cpp:211 +#: ../src/widgets/ruler.cpp:216 msgid "Lower limit of ruler" msgstr "标尺的下限" -#: ../src/widgets/ruler.cpp:220 +#: ../src/widgets/ruler.cpp:225 msgid "Upper" msgstr "上" -#: ../src/widgets/ruler.cpp:221 +#: ../src/widgets/ruler.cpp:226 msgid "Upper limit of ruler" msgstr "标尺的上限" -#: ../src/widgets/ruler.cpp:231 +#: ../src/widgets/ruler.cpp:236 msgid "Position of mark on the ruler" msgstr "标尺上的标记位置" -#: ../src/widgets/ruler.cpp:240 +#: ../src/widgets/ruler.cpp:245 msgid "Max Size" msgstr "最大大小" -#: ../src/widgets/ruler.cpp:241 +#: ../src/widgets/ruler.cpp:246 msgid "Maximum size of the ruler" msgstr "标尺的最大尺寸" @@ -28873,11 +29198,11 @@ msgstr "按照工具栏变换" #: ../src/widgets/select-toolbar.cpp:341 msgid "Now stroke width is scaled when objects are scaled." -msgstr "对象缩放笔廓宽度也会跟着缩放。" +msgstr "对象缩放笔刷宽度也会跟着缩放。" #: ../src/widgets/select-toolbar.cpp:343 msgid "Now stroke width is not scaled when objects are scaled." -msgstr "对象缩放笔廓宽度不会跟着缩放。" +msgstr "对象缩放笔刷宽度不会跟着缩放。" #: ../src/widgets/select-toolbar.cpp:354 msgid "" @@ -28895,25 +29220,25 @@ msgstr "矩形缩放圆角矩形的圆角不会跟着缩放。" msgid "" "Now gradients are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." -msgstr "渐变随着对象变换(移动、缩放、旋转或错切)。" +msgstr "渐变随着对象变换(移动、缩放、旋转或错切)。" #: ../src/widgets/select-toolbar.cpp:369 msgid "" "Now gradients remain fixed when objects are transformed " "(moved, scaled, rotated, or skewed)." -msgstr "渐变不随对象变换(移动、缩放、旋转或错切)。" +msgstr "渐变不随对象变换(移动、缩放、旋转或错切)。" #: ../src/widgets/select-toolbar.cpp:380 msgid "" "Now patterns are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." -msgstr "图案随着对象变换(移动、缩放、旋转或错切)。" +msgstr "图案随着对象变换(移动、缩放、旋转或错切)。" #: ../src/widgets/select-toolbar.cpp:382 msgid "" "Now patterns remain fixed when objects are transformed (moved, " "scaled, rotated, or skewed)." -msgstr "图案不随对象变换(移动、缩放、旋转或错切)。" +msgstr "图案不随对象变换(移动、缩放、旋转或错切)。" #. four spinbuttons #: ../src/widgets/select-toolbar.cpp:500 @@ -28996,7 +29321,7 @@ msgstr "移动图案" msgid "Set attribute" msgstr "设置属性" -#: ../src/widgets/sp-color-selector.cpp:47 +#: ../src/widgets/sp-color-selector.cpp:43 msgid "Unnamed" msgstr "未命名" @@ -29090,148 +29415,228 @@ msgstr "内半径:" #: ../src/widgets/spiral-toolbar.cpp:273 msgid "Radius of the innermost revolution (relative to the spiral size)" -msgstr "内部最小转数半径(相对于螺旋尺寸)" +msgstr "内部最小转数半径(相对于螺旋尺寸)" #: ../src/widgets/spiral-toolbar.cpp:286 ../src/widgets/star-toolbar.cpp:565 msgid "" "Reset shape parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" -msgstr "重置形状参数为默认值(使用“Inkscape 首选项→工具”来改变默认值)" +msgstr "重置形状参数为默认值(使用“Inkscape 首选项→工具”来改变默认值)" #. Width -#: ../src/widgets/spray-toolbar.cpp:113 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(narrow spray)" -msgstr "(小范围喷绘)" +msgstr "(小范围喷绘)" -#: ../src/widgets/spray-toolbar.cpp:113 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(broad spray)" -msgstr "(大范围喷绘)" +msgstr "(大范围喷绘)" -#: ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/spray-toolbar.cpp:297 msgid "The width of the spray area (relative to the visible canvas area)" -msgstr "喷绘范围的宽度(相对于可见画布面积)" +msgstr "喷绘范围的宽度(相对于可见画布面积)" + +#: ../src/widgets/spray-toolbar.cpp:312 +#, fuzzy +msgid "Use the pressure of the input device to alter the width of spray area" +msgstr "使用输入设备的压力改变笔的宽度" -#: ../src/widgets/spray-toolbar.cpp:129 +#: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" -msgstr "(最大均值)" +msgstr "(最大均值)" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus" msgstr "焦点" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus:" msgstr "焦点:" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "0 以喷射一下;提高以放大圆环半径" #. Standard_deviation -#: ../src/widgets/spray-toolbar.cpp:145 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(minimum scatter)" -msgstr "(最小分散)" +msgstr "(最小分散)" -#: ../src/widgets/spray-toolbar.cpp:145 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(maximum scatter)" -msgstr "(最大分散)" +msgstr "(最大分散)" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter" msgstr "分散" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter:" msgstr "分散:" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgid "Increase to scatter sprayed objects" msgstr "提高以分散喷射的对象" -#: ../src/widgets/spray-toolbar.cpp:167 +#: ../src/widgets/spray-toolbar.cpp:361 msgid "Spray copies of the initial selection" msgstr "喷绘原始对象的副本" -#: ../src/widgets/spray-toolbar.cpp:174 +#: ../src/widgets/spray-toolbar.cpp:368 msgid "Spray clones of the initial selection" msgstr "喷绘原始对象的克隆" -#: ../src/widgets/spray-toolbar.cpp:180 +#: ../src/widgets/spray-toolbar.cpp:375 msgid "Spray single path" msgstr "喷绘单一路径" -#: ../src/widgets/spray-toolbar.cpp:181 +#: ../src/widgets/spray-toolbar.cpp:376 msgid "Spray objects in a single path" msgstr "沿单一路径喷绘" -#: ../src/widgets/spray-toolbar.cpp:185 ../src/widgets/tweak-toolbar.cpp:253 +#: ../src/widgets/spray-toolbar.cpp:383 +#, fuzzy +msgid "Delete sprayed items" +msgstr "删除渐变分段点" + +#: ../src/widgets/spray-toolbar.cpp:384 +#, fuzzy +msgid "Delete sprayed items from selection" +msgstr "从选区中获得曲线..." + +#: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 msgid "Mode" msgstr "模式" #. Population -#: ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(low population)" -msgstr "(小数量)" +msgstr "(小数量)" -#: ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(high population)" -msgstr "(大数量)" +msgstr "(大数量)" -#: ../src/widgets/spray-toolbar.cpp:208 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount" msgstr "数量" -#: ../src/widgets/spray-toolbar.cpp:209 +#: ../src/widgets/spray-toolbar.cpp:412 msgid "Adjusts the number of items sprayed per click" msgstr "调整每次单击喷射的项目的数量" -#: ../src/widgets/spray-toolbar.cpp:225 +#: ../src/widgets/spray-toolbar.cpp:428 msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "使用输入设备的压力改变喷射对象的数值" -#: ../src/widgets/spray-toolbar.cpp:235 +#: ../src/widgets/spray-toolbar.cpp:438 msgid "(high rotation variation)" -msgstr "(大旋转差异)" +msgstr "(大旋转差异)" -#: ../src/widgets/spray-toolbar.cpp:238 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation" msgstr "旋转" -#: ../src/widgets/spray-toolbar.cpp:238 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation:" msgstr "旋转:" -#: ../src/widgets/spray-toolbar.cpp:240 +#: ../src/widgets/spray-toolbar.cpp:443 #, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " "than the original object" msgstr "喷涂对象的旋转变化;0% 表示和原始对象同样的旋转" -#: ../src/widgets/spray-toolbar.cpp:253 +#: ../src/widgets/spray-toolbar.cpp:456 msgid "(high scale variation)" msgstr "(大的缩放差异)" -#: ../src/widgets/spray-toolbar.cpp:256 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale" msgstr "缩放" -#: ../src/widgets/spray-toolbar.cpp:256 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale:" msgstr "缩放:" -#: ../src/widgets/spray-toolbar.cpp:258 +#: ../src/widgets/spray-toolbar.cpp:461 #, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " "the original object" msgstr "喷涂对象的规模上的变化;0% 表示和原始对象一样的规模大小" +#: ../src/widgets/spray-toolbar.cpp:477 +#, fuzzy +msgid "Use the pressure of the input device to alter the scale of new items" +msgstr "使用输入设备的压力改变笔的宽度" + +#: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 +msgid "" +"Pick color from the drawing. You can use clonetiler trace dialog for " +"advanced effects. In clone mode original fill or stroke colors must be unset." +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 +msgid "Pick from center instead average area." +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 +msgid "Inverted pick value, retaining color in advanced trace mode" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 +#, fuzzy +msgid "Apply picked color to fill" +msgstr "应用最近选择的颜色填充" + +#: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 +#, fuzzy +msgid "Apply picked color to stroke" +msgstr "应用最近选择的颜色到笔刷" + +#: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 +msgid "No overlap between colors" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 +msgid "Apply over transparent areas" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 +msgid "Apply over no transparent areas" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 +msgid "Prevent overlapping objects" +msgstr "组织重叠对象" + +#: ../src/widgets/spray-toolbar.cpp:605 +msgid "(minimum offset)" +msgstr "(最小偏移)" + +#: ../src/widgets/spray-toolbar.cpp:605 +msgid "(maximum offset)" +msgstr "(最大偏移)" + +#: ../src/widgets/spray-toolbar.cpp:608 +msgid "Offset %" +msgstr "偏移 %" + +#: ../src/widgets/spray-toolbar.cpp:608 +msgid "Offset %:" +msgstr "偏移 %:" + +#: ../src/widgets/spray-toolbar.cpp:609 +msgid "Increase to segregate objects more (value in percent)" +msgstr "" + #: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" msgstr "星形:改变角的数量" @@ -29258,11 +29663,11 @@ msgstr "星形:改变随机性" #: ../src/widgets/star-toolbar.cpp:463 msgid "Regular polygon (with one handle) instead of a star" -msgstr "规则多边形(有一个控制点)而非星形" +msgstr "规则多边形(有一个控制点)而非星形" #: ../src/widgets/star-toolbar.cpp:470 msgid "Star instead of a regular polygon (with one handle)" -msgstr "星形而非规则多边形(有一个控制点)" +msgstr "星形而非规则多边形(有一个控制点)" #: ../src/widgets/star-toolbar.cpp:491 msgid "triangle/tri-star" @@ -29372,7 +29777,7 @@ msgstr "圆角:" #: ../src/widgets/star-toolbar.cpp:534 msgid "How much rounded are the corners (0 for sharp)" -msgstr "角的圆整程度(0 是尖的)" +msgstr "角的圆整程度(0 是尖的)" #: ../src/widgets/star-toolbar.cpp:546 msgid "NOT randomized" @@ -29409,98 +29814,123 @@ msgstr "无" #: ../src/widgets/stroke-style.cpp:192 msgid "Stroke width" -msgstr "笔廓宽度" +msgstr "笔刷宽度" #: ../src/widgets/stroke-style.cpp:194 msgctxt "Stroke width" msgid "_Width:" msgstr "宽度(_W):" -#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:239 -msgid "Miter join" -msgstr "斜接连接" +#. Dash +#: ../src/widgets/stroke-style.cpp:225 +msgid "Dashes:" +msgstr "线型:" + +#. Drop down marker selectors +#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes +#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. +#: ../src/widgets/stroke-style.cpp:251 +msgid "Markers:" +msgstr "标记:" + +#: ../src/widgets/stroke-style.cpp:257 +msgid "Start Markers are drawn on the first node of a path or shape" +msgstr "起点标记画在路径或形状中的第一个节点上" + +#: ../src/widgets/stroke-style.cpp:266 +msgid "" +"Mid Markers are drawn on every node of a path or shape except the first and " +"last nodes" +msgstr "中间标记位于路径或形状中除去首位外所有的节点上" + +#: ../src/widgets/stroke-style.cpp:275 +msgid "End Markers are drawn on the last node of a path or shape" +msgstr "终点标记位于路径或形状中的最后一个节点上" #. TRANSLATORS: Round join: joining lines with a rounded corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:247 +#: ../src/widgets/stroke-style.cpp:300 msgid "Round join" msgstr "圆角连接" #. TRANSLATORS: Bevel join: joining lines with a blunted (flattened) corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:255 +#: ../src/widgets/stroke-style.cpp:308 msgid "Bevel join" msgstr "斜角连接" -#: ../src/widgets/stroke-style.cpp:280 -msgid "Miter _limit:" -msgstr "斜面限制(_L):" +#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:316 +msgid "Miter join" +msgstr "斜接连接" #. Cap type #. TRANSLATORS: cap type specifies the shape for the ends of lines #. spw_label(t, _("_Cap:"), 0, i); -#: ../src/widgets/stroke-style.cpp:296 +#: ../src/widgets/stroke-style.cpp:353 msgid "Cap:" msgstr "线端:" #. TRANSLATORS: Butt cap: the line shape does not extend beyond the end point #. of the line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:307 +#: ../src/widgets/stroke-style.cpp:364 msgid "Butt cap" msgstr "平头端点" #. TRANSLATORS: Round cap: the line shape extends beyond the end point of the #. line; the ends of the line are rounded -#: ../src/widgets/stroke-style.cpp:314 +#: ../src/widgets/stroke-style.cpp:371 msgid "Round cap" msgstr "圆头端点" #. TRANSLATORS: Square cap: the line shape extends beyond the end point of the #. line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:321 +#: ../src/widgets/stroke-style.cpp:378 msgid "Square cap" msgstr "方头端点" -#. Dash -#: ../src/widgets/stroke-style.cpp:326 -msgid "Dashes:" -msgstr "线型:" +#: ../src/widgets/stroke-style.cpp:392 +#, fuzzy +msgid "Fill, Stroke, Markers" +msgstr "笔刷样式标记" -#. Drop down marker selectors -#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes -#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. -#: ../src/widgets/stroke-style.cpp:352 -msgid "Markers:" -msgstr "标记:" +#: ../src/widgets/stroke-style.cpp:396 +#, fuzzy +msgid "Stroke, Fill, Markers" +msgstr "笔刷样式标记" -#: ../src/widgets/stroke-style.cpp:358 -msgid "Start Markers are drawn on the first node of a path or shape" -msgstr "起点标记画在路径或形状中的第一个节点上" +#: ../src/widgets/stroke-style.cpp:400 +#, fuzzy +msgid "Fill, Markers, Stroke" +msgstr "填充和笔刷" -#: ../src/widgets/stroke-style.cpp:367 -msgid "" -"Mid Markers are drawn on every node of a path or shape except the first and " -"last nodes" -msgstr "中间标记位于路径或形状中除去首位外所有的节点上" +#: ../src/widgets/stroke-style.cpp:408 +#, fuzzy +msgid "Markers, Fill, Stroke" +msgstr "填充和笔刷" -#: ../src/widgets/stroke-style.cpp:376 -msgid "End Markers are drawn on the last node of a path or shape" -msgstr "终点标记位于路径或形状中的最后一个节点上" +#: ../src/widgets/stroke-style.cpp:412 +#, fuzzy +msgid "Stroke, Markers, Fill" +msgstr "笔刷样式标记" + +#: ../src/widgets/stroke-style.cpp:416 +msgid "Markers, Stroke, Fill" +msgstr "" -#: ../src/widgets/stroke-style.cpp:498 +#: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" msgstr "设置标记" -#: ../src/widgets/stroke-style.cpp:1033 ../src/widgets/stroke-style.cpp:1117 +#: ../src/widgets/stroke-style.cpp:1116 ../src/widgets/stroke-style.cpp:1205 msgid "Set stroke style" -msgstr "设置笔廓样式" +msgstr "设置笔刷样式" -#: ../src/widgets/stroke-style.cpp:1206 +#: ../src/widgets/stroke-style.cpp:1309 msgid "Set marker color" msgstr "设置标记颜色" @@ -29552,390 +29982,445 @@ msgstr "文本:改变 dy" msgid "Text: Change rotate" msgstr "文本:改变旋转" -#: ../src/widgets/text-toolbar.cpp:781 +#: ../src/widgets/text-toolbar.cpp:787 +msgid "Text: Change writing mode" +msgstr "文本:改变输入模式" + +#: ../src/widgets/text-toolbar.cpp:841 msgid "Text: Change orientation" msgstr "文本:改变方向" -#: ../src/widgets/text-toolbar.cpp:1216 +#: ../src/widgets/text-toolbar.cpp:1309 msgid "Font Family" msgstr "字体家族" -#: ../src/widgets/text-toolbar.cpp:1217 +#: ../src/widgets/text-toolbar.cpp:1310 msgid "Select Font Family (Alt-X to access)" -msgstr "选择字体族(通过 Alt+X)" +msgstr "选择字体族(通过 Alt+X)" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1227 +#: ../src/widgets/text-toolbar.cpp:1320 msgid "Select all text with this font-family" -msgstr "选择所有带本 font-family(字族)的文本" +msgstr "选择所有带本 font-family(字族)的文本" -#: ../src/widgets/text-toolbar.cpp:1231 +#: ../src/widgets/text-toolbar.cpp:1324 msgid "Font not found on system" msgstr "系统中没有找到该字体" -#: ../src/widgets/text-toolbar.cpp:1290 +#: ../src/widgets/text-toolbar.cpp:1383 msgid "Font Style" msgstr "字体样式" -#: ../src/widgets/text-toolbar.cpp:1291 +#: ../src/widgets/text-toolbar.cpp:1384 msgid "Font style" msgstr "字体样式" #. Name -#: ../src/widgets/text-toolbar.cpp:1308 +#: ../src/widgets/text-toolbar.cpp:1401 msgid "Toggle Superscript" msgstr "切换上标" #. Label -#: ../src/widgets/text-toolbar.cpp:1309 +#: ../src/widgets/text-toolbar.cpp:1402 msgid "Toggle superscript" msgstr "切换上标" #. Name -#: ../src/widgets/text-toolbar.cpp:1321 +#: ../src/widgets/text-toolbar.cpp:1414 msgid "Toggle Subscript" msgstr "切换下标" #. Label -#: ../src/widgets/text-toolbar.cpp:1322 +#: ../src/widgets/text-toolbar.cpp:1415 msgid "Toggle subscript" msgstr "切换下标" -#: ../src/widgets/text-toolbar.cpp:1363 +#: ../src/widgets/text-toolbar.cpp:1456 msgid "Justify" msgstr "左右对齐" #. Name -#: ../src/widgets/text-toolbar.cpp:1370 +#: ../src/widgets/text-toolbar.cpp:1463 msgid "Alignment" msgstr "对齐" #. Label -#: ../src/widgets/text-toolbar.cpp:1371 +#: ../src/widgets/text-toolbar.cpp:1464 msgid "Text alignment" msgstr "文本对齐方式" -#: ../src/widgets/text-toolbar.cpp:1398 +#: ../src/widgets/text-toolbar.cpp:1491 msgid "Horizontal" msgstr "水平" -#: ../src/widgets/text-toolbar.cpp:1405 -msgid "Vertical" -msgstr "垂直" +#: ../src/widgets/text-toolbar.cpp:1498 +msgid "Vertical — RL" +msgstr "垂直 - RL" + +#: ../src/widgets/text-toolbar.cpp:1499 +msgid "Vertical text — lines: right to left" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1505 +msgid "Vertical — LR" +msgstr "垂直 - LR" + +#: ../src/widgets/text-toolbar.cpp:1506 +msgid "Vertical text — lines: left to right" +msgstr "" + +#. Name +#: ../src/widgets/text-toolbar.cpp:1511 +msgid "Writing mode" +msgstr "写作模式" #. Label -#: ../src/widgets/text-toolbar.cpp:1412 +#: ../src/widgets/text-toolbar.cpp:1512 +msgid "Block progression" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1541 +msgid "Auto glyph orientation" +msgstr "自动字形方向" + +#: ../src/widgets/text-toolbar.cpp:1548 +#, fuzzy +msgid "Upright" +msgstr "加亮" + +#: ../src/widgets/text-toolbar.cpp:1549 +#, fuzzy +msgid "Upright glyph orientation" +msgstr "文本方向" + +#: ../src/widgets/text-toolbar.cpp:1556 +msgid "Sideways" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1557 +#, fuzzy +msgid "Sideways glyph orientation" +msgstr "沿路径方向" + +#. Name +#: ../src/widgets/text-toolbar.cpp:1563 msgid "Text orientation" msgstr "文本方向" +#. Label +#: ../src/widgets/text-toolbar.cpp:1564 +msgid "Text (glyph) orientation in vertical text." +msgstr "" + #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1435 +#: ../src/widgets/text-toolbar.cpp:1588 msgid "Smaller spacing" msgstr "缩小间距" -#: ../src/widgets/text-toolbar.cpp:1435 ../src/widgets/text-toolbar.cpp:1466 -#: ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1588 ../src/widgets/text-toolbar.cpp:1619 +#: ../src/widgets/text-toolbar.cpp:1650 msgctxt "Text tool" msgid "Normal" msgstr "正常" -#: ../src/widgets/text-toolbar.cpp:1435 +#: ../src/widgets/text-toolbar.cpp:1588 msgid "Larger spacing" msgstr "扩大间距" #. name -#: ../src/widgets/text-toolbar.cpp:1440 +#: ../src/widgets/text-toolbar.cpp:1593 msgid "Line Height" msgstr "行高" #. label -#: ../src/widgets/text-toolbar.cpp:1441 +#: ../src/widgets/text-toolbar.cpp:1594 msgid "Line:" msgstr "行:" #. short label -#: ../src/widgets/text-toolbar.cpp:1442 -msgid "Spacing between lines (times font size)" -msgstr "行间距(字体大小的倍数)" +#: ../src/widgets/text-toolbar.cpp:1595 +#, fuzzy +msgid "Spacing between baselines (times font size)" +msgstr "行间距(字体大小的倍数)" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1466 ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 msgid "Negative spacing" msgstr "负间距" -#: ../src/widgets/text-toolbar.cpp:1466 ../src/widgets/text-toolbar.cpp:1497 +#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 msgid "Positive spacing" msgstr "正间距" #. name -#: ../src/widgets/text-toolbar.cpp:1471 +#: ../src/widgets/text-toolbar.cpp:1624 msgid "Word spacing" msgstr "词间距" #. label -#: ../src/widgets/text-toolbar.cpp:1472 +#: ../src/widgets/text-toolbar.cpp:1625 msgid "Word:" msgstr "词:" #. short label -#: ../src/widgets/text-toolbar.cpp:1473 +#: ../src/widgets/text-toolbar.cpp:1626 msgid "Spacing between words (px)" -msgstr "单词之间的间距(px)" +msgstr "单词之间的间距(像素)" #. name -#: ../src/widgets/text-toolbar.cpp:1502 +#: ../src/widgets/text-toolbar.cpp:1655 msgid "Letter spacing" msgstr "字间距" #. label -#: ../src/widgets/text-toolbar.cpp:1503 +#: ../src/widgets/text-toolbar.cpp:1656 msgid "Letter:" msgstr "字:" #. short label -#: ../src/widgets/text-toolbar.cpp:1504 +#: ../src/widgets/text-toolbar.cpp:1657 msgid "Spacing between letters (px)" -msgstr "字母间距(px)" +msgstr "字母间距(像素)" #. name -#: ../src/widgets/text-toolbar.cpp:1533 +#: ../src/widgets/text-toolbar.cpp:1686 msgid "Kerning" msgstr "字距调整" #. label -#: ../src/widgets/text-toolbar.cpp:1534 +#: ../src/widgets/text-toolbar.cpp:1687 msgid "Kern:" msgstr "距:" #. short label -#: ../src/widgets/text-toolbar.cpp:1535 +#: ../src/widgets/text-toolbar.cpp:1688 msgid "Horizontal kerning (px)" -msgstr "水平字距调整(px)" +msgstr "水平字距调整(像素)" #. name -#: ../src/widgets/text-toolbar.cpp:1564 +#: ../src/widgets/text-toolbar.cpp:1717 msgid "Vertical Shift" msgstr "垂直偏移" #. label -#: ../src/widgets/text-toolbar.cpp:1565 +#: ../src/widgets/text-toolbar.cpp:1718 msgid "Vert:" msgstr "垂:" #. short label -#: ../src/widgets/text-toolbar.cpp:1566 +#: ../src/widgets/text-toolbar.cpp:1719 msgid "Vertical shift (px)" -msgstr "垂直偏移(px)" +msgstr "垂直偏移(像素)" #. name -#: ../src/widgets/text-toolbar.cpp:1595 +#: ../src/widgets/text-toolbar.cpp:1748 msgid "Letter rotation" msgstr "字母旋转" #. label -#: ../src/widgets/text-toolbar.cpp:1596 +#: ../src/widgets/text-toolbar.cpp:1749 msgid "Rot:" msgstr "旋:" #. short label -#: ../src/widgets/text-toolbar.cpp:1597 +#: ../src/widgets/text-toolbar.cpp:1750 msgid "Character rotation (degrees)" -msgstr "字符旋转(度)" +msgstr "字符旋转(度)" -#: ../src/widgets/toolbox.cpp:177 +#: ../src/widgets/toolbox.cpp:184 msgid "Color/opacity used for color tweaking" msgstr "色彩扭曲使用的颜色/不透明度" -#: ../src/widgets/toolbox.cpp:185 +#: ../src/widgets/toolbox.cpp:192 msgid "Style of new stars" msgstr "新星形的样式" -#: ../src/widgets/toolbox.cpp:187 +#: ../src/widgets/toolbox.cpp:194 msgid "Style of new rectangles" msgstr "新矩形的样式" -#: ../src/widgets/toolbox.cpp:189 +#: ../src/widgets/toolbox.cpp:196 msgid "Style of new 3D boxes" msgstr "新 3D 盒子的样式" -#: ../src/widgets/toolbox.cpp:191 +#: ../src/widgets/toolbox.cpp:198 msgid "Style of new ellipses" msgstr "新椭圆的样式" -#: ../src/widgets/toolbox.cpp:193 +#: ../src/widgets/toolbox.cpp:200 msgid "Style of new spirals" msgstr "新螺旋线的样式" -#: ../src/widgets/toolbox.cpp:195 +#: ../src/widgets/toolbox.cpp:202 msgid "Style of new paths created by Pencil" msgstr "铅笔创建的新路径的样式" -#: ../src/widgets/toolbox.cpp:197 +#: ../src/widgets/toolbox.cpp:204 msgid "Style of new paths created by Pen" msgstr "钢笔创建的新路径的样式" -#: ../src/widgets/toolbox.cpp:199 +#: ../src/widgets/toolbox.cpp:206 msgid "Style of new calligraphic strokes" msgstr "新书法轮廓的样式" -#: ../src/widgets/toolbox.cpp:201 ../src/widgets/toolbox.cpp:203 +#: ../src/widgets/toolbox.cpp:208 ../src/widgets/toolbox.cpp:210 msgid "TBD" msgstr "待续 (TBD)" -#: ../src/widgets/toolbox.cpp:215 +#: ../src/widgets/toolbox.cpp:223 msgid "Style of Paint Bucket fill objects" msgstr "油漆桶填充样式" -#: ../src/widgets/toolbox.cpp:1684 +#: ../src/widgets/toolbox.cpp:1735 msgid "Bounding box" msgstr "边界框" -#: ../src/widgets/toolbox.cpp:1684 +#: ../src/widgets/toolbox.cpp:1735 msgid "Snap bounding boxes" msgstr "吸附边界框" -#: ../src/widgets/toolbox.cpp:1693 +#: ../src/widgets/toolbox.cpp:1744 msgid "Bounding box edges" msgstr "边界框的边" -#: ../src/widgets/toolbox.cpp:1693 +#: ../src/widgets/toolbox.cpp:1744 msgid "Snap to edges of a bounding box" msgstr "吸附到边界框的边" -#: ../src/widgets/toolbox.cpp:1702 +#: ../src/widgets/toolbox.cpp:1753 msgid "Bounding box corners" msgstr "边界框的顶点" -#: ../src/widgets/toolbox.cpp:1702 +#: ../src/widgets/toolbox.cpp:1753 msgid "Snap bounding box corners" msgstr "吸附边界框的顶点" -#: ../src/widgets/toolbox.cpp:1711 +#: ../src/widgets/toolbox.cpp:1762 msgid "BBox Edge Midpoints" msgstr "边界框边的中点" -#: ../src/widgets/toolbox.cpp:1711 +#: ../src/widgets/toolbox.cpp:1762 msgid "Snap midpoints of bounding box edges" msgstr "吸附边界框边缘的中点" -#: ../src/widgets/toolbox.cpp:1721 +#: ../src/widgets/toolbox.cpp:1772 msgid "BBox Centers" msgstr "边界框中心 " -#: ../src/widgets/toolbox.cpp:1721 +#: ../src/widgets/toolbox.cpp:1772 msgid "Snapping centers of bounding boxes" msgstr "吸附到边界框的中心" -#: ../src/widgets/toolbox.cpp:1730 +#: ../src/widgets/toolbox.cpp:1781 msgid "Snap nodes, paths, and handles" msgstr "吸附节点、路径和手柄" -#: ../src/widgets/toolbox.cpp:1738 +#: ../src/widgets/toolbox.cpp:1789 msgid "Snap to paths" msgstr "吸附到路径" -#: ../src/widgets/toolbox.cpp:1747 +#: ../src/widgets/toolbox.cpp:1798 msgid "Path intersections" msgstr "路径交点" -#: ../src/widgets/toolbox.cpp:1747 +#: ../src/widgets/toolbox.cpp:1798 msgid "Snap to path intersections" msgstr "吸附到路径交点" -#: ../src/widgets/toolbox.cpp:1756 +#: ../src/widgets/toolbox.cpp:1807 msgid "To nodes" msgstr "到节点" -#: ../src/widgets/toolbox.cpp:1756 +#: ../src/widgets/toolbox.cpp:1807 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "吸附尖角节点,包括矩形边角" -#: ../src/widgets/toolbox.cpp:1765 +#: ../src/widgets/toolbox.cpp:1816 msgid "Smooth nodes" msgstr "光滑节点" -#: ../src/widgets/toolbox.cpp:1765 +#: ../src/widgets/toolbox.cpp:1816 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "吸附平滑节点,包括椭圆的四个极限点" -#: ../src/widgets/toolbox.cpp:1774 +#: ../src/widgets/toolbox.cpp:1825 msgid "Line Midpoints" msgstr "线的中点" -#: ../src/widgets/toolbox.cpp:1774 +#: ../src/widgets/toolbox.cpp:1825 msgid "Snap midpoints of line segments" msgstr "吸附线段的中点" -#: ../src/widgets/toolbox.cpp:1783 +#: ../src/widgets/toolbox.cpp:1834 msgid "Others" msgstr "其他" -#: ../src/widgets/toolbox.cpp:1783 +#: ../src/widgets/toolbox.cpp:1834 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" -msgstr "吸附其它点(中心、辅助原点、渐变手柄等)" +msgstr "吸附其他点(中心、辅助原点、渐变手柄等)" -#: ../src/widgets/toolbox.cpp:1791 +#: ../src/widgets/toolbox.cpp:1842 msgid "Object Centers" msgstr "对象中心" -#: ../src/widgets/toolbox.cpp:1791 +#: ../src/widgets/toolbox.cpp:1842 msgid "Snap centers of objects" msgstr "吸附对象的中心" -#: ../src/widgets/toolbox.cpp:1800 +#: ../src/widgets/toolbox.cpp:1851 msgid "Rotation Centers" msgstr "旋转中心" -#: ../src/widgets/toolbox.cpp:1800 +#: ../src/widgets/toolbox.cpp:1851 msgid "Snap an item's rotation center" msgstr "吸附一个项目的旋转中心" -#: ../src/widgets/toolbox.cpp:1809 +#: ../src/widgets/toolbox.cpp:1860 msgid "Text baseline" msgstr "文本基线" -#: ../src/widgets/toolbox.cpp:1809 +#: ../src/widgets/toolbox.cpp:1860 msgid "Snap text anchors and baselines" msgstr "吸附文本锚点和基线" -#: ../src/widgets/toolbox.cpp:1819 +#: ../src/widgets/toolbox.cpp:1870 msgid "Page border" msgstr "页面边沿" -#: ../src/widgets/toolbox.cpp:1819 +#: ../src/widgets/toolbox.cpp:1870 msgid "Snap to the page border" msgstr "吸附到页面边沿" -#: ../src/widgets/toolbox.cpp:1828 +#: ../src/widgets/toolbox.cpp:1879 msgid "Snap to grids" msgstr "吸附到网格" -#: ../src/widgets/toolbox.cpp:1837 +#: ../src/widgets/toolbox.cpp:1888 msgid "Snap guides" msgstr "吸附辅助线" #. Width #: ../src/widgets/tweak-toolbar.cpp:125 msgid "(pinch tweak)" -msgstr "(挤压扭曲)" +msgstr "(挤压扭曲)" #: ../src/widgets/tweak-toolbar.cpp:125 msgid "(broad tweak)" -msgstr "(广泛扭曲)" +msgstr "(广泛扭曲)" #: ../src/widgets/tweak-toolbar.cpp:128 msgid "The width of the tweak area (relative to the visible canvas area)" -msgstr "扭曲区域宽度(相对于可见画布)" +msgstr "扭曲区域宽度(相对于可见画布)" #. Force #: ../src/widgets/tweak-toolbar.cpp:142 msgid "(minimum force)" -msgstr "(最小作用力)" +msgstr "(最小作用力)" #: ../src/widgets/tweak-toolbar.cpp:142 msgid "(maximum force)" -msgstr "(最大作用力)" +msgstr "(最大作用力)" #: ../src/widgets/tweak-toolbar.cpp:145 msgid "Force" @@ -29999,7 +30484,7 @@ msgstr "再制对象,按 Shift 则删除" #: ../src/widgets/tweak-toolbar.cpp:205 msgid "Push mode" -msgstr "推压" +msgstr "推压模式" #: ../src/widgets/tweak-toolbar.cpp:206 msgid "Push parts of paths in any direction" @@ -30011,7 +30496,7 @@ msgstr "扩张/收缩模式" #: ../src/widgets/tweak-toolbar.cpp:213 msgid "Shrink (inset) parts of paths; with Shift grow (outset)" -msgstr "收缩(内偏移)路径的一部分;按 Shift 则为扩张(外偏移)" +msgstr "收缩(内偏移)路径的一部分;按 Shift 则为扩张(外偏移)" #: ../src/widgets/tweak-toolbar.cpp:219 msgid "Attract/repel mode" @@ -30095,16 +30580,16 @@ msgstr "彩色模式下,作用于对象的不透明度" #: ../src/widgets/tweak-toolbar.cpp:339 msgctxt "Opacity" msgid "O" -msgstr "透" +msgstr "不透明" #. Fidelity #: ../src/widgets/tweak-toolbar.cpp:350 msgid "(rough, simplified)" -msgstr "(粗略,路径简单)" +msgstr "(粗略,路径简单)" #: ../src/widgets/tweak-toolbar.cpp:350 msgid "(fine, but many nodes)" -msgstr "(精细,节点较多)" +msgstr "(精细,节点较多)" #: ../src/widgets/tweak-toolbar.cpp:353 msgid "Fidelity" @@ -30143,35 +30628,35 @@ msgstr "不能处理对象。尝试先将其转为路径。" #. report to the Inkscape console using errormsg #: ../share/extensions/draw_from_triangle.py:180 msgid "Side Length 'a' (px): " -msgstr "边长 a(px):" +msgstr "边长 a (像素):" #: ../share/extensions/draw_from_triangle.py:181 msgid "Side Length 'b' (px): " -msgstr "边长 b(px):" +msgstr "边长 b (像素):" #: ../share/extensions/draw_from_triangle.py:182 msgid "Side Length 'c' (px): " -msgstr "边长 c(px):" +msgstr "边长 c (像素):" #: ../share/extensions/draw_from_triangle.py:183 msgid "Angle 'A' (radians): " -msgstr "角 A(rad):" +msgstr "角 A (弧度):" #: ../share/extensions/draw_from_triangle.py:184 msgid "Angle 'B' (radians): " -msgstr "角 B(rad):" +msgstr "角 B (弧度):" #: ../share/extensions/draw_from_triangle.py:185 msgid "Angle 'C' (radians): " -msgstr "角 C(rad):" +msgstr "角 C (弧度):" #: ../share/extensions/draw_from_triangle.py:186 msgid "Semiperimeter (px): " -msgstr "半周长(px):" +msgstr "半周长(像素):" #: ../share/extensions/draw_from_triangle.py:187 msgid "Area (px^2): " -msgstr "面积(px^2):" +msgstr "面积(px^2):" #: ../share/extensions/dxf_input.py:528 #, python-format @@ -30179,8 +30664,8 @@ msgid "" "%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert " "to Release 13 format using QCad." msgstr "" -"遇到 %d 个类型为 POLYLINE(折线)的 ENTITIES(实体)并被忽略。请尝试转换为使" -"用 QCad Release 13 格式。" +"遇到 %d 个类型为 POLYLINE(折线)的 ENTITIES(实体)并被忽略。请尝试转换为使用 " +"QCad Release 13 格式。" #: ../share/extensions/dxf_outlines.py:49 msgid "" @@ -30194,8 +30679,8 @@ msgid "" "Error: Field 'Layer match name' must be filled when using 'By name match' " "option" msgstr "" -"错误:字段“Layer match name”(层匹配名称)在使用“By name match”(按名称匹配)" -"选项时必须填写" +"错误:字段“Layer match name”(层匹配名称)在使用“By name match”(按名称匹配)选项" +"时必须填写" #: ../share/extensions/dxf_outlines.py:356 #, python-format @@ -30246,11 +30731,13 @@ msgid "Need at least 2 paths selected" msgstr "需要至少选择 2 个路径" #: ../share/extensions/funcplot.py:48 +#, fuzzy msgid "" "x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" msgstr "X 轴间隔不能为 0。请修改“开始 X 值”或“结束 X 值”" #: ../share/extensions/funcplot.py:60 +#, fuzzy msgid "" "y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y " "value of rectangle's bottom'" @@ -30306,8 +30793,8 @@ msgid "" "should not be the same. If there are three orientation points they should " "not be in a straight line.)" msgstr "" -"定向点错误!(如果有 2 个定向点,那么它们不应相同。如果有 3 个定向点的话,那" -"么它们不应在同一直线上。)" +"定向点错误!(如果有 2 个定向点,那么它们不应相同。如果有 3 个定向点的话,那么" +"它们不应在同一直线上。)" #: ../share/extensions/gcodetools.py:4250 #, python-format @@ -30343,7 +30830,7 @@ msgstr "" msgid "" "Document has no layers! Add at least one layer using layers panel (Ctrl+Shift" "+L)" -msgstr "文档没有图层!使用图层面板至少添加一层(Ctrl+Shift+L)" +msgstr "文档没有图层!使用图层面板至少添加一层(Ctrl+Shift+L)" #: ../share/extensions/gcodetools.py:4294 msgid "" @@ -30356,13 +30843,12 @@ msgstr "警告!在文档的根有相同的路径,但是不在任何的层中 msgid "" "Warning! Tool's and default tool's parameter's (%s) types are not the same " "( type('%s') != type('%s') )." -msgstr "" -"警告!工具的和默认工具的参数(%s)类型不相同(type('%s') != type('%s'))。" +msgstr "警告!工具的和默认工具的参数(%s)类型不相同(type('%s') != type('%s'))。" #: ../share/extensions/gcodetools.py:4374 #, python-format msgid "Warning! Tool has parameter that default tool has not ( '%s': '%s' )." -msgstr "警告!工具拥有默认工具没有的参数('%s': '%s')。" +msgstr "警告!工具拥有默认工具没有的参数('%s': '%s')。" #: ../share/extensions/gcodetools.py:4388 #, python-format @@ -30381,14 +30867,14 @@ msgid "" "Warning: One or more paths do not have 'd' parameter, try to Ungroup (Ctrl" "+Shift+G) and Object to Path (Ctrl+Shift+C)!" msgstr "" -"警告:一个或多个路径没有“d”参数,尝试“取消组合(Ctrl+Shift+G)”以及“对象转为" -"路径(Ctrl+Shift+C)”!" +"警告:一个或多个路径没有“d”参数,尝试“取消组合(Ctrl+Shift+G)”以及“对象转为路" +"径(Ctrl+Shift+C)”!" #: ../share/extensions/gcodetools.py:4667 msgid "" "Nothing is selected. Please select something to convert to drill point " "(dxfpoint) or clear point sign." -msgstr "未选择内容。请选择一些内容用于转换为钻尖点(dxfpoint)或者清理点标志。" +msgstr "未选择内容。请选择一些内容用于转换为钻尖点(dxfpoint)或者清理点标志。" #: ../share/extensions/gcodetools.py:4750 #: ../share/extensions/gcodetools.py:4996 @@ -30458,11 +30944,11 @@ msgstr "" #: ../share/extensions/gcodetools.py:6107 msgid "Lathe X and Z axis remap should be 'X', 'Y' or 'Z'. Exiting..." -msgstr "车床 X 和 Z 轴重新映射应该是 X、Y 或 Z。正在退出…" +msgstr "车床 X 和 Z 轴重新映射应该是 X、Y 或 Z。正在退出..." #: ../share/extensions/gcodetools.py:6110 msgid "Lathe X and Z axis remap should be the same. Exiting..." -msgstr "车床 X 和 Z 轴重新映射应该相同。正在退出…" +msgstr "车床 X 和 Z 轴重新映射应该相同。正在退出..." #: ../share/extensions/gcodetools.py:6662 #, python-format @@ -30473,7 +30959,7 @@ msgid "" msgstr "" "选择其中一个动作选项卡——路径转成 Gcode、面铣、雕刻、DXF 钻尖、方向、偏移、车" "床或刀具库。\n" -"当前的动作选项卡识别码为 %s" +"当前的动作选项卡标识为 %s" #: ../share/extensions/gcodetools.py:6668 msgid "" @@ -30492,8 +30978,8 @@ msgid "" "Failed to import the subprocess module. Please report this as a bug at: " "https://bugs.launchpad.net/inkscape." msgstr "" -"无法导入子进程(subprocess)模块。请在这个地址报告错误:https://bugs." -"launchpad.net/inkscape." +"无法导入子进程(subprocess)模块。请在这个地址报告错误:https://bugs.launchpad." +"net/inkscape." #: ../share/extensions/generate_voronoi.py:36 msgid "Python version is: " @@ -30505,11 +30991,11 @@ msgstr "请选择一个对象" #: ../share/extensions/gimp_xcf.py:39 msgid "Inkscape must be installed and set in your path variable." -msgstr "" +msgstr "必须安装 Inkscape 并存在于 PATH 变量中。" #: ../share/extensions/gimp_xcf.py:43 msgid "Gimp must be installed and set in your path variable." -msgstr "必须安装 Gimp 并存在于已设置的 PATH 变量中。" +msgstr "必须安装 Gimp 并存在于 PATH 变量中。" #: ../share/extensions/gimp_xcf.py:47 msgid "An error occurred while processing the XCF file." @@ -30540,14 +31026,13 @@ msgstr "找不到 HPGL 数据。" msgid "" "The HPGL data contained unknown (unsupported) commands, there is a " "possibility that the drawing is missing some content." -msgstr "" -"HPGL 数据中包含未知(或不被支持的)命令,也可能是此绘图缺少了某些内容。" +msgstr "HPGL 数据中包含未知(或不被支持的)命令,也可能是此绘图缺少了某些内容。" #. issue error if no paths found #: ../share/extensions/hpgl_output.py:58 msgid "" "No paths where found. Please convert all objects you want to save into paths." -msgstr "找不到路径。请转换所有你想保存到路径中的对象。" +msgstr "找不到路径。请转换所有您想保存到路径中的对象。" #: ../share/extensions/inkex.py:116 #, python-format @@ -30560,29 +31045,29 @@ msgid "" "Technical details:\n" "%s" msgstr "" -"用于 libxml2 的神奇的 lxml 包裹程序(于是还有此扩展)依赖于 inkex.py。请从 " -"http://cheeseshop.python.org/pypi/lxml/ 下载并安装最新版本,或者经由你的软件" -"包管理程序(例如:sudo apt-get install python-lxml)来安装\n" +"用于 libxml2 的神奇的 lxml 包裹程序(于是还有此扩展)依赖于 inkex.py。请从 " +"http://cheeseshop.python.org/pypi/lxml/ 下载并安装最新版本,或者经由您的软件" +"包管理程序(例如:sudo apt-get install python-lxml)来安装\n" "\n" "技术详情:\n" "%s" -#: ../share/extensions/inkex.py:169 +#: ../share/extensions/inkex.py:172 #, python-format msgid "Unable to open specified file: %s" msgstr "无法打开指定的文件: %s" -#: ../share/extensions/inkex.py:178 +#: ../share/extensions/inkex.py:181 #, python-format msgid "Unable to open object member file: %s" msgstr "无法打开对象成员文件:%s" -#: ../share/extensions/inkex.py:283 +#: ../share/extensions/inkex.py:286 #, python-format msgid "No matching node for expression: %s" msgstr "没有找到匹配表达式的节点:%s " -#: ../share/extensions/inkex.py:313 +#: ../share/extensions/inkex.py:340 msgid "SVG Width not set correctly! Assuming width = 100" msgstr "SVG 宽度设置不正确!假定宽度为 100" @@ -30608,7 +31093,7 @@ msgid "" "\n" msgstr "" "JessyInk 脚本没有未安装到这个 SVG 文件中或者与 JessyInk 扩展的版本不同。请" -"从“扩展”的“JessyInk”子菜单里选择“安装 / 更新…”来安装或更新此 JessyInk 脚" +"从“扩展”的“JessyInk”子菜单里选择“安装 / 更新...”来安装或更新此 JessyInk 脚" "本。\n" "\n" @@ -30626,7 +31111,7 @@ msgid "" "Node with id '{0}' is not a suitable text node and was therefore ignored.\n" "\n" msgstr "" -"含有识别码“{0}”的节点不是合适的文本节点,因此忽略该节点。\n" +"含有标识“{0}”的节点不是合适的文本节点,因此忽略该节点。\n" "\n" #: ../share/extensions/jessyInk_effects.py:53 @@ -30681,7 +31166,7 @@ msgstr "{0}层名:{1}" #: ../share/extensions/jessyInk_summary.py:102 msgid "{0}Transition in: {1} ({2!s} s)" -msgstr "{0}转入变换:{1}({2!s} 秒)" +msgstr "{0}转入变换:{1}({2!s} 秒)" #: ../share/extensions/jessyInk_summary.py:104 #, python-brace-format @@ -30690,7 +31175,7 @@ msgstr "{0}转入变换:{1}" #: ../share/extensions/jessyInk_summary.py:111 msgid "{0}Transition out: {1} ({2!s} s)" -msgstr "{0}转出变换:{1}({2!s} 秒)" +msgstr "{0}转出变换:{1}({2!s} 秒)" #: ../share/extensions/jessyInk_summary.py:113 #, python-brace-format @@ -30709,7 +31194,7 @@ msgstr "" #: ../share/extensions/jessyInk_summary.py:123 #, python-brace-format msgid "{0}\t\"{1}\" (object id \"{2}\") will be replaced by \"{3}\"." -msgstr "{0}\t“{1}”(对象识别码“{2}”)将会用“{3}”替换。" +msgstr "{0}\t“{1}”(对象标识“{2}”)将会用“{3}”替换。" #: ../share/extensions/jessyInk_summary.py:168 #, python-brace-format @@ -30718,7 +31203,7 @@ msgid "" "{0}Initial effect (order number {1}):" msgstr "" "\n" -"{0}初始特效(序号 {1}):" +"{0}初始特效(序号 {1}):" #: ../share/extensions/jessyInk_summary.py:170 msgid "" @@ -30726,7 +31211,7 @@ msgid "" "{0}Effect {1!s} (order number {2}):" msgstr "" "\n" -"{0}特效 {1!s}(序号 {2}):" +"{0}特效 {1!s}(序号 {2}):" #: ../share/extensions/jessyInk_summary.py:174 #, python-brace-format @@ -30789,7 +31274,7 @@ msgstr "没有选取对象。请选取您要指定视角的对象并按应用。 #: ../share/extensions/markers_strokepaint.py:83 #, python-format msgid "No style attribute found for id: %s" -msgstr "无法为下列 id 找到样式(style)属性:%s" +msgstr "无法为下列 id 找到样式(style)属性:%s" #: ../share/extensions/markers_strokepaint.py:137 #, python-format @@ -30810,7 +31295,7 @@ msgid "Area is zero, cannot calculate Center of Mass" msgstr "面积为 0,不能计算质心" #: ../share/extensions/pathalongpath.py:208 -#: ../share/extensions/pathscatter.py:228 ../share/extensions/perspective.py:53 +#: ../share/extensions/pathscatter.py:228 ../share/extensions/perspective.py:52 msgid "This extension requires two selected paths." msgstr "该扩展需要选择两条路径。" @@ -30833,9 +31318,9 @@ msgstr "" #: ../share/extensions/pathmodifier.py:237 #, python-format msgid "Please first convert objects to paths! (Got [%s].)" -msgstr "请首先将对象转为路径!(得到 [%s])。" +msgstr "请首先将对象转为路径!(得到 [%s])。" -#: ../share/extensions/perspective.py:45 +#: ../share/extensions/perspective.py:44 msgid "" "Failed to import the numpy or numpy.linalg modules. These modules are " "required by this extension. Please install them and try again. On a Debian-" @@ -30846,7 +31331,7 @@ msgstr "" "类 Debian 系统中,可以通过命令 sudo apt-get install python-numpy 来解决这个问" "题。" -#: ../share/extensions/perspective.py:61 ../share/extensions/summersnight.py:52 +#: ../share/extensions/perspective.py:60 ../share/extensions/summersnight.py:51 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -30855,12 +31340,12 @@ msgstr "" "第一个已选对象的类型为“%s”。\n" "请尝试执行操作“路径→对象转化成路径”。" -#: ../share/extensions/perspective.py:68 ../share/extensions/summersnight.py:60 +#: ../share/extensions/perspective.py:67 ../share/extensions/summersnight.py:59 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "该扩展要求第二个路径具有四个节点。" -#: ../share/extensions/perspective.py:94 ../share/extensions/summersnight.py:93 +#: ../share/extensions/perspective.py:93 ../share/extensions/summersnight.py:92 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -30868,7 +31353,7 @@ msgstr "" "第二个选定对象是群组,而不是路径。\n" "请尝试执行操作“群组→解除群组”。" -#: ../share/extensions/perspective.py:96 ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:95 ../share/extensions/summersnight.py:94 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -30876,7 +31361,7 @@ msgstr "" "第二个选定对象不是路径。\n" "请尝试执行操作“路径→对象转化成路径”。" -#: ../share/extensions/perspective.py:99 ../share/extensions/summersnight.py:98 +#: ../share/extensions/perspective.py:98 ../share/extensions/summersnight.py:97 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -30888,7 +31373,7 @@ msgstr "" #: ../share/extensions/plotter.py:69 msgid "" "No paths where found. Please convert all objects you want to plot into paths." -msgstr "找不到路径。请转换你想制成路径的所有对象。" +msgstr "找不到路径。请转换您想制成路径的所有对象。" #: ../share/extensions/plotter.py:147 msgid "" @@ -30905,9 +31390,9 @@ msgstr "" msgid "" "Could not open port. Please check that your plotter is running, connected " "and the settings are correct." -msgstr "不能打开端口。请检查你的绘图仪是否正在运作,已经链接并且设置正确。" +msgstr "不能打开端口。请检查您的绘图仪是否正在运作,已经链接并且设置正确。" -#: ../share/extensions/polyhedron_3d.py:65 +#: ../share/extensions/polyhedron_3d.py:66 msgid "" "Failed to import the numpy module. This module is required by this " "extension. Please install it and try again. On a Debian-like system this " @@ -30916,24 +31401,24 @@ msgstr "" "不能导入 numpy 模块。本扩展需要这些模块,请安装它们后重试。在类 Debian 系统" "中,可以通过命令 sudo apt-get install python-numpy 来解决这个问题。" -#: ../share/extensions/polyhedron_3d.py:336 +#: ../share/extensions/polyhedron_3d.py:337 msgid "No face data found in specified file." msgstr "在指定文件中没有“面”的数据。" -#: ../share/extensions/polyhedron_3d.py:337 +#: ../share/extensions/polyhedron_3d.py:338 msgid "Try selecting \"Edge Specified\" in the Model File tab.\n" msgstr "请尝试在模型文件面板中选择“指定边”。\n" -#: ../share/extensions/polyhedron_3d.py:343 +#: ../share/extensions/polyhedron_3d.py:344 msgid "No edge data found in specified file." msgstr "在指定文件中没有“边”的数据。" -#: ../share/extensions/polyhedron_3d.py:344 +#: ../share/extensions/polyhedron_3d.py:345 msgid "Try selecting \"Face Specified\" in the Model File tab.\n" msgstr "请尝试在模型文件面板中选择“指定面”。\n" #. we cannot generate a list of faces from the edges without a lot of computation -#: ../share/extensions/polyhedron_3d.py:522 +#: ../share/extensions/polyhedron_3d.py:524 msgid "" "Face Data Not Found. Ensure file contains face data, and check the file is " "imported as \"Face-Specified\" under the \"Model File\" tab.\n" @@ -30941,34 +31426,34 @@ msgstr "" "找不到有关面的数据。请确保文件中包含面的信息,并且确认该文件在“模型文件”面板" "中以“指定面”的形式导入。\n" -#: ../share/extensions/polyhedron_3d.py:524 +#: ../share/extensions/polyhedron_3d.py:526 msgid "Internal Error. No view type selected\n" msgstr "内部错误。未选择视图类型\n" #: ../share/extensions/print_win32_vector.py:41 msgid "sorry, this will run only on Windows, exiting..." -msgstr "对不起,这个只能在 Windows 上运行,正在退出…" +msgstr "对不起,这个只能在 Windows 上运行,正在退出..." #: ../share/extensions/print_win32_vector.py:179 msgid "Failed to open default printer" msgstr "无法打开默认打印机" -#: ../share/extensions/render_barcode_datamatrix.py:202 +#: ../share/extensions/render_barcode_datamatrix.py:203 msgid "Unrecognised DataMatrix size" msgstr "未能识别的 DataMatrix 尺寸" #. we have an invalid bit value -#: ../share/extensions/render_barcode_datamatrix.py:643 +#: ../share/extensions/render_barcode_datamatrix.py:644 msgid "Invalid bit value, this is a bug!" msgstr "无效位值,这是一个错误!" #. abort if converting blank text -#: ../share/extensions/render_barcode_datamatrix.py:678 +#: ../share/extensions/render_barcode_datamatrix.py:679 msgid "Please enter an input string" msgstr "请输入一个输入字符串" #. abort if converting blank text -#: ../share/extensions/render_barcode_qrcode.py:1054 +#: ../share/extensions/render_barcode_qrcode.py:1055 msgid "Please enter an input text" msgstr "请输入一个输入文本" @@ -31016,10 +31501,11 @@ msgid "Please enter a replacement font in the replace all box." msgstr "请在“替换全部”框中输入一个替代字体。" #: ../share/extensions/restack.py:76 +#, fuzzy msgid "There is no selection to restack." -msgstr "" +msgstr "没有选择要插值的内容" -#: ../share/extensions/summersnight.py:44 +#: ../share/extensions/summersnight.py:43 msgid "" "This extension requires two selected paths. \n" "The second path must be exactly four nodes long." @@ -31035,7 +31521,7 @@ msgstr "不能定位文件:%s" #: ../share/extensions/svgcalendar.py:266 #: ../share/extensions/svgcalendar.py:288 msgid "You must select a correct system encoding." -msgstr "你必须选择正确的系统编码。" +msgstr "您必须选择正确的系统编码。" #: ../share/extensions/uniconv-ext.py:56 #: ../share/extensions/uniconv_output.py:122 @@ -31047,33 +31533,33 @@ msgid "" "and install into your Inkscape's Python location\n" msgstr "" -#: ../share/extensions/voronoi2svg.py:215 +#: ../share/extensions/voronoi2svg.py:198 msgid "Please select objects!" msgstr "请选择对象!" #: ../share/extensions/web-set-att.py:58 #: ../share/extensions/web-transmit-att.py:54 msgid "You must select at least two elements." -msgstr "你需要选择至少两个对象." +msgstr "您需要选择至少两个对象." #: ../share/extensions/webslicer_create_group.py:57 msgid "" "You must create and select some \"Slicer rectangles\" before trying to group." -msgstr "在尝试组合前你必须创建并选择某些“分片工具矩形”。" +msgstr "在尝试组合前您必须创建并选择某些“分片工具矩形”。" #: ../share/extensions/webslicer_create_group.py:72 msgid "" "You must to select some \"Slicer rectangles\" or other \"Layout groups\"." -msgstr "你必须选择某些“分片矩形”或其它“布局组”。" +msgstr "您必须选择某些“分片矩形”或其他“布局组”。" #: ../share/extensions/webslicer_create_group.py:76 #, python-format msgid "Oops... The element \"%s\" is not in the Web Slicer layer" -msgstr "啊呀…元素“%s”不在 Web 切割蒙版图层中" +msgstr "啊呀...元素“%s”不在 Web 切割蒙版图层中" #: ../share/extensions/webslicer_export.py:57 msgid "You must give a directory to export the slices." -msgstr "你必须给出一个目录用于导出分片。" +msgstr "您必须给出一个目录用于导出分片。" #: ../share/extensions/webslicer_export.py:69 #, python-format @@ -31091,8 +31577,9 @@ msgid "The directory \"%s\" does not exists." msgstr "目录“%s”不存在。" #: ../share/extensions/webslicer_export.py:78 +#, fuzzy msgid "No slicer layer found." -msgstr "" +msgstr "没有当前图层。" #: ../share/extensions/webslicer_export.py:108 #, python-format @@ -31101,11 +31588,11 @@ msgstr "超过一个的元素带有“%s”html-id。" #: ../share/extensions/webslicer_export.py:338 msgid "You must install the ImageMagick to get JPG and GIF." -msgstr "你必须安装 ImageMagick 以打开 JPG 和 GIF 格式支持。" +msgstr "您必须安装 ImageMagick 以打开 JPG 和 GIF 格式支持。" #. PARAMETER PROCESSING #. lines of longitude are odd : abort -#: ../share/extensions/wireframe_sphere.py:116 +#: ../share/extensions/wireframe_sphere.py:117 msgid "Please enter an even number of lines of longitude." msgstr "请输入偶数个经度线。" @@ -31151,11 +31638,11 @@ msgstr "AI 8.0 输入" #: ../share/extensions/ai_input.inx.h:2 msgid "Adobe Illustrator 8.0 and below (*.ai)" -msgstr "Adobe Illustrator 8.0 及以下版本 (*.ai)" +msgstr "Adobe Illustrator 8.0 及以下版本(*.ai)" #: ../share/extensions/ai_input.inx.h:3 msgid "Open files saved with Adobe Illustrator 8.0 or older" -msgstr "打开使用 Adobe Illustrator 8.0(或更老的版本)保存的文件" +msgstr "打开使用 Adobe Illustrator 8.0(或更老的版本)保存的文件" #: ../share/extensions/aisvg.inx.h:1 msgid "AI SVG Input" @@ -31171,39 +31658,39 @@ msgstr "在打开之前清除 Adobe Illustrator SVG 中的垃圾代码" #: ../share/extensions/ccx_input.inx.h:1 msgid "Corel DRAW Compressed Exchange files input (UC)" -msgstr "Corel DRAW Compressed Exchange 文件输入 (UC)" +msgstr "Corel DRAW Compressed Exchange 文件输入(UC)" #: ../share/extensions/ccx_input.inx.h:2 msgid "Corel DRAW Compressed Exchange files (UC) (*.ccx)" -msgstr "Corel DRAW Compressed Exchange 文件 (UC) (*.ccx)" +msgstr "Corel DRAW Compressed Exchange 文件(UC) (*.ccx)" #: ../share/extensions/ccx_input.inx.h:3 msgid "Open compressed exchange files saved in Corel DRAW (UC)" -msgstr "打开 Corel DRAW 中保存的压缩交换文件 (UC)" +msgstr "打开 Corel DRAW 中保存的压缩交换文件(UC)" #: ../share/extensions/cdr_input.inx.h:1 msgid "Corel DRAW Input (UC)" -msgstr "Corel DRAW 输入 (UC)" +msgstr "Corel DRAW 输入(UC)" #: ../share/extensions/cdr_input.inx.h:2 msgid "Corel DRAW 7-X4 files (UC) (*.cdr)" -msgstr "Corel DRAW 7-X4 文件 (UC) (*.cdr)" +msgstr "Corel DRAW 7-X4 文件(UC) (*.cdr)" #: ../share/extensions/cdr_input.inx.h:3 msgid "Open files saved in Corel DRAW 7-X4 (UC)" -msgstr "打开 Corel DRAW 7-X4 中保存的文件 (UC)" +msgstr "打开 Corel DRAW 7-X4 中保存的文件(UC)" #: ../share/extensions/cdt_input.inx.h:1 msgid "Corel DRAW templates input (UC)" -msgstr "Corel DRAW 模板输入 (UC)" +msgstr "Corel DRAW 模板输入(UC)" #: ../share/extensions/cdt_input.inx.h:2 msgid "Corel DRAW 7-13 template files (UC) (*.cdt)" -msgstr "Corel DRAW 7-13 模板文件 (UC) (*.cdt)" +msgstr "Corel DRAW 7-13 模板文件(UC) (*.cdt)" #: ../share/extensions/cdt_input.inx.h:3 msgid "Open files saved in Corel DRAW 7-13 (UC)" -msgstr "打开 Corel DRAW 7-13 中保存的文件 (UC)" +msgstr "打开 Corel DRAW 7-13 中保存的文件(UC)" #: ../share/extensions/cgm_input.inx.h:1 msgid "Computer Graphics Metafile files input" @@ -31211,7 +31698,7 @@ msgstr "计算机图像图元文件输入" #: ../share/extensions/cgm_input.inx.h:2 msgid "Computer Graphics Metafile files (*.cgm)" -msgstr "计算机图像图元文件 (*.cgm)" +msgstr "计算机图像图元文件(*.cgm)" #: ../share/extensions/cgm_input.inx.h:3 msgid "Open Computer Graphics Metafile files" @@ -31219,15 +31706,15 @@ msgstr "打开计算机图像图元文件输入" #: ../share/extensions/cmx_input.inx.h:1 msgid "Corel DRAW Presentation Exchange files input (UC)" -msgstr "Corel DRAW Presentation Exchange 文件输入 (UC)" +msgstr "Corel DRAW Presentation Exchange 文件输入(UC)" #: ../share/extensions/cmx_input.inx.h:2 msgid "Corel DRAW Presentation Exchange files (UC) (*.cmx)" -msgstr "Corel DRAW Presentation Exchange 文件 (UC) (*.cmx)" +msgstr "Corel DRAW Presentation Exchange 文件(UC) (*.cmx)" #: ../share/extensions/cmx_input.inx.h:3 msgid "Open presentation exchange files saved in Corel DRAW (UC)" -msgstr "打开 Corel DRAW 中创建的展示交换文件 (UC)" +msgstr "打开 Corel DRAW 中创建的展示交换文件(UC)" #: ../share/extensions/color_HSL_adjust.inx.h:1 msgid "HSL Adjust" @@ -31235,7 +31722,7 @@ msgstr "调整 HSL" #: ../share/extensions/color_HSL_adjust.inx.h:3 msgid "Hue (°)" -msgstr "色调(°)" +msgstr "色调(°)" #: ../share/extensions/color_HSL_adjust.inx.h:4 msgid "Random hue" @@ -31244,7 +31731,7 @@ msgstr "随机色调" #: ../share/extensions/color_HSL_adjust.inx.h:6 #, no-c-format msgid "Saturation (%)" -msgstr "饱和度 (%)" +msgstr "饱和度(%)" #: ../share/extensions/color_HSL_adjust.inx.h:7 msgid "Random saturation" @@ -31253,7 +31740,7 @@ msgstr "随机饱和度" #: ../share/extensions/color_HSL_adjust.inx.h:9 #, no-c-format msgid "Lightness (%)" -msgstr "亮度 (%)" +msgstr "亮度(%)" #: ../share/extensions/color_HSL_adjust.inx.h:10 msgid "Random lightness" @@ -31285,7 +31772,7 @@ msgstr "黑白" #: ../share/extensions/color_blackandwhite.inx.h:2 msgid "Threshold Color (1-255):" -msgstr "阈值颜色(1-255):" +msgstr "阈值颜色(1-255):" #: ../share/extensions/color_brighter.inx.h:1 msgid "Brighter" @@ -31310,7 +31797,7 @@ msgstr "蓝色函数:" #: ../share/extensions/color_custom.inx.h:6 msgid "Input (r,g,b) Color Range:" -msgstr "颜色输入范围(r,g,b):" +msgstr "颜色输入范围(r,g,b):" #: ../share/extensions/color_custom.inx.h:8 msgid "" @@ -31323,11 +31810,11 @@ msgid "" " Green Function: b \n" " Blue Function: g" msgstr "" -"让你可以针对每个通道进行不同的函数估值。\n" +"让您可以针对每个通道进行不同的函数估值。\n" "红、绿和蓝数值为归一化后的红绿蓝通道数值。计算后的 RGB 数值会自动收紧" -"(clamp)。\n" +"(clamp)。\n" "\n" -"例如(红色变为原本的二分之一、绿色和蓝色互相交换):\n" +"例如(红色变为原本的二分之一、绿色和蓝色互相交换):\n" " 红色函数:r*0.5\n" " 绿色函数:b\n" " 蓝色函数:g" @@ -31343,7 +31830,7 @@ msgstr "去色" #: ../share/extensions/color_grayscale.inx.h:1 #: ../share/extensions/webslicer_create_rect.inx.h:15 msgid "Grayscale" -msgstr "灰度级" +msgstr "灰度" #: ../share/extensions/color_lesshue.inx.h:1 msgid "Less Hue" @@ -31378,10 +31865,27 @@ msgstr "负" msgid "Randomize" msgstr "随机化" -#: ../share/extensions/color_randomize.inx.h:7 +#: ../share/extensions/color_randomize.inx.h:5 +#, no-c-format +msgid "Hue range (%)" +msgstr "色调范围(%)" + +#: ../share/extensions/color_randomize.inx.h:8 +#, no-c-format +msgid "Saturation range (%)" +msgstr "饱和度范围(%)" + +#: ../share/extensions/color_randomize.inx.h:11 +#, no-c-format +msgid "Lightness range (%)" +msgstr "亮度范围(%)" + +#: ../share/extensions/color_randomize.inx.h:13 +#, fuzzy msgid "" "Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB." +"converts it back to RGB. Lower the range values to limit the distance " +"between the original color and the randomized one." msgstr "转换为 HSL,随机化色调、饱和度,和/或亮度,再将其转换回 RGB。" #: ../share/extensions/color_removeblue.inx.h:1 @@ -31402,7 +31906,7 @@ msgstr "替换颜色" #: ../share/extensions/color_replace.inx.h:2 msgid "Replace color (RRGGBB hex):" -msgstr "替换颜色(十六进制 RRGGBB):" +msgstr "替换颜色(十六进制 RRGGBB):" #: ../share/extensions/color_replace.inx.h:3 msgid "Color to replace" @@ -31410,7 +31914,7 @@ msgstr "要替换的颜色:" #: ../share/extensions/color_replace.inx.h:4 msgid "By color (RRGGBB hex):" -msgstr "为颜色(十六进制 RRGGBB):" +msgstr "为颜色(十六进制 RRGGBB):" #: ../share/extensions/color_replace.inx.h:5 msgid "New color" @@ -31458,7 +31962,7 @@ msgstr "" #: ../share/extensions/dia.inx.h:4 msgid "Dia Diagram (*.dia)" -msgstr "Dia 图表 (*.dia)" +msgstr "Dia 图表(*.dia)" #: ../share/extensions/dia.inx.h:5 msgid "A diagram created with the program Dia" @@ -31477,8 +31981,9 @@ msgid "Y Offset:" msgstr "Y 偏移:" #: ../share/extensions/dimension.inx.h:4 +#, fuzzy msgid "Bounding box type:" -msgstr "边框类型:" +msgstr "要使用的边界框" #: ../share/extensions/dimension.inx.h:5 msgid "Geometric" @@ -31520,8 +32025,8 @@ msgid "" " * Step: numbering step between two nodes." msgstr "" "此扩展功能会根据下列选项用数字点替换选中项的节点:\n" -" * 字体尺寸:节点数字标签的大小(20px、12pt…)。\n" -" * 点大小:于路径节点上放置的点直径(10px、2mm…)。\n" +" * 字体尺寸:节点数字标签的大小(20px、12pt...)。\n" +" * 点大小:于路径节点上放置的点直径(10px、2mm...)。\n" " * 起始点数字:数列的起始数字,指定到此路径的起始节点。\n" " * 公差值:两个节点之间的数字差值。" @@ -31640,7 +32145,7 @@ msgstr "在该点周围画圆" #: ../share/extensions/draw_from_triangle.inx.h:29 #: ../share/extensions/wireframe_sphere.inx.h:6 msgid "Radius (px):" -msgstr "半径 (px):" +msgstr "半径(像素):" #: ../share/extensions/draw_from_triangle.inx.h:30 msgid "Draw Isogonal Conjugate" @@ -31694,18 +32199,18 @@ msgid "" "may cause a divide-by-zero error for certain points.\n" " " msgstr "" -"此扩展功能可绘制由所选路径前 3 个节点定义的三角形结构。你可以选择缺省对象其中" +"此扩展功能可绘制由所选路径前 3 个节点定义的三角形结构。您可以选择缺省对象其中" "之一或者自己创建。\n" " \n" "所有单位为 Inkscape 的像素单位。角的单位全部为弧度。\n" -"你可以用三重线性坐标或三角中心函数指定一个点。\n" +"您可以用三重线性坐标或三角中心函数指定一个点。\n" "输入边长或角度的函数。\n" "三重线性部份必须用冒号分开:“:”。\n" "边长以“s_a”、“s_b”和“s_c”的形式来表示。\n" "角度则以“a_a”、“a_b”和“a_c”表示。\n" -"你也可以使用半周长和三角形面积作为常数。写入“area”或“semiperim”来表示。\n" +"您也可以使用半周长和三角形面积作为常数。写入“area”或“semiperim”来表示。\n" "\n" -"你可以使用任何标准的 Python 数学函数:\n" +"您可以使用任何标准的 Python 数学函数:\n" "ceil(x); fabs(x); floor(x); fmod(x,y); frexp(x); ldexp(x,i); \n" "modf(x); exp(x); log(x [, base]); log10(x); pow(x,y); sqrt(x); \n" "acos(x); asin(x); atan(x); atan2(y,x); hypot(x,y); \n" @@ -31715,7 +32220,7 @@ msgstr "" "也可用反三角函数:\n" "sec(x); csc(x); cot(x)\n" "\n" -"你可指定圆的半径让程序使用公式计算自定义的点,也可以包含边长、角度等。你也可" +"您可指定圆的半径让程序使用公式计算自定义的点,也可以包含边长、角度等。您也可" "以绘制等角和等分共轭点。请注意在某些点上可能会造成分母为零的错误。\n" " " @@ -31728,16 +32233,17 @@ msgid "Method of Scaling:" msgstr "缩放方式:" #: ../share/extensions/dxf_input.inx.h:4 +#, fuzzy msgid "Manual scale factor:" -msgstr "手动指定缩放系数:" +msgstr "或手动指定缩放系数:" #: ../share/extensions/dxf_input.inx.h:5 msgid "Manual x-axis origin (mm):" -msgstr "手动指定 X 轴原点(毫米):" +msgstr "手动指定 X 轴原点(毫米):" #: ../share/extensions/dxf_input.inx.h:6 msgid "Manual y-axis origin (mm):" -msgstr "手动指定 Y 轴原点(毫米):" +msgstr "手动指定 Y 轴原点(毫米):" #: ../share/extensions/dxf_input.inx.h:7 msgid "Gcodetools compatible point import" @@ -31867,7 +32373,7 @@ msgstr "UTF 8" #: ../share/extensions/dxf_outlines.inx.h:21 msgid "All (default)" -msgstr "全部(默认)" +msgstr "全部(默认)" #: ../share/extensions/dxf_outlines.inx.h:22 msgid "Visible only" @@ -31878,6 +32384,7 @@ msgid "By name match" msgstr "按名称匹配" #: ../share/extensions/dxf_outlines.inx.h:25 +#, fuzzy msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " @@ -31903,7 +32410,7 @@ msgstr "" "Inkscape 无法读取。\n" "- 多折线 (LWPOLYLINE) 输出是一种多段连接的折线,要使用旧版的线 (LINE) 输出请" "停用这个选项。\n" -"- 你可以选择要导出全部图层、只导出可见的图层或名称匹配的图层 (英文区分大小写" +"- 您可以选择要导出全部图层、只导出可见的图层或名称匹配的图层 (英文区分大小写" "并用逗号“,”将项目区隔开)" #: ../share/extensions/dxf_outlines.inx.h:34 @@ -31973,7 +32480,7 @@ msgstr "名片" #: ../share/extensions/empty_business_card.inx.h:2 msgid "Business card size:" -msgstr "名片尺寸:" +msgstr "名片大小:" #: ../share/extensions/empty_desktop.inx.h:1 msgid "Desktop" @@ -32006,7 +32513,7 @@ msgstr "DVD 盒背宽度:" #: ../share/extensions/empty_dvd_cover.inx.h:3 msgid "DVD cover bleed (mm):" -msgstr "DVD 封面出血(毫米):" +msgstr "DVD 封面出血(毫米):" #: ../share/extensions/empty_generic.inx.h:1 msgid "Generic Canvas" @@ -32067,7 +32574,7 @@ msgstr "LaTeX 输入:" #: ../share/extensions/eqtexsvg.inx.h:3 msgid "Additional packages (comma-separated): " -msgstr "附加包(使用逗号分隔):" +msgstr "附加包(使用逗号分隔):" #: ../share/extensions/export_gimp_palette.inx.h:1 msgid "Export as GIMP Palette" @@ -32075,7 +32582,7 @@ msgstr "导出为 GIMP 调色板" #: ../share/extensions/export_gimp_palette.inx.h:2 msgid "GIMP Palette (*.gpl)" -msgstr "GIMP 调色板 (*.gpl)" +msgstr "GIMP 调色板(*.gpl)" #: ../share/extensions/export_gimp_palette.inx.h:3 msgid "Exports the colors of this document as GIMP Palette" @@ -32096,7 +32603,7 @@ msgid "" "home directory." msgstr "" "* 扩展名会自动添加,无需手动输入。\n" -"* 相对路径(或不带路径的文件名)相对于用户的主(HOME)目录计算。" +"* 相对路径(或不带路径的文件名)相对于用户的主(HOME)目录计算。" #: ../share/extensions/extrude.inx.h:3 msgid "Lines" @@ -32112,7 +32619,7 @@ msgstr "XFIG 输入" #: ../share/extensions/fig_input.inx.h:2 msgid "XFIG Graphics File (*.fig)" -msgstr "XFIG 图形文件 (*.fig)" +msgstr "XFIG 图形文件(*.fig)" #: ../share/extensions/fig_input.inx.h:3 msgid "Open files saved with XFIG" @@ -32199,7 +32706,7 @@ msgstr "使用极坐标" #: ../share/extensions/param_curves.inx.h:12 msgid "" "When set, Isotropic scaling uses smallest of width/xrange or height/yrange" -msgstr "如果设置,等向缩放会使用 宽度/xrange 或 高度/yrange 中的最小值" +msgstr "如果设置,等向缩放会使用 宽度/xrange 或 高度/yrange 中的最小值" #: ../share/extensions/funcplot.inx.h:12 #: ../share/extensions/param_curves.inx.h:13 @@ -32219,7 +32726,7 @@ msgid "" " First derivative is always determined numerically." msgstr "" "调用此扩展功能前请先选择一个矩形,\n" -"若你希望填满此面积,则加入 X 轴端点,这会决定 X 和 Y 的比例。\n" +"若您希望填满此面积,则加入 X 轴端点,这会决定 X 和 Y 的比例。\n" "\n" "关于极坐标:\n" " 起始和结束的 x 值定义弧度的范围。\n" @@ -32299,7 +32806,7 @@ msgid "" "cnc-club.ru/gcodetools" msgstr "" "Gcodetools 可从 Inkscape 的路径制作简单的 Gcode。Gcode 是一种在大多数 CNC 机" -"器中使用的特殊格式。所以 Gcodetools 可让你将 Inkscape 用作 CAM 程序。" +"器中使用的特殊格式。所以 Gcodetools 可让您将 Inkscape 用作 CAM 程序。" "Gcodetools 可配合多种类型的机器使用:Mills Lathes Laser and Plasma cutters " "and engravers Mill engravers Plotters 等。欲知详情,请访问 http://www.cnc-" "club.ru/gcodetools" @@ -32324,8 +32831,8 @@ msgid "" "www.cnc-club.ru/gcodetoolsru Credits: Nick Drobchenko, Vladimir Kalyaev, " "John Brooker, Henry Nicolas, Chris Lusby Taylor. Gcodetools ver. 1.7" msgstr "" -"Gcodetools 插件模块:将路径转换成 Gcode(使用圆弧内插法),产生偏移路径并使用" -"锥形刀的雕刻锐角。 \n" +"Gcodetools 插件模块:将路径转换成 Gcode(使用圆弧内插法),产生偏移路径并使用锥" +"形刀的雕刻锐角。 \n" "此插件程序可在必要时使用圆弧内插法或线性移动计算路径 Gcode 代码。\n" "\n" "可从下述网站找到教学、支持信息和使用手册\n" @@ -32368,7 +32875,7 @@ msgstr "面宽:" #: ../share/extensions/gcodetools_area.inx.h:4 msgid "Area tool overlap (0..0.9):" -msgstr "面工具覆盖 (0..0.9):" +msgstr "面工具覆盖(0..0.9):" #: ../share/extensions/gcodetools_area.inx.h:5 msgid "" @@ -32378,11 +32885,11 @@ msgid "" "the nearest tool definition (\"Tool diameter\" value). Only one offset will " "be created if the \"Area width\" is equal to \"1/2 D\"." msgstr "" -"\"Create area offset\"(创建面积偏移): 创建多个 Inkscape 路径偏移来填充原来" -"的面积直至\"Area radius\"(面积半径)值。轮廓从 \"1/2 D\" 开始直至 \"Area " -"width\" (面宽)总宽度,带 \"D\" 步,其中 D 是从最接近的工具定义(\"Tool " -"diameter\" (工具直径)值)获取的。如果 \"Area width\" (面宽)等于 \"1/2 D" -"\",则将只会创建一个偏移。" +"\"Create area offset\"(创建面积偏移): 创建多个 Inkscape 路径偏移来填充原来的" +"面积直至\"Area radius\"(面积半径)值。轮廓从 \"1/2 D\" 开始直至 \"Area width" +"\" (面宽)总宽度,带 \"D\" 步,其中 D 是从最接近的工具定义(\"Tool diameter" +"\" (工具直径)值)获取的。如果 \"Area width\" (面宽)等于 \"1/2 D\",则将只会创" +"建一个偏移。" #: ../share/extensions/gcodetools_area.inx.h:6 msgid "Fill area" @@ -32504,8 +33011,8 @@ msgid "" msgstr "" "双圆弧内插法公差值是路径和路径本身近似值之间的最大距离。若路径的线段和本身近" "似值之间的距离超过双圆弧内插法公差值时,线段会被分割为两条线段。以深度函数来" -"说 c 为从 0.0(白)到 1.0(黑)的色彩强度,d 代表以方向点定义的深度,s 为以方" -"向点定义的曲面。" +"说 c 为从 0.0(白)到 1.0(黑)的色彩强度,d 代表以方向点定义的深度,s 为以方向点" +"定义的曲面。" #: ../share/extensions/gcodetools_area.inx.h:30 #: ../share/extensions/gcodetools_engraving.inx.h:8 @@ -32608,7 +33115,7 @@ msgstr "在空白上 G00 移动的 Z 安全高度:" #: ../share/extensions/gcodetools_orientation_points.inx.h:6 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:23 msgid "Units (mm or in):" -msgstr "单位(毫米或英寸):" +msgstr "单位(毫米或英寸):" #: ../share/extensions/gcodetools_area.inx.h:42 #: ../share/extensions/gcodetools_dxf_points.inx.h:14 @@ -32694,7 +33201,7 @@ msgstr "快速预先穿透" #: ../share/extensions/gcodetools_check_for_updates.inx.h:1 msgid "Check for updates" -msgstr "查找更新" +msgstr "检查更新" #: ../share/extensions/gcodetools_check_for_updates.inx.h:2 msgid "Check for Gcodetools latest stable version and try to get the updates." @@ -32719,9 +33226,9 @@ msgid "" "used. Also you can manually select object, open XML editor (Shift+Ctrl+X) " "and add or remove XML tag 'dxfpoint' with any value." msgstr "" -"将选中的对象转换为钻点(如 dxf_import 插件所为)。此外,也可以保存原始形状。" -"只会使用每个曲线的起始点。你还可以手动选择对象,打开 XML 编辑器 (Shift+Ctrl" -"+X) 并添加或删除带有任何值的 XML 标记 'dxfpoint' 。" +"将选中的对象转换为钻点(如 dxf_import 插件所为)。此外,也可以保存原始形状。只" +"会使用每个曲线的起始点。您还可以手动选择对象,打开 XML 编辑器 (Shift+Ctrl+X) " +"并添加或删除带有任何值的 XML 标记 'dxfpoint' 。" #: ../share/extensions/gcodetools_dxf_points.inx.h:5 msgid "set as dxfpoint and save shape" @@ -32745,11 +33252,11 @@ msgstr "本值和 180 度之间的平滑凸角:" #: ../share/extensions/gcodetools_engraving.inx.h:3 msgid "Maximum distance for engraving (mm/inch):" -msgstr "雕刻的最大距离 (mm/inch):" +msgstr "雕刻的最大距离(毫米/英寸):" #: ../share/extensions/gcodetools_engraving.inx.h:4 msgid "Accuracy factor (2 low to 10 high):" -msgstr "精度系数 (2 低 - 10 高):" +msgstr "精度系数(2 低 - 10 高):" #: ../share/extensions/gcodetools_engraving.inx.h:5 msgid "Draw additional graphics to see engraving path" @@ -32765,10 +33272,10 @@ msgid "" "ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" msgstr "" "这个函数创建使用锐角雕刻字母或任何形状的路径。切割器的深度作为由工具定义的半" -"径的函数。深度可以是任何 Python 表达式。例如: cone….(45 degrees)………………….: w " -"cone….(height/diameter=10/3)..: 10*w/3 sphere..(radius r)………………………: math." -"sqrt(max(0,r**2-w**2)) ellipse.(minor axis r, major 4r)…..: math.sqrt(max(0," -"r**2-w**2))*4" +"径的函数。深度可以是任何 Python 表达式。例如: cone....(45 " +"degrees)......................: w cone....(height/diameter=10/3)..: 10*w/3 " +"sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) " +"ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4" #: ../share/extensions/gcodetools_graffiti.inx.h:1 msgid "Graffiti" @@ -32784,7 +33291,7 @@ msgstr "最小连接器半径:" #: ../share/extensions/gcodetools_graffiti.inx.h:4 msgid "Start position (x;y):" -msgstr "起始位置 (x;y):" +msgstr "起始位置(x;y):" #: ../share/extensions/gcodetools_graffiti.inx.h:5 msgid "Create preview" @@ -32820,12 +33327,12 @@ msgstr "Z 深度:" #: ../share/extensions/gcodetools_graffiti.inx.h:14 #: ../share/extensions/gcodetools_orientation_points.inx.h:7 msgid "2-points mode (move and rotate, maintained aspect ratio X/Y)" -msgstr "2 点模式(移动并旋转,保持纵横比 X/Y)" +msgstr "2 点模式(移动并旋转,保持纵横比 X/Y)" #: ../share/extensions/gcodetools_graffiti.inx.h:15 #: ../share/extensions/gcodetools_orientation_points.inx.h:8 msgid "3-points mode (move, rotate and mirror, different X/Y scale)" -msgstr "3 点模式(移动、旋转和镜像,不同的 X/Y 比例)" +msgstr "3 点模式(移动、旋转和镜像,不同的 X/Y 比例)" #: ../share/extensions/gcodetools_graffiti.inx.h:16 #: ../share/extensions/gcodetools_orientation_points.inx.h:9 @@ -32849,12 +33356,12 @@ msgid "" "the group or by Ctrl+Click. Now press apply to create control points " "(independent set for each layer)." msgstr "" -"方向点用来计算路径的变形(XY 平面的偏移、缩放、镜射、旋转)。\n" -"仅在 3 点模式情况下:不要使三点共线(请改用 2 点模式)。\n" -"你之后可以使用文本工具修改 Z 表面、Z 深度的数值(第三坐标)。\n" +"方向点用来计算路径的变形(XY 平面的偏移、缩放、镜射、旋转)。\n" +"仅在 3 点模式情况下:不要使三点共线(请改用 2 点模式)。\n" +"您之后可以使用文本工具修改 Z 表面、Z 深度的数值(第三坐标)。\n" "若当前图层里面没有方向点则会从上一个图层获取。\n" -"千万不要将方向点解除群组!你可以单击两下或使用 Ctrl+单击 来选取方向点。\n" -"现在按应用可创建控制点(每个图层都独立设置)。" +"千万不要将方向点解除群组!您可以单击两下或使用 Ctrl+单击 来选取方向点。\n" +"现在按应用可创建控制点(每个图层都独立设置)。" #: ../share/extensions/gcodetools_lathe.inx.h:1 msgid "Lathe" @@ -32952,7 +33459,7 @@ msgstr "边角的步测距离:" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:12 msgid "Maximum angle for corner (0-180 deg):" -msgstr "最大角度(0-180 度):" +msgstr "最大角度(0-180 度):" #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:14 msgid "Perpendicular" @@ -33013,8 +33520,8 @@ msgid "" "active layer is used. If there is no tool inside the current layer it is " "taken from the upper layer. Press Apply to create new tool." msgstr "" -"选择的工具类型填充适当的默认值。你以后可以使用文本工具更改这些值。使用在活动" -"层的最顶(Z 顺序)的工具。如果在当前层中没有工具,那么从上一层获取。按应用创" +"选择的工具类型填充适当的默认值。您以后可以使用文本工具更改这些值。使用在活动" +"层的最顶(Z 顺序)的工具。如果在当前图层中没有工具,那么从上一层获取。按应用创" "建新的工具。" #: ../share/extensions/generate_voronoi.inx.h:1 @@ -33023,11 +33530,11 @@ msgstr "沃罗努瓦图案" #: ../share/extensions/generate_voronoi.inx.h:3 msgid "Average size of cell (px):" -msgstr "单元的平均尺寸 (px):" +msgstr "单元平均尺寸(px):" #: ../share/extensions/generate_voronoi.inx.h:4 msgid "Size of Border (px):" -msgstr "边框大小:" +msgstr "边框尺寸(px):" #: ../share/extensions/generate_voronoi.inx.h:6 msgid "" @@ -33039,7 +33546,7 @@ msgid "" "join of the pattern at the edges. Use a negative border to reduce the size " "of the pattern and get an empty border." msgstr "" -"生产一个沃罗努瓦单元的随机图案。图案将可以在填充和笔廓对话框中访问。你必须选" +"生产一个沃罗努瓦单元的随机图案。图案将可以在填充和笔刷对话框中访问。您必须选" "择一个对象或一个组。\n" "\n" "如果边框为 0,图案将会在边界处中断。使用一个正数边框,最好大于单元尺寸,可以" @@ -33092,7 +33599,7 @@ msgstr "" #: ../share/extensions/gimp_xcf.inx.h:15 msgid "GIMP XCF maintaining layers (*.xcf)" -msgstr "GIMP XCF 维护层 (*.xcf)" +msgstr "GIMP XCF 维护层(*.xcf)" #: ../share/extensions/grid_cartesian.inx.h:1 msgid "Cartesian Grid" @@ -33101,7 +33608,7 @@ msgstr "笛卡尔网格" #: ../share/extensions/grid_cartesian.inx.h:2 #: ../share/extensions/grid_isometric.inx.h:10 msgid "Border Thickness (px):" -msgstr "边框厚度 (px):" +msgstr "边框厚度(像素):" #: ../share/extensions/grid_cartesian.inx.h:3 msgid "X Axis" @@ -33113,7 +33620,7 @@ msgstr "主 X 分隔:" #: ../share/extensions/grid_cartesian.inx.h:5 msgid "Major X Division Spacing (px):" -msgstr "主 X 分隔间距 (px):" +msgstr "主 X 分隔间距(像素):" #: ../share/extensions/grid_cartesian.inx.h:6 msgid "Subdivisions per Major X Division:" @@ -33121,7 +33628,7 @@ msgstr "每个主 X 分隔的子分隔:" #: ../share/extensions/grid_cartesian.inx.h:7 msgid "Logarithmic X Subdiv. (Base given by entry above)" -msgstr "X 次级刻度为对数坐标(底数由先前输入决定)。" +msgstr "X 次级刻度为对数坐标(底数由先前输入决定)。" #: ../share/extensions/grid_cartesian.inx.h:8 msgid "Subsubdivs. per X Subdivision:" @@ -33129,19 +33636,19 @@ msgstr "每个 X 子分隔的子子分隔:" #: ../share/extensions/grid_cartesian.inx.h:9 msgid "Halve X Subsubdiv. Frequency after 'n' Subdivs. (log only):" -msgstr "半分 X 子子分隔。在“n”子分隔后的频率(仅记录):" +msgstr "半分 X 子子分隔。在“n”子分隔后的频率(仅记录):" #: ../share/extensions/grid_cartesian.inx.h:10 msgid "Major X Division Thickness (px):" -msgstr "主 X 分隔厚度 (px):" +msgstr "主 X 分隔厚度(像素):" #: ../share/extensions/grid_cartesian.inx.h:11 msgid "Minor X Division Thickness (px):" -msgstr "次 X 分隔厚度 (px):" +msgstr "次 X 分隔厚度(像素):" #: ../share/extensions/grid_cartesian.inx.h:12 msgid "Subminor X Division Thickness (px):" -msgstr "次次 X 分隔厚度 (px):" +msgstr "次次 X 分隔厚度(像素):" #: ../share/extensions/grid_cartesian.inx.h:13 msgid "Y Axis" @@ -33161,7 +33668,7 @@ msgstr "每个主 Y 分隔的子分隔:" #: ../share/extensions/grid_cartesian.inx.h:17 msgid "Logarithmic Y Subdiv. (Base given by entry above)" -msgstr "Y 次级刻度为对数坐标(底数由先前输入决定)。" +msgstr "Y 次级刻度为对数坐标(底数由先前输入决定)。" #: ../share/extensions/grid_cartesian.inx.h:18 msgid "Subsubdivs. per Y Subdivision:" @@ -33169,19 +33676,19 @@ msgstr "每个 Y 子分隔的子子分隔:" #: ../share/extensions/grid_cartesian.inx.h:19 msgid "Halve Y Subsubdiv. Frequency after 'n' Subdivs. (log only):" -msgstr "半分 X 子子分隔。在“n”子分隔后的频率(仅记录):" +msgstr "半分 X 子子分隔。在“n”子分隔后的频率(仅记录):" #: ../share/extensions/grid_cartesian.inx.h:20 msgid "Major Y Division Thickness (px):" -msgstr "主 Y 分隔厚度 (px):" +msgstr "主 Y 分隔厚度(像素):" #: ../share/extensions/grid_cartesian.inx.h:21 msgid "Minor Y Division Thickness (px):" -msgstr "次 Y 分隔厚度 (px):" +msgstr "次 Y 分隔厚度(像素):" #: ../share/extensions/grid_cartesian.inx.h:22 msgid "Subminor Y Division Thickness (px):" -msgstr "次次 Y 分隔厚度 (px):" +msgstr "次次 Y 分隔厚度(像素):" #: ../share/extensions/grid_isometric.inx.h:1 msgid "Isometric Grid" @@ -33209,15 +33716,15 @@ msgstr "每个子分隔的子子分隔数:" #: ../share/extensions/grid_isometric.inx.h:7 msgid "Major Division Thickness (px):" -msgstr "主分隔厚度 (px):" +msgstr "主分隔厚度(像素):" #: ../share/extensions/grid_isometric.inx.h:8 msgid "Minor Division Thickness (px):" -msgstr "次分隔厚度 (px):" +msgstr "次分隔厚度(像素):" #: ../share/extensions/grid_isometric.inx.h:9 msgid "Subminor Division Thickness (px):" -msgstr "次次分隔厚度 (px):" +msgstr "次次分隔厚度(像素):" #: ../share/extensions/grid_polar.inx.h:1 msgid "Polar Grid" @@ -33225,7 +33732,7 @@ msgstr "极坐标网格" #: ../share/extensions/grid_polar.inx.h:2 msgid "Centre Dot Diameter (px):" -msgstr "中心点半径 (px):" +msgstr "中心点半径(像素):" #: ../share/extensions/grid_polar.inx.h:3 msgid "Circumferential Labels:" @@ -33261,19 +33768,19 @@ msgstr "每个主圆周分隔的次分隔数:" #: ../share/extensions/grid_polar.inx.h:12 msgid "Logarithmic Subdiv. (Base given by entry above)" -msgstr "次级刻度为对数坐标(底数由先前输入决定)。" +msgstr "次级刻度为对数坐标(底数由先前输入决定)。" #: ../share/extensions/grid_polar.inx.h:13 msgid "Major Circular Division Thickness (px):" -msgstr "主圆周分隔厚度 (px):" +msgstr "主圆周分隔厚度(像素):" #: ../share/extensions/grid_polar.inx.h:14 msgid "Minor Circular Division Thickness (px):" -msgstr "次圆周分隔厚度 (px):" +msgstr "次圆周分隔厚度(像素):" #: ../share/extensions/grid_polar.inx.h:15 msgid "Angular Divisions" -msgstr "角度分隔" +msgstr "角分隔" #: ../share/extensions/grid_polar.inx.h:16 msgid "Angle Divisions:" @@ -33285,7 +33792,7 @@ msgstr "在中心的角度分隔:" #: ../share/extensions/grid_polar.inx.h:18 msgid "Subdivisions per Major Angular Division:" -msgstr "每个主角度分隔的子分隔:" +msgstr "每个主角分隔的子分隔:" #: ../share/extensions/grid_polar.inx.h:19 msgid "Minor Angle Division End 'n' Divs. Before Centre:" @@ -33293,11 +33800,11 @@ msgstr "次角度分隔结束“n”分隔。在中心前:" #: ../share/extensions/grid_polar.inx.h:20 msgid "Major Angular Division Thickness (px):" -msgstr "主角度分隔厚度 (px):" +msgstr "主角分隔厚度(像素):" #: ../share/extensions/grid_polar.inx.h:21 msgid "Minor Angular Division Thickness (px):" -msgstr "次角度分隔厚度 (px):" +msgstr "次角分隔厚度(像素):" #: ../share/extensions/guides_creator.inx.h:1 msgid "Guides creator" @@ -33317,15 +33824,15 @@ msgstr "从边开始" #: ../share/extensions/guides_creator.inx.h:7 msgid "Delete existing guides" -msgstr "移除现有参考线" +msgstr "删除现有参考线" #: ../share/extensions/guides_creator.inx.h:8 msgid "Custom..." -msgstr "自定义…" +msgstr "自定义..." #: ../share/extensions/guides_creator.inx.h:9 msgid "Golden ratio" -msgstr "黄金比例" +msgstr "黄金分割" #: ../share/extensions/guides_creator.inx.h:10 msgid "Rule-of-third" @@ -33398,7 +33905,7 @@ msgstr "保存图像的目录:" #: ../share/extensions/guillotine.inx.h:3 msgid "Image name (without extension):" -msgstr "图像名称(不带扩展名):" +msgstr "图像名称(不带扩展名):" #: ../share/extensions/guillotine.inx.h:4 msgid "Ignore these settings and use export hints" @@ -33469,7 +33976,7 @@ msgstr "手写体 1 笔画" #: ../share/extensions/hershey.inx.h:15 msgid "Script 1-stroke (alt)" -msgstr "手写体 1 笔画(替代模式)" +msgstr "手写体 1 笔画(替代模式)" #: ../share/extensions/hershey.inx.h:16 msgid "Script medium" @@ -33505,11 +34012,11 @@ msgstr "占星术" #: ../share/extensions/hershey.inx.h:25 msgid "Math (lower)" -msgstr "数学(较低)" +msgstr "数学(较低)" #: ../share/extensions/hershey.inx.h:26 msgid "Math (upper)" -msgstr "数学(较高)" +msgstr "数学(较高)" #: ../share/extensions/hershey.inx.h:28 msgid "Meteorology" @@ -33537,7 +34044,7 @@ msgstr "" #: ../share/extensions/hershey.inx.h:36 msgid "About..." -msgstr "关于…" +msgstr "关于..." #: ../share/extensions/hershey.inx.h:37 msgid "" @@ -33564,7 +34071,7 @@ msgstr "" "号的 Hershey 规范表。\n" "\n" "这些不是传统的字体“外框”,而是“单笔\n" -"划”字体,或是由笔划 (篓空) 构成字符外型\n" +"划”字体,或是由笔刷 (篓空) 构成字符外型\n" "的“雕刻”字体。\n" "\n" "请造访下面网站以得知更多额外的信息:\n" @@ -33580,8 +34087,8 @@ msgid "" "other HPGL files please change their file extension to .plt, make sure you " "have UniConverter installed and open them again." msgstr "" -"请注意,你只可以打开由 Inkscape 编写的 HPGL 文件,要打开其它 HPGL 文件,请更" -"改它们的文件扩展名为 .plt,确保你已安装 UniConverter 并再次打开它们。" +"请注意,您只可以打开由 Inkscape 编写的 HPGL 文件,要打开其他 HPGL 文件,请更" +"改它们的文件扩展名为 .plt,确保您已安装 UniConverter 并再次打开它们。" #: ../share/extensions/hpgl_input.inx.h:3 #: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 @@ -33593,7 +34100,7 @@ msgstr "分辨率 X (dpi):" msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" -msgstr "绘图仪在 X 轴上移动 1 英寸需移动的步数(默认为 1016.0)" +msgstr "绘图仪在 X 轴上移动 1 英寸需移动的步数(默认为 1016.0)" #: ../share/extensions/hpgl_input.inx.h:5 #: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 @@ -33605,7 +34112,7 @@ msgstr "分辨率 Y (dpi):" msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" -msgstr "绘图仪在 Y 轴上移动 1 英寸需移动的步数(默认为 1016.0)" +msgstr "绘图仪在 Y 轴上移动 1 英寸需移动的步数(默认为 1016.0)" #: ../share/extensions/hpgl_input.inx.h:7 msgid "Show movements between paths" @@ -33613,7 +34120,7 @@ msgstr "显示路径之间的移动" #: ../share/extensions/hpgl_input.inx.h:8 msgid "Check this to show movements between paths (Default: Unchecked)" -msgstr "勾选这个显示路径之间的移动(默认:不勾选)" +msgstr "勾选这个显示路径之间的移动(默认:不勾选)" #: ../share/extensions/hpgl_input.inx.h:9 #: ../share/extensions/hpgl_output.inx.h:35 @@ -33634,8 +34141,8 @@ msgid "" "Please use the plotter extension (Extensions menu) to plot directly over a " "serial connection." msgstr "" -"请确保你想保存的所有对象被转换为路径。请使用绘图仪扩展(扩展菜单)来直接在一" -"个串口连接上直接制图。" +"请确保您想保存的所有对象被转换为路径。请使用绘图仪扩展(扩展菜单)来直接在一个" +"串口连接上直接制图。" #: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 msgid "Plotter Settings " @@ -33647,12 +34154,12 @@ msgstr "钢笔编号:" #: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" -msgstr "要使用的笔(工具)的编号(标准:1)" +msgstr "要使用的笔(工具)的编号(标准:1)" #: ../share/extensions/hpgl_output.inx.h:10 #: ../share/extensions/plotter.inx.h:38 msgid "Pen force (g):" -msgstr "笔力度 (g):" +msgstr "笔力度(g):" #: ../share/extensions/hpgl_output.inx.h:11 #: ../share/extensions/plotter.inx.h:39 @@ -33660,13 +34167,13 @@ msgid "" "The amount of force pushing down the pen in grams, set to 0 to omit command; " "most plotters ignore this command (Default: 0)" msgstr "" -"笔下推的力度大小,以克为单位,设为 0 表示省略命令; 大多数绘图仪忽略这个命令 " -"(默认:0)" +"笔下推的力度大小,以克为单位,设为 0 表示省略命令; 大多数绘图仪忽略这个命令" +"(默认:0)" #: ../share/extensions/hpgl_output.inx.h:12 #: ../share/extensions/plotter.inx.h:40 msgid "Pen speed (cm/s or mm/s):" -msgstr "笔速(厘米/秒 或 毫米/秒):" +msgstr "笔速(厘米/秒 或 毫米/秒):" #: ../share/extensions/hpgl_output.inx.h:13 msgid "" @@ -33674,17 +34181,17 @@ msgid "" "(depending on your plotter model), set to 0 to omit command; most plotters " "ignore this command (Default: 0)" msgstr "" -"笔以每秒多少厘米或毫米的速度移动(取决于绘图仪的型号),设为 0 表示省略命令;" -"大多数绘图仪忽略这个命令(默认:0)" +"笔以每秒多少厘米或毫米的速度移动(取决于绘图仪的型号),设为 0 表示省略命令;大" +"多数绘图仪忽略这个命令(默认:0)" #: ../share/extensions/hpgl_output.inx.h:14 msgid "Rotation (°, Clockwise):" -msgstr "旋转(°,顺时针):" +msgstr "旋转(°,顺时针):" #: ../share/extensions/hpgl_output.inx.h:15 #: ../share/extensions/plotter.inx.h:43 msgid "Rotation of the drawing (Default: 0°)" -msgstr "绘图旋转(默认:0°)" +msgstr "绘图旋转(默认:0°)" #: ../share/extensions/hpgl_output.inx.h:16 #: ../share/extensions/plotter.inx.h:44 @@ -33694,7 +34201,7 @@ msgstr "镜像 X 轴" #: ../share/extensions/hpgl_output.inx.h:17 #: ../share/extensions/plotter.inx.h:45 msgid "Check this to mirror the X axis (Default: Unchecked)" -msgstr "勾选这个以镜像 X 轴(默认:不勾选)" +msgstr "勾选这个以镜像 X 轴(默认:不勾选)" #: ../share/extensions/hpgl_output.inx.h:18 #: ../share/extensions/plotter.inx.h:46 @@ -33704,7 +34211,7 @@ msgstr "镜像 Y 轴" #: ../share/extensions/hpgl_output.inx.h:19 #: ../share/extensions/plotter.inx.h:47 msgid "Check this to mirror the Y axis (Default: Unchecked)" -msgstr "勾选这个以镜像 Y 轴(默认:不勾选)" +msgstr "勾选这个以镜像 Y 轴(默认:不勾选)" #: ../share/extensions/hpgl_output.inx.h:20 #: ../share/extensions/plotter.inx.h:48 @@ -33715,7 +34222,7 @@ msgstr "中心零点" #: ../share/extensions/plotter.inx.h:49 msgid "" "Check this if your plotter uses a centered zero point (Default: Unchecked)" -msgstr "如果你的绘图仪使用中心零点的话则勾选这个(默认:不勾选)" +msgstr "如果您的绘图仪使用中心零点的话则勾选这个(默认:不勾选)" #: ../share/extensions/hpgl_output.inx.h:22 #: ../share/extensions/plotter.inx.h:50 @@ -33733,7 +34240,7 @@ msgstr "制图特性" #: ../share/extensions/hpgl_output.inx.h:24 #: ../share/extensions/plotter.inx.h:52 msgid "Overcut (mm):" -msgstr "外切割距离(毫米):" +msgstr "外切割距离(毫米):" #: ../share/extensions/hpgl_output.inx.h:25 #: ../share/extensions/plotter.inx.h:53 @@ -33741,8 +34248,8 @@ msgid "" "The distance in mm that will be cut over the starting point of the path to " "prevent open paths, set to 0.0 to omit command (Default: 1.00)" msgstr "" -"在路径的开始点外开始切割避免打开路径的毫米数,设为 0.0 表示省略命令(默认:" -"1.00)" +"在路径的开始点外开始切割避免打开路径的毫米数,设为 0.0 表示省略命令(默认:" +"1.00)" #: ../share/extensions/hpgl_output.inx.h:26 #: ../share/extensions/plotter.inx.h:54 @@ -33754,13 +34261,13 @@ msgstr "工具 (刀) 偏移校正 (mm):" msgid "" "The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " "command (Default: 0.25)" -msgstr "" -"从工具顶端到工具轴之间的偏移毫米数,设为 0.0 表示省略命令(默认:0.25)" +msgstr "从工具顶端到工具轴之间的偏移毫米数,设为 0.0 表示省略命令(默认:0.25)" #: ../share/extensions/hpgl_output.inx.h:28 #: ../share/extensions/plotter.inx.h:56 +#, fuzzy msgid "Precut" -msgstr "" +msgstr "使用预切" #: ../share/extensions/hpgl_output.inx.h:29 #: ../share/extensions/plotter.inx.h:57 @@ -33768,7 +34275,7 @@ msgid "" "Check this to cut a small line before the real drawing starts to correctly " "align the tool orientation. (Default: Checked)" msgstr "" -"勾选这个则在真正绘制开始前切割一条小线来正确的对齐工具定向。(默认:勾选)" +"勾选这个则在真正绘制开始前切割一条小线来正确的对齐工具定向。(默认:勾选)" #: ../share/extensions/hpgl_output.inx.h:30 #: ../share/extensions/plotter.inx.h:58 @@ -33781,8 +34288,8 @@ msgid "" "Curves are divided into lines, this number controls how fine the curves will " "be reproduced, the smaller the finer (Default: '1.2')" msgstr "" -"曲线被划分为多条线,整个数值控制重现的曲线有多精细,数值越小越精细(默认: " -"'1.2')" +"曲线被划分为多条线,整个数值控制重现的曲线有多精细,数值越小越精细(默认: " +"'1.2')" #: ../share/extensions/hpgl_output.inx.h:32 #: ../share/extensions/plotter.inx.h:60 @@ -33796,8 +34303,8 @@ msgid "" "if used). If unchecked you have to make sure that all parts of your drawing " "are within the document border! (Default: Checked)" msgstr "" -"勾选这个将自动对齐绘图到零点(如果使用的话则加上工具偏移)。如果取消勾选的" -"话,你必须确保你的绘图的所有部分都在文档边框内!(默认:勾选)" +"勾选这个将自动对齐绘图到零点(如果使用的话则加上工具偏移)。如果取消勾选的话," +"您必须确保您的绘图的所有部分都在文档边框内!(默认:勾选)" #: ../share/extensions/hpgl_output.inx.h:34 #: ../share/extensions/plotter.inx.h:64 @@ -33805,7 +34312,7 @@ msgid "" "All these settings depend on the plotter you use, for more information " "please consult the manual or homepage for your plotter." msgstr "" -"所有这些设置都取决于你使用的绘图仪,要获取更多信息,请参考你的绘图仪的手册或" +"所有这些设置都取决于您使用的绘图仪,要获取更多信息,请参考您的绘图仪的手册或" "者主页。" #: ../share/extensions/hpgl_output.inx.h:36 @@ -33998,11 +34505,11 @@ msgstr "要插值的属性:" #: ../share/extensions/interp_att_g.inx.h:4 msgid "Other Attribute:" -msgstr "其它属性:" +msgstr "其他属性:" #: ../share/extensions/interp_att_g.inx.h:5 msgid "Other Attribute type:" -msgstr "其它属性类型:" +msgstr "其他属性类型:" #: ../share/extensions/interp_att_g.inx.h:6 msgid "Apply to:" @@ -34037,7 +34544,7 @@ msgstr "其他" msgid "" "If you select \"Other\", you must know the SVG attributes to identify here " "this \"other\"." -msgstr "如选择“其它”,你必须了解 SVG 属性以知晓这里的“其它”的意义。" +msgstr "如选择“其他”,您必须了解 SVG 属性以知晓这里的“其他”的意义。" #: ../share/extensions/interp_att_g.inx.h:22 msgid "Integer Number" @@ -34058,7 +34565,7 @@ msgstr "变换" #: ../share/extensions/interp_att_g.inx.h:27 msgid "••••••••••••••••••••••••••••••••••••••••••••••••" -msgstr "••••••••••••••••••••••••••••••••••••••••••••••••" +msgstr "" #: ../share/extensions/interp_att_g.inx.h:28 msgid "No Unit" @@ -34092,7 +34599,7 @@ msgstr "自动文本:" #: ../share/extensions/jessyInk_autoTexts.inx.h:4 msgid "None (remove)" -msgstr "无(移除)" +msgstr "无(移除)" #: ../share/extensions/jessyInk_autoTexts.inx.h:5 msgid "Slide title" @@ -34112,7 +34619,7 @@ msgid "" "JessyInk presentation. Please see code.google.com/p/jessyink for more " "details." msgstr "" -"这个扩展让你安装、更新和删除一个 JessInk 演示的自动文本。请参阅 code.google." +"这个扩展让您安装、更新和删除一个 JessInk 演示的自动文本。请参阅 code.google." "com/p/jessyink 获取更多细节。" #: ../share/extensions/jessyInk_autoTexts.inx.h:10 @@ -34145,7 +34652,7 @@ msgstr "内建效果" #: ../share/extensions/jessyInk_effects.inx.h:7 msgid "None (default)" -msgstr "无(默认)" +msgstr "无(默认)" #: ../share/extensions/jessyInk_effects.inx.h:8 #: ../share/extensions/jessyInk_transitions.inx.h:8 @@ -34175,7 +34682,7 @@ msgid "" "JessyInk presentation. Please see code.google.com/p/jessyink for more " "details." msgstr "" -"这个扩展让你安装、更新和删除一个 JessInk 演示的对象效果。请参阅 code.google." +"这个扩展让您安装、更新和删除一个 JessInk 演示的对象效果。请参阅 code.google." "com/p/jessyink 获取更多细节。" #: ../share/extensions/jessyInk_export.inx.h:1 @@ -34200,12 +34707,12 @@ msgid "" "an export layer in your browser. Please see code.google.com/p/jessyink for " "more details." msgstr "" -"这个扩展让你一旦在你的浏览器中创建一个导出层则导出一个 JessInk 演示。请参阅 " +"这个扩展让您一旦在您的浏览器中创建一个导出层则导出一个 JessInk 演示。请参阅 " "code.google.com/p/jessyink 获取更多细节。" #: ../share/extensions/jessyInk_export.inx.h:9 msgid "JessyInk zipped pdf or png output (*.zip)" -msgstr "JessyInk zipped pdf 或 png 输出 (*.zip)" +msgstr "JessyInk zipped pdf 或 png 输出(*.zip)" #: ../share/extensions/jessyInk_export.inx.h:10 msgid "" @@ -34223,7 +34730,7 @@ msgid "" "to turn your SVG file into a presentation. Please see code.google.com/p/" "jessyink for more details." msgstr "" -"这个扩展让你安装或更新 JessInk 脚本以把你的 SVG 文件转换到一个演示中。请参阅 " +"这个扩展让您安装或更新 JessInk 脚本以把您的 SVG 文件转换到一个演示中。请参阅 " "code.google.com/p/jessyink 获取更多细节。" #: ../share/extensions/jessyInk_keyBindings.inx.h:1 @@ -34236,19 +34743,19 @@ msgstr "幻灯片模式" #: ../share/extensions/jessyInk_keyBindings.inx.h:3 msgid "Back (with effects):" -msgstr "后退(带特效):" +msgstr "后退(带特效):" #: ../share/extensions/jessyInk_keyBindings.inx.h:4 msgid "Next (with effects):" -msgstr "前进(带特效):" +msgstr "前进(带特效):" #: ../share/extensions/jessyInk_keyBindings.inx.h:5 msgid "Back (without effects):" -msgstr "后退(无特效):" +msgstr "后退(无特效):" #: ../share/extensions/jessyInk_keyBindings.inx.h:6 msgid "Next (without effects):" -msgstr "前进(无特效):" +msgstr "前进(无特效):" #: ../share/extensions/jessyInk_keyBindings.inx.h:7 msgid "First slide:" @@ -34399,7 +34906,7 @@ msgid "" "This extension allows you customise the key bindings JessyInk uses. Please " "see code.google.com/p/jessyink for more details." msgstr "" -"这个扩展让你定制 JessyInk 使用的按键绑定。请参阅 code.google.com/p/jessyink " +"这个扩展让您定制 JessyInk 使用的按键绑定。请参阅 code.google.com/p/jessyink " "获取更多细节。" #: ../share/extensions/jessyInk_masterSlide.inx.h:1 @@ -34420,7 +34927,7 @@ msgid "" "This extension allows you to change the master slide JessyInk uses. Please " "see code.google.com/p/jessyink for more details." msgstr "" -"这个扩展让你更改 JessInk 使用的主幻灯片。请参阅 code.google.com/p/jessyink 获" +"这个扩展让您更改 JessInk 使用的主幻灯片。请参阅 code.google.com/p/jessyink 获" "取更多细节。" #: ../share/extensions/jessyInk_mouseHandler.inx.h:1 @@ -34444,7 +34951,7 @@ msgid "" "This extension allows you customise the mouse handler JessyInk uses. Please " "see code.google.com/p/jessyink for more details." msgstr "" -"这个扩展让你定制 JessInk 使用的鼠标处理。请参阅 code.google.com/p/jessyink 获" +"这个扩展让您定制 JessInk 使用的鼠标处理。请参阅 code.google.com/p/jessyink 获" "取更多细节。" #: ../share/extensions/jessyInk_summary.inx.h:1 @@ -34457,7 +34964,7 @@ msgid "" "effects and transitions contained in this SVG file. Please see code.google." "com/p/jessyink for more details." msgstr "" -"这个扩展让你获取包含关于在这个 SVG 文件中的 JessInk 脚本、效果和变换的信息。" +"这个扩展让您获取包含关于在这个 SVG 文件中的 JessInk 脚本、效果和变换的信息。" "请参阅 code.google.com/p/jessyink 获取更多细节。" #: ../share/extensions/jessyInk_transitions.inx.h:1 @@ -34481,7 +34988,7 @@ msgid "" "This extension allows you to change the transition JessyInk uses for the " "selected layer. Please see code.google.com/p/jessyink for more details." msgstr "" -"这个扩展让你更改 JessInk 用于选择层的变化效果。请参阅 code.google.com/p/" +"这个扩展让您更改 JessInk 用于选择层的变化效果。请参阅 code.google.com/p/" "jessyink 获取更多细节。" #: ../share/extensions/jessyInk_uninstall.inx.h:1 @@ -34514,14 +35021,14 @@ msgstr "移除视图" #: ../share/extensions/jessyInk_uninstall.inx.h:9 msgid "Please select the parts of JessyInk you want to uninstall/remove." -msgstr "请选择你想卸载/移除的 JessyInk 部分。" +msgstr "请选择您想卸载/移除的 JessyInk 部分。" #: ../share/extensions/jessyInk_uninstall.inx.h:11 msgid "" "This extension allows you to uninstall the JessyInk script. Please see code." "google.com/p/jessyink for more details." msgstr "" -"这个扩展让你卸载 JessInk 脚本。请参阅 code.google.com/p/jessyink 获取更多细" +"这个扩展让您卸载 JessInk 脚本。请参阅 code.google.com/p/jessyink 获取更多细" "节。" #: ../share/extensions/jessyInk_video.inx.h:1 @@ -34534,7 +35041,7 @@ msgid "" "This element allows you to integrate a video into your JessyInk " "presentation. Please see code.google.com/p/jessyink for more details." msgstr "" -"这个扩展把一个 JessyInk 视频元素放在当前幻灯片上(层)。这个元素让你整合视频到 " +"这个扩展把一个 JessyInk 视频元素放在当前幻灯片上(层)。这个元素让您整合视频到 " "JessInk 演示中。请参阅 code.google.com/p/jessyink 获取更多细节。" #: ../share/extensions/jessyInk_view.inx.h:5 @@ -34550,7 +35057,7 @@ msgid "" "This extension allows you to set, update and remove views for a JessyInk " "presentation. Please see code.google.com/p/jessyink for more details." msgstr "" -"这个扩展让你设置、更新和移除一个 JessInk 演示的视图。请参阅 code.google.com/" +"这个扩展让您设置、更新和移除一个 JessInk 演示的视图。请参阅 code.google.com/" "p/jessyink 获取更多细节。" #: ../share/extensions/layers2svgfont.inx.h:1 @@ -34633,7 +35140,7 @@ msgstr "标记" #: ../share/extensions/layout_nup.inx.h:18 msgid "Place holder" -msgstr "表单的默认文本(占位符)" +msgstr "表单的默认文本(占位符)" #: ../share/extensions/layout_nup.inx.h:19 msgid "Cutting marks" @@ -34704,12 +35211,12 @@ msgstr "规则:" #: ../share/extensions/lindenmayer.inx.h:6 msgid "Step length (px):" -msgstr "阶数长度 (px):" +msgstr "阶数长度(像素):" #: ../share/extensions/lindenmayer.inx.h:8 #, no-c-format msgid "Randomize step (%):" -msgstr "随机阶数 (%):" +msgstr "随机阶数(%):" #: ../share/extensions/lindenmayer.inx.h:9 msgid "Left angle:" @@ -34722,7 +35229,7 @@ msgstr "右边角度:" #: ../share/extensions/lindenmayer.inx.h:12 #, no-c-format msgid "Randomize angle (%):" -msgstr "随机角度 (%):" +msgstr "随机角度(%):" #: ../share/extensions/lindenmayer.inx.h:14 msgid "" @@ -34779,7 +35286,7 @@ msgstr "每个段落的句数:" #: ../share/extensions/lorem_ipsum.inx.h:5 msgid "Paragraph length fluctuation (sentences):" -msgstr "段落长度变动(句数):" +msgstr "段落长度变动(句数):" #: ../share/extensions/lorem_ipsum.inx.h:7 msgid "" @@ -34804,7 +35311,7 @@ msgstr "标记类型:" #: ../share/extensions/markers_strokepaint.inx.h:4 msgid "Invert fill and stroke colors" -msgstr "反转填充和笔廓颜色" +msgstr "反转填充和笔刷颜色" #: ../share/extensions/markers_strokepaint.inx.h:5 msgid "Assign alpha" @@ -34824,20 +35331,16 @@ msgstr "指定充填颜色" #: ../share/extensions/markers_strokepaint.inx.h:11 msgid "Stroke" -msgstr "笔廓" +msgstr "笔刷" #: ../share/extensions/markers_strokepaint.inx.h:12 msgid "Assign stroke color" -msgstr "指定笔廓颜色" +msgstr "指定笔刷颜色" #: ../share/extensions/measure.inx.h:1 msgid "Measure Path" msgstr "测量路径" -#: ../share/extensions/measure.inx.h:2 -msgid "Measure" -msgstr "测量" - #: ../share/extensions/measure.inx.h:3 msgid "Measurement Type: " msgstr "测量类型:" @@ -34847,13 +35350,14 @@ msgid "Text Presets" msgstr "文本预设" #: ../share/extensions/measure.inx.h:6 +#, fuzzy msgid "Text on Path" msgstr "路径文本" #: ../share/extensions/measure.inx.h:8 #, no-c-format msgid "Offset (%)" -msgstr "偏移(%)" +msgstr "偏移(%)" #: ../share/extensions/measure.inx.h:9 msgid "Text anchor:" @@ -34865,23 +35369,19 @@ msgstr "固定文本" #: ../share/extensions/measure.inx.h:11 msgid "Angle (°):" -msgstr "角度(°):" +msgstr "角度(°):" #: ../share/extensions/measure.inx.h:12 msgid "Font size (px):" -msgstr "字体大小 (px):" +msgstr "字体大小(像素):" #: ../share/extensions/measure.inx.h:13 msgid "Offset (px):" -msgstr "偏移 (px):" - -#: ../share/extensions/measure.inx.h:14 -msgid "Precision:" -msgstr "精确度:" +msgstr "偏移(像素):" #: ../share/extensions/measure.inx.h:15 msgid "Scale Factor (Drawing:Real Length) = 1:" -msgstr "缩放比例(绘图:真实长度)= 1: " +msgstr "缩放比例(绘图:真实长度)= 1: " #: ../share/extensions/measure.inx.h:16 msgid "Length Unit:" @@ -35145,15 +35645,15 @@ msgstr "选取组成员:" #: ../share/extensions/pathscatter.inx.h:13 msgid "Moved" -msgstr "移动后的" +msgstr "已移动" #: ../share/extensions/pathscatter.inx.h:14 msgid "Copied" -msgstr "副本的" +msgstr "已复制" #: ../share/extensions/pathscatter.inx.h:15 msgid "Cloned" -msgstr "克隆后的" +msgstr "已克隆" #: ../share/extensions/pathscatter.inx.h:16 msgid "Randomly" @@ -35182,11 +35682,11 @@ msgstr "书籍属性" #: ../share/extensions/perfectboundcover.inx.h:3 msgid "Book Width (inches):" -msgstr "书籍宽度(英寸):" +msgstr "书籍宽度(英寸):" #: ../share/extensions/perfectboundcover.inx.h:4 msgid "Book Height (inches):" -msgstr "书籍高度(英寸):" +msgstr "书籍高度(英寸):" #: ../share/extensions/perfectboundcover.inx.h:5 msgid "Number of Pages:" @@ -35206,11 +35706,11 @@ msgstr "纸张厚度测量:" #: ../share/extensions/perfectboundcover.inx.h:9 msgid "Pages Per Inch (PPI)" -msgstr "每英寸页数(PPI)" +msgstr "每英寸页数(PPI)" #: ../share/extensions/perfectboundcover.inx.h:10 msgid "Caliper (inches)" -msgstr "卡尺(英寸)" +msgstr "卡尺(英寸)" #: ../share/extensions/perfectboundcover.inx.h:11 msgid "Points" @@ -35238,7 +35738,7 @@ msgstr "封面厚度测量:" #: ../share/extensions/perfectboundcover.inx.h:17 msgid "Bleed (in):" -msgstr "出血(英寸):" +msgstr "出血(英寸):" #: ../share/extensions/perfectboundcover.inx.h:18 msgid "Note: Bond Weight # calculations are a best-guess estimate." @@ -35276,8 +35776,8 @@ msgid "" "The port of your serial connection, on Windows something like 'COM1', on " "Linux something like: '/dev/ttyUSB0' (Default: COM1)" msgstr "" -"你的串口连接的端口。在 WIndows 上应该类似于“COM1”,在 Linux 上类似于“/dev/" -"ttyUSB0”(默认:COM1)" +"您的串口连接的端口。在 WIndows 上应该类似于“COM1”,在 Linux 上类似于“/dev/" +"ttyUSB0”(默认:COM1)" #: ../share/extensions/plotter.inx.h:6 msgid "Serial baud rate:" @@ -35285,7 +35785,7 @@ msgstr "串行连接波特率:" #: ../share/extensions/plotter.inx.h:7 msgid "The Baud rate of your serial connection (Default: 9600)" -msgstr "你的串口连接的波特率(默认:9600)" +msgstr "您的串口连接的波特率(默认:9600)" #: ../share/extensions/plotter.inx.h:8 msgid "Serial byte size:" @@ -35296,7 +35796,7 @@ msgstr "串行连接字节大小:" msgid "" "The Byte size of your serial connection, 99% of all plotters use the default " "setting (Default: 8 Bits)" -msgstr "串行连接的字节大小,99% 的绘图者可使用默认设置(默认:8 位)" +msgstr "串行连接的字节大小,99% 的绘图者可使用默认设置(默认:8 位)" #: ../share/extensions/plotter.inx.h:11 msgid "Serial stop bits:" @@ -35307,7 +35807,7 @@ msgstr "串行连接停止位:" msgid "" "The Stop bits of your serial connection, 99% of all plotters use the default " "setting (Default: 1 Bit)" -msgstr "串行连接的停止位,99% 的绘图者可使用默认设置(默认:1 位)" +msgstr "串行连接的停止位,99% 的绘图者可使用默认设置(默认:1 位)" #: ../share/extensions/plotter.inx.h:14 msgid "Serial parity:" @@ -35318,7 +35818,7 @@ msgstr "串行连接奇偶校验:" msgid "" "The Parity of your serial connection, 99% of all plotters use the default " "setting (Default: None)" -msgstr "串行连接的奇偶校验,99% 的绘图者可使用默认设置(默认:无)" +msgstr "串行连接的奇偶校验,99% 的绘图者可使用默认设置(默认:无)" #: ../share/extensions/plotter.inx.h:17 msgid "Serial flow control:" @@ -35328,7 +35828,7 @@ msgstr "串行流控制:" msgid "" "The Software / Hardware flow control of your serial connection (Default: " "Software)" -msgstr "你的串口连接的软件/硬件流控制(默认:软件)" +msgstr "您的串口连接的软件/硬件流控制(默认:软件)" #: ../share/extensions/plotter.inx.h:19 msgid "Command language:" @@ -35336,19 +35836,19 @@ msgstr "命令语言:" #: ../share/extensions/plotter.inx.h:20 msgid "The command language to use (Default: HPGL)" -msgstr "要使用的命令语言(默认:HPGL,惠普绘图语言)" +msgstr "要使用的命令语言(默认:HPGL,惠普绘图语言)" #: ../share/extensions/plotter.inx.h:21 msgid "Software (XON/XOFF)" -msgstr "软件(XON/XOFF)" +msgstr "软件(XON/XOFF)" #: ../share/extensions/plotter.inx.h:22 msgid "Hardware (RTS/CTS)" -msgstr "硬件(RTS/CTS)" +msgstr "硬件(RTS/CTS)" #: ../share/extensions/plotter.inx.h:23 msgid "Hardware (DSR/DTR + RTS/CTS)" -msgstr "硬件(DSR/DTR + RTS/CTS)" +msgstr "硬件(DSR/DTR + RTS/CTS)" #: ../share/extensions/plotter.inx.h:25 msgid "HPGL" @@ -35360,14 +35860,14 @@ msgstr "DMPL" #: ../share/extensions/plotter.inx.h:27 msgid "KNK Plotter (HPGL variant)" -msgstr "KNK 绘图仪(HPGL 变种)" +msgstr "KNK Plotter (HPGL 变种)" #: ../share/extensions/plotter.inx.h:28 msgid "" "Using wrong settings can under certain circumstances cause Inkscape to " "freeze. Always save your work before plotting!" msgstr "" -"在特定的环境下使用错误的设置可能导致 Inkscape 锁死。在绘制前请确定已保存你的" +"在特定的环境下使用错误的设置可能导致 Inkscape 锁死。在绘制前请确定已保存您的" "工作数据!" #: ../share/extensions/plotter.inx.h:29 @@ -35380,7 +35880,7 @@ msgstr "" #: ../share/extensions/plotter.inx.h:30 msgid "Parallel (LPT) connections are not supported." -msgstr "不支持并行链接 (LPT)。" +msgstr "不支持并口连接(LPT)。" #: ../share/extensions/plotter.inx.h:41 msgid "" @@ -35388,12 +35888,12 @@ msgid "" "(depending on your plotter model), set to 0 to omit command. Most plotters " "ignore this command. (Default: 0)" msgstr "" -"笔以每秒多少厘米或毫米的速度移动(取决于绘图仪的型号),设为 0 表示省略命令;" -"大多数绘图仪忽略这个命令(默认:0)" +"笔以每秒多少厘米或毫米的速度移动(取决于绘图仪的型号),设为 0 表示省略命令;大" +"多数绘图仪忽略这个命令(默认:0)" #: ../share/extensions/plotter.inx.h:42 msgid "Rotation (°, clockwise):" -msgstr "旋转(°,顺时针):" +msgstr "旋转(°,顺时针):" #: ../share/extensions/plotter.inx.h:62 msgid "Show debug information" @@ -35404,8 +35904,8 @@ msgid "" "Check this to get verbose information about the plot without actually " "sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" msgstr "" -"选中此处以获取关于绘图的详尽信息但不向绘图仪发送任何信息(又称数据转储)(默" -"认:不选中)" +"选中此处以获取关于绘图的详尽信息但不向绘图仪发送任何信息(又称数据转储)(默认:" +"不选中)" #: ../share/extensions/plt_input.inx.h:1 msgid "AutoCAD Plot Input" @@ -35535,7 +36035,7 @@ msgstr "根据如下点旋转:" #: ../share/extensions/spirograph.inx.h:8 #: ../share/extensions/wireframe_sphere.inx.h:5 msgid "Rotation (deg):" -msgstr "旋转(度):" +msgstr "旋转(度):" #: ../share/extensions/polyhedron_3d.inx.h:29 msgid "Then rotate around:" @@ -35577,11 +36077,11 @@ msgstr "填充不透明度 (%):" #: ../share/extensions/polyhedron_3d.inx.h:41 #, no-c-format msgid "Stroke opacity (%):" -msgstr "笔廓不透明度 (%):" +msgstr "笔刷不透明度 (%):" #: ../share/extensions/polyhedron_3d.inx.h:42 msgid "Stroke width (px):" -msgstr "笔划宽度 (px):" +msgstr "笔刷宽度 (px):" #: ../share/extensions/polyhedron_3d.inx.h:43 msgid "Shading" @@ -35661,7 +36161,7 @@ msgstr "星标" #: ../share/extensions/printing_marks.inx.h:7 msgid "Color Bars" -msgstr "颜色条" +msgstr "色条" #: ../share/extensions/printing_marks.inx.h:8 msgid "Page Information" @@ -35693,11 +36193,11 @@ msgstr "抖动节点" #: ../share/extensions/radiusrand.inx.h:3 msgid "Maximum displacement in X (px):" -msgstr "X 轴上最大位移(px):" +msgstr "X 轴上最大位移(像素):" #: ../share/extensions/radiusrand.inx.h:4 msgid "Maximum displacement in Y (px):" -msgstr "Y 轴上最大位移(px):" +msgstr "Y 轴上最大位移(像素):" #: ../share/extensions/radiusrand.inx.h:6 msgid "Shift node handles" @@ -35711,7 +36211,7 @@ msgstr "使用正态分布" msgid "" "This effect randomly shifts the nodes (and optionally node handles) of the " "selected path." -msgstr "此效果随机移动选中的路径(或节点控制柄)上的节点" +msgstr "此效果随机移动选中的路径(或节点控制柄)上的节点" #: ../share/extensions/render_alphabetsoup.inx.h:1 msgid "Alphabet Soup" @@ -35750,7 +36250,7 @@ msgstr "尺寸,按平方单位计算:" #: ../share/extensions/render_barcode_datamatrix.inx.h:4 msgid "Square Size (px):" -msgstr "方块尺寸 (px):" +msgstr "方块尺寸(像素):" #: ../share/extensions/render_barcode_qrcode.inx.h:1 msgid "QR Code" @@ -35773,22 +36273,22 @@ msgstr "纠错等级:" #: ../share/extensions/render_barcode_qrcode.inx.h:9 #, no-c-format msgid "L (Approx. 7%)" -msgstr "L(约 7%)" +msgstr "L(约 7%)" #: ../share/extensions/render_barcode_qrcode.inx.h:11 #, no-c-format msgid "M (Approx. 15%)" -msgstr "M(约 15%)" +msgstr "M(约 15%)" #: ../share/extensions/render_barcode_qrcode.inx.h:13 #, no-c-format msgid "Q (Approx. 25%)" -msgstr "Q(约 25%)" +msgstr "Q(约 25%)" #: ../share/extensions/render_barcode_qrcode.inx.h:15 #, no-c-format msgid "H (Approx. 30%)" -msgstr "H(约 30%)" +msgstr "H(约 30%)" #: ../share/extensions/render_barcode_qrcode.inx.h:17 msgid "Square size (px):" @@ -35817,19 +36317,19 @@ msgstr "齿轮" #: ../share/extensions/render_gears.inx.h:2 msgid "Number of teeth:" -msgstr "齿数" +msgstr "齿数:" #: ../share/extensions/render_gears.inx.h:3 msgid "Circular pitch (tooth size):" -msgstr "圆周齿距(齿尺寸):" +msgstr "圆周齿距(齿尺寸):" #: ../share/extensions/render_gears.inx.h:4 msgid "Pressure angle (degrees):" -msgstr "压力角(度):" +msgstr "压力角(度):" #: ../share/extensions/render_gears.inx.h:5 msgid "Diameter of center hole (0 for none):" -msgstr "中心孔直径(0 代表无中心孔):" +msgstr "中心孔直径(0 代表无中心孔):" #: ../share/extensions/render_gears.inx.h:10 msgid "Unit of measurement for both circular pitch and center diameter." @@ -35862,7 +36362,7 @@ msgstr "列出所有字体" #: ../share/extensions/replace_font.inx.h:7 msgid "" "Choose this tab if you would like to see a list of the fonts used/found." -msgstr "如果你希望查看使用/发现的字体的列表,选择这个标签页。" +msgstr "如果您希望查看使用/发现的字体的列表,选择这个标签页。" #: ../share/extensions/replace_font.inx.h:8 msgid "Work on:" @@ -35897,24 +36397,25 @@ msgid "Vertical:" msgstr "垂直:" #: ../share/extensions/restack.inx.h:8 +#, fuzzy msgid "Restack Direction" msgstr "重新堆叠方向" #: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" -msgstr "左至右(0)" +msgstr "左至右(0)" #: ../share/extensions/restack.inx.h:10 msgid "Bottom to Top (90)" -msgstr "底到顶(90)" +msgstr "底到顶(90)" #: ../share/extensions/restack.inx.h:11 msgid "Right to Left (180)" -msgstr "右到左(180)" +msgstr "右到左(180)" #: ../share/extensions/restack.inx.h:12 msgid "Top to Bottom (270)" -msgstr "顶到底(270)" +msgstr "顶到底(270)" #: ../share/extensions/restack.inx.h:13 msgid "Radial Outward" @@ -36001,202 +36502,286 @@ msgstr "弹性伸缩" #: ../share/extensions/rubberstretch.inx.h:3 #, no-c-format msgid "Strength (%):" -msgstr "强度 (%):" +msgstr "强度(%):" #: ../share/extensions/rubberstretch.inx.h:5 #, no-c-format msgid "Curve (%):" -msgstr "曲线 (%):" +msgstr "曲线(%):" #: ../share/extensions/scour.inx.h:1 msgid "Optimized SVG Output" msgstr "优化的 SVG 输出" #: ../share/extensions/scour.inx.h:3 -msgid "Shorten color values" -msgstr "缩短颜色编号" +#, fuzzy +msgid "Number of significant digits for coordinates:" +msgstr "坐标的有效位数:" #: ../share/extensions/scour.inx.h:4 -msgid "Convert CSS attributes to XML attributes" -msgstr "将 CSS 属性转换为 XML 属性" +msgid "" +"Specifies the number of significant digits that should be output for " +"coordinates. Note that significant digits are *not* the number of decimals " +"but the overall number of digits in the output. For example if a value of " +"\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " +"coordinate 123.675 is output as 124." +msgstr "" #: ../share/extensions/scour.inx.h:5 -msgid "Group collapsing" -msgstr "折叠组" +msgid "Shorten color values" +msgstr "缩短颜色编号" #: ../share/extensions/scour.inx.h:6 -msgid "Create groups for similar attributes" -msgstr "为带有类似属性的对象创建组" +msgid "" +"Convert all color specifications to #RRGGBB (or #RGB where applicable) " +"format." +msgstr "" #: ../share/extensions/scour.inx.h:7 -msgid "Embed rasters" -msgstr "嵌入栅格" +msgid "Convert CSS attributes to XML attributes" +msgstr "将 CSS 属性转换为 XML 属性" #: ../share/extensions/scour.inx.h:8 -msgid "Keep editor data" -msgstr "保留编辑器数据" +msgid "" +"Convert styles from style tags and inline style=\"\" declarations into XML " +"attributes." +msgstr "" #: ../share/extensions/scour.inx.h:9 -msgid "Remove metadata" -msgstr "移除元数据" +msgid "Collapse groups" +msgstr "折叠组" #: ../share/extensions/scour.inx.h:10 -msgid "Remove comments" -msgstr "移除注释" +msgid "" +"Remove useless groups, promoting their contents up one level. Requires " +"\"Remove unused IDs\" to be set." +msgstr "" #: ../share/extensions/scour.inx.h:11 -msgid "Work around renderer bugs" -msgstr "尝试解决渲染问题" +msgid "Create groups for similar attributes" +msgstr "为带有类似属性的对象创建组" #: ../share/extensions/scour.inx.h:12 -msgid "Enable viewboxing" -msgstr "启用视图框" +msgid "" +"Create groups for runs of elements having at least one attribute in common " +"(e.g. fill-color, stroke-opacity, ...)." +msgstr "" #: ../share/extensions/scour.inx.h:13 -msgid "Remove the xml declaration" -msgstr "移除 XML 声明" +msgid "Keep editor data" +msgstr "保留编辑器数据" #: ../share/extensions/scour.inx.h:14 -msgid "Number of significant digits for coords:" -msgstr "坐标的有效位数:" +msgid "" +"Don't remove editor-specific elements and attributes. Currently supported: " +"Inkscape, Sodipodi and Adobe Illustrator." +msgstr "" #: ../share/extensions/scour.inx.h:15 -msgid "XML indentation (pretty-printing):" -msgstr "XML 缩进(美化显示):" +msgid "Keep unreferenced definitions" +msgstr "" #: ../share/extensions/scour.inx.h:16 -msgid "Space" -msgstr "空格" +msgid "Keep element definitions that are not currently used in the SVG" +msgstr "" #: ../share/extensions/scour.inx.h:17 -msgid "Tab" -msgstr "制表符" +msgid "Work around renderer bugs" +msgstr "尝试解决渲染问题" #: ../share/extensions/scour.inx.h:18 -msgctxt "Indent" -msgid "None" -msgstr "无缩进" - -#: ../share/extensions/scour.inx.h:19 -msgid "Ids" -msgstr "Ids" +msgid "" +"Works around some common renderer bugs (mainly libRSVG) at the cost of a " +"slightly larger SVG file." +msgstr "" #: ../share/extensions/scour.inx.h:20 -msgid "Remove unused ID names for elements" -msgstr "为对象移除未使用的 ID 名称" +msgid "Remove the XML declaration" +msgstr "移除 XML 声明" #: ../share/extensions/scour.inx.h:21 -msgid "Shorten IDs" -msgstr "缩短 ID" +msgid "" +"Removes the XML declaration (which is optional but should be provided, " +"especially if special characters are used in the document) from the file " +"header." +msgstr "" #: ../share/extensions/scour.inx.h:22 -msgid "Preserve manually created ID names not ending with digits" -msgstr "保留非数字结尾的,手动创建的 ID 名称" +msgid "Remove metadata" +msgstr "移除元数据" #: ../share/extensions/scour.inx.h:23 -msgid "Preserve these ID names, comma-separated:" -msgstr "保留如下使用逗号分隔的 ID 名称:" +msgid "" +"Remove metadata tags along with all the contained information, which may " +"include license and author information, alternate versions for non-SVG-" +"enabled browsers, etc." +msgstr "" #: ../share/extensions/scour.inx.h:24 -msgid "Preserve ID names starting with:" -msgstr "保留以如下字串开头的 ID 名称:" +msgid "Remove comments" +msgstr "移除注释" #: ../share/extensions/scour.inx.h:25 -msgid "Help (Options)" -msgstr "帮助(选项)" +msgid "Remove all XML comments from output." +msgstr "" + +#: ../share/extensions/scour.inx.h:26 +#, fuzzy +msgid "Embed raster images" +msgstr "嵌入栅格" #: ../share/extensions/scour.inx.h:27 +msgid "" +"Resolve external references to raster images and embed them as Base64-" +"encoded data URLs." +msgstr "" + +#: ../share/extensions/scour.inx.h:28 +msgid "Enable viewboxing" +msgstr "启用视图框" + +#: ../share/extensions/scour.inx.h:30 #, no-c-format msgid "" -"This extension optimizes the SVG file according to the following options:\n" -" * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -" * Convert CSS attributes to XML attributes: convert styles from style " -"tags and inline style=\"\" declarations into XML attributes.\n" -" * Group collapsing: removes useless g elements, promoting their contents " -"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" -" * Create groups for similar attributes: create g elements for runs of " -"elements having at least one attribute in common (e.g. fill color, stroke " -"opacity, ...).\n" -" * Embed rasters: embed raster images as base64-encoded data URLs.\n" -" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " -"elements and attributes.\n" -" * Remove metadata: remove metadata tags along with all the information " -"in them, which may include license metadata, alternate versions for non-SVG-" -"enabled browsers, etc.\n" -" * Remove comments: remove comment tags.\n" -" * Work around renderer bugs: emits slightly larger SVG data, but works " -"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " -"various applications.\n" -" * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" -" * Number of significant digits for coords: all coordinates are output " -"with that number of significant digits. For example, if 3 is specified, the " -"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " -"472.\n" -" * XML indentation (pretty-printing): either None for no indentation, " -"Space to use one space per nesting level, or Tab to use one tab per nesting " -"level." -msgstr "" -"此扩展功能可以根据下列选项优化 SVG 文件:\n" -" * 缩短颜色名称:将全部颜色转换成 #RRGGBB 或 #RGB 格式。\n" -" * 将 CSS 属性转换成 XML 属性:将样式从样式标签和进线样式=\"\" 宣告转换成 " -"XML 属性。\n" -" * 折叠群组:移除没用到的 g 组件,让这些内容升高一个层级。需要已设置“移除" -"组件没用到的 ID 名称”。\n" -" * 创建相似属性的群组:创建 g 组件以让运行的组件至少共有一种属性 (例如,填" -"充、笔廓不透明度…)。\n" -" * 内嵌位图:将位图内嵌为 base64 编码数据网址。\n" -" * 保留软件数据:不移除 Inkscape、Sodipodi 或 Adobe Illustrator 组件和属" -"性。\n" -" * 移除中继数据:移除中继数据标签和里面的所有信息,这些信息可能包含授权中" -"继数据、不支持 SVG 浏览器的备用方案等。\n" -" * 移除注解:移除注解标签。\n" -" * 避开图形渲染引擎程序错误:稍微放大 SVG 数据,可避开 librsvg 图形渲染引" -"擎里的一个程序错误,该功能用在 GNOME 桌面的视觉效果和其他各种应用程序。\n" -" * 启用查看框:图像尺寸变为 100%/100% 并引进查看框。\n" -" * 坐标的有效位数:以此有效位数输出所有坐标。例如,若有效位数指定为 3,那" -"么坐标 3.5153 会输出为 3.51而坐标 471.55 输出为 472。\n" -" * XML 缩进 (打印美观):可选择是否缩进,若要缩进可选择“空格”让每个嵌套层级" -"使用一个空格字符缩进,或者“定位字符”让每个嵌套层级使用一个空格字符进行缩排。" +"Set page size to 100%/100% (full width and height of the display area) and " +"introduce a viewBox specifying the drawings dimensions." +msgstr "" + +#: ../share/extensions/scour.inx.h:31 +msgid "Format output with line-breaks and indentation" +msgstr "" + +#: ../share/extensions/scour.inx.h:32 +msgid "" +"Produce nicely formatted output including line-breaks. If you do not intend " +"to hand-edit the SVG file you can disable this option to bring down the file " +"size even more at the cost of clarity." +msgstr "" + +#: ../share/extensions/scour.inx.h:33 +msgid "Indentation characters:" +msgstr "缩进字符" + +#: ../share/extensions/scour.inx.h:34 +msgid "" +"The type of indentation used for each level of nesting in the output. " +"Specify \"None\" to disable indentation. This option has no effect if " +"\"Format output with line-breaks and indentation\" is disabled." +msgstr "" + +#: ../share/extensions/scour.inx.h:35 +msgid "Depth of indentation:" +msgstr "缩进深度:" + +#: ../share/extensions/scour.inx.h:36 +msgid "" +"The depth of the chosen type of indentation. E.g. if you choose \"2\" every " +"nesting level in the output will be indented by two additional spaces/tabs." +msgstr "" + +#: ../share/extensions/scour.inx.h:37 +msgid "Strip the \"xml:space\" attribute from the root SVG element" +msgstr "" + +#: ../share/extensions/scour.inx.h:38 +msgid "" +"This is useful if the input file specifies \"xml:space='preserve'\" in the " +"root SVG element which instructs the SVG editor not to change whitespace in " +"the document at all (and therefore overrides the options above)." +msgstr "" + +#: ../share/extensions/scour.inx.h:39 +msgid "Document options" +msgstr "文档选项" #: ../share/extensions/scour.inx.h:40 -msgid "Help (Ids)" -msgstr "帮助 (Ids)" +#, fuzzy +msgid "Pretty-printing" +msgstr "油画" #: ../share/extensions/scour.inx.h:41 +msgid "Space" +msgstr "空格" + +#: ../share/extensions/scour.inx.h:42 +msgid "Tab" +msgstr "制表符" + +#: ../share/extensions/scour.inx.h:43 +msgctxt "Indent" +msgid "None" +msgstr "无缩进" + +#: ../share/extensions/scour.inx.h:44 +msgid "IDs" +msgstr "ID" + +#: ../share/extensions/scour.inx.h:45 +msgid "Remove unused IDs" +msgstr "移除未使用的 ID" + +#: ../share/extensions/scour.inx.h:46 msgid "" -"Ids specific options:\n" -" * Remove unused ID names for elements: remove all unreferenced ID " -"attributes.\n" -" * Shorten IDs: reduce the length of all ID attributes, assigning the " -"shortest to the most-referenced elements. For instance, #linearGradient5621, " -"referenced 100 times, can become #a.\n" -" * Preserve manually created ID names not ending with digits: usually, " -"optimised SVG output removes these, but if they're needed for referencing (e." -"g. #middledot), you may use this option.\n" -" * Preserve these ID names, comma-separated: you can use this in " -"conjunction with the other preserve options if you wish to preserve some " -"more specific ID names.\n" -" * Preserve ID names starting with: usually, optimised SVG output removes " -"all unused ID names, but if all of your preserved ID names start with the " -"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." -msgstr "" -"识别码专属选项:\n" -" * 移除没用到的组件 ID 名称:移除所有未参考的 ID 属性。\n" -" * 缩短识别码:缩短全部 ID 属性的长度,指定最短长度到参考多数的组件。例" -"如,#linearGradient5621,被参考 100 次,那么就变成 #a。\n" -" * 保留手动创建的识别名称不编辑末端号码:正常情形下, 最佳化的 SVG 输出会" -"移除这些信息,但如果需要参考 (例如 #middledot),你可以使用此选项。\n" -" * 保留这些识别名称,用逗号分隔开:若你想保留更多指定的式别名称此选项可以" -"和其他保留选项结合使用。\n" -" * 保留某前缀开头的识别名称:正常情况下,最佳化的 SVG 输出会移除全部没用到" -"的识别名称,但如果想要保留的识别名称都以相同前缀开头 (例如 #flag-mx、#flag-" -"pt),可以使用此选项。" +"Remove all unreferenced IDs from elements. Those are not needed for " +"rendering." +msgstr "" +"从元素中移除所有未使用的 ID,渲染时无需这些信。" #: ../share/extensions/scour.inx.h:47 +msgid "Shorten IDs" +msgstr "缩短 ID" + +#: ../share/extensions/scour.inx.h:48 +msgid "" +"Minimize the length of IDs using only lowercase letters, assigning the " +"shortest values to the most-referenced elements. For instance, " +"\"linearGradient5621\" will become \"a\" if it is the most used element." +msgstr "" + +#: ../share/extensions/scour.inx.h:49 +msgid "Prefix shortened IDs with:" +msgstr "" + +#: ../share/extensions/scour.inx.h:50 +msgid "Prepend shortened IDs with the specified prefix." +msgstr "" + +#: ../share/extensions/scour.inx.h:51 +#, fuzzy +msgid "Preserve manually created IDs not ending with digits" +msgstr "保留非数字结尾的,手动创建的 ID 名称" + +#: ../share/extensions/scour.inx.h:52 +msgid "" +"Descriptive IDs which were manually created to reference or label specific " +"elements or groups (e.g. #arrowStart, #arrowEnd or #textLabels) will be " +"preserved while numbered IDs (as they are generated by most SVG editors " +"including Inkscape) will be removed/shortened." +msgstr "" + +#: ../share/extensions/scour.inx.h:53 +msgid "Preserve the following IDs:" +msgstr "保留以下 ID:" + +#: ../share/extensions/scour.inx.h:54 +msgid "A comma-separated list of IDs that are to be preserved." +msgstr "" + +#: ../share/extensions/scour.inx.h:55 +msgid "Preserve IDs starting with:" +msgstr "保留以如下字串开头的 ID:" + +#: ../share/extensions/scour.inx.h:56 +msgid "" +"Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " +"to preserve \"flag-mx\", \"flag-pt\", etc.)." +msgstr "" + +#: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" msgstr "优化的 SVG (*.svg)" -#: ../share/extensions/scour.inx.h:48 +#: ../share/extensions/scour.inx.h:58 msgid "Scalable Vector Graphics" msgstr "可缩放矢量图形" @@ -36252,7 +36837,7 @@ msgstr "sK1 矢量图形文件输入" #: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" -msgstr "sK1 矢量图形文件 (.sk1)" +msgstr "sK1 矢量图形文件(.sk1)" #: ../share/extensions/sk1_input.inx.h:3 msgid "Open files saved in sK1 vector graphics editor" @@ -36272,7 +36857,7 @@ msgstr "Sketch 输入" #: ../share/extensions/sk_input.inx.h:2 msgid "Sketch Diagram (*.sk)" -msgstr "Sketch 图表 (*.sk)" +msgstr "Sketch 图表(*.sk)" #: ../share/extensions/sk_input.inx.h:3 msgid "A diagram created with the program Sketch" @@ -36284,15 +36869,15 @@ msgstr "旋轮线" #: ../share/extensions/spirograph.inx.h:2 msgid "R - Ring Radius (px):" -msgstr "R - 环形半径 (px):" +msgstr "R - 环形半径(像素):" #: ../share/extensions/spirograph.inx.h:3 msgid "r - Gear Radius (px):" -msgstr "r - 齿轮半径 (px):" +msgstr "r - 齿轮半径(像素):" #: ../share/extensions/spirograph.inx.h:4 msgid "d - Pen Radius (px):" -msgstr "d - 钢笔半径 (px):" +msgstr "d - 钢笔半径(像素):" #: ../share/extensions/spirograph.inx.h:5 msgid "Gear Placement:" @@ -36300,15 +36885,15 @@ msgstr "齿轮放置点:" #: ../share/extensions/spirograph.inx.h:6 msgid "Inside (Hypotrochoid)" -msgstr "内侧 (内旋轮线)" +msgstr "内侧(内旋轮线)" #: ../share/extensions/spirograph.inx.h:7 msgid "Outside (Epitrochoid)" -msgstr "外侧 (外旋轮线)" +msgstr "外侧(外旋轮线)" #: ../share/extensions/spirograph.inx.h:9 msgid "Quality (Default = 16):" -msgstr "质量(默认=16):" +msgstr "质量(默认=16):" #: ../share/extensions/split.inx.h:1 msgid "Split text" @@ -36363,7 +36948,7 @@ msgstr "FXG 输出" #: ../share/extensions/svg2fxg.inx.h:2 msgid "Flash XML Graphics (*.fxg)" -msgstr "Flash XML 图像文件 (*.fxg)" +msgstr "Flash XML 图像文件(*.fxg)" #: ../share/extensions/svg2fxg.inx.h:3 msgid "Adobe's XML Graphics file format" @@ -36413,11 +36998,11 @@ msgstr "日历" #: ../share/extensions/svgcalendar.inx.h:3 msgid "Year (4 digits):" -msgstr "年份(四位数):" +msgstr "年份(四位数字):" #: ../share/extensions/svgcalendar.inx.h:4 msgid "Month (0 for all):" -msgstr "月份(0 代表全部):" +msgstr "月份(0 代表全部):" #: ../share/extensions/svgcalendar.inx.h:5 msgid "Fill empty day boxes with next month's days" @@ -36521,7 +37106,7 @@ msgstr "字符编码:" #: ../share/extensions/svgcalendar.inx.h:32 msgid "You may change the names for other languages:" -msgstr "你可以修改在其它语言中的名称:" +msgstr "您可以修改在其他语言中的名称:" #: ../share/extensions/svgcalendar.inx.h:33 msgid "" @@ -36555,7 +37140,7 @@ msgstr "将 SVG 字体转换为字形图层" #: ../share/extensions/svgfont2layers.inx.h:2 msgid "Load only the first 30 glyphs (Recommended)" -msgstr "仅载入前 30 个字形(推荐)" +msgstr "仅载入前 30 个字形(推荐)" #: ../share/extensions/synfig_output.inx.h:1 msgid "Synfig Output" @@ -36575,13 +37160,13 @@ msgstr "将来自每个根图层的 SVG 文件归类到不同的集合中" #: ../share/extensions/tar_layers.inx.h:2 msgid "Layers as Separate SVG (*.tar)" -msgstr "将图层保存为独立的 SVG 文件 (*.tar)" +msgstr "将图层保存为独立的 SVG 文件(*.tar)" #: ../share/extensions/tar_layers.inx.h:3 msgid "" "Each layer split into it's own svg file and collected as a tape archive (tar " "file)" -msgstr "将每个图层分割到相应的 SVG 文件,并集合为一个归档(tar 文件)" +msgstr "将每个图层分割到相应的 SVG 文件,并集合为一个归档(tar 文件)" #: ../share/extensions/text_braille.inx.h:1 msgid "Convert to Braille" @@ -36670,27 +37255,27 @@ msgstr "三角形" #: ../share/extensions/triangle.inx.h:2 msgid "Side Length a (px):" -msgstr "边长 a(px):" +msgstr "边长 a (像素):" #: ../share/extensions/triangle.inx.h:3 msgid "Side Length b (px):" -msgstr "边长 b(px):" +msgstr "边长 b (像素):" #: ../share/extensions/triangle.inx.h:4 msgid "Side Length c (px):" -msgstr "边长 c(px):" +msgstr "边长 c (像素):" #: ../share/extensions/triangle.inx.h:5 msgid "Angle a (deg):" -msgstr "角 a(度):" +msgstr "角 a (度):" #: ../share/extensions/triangle.inx.h:6 msgid "Angle b (deg):" -msgstr "角 b(度):" +msgstr "角 b (度):" #: ../share/extensions/triangle.inx.h:7 msgid "Angle c (deg):" -msgstr "角 c(度):" +msgstr "角 c (度):" #: ../share/extensions/triangle.inx.h:9 msgid "From Three Sides" @@ -36857,7 +37442,7 @@ msgstr "使用第一个选中组控制其他项的属性" msgid "" "This effect adds a feature visible (or usable) only on a SVG enabled web " "browser (like Firefox)." -msgstr "该效果添加的特征仅在兼容 SVG 的浏览器 (例如 Firefox)上可用。" +msgstr "该效果添加的特征仅在兼容 SVG 的浏览器 (例如 Firefox)上可用。" #: ../share/extensions/web-set-att.inx.h:27 msgid "" @@ -36902,7 +37487,7 @@ msgstr "将所有选择对象的属性应用到最后一个对象上" #: ../share/extensions/web-transmit-att.inx.h:22 msgid "The first selected transmits to all others" -msgstr "第一个选择对象传递到其它" +msgstr "第一个选择对象传递到其他" #: ../share/extensions/web-transmit-att.inx.h:25 msgid "" @@ -36946,22 +37531,22 @@ msgstr "背景色:" #: ../share/extensions/webslicer_create_group.inx.h:8 msgid "Pixel (fixed)" -msgstr "像素(固定)" +msgstr "像素(固定)" #: ../share/extensions/webslicer_create_group.inx.h:9 msgid "Percent (relative to parent size)" -msgstr "百分比 (相对于父对象大小)" +msgstr "百分比(相对于父对象大小)" #: ../share/extensions/webslicer_create_group.inx.h:10 msgid "Undefined (relative to non-floating content size)" -msgstr "未定义(相对于非浮动内容大小)" +msgstr "未定义(相对于非浮动内容大小)" #: ../share/extensions/webslicer_create_group.inx.h:12 msgid "" "Layout Group is only about to help a better code generation (if you need " "it). To use this, you must to select some \"Slicer rectangles\" first." msgstr "" -"布局组合仅仅是为了有助于获得更好的代码生成(如果你需要它的话)。要使用这个,你" +"布局组合仅仅是为了有助于获得更好的代码生成(如果您需要它的话)。要使用这个,您" "必须首先选择某些“分片矩形”。" #: ../share/extensions/webslicer_create_group.inx.h:14 @@ -37029,19 +37614,19 @@ msgstr "使用带图像的定位 html 块元素作为背景" #: ../share/extensions/webslicer_create_rect.inx.h:23 msgid "Tiled Background (on parent group)" -msgstr "平铺背景(父组中)" +msgstr "平铺背景(父组中)" #: ../share/extensions/webslicer_create_rect.inx.h:24 msgid "Background — repeat horizontally (on parent group)" -msgstr "背景 — 水平重复(父组中)" +msgstr "背景 — 水平重复(父组中)" #: ../share/extensions/webslicer_create_rect.inx.h:25 msgid "Background — repeat vertically (on parent group)" -msgstr "背景 — 垂直重复(父组中)" +msgstr "背景 — 垂直重复(父组中)" #: ../share/extensions/webslicer_create_rect.inx.h:26 msgid "Background — no repeat (on parent group)" -msgstr "背景 — 无重复(父组中)" +msgstr "背景 — 无重复(父组中)" #: ../share/extensions/webslicer_create_rect.inx.h:27 msgid "Positioned Image" @@ -37119,8 +37704,7 @@ msgstr "附带 HTML 及 CSS 文档" msgid "" "All sliced images, and optionally - code, will be generated as you had " "configured and saved to one directory." -msgstr "" -"所有分片的图像,以及代码(可选),将会如你所配置的生成并保存到一个目录。" +msgstr "所有分片的图像,以及代码(可选),将会如您所配置的生成并保存到一个目录。" #: ../share/extensions/whirl.inx.h:1 msgid "Whirl" @@ -37148,7 +37732,7 @@ msgstr "经线" #: ../share/extensions/wireframe_sphere.inx.h:4 msgid "Tilt (deg):" -msgstr "倾斜(°):" +msgstr "倾斜(°):" #: ../share/extensions/wireframe_sphere.inx.h:7 msgid "Hide lines behind the sphere" @@ -37165,3 +37749,372 @@ msgstr "一种常用于剪切画的图形文件格式" #: ../share/extensions/xaml2svg.inx.h:1 msgid "XAML Input" msgstr "XAML 输入" + +#~ msgid "A4 Landscape Page" +#~ msgstr "A4 横向" + +#, fuzzy +#~ msgid "Empty A4 landscape sheet" +#~ msgstr "空白 A4 横向" + +#~ msgid "A4 Page" +#~ msgstr "A4 页面" + +#, fuzzy +#~ msgid "A4 paper sheet empty" +#~ msgstr "无层级的空白页" + +#, fuzzy +#~ msgid "Black Opaque" +#~ msgstr "Black(黑色)通道" + +#~ msgid "Empty black page" +#~ msgstr "空的黑色页面" + +#~ msgid "Empty white page" +#~ msgstr "空白页面" + +#~ msgid "Empty business card template." +#~ msgstr "空白名片模板。" + +#~ msgid "business card empty 85x54" +#~ msgstr "空白名片模板 85x54" + +#~ msgid "Business Card 90x50mm" +#~ msgstr "名片 90x50mm" + +#, fuzzy +#~ msgid "business card empty 90x50" +#~ msgstr "空白名片 90x50" + +#~ msgid "CD Cover 300dpi" +#~ msgstr "CD 封面 300dpi" + +#~ msgid "Empty CD box cover." +#~ msgstr "空 CD 盒封面。" + +#, fuzzy +#~ msgid "CD cover disc disk 300dpi box" +#~ msgstr "CD 封面 300dpi" + +#~ msgid "DVD Cover Regular 300dpi " +#~ msgstr "标准 DVD 封面 300dpi" + +#~ msgid "Template for both-sides DVD covers." +#~ msgstr "双面的 DVD 封面模板。" + +#~ msgid "DVD cover regular 300dpi" +#~ msgstr "标准 DVD 封面 300dpi" + +#~ msgid "DVD Cover Slim 300dpi " +#~ msgstr "超薄 DVD 封面(Slim) 300dpi" + +#~ msgid "Template for both-sides DVD slim covers." +#~ msgstr "双面的超薄 DVD 封面(Slim)模板。" + +#~ msgid "DVD cover slim 300dpi" +#~ msgstr "超薄 DVD 封面(Slim) 300dpi" + +#~ msgid "DVD Cover Superslim 300dpi " +#~ msgstr "超薄 DVD 封面(Superslim) 300dpi" + +#~ msgid "Template for both-sides DVD superslim covers." +#~ msgstr "双面的超薄 DVD 封面(Superslim)模板。" + +#~ msgid "DVD cover superslim 300dpi" +#~ msgstr "超薄 DVD 封面(Superslim) 300dpi" + +#~ msgid "DVD Cover Ultraslim 300dpi " +#~ msgstr "超薄 DVD 封面(Ultraslim) 300dpi " + +#~ msgid "Template for both-sides DVD ultraslim covers." +#~ msgstr "双面的超薄 DVD 封面(Ultraslim)模板。" + +#~ msgid "DVD cover ultraslim 300dpi" +#~ msgstr "超薄 DVD 封面(Ultraslim) 300dpi" + +#~ msgid "Desktop 1024x768" +#~ msgstr "桌面 1024x768" + +#~ msgid "desktop 1024x768 wallpaper" +#~ msgstr "桌面 1024x768 壁纸" + +#~ msgid "Desktop 1600x1200" +#~ msgstr "桌面 1600x1200" + +#~ msgid "desktop 1600x1200 wallpaper" +#~ msgstr "桌面 1600x1200 壁纸" + +#~ msgid "Desktop 640x480" +#~ msgstr "桌面 640x480" + +#~ msgid "desktop 640x480 wallpaper" +#~ msgstr "桌面 640x480 桌面" + +#~ msgid "Desktop 800x600" +#~ msgstr "桌面 800x600" + +#~ msgid "desktop 800x600 wallpaper" +#~ msgstr "桌面 800x600 壁纸" + +#~ msgid "Fontforge Glyph" +#~ msgstr "Fontforge 字形" + +#~ msgid "Icon 16x16" +#~ msgstr "图标 16x16" + +#~ msgid "Small 16x16 icon template." +#~ msgstr "小号 16x16 图标模板。" + +#~ msgid "Icon 32x32" +#~ msgstr "图标 32x32" + +#~ msgid "32x32 icon template." +#~ msgstr "32x32 图标模板。" + +#~ msgid "Icon 48x48" +#~ msgstr "图标 48x48" + +#~ msgid "48x48 icon template." +#~ msgstr "48x48 图标模板。" + +#~ msgid "Icon 64x64" +#~ msgstr "图标 64x64" + +#~ msgid "64x64 icon template." +#~ msgstr "64x64 图标模板。" + +#~ msgid "Letter Landscape" +#~ msgstr "信函横向" + +#~ msgid "Letter" +#~ msgstr "信函" + +#~ msgid "No Borders" +#~ msgstr "无边框" + +#~ msgid "Video HDTV 1920x1080" +#~ msgstr "视频 HDTV 1920x1080" + +#~ msgid "HDTV video template for 1920x1080 resolution." +#~ msgstr "HDTV 视频模板 1920x1080 分辨率。" + +#~ msgid "Video NTSC 720x486" +#~ msgstr "视频 NTSC 720x486" + +#~ msgid "NTSC video template for 720x486 resolution." +#~ msgstr "NTSC 视频模板 720x486 分辨率。" + +#~ msgid "Video PAL 728x576" +#~ msgstr "视频 PAL 728x576" + +#~ msgid "PAL video template for 728x576 resolution." +#~ msgstr "PAL 视频模板 728x576 分辨率。" + +#~ msgid "Web Banner 468x60" +#~ msgstr "网页横幅 468x60" + +#~ msgid "Empty 468x60 web banner template." +#~ msgstr "空白的 468x60 网页横幅模板。" + +#~ msgid "Web Banner 728x90" +#~ msgstr "网页横幅 728x90" + +#~ msgid "Empty 728x90 web banner template." +#~ msgstr "空白的 728x90 网页横幅模板。" + +#~ msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" +#~ msgstr "PS+LaTex:忽略 PS 中的文本并创建 LaTeX 文件" + +#~ msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" +#~ msgstr "EPS+LaTeX:忽略 EPS 中的文本并创建 LaTeX 文件" + +#~ msgid "import via Poppler" +#~ msgstr "使用 Poppler 导入" + +#~ msgid "Text handling:" +#~ msgstr "文本处理:" + +#~ msgid "Import text as text" +#~ msgstr "将文本导入为文本" + +#~ msgid "Select one path to clone." +#~ msgstr "选择一个要克隆的路径。" + +#~ msgid "Select one path to clone." +#~ msgstr "选择一个要克隆的路径。" + +#~ msgid "" +#~ "Select exactly 2 paths to perform difference, division, or path " +#~ "cut." +#~ msgstr "选择正好两个路径执行差集、分割或者剪切路径。" + +#~ msgid "Default _units:" +#~ msgstr "默认单位(_U):" + +#~ msgid "Changed document unit" +#~ msgstr "已更改文件单位" + +#, fuzzy +#~ msgid "" +#~ "The feTile filter primitive tiles a region with its input graphic" +#~ msgstr "" +#~ "滤镜基元 feImage 用另外一幅图像或文档的另外一部分来填充区域。" + +#, fuzzy +#~ msgctxt "Path handle tip" +#~ msgid "%s: drag to shape the segment (%s)" +#~ msgstr "%s:拖动塑造路径形状(更多:Shift、Ctrl、Alt)" + +#~ msgid "_Templates..." +#~ msgstr "模板(_T)..." + +#~ msgid "Miter _limit:" +#~ msgstr "斜面限制(_L):" + +#~ msgid "H" +#~ msgstr "色调" + +#~ msgid "S" +#~ msgstr "饱和" + +#~ msgid "L" +#~ msgstr "亮度" + +#~ msgid "Use automatic scaling to size A4" +#~ msgstr "使用自动缩放到 A4 大小" + +#~ msgid "Empty Page" +#~ msgstr "空白页面" + +#~ msgid "Tool offset (mm):" +#~ msgstr "工具偏移(毫米)" + +#~ msgid "Text Orientation: " +#~ msgstr "文本方向:" + +#~ msgctxt "measure extension" +#~ msgid "Fixed Angle" +#~ msgstr "固定角度" + +#~ msgctxt "Flow control" +#~ msgid "None" +#~ msgstr "无" + +#~ msgid "Arbitrary Angle" +#~ msgstr "任意角度" + +#~ msgid "Horizontal Point:" +#~ msgstr "水平点:" + +#~ msgid "Vertical Point:" +#~ msgstr "垂直点:" + +#~ msgid "Group collapsing" +#~ msgstr "折叠组" + +#~ msgid "XML indentation (pretty-printing):" +#~ msgstr "XML 缩进(美化显示):" + +#~ msgid "Ids" +#~ msgstr "Ids" + +#~ msgid "Remove unused ID names for elements" +#~ msgstr "为对象移除未使用的 ID 名称" + +#~ msgid "Preserve these ID names, comma-separated:" +#~ msgstr "保留如下使用逗号分隔的 ID 名称:" + +#~ msgid "Help (Options)" +#~ msgstr "帮助(选项)" + +#~ msgid "" +#~ "This extension optimizes the SVG file according to the following " +#~ "options:\n" +#~ " * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" +#~ " * Convert CSS attributes to XML attributes: convert styles from style " +#~ "tags and inline style=\"\" declarations into XML attributes.\n" +#~ " * Group collapsing: removes useless g elements, promoting their " +#~ "contents up one level. Requires \"Remove unused ID names for elements\" " +#~ "to be set.\n" +#~ " * Create groups for similar attributes: create g elements for runs of " +#~ "elements having at least one attribute in common (e.g. fill color, stroke " +#~ "opacity, ...).\n" +#~ " * Embed rasters: embed raster images as base64-encoded data URLs.\n" +#~ " * Keep editor data: don't remove Inkscape, Sodipodi or Adobe " +#~ "Illustrator elements and attributes.\n" +#~ " * Remove metadata: remove metadata tags along with all the " +#~ "information in them, which may include license metadata, alternate " +#~ "versions for non-SVG-enabled browsers, etc.\n" +#~ " * Remove comments: remove comment tags.\n" +#~ " * Work around renderer bugs: emits slightly larger SVG data, but " +#~ "works around a bug in librsvg's renderer, which is used in Eye of GNOME " +#~ "and other various applications.\n" +#~ " * Enable viewboxing: size image to 100%/100% and introduce a " +#~ "viewBox.\n" +#~ " * Number of significant digits for coords: all coordinates are output " +#~ "with that number of significant digits. For example, if 3 is specified, " +#~ "the coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is " +#~ "output as 472.\n" +#~ " * XML indentation (pretty-printing): either None for no indentation, " +#~ "Space to use one space per nesting level, or Tab to use one tab per " +#~ "nesting level." +#~ msgstr "" +#~ "此扩展功能可以根据下列选项优化 SVG 文件:\n" +#~ " * 缩短颜色名称:将全部颜色转换成 #RRGGBB 或 #RGB 格式。\n" +#~ " * 将 CSS 属性转换成 XML 属性:将样式从样式标签和进线样式=\"\" 宣告转换" +#~ "成 XML 属性。\n" +#~ " * 折叠群组:移除没用到的 g 组件,让这些内容升高一个层级。需要已设置“移" +#~ "除组件没用到的 ID 名称”。\n" +#~ " * 创建相似属性的群组:创建 g 组件以让运行的组件至少共有一种属性 (例" +#~ "如,填充、笔刷不透明度...)。\n" +#~ " * 内嵌位图:将位图内嵌为 base64 编码数据网址。\n" +#~ " * 保留软件数据:不移除 Inkscape、Sodipodi 或 Adobe Illustrator 组件和" +#~ "属性。\n" +#~ " * 移除中继数据:移除中继数据标签和里面的所有信息,这些信息可能包含授权" +#~ "中继数据、不支持 SVG 浏览器的备用方案等。\n" +#~ " * 移除注解:移除注解标签。\n" +#~ " * 避开图形渲染引擎程序错误:稍微放大 SVG 数据,可避开 librsvg 图形渲染" +#~ "引擎里的一个程序错误,该功能用在 GNOME 桌面的视觉效果和其他各种应用程" +#~ "序。\n" +#~ " * 启用查看框:图像尺寸变为 100%/100% 并引进查看框。\n" +#~ " * 坐标的有效位数:以此有效位数输出所有坐标。例如,若有效位数指定为 3," +#~ "那么坐标 3.5153 会输出为 3.51而坐标 471.55 输出为 472。\n" +#~ " * XML 缩进 (打印美观):可选择是否缩进,若要缩进可选择“空格”让每个嵌套" +#~ "层级使用一个空格字符缩进,或者“定位字符”让每个嵌套层级使用一个空格字符进行" +#~ "缩排。" + +#~ msgid "Help (Ids)" +#~ msgstr "帮助 (Ids)" + +#~ msgid "" +#~ "Ids specific options:\n" +#~ " * Remove unused ID names for elements: remove all unreferenced ID " +#~ "attributes.\n" +#~ " * Shorten IDs: reduce the length of all ID attributes, assigning the " +#~ "shortest to the most-referenced elements. For instance, " +#~ "#linearGradient5621, referenced 100 times, can become #a.\n" +#~ " * Preserve manually created ID names not ending with digits: usually, " +#~ "optimised SVG output removes these, but if they're needed for referencing " +#~ "(e.g. #middledot), you may use this option.\n" +#~ " * Preserve these ID names, comma-separated: you can use this in " +#~ "conjunction with the other preserve options if you wish to preserve some " +#~ "more specific ID names.\n" +#~ " * Preserve ID names starting with: usually, optimised SVG output " +#~ "removes all unused ID names, but if all of your preserved ID names start " +#~ "with the same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +#~ msgstr "" +#~ "标识专属选项:\n" +#~ " * 移除没用到的组件 ID 名称:移除所有未参考的 ID 属性。\n" +#~ " * 缩短标识:缩短全部 ID 属性的长度,指定最短长度到参考多数的组件。例" +#~ "如,#linearGradient5621,被参考 100 次,那么就变成 #a。\n" +#~ " * 保留手动创建的识别名称不编辑末端号码:正常情形下, 最佳化的 SVG 输出" +#~ "会移除这些信息,但如果需要参考 (例如 #middledot),您可以使用此选项。\n" +#~ " * 保留这些识别名称,用逗号分隔开:若您想保留更多指定的式别名称此选项可" +#~ "以和其他保留选项结合使用。\n" +#~ " * 保留某前缀开头的识别名称:正常情况下,最佳化的 SVG 输出会移除全部没" +#~ "用到的识别名称,但如果想要保留的识别名称都以相同前缀开头 (例如 #flag-mx、" +#~ "#flag-pt),可以使用此选项。" + +#~ msgid "Max. smooth handle angle" +#~ msgstr "最大平滑控制柄角度" -- cgit v1.2.3 From 401c2f70ce1ffcdf7a041c27df8c06e19f42e847 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Mon, 28 Mar 2016 20:49:42 -0400 Subject: Fix bugs with the colour selector self-signaling on change. Fixed bugs: - https://launchpad.net/bugs/1462907 - https://launchpad.net/bugs/1249618 (bzr r14747) --- src/ui/selected-color.cpp | 1 - src/ui/widget/color-wheel-selector.cpp | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ui/selected-color.cpp b/src/ui/selected-color.cpp index 8c37ee7e0..846d50a5b 100644 --- a/src/ui/selected-color.cpp +++ b/src/ui/selected-color.cpp @@ -139,7 +139,6 @@ void SelectedColor::setHeld(bool held) { if (released) { signal_released.emit(); - signal_changed.emit(); } _updating = false; } diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index ed3400bb5..cac812640 100644 --- a/src/ui/widget/color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -246,21 +246,23 @@ void ColorWheelSelector::_wheelChanged(GimpColorWheel *wheel, ColorWheelSelector guint32 end = color.toRGBA32(0xff); wheelSelector->_slider->setColors(start, mid, end); - wheelSelector->_color.preserveICC(); + wheelSelector->_updating = true; wheelSelector->_color.setHeld(gimp_color_wheel_is_adjusting(wheel)); wheelSelector->_color.setColor(color); + wheelSelector->_updating = false; } void ColorWheelSelector::_updateDisplay() { + if(_updating) { return; } + #ifdef DUMP_CHANGE_INFO g_message("ColorWheelSelector::_colorChanged( this=%p, %f, %f, %f, %f)", this, _color.color().v.c[0], _color.color().v.c[1], _color.color().v.c[2], alpha); #endif - bool oldval = _updating; _updating = true; { float hsv[3] = { 0, 0, 0 }; @@ -276,7 +278,7 @@ void ColorWheelSelector::_updateDisplay() ColorScales::setScaled(_alpha_adjustment->gobj(), _color.alpha()); - _updating = oldval; + _updating = false; } -- cgit v1.2.3 From b2587a888338617bc8482bfc969072b979911719 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 29 Mar 2016 15:54:04 -0400 Subject: Protect the color wheel from hue loss at a deeper level. (bzr r14748) --- src/ui/widget/color-wheel-selector.cpp | 2 +- src/ui/widget/gimpcolorwheel.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp index cac812640..22c616325 100644 --- a/src/ui/widget/color-wheel-selector.cpp +++ b/src/ui/widget/color-wheel-selector.cpp @@ -245,10 +245,10 @@ void ColorWheelSelector::_wheelChanged(GimpColorWheel *wheel, ColorWheelSelector guint32 mid = color.toRGBA32(0x7f); guint32 end = color.toRGBA32(0xff); + wheelSelector->_updating = true; wheelSelector->_slider->setColors(start, mid, end); wheelSelector->_color.preserveICC(); - wheelSelector->_updating = true; wheelSelector->_color.setHeld(gimp_color_wheel_is_adjusting(wheel)); wheelSelector->_color.setColor(color); wheelSelector->_updating = false; diff --git a/src/ui/widget/gimpcolorwheel.c b/src/ui/widget/gimpcolorwheel.c index f632331d8..c857cfa8a 100644 --- a/src/ui/widget/gimpcolorwheel.c +++ b/src/ui/widget/gimpcolorwheel.c @@ -1412,6 +1412,10 @@ gimp_color_wheel_set_color (GimpColorWheel *wheel, priv = wheel->priv; + if(h == 0.0 && s == 0.0) { + h = priv->h; + } + priv->h = h; priv->s = s; priv->v = v; -- cgit v1.2.3 From 8b1a03d77776ead6fe5eeaf54e95ac01403b2af8 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 30 Mar 2016 02:04:39 +0200 Subject: buildtool: Comment a verbose debug message (that usually hides actual compiler warnings) (bzr r14749) --- buildtool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtool.cpp b/buildtool.cpp index 0169f82ae..cb70a25c2 100644 --- a/buildtool.cpp +++ b/buildtool.cpp @@ -8025,7 +8025,7 @@ public: String outbuf, errbuf; - std::cout << "DEBUG command = " << cmd << std::endl; + // std::cout << "DEBUG command = " << cmd << std::endl; if (!executeCommand(cmd.c_str(), "", outbuf, errbuf)) { error("LINK problem: %s", errbuf.c_str()); -- cgit v1.2.3 From b7fbe1182eabcd13d53e1dbcbfcbec93e37f01ee Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 30 Mar 2016 02:06:26 +0200 Subject: Fix bug #1548953 (Crash when SVG contains certain special chars) Fixed bugs: - https://launchpad.net/bugs/1548953 (bzr r14750) --- src/display/drawing-text.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp index a3ca7173a..f0d83abfd 100644 --- a/src/display/drawing-text.cpp +++ b/src/display/drawing-text.cpp @@ -100,14 +100,16 @@ unsigned DrawingGlyphs::_updateItem(Geom::IntRect const &/*area*/, UpdateContext above and below the max/min y positions of the letters to place the text decorations.*/ Geom::Rect b; - if(_drawable){ - Geom::OptRect tiltb = bounds_exact(*_font->PathVector(_glyph)); - Geom::Rect bigbox(Geom::Point(tiltb->left(),-_dsc*scale_bigbox*1.1),Geom::Point(tiltb->right(),_asc*scale_bigbox*1.1)); - b = bigbox * ctx.ctm; + if (_drawable) { + Geom::OptRect tiltb = bounds_exact(*_font->PathVector(_glyph)); + if (tiltb) { + Geom::Rect bigbox(Geom::Point(tiltb->left(),-_dsc*scale_bigbox*1.1),Geom::Point(tiltb->right(),_asc*scale_bigbox*1.1)); + b = bigbox * ctx.ctm; + } } - else { // Fallback, spaces mostly - Geom::Rect bigbox(Geom::Point(0.0, -_dsc*scale_bigbox*1.1),Geom::Point(_width*scale_bigbox, _asc*scale_bigbox*1.1)); - b = bigbox * ctx.ctm; + if (b.hasZeroArea()) { // Fallback, spaces mostly + Geom::Rect bigbox(Geom::Point(0.0, -_dsc*scale_bigbox*1.1),Geom::Point(_width*scale_bigbox, _asc*scale_bigbox*1.1)); + b = bigbox * ctx.ctm; } /* -- cgit v1.2.3 From 19ca801d0d7ac5f1b8e8cb3ef0b872c2cd80e01d Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Wed, 30 Mar 2016 02:08:48 +0200 Subject: Fix for bug #1395435 (Inkscape crashes on load CDR select sheet) and bug #1441437 (crashes when load multi page visio and select page 2 or more) Also clean up code to create dialog a bit and make dialog resizable. Fixed bugs: - https://launchpad.net/bugs/1395435 - https://launchpad.net/bugs/1441437 (bzr r14751) --- src/extension/internal/cdr-input.cpp | 171 ++++++++++++++++---------------- src/extension/internal/vsd-input.cpp | 183 +++++++++++++++++------------------ 2 files changed, 171 insertions(+), 183 deletions(-) diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index f4789a08f..a26af2078 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -41,28 +41,18 @@ #endif #include -#include -#include -#include -#include +#include #include "extension/system.h" #include "extension/input.h" -#include "document.h" +#include "document.h" #include "document-private.h" -#include "document-undo.h" #include "inkscape.h" #include "ui/dialog-events.h" -#include -#include "ui/widget/spinbutton.h" -#include "ui/widget/frame.h" #include -#include - -#include "svg-view.h" #include "svg-view-widget.h" #include "util/units.h" @@ -82,108 +72,99 @@ public: void getImportSettings(Inkscape::XML::Node *prefs); private: - void _setPreviewPage(unsigned page); + void _setPreviewPage(); // Signal handlers -#if !WITH_GTKMM_3_0 - bool _onExposePreview(GdkEventExpose *event); -#endif - void _onPageNumberChanged(); + void _onSpinButtonPress(GdkEventButton* button_event); + void _onSpinButtonRelease(GdkEventButton* button_event); + class Gtk::VBox * vbox1; + class Gtk::Widget * _previewArea; class Gtk::Button * cancelbutton; class Gtk::Button * okbutton; class Gtk::Label * _labelSelect; - class Inkscape::UI::Widget::SpinButton * _pageNumberSpin; class Gtk::Label * _labelTotalPages; - class Gtk::VBox * vbox1; - class Gtk::VBox * vbox2; - class Gtk::Widget * _previewArea; + class Gtk::SpinButton * _pageNumberSpin; - const std::vector &_vec; // Document to be imported - unsigned _current_page; // Current selected page - int _preview_width, _preview_height; // Size of the preview area + const std::vector &_vec; // Document to be imported + unsigned _current_page; // Current selected page + bool _spinning; // whether SpinButton is pressed (i.e. we're "spinning") }; CdrImportDialog::CdrImportDialog(const std::vector &vec) - : _vec(vec), _current_page(1) + : _vec(vec), _current_page(1), _spinning(false) { int num_pages = _vec.size(); if ( num_pages <= 1 ) return; - cancelbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-cancel"))); - okbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-ok"))); - _labelSelect = Gtk::manage(new class Gtk::Label(_("Select page:"))); - // Page number + // Dialog settings + this->set_title(_("Page Selector")); + this->set_modal(true); + sp_transientize(GTK_WIDGET(this->gobj())); //Make transient + this->property_window_position().set_value(Gtk::WIN_POS_NONE); + this->set_resizable(true); + this->property_destroy_with_parent().set_value(false); + + // Preview area + _previewArea = Gtk::manage(new class Gtk::VBox()); + vbox1 = Gtk::manage(new class Gtk::VBox()); + vbox1->pack_start(*_previewArea, Gtk::PACK_EXPAND_WIDGET, 0); #if WITH_GTKMM_3_0 - Glib::RefPtr _pageNumberSpin_adj = Gtk::Adjustment::create(1, 1, _vec.size(), 1, 10, 0); - _pageNumberSpin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(_pageNumberSpin_adj, 1, 1)); + this->get_content_area()->pack_start(*vbox1); #else - Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage( - new class Gtk::Adjustment(1, 1, _vec.size(), 1, 10, 0)); - _pageNumberSpin = Gtk::manage(new class Inkscape::UI::Widget::SpinButton(*_pageNumberSpin_adj, 1, 1)); + this->get_vbox()->pack_start(*vbox1); #endif - _labelTotalPages = Gtk::manage(new class Gtk::Label()); - gchar *label_text = g_strdup_printf(_("out of %i"), num_pages); - _labelTotalPages->set_label(label_text); - g_free(label_text); - vbox1 = Gtk::manage(new class Gtk::VBox(false, 4)); - SPDocument *doc = SPDocument::createNewDocFromMem(_vec[0].cstr(), strlen(_vec[0].cstr()), 0); - _previewArea = Glib::wrap(sp_svg_view_widget_new(doc)); - - vbox2 = Gtk::manage(new class Gtk::VBox(false, 4)); - cancelbutton->set_can_focus(); - cancelbutton->set_can_default(); - cancelbutton->set_relief(Gtk::RELIEF_NORMAL); - okbutton->set_can_focus(); - okbutton->set_can_default(); - okbutton->set_relief(Gtk::RELIEF_NORMAL); - this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END); + // CONTROLS + + // Buttons + cancelbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-cancel"))); + okbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-ok"))); + + // Labels + _labelSelect = Gtk::manage(new class Gtk::Label(_("Select page:"))); + _labelTotalPages = Gtk::manage(new class Gtk::Label()); _labelSelect->set_line_wrap(false); _labelSelect->set_use_markup(false); _labelSelect->set_selectable(false); - _pageNumberSpin->set_can_focus(); - _pageNumberSpin->set_update_policy(Gtk::UPDATE_ALWAYS); - _pageNumberSpin->set_numeric(true); - _pageNumberSpin->set_digits(0); - _pageNumberSpin->set_wrap(false); _labelTotalPages->set_line_wrap(false); _labelTotalPages->set_use_markup(false); _labelTotalPages->set_selectable(false); - vbox2->pack_start(*_previewArea, Gtk::PACK_SHRINK, 0); + gchar *label_text = g_strdup_printf(_("out of %i"), num_pages); + _labelTotalPages->set_label(label_text); + g_free(label_text); + + // Adjustment + spinner #if WITH_GTKMM_3_0 - this->get_content_area()->set_homogeneous(false); - this->get_content_area()->set_spacing(0); - this->get_content_area()->pack_start(*vbox2); + Glib::RefPtr _pageNumberSpin_adj = Gtk::Adjustment::create(1, 1, _vec.size(), 1, 10, 0); + _pageNumberSpin = Gtk::manage(new Gtk::SpinButton(_pageNumberSpin_adj, 1, 0)); #else - this->get_vbox()->set_homogeneous(false); - this->get_vbox()->set_spacing(0); - this->get_vbox()->pack_start(*vbox2); + Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage(new class Gtk::Adjustment(1, 1, _vec.size(), 1, 10, 0)); + _pageNumberSpin = Gtk::manage(new Gtk::SpinButton(*_pageNumberSpin_adj, 1, 0)); #endif - this->set_title(_("Page Selector")); - this->set_modal(true); - sp_transientize(GTK_WIDGET(this->gobj())); //Make transient - this->property_window_position().set_value(Gtk::WIN_POS_NONE); - this->set_resizable(true); - this->property_destroy_with_parent().set_value(false); + _pageNumberSpin->set_can_focus(); + _pageNumberSpin->set_update_policy(Gtk::UPDATE_ALWAYS); + _pageNumberSpin->set_numeric(true); + _pageNumberSpin->set_wrap(false); + + this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END); this->get_action_area()->add(*_labelSelect); - this->add_action_widget(*_pageNumberSpin, -7); + this->add_action_widget(*_pageNumberSpin, Gtk::RESPONSE_ACCEPT); this->get_action_area()->add(*_labelTotalPages); - this->add_action_widget(*cancelbutton, -6); - this->add_action_widget(*okbutton, -5); - cancelbutton->show(); - okbutton->show(); - _labelSelect->show(); - _pageNumberSpin->show(); - _labelTotalPages->show(); - vbox1->show(); - _previewArea->show(); - vbox2->show(); + this->add_action_widget(*cancelbutton, Gtk::RESPONSE_CANCEL); + this->add_action_widget(*okbutton, Gtk::RESPONSE_OK); + + // Show all widgets in dialog + this->show_all(); // Connect signals - _pageNumberSpin_adj->signal_value_changed().connect(sigc::mem_fun(*this, &CdrImportDialog::_onPageNumberChanged)); + _pageNumberSpin->signal_value_changed().connect(sigc::mem_fun(*this, &CdrImportDialog::_onPageNumberChanged)); + _pageNumberSpin->signal_button_press_event().connect_notify(sigc::mem_fun(*this, &CdrImportDialog::_onSpinButtonPress)); + _pageNumberSpin->signal_button_release_event().connect_notify(sigc::mem_fun(*this, &CdrImportDialog::_onSpinButtonRelease)); + + _setPreviewPage(); } CdrImportDialog::~CdrImportDialog() {} @@ -193,7 +174,7 @@ bool CdrImportDialog::showDialog() show(); gint b = run(); hide(); - if ( b == Gtk::RESPONSE_OK ) { + if (b == Gtk::RESPONSE_OK || b == Gtk::RESPONSE_ACCEPT) { return TRUE; } else { return FALSE; @@ -209,22 +190,34 @@ void CdrImportDialog::_onPageNumberChanged() { unsigned page = static_cast(_pageNumberSpin->get_value_as_int()); _current_page = CLAMP(page, 1U, _vec.size()); - _setPreviewPage(_current_page); + _setPreviewPage(); +} + +void CdrImportDialog::_onSpinButtonPress(GdkEventButton* /*button_event*/) +{ + _spinning = true; +} + +void CdrImportDialog::_onSpinButtonRelease(GdkEventButton* /*button_event*/) +{ + _spinning = false; + _setPreviewPage(); } /** * \brief Renders the given page's thumbnail */ -void CdrImportDialog::_setPreviewPage(unsigned page) +void CdrImportDialog::_setPreviewPage() { - SPDocument *doc = SPDocument::createNewDocFromMem(_vec[page-1].cstr(), strlen(_vec[page-1].cstr()), 0); + if (_spinning) { + return; + } + + SPDocument *doc = SPDocument::createNewDocFromMem(_vec[_current_page-1].cstr(), strlen(_vec[_current_page-1].cstr()), 0); Gtk::Widget * tmpPreviewArea = Glib::wrap(sp_svg_view_widget_new(doc)); std::swap(_previewArea, tmpPreviewArea); - if (tmpPreviewArea) { - _previewArea->set_size_request( tmpPreviewArea->get_width(), tmpPreviewArea->get_height() ); - delete tmpPreviewArea; - } - vbox2->pack_start(*_previewArea, Gtk::PACK_SHRINK, 0); + delete tmpPreviewArea; + vbox1->pack_start(*_previewArea, Gtk::PACK_EXPAND_WIDGET, 0); _previewArea->show_now(); } diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 7fd0d363b..a3d4aad37 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -40,33 +40,24 @@ typedef libvisio::VSDStringVector RVNGStringVector; #endif - #include -#include -#include -#include -#include +#include #include "extension/system.h" #include "extension/input.h" -#include "document.h" +#include "document.h" #include "document-private.h" -#include "document-undo.h" #include "inkscape.h" -#include "util/units.h" #include "ui/dialog-events.h" -#include -#include "ui/widget/spinbutton.h" -#include "ui/widget/frame.h" #include -#include - -#include "svg-view.h" #include "svg-view-widget.h" + +#include "util/units.h" + namespace Inkscape { namespace Extension { namespace Internal { @@ -82,108 +73,101 @@ public: void getImportSettings(Inkscape::XML::Node *prefs); private: - void _setPreviewPage(unsigned page); + void _setPreviewPage(); // Signal handlers -#if !WITH_GTKMM_3_0 - bool _onExposePreview(GdkEventExpose *event); -#endif - void _onPageNumberChanged(); + void _onSpinButtonPress(GdkEventButton* button_event); + void _onSpinButtonRelease(GdkEventButton* button_event); + class Gtk::VBox * vbox1; + class Gtk::Widget * _previewArea; class Gtk::Button * cancelbutton; class Gtk::Button * okbutton; class Gtk::Label * _labelSelect; - class Inkscape::UI::Widget::SpinButton * _pageNumberSpin; class Gtk::Label * _labelTotalPages; - class Gtk::VBox * vbox1; - class Gtk::VBox * vbox2; - class Gtk::Widget * _previewArea; + class Gtk::SpinButton * _pageNumberSpin; - const std::vector &_vec; // Document to be imported - unsigned _current_page; // Current selected page - int _preview_width, _preview_height; // Size of the preview area + const std::vector &_vec; // Document to be imported + unsigned _current_page; // Current selected page + bool _spinning; // whether SpinButton is pressed (i.e. we're "spinning") }; VsdImportDialog::VsdImportDialog(const std::vector &vec) - : _vec(vec), _current_page(1) + : _vec(vec), _current_page(1), _spinning(false) { int num_pages = _vec.size(); if ( num_pages <= 1 ) return; - cancelbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-cancel"))); - okbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-ok"))); - _labelSelect = Gtk::manage(new class Gtk::Label(_("Select page:"))); - // Page number + + // Dialog settings + this->set_title(_("Page Selector")); + this->set_modal(true); + sp_transientize(GTK_WIDGET(this->gobj())); //Make transient + this->property_window_position().set_value(Gtk::WIN_POS_NONE); + this->set_resizable(true); + this->property_destroy_with_parent().set_value(false); + + // Preview area + _previewArea = Gtk::manage(new class Gtk::VBox()); + vbox1 = Gtk::manage(new class Gtk::VBox()); + vbox1->pack_start(*_previewArea, Gtk::PACK_EXPAND_WIDGET, 0); #if WITH_GTKMM_3_0 - Glib::RefPtr _pageNumberSpin_adj = Gtk::Adjustment::create(1, 1, _vec.size(), 1, 10, 0); - _pageNumberSpin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(_pageNumberSpin_adj, 1, 1)); + this->get_content_area()->pack_start(*vbox1); #else - Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage( - new class Gtk::Adjustment(1, 1, _vec.size(), 1, 10, 0)); - _pageNumberSpin = Gtk::manage(new class Inkscape::UI::Widget::SpinButton(*_pageNumberSpin_adj, 1, 1)); + this->get_vbox()->pack_start(*vbox1); #endif - _labelTotalPages = Gtk::manage(new class Gtk::Label()); - gchar *label_text = g_strdup_printf(_("out of %i"), num_pages); - _labelTotalPages->set_label(label_text); - g_free(label_text); - vbox1 = Gtk::manage(new class Gtk::VBox(false, 4)); - SPDocument *doc = SPDocument::createNewDocFromMem(_vec[0].cstr(), strlen(_vec[0].cstr()), 0); - _previewArea = Glib::wrap(sp_svg_view_widget_new(doc)); - - vbox2 = Gtk::manage(new class Gtk::VBox(false, 4)); - cancelbutton->set_can_focus(); - cancelbutton->set_can_default(); - cancelbutton->set_relief(Gtk::RELIEF_NORMAL); - okbutton->set_can_focus(); - okbutton->set_can_default(); - okbutton->set_relief(Gtk::RELIEF_NORMAL); - this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END); + + // CONTROLS + + // Buttons + cancelbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-cancel"))); + okbutton = Gtk::manage(new class Gtk::Button(Gtk::StockID("gtk-ok"))); + + // Labels + _labelSelect = Gtk::manage(new class Gtk::Label(_("Select page:"))); + _labelTotalPages = Gtk::manage(new class Gtk::Label()); _labelSelect->set_line_wrap(false); _labelSelect->set_use_markup(false); _labelSelect->set_selectable(false); - _pageNumberSpin->set_can_focus(); - _pageNumberSpin->set_update_policy(Gtk::UPDATE_ALWAYS); - _pageNumberSpin->set_numeric(true); - _pageNumberSpin->set_digits(0); - _pageNumberSpin->set_wrap(false); _labelTotalPages->set_line_wrap(false); _labelTotalPages->set_use_markup(false); _labelTotalPages->set_selectable(false); - vbox2->pack_start(*_previewArea, Gtk::PACK_SHRINK, 0); + gchar *label_text = g_strdup_printf(_("out of %i"), num_pages); + _labelTotalPages->set_label(label_text); + g_free(label_text); + + // Adjustment + spinner #if WITH_GTKMM_3_0 - this->get_content_area()->set_homogeneous(false); - this->get_content_area()->set_spacing(0); - this->get_content_area()->pack_start(*vbox2); + Glib::RefPtr _pageNumberSpin_adj = Gtk::Adjustment::create(1, 1, _vec.size(), 1, 10, 0); + _pageNumberSpin = Gtk::manage(new Gtk::SpinButton(_pageNumberSpin_adj, 1, 0)); #else - this->get_vbox()->set_homogeneous(false); - this->get_vbox()->set_spacing(0); - this->get_vbox()->pack_start(*vbox2); + Gtk::Adjustment *_pageNumberSpin_adj = Gtk::manage(new class Gtk::Adjustment(1, 1, _vec.size(), 1, 10, 0)); + _pageNumberSpin = Gtk::manage(new Gtk::SpinButton(*_pageNumberSpin_adj, 1, 0)); #endif - this->set_title(_("Page Selector")); - this->set_modal(true); - sp_transientize(GTK_WIDGET(this->gobj())); //Make transient - this->property_window_position().set_value(Gtk::WIN_POS_NONE); - this->set_resizable(true); - this->property_destroy_with_parent().set_value(false); + _pageNumberSpin->set_can_focus(); + _pageNumberSpin->set_update_policy(Gtk::UPDATE_ALWAYS); + _pageNumberSpin->set_numeric(true); + _pageNumberSpin->set_wrap(false); + + this->get_action_area()->property_layout_style().set_value(Gtk::BUTTONBOX_END); this->get_action_area()->add(*_labelSelect); - this->add_action_widget(*_pageNumberSpin, -7); + this->add_action_widget(*_pageNumberSpin, Gtk::RESPONSE_ACCEPT); this->get_action_area()->add(*_labelTotalPages); - this->add_action_widget(*cancelbutton, -6); - this->add_action_widget(*okbutton, -5); - cancelbutton->show(); - okbutton->show(); - _labelSelect->show(); - _pageNumberSpin->show(); - _labelTotalPages->show(); - vbox1->show(); - _previewArea->show(); - vbox2->show(); + this->add_action_widget(*cancelbutton, Gtk::RESPONSE_CANCEL); + this->add_action_widget(*okbutton, Gtk::RESPONSE_OK); + + // Show all widgets in dialog + this->show_all(); // Connect signals - _pageNumberSpin_adj->signal_value_changed().connect(sigc::mem_fun(*this, &VsdImportDialog::_onPageNumberChanged)); + _pageNumberSpin->signal_value_changed().connect(sigc::mem_fun(*this, &VsdImportDialog::_onPageNumberChanged)); + _pageNumberSpin->signal_button_press_event().connect_notify(sigc::mem_fun(*this, &VsdImportDialog::_onSpinButtonPress)); + _pageNumberSpin->signal_button_release_event().connect_notify(sigc::mem_fun(*this, &VsdImportDialog::_onSpinButtonRelease)); + + _setPreviewPage(); } VsdImportDialog::~VsdImportDialog() {} @@ -193,7 +177,7 @@ bool VsdImportDialog::showDialog() show(); gint b = run(); hide(); - if ( b == Gtk::RESPONSE_OK ) { + if (b == Gtk::RESPONSE_OK || b == Gtk::RESPONSE_ACCEPT) { return TRUE; } else { return FALSE; @@ -209,22 +193,34 @@ void VsdImportDialog::_onPageNumberChanged() { unsigned page = static_cast(_pageNumberSpin->get_value_as_int()); _current_page = CLAMP(page, 1U, _vec.size()); - _setPreviewPage(_current_page); + _setPreviewPage(); +} + +void VsdImportDialog::_onSpinButtonPress(GdkEventButton* /*button_event*/) +{ + _spinning = true; +} + +void VsdImportDialog::_onSpinButtonRelease(GdkEventButton* /*button_event*/) +{ + _spinning = false; + _setPreviewPage(); } /** * \brief Renders the given page's thumbnail */ -void VsdImportDialog::_setPreviewPage(unsigned page) +void VsdImportDialog::_setPreviewPage() { - SPDocument *doc = SPDocument::createNewDocFromMem(_vec[page-1].cstr(), strlen(_vec[page-1].cstr()), 0); + if (_spinning) { + return; + } + + SPDocument *doc = SPDocument::createNewDocFromMem(_vec[_current_page-1].cstr(), strlen(_vec[_current_page-1].cstr()), 0); Gtk::Widget * tmpPreviewArea = Glib::wrap(sp_svg_view_widget_new(doc)); std::swap(_previewArea, tmpPreviewArea); - if (tmpPreviewArea) { - _previewArea->set_size_request( tmpPreviewArea->get_width(), tmpPreviewArea->get_height() ); - delete tmpPreviewArea; - } - vbox2->pack_start(*_previewArea, Gtk::PACK_SHRINK, 0); + delete tmpPreviewArea; + vbox1->pack_start(*_previewArea, Gtk::PACK_EXPAND_WIDGET, 0); _previewArea->show_now(); } @@ -282,12 +278,11 @@ SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u } SPDocument * doc = SPDocument::createNewDocFromMem(tmpSVGOutput[page_num-1].cstr(), strlen(tmpSVGOutput[page_num-1].cstr()), TRUE); - + // Set viewBox if it doesn't exist - if (!doc->getRoot()->viewBox_set) { + if (doc && !doc->getRoot()->viewBox_set) { doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc->getDisplayUnit()), doc->getHeight().value(doc->getDisplayUnit()))); } - return doc; } -- cgit v1.2.3 From a18efaedfcc01ec5bd1b9c60ca55b8be4445c5cb Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 30 Mar 2016 19:26:19 +0200 Subject: Partial fix for bug 156221 ('line-height' with non-pixel scaled drawing). (bzr r14752) --- src/desktop-style.cpp | 14 ++++++++++---- src/sp-text.cpp | 7 +++++++ src/widgets/text-toolbar.cpp | 10 ++++++---- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 5f6441aa7..7f9b46c7d 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1073,7 +1073,12 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r texts ++; SPItem *item = dynamic_cast(obj); g_assert(item != NULL); - double dummy = style->font_size.computed * Geom::Affine(item->i2dt_affine()).descrim(); + + // Quick way of getting document scale. Should be same as: + // item->document->getDocumentScale().Affine().descrim() + double doc_scale = Geom::Affine(item->i2dt_affine()).descrim(); + + double dummy = style->font_size.computed * doc_scale; if (!IS_NAN(dummy)) { size += dummy; /// \todo FIXME: we assume non-% units here } else { @@ -1085,7 +1090,7 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r letterspacing_normal = true; } } else { - letterspacing += style->letter_spacing.computed * Geom::Affine(item->i2dt_affine()).descrim(); /// \todo FIXME: we assume non-% units here + letterspacing += style->letter_spacing.computed * doc_scale;; /// \todo FIXME: we assume non-% units here letterspacing_normal = false; } @@ -1094,7 +1099,7 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r wordspacing_normal = true; } } else { - wordspacing += style->word_spacing.computed * Geom::Affine(item->i2dt_affine()).descrim(); /// \todo FIXME: we assume non-% units here + wordspacing += style->word_spacing.computed * doc_scale; /// \todo FIXME: we assume non-% units here wordspacing_normal = false; } @@ -1119,14 +1124,15 @@ objects_query_fontnumbers (const std::vector &objects, SPStyle *style_r lineheight_unit_current = style->line_height.unit; lineheight_unit_proportional = true; lineheight_normal = false; + lineheight += lineheight_current; } else { // Always 'px' internally lineheight_current = style->line_height.computed; lineheight_unit_current = style->line_height.unit; lineheight_unit_absolute = true; lineheight_normal = false; + lineheight += lineheight_current * doc_scale; } - lineheight += lineheight_current; if ((size_prev != 0 && style->font_size.computed != size_prev) || (letterspacing_prev != 0 && style->letter_spacing.computed != letterspacing_prev) || diff --git a/src/sp-text.cpp b/src/sp-text.cpp index da92ad8d4..6ae1c4fba 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -645,6 +645,13 @@ void SPText::_adjustFontsizeRecursive(SPItem *item, double ex, bool is_root) style->font_size.computed *= ex; style->letter_spacing.computed *= ex; style->word_spacing.computed *= ex; + if (style->line_height.unit != SP_CSS_UNIT_NONE && + style->line_height.unit != SP_CSS_UNIT_PERCENT && + style->line_height.unit != SP_CSS_UNIT_EM && + style->line_height.unit != SP_CSS_UNIT_EX) { + // No unit on 'line-height' property has special behavior. + style->line_height.computed *= ex; + } item->updateRepr(); } diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 8df80d2b6..e71c911bd 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -638,7 +638,8 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) int count = 0; for(std::vector::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){ if (SP_IS_TEXT (*i)) { - font_size += (*i)->style->font_size.computed; + double doc_scale = Geom::Affine((*i)->i2dt_affine()).descrim(); + font_size += (*i)->style->font_size.computed * doc_scale; ++count; } } @@ -662,7 +663,8 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) int count = 0; for(std::vector::const_iterator i=itemlist.begin();i!=itemlist.end(); ++i){ if (SP_IS_TEXT (*i)) { - font_size += (*i)->style->font_size.computed; + double doc_scale = Geom::Affine((*i)->i2dt_affine()).descrim(); + font_size += (*i)->style->font_size.computed * doc_scale; ++count; } } @@ -671,12 +673,13 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) } else { font_size = 20; } - line_height *= font_size; + if (old_unit == SP_CSS_UNIT_PERCENT) { line_height /= 100.0; } else if (old_unit == SP_CSS_UNIT_EX) { line_height /= 2.0; } + line_height *= font_size; line_height = Quantity::convert(line_height, "px", unit); } else { // Convert between different absolute units (only used in GUI) @@ -1252,7 +1255,6 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ double height; int line_height_unit = -1; if (query.line_height.normal) { - std::cout << " normal" << std::endl; height = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; line_height_unit = SP_CSS_UNIT_NONE; } else { -- cgit v1.2.3 From fd1988584d74008516463f33fc98e819ab838f9b Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 30 Mar 2016 20:58:46 +0200 Subject: Finish fixing bug 156221 ('line-height' with non-px scaling). (bzr r14753) --- src/style.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/style.cpp b/src/style.cpp index 1f98a50a3..c24818f2a 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1900,8 +1900,9 @@ sp_css_attr_scale_property_single(SPCSSAttr *css, gchar const *property, if (w == units) {// nothing converted, non-numeric value return; } - if (only_with_units && (units == NULL || *units == '\0' || *units == '%')) { + if (only_with_units && (units == NULL || *units == '\0' || *units == '%' || *units == 'e')) { // only_with_units, but no units found, so do nothing. + // 'e' matches 'em' or 'ex' return; } Inkscape::CSSOStringStream os; -- cgit v1.2.3 From 043093faaab06edae6c5947df94a0bf3d66cb2a8 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 30 Mar 2016 18:53:11 -0700 Subject: cmake: Add informational summary (bzr r14754) --- CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index de091a495..eea7cf3ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -211,3 +211,44 @@ if(WITH_GTEST) enable_testing() add_subdirectory(test EXCLUDE_FROM_ALL) endif() + +# ---------------------------------------------------------------------- +# Information Summary +# ---------------------------------------------------------------------- +message("------------------------------------------------------------------------") +message("Configuration Summary") +message("------------------------------------------------------------------------") +# project info +message("PROJECT_NAME: ${PROJECT_NAME}") +message("INKSCAPE_VERSION: ${INKSCAPE_VERSION}") +message("INKSCAPE_DIST_PREFIX: ${INKSCAPE_DIST_PREFIX}") +message("") + +# cmake info +message("CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") +message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") +message("CMAKE_SYSTEM_VERSION: ${CMAKE_SYSTEM_VERSION}") +message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") +message("CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}") +message("CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") +message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +message("") + +# dependency info +message("ENABLE_LCMS: ${ENABLE_LCMS}") +message("ENABLE_POPPLER: ${ENABLE_POPPLER}") +message("ENABLE_POPPLER_CAIRO: ${ENABLE_POPPLER_CAIRO}") +message("GMOCK_PRESENT: ${GMOCK_PRESENT}") +message("WITH_DBUS: ${WITH_DBUS}") +message("WITH_GNOME_VFS: ${WITH_GNOME_VFS}") +message("WITH_GTEST: ${WITH_GTEST}") +message("WITH_GTK3_EXPERIMENTAL: ${WITH_GTK3_EXPERIMENTAL}") +message("WITH_GTKSPELL: ${WITH_GTKSPELL}") +message("WITH_IMAGE_MAGICK: ${WITH_IMAGE_MAGICK}") +message("WITH_LIBCDR: ${WITH_LIBCDR}") +message("WITH_LIBVISIO: ${WITH_LIBVISIO}") +message("WITH_LIBWPG: ${WITH_LIBWPG}") +message("WITH_NLS: ${WITH_NLS}") +message("WITH_OPENMP: ${WITH_OPENMP}") +message("WITH_PROFILING: ${WITH_PROFILING}") +message("------------------------------------------------------------------------") -- cgit v1.2.3 From cdf4f38c84060a4a35a7881c8f464b0b3386730d Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 30 Mar 2016 18:57:15 -0700 Subject: bzrignore: inkview.pod (bzr r14755) --- .bzrignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.bzrignore b/.bzrignore index 6f725aa26..a8dddb7e8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -48,6 +48,7 @@ ./man/inkscape.zh_TW.1 ./man/inkscape.zh_TW.pod ./man/inkscape.zh_TW.tmp +./man/inkview.pod ./inkscape.appdata.xml ./inkscape.spec ./inkview.1 -- cgit v1.2.3 From addacd4d38a479c1dbb84197ab2c0295b49bad47 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 1 Apr 2016 15:24:08 +0200 Subject: Bug #1553497 Voronoi Extension: Delaunay triangulate can get fill color from sources. Fixed bugs: - https://launchpad.net/bugs/1553497 (bzr r14756) --- share/extensions/voronoi.py | 2 ++ share/extensions/voronoi2svg.inx | 6 ++++ share/extensions/voronoi2svg.py | 61 ++++++++++++++++++++++++++++++++-------- 3 files changed, 58 insertions(+), 11 deletions(-) mode change 100755 => 100644 share/extensions/voronoi.py mode change 100755 => 100644 share/extensions/voronoi2svg.py diff --git a/share/extensions/voronoi.py b/share/extensions/voronoi.py old mode 100755 new mode 100644 index 8661bc9bf..ac2c13f8f --- a/share/extensions/voronoi.py +++ b/share/extensions/voronoi.py @@ -395,6 +395,8 @@ class Edge(object): else: # set formula of line, with y fixed to 1 newedge.b = 1.0 + if dy <= 0: + dy = 0.01 newedge.a = dx/dy newedge.c /= dy diff --git a/share/extensions/voronoi2svg.inx b/share/extensions/voronoi2svg.inx index d86ebd819..c07dbb8e5 100644 --- a/share/extensions/voronoi2svg.inx +++ b/share/extensions/voronoi2svg.inx @@ -18,6 +18,12 @@ <_item value="Automatic from seeds">Automatic from selected objects + <_param name="Delaunay Options" type="description" appearance="header">Options for Delaunay Triangulation + + <_option value="delaunay-no-fill">Default (Stroke black and no fill) + <_option value="delaunay-fill">Triangles with item color + <_option value="delaunay-fill-random">Triangles with item color (random on apply) + <_param name="help_text" type="description">Select a set of objects. Their centroids will be used as the sites of the Voronoi diagram. Text objects are not handled. diff --git a/share/extensions/voronoi2svg.py b/share/extensions/voronoi2svg.py old mode 100755 new mode 100644 index c7033b23b..d4740b7f5 --- a/share/extensions/voronoi2svg.py +++ b/share/extensions/voronoi2svg.py @@ -24,7 +24,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ # standard library @@ -36,6 +36,7 @@ import simplestyle import simplepath import simpletransform import voronoi +import random inkex.localize() @@ -76,7 +77,13 @@ class Voronoi2svg(inkex.Effect): default = False, dest='showClipBox', help = 'Set this to true to write the bounding box') - + self.OptionParser.add_option( + '--delaunay-fill-options', + action = 'store', + type = 'string', + default = "delaunay-no-fill", + dest='delaunayFillOptions', + help = 'Set the Delaunay triangles color options') #}}} #{{{ Clipping a line by a bounding box @@ -191,7 +198,8 @@ class Voronoi2svg(inkex.Effect): #}}} def effect(self): - + #saveout = sys.stdout + #sys.stdout = sys.stderr #{{{ Check that elements have been selected if len(self.options.ids) == 0: @@ -203,15 +211,19 @@ class Voronoi2svg(inkex.Effect): #{{{ Drawing styles linestyle = { - 'stroke' : '#000000', - 'stroke-width' : str(self.unittouu('1px')), - 'fill' : 'none' + 'stroke' : '#000000', + 'stroke-width' : str(self.unittouu('1px')), + 'fill' : 'none', + 'stroke-linecap' : 'round', + 'stroke-linejoin' : 'round' } - + facestyle = { - 'stroke' : '#ff0000', - 'stroke-width' : str(self.unittouu('1px')), - 'fill' : 'none' + 'stroke' : '#000000', + 'stroke-width' : str(self.unittouu('1px')), + 'fill' : 'none', + 'stroke-linecap' : 'round', + 'stroke-linejoin' : 'round' } #}}} @@ -231,6 +243,7 @@ class Voronoi2svg(inkex.Effect): pts = [] nodes = [] seeds = [] + fills = [] for id in self.options.ids: @@ -244,6 +257,20 @@ class Voronoi2svg(inkex.Effect): if trans: simpletransform.applyTransformToPoint(trans,pt) pts.append(Point(pt[0],pt[1])) + fill = 'none' + if self.options.delaunayFillOptions != "delaunay-no-fill": + if node.attrib.has_key('style'): + style = node.get('style') # fixme: this will break for presentation attributes! + if style: + declarations = style.split(';') + for i,decl in enumerate(declarations): + parts = decl.split(':', 2) + if len(parts) == 2: + (prop, val) = parts + prop = prop.strip().lower() + if prop == 'fill': + fill = val.strip() + fills.append(fill) seeds.append(Point(cx,cy)) #}}} @@ -327,6 +354,9 @@ class Voronoi2svg(inkex.Effect): if self.options.diagramType != 'Voronoi': triangles = voronoi.computeDelaunayTriangulation(seeds) + i = 0; + if self.options.delaunayFillOptions == "delaunay-fill": + random.seed("inkscape") for triangle in triangles: p1 = seeds[triangle[0]] p2 = seeds[triangle[1]] @@ -335,11 +365,20 @@ class Voronoi2svg(inkex.Effect): ['L',[p2.x,p2.y]], ['L',[p3.x,p3.y]], ['Z',[]]] + if self.options.delaunayFillOptions == "delaunay-fill" or self.options.delaunayFillOptions == "delaunay-fill-random": + facestyle = { + 'stroke' : fills[triangle[random.randrange(0, 2)]], + 'stroke-width' : str(self.unittouu('0.005px')), + 'fill' : fills[triangle[random.randrange(0, 2)]], + 'stroke-linecap' : 'round', + 'stroke-linejoin' : 'round' + } path = inkex.etree.Element(inkex.addNS('path','svg')) path.set('d',simplepath.formatPath(cmds)) path.set('style',simplestyle.formatStyle(facestyle)) groupDelaunay.append(path) - + i += 1; + #sys.stdout = saveout #}}} -- cgit v1.2.3 From a6b3ec9cdaf7867d6b02da3122ab4c06bf2246a5 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 1 Apr 2016 09:35:30 -0400 Subject: Fix regression in swatch color selection and improve it by allowing drag to change the swatch color too. Fixed bugs: - https://launchpad.net/bugs/1564597 (bzr r14757) --- src/widgets/swatch-selector.cpp | 48 +++++------------------------------------ 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp index 6f2807255..b9cce1d19 100644 --- a/src/widgets/swatch-selector.cpp +++ b/src/widgets/swatch-selector.cpp @@ -37,10 +37,11 @@ SwatchSelector::SwatchSelector() : color_selector->show(); pack_start(*color_selector); - _selected_color.signal_grabbed.connect(sigc::mem_fun(this, &SwatchSelector::_grabbedCb)); - _selected_color.signal_dragged.connect(sigc::mem_fun(this, &SwatchSelector::_draggedCb)); - _selected_color.signal_released.connect(sigc::mem_fun(this, &SwatchSelector::_releasedCb)); - _selected_color.signal_changed.connect(sigc::mem_fun(this, &SwatchSelector::_changedCb)); + //_selected_color.signal_grabbed.connect(sigc::mem_fun(this, &SwatchSelector::_grabbedCb)); + _selected_color.signal_dragged.connect(sigc::mem_fun(this, &SwatchSelector::_changedCb)); + _selected_color.signal_released.connect(sigc::mem_fun(this, &SwatchSelector::_changedCb)); + // signal_changed doesn't get called if updating shape with colour. + //_selected_color.signal_changed.connect(sigc::mem_fun(this, &SwatchSelector::_changedCb)); } SwatchSelector::~SwatchSelector() @@ -53,45 +54,6 @@ SPGradientSelector *SwatchSelector::getGradientSelector() return _gsel; } -void SwatchSelector::_grabbedCb() -{ -} - -void SwatchSelector::_draggedCb() -{ - // if (data) { - //SwatchSelector *swsel = reinterpret_cast(data); - - // TODO might have to block cycles - - // Copied from gradient-vector.cpp, but does not appear to cause visible changes: - /* - if (swsel->_gsel) { - SPGradient *gradient = swsel->_gsel->getVector(); - SPGradient *ngr = sp_gradient_ensure_vector_normalized(gradient); - if (ngr != gradient) { - // Our master gradient has changed - // TODO replace with proper - sp_gradient_vector_widget_load_gradient(GTK_WIDGET(swsel->_gsel), ngr); - } - - sp_gradient_ensure_vector(ngr); - - - SPStop* stop = ngr->getFirstStop(); - if (stop) { - swsel->_csel->base->getColorAlpha(stop->specified_color, &stop->opacity); - stop->currentColor = false; - // TODO push refresh - } - } - */ - // } -} - -void SwatchSelector::_releasedCb() -{ -} - void SwatchSelector::_changedCb() { if (_updating_color) { -- cgit v1.2.3 From 517ad6d0a849329510ea7927742687c28b97c54e Mon Sep 17 00:00:00 2001 From: insaner and su_v <> Date: Sat, 2 Apr 2016 11:10:37 +0200 Subject: Add icon for Live Path Effects dialog. (bzr r14758) --- share/icons/icons.svg | 9 ++++++++- share/icons/symbolic_icons.svg | 8 ++++++++ src/verbs.cpp | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/share/icons/icons.svg b/share/icons/icons.svg index 5e3be4220..ea89282df 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -4307,6 +4307,13 @@ http://www.inkscape.org/ + + + + + + + @@ -4364,7 +4371,7 @@ http://www.inkscape.org/ - + diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg index 1f301f85c..aee4937c5 100644 --- a/share/icons/symbolic_icons.svg +++ b/share/icons/symbolic_icons.svg @@ -3621,5 +3621,13 @@ + + + + + + + + diff --git a/src/verbs.cpp b/src/verbs.cpp index a78bde2f7..b665d6c27 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -2949,7 +2949,7 @@ Verb *Verb::_base_verbs[] = { new DialogVerb(SP_VERB_DIALOG_TAGS, "DialogTags", N_("Selection se_ts..."), N_("View Tags"), INKSCAPE_ICON("edit-select-all-layers")), new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffects ..."), - N_("Manage, edit, and apply path effects"), NULL), + N_("Manage, edit, and apply path effects"), INKSCAPE_ICON("dialog-path-effects")), new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter _Editor..."), N_("Manage, edit, and apply SVG filters"), INKSCAPE_ICON("dialog-filters")), new DialogVerb(SP_VERB_DIALOG_SVG_FONTS, "DialogSVGFonts", N_("SVG Font Editor..."), -- cgit v1.2.3 From 8199cf68c6dbb74a7f1b4eedb970427171bb4d9f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sat, 2 Apr 2016 17:15:43 +0200 Subject: Fix crash on copying orphaned clones Fixed bugs: - https://launchpad.net/bugs/1565272 (bzr r14759) --- src/ui/clipboard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index f04d8a591..f0dc33740 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -759,7 +759,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection) void ClipboardManagerImpl::_copyUsedDefs(SPItem *item) { SPUse *use=dynamic_cast(item); - if(use){ + if (use && use->get_original()) { if(cloned_elements.insert(use->get_original()).second) _copyUsedDefs(use->get_original()); } -- cgit v1.2.3 From ba034a786957d33d5bc554d337208f68e4c1976e Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 2 Apr 2016 12:53:34 -0400 Subject: Remove unused variable warnings. (bzr r14760) --- src/verbs.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/verbs.cpp b/src/verbs.cpp index b665d6c27..7b128c172 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -952,10 +952,6 @@ void EditVerb::perform(SPAction *action, void *data) g_return_if_fail(ensure_desktop_valid(action)); SPDesktop *dt = sp_action_get_desktop(action); - SPDocument *doc = dt->getDocument(); - - Inkscape::XML::Node *repr = dt->namedview->getRepr(); - switch (reinterpret_cast(data)) { case SP_VERB_EDIT_UNDO: sp_undo(dt, dt->getDocument()); -- cgit v1.2.3 From ab843636c11bb0d0550a8987fbdfcb089a55832e Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 2 Apr 2016 14:21:12 -0400 Subject: Fix node size regression and add ctrlResize property for multiple use. Fixed bugs: - https://launchpad.net/bugs/1562197 (bzr r14761) --- src/display/sp-canvas-item.h | 1 + src/display/sp-canvas.cpp | 1 + src/ui/control-manager.cpp | 56 +++++++++++++++++++++++++++----------------- src/ui/control-manager.h | 2 ++ src/ui/draw-anchor.cpp | 12 ++++------ 5 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h index 66cd03dd9..00edb4dee 100644 --- a/src/display/sp-canvas-item.h +++ b/src/display/sp-canvas-item.h @@ -62,6 +62,7 @@ struct SPCanvasItem { Geom::Rect bounds; Geom::Affine xform; + int ctrlResize; Inkscape::ControlType ctrlType; Inkscape::ControlFlags ctrlFlags; diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index d17271752..81ea7d142 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -360,6 +360,7 @@ static void sp_canvas_item_init(SPCanvasItem *item) { item->xform = Geom::Affine(Geom::identity()); + item->ctrlResize = 0; item->ctrlType = Inkscape::CTRL_TYPE_UNKNOWN; item->ctrlFlags = Inkscape::CTRL_FLAG_NORMAL; diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp index cedaea405..a2c977533 100644 --- a/src/ui/control-manager.cpp +++ b/src/ui/control-manager.cpp @@ -54,9 +54,6 @@ ControlFlags& operator ^=(ControlFlags &lhs, ControlFlags rhs) } // namespace -#define FILL_COLOR_NORMAL 0xffffff7f -#define FILL_COLOR_MOUSEOVER 0xff0000ff - // Default color for line: #define LINE_COLOR_PRIMARY 0x0000ff7f #define LINE_COLOR_SECONDARY 0xff00007f @@ -83,6 +80,8 @@ public: bool setControlType(SPCanvasItem *item, ControlType type); + bool setControlResize(SPCanvasItem *item, int ctrlResize); + void setSelected(SPCanvasItem *item, bool selected); private: @@ -108,12 +107,13 @@ private: ControlManager &_manager; sigc::signal _sizeChangedSignal; PrefListener _prefHook; - int _size; + int _size; // Size from the grabsize preference + int _resize; // Way size should change from grabsize std::vector _itemList; std::map > _sizeTable; std::map _typeTable; std::map _ctrlToShape; - std::set _sizeChangers; + std::set _resizeOnSelect; }; ControlManagerImpl::ControlManagerImpl(ControlManager &manager) : @@ -121,6 +121,7 @@ ControlManagerImpl::ControlManagerImpl(ControlManager &manager) : _sizeChangedSignal(), _prefHook(*this), _size(3), + _resize(3), _itemList(), _sizeTable() { @@ -153,10 +154,10 @@ ControlManagerImpl::ControlManagerImpl(ControlManager &manager) : // ------- - _sizeChangers.insert(CTRL_TYPE_NODE_AUTO); - _sizeChangers.insert(CTRL_TYPE_NODE_CUSP); - _sizeChangers.insert(CTRL_TYPE_NODE_SMOOTH); - _sizeChangers.insert(CTRL_TYPE_NODE_SYMETRICAL); + _resizeOnSelect.insert(CTRL_TYPE_NODE_AUTO); + _resizeOnSelect.insert(CTRL_TYPE_NODE_CUSP); + _resizeOnSelect.insert(CTRL_TYPE_NODE_SMOOTH); + _resizeOnSelect.insert(CTRL_TYPE_NODE_SYMETRICAL); // ------- @@ -234,7 +235,7 @@ SPCanvasItem *ControlManagerImpl::createControl(SPCanvasGroup *parent, ControlTy item = sp_canvas_item_new(parent, SP_TYPE_CTRL, "size", targetSize, "filled", 1, - "fill_color", FILL_COLOR_NORMAL, + "fill_color", 0xffffff7f, "stroked", 1, "stroke_color", 0x000000ff, NULL); @@ -284,11 +285,8 @@ sigc::connection ControlManagerImpl::connectCtrlSizeChanged(const sigc::slotctrlType][_size - 1]; + double target = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize; - if (_sizeChangers.count(item->ctrlType) && _manager.isSelected(item)) { - target += 2; - } g_object_set(item, "size", target, NULL); sp_canvas_item_request_update(item); @@ -303,11 +301,9 @@ bool ControlManagerImpl::setControlType(SPCanvasItem *item, ControlType type) accepted = true; } else if (item) { if (_ctrlToShape.count(type) && (_typeTable[type] == _typeTable[item->ctrlType])) { // compatible? - double targetSize = _sizeTable[type][_size - 1]; - if (_manager.isSelected(item) && _sizeChangers.count(item->ctrlType)) { - targetSize += 2.0; - } + double targetSize = _sizeTable[type][_size - 1] + item->ctrlResize; SPCtrlShapeType targetShape = _ctrlToShape[type]; + g_object_set(item, "shape", targetShape, "size", targetSize, NULL); item->ctrlType = type; accepted = true; @@ -317,17 +313,28 @@ bool ControlManagerImpl::setControlType(SPCanvasItem *item, ControlType type) return accepted; } +bool ControlManagerImpl::setControlResize(SPCanvasItem *item, int ctrlResize) +{ + if(item) { + item->ctrlResize = ctrlResize; + double targetSize = _sizeTable[item->ctrlType][_size - 1] + item->ctrlResize; + g_object_set(item, "size", targetSize, NULL); + return true; + } + return false; +} void ControlManagerImpl::setSelected(SPCanvasItem *item, bool selected) { if (_manager.isSelected(item) != selected) { item->ctrlFlags ^= CTRL_FLAG_SELECTED; // toggle, since we know it is different - // TODO refresh colors - double targetSize = _sizeTable[item->ctrlType][_size - 1]; - if (selected && _sizeChangers.count(item->ctrlType)) { - targetSize += 2.0; + if (selected && _resizeOnSelect.count(item->ctrlType)) { + item->ctrlResize = 2; } + + // TODO refresh colors + double targetSize = _sizeTable[item->ctrlType][_size - 1] + _resize; g_object_set(item, "size", targetSize, NULL); } } @@ -431,6 +438,11 @@ bool ControlManager::setControlType(SPCanvasItem *item, ControlType type) return _impl->setControlType(item, type); } +bool ControlManager::setControlResize(SPCanvasItem *item, int ctrlResize) +{ + return _impl->setControlResize(item, ctrlResize); +} + bool ControlManager::isActive(SPCanvasItem *item) const { return (item->ctrlFlags & CTRL_FLAG_ACTIVE) != 0; diff --git a/src/ui/control-manager.h b/src/ui/control-manager.h index 964ad0a29..3f090d0bd 100644 --- a/src/ui/control-manager.h +++ b/src/ui/control-manager.h @@ -63,6 +63,8 @@ public: bool setControlType(SPCanvasItem *item, ControlType type); + bool setControlResize(SPCanvasItem *item, int ctrlResize); + bool isActive(SPCanvasItem *item) const; void setActive(SPCanvasItem *item, bool active); diff --git a/src/ui/draw-anchor.cpp b/src/ui/draw-anchor.cpp index e5a7a493e..c3bc5676d 100644 --- a/src/ui/draw-anchor.cpp +++ b/src/ui/draw-anchor.cpp @@ -26,9 +26,6 @@ using Inkscape::ControlManager; #define FILL_COLOR_NORMAL 0xffffff7f #define FILL_COLOR_MOUSEOVER 0xff0000ff -#define NODE_SIZE_NORMAL 7.0 -#define NODE_SIZE_MOUSEOVER 10.0 - /** * Creates an anchor object and initializes it. */ @@ -81,18 +78,19 @@ SPDrawAnchor *sp_draw_anchor_test(SPDrawAnchor *anchor, Geom::Point w, bool acti if ( activate && ( Geom::LInfty( w - anchor->dc->getDesktop().d2w(anchor->dp) ) <= (ctrl->box.width() / 2.0) ) ) { if (!anchor->active) { - g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, - "size", NODE_SIZE_MOUSEOVER, NULL); + ControlManager::getManager().setControlResize(anchor->ctrl, 4); + g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_MOUSEOVER, NULL); anchor->active = TRUE; } return anchor; } if (anchor->active) { - g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_NORMAL, - "size", NODE_SIZE_NORMAL, NULL); + ControlManager::getManager().setControlResize(anchor->ctrl, 0); + g_object_set(anchor->ctrl, "fill_color", FILL_COLOR_NORMAL, NULL); anchor->active = FALSE; } + return NULL; } -- cgit v1.2.3 From 3ae9b262529ea9e276a1acc2f7ebdb393079c514 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Mon, 4 Apr 2016 19:05:14 -0400 Subject: avoid higher-order calculations if sbasis is cubic. (Bug 1559721) Fixed bugs: - https://launchpad.net/bugs/1559721 (bzr r14762) --- src/2geom/sbasis-to-bezier.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/2geom/sbasis-to-bezier.cpp b/src/2geom/sbasis-to-bezier.cpp index 8a18cfd4a..64c07f35e 100644 --- a/src/2geom/sbasis-to-bezier.cpp +++ b/src/2geom/sbasis-to-bezier.cpp @@ -197,6 +197,8 @@ void sbasis_to_cubic_bezier (std::vector & bz, D2 const& sb) } sbasis_to_bezier(bz, sb, 4); // zeroth-order estimate + if ((sb[X].size() < 3) && (sb[Y].size() < 3)) + return; // cubic bezier estimate is exact Geom::ConvexHull bezhull(bz); // calculate first derivatives of x and y wrt t -- cgit v1.2.3 From c2c0e21ac5ed06791b74905272039276d99685a1 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Tue, 5 Apr 2016 11:13:27 -0400 Subject: re-write rev 11457. (Bug 1557348) Fixed bugs: - https://launchpad.net/bugs/1557348 (bzr r14763) --- src/livarot/PathOutline.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/livarot/PathOutline.cpp b/src/livarot/PathOutline.cpp index e146bb908..1c42301da 100644 --- a/src/livarot/PathOutline.cpp +++ b/src/livarot/PathOutline.cpp @@ -471,8 +471,13 @@ void Path::SubContractOutline(int off, int num_pd, // test de nullité du segment if (IsNulCurve (descr_cmd, curD, curX)) { - stTgt = dest->descr_cmd.size() ? Geom::Point(1, 0) : Geom::Point(-1, 0); // reverse direction - enTgt = stTgt; + if (descr_cmd.size() == 2) { // single point, see LP Bug 1006666 + stTgt = dest->descr_cmd.size() ? Geom::Point(1, 0) : Geom::Point(-1, 0); // reverse direction + enTgt = stTgt; + } else { + curP++; + continue; + } } stNor=stTgt.cw(); enNor=enTgt.cw(); -- cgit v1.2.3 From d3460d8a60c4d2c99c2c12fe0646db224335e232 Mon Sep 17 00:00:00 2001 From: Kamalpreet Grewal <> Date: Thu, 7 Apr 2016 12:54:08 +0200 Subject: Add clickable link to www.inkscape.org to splash screen dialog. (bzr r14764) --- src/ui/dialog/aboutbox.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 81f48e6ef..b653a630d 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -120,10 +120,22 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { label->set_selectable(true); label->show(); + Gtk::Label *link = new Gtk::Label(); + const gchar *website_link = + " https://www.inkscape.org"; + + link->set_markup(website_link); + link->set_alignment(Gtk::ALIGN_END); + link->set_padding(5,5); + link->set_selectable(true); + link->show(); + #if WITH_GTKMM_3_0 get_content_area()->pack_start(*manage(label), false, false); + get_content_area()->pack_start(*manage(link), false, false); #else get_vbox()->pack_start(*manage(label), false, false); + get_vbox()->pack_start(*manage(link), false, false); #endif Gtk::Requisition requisition; -- cgit v1.2.3 From 03e7b13ab09c39d2147e06138c517f0199d4f091 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 8 Apr 2016 15:26:55 +0200 Subject: Bug #1552765 fixed Break Apart dont handle well stroke with in documents different than px Fixed bugs: - https://launchpad.net/bugs/1552765 (bzr r14765) --- src/path-chemistry.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 15d3f0f99..1a345b565 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -1,4 +1,4 @@ -/* + /* * Here are handlers for modifying selections, specific to paths * * Authors: @@ -217,7 +217,6 @@ sp_selected_path_break_apart(SPDesktop *desktop, bool skip_undo) if (curve == NULL) { continue; } - did = true; Inkscape::XML::Node *parent = item->getRepr()->parent(); @@ -228,16 +227,10 @@ sp_selected_path_break_apart(SPDesktop *desktop, bool skip_undo) gchar *style = g_strdup(item->getRepr()->attribute("style")); // XML Tree being used directly here while it shouldn't be... gchar *path_effect = g_strdup(item->getRepr()->attribute("inkscape:path-effect")); - - Geom::PathVector apv = curve->get_pathvector() * path->transform; - - curve->unref(); - + Geom::Affine transform = path->transform; // it's going to resurrect as one of the pieces, so we delete without advertisement item->deleteObject(false); - curve = new SPCurve(apv); - g_assert(curve != NULL); GSList *list = curve->split(); @@ -258,7 +251,8 @@ sp_selected_path_break_apart(SPDesktop *desktop, bool skip_undo) else repr->setAttribute("d", str); g_free(str); - + repr->setAttribute("transform", sp_svg_transform_write(transform)); + // add the new repr to the parent parent->appendChild(repr); -- cgit v1.2.3 From d0aef5c0c23b426582534f6a13a90833ac719373 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 8 Apr 2016 19:38:40 +0200 Subject: Remove inkscape-specific glib clone function (and get rid of deprecated Glib ScopedPtr use) Fixed bugs: - https://launchpad.net/bugs/1567485 (bzr r14766) --- src/ui/clipboard.cpp | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index f0dc33740..4099bd631 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -146,8 +146,6 @@ private: void _setClipboardColor(guint32); void _userWarn(SPDesktop *, char const *); - void _inkscape_wait_for_targets(std::list &); - // private properites SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node @@ -1302,9 +1300,7 @@ Geom::Scale ClipboardManagerImpl::_getScale(SPDesktop *desktop, Geom::Point cons */ Glib::ustring ClipboardManagerImpl::_getBestTarget() { - // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets() - std::list targets; // = _clipboard->wait_for_targets(); - _inkscape_wait_for_targets(targets); + std::list targets = _clipboard->wait_for_targets(); // clipboard target debugging snippet /* @@ -1456,39 +1452,6 @@ void ClipboardManagerImpl::_userWarn(SPDesktop *desktop, char const *msg) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg); } - -// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see -// -// https://bugs.launchpad.net/inkscape/+bug/296778 -// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html -// -// for details. Until this has been fixed upstream we will use our own implementation -// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc. -void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list &listTargets) -{ - //Get a newly-allocated array of atoms: - GdkAtom* targets = NULL; - gint n_targets = 0; - gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets ); - if (!test || (targets == NULL)) { - return; - } - - //Add the targets to the C++ container: - for (int i = 0; i < n_targets; i++) - { - //Convert the atom to a string: - gchar* const atom_name = gdk_atom_name(targets[i]); - - Glib::ustring target; - if (atom_name) { - target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. - } - - listTargets.push_back(target); - } -} - /* ####################################### ClipboardManager class ####################################### */ -- cgit v1.2.3 From e95a3400c24ac43bcb93d184a1089a723a856351 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 8 Apr 2016 20:41:33 +0200 Subject: Provide tooltip for Selection set dialog tree area. Based on patch from Kamalpreet Grewal. (bzr r14767) --- src/ui/dialog/tags.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp index cbb2fb953..c99c1bff3 100644 --- a/src/ui/dialog/tags.cpp +++ b/src/ui/dialog/tags.cpp @@ -935,7 +935,17 @@ TagsPanel::TagsPanel() : _tree.set_headers_visible(false); _tree.set_reorderable(true); _tree.enable_model_drag_dest (Gdk::ACTION_MOVE); - + + // This string is constructed to use already translated strings. + // The tooltip applies to the whole tree area. It would be better + // if the tooltip was split into parts and only applied to the + // icons but doing that is quite complicated. + Glib::ustring tooltip_string = "'+': "; + tooltip_string += (_("Add selection to set")); + tooltip_string += "; '×': "; + tooltip_string += (_("Remove from selection set")); + _tree.set_tooltip_text( tooltip_string ); + Inkscape::UI::Widget::AddToIcon * addRenderer = manage( new Inkscape::UI::Widget::AddToIcon()); int addColNum = _tree.append_column("type", *addRenderer) - 1; Gtk::TreeViewColumn *col = _tree.get_column(addColNum); -- cgit v1.2.3 From 364d0165d1251b22b20e190f7e7c58c5fe72fe88 Mon Sep 17 00:00:00 2001 From: su_v Date: Sat, 9 Apr 2016 04:22:41 +0200 Subject: GTK3 fix Fixed bugs: - https://launchpad.net/bugs/1567485 (bzr r14768) --- src/ui/clipboard.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp index 4099bd631..d581dbf7e 100644 --- a/src/ui/clipboard.cpp +++ b/src/ui/clipboard.cpp @@ -1300,7 +1300,11 @@ Geom::Scale ClipboardManagerImpl::_getScale(SPDesktop *desktop, Geom::Point cons */ Glib::ustring ClipboardManagerImpl::_getBestTarget() { +#if WITH_GTKMM_3_0 + std::vector targets = _clipboard->wait_for_targets(); +#else std::list targets = _clipboard->wait_for_targets(); +#endif // clipboard target debugging snippet /* -- cgit v1.2.3 From d6cb67efb5a3c8a67a9de6b1fe000da72c6e144d Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 9 Apr 2016 04:35:46 +0200 Subject: Patch for ninja check in cmake builds Fixed bugs: - https://launchpad.net/bugs/1554143 (bzr r14769) --- CMakeLists.txt | 2 + src/2geom/Makefile_insert | 1 - test/CMakeLists.txt | 433 +------------------------------------------ test/src/attributes-test.cpp | 8 +- 4 files changed, 19 insertions(+), 425 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eea7cf3ee..66787a8f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,8 @@ set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0" if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") set(GMOCK_PRESENT ON) +else() + message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.bash' to download it.") endif() # ----------------------------------------------------------------------------- diff --git a/src/2geom/Makefile_insert b/src/2geom/Makefile_insert index b56942caa..4d41de297 100644 --- a/src/2geom/Makefile_insert +++ b/src/2geom/Makefile_insert @@ -45,7 +45,6 @@ 2geom/curves.h \ 2geom/d2.h \ 2geom/d2-sbasis.cpp \ - 2geom/d2-sbasis.h \ 2geom/ellipse.cpp \ 2geom/ellipse.h \ 2geom/elliptical-arc.cpp \ diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0b9584631..f31b0bc04 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,427 +9,12 @@ add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) include_directories(SYSTEM ${GMOCK_DIR}/gtest/include ${GMOCK_DIR}/include) -# copied from ../src/CMakeLists.txt -# TODO resolve to shared definition -set(sp_SRC - ../src/attribute-rel-css.cpp - ../src/attribute-rel-svg.cpp - ../src/attribute-rel-util.cpp - ../src/sp-anchor.cpp - ../src/sp-clippath.cpp - ../src/sp-conn-end-pair.cpp - ../src/sp-conn-end.cpp - ../src/sp-cursor.cpp - ../src/sp-defs.cpp - ../src/sp-desc.cpp - ../src/sp-ellipse.cpp - ../src/sp-factory.cpp - ../src/sp-filter-primitive.cpp - ../src/sp-filter-reference.cpp - ../src/sp-filter.cpp - ../src/sp-flowdiv.cpp - ../src/sp-flowregion.cpp - ../src/sp-flowtext.cpp - ../src/sp-font-face.cpp - ../src/sp-font.cpp - ../src/sp-glyph-kerning.cpp - ../src/sp-glyph.cpp - ../src/sp-gradient-reference.cpp - ../src/sp-gradient.cpp - ../src/sp-guide.cpp - ../src/sp-hatch-path.cpp - ../src/sp-hatch.cpp - ../src/sp-image.cpp - ../src/sp-item-group.cpp - ../src/sp-item-notify-moveto.cpp - ../src/sp-item-rm-unsatisfied-cns.cpp - ../src/sp-item-transform.cpp - ../src/sp-item-update-cns.cpp - ../src/sp-item.cpp - ../src/sp-line.cpp - ../src/sp-linear-gradient.cpp - ../src/sp-lpe-item.cpp - ../src/sp-marker.cpp - ../src/sp-mask.cpp - ../src/sp-mesh-array.cpp - ../src/sp-mesh-patch.cpp - ../src/sp-mesh-row.cpp - ../src/sp-mesh.cpp - ../src/sp-metadata.cpp - ../src/sp-missing-glyph.cpp - ../src/sp-namedview.cpp - ../src/sp-object-group.cpp - ../src/sp-object.cpp - ../src/sp-offset.cpp - ../src/sp-paint-server.cpp - ../src/sp-path.cpp - ../src/sp-pattern.cpp - ../src/sp-polygon.cpp - ../src/sp-polyline.cpp - ../src/sp-radial-gradient.cpp - ../src/sp-rect.cpp - ../src/sp-root.cpp - ../src/sp-script.cpp - ../src/sp-shape.cpp - ../src/sp-solid-color.cpp - ../src/sp-spiral.cpp - ../src/sp-star.cpp - ../src/sp-stop.cpp - ../src/sp-string.cpp - ../src/sp-style-elem.cpp - ../src/sp-switch.cpp - ../src/sp-symbol.cpp - ../src/sp-tag-use-reference.cpp - ../src/sp-tag-use.cpp - ../src/sp-tag.cpp - ../src/sp-text.cpp - ../src/sp-title.cpp - ../src/sp-tref-reference.cpp - ../src/sp-tref.cpp - ../src/sp-tspan.cpp - ../src/sp-use-reference.cpp - ../src/sp-use.cpp - ../src/splivarot.cpp - ../src/viewbox.cpp - - # ------- - # Headers - ../src/attribute-rel-css.h - ../src/attribute-rel-svg.h - ../src/attribute-rel-util.h - ../src/sp-anchor.h - ../src/sp-clippath.h - ../src/sp-conn-end-pair.h - ../src/sp-conn-end.h - ../src/sp-cursor.h - ../src/sp-defs.h - ../src/sp-desc.h - ../src/sp-ellipse.h - ../src/sp-factory.h - ../src/sp-filter-primitive.h - ../src/sp-filter-reference.h - ../src/sp-filter-units.h - ../src/sp-filter.h - ../src/sp-flowdiv.h - ../src/sp-flowregion.h - ../src/sp-flowtext.h - ../src/sp-font-face.h - ../src/sp-font.h - ../src/sp-glyph-kerning.h - ../src/sp-glyph.h - ../src/sp-gradient-reference.h - ../src/sp-gradient-spread.h - ../src/sp-gradient-test.h - ../src/sp-gradient-units.h - ../src/sp-gradient-vector.h - ../src/sp-gradient.h - ../src/sp-guide-attachment.h - ../src/sp-guide-constraint.h - ../src/sp-guide.h - ../src/sp-hatch-path.h - ../src/sp-hatch.h - ../src/sp-image.h - ../src/sp-item-group.h - ../src/sp-item-notify-moveto.h - ../src/sp-item-rm-unsatisfied-cns.h - ../src/sp-item-transform.h - ../src/sp-item-update-cns.h - ../src/sp-item.h - ../src/sp-line.h - ../src/sp-linear-gradient.h - ../src/sp-lpe-item.h - ../src/sp-marker-loc.h - ../src/sp-marker.h - ../src/sp-mask.h - ../src/sp-mesh-array.h - ../src/sp-mesh-patch.h - ../src/sp-mesh-row.h - ../src/sp-mesh.h - ../src/sp-metadata.h - ../src/sp-missing-glyph.h - ../src/sp-namedview.h - ../src/sp-object-group.h - ../src/sp-object.h - ../src/sp-offset.h - ../src/sp-paint-server-reference.h - ../src/sp-paint-server.h - ../src/sp-path.h - ../src/sp-pattern.h - ../src/sp-polygon.h - ../src/sp-polyline.h - ../src/sp-radial-gradient.h - ../src/sp-rect.h - ../src/sp-root.h - ../src/sp-script.h - ../src/sp-shape.h - ../src/sp-solid-color.h - ../src/sp-spiral.h - ../src/sp-star.h - ../src/sp-stop.h - ../src/sp-string.h - ../src/sp-style-elem-test.h - ../src/sp-style-elem.h - ../src/sp-switch.h - ../src/sp-symbol.h - ../src/sp-text.h - ../src/sp-textpath.h - ../src/sp-title.h - ../src/sp-tref-reference.h - ../src/sp-tref.h - ../src/sp-tspan.h - ../src/sp-use-reference.h - ../src/sp-use.h - ../src/viewbox.h -) - -# copied from ../src/CMakeLists.txt -# TODO resolve to shared definition -set(inkscape_SRC - ../src/attributes.cpp - ../src/axis-manip.cpp - ../src/box3d-side.cpp - ../src/box3d.cpp - ../src/color-profile.cpp - ../src/color.cpp - ../src/composite-undo-stack-observer.cpp - ../src/conditions.cpp - ../src/conn-avoid-ref.cpp - ../src/console-output-undo-observer.cpp - ../src/context-fns.cpp - ../src/desktop-events.cpp - ../src/desktop-style.cpp - ../src/desktop.cpp - ../src/device-manager.cpp - ../src/dir-util.cpp - ../src/document-subset.cpp - ../src/document-undo.cpp - ../src/document.cpp - ../src/ege-color-prof-tracker.cpp - ../src/event-log.cpp - ../src/extract-uri.cpp - ../src/file.cpp - ../src/filter-chemistry.cpp - ../src/filter-enums.cpp - ../src/gc-anchored.cpp - ../src/gc-finalized.cpp - ../src/gradient-chemistry.cpp - ../src/gradient-drag.cpp - ../src/graphlayout.cpp - ../src/guide-snapper.cpp - ../src/help.cpp - ../src/id-clash.cpp - ../src/inkscape.cpp - ../src/knot-holder-entity.cpp - ../src/knot-ptr.cpp - ../src/knot.cpp - ../src/knotholder.cpp - ../src/layer-fns.cpp - ../src/layer-manager.cpp - ../src/layer-model.cpp - ../src/line-geometry.cpp - ../src/line-snapper.cpp - ../src/main-cmdlineact.cpp - ../src/media.cpp - ../src/message-context.cpp - ../src/message-stack.cpp - ../src/mod360.cpp - ../src/object-hierarchy.cpp - ../src/object-snapper.cpp - ../src/path-chemistry.cpp - ../src/persp3d-reference.cpp - ../src/persp3d.cpp - ../src/perspective-line.cpp - ../src/preferences.cpp - ../src/prefix.cpp - ../src/print.cpp - ../src/profile-manager.cpp - ../src/proj_pt.cpp - ../src/rdf.cpp - ../src/removeoverlap.cpp - ../src/resource-manager.cpp - ../src/rubberband.cpp - ../src/satisfied-guide-cns.cpp - ../src/selcue.cpp - ../src/selection-chemistry.cpp - ../src/selection-describer.cpp - ../src/selection.cpp - ../src/seltrans-handles.cpp - ../src/seltrans.cpp - ../src/shortcuts.cpp - ../src/snap-preferences.cpp - ../src/snap.cpp - ../src/snapped-curve.cpp - ../src/snapped-line.cpp - ../src/snapped-point.cpp - ../src/snapper.cpp - ../src/style-internal.cpp - ../src/style.cpp - ../src/svg-view-widget.cpp - ../src/svg-view.cpp - ../src/text-chemistry.cpp - ../src/text-editing.cpp - ../src/transf_mat_3x4.cpp - ../src/unclump.cpp - ../src/unicoderange.cpp - ../src/uri-references.cpp - ../src/uri.cpp - ../src/vanishing-point.cpp - ../src/verbs.cpp - ../src/version.cpp - - # ------- - # Headers - ../src/MultiPrinter.h - ../src/PylogFormatter.h - ../src/TRPIFormatter.h - ../src/attributes-test.h - ../src/attributes.h - ../src/axis-manip.h - ../src/bad-uri-exception.h - ../src/box3d-side.h - ../src/box3d.h - ../src/cms-color-types.h - ../src/cms-system.h - ../src/color-profile-cms-fns.h - ../src/color-profile-test.h - ../src/color-profile.h - ../src/color-rgba.h - ../src/color.h - ../src/colorspace.h - ../src/composite-undo-stack-observer.h - ../src/conditions.h - ../src/conn-avoid-ref.h - ../src/console-output-undo-observer.h - ../src/context-fns.h - ../src/decimal-round.h - ../src/desktop-events.h - ../src/desktop-style.h - ../src/desktop.h - ../src/device-manager.h - ../src/dir-util-test.h - ../src/dir-util.h - ../src/document-private.h - ../src/document-subset.h - ../src/document-undo.h - ../src/document.h - ../src/ege-color-prof-tracker.h - ../src/enums.h - ../src/event-log.h - ../src/event.h - ../src/extract-uri-test.h - ../src/extract-uri.h - ../src/file.h - ../src/fill-or-stroke.h - ../src/filter-chemistry.h - ../src/filter-enums.h - ../src/gc-anchored.h - ../src/gc-finalized.h - ../src/gradient-chemistry.h - ../src/gradient-drag.h - ../src/graphlayout.h - ../src/guide-snapper.h - ../src/help.h - ../src/helper-fns.h - ../src/icon-size.h - ../src/id-clash.h - ../src/inkscape-version.h - ../src/inkscape.h - ../src/isinf.h - ../src/knot-enums.h - ../src/knot-holder-entity.h - ../src/knot-ptr.h - ../src/knot.h - ../src/knotholder.h - ../src/layer-fns.h - ../src/layer-manager.h - ../src/layer-model.h - ../src/line-geometry.h - ../src/line-snapper.h - ../src/macros.h - ../src/main-cmdlineact.h - ../src/marker-test.h - ../src/media.h - ../src/menus-skeleton.h - ../src/message-context.h - ../src/message-stack.h - ../src/message.h - ../src/mod360-test.h - ../src/mod360.h - ../src/number-opt-number.h - ../src/object-hierarchy.h - ../src/object-snapper.h - ../src/object-test.h - ../src/path-chemistry.h - ../src/path-prefix.h - ../src/persp3d-reference.h - ../src/persp3d.h - ../src/perspective-line.h - ../src/preferences-skeleton.h - ../src/preferences-test.h - ../src/preferences.h - ../src/prefix.h - ../src/print.h - ../src/profile-manager.h - ../src/proj_pt.h - ../src/rdf.h - ../src/remove-last.h - ../src/removeoverlap.h - ../src/require-config.h - ../src/resource-manager.h - ../src/round-test.h - ../src/round.h - ../src/rubberband.h - ../src/satisfied-guide-cns.h - ../src/selcue.h - ../src/selection-chemistry.h - ../src/selection-describer.h - ../src/selection.h - ../src/seltrans-handles.h - ../src/seltrans.h - ../src/shortcuts.h - ../src/snap-candidate.h - ../src/snap-enums.h - ../src/snap-preferences.h - ../src/snap.h - ../src/snapped-curve.h - ../src/snapped-line.h - ../src/snapped-point.h - ../src/snapper.h - ../src/splivarot.h - ../src/streq.h - ../src/strneq.h - ../src/style-enums.h - ../src/style-internal.h - ../src/style-test.h - ../src/style.h - ../src/svg-profile.h - ../src/svg-view-widget.h - ../src/svg-view.h - ../src/syseq.h - ../src/test-helpers.h - ../src/text-chemistry.h - ../src/text-editing.h - ../src/text-tag-attributes.h - ../src/transf_mat_3x4.h - ../src/unclump.h - ../src/undo-stack-observer.h - ../src/unicoderange.h - ../src/uri-references.h - ../src/uri-test.h - ../src/uri.h - ../src/vanishing-point.h - ../src/verbs-test.h - ../src/verbs.h - ../src/version.h -) - -get_property(inkscape_global_SRC GLOBAL PROPERTY inkscape_global_SRC) - set_source_files_properties( ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp PROPERTIES GENERATED TRUE) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/__/src) +# include_directories(${CMAKE_CURRENT_BINARY_DIR}/__/src) +include_directories(${CMAKE_BINARY_DIR}/src) add_executable(unittest unittest.cpp @@ -437,20 +22,22 @@ add_executable(unittest src/attributes-test.cpp src/color-profile-test.cpp src/dir-util-test.cpp - ${inkscape_SRC} - ${sp_SRC} - ${inkscape_global_SRC} - ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp + $ ) add_dependencies(unittest inkscape_version) +set (_optional_unittest_libs ) + +if (NOT "${WITH_EXT_GDL}") + list (APPEND _optional_unittest_libs "gdl_LIB") +endif() + target_link_libraries(unittest gmock_main # order from automake #sp_LIB - nrtype_LIB #inkscape_LIB #sp_LIB # annoying, we need both! @@ -458,7 +45,7 @@ target_link_libraries(unittest croco_LIB avoid_LIB - gdl_LIB + ${_optional_unittest_libs} cola_LIB vpsc_LIB livarot_LIB diff --git a/test/src/attributes-test.cpp b/test/src/attributes-test.cpp index 376c35cb2..41c0274ec 100644 --- a/test/src/attributes-test.cpp +++ b/test/src/attributes-test.cpp @@ -75,7 +75,6 @@ std::vector getKnownAttrs() AttributeInfo("baseProfile", false), AttributeInfo("bbox", true), AttributeInfo("bias", true), - AttributeInfo("block-progression", true), AttributeInfo("by", true), AttributeInfo("calcMode", true), AttributeInfo("cap-height", true), @@ -150,6 +149,7 @@ std::vector getKnownAttrs() AttributeInfo("format", false), AttributeInfo("from", true), AttributeInfo("fx", true), + AttributeInfo("fr", true), AttributeInfo("fy", true), AttributeInfo("g1", true), AttributeInfo("g2", true), @@ -314,6 +314,7 @@ std::vector getKnownAttrs() AttributeInfo("text-decoration-stroke", true), AttributeInfo("text-decoration-style", true), AttributeInfo("text-indent", true), + AttributeInfo("text-orientation", true), AttributeInfo("text-rendering", true), AttributeInfo("text-transform", true), AttributeInfo("textLength", true), @@ -375,6 +376,7 @@ std::vector getKnownAttrs() AttributeInfo("inkscape:bbox-paths", true), AttributeInfo("inkscape:box3dsidetype", true), AttributeInfo("inkscape:collect", true), + AttributeInfo("inkscape:color", true), AttributeInfo("inkscape:connection-end", true), AttributeInfo("inkscape:connection-end-point", true), AttributeInfo("inkscape:connection-points", true), @@ -402,10 +404,13 @@ std::vector getKnownAttrs() AttributeInfo("inkscape:href", true), AttributeInfo("inkscape:label", true), AttributeInfo("inkscape:layoutOptions", true), + AttributeInfo("inkscape:lockguides", true), + AttributeInfo("inkscape:locked", true), AttributeInfo("inkscape:object-nodes", true), AttributeInfo("inkscape:object-paths", true), AttributeInfo("inkscape:original", true), AttributeInfo("inkscape:original-d", true), + AttributeInfo("inkscape:pagecheckerboard", true), AttributeInfo("inkscape:pageopacity", true), AttributeInfo("inkscape:pageshadow", true), AttributeInfo("inkscape:path-effect", true), @@ -434,6 +439,7 @@ std::vector getKnownAttrs() AttributeInfo("inkscape:snap-tangential", true), AttributeInfo("inkscape:snap-text-baseline", true), AttributeInfo("inkscape:snap-to-guides", true), + AttributeInfo("inkscape:spray-origin", true), AttributeInfo("inkscape:srcNoMarkup", true), AttributeInfo("inkscape:srcPango", true), AttributeInfo("inkscape:transform-center-x", true), -- cgit v1.2.3 From c686984d95d4f65e65158e3eb20e90d34742dee6 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 9 Apr 2016 04:37:20 +0200 Subject: Script to download gtest/gmock Fixed bugs: - https://launchpad.net/bugs/1554143 (bzr r14770) --- download-gtest.bash | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 download-gtest.bash diff --git a/download-gtest.bash b/download-gtest.bash new file mode 100644 index 000000000..5fc7dfab9 --- /dev/null +++ b/download-gtest.bash @@ -0,0 +1,17 @@ +#!/bin/bash +if ! test -e gtest ; then + mkdir gtest +fi +( + cd gtest + if ! test -e gtest ; then + wget -O 'googletest-release-1.7.0.tar.gz' https://github.com/google/googletest/archive/release-1.7.0.tar.gz + tar -xvf 'googletest-release-1.7.0.tar.gz' + mv googletest-release-1.7.0 gtest + fi + if ! test -e gmock-1.7.0 ; then + wget -O 'googlemock-release-1.7.0.tar.gz' https://github.com/google/googlemock/archive/release-1.7.0.tar.gz + tar -xvf 'googlemock-release-1.7.0.tar.gz' + mv googlemock-release-1.7.0 gmock-1.7.0 + fi +) -- cgit v1.2.3 From f1324f54a5b46884f510471ff2c52d0266523f16 Mon Sep 17 00:00:00 2001 From: scootergrisen Date: Mon, 11 Apr 2016 07:34:09 +0200 Subject: Translations. Danish translation udpate. Fixed bugs: - https://launchpad.net/bugs/1471443 (bzr r14771) --- po/da.po | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) mode change 100644 => 100755 po/da.po diff --git a/po/da.po b/po/da.po old mode 100644 new mode 100755 index bd4900835..9ccedf0a9 --- a/po/da.po +++ b/po/da.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2016-02-14 00:09+0100\n" -"PO-Revision-Date: 2016-03-11 00:00+0200\n" +"PO-Revision-Date: 2016-04-08 00:00+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" "Language: da\n" @@ -5048,10 +5048,9 @@ msgstr "[Uændret]" msgid "_Undo" msgstr "Fo_rtryd" -# omgør/gentag #: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2463 msgid "_Redo" -msgstr "Ann_uller fortryd" +msgstr "_Omgør" #: ../src/extension/dependency.cpp:243 msgid "Dependency:" @@ -27094,7 +27093,7 @@ msgstr "Fortryd sidste handling" #: ../src/verbs.cpp:2464 msgid "Do again the last undone action" -msgstr "Annullér fortryd" +msgstr "Udfør den sidste handling igen" #: ../src/verbs.cpp:2465 msgid "Cu_t" @@ -27719,10 +27718,9 @@ msgstr "Eksportér markering til punktbillede og indsæt i dokumentet" msgid "_Combine" msgstr "_Kombinér" -# scootergrisen: måske Kombinér #: ../src/verbs.cpp:2636 msgid "Combine several paths into one" -msgstr "Kombiner flere stier til en" +msgstr "Kombinér flere stier til en" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info @@ -32881,7 +32879,6 @@ msgid "" "or image/x-icon" msgstr "" -# scootergrisen: kildesprog: forslå at lave til link så "." efter ".net/" ikke bliver del af URL'en #: ../share/extensions/export_gimp_palette.py:16 msgid "" "The export_gpl.py module requires PyXML. Please download the latest version " @@ -40253,6 +40250,5 @@ msgid "A popular graphics file format for clipart" msgstr "Et populært grafik-filformat til clipart" #: ../share/extensions/xaml2svg.inx.h:1 -#, fuzzy msgid "XAML Input" -msgstr "DXF inddata" +msgstr "XAML-inddata" -- cgit v1.2.3 From 440a180d82f64884b900bd0e18c6ee722a626c90 Mon Sep 17 00:00:00 2001 From: suv-lp <> Date: Mon, 11 Apr 2016 08:01:57 +0200 Subject: [Bug #1545319] Failure to retrieve image resolution of PNGs with Units: Undefined (clang from Xcode 4.6.3). Fixed bugs: - https://launchpad.net/bugs/1545319 (bzr r14772) --- src/extension/internal/image-resolution.cpp | 78 ++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 7 deletions(-) diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index e96fd6437..57142bbdd 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -34,6 +34,18 @@ #include #endif +#define noIMAGE_RESOLUTION_DEBUG + +#ifdef IMAGE_RESOLUTION_DEBUG +# define debug(f, a...) { g_print("%s(%d) %s:", \ + __FILE__,__LINE__,__FUNCTION__); \ + g_print(f, ## a); \ + g_print("\n"); \ + } +#else +# define debug(f, a...) /* */ +#endif + namespace Inkscape { namespace Extension { namespace Internal { @@ -118,17 +130,38 @@ void ImageResolution::readpng(char const *fn) { png_read_info(png_ptr, info_ptr); png_uint_32 res_x, res_y; +#ifdef PNG_INCH_CONVERSIONS_SUPPORTED + debug("PNG_INCH_CONVERSIONS_SUPPORTED"); + res_x = png_get_x_pixels_per_inch(png_ptr, info_ptr); + res_y = png_get_y_pixels_per_inch(png_ptr, info_ptr); + if (res_x != 0 && res_y != 0) { + ok_ = true; + x_ = res_x * 1.0; // FIXME: implicit conversion of png_uint_32 to double ok? + y_ = res_y * 1.0; // FIXME: implicit conversion of png_uint_32 to double ok? + } +#else + debug("PNG_RESOLUTION_METER"); int unit_type; + // FIXME: png_get_pHYs() fails to return expected values + // with clang (based on LLVM 3.2svn) from Xcode 4.6.3 (OS X 10.7.5) png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - fclose(fp); - if (unit_type == PNG_RESOLUTION_METER) { ok_ = true; x_ = res_x * 2.54 / 100; y_ = res_y * 2.54 / 100; } +#endif + + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + fclose(fp); + + if (ok_) { + debug("xdpi: %f", x_); + debug("ydpi: %f", y_); + } else { + debug("FAILED"); + } } #else @@ -206,6 +239,13 @@ void ImageResolution::readexif(char const *fn) { ok_ = true; } exif_data_free(ed); + + if (ok_) { + debug("xdpi: %f", x_); + debug("ydpi: %f", y_); + } else { + debug("FAILED"); + } } #else @@ -256,6 +296,13 @@ void ImageResolution::readexiv(char const *fn) { } } ok_ = havex && havey; + + if (ok_) { + debug("xdpi: %f", x_); + debug("ydpi: %f", y_); + } else { + debug("FAILED"); + } } #else @@ -312,6 +359,7 @@ void ImageResolution::readjfif(char const *fn) { jpeg_stdio_src(&cinfo, ifd); jpeg_read_header(&cinfo, TRUE); + debug("cinfo.[XY]_density"); if (cinfo.saw_JFIF_marker) { // JFIF APP0 marker was seen if ( cinfo.density_unit == 1 ) { // dots/inch x_ = cinfo.X_density; @@ -331,6 +379,13 @@ void ImageResolution::readjfif(char const *fn) { } jpeg_destroy_decompress(&cinfo); fclose(ifd); + + if (ok_) { + debug("xdpi: %f", x_); + debug("ydpi: %f", y_); + } else { + debug("FAILED"); + } } #else @@ -344,16 +399,17 @@ void ImageResolution::readjfif(char const *) { #ifdef WITH_IMAGE_MAGICK void ImageResolution::readmagick(char const *fn) { Magick::Image image; + debug("Trying image.read"); try { image.read(fn); } catch (Magick::Error & err) { - g_warning("ImageMagick error: %s", err.what()); + debug("ImageMagick error: %s", err.what()); return; - } catch (...) { - g_warning("ImageResolution::readmagick: Unknown error"); + } catch (std::exception & err) { + debug("ImageResolution::readmagick: %s", err.what()); return; } - + debug("image.[xy]Resolution"); std::string const type = image.magick(); x_ = image.xResolution(); y_ = image.yResolution(); @@ -367,6 +423,14 @@ void ImageResolution::readmagick(char const *fn) { if (x_ != 0 && y_ != 0) { ok_ = true; } + + if (ok_) { + debug("xdpi: %f", x_); + debug("ydpi: %f", y_); + } else { + debug("FAILED"); + debug("Using default Inkscape import resolution"); + } } #else -- cgit v1.2.3 From 1bd15554f673abd38a321047c690091435017eaa Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 11 Apr 2016 12:55:15 +0200 Subject: filename change (bzr r14773) --- download-gtest.bash | 17 ----------------- download-gtest.sh | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 download-gtest.bash create mode 100755 download-gtest.sh diff --git a/download-gtest.bash b/download-gtest.bash deleted file mode 100644 index 5fc7dfab9..000000000 --- a/download-gtest.bash +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -if ! test -e gtest ; then - mkdir gtest -fi -( - cd gtest - if ! test -e gtest ; then - wget -O 'googletest-release-1.7.0.tar.gz' https://github.com/google/googletest/archive/release-1.7.0.tar.gz - tar -xvf 'googletest-release-1.7.0.tar.gz' - mv googletest-release-1.7.0 gtest - fi - if ! test -e gmock-1.7.0 ; then - wget -O 'googlemock-release-1.7.0.tar.gz' https://github.com/google/googlemock/archive/release-1.7.0.tar.gz - tar -xvf 'googlemock-release-1.7.0.tar.gz' - mv googlemock-release-1.7.0 gmock-1.7.0 - fi -) diff --git a/download-gtest.sh b/download-gtest.sh new file mode 100755 index 000000000..5fc7dfab9 --- /dev/null +++ b/download-gtest.sh @@ -0,0 +1,17 @@ +#!/bin/bash +if ! test -e gtest ; then + mkdir gtest +fi +( + cd gtest + if ! test -e gtest ; then + wget -O 'googletest-release-1.7.0.tar.gz' https://github.com/google/googletest/archive/release-1.7.0.tar.gz + tar -xvf 'googletest-release-1.7.0.tar.gz' + mv googletest-release-1.7.0 gtest + fi + if ! test -e gmock-1.7.0 ; then + wget -O 'googlemock-release-1.7.0.tar.gz' https://github.com/google/googlemock/archive/release-1.7.0.tar.gz + tar -xvf 'googlemock-release-1.7.0.tar.gz' + mv googlemock-release-1.7.0 gmock-1.7.0 + fi +) -- cgit v1.2.3 From 205caa5fbceaa6ee1275a03f0f116d96c0d71dfc Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 11 Apr 2016 13:37:30 +0200 Subject: fix compile error in livarot (bzr r14774) --- CMakeLists.txt | 2 +- src/livarot/LivarotDefs.h | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66787a8f8..542214d60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ set(GMOCK_DIR "${CMAKE_SOURCE_DIR}/gtest/gmock-1.7.0" if(EXISTS "${GMOCK_DIR}" AND IS_DIRECTORY "${GMOCK_DIR}") set(GMOCK_PRESENT ON) else() - message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.bash' to download it.") + message("No gmock/gtest found! Perhaps you wish to run 'bash download-gtest.sh' to download it.") endif() # ----------------------------------------------------------------------------- diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index 49f954586..4e3c91e72 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -9,21 +9,11 @@ #ifndef my_defs #define my_defs -#if defined(WIN32) || defined(__WIN32__) -# include -#endif - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#ifdef HAVE_INTTYPES_H -# include -#else -# ifdef HAVE_STDINT_H -# include -# endif -#endif +#include // error codes (mostly obsolete) enum -- cgit v1.2.3 From ed3ca8d0ed258d51bf5cfce2bd6bf6a9ef8382bb Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 11 Apr 2016 13:43:42 +0200 Subject: remove FORCE from executable paths Fixed bugs: - https://launchpad.net/bugs/1548469 (bzr r14775) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 542214d60..fa0fd24df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,8 @@ endif(APPLE) # ----------------------------------------------------------------------------- # Redirect output files # ----------------------------------------------------------------------------- -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE ) -set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE ) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" ) +set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" ) # ----------------------------------------------------------------------------- # Test Harness -- cgit v1.2.3 From f55002c469ed7f5c198a7bb878266aa5f4805487 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 11 Apr 2016 14:56:03 +0200 Subject: cstdint is c++11, defaulting to stdint.h (bzr r14776) --- src/livarot/LivarotDefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/livarot/LivarotDefs.h b/src/livarot/LivarotDefs.h index 4e3c91e72..abeff3861 100644 --- a/src/livarot/LivarotDefs.h +++ b/src/livarot/LivarotDefs.h @@ -13,7 +13,7 @@ # include "config.h" #endif -#include +#include // error codes (mostly obsolete) enum -- cgit v1.2.3 From 9d028413f98d61937750f633703ad3de2eee1fad Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 11 Apr 2016 15:15:17 +0200 Subject: Fix feTile rendering bug with Krzysztof's help. Hackfest 2016. (bzr r14777) --- src/display/nr-filter-tile.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp index 913812828..7172f88ee 100644 --- a/src/display/nr-filter-tile.cpp +++ b/src/display/nr-filter-tile.cpp @@ -126,11 +126,8 @@ void FilterTile::render_cairo(FilterSlot &slot) void FilterTile::area_enlarge(Geom::IntRect &area, Geom::Affine const &trans) { - // We need to enlarge enough to get tile source... we don't the area of the source tile in this - // function so we guess. This is VERY inefficient. - Geom::Point enlarge(200, 200); - enlarge *= trans; - area.expandBy( enlarge[Geom::X] < 100 ? 100: enlarge[Geom::X] ); + // Set to infinite rectangle so we get tile source. It will be clipped later. + area = Geom::IntRect::infinite(); } double FilterTile::complexity(Geom::Affine const &) -- cgit v1.2.3 From 4862708928a1a9d0252ec89a4925f575be904012 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 11 Apr 2016 14:49:28 +0100 Subject: Partialy fix bug #172137. commented in bug (bzr r14778) --- src/live_effects/lpe-patternalongpath.cpp | 7 +++++++ src/live_effects/lpe-patternalongpath.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp index 9397d848f..911c410f9 100644 --- a/src/live_effects/lpe-patternalongpath.cpp +++ b/src/live_effects/lpe-patternalongpath.cpp @@ -259,9 +259,16 @@ LPEPatternAlongPath::transform_multiply(Geom::Affine const& postmul, bool set) // overriding the Effect class default method, disabling transform forwarding to the parameters. // only take translations into account + // Check if proportional stroke-width scaling is on + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool transform_stroke = prefs ? prefs->getBool("/options/transform/stroke", true) : true; + if (transform_stroke && !scale_y_rel) { + prop_scale.param_set_value(prop_scale * ((postmul.expansionX() + postmul.expansionY()) / 2)); + } if (postmul.isTranslation()) { pattern.param_transform_multiply(postmul, set); } + sp_lpe_item_update_patheffect (sp_lpe_item, false, true); } void diff --git a/src/live_effects/lpe-patternalongpath.h b/src/live_effects/lpe-patternalongpath.h index 3b9a17ab0..3d7fc02bc 100644 --- a/src/live_effects/lpe-patternalongpath.h +++ b/src/live_effects/lpe-patternalongpath.h @@ -42,7 +42,7 @@ public: virtual void transform_multiply(Geom::Affine const& postmul, bool set); void addCanvasIndicators(SPLPEItem const */*lpeitem*/, std::vector &hp_vec); - + virtual void addKnotHolderEntities(KnotHolder * knotholder, SPDesktop * desktop, SPItem * item); PathParam pattern; -- cgit v1.2.3 From 7eb4eab95f297feea0d4106d5b6d4a8d9fdedb86 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 11 Apr 2016 15:42:13 +0100 Subject: desktop: Fix deprecated GdkCursor API (bzr r14779) --- src/desktop.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index f099ba39f..84a578ee9 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1446,7 +1446,8 @@ void SPDesktop::disableInteraction() void SPDesktop::setWaitingCursor() { - GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); + GdkDisplay *display = gdk_display_get_default(); + GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(getCanvas())), waiting); #if GTK_CHECK_VERSION(3,0,0) g_object_unref(waiting); -- cgit v1.2.3 From 4ac5489c40bccb04912f12f3ea8b6c870d8fe818 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Mon, 11 Apr 2016 15:48:00 +0100 Subject: Hackfest 2016: fix critical warning on startup (bzr r14780) --- src/ui/widget/selected-style.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 9e283fc64..87cf0b8c4 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -363,19 +363,6 @@ SelectedStyle::SelectedStyle(bool /*layout*/) _popup_sw.show_all(); } - _fill_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_fill_click)); - _stroke_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_stroke_click)); - _opacity_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_click)); - _stroke_width_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_sw_click)); - _stroke_width_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_sw_click)); - - - _opacity_sb.signal_populate_popup().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_menu)); - _opacity_sb.signal_value_changed().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_changed)); - // Connect to key-press to ensure focus is consistent with other spin buttons when using the keys vs mouse-click - g_signal_connect (G_OBJECT (_opacity_sb.gobj()), "key-press-event", G_CALLBACK (spinbutton_keypress), _opacity_sb.gobj()); - g_signal_connect (G_OBJECT (_opacity_sb.gobj()), "focus-in-event", G_CALLBACK (spinbutton_focus_in), _opacity_sb.gobj()); - _fill_place.add(_na[SS_FILL]); _fill_place.set_tooltip_text(__na[SS_FILL]); @@ -452,6 +439,17 @@ SelectedStyle::SelectedStyle(bool /*layout*/) "drag_data_received", G_CALLBACK(dragDataReceived), _drop[SS_FILL]); + + _fill_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_fill_click)); + _stroke_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_stroke_click)); + _opacity_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_click)); + _stroke_width_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_sw_click)); + _stroke_width_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_sw_click)); + _opacity_sb.signal_populate_popup().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_menu)); + _opacity_sb.signal_value_changed().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_changed)); + // Connect to key-press to ensure focus is consistent with other spin buttons when using the keys vs mouse-click + g_signal_connect (G_OBJECT (_opacity_sb.gobj()), "key-press-event", G_CALLBACK (spinbutton_keypress), _opacity_sb.gobj()); + g_signal_connect (G_OBJECT (_opacity_sb.gobj()), "focus-in-event", G_CALLBACK (spinbutton_focus_in), _opacity_sb.gobj()); } SelectedStyle::~SelectedStyle() -- cgit v1.2.3 From ff49d82b42394daaac78de835a2bb9401fe9fea6 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Mon, 11 Apr 2016 15:49:49 +0100 Subject: Hackfest 2016: Add bzrignore rules for Eclipse files (bzr r14781) --- .bzrignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bzrignore b/.bzrignore index a8dddb7e8..114347d66 100644 --- a/.bzrignore +++ b/.bzrignore @@ -259,3 +259,6 @@ bin/ lib/ include/ +.project +.cproject +.settings -- cgit v1.2.3 From 58a5565b6d840af2e6a0e74c1554018f75d689b0 Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Mon, 11 Apr 2016 16:53:05 +0200 Subject: Added a mechanism to load c++ extensions dynamically. (bzr r14761.1.1) --- configure.ac | 1 + src/extension/CMakeLists.txt | 2 + src/extension/Makefile_insert | 2 + src/extension/dependency.cpp | 12 +++++ src/extension/dependency.h | 1 + src/extension/loader.cpp | 103 ++++++++++++++++++++++++++++++++++++++++++ src/extension/loader.h | 73 ++++++++++++++++++++++++++++++ src/extension/system.cpp | 17 +++---- 8 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 src/extension/loader.cpp create mode 100644 src/extension/loader.h diff --git a/configure.ac b/configure.ac index f876b1248..a05d247a5 100644 --- a/configure.ac +++ b/configure.ac @@ -638,6 +638,7 @@ PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.2 cairo >= 1.10 glib-2.0 >= 2.28 + gmodule-2.0 gsl gthread-2.0 >= 2.0 libpng >= 1.2 diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index 21e652563..238e8d3df 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -14,6 +14,7 @@ set(extension_SRC print.cpp system.cpp timer.cpp + loader.cpp implementation/implementation.cpp implementation/xslt.cpp @@ -90,6 +91,7 @@ set(extension_SRC print.h system.h timer.h + loader.h implementation/implementation.h implementation/script.h diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert index 4e75de13a..fb9713904 100644 --- a/src/extension/Makefile_insert +++ b/src/extension/Makefile_insert @@ -13,6 +13,8 @@ ink_common_sources += \ extension/execution-env.h \ extension/init.cpp \ extension/init.h \ + extension/loader.h \ + extension/loader.cpp \ extension/param/parameter.h \ extension/param/parameter.cpp \ extension/param/notebook.h \ diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index e46b6fbd2..712a9068d 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -234,6 +234,18 @@ bool Dependency::check (void) const return TRUE; } +/** + \brief Accessor to the name attribute. + \return A string containing the name of the dependency. + + Returns the name of the dependency as found in the configuration file. + +*/ +const gchar* Dependency::getName() +{ + return _string; +} + /** \brief Print out a dependency to a string. */ diff --git a/src/extension/dependency.h b/src/extension/dependency.h index 829912dc3..5d0a4844e 100644 --- a/src/extension/dependency.h +++ b/src/extension/dependency.h @@ -58,6 +58,7 @@ public: Dependency (Inkscape::XML::Node * in_repr); virtual ~Dependency (void); bool check (void) const; + const gchar* getName(); Glib::ustring &get_help (void) const; Glib::ustring &get_link (void) const; diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp new file mode 100644 index 000000000..df193a051 --- /dev/null +++ b/src/extension/loader.cpp @@ -0,0 +1,103 @@ +/* + * Loader for external plug-ins. + * + * Authors: + * Moritz Eberl + * + * Copyright (C) 2016 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#include "loader.h" +#include "system.h" +#include +#include +#include "dependency.h" + +namespace Inkscape { +namespace Extension { + +typedef Implementation::Implementation *(*_getImplementation)(void); + +bool Loader::LoadDependency(Dependency *dep) +{ + GModule *module = NULL; + module = g_module_open(dep->getName(), (GModuleFlags)0); + if (module == NULL) { + return false; + } + return true; +} + +/** + * @brief Load the actual implementation of a plugin supplied by the plugin. + * @param doc The xml representation of the INX extension configuration. + * @return The implementation of the extension loaded from the plugin. + */ +Implementation::Implementation *Loader::LoadImplementation(Inkscape::XML::Document *doc) +{ + try { + Inkscape::XML::Node *repr = doc->root(); + Inkscape::XML::Node *child_repr = repr->firstChild(); + while (child_repr != NULL) { + char const *chname = child_repr->name(); + if (!strncmp(chname, INKSCAPE_EXTENSION_NS_NC, strlen(INKSCAPE_EXTENSION_NS_NC))) { + chname += strlen(INKSCAPE_EXTENSION_NS); + } + + if (!strcmp(chname, "dependency")) { + Dependency dep = Dependency(child_repr); + bool success = LoadDependency(&dep); + if( !success ){ + const char *res = g_module_error(); + g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.getName(), res); + return NULL; + } + } + + if (!strcmp(chname, "plugin")) { + if (const gchar *name = child_repr->attribute("name")) { + GModule *module = NULL; + _getImplementation GetImplementation = NULL; + gchar *path = g_build_filename(_baseDirectory, name, (char *) NULL); + module = g_module_open(path, G_MODULE_BIND_LOCAL); + g_free(path); + if (module == NULL) { + const char *res = g_module_error(); + g_warning("Unable to load extension %s.\nDetails: %s\n", name, res); + return NULL; + } + + if (g_module_symbol(module, "GetImplementation", (gpointer *) &GetImplementation) == FALSE) { + const char *res = g_module_error(); + g_warning("Unable to load extension %s.\nDetails: %s\n", name, res); + return NULL; + } + + Implementation::Implementation *i = GetImplementation(); + return i; + } + } + + child_repr = child_repr->next(); + } + } catch (std::exception &e) { + g_warning("Unable to load extension."); + } + return NULL; +} + +} // namespace Extension +} // namespace Inkscape + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace .0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: \ No newline at end of file diff --git a/src/extension/loader.h b/src/extension/loader.h new file mode 100644 index 000000000..c09260f72 --- /dev/null +++ b/src/extension/loader.h @@ -0,0 +1,73 @@ +/** @file + * Loader for external plug-ins. + *//* + * + * Authors: + * Moritz Eberl + * + * Copyright (C) 2016 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifndef INKSCAPE_EXTENSION_LOADER_H_ +#define INKSCAPE_EXTENSION_LOADER_H_ + +#include "extension.h" +#include "implementation/implementation.h" +#include + + +namespace Inkscape { +namespace Extension { + +/** This class contains the mechanism to load c++ plugins dynamically. +*/ +class Loader { + +public: + /** + * Sets a base directory where to look for the actual plugin to load. + * + * @param dir is the path where the plugin should be loaded from. + */ + void setBaseDirectory(const gchar *dir) { + _baseDirectory = dir; + } + + /** + * Loads plugin dependencies which are needed for the plugin to load. + * + * @param dep + */ + bool LoadDependency(Dependency *dep); + + /** + * Load the actual implementation of a plugin supplied by the plugin. + * + * @param doc The xml representation of the INX extension configuration. + * @return The implementation of the extension loaded from the plugin. + */ + Implementation::Implementation *LoadImplementation(Inkscape::XML::Document *doc); + +private: + const gchar *_baseDirectory; /**< The base directory to load a plugin from */ + + +}; + +} // namespace Extension +} // namespace Inkscape */ + +#endif // _LOADER_H_ + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace .0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: \ No newline at end of file diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 6a95717f2..5a77ac28e 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -39,6 +39,7 @@ #include "io/sys.h" #include "inkscape.h" #include "document-undo.h" +#include "loader.h" namespace Inkscape { @@ -426,7 +427,7 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation enum { MODULE_EXTENSION, MODULE_XSLT, - /* MODULE_PLUGIN, */ + MODULE_PLUGIN, MODULE_UNKNOWN_IMP } module_implementation_type = MODULE_UNKNOWN_IMP; enum { @@ -465,10 +466,8 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation module_implementation_type = MODULE_EXTENSION; } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "xslt")) { module_implementation_type = MODULE_XSLT; -#if 0 - } else if (!strcmp(element_name, "plugin")) { + } else if (!strcmp(element_name, INKSCAPE_EXTENSION_NS "plugin")) { module_implementation_type = MODULE_PLUGIN; -#endif } //Inkscape::XML::Node *old_repr = child_repr; @@ -489,13 +488,15 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation imp = static_cast(xslt); break; } -#if 0 case MODULE_PLUGIN: { - Implementation::Plugin *plugin = new Implementation::Plugin(); - imp = static_cast(plugin); + Inkscape::Extension::Loader loader = Inkscape::Extension::Loader(); + loader.setBaseDirectory ( Inkscape::Application::profile_path("extensions")); + imp = loader.LoadImplementation(doc); + if( imp != NULL) { + return new Extension(repr, imp); + } break; } -#endif default: { imp = NULL; break; -- cgit v1.2.3 From 11e3494bd7bc992e8f3c26a147e9ef5c14b12681 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 11 Apr 2016 16:26:43 +0100 Subject: desktop-events: Fix deprecated GdkCursor API (bzr r14782) --- src/desktop-events.cpp | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 99bc4f7ae..b9bd949ff 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -519,34 +519,29 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) if (!guide->getLocked()) { sp_guideline_set_color(SP_GUIDELINE(item), guide->getHiColor()); } + // set move or rotate cursor Geom::Point const event_w(event->crossing.x, event->crossing.y); + GdkDisplay *display = gdk_display_get_default(); + GdkCursorType cursor_type; + if ((event->crossing.state & GDK_SHIFT_MASK) && (drag_type != SP_DRAG_MOVE_ORIGIN)) { - GdkCursor *guide_cursor; - guide_cursor = gdk_cursor_new (GDK_EXCHANGE); - if(guide->getLocked()){ - guide_cursor = sp_cursor_new_from_xpm(cursor_select_xpm , 1, 1); - } - gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(desktop->getCanvas())), guide_cursor); -#if GTK_CHECK_VERSION(3,0,0) - g_object_unref(guide_cursor); -#else - gdk_cursor_unref(guide_cursor); -#endif + cursor_type = GDK_EXCHANGE; } else { - GdkCursor *guide_cursor; - guide_cursor = gdk_cursor_new (GDK_HAND1); - if(guide->getLocked()){ - guide_cursor = sp_cursor_new_from_xpm(cursor_select_xpm , 1, 1); - } - gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(desktop->getCanvas())), guide_cursor); + cursor_type = GDK_HAND1; + } + + GdkCursor *guide_cursor = gdk_cursor_new_for_display(display, cursor_type); + if(guide->getLocked()){ + guide_cursor = sp_cursor_new_from_xpm(cursor_select_xpm , 1, 1); + } + gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(desktop->getCanvas())), guide_cursor); #if GTK_CHECK_VERSION(3,0,0) - g_object_unref(guide_cursor); + g_object_unref(guide_cursor); #else - gdk_cursor_unref(guide_cursor); + gdk_cursor_unref(guide_cursor); #endif - } char *guide_description = guide->description(); desktop->guidesMessageContext()->setF(Inkscape::NORMAL_MESSAGE, _("Guideline: %s"), guide_description); @@ -577,11 +572,11 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) case GDK_KEY_Shift_L: case GDK_KEY_Shift_R: if (drag_type != SP_DRAG_MOVE_ORIGIN) { - GdkCursor *guide_cursor; - guide_cursor = gdk_cursor_new (GDK_EXCHANGE); + GdkDisplay *display = gdk_display_get_default(); + GdkCursor *guide_cursor = gdk_cursor_new_for_display(display, GDK_EXCHANGE); gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(desktop->getCanvas())), guide_cursor); #if GTK_CHECK_VERSION(3,0,0) - g_object_unref(guide_cursor); + g_object_unref(guide_cursor); #else gdk_cursor_unref(guide_cursor); #endif @@ -598,15 +593,17 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) switch (Inkscape::UI::Tools::get_group0_keyval (&event->key)) { case GDK_KEY_Shift_L: case GDK_KEY_Shift_R: - GdkCursor *guide_cursor; - guide_cursor = gdk_cursor_new (GDK_EXCHANGE); + { + GdkDisplay *display = gdk_display_get_default(); + GdkCursor *guide_cursor = gdk_cursor_new_for_display(display, GDK_EXCHANGE); gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(desktop->getCanvas())), guide_cursor); #if GTK_CHECK_VERSION(3,0,0) - g_object_unref(guide_cursor); + g_object_unref(guide_cursor); #else gdk_cursor_unref(guide_cursor); #endif break; + } default: // do nothing; break; -- cgit v1.2.3 From dc4433ead7dfcd8e91150b1a91132b65cde6e3f7 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 11 Apr 2016 16:35:15 +0100 Subject: svg-view: Fix cursor API (bzr r14783) --- src/svg-view.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/svg-view.cpp b/src/svg-view.cpp index f52608420..53fa8633f 100644 --- a/src/svg-view.cpp +++ b/src/svg-view.cpp @@ -103,7 +103,8 @@ void SPSVGView::doRescale(bool event) void SPSVGView::mouseover() { - GdkCursor *cursor = gdk_cursor_new(GDK_HAND2); + GdkDisplay *display = gdk_display_get_default(); + GdkCursor *cursor = gdk_cursor_new_for_display(display, GDK_HAND2); GdkWindow *window = gtk_widget_get_window (GTK_WIDGET(SP_CANVAS_ITEM(_drawing)->canvas)); gdk_window_set_cursor(window, cursor); #if GTK_CHECK_VERSION(3,0,0) -- cgit v1.2.3 From 17926db8eb71c72c041f2e37d6d143833849ec0f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 12 Apr 2016 10:19:43 +0200 Subject: fix undo clip rendering bug Fixed bugs: - https://launchpad.net/bugs/1428535 (bzr r14784) --- src/sp-item.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 4937e6c76..af81194c2 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -568,6 +568,7 @@ void SPItem::clip_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item) clip->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } } + item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } void SPItem::mask_ref_changed(SPObject *old_mask, SPObject *mask, SPItem *item) -- cgit v1.2.3 From 5d542ba036017af885913a6dd1f35b91daba047f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 12 Apr 2016 11:10:40 +0200 Subject: regenerates inkscape-version when revno changes ; Translates inkscape.desktop file (CMake build) Fixed bugs: - https://launchpad.net/bugs/1543304 - https://launchpad.net/bugs/1514588 (bzr r14785) --- CMakeLists.txt | 5 ----- CMakeScripts/inkscape-desktop.cmake | 9 +++++++++ CMakeScripts/inkscape-version.cmake | 18 ++---------------- inkscape.desktop.template | 21 +++++++++++++++++++++ po/CMakeLists.txt | 9 +++++++++ src/CMakeLists.txt | 5 ----- src/inkscape-version.cpp.in | 7 +++++++ 7 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 CMakeScripts/inkscape-desktop.cmake create mode 100644 inkscape.desktop.template create mode 100644 src/inkscape-version.cpp.in diff --git a/CMakeLists.txt b/CMakeLists.txt index fa0fd24df..e0eb0e5cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,11 +129,6 @@ configure_file( "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/inkscape.desktop.in" - "${CMAKE_BINARY_DIR}/inkscape.desktop" - IMMEDIATE @ONLY) - add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") diff --git a/CMakeScripts/inkscape-desktop.cmake b/CMakeScripts/inkscape-desktop.cmake new file mode 100644 index 000000000..bf3b2b7b7 --- /dev/null +++ b/CMakeScripts/inkscape-desktop.cmake @@ -0,0 +1,9 @@ +# This is called by cmake as an extermal process from +# ./po/CMakeLists.txt and creates inkscape.desktop +# +# These variables are defined by the caller, matching the CMake equivilents. +# - ${INKSCAPE_SOURCE_DIR} +# - ${INKSCAPE_BINARY_DIR} +message("building inkscape.desktop") +set(INKSCAPE_MIMETYPE "image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;image/cgm;image/x-wmf;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr;application/visio;application/x-visio;application/vnd.visio;application/visio.drawing;application/vsd;application/x-vsd;image/x-vsd;") +configure_file(${INKSCAPE_BINARY_DIR}/inkscape.desktop.template.in ${INKSCAPE_BINARY_DIR}/inkscape.desktop) diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index cf6cadbc4..adfb3ddd8 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -15,20 +15,6 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) endif() +message("revision is " ${INKSCAPE_REVISION}) -file(WRITE - ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.txt - # unlike autoconf, include config.h - "#ifdef HAVE_CONFIG_H\n" - "# include \n" - "#endif\n" - "\n" - "namespace Inkscape {\n" - " char const *version_string = VERSION \" \" \"${INKSCAPE_REVISION}\";\n" - "}\n") - -# Copy the file to the final header only if the version changes -# and avoid needless rebuilds -execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.txt - ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp) +configure_file(${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.in ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp) diff --git a/inkscape.desktop.template b/inkscape.desktop.template new file mode 100644 index 000000000..ff95af282 --- /dev/null +++ b/inkscape.desktop.template @@ -0,0 +1,21 @@ +[Desktop Entry] +Version=1.0 +Name=Inkscape +GenericName=Vector Graphics Editor +X-GNOME-FullName=Inkscape Vector Graphics Editor +Comment=Create and edit Scalable Vector Graphics images +Keywords=image;editor;vector;drawing; +Type=Application +Categories=Graphics;VectorGraphics;GTK; +MimeType=${INKSCAPE_MIMETYPE} +Exec=inkscape %F +TryExec=inkscape +Terminal=false +StartupNotify=true +Icon=inkscape +X-Ayatana-Desktop-Shortcuts=Drawing + +[Drawing Shortcut Group] +Name=New Drawing +Exec=inkscape +TargetEnvironment=Unity diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 8633c484d..9261765c6 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -5,3 +5,12 @@ foreach(language ${LANGUAGES}) set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po) GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION "share/locale/" PO_FILES ${pofile}) endforeach(language) + + +#translates inkscape.desktop +add_custom_target(inkscape_desktop DEPENDS ${CMAKE_BINARY_DIR}/inkscape.desktop) +add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/inkscape.desktop +DEPENDS ${LANGUAGES} +COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --desktop --template ${CMAKE_SOURCE_DIR}/inkscape.desktop.template -d ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_BINARY_DIR}/inkscape.desktop.template.in --keyword=Name --keyword=GenericName --keyword=X-GNOME-FullName --keyword=Comment --keyword=Keywords +COMMAND ${CMAKE_COMMAND} -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-desktop.cmake) +add_dependencies(inkscape inkscape_desktop) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30af55925..5c436cefb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -443,11 +443,6 @@ endif() # a custom target that is always built add_custom_target( inkscape_version ALL - DEPENDS ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp) - -# creates inkscape-version.cpp using cmake script -add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp COMMAND ${CMAKE_COMMAND} -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} diff --git a/src/inkscape-version.cpp.in b/src/inkscape-version.cpp.in new file mode 100644 index 000000000..b4ea5028d --- /dev/null +++ b/src/inkscape-version.cpp.in @@ -0,0 +1,7 @@ +#ifdef HAVE_CONFIG_H +# include +#endif + +namespace Inkscape { + char const *version_string = VERSION " " "${INKSCAPE_REVISION}"; +} -- cgit v1.2.3 From f557834448da06ae62541573d6beab9289899c17 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 10:39:08 +0100 Subject: inkview: Fix cursor API deprecation #Hackfest2016 (bzr r14786) --- src/inkview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/inkview.cpp b/src/inkview.cpp index 3fcd9ed8a..db4b1aeb0 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -428,7 +428,8 @@ static int sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data) static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) { - GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); + GdkDisplay *display = gdk_display_get_default(); + GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting); #if GTK_CHECK_VERSION(3,0,0) g_object_unref(waiting); @@ -436,7 +437,7 @@ static void sp_svgview_waiting_cursor(struct SPSlideShow *ss) gdk_cursor_unref(waiting); #endif if (ctrlwin) { - GdkCursor *waiting = gdk_cursor_new(GDK_WATCH); + GdkCursor *waiting = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting); #if GTK_CHECK_VERSION(3,0,0) g_object_unref(waiting); -- cgit v1.2.3 From 8877e7f0c4b49b28720cbbb6c1b14d35076aabb8 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 12 Apr 2016 10:41:16 +0100 Subject: Bump version to gtk 3.8 of later (bzr r14787) --- CMakeScripts/DefineDependsandFlags.cmake | 10 +++++----- configure.ac | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ab197a7af..13e27d9c5 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -222,11 +222,11 @@ if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules( GTK REQUIRED - gtkmm-3.0>=3.2 - gdkmm-3.0>=3.2 - gtk+-3.0>=3.2 - gdk-3.0>=3.2 - gdl-3.0>=3.3.5 + gtkmm-3.0>=3.8 + gdkmm-3.0>=3.8 + gtk+-3.0>=3.8 + gdk-3.0>=3.8 + gdl-3.0>=3.4 ) message("Using EXPERIMENTAL Gtkmm 3 build") set(WITH_GTKMM_3_0 1) diff --git a/configure.ac b/configure.ac index f876b1248..ab11722f4 100644 --- a/configure.ac +++ b/configure.ac @@ -726,22 +726,22 @@ if test "x$enable_gtk3" = "xyes"; then fi PKG_CHECK_MODULES(GTK, - gtk+-3.0 >= 3.2 - gdk-3.0 >= 3.2 - gdl-3.0 > 3.3.4 + gtk+-3.0 >= 3.8 + gdk-3.0 >= 3.8 + gdl-3.0 > 3.4 $ink_spell_pkg) dnl Separate out dependencies that are known to introduce dnl C++-specific compiler flags PKG_CHECK_MODULES(GTKMM, - gtkmm-3.0 >= 3.2 - gdkmm-3.0 >= 3.2, + gtkmm-3.0 >= 3.8 + gdkmm-3.0 >= 3.8, with_gtkmm_3_0=yes, with_gtkmm_3_0=no) if test "x$with_gtkmm_3_0" = "xyes"; then AC_MSG_RESULT([Using EXPERIMENTAL Gtkmm 3 build]) - AC_DEFINE(WITH_GTKMM_3_0,1,[Build with Gtkmm 3.0.x or higher]) + AC_DEFINE(WITH_GTKMM_3_0,1,[Build with Gtkmm 3.x]) AC_MSG_RESULT([Using external GDL]) AC_DEFINE(WITH_EXT_GDL,1,[Build with external GDL]) -- cgit v1.2.3 From d2a9d82cd79c61f44e2224dee38847d4113c7eda Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Tue, 12 Apr 2016 11:43:56 +0200 Subject: fixed naming of methods. External extensions can now be other module types. (bzr r14761.1.2) --- src/extension/dependency.cpp | 2 +- src/extension/dependency.h | 2 +- src/extension/loader.cpp | 10 +++++----- src/extension/loader.h | 6 +++--- src/extension/system.cpp | 8 +++----- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index 712a9068d..624be12f9 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -241,7 +241,7 @@ bool Dependency::check (void) const Returns the name of the dependency as found in the configuration file. */ -const gchar* Dependency::getName() +const gchar* Dependency::get_name() { return _string; } diff --git a/src/extension/dependency.h b/src/extension/dependency.h index 5d0a4844e..8f5dcc0c8 100644 --- a/src/extension/dependency.h +++ b/src/extension/dependency.h @@ -58,7 +58,7 @@ public: Dependency (Inkscape::XML::Node * in_repr); virtual ~Dependency (void); bool check (void) const; - const gchar* getName(); + const gchar* get_name(); Glib::ustring &get_help (void) const; Glib::ustring &get_link (void) const; diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp index df193a051..8893f3f1d 100644 --- a/src/extension/loader.cpp +++ b/src/extension/loader.cpp @@ -20,10 +20,10 @@ namespace Extension { typedef Implementation::Implementation *(*_getImplementation)(void); -bool Loader::LoadDependency(Dependency *dep) +bool Loader::load_dependency(Dependency *dep) { GModule *module = NULL; - module = g_module_open(dep->getName(), (GModuleFlags)0); + module = g_module_open(dep->get_name(), (GModuleFlags)0); if (module == NULL) { return false; } @@ -35,7 +35,7 @@ bool Loader::LoadDependency(Dependency *dep) * @param doc The xml representation of the INX extension configuration. * @return The implementation of the extension loaded from the plugin. */ -Implementation::Implementation *Loader::LoadImplementation(Inkscape::XML::Document *doc) +Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Document *doc) { try { Inkscape::XML::Node *repr = doc->root(); @@ -48,10 +48,10 @@ Implementation::Implementation *Loader::LoadImplementation(Inkscape::XML::Docume if (!strcmp(chname, "dependency")) { Dependency dep = Dependency(child_repr); - bool success = LoadDependency(&dep); + bool success = load_dependency(&dep); if( !success ){ const char *res = g_module_error(); - g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.getName(), res); + g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.get_name(), res); return NULL; } } diff --git a/src/extension/loader.h b/src/extension/loader.h index c09260f72..5d48bf861 100644 --- a/src/extension/loader.h +++ b/src/extension/loader.h @@ -31,7 +31,7 @@ public: * * @param dir is the path where the plugin should be loaded from. */ - void setBaseDirectory(const gchar *dir) { + void set_base_directory(const gchar *dir) { _baseDirectory = dir; } @@ -40,7 +40,7 @@ public: * * @param dep */ - bool LoadDependency(Dependency *dep); + bool load_dependency(Dependency *dep); /** * Load the actual implementation of a plugin supplied by the plugin. @@ -48,7 +48,7 @@ public: * @param doc The xml representation of the INX extension configuration. * @return The implementation of the extension loaded from the plugin. */ - Implementation::Implementation *LoadImplementation(Inkscape::XML::Document *doc); + Implementation::Implementation *load_implementation(Inkscape::XML::Document *doc); private: const gchar *_baseDirectory; /**< The base directory to load a plugin from */ diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 5a77ac28e..6b8e80d3c 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -490,11 +490,8 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation } case MODULE_PLUGIN: { Inkscape::Extension::Loader loader = Inkscape::Extension::Loader(); - loader.setBaseDirectory ( Inkscape::Application::profile_path("extensions")); - imp = loader.LoadImplementation(doc); - if( imp != NULL) { - return new Extension(repr, imp); - } + loader.set_base_directory ( Inkscape::Application::profile_path("extensions")); + imp = loader.load_implementation(doc); break; } default: { @@ -529,6 +526,7 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation break; } default: { + module = new Extension(repr, imp); break; } } -- cgit v1.2.3 From 4f88ccdfed31eb06cfc0d362dc2cb8358bb65e34 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 12 Apr 2016 10:47:23 +0100 Subject: Bump ifdefs to 3.8 (now ifdefs say 3.0 instead of 3.2 or 3.8) (bzr r14788) --- src/svg-view-widget.cpp | 2 +- src/ui/dialog/ocaldialogs.cpp | 4 ++-- src/ui/dialog/ocaldialogs.h | 6 +++--- src/ui/widget/gimpcolorwheel.c | 2 +- src/widgets/eek-preview.cpp | 5 +++-- src/widgets/ruler.cpp | 7 ------- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index c568d3ca7..58e2b9dc9 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -100,7 +100,7 @@ static void sp_svg_view_widget_init(SPSVGSPViewWidget *vw) gtk_widget_set_style (vw->canvas, style); #endif -#if GTK_CHECK_VERSION(3,8,0) +#if GTK_CHECK_VERSION(3,0,0) gtk_container_add (GTK_CONTAINER (vw->sw), vw->canvas); #else gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (vw->sw), vw->canvas); diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index a1c7d41bd..f2ee79d06 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -573,7 +573,7 @@ void StatusWidget::end_process() clear(); } -#if !GTK_CHECK_VERSION(3,6,0) +#if !GTK_CHECK_VERSION(3,0,0) SearchEntry::SearchEntry() : Gtk::Entry() { signal_changed().connect(sigc::mem_fun(*this, &SearchEntry::_on_changed)); @@ -1222,7 +1222,7 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types label_not_found = new Gtk::Label(); label_description = new Gtk::Label(); -#if GTK_CHECK_VERSION(3,6,0) +#if GTK_CHECK_VERSION(3,0,0) entry_search = new Gtk::SearchEntry(); #else entry_search = new SearchEntry(); diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h index 6ceceb9ef..9de24d821 100644 --- a/src/ui/dialog/ocaldialogs.h +++ b/src/ui/dialog/ocaldialogs.h @@ -26,7 +26,7 @@ #include -#if GTK_CHECK_VERSION(3,6,0) +#if GTK_CHECK_VERSION(3,0,0) # include #endif @@ -336,7 +336,7 @@ public: Gtk::Label* label; }; -#if !GTK_CHECK_VERSION(3,6,0) +#if !GTK_CHECK_VERSION(3,0,0) /** * A Gtk::Entry with search & clear icons */ @@ -460,7 +460,7 @@ private: Glib::ustring filename_image; Glib::ustring filename_thumbnail; -#if GTK_CHECK_VERSION(3,6,0) +#if GTK_CHECK_VERSION(3,0,0) Gtk::SearchEntry *entry_search; #else SearchEntry *entry_search; diff --git a/src/ui/widget/gimpcolorwheel.c b/src/ui/widget/gimpcolorwheel.c index c857cfa8a..3642848df 100644 --- a/src/ui/widget/gimpcolorwheel.c +++ b/src/ui/widget/gimpcolorwheel.c @@ -1246,7 +1246,7 @@ paint_triangle (GimpColorWheel *wheel, #endif } -#if GTK_CHECK_VERSION(3,2,0) +#if GTK_CHECK_VERSION(3,0,0) static gboolean gimp_color_wheel_draw (GtkWidget *widget, cairo_t *cr) diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index 19dbb04ab..de14caa12 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -239,7 +239,7 @@ static gboolean eek_preview_draw(GtkWidget *widget, cairo_t *cr) { - GtkStyle *style = gtk_widget_get_style(widget); + EekPreview *preview = EEK_PREVIEW(widget); EekPreviewPrivate *priv = EEK_PREVIEW_GET_PRIVATE(preview); @@ -284,7 +284,8 @@ gboolean eek_preview_draw(GtkWidget *widget, 0, 0, allocation.width, allocation.height); #else - GdkWindow* window = gtk_widget_get_window(widget); + GtkStyle *style = gtk_widget_get_style(widget); + GdkWindow *window = gtk_widget_get_window(widget); gtk_paint_flat_box( style, window, diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 3a5e76277..0b473f173 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -284,17 +284,10 @@ sp_ruler_init (SPRuler *ruler) priv->font_scale = DEFAULT_RULER_FONT_SCALE; #if GTK_CHECK_VERSION(3,0,0) - #if GTK_CHECK_VERSION(3,8,0) const gchar *str = "SPRuler {\n" " background-color: @theme_bg_color;\n" "}\n"; - #else - const gchar *str = - "SPRuler {\n" - " background-color: @bg_color;\n" - "}\n"; - #endif GtkCssProvider *css = gtk_css_provider_new (); gtk_css_provider_load_from_data (css, str, -1, NULL); gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (ruler)), -- cgit v1.2.3 From 3ee1ba1e9a8019e98012bc77ff3953363b2fa17a Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 12 Apr 2016 12:28:18 +0200 Subject: Add option for larger icons (useful for 4K display). (bzr r14789) --- src/ui/dialog/inkscape-preferences.cpp | 5 +++-- src/widgets/icon.cpp | 8 ++++++++ src/widgets/toolbox.cpp | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index b20f71a6a..c7a168dee 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -613,8 +613,9 @@ void InkscapePreferences::initPageUI() _("Set the language for menus and number formats"), false); { - Glib::ustring sizeLabels[] = {C_("Icon size", "Large"), C_("Icon size", "Small"), C_("Icon size", "Smaller")}; - int sizeValues[] = {0, 1, 2}; + Glib::ustring sizeLabels[] = {C_("Icon size", "Larger"), C_("Icon size", "Large"), C_("Icon size", "Small"), C_("Icon size", "Smaller")}; + int sizeValues[] = {3, 0, 1, 2}; + // "Larger" is 3 to not break existing preference files. Should fix in GTK3 _misc_small_tools.init( "/toolbox/tools/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 ); _page_ui.add_line( false, _("Toolbox icon size:"), _misc_small_tools, "", diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 542d16797..f998cd66d 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -257,6 +257,14 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr) image = gtk_render_icon_pixbuf(gtk_widget_get_style_context(widget), source, (GtkIconSize)-1); + + // gtk_render_icon_pixbuf deprecated, replaced by: + // GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); + // image = gtk_icon_theme_load_icon (icon_theme, + // name, + // 32, + // 0, + // NULL); #else image = gtk_style_render_icon(gtk_widget_get_style(widget), source, gtk_widget_get_direction(widget), diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 3389f82f9..0697ff0fb 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -127,7 +127,8 @@ Inkscape::IconSize ToolboxFactory::prefToSize( Glib::ustring const &path, int ba static Inkscape::IconSize sizeChoices[] = { Inkscape::ICON_SIZE_LARGE_TOOLBAR, Inkscape::ICON_SIZE_SMALL_TOOLBAR, - Inkscape::ICON_SIZE_MENU + Inkscape::ICON_SIZE_MENU, + Inkscape::ICON_SIZE_DIALOG }; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int index = prefs->getIntLimited( path, base, 0, G_N_ELEMENTS(sizeChoices) ); -- cgit v1.2.3 From a907096a990015010ec1171cd8997d33951f28a2 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 12 Apr 2016 11:35:15 +0100 Subject: Hackfest 2016: un-obfuscate the SPCanvas widget. (bzr r14790) --- src/desktop.cpp | 4 +- src/display/sp-canvas.cpp | 898 ++++++++++++------------------ src/display/sp-canvas.h | 183 +++--- src/extension/dbus/document-interface.cpp | 4 +- src/extension/execution-env.cpp | 2 +- src/selection-chemistry.cpp | 4 +- src/ui/interface.cpp | 4 +- src/ui/tool/event-utils.cpp | 8 +- src/ui/tools/connector-tool.cpp | 4 +- src/widgets/desktop-widget.cpp | 16 +- 10 files changed, 495 insertions(+), 632 deletions(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 84a578ee9..331ab3351 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -501,7 +501,7 @@ void SPDesktop::redrawDesktop() { void SPDesktop::_setDisplayMode(Inkscape::RenderMode mode) { SP_CANVAS_ARENA (drawing)->drawing.setRenderMode(mode); - canvas->rendermode = mode; + canvas->_rendermode = mode; _display_mode = mode; redrawDesktop(); _widget->setTitle( this->getDocument()->getName() ); @@ -522,7 +522,7 @@ void SPDesktop::_setDisplayColorMode(Inkscape::ColorMode mode) { } SP_CANVAS_ARENA (drawing)->drawing.setColorMode(mode); - canvas->colorrendermode = mode; + canvas->_colorrendermode = mode; _display_color_mode = mode; redrawDesktop(); _widget->setTitle( this->getDocument()->getName() ); diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 81ea7d142..df84e379c 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -173,159 +173,8 @@ bool is_descendant(SPCanvasItem const *item, SPCanvasItem const *parent); guint item_signals[ITEM_LAST_SIGNAL] = { 0 }; -struct PaintRectSetup; - } // namespace -class SPCanvasImpl -{ -public: - - /** - * Helper that emits an event for an item in the canvas, be it the current - * item, grabbed item, or focused item, as appropriate. - */ - static int emitEvent(SPCanvas *canvas, GdkEvent *event); - - /** - * Helper that re-picks the current item in the canvas, based on the event's - * coordinates and emits enter/leave events for items as appropriate. - */ - static int pickCurrentItem(SPCanvas *canvas, GdkEvent *event); - - /** - * The canvas widget's realize callback. - */ - static void realize(GtkWidget *widget); - - /** - * The canvas widget's unrealize callback. - */ - static void unrealize(GtkWidget *widget); - - /** - * The canvas widget's size request callback. - */ -#if GTK_CHECK_VERSION(3,0,0) - static void getPreferredWidth(GtkWidget *widget, gint *min_w, gint *nat_w); - static void getPreferredHeight(GtkWidget *widget, gint *min_h, gint *nat_h); -#else - static void sizeRequest(GtkWidget *widget, GtkRequisition *req); -#endif - - /** - * The canvas widget's size allocate callback. - */ - static void sizeAllocate(GtkWidget *widget, GtkAllocation *allocation); - - /** - * Button event handler for the canvas. - */ - static gint button(GtkWidget *widget, GdkEventButton *event); - - /** - * Scroll event handler for the canvas. - * - * @todo FIXME: generate motion events to re-select items. - */ - static gint handleScroll(GtkWidget *widget, GdkEventScroll *event); - - /** - * Motion event handler for the canvas. - */ - static gint handleMotion(GtkWidget *widget, GdkEventMotion *event); - - /** - * The canvas widget's expose callback. - * - * @todo FIXME: function allways retruns false. - */ -#if GTK_CHECK_VERSION(3,0,0) - static gboolean handleDraw(GtkWidget *widget, cairo_t *cr); -#else - static gboolean handleExpose(GtkWidget *widget, GdkEventExpose *event); -#endif - - /** - * The canvas widget's keypress callback. - */ - static gint handleKeyEvent(GtkWidget *widget, GdkEventKey *event); - - /** - * Crossing event handler for the canvas. - */ - static gint handleCrossing(GtkWidget *widget, GdkEventCrossing *event); - - /** - * Focus in handler for the canvas. - */ - static gint handleFocusIn(GtkWidget *widget, GdkEventFocus *event); - - /** - * Focus out handler for the canvas. - */ - static gint handleFocusOut(GtkWidget *widget, GdkEventFocus *event); - - /** - * Helper that allocates a new tile array for the canvas, copying overlapping tiles from the old array - */ - static void sp_canvas_resize_tiles(SPCanvas* canvas, int nl, int nt, int nr, int nb); - - /** - * Helper that queues a canvas rectangle for redraw - */ - static void sp_canvas_dirty_rect(SPCanvas* canvas, Geom::IntRect const &area); - - /** - * Helper that marks specific canvas rectangle as clean (val == 0) or dirty (otherwise) - */ - static void sp_canvas_mark_rect(SPCanvas* canvas, Geom::IntRect const &area, uint8_t val); - - /** - * Helper that invokes update, paint, and repick on canvas. - */ - static int do_update(SPCanvas *canvas); - - static void sp_canvas_paint_single_buffer(SPCanvas *canvas, Geom::IntRect const &paint_rect, Geom::IntRect const &canvas_rect, int sw); - - /** - * Paint the given rect, recursively subdividing the region until it is the size of a single - * buffer. - * - * @return true if the drawing completes - */ - static int sp_canvas_paint_rect_internal(PaintRectSetup const *setup, Geom::IntRect const &this_rect); - - /** - * Helper that draws a specific rectangular part of the canvas. - * - * @return true if the rectangle painting succeeds. - */ - static bool sp_canvas_paint_rect(SPCanvas *canvas, int xx0, int yy0, int xx1, int yy1); - - /** - * Helper that repaints the areas in the canvas that need it. - * - * @return true if all the dirty parts have been redrawn - */ - static int paint(SPCanvas *canvas); - - /** - * Idle handler for the canvas that deals with pending updates and redraws. - */ - static gint idle_handler(gpointer data); - - /** - * Convenience function to add an idle handler to a canvas. - */ - static void add_idle(SPCanvas *canvas); - - /** - * Update callback for canvas widget. - */ - static void requestCanvasUpdate(SPCanvas *canvas); -}; - G_DEFINE_TYPE(SPCanvasItem, sp_canvas_item, G_TYPE_INITIALLY_UNOWNED); static void @@ -456,18 +305,18 @@ void sp_canvas_item_dispose(GObject *object) } item->visible = FALSE; - if (item == item->canvas->current_item) { - item->canvas->current_item = NULL; - item->canvas->need_repick = TRUE; + if (item == item->canvas->_current_item) { + item->canvas->_current_item = NULL; + item->canvas->_need_repick = TRUE; } - if (item == item->canvas->new_current_item) { - item->canvas->new_current_item = NULL; - item->canvas->need_repick = TRUE; + if (item == item->canvas->_new_current_item) { + item->canvas->_new_current_item = NULL; + item->canvas->_need_repick = TRUE; } - if (item == item->canvas->grabbed_item) { - item->canvas->grabbed_item = NULL; + if (item == item->canvas->_grabbed_item) { + item->canvas->_grabbed_item = NULL; #if GTK_CHECK_VERSION(3,0,0) GdkDeviceManager *dm = gdk_display_get_device_manager(gdk_display_get_default()); @@ -478,8 +327,8 @@ void sp_canvas_item_dispose(GObject *object) #endif } - if (item == item->canvas->focused_item) { - item->canvas->focused_item = NULL; + if (item == item->canvas->_focused_item) { + item->canvas->_focused_item = NULL; } if (item->parent) { @@ -577,11 +426,11 @@ void sp_canvas_item_affine_absolute(SPCanvasItem *item, Geom::Affine const &affi if (item->parent != NULL) { sp_canvas_item_request_update (item->parent); } else { - SPCanvasImpl::requestCanvasUpdate(item->canvas); + item->canvas->requestUpdate(); } } - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } /** @@ -614,7 +463,7 @@ void sp_canvas_item_raise(SPCanvasItem *item, int positions) parent->items.insert(l, item); redraw_if_visible (item); - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } void sp_canvas_item_raise_to_top(SPCanvasItem *item) @@ -627,7 +476,7 @@ void sp_canvas_item_raise_to_top(SPCanvasItem *item) parent->items.remove(item); parent->items.push_back(item); redraw_if_visible (item); - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } @@ -663,7 +512,7 @@ void sp_canvas_item_lower(SPCanvasItem *item, int positions) parent->items.insert(l, item); redraw_if_visible (item); - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } void sp_canvas_item_lower_to_bottom(SPCanvasItem *item) @@ -676,7 +525,7 @@ void sp_canvas_item_lower_to_bottom(SPCanvasItem *item) parent->items.remove(item); parent->items.push_front(item); redraw_if_visible (item); - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } bool sp_canvas_item_is_visible(SPCanvasItem *item) @@ -705,7 +554,7 @@ void sp_canvas_item_show(SPCanvasItem *item) if (x0 !=0 || x1 !=0 || y0 !=0 || y1 !=0) { item->canvas->requestRedraw((int)(item->x1), (int)(item->y1), (int)(item->x2 + 1), (int)(item->y2 + 1)); - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } } @@ -730,7 +579,7 @@ void sp_canvas_item_hide(SPCanvasItem *item) if (x0 !=0 || x1 !=0 || y0 !=0 || y1 !=0) { item->canvas->requestRedraw((int)item->x1, (int)item->y1, (int)(item->x2 + 1), (int)(item->y2 + 1)); - item->canvas->need_repick = TRUE; + item->canvas->_need_repick = TRUE; } } @@ -745,7 +594,7 @@ int sp_canvas_item_grab(SPCanvasItem *item, guint event_mask, GdkCursor *cursor, g_return_val_if_fail (SP_IS_CANVAS_ITEM (item), -1); g_return_val_if_fail (gtk_widget_get_mapped (GTK_WIDGET (item->canvas)), -1); - if (item->canvas->grabbed_item) { + if (item->canvas->_grabbed_item) { return -1; } @@ -780,9 +629,9 @@ int sp_canvas_item_grab(SPCanvasItem *item, guint event_mask, GdkCursor *cursor, NULL, cursor, etime); #endif - item->canvas->grabbed_item = item; - item->canvas->grabbed_event_mask = event_mask; - item->canvas->current_item = item; // So that events go to the grabbed item + item->canvas->_grabbed_item = item; + item->canvas->_grabbed_event_mask = event_mask; + item->canvas->_current_item = item; // So that events go to the grabbed item return 0; } @@ -799,11 +648,11 @@ void sp_canvas_item_ungrab(SPCanvasItem *item, guint32 etime) g_return_if_fail (item != NULL); g_return_if_fail (SP_IS_CANVAS_ITEM (item)); - if (item->canvas->grabbed_item != item) { + if (item->canvas->_grabbed_item != item) { return; } - item->canvas->grabbed_item = NULL; + item->canvas->_grabbed_item = NULL; #if GTK_CHECK_VERSION(3,0,0) GdkDeviceManager *dm = gdk_display_get_device_manager(gdk_display_get_default()); @@ -865,7 +714,7 @@ void sp_canvas_item_request_update(SPCanvasItem *item) sp_canvas_item_request_update (item->parent); } else { // Have reached the top of the tree, make sure the update call gets scheduled. - SPCanvasImpl::requestCanvasUpdate(item->canvas); + item->canvas->requestUpdate(); } } @@ -955,10 +804,10 @@ double SPCanvasGroup::point(SPCanvasItem *item, Geom::Point p, SPCanvasItem **ac SPCanvasGroup const *group = SP_CANVAS_GROUP(item); double const x = p[Geom::X]; double const y = p[Geom::Y]; - int x1 = (int)(x - item->canvas->close_enough); - int y1 = (int)(y - item->canvas->close_enough); - int x2 = (int)(x + item->canvas->close_enough); - int y2 = (int)(y + item->canvas->close_enough); + int x1 = (int)(x - item->canvas->_close_enough); + int y1 = (int)(y - item->canvas->_close_enough); + int x2 = (int)(x + item->canvas->_close_enough); + int y2 = (int)(y + item->canvas->_close_enough); double best = 0.0; *actual_item = NULL; @@ -984,7 +833,7 @@ double SPCanvasGroup::point(SPCanvasItem *item, Geom::Point p, SPCanvasItem **ac // of the item to be focused, and have that one selected. Of course this will only work if the // centers are not coincident, but at least it's better than what we have now. // See the extensive comment in Inkscape::SelTrans::_updateHandles() - if (pickable && point_item && ((int) (dist + 0.5) <= item->canvas->close_enough)) { + if (pickable && point_item && ((int) (dist + 0.5) <= item->canvas->_close_enough)) { best = dist; *actual_item = point_item; } @@ -1049,135 +898,117 @@ void SPCanvasGroup::remove(SPCanvasItem *item) } -static void sp_canvas_dispose (GObject *object); -static void sp_canvas_shutdown_transients(SPCanvas *canvas); - G_DEFINE_TYPE(SPCanvas, sp_canvas, GTK_TYPE_WIDGET); -static void -sp_canvas_class_init(SPCanvasClass *klass) +void sp_canvas_class_init(SPCanvasClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); - object_class->dispose = sp_canvas_dispose; + object_class->dispose = SPCanvas::dispose; - widget_class->realize = SPCanvasImpl::realize; - widget_class->unrealize = SPCanvasImpl::unrealize; + widget_class->realize = SPCanvas::handle_realize; + widget_class->unrealize = SPCanvas::handle_unrealize; #if GTK_CHECK_VERSION(3,0,0) - widget_class->get_preferred_width = SPCanvasImpl::getPreferredWidth; - widget_class->get_preferred_height = SPCanvasImpl::getPreferredHeight; - widget_class->draw = SPCanvasImpl::handleDraw; + widget_class->get_preferred_width = SPCanvas::handle_get_preferred_width; + widget_class->get_preferred_height = SPCanvas::handle_get_preferred_height; + widget_class->draw = SPCanvas::handle_draw; #else - widget_class->size_request = SPCanvasImpl::sizeRequest; - widget_class->expose_event = SPCanvasImpl::handleExpose; + widget_class->size_request = SPCanvas::handle_size_request; + widget_class->expose_event = SPCanvas::handle_expose; #endif - widget_class->size_allocate = SPCanvasImpl::sizeAllocate; - widget_class->button_press_event = SPCanvasImpl::button; - widget_class->button_release_event = SPCanvasImpl::button; - widget_class->motion_notify_event = SPCanvasImpl::handleMotion; - widget_class->scroll_event = SPCanvasImpl::handleScroll; - widget_class->key_press_event = SPCanvasImpl::handleKeyEvent; - widget_class->key_release_event = SPCanvasImpl::handleKeyEvent; - widget_class->enter_notify_event = SPCanvasImpl::handleCrossing; - widget_class->leave_notify_event = SPCanvasImpl::handleCrossing; - widget_class->focus_in_event = SPCanvasImpl::handleFocusIn; - widget_class->focus_out_event = SPCanvasImpl::handleFocusOut; + widget_class->size_allocate = SPCanvas::handle_size_allocate; + widget_class->button_press_event = SPCanvas::handle_button; + widget_class->button_release_event = SPCanvas::handle_button; + widget_class->motion_notify_event = SPCanvas::handle_motion; + widget_class->scroll_event = SPCanvas::handle_scroll; + widget_class->key_press_event = SPCanvas::handle_key_event; + widget_class->key_release_event = SPCanvas::handle_key_event; + widget_class->enter_notify_event = SPCanvas::handle_crossing; + widget_class->leave_notify_event = SPCanvas::handle_crossing; + widget_class->focus_in_event = SPCanvas::handle_focus_in; + widget_class->focus_out_event = SPCanvas::handle_focus_out; } -static void -sp_canvas_init(SPCanvas *canvas) +static void sp_canvas_init(SPCanvas *canvas) { gtk_widget_set_has_window (GTK_WIDGET (canvas), TRUE); gtk_widget_set_double_buffered (GTK_WIDGET (canvas), FALSE); gtk_widget_set_can_focus (GTK_WIDGET (canvas), TRUE); - canvas->pick_event.type = GDK_LEAVE_NOTIFY; - canvas->pick_event.crossing.x = 0; - canvas->pick_event.crossing.y = 0; + canvas->_pick_event.type = GDK_LEAVE_NOTIFY; + canvas->_pick_event.crossing.x = 0; + canvas->_pick_event.crossing.y = 0; // Create the root item as a special case - canvas->root = SP_CANVAS_ITEM(g_object_new(SP_TYPE_CANVAS_GROUP, NULL)); - canvas->root->canvas = canvas; + canvas->_root = SP_CANVAS_ITEM(g_object_new(SP_TYPE_CANVAS_GROUP, NULL)); + canvas->_root->canvas = canvas; - g_object_ref (canvas->root); - g_object_ref_sink (canvas->root); + g_object_ref (canvas->_root); + g_object_ref_sink (canvas->_root); - canvas->need_repick = TRUE; + canvas->_need_repick = TRUE; // See comment at in sp-canvas.h. - canvas->gen_all_enter_events = false; + canvas->_gen_all_enter_events = false; - canvas->drawing_disabled = false; + canvas->_drawing_disabled = false; - canvas->tiles=NULL; - canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0; - canvas->tileH=canvas->tileV=0; + canvas->_tiles=NULL; + canvas->_tLeft=canvas->_tTop=canvas->_tRight=canvas->_tBottom=0; + canvas->_tile_h=canvas->_tile_h=0; - canvas->forced_redraw_count = 0; - canvas->forced_redraw_limit = -1; + canvas->_forced_redraw_count = 0; + canvas->_forced_redraw_limit = -1; #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - canvas->enable_cms_display_adj = false; - new (&canvas->cms_key) Glib::ustring(""); + canvas->_enable_cms_display_adj = false; + new (&canvas->_cms_key) Glib::ustring(""); #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - canvas->is_scrolling = false; + canvas->_is_scrolling = false; } -static void sp_canvas_remove_idle(SPCanvas *canvas) -{ - if (canvas->idle_id) { - g_source_remove (canvas->idle_id); - canvas->idle_id = 0; - } -} - -static void -sp_canvas_shutdown_transients(SPCanvas *canvas) +void SPCanvas::shutdownTransients() { // We turn off the need_redraw flag, since if the canvas is mapped again // it will request a redraw anyways. We do not turn off the need_update // flag, though, because updates are not queued when the canvas remaps // itself. // - if (canvas->need_redraw) { - canvas->need_redraw = FALSE; - } - if ( canvas->tiles ) g_free(canvas->tiles); - canvas->tiles=NULL; - canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0; - canvas->tileH=canvas->tileV=0; - - if (canvas->grabbed_item) { - canvas->grabbed_item = NULL; + _need_redraw = FALSE; + if (_tiles) g_free(_tiles); + _tiles = NULL; + _tLeft = _tTop = _tRight = _tBottom = 0; + _tile_h = _tile_h = 0; + + if (_grabbed_item) { + _grabbed_item = NULL; #if GTK_CHECK_VERSION(3,0,0) GdkDeviceManager *dm = gdk_display_get_device_manager(gdk_display_get_default()); GdkDevice *device = gdk_device_manager_get_client_pointer(dm); gdk_device_ungrab(device, GDK_CURRENT_TIME); #else - gdk_pointer_ungrab (GDK_CURRENT_TIME); + gdk_pointer_ungrab(GDK_CURRENT_TIME); #endif } - - sp_canvas_remove_idle(canvas); + removeIdle(); } -static void -sp_canvas_dispose(GObject *object) +void SPCanvas::dispose(GObject *object) { SPCanvas *canvas = SP_CANVAS(object); - if (canvas->root) { - g_object_unref (canvas->root); - canvas->root = NULL; + if (canvas->_root) { + g_object_unref (canvas->_root); + canvas->_root = NULL; } - sp_canvas_shutdown_transients(canvas); + canvas->shutdownTransients(); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - canvas->cms_key.~ustring(); + canvas->_cms_key.~ustring(); #endif if (G_OBJECT_CLASS(sp_canvas_parent_class)->dispose) { (* G_OBJECT_CLASS(sp_canvas_parent_class)->dispose)(object); @@ -1203,7 +1034,7 @@ GtkWidget *SPCanvas::createAA() return GTK_WIDGET(canvas); } -void SPCanvasImpl::realize(GtkWidget *widget) +void SPCanvas::handle_realize(GtkWidget *widget) { GdkWindowAttr attributes; GtkAllocation allocation; @@ -1264,15 +1095,15 @@ void SPCanvasImpl::realize(GtkWidget *widget) gtk_widget_set_realized (widget, TRUE); } -void SPCanvasImpl::unrealize(GtkWidget *widget) +void SPCanvas::handle_unrealize(GtkWidget *widget) { SPCanvas *canvas = SP_CANVAS (widget); - canvas->current_item = NULL; - canvas->grabbed_item = NULL; - canvas->focused_item = NULL; + canvas->_current_item = NULL; + canvas->_grabbed_item = NULL; + canvas->_focused_item = NULL; - sp_canvas_shutdown_transients(canvas); + canvas->shutdownTransients(); if (GTK_WIDGET_CLASS(sp_canvas_parent_class)->unrealize) (* GTK_WIDGET_CLASS(sp_canvas_parent_class)->unrealize)(widget); @@ -1280,21 +1111,21 @@ void SPCanvasImpl::unrealize(GtkWidget *widget) #if GTK_CHECK_VERSION(3,0,0) -void SPCanvasImpl::getPreferredWidth(GtkWidget *widget, gint *minimum_width, gint *natural_width) +void SPCanvas::handle_get_preferred_width(GtkWidget *widget, gint *minimum_width, gint *natural_width) { static_cast(SP_CANVAS (widget)); *minimum_width = 256; *natural_width = 256; } -void SPCanvasImpl::getPreferredHeight(GtkWidget *widget, gint *minimum_height, gint *natural_height) +void SPCanvas::handle_get_preferred_height(GtkWidget *widget, gint *minimum_height, gint *natural_height) { static_cast(SP_CANVAS (widget)); *minimum_height = 256; *natural_height = 256; } #else -void SPCanvasImpl::sizeRequest(GtkWidget *widget, GtkRequisition *req) +void SPCanvas::handle_size_request(GtkWidget *widget, GtkRequisition *req) { static_cast(SP_CANVAS (widget)); @@ -1304,7 +1135,7 @@ void SPCanvasImpl::sizeRequest(GtkWidget *widget, GtkRequisition *req) #endif -void SPCanvasImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation) +void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { SPCanvas *canvas = SP_CANVAS (widget); GtkAllocation widg_allocation; @@ -1314,25 +1145,25 @@ void SPCanvasImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation) // Geom::IntRect old_area = Geom::IntRect::from_xywh(canvas->x0, canvas->y0, // widg_allocation.width, widg_allocation.height); - Geom::IntRect new_area = Geom::IntRect::from_xywh(canvas->x0, canvas->y0, + Geom::IntRect new_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, allocation->width, allocation->height); // Schedule redraw of new region - sp_canvas_resize_tiles(canvas,canvas->x0,canvas->y0,canvas->x0+allocation->width,canvas->y0+allocation->height); - if (SP_CANVAS_ITEM_GET_CLASS (canvas->root)->viewbox_changed) - SP_CANVAS_ITEM_GET_CLASS (canvas->root)->viewbox_changed (canvas->root, new_area); - + canvas->resizeTiles(canvas->_x0, canvas->_y0, canvas->_x0 + allocation->width, canvas->_y0 + allocation->height); + if (SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed) + SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed (canvas->_root, new_area); + if (allocation->width > widg_allocation.width) { - canvas->requestRedraw(canvas->x0 + widg_allocation.width, + canvas->requestRedraw(canvas->_x0 + widg_allocation.width, 0, - canvas->x0 + allocation->width, - canvas->y0 + allocation->height); + canvas->_x0 + allocation->width, + canvas->_y0 + allocation->height); } if (allocation->height > widg_allocation.height) { canvas->requestRedraw(0, - canvas->y0 + widg_allocation.height, - canvas->x0 + allocation->width, - canvas->y0 + allocation->height); + canvas->_y0 + widg_allocation.height, + canvas->_x0 + allocation->width, + canvas->_y0 + allocation->height); } gtk_widget_set_allocation (widget, allocation); @@ -1344,11 +1175,11 @@ void SPCanvasImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation) } } -int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event) +int SPCanvas::emitEvent(GdkEvent *event) { guint mask; - if (canvas->grabbed_item) { + if (_grabbed_item) { switch (event->type) { case GDK_ENTER_NOTIFY: mask = GDK_ENTER_NOTIFY_MASK; @@ -1384,7 +1215,7 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event) break; } - if (!(mask & canvas->grabbed_event_mask)) return FALSE; + if (!(mask & _grabbed_event_mask)) return FALSE; } // Convert to world coordinates -- we have two cases because of different @@ -1395,25 +1226,25 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event) switch (ev->type) { case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: - ev->crossing.x += canvas->x0; - ev->crossing.y += canvas->y0; + ev->crossing.x += _x0; + ev->crossing.y += _y0; break; case GDK_MOTION_NOTIFY: case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: case GDK_3BUTTON_PRESS: case GDK_BUTTON_RELEASE: - ev->motion.x += canvas->x0; - ev->motion.y += canvas->y0; + ev->motion.x += _x0; + ev->motion.y += _y0; break; default: break; } // Block Undo and Redo while we drag /anything/ if(event->type == GDK_BUTTON_PRESS && event->button.button == 1) - canvas->is_dragging = true; + _is_dragging = true; else if(event->type == GDK_BUTTON_RELEASE) - canvas->is_dragging = false; + _is_dragging = false; // Choose where we send the event @@ -1422,17 +1253,17 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event) // Lauris applied to SP to get around the problem. // SPCanvasItem* item = NULL; - if (canvas->grabbed_item && !is_descendant (canvas->current_item, canvas->grabbed_item)) { - item = canvas->grabbed_item; + if (_grabbed_item && !is_descendant(_current_item, _grabbed_item)) { + item = _grabbed_item; } else { - item = canvas->current_item; + item = _current_item; } - if (canvas->focused_item && + if (_focused_item && ((event->type == GDK_KEY_PRESS) || (event->type == GDK_KEY_RELEASE) || (event->type == GDK_FOCUS_CHANGE))) { - item = canvas->focused_item; + item = _focused_item; } // The event is propagated up the hierarchy (for if someone connected to @@ -1454,24 +1285,24 @@ int SPCanvasImpl::emitEvent(SPCanvas *canvas, GdkEvent *event) return finished; } -int SPCanvasImpl::pickCurrentItem(SPCanvas *canvas, GdkEvent *event) +int SPCanvas::pickCurrentItem(GdkEvent *event) { int button_down = 0; - if (!canvas->root) // canvas may have already be destroyed by closing desktop during interrupted display! + if (!_root) // canvas may have already be destroyed by closing desktop during interrupted display! return FALSE; int retval = FALSE; - if (canvas->gen_all_enter_events == false) { + if (_gen_all_enter_events == false) { // If a button is down, we'll perform enter and leave events on the // current item, but not enter on any other item. This is more or // less like X pointer grabbing for canvas items. // - button_down = canvas->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | + button_down = _state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK | GDK_BUTTON4_MASK | GDK_BUTTON5_MASK); - if (!button_down) canvas->left_grabbed_item = FALSE; + if (!button_down) _left_grabbed_item = FALSE; } // Save the event in the canvas. This is used to synthesize enter and @@ -1479,116 +1310,115 @@ int SPCanvasImpl::pickCurrentItem(SPCanvas *canvas, GdkEvent *event) // re-pick the current item if the current one gets deleted. Also, // synthesize an enter event. - if (event != &canvas->pick_event) { + if (event != &_pick_event) { if ((event->type == GDK_MOTION_NOTIFY) || (event->type == GDK_BUTTON_RELEASE)) { // these fields have the same offsets in both types of events - canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY; - canvas->pick_event.crossing.window = event->motion.window; - canvas->pick_event.crossing.send_event = event->motion.send_event; - canvas->pick_event.crossing.subwindow = NULL; - canvas->pick_event.crossing.x = event->motion.x; - canvas->pick_event.crossing.y = event->motion.y; - canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL; - canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; - canvas->pick_event.crossing.focus = FALSE; - canvas->pick_event.crossing.state = event->motion.state; + _pick_event.crossing.type = GDK_ENTER_NOTIFY; + _pick_event.crossing.window = event->motion.window; + _pick_event.crossing.send_event = event->motion.send_event; + _pick_event.crossing.subwindow = NULL; + _pick_event.crossing.x = event->motion.x; + _pick_event.crossing.y = event->motion.y; + _pick_event.crossing.mode = GDK_CROSSING_NORMAL; + _pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR; + _pick_event.crossing.focus = FALSE; + _pick_event.crossing.state = event->motion.state; // these fields don't have the same offsets in both types of events if (event->type == GDK_MOTION_NOTIFY) { - canvas->pick_event.crossing.x_root = event->motion.x_root; - canvas->pick_event.crossing.y_root = event->motion.y_root; + _pick_event.crossing.x_root = event->motion.x_root; + _pick_event.crossing.y_root = event->motion.y_root; } else { - canvas->pick_event.crossing.x_root = event->button.x_root; - canvas->pick_event.crossing.y_root = event->button.y_root; + _pick_event.crossing.x_root = event->button.x_root; + _pick_event.crossing.y_root = event->button.y_root; } } else { - canvas->pick_event = *event; + _pick_event = *event; } } // Don't do anything else if this is a recursive call - if (canvas->in_repick) { + if (_in_repick) { return retval; } // LeaveNotify means that there is no current item, so we don't look for one - if (canvas->pick_event.type != GDK_LEAVE_NOTIFY) { + if (_pick_event.type != GDK_LEAVE_NOTIFY) { // these fields don't have the same offsets in both types of events double x, y; - if (canvas->pick_event.type == GDK_ENTER_NOTIFY) { - x = canvas->pick_event.crossing.x; - y = canvas->pick_event.crossing.y; + if (_pick_event.type == GDK_ENTER_NOTIFY) { + x = _pick_event.crossing.x; + y = _pick_event.crossing.y; } else { - x = canvas->pick_event.motion.x; - y = canvas->pick_event.motion.y; + x = _pick_event.motion.x; + y = _pick_event.motion.y; } // world coords - x += canvas->x0; - y += canvas->y0; + x += _x0; + y += _y0; // find the closest item - if (canvas->root->visible) { - sp_canvas_item_invoke_point (canvas->root, Geom::Point(x, y), &canvas->new_current_item); + if (_root->visible) { + sp_canvas_item_invoke_point (_root, Geom::Point(x, y), &_new_current_item); } else { - canvas->new_current_item = NULL; + _new_current_item = NULL; } } else { - canvas->new_current_item = NULL; + _new_current_item = NULL; } - if ((canvas->new_current_item == canvas->current_item) && !canvas->left_grabbed_item) { + if ((_new_current_item == _current_item) && !_left_grabbed_item) { return retval; // current item did not change } // Synthesize events for old and new current items - if ((canvas->new_current_item != canvas->current_item) - && (canvas->current_item != NULL) - && !canvas->left_grabbed_item) { + if ((_new_current_item != _current_item) && + _current_item != NULL && !_left_grabbed_item) + { GdkEvent new_event; - new_event = canvas->pick_event; + new_event = _pick_event; new_event.type = GDK_LEAVE_NOTIFY; new_event.crossing.detail = GDK_NOTIFY_ANCESTOR; new_event.crossing.subwindow = NULL; - canvas->in_repick = TRUE; - retval = emitEvent(canvas, &new_event); - canvas->in_repick = FALSE; + _in_repick = TRUE; + retval = emitEvent(&new_event); + _in_repick = FALSE; } - if (canvas->gen_all_enter_events == false) { + if (_gen_all_enter_events == false) { // new_current_item may have been set to NULL during the call to // emitEvent() above - if ((canvas->new_current_item != canvas->current_item) && button_down) { - canvas->left_grabbed_item = TRUE; + if ((_new_current_item != _current_item) && button_down) { + _left_grabbed_item = TRUE; return retval; } } // Handle the rest of cases + _left_grabbed_item = FALSE; + _current_item = _new_current_item; - canvas->left_grabbed_item = FALSE; - canvas->current_item = canvas->new_current_item; - - if (canvas->current_item != NULL) { + if (_current_item != NULL) { GdkEvent new_event; - new_event = canvas->pick_event; + new_event = _pick_event; new_event.type = GDK_ENTER_NOTIFY; new_event.crossing.detail = GDK_NOTIFY_ANCESTOR; new_event.crossing.subwindow = NULL; - retval = emitEvent(canvas, &new_event); + retval = emitEvent(&new_event); } return retval; } -gint SPCanvasImpl::button(GtkWidget *widget, GdkEventButton *event) +gint SPCanvas::handle_button(GtkWidget *widget, GdkEventButton *event) { SPCanvas *canvas = SP_CANVAS (widget); @@ -1596,7 +1426,7 @@ gint SPCanvasImpl::button(GtkWidget *widget, GdkEventButton *event) // dispatch normally regardless of the event's window if an item // has a pointer grab in effect - if (!canvas->grabbed_item && + if (!canvas->_grabbed_item && event->window != getWindow(canvas)) return retval; @@ -1628,21 +1458,21 @@ gint SPCanvasImpl::button(GtkWidget *widget, GdkEventButton *event) // Pick the current item as if the button were not pressed, and // then process the event. // - canvas->state = event->state; - pickCurrentItem(canvas, reinterpret_cast(event)); - canvas->state ^= mask; - retval = emitEvent(canvas, (GdkEvent *) event); + canvas->_state = event->state; + canvas->pickCurrentItem(reinterpret_cast(event)); + canvas->_state ^= mask; + retval = canvas->emitEvent((GdkEvent *) event); break; case GDK_BUTTON_RELEASE: // Process the event as if the button were pressed, then repick // after the button has been released // - canvas->state = event->state; - retval = emitEvent(canvas, (GdkEvent *) event); + canvas->_state = event->state; + retval = canvas->emitEvent((GdkEvent *) event); event->state ^= mask; - canvas->state = event->state; - pickCurrentItem(canvas, reinterpret_cast(event)); + canvas->_state = event->state; + canvas->pickCurrentItem(reinterpret_cast(event)); event->state ^= mask; break; @@ -1654,9 +1484,9 @@ gint SPCanvasImpl::button(GtkWidget *widget, GdkEventButton *event) return retval; } -gint SPCanvasImpl::handleScroll(GtkWidget *widget, GdkEventScroll *event) +gint SPCanvas::handle_scroll(GtkWidget *widget, GdkEventScroll *event) { - return emitEvent(SP_CANVAS(widget), reinterpret_cast(event)); + return SP_CANVAS(widget)->emitEvent(reinterpret_cast(event)); } static inline void request_motions(GdkWindow *w, GdkEventMotion *event) { @@ -1670,7 +1500,7 @@ static inline void request_motions(GdkWindow *w, GdkEventMotion *event) { gdk_event_request_motions(event); } -int SPCanvasImpl::handleMotion(GtkWidget *widget, GdkEventMotion *event) +int SPCanvas::handle_motion(GtkWidget *widget, GdkEventMotion *event) { int status; SPCanvas *canvas = SP_CANVAS (widget); @@ -1681,12 +1511,12 @@ int SPCanvasImpl::handleMotion(GtkWidget *widget, GdkEventMotion *event) return FALSE; } - if (canvas->root == NULL) // canvas being deleted + if (canvas->_root == NULL) // canvas being deleted return FALSE; - canvas->state = event->state; - pickCurrentItem(canvas, reinterpret_cast(event)); - status = emitEvent(canvas, reinterpret_cast(event)); + canvas->_state = event->state; + canvas->pickCurrentItem(reinterpret_cast(event)); + status = canvas->emitEvent(reinterpret_cast(event)); if (event->is_hint) { request_motions(gtk_widget_get_window (widget), event); } @@ -1694,12 +1524,12 @@ int SPCanvasImpl::handleMotion(GtkWidget *widget, GdkEventMotion *event) return status; } -void SPCanvasImpl::sp_canvas_paint_single_buffer(SPCanvas *canvas, Geom::IntRect const &paint_rect, Geom::IntRect const &canvas_rect, int /*sw*/) +void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect const &canvas_rect, int /*sw*/) { - GtkWidget *widget = GTK_WIDGET (canvas); + GtkWidget *widget = GTK_WIDGET (this); // Mark the region clean - sp_canvas_mark_rect(canvas, paint_rect, 0); + markRect(paint_rect, 0); SPCanvasBuf buf; buf.buf = NULL; @@ -1709,16 +1539,6 @@ void SPCanvasImpl::sp_canvas_paint_single_buffer(SPCanvas *canvas, Geom::IntRect buf.is_empty = true; //buf.ct = gdk_cairo_create(widget->window); - /* - cairo_t *xctt = gdk_cairo_create(widget->window); - cairo_translate(xctt, paint_rect.left() - canvas->x0, paint_rect.top() - canvas->y0); - cairo_set_source_rgb(xctt, 1,0,0); - cairo_rectangle(xctt, 0, 0, paint_rect.width(), paint_rect.height()); - cairo_fill(xctt); - cairo_destroy(xctt); - // - */ - // create temporary surface cairo_surface_t *imgs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, paint_rect.width(), paint_rect.height()); buf.ct = cairo_create(imgs); @@ -1749,20 +1569,20 @@ void SPCanvasImpl::sp_canvas_paint_single_buffer(SPCanvas *canvas, Geom::IntRect cairo_paint(buf.ct); cairo_set_operator(buf.ct, CAIRO_OPERATOR_OVER); - if (canvas->root->visible) { - SP_CANVAS_ITEM_GET_CLASS (canvas->root)->render (canvas->root, &buf); + if (_root->visible) { + SP_CANVAS_ITEM_GET_CLASS(_root)->render(_root, &buf); } // output to X cairo_destroy(buf.ct); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - if (canvas->enable_cms_display_adj) { + if (_enable_cms_display_adj) { cmsHTRANSFORM transf = 0; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); bool fromDisplay = prefs->getBool( "/options/displayprofile/from_display"); if ( fromDisplay ) { - transf = Inkscape::CMSSystem::getDisplayPer( canvas->cms_key ); + transf = Inkscape::CMSSystem::getDisplayPer(_cms_key); } else { transf = Inkscape::CMSSystem::getDisplayTransform(); } @@ -1781,7 +1601,7 @@ void SPCanvasImpl::sp_canvas_paint_single_buffer(SPCanvas *canvas, Geom::IntRect #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) cairo_t *xct = gdk_cairo_create(gtk_widget_get_window (widget)); - cairo_translate(xct, paint_rect.left() - canvas->x0, paint_rect.top() - canvas->y0); + cairo_translate(xct, paint_rect.left() - _x0, paint_rect.top() - _y0); cairo_rectangle(xct, 0, 0, paint_rect.width(), paint_rect.height()); cairo_clip(xct); cairo_set_source_surface(xct, imgs, 0, 0); @@ -1789,26 +1609,16 @@ void SPCanvasImpl::sp_canvas_paint_single_buffer(SPCanvas *canvas, Geom::IntRect cairo_paint(xct); cairo_destroy(xct); cairo_surface_destroy(imgs); - - //cairo_surface_t *cst = cairo_get_target(buf.ct); - //cairo_destroy (buf.ct); - //cairo_surface_finish (cst); - //cairo_surface_destroy (cst); } -namespace { - struct PaintRectSetup { - SPCanvas* canvas; Geom::IntRect big_rect; GTimeVal start_time; int max_pixels; Geom::Point mouse_loc; }; -}// namespace - -int SPCanvasImpl::sp_canvas_paint_rect_internal(PaintRectSetup const *setup, Geom::IntRect const &this_rect) +int SPCanvas::paintRectInternal(PaintRectSetup const *setup, Geom::IntRect const &this_rect) { GTimeVal now; g_get_current_time (&now); @@ -1831,11 +1641,11 @@ int SPCanvasImpl::sp_canvas_paint_rect_internal(PaintRectSetup const *setup, Geo // If this limit is set, and if we have aborted redraw more times than is allowed, // interrupting is blocked and we're forced to redraw full screen once // (after which we can again interrupt forced_redraw_limit times). - if (setup->canvas->forced_redraw_limit < 0 || - setup->canvas->forced_redraw_count < setup->canvas->forced_redraw_limit) { + if (_forced_redraw_limit < 0 || + _forced_redraw_count < _forced_redraw_limit) { - if (setup->canvas->forced_redraw_limit != -1) { - setup->canvas->forced_redraw_count++; + if (_forced_redraw_limit != -1) { + _forced_redraw_count++; } return false; @@ -1861,8 +1671,7 @@ int SPCanvasImpl::sp_canvas_paint_rect_internal(PaintRectSetup const *setup, Geo gdk_window_begin_paint_rect(window, &r); */ - sp_canvas_paint_single_buffer (setup->canvas, - this_rect, setup->big_rect, bw); + paintSingleBuffer(this_rect, setup->big_rect, bw); //gdk_window_end_paint(window); return 1; } @@ -1894,11 +1703,11 @@ The default for now is the strips mode. if (setup->mouse_loc[Geom::X] < mid) { // Always paint towards the mouse first - return sp_canvas_paint_rect_internal(setup, lo) - && sp_canvas_paint_rect_internal(setup, hi); + return paintRectInternal(setup, lo) + && paintRectInternal(setup, hi); } else { - return sp_canvas_paint_rect_internal(setup, hi) - && sp_canvas_paint_rect_internal(setup, lo); + return paintRectInternal(setup, hi) + && paintRectInternal(setup, lo); } } else { int mid = this_rect[Geom::Y].middle(); @@ -1910,24 +1719,24 @@ The default for now is the strips mode. if (setup->mouse_loc[Geom::Y] < mid) { // Always paint towards the mouse first - return sp_canvas_paint_rect_internal(setup, lo) - && sp_canvas_paint_rect_internal(setup, hi); + return paintRectInternal(setup, lo) + && paintRectInternal(setup, hi); } else { - return sp_canvas_paint_rect_internal(setup, hi) - && sp_canvas_paint_rect_internal(setup, lo); + return paintRectInternal(setup, hi) + && paintRectInternal(setup, lo); } } } -bool SPCanvasImpl::sp_canvas_paint_rect(SPCanvas *canvas, int xx0, int yy0, int xx1, int yy1) +bool SPCanvas::paintRect(int xx0, int yy0, int xx1, int yy1) { GtkAllocation allocation; - g_return_val_if_fail (!canvas->need_update, false); + g_return_val_if_fail (!_need_update, false); - gtk_widget_get_allocation (GTK_WIDGET (canvas), &allocation); + gtk_widget_get_allocation(GTK_WIDGET(this), &allocation); - Geom::IntRect canvas_rect = Geom::IntRect::from_xywh(canvas->x0, canvas->y0, + Geom::IntRect canvas_rect = Geom::IntRect::from_xywh(_x0, _y0, allocation.width, allocation.height); Geom::IntRect paint_rect(xx0, yy0, xx1, yy1); @@ -1937,8 +1746,6 @@ bool SPCanvasImpl::sp_canvas_paint_rect(SPCanvas *canvas, int xx0, int yy0, int paint_rect = *area; PaintRectSetup setup; - - setup.canvas = canvas; setup.big_rect = paint_rect; // Save the mouse location @@ -1948,16 +1755,16 @@ bool SPCanvasImpl::sp_canvas_paint_rect(SPCanvas *canvas, int xx0, int yy0, int GdkDeviceManager *dm = gdk_display_get_device_manager(gdk_display_get_default()); GdkDevice *device = gdk_device_manager_get_client_pointer(dm); - gdk_window_get_device_position(gtk_widget_get_window(GTK_WIDGET(canvas)), + gdk_window_get_device_position(gtk_widget_get_window(GTK_WIDGET(this)), device, &x, &y, NULL); #else - gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET(canvas)), &x, &y, NULL); + gdk_window_get_pointer(gtk_widget_get_window(GTK_WIDGET(this)), &x, &y, NULL); #endif - setup.mouse_loc = sp_canvas_window_to_world (canvas, Geom::Point(x,y)); + setup.mouse_loc = sp_canvas_window_to_world(this, Geom::Point(x,y)); - if (canvas->rendermode != Inkscape::RENDERMODE_OUTLINE) { + if (_rendermode != Inkscape::RENDERMODE_OUTLINE) { // use 256K as a compromise to not slow down gradients // 256K is the cached buffer and we need 4 channels setup.max_pixels = 65536; // 256K/4 @@ -1971,41 +1778,41 @@ bool SPCanvasImpl::sp_canvas_paint_rect(SPCanvas *canvas, int xx0, int yy0, int g_get_current_time(&(setup.start_time)); // Go - return sp_canvas_paint_rect_internal(&setup, paint_rect); + return paintRectInternal(&setup, paint_rect); } void SPCanvas::forceFullRedrawAfterInterruptions(unsigned int count) { - forced_redraw_limit = count; - forced_redraw_count = 0; + _forced_redraw_limit = count; + _forced_redraw_count = 0; } void SPCanvas::endForcedFullRedraws() { - forced_redraw_limit = -1; + _forced_redraw_limit = -1; } #if GTK_CHECK_VERSION(3,0,0) -gboolean SPCanvasImpl::handleDraw(GtkWidget *widget, cairo_t *cr) { - SPCanvas *canvas = SP_CANVAS(widget); +gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { + SPCanvas *canvas = SP_CANVAS(widget); - cairo_rectangle_list_t *rects = cairo_copy_clip_rectangle_list(cr); + cairo_rectangle_list_t *rects = cairo_copy_clip_rectangle_list(cr); - for (int i = 0; i < rects->num_rectangles; i++) { - cairo_rectangle_t rectangle = rects->rectangles[i]; + for (int i = 0; i < rects->num_rectangles; i++) { + cairo_rectangle_t rectangle = rects->rectangles[i]; - Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->x0, rectangle.y + canvas->y0, - rectangle.width, rectangle.height); + Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, + rectangle.width, rectangle.height); - canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); - } + canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); + } - cairo_rectangle_list_destroy(rects); + cairo_rectangle_list_destroy(rects); return FALSE; } #else -gboolean SPCanvasImpl::handleExpose(GtkWidget *widget, GdkEventExpose *event) +gboolean SPCanvas::handle_expose(GtkWidget *widget, GdkEventExpose *event) { SPCanvas *canvas = SP_CANVAS(widget); @@ -2024,7 +1831,7 @@ gboolean SPCanvasImpl::handleExpose(GtkWidget *widget, GdkEventExpose *event) for (int i = 0; i < n_rects; i++) { GdkRectangle rectangle = rects[i]; - Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->x0, rectangle.y + canvas->y0, + Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, rectangle.width, rectangle.height); canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); @@ -2035,12 +1842,12 @@ gboolean SPCanvasImpl::handleExpose(GtkWidget *widget, GdkEventExpose *event) #endif -gint SPCanvasImpl::handleKeyEvent(GtkWidget *widget, GdkEventKey *event) +gint SPCanvas::handle_key_event(GtkWidget *widget, GdkEventKey *event) { - return emitEvent(SP_CANVAS(widget), reinterpret_cast(event)); + return SP_CANVAS(widget)->emitEvent(reinterpret_cast(event)); } -gint SPCanvasImpl::handleCrossing(GtkWidget *widget, GdkEventCrossing *event) +gint SPCanvas::handle_crossing(GtkWidget *widget, GdkEventCrossing *event) { SPCanvas *canvas = SP_CANVAS (widget); @@ -2048,57 +1855,56 @@ gint SPCanvasImpl::handleCrossing(GtkWidget *widget, GdkEventCrossing *event) return FALSE; } - canvas->state = event->state; - return pickCurrentItem(canvas, reinterpret_cast(event)); + canvas->_state = event->state; + return canvas->pickCurrentItem(reinterpret_cast(event)); } -gint SPCanvasImpl::handleFocusIn(GtkWidget *widget, GdkEventFocus *event) +gint SPCanvas::handle_focus_in(GtkWidget *widget, GdkEventFocus *event) { gtk_widget_grab_focus (widget); SPCanvas *canvas = SP_CANVAS (widget); - if (canvas->focused_item) { - return emitEvent(canvas, reinterpret_cast(event)); + if (canvas->_focused_item) { + return canvas->emitEvent(reinterpret_cast(event)); } else { return FALSE; } } -gint SPCanvasImpl::handleFocusOut(GtkWidget *widget, GdkEventFocus *event) +gint SPCanvas::handle_focus_out(GtkWidget *widget, GdkEventFocus *event) { SPCanvas *canvas = SP_CANVAS(widget); - if (canvas->focused_item) { - return emitEvent(canvas, reinterpret_cast(event)); + if (canvas->_focused_item) { + return canvas->emitEvent(reinterpret_cast(event)); } else { return FALSE; } } -int SPCanvasImpl::paint(SPCanvas *canvas) +int SPCanvas::paint() { - if (canvas->need_update) { - sp_canvas_item_invoke_update (canvas->root, Geom::identity(), 0); - canvas->need_update = FALSE; + if (_need_update) { + sp_canvas_item_invoke_update(_root, Geom::identity(), 0); + _need_update = FALSE; } - if (!canvas->need_redraw) { + if (!_need_redraw) { return TRUE; } Cairo::RefPtr to_paint = Cairo::Region::create(); - for (int j=canvas->tTop; jtBottom; j++) { - for (int i=canvas->tLeft; itRight; i++) { - int tile_index = (i - canvas->tLeft) + (j - canvas->tTop)*canvas->tileH; + for (int j = _tTop; j < _tBottom; ++j) { + for (int i = _tLeft; i < _tRight; ++i) { + int tile_index = (i - _tLeft) + (j - _tTop) * _tile_h; - if ( canvas->tiles[tile_index] ) { // if this tile is dirtied (nonzero) + if (_tiles[tile_index]) { // if this tile is dirtied (nonzero) Cairo::RectangleInt rect = {i*TILE_SIZE, j*TILE_SIZE, TILE_SIZE, TILE_SIZE}; to_paint->do_union(rect); } - } } @@ -2111,77 +1917,80 @@ int SPCanvasImpl::paint(SPCanvas *canvas) int y0 = rect.y; int x1 = x0 + rect.width; int y1 = y0 + rect.height; - if (!sp_canvas_paint_rect(canvas, x0, y0, x1, y1)) { + if (!paintRect(x0, y0, x1, y1)) { // Aborted return FALSE; }; } } - canvas->need_redraw = FALSE; + _need_redraw = FALSE; // we've had a full unaborted redraw, reset the full redraw counter - if (canvas->forced_redraw_limit != -1) { - canvas->forced_redraw_count = 0; + if (_forced_redraw_limit != -1) { + _forced_redraw_count = 0; } return TRUE; } -int SPCanvasImpl::do_update(SPCanvas *canvas) +int SPCanvas::doUpdate() { - if (!canvas->root) { // canvas may have already be destroyed by closing desktop during interrupted display! + if (!_root) { // canvas may have already be destroyed by closing desktop during interrupted display! return TRUE; } - - if (canvas->drawing_disabled) { + if (_drawing_disabled) { return TRUE; } // Cause the update if necessary - if (canvas->need_update) { - sp_canvas_item_invoke_update(canvas->root, Geom::identity(), 0); - canvas->need_update = FALSE; + if (_need_update) { + sp_canvas_item_invoke_update(_root, Geom::identity(), 0); + _need_update = FALSE; } // Paint if able to - if (gtk_widget_is_drawable( GTK_WIDGET(canvas) )) { - return paint(canvas); + if (gtk_widget_is_drawable(GTK_WIDGET(this))) { + return paint(); } // Pick new current item - while (canvas->need_repick) { - canvas->need_repick = FALSE; - pickCurrentItem(canvas, &canvas->pick_event); + while (_need_repick) { + _need_repick = FALSE; + pickCurrentItem(&_pick_event); } return TRUE; } -gint SPCanvasImpl::idle_handler(gpointer data) +gint SPCanvas::idle_handler(gpointer data) { SPCanvas *canvas = SP_CANVAS (data); - - int const ret = do_update (canvas); - + int const ret = canvas->doUpdate(); if (ret) { // Reset idle id - canvas->idle_id = 0; + canvas->_idle_id = 0; } - return !ret; } -void SPCanvasImpl::add_idle(SPCanvas *canvas) +void SPCanvas::addIdle() +{ + if (_idle_id == 0) { + _idle_id = gdk_threads_add_idle_full(UPDATE_PRIORITY, idle_handler, this, NULL); + } +} +void SPCanvas::removeIdle() { - if (canvas->idle_id == 0) { - canvas->idle_id = gdk_threads_add_idle_full(UPDATE_PRIORITY, idle_handler, canvas, NULL); + if (_idle_id) { + g_source_remove(_idle_id); + _idle_id = 0; } } SPCanvasGroup *SPCanvas::getRoot() { - return SP_CANVAS_GROUP(root); + return SP_CANVAS_GROUP(_root); } void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling) @@ -2190,28 +1999,28 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll int ix = (int) round(cx); // ix and iy are the new canvas coordinates (integer screen pixels) int iy = (int) round(cy); // cx might be negative, so (int)(cx + 0.5) will not do! - int dx = ix - x0; // dx and dy specify the displacement (scroll) of the - int dy = iy - y0; // canvas w.r.t its previous position + int dx = ix - _x0; // dx and dy specify the displacement (scroll) of the + int dy = iy - _y0; // canvas w.r.t its previous position Geom::IntRect old_area = getViewboxIntegers(); Geom::IntRect new_area = old_area + Geom::IntPoint(dx, dy); - dx0 = cx; // here the 'd' stands for double, not delta! - dy0 = cy; - x0 = ix; - y0 = iy; + _dx0 = cx; // here the 'd' stands for double, not delta! + _dy0 = cy; + _x0 = ix; + _y0 = iy; - gtk_widget_get_allocation(&widget, &allocation); + gtk_widget_get_allocation(&_widget, &allocation); - SPCanvasImpl::sp_canvas_resize_tiles(this, x0, y0, x0 + allocation.width, y0 + allocation.height); - if (SP_CANVAS_ITEM_GET_CLASS(root)->viewbox_changed) { - SP_CANVAS_ITEM_GET_CLASS(root)->viewbox_changed(root, new_area); + resizeTiles(_x0, _y0, _x0 + allocation.width, _y0 + allocation.height); + if (SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed) { + SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed(_root, new_area); } if (!clear) { // scrolling without zoom; redraw only the newly exposed areas if ((dx != 0) || (dy != 0)) { - this->is_scrolling = is_scrolling; + this->_is_scrolling = is_scrolling; if (gtk_widget_get_realized(GTK_WIDGET(this))) { gdk_window_scroll(getWindow(this), -dx, -dy); } @@ -2223,15 +2032,15 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll void SPCanvas::updateNow() { - if (need_update || need_redraw) { - SPCanvasImpl::do_update(this); + if (_need_update || _need_redraw) { + doUpdate(); } } -void SPCanvasImpl::requestCanvasUpdate(SPCanvas *canvas) +void SPCanvas::requestUpdate() { - canvas->need_update = TRUE; - add_idle(canvas); + _need_update = TRUE; + addIdle(); } void SPCanvas::requestRedraw(int x0, int y0, int x1, int y1) @@ -2248,13 +2057,13 @@ void SPCanvas::requestRedraw(int x0, int y0, int x1, int y1) Geom::IntRect bbox(x0, y0, x1, y1); gtk_widget_get_allocation(GTK_WIDGET(this), &allocation); - Geom::IntRect canvas_rect = Geom::IntRect::from_xywh(this->x0, this->y0, + Geom::IntRect canvas_rect = Geom::IntRect::from_xywh(this->_x0, this->_y0, allocation.width, allocation.height); Geom::OptIntRect clip = bbox & canvas_rect; if (clip) { - SPCanvasImpl::sp_canvas_dirty_rect(this, *clip); - SPCanvasImpl::add_idle(this); + dirtyRect(*clip); + addIdle(); } } @@ -2266,8 +2075,8 @@ void sp_canvas_window_to_world(SPCanvas const *canvas, double winx, double winy, g_return_if_fail (canvas != NULL); g_return_if_fail (SP_IS_CANVAS (canvas)); - if (worldx) *worldx = canvas->x0 + winx; - if (worldy) *worldy = canvas->y0 + winy; + if (worldx) *worldx = canvas->_x0 + winx; + if (worldy) *worldy = canvas->_y0 + winy; } /** @@ -2278,8 +2087,8 @@ void sp_canvas_world_to_window(SPCanvas const *canvas, double worldx, double wor g_return_if_fail (canvas != NULL); g_return_if_fail (SP_IS_CANVAS (canvas)); - if (winx) *winx = worldx - canvas->x0; - if (winy) *winy = worldy - canvas->y0; + if (winx) *winx = worldx - canvas->_x0; + if (winy) *winy = worldy - canvas->_y0; } /** @@ -2290,7 +2099,7 @@ Geom::Point sp_canvas_window_to_world(SPCanvas const *canvas, Geom::Point const g_assert (canvas != NULL); g_assert (SP_IS_CANVAS (canvas)); - return Geom::Point(canvas->x0 + win[0], canvas->y0 + win[1]); + return Geom::Point(canvas->_x0 + win[0], canvas->_y0 + win[1]); } /** @@ -2301,7 +2110,7 @@ Geom::Point sp_canvas_world_to_window(SPCanvas const *canvas, Geom::Point const g_assert (canvas != NULL); g_assert (SP_IS_CANVAS (canvas)); - return Geom::Point(world[0] - canvas->x0, world[1] - canvas->y0); + return Geom::Point(world[0] - canvas->_x0, world[1] - canvas->_y0); } /** @@ -2317,10 +2126,10 @@ bool sp_canvas_world_pt_inside_window(SPCanvas const *canvas, Geom::Point const GtkWidget *w = GTK_WIDGET(canvas); gtk_widget_get_allocation (w, &allocation); - return ( ( canvas->x0 <= world[Geom::X] ) && - ( canvas->y0 <= world[Geom::Y] ) && - ( world[Geom::X] < canvas->x0 + allocation.width ) && - ( world[Geom::Y] < canvas->y0 + allocation.height ) ); + return ( ( canvas->_x0 <= world[Geom::X] ) && + ( canvas->_y0 <= world[Geom::Y] ) && + ( world[Geom::X] < canvas->_x0 + allocation.width ) && + ( world[Geom::Y] < canvas->_y0 + allocation.height ) ); } /** @@ -2331,8 +2140,8 @@ Geom::Rect SPCanvas::getViewbox() const GtkAllocation allocation; gtk_widget_get_allocation (GTK_WIDGET (this), &allocation); - return Geom::Rect(Geom::Point(dx0, dy0), - Geom::Point(dx0 + allocation.width, dy0 + allocation.height)); + return Geom::Rect(Geom::Point(_dx0, _dy0), + Geom::Point(_dx0 + allocation.width, _dy0 + allocation.height)); } /** @@ -2344,8 +2153,8 @@ Geom::IntRect SPCanvas::getViewboxIntegers() const gtk_widget_get_allocation (GTK_WIDGET(this), &allocation); Geom::IntRect ret; - ret.setMin(Geom::IntPoint(x0, y0)); - ret.setMax(Geom::IntPoint(x0 + allocation.width, y0 + allocation.height)); + ret.setMin(Geom::IntPoint(_x0, _y0)); + ret.setMax(Geom::IntPoint(_x0 + allocation.width, _y0 + allocation.height)); return ret; } @@ -2359,63 +2168,62 @@ inline int sp_canvas_tile_ceil(int x) return ((x + (TILE_SIZE - 1)) & (~(TILE_SIZE - 1))) / TILE_SIZE; } -void SPCanvasImpl::sp_canvas_resize_tiles(SPCanvas* canvas, int nl, int nt, int nr, int nb) +void SPCanvas::resizeTiles(int nl, int nt, int nr, int nb) { if ( nl >= nr || nt >= nb ) { - if ( canvas->tiles ) g_free(canvas->tiles); - canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0; - canvas->tileH=canvas->tileV=0; - canvas->tiles=NULL; + if (_tiles) g_free(_tiles); + _tLeft = _tTop = _tRight = _tBottom = 0; + _tile_h = _tile_h = 0; + _tiles = NULL; return; } - int tl=sp_canvas_tile_floor(nl); - int tt=sp_canvas_tile_floor(nt); - int tr=sp_canvas_tile_ceil(nr); - int tb=sp_canvas_tile_ceil(nb); + int tl = sp_canvas_tile_floor(nl); + int tt = sp_canvas_tile_floor(nt); + int tr = sp_canvas_tile_ceil(nr); + int tb = sp_canvas_tile_ceil(nb); int nh = tr-tl, nv = tb-tt; - uint8_t* ntiles = (uint8_t*)g_malloc(nh*nv*sizeof(uint8_t)); - for (int i=tl; i= canvas->tLeft && i < canvas->tRight && j >= canvas->tTop && j < canvas->tBottom ) { - ntiles[ind]=canvas->tiles[(i-canvas->tLeft)+(j-canvas->tTop)*canvas->tileH]; // copy from the old tile + if ( i >= _tLeft && i < _tRight && j >= _tTop && j < _tBottom ) { + ntiles[ind] = _tiles[(i - _tLeft) + (j - _tTop) * _tile_h]; // copy from the old tile } else { - ntiles[ind]=0; // newly exposed areas get 0 + ntiles[ind] = 0; // newly exposed areas get 0 } } } - if ( canvas->tiles ) g_free(canvas->tiles); - canvas->tiles=ntiles; - canvas->tLeft=tl; - canvas->tTop=tt; - canvas->tRight=tr; - canvas->tBottom=tb; - canvas->tileH=nh; - canvas->tileV=nv; + if (_tiles) g_free(_tiles); + _tiles = ntiles; + _tLeft = tl; + _tTop = tt; + _tRight = tr; + _tBottom = tb; + _tile_h = nh; + _tile_h = nv; } -void SPCanvasImpl::sp_canvas_dirty_rect(SPCanvas* canvas, Geom::IntRect const &area) { - canvas->need_redraw = TRUE; - - sp_canvas_mark_rect(canvas, area, 1); +void SPCanvas::dirtyRect(Geom::IntRect const &area) { + _need_redraw = TRUE; + markRect(area, 1); } -void SPCanvasImpl::sp_canvas_mark_rect(SPCanvas* canvas, Geom::IntRect const &area, uint8_t val) +void SPCanvas::markRect(Geom::IntRect const &area, uint8_t val) { - int tl=sp_canvas_tile_floor(area.left()); - int tt=sp_canvas_tile_floor(area.top()); - int tr=sp_canvas_tile_ceil(area.right()); - int tb=sp_canvas_tile_ceil(area.bottom()); - if ( tl >= canvas->tRight || tr <= canvas->tLeft || tt >= canvas->tBottom || tb <= canvas->tTop ) return; - if ( tl < canvas->tLeft ) tl=canvas->tLeft; - if ( tr > canvas->tRight ) tr=canvas->tRight; - if ( tt < canvas->tTop ) tt=canvas->tTop; - if ( tb > canvas->tBottom ) tb=canvas->tBottom; + int tl = sp_canvas_tile_floor(area.left()); + int tt = sp_canvas_tile_floor(area.top()); + int tr = sp_canvas_tile_ceil(area.right()); + int tb = sp_canvas_tile_ceil(area.bottom()); + if ( tl >= _tRight || tr <= _tLeft || tt >= _tBottom || tb <= _tTop ) return; + if ( tl < _tLeft ) tl = _tLeft; + if ( tr > _tRight ) tr = _tRight; + if ( tt < _tTop ) tt = _tTop; + if ( tb > _tBottom ) tb = _tBottom; for (int i=tl; itiles[(i-canvas->tLeft)+(j-canvas->tTop)*canvas->tileH] = val; + _tiles[(i - _tLeft) + (j - _tTop) * _tile_h] = val; } } } diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index 65b06ade8..1a13250b3 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -60,7 +60,7 @@ G_END_DECLS // SPCanvas ------------------------------------------------- -class SPCanvasImpl; +struct PaintRectSetup; GType sp_canvas_get_type() G_GNUC_CONST; @@ -68,123 +68,178 @@ GType sp_canvas_get_type() G_GNUC_CONST; * Port of GnomeCanvas for inkscape needs. */ struct SPCanvas { - friend class SPCanvasImpl; + /// Scrolls canvas to specific position (cx and cy are measured in screen pixels). + void scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling = false); - /** - * Returns new canvas as widget. - */ - static GtkWidget *createAA(); + /// Synchronously updates the canvas if necessary. + void updateNow(); - /** - * Returns the root group of the specified canvas. - */ + /// Queues a redraw of rectangular canvas area. + void requestRedraw(int x1, int y1, int x2, int y2); + void requestUpdate(); + + void forceFullRedrawAfterInterruptions(unsigned int count); + void endForcedFullRedraws(); + + Geom::Rect getViewbox() const; + Geom::IntRect getViewboxIntegers() const; SPCanvasGroup *getRoot(); - /** - * Scrolls canvas to specific position (cx and cy are measured in screen pixels). - */ - void scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling = false); + /// Returns new canvas as widget. + static GtkWidget *createAA(); +private: + /// Emits an event for an item in the canvas, be it the current + /// item, grabbed item, or focused item, as appropriate. + int emitEvent(GdkEvent *event); - /** - * Updates canvas if necessary. - */ - void updateNow(); + /// Re-picks the current item in the canvas, based on the event's + /// coordinates and emits enter/leave events for items as appropriate. + int pickCurrentItem(GdkEvent *event); + void shutdownTransients(); - /** - * Forces redraw of rectangular canvas area. - */ - void requestRedraw(int x1, int y1, int x2, int y2); + /// Allocates a new tile array for the canvas, copying overlapping tiles from the old array + void resizeTiles(int nl, int nt, int nr, int nb); + + /// Marks the specified area as dirty (requiring redraw) + void dirtyRect(Geom::IntRect const &area); + /// Marks specific canvas rectangle as clean (val == 0) or dirty (otherwise) + void markRect(Geom::IntRect const &area, uint8_t val); + + /// Invokes update, paint, and repick on canvas. + int doUpdate(); + + void paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect const &canvas_rect, int sw); /** - * Force a full redraw after a specified number of interrupted redraws. + * Paint the given rect, recursively subdividing the region until it is the size of a single + * buffer. + * + * @return true if the drawing completes */ - void forceFullRedrawAfterInterruptions(unsigned int count); + int paintRectInternal(PaintRectSetup const *setup, Geom::IntRect const &this_rect); + + /// Draws a specific rectangular part of the canvas. + /// @return true if the rectangle painting succeeds. + bool paintRect(int xx0, int yy0, int xx1, int yy1); + + /// Repaints the areas in the canvas that need it. + /// @return true if all the dirty parts have been redrawn + int paint(); + + /// Idle handler for the canvas that deals with pending updates and redraws. + static gint idle_handler(gpointer data); + + /// Convenience function to add an idle handler to a canvas. + void addIdle(); + void removeIdle(); + +public: + // GTK virtual functions. + static void dispose(GObject *object); + static void handle_realize(GtkWidget *widget); + static void handle_unrealize(GtkWidget *widget); +#if GTK_CHECK_VERSION(3,0,0) + static void handle_get_preferred_width(GtkWidget *widget, gint *min_w, gint *nat_w); + static void handle_get_preferred_height(GtkWidget *widget, gint *min_h, gint *nat_h); +#else + static void handle_size_request(GtkWidget *widget, GtkRequisition *req); +#endif + static void handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation); + static gint handle_button(GtkWidget *widget, GdkEventButton *event); /** - * End forced full redraw requests. + * Scroll event handler for the canvas. + * + * @todo FIXME: generate motion events to re-select items. */ - void endForcedFullRedraws(); - + static gint handle_scroll(GtkWidget *widget, GdkEventScroll *event); + static gint handle_motion(GtkWidget *widget, GdkEventMotion *event); +#if GTK_CHECK_VERSION(3,0,0) + static gboolean handle_draw(GtkWidget *widget, cairo_t *cr); +#else + static gboolean handle_expose(GtkWidget *widget, GdkEventExpose *event); +#endif + static gint handle_key_event(GtkWidget *widget, GdkEventKey *event); + static gint handle_crossing(GtkWidget *widget, GdkEventCrossing *event); + static gint handle_focus_in(GtkWidget *widget, GdkEventFocus *event); + static gint handle_focus_out(GtkWidget *widget, GdkEventFocus *event); +public: // Data members: ---------------------------------------------------------- + GtkWidget _widget; - GtkWidget widget; + guint _idle_id; - guint idle_id; + SPCanvasItem *_root; - SPCanvasItem *root; - - bool is_dragging; - double dx0; - double dy0; - int x0; - int y0; + bool _is_dragging; + double _dx0; + double _dy0; + int _x0; + int _y0; /* Area that needs redrawing, stored as a microtile array */ - int tLeft, tTop, tRight, tBottom; - int tileH, tileV; - uint8_t *tiles; + int _tLeft, _tTop, _tRight, _tBottom; + int _tile_w, _tile_h; + uint8_t *_tiles; /** Last known modifier state, for deferred repick when a button is down. */ - int state; + int _state; /** The item containing the mouse pointer, or NULL if none. */ - SPCanvasItem *current_item; + SPCanvasItem *_current_item; /** Item that is about to become current (used to track deletions and such). */ - SPCanvasItem *new_current_item; + SPCanvasItem *_new_current_item; /** Item that holds a pointer grab, or NULL if none. */ - SPCanvasItem *grabbed_item; + SPCanvasItem *_grabbed_item; /** Event mask specified when grabbing an item. */ - guint grabbed_event_mask; + guint _grabbed_event_mask; /** If non-NULL, the currently focused item. */ - SPCanvasItem *focused_item; + SPCanvasItem *_focused_item; /** Event on which selection of current item is based. */ - GdkEvent pick_event; + GdkEvent _pick_event; - int close_enough; + int _close_enough; - unsigned int need_update : 1; - unsigned int need_redraw : 1; - unsigned int need_repick : 1; + unsigned int _need_update : 1; + unsigned int _need_redraw : 1; + unsigned int _need_repick : 1; - int forced_redraw_count; - int forced_redraw_limit; + int _forced_redraw_count; + int _forced_redraw_limit; /** For use by internal pick_current_item() function. */ - unsigned int left_grabbed_item : 1; + unsigned int _left_grabbed_item : 1; /** For use by internal pick_current_item() function. */ - unsigned int in_repick : 1; + unsigned int _in_repick : 1; // In most tools Inkscape only generates enter and leave events // on the current item, but no other enter events if a mouse button - // is depressed -- see function pick_current_item(). Some tools + // is depressed -- see function pickCurrentItem(). Some tools // may wish the canvas to generate to all enter events, (e.g., the // connector tool). If so, they may temporarily set this flag to // 'true'. - bool gen_all_enter_events; + bool _gen_all_enter_events; /** For scripting, sometimes we want to delay drawing. */ - bool drawing_disabled; + bool _drawing_disabled; - int rendermode; - int colorrendermode; + int _rendermode; + int _colorrendermode; #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - bool enable_cms_display_adj; - Glib::ustring cms_key; + bool _enable_cms_display_adj; + Glib::ustring _cms_key; #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - bool is_scrolling; - - Geom::Rect getViewbox() const; - Geom::IntRect getViewboxIntegers() const; + bool _is_scrolling; }; bool sp_canvas_world_pt_inside_window(SPCanvas const *canvas, Geom::Point const &world); diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp index 121a49a25..d0a2e81aa 100644 --- a/src/extension/dbus/document-interface.cpp +++ b/src/extension/dbus/document-interface.cpp @@ -1052,7 +1052,7 @@ void document_interface_pause_updates(DocumentInterface *doc_interface, GError * SPDesktop *desk = doc_interface->target.getDesktop(); g_return_if_fail(ensure_desktop_valid(desk, error)); doc_interface->updates = FALSE; - desk->canvas->drawing_disabled = 1; + desk->canvas->_drawing_disabled = 1; } void document_interface_resume_updates(DocumentInterface *doc_interface, GError ** error) @@ -1060,7 +1060,7 @@ void document_interface_resume_updates(DocumentInterface *doc_interface, GError SPDesktop *desk = doc_interface->target.getDesktop(); g_return_if_fail(ensure_desktop_valid(desk, error)); doc_interface->updates = TRUE; - desk->canvas->drawing_disabled = 0; + desk->canvas->_drawing_disabled = 0; //FIXME: use better verb than rect. Inkscape::DocumentUndo::done(doc_interface->target.getDocument(), SP_VERB_CONTEXT_RECT, "Multiple actions"); } diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index 31491605b..d5c80f26e 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -128,7 +128,7 @@ ExecutionEnv::createWorkingDialog (void) { } SPDesktop *desktop = (SPDesktop *)_doc; - GtkWidget *toplevel = gtk_widget_get_toplevel(&(desktop->canvas->widget)); + GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(desktop->canvas)); if (!toplevel || !gtk_widget_is_toplevel (toplevel)) return; Gtk::Window *window = Glib::wrap(GTK_WINDOW(toplevel), false); diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index e6d5f174e..e9a3af83a 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -1126,7 +1126,7 @@ void sp_undo(SPDesktop *desktop, SPDocument *) { // No re/undo while dragging, too dangerous. - if(desktop->getCanvas()->is_dragging) return; + if(desktop->getCanvas()->_is_dragging) return; if (!DocumentUndo::undo(desktop->getDocument())) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo.")); @@ -1137,7 +1137,7 @@ void sp_redo(SPDesktop *desktop, SPDocument *) { // No re/undo while dragging, too dangerous. - if(desktop->getCanvas()->is_dragging) return; + if(desktop->getCanvas()->_is_dragging) return; if (!DocumentUndo::redo(desktop->getDocument())) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo.")); diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 531aa728d..8639861f8 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -1018,7 +1018,7 @@ sp_ui_drag_data_received(GtkWidget *widget, { int destX = 0; int destY = 0; - gtk_widget_translate_coordinates( widget, &(desktop->canvas->widget), x, y, &destX, &destY ); + gtk_widget_translate_coordinates( widget, GTK_WIDGET(desktop->canvas), x, y, &destX, &destY ); Geom::Point where( sp_canvas_window_to_world( desktop->canvas, Geom::Point( destX, destY ) ) ); Geom::Point const button_dt(desktop->w2d(where)); Geom::Point const button_doc(desktop->dt2doc(button_dt)); @@ -1141,7 +1141,7 @@ sp_ui_drag_data_received(GtkWidget *widget, if ( worked ) { int destX = 0; int destY = 0; - gtk_widget_translate_coordinates( widget, &(desktop->canvas->widget), x, y, &destX, &destY ); + gtk_widget_translate_coordinates( widget, GTK_WIDGET(desktop->canvas), x, y, &destX, &destY ); Geom::Point where( sp_canvas_window_to_world( desktop->canvas, Geom::Point( destX, destY ) ) ); Geom::Point const button_dt(desktop->w2d(where)); Geom::Point const button_doc(desktop->dt2doc(button_dt)); diff --git a/src/ui/tool/event-utils.cpp b/src/ui/tool/event-utils.cpp index 079275d63..6b8d5f0dc 100644 --- a/src/ui/tool/event-utils.cpp +++ b/src/ui/tool/event-utils.cpp @@ -60,8 +60,8 @@ unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mas } GdkEvent *event_next; gint i = 0; - event.x -= canvas->x0; - event.y -= canvas->y0; + event.x -= canvas->_x0; + event.y -= canvas->_y0; event_next = gdk_event_get(); // while the next event is also a motion notify @@ -92,8 +92,8 @@ unsigned combine_motion_events(SPCanvas *canvas, GdkEventMotion &event, gint mas if (event_next) { gdk_event_put(event_next); } - event.x += canvas->x0; - event.y += canvas->y0; + event.x += canvas->_x0; + event.y += canvas->_y0; return i; } diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp index b84d16686..74f2664fe 100644 --- a/src/ui/tools/connector-tool.cpp +++ b/src/ui/tools/connector-tool.cpp @@ -247,7 +247,7 @@ void ConnectorTool::setup() { // Make sure we see all enter events for canvas items, // even if a mouse button is depressed. - this->desktop->canvas->gen_all_enter_events = true; + this->desktop->canvas->_gen_all_enter_events = true; } void ConnectorTool::set(const Inkscape::Preferences::Entry& val) { @@ -276,7 +276,7 @@ void ConnectorTool::finish() { this->cc_clear_active_conn(); // Restore the default event generating behaviour. - this->desktop->canvas->gen_all_enter_events = false; + this->desktop->canvas->_gen_all_enter_events = false; } //----------------------------------------------------------------------------- diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 1fdd3ca6d..3fa607820 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -564,7 +564,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) /* Canvas */ dtw->canvas = SP_CANVAS(SPCanvas::createAA()); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - dtw->canvas->enable_cms_display_adj = prefs->getBool("/options/displayprofile/enable"); + dtw->canvas->_enable_cms_display_adj = prefs->getBool("/options/displayprofile/enable"); #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) gtk_widget_set_can_focus (GTK_WIDGET (dtw->canvas), TRUE); @@ -746,8 +746,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) Glib::ustring id = Inkscape::CMSSystem::getDisplayId( 0, 0 ); bool enabled = false; - dtw->canvas->cms_key = id; - enabled = !dtw->canvas->cms_key.empty(); + dtw->canvas->_cms_key = id; + enabled = !dtw->canvas->_cms_key.empty(); cms_adjust_set_sensitive( dtw, enabled ); } #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) @@ -1035,7 +1035,7 @@ sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dt // current item on the canvas, because item events and all mouse events are caught // and passed on by the canvas acetate (I think). --bb if ((event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE) - && !dtw->canvas->current_item) { + && !dtw->canvas->_current_item) { return sp_desktop_root_handler (NULL, event, dtw->desktop); } } @@ -1054,9 +1054,9 @@ void sp_dtw_color_profile_event(EgeColorProfTracker */*tracker*/, SPDesktopWidge gint monitor = gdk_screen_get_monitor_at_window(screen, window); Glib::ustring id = Inkscape::CMSSystem::getDisplayId( screenNum, monitor ); bool enabled = false; - dtw->canvas->cms_key = id; + dtw->canvas->_cms_key = id; dtw->requestCanvasUpdate(); - enabled = !dtw->canvas->cms_key.empty(); + enabled = !dtw->canvas->_cms_key.empty(); cms_adjust_set_sensitive( dtw, enabled ); } #else @@ -1092,8 +1092,8 @@ void cms_adjust_toggled( GtkWidget */*button*/, gpointer data ) SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(data); bool down = SP_BUTTON_IS_DOWN(dtw->cms_adjust); - if ( down != dtw->canvas->enable_cms_display_adj ) { - dtw->canvas->enable_cms_display_adj = down; + if ( down != dtw->canvas->_enable_cms_display_adj ) { + dtw->canvas->_enable_cms_display_adj = down; dtw->requestCanvasUpdate(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setBool("/options/displayprofile/enable", down); -- cgit v1.2.3 From adb2151187f3ce389feca24c34d2c5581a8fe417 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 12 Apr 2016 12:20:09 +0100 Subject: Latest gtk3 cleanup (bzr r14791) --- src/widgets/eek-preview.cpp | 29 +++++++++++++++++++++-------- src/widgets/ruler.cpp | 14 ++++++++++++-- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index de14caa12..9951a8957 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -496,14 +496,11 @@ gboolean eek_preview_draw(GtkWidget *widget, otherArea.y = possible.y + (possible.height - otherArea.height) / 2; } #if GTK_CHECK_VERSION(3,0,0) - gtk_paint_diamond( style, - cr, - gtk_widget_get_state (widget), - GTK_SHADOW_ETCHED_OUT, - widget, - NULL, - otherArea.x, otherArea.y, - otherArea.width, otherArea.height ); + // This should be a diamond too? + gtk_render_check(context, + cr, + otherArea.x, otherArea.y, + otherArea.width, otherArea.height ); #else gtk_paint_diamond( style, window, @@ -550,7 +547,11 @@ static gboolean eek_preview_enter_cb( GtkWidget* widget, GdkEventCrossing* event EekPreviewPrivate *priv = EEK_PREVIEW_GET_PRIVATE(preview); priv->within = TRUE; +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_state_flags( widget, priv->hot ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_PRELIGHT, false ); +#else gtk_widget_set_state( widget, priv->hot ? GTK_STATE_ACTIVE : GTK_STATE_PRELIGHT ); +#endif } return FALSE; @@ -563,7 +564,11 @@ static gboolean eek_preview_leave_cb( GtkWidget* widget, GdkEventCrossing* event EekPreviewPrivate *priv = EEK_PREVIEW_GET_PRIVATE(preview); priv->within = FALSE; +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_state_flags( widget, GTK_STATE_FLAG_NORMAL, false ); +#else gtk_widget_set_state( widget, GTK_STATE_NORMAL ); +#endif } return FALSE; @@ -588,7 +593,11 @@ static gboolean eek_preview_button_press_cb( GtkWidget* widget, GdkEventButton* if ( priv->within ) { +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_state_flags( widget, GTK_STATE_FLAG_ACTIVE, false ); +#else gtk_widget_set_state( widget, GTK_STATE_ACTIVE ); +#endif } } } @@ -603,7 +612,11 @@ static gboolean eek_preview_button_release_cb( GtkWidget* widget, GdkEventButton EekPreviewPrivate *priv = EEK_PREVIEW_GET_PRIVATE(preview); priv->hot = FALSE; +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_state_flags( widget, GTK_STATE_FLAG_NORMAL, false ); +#else gtk_widget_set_state( widget, GTK_STATE_NORMAL ); +#endif if ( priv->within && (event->button == PRIME_BUTTON_MAGIC_NUMBER || diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 0b473f173..fe851d592 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -286,7 +286,7 @@ sp_ruler_init (SPRuler *ruler) #if GTK_CHECK_VERSION(3,0,0) const gchar *str = "SPRuler {\n" - " background-color: @theme_bg_color;\n" + " background-color: @bg_color;\n" "}\n"; GtkCssProvider *css = gtk_css_provider_new (); gtk_css_provider_load_from_data (css, str, -1, NULL); @@ -1418,7 +1418,6 @@ sp_ruler_get_pos_rect (SPRuler *ruler, gdouble position) { GtkWidget *widget = GTK_WIDGET (ruler); - GtkStyle *style = gtk_widget_get_style (widget); SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); GtkAllocation allocation; gint width, height; @@ -1433,8 +1432,19 @@ sp_ruler_get_pos_rect (SPRuler *ruler, gtk_widget_get_allocation (widget, &allocation); +#if GTK_CHECK_VERSION(3,0,0) + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkBorder padding; + + gtk_style_context_get_border(context, static_cast(0), &padding); + + xthickness = padding.left + padding.right; + ythickness = padding.top + padding.bottom; +#else + GtkStyle *style = gtk_widget_get_style (widget); xthickness = style->xthickness; ythickness = style->ythickness; +#endif if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { -- cgit v1.2.3 From feafa28eb3e6c8e3370ed7a6e1f74a4c653ce272 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 12 Apr 2016 12:56:42 +0100 Subject: Replace xthickness and ythickness with Gtk Context padding. (bzr r14792) --- src/widgets/button.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 1776e28c4..54f073c01 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -96,7 +96,6 @@ static void sp_button_dispose(GObject *object) static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget)); - GtkStyle *style = gtk_widget_get_style(widget); if (child) { gtk_widget_get_preferred_width(GTK_WIDGET(child), minimal_width, natural_width); @@ -105,14 +104,18 @@ static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width *natural_width = 0; } - *minimal_width += 2 + 2 * MAX(2, style->xthickness); - *natural_width += 2 + 2 * MAX(2, style->xthickness); + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkBorder padding; + + gtk_style_context_get_border(context, static_cast(0), &padding); + + *minimal_width += 2 + 2 * MAX(2, padding.left + padding.right); + *natural_width += 2 + 2 * MAX(2, padding.left + padding.right); } static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) { GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget)); - GtkStyle *style = gtk_widget_get_style(widget); if (child) { gtk_widget_get_preferred_height(GTK_WIDGET(child), minimal_height, natural_height); @@ -121,8 +124,13 @@ static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_heig *natural_height = 0; } - *minimal_height += 2 + 2 * MAX(2, style->ythickness); - *natural_height += 2 + 2 * MAX(2, style->ythickness); + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkBorder padding; + + gtk_style_context_get_border(context, static_cast(0), &padding); + + *minimal_height += 2 + 2 * MAX(2, padding.top + padding.bottom); + *natural_height += 2 + 2 * MAX(2, padding.top + padding.bottom); } #else static void sp_button_size_request(GtkWidget *widget, GtkRequisition *requisition) -- cgit v1.2.3 From a9f06392ba9cf059ce6418f99dd6a8fadae3c149 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 14:22:07 +0100 Subject: svg-view-widget: Fix background-color handling #Hackfest2016 (bzr r14793) --- src/svg-view-widget.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 58e2b9dc9..b1fddd7e6 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -91,8 +91,18 @@ static void sp_svg_view_widget_init(SPSVGSPViewWidget *vw) vw->canvas = SPCanvas::createAA(); #if GTK_CHECK_VERSION(3,0,0) - GdkRGBA white = {1,1,1,0}; - gtk_widget_override_background_color(vw->canvas, GTK_STATE_FLAG_NORMAL, &white); + GtkCssProvider *css_provider = gtk_css_provider_new(); + GtkStyleContext *style_context = gtk_widget_get_style_context(GTK_WIDGET(vw->canvas)); + + gtk_css_provider_load_from_data(css_provider, + "SPCanvas {\n" + " background-color: white;\n" + "}\n", + -1, NULL); + + gtk_style_context_add_provider(style_context, + GTK_STYLE_PROVIDER(css_provider), + GTK_STYLE_PROVIDER_PRIORITY_USER); #else gtk_widget_pop_colormap (); GtkStyle *style = gtk_style_copy (gtk_widget_get_style (vw->canvas)); -- cgit v1.2.3 From 92866cabf26a6caa50e73cf167957f9c54a90a48 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 12 Apr 2016 16:53:55 +0200 Subject: Fixed FIXMEs in Cmake build (set flags when needed) (bzr r14794) --- CMakeScripts/DefineDependsandFlags.cmake | 140 ++++++++++++------------------- 1 file changed, 55 insertions(+), 85 deletions(-) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 13e27d9c5..054c08a74 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -2,6 +2,7 @@ set(INKSCAPE_LIBS "") set(INKSCAPE_INCS "") set(INKSCAPE_INCS_SYS "") +set(INKSCAPE_CXX_FLAGS "") list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/src @@ -14,40 +15,29 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} # Files we include # ---------------------------------------------------------------------------- -find_package(GSL REQUIRED) -list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS}) -list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES}) if(WIN32) - list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME -elseif(APPLE) - if(DEFINED ENV{CMAKE_PREFIX_PATH}) - # Adding the library search path explicitly seems not required - # if MacPorts is installed in default prefix ('/opt/local') - - # Cmake then can rely on the hard-coded paths in its modules. - # Only prepend search path if $CMAKE_PREFIX_PATH is defined: - list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib") # FIXME - endif() - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + link_directories($ENV{DEVLIBS_PATH}/lib) +endif() + +pkg_check_modules(INKSCAPE_DEP REQUIRED pangocairo pangoft2 fontconfig gthread-2.0 gsl) +list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS}) +list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS}) +list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LIBRARIES}) +add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER}) + +if(APPLE AND DEFINED ENV{CMAKE_PREFIX_PATH}) + list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib") +endif() +if(APPLE) if(${GTK+_2.0_TARGET} MATCHES "x11") - # only link X11 if using X11 backend of GTK2 - list(APPEND INKSCAPE_LIBS "-lX11") # FIXME + pkg_check_modules(x11 REQUIRED x11) + list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS}) endif() else() - list(APPEND INKSCAPE_LIBS "-ldl") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME - list(APPEND INKSCAPE_LIBS "-lX11") # FIXME + pkg_check_modules(x11 REQUIRED x11) + list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS}) endif() -list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME - if(WITH_GNOME_VFS) find_package(GnomeVFS2) if(GNOMEVFS2_FOUND) @@ -229,6 +219,7 @@ if("${WITH_GTK3_EXPERIMENTAL}") gdl-3.0>=3.4 ) message("Using EXPERIMENTAL Gtkmm 3 build") + list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER}) set(WITH_GTKMM_3_0 1) message("Using external GDL") set(WITH_EXT_GDL 1) @@ -269,52 +260,28 @@ if("${WITH_GTK3_EXPERIMENTAL}") ${GTKSPELL3_LIBRARIES} ) else() - find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) + pkg_check_modules(GTK REQUIRED + gtkmm-2.4>=2.24 + gdkmm-2.4 + gtk+-2.0 + gdk-2.0 + ) + list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER}) + pkg_check_modules(GTKSPELL2 gtkspell-2.0) + if("${GTKSPELL3_FOUND}") + message("Using GtkSpell3 3.0") + add_definitions(${GTK_CFLAGS_OTHER}) + set (WITH_GTKSPELL 1) + endif() list(APPEND INKSCAPE_INCS_SYS - ${GTK2_GDK_INCLUDE_DIR} - ${GTK2_GDKMM_INCLUDE_DIR} - ${GTK2_GDK_PIXBUF_INCLUDE_DIR} - ${GTK2_GDKCONFIG_INCLUDE_DIR} - ${GTK2_GDKMMCONFIG_INCLUDE_DIR} - ${GTK2_GLIB_INCLUDE_DIR} - ${GTK2_GLIBCONFIG_INCLUDE_DIR} - ${GTK2_GLIBMM_INCLUDE_DIR} - ${GTK2_GLIBMMCONFIG_INCLUDE_DIR} - ${GTK2_GTK_INCLUDE_DIR} - ${GTK2_GTKMM_INCLUDE_DIR} - ${GTK2_GTKMMCONFIG_INCLUDE_DIR} - ${GTK2_ATK_INCLUDE_DIR} - ${GTK2_ATKMM_INCLUDE_DIR} - ${GTK2_PANGO_INCLUDE_DIR} - ${GTK2_PANGOMM_INCLUDE_DIR} - ${GTK2_PANGOMMCONFIG_INCLUDE_DIR} - ${GTK2_CAIRO_INCLUDE_DIR} - ${GTK2_CAIROMM_INCLUDE_DIR} - ${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4 - ${GTK2_GIOMM_INCLUDE_DIR} - ${GTK2_GIOMMCONFIG_INCLUDE_DIR} - ${GTK2_SIGC++_INCLUDE_DIR} - ${GTK2_SIGC++CONFIG_INCLUDE_DIR} - ) + ${GTK_INCLUDE_DIRS} + ${GTKSPELL_INCLUDE_DIRS} + ) list(APPEND INKSCAPE_LIBS - ${GTK2_GDK_LIBRARY} - ${GTK2_GDKMM_LIBRARY} - ${GTK2_GDK_PIXBUF_LIBRARY} - ${GTK2_GLIB_LIBRARY} - ${GTK2_GLIBMM_LIBRARY} - ${GTK2_GTK_LIBRARY} - ${GTK2_GTKMM_LIBRARY} - ${GTK2_ATK_LIBRARY} - ${GTK2_ATKMM_LIBRARY} - ${GTK2_PANGO_LIBRARY} - ${GTK2_PANGOMM_LIBRARY} - ${GTK2_CAIRO_LIBRARY} - ${GTK2_CAIROMM_LIBRARY} - ${GTK2_GIOMM_LIBRARY} - ${GTK2_SIGC++_LIBRARY} - ${GTK2_GOBJECT_LIBRARY} - ) + ${GTK_LIBRARIES} + ${GTKSPELL_LIBRARIES} + ) endif() find_package(Freetype REQUIRED) @@ -362,7 +329,7 @@ if(WITH_OPENMP) find_package(OpenMP) if(OPENMP_FOUND) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + list(APPEND INKSCAPE_CXX_FLAGS ${OpenMP_CXX_FLAGS}) if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode") set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES") endif() @@ -383,19 +350,15 @@ list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) if(WITH_IMAGE_MAGICK) - find_package(ImageMagick COMPONENTS MagickCore Magick++) + pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) if(ImageMagick_FOUND) - # the component-specific paths apparently fail to get detected correctly - # on some linux distros (or with older Cmake versions). - # Use variables which list all include dirs and libraries instead: - list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) - # TODO: Cmake's ImageMagick module misses required defines for newer - # versions of ImageMagick. See also: - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776832 - #add_definitions(-DMAGICKCORE_HDRI_ENABLE=0) # FIXME (version check?) - #add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=16) # FIXME (version check?) - else() + + list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) + add_definitions(${ImageMagick_CFLAGS_OTHER}) + + list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) + else() set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' endif() endif() @@ -411,8 +374,15 @@ if(WITH_NLS) endif(GETTEXT_FOUND) endif(WITH_NLS) -find_package(SigC++ REQUIRED) +pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 ) +list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS}) + +list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER}) +list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS) +foreach(flag ${INKSCAPE_CXX_FLAGS}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE) +endforeach() # end Dependencies list(REMOVE_DUPLICATES INKSCAPE_LIBS) -- cgit v1.2.3 From 490f3d7181baff4d215d0077be9e4939f9af5fde Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 12 Apr 2016 16:23:42 +0100 Subject: Hackfest 2016: Fix SPCanvas to comply with GTK3 rendering model. For now, causes redraw issues with SVG preview in the open dialog. (bzr r14795) --- src/display/sp-canvas.cpp | 279 ++++++++++++++++++++++------------------------ src/display/sp-canvas.h | 8 +- 2 files changed, 139 insertions(+), 148 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index df84e379c..2dced2512 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -122,7 +122,7 @@ struct SPCanvasClass { namespace { -gint const UPDATE_PRIORITY = G_PRIORITY_HIGH_IDLE; +gint const UPDATE_PRIORITY = G_PRIORITY_DEFAULT_IDLE; GdkWindow *getWindow(SPCanvas *canvas) { @@ -956,9 +956,8 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_drawing_disabled = false; - canvas->_tiles=NULL; - canvas->_tLeft=canvas->_tTop=canvas->_tRight=canvas->_tBottom=0; - canvas->_tile_h=canvas->_tile_h=0; + canvas->_backing_store = NULL; + canvas->_dirty_region = cairo_region_create(); canvas->_forced_redraw_count = 0; canvas->_forced_redraw_limit = -1; @@ -967,8 +966,6 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_enable_cms_display_adj = false; new (&canvas->_cms_key) Glib::ustring(""); #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - - canvas->_is_scrolling = false; } void SPCanvas::shutdownTransients() @@ -979,10 +976,6 @@ void SPCanvas::shutdownTransients() // itself. // _need_redraw = FALSE; - if (_tiles) g_free(_tiles); - _tiles = NULL; - _tLeft = _tTop = _tRight = _tBottom = 0; - _tile_h = _tile_h = 0; if (_grabbed_item) { _grabbed_item = NULL; @@ -1005,6 +998,14 @@ void SPCanvas::dispose(GObject *object) g_object_unref (canvas->_root); canvas->_root = NULL; } + if (canvas->_backing_store) { + cairo_surface_destroy(canvas->_backing_store); + canvas->_backing_store = NULL; + } + if (canvas->_dirty_region) { + cairo_region_destroy(canvas->_dirty_region); + canvas->_dirty_region = NULL; + } canvas->shutdownTransients(); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) @@ -1138,41 +1139,53 @@ void SPCanvas::handle_size_request(GtkWidget *widget, GtkRequisition *req) void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { SPCanvas *canvas = SP_CANVAS (widget); - GtkAllocation widg_allocation; + GtkAllocation old_allocation; - gtk_widget_get_allocation (widget, &widg_allocation); + gtk_widget_get_allocation(widget, &old_allocation); -// Geom::IntRect old_area = Geom::IntRect::from_xywh(canvas->x0, canvas->y0, -// widg_allocation.width, widg_allocation.height); +// Geom::IntRect old_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, +// old_allocation.width, old_allocation.height); Geom::IntRect new_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, allocation->width, allocation->height); + // resize backing store + cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, + allocation->width, allocation->height); + if (canvas->_backing_store) { + cairo_t *cr = cairo_create(new_backing_store); + cairo_set_source_surface(cr, canvas->_backing_store, 0, 0); + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_paint(cr); + cairo_destroy(cr); + cairo_surface_destroy(canvas->_backing_store); + } + canvas->_backing_store = new_backing_store; + + gtk_widget_set_allocation (widget, allocation); + // Schedule redraw of new region - canvas->resizeTiles(canvas->_x0, canvas->_y0, canvas->_x0 + allocation->width, canvas->_y0 + allocation->height); if (SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed) SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed (canvas->_root, new_area); - if (allocation->width > widg_allocation.width) { - canvas->requestRedraw(canvas->_x0 + widg_allocation.width, - 0, + if (gtk_widget_get_realized (widget)) { + gdk_window_move_resize (gtk_widget_get_window (widget), + allocation->x, allocation->y, + allocation->width, allocation->height); + } + + if (allocation->width > old_allocation.width) { + canvas->requestRedraw(canvas->_x0 + old_allocation.width, + canvas->_y0, canvas->_x0 + allocation->width, canvas->_y0 + allocation->height); } - if (allocation->height > widg_allocation.height) { - canvas->requestRedraw(0, - canvas->_y0 + widg_allocation.height, + if (allocation->height > old_allocation.height) { + canvas->requestRedraw(canvas->_x0, + canvas->_y0 + old_allocation.height, canvas->_x0 + allocation->width, canvas->_y0 + allocation->height); } - - gtk_widget_set_allocation (widget, allocation); - - if (gtk_widget_get_realized (widget)) { - gdk_window_move_resize (gtk_widget_get_window (widget), - allocation->x, allocation->y, - allocation->width, allocation->height); - } } int SPCanvas::emitEvent(GdkEvent *event) @@ -1600,7 +1613,8 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect } #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) - cairo_t *xct = gdk_cairo_create(gtk_widget_get_window (widget)); + //cairo_t *xct = gdk_cairo_create(gtk_widget_get_window (widget)); + cairo_t *xct = cairo_create(_backing_store); cairo_translate(xct, paint_rect.left() - _x0, paint_rect.top() - _y0); cairo_rectangle(xct, 0, 0, paint_rect.width(), paint_rect.height()); cairo_clip(xct); @@ -1609,6 +1623,12 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect cairo_paint(xct); cairo_destroy(xct); cairo_surface_destroy(imgs); + + cairo_rectangle_int_t crect = { paint_rect.left(), paint_rect.right(), paint_rect.width(), paint_rect.height() }; + cairo_region_subtract_rectangle(_dirty_region, &crect); + + gtk_widget_queue_draw_area(GTK_WIDGET(this), paint_rect.left() -_x0, paint_rect.top() - _y0, + paint_rect.width(), paint_rect.height()); } struct PaintRectSetup { @@ -1792,52 +1812,66 @@ void SPCanvas::endForcedFullRedraws() _forced_redraw_limit = -1; } -#if GTK_CHECK_VERSION(3,0,0) gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { SPCanvas *canvas = SP_CANVAS(widget); cairo_rectangle_list_t *rects = cairo_copy_clip_rectangle_list(cr); + cairo_region_t *draw_region = cairo_region_create(); for (int i = 0; i < rects->num_rectangles; i++) { cairo_rectangle_t rectangle = rects->rectangles[i]; + Geom::Rect dr = Geom::Rect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, + rectangle.width, rectangle.height); + Geom::IntRect ir = dr.roundOutwards(); + cairo_rectangle_int_t irect = { ir.left(), ir.top(), ir.width(), ir.height() }; + cairo_region_union_rectangle(draw_region, &irect); + } + cairo_rectangle_list_destroy(rects); - Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, - rectangle.width, rectangle.height); - - canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); + cairo_region_t *draw_dirty = cairo_region_copy(draw_region); + cairo_region_intersect(draw_dirty, canvas->_dirty_region); + cairo_region_subtract(draw_region, draw_dirty); + + // Draw the clean portion + if (!cairo_region_is_empty(draw_region)) { + cairo_region_translate(draw_region, -canvas->_x0, -canvas->_y0); + cairo_save(cr); + int n_rects = cairo_region_num_rectangles(draw_region); + for (int i = 0; i < n_rects; ++i) { + cairo_rectangle_int_t crect; + cairo_region_get_rectangle(draw_region, i, &crect); + cairo_rectangle(cr, crect.x, crect.y, crect.width, crect.height); + } + cairo_clip(cr); + cairo_set_source_surface(cr, canvas->_backing_store, 0, 0); + cairo_paint(cr); + cairo_restore(cr); } - cairo_rectangle_list_destroy(rects); + // Render the dirty portion in the background + int n_rects = cairo_region_num_rectangles(draw_dirty); + for (int i = 0; i < n_rects; ++i) { + cairo_rectangle_int_t crect; + cairo_region_get_rectangle(draw_dirty, i, &crect); + canvas->requestRedraw(crect.x, crect.y, crect.x + crect.width, crect.y + crect.height); + } + cairo_region_destroy(draw_region); + cairo_region_destroy(draw_dirty); - return FALSE; + return TRUE; } -#else +#if !GTK_CHECK_VERSION(3,0,0) gboolean SPCanvas::handle_expose(GtkWidget *widget, GdkEventExpose *event) { - SPCanvas *canvas = SP_CANVAS(widget); + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); - if (!gtk_widget_is_drawable (widget) || - (event->window != getWindow(canvas))) { - return FALSE; - } - - int n_rects = 0; - GdkRectangle *rects = NULL; - gdk_region_get_rectangles(event->region, &rects, &n_rects); + gdk_cairo_region (cr, event->region); + cairo_clip (cr); + gboolean result = SPCanvas::handle_draw(widget, cr); - if(rects == NULL) - return FALSE; - - for (int i = 0; i < n_rects; i++) { - GdkRectangle rectangle = rects[i]; + cairo_destroy (cr); - Geom::IntRect r = Geom::IntRect::from_xywh(rectangle.x + canvas->_x0, rectangle.y + canvas->_y0, - rectangle.width, rectangle.height); - - canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); - } - - return FALSE; + return result; } #endif @@ -1889,39 +1923,18 @@ int SPCanvas::paint() sp_canvas_item_invoke_update(_root, Geom::identity(), 0); _need_update = FALSE; } - if (!_need_redraw) { return TRUE; } - Cairo::RefPtr to_paint = Cairo::Region::create(); - - for (int j = _tTop; j < _tBottom; ++j) { - for (int i = _tLeft; i < _tRight; ++i) { - int tile_index = (i - _tLeft) + (j - _tTop) * _tile_h; - - if (_tiles[tile_index]) { // if this tile is dirtied (nonzero) - Cairo::RectangleInt rect = {i*TILE_SIZE, j*TILE_SIZE, - TILE_SIZE, TILE_SIZE}; - to_paint->do_union(rect); - } - } - } - - int n_rect = to_paint->get_num_rectangles(); - - if (n_rect > 0) { - for (int i=0; i < n_rect; i++) { - Cairo::RectangleInt rect = to_paint->get_rectangle(i); - int x0 = rect.x; - int y0 = rect.y; - int x1 = x0 + rect.width; - int y1 = y0 + rect.height; - if (!paintRect(x0, y0, x1, y1)) { - // Aborted - return FALSE; - }; - } + int n_rects = cairo_region_num_rectangles(_dirty_region); + for (int i = 0; i < n_rects; ++i) { + cairo_rectangle_int_t crect; + cairo_region_get_rectangle(_dirty_region, i, &crect); + if (!paintRect(crect.x, crect.y, crect.x + crect.width, crect.y + crect.height)) { + // Aborted + return FALSE; + }; } _need_redraw = FALSE; @@ -2012,21 +2025,46 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll gtk_widget_get_allocation(&_widget, &allocation); - resizeTiles(_x0, _y0, _x0 + allocation.width, _y0 + allocation.height); + assert(_backing_store); + cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, + allocation.width, allocation.height); + cairo_t *cr = cairo_create(new_backing_store); + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_paint(cr); + cairo_set_source_surface(cr, _backing_store, -dx, -dy); + cairo_paint(cr); + cairo_destroy(cr); + cairo_surface_destroy(_backing_store); + _backing_store = new_backing_store; + + cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; + cairo_region_intersect_rectangle(_dirty_region, &crect); + if (SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed) { SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed(_root, new_area); } - if (!clear) { + if (clear) { + requestRedraw(_x0, _y0, allocation.width, allocation.height); + } else { // scrolling without zoom; redraw only the newly exposed areas if ((dx != 0) || (dy != 0)) { - this->_is_scrolling = is_scrolling; if (gtk_widget_get_realized(GTK_WIDGET(this))) { gdk_window_scroll(getWindow(this), -dx, -dy); } } - } else { - // scrolling as part of zoom; do nothing here - the next do_update will perform full redraw + + if (dx > 0) { + requestRedraw(_x0 + allocation.width - dx, _y0, _x0 + allocation.width, _y0 + allocation.height); + } else if (dx < 0) { + requestRedraw(_x0, _y0, _x0 - dx, _y0 + allocation.height); + } + if (dy > 0) { + requestRedraw(_x0, _y0 + allocation.height - dy, _x0 + allocation.width, _y0 + allocation.height); + } else if (dy < 0) { + requestRedraw(_x0, _y0, _x0 + allocation.width, _y0 - dy); + } } } @@ -2168,42 +2206,6 @@ inline int sp_canvas_tile_ceil(int x) return ((x + (TILE_SIZE - 1)) & (~(TILE_SIZE - 1))) / TILE_SIZE; } -void SPCanvas::resizeTiles(int nl, int nt, int nr, int nb) -{ - if ( nl >= nr || nt >= nb ) { - if (_tiles) g_free(_tiles); - _tLeft = _tTop = _tRight = _tBottom = 0; - _tile_h = _tile_h = 0; - _tiles = NULL; - return; - } - int tl = sp_canvas_tile_floor(nl); - int tt = sp_canvas_tile_floor(nt); - int tr = sp_canvas_tile_ceil(nr); - int tb = sp_canvas_tile_ceil(nb); - - int nh = tr-tl, nv = tb-tt; - uint8_t *ntiles = (uint8_t*) g_malloc(nh * nv * sizeof(uint8_t)); - for (int i = tl; i < tr; i++) { - for (int j = tt; j < tb; j++) { - int ind = (i-tl) + (j-tt)*nh; - if ( i >= _tLeft && i < _tRight && j >= _tTop && j < _tBottom ) { - ntiles[ind] = _tiles[(i - _tLeft) + (j - _tTop) * _tile_h]; // copy from the old tile - } else { - ntiles[ind] = 0; // newly exposed areas get 0 - } - } - } - if (_tiles) g_free(_tiles); - _tiles = ntiles; - _tLeft = tl; - _tTop = tt; - _tRight = tr; - _tBottom = tb; - _tile_h = nh; - _tile_h = nv; -} - void SPCanvas::dirtyRect(Geom::IntRect const &area) { _need_redraw = TRUE; markRect(area, 1); @@ -2211,20 +2213,11 @@ void SPCanvas::dirtyRect(Geom::IntRect const &area) { void SPCanvas::markRect(Geom::IntRect const &area, uint8_t val) { - int tl = sp_canvas_tile_floor(area.left()); - int tt = sp_canvas_tile_floor(area.top()); - int tr = sp_canvas_tile_ceil(area.right()); - int tb = sp_canvas_tile_ceil(area.bottom()); - if ( tl >= _tRight || tr <= _tLeft || tt >= _tBottom || tb <= _tTop ) return; - if ( tl < _tLeft ) tl = _tLeft; - if ( tr > _tRight ) tr = _tRight; - if ( tt < _tTop ) tt = _tTop; - if ( tb > _tBottom ) tb = _tBottom; - - for (int i=tl; i Date: Tue, 12 Apr 2016 17:23:50 +0200 Subject: Modified the windows build to integrate gmodule-2.0 and loader.cpp/.h Added method to check inscape version used to build plugins. (bzr r14761.1.3) --- build-x64.xml | 4 ++++ build.xml | 4 ++++ src/extension/loader.cpp | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/build-x64.xml b/build-x64.xml index 1be9d9449..ca3adcf58 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -405,6 +405,7 @@ ${pcc.gdkmm-2.4} ${pcc.pangomm-1.4} ${pcc.cairomm-1.0} + ${pcc.gmodule-2.0} ${pcc.Magick++} ${pcc.libxml-2.0} @@ -490,6 +491,7 @@ ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} + ${pcl.gmodule-2.0} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -578,6 +580,7 @@ ${devlibs}/bin/libexslt-0.dll ${pcl.cairo} ${pcl.cairomm-1.0} ${pcl.librevenge-stream-0.0} ${pcl.libwpg-0.3} ${pcl.libvisio-0.1} ${pcl.libcdr-0.1} + ${pcl.gmodule-2.0} ${pcl.glibmm-2.4} ${pcl.gtk+-2.0} ${pcl.gdkmm-2.4} @@ -629,6 +632,7 @@ -L${devlibs}/lib ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0} + ${pcl.gmodule-2.0} ${devlibs}/bin/libxml2-2.dll ${devlibs}/bin/libxslt-1.dll ${devlibs}/bin/libexslt-0.dll diff --git a/build.xml b/build.xml index 82cb64231..0705f4f82 100644 --- a/build.xml +++ b/build.xml @@ -400,6 +400,7 @@ -I${devlibs}/include ${pcc.gtkmm-2.4} + ${pcc.gmodule-2.0} ${pcc.Magick++} ${pcc.libxml-2.0} @@ -480,6 +481,7 @@ -L${devlibs}/lib ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} + ${pcl.gmodule-2.0} ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0} ${devlibs}/bin/libxml2.dll ${devlibs}/bin/libxslt.dll @@ -564,6 +566,7 @@ -L${devlibs}/lib ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0} + ${pcl.gmodule-2.0} ${devlibs}/bin/libxml2.dll ${devlibs}/bin/libxslt.dll ${devlibs}/bin/libexslt.dll @@ -615,6 +618,7 @@ -L${devlibs}/lib ${pcl.poppler-cairo} ${pcl.poppler-glib} ${pcl.poppler} ${pcl.gtkmm-2.4} ${pcl.pangoft2} ${pcl.gthread-2.0} + ${pcl.gmodule-2.0} ${devlibs}/bin/libxml2.dll ${devlibs}/bin/libxslt.dll ${devlibs}/bin/libexslt.dll diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp index 8893f3f1d..32ac4b3b4 100644 --- a/src/extension/loader.cpp +++ b/src/extension/loader.cpp @@ -14,11 +14,13 @@ #include #include #include "dependency.h" +#include "inkscape-version.h" namespace Inkscape { namespace Extension { typedef Implementation::Implementation *(*_getImplementation)(void); +typedef const gchar *(*_getInkscapeVersion)(void); bool Loader::load_dependency(Dependency *dep) { @@ -38,43 +40,75 @@ bool Loader::load_dependency(Dependency *dep) Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Document *doc) { try { + Inkscape::XML::Node *repr = doc->root(); Inkscape::XML::Node *child_repr = repr->firstChild(); + + // Iterate over the xml content while (child_repr != NULL) { char const *chname = child_repr->name(); if (!strncmp(chname, INKSCAPE_EXTENSION_NS_NC, strlen(INKSCAPE_EXTENSION_NS_NC))) { chname += strlen(INKSCAPE_EXTENSION_NS); } - + + // Deal with dependencies if we have them if (!strcmp(chname, "dependency")) { Dependency dep = Dependency(child_repr); + // try to load it bool success = load_dependency(&dep); if( !success ){ + // Could not load dependency, we abort const char *res = g_module_error(); g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.get_name(), res); return NULL; } } + // Found a plugin to load if (!strcmp(chname, "plugin")) { + + // The name of the plugin is actually the library file we want to load if (const gchar *name = child_repr->attribute("name")) { GModule *module = NULL; _getImplementation GetImplementation = NULL; + _getInkscapeVersion GetInkscapeVersion = NULL; + + // build the path where to look for the plugin gchar *path = g_build_filename(_baseDirectory, name, (char *) NULL); module = g_module_open(path, G_MODULE_BIND_LOCAL); g_free(path); + if (module == NULL) { + // we were not able to load the plugin, write warning and abort const char *res = g_module_error(); g_warning("Unable to load extension %s.\nDetails: %s\n", name, res); return NULL; } + // Get a handle to the version function of the module + if (g_module_symbol(module, "GetInkscapeVersion", (gpointer *) &GetInkscapeVersion) == FALSE) { + // This didn't work, write warning and abort + const char *res = g_module_error(); + g_warning("Unable to load extension %s.\nDetails: %s\n", name, res); + return NULL; + } + + // Get a handle to the function that delivers the implementation if (g_module_symbol(module, "GetImplementation", (gpointer *) &GetImplementation) == FALSE) { + // This didn't work, write warning and abort const char *res = g_module_error(); g_warning("Unable to load extension %s.\nDetails: %s\n", name, res); return NULL; } - + + // Get version and test against this version + const gchar* version = GetInkscapeVersion(); + if( strcmp(version, version_string) != 0) { + // The versions are different, display warning. + g_warning("Plugin was built against Inkscape version %s, this is %s. The plugin might not be compatible.", version, version_string); + } + + Implementation::Implementation *i = GetImplementation(); return i; } -- cgit v1.2.3 From 6299cb3284e815d1035c6b35ce0e536a79b119e7 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 16:38:25 +0100 Subject: desktop-widget: Fix background color setting #Hackfest2016 (bzr r14796) --- src/widgets/desktop-widget.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 3fa607820..e899f9af1 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -572,10 +572,18 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) sp_ruler_add_track_widget (SP_RULER(dtw->vruler), GTK_WIDGET(dtw->canvas)); #if GTK_CHECK_VERSION(3,0,0) - GdkRGBA white = {1,1,1,1}; - gtk_widget_override_background_color(GTK_WIDGET(dtw->canvas), - GTK_STATE_FLAG_NORMAL, - &white); + GtkCssProvider *css_provider = gtk_css_provider_new(); + GtkStyleContext *style_context = gtk_widget_get_style_context(GTK_WIDGET(dtw->canvas)); + + gtk_css_provider_load_from_data(css_provider, + "SPCanvas {\n" + " background-color: white;\n" + "}\n", + -1, NULL); + + gtk_style_context_add_provider(style_context, + GTK_STYLE_PROVIDER(css_provider), + GTK_STYLE_PROVIDER_PRIORITY_USER); #else GtkStyle *style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(dtw->canvas))); style->bg[GTK_STATE_NORMAL] = style->white; -- cgit v1.2.3 From aea4803e114c264636addd9e8fea9c179ad06a62 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 16:42:30 +0100 Subject: desktop-widget: Fix deprecated gtk_widget_reparent usage #Hackfest2016 (bzr r14797) --- src/widgets/desktop-widget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index e899f9af1..bf9e7e272 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1693,7 +1693,8 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_TOP: case GTK_POS_BOTTOM: if ( gtk_widget_is_ancestor(toolbox, hbox) ) { - gtk_widget_reparent( toolbox, vbox ); + gtk_container_remove(GTK_CONTAINER(hbox), toolbox); + gtk_container_add(GTK_CONTAINER(vbox), toolbox); gtk_box_set_child_packing(GTK_BOX(vbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); } ToolboxFactory::setOrientation(toolbox, GTK_ORIENTATION_HORIZONTAL); @@ -1701,7 +1702,8 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_LEFT: case GTK_POS_RIGHT: if ( !gtk_widget_is_ancestor(toolbox, hbox) ) { - gtk_widget_reparent( toolbox, hbox ); + gtk_container_remove(GTK_CONTAINER(vbox), toolbox); + gtk_container_add(GTK_CONTAINER(hbox), toolbox); gtk_box_set_child_packing(GTK_BOX(hbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); if (pos == GTK_POS_LEFT) { gtk_box_reorder_child( GTK_BOX(hbox), toolbox, 0 ); -- cgit v1.2.3 From 85f115d1abec77f4e574b1e59c074509031f23a2 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 12 Apr 2016 16:46:20 +0100 Subject: Update copyright notices on display/sp-canvas.(h|cpp) (bzr r14798) --- src/display/sp-canvas.cpp | 2 ++ src/display/sp-canvas.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 2dced2512..8222f83ba 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -8,9 +8,11 @@ * fred * bbyak * Jon A. Cruz + * Krzysztof Kosiński * * Copyright (C) 1998 The Free Software Foundation * Copyright (C) 2002-2006 authors + * Copyright (C) 2016 Google * * Released under GNU GPL, read the file 'COPYING' for more information */ diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index 1f357a351..b626beedb 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -11,9 +11,11 @@ * Raph Levien * Lauris Kaplinski * Jon A. Cruz + * Krzysztof Kosiński * * Copyright (C) 1998 The Free Software Foundation * Copyright (C) 2002 Lauris Kaplinski + * Copyright (C) 2016 Google * * Released under GNU GPL, read the file 'COPYING' for more information */ -- cgit v1.2.3 From b3f4e955d1e0e8695e81a8dd9bb0b70f1a6bf7f1 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 17:00:58 +0100 Subject: sp-canvas: Disable deprecated double-buffering #Hackfest2016 (bzr r14799) --- src/display/sp-canvas.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 8222f83ba..598f45a7a 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -937,7 +937,6 @@ void sp_canvas_class_init(SPCanvasClass *klass) static void sp_canvas_init(SPCanvas *canvas) { gtk_widget_set_has_window (GTK_WIDGET (canvas), TRUE); - gtk_widget_set_double_buffered (GTK_WIDGET (canvas), FALSE); gtk_widget_set_can_focus (GTK_WIDGET (canvas), TRUE); canvas->_pick_event.type = GDK_LEAVE_NOTIFY; @@ -1569,11 +1568,7 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *context = gtk_widget_get_style_context(widget); - GdkRGBA color; - gtk_style_context_get_background_color(context, - gtk_widget_get_state_flags(widget), - &color); - gdk_cairo_set_source_rgba(buf.ct, &color); + gtk_render_background(context, buf.ct, 0, 0, paint_rect.width(), paint_rect.height()); #else GtkStyle *style = gtk_widget_get_style (widget); gdk_cairo_set_source_color(buf.ct, &style->bg[GTK_STATE_NORMAL]); -- cgit v1.2.3 From fe975a9b3c5603fe2b2d0491de3bbfe1e4bf0233 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Tue, 12 Apr 2016 17:01:58 +0100 Subject: Fork GtkImageMenuItem and remove show_image boolean because we always want to show menu. (bzr r14800) --- configure.ac | 1 + src/ui/interface.cpp | 12 + src/widgets/Makefile_insert | 6 + src/widgets/imagemenuitem.c | 1071 +++++++++++++++++++++++++++++++++++++++++++ src/widgets/imagemenuitem.h | 81 ++++ src/widgets/ink-action.cpp | 20 +- 6 files changed, 1190 insertions(+), 1 deletion(-) create mode 100644 src/widgets/imagemenuitem.c create mode 100644 src/widgets/imagemenuitem.h diff --git a/configure.ac b/configure.ac index ab11722f4..d90dab996 100644 --- a/configure.ac +++ b/configure.ac @@ -851,6 +851,7 @@ else CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS" fi fi +AM_CONDITIONAL(WITH_GTKMM_3_0, test "x$with_gtkmm_3_0" = "xyes") INKSCAPE_CFLAGS="$GTK_CFLAGS $INKSCAPE_CFLAGS" INKSCAPE_CXX_DEPS_CFLAGS="$GTKMM_CFLAGS $INKSCAPE_CXX_DEPS_CFLAGS" diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 8639861f8..6d0a85f13 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -79,6 +79,10 @@ #include "message-stack.h" #include "ui/dialog/layer-properties.h" +#if GTK_CHECK_VERSION(3,0,0) + #include "widgets/imagemenuitem.h" +#endif + #include #include @@ -413,7 +417,11 @@ sp_ui_menuitem_add_icon( GtkWidget *item, gchar *icon_name ) icon = sp_icon_new( Inkscape::ICON_SIZE_MENU, icon_name ); gtk_widget_show(icon); +#if GTK_CHECK_VERSION(3,0,0) + image_menu_item_set_image((ImageMenuItem *) item, icon); +#else gtk_image_menu_item_set_image((GtkImageMenuItem *) item, icon); +#endif } // end of sp_ui_menu_add_icon void @@ -467,7 +475,11 @@ static GtkWidget *sp_ui_menu_append_item_from_verb(GtkMenu *menu, Inkscape::Verb if (radio) { item = gtk_radio_menu_item_new_with_mnemonic(group, action->name); } else { +#if GTK_CHECK_VERSION(3,0,0) + item = image_menu_item_new_with_mnemonic(action->name); +#else item = gtk_image_menu_item_new_with_mnemonic(action->name); +#endif } gtk_label_set_markup_with_mnemonic( GTK_LABEL(gtk_bin_get_child(GTK_BIN (item))), action->name); diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 6913f4a58..10462a859 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -1,5 +1,11 @@ ## Makefile.am fragment sourced by src/Makefile.am. +if WITH_GTKMM_3_0 +ink_common_sources += \ + widgets/imagemenuitem.c \ + widgets/imagemenuitem.h +endif + ink_common_sources += \ widgets/arc-toolbar.cpp \ widgets/arc-toolbar.h \ diff --git a/src/widgets/imagemenuitem.c b/src/widgets/imagemenuitem.c new file mode 100644 index 000000000..86c44fe32 --- /dev/null +++ b/src/widgets/imagemenuitem.c @@ -0,0 +1,1071 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2001 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. + * Forked by . Icons in menus are important to us. + */ + +#include "config.h" + +#include +#include + +#include "widgets/imagemenuitem.h" + +/** + * SECTION:gtkimagemenuitem + * @Short_description: A menu item with an icon + * @Title: ImageMenuItem + * + * A ImageMenuItem is a menu item which has an icon next to the text label. + * + * Note that the user can disable display of menu icons, so make sure to still + * fill in the text label. + */ + + +struct _ImageMenuItemPrivate +{ + GtkWidget *image; + + gchar *label; + guint use_stock : 1; + guint toggle_size; +}; + +enum { + PROP_0, + PROP_IMAGE, + PROP_USE_STOCK, + PROP_ACCEL_GROUP, +}; + +static GtkActivatableIface *parent_activatable_iface; + +static void image_menu_item_destroy (GtkWidget *widget); +static void image_menu_item_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural); +static void image_menu_item_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural); +static void image_menu_item_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural); +static void image_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static void image_menu_item_map (GtkWidget *widget); +static void image_menu_item_remove (GtkContainer *container, + GtkWidget *child); +static void image_menu_item_toggle_size_request (GtkMenuItem *menu_item, + gint *requisition); +static void image_menu_item_set_label (GtkMenuItem *menu_item, + const gchar *label); +static const gchar * image_menu_item_get_label (GtkMenuItem *menu_item); + +static void image_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); + +static void image_menu_item_finalize (GObject *object); +static void image_menu_item_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void image_menu_item_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void image_menu_item_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen); + +static void image_menu_item_recalculate (ImageMenuItem *image_menu_item); + +static void image_menu_item_activatable_interface_init (GtkActivatableIface *iface); +static void image_menu_item_update (GtkActivatable *activatable, + GtkAction *action, + const gchar *property_name); +static void image_menu_item_sync_action_properties (GtkActivatable *activatable, + GtkAction *action); + + +G_DEFINE_TYPE_WITH_CODE (ImageMenuItem, image_menu_item, GTK_TYPE_MENU_ITEM, + G_ADD_PRIVATE (ImageMenuItem) + G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE, + image_menu_item_activatable_interface_init)) + + +static void +image_menu_item_class_init (ImageMenuItemClass *klass) +{ + GObjectClass *gobject_class = (GObjectClass*) klass; + GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; + GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass; + GtkContainerClass *container_class = (GtkContainerClass*) klass; + + widget_class->destroy = image_menu_item_destroy; + widget_class->screen_changed = image_menu_item_screen_changed; + widget_class->get_preferred_width = image_menu_item_get_preferred_width; + widget_class->get_preferred_height = image_menu_item_get_preferred_height; + widget_class->get_preferred_height_for_width = image_menu_item_get_preferred_height_for_width; + widget_class->size_allocate = image_menu_item_size_allocate; + widget_class->map = image_menu_item_map; + + container_class->forall = image_menu_item_forall; + container_class->remove = image_menu_item_remove; + + menu_item_class->toggle_size_request = image_menu_item_toggle_size_request; + menu_item_class->set_label = image_menu_item_set_label; + menu_item_class->get_label = image_menu_item_get_label; + + gobject_class->finalize = image_menu_item_finalize; + gobject_class->set_property = image_menu_item_set_property; + gobject_class->get_property = image_menu_item_get_property; + + /** + * ImageMenuItem:image: + * + * Child widget to appear next to the menu text. + * + */ + g_object_class_install_property (gobject_class, + PROP_IMAGE, + g_param_spec_object ("image", + _("Image widget"), + _("Child widget to appear next to the menu text"), + GTK_TYPE_WIDGET, + GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); + /** + * ImageMenuItem:use-stock: + * + * If %TRUE, the label set in the menuitem is used as a + * stock id to select the stock item for the item. + * + * Since: 2.16 + * + */ + g_object_class_install_property (gobject_class, + PROP_USE_STOCK, + g_param_spec_boolean ("use-stock", + _("Use stock"), + _("Whether to use the label text to create a stock menu item"), + FALSE, + GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)); + + /** + * ImageMenuItem:accel-group: + * + * The Accel Group to use for stock accelerator keys + * + * Since: 2.16 + * + */ + g_object_class_install_property (gobject_class, + PROP_ACCEL_GROUP, + g_param_spec_object ("accel-group", + _("Accel Group"), + _("The Accel Group to use for stock accelerator keys"), + GTK_TYPE_ACCEL_GROUP, + GTK_PARAM_WRITABLE | G_PARAM_DEPRECATED)); + +} + +static void +image_menu_item_init (ImageMenuItem *image_menu_item) +{ + ImageMenuItemPrivate *priv; + + image_menu_item->priv = image_menu_item_get_instance_private (image_menu_item); + priv = image_menu_item->priv; + + priv->image = NULL; + priv->use_stock = FALSE; + priv->label = NULL; +} + +static void +image_menu_item_finalize (GObject *object) +{ + ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (object)->priv; + + g_free (priv->label); + priv->label = NULL; + + G_OBJECT_CLASS (image_menu_item_parent_class)->finalize (object); +} + +static void +image_menu_item_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object); + + switch (prop_id) + { + case PROP_IMAGE: + image_menu_item_set_image (image_menu_item, (GtkWidget *) g_value_get_object (value)); + break; + case PROP_USE_STOCK: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + image_menu_item_set_use_stock (image_menu_item, g_value_get_boolean (value)); + G_GNUC_END_IGNORE_DEPRECATIONS; + break; + case PROP_ACCEL_GROUP: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + image_menu_item_set_accel_group (image_menu_item, g_value_get_object (value)); + G_GNUC_END_IGNORE_DEPRECATIONS; + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +image_menu_item_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object); + + switch (prop_id) + { + case PROP_IMAGE: + g_value_set_object (value, image_menu_item_get_image (image_menu_item)); + break; + case PROP_USE_STOCK: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + g_value_set_boolean (value, image_menu_item_get_use_stock (image_menu_item)); + G_GNUC_END_IGNORE_DEPRECATIONS; + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +image_menu_item_map (GtkWidget *widget) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->map (widget); + + if (priv->image) + g_object_set (priv->image, "visible", TRUE, NULL); +} + +static void +image_menu_item_destroy (GtkWidget *widget) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + if (priv->image) + gtk_container_remove (GTK_CONTAINER (image_menu_item), + priv->image); + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->destroy (widget); +} + +static void +image_menu_item_toggle_size_request (GtkMenuItem *menu_item, + gint *requisition) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (menu_item); + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkPackDirection pack_dir; + GtkWidget *parent; + GtkWidget *widget = GTK_WIDGET (menu_item); + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + *requisition = 0; + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + GtkRequisition image_requisition; + guint toggle_spacing; + + gtk_widget_get_preferred_size (priv->image, &image_requisition, NULL); + + gtk_widget_style_get (GTK_WIDGET (menu_item), + "toggle-spacing", &toggle_spacing, + NULL); + + if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) + { + if (image_requisition.width > 0) + *requisition = image_requisition.width + toggle_spacing; + } + else + { + if (image_requisition.height > 0) + *requisition = image_requisition.height + toggle_spacing; + } + } +} + +static void +image_menu_item_recalculate (ImageMenuItem *image_menu_item) +{ + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkStockItem stock_item; + GtkWidget *image; + const gchar *resolved_label = priv->label; + + if (priv->use_stock && priv->label) + { + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + if (!priv->image) + { + image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU); + image_menu_item_set_image (image_menu_item, image); + } + + if (gtk_stock_lookup (priv->label, &stock_item)) + resolved_label = stock_item.label; + + gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE); + + G_GNUC_END_IGNORE_DEPRECATIONS; + } + + GTK_MENU_ITEM_CLASS + (image_menu_item_parent_class)->set_label (GTK_MENU_ITEM (image_menu_item), resolved_label); + +} + +static void +image_menu_item_set_label (GtkMenuItem *menu_item, + const gchar *label) +{ + ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv; + + if (priv->label != label) + { + g_free (priv->label); + priv->label = g_strdup (label); + + image_menu_item_recalculate (IMAGE_MENU_ITEM (menu_item)); + + g_object_notify (G_OBJECT (menu_item), "label"); + + } +} + +static const gchar * +image_menu_item_get_label (GtkMenuItem *menu_item) +{ + ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv; + + return priv->label; +} + +static void +image_menu_item_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_width (widget, minimum, natural); + + if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) && + priv->image && + gtk_widget_get_visible (priv->image)) + { + gint child_minimum, child_natural; + + gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural); + + *minimum = MAX (*minimum, child_minimum); + *natural = MAX (*natural, child_natural); + } +} + +static void +image_menu_item_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + gint child_height = 0; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + GtkRequisition child_requisition; + + gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); + + child_height = child_requisition.height; + } + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_height (widget, minimum, natural); + + if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR) + { + *minimum = MAX (*minimum, child_height); + *natural = MAX (*natural, child_height); + } +} + +static void +image_menu_item_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + gint child_height = 0; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + GtkRequisition child_requisition; + + gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); + + child_height = child_requisition.height; + } + + GTK_WIDGET_CLASS + (image_menu_item_parent_class)->get_preferred_height_for_width (widget, width, minimum, natural); + + if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR) + { + *minimum = MAX (*minimum, child_height); + *natural = MAX (*natural, child_height); + } +} + + +static void +image_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkAllocation widget_allocation; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->size_allocate (widget, allocation); + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + gint x, y, offset; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding; + GtkRequisition child_requisition; + GtkAllocation child_allocation; + guint horizontal_padding, toggle_spacing; + gint toggle_size; + + toggle_size = image_menu_item->priv->toggle_size; + gtk_widget_style_get (widget, + "horizontal-padding", &horizontal_padding, + "toggle-spacing", &toggle_spacing, + NULL); + + /* Man this is lame hardcoding action, but I can't + * come up with a solution that's really better. + */ + + gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); + + gtk_widget_get_allocation (widget, &widget_allocation); + + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + gtk_style_context_get_padding (context, state, &padding); + offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item)); + + if (pack_dir == GTK_PACK_DIRECTION_LTR || + pack_dir == GTK_PACK_DIRECTION_RTL) + { + if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) == + (pack_dir == GTK_PACK_DIRECTION_LTR)) + x = offset + horizontal_padding + padding.left + + (toggle_size - toggle_spacing - child_requisition.width) / 2; + else + x = widget_allocation.width - offset - horizontal_padding - padding.right - + toggle_size + toggle_spacing + + (toggle_size - toggle_spacing - child_requisition.width) / 2; + + y = (widget_allocation.height - child_requisition.height) / 2; + } + else + { + if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) == + (pack_dir == GTK_PACK_DIRECTION_TTB)) + y = offset + horizontal_padding + padding.top + + (toggle_size - toggle_spacing - child_requisition.height) / 2; + else + y = widget_allocation.height - offset - horizontal_padding - padding.bottom - + toggle_size + toggle_spacing + + (toggle_size - toggle_spacing - child_requisition.height) / 2; + + x = (widget_allocation.width - child_requisition.width) / 2; + } + + child_allocation.width = child_requisition.width; + child_allocation.height = child_requisition.height; + child_allocation.x = widget_allocation.x + MAX (x, 0); + child_allocation.y = widget_allocation.y + MAX (y, 0); + + gtk_widget_size_allocate (priv->image, &child_allocation); + } +} + +static void +image_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + GTK_CONTAINER_CLASS (image_menu_item_parent_class)->forall (container, + include_internals, + callback, + callback_data); + + if (include_internals && priv->image) + (* callback) (priv->image, callback_data); +} + + +static void +image_menu_item_activatable_interface_init (GtkActivatableIface *iface) +{ + parent_activatable_iface = g_type_interface_peek_parent (iface); + iface->update = image_menu_item_update; + iface->sync_action_properties = image_menu_item_sync_action_properties; +} + +static gboolean +activatable_update_stock_id (ImageMenuItem *image_menu_item, GtkAction *action) +{ + GtkWidget *image; + const gchar *stock_id = gtk_action_get_stock_id (action); + + image = image_menu_item_get_image (image_menu_item); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + if (GTK_IS_IMAGE (image) && + stock_id && gtk_icon_factory_lookup_default (stock_id)) + { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + gtk_image_set_from_stock (GTK_IMAGE (image), stock_id, GTK_ICON_SIZE_MENU); + G_GNUC_END_IGNORE_DEPRECATIONS; + return TRUE; + } + + G_GNUC_END_IGNORE_DEPRECATIONS; + + return FALSE; +} + +static gboolean +activatable_update_gicon (ImageMenuItem *image_menu_item, GtkAction *action) +{ + GtkWidget *image; + GIcon *icon = gtk_action_get_gicon (action); + const gchar *stock_id; + gboolean ret = FALSE; + + stock_id = gtk_action_get_stock_id (action); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + image = image_menu_item_get_image (image_menu_item); + + if (icon && GTK_IS_IMAGE (image) && + !(stock_id && gtk_icon_factory_lookup_default (stock_id))) + { + gtk_image_set_from_gicon (GTK_IMAGE (image), icon, GTK_ICON_SIZE_MENU); + ret = TRUE; + } + + G_GNUC_END_IGNORE_DEPRECATIONS; + + return ret; +} + +static void +activatable_update_icon_name (ImageMenuItem *image_menu_item, GtkAction *action) +{ + GtkWidget *image; + const gchar *icon_name = gtk_action_get_icon_name (action); + + image = image_menu_item_get_image (image_menu_item); + + if (GTK_IS_IMAGE (image) && + (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY || + gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME)) + { + gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_MENU); + } +} + +static void +image_menu_item_update (GtkActivatable *activatable, + GtkAction *action, + const gchar *property_name) +{ + ImageMenuItem *image_menu_item; + gboolean use_appearance; + + image_menu_item = IMAGE_MENU_ITEM (activatable); + + parent_activatable_iface->update (activatable, action, property_name); + + use_appearance = gtk_activatable_get_use_action_appearance (activatable); + if (!use_appearance) + return; + + if (strcmp (property_name, "stock-id") == 0) + activatable_update_stock_id (image_menu_item, action); + else if (strcmp (property_name, "gicon") == 0) + activatable_update_gicon (image_menu_item, action); + else if (strcmp (property_name, "icon-name") == 0) + activatable_update_icon_name (image_menu_item, action); +} + +static void +image_menu_item_sync_action_properties (GtkActivatable *activatable, + GtkAction *action) +{ + ImageMenuItem *image_menu_item; + GtkWidget *image; + gboolean use_appearance; + + image_menu_item = IMAGE_MENU_ITEM (activatable); + + parent_activatable_iface->sync_action_properties (activatable, action); + + if (!action) + return; + + use_appearance = gtk_activatable_get_use_action_appearance (activatable); + if (!use_appearance) + return; + + image = image_menu_item_get_image (image_menu_item); + if (image && !GTK_IS_IMAGE (image)) + { + image_menu_item_set_image (image_menu_item, NULL); + image = NULL; + } + + if (!image) + { + image = gtk_image_new (); + gtk_widget_show (image); + image_menu_item_set_image (IMAGE_MENU_ITEM (activatable), + image); + } + + if (!activatable_update_stock_id (image_menu_item, action) && + !activatable_update_gicon (image_menu_item, action)) + activatable_update_icon_name (image_menu_item, action); + +} + + +/** + * image_menu_item_new: + * + * Creates a new #ImageMenuItem with an empty label. + * + * Returns: a new #ImageMenuItem + * + */ +GtkWidget* +image_menu_item_new (void) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, NULL); +} + +/** + * image_menu_item_new_with_label: + * @label: the text of the menu item. + * + * Creates a new #ImageMenuItem containing a label. + * + * Returns: a new #ImageMenuItem. + * + */ +GtkWidget* +image_menu_item_new_with_label (const gchar *label) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, + "label", label, + NULL); +} + +/** + * image_menu_item_new_with_mnemonic: + * @label: the text of the menu item, with an underscore in front of the + * mnemonic character + * + * Creates a new #ImageMenuItem containing a label. The label + * will be created using gtk_label_new_with_mnemonic(), so underscores + * in @label indicate the mnemonic for the menu item. + * + * Returns: a new #ImageMenuItem + * + */ +GtkWidget* +image_menu_item_new_with_mnemonic (const gchar *label) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, + "use-underline", TRUE, + "label", label, + NULL); +} + +/** + * image_menu_item_new_from_stock: + * @stock_id: the name of the stock item. + * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items + * accelerator to, or %NULL. + * + * Creates a new #ImageMenuItem containing the image and text from a + * stock item. Some stock ids have preprocessor macros like #STOCK_OK + * and #STOCK_APPLY. + * + * If you want this menu item to have changeable accelerators, then pass in + * %NULL for accel_group. Next call gtk_menu_item_set_accel_path() with an + * appropriate path for the menu item, use gtk_stock_lookup() to look up the + * standard accelerator for the stock item, and if one is found, call + * gtk_accel_map_add_entry() to register it. + * + * Returns: a new #ImageMenuItem. + * + */ +GtkWidget* +image_menu_item_new_from_stock (const gchar *stock_id, + GtkAccelGroup *accel_group) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, + "label", stock_id, + "use-stock", TRUE, + "accel-group", accel_group, + NULL); +} + +/** + * image_menu_item_set_use_stock: + * @image_menu_item: a #ImageMenuItem + * @use_stock: %TRUE if the menuitem should use a stock item + * + * If %TRUE, the label set in the menuitem is used as a + * stock id to select the stock item for the item. + * + * Since: 2.16 + * + */ +void +image_menu_item_set_use_stock (ImageMenuItem *image_menu_item, + gboolean use_stock) +{ + ImageMenuItemPrivate *priv; + + g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); + + priv = image_menu_item->priv; + + if (priv->use_stock != use_stock) + { + priv->use_stock = use_stock; + + image_menu_item_recalculate (image_menu_item); + + g_object_notify (G_OBJECT (image_menu_item), "use-stock"); + } +} + +/** + * image_menu_item_get_use_stock: + * @image_menu_item: a #ImageMenuItem + * + * Checks whether the label set in the menuitem is used as a + * stock id to select the stock item for the item. + * + * Returns: %TRUE if the label set in the menuitem is used as a + * stock id to select the stock item for the item + * + * Since: 2.16 + * + */ +gboolean +image_menu_item_get_use_stock (ImageMenuItem *image_menu_item) +{ + g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), FALSE); + + return image_menu_item->priv->use_stock; +} + +/** + * image_menu_item_set_accel_group: + * @image_menu_item: a #ImageMenuItem + * @accel_group: the #GtkAccelGroup + * + * Specifies an @accel_group to add the menu items accelerator to + * (this only applies to stock items so a stock item must already + * be set, make sure to call image_menu_item_set_use_stock() + * and gtk_menu_item_set_label() with a valid stock item first). + * + * If you want this menu item to have changeable accelerators then + * you shouldnt need this (see image_menu_item_new_from_stock()). + * + * Since: 2.16 + * + */ +void +image_menu_item_set_accel_group (ImageMenuItem *image_menu_item, + GtkAccelGroup *accel_group) +{ + ImageMenuItemPrivate *priv; + GtkStockItem stock_item; + + /* Silent return for the constructor */ + if (!accel_group) + return; + + g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); + g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group)); + + priv = image_menu_item->priv; + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + if (priv->use_stock && priv->label && gtk_stock_lookup (priv->label, &stock_item)) + if (stock_item.keyval) + { + gtk_widget_add_accelerator (GTK_WIDGET (image_menu_item), + "activate", + accel_group, + stock_item.keyval, + stock_item.modifier, + GTK_ACCEL_VISIBLE); + + g_object_notify (G_OBJECT (image_menu_item), "accel-group"); + } + + G_GNUC_END_IGNORE_DEPRECATIONS; + +} + +/** + * image_menu_item_set_image: + * @image_menu_item: a #ImageMenuItem. + * @image: (allow-none): a widget to set as the image for the menu item. + * + * Sets the image of @image_menu_item to the given widget. + * Note that it depends on the show-menu-images setting whether + * the image will be displayed or not. + * + */ +void +image_menu_item_set_image (ImageMenuItem *image_menu_item, + GtkWidget *image) +{ + ImageMenuItemPrivate *priv; + + g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); + + priv = image_menu_item->priv; + + if (image == priv->image) + return; + + if (priv->image) + gtk_container_remove (GTK_CONTAINER (image_menu_item), + priv->image); + + priv->image = image; + + if (image == NULL) + return; + + gtk_widget_set_parent (image, GTK_WIDGET (image_menu_item)); + g_object_set (image, "visible", TRUE, "no-show-all", TRUE, NULL); + + g_object_notify (G_OBJECT (image_menu_item), "image"); +} + +/** + * image_menu_item_get_image: + * @image_menu_item: a #ImageMenuItem + * + * Gets the widget that is currently set as the image of @image_menu_item. + * See image_menu_item_set_image(). + * + * Return value: (transfer none): the widget set as image of @image_menu_item + * + **/ +GtkWidget* +image_menu_item_get_image (ImageMenuItem *image_menu_item) +{ + g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), NULL); + + return image_menu_item->priv->image; +} + +static void +image_menu_item_remove (GtkContainer *container, + GtkWidget *child) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + if (child == priv->image) + { + gboolean widget_was_visible; + + widget_was_visible = gtk_widget_get_visible (child); + + gtk_widget_unparent (child); + priv->image = NULL; + + if (widget_was_visible && + gtk_widget_get_visible (GTK_WIDGET (container))) + gtk_widget_queue_resize (GTK_WIDGET (container)); + + g_object_notify (G_OBJECT (image_menu_item), "image"); + } + else + { + GTK_CONTAINER_CLASS (image_menu_item_parent_class)->remove (container, child); + } +} + +static void +show_image_change_notify (ImageMenuItem *image_menu_item) +{ + ImageMenuItemPrivate *priv = image_menu_item->priv; + + if (priv->image) + { + gtk_widget_show (priv->image); + } +} + +static void +traverse_container (GtkWidget *widget, + gpointer data) +{ + if (IS_IMAGE_MENU_ITEM (widget)) + show_image_change_notify (IMAGE_MENU_ITEM (widget)); + else if (GTK_IS_CONTAINER (widget)) + gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL); +} + +static void +image_menu_item_setting_changed (GtkSettings *settings) +{ + GList *list, *l; + + list = gtk_window_list_toplevels (); + + for (l = list; l; l = l->next) + gtk_container_forall (GTK_CONTAINER (l->data), + traverse_container, NULL); + + g_list_free (list); +} + +static void +image_menu_item_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen) +{ + GtkSettings *settings; + gulong show_image_connection; + + if (!gtk_widget_has_screen (widget)) + return; + + settings = gtk_widget_get_settings (widget); + + show_image_connection = + g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0, + NULL, image_menu_item_setting_changed, NULL); + + if (show_image_connection) + return; + + g_signal_connect (settings, "notify::gtk-menu-images", + G_CALLBACK (image_menu_item_setting_changed), NULL); + + show_image_change_notify (IMAGE_MENU_ITEM (widget)); +} diff --git a/src/widgets/imagemenuitem.h b/src/widgets/imagemenuitem.h new file mode 100644 index 000000000..61cc48f3a --- /dev/null +++ b/src/widgets/imagemenuitem.h @@ -0,0 +1,81 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. + * Forked for , icons in menus are important to us. + */ + +#ifndef __IMAGE_MENU_ITEM_H__ +#define __IMAGE_MENU_ITEM_H__ + +#include + +G_BEGIN_DECLS + +#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB + +#define TYPE_IMAGE_MENU_ITEM (image_menu_item_get_type ()) +#define IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItem)) +#define IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass)) +#define IS_IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_MENU_ITEM)) +#define IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_MENU_ITEM)) +#define IMAGE_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass)) + +typedef struct _ImageMenuItem ImageMenuItem; +typedef struct _ImageMenuItemPrivate ImageMenuItemPrivate; +typedef struct _ImageMenuItemClass ImageMenuItemClass; + +struct _ImageMenuItem +{ + GtkMenuItem menu_item; + + /*< private >*/ + ImageMenuItemPrivate *priv; +}; + +struct _ImageMenuItemClass +{ + GtkMenuItemClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); +}; + +GType image_menu_item_get_type (void) G_GNUC_CONST; +GtkWidget* image_menu_item_new (void); +GtkWidget* image_menu_item_new_with_label (const gchar *label); +GtkWidget* image_menu_item_new_with_mnemonic (const gchar *label); +GtkWidget* image_menu_item_new_from_stock (const gchar *stock_id, + GtkAccelGroup *accel_group); +void image_menu_item_set_image (ImageMenuItem *image_menu_item, + GtkWidget *image); +GtkWidget* image_menu_item_get_image (ImageMenuItem *image_menu_item); +void image_menu_item_set_use_stock (ImageMenuItem *image_menu_item, + gboolean use_stock); +gboolean image_menu_item_get_use_stock (ImageMenuItem *image_menu_item); +void image_menu_item_set_accel_group (ImageMenuItem *image_menu_item, + GtkAccelGroup *accel_group); + +G_END_DECLS + +#endif /* __IMAGE_MENU_ITEM_H__ */ diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp index 5941c31e4..01aa4957a 100644 --- a/src/widgets/ink-action.cpp +++ b/src/widgets/ink-action.cpp @@ -1,12 +1,20 @@ #include "widgets/icon.h" #include "icon-size.h" #include -#include + #include "widgets/ink-action.h" #include "widgets/button.h" +#include + +#if GTK_CHECK_VERSION(3,0,0) + // Fork of gtk-imagemenuitem to continue support + #include "widgets/imagemenuitem.h" + +#endif + static void ink_action_finalize( GObject* obj ); static void ink_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec ); static void ink_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec ); @@ -158,7 +166,12 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action ) gchar* label = 0; g_object_get( G_OBJECT(act), "label", &label, NULL ); +#if GTK_CHECK_VERSION(3,0,0) + item = image_menu_item_new_with_mnemonic( label ); +#else item = gtk_image_menu_item_new_with_mnemonic( label ); +#endif + GtkWidget* child = sp_icon_new( Inkscape::ICON_SIZE_MENU, act->private_data->iconId ); // TODO this work-around is until SPIcon will live properly inside of a popup menu if ( SP_IS_ICON(child) ) { @@ -172,7 +185,12 @@ static GtkWidget* ink_action_create_menu_item( GtkAction* action ) } } gtk_widget_show_all( child ); + +#if GTK_CHECK_VERSION(3,0,0) + image_menu_item_set_image( IMAGE_MENU_ITEM(item), child ); +#else gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(item), child ); +#endif g_free( label ); label = 0; -- cgit v1.2.3 From d97964973f051d4ee5f9adf14997961142393420 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Tue, 12 Apr 2016 19:12:47 +0200 Subject: Fix some cmake caching issue preventing to switch between gtk{2,3} builds (bzr r14801) --- CMakeScripts/DefineDependsandFlags.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 054c08a74..d8088bf9a 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -210,7 +210,7 @@ set(TRY_GTKSPELL 1) # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules( - GTK + GTK3 REQUIRED gtkmm-3.0>=3.8 gdkmm-3.0>=3.8 @@ -219,7 +219,7 @@ if("${WITH_GTK3_EXPERIMENTAL}") gdl-3.0>=3.4 ) message("Using EXPERIMENTAL Gtkmm 3 build") - list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER}) + list(APPEND INKSCAPE_CXX_FLAGS ${GTK3_CFLAGS_OTHER}) set(WITH_GTKMM_3_0 1) message("Using external GDL") set(WITH_EXT_GDL 1) @@ -251,12 +251,12 @@ if("${WITH_GTK3_EXPERIMENTAL}") set (WITH_GTKSPELL 1) endif() list(APPEND INKSCAPE_INCS_SYS - ${GTK_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} ${GTKSPELL3_INCLUDE_DIRS} ) list(APPEND INKSCAPE_LIBS - ${GTK_LIBRARIES} + ${GTK3_LIBRARIES} ${GTKSPELL3_LIBRARIES} ) else() -- cgit v1.2.3 From 42727c90c85049a17b192530ec3f96bac3054e15 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 23:33:42 +0100 Subject: desktop-widget: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14802) --- src/widgets/desktop-widget.cpp | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index bf9e7e272..759be551f 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -700,38 +700,37 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_container_add (GTK_CONTAINER (eventbox), dtw->coord_status); gtk_widget_set_tooltip_text (eventbox, _("Cursor coordinates")); GtkWidget *label_x = gtk_label_new(_("X:")); - gtk_misc_set_alignment (GTK_MISC(label_x), 0.0, 0.5); - -#if GTK_CHECK_VERSION(3,0,0) - gtk_grid_attach(GTK_GRID(dtw->coord_status), - label_x, 1, 0, 1, 1); -#else - gtk_table_attach(GTK_TABLE(dtw->coord_status), label_x, 1,2, 0,1, GTK_FILL, GTK_FILL, 0, 0); -#endif - GtkWidget *label_y = gtk_label_new(_("Y:")); - gtk_misc_set_alignment (GTK_MISC(label_y), 0.0, 0.5); #if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(label_x, GTK_ALIGN_START); + gtk_widget_set_halign(label_y, GTK_ALIGN_START); + gtk_grid_attach(GTK_GRID(dtw->coord_status), label_x, 1, 0, 1, 1); gtk_grid_attach(GTK_GRID(dtw->coord_status), label_y, 1, 1, 1, 1); #else + gtk_misc_set_alignment (GTK_MISC(label_x), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC(label_y), 0.0, 0.5); + gtk_table_attach(GTK_TABLE(dtw->coord_status), label_x, 1,2, 0,1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(dtw->coord_status), label_y, 1,2, 1,2, GTK_FILL, GTK_FILL, 0, 0); #endif dtw->coord_status_x = gtk_label_new(NULL); - gtk_label_set_markup( GTK_LABEL(dtw->coord_status_x), " 0.00 " ); - gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_x), 1.0, 0.5); dtw->coord_status_y = gtk_label_new(NULL); + gtk_label_set_markup( GTK_LABEL(dtw->coord_status_x), " 0.00 " ); gtk_label_set_markup( GTK_LABEL(dtw->coord_status_y), " 0.00 " ); - gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_y), 1.0, 0.5); + GtkWidget* label_z = gtk_label_new(_("Z:")); #if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(dtw->coord_status_x, GTK_ALIGN_END); + gtk_widget_set_halign(dtw->coord_status_y, GTK_ALIGN_END); gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_x, 2, 0, 1, 1); gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_y, 2, 1, 1, 1); gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 2); gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 2); #else + gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_x), 1.0, 0.5); + gtk_misc_set_alignment (GTK_MISC(dtw->coord_status_y), 1.0, 0.5); gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_x, 2,3, 0,1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(dtw->coord_status), dtw->coord_status_y, 2,3, 1,2, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(dtw->coord_status), label_z, 3,4, 0,2, GTK_FILL, GTK_FILL, 0, 0); @@ -764,7 +763,13 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->select_status_eventbox = gtk_event_box_new (); dtw->select_status = gtk_label_new (NULL); gtk_label_set_ellipsize (GTK_LABEL(dtw->select_status), PANGO_ELLIPSIZE_END); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(dtw->select_status, GTK_ALIGN_START); +#else gtk_misc_set_alignment (GTK_MISC (dtw->select_status), 0.0, 0.5); +#endif + gtk_widget_set_size_request (dtw->select_status, 1, -1); // display the initial welcome message in the statusbar gtk_label_set_markup (GTK_LABEL (dtw->select_status), _("Welcome to Inkscape! Use shape or freehand tools to create objects; use selector (arrow) to move or transform them.")); -- cgit v1.2.3 From 18444221922cb85250c29eeb43850077c9f5f88c Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 23:37:22 +0100 Subject: ege-adjustment-action: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14803) --- src/widgets/ege-adjustment-action.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp index a91149f4c..272217aa4 100644 --- a/src/widgets/ege-adjustment-action.cpp +++ b/src/widgets/ege-adjustment-action.cpp @@ -865,7 +865,13 @@ static GtkWidget* create_tool_item( GtkAction* action ) gtk_box_pack_start( GTK_BOX(hb), icon, FALSE, FALSE, 0 ); } else { GtkWidget* lbl = gtk_label_new( g_value_get_string( &value ) ? g_value_get_string( &value ) : "wwww" ); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(lbl, GTK_ALIGN_END); +#else gtk_misc_set_alignment( GTK_MISC(lbl), 1.0, 0.5 ); +#endif + gtk_box_pack_start( GTK_BOX(hb), lbl, FALSE, FALSE, 0 ); } } -- cgit v1.2.3 From 936d8b575539c41d1f45688beea20bb8038b38be Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 12 Apr 2016 23:41:33 +0100 Subject: gradient-vector: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14804) --- src/widgets/gradient-vector.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index 35c1e4a8d..3aa44c90a 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -914,7 +914,13 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s /* Label */ GtkWidget *l = gtk_label_new(C_("Gradient","Offset:")); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(l, GTK_ALIGN_END); +#else gtk_misc_set_alignment(GTK_MISC(l), 1.0, 0.5); +#endif + gtk_box_pack_start(GTK_BOX(hb),l, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); gtk_widget_show(l); -- cgit v1.2.3 From 9c951f1140577582dde039e5c1abb934f3b97dec Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 00:04:28 +0100 Subject: spw-utilities: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14805) --- src/widgets/spw-utilities.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp index 7030753a5..2cad395e7 100644 --- a/src/widgets/spw-utilities.cpp +++ b/src/widgets/spw-utilities.cpp @@ -84,12 +84,23 @@ spw_label_old(GtkWidget *table, const gchar *label_text, int col, int row) label_widget = gtk_label_new (label_text); g_assert(label_widget != NULL); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(label_widget, GTK_ALIGN_END); +#else gtk_misc_set_alignment (GTK_MISC (label_widget), 1.0, 0.5); +#endif + gtk_widget_show (label_widget); #if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_margin_start(label_widget, 4); + gtk_widget_set_margin_end(label_widget, 4); +#if GTK_CHECK_VERSION(3,12,0) +#else gtk_widget_set_margin_left(label_widget, 4); gtk_widget_set_margin_right(label_widget, 4); +#endif gtk_widget_set_hexpand(label_widget, TRUE); gtk_widget_set_halign(label_widget, GTK_ALIGN_FILL); gtk_widget_set_valign(label_widget, GTK_ALIGN_CENTER); @@ -166,7 +177,13 @@ spw_checkbutton(GtkWidget * dialog, GtkWidget * table, g_assert(table != NULL); GtkWidget *l = gtk_label_new (label); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(l, GTK_ALIGN_END); +#else gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5); +#endif + gtk_widget_show (l); #if GTK_CHECK_VERSION(3,0,0) -- cgit v1.2.3 From 5d51cbdde8990a564d60e38ab121b31b97ba110d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 00:22:35 +0100 Subject: ege-select-one-action: Fix deprecated GtkAlignment #Hackfest2016 (bzr r14806) --- src/widgets/ege-select-one-action.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/widgets/ege-select-one-action.cpp b/src/widgets/ege-select-one-action.cpp index ab86c49f8..2e106154e 100644 --- a/src/widgets/ege-select-one-action.cpp +++ b/src/widgets/ege-select-one-action.cpp @@ -818,9 +818,14 @@ GtkWidget* create_tool_item( GtkAction* action ) gtk_box_pack_start( GTK_BOX(holder), normal, FALSE, FALSE, 0 ); { +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(holder, GTK_ALIGN_START); + gtk_container_add(GTK_CONTAINER(item), holder); +#else GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0); gtk_container_add( GTK_CONTAINER(align), holder); gtk_container_add( GTK_CONTAINER(item), align ); +#endif } } @@ -855,10 +860,14 @@ void resync_active( EgeSelectOneAction* act, gint active, gboolean override ) GList* children = gtk_container_get_children( GTK_CONTAINER(proxies->data) ); if ( children && children->data ) { gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" ); + +#if !GTK_CHECK_VERSION(3,0,0) if (!combodata && GTK_IS_ALIGNMENT(children->data)) { GList *other = gtk_container_get_children( GTK_CONTAINER(children->data) ); combodata = g_object_get_data( G_OBJECT(other->data), "ege-combo-box" ); } +#endif + if ( GTK_IS_COMBO_BOX(combodata) ) { GtkComboBox* combo = GTK_COMBO_BOX(combodata); if ((active == -1) && (gtk_combo_box_get_has_entry(combo))) { @@ -915,10 +924,14 @@ void resync_sensitive( EgeSelectOneAction* act ) GList* children = gtk_container_get_children( GTK_CONTAINER(proxies->data) ); if ( children && children->data ) { gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" ); + +#if !GTK_CHECK_VERSION(3,0,0) if (!combodata && GTK_IS_ALIGNMENT(children->data)) { GList *other = gtk_container_get_children( GTK_CONTAINER(children->data) ); combodata = g_object_get_data( G_OBJECT(other->data), "ege-combo-box" ); } +#endif + if ( GTK_IS_COMBO_BOX(combodata) ) { /* Not implemented */ } else if ( GTK_IS_BOX(children->data) ) { -- cgit v1.2.3 From 12dfd72d7b2ed18dbf894d24c76d63784030eb31 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 08:37:07 +0100 Subject: clonetiler: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14807) --- src/ui/dialog/clonetiler.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index fbd050f8e..fa53041d3 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -1061,7 +1061,11 @@ CloneTiler::CloneTiler () : { GtkWidget *l = gtk_label_new (""); gtk_label_set_markup (GTK_LABEL(l), "×"); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(l, GTK_ALIGN_END); +#else gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5); +#endif gtk_box_pack_start (GTK_BOX (hb), l, TRUE, TRUE, 0); } @@ -1135,7 +1139,11 @@ CloneTiler::CloneTiler () : { GtkWidget *l = gtk_label_new (""); gtk_label_set_markup (GTK_LABEL(l), "×"); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(l, GTK_ALIGN_END); +#else gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5); +#endif gtk_box_pack_start (GTK_BOX (hb), l, TRUE, TRUE, 0); } @@ -2777,7 +2785,12 @@ GtkWidget * CloneTiler::clonetiler_spinbox(const char *tip, const char *attr, do { GtkWidget *l = gtk_label_new (""); gtk_label_set_markup (GTK_LABEL(l), suffix); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(l, GTK_ALIGN_END); + gtk_widget_set_valign(l, GTK_ALIGN_START); +#else gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0); +#endif gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 0); } -- cgit v1.2.3 From 5cebe28e2fa5ca6ee27e43579596f5aad43273f5 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 08:43:53 +0100 Subject: clonetiler: Fix deprecated GtkAlignment #Hackfest2016 (bzr r14808) --- src/ui/dialog/clonetiler.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index fa53041d3..9656878e0 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -2866,14 +2866,13 @@ void CloneTiler::clonetiler_reset(GtkWidget */*widget*/, GtkWidget *dlg) void CloneTiler::clonetiler_table_attach(GtkWidget *table, GtkWidget *widget, float align, int row, int col) { - GtkWidget *a = gtk_alignment_new (align, 0, 0, 0); - gtk_container_add(GTK_CONTAINER(a), widget); - #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_halign(table, GTK_ALIGN_FILL); - gtk_widget_set_valign(table, GTK_ALIGN_CENTER); - gtk_grid_attach(GTK_GRID(table), a, col, row, 1, 1); + gtk_widget_set_halign(widget, GTK_ALIGN_FILL); + gtk_widget_set_valign(widget, GTK_ALIGN_START); + gtk_grid_attach(GTK_GRID(table), widget, col, row, 1, 1); #else + GtkWidget *a = gtk_alignment_new (align, 0, 0, 0); + gtk_container_add(GTK_CONTAINER(a), widget); gtk_table_attach ( GTK_TABLE (table), a, col, col + 1, row, row + 1, GTK_FILL, (GtkAttachOptions)0, 0, 0 ); #endif } -- cgit v1.2.3 From 1ed89e14a0101dc5f57dfde75895a5e00e0ee37d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 09:34:40 +0100 Subject: color-icc-selector: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14809) --- src/ui/widget/color-icc-selector.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index 2fe4a0704..ec2e69fb3 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -377,7 +377,6 @@ void ColorICCSelector::init() (gpointer)_impl); gtk_widget_set_sensitive(_impl->_fixupBtn, FALSE); gtk_widget_set_tooltip_text(_impl->_fixupBtn, _("Fix RGB fallback to match icc-color() value.")); - // gtk_misc_set_alignment( GTK_MISC (_impl->_fixupBtn), 1.0, 0.5 ); gtk_widget_show(_impl->_fixupBtn); attachToGridOrTable(t, _impl->_fixupBtn, 0, row, 1, 1); @@ -431,7 +430,13 @@ void ColorICCSelector::init() #endif _impl->_compUI[i]._label = gtk_label_new_with_mnemonic(labelStr.c_str()); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(_impl->_compUI[i]._label, GTK_ALIGN_END); +#else gtk_misc_set_alignment(GTK_MISC(_impl->_compUI[i]._label), 1.0, 0.5); +#endif + gtk_widget_show(_impl->_compUI[i]._label); gtk_widget_set_no_show_all(_impl->_compUI[i]._label, TRUE); @@ -489,7 +494,13 @@ void ColorICCSelector::init() // Label _impl->_label = gtk_label_new_with_mnemonic(_("_A:")); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(_impl->_label, GTK_ALIGN_END); +#else gtk_misc_set_alignment(GTK_MISC(_impl->_label), 1.0, 0.5); +#endif + gtk_widget_show(_impl->_label); attachToGridOrTable(t, _impl->_label, 0, row, 1, 1); -- cgit v1.2.3 From e12e3b0f5a6382aadd604101c68cb3c66658167e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 09:41:56 +0100 Subject: color-notebook: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14810) --- src/ui/widget/color-notebook.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index 60abf43bf..6d7ada734 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -210,7 +210,11 @@ void ColorNotebook::_initUI() /* Create RGBA entry and color preview */ _rgbal = gtk_label_new_with_mnemonic(_("RGBA_:")); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(_rgbal, GTK_ALIGN_END); +#else gtk_misc_set_alignment(GTK_MISC(_rgbal), 1.0, 0.5); +#endif gtk_box_pack_start(GTK_BOX(rgbabox), _rgbal, TRUE, TRUE, 2); ColorEntry *rgba_entry = Gtk::manage(new ColorEntry(_selected_color)); -- cgit v1.2.3 From 5613a4a900e8a90bd0219f1c4d35eddaa7db369d Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 13 Apr 2016 10:44:24 +0200 Subject: Should compile inkscape-version.cpp in out of tree builds Fixed bugs: - https://launchpad.net/bugs/1543304 (bzr r14811) --- CMakeScripts/inkscape-version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index adfb3ddd8..2155e0013 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -17,4 +17,4 @@ if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) endif() message("revision is " ${INKSCAPE_REVISION}) -configure_file(${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp.in ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp) +configure_file(${INKSCAPE_SOURCE_DIR}/src/inkscape-version.cpp.in ${INKSCAPE_BINARY_DIR}/src/inkscape-version.cpp) -- cgit v1.2.3 From eff7c5e5ab8ed2f381b7dbb6edfd1c7062afc812 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 09:47:09 +0100 Subject: color-scales: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14812) --- src/ui/widget/color-scales.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 170f83887..48a2693bc 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -92,7 +92,13 @@ void ColorScales::_initUI(SPColorScalesMode mode) for (i = 0; i < static_cast(G_N_ELEMENTS(_a)); i++) { /* Label */ _l[i] = gtk_label_new(""); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(_l[i], GTK_ALIGN_END); +#else gtk_misc_set_alignment(GTK_MISC(_l[i]), 1.0, 0.5); +#endif + gtk_widget_show(_l[i]); #if GTK_CHECK_VERSION(3, 0, 0) -- cgit v1.2.3 From 2656d1c2c4f35261da9cd40a94417426e5c6d8e4 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 10:03:28 +0100 Subject: ink-action: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14813) --- src/widgets/ink-action.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp index 01aa4957a..44ba5c7f9 100644 --- a/src/widgets/ink-action.cpp +++ b/src/widgets/ink-action.cpp @@ -392,9 +392,16 @@ static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action ) GtkToolButton* button = GTK_TOOL_BUTTON(item); if ( act->private_data->iconId ) { GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId ); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_hexpand(child, FALSE); + gtk_widget_set_vexpand(child, FALSE); + gtk_tool_button_set_icon_widget(button, child); +#else GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 ); gtk_container_add( GTK_CONTAINER(align), child ); gtk_tool_button_set_icon_widget( button, align ); +#endif } else { gchar *label = 0; g_object_get( G_OBJECT(action), "short_label", &label, NULL ); @@ -423,10 +430,18 @@ static void ink_toggle_action_update_icon( InkToggleAction* action ) GtkToolButton* button = GTK_TOOL_BUTTON(proxies->data); GtkWidget* child = sp_icon_new( action->private_data->iconSize, action->private_data->iconId ); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_hexpand(child, FALSE); + gtk_widget_set_vexpand(child, FALSE); + gtk_widget_show_all(child); + gtk_tool_button_set_icon_widget(button, child); +#else GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 ); gtk_container_add( GTK_CONTAINER(align), child ); gtk_widget_show_all( align ); gtk_tool_button_set_icon_widget( button, align ); +#endif } } @@ -595,9 +610,16 @@ static GtkWidget* ink_radio_action_create_tool_item( GtkAction* action ) GtkToolButton* button = GTK_TOOL_BUTTON(item); GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId ); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_hexpand(child, FALSE); + gtk_widget_set_vexpand(child, FALSE); + gtk_tool_button_set_icon_widget(button, child); +#else GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 ); gtk_container_add( GTK_CONTAINER(align), child ); gtk_tool_button_set_icon_widget( button, align ); +#endif } else { // For now trigger a warning but don't do anything else GtkToolButton* button = GTK_TOOL_BUTTON(item); -- cgit v1.2.3 From 0ed6ffcc46be15caa8974c2778ec2b86e6139ab2 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 13 Apr 2016 11:11:33 +0200 Subject: Restore ability to set unitless 'line-height'. Hackfest 2016 Note: Rendering with 'line-height' with units is buggy. (bzr r14814) --- src/widgets/text-toolbar.cpp | 79 +++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index e71c911bd..661fc6fa9 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -508,6 +508,10 @@ static void sp_text_align_mode_changed( EgeSelectOneAction *act, GObject *tbl ) g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) ); } +static bool is_relative( Unit const *unit ) { + return (unit->abbr == "" || unit->abbr == "em" || unit->abbr == "ex" || unit->abbr == "%"); +} + static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) { // quit if run by the _changed callbacks @@ -524,21 +528,22 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl ) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - // This nonsense is to get SP_CSS_UNIT_xx value corresponding to unit so - // we can save it (allows us to adjust line height value when unit changes). - SPILength temp_length; - Inkscape::CSSOStringStream temp_stream; - temp_stream << 1 << unit->abbr; - temp_length.read(temp_stream.str().c_str()); - prefs->setInt("/tools/text/lineheight/display_unit", temp_length.unit); - g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(temp_length.unit)); - + // Only save if not relative unit + if ( !is_relative(unit) ) { + // This nonsense is to get SP_CSS_UNIT_xx value corresponding to unit so + // we can save it (allows us to adjust line height value when unit changes). + SPILength temp_length; + Inkscape::CSSOStringStream temp_stream; + temp_stream << 1 << unit->abbr; + temp_length.read(temp_stream.str().c_str()); + prefs->setInt("/tools/text/lineheight/display_unit", temp_length.unit); + g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(temp_length.unit)); + } // Set css line height. SPCSSAttr *css = sp_repr_css_attr_new (); Inkscape::CSSOStringStream osfs; - // We should handle unitless values as well as 'em' and 'ex' - if ((unit->abbr) == "em" || unit->abbr == "ex" || unit->abbr == "%") { + if ( is_relative(unit) ) { osfs << gtk_adjustment_get_value(adj) << unit->abbr; } else { // Inside SVG file, always use "px" for absolute units. @@ -601,13 +606,16 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) g_return_if_fail(unit != NULL); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - // This nonsense is to get SP_CSS_UNIT_xx value corresponding to unit. - SPILength temp_length; - Inkscape::CSSOStringStream temp_stream; - temp_stream << 1 << unit->abbr; - temp_length.read(temp_stream.str().c_str()); - prefs->setInt("/tools/text/lineheight/display_unit", temp_length.unit); - g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(temp_length.unit)); + // Only save if not relative unit + if ( !is_relative(unit) ) { + // This nonsense is to get SP_CSS_UNIT_xx value corresponding to unit. + SPILength temp_length; + Inkscape::CSSOStringStream temp_stream; + temp_stream << 1 << unit->abbr; + temp_length.read(temp_stream.str().c_str()); + prefs->setInt("/tools/text/lineheight/display_unit", temp_length.unit); + g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(temp_length.unit)); + } // Read current line height value EgeAdjustmentAction *line_height_act = @@ -620,19 +628,19 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) std::vector itemlist=selection->itemList(); // Convert between units - if ((unit->abbr) == "em" && old_unit == SP_CSS_UNIT_EX) { + if ((unit->abbr == "" || unit->abbr == "em") && old_unit == SP_CSS_UNIT_EX) { line_height *= 0.5; - } else if ((unit->abbr) == "ex" && old_unit == SP_CSS_UNIT_EM) { + } else if ((unit->abbr) == "ex" && (old_unit == SP_CSS_UNIT_EM || old_unit == SP_CSS_UNIT_NONE) ) { line_height *= 2.0; - } else if ((unit->abbr) == "em" && old_unit == SP_CSS_UNIT_PERCENT) { + } else if ((unit->abbr == "" || unit->abbr == "em") && old_unit == SP_CSS_UNIT_PERCENT) { line_height /= 100.0; - } else if ((unit->abbr) == "%" && old_unit == SP_CSS_UNIT_EM) { + } else if ((unit->abbr) == "%" && (old_unit == SP_CSS_UNIT_EM || old_unit == SP_CSS_UNIT_NONE) ) { line_height *= 100; } else if ((unit->abbr) == "ex" && old_unit == SP_CSS_UNIT_PERCENT) { line_height /= 50.0; } else if ((unit->abbr) == "%" && old_unit == SP_CSS_UNIT_EX) { line_height *= 50; - } else if ((unit->abbr) == "%" || (unit->abbr) == "em" || (unit->abbr) == "ex") { + } else if (is_relative(unit)) { // Convert absolute to relative... for the moment use average font-size double font_size = 0; int count = 0; @@ -648,7 +656,10 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) } else { font_size = 20; } + + if (old_unit == SP_CSS_UNIT_NONE) old_unit = SP_CSS_UNIT_EM; line_height = Quantity::convert(line_height, sp_style_get_css_unit_string(old_unit), "px"); + if (font_size > 0) { line_height /= font_size; } @@ -657,7 +668,8 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) } else if ((unit->abbr) == "ex") { line_height *= 2; } - } else if (old_unit==SP_CSS_UNIT_PERCENT || old_unit==SP_CSS_UNIT_EM || old_unit==SP_CSS_UNIT_EX) { + } else if (old_unit==SP_CSS_UNIT_NONE || old_unit==SP_CSS_UNIT_PERCENT || + old_unit==SP_CSS_UNIT_EM || old_unit==SP_CSS_UNIT_EX) { // Convert relative to absolute... for the moment use average font-size double font_size = 0; int count = 0; @@ -689,8 +701,7 @@ static void sp_text_lineheight_unit_changed( gpointer /* */, GObject *tbl ) // Set css line height. SPCSSAttr *css = sp_repr_css_attr_new (); Inkscape::CSSOStringStream osfs; - // We should handle unitless values as well as 'em' and 'ex' - if ((unit->abbr) == "em" || unit->abbr == "ex" || unit->abbr == "%") { + if ( is_relative(unit) ) { osfs << line_height << unit->abbr; } else { osfs << Quantity::convert(line_height, unit, "px") << "px"; @@ -1264,8 +1275,6 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ switch (line_height_unit) { case SP_CSS_UNIT_NONE: - // tracker can't show no unit... use 'em' - line_height_unit = SP_CSS_UNIT_EM; case SP_CSS_UNIT_EM: case SP_CSS_UNIT_EX: break; @@ -1276,7 +1285,9 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ // If unit is set to 'px', use the preferred display unit (if absolute). line_height_unit = prefs->getInt("/tools/text/lineheight/display_unit", SP_CSS_UNIT_PT); - if (line_height_unit != SP_CSS_UNIT_EM && + // But not if prefered unit is relative + if (line_height_unit != SP_CSS_UNIT_NONE && + line_height_unit != SP_CSS_UNIT_EM && line_height_unit != SP_CSS_UNIT_EX && line_height_unit != SP_CSS_UNIT_PERCENT) { height = @@ -1299,7 +1310,13 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/ gtk_adjustment_set_value( lineHeightAdjustment, height ); UnitTracker* tracker = reinterpret_cast( g_object_get_data( tbl, "tracker" ) ); - tracker->setActiveUnitByAbbr(sp_style_get_css_unit_string(line_height_unit)); + if( line_height_unit == SP_CSS_UNIT_NONE ) { + // Function 'sp_style_get_css_unit_string' returns 'px' for unit none. + // We need to avoid this. + tracker->setActiveUnitByAbbr(""); + } else { + tracker->setActiveUnitByAbbr(sp_style_get_css_unit_string(line_height_unit)); + } // Save unit so we can do convertions between new/old units. g_object_set_data( tbl, "lineheight_unit", GINT_TO_POINTER(line_height_unit)); @@ -1797,10 +1814,10 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje /* Line height unit tracker */ UnitTracker* tracker = new UnitTracker(Inkscape::Util::UNIT_TYPE_LINEAR); + tracker->prependUnit(unit_table.getUnit("")); // No unit tracker->addUnit(unit_table.getUnit("%")); tracker->addUnit(unit_table.getUnit("em")); tracker->addUnit(unit_table.getUnit("ex")); - // tracker->addUnit(unit_table.getUnit("None")); tracker->setActiveUnit(unit_table.getUnit("%")); g_object_set_data( holder, "tracker", tracker ); -- cgit v1.2.3 From d9cab02baeddb4f97a34a72e1b0de97b13a3037a Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 10:13:05 +0100 Subject: ink-comboboxentry-action: Fix deprecated gtk_misc_set_alignment #Hackfest2016 (bzr r14815) --- src/widgets/ink-comboboxentry-action.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/widgets/ink-comboboxentry-action.cpp b/src/widgets/ink-comboboxentry-action.cpp index 1114d2cdb..ec5e26cf5 100644 --- a/src/widgets/ink-comboboxentry-action.cpp +++ b/src/widgets/ink-comboboxentry-action.cpp @@ -371,9 +371,16 @@ GtkWidget* create_tool_item( GtkAction* action ) g_free( combobox_name ); { +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(comboBoxEntry, GTK_ALIGN_START); + gtk_widget_set_hexpand(comboBoxEntry, FALSE); + gtk_widget_set_vexpand(comboBoxEntry, FALSE); + gtk_container_add(GTK_CONTAINER(item), comboBoxEntry); +#else GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0); gtk_container_add( GTK_CONTAINER(align), comboBoxEntry ); gtk_container_add( GTK_CONTAINER(item), align ); +#endif } ink_comboboxentry_action->combobox = GTK_COMBO_BOX (comboBoxEntry); @@ -956,3 +963,14 @@ gboolean keypress_cb( GtkWidget * /*widget*/, GdkEventKey *event, gpointer data return wasConsumed; } + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From a78262c248224a8e486985de4736b20d2e9e3ff2 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 10:28:57 +0100 Subject: Simplify SPCanvas by tracking the clean region instead of the dirty region. #Hackfest2016 (bzr r14816) --- src/display/sp-canvas.cpp | 113 ++++++++++++++++------------------------------ src/display/sp-canvas.h | 5 +- 2 files changed, 42 insertions(+), 76 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 598f45a7a..644da8d5a 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -12,7 +12,7 @@ * * Copyright (C) 1998 The Free Software Foundation * Copyright (C) 2002-2006 authors - * Copyright (C) 2016 Google + * Copyright (C) 2016 Google Inc. * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -958,7 +958,7 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_drawing_disabled = false; canvas->_backing_store = NULL; - canvas->_dirty_region = cairo_region_create(); + canvas->_clean_region = cairo_region_create(); canvas->_forced_redraw_count = 0; canvas->_forced_redraw_limit = -1; @@ -971,12 +971,11 @@ static void sp_canvas_init(SPCanvas *canvas) void SPCanvas::shutdownTransients() { - // We turn off the need_redraw flag, since if the canvas is mapped again - // it will request a redraw anyways. We do not turn off the need_update - // flag, though, because updates are not queued when the canvas remaps - // itself. - // - _need_redraw = FALSE; + // Reset the clean region + if (_clean_region && !cairo_region_is_empty(_clean_region)) { + cairo_region_destroy(_clean_region); + _clean_region = cairo_region_create(); + } if (_grabbed_item) { _grabbed_item = NULL; @@ -1003,9 +1002,9 @@ void SPCanvas::dispose(GObject *object) cairo_surface_destroy(canvas->_backing_store); canvas->_backing_store = NULL; } - if (canvas->_dirty_region) { - cairo_region_destroy(canvas->_dirty_region); - canvas->_dirty_region = NULL; + if (canvas->_clean_region) { + cairo_region_destroy(canvas->_clean_region); + canvas->_clean_region = NULL; } canvas->shutdownTransients(); @@ -1150,7 +1149,7 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation Geom::IntRect new_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, allocation->width, allocation->height); - // resize backing store + // resize backing store; the clean region does not change cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation->width, allocation->height); if (canvas->_backing_store) { @@ -1174,19 +1173,7 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation allocation->x, allocation->y, allocation->width, allocation->height); } - - if (allocation->width > old_allocation.width) { - canvas->requestRedraw(canvas->_x0 + old_allocation.width, - canvas->_y0, - canvas->_x0 + allocation->width, - canvas->_y0 + allocation->height); - } - if (allocation->height > old_allocation.height) { - canvas->requestRedraw(canvas->_x0, - canvas->_y0 + old_allocation.height, - canvas->_x0 + allocation->width, - canvas->_y0 + allocation->height); - } + canvas->addIdle(); } int SPCanvas::emitEvent(GdkEvent *event) @@ -1622,7 +1609,7 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect cairo_surface_destroy(imgs); cairo_rectangle_int_t crect = { paint_rect.left(), paint_rect.right(), paint_rect.width(), paint_rect.height() }; - cairo_region_subtract_rectangle(_dirty_region, &crect); + cairo_region_union_rectangle(_clean_region, &crect); gtk_widget_queue_draw_area(GTK_WIDGET(this), paint_rect.left() -_x0, paint_rect.top() - _y0, paint_rect.width(), paint_rect.height()); @@ -1826,8 +1813,8 @@ gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { cairo_rectangle_list_destroy(rects); cairo_region_t *draw_dirty = cairo_region_copy(draw_region); - cairo_region_intersect(draw_dirty, canvas->_dirty_region); - cairo_region_subtract(draw_region, draw_dirty); + cairo_region_subtract(draw_dirty, canvas->_clean_region); + cairo_region_intersect(draw_region, canvas->_clean_region); // Draw the clean portion if (!cairo_region_is_empty(draw_region)) { @@ -1846,11 +1833,8 @@ gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { } // Render the dirty portion in the background - int n_rects = cairo_region_num_rectangles(draw_dirty); - for (int i = 0; i < n_rects; ++i) { - cairo_rectangle_int_t crect; - cairo_region_get_rectangle(draw_dirty, i, &crect); - canvas->requestRedraw(crect.x, crect.y, crect.x + crect.width, crect.y + crect.height); + if (!cairo_region_is_empty(draw_dirty)) { + canvas->addIdle(); } cairo_region_destroy(draw_region); cairo_region_destroy(draw_dirty); @@ -1920,22 +1904,23 @@ int SPCanvas::paint() sp_canvas_item_invoke_update(_root, Geom::identity(), 0); _need_update = FALSE; } - if (!_need_redraw) { - return TRUE; - } - int n_rects = cairo_region_num_rectangles(_dirty_region); + GtkAllocation allocation; + gtk_widget_get_allocation(GTK_WIDGET(this), &allocation); + cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; + cairo_region_t *to_draw = cairo_region_create_rectangle(&crect); + cairo_region_subtract(to_draw, _clean_region); + + int n_rects = cairo_region_num_rectangles(to_draw); for (int i = 0; i < n_rects; ++i) { cairo_rectangle_int_t crect; - cairo_region_get_rectangle(_dirty_region, i, &crect); + cairo_region_get_rectangle(to_draw, i, &crect); if (!paintRect(crect.x, crect.y, crect.x + crect.width, crect.y + crect.height)) { // Aborted return FALSE; }; } - _need_redraw = FALSE; - // we've had a full unaborted redraw, reset the full redraw counter if (_forced_redraw_limit != -1) { _forced_redraw_count = 0; @@ -2035,39 +2020,32 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll cairo_surface_destroy(_backing_store); _backing_store = new_backing_store; - cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; - cairo_region_intersect_rectangle(_dirty_region, &crect); + if (clear) { + cairo_region_destroy(_clean_region); + _clean_region = cairo_region_create(); + } else { + cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; + cairo_region_intersect_rectangle(_clean_region, &crect); + } if (SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed) { SP_CANVAS_ITEM_GET_CLASS(_root)->viewbox_changed(_root, new_area); } - if (clear) { - requestRedraw(_x0, _y0, allocation.width, allocation.height); - } else { + if (!clear) { // scrolling without zoom; redraw only the newly exposed areas if ((dx != 0) || (dy != 0)) { if (gtk_widget_get_realized(GTK_WIDGET(this))) { gdk_window_scroll(getWindow(this), -dx, -dy); } } - - if (dx > 0) { - requestRedraw(_x0 + allocation.width - dx, _y0, _x0 + allocation.width, _y0 + allocation.height); - } else if (dx < 0) { - requestRedraw(_x0, _y0, _x0 - dx, _y0 + allocation.height); - } - if (dy > 0) { - requestRedraw(_x0, _y0 + allocation.height - dy, _x0 + allocation.width, _y0 + allocation.height); - } else if (dy < 0) { - requestRedraw(_x0, _y0, _x0 + allocation.width, _y0 - dy); - } } + addIdle(); } void SPCanvas::updateNow() { - if (_need_update || _need_redraw) { + if (_need_update) { doUpdate(); } } @@ -2080,26 +2058,16 @@ void SPCanvas::requestUpdate() void SPCanvas::requestRedraw(int x0, int y0, int x1, int y1) { - GtkAllocation allocation; - if (!gtk_widget_is_drawable( GTK_WIDGET(this) )) { return; } - if ((x0 >= x1) || (y0 >= y1)) { + if (x0 >= x1 || y0 >= y1) { return; } Geom::IntRect bbox(x0, y0, x1, y1); - gtk_widget_get_allocation(GTK_WIDGET(this), &allocation); - - Geom::IntRect canvas_rect = Geom::IntRect::from_xywh(this->_x0, this->_y0, - allocation.width, allocation.height); - - Geom::OptIntRect clip = bbox & canvas_rect; - if (clip) { - dirtyRect(*clip); - addIdle(); - } + dirtyRect(bbox); + addIdle(); } /** @@ -2204,7 +2172,6 @@ inline int sp_canvas_tile_ceil(int x) } void SPCanvas::dirtyRect(Geom::IntRect const &area) { - _need_redraw = TRUE; markRect(area, 1); } @@ -2212,9 +2179,9 @@ void SPCanvas::markRect(Geom::IntRect const &area, uint8_t val) { cairo_rectangle_int_t crect = { area.left(), area.top(), area.width(), area.height() }; if (val) { - cairo_region_union_rectangle(_dirty_region, &crect); + cairo_region_subtract_rectangle(_clean_region, &crect); } else { - cairo_region_subtract_rectangle(_dirty_region, &crect); + cairo_region_union_rectangle(_clean_region, &crect); } } diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index b626beedb..a1f8d0a1a 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -15,7 +15,7 @@ * * Copyright (C) 1998 The Free Software Foundation * Copyright (C) 2002 Lauris Kaplinski - * Copyright (C) 2016 Google + * Copyright (C) 2016 Google Inc. * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -182,7 +182,7 @@ public: /* Area that needs redrawing, stored as a microtile array */ cairo_surface_t *_backing_store; - cairo_region_t *_dirty_region; + cairo_region_t *_clean_region; /** Last known modifier state, for deferred repick when a button is down. */ int _state; @@ -208,7 +208,6 @@ public: int _close_enough; unsigned int _need_update : 1; - unsigned int _need_redraw : 1; unsigned int _need_repick : 1; int _forced_redraw_count; -- cgit v1.2.3 From 5be8d2b5c94eda6bccb40c265c97607c5f7e998f Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 13 Apr 2016 11:34:23 +0200 Subject: Disable inkscape.desktop translation for old gettext (bzr r14817) --- po/CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 9261765c6..9e6b56f64 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -9,8 +9,19 @@ endforeach(language) #translates inkscape.desktop add_custom_target(inkscape_desktop DEPENDS ${CMAKE_BINARY_DIR}/inkscape.desktop) -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/inkscape.desktop -DEPENDS ${LANGUAGES} -COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --desktop --template ${CMAKE_SOURCE_DIR}/inkscape.desktop.template -d ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_BINARY_DIR}/inkscape.desktop.template.in --keyword=Name --keyword=GenericName --keyword=X-GNOME-FullName --keyword=Comment --keyword=Keywords -COMMAND ${CMAKE_COMMAND} -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-desktop.cmake) + +if(${GETTEXT_VERSION_STRING} VERSION_GREATER "0.19") + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/inkscape.desktop + DEPENDS ${LANGUAGES} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --desktop --template ${CMAKE_SOURCE_DIR}/inkscape.desktop.template -d ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_BINARY_DIR}/inkscape.desktop.template.in --keyword=Name --keyword=GenericName --keyword=X-GNOME-FullName --keyword=Comment --keyword=Keywords + COMMAND ${CMAKE_COMMAND} -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-desktop.cmake + ) +else() + message("Old gettext version, not translating inkscape.desktop") + add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/inkscape.desktop + COMMAND cp ${CMAKE_SOURCE_DIR}/inkscape.desktop.template ${CMAKE_BINARY_DIR}/inkscape.desktop.template.in + COMMAND ${CMAKE_COMMAND} -DINKSCAPE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DINKSCAPE_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-desktop.cmake + ) +endif() + add_dependencies(inkscape inkscape_desktop) -- cgit v1.2.3 From 0336a2a6926411517cdba3baa93a0bd67411cfe1 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 13 Apr 2016 11:46:28 +0200 Subject: Fix cmake build (bzr r14818) --- CMakeScripts/Modules/FindGTK2.cmake | 597 ------------------- src/ui/interface.cpp | 2 +- src/widgets/CMakeLists.txt | 8 + src/widgets/Makefile_insert | 4 +- src/widgets/image-menu-item.c | 1071 +++++++++++++++++++++++++++++++++++ src/widgets/image-menu-item.h | 81 +++ src/widgets/imagemenuitem.c | 1071 ----------------------------------- src/widgets/imagemenuitem.h | 81 --- src/widgets/ink-action.cpp | 2 +- 9 files changed, 1164 insertions(+), 1753 deletions(-) delete mode 100644 CMakeScripts/Modules/FindGTK2.cmake create mode 100644 src/widgets/image-menu-item.c create mode 100644 src/widgets/image-menu-item.h delete mode 100644 src/widgets/imagemenuitem.c delete mode 100644 src/widgets/imagemenuitem.h diff --git a/CMakeScripts/Modules/FindGTK2.cmake b/CMakeScripts/Modules/FindGTK2.cmake deleted file mode 100644 index e986fddfd..000000000 --- a/CMakeScripts/Modules/FindGTK2.cmake +++ /dev/null @@ -1,597 +0,0 @@ -# *NOTE*, this file include 1 line modification from 2.8.5's module -# this adds GTK2_CAIROMM_INCLUDE_DIR which we need! -# - ideasman42 -# ------------ - -# - FindGTK2.cmake -# This module can find the GTK2 widget libraries and several of its other -# optional components like gtkmm, glade, and glademm. -# -# NOTE: If you intend to use version checking, CMake 2.6.2 or later is -# required. -# -# Specify one or more of the following components -# as you call this find module. See example below. -# -# gtk -# gtkmm -# glade -# glademm -# -# The following variables will be defined for your use -# -# GTK2_FOUND - Were all of your specified components found? -# GTK2_INCLUDE_DIRS - All include directories -# GTK2_LIBRARIES - All libraries -# -# GTK2_VERSION - The version of GTK2 found (x.y.z) -# GTK2_MAJOR_VERSION - The major version of GTK2 -# GTK2_MINOR_VERSION - The minor version of GTK2 -# GTK2_PATCH_VERSION - The patch version of GTK2 -# -# Optional variables you can define prior to calling this module: -# -# GTK2_DEBUG - Enables verbose debugging of the module -# GTK2_SKIP_MARK_AS_ADVANCED - Disable marking cache variables as advanced -# GTK2_ADDITIONAL_SUFFIXES - Allows defining additional directories to -# search for include files -# -#================= -# Example Usage: -# -# Call find_package() once, here are some examples to pick from: -# -# Require GTK 2.6 or later -# find_package(GTK2 2.6 REQUIRED gtk) -# -# Require GTK 2.10 or later and Glade -# find_package(GTK2 2.10 REQUIRED gtk glade) -# -# Search for GTK/GTKMM 2.8 or later -# find_package(GTK2 2.8 COMPONENTS gtk gtkmm) -# -# if(GTK2_FOUND) -# include_directories(${GTK2_INCLUDE_DIRS}) -# add_executable(mygui mygui.cc) -# target_link_libraries(mygui ${GTK2_LIBRARIES}) -# endif() -# - -#============================================================================= -# Copyright 2009 Kitware, Inc. -# Copyright 2008-2009 Philip Lowman -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -# Version 1.3 (11/9/2010) (CMake 2.8.4) -# * 11429: Add support for detecting GTK2 built with Visual Studio 10. -# Thanks to Vincent Levesque for the patch. - -# Version 1.2 (8/30/2010) (CMake 2.8.3) -# * Merge patch for detecting gdk-pixbuf library (split off -# from core GTK in 2.21). Thanks to Vincent Untz for the patch -# and Ricardo Cruz for the heads up. -# Version 1.1 (8/19/2010) (CMake 2.8.3) -# * Add support for detecting GTK2 under macports (thanks to Gary Kramlich) -# Version 1.0 (8/12/2010) (CMake 2.8.3) -# * Add support for detecting new pangommconfig.h header file -# (Thanks to Sune Vuorela & the Debian Project for the patch) -# * Add support for detecting fontconfig.h header -# * Call find_package(Freetype) since it's required -# * Add support for allowing users to add additional library directories -# via the GTK2_ADDITIONAL_SUFFIXES variable (kind of a future-kludge in -# case the GTK developers change versions on any of the directories in the -# future). -# Version 0.8 (1/4/2010) -# * Get module working under MacOSX fink by adding /sw/include, /sw/lib -# to PATHS and the gobject library -# Version 0.7 (3/22/09) -# * Checked into CMake CVS -# * Added versioning support -# * Module now defaults to searching for GTK if COMPONENTS not specified. -# * Added HKCU prior to HKLM registry key and GTKMM specific environment -# variable as per mailing list discussion. -# * Added lib64 to include search path and a few other search paths where GTK -# may be installed on Unix systems. -# * Switched to lowercase CMake commands -# * Prefaced internal variables with _GTK2 to prevent collision -# * Changed internal macros to functions -# * Enhanced documentation -# Version 0.6 (1/8/08) -# Added GTK2_SKIP_MARK_AS_ADVANCED option -# Version 0.5 (12/19/08) -# Second release to cmake mailing list - -#============================================================= -# _GTK2_GET_VERSION -# Internal function to parse the version number in gtkversion.h -# _OUT_major = Major version number -# _OUT_minor = Minor version number -# _OUT_micro = Micro version number -# _gtkversion_hdr = Header file to parse -#============================================================= -function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr) - file(READ ${_gtkversion_hdr} _contents) - if(_contents) - string(REGEX REPLACE ".*#define GTK_MAJOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_major} "${_contents}") - string(REGEX REPLACE ".*#define GTK_MINOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_minor} "${_contents}") - string(REGEX REPLACE ".*#define GTK_MICRO_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_micro} "${_contents}") - - if(NOT ${_OUT_major} MATCHES "[0-9]+") - message(FATAL_ERROR "Version parsing failed for GTK2_MAJOR_VERSION!") - endif() - if(NOT ${_OUT_minor} MATCHES "[0-9]+") - message(FATAL_ERROR "Version parsing failed for GTK2_MINOR_VERSION!") - endif() - if(NOT ${_OUT_micro} MATCHES "[0-9]+") - message(FATAL_ERROR "Version parsing failed for GTK2_MICRO_VERSION!") - endif() - - set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE) - set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE) - set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE) - else() - message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist") - endif() -endfunction() - -#============================================================= -# _GTK2_FIND_INCLUDE_DIR -# Internal function to find the GTK include directories -# _var = variable to set -# _hdr = header file to look for -#============================================================= -function(_GTK2_FIND_INCLUDE_DIR _var _hdr) - - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "_GTK2_FIND_INCLUDE_DIR( ${_var} ${_hdr} )") - endif() - - set(_relatives - # If these ever change, things will break. - ${GTK2_ADDITIONAL_SUFFIXES} - glibmm-2.4 - glib-2.0 - atk-1.0 - atkmm-1.6 - cairo - cairomm-1.0 - gdk-pixbuf-2.0 - gdkmm-2.4 - giomm-2.4 - gtk-2.0 - gtkmm-2.4 - libglade-2.0 - libglademm-2.4 - pango-1.0 - pangomm-1.4 - sigc++-2.0 - ) - - set(_suffixes) - foreach(_d ${_relatives}) - list(APPEND _suffixes ${_d}) - list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include - endforeach() - - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "include suffixes = ${_suffixes}") - endif() - - find_path(${_var} ${_hdr} - PATHS - /usr/local/lib64 - /usr/local/lib - /usr/lib64 - /usr/lib/x86_64-linux-gnu - /usr/lib - /opt/gnome/include - /opt/gnome/lib - /opt/openwin/include - /usr/openwin/lib - /sw/include - /sw/lib - /opt/local/include - /opt/local/lib - $ENV{GTKMM_BASEPATH}/include - $ENV{GTKMM_BASEPATH}/lib - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib - PATH_SUFFIXES - ${_suffixes} - ) - - if(${_var}) - set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}} PARENT_SCOPE) - if(NOT GTK2_SKIP_MARK_AS_ADVANCED) - mark_as_advanced(${_var}) - endif() - endif() - -endfunction(_GTK2_FIND_INCLUDE_DIR) - -#============================================================= -# _GTK2_FIND_LIBRARY -# Internal function to find libraries packaged with GTK2 -# _var = library variable to create -#============================================================= -function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) - - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "_GTK2_FIND_LIBRARY( ${_var} ${_lib} ${_expand_vc} ${_append_version} )") - endif() - - # Not GTK versions per se but the versions encoded into Windows - # import libraries (GtkMM 2.14.1 has a gtkmm-vc80-2_4.lib for example) - # Also the MSVC libraries use _ for . (this is handled below) - set(_versions 2.20 2.18 2.16 2.14 2.12 - 2.10 2.8 2.6 2.4 2.2 2.0 - 1.20 1.18 1.16 1.14 1.12 - 1.10 1.8 1.6 1.4 1.2 1.0) - - set(_library) - set(_library_d) - - set(_library ${_lib}) - - if(_expand_vc AND MSVC) - # Add vc80/vc90/vc100 midfixes - if(MSVC80) - set(_library ${_library}-vc80) - elseif(MSVC90) - set(_library ${_library}-vc90) - elseif(MSVC10) - set(_library ${_library}-vc100) - endif() - set(_library_d ${_library}-d) - endif() - - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "After midfix addition = ${_library} and ${_library_d}") - endif() - - set(_lib_list) - set(_libd_list) - if(_append_version) - foreach(_ver ${_versions}) - list(APPEND _lib_list "${_library}-${_ver}") - list(APPEND _libd_list "${_library_d}-${_ver}") - endforeach() - else() - set(_lib_list ${_library}) - set(_libd_list ${_library_d}) - endif() - - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "library list = ${_lib_list} and library debug list = ${_libd_list}") - endif() - - # For some silly reason the MSVC libraries use _ instead of . - # in the version fields - if(_expand_vc AND MSVC) - set(_no_dots_lib_list) - set(_no_dots_libd_list) - foreach(_l ${_lib_list}) - string(REPLACE "." "_" _no_dots_library ${_l}) - list(APPEND _no_dots_lib_list ${_no_dots_library}) - endforeach() - # And for debug - set(_no_dots_libsd_list) - foreach(_l ${_libd_list}) - string(REPLACE "." "_" _no_dots_libraryd ${_l}) - list(APPEND _no_dots_libd_list ${_no_dots_libraryd}) - endforeach() - - # Copy list back to original names - set(_lib_list ${_no_dots_lib_list}) - set(_libd_list ${_no_dots_libd_list}) - endif() - - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "While searching for ${_var}, our proposed library list is ${_lib_list}") - endif() - - find_library(${_var} - NAMES ${_lib_list} - PATHS - /opt/gnome/lib - /opt/gnome/lib64 - /usr/openwin/lib - /usr/openwin/lib64 - /sw/lib - $ENV{GTKMM_BASEPATH}/lib - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib - ) - - if(_expand_vc AND MSVC) - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "While searching for ${_var}_DEBUG our proposed library list is ${_libd_list}") - endif() - - find_library(${_var}_DEBUG - NAMES ${_libd_list} - PATHS - $ENV{GTKMM_BASEPATH}/lib - [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib - [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib - ) - - if(${_var} AND ${_var}_DEBUG) - if(NOT GTK2_SKIP_MARK_AS_ADVANCED) - mark_as_advanced(${_var}_DEBUG) - endif() - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} optimized ${${_var}} debug ${${_var}_DEBUG}) - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE) - endif() - else() - if(NOT GTK2_SKIP_MARK_AS_ADVANCED) - mark_as_advanced(${_var}) - endif() - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${${_var}}) - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE) - # Set debug to release - set(${_var}_DEBUG ${${_var}}) - set(${_var}_DEBUG ${${_var}} PARENT_SCOPE) - endif() -endfunction(_GTK2_FIND_LIBRARY) - -#============================================================= - -# -# main() -# - -set(GTK2_FOUND) -set(GTK2_INCLUDE_DIRS) -set(GTK2_LIBRARIES) - -if(NOT GTK2_FIND_COMPONENTS) - # Assume they only want GTK - set(GTK2_FIND_COMPONENTS gtk) -endif() - -# -# If specified, enforce version number -# -if(GTK2_FIND_VERSION) - cmake_minimum_required(VERSION 2.6.2) - set(GTK2_FAILED_VERSION_CHECK true) - if(GTK2_DEBUG) - message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " - "Searching for version ${GTK2_FIND_VERSION}") - endif() - _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h) - if(GTK2_GTK_INCLUDE_DIR) - _GTK2_GET_VERSION(GTK2_MAJOR_VERSION - GTK2_MINOR_VERSION - GTK2_PATCH_VERSION - ${GTK2_GTK_INCLUDE_DIR}/gtk/gtkversion.h) - set(GTK2_VERSION - ${GTK2_MAJOR_VERSION}.${GTK2_MINOR_VERSION}.${GTK2_PATCH_VERSION}) - if(GTK2_FIND_VERSION_EXACT) - if(GTK2_VERSION VERSION_EQUAL GTK2_FIND_VERSION) - set(GTK2_FAILED_VERSION_CHECK false) - endif() - else() - if(GTK2_VERSION VERSION_EQUAL GTK2_FIND_VERSION OR - GTK2_VERSION VERSION_GREATER GTK2_FIND_VERSION) - set(GTK2_FAILED_VERSION_CHECK false) - endif() - endif() - else() - # If we can't find the GTK include dir, we can't do version checking - if(GTK2_FIND_REQUIRED AND NOT GTK2_FIND_QUIETLY) - message(FATAL_ERROR "Could not find GTK2 include directory") - endif() - return() - endif() - - if(GTK2_FAILED_VERSION_CHECK) - if(GTK2_FIND_REQUIRED AND NOT GTK2_FIND_QUIETLY) - if(GTK2_FIND_VERSION_EXACT) - message(FATAL_ERROR "GTK2 version check failed. Version ${GTK2_VERSION} was found, version ${GTK2_FIND_VERSION} is needed exactly.") - else() - message(FATAL_ERROR "GTK2 version check failed. Version ${GTK2_VERSION} was found, at least version ${GTK2_FIND_VERSION} is required") - endif() - endif() - - # If the version check fails, exit out of the module here - return() - endif() -endif() - -# -# Find all components -# - -find_package(Freetype) -list(APPEND GTK2_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) -list(APPEND GTK2_LIBRARIES ${FREETYPE_LIBRARIES}) - -foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) - if(_GTK2_component STREQUAL "gtk") - _GTK2_FIND_INCLUDE_DIR(GTK2_GLIB_INCLUDE_DIR glib.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBCONFIG_INCLUDE_DIR glibconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GLIB_LIBRARY glib false true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) - _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) - _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h) - - if(UNIX) - _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) - _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-x11 false true) - else() - _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-win32 false true) - _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-win32 false true) - endif() - - _GTK2_FIND_INCLUDE_DIR(GTK2_CAIRO_INCLUDE_DIR cairo.h) - _GTK2_FIND_LIBRARY (GTK2_CAIRO_LIBRARY cairo false false) - - _GTK2_FIND_INCLUDE_DIR(GTK2_FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h) - - _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h) - _GTK2_FIND_LIBRARY (GTK2_PANGO_LIBRARY pango false true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h) - _GTK2_FIND_LIBRARY (GTK2_ATK_LIBRARY atk false true) - - - elseif(_GTK2_component STREQUAL "gtkmm") - - _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBMM_INCLUDE_DIR glibmm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBMMCONFIG_INCLUDE_DIR glibmmconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GLIBMM_LIBRARY glibmm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_GDKMM_INCLUDE_DIR gdkmm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GDKMMCONFIG_INCLUDE_DIR gdkmmconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GDKMM_LIBRARY gdkmm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_GTKMM_INCLUDE_DIR gtkmm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GTKMMCONFIG_INCLUDE_DIR gtkmmconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GTKMM_LIBRARY gtkmm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMM_INCLUDE_DIR cairomm/cairomm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMMCONFIG_INCLUDE_DIR cairommconfig.h) - _GTK2_FIND_LIBRARY (GTK2_CAIROMM_LIBRARY cairomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMM_INCLUDE_DIR pangomm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMMCONFIG_INCLUDE_DIR pangommconfig.h) - _GTK2_FIND_LIBRARY (GTK2_PANGOMM_LIBRARY pangomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++_INCLUDE_DIR sigc++/sigc++.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++CONFIG_INCLUDE_DIR sigc++config.h) - _GTK2_FIND_LIBRARY (GTK2_SIGC++_LIBRARY sigc true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_GIOMM_INCLUDE_DIR giomm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GIOMMCONFIG_INCLUDE_DIR giommconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GIOMM_LIBRARY giomm true true) - - _GTK2_FIND_INCLUDE_DIR(GTK2_ATKMM_INCLUDE_DIR atkmm.h) - _GTK2_FIND_LIBRARY (GTK2_ATKMM_LIBRARY atkmm true true) - - elseif(_GTK2_component STREQUAL "glade") - - _GTK2_FIND_INCLUDE_DIR(GTK2_GLADE_INCLUDE_DIR glade/glade.h) - _GTK2_FIND_LIBRARY (GTK2_GLADE_LIBRARY glade false true) - - elseif(_GTK2_component STREQUAL "glademm") - - _GTK2_FIND_INCLUDE_DIR(GTK2_GLADEMM_INCLUDE_DIR libglademm.h) - _GTK2_FIND_INCLUDE_DIR(GTK2_GLADEMMCONFIG_INCLUDE_DIR libglademmconfig.h) - _GTK2_FIND_LIBRARY (GTK2_GLADEMM_LIBRARY glademm true true) - - else() - message(FATAL_ERROR "Unknown GTK2 component ${_component}") - endif() -endforeach() - -# -# Solve for the GTK2 version if we haven't already -# -if(NOT GTK2_FIND_VERSION AND GTK2_GTK_INCLUDE_DIR) - _GTK2_GET_VERSION(GTK2_MAJOR_VERSION - GTK2_MINOR_VERSION - GTK2_PATCH_VERSION - ${GTK2_GTK_INCLUDE_DIR}/gtk/gtkversion.h) - set(GTK2_VERSION ${GTK2_MAJOR_VERSION}.${GTK2_MINOR_VERSION}.${GTK2_PATCH_VERSION}) -endif() - -# -# Try to enforce components -# - -set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND - -include(FindPackageHandleStandardArgs) - -foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) - string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER) - - if(_GTK2_component STREQUAL "gtk") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found." - GTK2_GTK_LIBRARY - GTK2_GTK_INCLUDE_DIR - - GTK2_GLIB_INCLUDE_DIR - GTK2_GLIBCONFIG_INCLUDE_DIR - GTK2_GLIB_LIBRARY - - GTK2_GDK_INCLUDE_DIR - GTK2_GDKCONFIG_INCLUDE_DIR - GTK2_GDK_LIBRARY - ) - elseif(_GTK2_component STREQUAL "gtkmm") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtkmm libraries were not found." - GTK2_GTKMM_LIBRARY - GTK2_GTKMM_INCLUDE_DIR - GTK2_GTKMMCONFIG_INCLUDE_DIR - - GTK2_GLIBMM_INCLUDE_DIR - GTK2_GLIBMMCONFIG_INCLUDE_DIR - GTK2_GLIBMM_LIBRARY - - GTK2_GDKMM_INCLUDE_DIR - GTK2_GDKMMCONFIG_INCLUDE_DIR - GTK2_GDKMM_LIBRARY - ) - elseif(_GTK2_component STREQUAL "glade") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glade library was not found." - GTK2_GLADE_LIBRARY - GTK2_GLADE_INCLUDE_DIR - ) - elseif(_GTK2_component STREQUAL "glademm") - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glademm library was not found." - GTK2_GLADEMM_LIBRARY - GTK2_GLADEMM_INCLUDE_DIR - GTK2_GLADEMMCONFIG_INCLUDE_DIR - ) - endif() - - if(NOT GTK2_${_COMPONENT_UPPER}_FOUND) - set(_GTK2_did_we_find_everything false) - endif() -endforeach() - -if(_GTK2_did_we_find_everything AND NOT GTK2_VERSION_CHECK_FAILED) - set(GTK2_FOUND true) -else() - # Unset our variables. - set(GTK2_FOUND false) - set(GTK2_VERSION) - set(GTK2_VERSION_MAJOR) - set(GTK2_VERSION_MINOR) - set(GTK2_VERSION_PATCH) - set(GTK2_INCLUDE_DIRS) - set(GTK2_LIBRARIES) -endif() - -if(GTK2_INCLUDE_DIRS) - list(REMOVE_DUPLICATES GTK2_INCLUDE_DIRS) -endif() - diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 6d0a85f13..a16bbc472 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -80,7 +80,7 @@ #include "ui/dialog/layer-properties.h" #if GTK_CHECK_VERSION(3,0,0) - #include "widgets/imagemenuitem.h" + #include "widgets/image-menu-item.h" #endif #include diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index c38bde5cf..8cb6e947f 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -110,6 +110,11 @@ set(widgets_SRC widget-sizes.h ) +if(${WITH_GTK3_EXPERIMENTAL}) + set(image_menu_item_SRC image-menu-item.h image-menu-item.c) + add_inkscape_source("${image_menu_item_SRC}") +endif() + # add_inkscape_lib(widgets_LIB "${widgets_SRC}") add_inkscape_source("${widgets_SRC}") @@ -121,3 +126,6 @@ set ( widgets_paintbucket_SRC if ("${HAVE_POTRACE}") add_inkscape_source("${widgets_paintbucket_SRC}") endif() + + + diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 10462a859..2ee0f7002 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -2,8 +2,8 @@ if WITH_GTKMM_3_0 ink_common_sources += \ - widgets/imagemenuitem.c \ - widgets/imagemenuitem.h + widgets/image-menu-item.c \ + widgets/image-menu-item.h endif ink_common_sources += \ diff --git a/src/widgets/image-menu-item.c b/src/widgets/image-menu-item.c new file mode 100644 index 000000000..2b9500ba0 --- /dev/null +++ b/src/widgets/image-menu-item.c @@ -0,0 +1,1071 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) 2001 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. + * Forked by . Icons in menus are important to us. + */ + +#include "config.h" + +#include +#include + +#include "widgets/image-menu-item.h" + +/** + * SECTION:gtkimagemenuitem + * @Short_description: A menu item with an icon + * @Title: ImageMenuItem + * + * A ImageMenuItem is a menu item which has an icon next to the text label. + * + * Note that the user can disable display of menu icons, so make sure to still + * fill in the text label. + */ + + +struct _ImageMenuItemPrivate +{ + GtkWidget *image; + + gchar *label; + guint use_stock : 1; + guint toggle_size; +}; + +enum { + PROP_0, + PROP_IMAGE, + PROP_USE_STOCK, + PROP_ACCEL_GROUP, +}; + +static GtkActivatableIface *parent_activatable_iface; + +static void image_menu_item_destroy (GtkWidget *widget); +static void image_menu_item_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural); +static void image_menu_item_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural); +static void image_menu_item_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural); +static void image_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static void image_menu_item_map (GtkWidget *widget); +static void image_menu_item_remove (GtkContainer *container, + GtkWidget *child); +static void image_menu_item_toggle_size_request (GtkMenuItem *menu_item, + gint *requisition); +static void image_menu_item_set_label (GtkMenuItem *menu_item, + const gchar *label); +static const gchar * image_menu_item_get_label (GtkMenuItem *menu_item); + +static void image_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data); + +static void image_menu_item_finalize (GObject *object); +static void image_menu_item_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void image_menu_item_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void image_menu_item_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen); + +static void image_menu_item_recalculate (ImageMenuItem *image_menu_item); + +static void image_menu_item_activatable_interface_init (GtkActivatableIface *iface); +static void image_menu_item_update (GtkActivatable *activatable, + GtkAction *action, + const gchar *property_name); +static void image_menu_item_sync_action_properties (GtkActivatable *activatable, + GtkAction *action); + + +G_DEFINE_TYPE_WITH_CODE (ImageMenuItem, image_menu_item, GTK_TYPE_MENU_ITEM, + G_ADD_PRIVATE (ImageMenuItem) + G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE, + image_menu_item_activatable_interface_init)) + + +static void +image_menu_item_class_init (ImageMenuItemClass *klass) +{ + GObjectClass *gobject_class = (GObjectClass*) klass; + GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; + GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass; + GtkContainerClass *container_class = (GtkContainerClass*) klass; + + widget_class->destroy = image_menu_item_destroy; + widget_class->screen_changed = image_menu_item_screen_changed; + widget_class->get_preferred_width = image_menu_item_get_preferred_width; + widget_class->get_preferred_height = image_menu_item_get_preferred_height; + widget_class->get_preferred_height_for_width = image_menu_item_get_preferred_height_for_width; + widget_class->size_allocate = image_menu_item_size_allocate; + widget_class->map = image_menu_item_map; + + container_class->forall = image_menu_item_forall; + container_class->remove = image_menu_item_remove; + + menu_item_class->toggle_size_request = image_menu_item_toggle_size_request; + menu_item_class->set_label = image_menu_item_set_label; + menu_item_class->get_label = image_menu_item_get_label; + + gobject_class->finalize = image_menu_item_finalize; + gobject_class->set_property = image_menu_item_set_property; + gobject_class->get_property = image_menu_item_get_property; + + /** + * ImageMenuItem:image: + * + * Child widget to appear next to the menu text. + * + */ + g_object_class_install_property (gobject_class, + PROP_IMAGE, + g_param_spec_object ("image", + _("Image widget"), + _("Child widget to appear next to the menu text"), + GTK_TYPE_WIDGET, + GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); + /** + * ImageMenuItem:use-stock: + * + * If %TRUE, the label set in the menuitem is used as a + * stock id to select the stock item for the item. + * + * Since: 2.16 + * + */ + g_object_class_install_property (gobject_class, + PROP_USE_STOCK, + g_param_spec_boolean ("use-stock", + _("Use stock"), + _("Whether to use the label text to create a stock menu item"), + FALSE, + GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)); + + /** + * ImageMenuItem:accel-group: + * + * The Accel Group to use for stock accelerator keys + * + * Since: 2.16 + * + */ + g_object_class_install_property (gobject_class, + PROP_ACCEL_GROUP, + g_param_spec_object ("accel-group", + _("Accel Group"), + _("The Accel Group to use for stock accelerator keys"), + GTK_TYPE_ACCEL_GROUP, + GTK_PARAM_WRITABLE | G_PARAM_DEPRECATED)); + +} + +static void +image_menu_item_init (ImageMenuItem *image_menu_item) +{ + ImageMenuItemPrivate *priv; + + image_menu_item->priv = image_menu_item_get_instance_private (image_menu_item); + priv = image_menu_item->priv; + + priv->image = NULL; + priv->use_stock = FALSE; + priv->label = NULL; +} + +static void +image_menu_item_finalize (GObject *object) +{ + ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (object)->priv; + + g_free (priv->label); + priv->label = NULL; + + G_OBJECT_CLASS (image_menu_item_parent_class)->finalize (object); +} + +static void +image_menu_item_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object); + + switch (prop_id) + { + case PROP_IMAGE: + image_menu_item_set_image (image_menu_item, (GtkWidget *) g_value_get_object (value)); + break; + case PROP_USE_STOCK: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + image_menu_item_set_use_stock (image_menu_item, g_value_get_boolean (value)); + G_GNUC_END_IGNORE_DEPRECATIONS; + break; + case PROP_ACCEL_GROUP: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + image_menu_item_set_accel_group (image_menu_item, g_value_get_object (value)); + G_GNUC_END_IGNORE_DEPRECATIONS; + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +image_menu_item_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object); + + switch (prop_id) + { + case PROP_IMAGE: + g_value_set_object (value, image_menu_item_get_image (image_menu_item)); + break; + case PROP_USE_STOCK: + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + g_value_set_boolean (value, image_menu_item_get_use_stock (image_menu_item)); + G_GNUC_END_IGNORE_DEPRECATIONS; + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +image_menu_item_map (GtkWidget *widget) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->map (widget); + + if (priv->image) + g_object_set (priv->image, "visible", TRUE, NULL); +} + +static void +image_menu_item_destroy (GtkWidget *widget) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + if (priv->image) + gtk_container_remove (GTK_CONTAINER (image_menu_item), + priv->image); + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->destroy (widget); +} + +static void +image_menu_item_toggle_size_request (GtkMenuItem *menu_item, + gint *requisition) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (menu_item); + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkPackDirection pack_dir; + GtkWidget *parent; + GtkWidget *widget = GTK_WIDGET (menu_item); + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + *requisition = 0; + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + GtkRequisition image_requisition; + guint toggle_spacing; + + gtk_widget_get_preferred_size (priv->image, &image_requisition, NULL); + + gtk_widget_style_get (GTK_WIDGET (menu_item), + "toggle-spacing", &toggle_spacing, + NULL); + + if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) + { + if (image_requisition.width > 0) + *requisition = image_requisition.width + toggle_spacing; + } + else + { + if (image_requisition.height > 0) + *requisition = image_requisition.height + toggle_spacing; + } + } +} + +static void +image_menu_item_recalculate (ImageMenuItem *image_menu_item) +{ + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkStockItem stock_item; + GtkWidget *image; + const gchar *resolved_label = priv->label; + + if (priv->use_stock && priv->label) + { + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + if (!priv->image) + { + image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU); + image_menu_item_set_image (image_menu_item, image); + } + + if (gtk_stock_lookup (priv->label, &stock_item)) + resolved_label = stock_item.label; + + gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE); + + G_GNUC_END_IGNORE_DEPRECATIONS; + } + + GTK_MENU_ITEM_CLASS + (image_menu_item_parent_class)->set_label (GTK_MENU_ITEM (image_menu_item), resolved_label); + +} + +static void +image_menu_item_set_label (GtkMenuItem *menu_item, + const gchar *label) +{ + ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv; + + if (priv->label != label) + { + g_free (priv->label); + priv->label = g_strdup (label); + + image_menu_item_recalculate (IMAGE_MENU_ITEM (menu_item)); + + g_object_notify (G_OBJECT (menu_item), "label"); + + } +} + +static const gchar * +image_menu_item_get_label (GtkMenuItem *menu_item) +{ + ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv; + + return priv->label; +} + +static void +image_menu_item_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_width (widget, minimum, natural); + + if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) && + priv->image && + gtk_widget_get_visible (priv->image)) + { + gint child_minimum, child_natural; + + gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural); + + *minimum = MAX (*minimum, child_minimum); + *natural = MAX (*natural, child_natural); + } +} + +static void +image_menu_item_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + gint child_height = 0; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + GtkRequisition child_requisition; + + gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); + + child_height = child_requisition.height; + } + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_height (widget, minimum, natural); + + if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR) + { + *minimum = MAX (*minimum, child_height); + *natural = MAX (*natural, child_height); + } +} + +static void +image_menu_item_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + gint child_height = 0; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + GtkRequisition child_requisition; + + gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); + + child_height = child_requisition.height; + } + + GTK_WIDGET_CLASS + (image_menu_item_parent_class)->get_preferred_height_for_width (widget, width, minimum, natural); + + if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR) + { + *minimum = MAX (*minimum, child_height); + *natural = MAX (*natural, child_height); + } +} + + +static void +image_menu_item_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); + ImageMenuItemPrivate *priv = image_menu_item->priv; + GtkAllocation widget_allocation; + GtkPackDirection pack_dir; + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (GTK_IS_MENU_BAR (parent)) + pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); + else + pack_dir = GTK_PACK_DIRECTION_LTR; + + GTK_WIDGET_CLASS (image_menu_item_parent_class)->size_allocate (widget, allocation); + + if (priv->image && gtk_widget_get_visible (priv->image)) + { + gint x, y, offset; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding; + GtkRequisition child_requisition; + GtkAllocation child_allocation; + guint horizontal_padding, toggle_spacing; + gint toggle_size; + + toggle_size = image_menu_item->priv->toggle_size; + gtk_widget_style_get (widget, + "horizontal-padding", &horizontal_padding, + "toggle-spacing", &toggle_spacing, + NULL); + + /* Man this is lame hardcoding action, but I can't + * come up with a solution that's really better. + */ + + gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); + + gtk_widget_get_allocation (widget, &widget_allocation); + + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + gtk_style_context_get_padding (context, state, &padding); + offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item)); + + if (pack_dir == GTK_PACK_DIRECTION_LTR || + pack_dir == GTK_PACK_DIRECTION_RTL) + { + if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) == + (pack_dir == GTK_PACK_DIRECTION_LTR)) + x = offset + horizontal_padding + padding.left + + (toggle_size - toggle_spacing - child_requisition.width) / 2; + else + x = widget_allocation.width - offset - horizontal_padding - padding.right - + toggle_size + toggle_spacing + + (toggle_size - toggle_spacing - child_requisition.width) / 2; + + y = (widget_allocation.height - child_requisition.height) / 2; + } + else + { + if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) == + (pack_dir == GTK_PACK_DIRECTION_TTB)) + y = offset + horizontal_padding + padding.top + + (toggle_size - toggle_spacing - child_requisition.height) / 2; + else + y = widget_allocation.height - offset - horizontal_padding - padding.bottom - + toggle_size + toggle_spacing + + (toggle_size - toggle_spacing - child_requisition.height) / 2; + + x = (widget_allocation.width - child_requisition.width) / 2; + } + + child_allocation.width = child_requisition.width; + child_allocation.height = child_requisition.height; + child_allocation.x = widget_allocation.x + MAX (x, 0); + child_allocation.y = widget_allocation.y + MAX (y, 0); + + gtk_widget_size_allocate (priv->image, &child_allocation); + } +} + +static void +image_menu_item_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + GTK_CONTAINER_CLASS (image_menu_item_parent_class)->forall (container, + include_internals, + callback, + callback_data); + + if (include_internals && priv->image) + (* callback) (priv->image, callback_data); +} + + +static void +image_menu_item_activatable_interface_init (GtkActivatableIface *iface) +{ + parent_activatable_iface = g_type_interface_peek_parent (iface); + iface->update = image_menu_item_update; + iface->sync_action_properties = image_menu_item_sync_action_properties; +} + +static gboolean +activatable_update_stock_id (ImageMenuItem *image_menu_item, GtkAction *action) +{ + GtkWidget *image; + const gchar *stock_id = gtk_action_get_stock_id (action); + + image = image_menu_item_get_image (image_menu_item); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + if (GTK_IS_IMAGE (image) && + stock_id && gtk_icon_factory_lookup_default (stock_id)) + { + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + gtk_image_set_from_stock (GTK_IMAGE (image), stock_id, GTK_ICON_SIZE_MENU); + G_GNUC_END_IGNORE_DEPRECATIONS; + return TRUE; + } + + G_GNUC_END_IGNORE_DEPRECATIONS; + + return FALSE; +} + +static gboolean +activatable_update_gicon (ImageMenuItem *image_menu_item, GtkAction *action) +{ + GtkWidget *image; + GIcon *icon = gtk_action_get_gicon (action); + const gchar *stock_id; + gboolean ret = FALSE; + + stock_id = gtk_action_get_stock_id (action); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + image = image_menu_item_get_image (image_menu_item); + + if (icon && GTK_IS_IMAGE (image) && + !(stock_id && gtk_icon_factory_lookup_default (stock_id))) + { + gtk_image_set_from_gicon (GTK_IMAGE (image), icon, GTK_ICON_SIZE_MENU); + ret = TRUE; + } + + G_GNUC_END_IGNORE_DEPRECATIONS; + + return ret; +} + +static void +activatable_update_icon_name (ImageMenuItem *image_menu_item, GtkAction *action) +{ + GtkWidget *image; + const gchar *icon_name = gtk_action_get_icon_name (action); + + image = image_menu_item_get_image (image_menu_item); + + if (GTK_IS_IMAGE (image) && + (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY || + gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME)) + { + gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_MENU); + } +} + +static void +image_menu_item_update (GtkActivatable *activatable, + GtkAction *action, + const gchar *property_name) +{ + ImageMenuItem *image_menu_item; + gboolean use_appearance; + + image_menu_item = IMAGE_MENU_ITEM (activatable); + + parent_activatable_iface->update (activatable, action, property_name); + + use_appearance = gtk_activatable_get_use_action_appearance (activatable); + if (!use_appearance) + return; + + if (strcmp (property_name, "stock-id") == 0) + activatable_update_stock_id (image_menu_item, action); + else if (strcmp (property_name, "gicon") == 0) + activatable_update_gicon (image_menu_item, action); + else if (strcmp (property_name, "icon-name") == 0) + activatable_update_icon_name (image_menu_item, action); +} + +static void +image_menu_item_sync_action_properties (GtkActivatable *activatable, + GtkAction *action) +{ + ImageMenuItem *image_menu_item; + GtkWidget *image; + gboolean use_appearance; + + image_menu_item = IMAGE_MENU_ITEM (activatable); + + parent_activatable_iface->sync_action_properties (activatable, action); + + if (!action) + return; + + use_appearance = gtk_activatable_get_use_action_appearance (activatable); + if (!use_appearance) + return; + + image = image_menu_item_get_image (image_menu_item); + if (image && !GTK_IS_IMAGE (image)) + { + image_menu_item_set_image (image_menu_item, NULL); + image = NULL; + } + + if (!image) + { + image = gtk_image_new (); + gtk_widget_show (image); + image_menu_item_set_image (IMAGE_MENU_ITEM (activatable), + image); + } + + if (!activatable_update_stock_id (image_menu_item, action) && + !activatable_update_gicon (image_menu_item, action)) + activatable_update_icon_name (image_menu_item, action); + +} + + +/** + * image_menu_item_new: + * + * Creates a new #ImageMenuItem with an empty label. + * + * Returns: a new #ImageMenuItem + * + */ +GtkWidget* +image_menu_item_new (void) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, NULL); +} + +/** + * image_menu_item_new_with_label: + * @label: the text of the menu item. + * + * Creates a new #ImageMenuItem containing a label. + * + * Returns: a new #ImageMenuItem. + * + */ +GtkWidget* +image_menu_item_new_with_label (const gchar *label) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, + "label", label, + NULL); +} + +/** + * image_menu_item_new_with_mnemonic: + * @label: the text of the menu item, with an underscore in front of the + * mnemonic character + * + * Creates a new #ImageMenuItem containing a label. The label + * will be created using gtk_label_new_with_mnemonic(), so underscores + * in @label indicate the mnemonic for the menu item. + * + * Returns: a new #ImageMenuItem + * + */ +GtkWidget* +image_menu_item_new_with_mnemonic (const gchar *label) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, + "use-underline", TRUE, + "label", label, + NULL); +} + +/** + * image_menu_item_new_from_stock: + * @stock_id: the name of the stock item. + * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items + * accelerator to, or %NULL. + * + * Creates a new #ImageMenuItem containing the image and text from a + * stock item. Some stock ids have preprocessor macros like #STOCK_OK + * and #STOCK_APPLY. + * + * If you want this menu item to have changeable accelerators, then pass in + * %NULL for accel_group. Next call gtk_menu_item_set_accel_path() with an + * appropriate path for the menu item, use gtk_stock_lookup() to look up the + * standard accelerator for the stock item, and if one is found, call + * gtk_accel_map_add_entry() to register it. + * + * Returns: a new #ImageMenuItem. + * + */ +GtkWidget* +image_menu_item_new_from_stock (const gchar *stock_id, + GtkAccelGroup *accel_group) +{ + return g_object_new (TYPE_IMAGE_MENU_ITEM, + "label", stock_id, + "use-stock", TRUE, + "accel-group", accel_group, + NULL); +} + +/** + * image_menu_item_set_use_stock: + * @image_menu_item: a #ImageMenuItem + * @use_stock: %TRUE if the menuitem should use a stock item + * + * If %TRUE, the label set in the menuitem is used as a + * stock id to select the stock item for the item. + * + * Since: 2.16 + * + */ +void +image_menu_item_set_use_stock (ImageMenuItem *image_menu_item, + gboolean use_stock) +{ + ImageMenuItemPrivate *priv; + + g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); + + priv = image_menu_item->priv; + + if (priv->use_stock != use_stock) + { + priv->use_stock = use_stock; + + image_menu_item_recalculate (image_menu_item); + + g_object_notify (G_OBJECT (image_menu_item), "use-stock"); + } +} + +/** + * image_menu_item_get_use_stock: + * @image_menu_item: a #ImageMenuItem + * + * Checks whether the label set in the menuitem is used as a + * stock id to select the stock item for the item. + * + * Returns: %TRUE if the label set in the menuitem is used as a + * stock id to select the stock item for the item + * + * Since: 2.16 + * + */ +gboolean +image_menu_item_get_use_stock (ImageMenuItem *image_menu_item) +{ + g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), FALSE); + + return image_menu_item->priv->use_stock; +} + +/** + * image_menu_item_set_accel_group: + * @image_menu_item: a #ImageMenuItem + * @accel_group: the #GtkAccelGroup + * + * Specifies an @accel_group to add the menu items accelerator to + * (this only applies to stock items so a stock item must already + * be set, make sure to call image_menu_item_set_use_stock() + * and gtk_menu_item_set_label() with a valid stock item first). + * + * If you want this menu item to have changeable accelerators then + * you shouldnt need this (see image_menu_item_new_from_stock()). + * + * Since: 2.16 + * + */ +void +image_menu_item_set_accel_group (ImageMenuItem *image_menu_item, + GtkAccelGroup *accel_group) +{ + ImageMenuItemPrivate *priv; + GtkStockItem stock_item; + + /* Silent return for the constructor */ + if (!accel_group) + return; + + g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); + g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group)); + + priv = image_menu_item->priv; + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + + if (priv->use_stock && priv->label && gtk_stock_lookup (priv->label, &stock_item)) + if (stock_item.keyval) + { + gtk_widget_add_accelerator (GTK_WIDGET (image_menu_item), + "activate", + accel_group, + stock_item.keyval, + stock_item.modifier, + GTK_ACCEL_VISIBLE); + + g_object_notify (G_OBJECT (image_menu_item), "accel-group"); + } + + G_GNUC_END_IGNORE_DEPRECATIONS; + +} + +/** + * image_menu_item_set_image: + * @image_menu_item: a #ImageMenuItem. + * @image: (allow-none): a widget to set as the image for the menu item. + * + * Sets the image of @image_menu_item to the given widget. + * Note that it depends on the show-menu-images setting whether + * the image will be displayed or not. + * + */ +void +image_menu_item_set_image (ImageMenuItem *image_menu_item, + GtkWidget *image) +{ + ImageMenuItemPrivate *priv; + + g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); + + priv = image_menu_item->priv; + + if (image == priv->image) + return; + + if (priv->image) + gtk_container_remove (GTK_CONTAINER (image_menu_item), + priv->image); + + priv->image = image; + + if (image == NULL) + return; + + gtk_widget_set_parent (image, GTK_WIDGET (image_menu_item)); + g_object_set (image, "visible", TRUE, "no-show-all", TRUE, NULL); + + g_object_notify (G_OBJECT (image_menu_item), "image"); +} + +/** + * image_menu_item_get_image: + * @image_menu_item: a #ImageMenuItem + * + * Gets the widget that is currently set as the image of @image_menu_item. + * See image_menu_item_set_image(). + * + * Return value: (transfer none): the widget set as image of @image_menu_item + * + **/ +GtkWidget* +image_menu_item_get_image (ImageMenuItem *image_menu_item) +{ + g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), NULL); + + return image_menu_item->priv->image; +} + +static void +image_menu_item_remove (GtkContainer *container, + GtkWidget *child) +{ + ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container); + ImageMenuItemPrivate *priv = image_menu_item->priv; + + if (child == priv->image) + { + gboolean widget_was_visible; + + widget_was_visible = gtk_widget_get_visible (child); + + gtk_widget_unparent (child); + priv->image = NULL; + + if (widget_was_visible && + gtk_widget_get_visible (GTK_WIDGET (container))) + gtk_widget_queue_resize (GTK_WIDGET (container)); + + g_object_notify (G_OBJECT (image_menu_item), "image"); + } + else + { + GTK_CONTAINER_CLASS (image_menu_item_parent_class)->remove (container, child); + } +} + +static void +show_image_change_notify (ImageMenuItem *image_menu_item) +{ + ImageMenuItemPrivate *priv = image_menu_item->priv; + + if (priv->image) + { + gtk_widget_show (priv->image); + } +} + +static void +traverse_container (GtkWidget *widget, + gpointer data) +{ + if (IS_IMAGE_MENU_ITEM (widget)) + show_image_change_notify (IMAGE_MENU_ITEM (widget)); + else if (GTK_IS_CONTAINER (widget)) + gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL); +} + +static void +image_menu_item_setting_changed (GtkSettings *settings) +{ + GList *list, *l; + + list = gtk_window_list_toplevels (); + + for (l = list; l; l = l->next) + gtk_container_forall (GTK_CONTAINER (l->data), + traverse_container, NULL); + + g_list_free (list); +} + +static void +image_menu_item_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen) +{ + GtkSettings *settings; + gulong show_image_connection; + + if (!gtk_widget_has_screen (widget)) + return; + + settings = gtk_widget_get_settings (widget); + + show_image_connection = + g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0, + NULL, image_menu_item_setting_changed, NULL); + + if (show_image_connection) + return; + + g_signal_connect (settings, "notify::gtk-menu-images", + G_CALLBACK (image_menu_item_setting_changed), NULL); + + show_image_change_notify (IMAGE_MENU_ITEM (widget)); +} diff --git a/src/widgets/image-menu-item.h b/src/widgets/image-menu-item.h new file mode 100644 index 000000000..61cc48f3a --- /dev/null +++ b/src/widgets/image-menu-item.h @@ -0,0 +1,81 @@ +/* GTK - The GIMP Toolkit + * Copyright (C) Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. + * Forked for , icons in menus are important to us. + */ + +#ifndef __IMAGE_MENU_ITEM_H__ +#define __IMAGE_MENU_ITEM_H__ + +#include + +G_BEGIN_DECLS + +#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB +#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB + +#define TYPE_IMAGE_MENU_ITEM (image_menu_item_get_type ()) +#define IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItem)) +#define IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass)) +#define IS_IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_MENU_ITEM)) +#define IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_MENU_ITEM)) +#define IMAGE_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass)) + +typedef struct _ImageMenuItem ImageMenuItem; +typedef struct _ImageMenuItemPrivate ImageMenuItemPrivate; +typedef struct _ImageMenuItemClass ImageMenuItemClass; + +struct _ImageMenuItem +{ + GtkMenuItem menu_item; + + /*< private >*/ + ImageMenuItemPrivate *priv; +}; + +struct _ImageMenuItemClass +{ + GtkMenuItemClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); +}; + +GType image_menu_item_get_type (void) G_GNUC_CONST; +GtkWidget* image_menu_item_new (void); +GtkWidget* image_menu_item_new_with_label (const gchar *label); +GtkWidget* image_menu_item_new_with_mnemonic (const gchar *label); +GtkWidget* image_menu_item_new_from_stock (const gchar *stock_id, + GtkAccelGroup *accel_group); +void image_menu_item_set_image (ImageMenuItem *image_menu_item, + GtkWidget *image); +GtkWidget* image_menu_item_get_image (ImageMenuItem *image_menu_item); +void image_menu_item_set_use_stock (ImageMenuItem *image_menu_item, + gboolean use_stock); +gboolean image_menu_item_get_use_stock (ImageMenuItem *image_menu_item); +void image_menu_item_set_accel_group (ImageMenuItem *image_menu_item, + GtkAccelGroup *accel_group); + +G_END_DECLS + +#endif /* __IMAGE_MENU_ITEM_H__ */ diff --git a/src/widgets/imagemenuitem.c b/src/widgets/imagemenuitem.c deleted file mode 100644 index 86c44fe32..000000000 --- a/src/widgets/imagemenuitem.c +++ /dev/null @@ -1,1071 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2001 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. - * Forked by . Icons in menus are important to us. - */ - -#include "config.h" - -#include -#include - -#include "widgets/imagemenuitem.h" - -/** - * SECTION:gtkimagemenuitem - * @Short_description: A menu item with an icon - * @Title: ImageMenuItem - * - * A ImageMenuItem is a menu item which has an icon next to the text label. - * - * Note that the user can disable display of menu icons, so make sure to still - * fill in the text label. - */ - - -struct _ImageMenuItemPrivate -{ - GtkWidget *image; - - gchar *label; - guint use_stock : 1; - guint toggle_size; -}; - -enum { - PROP_0, - PROP_IMAGE, - PROP_USE_STOCK, - PROP_ACCEL_GROUP, -}; - -static GtkActivatableIface *parent_activatable_iface; - -static void image_menu_item_destroy (GtkWidget *widget); -static void image_menu_item_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural); -static void image_menu_item_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural); -static void image_menu_item_get_preferred_height_for_width (GtkWidget *widget, - gint width, - gint *minimum, - gint *natural); -static void image_menu_item_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void image_menu_item_map (GtkWidget *widget); -static void image_menu_item_remove (GtkContainer *container, - GtkWidget *child); -static void image_menu_item_toggle_size_request (GtkMenuItem *menu_item, - gint *requisition); -static void image_menu_item_set_label (GtkMenuItem *menu_item, - const gchar *label); -static const gchar * image_menu_item_get_label (GtkMenuItem *menu_item); - -static void image_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data); - -static void image_menu_item_finalize (GObject *object); -static void image_menu_item_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void image_menu_item_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void image_menu_item_screen_changed (GtkWidget *widget, - GdkScreen *previous_screen); - -static void image_menu_item_recalculate (ImageMenuItem *image_menu_item); - -static void image_menu_item_activatable_interface_init (GtkActivatableIface *iface); -static void image_menu_item_update (GtkActivatable *activatable, - GtkAction *action, - const gchar *property_name); -static void image_menu_item_sync_action_properties (GtkActivatable *activatable, - GtkAction *action); - - -G_DEFINE_TYPE_WITH_CODE (ImageMenuItem, image_menu_item, GTK_TYPE_MENU_ITEM, - G_ADD_PRIVATE (ImageMenuItem) - G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE, - image_menu_item_activatable_interface_init)) - - -static void -image_menu_item_class_init (ImageMenuItemClass *klass) -{ - GObjectClass *gobject_class = (GObjectClass*) klass; - GtkWidgetClass *widget_class = (GtkWidgetClass*) klass; - GtkMenuItemClass *menu_item_class = (GtkMenuItemClass*) klass; - GtkContainerClass *container_class = (GtkContainerClass*) klass; - - widget_class->destroy = image_menu_item_destroy; - widget_class->screen_changed = image_menu_item_screen_changed; - widget_class->get_preferred_width = image_menu_item_get_preferred_width; - widget_class->get_preferred_height = image_menu_item_get_preferred_height; - widget_class->get_preferred_height_for_width = image_menu_item_get_preferred_height_for_width; - widget_class->size_allocate = image_menu_item_size_allocate; - widget_class->map = image_menu_item_map; - - container_class->forall = image_menu_item_forall; - container_class->remove = image_menu_item_remove; - - menu_item_class->toggle_size_request = image_menu_item_toggle_size_request; - menu_item_class->set_label = image_menu_item_set_label; - menu_item_class->get_label = image_menu_item_get_label; - - gobject_class->finalize = image_menu_item_finalize; - gobject_class->set_property = image_menu_item_set_property; - gobject_class->get_property = image_menu_item_get_property; - - /** - * ImageMenuItem:image: - * - * Child widget to appear next to the menu text. - * - */ - g_object_class_install_property (gobject_class, - PROP_IMAGE, - g_param_spec_object ("image", - _("Image widget"), - _("Child widget to appear next to the menu text"), - GTK_TYPE_WIDGET, - GTK_PARAM_READWRITE | G_PARAM_DEPRECATED)); - /** - * ImageMenuItem:use-stock: - * - * If %TRUE, the label set in the menuitem is used as a - * stock id to select the stock item for the item. - * - * Since: 2.16 - * - */ - g_object_class_install_property (gobject_class, - PROP_USE_STOCK, - g_param_spec_boolean ("use-stock", - _("Use stock"), - _("Whether to use the label text to create a stock menu item"), - FALSE, - GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_DEPRECATED)); - - /** - * ImageMenuItem:accel-group: - * - * The Accel Group to use for stock accelerator keys - * - * Since: 2.16 - * - */ - g_object_class_install_property (gobject_class, - PROP_ACCEL_GROUP, - g_param_spec_object ("accel-group", - _("Accel Group"), - _("The Accel Group to use for stock accelerator keys"), - GTK_TYPE_ACCEL_GROUP, - GTK_PARAM_WRITABLE | G_PARAM_DEPRECATED)); - -} - -static void -image_menu_item_init (ImageMenuItem *image_menu_item) -{ - ImageMenuItemPrivate *priv; - - image_menu_item->priv = image_menu_item_get_instance_private (image_menu_item); - priv = image_menu_item->priv; - - priv->image = NULL; - priv->use_stock = FALSE; - priv->label = NULL; -} - -static void -image_menu_item_finalize (GObject *object) -{ - ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (object)->priv; - - g_free (priv->label); - priv->label = NULL; - - G_OBJECT_CLASS (image_menu_item_parent_class)->finalize (object); -} - -static void -image_menu_item_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object); - - switch (prop_id) - { - case PROP_IMAGE: - image_menu_item_set_image (image_menu_item, (GtkWidget *) g_value_get_object (value)); - break; - case PROP_USE_STOCK: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - image_menu_item_set_use_stock (image_menu_item, g_value_get_boolean (value)); - G_GNUC_END_IGNORE_DEPRECATIONS; - break; - case PROP_ACCEL_GROUP: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - image_menu_item_set_accel_group (image_menu_item, g_value_get_object (value)); - G_GNUC_END_IGNORE_DEPRECATIONS; - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -image_menu_item_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (object); - - switch (prop_id) - { - case PROP_IMAGE: - g_value_set_object (value, image_menu_item_get_image (image_menu_item)); - break; - case PROP_USE_STOCK: - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_value_set_boolean (value, image_menu_item_get_use_stock (image_menu_item)); - G_GNUC_END_IGNORE_DEPRECATIONS; - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -image_menu_item_map (GtkWidget *widget) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); - ImageMenuItemPrivate *priv = image_menu_item->priv; - - GTK_WIDGET_CLASS (image_menu_item_parent_class)->map (widget); - - if (priv->image) - g_object_set (priv->image, "visible", TRUE, NULL); -} - -static void -image_menu_item_destroy (GtkWidget *widget) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); - ImageMenuItemPrivate *priv = image_menu_item->priv; - - if (priv->image) - gtk_container_remove (GTK_CONTAINER (image_menu_item), - priv->image); - - GTK_WIDGET_CLASS (image_menu_item_parent_class)->destroy (widget); -} - -static void -image_menu_item_toggle_size_request (GtkMenuItem *menu_item, - gint *requisition) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (menu_item); - ImageMenuItemPrivate *priv = image_menu_item->priv; - GtkPackDirection pack_dir; - GtkWidget *parent; - GtkWidget *widget = GTK_WIDGET (menu_item); - - parent = gtk_widget_get_parent (widget); - - if (GTK_IS_MENU_BAR (parent)) - pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - else - pack_dir = GTK_PACK_DIRECTION_LTR; - - *requisition = 0; - - if (priv->image && gtk_widget_get_visible (priv->image)) - { - GtkRequisition image_requisition; - guint toggle_spacing; - - gtk_widget_get_preferred_size (priv->image, &image_requisition, NULL); - - gtk_widget_style_get (GTK_WIDGET (menu_item), - "toggle-spacing", &toggle_spacing, - NULL); - - if (pack_dir == GTK_PACK_DIRECTION_LTR || pack_dir == GTK_PACK_DIRECTION_RTL) - { - if (image_requisition.width > 0) - *requisition = image_requisition.width + toggle_spacing; - } - else - { - if (image_requisition.height > 0) - *requisition = image_requisition.height + toggle_spacing; - } - } -} - -static void -image_menu_item_recalculate (ImageMenuItem *image_menu_item) -{ - ImageMenuItemPrivate *priv = image_menu_item->priv; - GtkStockItem stock_item; - GtkWidget *image; - const gchar *resolved_label = priv->label; - - if (priv->use_stock && priv->label) - { - - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - - if (!priv->image) - { - image = gtk_image_new_from_stock (priv->label, GTK_ICON_SIZE_MENU); - image_menu_item_set_image (image_menu_item, image); - } - - if (gtk_stock_lookup (priv->label, &stock_item)) - resolved_label = stock_item.label; - - gtk_menu_item_set_use_underline (GTK_MENU_ITEM (image_menu_item), TRUE); - - G_GNUC_END_IGNORE_DEPRECATIONS; - } - - GTK_MENU_ITEM_CLASS - (image_menu_item_parent_class)->set_label (GTK_MENU_ITEM (image_menu_item), resolved_label); - -} - -static void -image_menu_item_set_label (GtkMenuItem *menu_item, - const gchar *label) -{ - ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv; - - if (priv->label != label) - { - g_free (priv->label); - priv->label = g_strdup (label); - - image_menu_item_recalculate (IMAGE_MENU_ITEM (menu_item)); - - g_object_notify (G_OBJECT (menu_item), "label"); - - } -} - -static const gchar * -image_menu_item_get_label (GtkMenuItem *menu_item) -{ - ImageMenuItemPrivate *priv = IMAGE_MENU_ITEM (menu_item)->priv; - - return priv->label; -} - -static void -image_menu_item_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); - ImageMenuItemPrivate *priv = image_menu_item->priv; - GtkPackDirection pack_dir; - GtkWidget *parent; - - parent = gtk_widget_get_parent (widget); - - if (GTK_IS_MENU_BAR (parent)) - pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - else - pack_dir = GTK_PACK_DIRECTION_LTR; - - GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_width (widget, minimum, natural); - - if ((pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) && - priv->image && - gtk_widget_get_visible (priv->image)) - { - gint child_minimum, child_natural; - - gtk_widget_get_preferred_width (priv->image, &child_minimum, &child_natural); - - *minimum = MAX (*minimum, child_minimum); - *natural = MAX (*natural, child_natural); - } -} - -static void -image_menu_item_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); - ImageMenuItemPrivate *priv = image_menu_item->priv; - gint child_height = 0; - GtkPackDirection pack_dir; - GtkWidget *parent; - - parent = gtk_widget_get_parent (widget); - - if (GTK_IS_MENU_BAR (parent)) - pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - else - pack_dir = GTK_PACK_DIRECTION_LTR; - - if (priv->image && gtk_widget_get_visible (priv->image)) - { - GtkRequisition child_requisition; - - gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); - - child_height = child_requisition.height; - } - - GTK_WIDGET_CLASS (image_menu_item_parent_class)->get_preferred_height (widget, minimum, natural); - - if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR) - { - *minimum = MAX (*minimum, child_height); - *natural = MAX (*natural, child_height); - } -} - -static void -image_menu_item_get_preferred_height_for_width (GtkWidget *widget, - gint width, - gint *minimum, - gint *natural) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); - ImageMenuItemPrivate *priv = image_menu_item->priv; - gint child_height = 0; - GtkPackDirection pack_dir; - GtkWidget *parent; - - parent = gtk_widget_get_parent (widget); - - if (GTK_IS_MENU_BAR (parent)) - pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - else - pack_dir = GTK_PACK_DIRECTION_LTR; - - if (priv->image && gtk_widget_get_visible (priv->image)) - { - GtkRequisition child_requisition; - - gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); - - child_height = child_requisition.height; - } - - GTK_WIDGET_CLASS - (image_menu_item_parent_class)->get_preferred_height_for_width (widget, width, minimum, natural); - - if (pack_dir == GTK_PACK_DIRECTION_RTL || pack_dir == GTK_PACK_DIRECTION_LTR) - { - *minimum = MAX (*minimum, child_height); - *natural = MAX (*natural, child_height); - } -} - - -static void -image_menu_item_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (widget); - ImageMenuItemPrivate *priv = image_menu_item->priv; - GtkAllocation widget_allocation; - GtkPackDirection pack_dir; - GtkWidget *parent; - - parent = gtk_widget_get_parent (widget); - - if (GTK_IS_MENU_BAR (parent)) - pack_dir = gtk_menu_bar_get_child_pack_direction (GTK_MENU_BAR (parent)); - else - pack_dir = GTK_PACK_DIRECTION_LTR; - - GTK_WIDGET_CLASS (image_menu_item_parent_class)->size_allocate (widget, allocation); - - if (priv->image && gtk_widget_get_visible (priv->image)) - { - gint x, y, offset; - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder padding; - GtkRequisition child_requisition; - GtkAllocation child_allocation; - guint horizontal_padding, toggle_spacing; - gint toggle_size; - - toggle_size = image_menu_item->priv->toggle_size; - gtk_widget_style_get (widget, - "horizontal-padding", &horizontal_padding, - "toggle-spacing", &toggle_spacing, - NULL); - - /* Man this is lame hardcoding action, but I can't - * come up with a solution that's really better. - */ - - gtk_widget_get_preferred_size (priv->image, &child_requisition, NULL); - - gtk_widget_get_allocation (widget, &widget_allocation); - - context = gtk_widget_get_style_context (widget); - state = gtk_widget_get_state_flags (widget); - gtk_style_context_get_padding (context, state, &padding); - offset = gtk_container_get_border_width (GTK_CONTAINER (image_menu_item)); - - if (pack_dir == GTK_PACK_DIRECTION_LTR || - pack_dir == GTK_PACK_DIRECTION_RTL) - { - if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) == - (pack_dir == GTK_PACK_DIRECTION_LTR)) - x = offset + horizontal_padding + padding.left + - (toggle_size - toggle_spacing - child_requisition.width) / 2; - else - x = widget_allocation.width - offset - horizontal_padding - padding.right - - toggle_size + toggle_spacing + - (toggle_size - toggle_spacing - child_requisition.width) / 2; - - y = (widget_allocation.height - child_requisition.height) / 2; - } - else - { - if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) == - (pack_dir == GTK_PACK_DIRECTION_TTB)) - y = offset + horizontal_padding + padding.top + - (toggle_size - toggle_spacing - child_requisition.height) / 2; - else - y = widget_allocation.height - offset - horizontal_padding - padding.bottom - - toggle_size + toggle_spacing + - (toggle_size - toggle_spacing - child_requisition.height) / 2; - - x = (widget_allocation.width - child_requisition.width) / 2; - } - - child_allocation.width = child_requisition.width; - child_allocation.height = child_requisition.height; - child_allocation.x = widget_allocation.x + MAX (x, 0); - child_allocation.y = widget_allocation.y + MAX (y, 0); - - gtk_widget_size_allocate (priv->image, &child_allocation); - } -} - -static void -image_menu_item_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container); - ImageMenuItemPrivate *priv = image_menu_item->priv; - - GTK_CONTAINER_CLASS (image_menu_item_parent_class)->forall (container, - include_internals, - callback, - callback_data); - - if (include_internals && priv->image) - (* callback) (priv->image, callback_data); -} - - -static void -image_menu_item_activatable_interface_init (GtkActivatableIface *iface) -{ - parent_activatable_iface = g_type_interface_peek_parent (iface); - iface->update = image_menu_item_update; - iface->sync_action_properties = image_menu_item_sync_action_properties; -} - -static gboolean -activatable_update_stock_id (ImageMenuItem *image_menu_item, GtkAction *action) -{ - GtkWidget *image; - const gchar *stock_id = gtk_action_get_stock_id (action); - - image = image_menu_item_get_image (image_menu_item); - - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - - if (GTK_IS_IMAGE (image) && - stock_id && gtk_icon_factory_lookup_default (stock_id)) - { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - gtk_image_set_from_stock (GTK_IMAGE (image), stock_id, GTK_ICON_SIZE_MENU); - G_GNUC_END_IGNORE_DEPRECATIONS; - return TRUE; - } - - G_GNUC_END_IGNORE_DEPRECATIONS; - - return FALSE; -} - -static gboolean -activatable_update_gicon (ImageMenuItem *image_menu_item, GtkAction *action) -{ - GtkWidget *image; - GIcon *icon = gtk_action_get_gicon (action); - const gchar *stock_id; - gboolean ret = FALSE; - - stock_id = gtk_action_get_stock_id (action); - - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - - image = image_menu_item_get_image (image_menu_item); - - if (icon && GTK_IS_IMAGE (image) && - !(stock_id && gtk_icon_factory_lookup_default (stock_id))) - { - gtk_image_set_from_gicon (GTK_IMAGE (image), icon, GTK_ICON_SIZE_MENU); - ret = TRUE; - } - - G_GNUC_END_IGNORE_DEPRECATIONS; - - return ret; -} - -static void -activatable_update_icon_name (ImageMenuItem *image_menu_item, GtkAction *action) -{ - GtkWidget *image; - const gchar *icon_name = gtk_action_get_icon_name (action); - - image = image_menu_item_get_image (image_menu_item); - - if (GTK_IS_IMAGE (image) && - (gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_EMPTY || - gtk_image_get_storage_type (GTK_IMAGE (image)) == GTK_IMAGE_ICON_NAME)) - { - gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, GTK_ICON_SIZE_MENU); - } -} - -static void -image_menu_item_update (GtkActivatable *activatable, - GtkAction *action, - const gchar *property_name) -{ - ImageMenuItem *image_menu_item; - gboolean use_appearance; - - image_menu_item = IMAGE_MENU_ITEM (activatable); - - parent_activatable_iface->update (activatable, action, property_name); - - use_appearance = gtk_activatable_get_use_action_appearance (activatable); - if (!use_appearance) - return; - - if (strcmp (property_name, "stock-id") == 0) - activatable_update_stock_id (image_menu_item, action); - else if (strcmp (property_name, "gicon") == 0) - activatable_update_gicon (image_menu_item, action); - else if (strcmp (property_name, "icon-name") == 0) - activatable_update_icon_name (image_menu_item, action); -} - -static void -image_menu_item_sync_action_properties (GtkActivatable *activatable, - GtkAction *action) -{ - ImageMenuItem *image_menu_item; - GtkWidget *image; - gboolean use_appearance; - - image_menu_item = IMAGE_MENU_ITEM (activatable); - - parent_activatable_iface->sync_action_properties (activatable, action); - - if (!action) - return; - - use_appearance = gtk_activatable_get_use_action_appearance (activatable); - if (!use_appearance) - return; - - image = image_menu_item_get_image (image_menu_item); - if (image && !GTK_IS_IMAGE (image)) - { - image_menu_item_set_image (image_menu_item, NULL); - image = NULL; - } - - if (!image) - { - image = gtk_image_new (); - gtk_widget_show (image); - image_menu_item_set_image (IMAGE_MENU_ITEM (activatable), - image); - } - - if (!activatable_update_stock_id (image_menu_item, action) && - !activatable_update_gicon (image_menu_item, action)) - activatable_update_icon_name (image_menu_item, action); - -} - - -/** - * image_menu_item_new: - * - * Creates a new #ImageMenuItem with an empty label. - * - * Returns: a new #ImageMenuItem - * - */ -GtkWidget* -image_menu_item_new (void) -{ - return g_object_new (TYPE_IMAGE_MENU_ITEM, NULL); -} - -/** - * image_menu_item_new_with_label: - * @label: the text of the menu item. - * - * Creates a new #ImageMenuItem containing a label. - * - * Returns: a new #ImageMenuItem. - * - */ -GtkWidget* -image_menu_item_new_with_label (const gchar *label) -{ - return g_object_new (TYPE_IMAGE_MENU_ITEM, - "label", label, - NULL); -} - -/** - * image_menu_item_new_with_mnemonic: - * @label: the text of the menu item, with an underscore in front of the - * mnemonic character - * - * Creates a new #ImageMenuItem containing a label. The label - * will be created using gtk_label_new_with_mnemonic(), so underscores - * in @label indicate the mnemonic for the menu item. - * - * Returns: a new #ImageMenuItem - * - */ -GtkWidget* -image_menu_item_new_with_mnemonic (const gchar *label) -{ - return g_object_new (TYPE_IMAGE_MENU_ITEM, - "use-underline", TRUE, - "label", label, - NULL); -} - -/** - * image_menu_item_new_from_stock: - * @stock_id: the name of the stock item. - * @accel_group: (allow-none): the #GtkAccelGroup to add the menu items - * accelerator to, or %NULL. - * - * Creates a new #ImageMenuItem containing the image and text from a - * stock item. Some stock ids have preprocessor macros like #STOCK_OK - * and #STOCK_APPLY. - * - * If you want this menu item to have changeable accelerators, then pass in - * %NULL for accel_group. Next call gtk_menu_item_set_accel_path() with an - * appropriate path for the menu item, use gtk_stock_lookup() to look up the - * standard accelerator for the stock item, and if one is found, call - * gtk_accel_map_add_entry() to register it. - * - * Returns: a new #ImageMenuItem. - * - */ -GtkWidget* -image_menu_item_new_from_stock (const gchar *stock_id, - GtkAccelGroup *accel_group) -{ - return g_object_new (TYPE_IMAGE_MENU_ITEM, - "label", stock_id, - "use-stock", TRUE, - "accel-group", accel_group, - NULL); -} - -/** - * image_menu_item_set_use_stock: - * @image_menu_item: a #ImageMenuItem - * @use_stock: %TRUE if the menuitem should use a stock item - * - * If %TRUE, the label set in the menuitem is used as a - * stock id to select the stock item for the item. - * - * Since: 2.16 - * - */ -void -image_menu_item_set_use_stock (ImageMenuItem *image_menu_item, - gboolean use_stock) -{ - ImageMenuItemPrivate *priv; - - g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); - - priv = image_menu_item->priv; - - if (priv->use_stock != use_stock) - { - priv->use_stock = use_stock; - - image_menu_item_recalculate (image_menu_item); - - g_object_notify (G_OBJECT (image_menu_item), "use-stock"); - } -} - -/** - * image_menu_item_get_use_stock: - * @image_menu_item: a #ImageMenuItem - * - * Checks whether the label set in the menuitem is used as a - * stock id to select the stock item for the item. - * - * Returns: %TRUE if the label set in the menuitem is used as a - * stock id to select the stock item for the item - * - * Since: 2.16 - * - */ -gboolean -image_menu_item_get_use_stock (ImageMenuItem *image_menu_item) -{ - g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), FALSE); - - return image_menu_item->priv->use_stock; -} - -/** - * image_menu_item_set_accel_group: - * @image_menu_item: a #ImageMenuItem - * @accel_group: the #GtkAccelGroup - * - * Specifies an @accel_group to add the menu items accelerator to - * (this only applies to stock items so a stock item must already - * be set, make sure to call image_menu_item_set_use_stock() - * and gtk_menu_item_set_label() with a valid stock item first). - * - * If you want this menu item to have changeable accelerators then - * you shouldnt need this (see image_menu_item_new_from_stock()). - * - * Since: 2.16 - * - */ -void -image_menu_item_set_accel_group (ImageMenuItem *image_menu_item, - GtkAccelGroup *accel_group) -{ - ImageMenuItemPrivate *priv; - GtkStockItem stock_item; - - /* Silent return for the constructor */ - if (!accel_group) - return; - - g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); - g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group)); - - priv = image_menu_item->priv; - - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - - if (priv->use_stock && priv->label && gtk_stock_lookup (priv->label, &stock_item)) - if (stock_item.keyval) - { - gtk_widget_add_accelerator (GTK_WIDGET (image_menu_item), - "activate", - accel_group, - stock_item.keyval, - stock_item.modifier, - GTK_ACCEL_VISIBLE); - - g_object_notify (G_OBJECT (image_menu_item), "accel-group"); - } - - G_GNUC_END_IGNORE_DEPRECATIONS; - -} - -/** - * image_menu_item_set_image: - * @image_menu_item: a #ImageMenuItem. - * @image: (allow-none): a widget to set as the image for the menu item. - * - * Sets the image of @image_menu_item to the given widget. - * Note that it depends on the show-menu-images setting whether - * the image will be displayed or not. - * - */ -void -image_menu_item_set_image (ImageMenuItem *image_menu_item, - GtkWidget *image) -{ - ImageMenuItemPrivate *priv; - - g_return_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item)); - - priv = image_menu_item->priv; - - if (image == priv->image) - return; - - if (priv->image) - gtk_container_remove (GTK_CONTAINER (image_menu_item), - priv->image); - - priv->image = image; - - if (image == NULL) - return; - - gtk_widget_set_parent (image, GTK_WIDGET (image_menu_item)); - g_object_set (image, "visible", TRUE, "no-show-all", TRUE, NULL); - - g_object_notify (G_OBJECT (image_menu_item), "image"); -} - -/** - * image_menu_item_get_image: - * @image_menu_item: a #ImageMenuItem - * - * Gets the widget that is currently set as the image of @image_menu_item. - * See image_menu_item_set_image(). - * - * Return value: (transfer none): the widget set as image of @image_menu_item - * - **/ -GtkWidget* -image_menu_item_get_image (ImageMenuItem *image_menu_item) -{ - g_return_val_if_fail (IS_IMAGE_MENU_ITEM (image_menu_item), NULL); - - return image_menu_item->priv->image; -} - -static void -image_menu_item_remove (GtkContainer *container, - GtkWidget *child) -{ - ImageMenuItem *image_menu_item = IMAGE_MENU_ITEM (container); - ImageMenuItemPrivate *priv = image_menu_item->priv; - - if (child == priv->image) - { - gboolean widget_was_visible; - - widget_was_visible = gtk_widget_get_visible (child); - - gtk_widget_unparent (child); - priv->image = NULL; - - if (widget_was_visible && - gtk_widget_get_visible (GTK_WIDGET (container))) - gtk_widget_queue_resize (GTK_WIDGET (container)); - - g_object_notify (G_OBJECT (image_menu_item), "image"); - } - else - { - GTK_CONTAINER_CLASS (image_menu_item_parent_class)->remove (container, child); - } -} - -static void -show_image_change_notify (ImageMenuItem *image_menu_item) -{ - ImageMenuItemPrivate *priv = image_menu_item->priv; - - if (priv->image) - { - gtk_widget_show (priv->image); - } -} - -static void -traverse_container (GtkWidget *widget, - gpointer data) -{ - if (IS_IMAGE_MENU_ITEM (widget)) - show_image_change_notify (IMAGE_MENU_ITEM (widget)); - else if (GTK_IS_CONTAINER (widget)) - gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL); -} - -static void -image_menu_item_setting_changed (GtkSettings *settings) -{ - GList *list, *l; - - list = gtk_window_list_toplevels (); - - for (l = list; l; l = l->next) - gtk_container_forall (GTK_CONTAINER (l->data), - traverse_container, NULL); - - g_list_free (list); -} - -static void -image_menu_item_screen_changed (GtkWidget *widget, - GdkScreen *previous_screen) -{ - GtkSettings *settings; - gulong show_image_connection; - - if (!gtk_widget_has_screen (widget)) - return; - - settings = gtk_widget_get_settings (widget); - - show_image_connection = - g_signal_handler_find (settings, G_SIGNAL_MATCH_FUNC, 0, 0, - NULL, image_menu_item_setting_changed, NULL); - - if (show_image_connection) - return; - - g_signal_connect (settings, "notify::gtk-menu-images", - G_CALLBACK (image_menu_item_setting_changed), NULL); - - show_image_change_notify (IMAGE_MENU_ITEM (widget)); -} diff --git a/src/widgets/imagemenuitem.h b/src/widgets/imagemenuitem.h deleted file mode 100644 index 61cc48f3a..000000000 --- a/src/widgets/imagemenuitem.h +++ /dev/null @@ -1,81 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. - * Forked for , icons in menus are important to us. - */ - -#ifndef __IMAGE_MENU_ITEM_H__ -#define __IMAGE_MENU_ITEM_H__ - -#include - -G_BEGIN_DECLS - -#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB -#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB -#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB - -#define TYPE_IMAGE_MENU_ITEM (image_menu_item_get_type ()) -#define IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItem)) -#define IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass)) -#define IS_IMAGE_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_MENU_ITEM)) -#define IS_IMAGE_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_MENU_ITEM)) -#define IMAGE_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_IMAGE_MENU_ITEM, ImageMenuItemClass)) - -typedef struct _ImageMenuItem ImageMenuItem; -typedef struct _ImageMenuItemPrivate ImageMenuItemPrivate; -typedef struct _ImageMenuItemClass ImageMenuItemClass; - -struct _ImageMenuItem -{ - GtkMenuItem menu_item; - - /*< private >*/ - ImageMenuItemPrivate *priv; -}; - -struct _ImageMenuItemClass -{ - GtkMenuItemClass parent_class; - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - -GType image_menu_item_get_type (void) G_GNUC_CONST; -GtkWidget* image_menu_item_new (void); -GtkWidget* image_menu_item_new_with_label (const gchar *label); -GtkWidget* image_menu_item_new_with_mnemonic (const gchar *label); -GtkWidget* image_menu_item_new_from_stock (const gchar *stock_id, - GtkAccelGroup *accel_group); -void image_menu_item_set_image (ImageMenuItem *image_menu_item, - GtkWidget *image); -GtkWidget* image_menu_item_get_image (ImageMenuItem *image_menu_item); -void image_menu_item_set_use_stock (ImageMenuItem *image_menu_item, - gboolean use_stock); -gboolean image_menu_item_get_use_stock (ImageMenuItem *image_menu_item); -void image_menu_item_set_accel_group (ImageMenuItem *image_menu_item, - GtkAccelGroup *accel_group); - -G_END_DECLS - -#endif /* __IMAGE_MENU_ITEM_H__ */ diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp index 44ba5c7f9..ace99d9aa 100644 --- a/src/widgets/ink-action.cpp +++ b/src/widgets/ink-action.cpp @@ -11,7 +11,7 @@ #if GTK_CHECK_VERSION(3,0,0) // Fork of gtk-imagemenuitem to continue support - #include "widgets/imagemenuitem.h" + #include "widgets/image-menu-item.h" #endif -- cgit v1.2.3 From 1eacfbf37731e918de1690b1e614440c4e3d9afe Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 11:19:33 +0100 Subject: spw-utilities: Fix deprecated gtk_widget_override_font #Hackfest2016 (bzr r14819) --- src/widgets/spw-utilities.cpp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp index 2cad395e7..89ab76585 100644 --- a/src/widgets/spw-utilities.cpp +++ b/src/widgets/spw-utilities.cpp @@ -255,12 +255,26 @@ sp_set_font_size_recursive (GtkWidget *w, gpointer font) { guint size = GPOINTER_TO_UINT (font); - PangoFontDescription* pan = pango_font_description_new (); - pango_font_description_set_size (pan, size); - #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_override_font (w, pan); + GtkCssProvider *css_provider = gtk_css_provider_new(); + + const double pt_size = size / static_cast(PANGO_SCALE); + std::ostringstream css_data; + css_data << "GtkWidget {\n" + << " font-size: " << pt_size << "pt;\n" + << "}\n"; + + gtk_css_provider_load_from_data(css_provider, + css_data.str().c_str(), + -1, NULL); + + GtkStyleContext *style_context = gtk_widget_get_style_context(w); + gtk_style_context_add_provider(style_context, + GTK_STYLE_PROVIDER(css_provider), + GTK_STYLE_PROVIDER_PRIORITY_USER); #else + PangoFontDescription* pan = pango_font_description_new (); + pango_font_description_set_size (pan, size); gtk_widget_modify_font (w, pan); #endif @@ -268,7 +282,11 @@ sp_set_font_size_recursive (GtkWidget *w, gpointer font) gtk_container_foreach (GTK_CONTAINER(w), (GtkCallback) sp_set_font_size_recursive, font); } +#if GTK_CHECK_VERSION(3,0,0) + g_object_unref(css_provider); +#else pango_font_description_free (pan); +#endif } void -- cgit v1.2.3 From 82014e41c1e158e3b8d3f4ca9af9834400ca8f91 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 11:21:25 +0100 Subject: gimpcolorwheel: Fix deprecated gtk_widget_style_attach #Hackfest2016 (bzr r14820) --- src/ui/widget/gimpcolorwheel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/widget/gimpcolorwheel.c b/src/ui/widget/gimpcolorwheel.c index 3642848df..d54486505 100644 --- a/src/ui/widget/gimpcolorwheel.c +++ b/src/ui/widget/gimpcolorwheel.c @@ -303,7 +303,9 @@ gimp_color_wheel_realize (GtkWidget *widget) priv->window = gdk_window_new (parent_window, &attr, attr_mask); gdk_window_set_user_data (priv->window, wheel); +#if !GTK_CHECK_VERSION(3,0,0) gtk_widget_style_attach (widget); +#endif } static void -- cgit v1.2.3 From d2a3bc0b327557fba34f09a110a0ac5b6d18f85e Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 12:38:28 +0100 Subject: Move background drawing to SPCanvas to avoid temporarily drawing an incorrect background. #Hackfest2016 (bzr r14821) --- src/desktop.cpp | 17 ++-------- src/desktop.h | 1 - src/display/sp-canvas.cpp | 85 +++++++++++++++++++++++++++++++++++------------ src/display/sp-canvas.h | 18 +++++++--- 4 files changed, 79 insertions(+), 42 deletions(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 331ab3351..5cd9ef32f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -111,7 +111,6 @@ SPDesktop::SPDesktop() : sketch( NULL ), controls( NULL ), tempgroup ( NULL ), - table( NULL ), page( NULL ), page_border( NULL ), current( NULL ), @@ -211,11 +210,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid g_signal_connect (G_OBJECT (main), "event", G_CALLBACK (sp_desktop_root_handler), this); /* This is the background the page sits on. */ - table = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL); - SP_CTRLRECT(table)->setRectangle(Geom::Rect(Geom::Point(-80000, -80000), Geom::Point(80000, 80000))); - SP_CTRLRECT(table)->setColor(0x00000000, true, 0x00000000); - SP_CTRLRECT(table)->setCheckerboard( false ); - sp_canvas_item_move_to_z (table, 0); + canvas->setBackgroundColor(0xffffff00); page = sp_canvas_item_new (main, SP_TYPE_CTRLRECT, NULL); ((CtrlRect *) page)->setColor(0x00000000, FALSE, 0x00000000); @@ -1733,17 +1728,11 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop) SPNamedView *nv=SP_NAMEDVIEW(obj); if (flags & SP_OBJECT_MODIFIED_FLAG) { - - /* Set page background */ - sp_canvas_item_show (desktop->table); if (nv->pagecheckerboard) { - ((CtrlRect *) desktop->table)->setCheckerboard( true ); - ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor ); // | 0xff); + desktop->canvas->setBackgroundCheckerboard(); } else { - ((CtrlRect *) desktop->table)->setCheckerboard( false ); - ((CtrlRect *) desktop->table)->setColor(0x00000000, true, nv->pagecolor | 0xff); + desktop->canvas->setBackgroundColor(nv->pagecolor); } - sp_canvas_item_move_to_z (desktop->table, 0); /* Show/hide page border */ if (nv->showborder) { diff --git a/src/desktop.h b/src/desktop.h index f1444ba7b..3652d4a97 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -174,7 +174,6 @@ public: SPCanvasGroup *sketch; SPCanvasGroup *controls; SPCanvasGroup *tempgroup; ///< contains temporary canvas items - SPCanvasItem *table; ///< outside-of-page background SPCanvasItem *page; ///< page background SPCanvasItem *page_border; ///< page border SPCSSAttr *current; ///< current style diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 644da8d5a..6b7836d2e 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -27,6 +27,7 @@ #include "helper/sp-marshal.h" #include <2geom/rect.h> #include <2geom/affine.h> +#include "display/cairo-utils.h" #include "display/sp-canvas.h" #include "display/sp-canvas-group.h" #include "preferences.h" @@ -37,6 +38,7 @@ #include "display/cairo-utils.h" #include "debug/gdk-event-latency-tracker.h" #include "desktop.h" +#include "color.h" using Inkscape::Debug::GdkEventLatencyTracker; @@ -959,6 +961,8 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_backing_store = NULL; canvas->_clean_region = cairo_region_create(); + canvas->_background = cairo_pattern_create_rgb(1, 1, 1); + canvas->_background_is_checkerboard = false; canvas->_forced_redraw_count = 0; canvas->_forced_redraw_limit = -1; @@ -972,10 +976,7 @@ static void sp_canvas_init(SPCanvas *canvas) void SPCanvas::shutdownTransients() { // Reset the clean region - if (_clean_region && !cairo_region_is_empty(_clean_region)) { - cairo_region_destroy(_clean_region); - _clean_region = cairo_region_create(); - } + dirtyAll(); if (_grabbed_item) { _grabbed_item = NULL; @@ -1006,6 +1007,10 @@ void SPCanvas::dispose(GObject *object) cairo_region_destroy(canvas->_clean_region); canvas->_clean_region = NULL; } + if (canvas->_background) { + cairo_pattern_destroy(canvas->_background); + canvas->_background = NULL; + } canvas->shutdownTransients(); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) @@ -1529,9 +1534,6 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect { GtkWidget *widget = GTK_WIDGET (this); - // Mark the region clean - markRect(paint_rect, 0); - SPCanvasBuf buf; buf.buf = NULL; buf.buf_rowstride = 0; @@ -1543,7 +1545,6 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect // create temporary surface cairo_surface_t *imgs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, paint_rect.width(), paint_rect.height()); buf.ct = cairo_create(imgs); - //cairo_translate(buf.ct, -x0, -y0); // fix coordinates, clip all drawing to the tile and clear the background //cairo_translate(buf.ct, paint_rect.left() - canvas->x0, paint_rect.top() - canvas->y0); @@ -1553,18 +1554,12 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect //cairo_stroke_preserve(buf.ct); //cairo_clip(buf.ct); -#if GTK_CHECK_VERSION(3,0,0) - GtkStyleContext *context = gtk_widget_get_style_context(widget); - gtk_render_background(context, buf.ct, 0, 0, paint_rect.width(), paint_rect.height()); -#else - GtkStyle *style = gtk_widget_get_style (widget); - gdk_cairo_set_source_color(buf.ct, &style->bg[GTK_STATE_NORMAL]); -#endif - + cairo_save(buf.ct); + cairo_translate(buf.ct, -paint_rect.left(), -paint_rect.top()); + cairo_set_source(buf.ct, _background); cairo_set_operator(buf.ct, CAIRO_OPERATOR_SOURCE); - //cairo_rectangle(buf.ct, 0, 0, paint_rect.width(), paint_rec.height()); cairo_paint(buf.ct); - cairo_set_operator(buf.ct, CAIRO_OPERATOR_OVER); + cairo_restore(buf.ct); if (_root->visible) { SP_CANVAS_ITEM_GET_CLASS(_root)->render(_root, &buf); @@ -1608,8 +1603,8 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect cairo_destroy(xct); cairo_surface_destroy(imgs); - cairo_rectangle_int_t crect = { paint_rect.left(), paint_rect.right(), paint_rect.width(), paint_rect.height() }; - cairo_region_union_rectangle(_clean_region, &crect); + // Mark the painted rectangle clean + markRect(paint_rect, 0); gtk_widget_queue_draw_area(GTK_WIDGET(this), paint_rect.left() -_x0, paint_rect.top() - _y0, paint_rect.width(), paint_rect.height()); @@ -1816,6 +1811,16 @@ gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { cairo_region_subtract(draw_dirty, canvas->_clean_region); cairo_region_intersect(draw_region, canvas->_clean_region); + // Draw the background + cairo_save(cr); + cairo_translate(cr, -canvas->_x0, -canvas->_y0); + cairo_set_source(cr, canvas->_background); + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_paint(cr); + cairo_restore(cr); + /*cairo_set_source(cr, canvas->_background); + cairo_paint(cr);*/ + // Draw the clean portion if (!cairo_region_is_empty(draw_region)) { cairo_region_translate(draw_region, -canvas->_x0, -canvas->_y0); @@ -2007,6 +2012,7 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll gtk_widget_get_allocation(&_widget, &allocation); + // adjust backing store contents assert(_backing_store); cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height); @@ -2021,8 +2027,7 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll _backing_store = new_backing_store; if (clear) { - cairo_region_destroy(_clean_region); - _clean_region = cairo_region_create(); + dirtyAll(); } else { cairo_rectangle_int_t crect = { _x0, _y0, allocation.width, allocation.height }; cairo_region_intersect_rectangle(_clean_region, &crect); @@ -2070,6 +2075,35 @@ void SPCanvas::requestRedraw(int x0, int y0, int x1, int y1) addIdle(); } +void SPCanvas::setBackgroundColor(guint32 rgba) { + double new_r = SP_RGBA32_R_F(rgba); + double new_g = SP_RGBA32_G_F(rgba); + double new_b = SP_RGBA32_B_F(rgba); + if (!_background_is_checkerboard) { + double old_r, old_g, old_b; + cairo_pattern_get_rgba(_background, &old_r, &old_g, &old_b, NULL); + if (new_r == old_r && new_g == old_g && new_b == old_b) return; + } + if (_background) { + cairo_pattern_destroy(_background); + } + _background = cairo_pattern_create_rgb(new_r, new_g, new_b); + _background_is_checkerboard = false; + dirtyAll(); + addIdle(); +} + +void SPCanvas::setBackgroundCheckerboard() { + if (_background_is_checkerboard) return; + if (_background) { + cairo_pattern_destroy(_background); + } + _background = ink_cairo_pattern_create_checkerboard(); + _background_is_checkerboard = true; + dirtyAll(); + addIdle(); +} + /** * Sets world coordinates from win and canvas. */ @@ -2175,6 +2209,13 @@ void SPCanvas::dirtyRect(Geom::IntRect const &area) { markRect(area, 1); } +void SPCanvas::dirtyAll() { + if (_clean_region && !cairo_region_is_empty(_clean_region)) { + cairo_region_destroy(_clean_region); + _clean_region = cairo_region_create(); + } +} + void SPCanvas::markRect(Geom::IntRect const &area, uint8_t val) { cairo_rectangle_int_t crect = { area.left(), area.top(), area.width(), area.height() }; diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index a1f8d0a1a..171fdaf67 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -87,6 +87,9 @@ struct SPCanvas { Geom::IntRect getViewboxIntegers() const; SPCanvasGroup *getRoot(); + void setBackgroundColor(guint32 rgba); + void setBackgroundCheckerboard(); + /// Returns new canvas as widget. static GtkWidget *createAA(); @@ -105,7 +108,8 @@ private: /// Marks the specified area as dirty (requiring redraw) void dirtyRect(Geom::IntRect const &area); - /// Marks specific canvas rectangle as clean (val == 0) or dirty (otherwise) + /// Marks the whole widget for redraw + void dirtyAll(); void markRect(Geom::IntRect const &area, uint8_t val); /// Invokes update, paint, and repick on canvas. @@ -177,14 +181,18 @@ public: bool _is_dragging; double _dx0; double _dy0; - int _x0; - int _y0; + int _x0; ///< World coordinate of the leftmost pixels + int _y0; ///< World coordinate of the topmost pixels - /* Area that needs redrawing, stored as a microtile array */ + /// Image surface storing the contents of the widget cairo_surface_t *_backing_store; + /// Area of the widget that has up-to-date content cairo_region_t *_clean_region; + /// Widget background, defaults to white + cairo_pattern_t *_background; + bool _background_is_checkerboard; - /** Last known modifier state, for deferred repick when a button is down. */ + /// Last known modifier state, for deferred repick when a button is down. int _state; /** The item containing the mouse pointer, or NULL if none. */ -- cgit v1.2.3 From ea551934712e32620210338aa47f6bf5a6f81043 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 13 Apr 2016 13:53:54 +0200 Subject: Fix referencing problem with widget is moved from one container to another. Hackfest 2016. (bzr r14822) --- src/widgets/desktop-widget.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 759be551f..19c07075b 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1698,8 +1698,11 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_TOP: case GTK_POS_BOTTOM: if ( gtk_widget_is_ancestor(toolbox, hbox) ) { + // Removing a widget can reduce ref count to zero + gtk_object_ref(GTK_OBJECT(toolbox)); gtk_container_remove(GTK_CONTAINER(hbox), toolbox); gtk_container_add(GTK_CONTAINER(vbox), toolbox); + gtk_object_unref(GTK_OBJECT(toolbox)); gtk_box_set_child_packing(GTK_BOX(vbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); } ToolboxFactory::setOrientation(toolbox, GTK_ORIENTATION_HORIZONTAL); @@ -1707,8 +1710,10 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_LEFT: case GTK_POS_RIGHT: if ( !gtk_widget_is_ancestor(toolbox, hbox) ) { + gtk_object_ref(GTK_OBJECT(toolbox)); gtk_container_remove(GTK_CONTAINER(vbox), toolbox); gtk_container_add(GTK_CONTAINER(hbox), toolbox); + gtk_object_unref(GTK_OBJECT(toolbox)); gtk_box_set_child_packing(GTK_BOX(hbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); if (pos == GTK_POS_LEFT) { gtk_box_reorder_child( GTK_BOX(hbox), toolbox, 0 ); -- cgit v1.2.3 From 16b2c93dcfca8c6ee6cd61f4065a9a387fcde3bd Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 13 Apr 2016 13:58:08 +0200 Subject: Fix CMake caching issue with GtkSpell (bzr r14823) --- CMakeScripts/DefineDependsandFlags.cmake | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index d8088bf9a..4429758c0 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -247,9 +247,12 @@ if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules(GTKSPELL3 gtkspell3-3.0) if("${GTKSPELL3_FOUND}") - message("Using GtkSpell3 3.0") + message("Using GtkSpell3") set (WITH_GTKSPELL 1) + else() + unset(WITH_GTKSPELL) endif() + list(APPEND INKSCAPE_INCS_SYS ${GTK3_INCLUDE_DIRS} ${GTKSPELL3_INCLUDE_DIRS} @@ -268,19 +271,21 @@ else() ) list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER}) pkg_check_modules(GTKSPELL2 gtkspell-2.0) - if("${GTKSPELL3_FOUND}") - message("Using GtkSpell3 3.0") - add_definitions(${GTK_CFLAGS_OTHER}) + if("${GTKSPELL2_FOUND}") + message("Using GtkSpell 2") + add_definitions(${GTKSPELL2_CFLAGS_OTHER}) set (WITH_GTKSPELL 1) + else() + unset(WITH_GTKSPELL) endif() list(APPEND INKSCAPE_INCS_SYS ${GTK_INCLUDE_DIRS} - ${GTKSPELL_INCLUDE_DIRS} + ${GTKSPELL2_INCLUDE_DIRS} ) list(APPEND INKSCAPE_LIBS ${GTK_LIBRARIES} - ${GTKSPELL_LIBRARIES} + ${GTKSPELL2_LIBRARIES} ) endif() @@ -300,17 +305,6 @@ if(ASPELL_FOUND) set(HAVE_ASPELL TRUE) endif() -if("${TRY_GTKSPELL}" AND "${WITH_GTKSPELL}") - find_package(GtkSpell) - if(GTKSPELL_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${GTKSPELL_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${GTKSPELL_LIBRARIES}) - add_definitions(${GTKSPELL_DEFINITIONS}) - else() - set(WITH_GTKSPELL OFF) - endif() -endif() - #find_package(OpenSSL) #list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR}) #list(APPEND INKSCAPE_LIBS ${OPENSSL_LIBRARIES}) -- cgit v1.2.3 From de93b23d78770247c0b69a0b11b6097396a09fb5 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 12:58:25 +0100 Subject: Fix redraw problems when shrinking and then enlarging the SPCanvas widget. #Hackfest2016 (bzr r14824) --- src/display/sp-canvas.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 6b7836d2e..a311de7f1 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1154,7 +1154,7 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation Geom::IntRect new_area = Geom::IntRect::from_xywh(canvas->_x0, canvas->_y0, allocation->width, allocation->height); - // resize backing store; the clean region does not change + // resize backing store cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation->width, allocation->height); if (canvas->_backing_store) { @@ -1167,9 +1167,12 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation } canvas->_backing_store = new_backing_store; + // Clip the clean region to the new allocation + cairo_rectangle_int_t crect = { canvas->_x0, canvas->_y0, allocation->width, allocation->height }; + cairo_region_intersect_rectangle(canvas->_clean_region, &crect); + gtk_widget_set_allocation (widget, allocation); - // Schedule redraw of new region if (SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed) SP_CANVAS_ITEM_GET_CLASS (canvas->_root)->viewbox_changed (canvas->_root, new_area); @@ -1178,6 +1181,7 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation allocation->x, allocation->y, allocation->width, allocation->height); } + // Schedule redraw of any newly exposed regions canvas->addIdle(); } @@ -1818,8 +1822,6 @@ gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_paint(cr); cairo_restore(cr); - /*cairo_set_source(cr, canvas->_background); - cairo_paint(cr);*/ // Draw the clean portion if (!cairo_region_is_empty(draw_region)) { -- cgit v1.2.3 From c9d41b9a25cdcd58087f37c73f60638cb79bf309 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 13 Apr 2016 14:11:41 +0200 Subject: Gtk3 compatibility fix. Hackfest 2016 (bzr r14825) --- src/widgets/desktop-widget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 19c07075b..fe724a964 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1699,10 +1699,10 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_BOTTOM: if ( gtk_widget_is_ancestor(toolbox, hbox) ) { // Removing a widget can reduce ref count to zero - gtk_object_ref(GTK_OBJECT(toolbox)); + g_object_ref(G_OBJECT(toolbox)); gtk_container_remove(GTK_CONTAINER(hbox), toolbox); gtk_container_add(GTK_CONTAINER(vbox), toolbox); - gtk_object_unref(GTK_OBJECT(toolbox)); + g_object_unref(G_OBJECT(toolbox)); gtk_box_set_child_packing(GTK_BOX(vbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); } ToolboxFactory::setOrientation(toolbox, GTK_ORIENTATION_HORIZONTAL); @@ -1710,10 +1710,10 @@ void SPDesktopWidget::setToolboxPosition(Glib::ustring const& id, GtkPositionTyp case GTK_POS_LEFT: case GTK_POS_RIGHT: if ( !gtk_widget_is_ancestor(toolbox, hbox) ) { - gtk_object_ref(GTK_OBJECT(toolbox)); + g_object_ref(G_OBJECT(toolbox)); gtk_container_remove(GTK_CONTAINER(vbox), toolbox); gtk_container_add(GTK_CONTAINER(hbox), toolbox); - gtk_object_unref(GTK_OBJECT(toolbox)); + g_object_unref(G_OBJECT(toolbox)); gtk_box_set_child_packing(GTK_BOX(hbox), toolbox, FALSE, TRUE, 0, GTK_PACK_START); if (pos == GTK_POS_LEFT) { gtk_box_reorder_child( GTK_BOX(hbox), toolbox, 0 ); -- cgit v1.2.3 From 8948544b36d4caef900860cd6aa8672deb5814b0 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Wed, 13 Apr 2016 14:18:46 +0100 Subject: Remove old uses of GTK_STOCK macros (bzr r14826) --- src/libgdl/gdl-dock-bar.c | 2 +- src/live_effects/parameter/originalpatharray.cpp | 8 ++++---- src/ui/dialog/objects.cpp | 4 ++-- src/ui/widget/addtoicon.cpp | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/libgdl/gdl-dock-bar.c b/src/libgdl/gdl-dock-bar.c index 1d7b33b5f..c1fe21872 100644 --- a/src/libgdl/gdl-dock-bar.c +++ b/src/libgdl/gdl-dock-bar.c @@ -314,7 +314,7 @@ gdl_dock_bar_add_item (GdlDockBar *dockbar, } else if (pixbuf_icon) { image = gtk_image_new_from_pixbuf (pixbuf_icon); } else { - image = gtk_image_new_from_stock (GTK_STOCK_NEW, + image = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_SMALL_TOOLBAR); } gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0); diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp index 7e3a6f5fe..4ee068ebf 100644 --- a/src/live_effects/parameter/originalpatharray.cpp +++ b/src/live_effects/parameter/originalpatharray.cpp @@ -144,7 +144,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() { // Paste path to link button - Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( GTK_STOCK_PASTE, Inkscape::ICON_SIZE_BUTTON) ); + Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon("gtk-stock", Inkscape::ICON_SIZE_BUTTON) ); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -156,7 +156,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() } { // Remove linked path - Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( GTK_STOCK_REMOVE, Inkscape::ICON_SIZE_BUTTON) ); + Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon("gtk-remove", Inkscape::ICON_SIZE_BUTTON) ); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -168,7 +168,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() } { // Move Down - Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( GTK_STOCK_GO_DOWN, Inkscape::ICON_SIZE_BUTTON) ); + Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( "gtk-go-down", Inkscape::ICON_SIZE_BUTTON) ); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); @@ -180,7 +180,7 @@ Gtk::Widget* OriginalPathArrayParam::param_newWidget() } { // Move Down - Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( GTK_STOCK_GO_UP, Inkscape::ICON_SIZE_BUTTON) ); + Gtk::Widget *pIcon = Gtk::manage( sp_icon_get_icon( "gtk-go-up", Inkscape::ICON_SIZE_BUTTON) ); Gtk::Button *pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index 891048beb..27694a9ac 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -1907,8 +1907,8 @@ ObjectsPanel::ObjectsPanel() : _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem())); - _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_RAISE, GTK_STOCK_GO_UP, _("Up"), (int)BUTTON_UP ) ); - _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_LOWER, GTK_STOCK_GO_DOWN, _("Down"), (int)BUTTON_DOWN ) ); + _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_RAISE, "gtk-go-up", _("Up"), (int)BUTTON_UP ) ); + _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_LOWER, "gtk-go-down", _("Down"), (int)BUTTON_DOWN ) ); _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem())); diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp index 823e24a00..10294125d 100644 --- a/src/ui/widget/addtoicon.cpp +++ b/src/ui/widget/addtoicon.cpp @@ -48,7 +48,6 @@ AddToIcon::AddToIcon() : // // _property_pixbuf_add = Gtk::Widget:: - //property_stock_id() = GTK_STOCK_ADD; set_pixbuf(); } -- cgit v1.2.3 From 1853340f66e25dbece6666c7ebf71f93ed203ba7 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 14:45:53 +0100 Subject: text-toolbar: Gtk+ 3 theming #Hackfest2016 (bzr r14827) --- src/widgets/text-toolbar.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 661fc6fa9..23acb74af 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -1562,6 +1562,23 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje g_object_set_data( holder, "TextFontFamilyAction", act ); // Change style of drop-down from menu to list +#if GTK_CHECK_VERSION(3,0,0) + GtkCssProvider *css_provider = gtk_css_provider_new(); + gtk_css_provider_load_from_data(css_provider, + "#TextFontFamilyAction_combobox {\n" + " -GtkComboBox-appears-as-list: true;\n" + "}\n" + "combobox window.popup scrolledwindow treeview separator {\n" + " -GtkWidget-wide-separators: true;\n" + " -GtkWidget-separator-height: 6;\n" + "}\n", + -1, NULL); + + GdkScreen *screen = gdk_screen_get_default(); + gtk_style_context_add_provider_for_screen(screen, + GTK_STYLE_PROVIDER(css_provider), + GTK_STYLE_PROVIDER_PRIORITY_USER); +#else gtk_rc_parse_string ( "style \"dropdown-as-list-style\"\n" "{\n" @@ -1574,6 +1591,7 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje " GtkWidget::separator-height = 6\n" "}\n" "widget \"*gtk-combobox-popup-window.GtkScrolledWindow.GtkTreeView\" style \"fontfamily-separator-style\""); +#endif } /* Font size */ -- cgit v1.2.3 From 62468bff6706859d2aaa9d14a23221270f5d3053 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 14:48:21 +0100 Subject: spw-utilities: Fix gtk_widget_set_margin_* API #Hackfest2016 (bzr r14828) --- src/widgets/spw-utilities.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp index 89ab76585..5500e1068 100644 --- a/src/widgets/spw-utilities.cpp +++ b/src/widgets/spw-utilities.cpp @@ -94,9 +94,9 @@ spw_label_old(GtkWidget *table, const gchar *label_text, int col, int row) gtk_widget_show (label_widget); #if GTK_CHECK_VERSION(3,0,0) +#if GTK_CHECK_VERSION(3,12,0) gtk_widget_set_margin_start(label_widget, 4); gtk_widget_set_margin_end(label_widget, 4); -#if GTK_CHECK_VERSION(3,12,0) #else gtk_widget_set_margin_left(label_widget, 4); gtk_widget_set_margin_right(label_widget, 4); -- cgit v1.2.3 From 9e005239a9a2c93f40b1ac0e1a8e711ec7a2234e Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 14:56:01 +0100 Subject: Fix canvas flicker while dragging objects. #Hackfest2016 (bzr r14829) --- src/display/sp-canvas.cpp | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index a311de7f1..3a801826b 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1798,8 +1798,14 @@ void SPCanvas::endForcedFullRedraws() gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { SPCanvas *canvas = SP_CANVAS(widget); + // Blit from the backing store, without regard for the clean region. + // This is necessary because GTK clears the widget for us, which causes + // severe flicker while drawing if we don't blit the old contents. + cairo_set_source_surface(cr, canvas->_backing_store, 0, 0); + cairo_paint(cr); + cairo_rectangle_list_t *rects = cairo_copy_clip_rectangle_list(cr); - cairo_region_t *draw_region = cairo_region_create(); + cairo_region_t *dirty_region = cairo_region_create(); for (int i = 0; i < rects->num_rectangles; i++) { cairo_rectangle_t rectangle = rects->rectangles[i]; @@ -1807,44 +1813,16 @@ gboolean SPCanvas::handle_draw(GtkWidget *widget, cairo_t *cr) { rectangle.width, rectangle.height); Geom::IntRect ir = dr.roundOutwards(); cairo_rectangle_int_t irect = { ir.left(), ir.top(), ir.width(), ir.height() }; - cairo_region_union_rectangle(draw_region, &irect); + cairo_region_union_rectangle(dirty_region, &irect); } cairo_rectangle_list_destroy(rects); - - cairo_region_t *draw_dirty = cairo_region_copy(draw_region); - cairo_region_subtract(draw_dirty, canvas->_clean_region); - cairo_region_intersect(draw_region, canvas->_clean_region); - - // Draw the background - cairo_save(cr); - cairo_translate(cr, -canvas->_x0, -canvas->_y0); - cairo_set_source(cr, canvas->_background); - cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); - cairo_paint(cr); - cairo_restore(cr); - - // Draw the clean portion - if (!cairo_region_is_empty(draw_region)) { - cairo_region_translate(draw_region, -canvas->_x0, -canvas->_y0); - cairo_save(cr); - int n_rects = cairo_region_num_rectangles(draw_region); - for (int i = 0; i < n_rects; ++i) { - cairo_rectangle_int_t crect; - cairo_region_get_rectangle(draw_region, i, &crect); - cairo_rectangle(cr, crect.x, crect.y, crect.width, crect.height); - } - cairo_clip(cr); - cairo_set_source_surface(cr, canvas->_backing_store, 0, 0); - cairo_paint(cr); - cairo_restore(cr); - } + cairo_region_subtract(dirty_region, canvas->_clean_region); // Render the dirty portion in the background - if (!cairo_region_is_empty(draw_dirty)) { + if (!cairo_region_is_empty(dirty_region)) { canvas->addIdle(); } - cairo_region_destroy(draw_region); - cairo_region_destroy(draw_dirty); + cairo_region_destroy(dirty_region); return TRUE; } -- cgit v1.2.3 From dd318b73edb6989587be9f70f2ee6dacd5bd139b Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 14:56:53 +0100 Subject: font-selector: Gtk+ 3 theming #Hackfest2016 (bzr r14830) --- src/widgets/font-selector.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index 943434868..aefcb2e81 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -159,9 +159,24 @@ static void sp_font_selector_init(SPFontSelector *fsel) /* Muck with style, see text-toolbar.cpp */ gtk_widget_set_name( GTK_WIDGET(fsel->family_treeview), "font_selector_family" ); + +#if GTK_CHECK_VERSION(3,0,0) + GtkCssProvider *css_provider = gtk_css_provider_new(); + gtk_css_provider_load_from_data(css_provider, + "#font_selector_family {\n" + " -GtkWidget-wide-separators: true;\n" + " -GtkWidget-separator-height: 6;\n" + "}\n", + -1, NULL); + + GdkScreen *screen = gdk_screen_get_default(); + gtk_style_context_add_provider_for_screen(screen, + GTK_STYLE_PROVIDER(css_provider), + GTK_STYLE_PROVIDER_PRIORITY_USER); +#else gtk_rc_parse_string ( "widget \"*font_selector_family\" style \"fontfamily-separator-style\""); - +#endif Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); Glib::RefPtr store = fontlister->get_font_list(); -- cgit v1.2.3 From af72bed26b283d07ab91b147d5b8791edef64cc5 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 15:19:07 +0100 Subject: Fix artifacts at the border when panning the canvas. #Hackfest2016 (bzr r14831) --- src/display/sp-canvas.cpp | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 3a801826b..36fea767e 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1544,20 +1544,11 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect buf.rect = paint_rect; buf.visible_rect = canvas_rect; buf.is_empty = true; - //buf.ct = gdk_cairo_create(widget->window); // create temporary surface cairo_surface_t *imgs = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, paint_rect.width(), paint_rect.height()); buf.ct = cairo_create(imgs); - // fix coordinates, clip all drawing to the tile and clear the background - //cairo_translate(buf.ct, paint_rect.left() - canvas->x0, paint_rect.top() - canvas->y0); - //cairo_rectangle(buf.ct, 0, 0, paint_rect.width(), paint_rect.height()); - //cairo_set_line_width(buf.ct, 3); - //cairo_set_source_rgba(buf.ct, 1.0, 0.0, 0.0, 0.1); - //cairo_stroke_preserve(buf.ct); - //cairo_clip(buf.ct); - cairo_save(buf.ct); cairo_translate(buf.ct, -paint_rect.left(), -paint_rect.top()); cairo_set_source(buf.ct, _background); @@ -1984,11 +1975,6 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll Geom::IntRect old_area = getViewboxIntegers(); Geom::IntRect new_area = old_area + Geom::IntPoint(dx, dy); - - _dx0 = cx; // here the 'd' stands for double, not delta! - _dy0 = cy; - _x0 = ix; - _y0 = iy; gtk_widget_get_allocation(&_widget, &allocation); @@ -1997,15 +1983,26 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height); cairo_t *cr = cairo_create(new_backing_store); - cairo_set_source_rgb(cr, 1, 1, 1); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + // Paint the background + cairo_translate(cr, -ix, -iy); + cairo_set_source(cr, _background); cairo_paint(cr); - cairo_set_source_surface(cr, _backing_store, -dx, -dy); + // Copy the old backing store contents + cairo_set_source_surface(cr, _backing_store, _x0, _y0); + cairo_rectangle(cr, _x0, _y0, allocation.width, allocation.height); + cairo_clip(cr); cairo_paint(cr); cairo_destroy(cr); cairo_surface_destroy(_backing_store); _backing_store = new_backing_store; + _dx0 = cx; // here the 'd' stands for double, not delta! + _dy0 = cy; + _x0 = ix; + _y0 = iy; + + // Adjust the clean region if (clear) { dirtyAll(); } else { -- cgit v1.2.3 From d18eee586af65f913c7f614c9c9548ebf2594f3e Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 15:38:06 +0100 Subject: Hopefully fix "invalid state when picking" warnings. #Hackfest2016 (bzr r14832) --- src/display/canvas-arena.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index ec99eca9a..366b3c7d1 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -250,7 +250,8 @@ sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event) arena->c = Geom::Point(event->crossing.x, event->crossing.y); /* fixme: Not sure abut this, but seems the right thing (Lauris) */ - arena->drawing.update(Geom::IntRect::infinite(), arena->ctx, DrawingItem::STATE_PICK, 0); + arena->drawing.update(Geom::IntRect::infinite(), arena->ctx, + DrawingItem::STATE_PICK | DrawingItem::STATE_BBOX, 0); arena->active = arena->drawing.pick(arena->c, arena->drawing.delta, arena->sticky); ret = sp_canvas_arena_send_event (arena, event); } @@ -269,7 +270,8 @@ sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event) arena->c = Geom::Point(event->motion.x, event->motion.y); /* fixme: Not sure abut this, but seems the right thing (Lauris) */ - arena->drawing.update(Geom::IntRect::infinite(), arena->ctx, DrawingItem::STATE_PICK); + arena->drawing.update(Geom::IntRect::infinite(), arena->ctx, + DrawingItem::STATE_PICK | DrawingItem::STATE_BBOX); new_arena = arena->drawing.pick(arena->c, arena->drawing.delta, arena->sticky); if (new_arena != arena->active) { GdkEventCrossing ec; -- cgit v1.2.3 From b9212ef6bdf7172f053bb8821d6579c9ab5e14cb Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 15:40:55 +0100 Subject: Remove unused variable in sp-canvas.cpp (bzr r14833) --- src/display/sp-canvas.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 36fea767e..decb14184 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1536,8 +1536,6 @@ int SPCanvas::handle_motion(GtkWidget *widget, GdkEventMotion *event) void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect const &canvas_rect, int /*sw*/) { - GtkWidget *widget = GTK_WIDGET (this); - SPCanvasBuf buf; buf.buf = NULL; buf.buf_rowstride = 0; -- cgit v1.2.3 From 4530a577992a0289d74885d5135ed44d3365a572 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 15:55:31 +0100 Subject: Fix a few more pick calls not preceded by update (bzr r14834) --- src/document.cpp | 13 +++++++++---- src/trace/trace.cpp | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/document.cpp b/src/document.cpp index ae03b1ba1..7086fc0be 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -46,6 +46,7 @@ #include "widgets/desktop-widget.h" #include "desktop.h" #include "dir-util.h" +#include "display/drawing.h" #include "display/drawing-item.h" #include "document-private.h" #include "document-undo.h" @@ -1316,6 +1317,7 @@ SPItem *SPDocument::getItemFromListAtPointBottom(unsigned int dkey, SPGroup *gro if ( SP_IS_ITEM(o) ) { SPItem *item = SP_ITEM(o); Inkscape::DrawingItem *arenaitem = item->get_arenaitem(dkey); + arenaitem->drawing().update(); if (arenaitem && arenaitem->pick(p, delta, 1) != NULL && (take_insensitive || item->isVisibleAndUnlocked(dkey))) { if (find(list.begin(),list.end(),item)!=list.end() ) { @@ -1380,10 +1382,12 @@ static SPItem *find_item_at_point(std::deque *nodes, unsigned int dkey, continue; } Inkscape::DrawingItem *arenaitem = child->get_arenaitem(dkey); - - if (arenaitem && arenaitem->pick(p, delta, 1) != NULL) { - seen = child; - break; + if (arenaitem) { + arenaitem->drawing().update(); + if (arenaitem->pick(p, delta, 1) != NULL) { + seen = child; + break; + } } } @@ -1413,6 +1417,7 @@ static SPItem *find_group_at_point(unsigned int dkey, SPGroup *group, Geom::Poin if (SP_IS_GROUP(o) && SP_GROUP(o)->effectiveLayerMode(dkey) != SPGroup::LAYER ) { SPItem *child = SP_ITEM(o); Inkscape::DrawingItem *arenaitem = child->get_arenaitem(dkey); + arenaitem->drawing().update(); // seen remembers the last (topmost) of groups pickable at this point if (arenaitem && arenaitem->pick(p, delta, 1) != NULL) { diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index 18f03aa1b..379682668 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -274,6 +274,7 @@ Glib::RefPtr Tracer::sioxProcessImage(SPImage *img, Glib::RefPtrdrawing().update(); if (arenaItem->pick(point, 1.0f, 1)) { weHaveAHit = true; -- cgit v1.2.3 From f5a95a0c8e4080b59d43cdcdcc1ea6b717f3d3f3 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 13 Apr 2016 17:02:57 +0200 Subject: Remove no longer needed warning about feTile rendering. (bzr r14835) --- src/display/nr-filter-tile.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp index 7172f88ee..c151c8537 100644 --- a/src/display/nr-filter-tile.cpp +++ b/src/display/nr-filter-tile.cpp @@ -32,18 +32,6 @@ FilterTile::~FilterTile() void FilterTile::render_cairo(FilterSlot &slot) { - // FIX ME! - static bool tile_warning = false; - if (!tile_warning) { - g_warning("Renderer for feTile has non-optimal implementation, expect slowness and bugs."); - tile_warning = true; - } - - // Fixing isn't so easy as the Inkscape renderer breaks the canvas into "rendering" tiles for - // faster rendering. (The "rendering" tiles are not the same as the tiles in this primitive.) - // Only if the the feTile tile source falls inside the current "rendering" tile will the tile - // image be available. - // This input source contains only the "rendering" tile. cairo_surface_t *in = slot.getcairo(_input); -- cgit v1.2.3 From a18ef5710791412d906f09ed04f89d98d4952b9e Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Wed, 13 Apr 2016 17:27:54 +0200 Subject: using cpp limits values (bzr r14836) --- src/libnrtype/Layout-TNG-Compute.cpp | 5 +++-- src/libnrtype/Layout-TNG-Scanline-Makers.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp index e862f0657..337d2a656 100644 --- a/src/libnrtype/Layout-TNG-Compute.cpp +++ b/src/libnrtype/Layout-TNG-Compute.cpp @@ -14,6 +14,7 @@ #include "svg/svg-length.h" #include "sp-object.h" #include "Layout-TNG-Scanline-Maker.h" +#include namespace Inkscape { namespace Text { @@ -1569,8 +1570,8 @@ bool Layout::Calculator::_buildChunksInScanRun(ParagraphInfo const ¶, new_span_height.computeEffective( new_span.start.iter_span->line_height_multiplier ); /* floating point 80-bit/64-bit rounding problems require epsilon. See discussion http://inkscape.gristle.org/2005-03-16.txt around 22:00 */ - if ( new_span_height.ascent > line_height->ascent + FLT_EPSILON || - new_span_height.descent > line_height->descent + FLT_EPSILON) { + if ( new_span_height.ascent > line_height->ascent + std::numeric_limits::epsilon() || + new_span_height.descent > line_height->descent + std::numeric_limits::epsilon() ) { // Take larger of each of the two ascents and two descents per CSS line_height->max(new_span_height); if (!_scanline_maker->canExtendCurrentScanline(*line_height)) { diff --git a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp index dcc973a24..0d6112d19 100644 --- a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp +++ b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp @@ -11,6 +11,7 @@ #include "Layout-TNG-Scanline-Maker.h" #include "livarot/Shape.h" #include "livarot/float-line.h" +#include namespace Inkscape { namespace Text { @@ -43,7 +44,7 @@ std::vector Layout::InfiniteScanlineMaker::makeS { std::vector runs(1); runs[0].x_start = _x; - runs[0].x_end = FLT_MAX; // we could use DBL_MAX, but this just seems safer + runs[0].x_end = std::numeric_limits::max(); // we could use DBL_MAX, but this just seems safer runs[0].y = _y; _current_line_height = line_height; return runs; -- cgit v1.2.3 From 90c039450593f045361112648e4ec2dfcff91f0e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 16:44:26 +0100 Subject: Rm shrink_wrap_button - Not needed & uses deprecated GtkStyle features #Hackfest2016 (bzr r14837) --- src/ui/widget/layer-selector.cpp | 3 -- src/widgets/CMakeLists.txt | 2 -- src/widgets/Makefile_insert | 2 -- src/widgets/shrink-wrap-button.cpp | 65 -------------------------------------- src/widgets/shrink-wrap-button.h | 35 -------------------- 5 files changed, 107 deletions(-) delete mode 100644 src/widgets/shrink-wrap-button.cpp delete mode 100644 src/widgets/shrink-wrap-button.h diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index dc89d233f..2a1fa352b 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -32,7 +32,6 @@ #include "util/reverse-list.h" #include "verbs.h" #include "widgets/icon.h" -#include "widgets/shrink-wrap-button.h" #include "xml/node-event-vector.h" #include "widgets/gradient-vector.h" @@ -114,7 +113,6 @@ LayerSelector::LayerSelector(SPDesktop *desktop) ); _visibility_toggle.set_relief(Gtk::RELIEF_NONE); - shrink_wrap_button(_visibility_toggle); _visibility_toggle.set_tooltip_text(_("Toggle current layer visibility")); pack_start(_visibility_toggle, Gtk::PACK_EXPAND_PADDING); @@ -135,7 +133,6 @@ LayerSelector::LayerSelector(SPDesktop *desktop) ); _lock_toggle.set_relief(Gtk::RELIEF_NONE); - shrink_wrap_button(_lock_toggle); _lock_toggle.set_tooltip_text(_("Lock or unlock current layer")); pack_start(_lock_toggle, Gtk::PACK_EXPAND_PADDING); diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 8cb6e947f..225afe317 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -38,7 +38,6 @@ set(widgets_SRC paint-selector.cpp ruler.cpp select-toolbar.cpp - shrink-wrap-button.cpp sp-attribute-widget.cpp sp-color-selector.cpp sp-widget.cpp @@ -94,7 +93,6 @@ set(widgets_SRC paint-selector.h ruler.h select-toolbar.h - shrink-wrap-button.h sp-attribute-widget.h sp-color-selector.h sp-widget.h diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 2ee0f7002..c9f04de14 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -72,8 +72,6 @@ ink_common_sources += \ widgets/ruler.h \ widgets/select-toolbar.cpp \ widgets/select-toolbar.h \ - widgets/shrink-wrap-button.cpp \ - widgets/shrink-wrap-button.h \ widgets/spray-toolbar.cpp \ widgets/spray-toolbar.h \ widgets/spiral-toolbar.cpp \ diff --git a/src/widgets/shrink-wrap-button.cpp b/src/widgets/shrink-wrap-button.cpp deleted file mode 100644 index 941a0466c..000000000 --- a/src/widgets/shrink-wrap-button.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Inkscape::Widgets::shrink_wrap_button - shrink a button to minimum size - * - * Authors: - * MenTaLguY - * - * Copyright (C) 2004 MenTaLguY - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#if HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include - -#include "shrink-wrap-button.h" - -namespace Inkscape { -namespace Widgets { - -void shrink_wrap_button(Gtk::Button &button) { - button.set_border_width(0); - button.set_can_focus(false); - button.set_can_default(false); - - Gtk::Widget* child = button.get_child(); - Gtk::Requisition req_min; - - if (child) { -#if WITH_GTKMM_3_0 - Gtk::Requisition req_nat; - child->get_preferred_size(req_min, req_nat); -#else - req_min = child->size_request(); -#endif - } else { - req_min.width = 0; - req_min.height = 0; - } - - // TODO: Use Gtk::StyleContext instead - GtkStyle* style = gtk_widget_get_style(GTK_WIDGET(button.gobj())); - - req_min.width += 2 + 2 * std::max(2, style->xthickness); - req_min.height += 2 + 2 * std::max(2, style->ythickness); - - button.set_size_request(req_min.width, req_min.height); -} - -} -} - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : diff --git a/src/widgets/shrink-wrap-button.h b/src/widgets/shrink-wrap-button.h deleted file mode 100644 index ca9153aea..000000000 --- a/src/widgets/shrink-wrap-button.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Inkscape::Widgets::shrink_wrap_button - shrink a button to minimum size - * - * Authors: - * MenTaLguY - * - * Copyright (C) 2004 MenTaLguY - * - * Released under GNU GPL, read the file 'COPYING' for more information - */ - -#ifndef SEEN_INKSCAPE_WIDGETS_SHRINK_WRAP_BUTTON_H -#define SEEN_INKSCAPE_WIDGETS_SHRINK_WRAP_BUTTON_H - -namespace Gtk { class Button; } - -namespace Inkscape { -namespace Widgets { - -void shrink_wrap_button(Gtk::Button &button); - -} -} - -#endif -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 : -- cgit v1.2.3 From d75d7879cea0a018fab78e006197ae0bcba09bef Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Wed, 13 Apr 2016 16:51:44 +0100 Subject: Move page border below the drawing. (bzr r14838) --- src/desktop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 5cd9ef32f..d482d0d7f 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1745,7 +1745,7 @@ static void _namedview_modified (SPObject *obj, guint flags, SPDesktop *desktop) } // place in the z-order stack if (nv->borderlayer == SP_BORDER_LAYER_BOTTOM) { - sp_canvas_item_move_to_z (desktop->page_border, 2); + sp_canvas_item_move_to_z (desktop->page_border, 1); } else { int order = sp_canvas_item_order (desktop->page_border); int morder = sp_canvas_item_order (desktop->drawing); -- cgit v1.2.3 From 24397ca99c5807898ee423669bb2a089f51bc787 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Wed, 13 Apr 2016 16:59:14 +0100 Subject: icon: Fix deprecated gtk_widget_get_requisition() #Hackfest2016 (bzr r14839) --- src/widgets/icon.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index f998cd66d..010b3a6fb 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -280,7 +280,13 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr) GtkAllocation allocation; GtkRequisition requisition; gtk_widget_get_allocation(widget, &allocation); + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_get_preferred_size(widget, &requisition, NULL); +#else gtk_widget_get_requisition(widget, &requisition); +#endif + int x = floor(allocation.x + ((allocation.width - requisition.width) * 0.5)); int y = floor(allocation.y + ((allocation.height - requisition.height) * 0.5)); int width = gdk_pixbuf_get_width(image); -- cgit v1.2.3 From 956b51fdbf47877371055dde874967ada810f519 Mon Sep 17 00:00:00 2001 From: Raphael Rosch Date: Wed, 13 Apr 2016 12:08:17 -0400 Subject: icons.svg can be reduced in size (re-use gradients) Fixed bugs: - https://launchpad.net/bugs/1113302 (bzr r14840) --- share/icons/icons.svg | 532 ++++++++++++++++---------------------------------- 1 file changed, 169 insertions(+), 363 deletions(-) diff --git a/share/icons/icons.svg b/share/icons/icons.svg index ea89282df..f3df06b6f 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -4,10 +4,6 @@ - - - - @@ -16,54 +12,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -102,13 +54,13 @@ - - + + - - + + @@ -116,11 +68,6 @@ - - - - - @@ -130,12 +77,12 @@ - - + + - - + + @@ -143,14 +90,14 @@ - + - + - + @@ -158,121 +105,101 @@ - - - - - + - - + + - - - - - - + + - - - - - - - - - - + + - - + + - - - - - - + + - + - + - - + + - + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - - - + + + - - - + + + - + - + - - - - + + + + @@ -280,20 +207,20 @@ - - - - + + + + - + - - + + - + @@ -329,7 +256,7 @@ - + @@ -338,7 +265,7 @@ - + @@ -366,17 +293,17 @@ - + - - + + - - + + @@ -394,9 +321,9 @@ - + - + @@ -418,17 +345,17 @@ - - + + - - - + + + - + @@ -446,7 +373,7 @@ - + @@ -454,8 +381,8 @@ - - + + @@ -465,11 +392,7 @@ - - - - - + @@ -478,8 +401,8 @@ - - + + @@ -492,7 +415,7 @@ - + @@ -513,8 +436,8 @@ - - + + @@ -531,48 +454,27 @@ - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + + @@ -657,161 +559,89 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + - - - - - - - - - - - - - + + + + + + - - - - - + - - - - - - - - - - - + + + @@ -819,56 +649,32 @@ - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - + + + - - - - - - - - + + + + - + - + - - - - - - - - + + + + + + + + - + -- cgit v1.2.3 From e3d2f6b9ddf84b68c690dc750a1b3e12f22af4a4 Mon Sep 17 00:00:00 2001 From: Raphael Rosch Date: Wed, 13 Apr 2016 20:35:29 -0400 Subject: icons.svg can be reduced in size (fix missing radial gradients) Fixed bugs: - https://launchpad.net/bugs/1113302 (bzr r14841) --- share/icons/icons.svg | 1 + 1 file changed, 1 insertion(+) diff --git a/share/icons/icons.svg b/share/icons/icons.svg index f3df06b6f..ac9ddd651 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -164,6 +164,7 @@ + -- cgit v1.2.3 From ff7d0a611e38ba0415bef8c22a4ca9c81b3a584a Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 14 Apr 2016 01:50:01 +0100 Subject: Upgrade barcodes, more pylint, new Ean2 code and extended Ean13 with automatic Ean2 and Ean5 additions (bzr r14842) --- share/extensions/Barcode/Base.py | 140 +++++++++++++++++++++-------------- share/extensions/Barcode/BaseEan.py | 107 ++++++++++++++------------ share/extensions/Barcode/Code128.py | 130 ++++++++++++++++---------------- share/extensions/Barcode/Code25i.py | 57 ++++++-------- share/extensions/Barcode/Code39.py | 116 ++++++++++++++--------------- share/extensions/Barcode/Code93.py | 120 ++++++++++++++---------------- share/extensions/Barcode/Ean13.py | 13 ++-- share/extensions/Barcode/Ean2.py | 38 ++++++++++ share/extensions/Barcode/Ean5.py | 37 +++++---- share/extensions/Barcode/Ean8.py | 14 ++-- share/extensions/Barcode/Makefile.am | 1 + share/extensions/Barcode/Rm4scc.py | 7 +- share/extensions/Barcode/Upca.py | 16 ++-- share/extensions/Barcode/Upce.py | 66 ++++++++--------- share/extensions/Barcode/__init__.py | 16 ++-- share/extensions/render_barcode.inx | 5 +- share/extensions/render_barcode.py | 57 +++++++++----- 17 files changed, 505 insertions(+), 435 deletions(-) create mode 100644 share/extensions/Barcode/Ean2.py diff --git a/share/extensions/Barcode/Base.py b/share/extensions/Barcode/Base.py index 1aa1f8415..bfa0a774f 100644 --- a/share/extensions/Barcode/Base.py +++ b/share/extensions/Barcode/Base.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Base module for rendering barcodes for Inkscape. @@ -23,114 +23,140 @@ import itertools import sys from lxml import etree +(TEXT_POS_BOTTOM, TEXT_POS_TOP) = range(2) (WHITE_BAR, BLACK_BAR, TALL_BAR) = range(3) TEXT_TEMPLATE = 'font-size:%dpx;text-align:center;text-anchor:middle;' +SVG_URI = u'http://www.w3.org/2000/svg' +# pylint: disable=abstract-class-not-used class Barcode(object): """Provide a base class for all barcode renderers""" + default_height = 30 + font_size = 9 name = None - def error(self, bar, msg): + def error(self, text, msg): """Cause an error to be reported""" sys.stderr.write( - "Error encoding '%s' as %s barcode: %s\n" % (bar, self.name, msg)) + "Error encoding '%s' as %s barcode: %s\n" % (text, self.name, msg)) return "ERROR" - def __init__(self, param={}): + def encode(self, text): + """ + Replace this with the encoding function, it should return + a string of ones and zeros + """ + raise NotImplementedError("You need to write an encode() function.") + + def __init__(self, param): + param = param or {} self.document = param.get('document', None) - self.x = int(param.get('x', 0)) - self.y = int(param.get('y', 0)) - self.scale = param.get('scale', 1) - self.height = param.get('height', 30) - self.label = param.get('text', None) - self.string = self.encode( self.label ) - - if not self.string: - return + self.known_ids = [] + self._extra = [] - self.width = len(self.string) - self.data = self.graphicalArray(self.string) + self.pos_x = int(param.get('x', 0)) + self.pos_y = int(param.get('y', 0)) + self.text = param.get('text', None) + self.scale = param.get('scale', 1) + self.height = param.get('height', self.default_height) + self.pos_text = param.get('text_pos', TEXT_POS_BOTTOM) - def get_id(self): - """Get the next useful id""" - if not self.document: - return "barcode" - doc_ids = {} - docIdNodes = self.document.xpath('//@id') - for m in docIdNodes: - doc_ids[m] = 1 + if self.document: + self.known_ids = list(self.document.xpath('//@id')) - name = 'barcode' + if not self.text: + raise ValueError("No string specified for barcode.") + def get_id(self, name='element'): + """Get the next useful id (and claim it)""" index = 0 - while (doc_ids.has_key(name)): + while name in self.known_ids: index += 1 name = 'barcode%d' % index + self.known_ids.append(name) return name + def add_extra_barcode(self, barcode, **kw): + """Add an extra barcode along side this one, used for ean13 extras""" + from . import getBarcode + kw['height'] = self.height + kw['document'] = self.document + kw['scale'] = None + self._extra.append(getBarcode(barcode, **kw).generate()) + def generate(self): """Generate the actual svg from the coding""" - svg_uri = u'http://www.w3.org/2000/svg' - if self.string == 'ERROR': + string = self.encode(self.text) + + if string == 'ERROR': return - if not self.string or not self.data: - raise ValueError("No string specified for barcode.") - data = self.data - name = self.get_id() + name = self.get_id('barcode') # use an svg group element to contain the barcode - barcode = etree.Element('{%s}%s' % (svg_uri,'g')) + barcode = etree.Element('{%s}g' % SVG_URI) barcode.set('id', name) barcode.set('style', 'fill: black;') - barcode.set('transform', 'translate(%d,%d) scale(%f)' % (self.x, self.y, self.scale)) - + if self.scale: + barcode.set('transform', 'translate(%d,%d) scale(%f)' % ( + self.pos_x, self.pos_y, self.scale)) + else: + barcode.set('transform', 'translate(%d,%d)' % ( + self.pos_x, self.pos_y)) + + bar_id = 1 bar_offset = 0 - bar_id = 1 + tops = set() - for datum in data: + for datum in self.graphical_array(string): # Datum 0 tells us what style of bar is to come next - style = self.getStyle(int(datum[0])) + style = self.get_style(int(datum[0])) # Datum 1 tells us what width in units, # style tells us how wide a unit is width = int(datum[1]) * int(style['width']) if style['write']: - rect = etree.SubElement(barcode,'{%s}%s' % (svg_uri,'rect')) - rect.set('x', str(bar_offset)) - rect.set('y', str(style['top'])) - rect.set('width', str(width)) + tops.add(style['top']) + rect = etree.SubElement(barcode, '{%s}rect' % SVG_URI) + rect.set('x', str(bar_offset)) + rect.set('y', str(style['top'])) + if self.pos_text == TEXT_POS_TOP: + rect.set('y', str(style['top'] + self.font_size)) + rect.set('id', "%s_bar%d" % (name, bar_id)) + rect.set('width', str(width)) rect.set('height', str(style['height'])) - rect.set('id', "%s_bar%d" % (name, bar_id)) bar_offset += width bar_id += 1 + for extra in self._extra: + if extra is not None: + barcode.append(extra) + bar_width = bar_offset # Add text at the bottom of the barcode - text = etree.SubElement(barcode,'{%s}%s' % (svg_uri,'text')) - text.set( 'x', str(int(bar_width / 2))) - text.set( 'y', str(self.height + self.fontSize() )) - text.set( 'style', TEXT_TEMPLATE % self.fontSize() ) - text.set( '{http://www.w3.org/XML/1998/namespace}space', 'preserve' ) - text.set( 'id', '%s_text' % name ) - text.text = str(self.label) + text = etree.SubElement(barcode, '{%s}text' % SVG_URI) + text.set('x', str(int(bar_width / 2))) + text.set('y', str(min(tops) + self.font_size - 1)) + if self.pos_text == TEXT_POS_BOTTOM: + text.set('y', str(self.height + max(tops) + self.font_size)) + text.set('style', TEXT_TEMPLATE % self.font_size) + text.set('{http://www.w3.org/XML/1998/namespace}space', 'preserve') + text.set('id', '%s_text' % name) + text.text = str(self.text) return barcode - def graphicalArray(self, code): + def graphical_array(self, code): """Converts black and white markets into a space array""" - return [(x,len(list(y))) for x, y in itertools.groupby(code)] + return [(x, len(list(y))) for x, y in itertools.groupby(code)] - def getStyle(self, index): + def get_style(self, index): """Returns the styles that should be applied to each bar""" - result = { 'width' : 1, 'top' : 0, 'write' : True } + result = {'width' : 1, 'top' : 0, 'write' : True} if index == BLACK_BAR: result['height'] = int(self.height) if index == TALL_BAR: - result['height'] = int(self.height) + int(self.fontSize() / 2) + result['height'] = int(self.height) + int(self.font_size / 2) if index == WHITE_BAR: result['write'] = False return result - def fontSize(self): - """Return the ideal font size, defaults to 9px""" - return 9 diff --git a/share/extensions/Barcode/BaseEan.py b/share/extensions/Barcode/BaseEan.py index 4ceaeed4a..2c3ab0c09 100644 --- a/share/extensions/Barcode/BaseEan.py +++ b/share/extensions/Barcode/BaseEan.py @@ -13,40 +13,39 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Some basic common code shared between EAN and UCP generators. """ -from Base import Barcode -import sys +from .Base import Barcode, TEXT_POS_TOP MAPPING = [ # Left side of barcode Family '0' - [ "0001101", "0011001", "0010011", "0111101", "0100011", - "0110001", "0101111", "0111011", "0110111", "0001011" ], + ["0001101", "0011001", "0010011", "0111101", "0100011", + "0110001", "0101111", "0111011", "0110111", "0001011"], # Left side of barcode Family '1' and flipped to right side. - [ "0100111", "0110011", "0011011", "0100001", "0011101", - "0111001", "0000101", "0010001", "0001001", "0010111" ], + ["0100111", "0110011", "0011011", "0100001", "0011101", + "0111001", "0000101", "0010001", "0001001", "0010111"], ] # This chooses which of the two encodings above to use. -FAMILIES = [ '000000', '001011', '001101', '001110', '010011', - '011001', '011100', '010101', '010110', '011010' ] - -GUARD_BAR = '202' -CENTER_BAR = '02020' +FAMILIES = ('000000', '001011', '001101', '001110', '010011', + '011001', '011100', '010101', '010110', '011010') class EanBarcode(Barcode): """Simple base class for all EAN type barcodes""" - length = None lengths = None - checks = [] + length = None + checks = [] + extras = {} + magic = 10 + guard_bar = '202' + center_bar = '02020' def intarray(self, number): """Convert a string of digits into an array of ints""" - return [ int(i) for i in number ] - + return [int(i) for i in number] def encode_interleaved(self, family, number, fams=FAMILIES): """Encode any side of the barcode, interleaved""" @@ -54,27 +53,24 @@ class EanBarcode(Barcode): encset = self.intarray(fams[family]) for i in range(len(number)): thismap = MAPPING[encset[i]] - result.append( thismap[number[i]] ) + result.append(thismap[number[i]]) return result - def encode_right(self, number): """Encode the right side of the barcode, non-interleaved""" result = [] - for n in number: + for num in number: # The right side is always the reverse of the left's family '1' - result.append( MAPPING[1][n][::-1] ) + result.append(MAPPING[1][num][::-1]) return result - def encode_left(self, number): """Encode the left side of the barcode, non-interleaved""" result = [] - for n in number: - result.append( MAPPING[0][n] ) + for num in number: + result.append(MAPPING[0][num]) return result - def space(self, *spacing): """Space out an array of numbers""" result = '' @@ -86,60 +82,75 @@ class EanBarcode(Barcode): result += ' ' * space return result - - def getLengths(self): + def get_lengths(self): """Return a list of acceptable lengths""" if self.length: - return [ self.length ] + return [self.length] return self.lengths[:] - def encode(self, code): """Encode any EAN barcode""" + code = code.replace(' ', '').strip() + if not code.isdigit(): return self.error(code, 'Not a Number, must be digits 0-9 only') - lengths = self.getLengths() + self.checks + lengths = self.get_lengths() + self.checks + # Allow extra barcodes after the first one if len(code) not in lengths: - return self.error(code, 'Wrong size, must be %s digits' % - (', '.join(self.space(lengths)))) + for extra in self.extras: + sep = len(code) - extra + if sep in lengths: + # Generate a barcode along side this one. + self.add_extra_barcode(self.extras[extra], text=code[sep:], + x=self.pos_x + 400 * self.scale, text_pos=TEXT_POS_TOP) + code = code[:sep] + + if len(code) not in lengths: + return self.error(code, 'Wrong size %d, must be %s digits' % + (len(code), ', '.join([str(length) for length in lengths]))) if self.checks: if len(code) not in self.checks: - code = self.appendChecksum(code) - elif not self.verifyChecksum(code): + code = self.append_checksum(code) + elif not self.verify_checksum(code): return self.error(code, 'Checksum failed, omit for new sum') return self._encode(self.intarray(code)) - - def _encode(self, n): + def _encode(self, num): + """ + Write your EAN encoding function, it's passed in an array of int and + it should return a string on 1 and 0 for black and white parts + """ raise NotImplementedError("_encode should be provided by parent EAN") - def enclose(self, left, right=[], guard=GUARD_BAR, center=CENTER_BAR): + def enclose(self, left, right=()): """Standard Enclosure""" - parts = [ guard ] + left + [ center ] + right + [ guard ] - return ''.join( parts ) + parts = [self.guard_bar] + left + parts.append(self.center_bar) + parts += list(right) + [self.guard_bar] + return ''.join(parts) - def getChecksum(self, number, magic=10): + def get_checksum(self, number): """Generate a UPCA/EAN13/EAN8 Checksum""" - weight = [3,1] * len(number) + weight = [3, 1] * len(number) result = 0 # We need to work from left to right so reverse number = number[::-1] # checksum based on first digits. for i in range(len(number)): - result += int(number[i]) * weight[i] + result += int(number[i]) * weight[i] # Modulous result to a single digit checksum - checksum = magic - (result % magic) - if checksum < 0 or checksum >= magic: - return '0' + checksum = self.magic - (result % self.magic) + if checksum < 0 or checksum >= self.magic: + return '0' return str(checksum) - def appendChecksum(self, number): + def append_checksum(self, number): """Apply the checksum to a short number""" - return number + self.getChecksum(number) + return number + self.get_checksum(number) - def verifyChecksum(self, number): + def verify_checksum(self, number): """Verify any checksum""" - return self.getChecksum(number[:-1]) == number[-1] + return self.get_checksum(number[:-1]) == number[-1] diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py index 7ff92088f..b90e3bcf6 100644 --- a/share/extensions/Barcode/Code128.py +++ b/share/extensions/Barcode/Code128.py @@ -17,42 +17,42 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ -Python barcode renderer for Code128/EAN128 barcodes. Designed for use with Inkscape. +Renderer for Code128/EAN128 codes. Designed for use with Inkscape. """ -from Base import Barcode -import math +from .Base import Barcode import re -codeMap = [ - '11011001100','11001101100','11001100110','10010011000','10010001100', - '10001001100','10011001000','10011000100','10001100100','11001001000', - '11001000100','11000100100','10110011100','10011011100','10011001110', - '10111001100','10011101100','10011100110','11001110010','11001011100', - '11001001110','11011100100','11001110100','11101101110','11101001100', - '11100101100','11100100110','11101100100','11100110100','11100110010', - '11011011000','11011000110','11000110110','10100011000','10001011000', - '10001000110','10110001000','10001101000','10001100010','11010001000', - '11000101000','11000100010','10110111000','10110001110','10001101110', - '10111011000','10111000110','10001110110','11101110110','11010001110', - '11000101110','11011101000','11011100010','11011101110','11101011000', - '11101000110','11100010110','11101101000','11101100010','11100011010', - '11101111010','11001000010','11110001010','10100110000','10100001100', - '10010110000','10010000110','10000101100','10000100110','10110010000', - '10110000100','10011010000','10011000010','10000110100','10000110010', - '11000010010','11001010000','11110111010','11000010100','10001111010', - '10100111100','10010111100','10010011110','10111100100','10011110100', - '10011110010','11110100100','11110010100','11110010010','11011011110', - '11011110110','11110110110','10101111000','10100011110','10001011110', - '10111101000','10111100010','11110101000','11110100010','10111011110', - '10111101110','11101011110','11110101110','11010000100','11010010000', - '11010011100','11000111010','11' ] - -def mapExtra(sd, chars): - result = list(sd) +CODE_MAP = [ + '11011001100', '11001101100', '11001100110', '10010011000', '10010001100', + '10001001100', '10011001000', '10011000100', '10001100100', '11001001000', + '11001000100', '11000100100', '10110011100', '10011011100', '10011001110', + '10111001100', '10011101100', '10011100110', '11001110010', '11001011100', + '11001001110', '11011100100', '11001110100', '11101101110', '11101001100', + '11100101100', '11100100110', '11101100100', '11100110100', '11100110010', + '11011011000', '11011000110', '11000110110', '10100011000', '10001011000', + '10001000110', '10110001000', '10001101000', '10001100010', '11010001000', + '11000101000', '11000100010', '10110111000', '10110001110', '10001101110', + '10111011000', '10111000110', '10001110110', '11101110110', '11010001110', + '11000101110', '11011101000', '11011100010', '11011101110', '11101011000', + '11101000110', '11100010110', '11101101000', '11101100010', '11100011010', + '11101111010', '11001000010', '11110001010', '10100110000', '10100001100', + '10010110000', '10010000110', '10000101100', '10000100110', '10110010000', + '10110000100', '10011010000', '10011000010', '10000110100', '10000110010', + '11000010010', '11001010000', '11110111010', '11000010100', '10001111010', + '10100111100', '10010111100', '10010011110', '10111100100', '10011110100', + '10011110010', '11110100100', '11110010100', '11110010010', '11011011110', + '11011110110', '11110110110', '10101111000', '10100011110', '10001011110', + '10111101000', '10111100010', '11110101000', '11110100010', '10111011110', + '10111101110', '11101011110', '11110101110', '11010000100', '11010010000', + '11010011100', '11000111010', '11'] + +def map_extra(data, chars): + """Maps the data into the chars""" + result = list(data) for char in chars: result.append(chr(char)) result.append('FNC3') @@ -60,18 +60,18 @@ def mapExtra(sd, chars): result.append('SHIFT') return result -# The mapExtra method is used to slim down the amount +# The map_extra method is used to slim down the amount # of pre code and instead we generate the lists -charAB = list(' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_') -charA = mapExtra(charAB, range(0, 31)) # Offset 64 -charB = mapExtra(charAB, range(96, 125)) # Offset -32 +CHAR_AB = list(" !\"#$%&\'()*+,-./0123456789:;<=>?@" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_") +CHAR_A = map_extra(CHAR_AB, range(0, 31)) # Offset 64 +CHAR_B = map_extra(CHAR_AB, range(96, 125)) # Offset -32 class Code128(Barcode): """Main barcode object, generates the encoding bits here""" def encode(self, text): - result = '' blocks = [] - block = '' + block = '' # Split up into sections of numbers, or charicters # This makes sure that all the charicters are encoded @@ -81,42 +81,42 @@ class Code128(Barcode): block = block + datum else: if block: - blocks.append(self.bestBlock(block)) + blocks.append(self.best_block(block)) block = '' - blocks.append( [ 'C', datum ] ) + blocks.append(['C', datum]) if block: - blocks.append(self.bestBlock(block)) - block = ''; + blocks.append(self.best_block(block)) + block = '' - self.inclabel = text - return self.encodeBlocks(blocks) + return self.encode_blocks(blocks) - def bestBlock(self, block): - # If this has lower case then select B over A + def best_block(self, block): + """If this has lower case then select B over A""" if block.upper() == block: - return [ 'A', block ] - return [ 'B', block ] + return ['A', block] + return ['B', block] - def encodeBlocks(self, blocks): - total = 0 - pos = 0 - encode = ''; + def encode_blocks(self, blocks): + """Encode the given blocks into A, B or C codes""" + encode = '' + total = 0 + pos = 0 for block in blocks: - set = block[0] + b_set = block[0] datum = block[1] # POS : 0, 1 # A : 101, 103 # B : 100, 104 # C : 99, 105 - num = 0; - if set == 'A': + num = 0 + if b_set == 'A': num = 103 - elif set == 'B': + elif b_set == 'B': num = 104 - elif set == 'C': + elif b_set == 'C': num = 105 i = pos @@ -126,28 +126,28 @@ class Code128(Barcode): i = 1 total = total + num * i - encode = encode + codeMap[num] + encode = encode + CODE_MAP[num] pos = pos + 1 - if set == 'A' or set == 'B': - chars = charB - if set == 'A': - chars = charA + if b_set == 'A' or b_set == 'B': + chars = CHAR_B + if b_set == 'A': + chars = CHAR_A for char in datum: total = total + (chars.index(char) * pos) - encode = encode + codeMap[chars.index(char)] + encode = encode + CODE_MAP[chars.index(char)] pos = pos + 1 else: for char in (datum[i:i+2] for i in range(0, len(datum), 2)): total = total + (int(char) * pos) - encode = encode + codeMap[int(char)] + encode = encode + CODE_MAP[int(char)] pos = pos + 1 checksum = total % 103 - encode = encode + codeMap[checksum] - encode = encode + codeMap[106] - encode = encode + codeMap[107] + encode = encode + CODE_MAP[checksum] + encode = encode + CODE_MAP[106] + encode = encode + CODE_MAP[107] return encode diff --git a/share/extensions/Barcode/Code25i.py b/share/extensions/Barcode/Code25i.py index 9812d8598..2c751559c 100644 --- a/share/extensions/Barcode/Code25i.py +++ b/share/extensions/Barcode/Code25i.py @@ -13,53 +13,48 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Generate barcodes for Code25-interleaved 2 of 5, for Inkscape. """ -from Base import Barcode -import sys +from .Base import Barcode # 1 means thick, 0 means thin -encoding = { - '0' : '00110', - '1' : '10001', - '2' : '01001', - '3' : '11000', - '4' : '00101', - '5' : '10100', - '6' : '01100', - '7' : '00011', - '8' : '10010', - '9' : '01010', +ENCODE = { + '0': '00110', + '1': '10001', + '2': '01001', + '3': '11000', + '4': '00101', + '5': '10100', + '6': '01100', + '7': '00011', + '8': '10010', + '9': '01010', } -# Start and stop code are already encoded into white (0) and black(1) bars -start_code = '1010' -stop_code = '1101' class Code25i(Barcode): - # Convert a text into string binary of black and white markers + """Convert a text into string binary of black and white markers""" + # Start and stop code are already encoded into white (0) and black(1) bars def encode(self, number): - self.label = number - if not number.isdigit(): - sys.stderr.write("CODE25 can only encode numbers.\n") - return + return self.error(number, "CODE25 can only encode numbers.") - # Number of figures to encode must be even, a 0 is added to the left in case it's odd. - if len(number) % 2 > 0 : + # Number of figures to encode must be even, + # a 0 is added to the left in case it's odd. + if len(number) % 2 > 0: number = '0' + number # Number is encoded by pairs of 2 figures - size = len(number) / 2; - encoded = start_code; + size = len(number) / 2 + encoded = '1010' for i in range(size): # First in the pair is encoded in black (1), second in white (0) - black = encoding[number[i*2]] - white = encoding[number[i*2+1]] + black = ENCODE[number[i*2]] + white = ENCODE[number[i*2+1]] for j in range(5): if black[j] == '1': encoded += '11' @@ -69,9 +64,5 @@ class Code25i(Barcode): encoded += '00' else: encoded += '0' - - encoded += stop_code - - self.inclabel = number - return encoded; + return encoded + '1101' diff --git a/share/extensions/Barcode/Code39.py b/share/extensions/Barcode/Code39.py index 3cd8467a8..0d4d445b1 100644 --- a/share/extensions/Barcode/Code39.py +++ b/share/extensions/Barcode/Code39.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for Code39 barcodes. Designed for use with Inkscape. @@ -21,73 +21,70 @@ Python barcode renderer for Code39 barcodes. Designed for use with Inkscape. from Base import Barcode -encoding = { - '0' : '000110100', - '1' : '100100001', - '2' : '001100001', - '3' : '101100000', - '4' : '000110001', - '5' : '100110000', - '6' : '001110000', - '7' : '000100101', - '8' : '100100100', - '9' : '001100100', - 'A' : '100001001', - 'B' : '001001001', - 'C' : '101001000', - 'D' : '000011001', - 'E' : '100011000', - 'F' : '001011000', - 'G' : '000001101', - 'H' : '100001100', - 'I' : '001001100', - 'J' : '000011100', - 'K' : '100000011', - 'L' : '001000011', - 'M' : '101000010', - 'N' : '000010011', - 'O' : '100010010', - 'P' : '001010010', - 'Q' : '000000111', - 'R' : '100000110', - 'S' : '001000110', - 'T' : '000010110', - 'U' : '110000001', - 'V' : '011000001', - 'W' : '111000000', - 'X' : '010010001', - 'Y' : '110010000', - 'Z' : '011010000', - '-' : '010000101', - '*' : '010010100', - '+' : '010001010', - '$' : '010101000', - '%' : '000101010', - '/' : '010100010', - '.' : '110000100', - ' ' : '011000100', +ENCODE = { + '0': '000110100', + '1': '100100001', + '2': '001100001', + '3': '101100000', + '4': '000110001', + '5': '100110000', + '6': '001110000', + '7': '000100101', + '8': '100100100', + '9': '001100100', + 'A': '100001001', + 'B': '001001001', + 'C': '101001000', + 'D': '000011001', + 'E': '100011000', + 'F': '001011000', + 'G': '000001101', + 'H': '100001100', + 'I': '001001100', + 'J': '000011100', + 'K': '100000011', + 'L': '001000011', + 'M': '101000010', + 'N': '000010011', + 'O': '100010010', + 'P': '001010010', + 'Q': '000000111', + 'R': '100000110', + 'S': '001000110', + 'T': '000010110', + 'U': '110000001', + 'V': '011000001', + 'W': '111000000', + 'X': '010010001', + 'Y': '110010000', + 'Z': '011010000', + '-': '010000101', + '*': '010010100', + '+': '010001010', + '$': '010101000', + '%': '000101010', + '/': '010100010', + '.': '110000100', + ' ': '011000100', } class Code39(Barcode): - # Convert a text into string binary of black and white markers + """Convert a text into string binary of black and white markers""" def encode(self, text): - text = text.upper() - self.label = text - text = '*' + text + '*' - result = '' + self.text = text.upper() + result = '' # It isposible for us to encode code39 # into full ascii, but this feature is # not enabled here - for char in text: - if not encoding.has_key(char): - char = '-'; - - result = result + encoding[char] + '0'; + for char in '*' + self.text + '*': + if not ENCODE.has_key(char): + char = '-' + result = result + ENCODE[char] + '0' # Now we need to encode the code39, best read # the code to understand what it's up to: - encoded = ''; - colour = '1'; # 1 = Black, 0 = White + encoded = '' + colour = '1' # 1 = Black, 0 = White for data in result: if data == '1': encoded = encoded + colour + colour @@ -95,6 +92,5 @@ class Code39(Barcode): encoded = encoded + colour colour = colour == '1' and '0' or '1' - self.inclabel = text - return encoded; + return encoded diff --git a/share/extensions/Barcode/Code93.py b/share/extensions/Barcode/Code93.py index 2b90fdda1..939a739dd 100644 --- a/share/extensions/Barcode/Code93.py +++ b/share/extensions/Barcode/Code93.py @@ -13,109 +13,101 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for Code93 barcodes. Designed for use with Inkscape. """ -from Base import Barcode +from .Base import Barcode -chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%' -encode = list(chars) -encode.append('($)') -encode.append('(/)') -encode.append('(+)') -encode.append('(%)') -encode.append('MARKER') +PALLET = list('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%') +PALLET.append('($)') +PALLET.append('(/)') +PALLET.append('(+)') +PALLET.append('(%)') +PALLET.append('MARKER') -map = {} - -i = 0 -for char in encode: - map[char] = i - i = i + 1 - -# Extended encoding maps for full ASCII Code93 -def getMap(array): +MAP = dict((PALLET[i], i) for i in range(len(PALLET))) +def get_map(array): + """Extended ENCODE maps for full ASCII Code93""" result = {} - y = 10 - - for x in array: - result[chr(x)] = encode[y] - y = y + 1 - - return result; + pos = 10 + for char in array: + result[chr(char)] = PALLET[pos] + pos = pos + 1 + return result # MapA is eclectic, but B, C, D are all ASCII ranges -mapA = getMap([27,28,29,30,31,59,60,61,62,63,91,92,93,94,95,123,124,125,126,127,0,64,96,127,127,127]) # % -mapB = getMap(range(1, 26)) # $ -mapC = getMap(range(33, 58)) # / -mapD = getMap(range(97, 122)) # + - -encoding = '100010100 101001000 101000100 101000010 100101000 100100100 100100010 101010000 100010010 100001010 110101000 110100100 110100010 110010100 110010010 110001010 101101000 101100100 101100010 100110100 100011010 101011000 101001100 101000110 100101100 100010110 110110100 110110010 110101100 110100110 110010110 110011010 101101100 101100110 100110110 100111010 100101110 111010100 111010010 111001010 101101110 101110110 110101110 100100110 111011010 111010110 100110010 101011110'.split() +MAP_A = get_map([27, 28, 29, 30, 31, 59, 60, 61, 62, 63, 91, 92, 93, 94, 95, + 123, 124, 125, 126, 127, 0, 64, 96, 127, 127, 127]) # % +MAP_B = get_map(range(1, 26)) # $ +MAP_C = get_map(range(33, 58)) # / +MAP_D = get_map(range(97, 122)) # + + +ENCODE = [ + '100010100', '101001000', '101000100', '101000010', '100101000', + '100100100', '100100010', '101010000', '100010010', '100001010', + '110101000', '110100100', '110100010', '110010100', '110010010', + '110001010', '101101000', '101100100', '101100010', '100110100', + '100011010', '101011000', '101001100', '101000110', '100101100', + '100010110', '110110100', '110110010', '110101100', '110100110', + '110010110', '110011010', '101101100', '101100110', '100110110', + '100111010', '100101110', '111010100', '111010010', '111001010', + '101101110', '101110110', '110101110', '100100110', '111011010', + '111010110', '100110010', '101011110', '' +] class Code93(Barcode): def encode(self, text): - # start marker - bits = self.encode93('MARKER') + # start marker + bits = ENCODE[MAP.get('MARKER', -1)] # Extend to ASCII charset ( return Array ) - text = self.encodeAscii(text) + text = self.encode_ascii(text) # Calculate the checksums text.append(self.checksum(text, 20)) # C text.append(self.checksum(text, 15)) # K - # Now convert text into the encoding bits (black and white stripes) + # Now convert text into the ENCODE bits (black and white stripes) for char in text: - bits = bits + self.encode93(char) - - # end marker - bits = bits + self.encode93('MARKER') + bits = bits + ENCODE[MAP.get(char, -1)] - # termination bar - bits = bits + '1' - - self.inclabel = text - return bits + # end marker and termination bar + return bits + ENCODE[MAP.get('MARKER', -1)] + '1' def checksum(self, text, mod): + """Generate a code 93 checksum""" weight = len(text) % mod - check = 0 + check = 0 for char in text: - check = check + (map[char] * weight) + check = check + (MAP[char] * weight) # Reset the weight is required weight = weight - 1 if weight == 0: weight = mod - return encode[check % 47] + return PALLET[check % 47] - # Some charicters need re-encoding into the code93 specification - def encodeAscii(self, text): + # Some charicters need re-ENCODE into the code93 specification + def encode_ascii(self, text): result = [] for char in text: - if map.has_key(char): + if MAP.has_key(char): result.append(char) - elif mapA.has_key(char): + elif MAP_A.has_key(char): result.append('(%)') - result.append(mapA[char]) - elif mapB.has_key(char): + result.append(MAP_A[char]) + elif MAP_B.has_key(char): result.append('($)') - result.append(mapB[char]) - elif mapC.has_key(char): + result.append(MAP_B[char]) + elif MAP_C.has_key(char): result.append('(/)') - result.append(mapC[char]) - elif mapD.has_key(char): + result.append(MAP_C[char]) + elif MAP_D.has_key(char): result.append('(+)') - result.append(mapD[char]) - + result.append(MAP_D[char]) return result - def encode93(self, char): - if map.has_key(char): - return encoding[map[char]] - return '' - diff --git a/share/extensions/Barcode/Ean13.py b/share/extensions/Barcode/Ean13.py index 7e138f25a..41f4df826 100644 --- a/share/extensions/Barcode/Ean13.py +++ b/share/extensions/Barcode/Ean13.py @@ -15,24 +15,25 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for EAN13 barcodes. Designed for use with Inkscape. """ -from BaseEan import EanBarcode +from .BaseEan import EanBarcode class Ean13(EanBarcode): """Provide an Ean13 barcode generator""" name = 'ean13' - lengths = [ 12 ] - checks = [ 13 ] + extras = {2: 'Ean2', 5: 'Ean5'} + checks = [13] + lengths = [12] def _encode(self, n): """Encode an ean13 barcode""" - self.label = self.space(n[0:1], 4, n[1:7], 5, n[7:], 7) + self.text = self.space(n[0:1], 4, n[1:7], 5, n[7:], 7) return self.enclose( - self.encode_interleaved(n[0], n[1:7]), self.encode_right(n[7:]) ) + self.encode_interleaved(n[0], n[1:7]), self.encode_right(n[7:])) diff --git a/share/extensions/Barcode/Ean2.py b/share/extensions/Barcode/Ean2.py new file mode 100644 index 000000000..9aec06a27 --- /dev/null +++ b/share/extensions/Barcode/Ean2.py @@ -0,0 +1,38 @@ +# +# Copyright (C) 2016 Martin Owens +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. +# +""" +Python barcode renderer for EAN2 barcodes. Designed for use with Inkscape. +""" + +from .BaseEan import EanBarcode + +FAMS = ['00', '01', '10', '11'] +START = '01011' + +class Ean2(EanBarcode): + """Provide an Ean5 barcode generator""" + length = 2 + name = 'ean5' + + def _encode(self, number): + if len(number) != 2: + number = ([0, 0] + number)[-2:] + self.text = ' '.join(self.space(number)) + family = ((number[0] * 10) + number[1]) % 4 + return START + '01'.join(self.encode_interleaved(family, number, FAMS)) + diff --git a/share/extensions/Barcode/Ean5.py b/share/extensions/Barcode/Ean5.py index d2e38a063..c6f8555fb 100644 --- a/share/extensions/Barcode/Ean5.py +++ b/share/extensions/Barcode/Ean5.py @@ -1,39 +1,38 @@ -# +# # Copyright (C) 2009 Aaron C Spike # 2010 Martin Owens # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for EAN5 barcodes. Designed for use with Inkscape. """ -from BaseEan import EanBarcode +from .BaseEan import EanBarcode -FAMS = [ '11000','10100','10010','10001','01100','00110','00011','01010','01001','00101' ] +FAMS = ['11000', '10100', '10010', '10001', '01100', + '00110', '00011', '01010', '01001', '00101'] START = '01011' class Ean5(EanBarcode): """Provide an Ean5 barcode generator""" - name = 'ean5' + name = 'ean5' length = 5 def _encode(self, number): - self.x += 110.0*self.scale # horiz offset so it does not overlap EAN13 - self.y -= (self.height + 5)*self.scale # move the text to the top - self.label = ' '.join(self.space(number)) - family = sum([int(n)*int(m) for n,m in zip(number, '39393')]) % 10 + self.text = ' '.join(self.space(number)) + family = sum([int(n)*int(m) for n, m in zip(number, '39393')]) % 10 return START + '01'.join(self.encode_interleaved(family, number, FAMS)) diff --git a/share/extensions/Barcode/Ean8.py b/share/extensions/Barcode/Ean8.py index 010dff03e..562952e42 100644 --- a/share/extensions/Barcode/Ean8.py +++ b/share/extensions/Barcode/Ean8.py @@ -13,22 +13,22 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for EAN8 barcodes. Designed for use with Inkscape. """ -from BaseEan import EanBarcode +from .BaseEan import EanBarcode class Ean8(EanBarcode): """Provide an EAN8 barcode generator""" - name = 'ean8' - lengths = [ 7 ] - checks = [ 8 ] + name = 'ean8' + checks = [8] + lengths = [7] def _encode(self, n): """Encode an ean8 barcode""" - self.label = self.space(n[:4], 3, n[4:]) - return self.enclose( self.encode_left(n[:4]), self.encode_right(n[4:]) ) + self.text = self.space(n[:4], 3, n[4:]) + return self.enclose(self.encode_left(n[:4]), self.encode_right(n[4:])) diff --git a/share/extensions/Barcode/Makefile.am b/share/extensions/Barcode/Makefile.am index 7a1e889c0..08e2f58b4 100644 --- a/share/extensions/Barcode/Makefile.am +++ b/share/extensions/Barcode/Makefile.am @@ -12,6 +12,7 @@ barcode_DATA = \ Ean13.py \ Ean8.py \ Ean5.py \ + Ean2.py \ __init__.py \ Rm4scc.py \ Upca.py \ diff --git a/share/extensions/Barcode/Rm4scc.py b/share/extensions/Barcode/Rm4scc.py index d40cd2435..7c36f26ee 100644 --- a/share/extensions/Barcode/Rm4scc.py +++ b/share/extensions/Barcode/Rm4scc.py @@ -66,10 +66,11 @@ check = ['ZUVWXY','501234','B6789A','HCDEFG','NIJKLM','TOPQRS'] (BAR_TRACK, BAR_DOWN, BAR_UP, BAR_FULL, BAR_NONE, WHITE_SPACE) = range(6) class Rm4scc(Barcode): + default_height = 18 + def encode(self, text): result = '' - self.height = 18 text = text.upper() text.replace('(', '') text.replace(')', '') @@ -80,10 +81,8 @@ class Rm4scc(Barcode): for char in text: if map.has_key(char): result = result + map[char] - i = i + 1 - self.inclabel = text return result; # given a string of data, return the check character @@ -117,7 +116,7 @@ class Rm4scc(Barcode): checkchar = check[total_upper][total_lower] return checkchar - def getStyle(self, index): + def get_style(self, index): """Royal Mail Barcodes use a completely different style""" result = { 'width' : 2, 'write' : True, 'top' : 0 } if index == BAR_TRACK: # Track Bar diff --git a/share/extensions/Barcode/Upca.py b/share/extensions/Barcode/Upca.py index bc6ffdf29..32ecc0aa6 100644 --- a/share/extensions/Barcode/Upca.py +++ b/share/extensions/Barcode/Upca.py @@ -13,25 +13,23 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for UPCA barcodes. Designed for use with Inkscape. """ -from BaseEan import EanBarcode +from .BaseEan import EanBarcode class Upca(EanBarcode): """Provides a renderer for EAN12 aka UPC-A Barcodes""" - name = 'upca' - lengths = [ 11 ] - checks = [ 12 ] + name = 'upca' + font_size = 10 + lengths = [11] + checks = [12] def _encode(self, n): """Encode for a UPC-A Barcode""" - self.label = self.space(n[0:1], 3, n[1:6], 4, n[6:11], 3, n[11:]) + self.text = self.space(n[0:1], 3, n[1:6], 4, n[6:11], 3, n[11:]) return self.enclose(self.encode_left(n[0:6]), self.encode_right(n[6:12])) - def fontSize(self): - """We need a bigger barcode""" - return 10 diff --git a/share/extensions/Barcode/Upce.py b/share/extensions/Barcode/Upce.py index d25c9c6cc..193d605a0 100644 --- a/share/extensions/Barcode/Upce.py +++ b/share/extensions/Barcode/Upce.py @@ -13,79 +13,75 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Python barcode renderer for UPCE barcodes. Designed for use with Inkscape. """ -from BaseEan import EanBarcode -import sys +from .BaseEan import EanBarcode # This is almost exactly the same as the standard FAMILIES # But flipped around and with the first 111000 instead of 000000. -FAMS = [ '111000', '110100', '110010', '110001', '101100', - '100110', '100011', '101010', '101001', '100101' ] +FAMS = ['111000', '110100', '110010', '110001', '101100', + '100110', '100011', '101010', '101001', '100101'] class Upce(EanBarcode): """Generate EAN6/UPC-E barcode generator""" - name = 'upce' - lengths = [ 6, 11 ] - checks = [ 7, 12 ] + name = 'upce' + font_size = 10 + lengths = [6, 11] + checks = [7, 12] + center_bar = '020' def _encode(self, n): """Generate a UPC-E Barcode""" - self.label = self.space(['0'], 2, n[:6], 2, n[-1]) + self.text = self.space(['0'], 2, n[:6], 2, n[-1]) code = self.encode_interleaved(n[-1], n[:6], FAMS) - # 202(guard) + code + 020(center) + 202(guard) - return self.enclose(code, center='020') + return self.enclose(code) - def appendChecksum(self, number): + def append_checksum(self, number): """Generate a UPCE Checksum""" if len(number) == 6: - number = self.ConvertEtoA(number) - result = self.getChecksum(number) - return self.ConvertAtoE(number) + result + number = self.convert_e2a(number) + result = self.get_checksum(number) + return self.convert_a2e(number) + result - def fontSize(self): - """We need a font size of 10""" - return 10 - - def ConvertAtoE(self, number): + def convert_a2e(self, number): """Converting UPC-A to UPC-E, may cause errors.""" # All UPC-E Numbers use number system 0 - if number[0] != '0' or len(number)!=11: + if number[0] != '0' or len(number) != 11: # If not then the code is invalid raise ValueError("Invalid UPC Number") # Most of the conversions deal # with the specific code parts - manufacturer = number[1:6] + maker = number[1:6] product = number[6:11] # There are 4 cases to convert: - if manufacturer[2:] == '000' or manufacturer[2:] == '100' or manufacturer[2:] == '200': + if maker[2:] == '000' or maker[2:] == '100' or maker[2:] == '200': # Maxium number product code digits can be encoded - if product[:2]=='00': - return manufacturer[:2] + product[2:] + manufacturer[2] - elif manufacturer[3:5] == '00': + if product[:2] == '00': + return maker[:2] + product[2:] + maker[2] + elif maker[3:5] == '00': # Now only 2 product code digits can be used - if product[:3]=='000': - return manufacturer[:3] + product[3:] + '3' - elif manufacturer[4] == '0': - # With even more manufacturer code we have less room for product code - if product[:4]=='0000': - return manufacturer[0:4] + product[4] + '4' - elif product[:4]=='0000' and int(product[4]) > 4: + if product[:3] == '000': + return maker[:3] + product[3:] + '3' + elif maker[4] == '0': + # With even more maker code we have less room for product code + if product[:4] == '0000': + return maker[0:4] + product[4] + '4' + elif product[:4] == '0000' and int(product[4]) > 4: # The last recorse is to try and squeeze it in the last 5 numbers # so long as the product is 00005-00009 so as not to conflict with # the 0-4 used above. - return manufacturer + product[4] + return maker + product[4] else: # Invalid UPC-A Numbe raise ValueError("Invalid UPC Number") - def ConvertEtoA(self, number): + def convert_e2a(self, number): """Convert UPC-E to UPC-A by padding with zeros""" # It's more likly to convert this without fault # But we still must be mindful of the 4 conversions diff --git a/share/extensions/Barcode/__init__.py b/share/extensions/Barcode/__init__.py index 9ad412448..fcfcfdbad 100644 --- a/share/extensions/Barcode/__init__.py +++ b/share/extensions/Barcode/__init__.py @@ -39,19 +39,23 @@ For supported barcodes see Barcode module directory. import sys -def getBarcode(code, **kwargs): +class NoBarcode(object): + """Simple class for no barcode""" + def generate(self): + return None + +def getBarcode(code, **kw): """Gets a barcode from a list of available barcode formats""" if not code: return sys.stderr.write("No barcode format given!\n") - code = str(code).replace('-', '').strip() + mod = 'Barcode' try: - barcode = getattr(__import__('Barcode.'+code, fromlist=['Barcode']), code) - return barcode(kwargs) + return getattr(__import__(mod+'.'+code, fromlist=[mod]), code)(kw) except ImportError: sys.stderr.write("Invalid type of barcode: %s\n" % code) except AttributeError: - raise - sys.stderr.write("Barcode module is missing the barcode class: %s\n" % code) + sys.stderr.write("Barcode module is missing barcode class: %s\n" % code) + return NoBarcode() diff --git a/share/extensions/render_barcode.inx b/share/extensions/render_barcode.inx index debefadad..890ffb1bd 100644 --- a/share/extensions/render_barcode.inx +++ b/share/extensions/render_barcode.inx @@ -5,9 +5,10 @@ inkex.py render_barcode.py - EAN5 + EAN2 Extension + EAN5 Extension + EAN13 +Extensions EAN8 - EAN13 UPC-A UPC-E Code25 Interleaved 2 of 5 diff --git a/share/extensions/render_barcode.py b/share/extensions/render_barcode.py index 381f3fc76..63436f03c 100755 --- a/share/extensions/render_barcode.py +++ b/share/extensions/render_barcode.py @@ -11,10 +11,10 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA. # """ Inkscape's general barcode extension. Run from within inkscape or use the @@ -27,6 +27,9 @@ from Barcode import getBarcode from simpletransform import computePointInNode class InsertBarcode(inkex.Effect): + """ + Raw barcode Effect class, see Barcode base class. + """ def __init__(self): inkex.Effect.__init__(self) self.OptionParser.add_option("-l", "--height", @@ -43,29 +46,44 @@ class InsertBarcode(inkex.Effect): help="Text to print on barcode") def effect(self): - x, y = computePointInNode(list(self.view_center), self.current_layer) - bargen = getBarcode( self.options.type, + (pos_x, pos_y) = computePointInNode( + list(self.view_center), self.current_layer) + + barcode = getBarcode(self.options.type, text=self.options.text, height=self.options.height, document=self.document, - x=x, y=y, + x=pos_x, y=pos_y, scale=self.unittouu('1px'), - ) - if bargen is not None: - barcode = bargen.generate() - if barcode is not None: - self.current_layer.append(barcode) - else: - sys.stderr.write("No barcode was generated\n") + ).generate() + if barcode is not None: + self.current_layer.append(barcode) else: - sys.stderr.write("Unable to make barcode with: " + str(self.options) + "\n") + sys.stderr.write("No barcode was generated\n") def test_barcode(): - bargen = getBarcode("Ean13", text="123456789101") - if bargen is not None: - barcode = bargen.generate() - if barcode: - print inkex.etree.tostring(barcode, pretty_print=True) + """Run from command line""" + for (kind, text) in ( + ('Ean2', '55'), + ('Ean5', '54321'), + ('Ean8', '0123456'), + ('Ean13', '123456789101'), + ('Ean13', '12345678910155'), + ('Ean13', '12345678910154321'), + ('Code128', 'Martin is Great'), + ('Code25i', '3242322'), + ('Code39', '4443322888'), + ('Code93', '3332222'), + ('Rm4scc', 'ROYAL POINT'), + ('Upca', '12345678911'), + ('Upce', '123456'), + ): + print "RENDER TEST: %s" % kind + bargen = getBarcode(kind, text=text) + if bargen is not None: + barcode = bargen.generate() + if barcode is not None: + print inkex.etree.tostring(barcode, pretty_print=True) if __name__ == '__main__': @@ -73,6 +91,5 @@ if __name__ == '__main__': # Debug mode without inkex test_barcode() exit(0) - e = InsertBarcode() - e.affect() + InsertBarcode().affect() -- cgit v1.2.3 From 6f18a0e9e22d9d9f79b447bed833fdcef1bdef42 Mon Sep 17 00:00:00 2001 From: su_v Date: Thu, 14 Apr 2016 09:53:53 +0200 Subject: Fix for make check (bzr r14843) --- generate_POTFILES.sh | 1 + po/POTFILES.in | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/generate_POTFILES.sh b/generate_POTFILES.sh index 04ea931b5..87c769ea4 100755 --- a/generate_POTFILES.sh +++ b/generate_POTFILES.sh @@ -21,6 +21,7 @@ rm -f po/POTFILES.in.new echo "# Please keep this file sorted alphabetically." echo "# Generated by $prog at `date`" echo "[encoding: UTF-8]" + echo "inkscape.appdata.xml.in" echo "inkscape.desktop.in" echo "share/filters/filters.svg.h" echo "share/palettes/palettes.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index ee168fb74..057114bd0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -# Generated by ./generate_POTFILES.sh at Tue Sep 22 20:20:22 CEST 2015 +# Generated by ./generate_POTFILES.sh at Thu Apr 14 04:25:58 CEST 2016 [encoding: UTF-8] inkscape.appdata.xml.in inkscape.desktop.in @@ -340,6 +340,7 @@ src/widgets/font-selector.cpp src/widgets/gradient-selector.cpp src/widgets/gradient-toolbar.cpp src/widgets/gradient-vector.cpp +src/widgets/image-menu-item.c src/widgets/lpe-toolbar.cpp src/widgets/measure-toolbar.cpp src/widgets/mesh-toolbar.cpp @@ -532,6 +533,7 @@ share/extensions/wireframe_sphere.py [type: gettext/xml] share/extensions/motion.inx [type: gettext/xml] share/extensions/new_glyph_layer.inx [type: gettext/xml] share/extensions/next_glyph_layer.inx +[type: gettext/xml] share/extensions/nicechart.inx [type: gettext/xml] share/extensions/param_curves.inx [type: gettext/xml] share/extensions/pathalongpath.inx [type: gettext/xml] share/extensions/pathscatter.inx -- cgit v1.2.3 From 2b635a500e8844e5788d8178d13887c2b5ace640 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Thu, 14 Apr 2016 16:58:56 +0200 Subject: Fix c++11 flag when required on non-debian-based systems (bzr r14844) --- CMakeScripts/DefineDependsandFlags.cmake | 3 +++ CMakeScripts/Modules/FindSigC++.cmake | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 4429758c0..00c2131e2 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -368,6 +368,9 @@ if(WITH_NLS) endif(GETTEXT_FOUND) endif(WITH_NLS) +#sets c++11 for newer sigc++ if required when pkg-config does not detect it +find_package(SigC++ REQUIRED) + pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 ) list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS}) diff --git a/CMakeScripts/Modules/FindSigC++.cmake b/CMakeScripts/Modules/FindSigC++.cmake index 8046410b5..14cbf47f7 100644 --- a/CMakeScripts/Modules/FindSigC++.cmake +++ b/CMakeScripts/Modules/FindSigC++.cmake @@ -106,10 +106,12 @@ endif (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) # https://bugs.launchpad.net/inkscape/+bug/1488079 macro (sigcpp_compile extra_cppflags) + set(sigcpp_compile_output "") try_compile(SIGCPP_COMPILES_FINE "${CMAKE_BINARY_DIR}/sigcpp-bindir" SOURCES "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules/sigcpp_test.cpp" COMPILE_DEFINITIONS ${_SIGC++_CFLAGS} ${extra_cppflags} - LINK_LIBRARIES ${SIGC++_LIBRARIES}) + LINK_LIBRARIES ${SIGC++_LIBRARIES} + OUTPUT_VARIABLE sigcpp_compile_output) endmacro() @@ -120,7 +122,7 @@ if (NOT "${SIGCPP_COMPILES_FINE}") if ("${SIGCPP_COMPILES_FINE}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${cppflag}") else() - message(FATAL_ERROR "Could not compile against SIGC++") + message(FATAL_ERROR "Could not compile against SIGC++ - output is <<${sigcpp_compile_output}>>") endif() endif() -- cgit v1.2.3 From 1dfba12bc394644560de7d2560aa03061237d0b8 Mon Sep 17 00:00:00 2001 From: Raphael Rosch Date: Thu, 14 Apr 2016 14:19:03 -0400 Subject: function to release object from group Fixed bugs: - https://launchpad.net/bugs/484041 (bzr r14845) --- src/menus-skeleton.h | 1 + src/selection-chemistry.cpp | 32 ++++++++++++++++++++++++++++++++ src/selection-chemistry.h | 1 + src/ui/interface.cpp | 12 ++++++++++++ src/ui/interface.h | 1 + src/verbs.cpp | 5 +++++ src/verbs.h | 1 + 7 files changed, 53 insertions(+) diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 8cdfbeb05..9e1c5c9f6 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -188,6 +188,7 @@ static char const menus_skeleton[] = " \n" " \n" " \n" +" \n" " \n" " \n" " \n" diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index e9a3af83a..7d32477a1 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -791,6 +791,38 @@ static gint clone_depth_descending(gconstpointer a, gconstpointer b) { return -1; } } + +void sp_selection_ungroup_pop_selection(Inkscape::Selection *selection, SPDesktop *desktop) +{ + if (selection->isEmpty()) { + selection_display_message(desktop, Inkscape::WARNING_MESSAGE, _("No objects selected to pop out of group.")); + return; + } + std::vector selection_list = selection->itemList(); + + std::vector::const_iterator item = selection_list.begin(); // leaving this because it will be useful for + // future implementation of complex pop ungrouping + SPItem *obj = *item; + SPItem *parent_group = static_cast(obj->parent); + if (!SP_IS_GROUP(parent_group) || SP_IS_LAYER(parent_group)) { + desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Selection not in a group.")); + return; + } + if (parent_group->firstChild()->getNext() == NULL) { + std::vector children; + sp_item_group_ungroup(static_cast(parent_group), children, false); + } + else { + sp_selection_to_next_layer(desktop, 1); // suppress done + } + + parent_group->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); + + DocumentUndo::done(selection->layers()->getDocument(), SP_VERB_SELECTION_UNGROUP_POP_SELECTION, + _("Pop selection from group")); + +} + void sp_selection_ungroup(Inkscape::Selection *selection, SPDesktop *desktop) { diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h index 4bfa2c0aa..82b91c617 100644 --- a/src/selection-chemistry.h +++ b/src/selection-chemistry.h @@ -76,6 +76,7 @@ void sp_selection_untile(SPDesktop *desktop); void sp_selection_group(Inkscape::Selection *selection, SPDesktop *desktop); void sp_selection_ungroup(Inkscape::Selection *selection, SPDesktop *desktop); +void sp_selection_ungroup_pop_selection(Inkscape::Selection *selection, SPDesktop *desktop); void sp_selection_raise(Inkscape::Selection *selection, SPDesktop *desktop); void sp_selection_raise_to_top(Inkscape::Selection *selection, SPDesktop *desktop); diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index a16bbc472..3e2a2004c 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -1523,6 +1523,12 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : MIParent.signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::LeaveGroup)); MIParent.show(); append(MIParent); + + /* Pop selection out of group */ + Gtk::MenuItem* miu = Gtk::manage(new Gtk::MenuItem(_("_Pop selection out of group"), 1)); + miu->signal_activate().connect(sigc::mem_fun(*this, &ContextMenu::ActivateUngroupPopSelection)); + miu->show(); + append(*miu); } } } @@ -1920,6 +1926,12 @@ void ContextMenu::ActivateUngroup(void) sp_item_group_ungroup(static_cast(_item), children); _desktop->selection->setList(children); } + +void ContextMenu::ActivateUngroupPopSelection(void) +{ + sp_selection_ungroup_pop_selection(_desktop->selection, _desktop); +} + void ContextMenu::MakeAnchorMenu(void) { diff --git a/src/ui/interface.h b/src/ui/interface.h index 6fb74046f..52074f0f0 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -194,6 +194,7 @@ class ContextMenu : public Gtk::Menu /** * callback, is executed on clicking the anchor "Group" and "Ungroup" menu entry */ + void ActivateUngroupPopSelection(void); void ActivateUngroup(void); void ActivateGroup(void); diff --git a/src/verbs.cpp b/src/verbs.cpp index 7b128c172..e3ba82e46 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1150,6 +1150,9 @@ void SelectionVerb::perform(SPAction *action, void *data) case SP_VERB_SELECTION_UNGROUP: sp_selection_ungroup(selection, dt); break; + case SP_VERB_SELECTION_UNGROUP_POP_SELECTION: + sp_selection_ungroup_pop_selection(selection, dt); + break; default: handled = false; break; @@ -2559,6 +2562,8 @@ Verb *Verb::_base_verbs[] = { N_("Group selected objects"), INKSCAPE_ICON("object-group")), new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"), N_("Ungroup selected groups"), INKSCAPE_ICON("object-ungroup")), + new SelectionVerb(SP_VERB_SELECTION_UNGROUP_POP_SELECTION, "SelectionUnGroupPopSelection", N_("_Pop selected objects out of group"), + N_("Pop selected objects out of group"), INKSCAPE_ICON("object-ungroup-pop-selection")), new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"), N_("Put text on path"), INKSCAPE_ICON("text-put-on-path")), diff --git a/src/verbs.h b/src/verbs.h index 4f453761e..ffb9b23d8 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -116,6 +116,7 @@ enum { SP_VERB_SELECTION_LOWER, SP_VERB_SELECTION_GROUP, SP_VERB_SELECTION_UNGROUP, + SP_VERB_SELECTION_UNGROUP_POP_SELECTION, SP_VERB_SELECTION_TEXTTOPATH, SP_VERB_SELECTION_TEXTFROMPATH, SP_VERB_SELECTION_REMOVE_KERNS, -- cgit v1.2.3 From 2f83e893435604a0af0dafbb7b8f96648703667a Mon Sep 17 00:00:00 2001 From: Raphael Rosch Date: Thu, 14 Apr 2016 14:56:59 -0400 Subject: Filter editor: effect description not entirely readable Fixed bugs: - https://launchpad.net/bugs/1436180 (bzr r14846) --- src/ui/dialog/filter-effects-dialog.cpp | 51 ++++++++++++++++++++++----------- src/ui/dialog/filter-effects-dialog.h | 9 +++++- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 7e9d8481a..b70cfcdd4 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1364,6 +1364,7 @@ FilterEffectsDialog::FilterModifier::FilterModifier(FilterEffectsDialog& d) _list.append_column("#", _columns.count); _list.get_column(2)->set_sizing(Gtk::TREE_VIEW_COLUMN_AUTOSIZE); _list.get_column(2)->set_expand(false); + _list.get_column(2)->set_reorderable(true); sw->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); _list.get_column(1)->set_resizable(true); @@ -1868,7 +1869,7 @@ void FilterEffectsDialog::PrimitiveList::update() if(f) { bool active_found = false; - _dialog._primitive_box.set_sensitive(true); + _dialog._primitive_box->set_sensitive(true); _dialog.update_filter_general_settings_view(); for(SPObject *prim_obj = f->children; prim_obj && SP_IS_FILTER_PRIMITIVE(prim_obj); @@ -1913,7 +1914,7 @@ void FilterEffectsDialog::PrimitiveList::update() } } else { - _dialog._primitive_box.set_sensitive(false); + _dialog._primitive_box->set_sensitive(false); set_size_request(-1, -1); } } @@ -2760,8 +2761,10 @@ FilterEffectsDialog::FilterEffectsDialog() // Initialize widget hierarchy #if WITH_GTKMM_3_0 Gtk::Paned* hpaned = Gtk::manage(new Gtk::Paned); + _primitive_box = Gtk::manage(new Gtk::Paned); #else Gtk::HPaned* hpaned = Gtk::manage(new Gtk::HPaned); + _primitive_box = Gtk::manage(new Gtk::VPaned); #endif Gtk::ScrolledWindow* sw_prims = Gtk::manage(new Gtk::ScrolledWindow); @@ -2769,25 +2772,40 @@ FilterEffectsDialog::FilterEffectsDialog() Gtk::HBox* infobox = Gtk::manage(new Gtk::HBox(/*homogeneous:*/false, /*spacing:*/4)); Gtk::HBox* hb_prims = Gtk::manage(new Gtk::HBox); Gtk::VBox* vb_prims = Gtk::manage(new Gtk::VBox); + Gtk::VBox* vb_desc = Gtk::manage(new Gtk::VBox); + + Gtk::VBox* prim_vbox_p = Gtk::manage(new Gtk::VBox); + Gtk::VBox* prim_vbox_i = Gtk::manage(new Gtk::VBox); + _primitive_box->pack1(*prim_vbox_p); + _primitive_box->pack2(*prim_vbox_i); + _getContents()->add(*hpaned); hpaned->pack1(_filter_modifier); - hpaned->pack2(_primitive_box); - _primitive_box.pack_start(*sw_prims); - _primitive_box.pack_start(*sw_infobox, false, false); + hpaned->pack2(*_primitive_box); + prim_vbox_p->pack_start(*sw_prims, true, true); + prim_vbox_i->pack_start(*vb_prims, true, true); + sw_prims->add(_primitive_list); - sw_infobox->add(*vb_prims); - infobox->pack_start(_infobox_icon, false, false); - infobox->pack_start(_infobox_desc, false, false); + sw_infobox->add(*infobox); + + _infobox_icon.set_alignment(0, 0); + _infobox_desc.set_alignment(0, 0); + _infobox_desc.set_justify(Gtk::JUSTIFY_LEFT); _infobox_desc.set_line_wrap(true); - _infobox_desc.set_size_request(250, -1); - - vb_prims->pack_start(*hb_prims); - vb_prims->pack_start(*infobox); + _infobox_desc.set_size_request(200, -1); + + infobox->pack_start(_infobox_icon, false, false); + vb_desc->pack_start(_infobox_desc, true, true); + infobox->pack_start(*vb_desc, true, true); + + vb_prims->pack_start(*hb_prims, false, false); + vb_prims->pack_start(*sw_infobox, true, true); hb_prims->pack_start(_add_primitive, false, false); - hb_prims->pack_start(_add_primitive_type, false, false); - _getContents()->pack_start(_settings_tabs, false, false); + + hb_prims->pack_start(_add_primitive_type, true, true); + _getContents()->pack_start(_settings_tabs, true, true); _settings_tabs.append_page(_settings_tab1, _("Effect parameters")); _settings_tabs.append_page(_settings_tab2, _("Filter General Settings")); @@ -2801,7 +2819,7 @@ FilterEffectsDialog::FilterEffectsDialog() sw_prims->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); sw_prims->set_shadow_type(Gtk::SHADOW_IN); - sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER); + sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); // al_settings->set_padding(0, 0, 12, 0); // fr_settings->set_shadow_type(Gtk::SHADOW_NONE); @@ -3026,7 +3044,8 @@ void FilterEffectsDialog::update_primitive_infobox() g_assert(false); break; } - _infobox_icon.set_pixel_size(96); + //_infobox_icon.set_pixel_size(96); + _infobox_icon.set_pixel_size(64); } void FilterEffectsDialog::duplicate_primitive() diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 283abb5b0..90bde23cf 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -28,6 +28,8 @@ #include #include +#include + namespace Inkscape { namespace UI { namespace Dialog { @@ -279,7 +281,12 @@ private: Gtk::Image _infobox_icon; // View/add primitives - Gtk::VBox _primitive_box; +#if WITH_GTKMM_3_0 + Gtk::Paned* _primitive_box; +#else + Gtk::VPaned* _primitive_box; +#endif + UI::Widget::ComboBoxEnum _add_primitive_type; Gtk::Button _add_primitive; -- cgit v1.2.3 From 051bd8baba5fd0909ab412fbe2938b22e3c18385 Mon Sep 17 00:00:00 2001 From: Raphael Rosch Date: Thu, 14 Apr 2016 15:09:11 -0400 Subject: no icon for 'pop selection' Fixed bugs: - https://launchpad.net/bugs/1570542 (bzr r14847) --- share/icons/icons.svg | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/share/icons/icons.svg b/share/icons/icons.svg index ac9ddd651..8323795bc 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -175,6 +175,9 @@ + + + @@ -4206,4 +4209,15 @@ http://www.inkscape.org/ + + + + + + + + + + + -- cgit v1.2.3 From 6572b29914475c769c035265b089e9668c47a974 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Thu, 14 Apr 2016 15:33:35 -0400 Subject: Change idle priority back to high (bzr r14848) --- src/display/sp-canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index decb14184..46be95518 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -126,7 +126,7 @@ struct SPCanvasClass { namespace { -gint const UPDATE_PRIORITY = G_PRIORITY_DEFAULT_IDLE; +gint const UPDATE_PRIORITY = G_PRIORITY_HIGH_IDLE; GdkWindow *getWindow(SPCanvas *canvas) { -- cgit v1.2.3 From 50a770bd6f47f27d8a45894e2ff19cf630b4c9f8 Mon Sep 17 00:00:00 2001 From: "Liam P. White" Date: Thu, 14 Apr 2016 20:35:13 -0400 Subject: Priority is so high it blocks blitting the canvas (bzr r14849) --- src/display/sp-canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 46be95518..decb14184 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -126,7 +126,7 @@ struct SPCanvasClass { namespace { -gint const UPDATE_PRIORITY = G_PRIORITY_HIGH_IDLE; +gint const UPDATE_PRIORITY = G_PRIORITY_DEFAULT_IDLE; GdkWindow *getWindow(SPCanvas *canvas) { -- cgit v1.2.3 From 2ab73707c1214a5b44c8b505eb98cbf56de21061 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Fri, 15 Apr 2016 15:39:49 +0100 Subject: Add a Resize to Page with Keyboard Shortcut (bzr r14850) --- share/keys/default.xml | 6 ++++-- src/menus-skeleton.h | 2 ++ src/verbs.cpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/share/keys/default.xml b/share/keys/default.xml index 07192cb37..f16be0689 100644 --- a/share/keys/default.xml +++ b/share/keys/default.xml @@ -297,8 +297,7 @@ override) the bindings in the main default.xml. - - + @@ -384,6 +383,9 @@ override) the bindings in the main default.xml. + + + diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 9e1c5c9f6..9c7c65140 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -86,6 +86,8 @@ static char const menus_skeleton[] = " \n" " \n" " \n" +" \n" +" \n" " \n" " \n" " \n" diff --git a/src/verbs.cpp b/src/verbs.cpp index e3ba82e46..299cfe8e7 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -3005,7 +3005,7 @@ Verb *Verb::_base_verbs[] = { N_("Fit the page to the current selection"), NULL), new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_DRAWING, "FitCanvasToDrawing", N_("Fit Page to Drawing"), N_("Fit the page to the drawing"), NULL), - new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, "FitCanvasToSelectionOrDrawing", N_("Fit Page to Selection or Drawing"), + new FitCanvasVerb(SP_VERB_FIT_CANVAS_TO_SELECTION_OR_DRAWING, "FitCanvasToSelectionOrDrawing", N_("_Resize Page to Selection"), N_("Fit the page to the current selection or the drawing if there is no selection"), NULL), // LockAndHide new LockAndHideVerb(SP_VERB_UNLOCK_ALL, "UnlockAll", N_("Unlock All"), -- cgit v1.2.3 From 47af1985a797019dd1f2539a2d00f8473688765d Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 15 Apr 2016 19:25:39 +0200 Subject: Fix CMake make check to without a global gtest (bzr r14851) --- test/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f31b0bc04..ab73b9e37 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -7,7 +7,8 @@ set(CMAKE_CTEST_COMMAND ctest -V) add_subdirectory(${GMOCK_DIR} ${CMAKE_BINARY_DIR}/gmock) include_directories(SYSTEM ${GMOCK_DIR}/gtest/include - ${GMOCK_DIR}/include) + ${GMOCK_DIR}/include + ${CMAKE_SOURCE_DIR}/gtest/gtest/include) set_source_files_properties( ${CMAKE_BINARY_DIR}/src/inkscape-version.cpp -- cgit v1.2.3 From d877a378a6d1b11417c73862ddb82be680f66378 Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Sat, 16 Apr 2016 12:54:58 +0200 Subject: CMake build creates a shared libinkscape_base library and links inkscape and inkview against it. (bzr r14761.1.6) --- CMakeLists.txt | 1 + src/CMakeLists.txt | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0eb0e5cd..ddebe9a64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,6 +108,7 @@ add_definitions(-DORBIT2=1) add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CAIRO_PDF=1) # needed for src/libnrtype/Layout-TNG.h add_definitions(-DHAVE_TR1_UNORDERED_SET) # XXX make an option! +add_definitions(-fPIC) # # end badness # ----------------------------------------------------------------------------- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c436cefb..93eea1e2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -506,14 +506,14 @@ set(inkscape_SRC #add_inkscape_lib(sp_LIB "${sp_SRC}") #add_inkscape_lib(inkscape_LIB "${inkscape_SRC}") -# Build everything except main and inkview.c in a CMake "object" library. -# An object library is just a bunch of .o files. Linking them with main.c or inkview.c -# we get the inkscape and inkview executables respectively. -add_library(inkscape_base OBJECT ${inkscape_SRC} ${sp_SRC}) +# Build everything except main and inkview.c in a shared library. +add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC}) # make executables for inkscape and inkview -add_executable(inkscape ${main_SRC} $) -add_executable(inkview inkview.cpp $) +add_executable(inkscape ${main_SRC} ) +add_executable(inkview inkview.cpp ) + + if(UNIX) # message after building. @@ -526,10 +526,6 @@ endif() add_dependencies(inkscape inkscape_version) -if (NOT "${WITH_EXT_GDL}") - list (APPEND INKSCAPE_LIBS "gdl_LIB") -endif() - set(INKSCAPE_TARGET_LIBS # order from automake #sp_LIB @@ -552,5 +548,16 @@ set(INKSCAPE_TARGET_LIBS ${INKSCAPE_LIBS} ) -target_link_libraries(inkscape ${INKSCAPE_TARGET_LIBS}) -target_link_libraries(inkview ${INKSCAPE_TARGET_LIBS}) +if (NOT "${WITH_EXT_GDL}") + # Insert it at the beginning of the list as the windows build fails otherwise + list (INSERT INKSCAPE_TARGET_LIBS 0 "gdl_LIB") +endif() + + +# Link the inkscape_base library against all external dependencies +target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) + +# Link inkscape and inkview against inkscape_base +target_link_libraries(inkscape inkscape_base ) +target_link_libraries(inkview inkscape_base) + -- cgit v1.2.3 From f9a9eedc285caf24f095135e8df191acd820ccaf Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Sat, 16 Apr 2016 15:11:39 +0200 Subject: Added Sebastian Faubels CMake changes for the windows build. (bzr r14761.1.7) --- CMakeScripts/ConfigChecks.cmake | 3 +- CMakeScripts/DefineDependsandFlags.cmake | 69 +++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 926dc3ad3..d12a37cbe 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -3,6 +3,7 @@ # Set all HAVE_XXX variables, to correctly set all defines in config.h #SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES}) include(CheckIncludeFiles) +include(CheckIncludeFileCXX) include(CheckFunctionExists) include(CheckStructHasMember) # usage: CHECK_INCLUDE_FILES (
) @@ -12,7 +13,7 @@ include(CheckStructHasMember) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS}) -CHECK_INCLUDE_FILES(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) +CHECK_INCLUDE_FILE_CXX(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF) CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR) CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 61500fe97..c9367d2a1 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -16,7 +16,74 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR} # ---------------------------------------------------------------------------- if(WIN32) - link_directories($ENV{DEVLIBS_PATH}/lib) + message("---------------- BEGIN: Win32 ----------------") + + # The name of the target operating system + set(CMAKE_SYSTEM_NAME Windows) + + message("CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME}) + + set(CMAKE_C_COMPILER gcc) + set(CMAKE_CXX_COMPILER g++) + set(CMAKE_RC_COMPILER windres) + + # Adjust the command line parameters for windres to the verion of MinGW. + set(CMAKE_RC_COMPILER_INIT windres) + enable_language(RC) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + + # Here is the target environment located + set(CMAKE_FIND_ROOT_PATH $ENV{MINGW_PATH}/mingw64/) + + message("CMAKE_FIND_ROOT_PATH: " ${CMAKE_FIND_ROOT_PATH}) + + # Tweak CMake into using Unix-style library names. + set(CMAKE_FIND_LIBRARY_PREFIXES "lib") + #set(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a" ".dll.a") + set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll") + + message("CMAKE_FIND_LIBRARY_PREFIXES: " ${CMAKE_FIND_LIBRARY_PREFIXES}) + message("CMAKE_FIND_LIBRARY_SUFFIXES: " ${CMAKE_FIND_LIBRARY_SUFFIXES}) + + set(SDL_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}x86_64-w64-mingw32/include/c++) + + message("SDL_INCLUDE_DIR: " ${SDL_INCLUDE_DIR}) + + #if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64") + link_directories($ENV{DEVLIBS_PATH}/lib) + link_directories($ENV{MINGW_PATH}/mingw64/lib) + link_directories($ENV{MINGW_PATH}/mingw64/x86_64-w64-mingw32/lib) + link_directories($ENV{WINDIR}/system32) + + include_directories($ENV{MINGW_PATH}/mingw64/include) + include_directories($ENV{MINGW_PATH}/mingw64/x86_64-w64-mingw32/include) + include_directories($ENV{MINGW_PATH}/mingw64/x86_64-w64-mingw32/include/c++) + #endif () + + get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) + + foreach(dir ${dirs}) + message("CMAKE_INCLUDE_DIR:" ${dir}) + endforeach() + + add_definitions(-DFLT_EPSILON=1e-9) + add_definitions(-DFLT_MAX=1e+37) + add_definitions(-DFLT_MIN=1e-37) + + list(APPEND INKSCAPE_LIBS "-lgomp") + list(APPEND INKSCAPE_LIBS "-lwinpthread") + list(APPEND INKSCAPE_LIBS "-lmscms") + + list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") + list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") + list(APPEND INKSCAPE_CXX_FLAGS "-m64") + + # Try to compile using C++ 11. + set(CMAKE_CXX_STANDARD 11) + + message("CMAKE_CXX_STANDARD: " ${CMAKE_CXX_STANDARD}) + message("---------------- END: Win32 ----------------") + endif() pkg_check_modules(INKSCAPE_DEP REQUIRED pangocairo pangoft2 fontconfig gthread-2.0 gsl gmodule-2.0) -- cgit v1.2.3 From 8047a376e9e79ab45bb6eb97c5d234c5a5247175 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 16 Apr 2016 15:31:28 +0100 Subject: CMake: Disable broken pseudo-option for GTKSPELL - determined automatically by pkg-config, and fix a couple of typos (bzr r14852) --- CMakeLists.txt | 1 - CMakeScripts/DefineDependsandFlags.cmake | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0eb0e5cd..6545ac44e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,6 @@ option(WITH_OPENMP "Compile with OpenMP support" ON) option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling -option(WITH_GTKSPELL "Compile with support for GTK spelling widget" ON) option(ENABLE_POPPLER "Compile with support of libpoppler" ON) option(ENABLE_POPPLER_CAIRO "Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER)" ON) option(WITH_IMAGE_MAGICK "Compile with support of ImageMagick for raster extensions and image import resolution" ON) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 00c2131e2..204f96c02 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -239,7 +239,7 @@ if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules(GDL_3_6 gdl-3.0>=3.6) if("${GDL_3_6_FOUND}") - message("Using Gdl 3.6 or higher") + message("Using GDL 3.6 or higher") set (WITH_GDL_3_6 1) endif() @@ -247,7 +247,7 @@ if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules(GTKSPELL3 gtkspell3-3.0) if("${GTKSPELL3_FOUND}") - message("Using GtkSpell3") + message("Using GtkSpell 3") set (WITH_GTKSPELL 1) else() unset(WITH_GTKSPELL) -- cgit v1.2.3 From eeed7483385d14192bb11ef501bc729c286da7c5 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sat, 16 Apr 2016 16:39:29 +0200 Subject: CMake build: builds with WITH_DBUS (bzr r14853) --- CMakeScripts/ConfigChecks.cmake | 3 +-- CMakeScripts/DefineDependsandFlags.cmake | 10 ++++++---- src/CMakeLists.txt | 4 ++++ src/extension/CMakeLists.txt | 15 +-------------- src/extension/dbus/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 20 deletions(-) create mode 100644 src/extension/dbus/CMakeLists.txt diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 926dc3ad3..34396ef28 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -65,7 +65,6 @@ if(HAVE_CAIRO_PDF) set(RENDER_WITH_PANGO_CAIRO TRUE) endif() -# Create the two configuration files: config.h and inkscape_version.h -# Create them in the binary root dir +# Create the configuration files config.h in the binary root dir configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) add_definitions(-DHAVE_CONFIG_H) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 204f96c02..8e1cf2826 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -183,11 +183,13 @@ else(POTRACE_FOUND) endif() if(WITH_DBUS) - find_package(DBus REQUIRED) + pkg_check_modules(DBUS dbus-1 dbus-glib-1) if(DBUS_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIR}) - list(APPEND INKSCAPE_INCS_SYS ${DBUS_ARCH_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) + list(APPEND INKSCAPE_LIBS ${DBUS_LDFLAGS}) + list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/) + list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) + add_definitions(${DBUS_CFLAGS_OTHER}) + else() set(WITH_DBUS OFF) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c436cefb..e97ea8489 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -526,6 +526,10 @@ endif() add_dependencies(inkscape inkscape_version) +if(WITH_DBUS) + add_dependencies(inkscape inkscape_dbus) +endif() + if (NOT "${WITH_EXT_GDL}") list (APPEND INKSCAPE_LIBS "gdl_LIB") endif() diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index 21e652563..86a192f47 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -244,20 +244,7 @@ if(WITH_IMAGE_MAGICK) endif() if(WITH_DBUS) - list(APPEND extension_SRC - dbus/application-interface.cpp - dbus/dbus-init.cpp - dbus/document-interface.cpp - - # ------ - # Header - dbus/application-interface.h - dbus/dbus-init.h - dbus/document-interface.h - dbus/wrapper/inkscape-dbus-wrapper.h - ) - - include_directories(dbus) + add_subdirectory(dbus) endif() # add_inkscape_lib(extension_LIB "${extension_SRC}") diff --git a/src/extension/dbus/CMakeLists.txt b/src/extension/dbus/CMakeLists.txt new file mode 100644 index 000000000..ad9e1fd7d --- /dev/null +++ b/src/extension/dbus/CMakeLists.txt @@ -0,0 +1,29 @@ +if(WITH_DBUS) +include_directories(${CMAKE_BINARY_DIR}/src/extension/dbus) +set(dbus_SRC "") + list(APPEND dbus_SRC + application-interface.cpp + dbus-init.cpp + document-interface.cpp + ) + add_custom_target(inkscape_dbus + DEPENDS ${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h + ) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h ${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h + DEPENDS ${CMAKE_SOURCE_DIR}/src/extension/dbus/application-interface.xml ${CMAKE_SOURCE_DIR}/src/extension/dbus/document-interface.xml + COMMAND dbus-binding-tool --mode=glib-server --output=${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h --prefix=application_interface ${CMAKE_SOURCE_DIR}/src/extension/dbus/application-interface.xml + COMMAND dbus-binding-tool --mode=glib-server --output=${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h --prefix=document_interface ${CMAKE_SOURCE_DIR}/src/extension/dbus/document-interface.xml + COMMAND dbus-binding-tool --mode=glib-client --output=${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h --prefix=document_interface ${CMAKE_SOURCE_DIR}/src/extension/dbus/document-interface.xml + ) + set_source_files_properties( + ${CMAKE_BINARY_DIR}/src/extension/dbus/application-server-glue.h + PROPERTIES GENERATED TRUE) + set_source_files_properties( + ${CMAKE_BINARY_DIR}/src/extension/dbus/document-server-glue.h + PROPERTIES GENERATED TRUE) + set_source_files_properties( + ${CMAKE_BINARY_DIR}/src/extension/dbus/document-client-glue.h + PROPERTIES GENERATED TRUE) +add_inkscape_source("${dbus_SRC}") +endif() -- cgit v1.2.3 From bb779c6c9b9e84e6526b533df8c3bd441be82ae8 Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Sat, 16 Apr 2016 16:44:37 +0200 Subject: Added an example plugin. (bzr r14761.1.8) --- CMakeScripts/DefineDependsandFlags.cmake | 3 + po/CMakeLists.txt | 3 + src/extension/CMakeLists.txt | 2 + src/extension/plugins/grid2/CMakeLists.txt | 16 +++ src/extension/plugins/grid2/grid.cpp | 220 +++++++++++++++++++++++++++++ src/extension/plugins/grid2/grid.h | 58 ++++++++ src/extension/plugins/grid2/libgrid2.inx | 20 +++ 7 files changed, 322 insertions(+) create mode 100644 src/extension/plugins/grid2/CMakeLists.txt create mode 100644 src/extension/plugins/grid2/grid.cpp create mode 100644 src/extension/plugins/grid2/grid.h create mode 100644 src/extension/plugins/grid2/libgrid2.inx diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index c9367d2a1..4f02d258b 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -100,9 +100,12 @@ if(APPLE) pkg_check_modules(x11 REQUIRED x11) list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS}) endif() +elseif(WIN32) +# X11 not available on windows else() pkg_check_modules(x11 REQUIRED x11) list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS}) + endif() if(WITH_GNOME_VFS) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 9e6b56f64..5e2352100 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -6,6 +6,7 @@ foreach(language ${LANGUAGES}) GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION "share/locale/" PO_FILES ${pofile}) endforeach(language) +if(!WIN32) #translates inkscape.desktop add_custom_target(inkscape_desktop DEPENDS ${CMAKE_BINARY_DIR}/inkscape.desktop) @@ -25,3 +26,5 @@ else() endif() add_dependencies(inkscape inkscape_desktop) + +endif() diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index 238e8d3df..a8fd86d39 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -264,3 +264,5 @@ endif() # add_inkscape_lib(extension_LIB "${extension_SRC}") add_inkscape_source("${extension_SRC}") + +add_subdirectory( plugins ) diff --git a/src/extension/plugins/grid2/CMakeLists.txt b/src/extension/plugins/grid2/CMakeLists.txt new file mode 100644 index 000000000..3e18bdef3 --- /dev/null +++ b/src/extension/plugins/grid2/CMakeLists.txt @@ -0,0 +1,16 @@ +set(grid_PART_SRCS grid.cpp) + +include_directories( ${CMAKE_BINARY_DIR}/src ) + +add_library(grid2 SHARED ${grid_PART_SRCS}) + +target_link_libraries(grid2 inkscape_base) + +#install(TARGETS kritaartivity DESTINATION ${PLUGIN_INSTALL_DIR}) + +########### install files ############### + +#install(FILES artivity.rc DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) +#install(FILES kritaartivity.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + +#include(CPack) diff --git a/src/extension/plugins/grid2/grid.cpp b/src/extension/plugins/grid2/grid.cpp new file mode 100644 index 000000000..3a2ed7867 --- /dev/null +++ b/src/extension/plugins/grid2/grid.cpp @@ -0,0 +1,220 @@ +/** + \file grid.cpp + + A plug-in to add a grid creation effect into Inkscape. +*/ +/* + * Copyright (C) 2004-2005 Ted Gould + * Copyright (C) 2007 MenTaLguY + * Abhishek Sharma + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include +#include + +#include "desktop.h" + +#include "document.h" +#include "selection.h" +#include "sp-object.h" +#include "2geom/geom.h" + +#include "svg/path-string.h" + +#include "extension/effect.h" +#include "extension/system.h" + +#include "util/units.h" + +#include "grid.h" + +namespace Inkscape { +namespace Extension { +namespace Internal { + +/** + \brief A function to allocated anything -- just an example here + \param module Unused + \return Whether the load was sucessful +*/ +bool +Grid::load (Inkscape::Extension::Extension */*module*/) +{ + // std::cout << "Hey, I'm Grid, I'm loading!" << std::endl; + return TRUE; +} + +namespace { + +Glib::ustring build_lines(Geom::Rect bounding_area, + Geom::Point const &offset, Geom::Point const &spacing) +{ + + std::cout << "Building lines" << std::endl; + + Geom::Point point_offset(0.0, 0.0); + + SVG::PathString path_data; + + for ( int axis = Geom::X ; axis <= Geom::Y ; ++axis ) { + point_offset[axis] = offset[axis]; + + for (Geom::Point start_point = bounding_area.min(); + start_point[axis] + offset[axis] <= (bounding_area.max())[axis]; + start_point[axis] += spacing[axis]) { + Geom::Point end_point = start_point; + end_point[1-axis] = (bounding_area.max())[1-axis]; + + path_data.moveTo(start_point + point_offset) + .lineTo(end_point + point_offset); + } + } + std::cout << "Path data:" << path_data.c_str() << std::endl; + return path_data; +} + +} // namespace + +/** + \brief This actually draws the grid. + \param module The effect that was called (unused) + \param document What should be edited. +*/ +void +Grid::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/) +{ + + std::cout << "Executing effect" << std::endl; + + Inkscape::Selection * selection = ((SPDesktop *)document)->selection; + + Geom::Rect bounding_area = Geom::Rect(Geom::Point(0,0), Geom::Point(100,100)); + if (selection->isEmpty()) { + /* get page size */ + SPDocument * doc = document->doc(); + bounding_area = Geom::Rect( Geom::Point(0,0), + Geom::Point(doc->getWidth().value("px"), doc->getHeight().value("px")) ); + } else { + Geom::OptRect bounds = selection->visualBounds(); + if (bounds) { + bounding_area = *bounds; + } + + gdouble doc_height = (document->doc())->getHeight().value("px"); + Geom::Rect temprec = Geom::Rect(Geom::Point(bounding_area.min()[Geom::X], doc_height - bounding_area.min()[Geom::Y]), + Geom::Point(bounding_area.max()[Geom::X], doc_height - bounding_area.max()[Geom::Y])); + + bounding_area = temprec; + } + + gdouble scale = Inkscape::Util::Quantity::convert(1, "px", &document->doc()->getSVGUnit()); + bounding_area *= Geom::Scale(scale); + Geom::Point spacings( scale * module->get_param_float("xspacing"), + scale * module->get_param_float("yspacing") ); + gdouble line_width = scale * module->get_param_float("lineWidth"); + Geom::Point offsets( scale * module->get_param_float("xoffset"), + scale * module->get_param_float("yoffset") ); + + Glib::ustring path_data(""); + + path_data = build_lines(bounding_area, offsets, spacings); + Inkscape::XML::Document * xml_doc = document->doc()->getReprDoc(); + + //XML Tree being used directly here while it shouldn't be. + Inkscape::XML::Node * current_layer = static_cast(document)->currentLayer()->getRepr(); + Inkscape::XML::Node * path = xml_doc->createElement("svg:path"); + + path->setAttribute("d", path_data.c_str()); + + Glib::ustring style("fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"); + style += ";stroke-width:"; + gchar floatstring[64]; + std::ostringstream stringstream; + stringstream << line_width; + sprintf(floatstring, "%s", stringstream.str().c_str()); + style += floatstring; + style += "pt"; + path->setAttribute("style", style.c_str()); + + current_layer->appendChild(path); + Inkscape::GC::release(path); +} + +/** \brief A class to make an adjustment that uses Extension params */ +class PrefAdjustment : public Gtk::Adjustment { + /** Extension that this relates to */ + Inkscape::Extension::Extension * _ext; + /** The string which represents the parameter */ + char * _pref; +public: + /** \brief Make the adjustment using an extension and the string + describing the parameter. */ + PrefAdjustment(Inkscape::Extension::Extension * ext, char * pref) : + Gtk::Adjustment(0.0, 0.0, 10.0, 0.1), _ext(ext), _pref(pref) { + this->set_value(_ext->get_param_float(_pref)); + this->signal_value_changed().connect(sigc::mem_fun(this, &PrefAdjustment::val_changed)); + return; + }; + + void val_changed (void); +}; /* class PrefAdjustment */ + +/** \brief A function to respond to the value_changed signal from the + adjustment. + + This function just grabs the value from the adjustment and writes + it to the parameter. Very simple, but yet beautiful. +*/ +void +PrefAdjustment::val_changed (void) +{ + // std::cout << "Value Changed to: " << this->get_value() << std::endl; + _ext->set_param_float(_pref, this->get_value()); + return; +} + +/** \brief A function to get the prefences for the grid + \param moudule Module which holds the params + \param view Unused today - may get style information in the future. + + Uses AutoGUI for creating the GUI. +*/ +Gtk::Widget * +Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/) +{ + SPDocument * current_document = view->doc(); + + std::vector selected = ((SPDesktop *)view)->getSelection()->itemList(); + Inkscape::XML::Node * first_select = NULL; + if (!selected.empty()) { + first_select = selected[0]->getRepr(); + } + + return module->autogui(current_document, first_select, changeSignal); +} + + + + +}; /* namespace Internal */ +}; /* namespace Extension */ +}; /* namespace Inkscape */ + + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/extension/plugins/grid2/grid.h b/src/extension/plugins/grid2/grid.h new file mode 100644 index 000000000..b4997bb18 --- /dev/null +++ b/src/extension/plugins/grid2/grid.h @@ -0,0 +1,58 @@ +/* + * Authors: + * Ted Gould + * + * Copyright (C) 2004-2005 Authors + * + * Released under GNU GPL, read the file 'COPYING' for more information + */ + +#ifndef __GRID_H + +#include "extension/implementation/implementation.h" + + +#include +#include +#include "inkscape-version.cpp" + + + +namespace Inkscape { +namespace Extension { + +class Effect; +class Extension; + +namespace Internal { + +/** \brief Implementation class of the GIMP gradient plugin. This mostly + just creates a namespace for the GIMP gradient plugin today. +*/ +class Grid : public Inkscape::Extension::Implementation::Implementation { + +public: + bool load(Inkscape::Extension::Extension *module); + void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache); + +}; + +}; /* namespace Internal */ +}; /* namespace Extension */ +}; /* namespace Inkscape */ + +extern "C" G_MODULE_EXPORT Inkscape::Extension::Implementation::Implementation* GetImplementation() { return new Inkscape::Extension::Internal::Grid(); } +extern "C" G_MODULE_EXPORT const gchar* GetInkscapeVersion() { return Inkscape::version_string; } +#endif + +/* + Local Variables: + mode:c++ + c-file-style:"stroustrup" + c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + indent-tabs-mode:nil + fill-column:99 + End: +*/ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/extension/plugins/grid2/libgrid2.inx b/src/extension/plugins/grid2/libgrid2.inx new file mode 100644 index 000000000..0360d37e3 --- /dev/null +++ b/src/extension/plugins/grid2/libgrid2.inx @@ -0,0 +1,20 @@ + + +<_name>Grid2 +org.inkscape.effect.grid2 +1.0 +10.0 +10.0 +0.0 +0.0 + + all + + + + + +<_menu-tip>Draw a path which is a grid + + + -- cgit v1.2.3 From 8bf048f0e99f932a9bdf49860e1356353efc7e10 Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Sat, 16 Apr 2016 16:45:24 +0200 Subject: Added missing file (bzr r14761.1.9) --- src/extension/plugins/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/extension/plugins/CMakeLists.txt diff --git a/src/extension/plugins/CMakeLists.txt b/src/extension/plugins/CMakeLists.txt new file mode 100644 index 000000000..78f268c6b --- /dev/null +++ b/src/extension/plugins/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(grid2) -- cgit v1.2.3 From 4429cb1baabc23137a2aa8bc687cfa78412126cd Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Sat, 16 Apr 2016 17:59:22 +0200 Subject: Added Sebastian Faubels helper scripts for windows. (bzr r14761.1.10) --- CMakeLists.txt | 3 +++ configure.bat | 9 +++++++++ touch.bat | 1 + 3 files changed, 13 insertions(+) create mode 100644 configure.bat create mode 100644 touch.bat diff --git a/CMakeLists.txt b/CMakeLists.txt index ddebe9a64..ec16218dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,10 @@ add_definitions(-DORBIT2=1) add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CAIRO_PDF=1) # needed for src/libnrtype/Layout-TNG.h add_definitions(-DHAVE_TR1_UNORDERED_SET) # XXX make an option! + +if(!WIN32) add_definitions(-fPIC) +endif() # # end badness # ----------------------------------------------------------------------------- diff --git a/configure.bat b/configure.bat new file mode 100644 index 000000000..503b47b84 --- /dev/null +++ b/configure.bat @@ -0,0 +1,9 @@ +REM Set the MinGW environment variables. +if "%MINGW_BIN%"=="" mingwenv.bat + +REM Delete the CMake cache. Needed when changes on the CMakeLists should be applied in a consistent way. +del CMakeCache.txt +rmdir /s /q CMakeFiles + +REM Configure using the MinGW compiler chain. +cmake -D"CMAKE_SYSTEM_PREFIX_PATH:PATH=C:\MinGW64\mingw64\x86_64-w64-mingw32" -G "MinGW Makefiles" .. diff --git a/touch.bat b/touch.bat new file mode 100644 index 000000000..043b3eb99 --- /dev/null +++ b/touch.bat @@ -0,0 +1 @@ +forfiles /s /m *.obj /c "cmd /c copy /b @path +,," \ No newline at end of file -- cgit v1.2.3 From 79c7cc29d83772771100d2a10900de15a66af0f7 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sat, 16 Apr 2016 19:14:12 +0200 Subject: CXX flags dedup on CMake builds (bzr r14854) --- CMakeLists.txt | 8 ++++++++ CMakeScripts/CanonicalizeFlagsVar.cmake | 11 +++++++++++ 2 files changed, 19 insertions(+) create mode 100644 CMakeScripts/CanonicalizeFlagsVar.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 6545ac44e..873e24c52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,6 +208,14 @@ if(WITH_GTEST) add_subdirectory(test EXCLUDE_FROM_ALL) endif() +# Canonicalize the flags to speed up recompilation using ccache/etc. +# This should be the last thing we do: +include(CMakeScripts/CanonicalizeFlagsVar.cmake) +canonicalize_flags_var("${CMAKE_CXX_FLAGS}" _new_cxx) +set(CMAKE_CXX_FLAGS "${_new_cxx}" CACHE STRING "" FORCE) +# message(FATAL_ERROR "CMAKE_CXX_FLAGS = <${CMAKE_CXX_FLAGS}>") + + # ---------------------------------------------------------------------- # Information Summary # ---------------------------------------------------------------------- diff --git a/CMakeScripts/CanonicalizeFlagsVar.cmake b/CMakeScripts/CanonicalizeFlagsVar.cmake new file mode 100644 index 000000000..ddc5b7b5d --- /dev/null +++ b/CMakeScripts/CanonicalizeFlagsVar.cmake @@ -0,0 +1,11 @@ +# This file is copyright by Shlomi Fish, 2016. +# +# This file is licensed under the MIT/X11 license: +# https://opensource.org/licenses/mit-license.php + +macro (canonicalize_flags_var in_val out_var) + string(REPLACE " " ";" _c "${in_val}") + list(REMOVE_DUPLICATES _c) + list(SORT _c) + string(REPLACE ";" " " "${out_var}" "${_c}") +endmacro() -- cgit v1.2.3 From 92622bd42c6698f6fb17841a0a3efcf1089c9c28 Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Sat, 16 Apr 2016 19:50:16 +0200 Subject: removed unnecessary comments (bzr r14761.1.13) --- src/extension/plugins/grid2/CMakeLists.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/extension/plugins/grid2/CMakeLists.txt b/src/extension/plugins/grid2/CMakeLists.txt index 3e18bdef3..f39e259de 100644 --- a/src/extension/plugins/grid2/CMakeLists.txt +++ b/src/extension/plugins/grid2/CMakeLists.txt @@ -6,11 +6,3 @@ add_library(grid2 SHARED ${grid_PART_SRCS}) target_link_libraries(grid2 inkscape_base) -#install(TARGETS kritaartivity DESTINATION ${PLUGIN_INSTALL_DIR}) - -########### install files ############### - -#install(FILES artivity.rc DESTINATION ${DATA_INSTALL_DIR}/kritaplugins) -#install(FILES kritaartivity.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - -#include(CPack) -- cgit v1.2.3 From b4c7da26801e78108f956c0776984fc909d4e2ef Mon Sep 17 00:00:00 2001 From: Raphael Rosch Date: Sat, 16 Apr 2016 17:42:07 -0400 Subject: various filter editor fixes Fixed bugs: - https://launchpad.net/bugs/1570605 - https://launchpad.net/bugs/1570598 (bzr r14856) --- src/ui/dialog/filter-effects-dialog.cpp | 47 ++++++++++++++++++--------------- src/ui/dialog/filter-effects-dialog.h | 2 ++ 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index b70cfcdd4..ce08ed1f7 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -2767,8 +2767,8 @@ FilterEffectsDialog::FilterEffectsDialog() _primitive_box = Gtk::manage(new Gtk::VPaned); #endif + _sw_infobox = Gtk::manage(new Gtk::ScrolledWindow); Gtk::ScrolledWindow* sw_prims = Gtk::manage(new Gtk::ScrolledWindow); - Gtk::ScrolledWindow* sw_infobox = Gtk::manage(new Gtk::ScrolledWindow); Gtk::HBox* infobox = Gtk::manage(new Gtk::HBox(/*homogeneous:*/false, /*spacing:*/4)); Gtk::HBox* hb_prims = Gtk::manage(new Gtk::HBox); Gtk::VBox* vb_prims = Gtk::manage(new Gtk::VBox); @@ -2777,17 +2777,17 @@ FilterEffectsDialog::FilterEffectsDialog() Gtk::VBox* prim_vbox_p = Gtk::manage(new Gtk::VBox); Gtk::VBox* prim_vbox_i = Gtk::manage(new Gtk::VBox); - _primitive_box->pack1(*prim_vbox_p); - _primitive_box->pack2(*prim_vbox_i); + sw_prims->add(_primitive_list); - _getContents()->add(*hpaned); - hpaned->pack1(_filter_modifier); - hpaned->pack2(*_primitive_box); prim_vbox_p->pack_start(*sw_prims, true, true); prim_vbox_i->pack_start(*vb_prims, true, true); - sw_prims->add(_primitive_list); - sw_infobox->add(*infobox); + _primitive_box->pack1(*prim_vbox_p); + _primitive_box->pack2(*prim_vbox_i, false, false); + + hpaned->pack1(_filter_modifier); + hpaned->pack2(*_primitive_box); + _getContents()->add(*hpaned); _infobox_icon.set_alignment(0, 0); _infobox_desc.set_alignment(0, 0); @@ -2795,20 +2795,27 @@ FilterEffectsDialog::FilterEffectsDialog() _infobox_desc.set_line_wrap(true); _infobox_desc.set_size_request(200, -1); - infobox->pack_start(_infobox_icon, false, false); vb_desc->pack_start(_infobox_desc, true, true); + + infobox->pack_start(_infobox_icon, false, false); infobox->pack_start(*vb_desc, true, true); + //_sw_infobox->set_size_request(-1, -1); + _sw_infobox->set_size_request(200, -1); + _sw_infobox->add(*infobox); + + //vb_prims->set_size_request(-1, 50); vb_prims->pack_start(*hb_prims, false, false); - vb_prims->pack_start(*sw_infobox, true, true); - - hb_prims->pack_start(_add_primitive, false, false); + vb_prims->pack_start(*_sw_infobox, true, true); + hb_prims->pack_start(_add_primitive, false, false); hb_prims->pack_start(_add_primitive_type, true, true); - _getContents()->pack_start(_settings_tabs, true, true); + _getContents()->pack_start(_settings_tabs, false, false); _settings_tabs.append_page(_settings_tab1, _("Effect parameters")); _settings_tabs.append_page(_settings_tab2, _("Filter General Settings")); + + _primitive_list.signal_primitive_changed().connect( sigc::mem_fun(*this, &FilterEffectsDialog::update_settings_view)); _filter_modifier.signal_filter_changed().connect( @@ -2819,7 +2826,7 @@ FilterEffectsDialog::FilterEffectsDialog() sw_prims->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); sw_prims->set_shadow_type(Gtk::SHADOW_IN); - sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + _sw_infobox->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); // al_settings->set_padding(0, 0, 12, 0); // fr_settings->set_shadow_type(Gtk::SHADOW_NONE); @@ -2969,11 +2976,9 @@ void FilterEffectsDialog::update_primitive_infobox() { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/options/showfiltersinfobox/value", true)){ - _infobox_icon.show(); - _infobox_desc.show(); + _sw_infobox->show(); } else { - _infobox_icon.hide(); - _infobox_desc.hide(); + _sw_infobox->hide(); } switch(_add_primitive_type.get_active_data()->id){ case(NR_FILTER_BLEND): @@ -3157,11 +3162,9 @@ void FilterEffectsDialog::update_settings_view() Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/options/showfiltersinfobox/value", true)){ - _infobox_icon.show(); - _infobox_desc.show(); + _sw_infobox->show(); } else { - _infobox_icon.hide(); - _infobox_desc.hide(); + _sw_infobox->hide(); } SPFilterPrimitive* prim = _primitive_list.get_selected(); diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 90bde23cf..7c715327e 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -29,6 +29,7 @@ #include #include +#include namespace Inkscape { namespace UI { @@ -279,6 +280,7 @@ private: // Primitives Info Box Gtk::Label _infobox_desc; Gtk::Image _infobox_icon; + Gtk::ScrolledWindow* _sw_infobox; // View/add primitives #if WITH_GTKMM_3_0 -- cgit v1.2.3 From d1a32d975024c9c5597d6efa79ec451c89385795 Mon Sep 17 00:00:00 2001 From: Stefan Zellmann Date: Sun, 17 Apr 2016 14:08:49 +0200 Subject: OS X Xcode clang 7.0.2 compile fix Have no STL headers w/ OS X clang so try to find the C++11 ones (bzr r14855.1.1) --- CMakeScripts/ConfigChecks.cmake | 2 ++ config.h.cmake | 3 +++ 2 files changed, 5 insertions(+) diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index a247f4e72..3d986d8dd 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -59,6 +59,8 @@ CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H) +CHECK_INCLUDE_FILE_CXX(unordered_set HAVE_NATIVE_UNORDERED_SET) + # Enable pango defines, necessary for compilation on Win32, how about Linux? # yes but needs to be done a better way if(HAVE_CAIRO_PDF) diff --git a/config.h.cmake b/config.h.cmake index a63768f74..3471caadf 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -237,6 +237,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_UNISTD_H 1 +/* Define to 1 if you have the header file. */ +#cmakedefine HAVE_NATIVE_UNORDERED_SET 1 + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ZLIB_H 1 -- cgit v1.2.3 From fd7cd4f5ee747d716599c76072e3463a66bacf60 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 17 Apr 2016 15:05:59 +0200 Subject: btool: exlude 'image-menu-item.c' from gtk2 builds Fixed bugs: - https://launchpad.net/bugs/1571282 (bzr r14857) --- build-x64.xml | 1 + build.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/build-x64.xml b/build-x64.xml index ca3adcf58..742f8a399 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -340,6 +340,7 @@ + diff --git a/build.xml b/build.xml index 0705f4f82..a1cd2111b 100644 --- a/build.xml +++ b/build.xml @@ -343,6 +343,7 @@ + -- cgit v1.2.3 From 0e40bf27e9a2381d39099f58850902e427546b35 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sun, 17 Apr 2016 17:57:57 +0200 Subject: Fix make check (bzr r14859) --- test/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index ab73b9e37..8da39d627 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -23,9 +23,10 @@ add_executable(unittest src/attributes-test.cpp src/color-profile-test.cpp src/dir-util-test.cpp - $ ) +target_link_libraries(unittest inkscape_base) + add_dependencies(unittest inkscape_version) set (_optional_unittest_libs ) -- cgit v1.2.3 From d774c8807a87542631ad3ddaf9a703fc9ab7e608 Mon Sep 17 00:00:00 2001 From: "theAdib theadib@gmail.com" <> Date: Tue, 19 Apr 2016 11:50:37 +0200 Subject: fix #1571365 linking on win32 (bzr r14860) --- build-x64.xml | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-x64.xml b/build-x64.xml index 742f8a399..35373a5c9 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -325,7 +325,7 @@ - + diff --git a/build.xml b/build.xml index a1cd2111b..2589eb103 100644 --- a/build.xml +++ b/build.xml @@ -328,7 +328,7 @@ - + -- cgit v1.2.3 From e71c798f2fd8610baaddbb58d103b2ef44d65ccb Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 20 Apr 2016 23:14:10 -0700 Subject: minor warning cleanup. (bzr r14861) --- src/extension/loader.cpp | 4 ++-- src/live_effects/parameter/filletchamferpointarray.cpp | 2 +- src/ui/tools/measure-tool.cpp | 4 ++-- src/unclump.cpp | 8 ++++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp index 32ac4b3b4..110df3ae3 100644 --- a/src/extension/loader.cpp +++ b/src/extension/loader.cpp @@ -59,7 +59,7 @@ Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Docum if( !success ){ // Could not load dependency, we abort const char *res = g_module_error(); - g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.get_name(), res); + g_warning("Unable to load dependency %s of plugin %s.\nDetails: %s\n", dep.get_name(), "", res); return NULL; } } @@ -134,4 +134,4 @@ Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Docum fill-column:99 End: */ -// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: \ No newline at end of file +// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: diff --git a/src/live_effects/parameter/filletchamferpointarray.cpp b/src/live_effects/parameter/filletchamferpointarray.cpp index 117d57460..b321a5831 100644 --- a/src/live_effects/parameter/filletchamferpointarray.cpp +++ b/src/live_effects/parameter/filletchamferpointarray.cpp @@ -491,7 +491,7 @@ std::vector FilletChamferPointArrayParam::get_times(int index, Geom::Pat curve_it1 = subpaths[positions.first][positions.second].duplicate(); Coord it1_length = (*curve_it1).length(tolerance); double time_it1, time_it2, time_it1_B, intpart; - if(_vector.size() <= index){ + if (static_cast(_vector.size()) <= index){ std::vector out; out.push_back(0); out.push_back(1); diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp index 07edf6039..287828d32 100644 --- a/src/ui/tools/measure-tool.cpp +++ b/src/ui/tools/measure-tool.cpp @@ -1287,9 +1287,9 @@ void MeasureTool::showCanvasItems(bool to_guides, bool to_item, bool to_phantom, if(to_guides) { gchar *cross_number; if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true)) { - cross_number= g_strdup_printf(_("Crossing %u"), idx); + cross_number= g_strdup_printf(_("Crossing %lu"), static_cast(idx)); } else { - cross_number= g_strdup_printf(_("Crossing %u"), idx + 1); + cross_number= g_strdup_printf(_("Crossing %lu"), static_cast(idx + 1)); } if (!prefs->getBool("/tools/measure/ignore_1st_and_last", true) && idx == 0) { setGuide(desktop->doc2dt(intersections[idx]), angle + Geom::rad_from_deg(90), ""); diff --git a/src/unclump.cpp b/src/unclump.cpp index 2c6840425..5ec5cfce4 100644 --- a/src/unclump.cpp +++ b/src/unclump.cpp @@ -342,7 +342,9 @@ unclump (std::vector &items) std::list nei; std::list rest; - for(int i=0;i(items.size()); i++) { + rest.push_front(items[items.size() - i - 1]); + } rest.remove(item); while (!rest.empty()) { @@ -352,7 +354,9 @@ unclump (std::vector &items) rest.remove(closest); std::vector new_rest = unclump_remove_behind (item, closest, rest); rest.clear(); - for(int i=0;i(new_rest.size()); i++) { + rest.push_front(new_rest[new_rest.size() - i - 1]); + } } else { break; } -- cgit v1.2.3 From d5d626483bf0568595b4c921b709850e64e6e759 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 22 Apr 2016 17:57:41 +0200 Subject: Correct enumeration names. (bzr r14862) --- src/display/drawing-image.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp index 2a943d16c..e23c89c59 100644 --- a/src/display/drawing-image.cpp +++ b/src/display/drawing-image.cpp @@ -118,14 +118,14 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar // http://www.w3.org/TR/css4-images/#the-image-rendering // style.h/style.cpp switch (_style->image_rendering.computed) { - case SP_CSS_COLOR_RENDERING_AUTO: + case SP_CSS_IMAGE_RENDERING_AUTO: // Do nothing break; - case SP_CSS_COLOR_RENDERING_OPTIMIZEQUALITY: + case SP_CSS_IMAGE_RENDERING_OPTIMIZEQUALITY: // In recent Cairo, BEST used Lanczos3, which is prohibitively slow dc.patternSetFilter( CAIRO_FILTER_GOOD ); break; - case SP_CSS_COLOR_RENDERING_OPTIMIZESPEED: + case SP_CSS_IMAGE_RENDERING_OPTIMIZESPEED: default: dc.patternSetFilter( CAIRO_FILTER_NEAREST ); break; -- cgit v1.2.3 From b8136b3cdbb75028e9eb815e69b735695453d70f Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Wed, 27 Apr 2016 09:29:21 +0200 Subject: Fixed path resolution in plugin loader. (bzr r14862.1.1) --- src/extension/loader.cpp | 2 +- src/extension/loader.h | 6 +++--- src/extension/system.cpp | 13 ++++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp index 110df3ae3..863a176ca 100644 --- a/src/extension/loader.cpp +++ b/src/extension/loader.cpp @@ -74,7 +74,7 @@ Implementation::Implementation *Loader::load_implementation(Inkscape::XML::Docum _getInkscapeVersion GetInkscapeVersion = NULL; // build the path where to look for the plugin - gchar *path = g_build_filename(_baseDirectory, name, (char *) NULL); + gchar *path = g_build_filename(_baseDirectory.c_str(), name, (char *) NULL); module = g_module_open(path, G_MODULE_BIND_LOCAL); g_free(path); diff --git a/src/extension/loader.h b/src/extension/loader.h index 5d48bf861..0d3a69061 100644 --- a/src/extension/loader.h +++ b/src/extension/loader.h @@ -31,7 +31,7 @@ public: * * @param dir is the path where the plugin should be loaded from. */ - void set_base_directory(const gchar *dir) { + void set_base_directory(std::string dir) { _baseDirectory = dir; } @@ -51,7 +51,7 @@ public: Implementation::Implementation *load_implementation(Inkscape::XML::Document *doc); private: - const gchar *_baseDirectory; /**< The base directory to load a plugin from */ + std::string _baseDirectory; /**< The base directory to load a plugin from */ }; @@ -70,4 +70,4 @@ private: fill-column:99 End: */ -// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: \ No newline at end of file +// vim:filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99: diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 6b8e80d3c..3c623455a 100644 --- a/src/extension/system.cpp +++ b/src/extension/system.cpp @@ -47,7 +47,7 @@ namespace Extension { static void open_internal(Inkscape::Extension::Extension *in_plug, gpointer in_data); static void save_internal(Inkscape::Extension::Extension *in_plug, gpointer in_data); -static Extension *build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp); +static Extension *build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp, std::string* baseDir); /** * \return A new document created from the filename passed in @@ -422,7 +422,7 @@ get_print(gchar const *key) * case could apply to modules that are built in (like the SVG load/save functions). */ static Extension * -build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp) +build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation *in_imp, std::string* baseDir) { enum { MODULE_EXTENSION, @@ -490,7 +490,9 @@ build_from_reprdoc(Inkscape::XML::Document *doc, Implementation::Implementation } case MODULE_PLUGIN: { Inkscape::Extension::Loader loader = Inkscape::Extension::Loader(); - loader.set_base_directory ( Inkscape::Application::profile_path("extensions")); + if( baseDir != NULL){ + loader.set_base_directory ( *baseDir ); + } imp = loader.load_implementation(doc); break; } @@ -546,7 +548,8 @@ Extension * build_from_file(gchar const *filename) { Inkscape::XML::Document *doc = sp_repr_read_file(filename, INKSCAPE_EXTENSION_URI); - Extension *ext = build_from_reprdoc(doc, NULL); + std::string dir = Glib::path_get_dirname(filename); + Extension *ext = build_from_reprdoc(doc, NULL, &dir); if (ext != NULL) Inkscape::GC::release(doc); else @@ -568,7 +571,7 @@ build_from_mem(gchar const *buffer, Implementation::Implementation *in_imp) { Inkscape::XML::Document *doc = sp_repr_read_mem(buffer, strlen(buffer), INKSCAPE_EXTENSION_URI); g_return_val_if_fail(doc != NULL, NULL); - Extension *ext = build_from_reprdoc(doc, in_imp); + Extension *ext = build_from_reprdoc(doc, in_imp, NULL); Inkscape::GC::release(doc); return ext; } -- cgit v1.2.3 From f5d66a6633e96b5c847127c75c1691630fe13c95 Mon Sep 17 00:00:00 2001 From: Moritz Eberl Date: Wed, 27 Apr 2016 09:54:17 +0200 Subject: Fixed "make install" to set the right rpath. libinkscape_base.so should now be found correctly. (bzr r14862.1.2) --- CMakeLists.txt | 7 +++---- src/CMakeLists.txt | 10 ++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a181ca04..58fb98350 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,8 @@ project(inkscape) set(INKSCAPE_VERSION 0.91+devel) set(PROJECT_NAME inkscape) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) +SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/") + cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths cmake_policy(SET CMP0005 NEW) # proper define quoting @@ -173,10 +175,7 @@ endforeach() # Installation # ----------------------------------------------------------------------------- if(UNIX) - install( - PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape ${EXECUTABLE_OUTPUT_PATH}/inkview - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - ) + #The install directive for the binaries and libraries are found in src/CMakeList.txt install( FILES ${CMAKE_BINARY_DIR}/inkscape.desktop diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e44eb757d..594464172 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -558,6 +558,8 @@ if (NOT "${WITH_EXT_GDL}") endif() + + # Link the inkscape_base library against all external dependencies target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) @@ -565,3 +567,11 @@ target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) target_link_libraries(inkscape inkscape_base ) target_link_libraries(inkview inkscape_base) +#Define the installation +install( + TARGETS inkscape_base inkscape inkview + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +) + + -- cgit v1.2.3 From 01ed6d62a228ce560c5ed0976b63609efb7076ac Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 29 Apr 2016 14:03:21 +0200 Subject: SVG 2 allows 'href' without 'xlink:'. For now just read plain 'href'. (bzr r14863) --- src/attributes.cpp | 1 + src/attributes.h | 1 + src/color-profile.cpp | 2 ++ src/filters/image.cpp | 2 ++ src/sp-anchor.cpp | 2 ++ src/sp-filter.cpp | 2 ++ src/sp-gradient.cpp | 2 ++ src/sp-hatch.cpp | 2 ++ src/sp-image.cpp | 2 ++ src/sp-pattern.cpp | 2 ++ src/sp-script.cpp | 2 ++ src/sp-tag-use.cpp | 5 ++++- src/sp-tref.cpp | 3 ++- src/sp-tspan.cpp | 2 ++ src/sp-use.cpp | 5 ++++- 15 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/attributes.cpp b/src/attributes.cpp index 646c2ab0c..223ce5803 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -44,6 +44,7 @@ static SPStyleProp const props[] = { {SP_ATTR_INKSCAPE_SPRAY_ORIGIN, "inkscape:spray-origin"}, /* SPAnchor */ {SP_ATTR_XLINK_HREF, "xlink:href"}, + {SP_ATTR_HREF, "href"}, {SP_ATTR_XLINK_TYPE, "xlink:type"}, {SP_ATTR_XLINK_ROLE, "xlink:role"}, {SP_ATTR_XLINK_ARCROLE, "xlink:arcrole"}, diff --git a/src/attributes.h b/src/attributes.h index f5544d0a1..52884e193 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -44,6 +44,7 @@ enum SPAttributeEnum { SP_ATTR_INKSCAPE_SPRAY_ORIGIN, /* SPAnchor */ SP_ATTR_XLINK_HREF, + SP_ATTR_HREF, // SVG2 allows href without xlink SP_ATTR_XLINK_TYPE, SP_ATTR_XLINK_ROLE, SP_ATTR_XLINK_ARCROLE, diff --git a/src/color-profile.cpp b/src/color-profile.cpp index bcefe994a..99c62ecb3 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -271,6 +271,7 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) { SPObject::build(document, repr); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); this->readAttr( "id" ); this->readAttr( "local" ); this->readAttr( "name" ); @@ -289,6 +290,7 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) { void ColorProfile::set(unsigned key, gchar const *value) { switch (key) { case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if ( this->href ) { g_free( this->href ); this->href = 0; diff --git a/src/filters/image.cpp b/src/filters/image.cpp index 62e8b76b9..50ae5b38f 100644 --- a/src/filters/image.cpp +++ b/src/filters/image.cpp @@ -53,6 +53,7 @@ void SPFeImage::build(SPDocument *document, Inkscape::XML::Node *repr) this->readAttr( "preserveAspectRatio" ); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); } /** @@ -95,6 +96,7 @@ void SPFeImage::set(unsigned int key, gchar const *value) { switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if (this->href) { g_free(this->href); } diff --git a/src/sp-anchor.cpp b/src/sp-anchor.cpp index 78ba10c13..39bba610e 100644 --- a/src/sp-anchor.cpp +++ b/src/sp-anchor.cpp @@ -38,6 +38,7 @@ void SPAnchor::build(SPDocument *document, Inkscape::XML::Node *repr) { this->readAttr( "xlink:show" ); this->readAttr( "xlink:actuate" ); this->readAttr( "xlink:href" ); + this->readAttr( "xlink" ); this->readAttr( "target" ); } @@ -53,6 +54,7 @@ void SPAnchor::release() { void SPAnchor::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: g_free(this->href); this->href = g_strdup(value); this->requestModified(SP_OBJECT_MODIFIED_FLAG); diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp index c17c67fc5..4d9aed9c8 100644 --- a/src/sp-filter.cpp +++ b/src/sp-filter.cpp @@ -79,6 +79,7 @@ void SPFilter::build(SPDocument *document, Inkscape::XML::Node *repr) { this->readAttr( "height" ); this->readAttr( "filterRes" ); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); this->_refcount = 0; SPObject::build(document, repr); @@ -173,6 +174,7 @@ void SPFilter::set(unsigned int key, gchar const *value) { this->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if (value) { try { this->href->attach(Inkscape::URI(value)); diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index 854d53dc4..b0a996ab1 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -287,6 +287,7 @@ void SPGradient::build(SPDocument *document, Inkscape::XML::Node *repr) this->readAttr( "gradientTransform" ); this->readAttr( "spreadMethod" ); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); this->readAttr( "osb:paint" ); // Register ourselves @@ -375,6 +376,7 @@ void SPGradient::set(unsigned key, gchar const *value) break; case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if (value) { try { this->ref->attach(Inkscape::URI(value)); diff --git a/src/sp-hatch.cpp b/src/sp-hatch.cpp index 2d938618c..274b73e86 100644 --- a/src/sp-hatch.cpp +++ b/src/sp-hatch.cpp @@ -73,6 +73,7 @@ void SPHatch::build(SPDocument* doc, Inkscape::XML::Node* repr) readAttr("pitch"); readAttr("rotate"); readAttr("xlink:href"); + readAttr("href"); readAttr( "style" ); // Register ourselves @@ -196,6 +197,7 @@ void SPHatch::set(unsigned int key, const gchar* value) break; case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if (value && href == value) { // Href unchanged, do nothing. } else { diff --git a/src/sp-image.cpp b/src/sp-image.cpp index bf5b9ebcd..efa70ffdf 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -137,6 +137,7 @@ void SPImage::build(SPDocument *document, Inkscape::XML::Node *repr) { SPItem::build(document, repr); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); this->readAttr( "x" ); this->readAttr( "y" ); this->readAttr( "width" ); @@ -179,6 +180,7 @@ void SPImage::release() { void SPImage::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: g_free (this->href); this->href = (value) ? g_strdup (value) : NULL; this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_IMAGE_HREF_MODIFIED_FLAG); diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 55110f3c5..721df31f4 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -75,6 +75,7 @@ void SPPattern::build(SPDocument *doc, Inkscape::XML::Node *repr) this->readAttr("viewBox"); this->readAttr("preserveAspectRatio"); this->readAttr("xlink:href"); + this->readAttr("href"); /* Register ourselves */ doc->addResource("pattern", this); @@ -182,6 +183,7 @@ void SPPattern::set(unsigned int key, const gchar *value) break; case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if (value && this->href == value) { /* Href unchanged, do nothing. */ } diff --git a/src/sp-script.cpp b/src/sp-script.cpp index f1ea9c9bd..78a6544b3 100644 --- a/src/sp-script.cpp +++ b/src/sp-script.cpp @@ -28,6 +28,7 @@ void SPScript::build(SPDocument* doc, Inkscape::XML::Node* repr) { //Read values of key attributes from XML nodes into object. this->readAttr( "xlink:href" ); + this->readAttr( "href" ); doc->addResource("script", this); } @@ -58,6 +59,7 @@ void SPScript::modified(unsigned int /*flags*/) { void SPScript::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: if (this->xlinkhref) { g_free(this->xlinkhref); } diff --git a/src/sp-tag-use.cpp b/src/sp-tag-use.cpp index 935f7429e..b891c8fa0 100644 --- a/src/sp-tag-use.cpp +++ b/src/sp-tag-use.cpp @@ -55,6 +55,7 @@ SPTagUse::build(SPDocument *document, Inkscape::XML::Node *repr) { SPObject::build(document, repr); readAttr( "xlink:href" ); + readAttr( "href" ); // We don't need to create child here: // reading xlink:href will attach ref, and that will cause the changed signal to be emitted, @@ -85,7 +86,9 @@ SPTagUse::set(unsigned key, gchar const *value) { switch (key) { - case SP_ATTR_XLINK_HREF: { + case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: + { if ( value && href && ( strcmp(value, href) == 0 ) ) { /* No change, do nothing. */ } else { diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index ba592058b..7dd00eba5 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -67,6 +67,7 @@ void SPTRef::build(SPDocument *document, Inkscape::XML::Node *repr) { SPItem::build(document, repr); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); this->readAttr( "x" ); this->readAttr( "y" ); this->readAttr( "dx" ); @@ -94,7 +95,7 @@ void SPTRef::set(unsigned int key, const gchar* value) { if (this->attributes.readSingleAttribute(key, value, style, &viewport)) { // x, y, dx, dy, rotate this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - } else if (key == SP_ATTR_XLINK_HREF) { // xlink:href + } else if (key == SP_ATTR_XLINK_HREF || key == SP_ATTR_HREF ) { // xlink:href if ( !value ) { // No value g_free(this->href); diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp index 05f8430ba..d4fbddffb 100644 --- a/src/sp-tspan.cpp +++ b/src/sp-tspan.cpp @@ -245,6 +245,7 @@ void SPTextPath::build(SPDocument *doc, Inkscape::XML::Node *repr) { this->readAttr( "rotate" ); this->readAttr( "startOffset" ); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); bool no_content = true; @@ -283,6 +284,7 @@ void SPTextPath::set(unsigned int key, const gchar* value) { } else { switch (key) { case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: this->sourcePath->link((char*)value); break; case SP_ATTR_STARTOFFSET: diff --git a/src/sp-use.cpp b/src/sp-use.cpp index c8a0830c1..bf91d52b7 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -82,6 +82,7 @@ void SPUse::build(SPDocument *document, Inkscape::XML::Node *repr) { this->readAttr( "width" ); this->readAttr( "height" ); this->readAttr( "xlink:href" ); + this->readAttr( "href" ); // We don't need to create child here: // reading xlink:href will attach ref, and that will cause the changed signal to be emitted, @@ -128,7 +129,9 @@ void SPUse::set(unsigned int key, const gchar* value) { this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_XLINK_HREF: { + case SP_ATTR_XLINK_HREF: + case SP_ATTR_HREF: + { if ( value && this->href && ( strcmp(value, this->href) == 0 ) ) { /* No change, do nothing. */ } else { -- cgit v1.2.3 From a6a6de5c06d3183329d73fa39ae0ba02bbd838e1 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 29 Apr 2016 18:12:37 +0200 Subject: Backout last commit as it introduced subtle errors. (bzr r14864) --- src/attributes.cpp | 1 - src/attributes.h | 1 - src/color-profile.cpp | 2 -- src/filters/image.cpp | 2 -- src/sp-anchor.cpp | 2 -- src/sp-filter.cpp | 2 -- src/sp-gradient.cpp | 2 -- src/sp-hatch.cpp | 2 -- src/sp-image.cpp | 2 -- src/sp-pattern.cpp | 2 -- src/sp-script.cpp | 2 -- src/sp-tag-use.cpp | 5 +---- src/sp-tref.cpp | 3 +-- src/sp-tspan.cpp | 2 -- src/sp-use.cpp | 5 +---- 15 files changed, 3 insertions(+), 32 deletions(-) diff --git a/src/attributes.cpp b/src/attributes.cpp index 223ce5803..646c2ab0c 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -44,7 +44,6 @@ static SPStyleProp const props[] = { {SP_ATTR_INKSCAPE_SPRAY_ORIGIN, "inkscape:spray-origin"}, /* SPAnchor */ {SP_ATTR_XLINK_HREF, "xlink:href"}, - {SP_ATTR_HREF, "href"}, {SP_ATTR_XLINK_TYPE, "xlink:type"}, {SP_ATTR_XLINK_ROLE, "xlink:role"}, {SP_ATTR_XLINK_ARCROLE, "xlink:arcrole"}, diff --git a/src/attributes.h b/src/attributes.h index 52884e193..f5544d0a1 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -44,7 +44,6 @@ enum SPAttributeEnum { SP_ATTR_INKSCAPE_SPRAY_ORIGIN, /* SPAnchor */ SP_ATTR_XLINK_HREF, - SP_ATTR_HREF, // SVG2 allows href without xlink SP_ATTR_XLINK_TYPE, SP_ATTR_XLINK_ROLE, SP_ATTR_XLINK_ARCROLE, diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 99c62ecb3..bcefe994a 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -271,7 +271,6 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) { SPObject::build(document, repr); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); this->readAttr( "id" ); this->readAttr( "local" ); this->readAttr( "name" ); @@ -290,7 +289,6 @@ void ColorProfile::build(SPDocument *document, Inkscape::XML::Node *repr) { void ColorProfile::set(unsigned key, gchar const *value) { switch (key) { case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if ( this->href ) { g_free( this->href ); this->href = 0; diff --git a/src/filters/image.cpp b/src/filters/image.cpp index 50ae5b38f..62e8b76b9 100644 --- a/src/filters/image.cpp +++ b/src/filters/image.cpp @@ -53,7 +53,6 @@ void SPFeImage::build(SPDocument *document, Inkscape::XML::Node *repr) this->readAttr( "preserveAspectRatio" ); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); } /** @@ -96,7 +95,6 @@ void SPFeImage::set(unsigned int key, gchar const *value) { switch(key) { /*DEAL WITH SETTING ATTRIBUTES HERE*/ case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if (this->href) { g_free(this->href); } diff --git a/src/sp-anchor.cpp b/src/sp-anchor.cpp index 39bba610e..78ba10c13 100644 --- a/src/sp-anchor.cpp +++ b/src/sp-anchor.cpp @@ -38,7 +38,6 @@ void SPAnchor::build(SPDocument *document, Inkscape::XML::Node *repr) { this->readAttr( "xlink:show" ); this->readAttr( "xlink:actuate" ); this->readAttr( "xlink:href" ); - this->readAttr( "xlink" ); this->readAttr( "target" ); } @@ -54,7 +53,6 @@ void SPAnchor::release() { void SPAnchor::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: g_free(this->href); this->href = g_strdup(value); this->requestModified(SP_OBJECT_MODIFIED_FLAG); diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp index 4d9aed9c8..c17c67fc5 100644 --- a/src/sp-filter.cpp +++ b/src/sp-filter.cpp @@ -79,7 +79,6 @@ void SPFilter::build(SPDocument *document, Inkscape::XML::Node *repr) { this->readAttr( "height" ); this->readAttr( "filterRes" ); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); this->_refcount = 0; SPObject::build(document, repr); @@ -174,7 +173,6 @@ void SPFilter::set(unsigned int key, gchar const *value) { this->requestModified(SP_OBJECT_MODIFIED_FLAG); break; case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if (value) { try { this->href->attach(Inkscape::URI(value)); diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index b0a996ab1..854d53dc4 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -287,7 +287,6 @@ void SPGradient::build(SPDocument *document, Inkscape::XML::Node *repr) this->readAttr( "gradientTransform" ); this->readAttr( "spreadMethod" ); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); this->readAttr( "osb:paint" ); // Register ourselves @@ -376,7 +375,6 @@ void SPGradient::set(unsigned key, gchar const *value) break; case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if (value) { try { this->ref->attach(Inkscape::URI(value)); diff --git a/src/sp-hatch.cpp b/src/sp-hatch.cpp index 274b73e86..2d938618c 100644 --- a/src/sp-hatch.cpp +++ b/src/sp-hatch.cpp @@ -73,7 +73,6 @@ void SPHatch::build(SPDocument* doc, Inkscape::XML::Node* repr) readAttr("pitch"); readAttr("rotate"); readAttr("xlink:href"); - readAttr("href"); readAttr( "style" ); // Register ourselves @@ -197,7 +196,6 @@ void SPHatch::set(unsigned int key, const gchar* value) break; case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if (value && href == value) { // Href unchanged, do nothing. } else { diff --git a/src/sp-image.cpp b/src/sp-image.cpp index efa70ffdf..bf5b9ebcd 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -137,7 +137,6 @@ void SPImage::build(SPDocument *document, Inkscape::XML::Node *repr) { SPItem::build(document, repr); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); this->readAttr( "x" ); this->readAttr( "y" ); this->readAttr( "width" ); @@ -180,7 +179,6 @@ void SPImage::release() { void SPImage::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: g_free (this->href); this->href = (value) ? g_strdup (value) : NULL; this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_IMAGE_HREF_MODIFIED_FLAG); diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 721df31f4..55110f3c5 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -75,7 +75,6 @@ void SPPattern::build(SPDocument *doc, Inkscape::XML::Node *repr) this->readAttr("viewBox"); this->readAttr("preserveAspectRatio"); this->readAttr("xlink:href"); - this->readAttr("href"); /* Register ourselves */ doc->addResource("pattern", this); @@ -183,7 +182,6 @@ void SPPattern::set(unsigned int key, const gchar *value) break; case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if (value && this->href == value) { /* Href unchanged, do nothing. */ } diff --git a/src/sp-script.cpp b/src/sp-script.cpp index 78a6544b3..f1ea9c9bd 100644 --- a/src/sp-script.cpp +++ b/src/sp-script.cpp @@ -28,7 +28,6 @@ void SPScript::build(SPDocument* doc, Inkscape::XML::Node* repr) { //Read values of key attributes from XML nodes into object. this->readAttr( "xlink:href" ); - this->readAttr( "href" ); doc->addResource("script", this); } @@ -59,7 +58,6 @@ void SPScript::modified(unsigned int /*flags*/) { void SPScript::set(unsigned int key, const gchar* value) { switch (key) { case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: if (this->xlinkhref) { g_free(this->xlinkhref); } diff --git a/src/sp-tag-use.cpp b/src/sp-tag-use.cpp index b891c8fa0..935f7429e 100644 --- a/src/sp-tag-use.cpp +++ b/src/sp-tag-use.cpp @@ -55,7 +55,6 @@ SPTagUse::build(SPDocument *document, Inkscape::XML::Node *repr) { SPObject::build(document, repr); readAttr( "xlink:href" ); - readAttr( "href" ); // We don't need to create child here: // reading xlink:href will attach ref, and that will cause the changed signal to be emitted, @@ -86,9 +85,7 @@ SPTagUse::set(unsigned key, gchar const *value) { switch (key) { - case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: - { + case SP_ATTR_XLINK_HREF: { if ( value && href && ( strcmp(value, href) == 0 ) ) { /* No change, do nothing. */ } else { diff --git a/src/sp-tref.cpp b/src/sp-tref.cpp index 7dd00eba5..ba592058b 100644 --- a/src/sp-tref.cpp +++ b/src/sp-tref.cpp @@ -67,7 +67,6 @@ void SPTRef::build(SPDocument *document, Inkscape::XML::Node *repr) { SPItem::build(document, repr); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); this->readAttr( "x" ); this->readAttr( "y" ); this->readAttr( "dx" ); @@ -95,7 +94,7 @@ void SPTRef::set(unsigned int key, const gchar* value) { if (this->attributes.readSingleAttribute(key, value, style, &viewport)) { // x, y, dx, dy, rotate this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - } else if (key == SP_ATTR_XLINK_HREF || key == SP_ATTR_HREF ) { // xlink:href + } else if (key == SP_ATTR_XLINK_HREF) { // xlink:href if ( !value ) { // No value g_free(this->href); diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp index d4fbddffb..05f8430ba 100644 --- a/src/sp-tspan.cpp +++ b/src/sp-tspan.cpp @@ -245,7 +245,6 @@ void SPTextPath::build(SPDocument *doc, Inkscape::XML::Node *repr) { this->readAttr( "rotate" ); this->readAttr( "startOffset" ); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); bool no_content = true; @@ -284,7 +283,6 @@ void SPTextPath::set(unsigned int key, const gchar* value) { } else { switch (key) { case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: this->sourcePath->link((char*)value); break; case SP_ATTR_STARTOFFSET: diff --git a/src/sp-use.cpp b/src/sp-use.cpp index bf91d52b7..c8a0830c1 100644 --- a/src/sp-use.cpp +++ b/src/sp-use.cpp @@ -82,7 +82,6 @@ void SPUse::build(SPDocument *document, Inkscape::XML::Node *repr) { this->readAttr( "width" ); this->readAttr( "height" ); this->readAttr( "xlink:href" ); - this->readAttr( "href" ); // We don't need to create child here: // reading xlink:href will attach ref, and that will cause the changed signal to be emitted, @@ -129,9 +128,7 @@ void SPUse::set(unsigned int key, const gchar* value) { this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); break; - case SP_ATTR_XLINK_HREF: - case SP_ATTR_HREF: - { + case SP_ATTR_XLINK_HREF: { if ( value && this->href && ( strcmp(value, this->href) == 0 ) ) { /* No change, do nothing. */ } else { -- cgit v1.2.3 From d9336a5d49750009f92498091ba1f8c4483a1cb4 Mon Sep 17 00:00:00 2001 From: firashanife Date: Sun, 1 May 2016 18:45:49 +0200 Subject: Translations. Italian translation update. Fixed bugs: - https://launchpad.net/bugs/1574561 (bzr r14865) --- TRANSLATORS | 2 +- po/it.po | 15436 ++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 9526 insertions(+), 5912 deletions(-) diff --git a/TRANSLATORS b/TRANSLATORS index c1b83477f..e38f1f2d0 100644 --- a/TRANSLATORS +++ b/TRANSLATORS @@ -41,7 +41,7 @@ Duarte Loreto 2002, 2003 (Maintainer). Elias Norberg , 2009. Equipe de Tradução Inkscape Brasil , 2007. Fatih Demir , 2000. -Firas Hanife , 2014-2015. +Firas Hanife , 2014-2016. Foppe Benedictus , 2007-2009. Francesc Dorca , 2003. Traducció sodipodi. Francisco Javier F. Serrador , 2003. diff --git a/po/it.po b/po/it.po index 2a1a16d00..3a38eea67 100644 --- a/po/it.po +++ b/po/it.po @@ -5,14 +5,15 @@ # Alessio Frusciante , 2002-2003. # Luca Ferretti , 2005. # Luca Bruno , 2005-2009. -# Firas Hanife , 2014. +# Firas Hanife , 2014-2016. # +#: ../src/ui/dialog/clonetiler.cpp:1010 msgid "" msgstr "" -"Project-Id-Version: Inkscape 0.91\n" +"Project-Id-Version: Inkscape 0.91+devel\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-11-14 17:53+0100\n" -"PO-Revision-Date: 2014-11-18 18:00+0100\n" +"POT-Creation-Date: 2016-04-24 18:48+0200\n" +"PO-Revision-Date: 2016-04-24 19:00+0100\n" "Last-Translator: Firas Hanife \n" "Language-Team: \n" "Language: it\n" @@ -21,14 +22,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../inkscape.desktop.in.h:1 +#: ../inkscape.appdata.xml.in.h:1 ../inkscape.desktop.in.h:1 msgid "Inkscape" msgstr "Inkscape" -#: ../inkscape.desktop.in.h:2 +#: ../inkscape.appdata.xml.in.h:2 ../inkscape.desktop.in.h:2 msgid "Vector Graphics Editor" msgstr "Grafica vettoriale SVG" +#: ../inkscape.appdata.xml.in.h:3 +msgid "" +"An Open Source vector graphics editor, with capabilities similar to " +"Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " +"Graphics (SVG) file format." +msgstr "" + +#: ../inkscape.appdata.xml.in.h:4 +msgid "" +"Inkscape supports many advanced SVG features (markers, clones, alpha " +"blending, etc.) and great care is taken in designing a streamlined " +"interface. It is very easy to edit nodes, perform complex path operations, " +"trace bitmaps and much more. We also aim to maintain a thriving user and " +"developer community by using open, community-oriented development." +msgstr "" + +#: ../inkscape.appdata.xml.in.h:5 +#, fuzzy +msgid "Main application window" +msgstr "Duplic_a finestra" + #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" msgstr "Inkscape - Grafica vettoriale SVG" @@ -38,6 +60,10 @@ msgid "Create and edit Scalable Vector Graphics images" msgstr "Crea e modifica immagini Scalable Vector Graphics" #: ../inkscape.desktop.in.h:5 +msgid "image;editor;vector;drawing;" +msgstr "" + +#: ../inkscape.desktop.in.h:6 msgid "New Drawing" msgstr "Nuovo disegno" @@ -297,7 +323,7 @@ msgstr "Simula lo stile dei dipinti ad olio" #. Pencil #: ../share/filters/filters.svg.h:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:421 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 msgid "Pencil" msgstr "Pastello" @@ -668,7 +694,7 @@ msgstr "Buco nero" #: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 #: ../src/extension/internal/filter/morphology.h:76 #: ../src/extension/internal/filter/morphology.h:203 -#: ../src/filter-enums.cpp:31 +#: ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "Morfologia" @@ -1047,26 +1073,27 @@ msgstr "Luce nera" #: ../src/extension/internal/filter/bumps.h:101 #: ../src/extension/internal/filter/bumps.h:321 #: ../src/extension/internal/filter/bumps.h:328 -#: ../src/extension/internal/filter/color.h:82 -#: ../src/extension/internal/filter/color.h:164 -#: ../src/extension/internal/filter/color.h:171 -#: ../src/extension/internal/filter/color.h:262 -#: ../src/extension/internal/filter/color.h:340 -#: ../src/extension/internal/filter/color.h:347 -#: ../src/extension/internal/filter/color.h:437 -#: ../src/extension/internal/filter/color.h:532 -#: ../src/extension/internal/filter/color.h:654 -#: ../src/extension/internal/filter/color.h:751 -#: ../src/extension/internal/filter/color.h:830 -#: ../src/extension/internal/filter/color.h:921 -#: ../src/extension/internal/filter/color.h:1049 -#: ../src/extension/internal/filter/color.h:1119 -#: ../src/extension/internal/filter/color.h:1212 -#: ../src/extension/internal/filter/color.h:1324 -#: ../src/extension/internal/filter/color.h:1429 -#: ../src/extension/internal/filter/color.h:1505 -#: ../src/extension/internal/filter/color.h:1609 -#: ../src/extension/internal/filter/color.h:1616 +#: ../src/extension/internal/filter/color.h:83 +#: ../src/extension/internal/filter/color.h:165 +#: ../src/extension/internal/filter/color.h:172 +#: ../src/extension/internal/filter/color.h:283 +#: ../src/extension/internal/filter/color.h:337 +#: ../src/extension/internal/filter/color.h:415 +#: ../src/extension/internal/filter/color.h:422 +#: ../src/extension/internal/filter/color.h:512 +#: ../src/extension/internal/filter/color.h:607 +#: ../src/extension/internal/filter/color.h:729 +#: ../src/extension/internal/filter/color.h:826 +#: ../src/extension/internal/filter/color.h:905 +#: ../src/extension/internal/filter/color.h:996 +#: ../src/extension/internal/filter/color.h:1124 +#: ../src/extension/internal/filter/color.h:1194 +#: ../src/extension/internal/filter/color.h:1287 +#: ../src/extension/internal/filter/color.h:1399 +#: ../src/extension/internal/filter/color.h:1504 +#: ../src/extension/internal/filter/color.h:1580 +#: ../src/extension/internal/filter/color.h:1684 +#: ../src/extension/internal/filter/color.h:1691 #: ../src/extension/internal/filter/morphology.h:194 #: ../src/extension/internal/filter/overlays.h:73 #: ../src/extension/internal/filter/paint.h:99 @@ -1074,9 +1101,9 @@ msgstr "Luce nera" #: ../src/extension/internal/filter/paint.h:717 #: ../src/extension/internal/filter/shadows.h:73 #: ../src/extension/internal/filter/transparency.h:345 -#: ../src/filter-enums.cpp:66 ../src/ui/dialog/clonetiler.cpp:832 -#: ../src/ui/dialog/clonetiler.cpp:983 -#: ../src/ui/dialog/document-properties.cpp:157 +#: ../src/filter-enums.cpp:67 ../src/ui/dialog/clonetiler.cpp:828 +#: ../src/ui/dialog/clonetiler.cpp:979 +#: ../src/ui/dialog/document-properties.cpp:165 #: ../share/extensions/color_HSL_adjust.inx.h:20 #: ../share/extensions/color_blackandwhite.inx.h:3 #: ../share/extensions/color_brighter.inx.h:2 @@ -1091,13 +1118,13 @@ msgstr "Luce nera" #: ../share/extensions/color_morelight.inx.h:2 #: ../share/extensions/color_moresaturation.inx.h:2 #: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_randomize.inx.h:14 #: ../share/extensions/color_removeblue.inx.h:2 #: ../share/extensions/color_removegreen.inx.h:2 #: ../share/extensions/color_removered.inx.h:2 #: ../share/extensions/color_replace.inx.h:6 #: ../share/extensions/color_rgbbarrel.inx.h:2 -#: ../share/extensions/interp_att_g.inx.h:19 +#: ../share/extensions/interp_att_g.inx.h:21 msgid "Color" msgstr "Colore" @@ -4384,88 +4411,8 @@ msgid "New Wheelchair Accessible" msgstr "Nuovo Accessibile alle sedie a rotelle" #: ../share/templates/templates.h:1 -msgid "A4 Landscape Page" -msgstr "Pagina A4 Orizzontale" - -#: ../share/templates/templates.h:1 -msgid "Empty A4 landscape sheet" -msgstr "Foglio A4 orizzontale vuoto" - -#: ../share/templates/templates.h:1 -msgid "A4 paper sheet empty landscape" -msgstr "A4 pagina foglio vuoto orizzontale" - -#: ../share/templates/templates.h:1 -msgid "A4 Page" -msgstr "Pagina A4" - -#: ../share/templates/templates.h:1 -msgid "Empty A4 sheet" -msgstr "Foglio A4 vuoto" - -#: ../share/templates/templates.h:1 -msgid "A4 paper sheet empty" -msgstr "A4 pagina foglio vuoto" - -#: ../share/templates/templates.h:1 -msgid "Black Opaque" -msgstr "Nero opaco" - -#: ../share/templates/templates.h:1 -msgid "Empty black page" -msgstr "Pagina nera vuota" - -#: ../share/templates/templates.h:1 -msgid "black opaque empty" -msgstr "nero opaco vuoto" - -#: ../share/templates/templates.h:1 -msgid "White Opaque" -msgstr "Bianco opaco" - -#: ../share/templates/templates.h:1 -msgid "Empty white page" -msgstr "Pagina bianca vuota" - -#: ../share/templates/templates.h:1 -msgid "white opaque empty" -msgstr "bianco opaco vuoto" - -#: ../share/templates/templates.h:1 -msgid "Business Card 85x54mm" -msgstr "Biglietto da visita 85x54mm" - -#: ../share/templates/templates.h:1 -msgid "Empty business card template." -msgstr "Modello biglietto da visita vuoto." - -#: ../share/templates/templates.h:1 -msgid "business card empty 85x54" -msgstr "biglietto visita vuoto 85x54" - -#: ../share/templates/templates.h:1 -msgid "Business Card 90x50mm" -msgstr "Biglietto da visita 90x50mm" - -#: ../share/templates/templates.h:1 -msgid "business card empty 90x50" -msgstr "biglietto visita vuoto 90x50" - -#: ../share/templates/templates.h:1 -msgid "CD Cover 300dpi" -msgstr "Cover CD 300dpi" - -#: ../share/templates/templates.h:1 -msgid "Empty CD box cover." -msgstr "Cover CD vuota." - -#: ../share/templates/templates.h:1 -msgid "CD cover disc disk 300dpi box" -msgstr "CD cover disco 300dpi" - -#: ../share/templates/templates.h:1 -msgid "CD Label 120x120 " -msgstr "Etichetta CD 120x120 " +msgid "CD Label 120mmx120mm " +msgstr "Etichetta CD 120mmx120mm " #: ../share/templates/templates.h:1 msgid "Simple CD Label template with disc's pattern." @@ -4475,182 +4422,6 @@ msgstr "Semplice modello di etichetta per CD." msgid "CD label 120x120 disc disk" msgstr "CD etichetta 120x120 disco" -#: ../share/templates/templates.h:1 -msgid "DVD Cover Regular 300dpi " -msgstr "Cover DVD Normale 300dpi " - -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD covers." -msgstr "Modello per cover DVD fronte-retro." - -#: ../share/templates/templates.h:1 -msgid "DVD cover regular 300dpi" -msgstr "DVD cover normale 300dpi" - -#: ../share/templates/templates.h:1 -msgid "DVD Cover Slim 300dpi " -msgstr "Cover DVD slim 300dpi " - -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD slim covers." -msgstr "Modello per cover DVD slim fronte-retro." - -#: ../share/templates/templates.h:1 -msgid "DVD cover slim 300dpi" -msgstr "DVD cover slim 300dpi" - -#: ../share/templates/templates.h:1 -msgid "DVD Cover Superslim 300dpi " -msgstr "Cover DVD superslim 300dpi " - -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD superslim covers." -msgstr "Modello per cover DVD fronte-retro superslim." - -#: ../share/templates/templates.h:1 -msgid "DVD cover superslim 300dpi" -msgstr "DVD cover superslim 300dpi" - -#: ../share/templates/templates.h:1 -msgid "DVD Cover Ultraslim 300dpi " -msgstr "Cover DVD ultraslim 300dpi " - -#: ../share/templates/templates.h:1 -msgid "Template for both-sides DVD ultraslim covers." -msgstr "Modello per cover DVD ultraslim fronte-retro." - -#: ../share/templates/templates.h:1 -msgid "DVD cover ultraslim 300dpi" -msgstr "DVD cover ultraslim 300dpi" - -#: ../share/templates/templates.h:1 -msgid "Desktop 1024x768" -msgstr "Desktop 1024x768" - -#: ../share/templates/templates.h:1 -msgid "Empty desktop size sheet" -msgstr "Foglio dimensione desktop vuoto" - -#: ../share/templates/templates.h:1 -msgid "desktop 1024x768 wallpaper" -msgstr "desktop 1024x768 wallpaper" - -#: ../share/templates/templates.h:1 -msgid "Desktop 1600x1200" -msgstr "Desktop 1600x1200" - -#: ../share/templates/templates.h:1 -msgid "desktop 1600x1200 wallpaper" -msgstr "desktop 1600x1200 wallpaper" - -#: ../share/templates/templates.h:1 -msgid "Desktop 640x480" -msgstr "Desktop 640x480" - -#: ../share/templates/templates.h:1 -msgid "desktop 640x480 wallpaper" -msgstr "desktop 640x480 wallpaper" - -#: ../share/templates/templates.h:1 -msgid "Desktop 800x600" -msgstr "Desktop 800x600" - -#: ../share/templates/templates.h:1 -msgid "desktop 800x600 wallpaper" -msgstr "desktop 800x600 wallpaper" - -#: ../share/templates/templates.h:1 -msgid "Fontforge Glyph" -msgstr "Glifo Fontforge" - -#: ../share/templates/templates.h:1 -msgid "font fontforge glyph 1000x1000" -msgstr "font fontforge glifo 1000x1000" - -#: ../share/templates/templates.h:1 -msgid "Icon 16x16" -msgstr "Icona 16x16" - -#: ../share/templates/templates.h:1 -msgid "Small 16x16 icon template." -msgstr "Modello icona piccola 16x16." - -#: ../share/templates/templates.h:1 -msgid "icon 16x16 empty" -msgstr "icona 16x16 vuota" - -#: ../share/templates/templates.h:1 -msgid "Icon 32x32" -msgstr "Icona 32x32" - -#: ../share/templates/templates.h:1 -msgid "32x32 icon template." -msgstr "Modello icona 32x32." - -#: ../share/templates/templates.h:1 -msgid "icon 32x32 empty" -msgstr "icona 32x32 vuota" - -#: ../share/templates/templates.h:1 -msgid "Icon 48x48" -msgstr "Icona 48x48" - -#: ../share/templates/templates.h:1 -msgid "48x48 icon template." -msgstr "Modello icona 48x48." - -#: ../share/templates/templates.h:1 -msgid "icon 48x48 empty" -msgstr "icona 48x48 vuota" - -#: ../share/templates/templates.h:1 -msgid "Icon 64x64" -msgstr "Icona 64x64" - -#: ../share/templates/templates.h:1 -msgid "64x64 icon template." -msgstr "Modello icona 64x64." - -#: ../share/templates/templates.h:1 -msgid "icon 64x64 empty" -msgstr "icona 64x64 vuota" - -#: ../share/templates/templates.h:1 -msgid "Letter Landscape" -msgstr "Letter Orizzontale" - -#: ../share/templates/templates.h:1 -msgid "Standard letter landscape sheet - 792x612" -msgstr "Foglio letter standard orizzontale - 792x612" - -#: ../share/templates/templates.h:1 -msgid "letter landscape 792x612 empty" -msgstr "letter orizzontale 792x612 vuoto" - -#: ../share/templates/templates.h:1 -msgid "Letter" -msgstr "Letter" - -#: ../share/templates/templates.h:1 -msgid "Standard letter sheet - 612x792" -msgstr "Foglio letter standard - 612x792" - -#: ../share/templates/templates.h:1 -msgid "letter 612x792 empty" -msgstr "letter 612x792 vuoto" - -#: ../share/templates/templates.h:1 -msgid "No Borders" -msgstr "Nessun bordo" - -#: ../share/templates/templates.h:1 -msgid "Empty sheet with no borders" -msgstr "Foglio vuoto senza bordi" - -#: ../share/templates/templates.h:1 -msgid "no borders empty" -msgstr "no bordi vuoto" - #: ../share/templates/templates.h:1 msgid "No Layers" msgstr "Nessun livello" @@ -4663,66 +4434,6 @@ msgstr "Foglio vuoto senza livelli" msgid "no layers empty" msgstr "no livelli vuoto" -#: ../share/templates/templates.h:1 -msgid "Video HDTV 1920x1080" -msgstr "Video HDTV 1920x1080" - -#: ../share/templates/templates.h:1 -msgid "HDTV video template for 1920x1080 resolution." -msgstr "Modello video HDTV per risoluzione 1920x1080." - -#: ../share/templates/templates.h:1 -msgid "HDTV video empty 1920x1080" -msgstr "HDTV video vuoto 1920x1080" - -#: ../share/templates/templates.h:1 -msgid "Video NTSC 720x486" -msgstr "Video NTSC 720x486" - -#: ../share/templates/templates.h:1 -msgid "NTSC video template for 720x486 resolution." -msgstr "Modello video NTSC per risoluzione 720x486." - -#: ../share/templates/templates.h:1 -msgid "NTSC video empty 720x486" -msgstr "NTSC video vuoto 720x486" - -#: ../share/templates/templates.h:1 -msgid "Video PAL 728x576" -msgstr "Video PAL 728x576" - -#: ../share/templates/templates.h:1 -msgid "PAL video template for 728x576 resolution." -msgstr "Modello video PAL per risoluzione 728x576." - -#: ../share/templates/templates.h:1 -msgid "PAL video empty 728x576" -msgstr "PAL video vuoto 728x576" - -#: ../share/templates/templates.h:1 -msgid "Web Banner 468x60" -msgstr "Web Banner 468x60" - -#: ../share/templates/templates.h:1 -msgid "Empty 468x60 web banner template." -msgstr "Modello web banner vuoto 468x60." - -#: ../share/templates/templates.h:1 -msgid "web banner 468x60 empty" -msgstr "web banner 468x60 vuoto" - -#: ../share/templates/templates.h:1 -msgid "Web Banner 728x90" -msgstr "Web Banner 728x90" - -#: ../share/templates/templates.h:1 -msgid "Empty 728x90 web banner template." -msgstr "Modello web banner vuoto 728x90." - -#: ../share/templates/templates.h:1 -msgid "web banner 728x90 empty" -msgstr "web banner 728x90 vuoto" - #: ../share/templates/templates.h:1 msgid "LaTeX Beamer" msgstr "LaTeX Beamer" @@ -4748,169 +4459,169 @@ msgid "guidelines typography canvas" msgstr "guide tipografia tipografico canvas" #. 3D box -#: ../src/box3d.cpp:260 ../src/box3d.cpp:1313 -#: ../src/ui/dialog/inkscape-preferences.cpp:404 +#: ../src/box3d.cpp:255 ../src/box3d.cpp:1309 +#: ../src/ui/dialog/inkscape-preferences.cpp:416 msgid "3D Box" msgstr "Solido 3D" -#: ../src/color-profile.cpp:853 +#: ../src/color-profile.cpp:842 #, c-format msgid "Color profiles directory (%s) is unavailable." msgstr "La cartella dei profili colore (%s) non è disponibile." -#: ../src/color-profile.cpp:912 ../src/color-profile.cpp:929 +#: ../src/color-profile.cpp:901 ../src/color-profile.cpp:918 msgid "(invalid UTF-8 string)" msgstr "(stringa UTF-8 non valida)" -#: ../src/color-profile.cpp:914 +#: ../src/color-profile.cpp:903 msgctxt "Profile name" msgid "None" msgstr "Nessuno" -#: ../src/context-fns.cpp:36 ../src/context-fns.cpp:65 +#: ../src/context-fns.cpp:33 ../src/context-fns.cpp:62 msgid "Current layer is hidden. Unhide it to be able to draw on it." msgstr "" "Il livello attuale è nascosto. Per potervi disegnare occorre " "mostrarlo." -#: ../src/context-fns.cpp:42 ../src/context-fns.cpp:71 +#: ../src/context-fns.cpp:39 ../src/context-fns.cpp:68 msgid "Current layer is locked. Unlock it to be able to draw on it." msgstr "" "Il livello attuale è bloccato. Per potervi disegnare occorre " "sbloccarlo." -#: ../src/desktop-events.cpp:236 +#: ../src/desktop-events.cpp:244 msgid "Create guide" msgstr "Crea guida" -#: ../src/desktop-events.cpp:482 +#: ../src/desktop-events.cpp:500 msgid "Move guide" msgstr "Muovi guida" -#: ../src/desktop-events.cpp:489 ../src/desktop-events.cpp:547 -#: ../src/ui/dialog/guides.cpp:138 +#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:567 +#: ../src/ui/dialog/guides.cpp:147 msgid "Delete guide" msgstr "Cancella guida" -#: ../src/desktop-events.cpp:527 +#: ../src/desktop-events.cpp:547 #, c-format msgid "Guideline: %s" msgstr "Linea guida: %s" -#: ../src/desktop.cpp:881 +#: ../src/desktop.cpp:870 msgid "No previous zoom." msgstr "Nessuno zoom precedente." -#: ../src/desktop.cpp:902 +#: ../src/desktop.cpp:891 msgid "No next zoom." msgstr "Nessuno zoom successivo." -#: ../src/display/canvas-axonomgrid.cpp:353 ../src/display/canvas-grid.cpp:719 +#: ../src/display/canvas-axonomgrid.cpp:357 ../src/display/canvas-grid.cpp:697 msgid "Grid _units:" msgstr "_Unità della griglia:" -#: ../src/display/canvas-axonomgrid.cpp:355 ../src/display/canvas-grid.cpp:721 +#: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 msgid "_Origin X:" msgstr "_Origine X:" -#: ../src/display/canvas-axonomgrid.cpp:355 ../src/display/canvas-grid.cpp:721 -#: ../src/ui/dialog/inkscape-preferences.cpp:738 -#: ../src/ui/dialog/inkscape-preferences.cpp:763 +#: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "X coordinate of grid origin" msgstr "Coordinata X dell'origine della griglia" -#: ../src/display/canvas-axonomgrid.cpp:358 ../src/display/canvas-grid.cpp:724 +#: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 msgid "O_rigin Y:" msgstr "_Origine Y:" -#: ../src/display/canvas-axonomgrid.cpp:358 ../src/display/canvas-grid.cpp:724 -#: ../src/ui/dialog/inkscape-preferences.cpp:739 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Y coordinate of grid origin" msgstr "Coordinate Y dell'origine della griglia" -#: ../src/display/canvas-axonomgrid.cpp:361 ../src/display/canvas-grid.cpp:730 +#: ../src/display/canvas-axonomgrid.cpp:365 ../src/display/canvas-grid.cpp:708 msgid "Spacing _Y:" msgstr "Spaziatura _Y:" -#: ../src/display/canvas-axonomgrid.cpp:361 -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/display/canvas-axonomgrid.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Base length of z-axis" msgstr "Unità di lunghezza dell'asse Z" -#: ../src/display/canvas-axonomgrid.cpp:364 -#: ../src/ui/dialog/inkscape-preferences.cpp:770 -#: ../src/widgets/box3d-toolbar.cpp:299 +#: ../src/display/canvas-axonomgrid.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 +#: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "Angolo X:" -#: ../src/display/canvas-axonomgrid.cpp:364 -#: ../src/ui/dialog/inkscape-preferences.cpp:770 +#: ../src/display/canvas-axonomgrid.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 msgid "Angle of x-axis" msgstr "Angolo dell'asse X" -#: ../src/display/canvas-axonomgrid.cpp:366 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 -#: ../src/widgets/box3d-toolbar.cpp:378 +#: ../src/display/canvas-axonomgrid.cpp:370 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 +#: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "Angolo Z:" -#: ../src/display/canvas-axonomgrid.cpp:366 -#: ../src/ui/dialog/inkscape-preferences.cpp:771 +#: ../src/display/canvas-axonomgrid.cpp:370 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 msgid "Angle of z-axis" msgstr "Angolo dell'asse Z" -#: ../src/display/canvas-axonomgrid.cpp:370 ../src/display/canvas-grid.cpp:735 +#: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 msgid "Minor grid line _color:" msgstr "_Colore delle linee minori della griglia:" -#: ../src/display/canvas-axonomgrid.cpp:370 ../src/display/canvas-grid.cpp:735 -#: ../src/ui/dialog/inkscape-preferences.cpp:722 +#: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 msgid "Minor grid line color" msgstr "Colore delle linee minori della griglia" -#: ../src/display/canvas-axonomgrid.cpp:370 ../src/display/canvas-grid.cpp:735 +#: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 msgid "Color of the minor grid lines" msgstr "Colore delle linee minori della griglia" -#: ../src/display/canvas-axonomgrid.cpp:375 ../src/display/canvas-grid.cpp:740 +#: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 msgid "Ma_jor grid line color:" msgstr "Colore delle linee principali della _griglia:" -#: ../src/display/canvas-axonomgrid.cpp:375 ../src/display/canvas-grid.cpp:740 -#: ../src/ui/dialog/inkscape-preferences.cpp:724 +#: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 +#: ../src/ui/dialog/inkscape-preferences.cpp:777 msgid "Major grid line color" msgstr "Colore delle linee principali della griglia" -#: ../src/display/canvas-axonomgrid.cpp:376 ../src/display/canvas-grid.cpp:741 +#: ../src/display/canvas-axonomgrid.cpp:380 ../src/display/canvas-grid.cpp:719 msgid "Color of the major (highlighted) grid lines" msgstr "Colore delle linee principali (evidenziate) della griglia" -#: ../src/display/canvas-axonomgrid.cpp:380 ../src/display/canvas-grid.cpp:745 +#: ../src/display/canvas-axonomgrid.cpp:384 ../src/display/canvas-grid.cpp:723 msgid "_Major grid line every:" msgstr "Li_nee principali della griglia ogni:" -#: ../src/display/canvas-axonomgrid.cpp:380 ../src/display/canvas-grid.cpp:745 +#: ../src/display/canvas-axonomgrid.cpp:384 ../src/display/canvas-grid.cpp:723 msgid "lines" msgstr "linee" -#: ../src/display/canvas-grid.cpp:64 +#: ../src/display/canvas-grid.cpp:60 msgid "Rectangular grid" msgstr "Griglia rettangolare" -#: ../src/display/canvas-grid.cpp:65 +#: ../src/display/canvas-grid.cpp:61 msgid "Axonometric grid" msgstr "Griglia assonometrica" -#: ../src/display/canvas-grid.cpp:276 +#: ../src/display/canvas-grid.cpp:246 msgid "Create new grid" msgstr "Crea nuova griglia" -#: ../src/display/canvas-grid.cpp:342 +#: ../src/display/canvas-grid.cpp:312 msgid "_Enabled" msgstr "_Abilitata" -#: ../src/display/canvas-grid.cpp:343 +#: ../src/display/canvas-grid.cpp:313 msgid "" "Determines whether to snap to this grid or not. Can be 'on' for invisible " "grids." @@ -4918,11 +4629,11 @@ msgstr "" "Determina se agganciare a questa griglia o meno. Può essere attiva per " "griglie invisibili." -#: ../src/display/canvas-grid.cpp:347 +#: ../src/display/canvas-grid.cpp:317 msgid "Snap to visible _grid lines only" msgstr "Aggancia solo alle linee visibili della _griglia" -#: ../src/display/canvas-grid.cpp:348 +#: ../src/display/canvas-grid.cpp:318 msgid "" "When zoomed out, not all grid lines will be displayed. Only the visible ones " "will be snapped to" @@ -4930,11 +4641,11 @@ msgstr "" "Quando si rimpicciolisce, non tutte le linee della griglia vengono mostrate. " "L'aggancio si effettua solo su quelle visibili" -#: ../src/display/canvas-grid.cpp:352 +#: ../src/display/canvas-grid.cpp:322 msgid "_Visible" msgstr "_Visibile" -#: ../src/display/canvas-grid.cpp:353 +#: ../src/display/canvas-grid.cpp:323 msgid "" "Determines whether the grid is displayed or not. Objects are still snapped " "to invisible grids." @@ -4942,25 +4653,25 @@ msgstr "" "Determina se la griglia viene mostrata o meno. Gli oggetti vengono " "agganciati anche alle griglie invisibili." -#: ../src/display/canvas-grid.cpp:727 +#: ../src/display/canvas-grid.cpp:705 msgid "Spacing _X:" msgstr "Spaziatura _X:" -#: ../src/display/canvas-grid.cpp:727 -#: ../src/ui/dialog/inkscape-preferences.cpp:744 +#: ../src/display/canvas-grid.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Distance between vertical grid lines" msgstr "Distanza tra linee guida verticali" -#: ../src/display/canvas-grid.cpp:730 -#: ../src/ui/dialog/inkscape-preferences.cpp:745 +#: ../src/display/canvas-grid.cpp:708 +#: ../src/ui/dialog/inkscape-preferences.cpp:798 msgid "Distance between horizontal grid lines" msgstr "Distanza tra linee guida orizzontali" -#: ../src/display/canvas-grid.cpp:762 +#: ../src/display/canvas-grid.cpp:740 msgid "_Show dots instead of lines" msgstr "Vi_sualizza punti invece di linee" -#: ../src/display/canvas-grid.cpp:763 +#: ../src/display/canvas-grid.cpp:741 msgid "If set, displays dots at gridpoints instead of gridlines" msgstr "" "Se impostato, visualizza i punti di intersezione delle griglie invece delle " @@ -5114,11 +4825,11 @@ msgstr "Baricentro riquadro" msgid "Bounding box side midpoint" msgstr "Metà lato riquadro" -#: ../src/display/snap-indicator.cpp:196 ../src/ui/tool/node.cpp:1319 +#: ../src/display/snap-indicator.cpp:196 ../src/ui/tool/node.cpp:1484 msgid "Smooth node" msgstr "Nodo curvo" -#: ../src/display/snap-indicator.cpp:199 ../src/ui/tool/node.cpp:1318 +#: ../src/display/snap-indicator.cpp:199 ../src/ui/tool/node.cpp:1483 msgid "Cusp node" msgstr "Nodo angolare" @@ -5170,25 +4881,25 @@ msgstr "Ancoraggio testo" msgid "Multiple of grid spacing" msgstr "Multiplo spaziatura griglia" -#: ../src/display/snap-indicator.cpp:281 +#: ../src/display/snap-indicator.cpp:286 msgid " to " msgstr " a " -#: ../src/document.cpp:541 +#: ../src/document.cpp:531 #, c-format msgid "New document %d" msgstr "Nuovo documento %d" -#: ../src/document.cpp:546 +#: ../src/document.cpp:536 #, c-format msgid "Memory document %d" msgstr "Documento memoria %d" -#: ../src/document.cpp:575 +#: ../src/document.cpp:565 msgid "Memory document %1" msgstr "Documento memoria %1" -#: ../src/document.cpp:794 +#: ../src/document.cpp:873 #, c-format msgid "Unnamed document %d" msgstr "Documento senza nome %d" @@ -5198,31 +4909,31 @@ msgid "[Unchanged]" msgstr "[Non modificato]" #. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2386 +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2460 msgid "_Undo" msgstr "Ann_ulla" -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2388 +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2462 msgid "_Redo" msgstr "_Ripeti" -#: ../src/extension/dependency.cpp:243 +#: ../src/extension/dependency.cpp:255 msgid "Dependency:" msgstr "Dipendenza:" -#: ../src/extension/dependency.cpp:244 +#: ../src/extension/dependency.cpp:256 msgid " type: " msgstr " tipo: " -#: ../src/extension/dependency.cpp:245 +#: ../src/extension/dependency.cpp:257 msgid " location: " msgstr " posizione: " -#: ../src/extension/dependency.cpp:246 +#: ../src/extension/dependency.cpp:258 msgid " string: " msgstr " stringa: " -#: ../src/extension/dependency.cpp:249 +#: ../src/extension/dependency.cpp:261 msgid " description: " msgstr " descrizione: " @@ -5230,12 +4941,13 @@ msgstr " descrizione: " msgid " (No preferences)" msgstr " (Nessuna preferenza)" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2160 +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2234 msgid "Extensions" msgstr "Estensioni" +#. \FIXME change this #. This is some filler text, needs to change before relase -#: ../src/extension/error-file.cpp:52 +#: ../src/extension/error-file.cpp:53 msgid "" "One or more extensions failed to load\n" @@ -5252,18 +4964,18 @@ msgstr "" "ottenere dettagli per risolvere questo problema, consultare il registro " "degli errori disponibile presso: " -#: ../src/extension/error-file.cpp:66 +#: ../src/extension/error-file.cpp:67 msgid "Show dialog on startup" msgstr "Mostra la finestra all'avvio" -#: ../src/extension/execution-env.cpp:144 +#: ../src/extension/execution-env.cpp:136 #, c-format msgid "'%s' working, please wait..." msgstr "'%s' in esecuzione, attendere..." #. static int i = 0; #. std::cout << "Checking module[" << i++ << "]: " << name << std::endl; -#: ../src/extension/extension.cpp:271 +#: ../src/extension/extension.cpp:267 msgid "" " This is caused by an improper .inx file for this extension. An improper ." "inx file could have been caused by a faulty installation of Inkscape." @@ -5272,71 +4984,71 @@ msgstr "" "file .inx scorretto potrebbe essere causato da un'installazione problematica " "di Inkscape." -#: ../src/extension/extension.cpp:281 +#: ../src/extension/extension.cpp:277 msgid "the extension is designed for Windows only." msgstr "l'estensione è stata programmata solo per Windows." -#: ../src/extension/extension.cpp:286 +#: ../src/extension/extension.cpp:282 msgid "an ID was not defined for it." msgstr "non è stato definito un ID in proposito." -#: ../src/extension/extension.cpp:290 +#: ../src/extension/extension.cpp:286 msgid "there was no name defined for it." msgstr "non è stato definito nessun nome in proposito." -#: ../src/extension/extension.cpp:294 +#: ../src/extension/extension.cpp:290 msgid "the XML description of it got lost." msgstr "la descrizione XML è andata perduta." -#: ../src/extension/extension.cpp:298 +#: ../src/extension/extension.cpp:294 msgid "no implementation was defined for the extension." msgstr "non è stata definita nessuna implementazione per l'estensione." #. std::cout << "Failed: " << *(_deps[i]) << std::endl; -#: ../src/extension/extension.cpp:305 +#: ../src/extension/extension.cpp:301 msgid "a dependency was not met." msgstr "una dipendenza non è stata soddisfatta." -#: ../src/extension/extension.cpp:325 +#: ../src/extension/extension.cpp:321 msgid "Extension \"" msgstr "Estensione \"" -#: ../src/extension/extension.cpp:325 +#: ../src/extension/extension.cpp:321 msgid "\" failed to load because " msgstr "\" non caricata perchè " -#: ../src/extension/extension.cpp:674 +#: ../src/extension/extension.cpp:670 #, c-format msgid "Could not create extension error log file '%s'" msgstr "" "Impossibile creare il file per il registro degli errori dell'estensione '%s'" -#: ../src/extension/extension.cpp:782 +#: ../src/extension/extension.cpp:778 #: ../share/extensions/webslicer_create_rect.inx.h:2 msgid "Name:" msgstr "Nome:" -#: ../src/extension/extension.cpp:783 +#: ../src/extension/extension.cpp:779 msgid "ID:" msgstr "ID:" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:780 msgid "State:" msgstr "Stato:" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:780 msgid "Loaded" msgstr "Caricato" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:780 msgid "Unloaded" msgstr "Non caricato" -#: ../src/extension/extension.cpp:784 +#: ../src/extension/extension.cpp:780 msgid "Deactivated" msgstr "Disattivato" -#: ../src/extension/extension.cpp:824 +#: ../src/extension/extension.cpp:820 msgid "" "Currently there is no help available for this Extension. Please look on the " "Inkscape website or ask on the mailing lists if you have questions regarding " @@ -5346,7 +5058,7 @@ msgstr "" "informazioni, consultare il sito web di Inkscape o rivolgersi alle mailing " "list." -#: ../src/extension/implementation/script.cpp:1060 +#: ../src/extension/implementation/script.cpp:1108 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5379,11 +5091,13 @@ msgstr "Soglia adattiva" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41 #: ../src/extension/internal/bitmap/raise.cpp:42 #: ../src/extension/internal/bitmap/sample.cpp:41 -#: ../src/extension/internal/bluredge.cpp:138 +#: ../src/extension/internal/bluredge.cpp:134 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:68 #: ../src/ui/dialog/object-attributes.cpp:77 +#: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 #: ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" @@ -5394,11 +5108,12 @@ msgstr "Larghezza:" #: ../src/extension/internal/bitmap/sample.cpp:42 #: ../src/ui/dialog/object-attributes.cpp:69 #: ../src/ui/dialog/object-attributes.cpp:78 -#: ../share/extensions/foldablebox.inx.h:3 +#: ../src/ui/widget/page-sizer.cpp:250 ../share/extensions/foldablebox.inx.h:3 msgid "Height:" msgstr "Altezza:" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 +#: ../src/widgets/measure-toolbar.cpp:328 #: ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "Posizione:" @@ -5451,13 +5166,13 @@ msgstr "Aggiungi disturbo" #. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch"); #: ../src/extension/internal/bitmap/addNoise.cpp:47 -#: ../src/extension/internal/filter/color.h:426 -#: ../src/extension/internal/filter/color.h:1497 -#: ../src/extension/internal/filter/color.h:1585 +#: ../src/extension/internal/filter/color.h:501 +#: ../src/extension/internal/filter/color.h:1572 +#: ../src/extension/internal/filter/color.h:1660 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2842 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 #: ../src/ui/dialog/object-attributes.cpp:49 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5509,7 +5224,7 @@ msgstr "Sfocatura" #: ../src/extension/internal/bitmap/oilPaint.cpp:39 #: ../src/extension/internal/bitmap/sharpen.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 msgid "Radius:" msgstr "Raggio:" @@ -5592,7 +5307,7 @@ msgid "Apply charcoal stylization to selected bitmap(s)" msgstr "Applica stilizzazione al carboncino alle bitmap selezionate" #: ../src/extension/internal/bitmap/colorize.cpp:50 -#: ../src/extension/internal/filter/color.h:317 +#: ../src/extension/internal/filter/color.h:392 msgid "Colorize" msgstr "Colora" @@ -5603,7 +5318,8 @@ msgstr "" "fornita" #: ../src/extension/internal/bitmap/contrast.cpp:40 -#: ../src/extension/internal/filter/color.h:1114 +#: ../src/extension/internal/filter/color.h:1189 +#: ../share/extensions/nicechart.inx.h:36 msgid "Contrast" msgstr "Contrasto" @@ -5648,7 +5364,7 @@ msgstr "Cicla mappa dei colori" #: ../src/extension/internal/bitmap/cycleColormap.cpp:39 #: ../src/extension/internal/bitmap/spread.cpp:39 #: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:208 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount:" msgstr "Quantità:" @@ -5698,7 +5414,7 @@ msgid "Equalize selected bitmap(s); histogram equalization" msgstr "Equalizza le bitmap selezionate - istogramma di equalizzazione" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:38 -#: ../src/filter-enums.cpp:28 +#: ../src/filter-enums.cpp:29 msgid "Gaussian Blur" msgstr "Sfocatura gaussiana" @@ -5721,7 +5437,7 @@ msgid "Implode selected bitmap(s)" msgstr "Implode le bitmap selezionate" #: ../src/extension/internal/bitmap/level.cpp:41 -#: ../src/extension/internal/filter/color.h:742 +#: ../src/extension/internal/filter/color.h:817 #: ../src/extension/internal/filter/image.h:56 #: ../src/extension/internal/filter/morphology.h:66 #: ../src/extension/internal/filter/paint.h:345 @@ -5756,7 +5472,7 @@ msgid "Level (with Channel)" msgstr "Livello (tramite canale)" #: ../src/extension/internal/bitmap/levelChannel.cpp:54 -#: ../src/extension/internal/filter/color.h:636 +#: ../src/extension/internal/filter/color.h:711 msgid "Channel:" msgstr "Canale:" @@ -5833,15 +5549,15 @@ msgstr "Ritocca le bitmap selezionate per farle sembrare dipinte ad olio" #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/blurs.h:333 #: ../src/extension/internal/filter/transparency.h:279 -#: ../src/ui/dialog/clonetiler.cpp:840 ../src/ui/dialog/clonetiler.cpp:993 +#: ../src/ui/dialog/clonetiler.cpp:836 ../src/ui/dialog/clonetiler.cpp:989 #: ../src/widgets/tweak-toolbar.cpp:334 -#: ../share/extensions/interp_att_g.inx.h:16 +#: ../share/extensions/interp_att_g.inx.h:18 msgid "Opacity" msgstr "Opacità" #: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2884 -#: ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2924 +#: ../src/ui/dialog/objects.cpp:1629 ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "Opacità:" @@ -5868,7 +5584,10 @@ msgstr "" msgid "Reduce Noise" msgstr "Riduci disturbo" +#. Paint order +#. TRANSLATORS: Paint order determines the order the 'fill', 'stroke', and 'markers are painted. #: ../src/extension/internal/bitmap/reduceNoise.cpp:42 +#: ../src/widgets/stroke-style.cpp:384 #: ../share/extensions/jessyInk_effects.inx.h:3 #: ../share/extensions/jessyInk_view.inx.h:3 #: ../share/extensions/lindenmayer.inx.h:5 @@ -5919,8 +5638,8 @@ msgid "Sharpen selected bitmap(s)" msgstr "Contrasta le bitmap selezionate" #: ../src/extension/internal/bitmap/solarize.cpp:39 -#: ../src/extension/internal/filter/color.h:1494 -#: ../src/extension/internal/filter/color.h:1498 +#: ../src/extension/internal/filter/color.h:1569 +#: ../src/extension/internal/filter/color.h:1573 msgid "Solarize" msgstr "Sovraesponi" @@ -5957,7 +5676,7 @@ msgstr "Soglia" #: ../src/extension/internal/bitmap/threshold.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:46 -#: ../src/widgets/paintbucket-toolbar.cpp:146 +#: ../src/widgets/paintbucket-toolbar.cpp:147 msgid "Threshold:" msgstr "Soglia:" @@ -5991,29 +5710,29 @@ msgstr "Lunghezza d'onda:" msgid "Alter selected bitmap(s) along sine wave" msgstr "Altera le bitmap selezionate lungo un'onda sinusoidale" -#: ../src/extension/internal/bluredge.cpp:136 +#: ../src/extension/internal/bluredge.cpp:132 msgid "Inset/Outset Halo" msgstr "Intrudi/Estrudi alone" -#: ../src/extension/internal/bluredge.cpp:138 +#: ../src/extension/internal/bluredge.cpp:134 msgid "Width in px of the halo" msgstr "Larghezza in pixel dell'alone" -#: ../src/extension/internal/bluredge.cpp:139 +#: ../src/extension/internal/bluredge.cpp:135 msgid "Number of steps:" msgstr "Numero di passi:" -#: ../src/extension/internal/bluredge.cpp:139 +#: ../src/extension/internal/bluredge.cpp:135 msgid "Number of inset/outset copies of the object to make" msgstr "Numero delle copie intruse/estruse dell'oggetto" -#: ../src/extension/internal/bluredge.cpp:143 +#: ../src/extension/internal/bluredge.cpp:139 #: ../share/extensions/extrude.inx.h:5 #: ../share/extensions/generate_voronoi.inx.h:9 -#: ../share/extensions/interp.inx.h:7 ../share/extensions/motion.inx.h:4 +#: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 #: ../share/extensions/pathalongpath.inx.h:18 #: ../share/extensions/pathscatter.inx.h:20 -#: ../share/extensions/voronoi2svg.inx.h:13 +#: ../share/extensions/voronoi2svg.inx.h:18 msgid "Generate from Path" msgstr "Genera da tracciato" @@ -6023,100 +5742,112 @@ msgid "PostScript" msgstr "PostScript" #: ../src/extension/internal/cairo-ps-out.cpp:329 -#: ../src/extension/internal/cairo-ps-out.cpp:368 +#: ../src/extension/internal/cairo-ps-out.cpp:371 msgid "Restrict to PS level:" msgstr "Limita al livello PS:" #: ../src/extension/internal/cairo-ps-out.cpp:330 -#: ../src/extension/internal/cairo-ps-out.cpp:369 +#: ../src/extension/internal/cairo-ps-out.cpp:372 msgid "PostScript level 3" msgstr "PostScript livello 3" #: ../src/extension/internal/cairo-ps-out.cpp:331 -#: ../src/extension/internal/cairo-ps-out.cpp:370 +#: ../src/extension/internal/cairo-ps-out.cpp:373 msgid "PostScript level 2" msgstr "PostScript livello 2" #: ../src/extension/internal/cairo-ps-out.cpp:333 -#: ../src/extension/internal/cairo-ps-out.cpp:372 +#: ../src/extension/internal/cairo-ps-out.cpp:375 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:250 -#: ../src/extension/internal/emf-inout.cpp:3569 -#: ../src/extension/internal/wmf-inout.cpp:3143 -msgid "Convert texts to paths" -msgstr "Converti testo in tracciato" +#, fuzzy +msgid "Text output options:" +msgstr "Orientamento testo" #: ../src/extension/internal/cairo-ps-out.cpp:334 -msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" -msgstr "PS+LaTeX: ometti testo nel file PS, e crea un file LaTeX" +#: ../src/extension/internal/cairo-ps-out.cpp:376 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 +#, fuzzy +msgid "Embed fonts" +msgstr "Incorpora immagini" #: ../src/extension/internal/cairo-ps-out.cpp:335 -#: ../src/extension/internal/cairo-ps-out.cpp:374 +#: ../src/extension/internal/cairo-ps-out.cpp:377 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:252 -msgid "Rasterize filter effects" -msgstr "Rasterizza gli effetti" +#, fuzzy +msgid "Convert text to paths" +msgstr "Converti testo in tracciato" #: ../src/extension/internal/cairo-ps-out.cpp:336 -#: ../src/extension/internal/cairo-ps-out.cpp:375 +#: ../src/extension/internal/cairo-ps-out.cpp:378 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:253 +#, fuzzy +msgid "Omit text in PDF and create LaTeX file" +msgstr "PDF+LaTeX: ometti testo nel file PDF, e crea un file LaTeX" + +#: ../src/extension/internal/cairo-ps-out.cpp:338 +#: ../src/extension/internal/cairo-ps-out.cpp:380 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255 +msgid "Rasterize filter effects" +msgstr "Rasterizza gli effetti" + +#: ../src/extension/internal/cairo-ps-out.cpp:339 +#: ../src/extension/internal/cairo-ps-out.cpp:381 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256 msgid "Resolution for rasterization (dpi):" msgstr "Risoluzione per la rasterizzazione (dpi):" -#: ../src/extension/internal/cairo-ps-out.cpp:337 -#: ../src/extension/internal/cairo-ps-out.cpp:376 +#: ../src/extension/internal/cairo-ps-out.cpp:340 +#: ../src/extension/internal/cairo-ps-out.cpp:382 msgid "Output page size" msgstr "Imposta dimensione pagina" -#: ../src/extension/internal/cairo-ps-out.cpp:338 -#: ../src/extension/internal/cairo-ps-out.cpp:377 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:255 +#: ../src/extension/internal/cairo-ps-out.cpp:341 +#: ../src/extension/internal/cairo-ps-out.cpp:383 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:258 msgid "Use document's page size" msgstr "Usa dimensione pagina documento" -#: ../src/extension/internal/cairo-ps-out.cpp:339 -#: ../src/extension/internal/cairo-ps-out.cpp:378 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:256 +#: ../src/extension/internal/cairo-ps-out.cpp:342 +#: ../src/extension/internal/cairo-ps-out.cpp:384 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:259 msgid "Use exported object's size" msgstr "Usa dimensione oggetto esportato" -#: ../src/extension/internal/cairo-ps-out.cpp:341 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:258 +#: ../src/extension/internal/cairo-ps-out.cpp:344 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:261 msgid "Bleed/margin (mm):" msgstr "Margini di rifilo (mm):" -#: ../src/extension/internal/cairo-ps-out.cpp:342 -#: ../src/extension/internal/cairo-ps-out.cpp:381 -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:259 +#: ../src/extension/internal/cairo-ps-out.cpp:345 +#: ../src/extension/internal/cairo-ps-out.cpp:387 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:262 msgid "Limit export to the object with ID:" msgstr "Limita l'esportazione agli oggetti con ID:" -#: ../src/extension/internal/cairo-ps-out.cpp:346 +#: ../src/extension/internal/cairo-ps-out.cpp:349 #: ../share/extensions/ps_input.inx.h:2 msgid "PostScript (*.ps)" msgstr "PostScript (*.ps)" -#: ../src/extension/internal/cairo-ps-out.cpp:347 +#: ../src/extension/internal/cairo-ps-out.cpp:350 msgid "PostScript File" msgstr "File PostScript" -#: ../src/extension/internal/cairo-ps-out.cpp:366 +#: ../src/extension/internal/cairo-ps-out.cpp:369 #: ../share/extensions/eps_input.inx.h:3 msgid "Encapsulated PostScript" msgstr "Encapsulated PostScript" -#: ../src/extension/internal/cairo-ps-out.cpp:373 -msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" -msgstr "EPS+LaTeX: ometti testo nel file EPS, e crea un file LaTeX" - -#: ../src/extension/internal/cairo-ps-out.cpp:380 +#: ../src/extension/internal/cairo-ps-out.cpp:386 msgid "Bleed/margin (mm)" msgstr "Margini di rifilo (mm)" -#: ../src/extension/internal/cairo-ps-out.cpp:385 +#: ../src/extension/internal/cairo-ps-out.cpp:391 #: ../share/extensions/eps_input.inx.h:2 msgid "Encapsulated PostScript (*.eps)" msgstr "Encapsulated PostScript (*.eps)" -#: ../src/extension/internal/cairo-ps-out.cpp:386 +#: ../src/extension/internal/cairo-ps-out.cpp:392 msgid "Encapsulated PostScript File" msgstr "File Encapsulated PostScript" @@ -6132,153 +5863,156 @@ msgstr "PDF 1.5" msgid "PDF 1.4" msgstr "PDF 1.4" -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:251 -msgid "PDF+LaTeX: Omit text in PDF, and create LaTeX file" -msgstr "PDF+LaTeX: ometti testo nel file PDF, e crea un file LaTeX" - -#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:254 +#: ../src/extension/internal/cairo-renderer-pdf-out.cpp:257 msgid "Output page size:" msgstr "Imposta dimensione pagina:" -#: ../src/extension/internal/cdr-input.cpp:116 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:87 -#: ../src/extension/internal/vsd-input.cpp:116 +#. Dialog settings +#: ../src/extension/internal/cdr-input.cpp:103 +#: ../src/extension/internal/vsd-input.cpp:105 +msgid "Page Selector" +msgstr "Selettore pagina" + +#. Labels +#: ../src/extension/internal/cdr-input.cpp:127 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:92 +#: ../src/extension/internal/vsd-input.cpp:130 msgid "Select page:" msgstr "Seleziona pagina:" #. Display total number of pages -#: ../src/extension/internal/cdr-input.cpp:128 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:106 -#: ../src/extension/internal/vsd-input.cpp:128 +#: ../src/extension/internal/cdr-input.cpp:135 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:111 +#: ../src/extension/internal/vsd-input.cpp:138 #, c-format msgid "out of %i" msgstr "su %i" -#: ../src/extension/internal/cdr-input.cpp:159 -#: ../src/extension/internal/vsd-input.cpp:159 -msgid "Page Selector" -msgstr "Selettore pagina" - -#: ../src/extension/internal/cdr-input.cpp:294 +#: ../src/extension/internal/cdr-input.cpp:293 msgid "Corel DRAW Input" msgstr "Input Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:299 +#: ../src/extension/internal/cdr-input.cpp:298 msgid "Corel DRAW 7-X4 files (*.cdr)" msgstr "File Corel DRAW 7-X4 (*.cdr)" -#: ../src/extension/internal/cdr-input.cpp:300 +#: ../src/extension/internal/cdr-input.cpp:299 msgid "Open files saved in Corel DRAW 7-X4" msgstr "Apre file salvati con Corel DRAW 7-X4" -#: ../src/extension/internal/cdr-input.cpp:307 +#: ../src/extension/internal/cdr-input.cpp:306 msgid "Corel DRAW templates input" msgstr "Input modello Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:312 +#: ../src/extension/internal/cdr-input.cpp:311 msgid "Corel DRAW 7-13 template files (*.cdt)" msgstr "File modello Corel DRAW 7-13 (*.cdt)" -#: ../src/extension/internal/cdr-input.cpp:313 +#: ../src/extension/internal/cdr-input.cpp:312 msgid "Open files saved in Corel DRAW 7-13" msgstr "Apre file salvati con Corel DRAW 7-13" -#: ../src/extension/internal/cdr-input.cpp:320 +#: ../src/extension/internal/cdr-input.cpp:319 msgid "Corel DRAW Compressed Exchange files input" msgstr "File input Corel DRAW Compressed Exchange" -#: ../src/extension/internal/cdr-input.cpp:325 +#: ../src/extension/internal/cdr-input.cpp:324 msgid "Corel DRAW Compressed Exchange files (*.ccx)" msgstr "File Corel DRAW Compressed Exchang (*.ccx)" -#: ../src/extension/internal/cdr-input.cpp:326 +#: ../src/extension/internal/cdr-input.cpp:325 msgid "Open compressed exchange files saved in Corel DRAW" msgstr "File Open compressed exchange salvato con Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:333 +#: ../src/extension/internal/cdr-input.cpp:332 msgid "Corel DRAW Presentation Exchange files input" msgstr "File input Corel DRAW Presentation Exchange" -#: ../src/extension/internal/cdr-input.cpp:338 +#: ../src/extension/internal/cdr-input.cpp:337 msgid "Corel DRAW Presentation Exchange files (*.cmx)" msgstr "File Corel DRAW Presentation Exchange (*.cmx)" -#: ../src/extension/internal/cdr-input.cpp:339 +#: ../src/extension/internal/cdr-input.cpp:338 msgid "Open presentation exchange files saved in Corel DRAW" msgstr "File Open presentation exchange salvato con Corel DRAW" -#: ../src/extension/internal/emf-inout.cpp:3553 +#: ../src/extension/internal/emf-inout.cpp:3601 msgid "EMF Input" msgstr "Input EMF" -#: ../src/extension/internal/emf-inout.cpp:3558 +#: ../src/extension/internal/emf-inout.cpp:3606 msgid "Enhanced Metafiles (*.emf)" msgstr "Metafile avanzato (*.emf)" -#: ../src/extension/internal/emf-inout.cpp:3559 +#: ../src/extension/internal/emf-inout.cpp:3607 msgid "Enhanced Metafiles" msgstr "Metafile avanzato" -#: ../src/extension/internal/emf-inout.cpp:3567 +#: ../src/extension/internal/emf-inout.cpp:3615 msgid "EMF Output" msgstr "Output EMF" -#: ../src/extension/internal/emf-inout.cpp:3570 -#: ../src/extension/internal/wmf-inout.cpp:3144 +#: ../src/extension/internal/emf-inout.cpp:3617 +#: ../src/extension/internal/wmf-inout.cpp:3196 +msgid "Convert texts to paths" +msgstr "Converti testo in tracciato" + +#: ../src/extension/internal/emf-inout.cpp:3618 +#: ../src/extension/internal/wmf-inout.cpp:3197 #, fuzzy msgid "Map Unicode to Symbol font" msgstr "Map Unicode a Symbol font" -#: ../src/extension/internal/emf-inout.cpp:3571 -#: ../src/extension/internal/wmf-inout.cpp:3145 +#: ../src/extension/internal/emf-inout.cpp:3619 +#: ../src/extension/internal/wmf-inout.cpp:3198 #, fuzzy msgid "Map Unicode to Wingdings" msgstr "Map Unicode a Wingdings" -#: ../src/extension/internal/emf-inout.cpp:3572 -#: ../src/extension/internal/wmf-inout.cpp:3146 +#: ../src/extension/internal/emf-inout.cpp:3620 +#: ../src/extension/internal/wmf-inout.cpp:3199 #, fuzzy msgid "Map Unicode to Zapf Dingbats" msgstr "Map Unicode a Zapf Dingbats" -#: ../src/extension/internal/emf-inout.cpp:3573 -#: ../src/extension/internal/wmf-inout.cpp:3147 +#: ../src/extension/internal/emf-inout.cpp:3621 +#: ../src/extension/internal/wmf-inout.cpp:3200 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" msgstr "Usa MS Unicode PUA (0xF020-0xF0FF) per i caratteri convertiti" -#: ../src/extension/internal/emf-inout.cpp:3574 -#: ../src/extension/internal/wmf-inout.cpp:3148 +#: ../src/extension/internal/emf-inout.cpp:3622 +#: ../src/extension/internal/wmf-inout.cpp:3201 msgid "Compensate for PPT font bug" msgstr "Ripara bug font PPT" -#: ../src/extension/internal/emf-inout.cpp:3575 -#: ../src/extension/internal/wmf-inout.cpp:3149 +#: ../src/extension/internal/emf-inout.cpp:3623 +#: ../src/extension/internal/wmf-inout.cpp:3202 msgid "Convert dashed/dotted lines to single lines" msgstr "Converti linee tratteggiate in linee singole" -#: ../src/extension/internal/emf-inout.cpp:3576 -#: ../src/extension/internal/wmf-inout.cpp:3150 +#: ../src/extension/internal/emf-inout.cpp:3624 +#: ../src/extension/internal/wmf-inout.cpp:3203 msgid "Convert gradients to colored polygon series" msgstr "Converti i gradienti in serie colorate di poligoni" -#: ../src/extension/internal/emf-inout.cpp:3577 +#: ../src/extension/internal/emf-inout.cpp:3625 msgid "Use native rectangular linear gradients" msgstr "Usa gradienti lineari rettangolari nativi" -#: ../src/extension/internal/emf-inout.cpp:3578 +#: ../src/extension/internal/emf-inout.cpp:3626 msgid "Map all fill patterns to standard EMF hatches" msgstr "" -#: ../src/extension/internal/emf-inout.cpp:3579 +#: ../src/extension/internal/emf-inout.cpp:3627 #, fuzzy msgid "Ignore image rotations" msgstr "Ignora rotazione immagini" -#: ../src/extension/internal/emf-inout.cpp:3583 +#: ../src/extension/internal/emf-inout.cpp:3631 msgid "Enhanced Metafile (*.emf)" msgstr "Metafile avanzato (*.emf)" -#: ../src/extension/internal/emf-inout.cpp:3584 +#: ../src/extension/internal/emf-inout.cpp:3632 msgid "Enhanced Metafile" msgstr "Metafile avanzato" @@ -6322,27 +6056,28 @@ msgstr "Colore illuminazione" #: ../src/extension/internal/filter/blurs.h:350 #: ../src/extension/internal/filter/bumps.h:141 #: ../src/extension/internal/filter/bumps.h:361 -#: ../src/extension/internal/filter/color.h:81 -#: ../src/extension/internal/filter/color.h:170 -#: ../src/extension/internal/filter/color.h:261 -#: ../src/extension/internal/filter/color.h:346 -#: ../src/extension/internal/filter/color.h:436 -#: ../src/extension/internal/filter/color.h:531 -#: ../src/extension/internal/filter/color.h:653 -#: ../src/extension/internal/filter/color.h:750 -#: ../src/extension/internal/filter/color.h:829 -#: ../src/extension/internal/filter/color.h:920 -#: ../src/extension/internal/filter/color.h:1048 -#: ../src/extension/internal/filter/color.h:1118 -#: ../src/extension/internal/filter/color.h:1211 -#: ../src/extension/internal/filter/color.h:1323 -#: ../src/extension/internal/filter/color.h:1428 -#: ../src/extension/internal/filter/color.h:1504 -#: ../src/extension/internal/filter/color.h:1615 +#: ../src/extension/internal/filter/color.h:82 +#: ../src/extension/internal/filter/color.h:171 +#: ../src/extension/internal/filter/color.h:282 +#: ../src/extension/internal/filter/color.h:336 +#: ../src/extension/internal/filter/color.h:421 +#: ../src/extension/internal/filter/color.h:511 +#: ../src/extension/internal/filter/color.h:606 +#: ../src/extension/internal/filter/color.h:728 +#: ../src/extension/internal/filter/color.h:825 +#: ../src/extension/internal/filter/color.h:904 +#: ../src/extension/internal/filter/color.h:995 +#: ../src/extension/internal/filter/color.h:1123 +#: ../src/extension/internal/filter/color.h:1193 +#: ../src/extension/internal/filter/color.h:1286 +#: ../src/extension/internal/filter/color.h:1398 +#: ../src/extension/internal/filter/color.h:1503 +#: ../src/extension/internal/filter/color.h:1579 +#: ../src/extension/internal/filter/color.h:1690 #: ../src/extension/internal/filter/distort.h:95 #: ../src/extension/internal/filter/distort.h:204 #: ../src/extension/internal/filter/filter-file.cpp:151 -#: ../src/extension/internal/filter/filter.cpp:214 +#: ../src/extension/internal/filter/filter.cpp:211 #: ../src/extension/internal/filter/image.h:61 #: ../src/extension/internal/filter/morphology.h:75 #: ../src/extension/internal/filter/morphology.h:202 @@ -6363,7 +6098,7 @@ msgstr "Colore illuminazione" #: ../src/extension/internal/filter/transparency.h:214 #: ../src/extension/internal/filter/transparency.h:287 #: ../src/extension/internal/filter/transparency.h:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1743 +#: ../src/ui/dialog/inkscape-preferences.cpp:1806 #, c-format msgid "Filters" msgstr "Filtri" @@ -6379,7 +6114,7 @@ msgstr "Gelatina opaca" #: ../src/extension/internal/filter/bevels.h:136 #: ../src/extension/internal/filter/bevels.h:220 #: ../src/extension/internal/filter/blurs.h:187 -#: ../src/extension/internal/filter/color.h:74 +#: ../src/extension/internal/filter/color.h:75 msgid "Brightness" msgstr "Brillantezza" @@ -6451,14 +6186,14 @@ msgstr "Miscela:" #: ../src/extension/internal/filter/bumps.h:131 #: ../src/extension/internal/filter/bumps.h:337 #: ../src/extension/internal/filter/bumps.h:344 -#: ../src/extension/internal/filter/color.h:329 -#: ../src/extension/internal/filter/color.h:336 -#: ../src/extension/internal/filter/color.h:1423 -#: ../src/extension/internal/filter/color.h:1596 -#: ../src/extension/internal/filter/color.h:1602 +#: ../src/extension/internal/filter/color.h:404 +#: ../src/extension/internal/filter/color.h:411 +#: ../src/extension/internal/filter/color.h:1498 +#: ../src/extension/internal/filter/color.h:1671 +#: ../src/extension/internal/filter/color.h:1677 #: ../src/extension/internal/filter/paint.h:705 #: ../src/extension/internal/filter/transparency.h:63 -#: ../src/filter-enums.cpp:54 +#: ../src/filter-enums.cpp:55 msgid "Darken" msgstr "Scurisci" @@ -6467,15 +6202,15 @@ msgstr "Scurisci" #: ../src/extension/internal/filter/bumps.h:132 #: ../src/extension/internal/filter/bumps.h:335 #: ../src/extension/internal/filter/bumps.h:342 -#: ../src/extension/internal/filter/color.h:327 -#: ../src/extension/internal/filter/color.h:332 -#: ../src/extension/internal/filter/color.h:647 -#: ../src/extension/internal/filter/color.h:1415 -#: ../src/extension/internal/filter/color.h:1420 -#: ../src/extension/internal/filter/color.h:1594 +#: ../src/extension/internal/filter/color.h:402 +#: ../src/extension/internal/filter/color.h:407 +#: ../src/extension/internal/filter/color.h:722 +#: ../src/extension/internal/filter/color.h:1490 +#: ../src/extension/internal/filter/color.h:1495 +#: ../src/extension/internal/filter/color.h:1669 #: ../src/extension/internal/filter/paint.h:703 #: ../src/extension/internal/filter/transparency.h:62 -#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:382 +#: ../src/filter-enums.cpp:54 ../src/ui/dialog/input.cpp:382 msgid "Screen" msgstr "Scherma" @@ -6484,16 +6219,16 @@ msgstr "Scherma" #: ../src/extension/internal/filter/bumps.h:133 #: ../src/extension/internal/filter/bumps.h:338 #: ../src/extension/internal/filter/bumps.h:345 -#: ../src/extension/internal/filter/color.h:325 -#: ../src/extension/internal/filter/color.h:333 -#: ../src/extension/internal/filter/color.h:645 -#: ../src/extension/internal/filter/color.h:1414 -#: ../src/extension/internal/filter/color.h:1421 -#: ../src/extension/internal/filter/color.h:1595 -#: ../src/extension/internal/filter/color.h:1601 +#: ../src/extension/internal/filter/color.h:400 +#: ../src/extension/internal/filter/color.h:408 +#: ../src/extension/internal/filter/color.h:720 +#: ../src/extension/internal/filter/color.h:1489 +#: ../src/extension/internal/filter/color.h:1496 +#: ../src/extension/internal/filter/color.h:1670 +#: ../src/extension/internal/filter/color.h:1676 #: ../src/extension/internal/filter/paint.h:701 #: ../src/extension/internal/filter/transparency.h:60 -#: ../src/filter-enums.cpp:52 +#: ../src/filter-enums.cpp:53 msgid "Multiply" msgstr "Moltiplica" @@ -6502,13 +6237,13 @@ msgstr "Moltiplica" #: ../src/extension/internal/filter/bumps.h:134 #: ../src/extension/internal/filter/bumps.h:339 #: ../src/extension/internal/filter/bumps.h:346 -#: ../src/extension/internal/filter/color.h:328 -#: ../src/extension/internal/filter/color.h:335 -#: ../src/extension/internal/filter/color.h:1422 -#: ../src/extension/internal/filter/color.h:1593 +#: ../src/extension/internal/filter/color.h:403 +#: ../src/extension/internal/filter/color.h:410 +#: ../src/extension/internal/filter/color.h:1497 +#: ../src/extension/internal/filter/color.h:1668 #: ../src/extension/internal/filter/paint.h:704 #: ../src/extension/internal/filter/transparency.h:64 -#: ../src/filter-enums.cpp:55 +#: ../src/filter-enums.cpp:56 msgid "Lighten" msgstr "Illumina" @@ -6550,9 +6285,9 @@ msgid "Erosion" msgstr "Erosione" #: ../src/extension/internal/filter/blurs.h:336 -#: ../src/extension/internal/filter/color.h:1205 -#: ../src/extension/internal/filter/color.h:1317 -#: ../src/ui/dialog/document-properties.cpp:115 +#: ../src/extension/internal/filter/color.h:1280 +#: ../src/extension/internal/filter/color.h:1392 +#: ../src/ui/dialog/document-properties.cpp:123 msgid "Background color" msgstr "Colore di sfondo" @@ -6565,18 +6300,18 @@ msgstr "Tipo miscela:" #: ../src/extension/internal/filter/bumps.h:130 #: ../src/extension/internal/filter/bumps.h:336 #: ../src/extension/internal/filter/bumps.h:343 -#: ../src/extension/internal/filter/color.h:326 -#: ../src/extension/internal/filter/color.h:334 -#: ../src/extension/internal/filter/color.h:646 -#: ../src/extension/internal/filter/color.h:1413 -#: ../src/extension/internal/filter/color.h:1419 -#: ../src/extension/internal/filter/color.h:1586 -#: ../src/extension/internal/filter/color.h:1600 +#: ../src/extension/internal/filter/color.h:401 +#: ../src/extension/internal/filter/color.h:409 +#: ../src/extension/internal/filter/color.h:721 +#: ../src/extension/internal/filter/color.h:1488 +#: ../src/extension/internal/filter/color.h:1494 +#: ../src/extension/internal/filter/color.h:1661 +#: ../src/extension/internal/filter/color.h:1675 #: ../src/extension/internal/filter/distort.h:78 #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:698 msgid "Normal" msgstr "Normale" @@ -6609,40 +6344,38 @@ msgstr "Sorgente rugosità" #: ../src/extension/internal/filter/bumps.h:88 #: ../src/extension/internal/filter/bumps.h:317 -#: ../src/extension/internal/filter/color.h:157 -#: ../src/extension/internal/filter/color.h:637 -#: ../src/extension/internal/filter/color.h:821 +#: ../src/extension/internal/filter/color.h:158 +#: ../src/extension/internal/filter/color.h:712 +#: ../src/extension/internal/filter/color.h:896 #: ../src/extension/internal/filter/transparency.h:132 -#: ../src/filter-enums.cpp:127 ../src/ui/tools/flood-tool.cpp:193 -#: ../src/widgets/sp-color-icc-selector.cpp:355 -#: ../src/widgets/sp-color-scales.cpp:429 -#: ../src/widgets/sp-color-scales.cpp:430 +#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:91 +#: ../src/ui/widget/color-icc-selector.cpp:176 +#: ../src/ui/widget/color-scales.cpp:385 ../src/ui/widget/color-scales.cpp:386 msgid "Red" msgstr "Rosso" #: ../src/extension/internal/filter/bumps.h:89 #: ../src/extension/internal/filter/bumps.h:318 -#: ../src/extension/internal/filter/color.h:158 -#: ../src/extension/internal/filter/color.h:638 -#: ../src/extension/internal/filter/color.h:822 +#: ../src/extension/internal/filter/color.h:159 +#: ../src/extension/internal/filter/color.h:713 +#: ../src/extension/internal/filter/color.h:897 #: ../src/extension/internal/filter/transparency.h:133 -#: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:194 -#: ../src/widgets/sp-color-icc-selector.cpp:356 -#: ../src/widgets/sp-color-scales.cpp:432 -#: ../src/widgets/sp-color-scales.cpp:433 +#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:92 +#: ../src/ui/widget/color-icc-selector.cpp:177 +#: ../src/ui/widget/color-scales.cpp:388 ../src/ui/widget/color-scales.cpp:389 msgid "Green" msgstr "Verde" #: ../src/extension/internal/filter/bumps.h:90 #: ../src/extension/internal/filter/bumps.h:319 -#: ../src/extension/internal/filter/color.h:159 -#: ../src/extension/internal/filter/color.h:639 -#: ../src/extension/internal/filter/color.h:823 +#: ../src/extension/internal/filter/color.h:160 +#: ../src/extension/internal/filter/color.h:714 +#: ../src/extension/internal/filter/color.h:898 #: ../src/extension/internal/filter/transparency.h:134 -#: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:195 -#: ../src/widgets/sp-color-icc-selector.cpp:357 -#: ../src/widgets/sp-color-scales.cpp:435 -#: ../src/widgets/sp-color-scales.cpp:436 +#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:93 +#: ../src/ui/widget/color-icc-selector.cpp:178 +#: ../src/ui/widget/color-scales.cpp:391 ../src/ui/widget/color-scales.cpp:392 +#: ../share/extensions/nicechart.inx.h:34 msgid "Blue" msgstr "Blu" @@ -6665,29 +6398,30 @@ msgstr "Diffusa" #: ../src/extension/internal/filter/bumps.h:98 #: ../src/extension/internal/filter/bumps.h:329 #: ../src/libgdl/gdl-dock-placeholder.c:175 ../src/libgdl/gdl-dock.c:199 -#: ../src/widgets/rect-toolbar.cpp:331 -#: ../share/extensions/interp_att_g.inx.h:11 +#: ../src/ui/widget/page-sizer.cpp:250 ../src/widgets/rect-toolbar.cpp:334 +#: ../share/extensions/interp_att_g.inx.h:13 msgid "Height" msgstr "Altezza" #: ../src/extension/internal/filter/bumps.h:99 #: ../src/extension/internal/filter/bumps.h:330 -#: ../src/extension/internal/filter/color.h:76 -#: ../src/extension/internal/filter/color.h:824 -#: ../src/extension/internal/filter/color.h:1113 +#: ../src/extension/internal/filter/color.h:77 +#: ../src/extension/internal/filter/color.h:899 +#: ../src/extension/internal/filter/color.h:1188 #: ../src/extension/internal/filter/paint.h:86 #: ../src/extension/internal/filter/paint.h:592 #: ../src/extension/internal/filter/paint.h:707 -#: ../src/ui/tools/flood-tool.cpp:198 -#: ../src/widgets/sp-color-icc-selector.cpp:366 -#: ../src/widgets/sp-color-scales.cpp:461 -#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 +#: ../src/ui/tools/flood-tool.cpp:96 +#: ../src/ui/widget/color-icc-selector.cpp:187 +#: ../src/ui/widget/color-scales.cpp:417 ../src/ui/widget/color-scales.cpp:418 +#: ../src/widgets/tweak-toolbar.cpp:318 +#: ../share/extensions/color_randomize.inx.h:9 msgid "Lightness" msgstr "Luminosità" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 +#: ../src/widgets/measure-toolbar.cpp:302 msgid "Precision" msgstr "Precisione" @@ -6704,7 +6438,7 @@ msgid "Distant" msgstr "Distante" #: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Point" msgstr "Puntiforme" @@ -6718,13 +6452,13 @@ msgstr "Opzioni illuminazione distante" #: ../src/extension/internal/filter/bumps.h:110 #: ../src/extension/internal/filter/bumps.h:332 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1195 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 msgid "Azimuth" msgstr "Azimut" #: ../src/extension/internal/filter/bumps.h:111 #: ../src/extension/internal/filter/bumps.h:333 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1197 msgid "Elevation" msgstr "Elevazione" @@ -6793,7 +6527,7 @@ msgstr "Sfondo:" #: ../src/extension/internal/filter/bumps.h:322 #: ../src/extension/internal/filter/transparency.h:57 -#: ../src/filter-enums.cpp:29 ../src/sp-image.cpp:517 +#: ../src/filter-enums.cpp:30 ../src/sp-image.cpp:509 msgid "Image" msgstr "Immagine" @@ -6806,7 +6540,7 @@ msgid "Background opacity" msgstr "Opacità sfondo" #: ../src/extension/internal/filter/bumps.h:327 -#: ../src/extension/internal/filter/color.h:1040 +#: ../src/extension/internal/filter/color.h:1115 msgid "Lighting" msgstr "Illuminazione" @@ -6832,14 +6566,14 @@ msgstr "Tipo trasparenza:" #: ../src/extension/internal/filter/bumps.h:353 #: ../src/extension/internal/filter/morphology.h:176 -#: ../src/filter-enums.cpp:90 +#: ../src/filter-enums.cpp:91 msgid "Atop" msgstr "In cima" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 #: ../src/extension/internal/filter/morphology.h:174 -#: ../src/filter-enums.cpp:88 +#: ../src/filter-enums.cpp:89 msgid "In" msgstr "In" @@ -6847,17 +6581,17 @@ msgstr "In" msgid "Turns an image to jelly" msgstr "Converte un'immagine in gelatina" -#: ../src/extension/internal/filter/color.h:72 +#: ../src/extension/internal/filter/color.h:73 msgid "Brilliance" msgstr "Brillantezza" -#: ../src/extension/internal/filter/color.h:75 -#: ../src/extension/internal/filter/color.h:1417 +#: ../src/extension/internal/filter/color.h:76 +#: ../src/extension/internal/filter/color.h:1492 msgid "Over-saturation" msgstr "Sovrasaturazione" -#: ../src/extension/internal/filter/color.h:77 -#: ../src/extension/internal/filter/color.h:161 +#: ../src/extension/internal/filter/color.h:78 +#: ../src/extension/internal/filter/color.h:162 #: ../src/extension/internal/filter/overlays.h:70 #: ../src/extension/internal/filter/paint.h:85 #: ../src/extension/internal/filter/paint.h:502 @@ -6866,440 +6600,487 @@ msgstr "Sovrasaturazione" msgid "Inverted" msgstr "Inverti" -#: ../src/extension/internal/filter/color.h:85 +#: ../src/extension/internal/filter/color.h:86 msgid "Brightness filter" msgstr "Filtro di luminosità" -#: ../src/extension/internal/filter/color.h:152 +#: ../src/extension/internal/filter/color.h:153 msgid "Channel Painting" msgstr "Pittura canale" -#: ../src/extension/internal/filter/color.h:156 -#: ../src/extension/internal/filter/color.h:257 -#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:65 -#: ../src/ui/dialog/inkscape-preferences.cpp:944 -#: ../src/ui/tools/flood-tool.cpp:197 -#: ../src/widgets/sp-color-icc-selector.cpp:362 -#: ../src/widgets/sp-color-icc-selector.cpp:367 -#: ../src/widgets/sp-color-scales.cpp:458 -#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 +#: ../src/extension/internal/filter/color.h:157 +#: ../src/extension/internal/filter/color.h:332 +#: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 +#: ../src/ui/tools/flood-tool.cpp:95 +#: ../src/ui/widget/color-icc-selector.cpp:183 +#: ../src/ui/widget/color-icc-selector.cpp:188 +#: ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 +#: ../src/widgets/tweak-toolbar.cpp:302 +#: ../share/extensions/color_randomize.inx.h:6 msgid "Saturation" msgstr "Saturazione" -#: ../src/extension/internal/filter/color.h:160 +#: ../src/extension/internal/filter/color.h:161 #: ../src/extension/internal/filter/transparency.h:135 -#: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:199 +#: ../src/filter-enums.cpp:131 ../src/ui/tools/flood-tool.cpp:97 msgid "Alpha" msgstr "Alpha" -#: ../src/extension/internal/filter/color.h:174 +#: ../src/extension/internal/filter/color.h:175 msgid "Replace RGB by any color" msgstr "Rimpiazza RGB con qualsiasi colore" #: ../src/extension/internal/filter/color.h:254 +#, fuzzy +msgid "Color Blindness" +msgstr "Contorno colorato" + +#: ../src/extension/internal/filter/color.h:258 +#, fuzzy +msgid "Blindness type:" +msgstr "Tipo miscela:" + +#: ../src/extension/internal/filter/color.h:259 +msgid "Rod monochromacy (atypical achromatopsia)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:260 +msgid "Cone monochromacy (typical achromatopsia)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:261 +msgid "Green weak (deuteranomaly)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:262 +msgid "Green blind (deuteranopia)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:263 +msgid "Red weak (protanomaly)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:264 +msgid "Red blind (protanopia)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:265 +msgid "Blue weak (tritanomaly)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:266 +msgid "Blue blind (tritanopia)" +msgstr "" + +#: ../src/extension/internal/filter/color.h:286 +#, fuzzy +msgid "Simulate color blindness" +msgstr "Simula lo stile dei dipinti ad olio" + +#: ../src/extension/internal/filter/color.h:329 msgid "Color Shift" msgstr "Spostamento colore" -#: ../src/extension/internal/filter/color.h:256 +#: ../src/extension/internal/filter/color.h:331 msgid "Shift (°)" msgstr "Spostamento (°)" -#: ../src/extension/internal/filter/color.h:265 +#: ../src/extension/internal/filter/color.h:340 msgid "Rotate and desaturate hue" msgstr "Ruota e desatura tonalità" -#: ../src/extension/internal/filter/color.h:321 +#: ../src/extension/internal/filter/color.h:396 msgid "Harsh light" msgstr "Luce grezza" -#: ../src/extension/internal/filter/color.h:322 +#: ../src/extension/internal/filter/color.h:397 msgid "Normal light" msgstr "Luce normale" -#: ../src/extension/internal/filter/color.h:323 +#: ../src/extension/internal/filter/color.h:398 msgid "Duotone" msgstr "Due toni" -#: ../src/extension/internal/filter/color.h:324 -#: ../src/extension/internal/filter/color.h:1412 +#: ../src/extension/internal/filter/color.h:399 +#: ../src/extension/internal/filter/color.h:1487 msgid "Blend 1:" msgstr "Miscela 1:" -#: ../src/extension/internal/filter/color.h:331 -#: ../src/extension/internal/filter/color.h:1418 +#: ../src/extension/internal/filter/color.h:406 +#: ../src/extension/internal/filter/color.h:1493 msgid "Blend 2:" msgstr "Miscela 2:" -#: ../src/extension/internal/filter/color.h:350 +#: ../src/extension/internal/filter/color.h:425 msgid "Blend image or object with a flood color" msgstr "Miscela immagine o oggetto con un colore di riempimento" -#: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:22 +#: ../src/extension/internal/filter/color.h:499 ../src/filter-enums.cpp:23 msgid "Component Transfer" msgstr "Trasferimento componenti" -#: ../src/extension/internal/filter/color.h:427 ../src/filter-enums.cpp:109 +#: ../src/extension/internal/filter/color.h:502 ../src/filter-enums.cpp:110 msgid "Identity" msgstr "Identità" -#: ../src/extension/internal/filter/color.h:428 -#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:110 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1050 +#: ../src/extension/internal/filter/color.h:503 +#: ../src/extension/internal/filter/paint.h:498 ../src/filter-enums.cpp:111 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1051 msgid "Table" msgstr "Tabella" -#: ../src/extension/internal/filter/color.h:429 -#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:111 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1053 +#: ../src/extension/internal/filter/color.h:504 +#: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:112 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1054 msgid "Discrete" msgstr "Discreto" -#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:112 -#: ../src/live_effects/lpe-powerstroke.cpp:188 +#: ../src/extension/internal/filter/color.h:505 ../src/filter-enums.cpp:113 +#: ../src/live_effects/lpe-interpolate_points.cpp:25 +#: ../src/live_effects/lpe-powerstroke.cpp:133 msgid "Linear" msgstr "Lineare" -#: ../src/extension/internal/filter/color.h:431 ../src/filter-enums.cpp:113 +#: ../src/extension/internal/filter/color.h:506 ../src/filter-enums.cpp:114 msgid "Gamma" msgstr "Gamma" -#: ../src/extension/internal/filter/color.h:440 +#: ../src/extension/internal/filter/color.h:515 msgid "Basic component transfer structure" msgstr "Struttura base di trasferimento componenti" -#: ../src/extension/internal/filter/color.h:509 +#: ../src/extension/internal/filter/color.h:584 msgid "Duochrome" msgstr "Bicromatico" -#: ../src/extension/internal/filter/color.h:513 +#: ../src/extension/internal/filter/color.h:588 msgid "Fluorescence level" msgstr "Livello fluorescenza" -#: ../src/extension/internal/filter/color.h:514 +#: ../src/extension/internal/filter/color.h:589 msgid "Swap:" msgstr "Scambia:" -#: ../src/extension/internal/filter/color.h:515 +#: ../src/extension/internal/filter/color.h:590 msgid "No swap" msgstr "Nessuno scambio" -#: ../src/extension/internal/filter/color.h:516 +#: ../src/extension/internal/filter/color.h:591 msgid "Color and alpha" msgstr "Colore e alpha" -#: ../src/extension/internal/filter/color.h:517 +#: ../src/extension/internal/filter/color.h:592 msgid "Color only" msgstr "Solo colore" -#: ../src/extension/internal/filter/color.h:518 +#: ../src/extension/internal/filter/color.h:593 msgid "Alpha only" msgstr "Solo alfa" -#: ../src/extension/internal/filter/color.h:522 +#: ../src/extension/internal/filter/color.h:597 msgid "Color 1" msgstr "Colore 1" -#: ../src/extension/internal/filter/color.h:525 +#: ../src/extension/internal/filter/color.h:600 msgid "Color 2" msgstr "Colore 2" -#: ../src/extension/internal/filter/color.h:535 +#: ../src/extension/internal/filter/color.h:610 msgid "Convert luminance values to a duochrome palette" msgstr "Converte i valori di luminanza in una paletta bicromatica" -#: ../src/extension/internal/filter/color.h:634 +#: ../src/extension/internal/filter/color.h:709 msgid "Extract Channel" msgstr "Estrai canale" -#: ../src/extension/internal/filter/color.h:640 -#: ../src/widgets/sp-color-icc-selector.cpp:369 -#: ../src/widgets/sp-color-icc-selector.cpp:374 -#: ../src/widgets/sp-color-scales.cpp:483 -#: ../src/widgets/sp-color-scales.cpp:484 +#: ../src/extension/internal/filter/color.h:715 +#: ../src/ui/widget/color-icc-selector.cpp:190 +#: ../src/ui/widget/color-icc-selector.cpp:195 +#: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 msgid "Cyan" msgstr "Ciano" -#: ../src/extension/internal/filter/color.h:641 -#: ../src/widgets/sp-color-icc-selector.cpp:370 -#: ../src/widgets/sp-color-icc-selector.cpp:375 -#: ../src/widgets/sp-color-scales.cpp:486 -#: ../src/widgets/sp-color-scales.cpp:487 +#: ../src/extension/internal/filter/color.h:716 +#: ../src/ui/widget/color-icc-selector.cpp:191 +#: ../src/ui/widget/color-icc-selector.cpp:196 +#: ../src/ui/widget/color-scales.cpp:442 ../src/ui/widget/color-scales.cpp:443 msgid "Magenta" msgstr "Magenta" -#: ../src/extension/internal/filter/color.h:642 -#: ../src/widgets/sp-color-icc-selector.cpp:371 -#: ../src/widgets/sp-color-icc-selector.cpp:376 -#: ../src/widgets/sp-color-scales.cpp:489 -#: ../src/widgets/sp-color-scales.cpp:490 +#: ../src/extension/internal/filter/color.h:717 +#: ../src/ui/widget/color-icc-selector.cpp:192 +#: ../src/ui/widget/color-icc-selector.cpp:197 +#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 msgid "Yellow" msgstr "Giallo" -#: ../src/extension/internal/filter/color.h:644 +#: ../src/extension/internal/filter/color.h:719 msgid "Background blend mode:" msgstr "Modalità miscela sfondo:" -#: ../src/extension/internal/filter/color.h:649 +#: ../src/extension/internal/filter/color.h:724 msgid "Channel to alpha" msgstr "Canale a alpha" -#: ../src/extension/internal/filter/color.h:657 +#: ../src/extension/internal/filter/color.h:732 msgid "Extract color channel as a transparent image" msgstr "Estrai canale colore come un'immagine trasparente" -#: ../src/extension/internal/filter/color.h:740 +#: ../src/extension/internal/filter/color.h:815 msgid "Fade to Black or White" msgstr "Schiarisci verso Nero o Bianco" -#: ../src/extension/internal/filter/color.h:743 +#: ../src/extension/internal/filter/color.h:818 msgid "Fade to:" msgstr "Schiarisci verso:" -#: ../src/extension/internal/filter/color.h:744 -#: ../src/ui/widget/selected-style.cpp:261 -#: ../src/widgets/sp-color-icc-selector.cpp:372 -#: ../src/widgets/sp-color-scales.cpp:492 -#: ../src/widgets/sp-color-scales.cpp:493 +#: ../src/extension/internal/filter/color.h:819 +#: ../src/ui/widget/color-icc-selector.cpp:193 +#: ../src/ui/widget/color-scales.cpp:448 ../src/ui/widget/color-scales.cpp:449 +#: ../src/ui/widget/selected-style.cpp:274 msgid "Black" msgstr "Nero" -#: ../src/extension/internal/filter/color.h:745 -#: ../src/ui/widget/selected-style.cpp:257 +#: ../src/extension/internal/filter/color.h:820 +#: ../src/ui/widget/selected-style.cpp:270 msgid "White" msgstr "Bianco" -#: ../src/extension/internal/filter/color.h:754 +#: ../src/extension/internal/filter/color.h:829 msgid "Fade to black or white" msgstr "Schiarisci verso nero o bianco" -#: ../src/extension/internal/filter/color.h:819 +#: ../src/extension/internal/filter/color.h:894 msgid "Greyscale" msgstr "Scala di grigi" -#: ../src/extension/internal/filter/color.h:825 +#: ../src/extension/internal/filter/color.h:900 #: ../src/extension/internal/filter/paint.h:83 #: ../src/extension/internal/filter/paint.h:239 msgid "Transparent" msgstr "Trasparente" -#: ../src/extension/internal/filter/color.h:833 +#: ../src/extension/internal/filter/color.h:908 msgid "Customize greyscale components" msgstr "Personalizza le componenti della scala di grigi" -#: ../src/extension/internal/filter/color.h:905 -#: ../src/ui/widget/selected-style.cpp:253 +#: ../src/extension/internal/filter/color.h:980 +#: ../src/ui/widget/selected-style.cpp:266 msgid "Invert" msgstr "Inverti" -#: ../src/extension/internal/filter/color.h:907 +#: ../src/extension/internal/filter/color.h:982 msgid "Invert channels:" msgstr "Inverti canali:" -#: ../src/extension/internal/filter/color.h:908 +#: ../src/extension/internal/filter/color.h:983 msgid "No inversion" msgstr "Nessuna inversione" -#: ../src/extension/internal/filter/color.h:909 +#: ../src/extension/internal/filter/color.h:984 msgid "Red and blue" msgstr "Rosso e blu" -#: ../src/extension/internal/filter/color.h:910 +#: ../src/extension/internal/filter/color.h:985 msgid "Red and green" msgstr "Rosso e verde" -#: ../src/extension/internal/filter/color.h:911 +#: ../src/extension/internal/filter/color.h:986 msgid "Green and blue" msgstr "Verde e blu" -#: ../src/extension/internal/filter/color.h:913 +#: ../src/extension/internal/filter/color.h:988 msgid "Light transparency" msgstr "Trasparenza luce" -#: ../src/extension/internal/filter/color.h:914 +#: ../src/extension/internal/filter/color.h:989 msgid "Invert hue" msgstr "Inverti tonalità" -#: ../src/extension/internal/filter/color.h:915 +#: ../src/extension/internal/filter/color.h:990 msgid "Invert lightness" msgstr "Inverti luminosità" -#: ../src/extension/internal/filter/color.h:916 +#: ../src/extension/internal/filter/color.h:991 msgid "Invert transparency" msgstr "Inverti trasparenza" -#: ../src/extension/internal/filter/color.h:924 +#: ../src/extension/internal/filter/color.h:999 msgid "Manage hue, lightness and transparency inversions" msgstr "Gestisce l'inversione di tonalità, luminosità e trasparenza" -#: ../src/extension/internal/filter/color.h:1042 +#: ../src/extension/internal/filter/color.h:1117 msgid "Lights" msgstr "Luci" -#: ../src/extension/internal/filter/color.h:1043 +#: ../src/extension/internal/filter/color.h:1118 msgid "Shadows" msgstr "Ombre" -#: ../src/extension/internal/filter/color.h:1044 -#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:32 -#: ../src/live_effects/effect.cpp:95 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1047 -#: ../src/widgets/gradient-toolbar.cpp:1156 +#: ../src/extension/internal/filter/color.h:1119 +#: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 +#: ../src/live_effects/effect.cpp:108 +#: ../src/live_effects/lpe-transform_2pts.cpp:40 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1048 +#: ../src/widgets/gradient-toolbar.cpp:1159 +#: ../src/widgets/measure-toolbar.cpp:328 msgid "Offset" msgstr "Proiezione" -#: ../src/extension/internal/filter/color.h:1052 +#: ../src/extension/internal/filter/color.h:1127 msgid "Modify lights and shadows separately" msgstr "Modifica luci e ombre separatamente" -#: ../src/extension/internal/filter/color.h:1111 +#: ../src/extension/internal/filter/color.h:1186 msgid "Lightness-Contrast" msgstr "Luminosità-Contrasto" -#: ../src/extension/internal/filter/color.h:1122 +#: ../src/extension/internal/filter/color.h:1197 msgid "Modify lightness and contrast separately" msgstr "Modifica luminosità e contrasto separatamente" -#: ../src/extension/internal/filter/color.h:1190 +#: ../src/extension/internal/filter/color.h:1265 msgid "Nudge RGB" msgstr "Sposta RGB" -#: ../src/extension/internal/filter/color.h:1194 +#: ../src/extension/internal/filter/color.h:1269 msgid "Red offset" msgstr "Spostamento rosso" -#: ../src/extension/internal/filter/color.h:1195 -#: ../src/extension/internal/filter/color.h:1198 -#: ../src/extension/internal/filter/color.h:1201 -#: ../src/extension/internal/filter/color.h:1307 -#: ../src/extension/internal/filter/color.h:1310 -#: ../src/extension/internal/filter/color.h:1313 -#: ../src/ui/dialog/input.cpp:1616 ../src/ui/dialog/layers.cpp:917 +#: ../src/extension/internal/filter/color.h:1270 +#: ../src/extension/internal/filter/color.h:1273 +#: ../src/extension/internal/filter/color.h:1276 +#: ../src/extension/internal/filter/color.h:1382 +#: ../src/extension/internal/filter/color.h:1385 +#: ../src/extension/internal/filter/color.h:1388 +#: ../src/ui/dialog/input.cpp:1616 ../src/ui/dialog/layers.cpp:925 +#: ../src/ui/widget/page-sizer.cpp:247 msgid "X" msgstr "X" -#: ../src/extension/internal/filter/color.h:1196 -#: ../src/extension/internal/filter/color.h:1199 -#: ../src/extension/internal/filter/color.h:1202 -#: ../src/extension/internal/filter/color.h:1308 -#: ../src/extension/internal/filter/color.h:1311 -#: ../src/extension/internal/filter/color.h:1314 -#: ../src/ui/dialog/input.cpp:1616 +#: ../src/extension/internal/filter/color.h:1271 +#: ../src/extension/internal/filter/color.h:1274 +#: ../src/extension/internal/filter/color.h:1277 +#: ../src/extension/internal/filter/color.h:1383 +#: ../src/extension/internal/filter/color.h:1386 +#: ../src/extension/internal/filter/color.h:1389 +#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/page-sizer.cpp:248 msgid "Y" msgstr "Y" -#: ../src/extension/internal/filter/color.h:1197 +#: ../src/extension/internal/filter/color.h:1272 msgid "Green offset" msgstr "Spostamento verde" -#: ../src/extension/internal/filter/color.h:1200 +#: ../src/extension/internal/filter/color.h:1275 msgid "Blue offset" msgstr "Spostamento blu" -#: ../src/extension/internal/filter/color.h:1215 +#: ../src/extension/internal/filter/color.h:1290 msgid "" "Nudge RGB channels separately and blend them to different types of " "backgrounds" msgstr "" "Sposta i canali RGB separatamente e gli miscela in diversi tipi di sfondi" -#: ../src/extension/internal/filter/color.h:1302 +#: ../src/extension/internal/filter/color.h:1377 msgid "Nudge CMY" msgstr "Sposta CMY" -#: ../src/extension/internal/filter/color.h:1306 +#: ../src/extension/internal/filter/color.h:1381 msgid "Cyan offset" msgstr "Spostamento ciano" -#: ../src/extension/internal/filter/color.h:1309 +#: ../src/extension/internal/filter/color.h:1384 msgid "Magenta offset" msgstr "Spostamento magenta" -#: ../src/extension/internal/filter/color.h:1312 +#: ../src/extension/internal/filter/color.h:1387 msgid "Yellow offset" msgstr "Spostamento giallo" -#: ../src/extension/internal/filter/color.h:1327 +#: ../src/extension/internal/filter/color.h:1402 msgid "" "Nudge CMY channels separately and blend them to different types of " "backgrounds" msgstr "" "Sposta i canali CMY separatamente e gli miscela in diversi tipi di sfondi" -#: ../src/extension/internal/filter/color.h:1408 +#: ../src/extension/internal/filter/color.h:1483 msgid "Quadritone fantasy" msgstr "Fantasia in quattro torni" -#: ../src/extension/internal/filter/color.h:1410 +#: ../src/extension/internal/filter/color.h:1485 msgid "Hue distribution (°)" msgstr "Distribuzione tonalità (°)" -#: ../src/extension/internal/filter/color.h:1411 +#: ../src/extension/internal/filter/color.h:1486 #: ../share/extensions/svgcalendar.inx.h:19 msgid "Colors" msgstr "Colori" -#: ../src/extension/internal/filter/color.h:1432 +#: ../src/extension/internal/filter/color.h:1507 msgid "Replace hue by two colors" msgstr "Rimpiazza tonalità con due colori" -#: ../src/extension/internal/filter/color.h:1496 +#: ../src/extension/internal/filter/color.h:1571 msgid "Hue rotation (°)" msgstr "Rotazione tonalità (°)" -#: ../src/extension/internal/filter/color.h:1499 +#: ../src/extension/internal/filter/color.h:1574 msgid "Moonarize" msgstr "Lunare" -#: ../src/extension/internal/filter/color.h:1508 +#: ../src/extension/internal/filter/color.h:1583 msgid "Classic photographic solarization effect" msgstr "Classico effetto fotografico di solarizzazione" -#: ../src/extension/internal/filter/color.h:1581 +#: ../src/extension/internal/filter/color.h:1656 msgid "Tritone" msgstr "Tre toni" -#: ../src/extension/internal/filter/color.h:1587 +#: ../src/extension/internal/filter/color.h:1662 msgid "Enhance hue" msgstr "Migliora tonalità" -#: ../src/extension/internal/filter/color.h:1588 +#: ../src/extension/internal/filter/color.h:1663 msgid "Phosphorescence" msgstr "Fosforescenza" -#: ../src/extension/internal/filter/color.h:1589 +#: ../src/extension/internal/filter/color.h:1664 msgid "Colored nights" msgstr "Ombra colorata" -#: ../src/extension/internal/filter/color.h:1590 +#: ../src/extension/internal/filter/color.h:1665 msgid "Hue to background" msgstr "Tonalità a sfondo" -#: ../src/extension/internal/filter/color.h:1592 +#: ../src/extension/internal/filter/color.h:1667 msgid "Global blend:" msgstr "Miscela globale:" -#: ../src/extension/internal/filter/color.h:1598 +#: ../src/extension/internal/filter/color.h:1673 msgid "Glow" msgstr "Alone" -#: ../src/extension/internal/filter/color.h:1599 +#: ../src/extension/internal/filter/color.h:1674 msgid "Glow blend:" msgstr "Miscela alone:" -#: ../src/extension/internal/filter/color.h:1604 +#: ../src/extension/internal/filter/color.h:1679 msgid "Local light" msgstr "Illuminazione locale" -#: ../src/extension/internal/filter/color.h:1605 +#: ../src/extension/internal/filter/color.h:1680 msgid "Global light" msgstr "Illuminazione globale" -#: ../src/extension/internal/filter/color.h:1608 +#: ../src/extension/internal/filter/color.h:1683 msgid "Hue distribution (°):" msgstr "Distribuzione tonalità (°):" -#: ../src/extension/internal/filter/color.h:1619 +#: ../src/extension/internal/filter/color.h:1694 msgid "" "Create a custom tritone palette with additional glow, blend modes and hue " "moving" @@ -7313,13 +7094,13 @@ msgstr "Piuma" #: ../src/extension/internal/filter/distort.h:71 #: ../src/extension/internal/filter/morphology.h:175 -#: ../src/filter-enums.cpp:89 +#: ../src/filter-enums.cpp:90 msgid "Out" msgstr "Out" #: ../src/extension/internal/filter/distort.h:77 #: ../src/extension/internal/filter/textures.h:75 -#: ../src/ui/widget/selected-style.cpp:131 +#: ../src/ui/widget/selected-style.cpp:132 #: ../src/ui/widget/style-swatch.cpp:128 msgid "Stroke:" msgstr "Contorno:" @@ -7352,8 +7133,8 @@ msgstr "Rumore frattale" #: ../src/extension/internal/filter/distort.h:85 #: ../src/extension/internal/filter/distort.h:194 #: ../src/extension/internal/filter/overlays.h:62 -#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:35 -#: ../src/filter-enums.cpp:144 +#: ../src/extension/internal/filter/paint.h:693 ../src/filter-enums.cpp:36 +#: ../src/filter-enums.cpp:145 msgid "Turbulence" msgstr "Turbolenza" @@ -7395,6 +7176,7 @@ msgid "Blur and displace edges of shapes and pictures" msgstr "Sfoca e sposta i bordi di forme e immagini" #: ../src/extension/internal/filter/distort.h:190 +#: ../src/live_effects/effect.cpp:143 msgid "Roughen" msgstr "Increspato" @@ -7432,8 +7214,8 @@ msgid "Detect:" msgstr "Rileva:" #: ../src/extension/internal/filter/image.h:52 -#: ../src/ui/dialog/template-load-tab.cpp:105 -#: ../src/ui/dialog/template-load-tab.cpp:142 +#: ../src/ui/dialog/template-load-tab.cpp:107 +#: ../src/ui/dialog/template-load-tab.cpp:144 msgid "All" msgstr "Tutti" @@ -7473,9 +7255,9 @@ msgstr "Aperta" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 -#: ../src/widgets/rect-toolbar.cpp:314 ../src/widgets/spray-toolbar.cpp:116 -#: ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/interp_att_g.inx.h:10 +#: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317 +#: ../src/widgets/spray-toolbar.cpp:297 ../src/widgets/tweak-toolbar.cpp:128 +#: ../share/extensions/interp_att_g.inx.h:12 msgid "Width" msgstr "Larghezza" @@ -7509,17 +7291,19 @@ msgid "Composite type:" msgstr "Tipo composizione:" #: ../src/extension/internal/filter/morphology.h:173 -#: ../src/filter-enums.cpp:87 +#: ../src/filter-enums.cpp:88 msgid "Over" msgstr "Sovrapposizione" #: ../src/extension/internal/filter/morphology.h:177 -#: ../src/filter-enums.cpp:91 +#: ../src/filter-enums.cpp:92 msgid "XOR" msgstr "XOR" #: ../src/extension/internal/filter/morphology.h:179 #: ../src/ui/dialog/layer-properties.cpp:185 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:59 +#: ../share/extensions/measure.inx.h:5 msgid "Position:" msgstr "Posizione:" @@ -7560,6 +7344,7 @@ msgid "Erosion 2" msgstr "Erosione 2" #: ../src/extension/internal/filter/morphology.h:191 +#: ../src/live_effects/lpe-roughen.cpp:41 msgid "Smooth" msgstr "Uniformità" @@ -7697,7 +7482,7 @@ msgid "Clean-up" msgstr "Pulisci" #: ../src/extension/internal/filter/paint.h:238 -#: ../share/extensions/measure.inx.h:11 +#: ../share/extensions/measure.inx.h:17 msgid "Length" msgstr "Lunghezza" @@ -7707,15 +7492,17 @@ msgstr "" "Converte l'immagine in una incisione fatta di linee verticali e orizzontali" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:1004 -#: ../src/widgets/desktop-widget.cpp:1996 +#: ../src/ui/dialog/align-and-distribute.cpp:1090 +#: ../src/widgets/desktop-widget.cpp:2069 msgid "Drawing" msgstr "Disegno" +#. 0.92 #: ../src/extension/internal/filter/paint.h:335 #: ../src/extension/internal/filter/paint.h:496 #: ../src/extension/internal/filter/paint.h:590 -#: ../src/extension/internal/filter/paint.h:976 ../src/splivarot.cpp:2212 +#: ../src/extension/internal/filter/paint.h:976 +#: ../src/live_effects/effect.cpp:136 ../src/splivarot.cpp:2204 msgid "Simplify" msgstr "Semplifica" @@ -7786,6 +7573,7 @@ msgid "Contrasted" msgstr "Grezza" #: ../src/extension/internal/filter/paint.h:591 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Line width" msgstr "Larghezza linea" @@ -7956,6 +7744,8 @@ msgid "External" msgstr "Esterno" #: ../src/extension/internal/filter/textures.h:81 +#: ../share/extensions/markers_strokepaint.inx.h:8 +#: ../share/extensions/restack.inx.h:4 msgid "Custom" msgstr "Personalizzato" @@ -7980,7 +7770,7 @@ msgid "Inkblot on tissue or rough paper" msgstr "Macchie di inchiostro su tessuto o carta grezza" #: ../src/extension/internal/filter/transparency.h:53 -#: ../src/filter-enums.cpp:20 +#: ../src/filter-enums.cpp:21 msgid "Blend" msgstr "Miscela" @@ -7989,14 +7779,14 @@ msgid "Source:" msgstr "Sorgente:" #: ../src/extension/internal/filter/transparency.h:56 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1551 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1603 msgid "Background" msgstr "Sfondo" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2839 -#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:127 ../src/widgets/spray-toolbar.cpp:186 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:133 +#: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:389 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 #: ../share/extensions/triangle.inx.h:8 msgid "Mode:" @@ -8043,17 +7833,17 @@ msgstr "Taglio" msgid "Repaint anything visible monochrome" msgstr "Ridipinge tutto il visibile in monocromomatico" -#: ../src/extension/internal/gdkpixbuf-input.cpp:184 +#: ../src/extension/internal/gdkpixbuf-input.cpp:188 #, c-format msgid "%s bitmap image import" msgstr "Importa immagine bitmap %s" -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 +#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format msgid "Image Import Type:" msgstr "Modalità importazione immagine:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:191 +#: ../src/extension/internal/gdkpixbuf-input.cpp:195 #, c-format msgid "" "Embed results in stand-alone, larger SVG files. Link references a file " @@ -8063,24 +7853,24 @@ msgstr "" "riferimento a un file esterno al file SVG che necessita di essere spostato " "insieme a tutti gli altri file." -#: ../src/extension/internal/gdkpixbuf-input.cpp:192 -#: ../src/ui/dialog/inkscape-preferences.cpp:1448 +#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +#: ../src/ui/dialog/inkscape-preferences.cpp:1511 #, c-format msgid "Embed" msgstr "Incorpora" -#: ../src/extension/internal/gdkpixbuf-input.cpp:193 ../src/sp-anchor.cpp:119 -#: ../src/ui/dialog/inkscape-preferences.cpp:1448 +#: ../src/extension/internal/gdkpixbuf-input.cpp:197 ../src/sp-anchor.cpp:105 +#: ../src/ui/dialog/inkscape-preferences.cpp:1511 #, c-format msgid "Link" msgstr "Collega" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #, c-format msgid "Image DPI:" msgstr "DPI immagine:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:196 +#: ../src/extension/internal/gdkpixbuf-input.cpp:200 #, c-format msgid "" "Take information from file or use default bitmap import resolution as " @@ -8089,22 +7879,22 @@ msgstr "" "Ottiene informazioni dal file o utilizza la risoluzione impostata nelle " "preferenze per l'importazione bitmap." -#: ../src/extension/internal/gdkpixbuf-input.cpp:197 +#: ../src/extension/internal/gdkpixbuf-input.cpp:201 #, c-format msgid "From file" msgstr "Da file" -#: ../src/extension/internal/gdkpixbuf-input.cpp:198 +#: ../src/extension/internal/gdkpixbuf-input.cpp:202 #, c-format msgid "Default import resolution" msgstr "Risoluzione predefinita per l'importazione" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 +#: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format msgid "Image Rendering Mode:" msgstr "Modalità rendering immagine:" -#: ../src/extension/internal/gdkpixbuf-input.cpp:201 +#: ../src/extension/internal/gdkpixbuf-input.cpp:205 #, c-format msgid "" "When an image is upscaled, apply smoothing or keep blocky (pixelated). (Will " @@ -8113,31 +7903,31 @@ msgstr "" "Quando un'immagine viene ingrandita, la rende fluida o la mantiene grezza " "(pixel). (Non funziona in tutti i browser)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:202 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/extension/internal/gdkpixbuf-input.cpp:206 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "None (auto)" msgstr "Nessuna (auto)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:203 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/extension/internal/gdkpixbuf-input.cpp:207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "Smooth (optimizeQuality)" msgstr "Fluida (optimizeQuality)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:204 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/extension/internal/gdkpixbuf-input.cpp:208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "Blocky (optimizeSpeed)" msgstr "Grezza (optimizeSpeed)" -#: ../src/extension/internal/gdkpixbuf-input.cpp:207 +#: ../src/extension/internal/gdkpixbuf-input.cpp:211 #, c-format msgid "Hide the dialog next time and always apply the same actions." msgstr "" "Nasconde questa finestra la prossima volta e applica le stesse opzioni." -#: ../src/extension/internal/gdkpixbuf-input.cpp:207 +#: ../src/extension/internal/gdkpixbuf-input.cpp:211 #, c-format msgid "Don't ask again" msgstr "Non chiedere più" @@ -8154,32 +7944,32 @@ msgstr "Gradiente GIMP (*.ggr)" msgid "Gradients used in GIMP" msgstr "Gradienti usati in GIMP" -#: ../src/extension/internal/grid.cpp:210 ../src/ui/widget/panel.cpp:117 +#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:114 msgid "Grid" msgstr "Griglia" -#: ../src/extension/internal/grid.cpp:212 +#: ../src/extension/internal/grid.cpp:206 msgid "Line Width:" msgstr "Larghezza linea:" -#: ../src/extension/internal/grid.cpp:213 +#: ../src/extension/internal/grid.cpp:207 msgid "Horizontal Spacing:" msgstr "Spaziatura orizzontale:" -#: ../src/extension/internal/grid.cpp:214 +#: ../src/extension/internal/grid.cpp:208 msgid "Vertical Spacing:" msgstr "Spaziatura verticale:" -#: ../src/extension/internal/grid.cpp:215 +#: ../src/extension/internal/grid.cpp:209 msgid "Horizontal Offset:" msgstr "Spostamento orizzontale:" -#: ../src/extension/internal/grid.cpp:216 +#: ../src/extension/internal/grid.cpp:210 msgid "Vertical Offset:" msgstr "Spostamento verticale:" -#: ../src/extension/internal/grid.cpp:220 -#: ../src/ui/dialog/inkscape-preferences.cpp:1469 +#: ../src/extension/internal/grid.cpp:214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 #: ../share/extensions/eqtexsvg.inx.h:4 #: ../share/extensions/foldablebox.inx.h:9 @@ -8191,6 +7981,7 @@ msgstr "Spostamento verticale:" #: ../share/extensions/hershey.inx.h:52 #: ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 +#: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 #: ../share/extensions/perfectboundcover.inx.h:19 #: ../share/extensions/polyhedron_3d.inx.h:56 @@ -8200,7 +7991,8 @@ msgstr "Spostamento verticale:" #: ../share/extensions/render_barcode_datamatrix.inx.h:5 #: ../share/extensions/render_barcode_qrcode.inx.h:18 #: ../share/extensions/render_gear_rack.inx.h:5 -#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:4 +#: ../share/extensions/render_gears.inx.h:11 ../share/extensions/rtree.inx.h:6 +#: ../share/extensions/seamless_pattern.inx.h:5 #: ../share/extensions/spirograph.inx.h:10 #: ../share/extensions/svgcalendar.inx.h:38 #: ../share/extensions/triangle.inx.h:14 @@ -8208,26 +8000,26 @@ msgstr "Spostamento verticale:" msgid "Render" msgstr "Rendering" -#: ../src/extension/internal/grid.cpp:221 -#: ../src/ui/dialog/document-properties.cpp:155 -#: ../src/ui/dialog/inkscape-preferences.cpp:779 -#: ../src/widgets/toolbox.cpp:1826 +#: ../src/extension/internal/grid.cpp:215 +#: ../src/ui/dialog/document-properties.cpp:163 +#: ../src/ui/dialog/inkscape-preferences.cpp:832 +#: ../src/widgets/toolbox.cpp:1886 msgid "Grids" msgstr "Griglie" -#: ../src/extension/internal/grid.cpp:224 +#: ../src/extension/internal/grid.cpp:218 msgid "Draw a path which is a grid" msgstr "Disegna un tracciato a forma di griglia" -#: ../src/extension/internal/javafx-out.cpp:966 +#: ../src/extension/internal/javafx-out.cpp:963 msgid "JavaFX Output" msgstr "Ouput JavaFX" -#: ../src/extension/internal/javafx-out.cpp:971 +#: ../src/extension/internal/javafx-out.cpp:968 msgid "JavaFX (*.fx)" msgstr "JavaFX (*.fx)" -#: ../src/extension/internal/javafx-out.cpp:972 +#: ../src/extension/internal/javafx-out.cpp:969 msgid "JavaFX Raytracer File" msgstr "File JavaFX Raytracer" @@ -8243,58 +8035,58 @@ msgstr "LaTeX con macro PSTricks (*.tex)" msgid "LaTeX PSTricks File" msgstr "LaTeX PSTricks File" -#: ../src/extension/internal/latex-pstricks.cpp:331 +#: ../src/extension/internal/latex-pstricks.cpp:330 msgid "LaTeX Print" msgstr "Stampa LaTeX" -#: ../src/extension/internal/odf.cpp:2142 +#: ../src/extension/internal/odf.cpp:2141 msgid "OpenDocument Drawing Output" msgstr "Output OpenDocument Drawing" -#: ../src/extension/internal/odf.cpp:2147 +#: ../src/extension/internal/odf.cpp:2146 msgid "OpenDocument drawing (*.odg)" msgstr "Disegno OpenDocument (*.odg)" -#: ../src/extension/internal/odf.cpp:2148 +#: ../src/extension/internal/odf.cpp:2147 msgid "OpenDocument drawing file" msgstr "File di disegno OpenDocument" #. TRANSLATORS: The following are document crop settings for PDF import #. more info: http://www.acrobatusers.com/tech_corners/javascript_corner/tips/2006/page_bounds/ -#: ../src/extension/internal/pdfinput/pdf-input.cpp:71 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:77 msgid "media box" msgstr "riquadro contenuto" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:72 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:78 msgid "crop box" msgstr "riquadro adattato" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:73 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:79 msgid "trim box" msgstr "riquadro ritaglio" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:74 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:80 msgid "bleed box" msgstr "riquadro rifilo" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:75 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:81 msgid "art box" msgstr "riquadro immagine" #. Crop settings -#: ../src/extension/internal/pdfinput/pdf-input.cpp:112 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:117 msgid "Clip to:" msgstr "Fissa a:" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:123 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:128 msgid "Page settings" msgstr "Impostazioni pagina" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:124 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:129 msgid "Precision of approximating gradient meshes:" msgstr "Precisione approssimazione delle mesh dei gradienti:" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:125 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:130 msgid "" "Note: setting the precision too high may result in a large SVG file " "and slow performance." @@ -8302,93 +8094,109 @@ msgstr "" "Nota: impostare la precisione ad un valore troppo alto può comportare " "file SVG molto grossi e performance peggiori." -#: ../src/extension/internal/pdfinput/pdf-input.cpp:128 -msgid "import via Poppler" -msgstr "importa via Poppler" +#: ../src/extension/internal/pdfinput/pdf-input.cpp:134 +msgid "Poppler/Cairo import" +msgstr "" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:135 +msgid "" +"Import via external library. Text consists of groups containing cloned " +"glyphs where each glyph is a path. Images are stored internally. Meshes " +"cause entire document to be rendered as a raster image." +msgstr "" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:138 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:136 +#, fuzzy +msgid "Internal import" +msgstr "Punto verticale:" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:137 +msgid "" +"Import via internal (Poppler derived) library. Text is stored as text but " +"white space is missing. Meshes are converted to tiles, the number depends on " +"the precision set below." +msgstr "" + +#: ../src/extension/internal/pdfinput/pdf-input.cpp:148 msgid "rough" msgstr "grezzo" #. Text options -#: ../src/extension/internal/pdfinput/pdf-input.cpp:142 -msgid "Text handling:" -msgstr "Gestione testo:" - -#: ../src/extension/internal/pdfinput/pdf-input.cpp:144 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:145 -msgid "Import text as text" -msgstr "Importa testo come testo" - -#: ../src/extension/internal/pdfinput/pdf-input.cpp:146 +#. _labelText = Gtk::manage(new class Gtk::Label(_("Text handling:"))); +#. _textHandlingCombo = Gtk::manage(new class Gtk::ComboBoxText()); +#. _textHandlingCombo->append(_("Import text as text")); +#. _textHandlingCombo->set_active_text(_("Import text as text")); +#. hbox5 = Gtk::manage(new class Gtk::HBox(false, 4)); +#. Font option +#: ../src/extension/internal/pdfinput/pdf-input.cpp:159 msgid "Replace PDF fonts by closest-named installed fonts" msgstr "Rimpiazza font PDF con il font installato dal nome più simile" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:149 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:161 msgid "Embed images" msgstr "Incorpora immagini" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:151 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:163 msgid "Import settings" msgstr "Impostazioni importazione" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:268 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:291 msgid "PDF Import Settings" msgstr "Impostazioni importazione PDF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:431 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:438 msgctxt "PDF input precision" msgid "rough" msgstr "grezza" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:432 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:439 msgctxt "PDF input precision" msgid "medium" msgstr "media" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:433 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:440 msgctxt "PDF input precision" msgid "fine" msgstr "buona" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:434 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:441 msgctxt "PDF input precision" msgid "very fine" msgstr "ottima" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:901 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:937 msgid "PDF Input" msgstr "Input PDF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:906 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:942 msgid "Adobe PDF (*.pdf)" msgstr "PDF Adobe (*.pdf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:907 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:943 msgid "Adobe Portable Document Format" msgstr "Documento Adobe Portable Format" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:914 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:950 msgid "AI Input" msgstr "Input AI" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:919 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:955 msgid "Adobe Illustrator 9.0 and above (*.ai)" msgstr "Adobe Illustrator 9.0 e superiori (*.ai)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:920 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:956 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" msgstr "Apre file salvati con Adobe Illustrator 9.0 o più recenti" -#: ../src/extension/internal/pov-out.cpp:715 +#: ../src/extension/internal/pov-out.cpp:714 msgid "PovRay Output" msgstr "Output PovRay" -#: ../src/extension/internal/pov-out.cpp:720 +#: ../src/extension/internal/pov-out.cpp:719 msgid "PovRay (*.pov) (paths and shapes only)" msgstr "PovRay (*.pov) (solo tracciati e forme)" -#: ../src/extension/internal/pov-out.cpp:721 +#: ../src/extension/internal/pov-out.cpp:720 msgid "PovRay Raytracer File" msgstr "File PovRay Raytracer" @@ -8416,7 +8224,7 @@ msgstr "Inkscape SVG (*.svg)" msgid "SVG format with Inkscape extensions" msgstr "Formato SVG con estensioni di Inkscape" -#: ../src/extension/internal/svg.cpp:128 +#: ../src/extension/internal/svg.cpp:128 ../share/extensions/scour.inx.h:19 msgid "SVG Output" msgstr "Output SVG" @@ -8456,78 +8264,78 @@ msgstr "SVG puro compresso (*.svgz)" msgid "Scalable Vector Graphics format compressed with GZip" msgstr "Formato Scalable Vector Graphics compresso con GZip" -#: ../src/extension/internal/vsd-input.cpp:295 +#: ../src/extension/internal/vsd-input.cpp:296 msgid "VSD Input" msgstr "Input VSD" -#: ../src/extension/internal/vsd-input.cpp:300 +#: ../src/extension/internal/vsd-input.cpp:301 msgid "Microsoft Visio Diagram (*.vsd)" msgstr "Microsoft Visio Diagram (*.vsd)" -#: ../src/extension/internal/vsd-input.cpp:301 +#: ../src/extension/internal/vsd-input.cpp:302 msgid "File format used by Microsoft Visio 6 and later" msgstr "Formato file usato da Microsoft Visio 6 e successivi" -#: ../src/extension/internal/vsd-input.cpp:308 +#: ../src/extension/internal/vsd-input.cpp:309 msgid "VDX Input" msgstr "Input VDX" -#: ../src/extension/internal/vsd-input.cpp:313 +#: ../src/extension/internal/vsd-input.cpp:314 msgid "Microsoft Visio XML Diagram (*.vdx)" msgstr "Microsoft Visio XML Diagram (*.vdx)" -#: ../src/extension/internal/vsd-input.cpp:314 +#: ../src/extension/internal/vsd-input.cpp:315 msgid "File format used by Microsoft Visio 2010 and later" msgstr "Formato file usato da Microsoft Visio 2010 e successivi" -#: ../src/extension/internal/vsd-input.cpp:321 +#: ../src/extension/internal/vsd-input.cpp:322 msgid "VSDM Input" msgstr "Input VSDM" -#: ../src/extension/internal/vsd-input.cpp:326 +#: ../src/extension/internal/vsd-input.cpp:327 msgid "Microsoft Visio 2013 drawing (*.vsdm)" msgstr "Disegno Microsoft Visio 2013 (*.vsdm)" -#: ../src/extension/internal/vsd-input.cpp:327 -#: ../src/extension/internal/vsd-input.cpp:340 +#: ../src/extension/internal/vsd-input.cpp:328 +#: ../src/extension/internal/vsd-input.cpp:341 msgid "File format used by Microsoft Visio 2013 and later" msgstr "Formato file usato da Microsoft Visio 2013 e successivi" -#: ../src/extension/internal/vsd-input.cpp:334 +#: ../src/extension/internal/vsd-input.cpp:335 msgid "VSDX Input" msgstr "Input VSDX" -#: ../src/extension/internal/vsd-input.cpp:339 +#: ../src/extension/internal/vsd-input.cpp:340 msgid "Microsoft Visio 2013 drawing (*.vsdx)" msgstr "Disegno Microsoft Visio 2013 (*.vsdx)" -#: ../src/extension/internal/wmf-inout.cpp:3127 +#: ../src/extension/internal/wmf-inout.cpp:3180 msgid "WMF Input" msgstr "Input WMF" -#: ../src/extension/internal/wmf-inout.cpp:3132 +#: ../src/extension/internal/wmf-inout.cpp:3185 msgid "Windows Metafiles (*.wmf)" msgstr "Windows Metafile (*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3133 +#: ../src/extension/internal/wmf-inout.cpp:3186 msgid "Windows Metafiles" msgstr "Windows Metafile" -#: ../src/extension/internal/wmf-inout.cpp:3141 +#: ../src/extension/internal/wmf-inout.cpp:3194 msgid "WMF Output" msgstr "Output WMF" -#: ../src/extension/internal/wmf-inout.cpp:3151 +#: ../src/extension/internal/wmf-inout.cpp:3204 msgid "Map all fill patterns to standard WMF hatches" msgstr "" -#: ../src/extension/internal/wmf-inout.cpp:3155 +#: ../src/extension/internal/wmf-inout.cpp:3208 #: ../share/extensions/wmf_input.inx.h:2 #: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Windows Metafile (*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3156 +#: ../src/extension/internal/wmf-inout.cpp:3209 msgid "Windows Metafile" msgstr "Windows Metafile" @@ -8551,62 +8359,62 @@ msgstr "Anteprima diretta" msgid "Is the effect previewed live on canvas?" msgstr "Aggiornamento in tempo reale degli effetti sul disegno?" -#: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127 +#: ../src/extension/system.cpp:126 ../src/extension/system.cpp:128 msgid "Format autodetect failed. The file is being opened as SVG." msgstr "" "Impossibile determinare automaticamente il formato. Il file verrà aperto " "come SVG." -#: ../src/file.cpp:183 +#: ../src/file.cpp:185 msgid "default.svg" msgstr "default.it.svg" -#: ../src/file.cpp:322 +#: ../src/file.cpp:332 msgid "Broken links have been changed to point to existing files." msgstr "" -#: ../src/file.cpp:333 ../src/file.cpp:1249 +#: ../src/file.cpp:343 ../src/file.cpp:1278 #, c-format msgid "Failed to load the requested file %s" msgstr "Impossibile caricare il file %s" -#: ../src/file.cpp:359 +#: ../src/file.cpp:369 msgid "Document not saved yet. Cannot revert." msgstr "Documento non ancora salvato. Impossibile ricaricarlo." -#: ../src/file.cpp:365 +#: ../src/file.cpp:375 msgid "Changes will be lost! Are you sure you want to reload document %1?" msgstr "" "Le modifiche andranno perdute! Sicuri di voler ricaricare il documento %1?" -#: ../src/file.cpp:391 +#: ../src/file.cpp:401 msgid "Document reverted." msgstr "Documento ricaricato." -#: ../src/file.cpp:393 +#: ../src/file.cpp:403 msgid "Document not reverted." msgstr "Documento non ricaricato." -#: ../src/file.cpp:543 +#: ../src/file.cpp:553 msgid "Select file to open" msgstr "Seleziona il file da aprire" -#: ../src/file.cpp:625 +#: ../src/file.cpp:635 msgid "Clean up document" msgstr "Pulisci documento" -#: ../src/file.cpp:632 +#: ../src/file.cpp:642 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." msgstr[0] "Rimossa %i definizione inutilizzata in <defs>." msgstr[1] "Rimosse %i definizioni inutilizzate in <defs>." -#: ../src/file.cpp:637 +#: ../src/file.cpp:647 msgid "No unused definitions in <defs>." msgstr "Nessuna definizione inutilizzata in <defs>." -#: ../src/file.cpp:669 +#: ../src/file.cpp:679 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8616,276 +8424,278 @@ msgstr "" "(%s). Ciò potrebbe esser stato causato da un'estensione del nome del file " "sconosciuta." -#: ../src/file.cpp:670 ../src/file.cpp:678 ../src/file.cpp:686 -#: ../src/file.cpp:692 ../src/file.cpp:697 +#: ../src/file.cpp:680 ../src/file.cpp:688 ../src/file.cpp:696 +#: ../src/file.cpp:702 ../src/file.cpp:707 msgid "Document not saved." msgstr "Documento non salvato." -#: ../src/file.cpp:677 +#: ../src/file.cpp:687 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." msgstr "" "Il file %s è protetto dalla scrittura. Rimuovere la protezione e riprovare." -#: ../src/file.cpp:685 +#: ../src/file.cpp:695 #, c-format msgid "File %s could not be saved." msgstr "Impossibile salvare il file %s." -#: ../src/file.cpp:715 ../src/file.cpp:717 +#: ../src/file.cpp:725 ../src/file.cpp:727 msgid "Document saved." msgstr "Documento salvato." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:860 ../src/file.cpp:1408 +#: ../src/file.cpp:870 ../src/file.cpp:1437 msgid "drawing" msgstr "disegno" -#: ../src/file.cpp:865 +#: ../src/file.cpp:875 msgid "drawing-%1" msgstr "disegno-%1" -#: ../src/file.cpp:882 +#: ../src/file.cpp:892 msgid "Select file to save a copy to" msgstr "Seleziona il file in cui salvare una copia" -#: ../src/file.cpp:884 +#: ../src/file.cpp:894 msgid "Select file to save to" msgstr "Seleziona il file da salvare" -#: ../src/file.cpp:989 ../src/file.cpp:991 +#: ../src/file.cpp:999 ../src/file.cpp:1001 msgid "No changes need to be saved." msgstr "Nessuna modifica da salvare." -#: ../src/file.cpp:1010 +#: ../src/file.cpp:1020 msgid "Saving document..." msgstr "Salvataggio del documento..." -#: ../src/file.cpp:1246 ../src/ui/dialog/inkscape-preferences.cpp:1442 +#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1505 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "Importa" -#: ../src/file.cpp:1296 +#: ../src/file.cpp:1325 msgid "Select file to import" msgstr "Seleziona il file da importare" -#: ../src/file.cpp:1429 +#: ../src/file.cpp:1458 msgid "Select file to export to" msgstr "Seleziona il file su cui esportare" -#: ../src/file.cpp:1682 +#: ../src/file.cpp:1711 msgid "Import Clip Art" msgstr "Importa Clip Art" -#: ../src/filter-enums.cpp:21 +#: ../src/filter-enums.cpp:22 msgid "Color Matrix" msgstr "Matrice di colore" -#: ../src/filter-enums.cpp:23 +#: ../src/filter-enums.cpp:24 msgid "Composite" msgstr "Composto" -#: ../src/filter-enums.cpp:24 +#: ../src/filter-enums.cpp:25 msgid "Convolve Matrix" msgstr "Matrice di convoluzione" -#: ../src/filter-enums.cpp:25 +#: ../src/filter-enums.cpp:26 msgid "Diffuse Lighting" msgstr "Illuminazione diffusa" -#: ../src/filter-enums.cpp:26 +#: ../src/filter-enums.cpp:27 msgid "Displacement Map" msgstr "Mappa di spostamento" -#: ../src/filter-enums.cpp:27 +#: ../src/filter-enums.cpp:28 msgid "Flood" msgstr "Riempimento" -#: ../src/filter-enums.cpp:30 ../share/extensions/text_merge.inx.h:1 +#: ../src/filter-enums.cpp:31 ../share/extensions/text_merge.inx.h:1 msgid "Merge" msgstr "Mischia" -#: ../src/filter-enums.cpp:33 +#: ../src/filter-enums.cpp:34 msgid "Specular Lighting" msgstr "Illuminazione speculare" -#: ../src/filter-enums.cpp:34 +#: ../src/filter-enums.cpp:35 msgid "Tile" msgstr "Piastrella" -#: ../src/filter-enums.cpp:40 +#: ../src/filter-enums.cpp:41 msgid "Source Graphic" msgstr "Sorgente immagine" -#: ../src/filter-enums.cpp:41 +#: ../src/filter-enums.cpp:42 msgid "Source Alpha" msgstr "Sorgente trasparenza" -#: ../src/filter-enums.cpp:42 +#: ../src/filter-enums.cpp:43 msgid "Background Image" msgstr "Immagine di sfondo" -#: ../src/filter-enums.cpp:43 +#: ../src/filter-enums.cpp:44 msgid "Background Alpha" msgstr "Trasparenza dello sfondo" -#: ../src/filter-enums.cpp:44 +#: ../src/filter-enums.cpp:45 msgid "Fill Paint" msgstr "Riempimento uniforme" -#: ../src/filter-enums.cpp:45 +#: ../src/filter-enums.cpp:46 msgid "Stroke Paint" msgstr "Colore contorno" #. New in Compositing and Blending Level 1 -#: ../src/filter-enums.cpp:57 +#: ../src/filter-enums.cpp:58 #, fuzzy msgid "Overlay" msgstr "Sovrapposizione" -#: ../src/filter-enums.cpp:58 +#: ../src/filter-enums.cpp:59 #, fuzzy msgid "Color Dodge" msgstr "Colore delle linee guida" -#: ../src/filter-enums.cpp:59 +#: ../src/filter-enums.cpp:60 #, fuzzy msgid "Color Burn" msgstr "Barra colori" -#: ../src/filter-enums.cpp:60 +#: ../src/filter-enums.cpp:61 msgid "Hard Light" msgstr "" -#: ../src/filter-enums.cpp:61 +#: ../src/filter-enums.cpp:62 #, fuzzy msgid "Soft Light" msgstr "Punto luce" -#: ../src/filter-enums.cpp:62 ../src/splivarot.cpp:88 ../src/splivarot.cpp:94 +#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:89 ../src/splivarot.cpp:95 msgid "Difference" msgstr "Differenza" -#: ../src/filter-enums.cpp:63 ../src/splivarot.cpp:100 +#: ../src/filter-enums.cpp:64 ../src/splivarot.cpp:101 msgid "Exclusion" msgstr "Esclusione" -#: ../src/filter-enums.cpp:64 ../src/ui/tools/flood-tool.cpp:196 -#: ../src/widgets/sp-color-icc-selector.cpp:361 -#: ../src/widgets/sp-color-icc-selector.cpp:365 -#: ../src/widgets/sp-color-scales.cpp:455 -#: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:286 +#: ../src/filter-enums.cpp:65 ../src/ui/tools/flood-tool.cpp:94 +#: ../src/ui/widget/color-icc-selector.cpp:182 +#: ../src/ui/widget/color-icc-selector.cpp:186 +#: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 +#: ../src/widgets/tweak-toolbar.cpp:286 #: ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "Tonalità" -#: ../src/filter-enums.cpp:67 +#: ../src/filter-enums.cpp:68 msgid "Luminosity" msgstr "" -#: ../src/filter-enums.cpp:77 +#: ../src/filter-enums.cpp:78 msgid "Matrix" msgstr "Matrice" -#: ../src/filter-enums.cpp:78 +#: ../src/filter-enums.cpp:79 msgid "Saturate" msgstr "Satura" -#: ../src/filter-enums.cpp:79 +#: ../src/filter-enums.cpp:80 msgid "Hue Rotate" msgstr "Ruota luminosità" -#: ../src/filter-enums.cpp:80 +#: ../src/filter-enums.cpp:81 msgid "Luminance to Alpha" msgstr "Da luminanza a trasparenza" -#: ../src/filter-enums.cpp:86 +#: ../src/filter-enums.cpp:87 #: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 +#: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" msgstr "Predefinito" #. New CSS -#: ../src/filter-enums.cpp:94 +#: ../src/filter-enums.cpp:95 #, fuzzy msgid "Clear" msgstr "Pulisci" -#: ../src/filter-enums.cpp:95 +#: ../src/filter-enums.cpp:96 #, fuzzy msgid "Copy" msgstr "Copia" -#: ../src/filter-enums.cpp:96 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1571 +#: ../src/filter-enums.cpp:97 ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1623 msgid "Destination" msgstr "Destinazione" -#: ../src/filter-enums.cpp:97 +#: ../src/filter-enums.cpp:98 #, fuzzy msgid "Destination Over" msgstr "Destinazione" -#: ../src/filter-enums.cpp:98 +#: ../src/filter-enums.cpp:99 #, fuzzy msgid "Destination In" msgstr "Destinazione" -#: ../src/filter-enums.cpp:99 +#: ../src/filter-enums.cpp:100 #, fuzzy msgid "Destination Out" msgstr "Destinazione" -#: ../src/filter-enums.cpp:100 +#: ../src/filter-enums.cpp:101 #, fuzzy msgid "Destination Atop" msgstr "Destinazione" -#: ../src/filter-enums.cpp:101 +#: ../src/filter-enums.cpp:102 #, fuzzy msgid "Lighter" msgstr "Illumina" -#: ../src/filter-enums.cpp:103 +#: ../src/filter-enums.cpp:104 msgid "Arithmetic" msgstr "Aritmetico" -#: ../src/filter-enums.cpp:119 ../src/selection-chemistry.cpp:535 +#: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:545 +#: ../src/ui/dialog/objects.cpp:1893 msgid "Duplicate" msgstr "Duplica" -#: ../src/filter-enums.cpp:120 +#: ../src/filter-enums.cpp:121 msgid "Wrap" msgstr "Ingloba" -#: ../src/filter-enums.cpp:121 +#: ../src/filter-enums.cpp:122 #, fuzzy msgctxt "Convolve matrix, edge mode" msgid "None" msgstr "Nessuno" -#: ../src/filter-enums.cpp:136 +#: ../src/filter-enums.cpp:137 msgid "Erode" msgstr "Erodi" -#: ../src/filter-enums.cpp:137 +#: ../src/filter-enums.cpp:138 msgid "Dilate" msgstr "Dilata" -#: ../src/filter-enums.cpp:143 +#: ../src/filter-enums.cpp:144 msgid "Fractal Noise" msgstr "Rumore frattale" -#: ../src/filter-enums.cpp:150 +#: ../src/filter-enums.cpp:151 msgid "Distant Light" msgstr "Luce distante" -#: ../src/filter-enums.cpp:151 +#: ../src/filter-enums.cpp:152 msgid "Point Light" msgstr "Luce puntiforme" -#: ../src/filter-enums.cpp:152 +#: ../src/filter-enums.cpp:153 msgid "Spot Light" msgstr "Punto luce" @@ -8893,76 +8703,77 @@ msgstr "Punto luce" msgid "Invert gradient colors" msgstr "Inverti colori gradiente" -#: ../src/gradient-chemistry.cpp:1606 +#: ../src/gradient-chemistry.cpp:1607 msgid "Reverse gradient" msgstr "Inverti gradiente" -#: ../src/gradient-chemistry.cpp:1620 ../src/widgets/gradient-selector.cpp:245 +#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:222 msgid "Delete swatch" msgstr "Cancella campione" -#: ../src/gradient-drag.cpp:97 ../src/ui/tools/gradient-tool.cpp:100 +#: ../src/gradient-drag.cpp:97 ../src/ui/tools/gradient-tool.cpp:90 msgid "Linear gradient start" msgstr "Inizio del gradiente lineare" #. POINT_LG_BEGIN -#: ../src/gradient-drag.cpp:98 ../src/ui/tools/gradient-tool.cpp:101 +#: ../src/gradient-drag.cpp:98 ../src/ui/tools/gradient-tool.cpp:91 msgid "Linear gradient end" msgstr "Fine del gradiente lineare" -#: ../src/gradient-drag.cpp:99 ../src/ui/tools/gradient-tool.cpp:102 +#: ../src/gradient-drag.cpp:99 ../src/ui/tools/gradient-tool.cpp:92 msgid "Linear gradient mid stop" msgstr "Passaggio intermedio del gradiente lineare" -#: ../src/gradient-drag.cpp:100 ../src/ui/tools/gradient-tool.cpp:103 +#: ../src/gradient-drag.cpp:100 ../src/ui/tools/gradient-tool.cpp:93 msgid "Radial gradient center" msgstr "Centro del gradiente radiale" #: ../src/gradient-drag.cpp:101 ../src/gradient-drag.cpp:102 -#: ../src/ui/tools/gradient-tool.cpp:104 ../src/ui/tools/gradient-tool.cpp:105 +#: ../src/ui/tools/gradient-tool.cpp:94 ../src/ui/tools/gradient-tool.cpp:95 msgid "Radial gradient radius" msgstr "Raggio del gradiente radiale" -#: ../src/gradient-drag.cpp:103 ../src/ui/tools/gradient-tool.cpp:106 +#: ../src/gradient-drag.cpp:103 ../src/ui/tools/gradient-tool.cpp:96 msgid "Radial gradient focus" msgstr "Fuoco del gradiente radiale" #. POINT_RG_FOCUS #: ../src/gradient-drag.cpp:104 ../src/gradient-drag.cpp:105 -#: ../src/ui/tools/gradient-tool.cpp:107 ../src/ui/tools/gradient-tool.cpp:108 +#: ../src/ui/tools/gradient-tool.cpp:97 ../src/ui/tools/gradient-tool.cpp:98 msgid "Radial gradient mid stop" msgstr "Passaggio intermedio del gradiente lineare" -#: ../src/gradient-drag.cpp:106 ../src/ui/tools/mesh-tool.cpp:103 +#: ../src/gradient-drag.cpp:106 ../src/ui/tools/mesh-tool.cpp:93 msgid "Mesh gradient corner" msgstr "Angolo del gradiente a maglia" -#: ../src/gradient-drag.cpp:107 ../src/ui/tools/mesh-tool.cpp:104 +#: ../src/gradient-drag.cpp:107 ../src/ui/tools/mesh-tool.cpp:94 msgid "Mesh gradient handle" msgstr "Maniglia del gradiente a maglia" -#: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:105 +#: ../src/gradient-drag.cpp:108 ../src/ui/tools/mesh-tool.cpp:95 #, fuzzy msgid "Mesh gradient tensor" msgstr "Fine del gradiente lineare" -#: ../src/gradient-drag.cpp:567 +#: ../src/gradient-drag.cpp:565 msgid "Added patch row or column" msgstr "" -#: ../src/gradient-drag.cpp:797 +#: ../src/gradient-drag.cpp:798 msgid "Merge gradient handles" msgstr "Unisci maniglie del gradiente" -#: ../src/gradient-drag.cpp:1104 +#. we did an undoable action +#: ../src/gradient-drag.cpp:1101 msgid "Move gradient handle" msgstr "Muovi maniglia del gradiente" -#: ../src/gradient-drag.cpp:1163 ../src/widgets/gradient-vector.cpp:847 +#: ../src/gradient-drag.cpp:1160 ../src/widgets/gradient-vector.cpp:834 msgid "Delete gradient stop" msgstr "Cancella passaggio del gradiente" -#: ../src/gradient-drag.cpp:1426 +#: ../src/gradient-drag.cpp:1423 #, c-format msgid "" "%s %d for: %s%s; drag with Ctrl to snap offset; click with Ctrl" @@ -8971,11 +8782,11 @@ msgstr "" "%s %d per: %s%s; trascina con Ctrl per far scattare l'offset; con " "Ctrl+Alt per cancellare il passaggio" -#: ../src/gradient-drag.cpp:1430 ../src/gradient-drag.cpp:1437 +#: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434 msgid " (stroke)" msgstr " (contorno)" -#: ../src/gradient-drag.cpp:1434 +#: ../src/gradient-drag.cpp:1431 #, c-format msgid "" "%s for: %s%s; drag with Ctrl to snap angle, with Ctrl+Alt to " @@ -8985,7 +8796,7 @@ msgstr "" "+Alt per mantenere l'angolo; con Ctrl+Maiusc per ridimensionare " "attorno al centro" -#: ../src/gradient-drag.cpp:1442 +#: ../src/gradient-drag.cpp:1439 msgid "" "Radial gradient center and focus; drag with Shift to " "separate focus" @@ -8993,7 +8804,7 @@ msgstr "" "Centro e fuoco del gradiente radiale; trascina con Maiusc per separare il fuoco" -#: ../src/gradient-drag.cpp:1445 +#: ../src/gradient-drag.cpp:1442 #, c-format msgid "" "Gradient point shared by %d gradient; drag with Shift to " @@ -9008,56 +8819,56 @@ msgstr[1] "" "Punto di gradiente condiviso da %d gradienti; trascina con Maiusc per separare" -#: ../src/gradient-drag.cpp:2377 +#: ../src/gradient-drag.cpp:2364 msgid "Move gradient handle(s)" msgstr "Muovi maniglia del gradiente" -#: ../src/gradient-drag.cpp:2413 +#: ../src/gradient-drag.cpp:2398 msgid "Move gradient mid stop(s)" msgstr "Muovi passaggio intermedio del gradiente" -#: ../src/gradient-drag.cpp:2702 +#: ../src/gradient-drag.cpp:2687 msgid "Delete gradient stop(s)" msgstr "Cancella passaggio del gradiente" -#: ../src/inkscape.cpp:344 +#: ../src/inkscape.cpp:242 msgid "Autosave failed! Cannot create directory %1." msgstr "Errore nel salvataggio automatico! Impossibile creare la cartella %1." -#: ../src/inkscape.cpp:353 +#: ../src/inkscape.cpp:251 msgid "Autosave failed! Cannot open directory %1." msgstr "Errore nel salvataggio automatico! Impossibile aprire la cartella %1." -#: ../src/inkscape.cpp:369 +#: ../src/inkscape.cpp:267 msgid "Autosaving documents..." msgstr "Salvataggio automatico documenti..." -#: ../src/inkscape.cpp:442 +#: ../src/inkscape.cpp:335 msgid "Autosave failed! Could not find inkscape extension to save document." msgstr "" "Errore nel salvataggio automatico! Impossibile trovare un'estensione di " "Inkscape per salvare il documento." -#: ../src/inkscape.cpp:445 ../src/inkscape.cpp:452 +#: ../src/inkscape.cpp:338 ../src/inkscape.cpp:345 #, c-format msgid "Autosave failed! File %s could not be saved." msgstr "Errore nel salvataggio automatico! Impossibile salvare il file %s." -#: ../src/inkscape.cpp:467 +#: ../src/inkscape.cpp:360 msgid "Autosave complete." msgstr "Salvataggio automatico completato." -#: ../src/inkscape.cpp:715 +#: ../src/inkscape.cpp:618 msgid "Untitled document" msgstr "Documento senza nome" #. Show nice dialog box -#: ../src/inkscape.cpp:747 +#: ../src/inkscape.cpp:650 msgid "Inkscape encountered an internal error and will close now.\n" msgstr "" "Si è verificato un errore interno ed Inkscape verrà chiuso immediatamente.\n" -#: ../src/inkscape.cpp:748 +#: ../src/inkscape.cpp:651 msgid "" "Automatic backups of unsaved documents were done to the following " "locations:\n" @@ -9065,278 +8876,34 @@ msgstr "" "I backup automatici dei documenti non salvati sono stati fatti ai seguenti " "indirizzi:\n" -#: ../src/inkscape.cpp:749 +#: ../src/inkscape.cpp:652 msgid "Automatic backup of the following documents failed:\n" msgstr "Fallito il backup automatico dei seguenti documenti:\n" -#: ../src/interface.cpp:748 -msgctxt "Interface setup" -msgid "Default" -msgstr "Predefinita" - -#: ../src/interface.cpp:748 -msgid "Default interface setup" -msgstr "Impostazione interfaccia predefinita" - -#: ../src/interface.cpp:749 -msgctxt "Interface setup" -msgid "Custom" -msgstr "Personalizzata" - -#: ../src/interface.cpp:749 -msgid "Setup for custom task" -msgstr "Impostazione interfaccia personalizzata" - -#: ../src/interface.cpp:750 -msgctxt "Interface setup" -msgid "Wide" -msgstr "Larga" - -#: ../src/interface.cpp:750 -msgid "Setup for widescreen work" -msgstr "Impostazione interfaccia per schermi larghi" - -# Verb dovrebbe essere parola chiave per menù scritti in XML -# del GTK+ versione 2.6 o superiore -Luca -#: ../src/interface.cpp:862 -#, c-format -msgid "Verb \"%s\" Unknown" -msgstr "Verb \"%s\" sconosciuto" - -#: ../src/interface.cpp:901 -msgid "Open _Recent" -msgstr "Apri _recenti" - -#: ../src/interface.cpp:1009 ../src/interface.cpp:1095 -#: ../src/interface.cpp:1198 ../src/ui/widget/selected-style.cpp:532 -msgid "Drop color" -msgstr "Rilascia colore" - -#: ../src/interface.cpp:1048 ../src/interface.cpp:1158 -msgid "Drop color on gradient" -msgstr "Usa colore per il gradiente" - -#: ../src/interface.cpp:1211 -msgid "Could not parse SVG data" -msgstr "Impossibile leggere i dati SVG" - -#: ../src/interface.cpp:1250 -msgid "Drop SVG" -msgstr "Rilascia SVG" - -#: ../src/interface.cpp:1263 -msgid "Drop Symbol" -msgstr "Rilascia Simbolo" - -#: ../src/interface.cpp:1294 -msgid "Drop bitmap image" -msgstr "Rilascia immagine bitmap" - -#: ../src/interface.cpp:1386 -#, c-format -msgid "" -"A file named \"%s\" already exists. Do " -"you want to replace it?\n" -"\n" -"The file already exists in \"%s\". Replacing it will overwrite its contents." -msgstr "" -"Esiste già un file di nome \"%s\". Lo " -"si vuole rimpiazzare?\n" -"\n" -"Il file esiste già in \"%s\". Rimpiazzandolo si sovrascriverà il contenuto." - -#: ../src/interface.cpp:1392 ../src/ui/dialog/export.cpp:1311 -#: ../src/widgets/desktop-widget.cpp:1122 -#: ../src/widgets/desktop-widget.cpp:1184 -msgid "_Cancel" -msgstr "_Annulla" - -#: ../src/interface.cpp:1393 ../share/extensions/web-set-att.inx.h:21 -#: ../share/extensions/web-transmit-att.inx.h:19 -msgid "Replace" -msgstr "Rimpiazza" - -#: ../src/interface.cpp:1464 -msgid "Go to parent" -msgstr "Livello superiore" - -#. TRANSLATORS: #%1 is the id of the group e.g. , not a number. -#: ../src/interface.cpp:1505 -msgid "Enter group #%1" -msgstr "Modifica gruppo #%1" - -#. Item dialog -#: ../src/interface.cpp:1641 ../src/verbs.cpp:2849 -msgid "_Object Properties..." -msgstr "Proprietà _oggetto..." - -#: ../src/interface.cpp:1650 -msgid "_Select This" -msgstr "_Seleziona questo" - -#: ../src/interface.cpp:1661 -msgid "Select Same" -msgstr "Seleziona stesso" - -#. Select same fill and stroke -#: ../src/interface.cpp:1671 -msgid "Fill and Stroke" -msgstr "Riempimento e contorni" - -#. Select same fill color -#: ../src/interface.cpp:1678 -msgid "Fill Color" -msgstr "Colore riempimento" - -#. Select same stroke color -#: ../src/interface.cpp:1685 -msgid "Stroke Color" -msgstr "Colore contorno" - -#. Select same stroke style -#: ../src/interface.cpp:1692 -msgid "Stroke Style" -msgstr "Stile contorno" - -#. Select same stroke style -#: ../src/interface.cpp:1699 -msgid "Object type" -msgstr "Tipo oggetto" - -#. Move to layer -#: ../src/interface.cpp:1706 -msgid "_Move to layer ..." -msgstr "_Sposta a livello..." - -#. Create link -#: ../src/interface.cpp:1716 -msgid "Create _Link" -msgstr "_Crea collegamento" - -#. Set mask -#: ../src/interface.cpp:1739 -msgid "Set Mask" -msgstr "Imposta maschera" - -#. Release mask -#: ../src/interface.cpp:1750 -msgid "Release Mask" -msgstr "Rimuovi maschera" - -#. Set Clip -#: ../src/interface.cpp:1761 -msgid "Set Cl_ip" -msgstr "Imposta fi_ssaggio" - -#. Release Clip -#: ../src/interface.cpp:1772 -msgid "Release C_lip" -msgstr "Rilascia _fissaggio" - -#. Group -#: ../src/interface.cpp:1783 ../src/verbs.cpp:2486 -msgid "_Group" -msgstr "Ra_ggruppa" - -#: ../src/interface.cpp:1854 -msgid "Create link" -msgstr "Crea collegamento" - -#. Ungroup -#: ../src/interface.cpp:1885 ../src/verbs.cpp:2488 -msgid "_Ungroup" -msgstr "_Dividi" - -#. Link dialog -#: ../src/interface.cpp:1910 -msgid "Link _Properties..." -msgstr "_Proprietà collegamento..." - -#. Select item -#: ../src/interface.cpp:1916 -msgid "_Follow Link" -msgstr "_Segui collegamento" - -#. Reset transformations -#: ../src/interface.cpp:1922 -msgid "_Remove Link" -msgstr "_Rimuovi collegamento" - -#: ../src/interface.cpp:1953 -msgid "Remove link" -msgstr "Rimuovi collegamento" - -#. Image properties -#: ../src/interface.cpp:1964 -msgid "Image _Properties..." -msgstr "_Proprietà immagine..." - -#. Edit externally -#: ../src/interface.cpp:1970 -msgid "Edit Externally..." -msgstr "Modifica con programma esterno..." - -#. Trace Bitmap -#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/interface.cpp:1979 ../src/verbs.cpp:2549 -msgid "_Trace Bitmap..." -msgstr "Ve_ttorizza bitmap..." - -#. Trace Pixel Art -#: ../src/interface.cpp:1988 -msgid "Trace Pixel Art" -msgstr "Vettorizza Pixel Art" - -#: ../src/interface.cpp:1998 -msgctxt "Context menu" -msgid "Embed Image" -msgstr "Incorpora immagine" - -#: ../src/interface.cpp:2009 -msgctxt "Context menu" -msgid "Extract Image..." -msgstr "Estrai immagine..." - -#. Item dialog -#. Fill and Stroke dialog -#: ../src/interface.cpp:2154 ../src/interface.cpp:2174 ../src/verbs.cpp:2812 -msgid "_Fill and Stroke..." -msgstr "Riem_pimento e contorni..." - -#. Edit Text dialog -#: ../src/interface.cpp:2180 ../src/verbs.cpp:2831 -msgid "_Text and Font..." -msgstr "_Testo e carattere..." - -#. Spellcheck dialog -#: ../src/interface.cpp:2186 ../src/verbs.cpp:2839 -msgid "Check Spellin_g..." -msgstr "Controlla orto_grafia..." - -#: ../src/knot.cpp:334 +#: ../src/knot.cpp:348 msgid "Node or handle drag canceled." msgstr "Nodo o maniglia cancellato." -#: ../src/knotholder.cpp:158 +#: ../src/knotholder.cpp:171 msgid "Change handle" msgstr "Modifica maniglia" -#: ../src/knotholder.cpp:237 +#: ../src/knotholder.cpp:258 msgid "Move handle" msgstr "Muovi maniglia" #. TRANSLATORS: This refers to the pattern that's inside the object -#: ../src/knotholder.cpp:256 ../src/knotholder.cpp:278 +#: ../src/knotholder.cpp:277 ../src/knotholder.cpp:299 msgid "Move the pattern fill inside the object" msgstr "Muovi il motivo di riempimento all'interno dell'oggetto" -#: ../src/knotholder.cpp:260 ../src/knotholder.cpp:282 +#: ../src/knotholder.cpp:281 ../src/knotholder.cpp:303 msgid "Scale the pattern fill; uniformly if with Ctrl" msgstr "" "Ridimensiona il motivo di riempimento; in maniera uniforme con " "Ctrl" -#: ../src/knotholder.cpp:264 ../src/knotholder.cpp:286 +#: ../src/knotholder.cpp:285 ../src/knotholder.cpp:307 msgid "Rotate the pattern fill; with Ctrl to snap angle" msgstr "" "Ruota il motivo di riempimento; con Ctrl per far scattare " @@ -9376,9 +8943,7 @@ msgstr "Pannello atto al controllo" msgid "Dockitem which 'owns' this grip" msgstr "Pannello a cui appartiene questa scheda" -#. Name -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:191 -#: ../src/widgets/text-toolbar.cpp:1424 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:197 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 msgid "Orientation" @@ -9522,11 +9087,12 @@ msgstr "" "controllori sono pannelli manuali." #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:1003 -#: ../src/ui/dialog/document-properties.cpp:153 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 -#: ../src/widgets/desktop-widget.cpp:1992 -#: ../share/extensions/voronoi2svg.inx.h:9 +#: ../src/ui/dialog/align-and-distribute.cpp:1089 +#: ../src/ui/dialog/document-properties.cpp:161 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 +#: ../src/widgets/desktop-widget.cpp:2065 +#: ../share/extensions/empty_page.inx.h:1 +#: ../share/extensions/voronoi2svg.inx.h:10 msgid "Page" msgstr "Pagina" @@ -9535,10 +9101,11 @@ msgid "The index of the current page" msgstr "L'indice della pagina attuale" #: ../src/libgdl/gdl-dock-object.c:125 -#: ../src/ui/dialog/inkscape-preferences.cpp:1503 -#: ../src/ui/widget/page-sizer.cpp:262 -#: ../src/widgets/gradient-selector.cpp:158 -#: ../src/widgets/sp-xmlview-attr-list.cpp:54 +#: ../src/live_effects/parameter/originalpatharray.cpp:82 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 +#: ../src/ui/widget/page-sizer.cpp:285 +#: ../src/widgets/gradient-selector.cpp:150 +#: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Nome" @@ -9609,7 +9176,7 @@ msgstr "" "Tentativo di agganciare a %p un pannello %p già collegato (master attuale: " "%p)" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:229 +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:235 msgid "Position" msgstr "Posizione" @@ -9706,8 +9273,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "Elemento del pannello a cui appartiene questa scheda" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:634 -#: ../src/ui/dialog/inkscape-preferences.cpp:677 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/ui/dialog/inkscape-preferences.cpp:730 msgid "Floating" msgstr "Fluttuante" @@ -9748,152 +9315,217 @@ msgstr "Coordinata Y per un pannello fluttuante" msgid "Dock #%d" msgstr "Pannello #%d" -#: ../src/libnrtype/FontFactory.cpp:617 +#: ../src/libnrtype/FontFactory.cpp:636 msgid "Ignoring font without family that will crash Pango" msgstr "I font senza famiglia che fanno andare in crash Pango vengono ignorati" -#: ../src/live_effects/effect.cpp:84 +#: ../src/live_effects/effect.cpp:99 msgid "doEffect stack test" msgstr "test stack doEffect" -#: ../src/live_effects/effect.cpp:85 +#: ../src/live_effects/effect.cpp:100 msgid "Angle bisector" msgstr "Bisettrice angolo" -#. TRANSLATORS: boolean operations -#: ../src/live_effects/effect.cpp:87 -msgid "Boolops" -msgstr "Operazione booleana" - -#: ../src/live_effects/effect.cpp:88 +#: ../src/live_effects/effect.cpp:101 msgid "Circle (by center and radius)" msgstr "Cerchio (tramite centro e raggio)" -#: ../src/live_effects/effect.cpp:89 +#: ../src/live_effects/effect.cpp:102 msgid "Circle by 3 points" msgstr "Cerchio da 3 punti" -#: ../src/live_effects/effect.cpp:90 +#: ../src/live_effects/effect.cpp:103 msgid "Dynamic stroke" msgstr "Contorno dinamico" -#: ../src/live_effects/effect.cpp:91 ../share/extensions/extrude.inx.h:1 +#: ../src/live_effects/effect.cpp:104 ../share/extensions/extrude.inx.h:1 msgid "Extrude" msgstr "Estrudi" -#: ../src/live_effects/effect.cpp:92 +#: ../src/live_effects/effect.cpp:105 msgid "Lattice Deformation" msgstr "Deformazione reticolare" -#: ../src/live_effects/effect.cpp:93 +#: ../src/live_effects/effect.cpp:106 msgid "Line Segment" msgstr "Segmento" -#: ../src/live_effects/effect.cpp:94 +#: ../src/live_effects/effect.cpp:107 msgid "Mirror symmetry" msgstr "Simmetria speculare" -#: ../src/live_effects/effect.cpp:96 +#: ../src/live_effects/effect.cpp:109 msgid "Parallel" msgstr "Parallelo" -#: ../src/live_effects/effect.cpp:97 +#: ../src/live_effects/effect.cpp:110 msgid "Path length" msgstr "Lunghezza tracciato" -#: ../src/live_effects/effect.cpp:98 +#: ../src/live_effects/effect.cpp:111 msgid "Perpendicular bisector" msgstr "Bisettrice perpendicolare" -#: ../src/live_effects/effect.cpp:99 +#: ../src/live_effects/effect.cpp:112 msgid "Perspective path" msgstr "Tracciato in prospettiva" -#: ../src/live_effects/effect.cpp:100 -msgid "Rotate copies" -msgstr "Ruota copie" - -#: ../src/live_effects/effect.cpp:101 +#: ../src/live_effects/effect.cpp:113 msgid "Recursive skeleton" msgstr "Scheletro ricorsivo" -#: ../src/live_effects/effect.cpp:102 +#: ../src/live_effects/effect.cpp:114 msgid "Tangent to curve" msgstr "Tangente alla curva" -#: ../src/live_effects/effect.cpp:103 +#: ../src/live_effects/effect.cpp:115 msgid "Text label" msgstr "Etichetta testuale" #. 0.46 -#: ../src/live_effects/effect.cpp:106 +#: ../src/live_effects/effect.cpp:118 msgid "Bend" msgstr "Piegatura" -#: ../src/live_effects/effect.cpp:107 +#: ../src/live_effects/effect.cpp:119 msgid "Gears" msgstr "Ingranaggi" -#: ../src/live_effects/effect.cpp:108 +#: ../src/live_effects/effect.cpp:120 msgid "Pattern Along Path" msgstr "Motivo lungo tracciato" #. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG -#: ../src/live_effects/effect.cpp:109 +#: ../src/live_effects/effect.cpp:121 msgid "Stitch Sub-Paths" msgstr "Cucitura sotto-tracciati" #. 0.47 -#: ../src/live_effects/effect.cpp:111 +#: ../src/live_effects/effect.cpp:123 msgid "VonKoch" msgstr "VonKoch" -#: ../src/live_effects/effect.cpp:112 +#: ../src/live_effects/effect.cpp:124 msgid "Knot" msgstr "Nodo" -#: ../src/live_effects/effect.cpp:113 +#: ../src/live_effects/effect.cpp:125 msgid "Construct grid" msgstr "Costruzione griglia" -#: ../src/live_effects/effect.cpp:114 +#: ../src/live_effects/effect.cpp:126 msgid "Spiro spline" msgstr "Spline Spiro" -#: ../src/live_effects/effect.cpp:115 +#: ../src/live_effects/effect.cpp:127 msgid "Envelope Deformation" msgstr "Deformazione a busta" -#: ../src/live_effects/effect.cpp:116 +#: ../src/live_effects/effect.cpp:128 msgid "Interpolate Sub-Paths" msgstr "Interpola sotto-tracciati" -#: ../src/live_effects/effect.cpp:117 +#: ../src/live_effects/effect.cpp:129 msgid "Hatches (rough)" msgstr "Scarabocchi (grezzo)" -#: ../src/live_effects/effect.cpp:118 +#: ../src/live_effects/effect.cpp:130 msgid "Sketch" msgstr "Bozzetto" -#: ../src/live_effects/effect.cpp:119 +#: ../src/live_effects/effect.cpp:131 msgid "Ruler" msgstr "Righello" -#. 0.49 -#: ../src/live_effects/effect.cpp:121 +#. 0.91 +#: ../src/live_effects/effect.cpp:133 msgid "Power stroke" msgstr "Contorno evoluto" -#: ../src/live_effects/effect.cpp:122 ../src/selection-chemistry.cpp:2859 +#: ../src/live_effects/effect.cpp:134 msgid "Clone original path" msgstr "Clona tracciato originale" -#: ../src/live_effects/effect.cpp:284 +#: ../src/live_effects/effect.cpp:137 +#, fuzzy +msgid "Lattice Deformation 2" +msgstr "Deformazione reticolare" + +#: ../src/live_effects/effect.cpp:138 +#, fuzzy +msgid "Perspective/Envelope" +msgstr "Prospettiva" + +#: ../src/live_effects/effect.cpp:139 +msgid "Fillet/Chamfer" +msgstr "" + +#: ../src/live_effects/effect.cpp:140 +#, fuzzy +msgid "Interpolate points" +msgstr "Interpola" + +#: ../src/live_effects/effect.cpp:141 +#, fuzzy +msgid "Transform by 2 points" +msgstr "Trasforma gradienti" + +#: ../src/live_effects/effect.cpp:142 +#: ../src/live_effects/lpe-show_handles.cpp:26 +#, fuzzy +msgid "Show handles" +msgstr "Mostra maniglie" + +#: ../src/live_effects/effect.cpp:144 ../src/widgets/pencil-toolbar.cpp:118 +#, fuzzy +msgid "BSpline" +msgstr "Opalino" + +#: ../src/live_effects/effect.cpp:145 +#, fuzzy +msgid "Join type" +msgstr "Tipo linea:" + +#: ../src/live_effects/effect.cpp:146 +#, fuzzy +msgid "Taper stroke" +msgstr "Motivo del contorno" + +#: ../src/live_effects/effect.cpp:147 +msgid "Rotate copies" +msgstr "Ruota copie" + +#. Ponyscape -> Inkscape 0.92 +#: ../src/live_effects/effect.cpp:149 +#, fuzzy +msgid "Attach path" +msgstr "Tracciato di cucitura:" + +#: ../src/live_effects/effect.cpp:150 +#, fuzzy +msgid "Fill between strokes" +msgstr "Riempimento e contorni" + +#: ../src/live_effects/effect.cpp:151 ../src/selection-chemistry.cpp:2906 +msgid "Fill between many" +msgstr "" + +#: ../src/live_effects/effect.cpp:152 +#, fuzzy +msgid "Ellipse by 5 points" +msgstr "Cerchio da 3 punti" + +#: ../src/live_effects/effect.cpp:153 +#, fuzzy +msgid "Bounding Box" +msgstr "Riquadri" + +#: ../src/live_effects/effect.cpp:361 msgid "Is visible?" msgstr "Visibile?" -#: ../src/live_effects/effect.cpp:284 +#: ../src/live_effects/effect.cpp:361 msgid "" "If unchecked, the effect remains applied to the object but is temporarily " "disabled on canvas" @@ -9901,71 +9533,235 @@ msgstr "" "Se non selezionato, l'effetto rimane applicato all'oggetto ma è " "temporaneamente disabilitato sulla tela" -#: ../src/live_effects/effect.cpp:305 +#: ../src/live_effects/effect.cpp:386 msgid "No effect" msgstr "Nessun effetto" -#: ../src/live_effects/effect.cpp:352 +#: ../src/live_effects/effect.cpp:498 #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "Specificare un tracciato parametro per l'effetto '%s' con %d clic" -#: ../src/live_effects/effect.cpp:624 +#: ../src/live_effects/effect.cpp:765 #, c-format msgid "Editing parameter %s." msgstr "Modifica del parametro %s." -#: ../src/live_effects/effect.cpp:629 +#: ../src/live_effects/effect.cpp:770 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" "Nessuno dei parametri dell'effetto su tracciato applicato può essere " "modificato direttamente sulla tela." -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/live_effects/lpe-attach-path.cpp:29 +#, fuzzy +msgid "Start path:" +msgstr "Tracciato di cucitura:" + +#: ../src/live_effects/lpe-attach-path.cpp:29 +#, fuzzy +msgid "Path to attach to the start of this path" +msgstr "Tracciato da mettere sul tracciato scheletro" + +#: ../src/live_effects/lpe-attach-path.cpp:30 +#, fuzzy +msgid "Start path position:" +msgstr "Posizione casuale" + +#: ../src/live_effects/lpe-attach-path.cpp:30 +msgid "Position to attach path start to" +msgstr "" + +#: ../src/live_effects/lpe-attach-path.cpp:31 +#, fuzzy +msgid "Start path curve start:" +msgstr "Imposta colore tracciato a rosso:" + +#: ../src/live_effects/lpe-attach-path.cpp:31 +#: ../src/live_effects/lpe-attach-path.cpp:35 +#, fuzzy +msgid "Starting curve" +msgstr "Trascina curva" + +#. , true +#: ../src/live_effects/lpe-attach-path.cpp:32 +#, fuzzy +msgid "Start path curve end:" +msgstr "Imposta colore tracciato a rosso:" + +#: ../src/live_effects/lpe-attach-path.cpp:32 +#: ../src/live_effects/lpe-attach-path.cpp:36 +#, fuzzy +msgid "Ending curve" +msgstr "curvatura minima" + +#. , true +#: ../src/live_effects/lpe-attach-path.cpp:33 +#, fuzzy +msgid "End path:" +msgstr "Tracciato di piega:" + +#: ../src/live_effects/lpe-attach-path.cpp:33 +#, fuzzy +msgid "Path to attach to the end of this path" +msgstr "Tracciato da mettere sul tracciato scheletro" + +#: ../src/live_effects/lpe-attach-path.cpp:34 +#, fuzzy +msgid "End path position:" +msgstr "Posizione casuale" + +#: ../src/live_effects/lpe-attach-path.cpp:34 +msgid "Position to attach path end to" +msgstr "" + +#: ../src/live_effects/lpe-attach-path.cpp:35 +msgid "End path curve start:" +msgstr "" + +#. , true +#: ../src/live_effects/lpe-attach-path.cpp:36 +msgid "End path curve end:" +msgstr "" + +#: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Bend path:" msgstr "Tracciato di piega:" -#: ../src/live_effects/lpe-bendpath.cpp:53 +#: ../src/live_effects/lpe-bendpath.cpp:69 msgid "Path along which to bend the original path" msgstr "Tracciato secondo il quale piegare il tracciato originale" -#: ../src/live_effects/lpe-bendpath.cpp:54 -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/transformation.cpp:80 -#: ../src/ui/widget/page-sizer.cpp:236 +#: ../src/live_effects/lpe-bendpath.cpp:71 +#: ../src/live_effects/lpe-patternalongpath.cpp:74 +#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/transformation.cpp:73 +#: ../src/ui/widget/page-sizer.cpp:237 msgid "_Width:" msgstr "_Larghezza:" -#: ../src/live_effects/lpe-bendpath.cpp:54 +#: ../src/live_effects/lpe-bendpath.cpp:71 msgid "Width of the path" msgstr "Larghezza del tracciato" -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/live_effects/lpe-bendpath.cpp:72 msgid "W_idth in units of length" msgstr "_Larghezza in unità di lunghezza" -#: ../src/live_effects/lpe-bendpath.cpp:55 +#: ../src/live_effects/lpe-bendpath.cpp:72 msgid "Scale the width of the path in units of its length" msgstr "Ridimensiona la larghezza del motivo in unità della sua lunghezza" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/live_effects/lpe-bendpath.cpp:73 msgid "_Original path is vertical" msgstr "Tracciato _originale è verticale" -#: ../src/live_effects/lpe-bendpath.cpp:56 +#: ../src/live_effects/lpe-bendpath.cpp:73 msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "" "Ruota l'originale di 90 gradi, prima di piegarlo lungo il tracciato di " "piegatura" +#: ../src/live_effects/lpe-bendpath.cpp:178 +#: ../src/live_effects/lpe-patternalongpath.cpp:285 +#, fuzzy +msgid "Change the width" +msgstr "Modifica larghezza contorno" + +#: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 +#: ../src/live_effects/lpe-fill-between-many.cpp:25 +#: ../src/live_effects/lpe-fill-between-strokes.cpp:23 msgid "Linked path:" msgstr "Tracciato collegato:" +#: ../src/live_effects/lpe-bounding-box.cpp:24 #: ../src/live_effects/lpe-clone-original.cpp:18 +#: ../src/live_effects/lpe-fill-between-strokes.cpp:23 msgid "Path from which to take the original path data" msgstr "Tracciato da cui ottenere i dati tracciato originali" +#: ../src/live_effects/lpe-bounding-box.cpp:25 +#, fuzzy +msgid "Visual Bounds" +msgstr "Riquadro visivo" + +#: ../src/live_effects/lpe-bounding-box.cpp:25 +#, fuzzy +msgid "Uses the visual bounding box" +msgstr "Riquadro visivo" + +#: ../src/live_effects/lpe-bspline.cpp:30 +msgid "Steps with CTRL:" +msgstr "" + +#: ../src/live_effects/lpe-bspline.cpp:30 +msgid "Change number of steps with CTRL pressed" +msgstr "" + +#: ../src/live_effects/lpe-bspline.cpp:31 +#: ../src/live_effects/lpe-simplify.cpp:33 +#: ../src/live_effects/lpe-transform_2pts.cpp:43 +#, fuzzy +msgid "Helper size:" +msgstr "_Dimensione maniglia:" + +#: ../src/live_effects/lpe-bspline.cpp:31 +#: ../src/live_effects/lpe-simplify.cpp:33 +#, fuzzy +msgid "Helper size" +msgstr "_Dimensione maniglia:" + +#: ../src/live_effects/lpe-bspline.cpp:32 +msgid "Apply changes if weight = 0%" +msgstr "" + +#: ../src/live_effects/lpe-bspline.cpp:33 +msgid "Apply changes if weight > 0%" +msgstr "" + +#: ../src/live_effects/lpe-bspline.cpp:34 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:56 +#, fuzzy +msgid "Change only selected nodes" +msgstr "Unisce i nodi finali selezionati" + +#: ../src/live_effects/lpe-bspline.cpp:35 +#, fuzzy +msgid "Change weight %:" +msgstr "Altezza della maiuscola:" + +#: ../src/live_effects/lpe-bspline.cpp:35 +#, fuzzy +msgid "Change weight percent of the effect" +msgstr "Cambia offset del passaggio del gradiente" + +#: ../src/live_effects/lpe-bspline.cpp:99 +#, fuzzy +msgid "Default weight" +msgstr "Titolo predefinito" + +#: ../src/live_effects/lpe-bspline.cpp:104 +#, fuzzy +msgid "Make cusp" +msgstr "Crea stella" + +#: ../src/live_effects/lpe-bspline.cpp:148 +#, fuzzy +msgid "Change to default weight" +msgstr "Crea maglia predefinita" + +#: ../src/live_effects/lpe-bspline.cpp:154 +#, fuzzy +msgid "Change to 0 weight" +msgstr "Modifica larghezza contorno" + +#: ../src/live_effects/lpe-bspline.cpp:160 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:240 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:262 +#: ../src/live_effects/parameter/parameter.cpp:170 +msgid "Change scalar parameter" +msgstr "Cambia parametri scalari" + #: ../src/live_effects/lpe-constructgrid.cpp:27 msgid "Size _X:" msgstr "Dimensione _X:" @@ -10064,6 +9860,15 @@ msgstr "" "Ridimensiona la larghezza del tracciato di cucitura relativamente alla sua " "lunghezza" +#: ../src/live_effects/lpe-ellipse_5pts.cpp:77 +msgid "Five points required for constructing an ellipse" +msgstr "" + +#: ../src/live_effects/lpe-ellipse_5pts.cpp:162 +#, fuzzy +msgid "No ellipse found for specified points" +msgstr "Nessuna informazione per gli spigoli trovata nel file specificato." + #: ../src/live_effects/lpe-envelope.cpp:31 msgid "Top bend path:" msgstr "Tracciato di deformazione superiore:" @@ -10099,7 +9904,8 @@ msgid "Left path along which to bend the original path" msgstr "Tracciato del lato sinistro usato per deformare il tracciato originale" #: ../src/live_effects/lpe-envelope.cpp:35 -msgid "E_nable left & right paths" +#, fuzzy +msgid "_Enable left & right paths" msgstr "A_bilita tracciati sinistro e destro" #: ../src/live_effects/lpe-envelope.cpp:35 @@ -10123,6 +9929,160 @@ msgstr "Direzione" msgid "Defines the direction and magnitude of the extrusion" msgstr "" +#: ../src/live_effects/lpe-fill-between-many.cpp:25 +#, fuzzy +msgid "Paths from which to take the original path data" +msgstr "Tracciato da cui ottenere i dati tracciato originali" + +#: ../src/live_effects/lpe-fill-between-strokes.cpp:24 +#, fuzzy +msgid "Second path:" +msgstr "Tracciato di piega:" + +#: ../src/live_effects/lpe-fill-between-strokes.cpp:24 +#, fuzzy +msgid "Second path from which to take the original path data" +msgstr "Tracciato da cui ottenere i dati tracciato originali" + +#: ../src/live_effects/lpe-fill-between-strokes.cpp:25 +#, fuzzy +msgid "Reverse Second" +msgstr "Inverti gradiente" + +#: ../src/live_effects/lpe-fill-between-strokes.cpp:25 +#, fuzzy +msgid "Reverses the second path order" +msgstr "Inverti la direzione del gradiente" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:41 +#: ../src/widgets/text-toolbar.cpp:1788 +#: ../share/extensions/render_barcode_qrcode.inx.h:5 +msgid "Auto" +msgstr "Automatico" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:42 +#, fuzzy +msgid "Force arc" +msgstr "Forza" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:43 +msgid "Force bezier" +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:53 +#, fuzzy +msgid "Fillet point" +msgstr "Riempimento uniforme" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:54 +#, fuzzy +msgid "Hide knots" +msgstr "Nascondi oggetto" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:55 +#, fuzzy +msgid "Ignore 0 radius knots" +msgstr "Ignora primo e ultimo punto" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:57 +msgid "Flexible radius size (%)" +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:58 +msgid "Use knots distance instead radius" +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:59 +#, fuzzy +msgid "Method:" +msgstr "Metodo" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:59 +#, fuzzy +msgid "Fillets methods" +msgstr "Metodo di divisione" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:60 +#, fuzzy +msgid "Radius (unit or %):" +msgstr "Raggio (px):" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:60 +msgid "Radius, in unit or %" +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:61 +#, fuzzy +msgid "Chamfer steps:" +msgstr "Numero di passi:" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:61 +#, fuzzy +msgid "Chamfer steps" +msgstr "Numero di passi:" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:63 +#, fuzzy +msgid "Helper size with direction:" +msgstr "Angolo sulla direzione X" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:63 +#, fuzzy +msgid "Helper size with direction" +msgstr "Angolo sulla direzione X" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:103 +msgid "IMPORTANT! New version soon..." +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:107 +msgid "Not compatible. Convert to path after." +msgstr "" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:165 +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 +#, fuzzy +msgid "Fillet" +msgstr "Riempimento" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:169 +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 +#, fuzzy +msgid "Inverse fillet" +msgstr "Inverti riempimento" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:174 +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 +#, fuzzy +msgid "Chamfer" +msgstr "Cham" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:178 +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 +#, fuzzy +msgid "Inverse chamfer" +msgstr "Inverti canali:" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:247 +#, fuzzy +msgid "Convert to fillet" +msgstr "Converti in Braille" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:278 +#, fuzzy +msgid "Convert to inverse fillet" +msgstr "Converti in Braille" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 +#, fuzzy +msgid "Convert to chamfer" +msgstr "Converti in tratti" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:290 +msgid "Knots and helper paths refreshed" +msgstr "" + #: ../src/live_effects/lpe-gears.cpp:214 msgid "_Teeth:" msgstr "_Denti:" @@ -10143,27 +10103,27 @@ msgstr "" "Angolo di pressione dei denti (tipicamente 20-25 gradi). Il rapporto tra i " "denti non in contatto." -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Trajectory:" msgstr "Traiettoria:" -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Path along which intermediate steps are created." msgstr "Tracciato lungo il quale creare i passaggi intermedi." -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Steps_:" msgstr "_Passi:" -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Determines the number of steps from start to end path." msgstr "Determina il numero di passi dall'inizio alla fine del tracciato." -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "E_quidistant spacing" msgstr "Spaziatura e_quidistante" -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "" "If true, the spacing between intermediates is constant along the length of " "the path. If false, the distance depends on the location of the nodes of the " @@ -10173,6 +10133,153 @@ msgstr "" "lunghezza del tracciato. Altrimenti, la distanza sarà determinata dalla " "posizione dei nodi del tracciato di sostegno." +#: ../src/live_effects/lpe-interpolate_points.cpp:26 +#: ../src/live_effects/lpe-powerstroke.cpp:134 +msgid "CubicBezierFit" +msgstr "CubicBezierFit" + +#: ../src/live_effects/lpe-interpolate_points.cpp:27 +#: ../src/live_effects/lpe-powerstroke.cpp:135 +msgid "CubicBezierJohan" +msgstr "CubicBezierJohan" + +#: ../src/live_effects/lpe-interpolate_points.cpp:28 +#: ../src/live_effects/lpe-powerstroke.cpp:136 +msgid "SpiroInterpolator" +msgstr "SpiroInterpolator" + +#: ../src/live_effects/lpe-interpolate_points.cpp:29 +#: ../src/live_effects/lpe-powerstroke.cpp:137 +msgid "Centripetal Catmull-Rom" +msgstr "" + +#: ../src/live_effects/lpe-interpolate_points.cpp:37 +#: ../src/live_effects/lpe-powerstroke.cpp:179 +msgid "Interpolator type:" +msgstr "Tipo interpolazione:" + +#: ../src/live_effects/lpe-interpolate_points.cpp:38 +#: ../src/live_effects/lpe-powerstroke.cpp:179 +msgid "" +"Determines which kind of interpolator will be used to interpolate between " +"stroke width along the path" +msgstr "" +"Determina il tipo di interpolazione che sarà utilizzata per interpolare la " +"larghezza del contorno lungo il tracciato" + +#: ../src/live_effects/lpe-jointype.cpp:31 +#: ../src/live_effects/lpe-powerstroke.cpp:166 +#: ../src/live_effects/lpe-taperstroke.cpp:63 +msgid "Beveled" +msgstr "Tagliati" + +#: ../src/live_effects/lpe-jointype.cpp:32 +#: ../src/live_effects/lpe-jointype.cpp:43 +#: ../src/live_effects/lpe-powerstroke.cpp:167 +#: ../src/live_effects/lpe-taperstroke.cpp:64 +#: ../src/widgets/star-toolbar.cpp:534 +msgid "Rounded" +msgstr "Arrotondati" + +#: ../src/live_effects/lpe-jointype.cpp:33 +#: ../src/live_effects/lpe-powerstroke.cpp:170 +#: ../src/live_effects/lpe-taperstroke.cpp:65 +msgid "Miter" +msgstr "Vivi" + +#: ../src/live_effects/lpe-jointype.cpp:34 +#, fuzzy +msgid "Miter Clip" +msgstr "Spigolosità:" + +#. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well +#: ../src/live_effects/lpe-jointype.cpp:35 +#: ../src/live_effects/lpe-powerstroke.cpp:169 +msgid "Extrapolated arc" +msgstr "Arco estrapolato" + +#: ../src/live_effects/lpe-jointype.cpp:36 +#, fuzzy +msgid "Extrapolated arc Alt1" +msgstr "Arco estrapolato" + +#: ../src/live_effects/lpe-jointype.cpp:37 +#, fuzzy +msgid "Extrapolated arc Alt2" +msgstr "Arco estrapolato" + +#: ../src/live_effects/lpe-jointype.cpp:38 +#, fuzzy +msgid "Extrapolated arc Alt3" +msgstr "Arco estrapolato" + +#: ../src/live_effects/lpe-jointype.cpp:42 +#: ../src/live_effects/lpe-powerstroke.cpp:149 +msgid "Butt" +msgstr "Geometrica" + +#: ../src/live_effects/lpe-jointype.cpp:44 +#: ../src/live_effects/lpe-powerstroke.cpp:150 +msgid "Square" +msgstr "Quadrata" + +#: ../src/live_effects/lpe-jointype.cpp:45 +#: ../src/live_effects/lpe-powerstroke.cpp:152 +msgid "Peak" +msgstr "Punta" + +#: ../src/live_effects/lpe-jointype.cpp:54 +#, fuzzy +msgid "Thickness of the stroke" +msgstr "Spessore: al lato inferiore:" + +#: ../src/live_effects/lpe-jointype.cpp:55 +#, fuzzy +msgid "Line cap" +msgstr "Lineare" + +#: ../src/live_effects/lpe-jointype.cpp:55 +#, fuzzy +msgid "The end shape of the stroke" +msgstr "Orientazione del righello" + +#. Join type +#. TRANSLATORS: The line join style specifies the shape to be used at the +#. corners of paths. It can be "miter", "round" or "bevel". +#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-powerstroke.cpp:182 +#: ../src/widgets/stroke-style.cpp:288 +msgid "Join:" +msgstr "Spigoli:" + +#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-powerstroke.cpp:182 +msgid "Determines the shape of the path's corners" +msgstr "Determina la forma degli spigoli del tracciato" + +#. start_lean(_("Start path lean"), _("Start path lean"), "start_lean", &wr, this, 0.), +#. end_lean(_("End path lean"), _("End path lean"), "end_lean", &wr, this, 0.), +#: ../src/live_effects/lpe-jointype.cpp:59 +#: ../src/live_effects/lpe-powerstroke.cpp:183 +#: ../src/live_effects/lpe-taperstroke.cpp:78 +msgid "Miter limit:" +msgstr "Spigolosità:" + +#: ../src/live_effects/lpe-jointype.cpp:59 +#, fuzzy +msgid "Maximum length of the miter join (in units of stroke width)" +msgstr "" +"Lunghezza massima dello spigolo (in unità della larghezza del contorno)" + +#: ../src/live_effects/lpe-jointype.cpp:60 +#, fuzzy +msgid "Force miter" +msgstr "Forza" + +#: ../src/live_effects/lpe-jointype.cpp:60 +msgid "Overrides the miter limit and forces a join." +msgstr "" + #. initialise your parameters here: #: ../src/live_effects/lpe-knot.cpp:350 msgid "Fi_xed width:" @@ -10225,68 +10332,406 @@ msgstr "Segni intersezione" msgid "Crossings signs" msgstr "Segni intersezioni" -#: ../src/live_effects/lpe-knot.cpp:622 +#: ../src/live_effects/lpe-knot.cpp:626 msgid "Drag to select a crossing, click to flip it" msgstr "Trascina per selezionare un intersezione, clicca per girarla" #. / @todo Is this the right verb? -#: ../src/live_effects/lpe-knot.cpp:660 +#: ../src/live_effects/lpe-knot.cpp:664 msgid "Change knot crossing" msgstr "Cambia intersezione nodo" -#: ../src/live_effects/lpe-patternalongpath.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:47 +#: ../src/live_effects/lpe-perspective-envelope.cpp:43 +#, fuzzy +msgid "Mirror movements in horizontal" +msgstr "Muove i nodi verticalmente" + +#: ../src/live_effects/lpe-lattice2.cpp:48 +#: ../src/live_effects/lpe-perspective-envelope.cpp:44 +#, fuzzy +msgid "Mirror movements in vertical" +msgstr "Muove i nodi verticalmente" + +#: ../src/live_effects/lpe-lattice2.cpp:49 +msgid "Update while moving knots (maybe slow)" +msgstr "" + +#: ../src/live_effects/lpe-lattice2.cpp:50 +#, fuzzy +msgid "Control 0:" +msgstr "Maniglia di controllo 0" + +#: ../src/live_effects/lpe-lattice2.cpp:50 +#, fuzzy +msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:51 +#, fuzzy +msgid "Control 1:" +msgstr "Maniglia di controllo 1" + +#: ../src/live_effects/lpe-lattice2.cpp:51 +#, fuzzy +msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:52 +#, fuzzy +msgid "Control 2:" +msgstr "Maniglia di controllo 3" + +#: ../src/live_effects/lpe-lattice2.cpp:52 +#, fuzzy +msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:53 +#, fuzzy +msgid "Control 3:" +msgstr "Maniglia di controllo 3" + +#: ../src/live_effects/lpe-lattice2.cpp:53 +#, fuzzy +msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:54 +#, fuzzy +msgid "Control 4:" +msgstr "Maniglia di controllo 4" + +#: ../src/live_effects/lpe-lattice2.cpp:54 +#, fuzzy +msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:55 +#, fuzzy +msgid "Control 5:" +msgstr "Maniglia di controllo 5" + +#: ../src/live_effects/lpe-lattice2.cpp:55 +#, fuzzy +msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:56 +#, fuzzy +msgid "Control 6:" +msgstr "Maniglia di controllo 6" + +#: ../src/live_effects/lpe-lattice2.cpp:56 +#, fuzzy +msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:57 +#, fuzzy +msgid "Control 7:" +msgstr "Maniglia di controllo 7" + +#: ../src/live_effects/lpe-lattice2.cpp:57 +#, fuzzy +msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:58 +#, fuzzy +msgid "Control 8x9:" +msgstr "Maniglia di controllo 8" + +#: ../src/live_effects/lpe-lattice2.cpp:58 +#, fuzzy +msgid "" +"Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:59 +#, fuzzy +msgid "Control 10x11:" +msgstr "Maniglia di controllo 10" + +#: ../src/live_effects/lpe-lattice2.cpp:59 +#, fuzzy +msgid "" +"Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:60 +#, fuzzy +msgid "Control 12:" +msgstr "Maniglia di controllo 12" + +#: ../src/live_effects/lpe-lattice2.cpp:60 +#, fuzzy +msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:61 +#, fuzzy +msgid "Control 13:" +msgstr "Maniglia di controllo 13" + +#: ../src/live_effects/lpe-lattice2.cpp:61 +#, fuzzy +msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:62 +#, fuzzy +msgid "Control 14:" +msgstr "Maniglia di controllo 14" + +#: ../src/live_effects/lpe-lattice2.cpp:62 +#, fuzzy +msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:63 +#, fuzzy +msgid "Control 15:" +msgstr "Maniglia di controllo 15" + +#: ../src/live_effects/lpe-lattice2.cpp:63 +#, fuzzy +msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:64 +#, fuzzy +msgid "Control 16:" +msgstr "Maniglia di controllo 1" + +#: ../src/live_effects/lpe-lattice2.cpp:64 +#, fuzzy +msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:65 +#, fuzzy +msgid "Control 17:" +msgstr "Maniglia di controllo 1" + +#: ../src/live_effects/lpe-lattice2.cpp:65 +#, fuzzy +msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:66 +#, fuzzy +msgid "Control 18:" +msgstr "Maniglia di controllo 1" + +#: ../src/live_effects/lpe-lattice2.cpp:66 +#, fuzzy +msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:67 +#, fuzzy +msgid "Control 19:" +msgstr "Maniglia di controllo 1" + +#: ../src/live_effects/lpe-lattice2.cpp:67 +#, fuzzy +msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:68 +#, fuzzy +msgid "Control 20x21:" +msgstr "Maniglia di controllo 0" + +#: ../src/live_effects/lpe-lattice2.cpp:68 +#, fuzzy +msgid "" +"Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:69 +#, fuzzy +msgid "Control 22x23:" +msgstr "Maniglia di controllo 3" + +#: ../src/live_effects/lpe-lattice2.cpp:69 +#, fuzzy +msgid "" +"Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:70 +#, fuzzy +msgid "Control 24x26:" +msgstr "Maniglia di controllo 3" + +#: ../src/live_effects/lpe-lattice2.cpp:70 +#, fuzzy +msgid "" +"Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:71 +#, fuzzy +msgid "Control 25x27:" +msgstr "Maniglia di controllo 3" + +#: ../src/live_effects/lpe-lattice2.cpp:71 +#, fuzzy +msgid "" +"Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:72 +#, fuzzy +msgid "Control 28x30:" +msgstr "Maniglia di controllo 0" + +#: ../src/live_effects/lpe-lattice2.cpp:72 +#, fuzzy +msgid "" +"Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:73 +#, fuzzy +msgid "Control 29x31:" +msgstr "Maniglia di controllo 1" + +#: ../src/live_effects/lpe-lattice2.cpp:73 +#, fuzzy +msgid "" +"Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" + +#: ../src/live_effects/lpe-lattice2.cpp:74 +msgid "Control 32x33x34x35:" +msgstr "" + +#: ../src/live_effects/lpe-lattice2.cpp:74 +msgid "" +"Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " +"axes" +msgstr "" + +#: ../src/live_effects/lpe-lattice2.cpp:239 +#, fuzzy +msgid "Reset grid" +msgstr "Rimuovi griglia" + +#: ../src/live_effects/lpe-lattice2.cpp:271 +#: ../src/live_effects/lpe-lattice2.cpp:286 +#, fuzzy +msgid "Show Points" +msgstr "Ordina punti" + +#: ../src/live_effects/lpe-lattice2.cpp:284 +#, fuzzy +msgid "Hide Points" +msgstr "Punti" + +#: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 msgid "Single" msgstr "Singolo" -#: ../src/live_effects/lpe-patternalongpath.cpp:51 +#: ../src/live_effects/lpe-patternalongpath.cpp:64 #: ../share/extensions/pathalongpath.inx.h:11 msgid "Single, stretched" msgstr "Singolo, adattato" -#: ../src/live_effects/lpe-patternalongpath.cpp:52 +#: ../src/live_effects/lpe-patternalongpath.cpp:65 #: ../share/extensions/pathalongpath.inx.h:12 msgid "Repeated" msgstr "Ripetuto" -#: ../src/live_effects/lpe-patternalongpath.cpp:53 +#: ../src/live_effects/lpe-patternalongpath.cpp:66 #: ../share/extensions/pathalongpath.inx.h:13 msgid "Repeated, stretched" msgstr "Ripetuto, adattato" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 msgid "Pattern source:" msgstr "Motivo sorgente:" -#: ../src/live_effects/lpe-patternalongpath.cpp:59 +#: ../src/live_effects/lpe-patternalongpath.cpp:72 msgid "Path to put along the skeleton path" msgstr "Tracciato da mettere sul tracciato scheletro" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#: ../src/live_effects/lpe-patternalongpath.cpp:74 +msgid "Width of the pattern" +msgstr "Larghezza del motivo" + +#: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "Pattern copies:" msgstr "Motivi copia:" -#: ../src/live_effects/lpe-patternalongpath.cpp:60 +#: ../src/live_effects/lpe-patternalongpath.cpp:75 msgid "How many pattern copies to place along the skeleton path" msgstr "Numero di copie del motivo da ripetere lungo il tracciato scheletro" -#: ../src/live_effects/lpe-patternalongpath.cpp:62 -msgid "Width of the pattern" -msgstr "Larghezza del motivo" - -#: ../src/live_effects/lpe-patternalongpath.cpp:63 +#: ../src/live_effects/lpe-patternalongpath.cpp:77 msgid "Wid_th in units of length" msgstr "Larghe_zza in unità di lunghezza" -#: ../src/live_effects/lpe-patternalongpath.cpp:64 +#: ../src/live_effects/lpe-patternalongpath.cpp:78 msgid "Scale the width of the pattern in units of its length" msgstr "Ridimensiona la larghezza del motivo in unità della sua lunghezza" -#: ../src/live_effects/lpe-patternalongpath.cpp:66 +#: ../src/live_effects/lpe-patternalongpath.cpp:80 msgid "Spa_cing:" msgstr "Spa_ziatura:" -#: ../src/live_effects/lpe-patternalongpath.cpp:68 +#: ../src/live_effects/lpe-patternalongpath.cpp:82 #, no-c-format msgid "" "Space between copies of the pattern. Negative values allowed, but are " @@ -10295,19 +10740,19 @@ msgstr "" "Spaziatura tra le copie del motivo. Sono permessi valori negativi, ma " "limitati al -90% della larghezza del motivo." -#: ../src/live_effects/lpe-patternalongpath.cpp:70 +#: ../src/live_effects/lpe-patternalongpath.cpp:84 msgid "No_rmal offset:" msgstr "Spostamento no_rmale:" -#: ../src/live_effects/lpe-patternalongpath.cpp:71 +#: ../src/live_effects/lpe-patternalongpath.cpp:85 msgid "Tan_gential offset:" msgstr "Spostamento tan_genziale:" -#: ../src/live_effects/lpe-patternalongpath.cpp:72 +#: ../src/live_effects/lpe-patternalongpath.cpp:86 msgid "Offsets in _unit of pattern size" msgstr "Spostamento in _unita di dimensione del motivo" -#: ../src/live_effects/lpe-patternalongpath.cpp:73 +#: ../src/live_effects/lpe-patternalongpath.cpp:87 msgid "" "Spacing, tangential and normal offset are expressed as a ratio of width/" "height" @@ -10315,111 +10760,133 @@ msgstr "" "Spaziatura e spostamento tangenziale e normale sono espressi come rapporto " "larghezza/altezza" -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/live_effects/lpe-patternalongpath.cpp:89 msgid "Pattern is _vertical" msgstr "Motivo _verticale" -#: ../src/live_effects/lpe-patternalongpath.cpp:75 +#: ../src/live_effects/lpe-patternalongpath.cpp:89 msgid "Rotate pattern 90 deg before applying" msgstr "Ruota il motivo di 90 gradi prima di applicarlo" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/live_effects/lpe-patternalongpath.cpp:91 msgid "_Fuse nearby ends:" msgstr "_Fondi terminazioni vicine:" -#: ../src/live_effects/lpe-patternalongpath.cpp:77 +#: ../src/live_effects/lpe-patternalongpath.cpp:91 msgid "Fuse ends closer than this number. 0 means don't fuse." msgstr "" "Fonde terminazioni più vicine di questo numero. 0 per non fonderle mai." -#: ../src/live_effects/lpe-powerstroke.cpp:189 -msgid "CubicBezierFit" -msgstr "CubicBezierFit" +#: ../src/live_effects/lpe-perspective-envelope.cpp:35 +#: ../share/extensions/perspective.inx.h:1 +msgid "Perspective" +msgstr "Prospettiva" -#. {Geom::Interpolate::INTERP_CUBICBEZIER_JOHAN , N_("CubicBezierJohan"), "CubicBezierJohan"}, -#: ../src/live_effects/lpe-powerstroke.cpp:191 -msgid "SpiroInterpolator" -msgstr "SpiroInterpolator" +#: ../src/live_effects/lpe-perspective-envelope.cpp:36 +#, fuzzy +msgid "Envelope deformation" +msgstr "Deformazione a busta" -#: ../src/live_effects/lpe-powerstroke.cpp:192 -msgid "Centripetal Catmull-Rom" +#: ../src/live_effects/lpe-perspective-envelope.cpp:45 +msgid "Type" +msgstr "Tipo" + +#: ../src/live_effects/lpe-perspective-envelope.cpp:45 +#, fuzzy +msgid "Select the type of deformation" +msgstr "Duplica il motivo prima della deformazione" + +#: ../src/live_effects/lpe-perspective-envelope.cpp:46 +#, fuzzy +msgid "Top Left" +msgstr "Tracciato lato superiore" + +#: ../src/live_effects/lpe-perspective-envelope.cpp:46 +#, fuzzy +msgid "Top Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" -#: ../src/live_effects/lpe-powerstroke.cpp:204 -msgid "Butt" -msgstr "Geometrica" +#: ../src/live_effects/lpe-perspective-envelope.cpp:47 +#, fuzzy +msgid "Top Right" +msgstr "_Trucchi" -#: ../src/live_effects/lpe-powerstroke.cpp:205 -msgid "Square" -msgstr "Quadrata" +#: ../src/live_effects/lpe-perspective-envelope.cpp:47 +#, fuzzy +msgid "Top Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" -#: ../src/live_effects/lpe-powerstroke.cpp:206 -#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 -msgid "Round" -msgstr "Arrotondata" +#: ../src/live_effects/lpe-perspective-envelope.cpp:48 +#, fuzzy +msgid "Down Left" +msgstr "Tracciato lato superiore" -#: ../src/live_effects/lpe-powerstroke.cpp:207 -msgid "Peak" -msgstr "Punta" +#: ../src/live_effects/lpe-perspective-envelope.cpp:48 +#, fuzzy +msgid "Down Left - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" -#: ../src/live_effects/lpe-powerstroke.cpp:208 -msgid "Zero width" -msgstr "Larghezza zero" +#: ../src/live_effects/lpe-perspective-envelope.cpp:49 +#, fuzzy +msgid "Down Right" +msgstr "Destra" -#: ../src/live_effects/lpe-powerstroke.cpp:221 -msgid "Beveled" -msgstr "Tagliati" +#: ../src/live_effects/lpe-perspective-envelope.cpp:49 +#, fuzzy +msgid "Down Right - Ctrl+Alt+Click: reset, Ctrl: move along axes" +msgstr "" +"Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove tra " +"le maniglie" -#: ../src/live_effects/lpe-powerstroke.cpp:222 -#: ../src/widgets/star-toolbar.cpp:534 -msgid "Rounded" -msgstr "Arrotondati" +#: ../src/live_effects/lpe-perspective-envelope.cpp:269 +#, fuzzy +msgid "Handles:" +msgstr "Maniglia" -#. {LINEJOIN_EXTRP_MITER, N_("Extrapolated"), "extrapolated"}, // disabled because doesn't work well -#: ../src/live_effects/lpe-powerstroke.cpp:224 -msgid "Extrapolated arc" -msgstr "Arco estrapolato" +#: ../src/live_effects/lpe-powerstroke.cpp:132 +#, fuzzy +msgid "CubicBezierSmooth" +msgstr "CubicBezierJohan" -#: ../src/live_effects/lpe-powerstroke.cpp:225 -msgid "Miter" -msgstr "Vivi" +#: ../src/live_effects/lpe-powerstroke.cpp:151 +#: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:13 +msgid "Round" +msgstr "Arrotondata" + +#: ../src/live_effects/lpe-powerstroke.cpp:153 +msgid "Zero width" +msgstr "Larghezza zero" -#: ../src/live_effects/lpe-powerstroke.cpp:226 -#: ../src/widgets/pencil-toolbar.cpp:103 +#: ../src/live_effects/lpe-powerstroke.cpp:171 +#: ../src/widgets/pencil-toolbar.cpp:112 msgid "Spiro" msgstr "Spiro" -#: ../src/live_effects/lpe-powerstroke.cpp:232 +#: ../src/live_effects/lpe-powerstroke.cpp:177 msgid "Offset points" msgstr "Punti proiezione" -#: ../src/live_effects/lpe-powerstroke.cpp:233 +#: ../src/live_effects/lpe-powerstroke.cpp:178 msgid "Sort points" msgstr "Ordina punti" -#: ../src/live_effects/lpe-powerstroke.cpp:233 +#: ../src/live_effects/lpe-powerstroke.cpp:178 msgid "Sort offset points according to their time value along the curve" msgstr "" "Ordina i punti della proiezione secondo la loro posizione lungo la curva" -#: ../src/live_effects/lpe-powerstroke.cpp:234 -msgid "Interpolator type:" -msgstr "Tipo interpolazione:" - -#: ../src/live_effects/lpe-powerstroke.cpp:234 -msgid "" -"Determines which kind of interpolator will be used to interpolate between " -"stroke width along the path" -msgstr "" -"Determina il tipo di interpolazione che sarà utilizzata per interpolare la " -"larghezza del contorno lungo il tracciato" - -#: ../src/live_effects/lpe-powerstroke.cpp:235 +#: ../src/live_effects/lpe-powerstroke.cpp:180 #: ../share/extensions/fractalize.inx.h:3 msgid "Smoothness:" msgstr "Curvatura:" -#: ../src/live_effects/lpe-powerstroke.cpp:235 +#: ../src/live_effects/lpe-powerstroke.cpp:180 msgid "" "Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear " "interpolation, 1 = smooth" @@ -10427,41 +10894,25 @@ msgstr "" "Imposta la curvatura per l'interpolazione CubicBezierJohan; 0 = lineare, 1 = " "morbida" -#: ../src/live_effects/lpe-powerstroke.cpp:236 +#: ../src/live_effects/lpe-powerstroke.cpp:181 msgid "Start cap:" msgstr "Estremità iniziale:" -#: ../src/live_effects/lpe-powerstroke.cpp:236 +#: ../src/live_effects/lpe-powerstroke.cpp:181 msgid "Determines the shape of the path's start" msgstr "Determina la forma dell'estremità iniziale del tracciato" -#. Join type -#. TRANSLATORS: The line join style specifies the shape to be used at the -#. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-powerstroke.cpp:237 -#: ../src/widgets/stroke-style.cpp:227 -msgid "Join:" -msgstr "Spigoli:" - -#: ../src/live_effects/lpe-powerstroke.cpp:237 -msgid "Determines the shape of the path's corners" -msgstr "Determina la forma degli spigoli del tracciato" - -#: ../src/live_effects/lpe-powerstroke.cpp:238 -msgid "Miter limit:" -msgstr "Spigolosità:" - -#: ../src/live_effects/lpe-powerstroke.cpp:238 -#: ../src/widgets/stroke-style.cpp:278 +#: ../src/live_effects/lpe-powerstroke.cpp:183 +#: ../src/widgets/stroke-style.cpp:335 msgid "Maximum length of the miter (in units of stroke width)" msgstr "" "Lunghezza massima dello spigolo (in unità della larghezza del contorno)" -#: ../src/live_effects/lpe-powerstroke.cpp:239 +#: ../src/live_effects/lpe-powerstroke.cpp:184 msgid "End cap:" msgstr "Estremità finale:" -#: ../src/live_effects/lpe-powerstroke.cpp:239 +#: ../src/live_effects/lpe-powerstroke.cpp:184 msgid "Determines the shape of the path's end" msgstr "Determina la forma dell'estremità finale del tracciato" @@ -10655,13 +11106,123 @@ msgstr "" "La posizione relativa a un punto di riferimento definisce la quantità e la " "direzione della piegatura globale" -#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/restack.inx.h:12 +#: ../src/live_effects/lpe-roughen.cpp:31 ../share/extensions/addnodes.inx.h:4 +msgid "By number of segments" +msgstr "Per numero di segmenti" + +#: ../src/live_effects/lpe-roughen.cpp:32 +#, fuzzy +msgid "By max. segment size" +msgstr "Per lunghezza massima del segmento" + +#: ../src/live_effects/lpe-roughen.cpp:38 +#, fuzzy +msgid "Along nodes" +msgstr "Unisci nodi" + +#: ../src/live_effects/lpe-roughen.cpp:39 +#, fuzzy +msgid "Rand" +msgstr "Casualmente" + +#: ../src/live_effects/lpe-roughen.cpp:40 +#, fuzzy +msgid "Retract" +msgstr "Estrai" + +#. initialise your parameters here: +#: ../src/live_effects/lpe-roughen.cpp:49 +msgid "Method" +msgstr "Metodo" + +#: ../src/live_effects/lpe-roughen.cpp:49 +#, fuzzy +msgid "Division method" +msgstr "Metodo di divisione:" + +#: ../src/live_effects/lpe-roughen.cpp:51 +#, fuzzy +msgid "Max. segment size" +msgstr "Per lunghezza massima del segmento" + +#: ../src/live_effects/lpe-roughen.cpp:53 +#, fuzzy +msgid "Number of segments" +msgstr "Numero di segmenti:" + +#: ../src/live_effects/lpe-roughen.cpp:55 +#, fuzzy +msgid "Max. displacement in X" +msgstr "Spostamento massimo sulle X (px):" + +#: ../src/live_effects/lpe-roughen.cpp:57 +#, fuzzy +msgid "Max. displacement in Y" +msgstr "Spostamento massimo sulle Y (px):" + +#: ../src/live_effects/lpe-roughen.cpp:59 +#, fuzzy +msgid "Global randomize" +msgstr "visibilmente casuale" + +#: ../src/live_effects/lpe-roughen.cpp:61 +#, fuzzy +msgid "Handles" +msgstr "Maniglia" + +#: ../src/live_effects/lpe-roughen.cpp:61 +#, fuzzy +msgid "Handles options" +msgstr "Posizione casuale" + +#: ../src/live_effects/lpe-roughen.cpp:63 +#: ../share/extensions/radiusrand.inx.h:5 +msgid "Shift nodes" +msgstr "Sposta nodi" + +#: ../src/live_effects/lpe-roughen.cpp:65 +#, fuzzy +msgid "Fixed displacement" +msgstr "Spostamento X:" + +#: ../src/live_effects/lpe-roughen.cpp:65 +msgid "Fixed displacement, 1/3 of segment length" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:67 +#, fuzzy +msgid "Spray Tool friendly" +msgstr "Preferenze strumento spray" + +#: ../src/live_effects/lpe-roughen.cpp:67 +msgid "For use with spray tool in copy mode" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:121 +msgid "Add nodes Subdivide each segment" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:130 +msgid "Jitter nodes Move nodes/handles" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:139 +msgid "Extra roughen Add a extra layer of rough" +msgstr "" + +#: ../src/live_effects/lpe-roughen.cpp:148 +msgid "Options Modify options to rough" +msgstr "" + +#: ../src/live_effects/lpe-ruler.cpp:25 ../share/extensions/measure.inx.h:27 +#: ../share/extensions/restack.inx.h:16 #: ../share/extensions/text_extract.inx.h:8 #: ../share/extensions/text_merge.inx.h:8 msgid "Left" msgstr "Sinistra" -#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/restack.inx.h:14 +#: ../src/live_effects/lpe-ruler.cpp:26 ../share/extensions/measure.inx.h:29 +#: ../share/extensions/restack.inx.h:18 #: ../share/extensions/text_extract.inx.h:10 #: ../share/extensions/text_merge.inx.h:10 msgid "Right" @@ -10676,11 +11237,15 @@ msgctxt "Border mark" msgid "None" msgstr "Nessuno" -#: ../src/live_effects/lpe-ruler.cpp:33 ../src/widgets/arc-toolbar.cpp:326 +#: ../src/live_effects/lpe-ruler.cpp:33 +#: ../src/live_effects/lpe-transform_2pts.cpp:37 +#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "Inizio" -#: ../src/live_effects/lpe-ruler.cpp:34 ../src/widgets/arc-toolbar.cpp:339 +#: ../src/live_effects/lpe-ruler.cpp:34 +#: ../src/live_effects/lpe-transform_2pts.cpp:38 +#: ../src/ui/tools/measure-tool.cpp:757 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "Fine" @@ -10700,7 +11265,7 @@ msgstr "Distanza tra le tacche del righello" msgid "Unit:" msgstr "Unità:" -#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:201 +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:207 msgid "Unit" msgstr "Unità" @@ -10760,6 +11325,77 @@ msgstr "Segni del bordo:" msgid "Choose whether to draw marks at the beginning and end of the path" msgstr "Disegna o meno le tacche all'inizio e alla fine del tracciato" +#: ../src/live_effects/lpe-show_handles.cpp:25 +#, fuzzy +msgid "Show nodes" +msgstr "Mostra maniglie" + +#: ../src/live_effects/lpe-show_handles.cpp:27 +#, fuzzy +msgid "Show path" +msgstr "Disegna tracciato" + +#: ../src/live_effects/lpe-show_handles.cpp:28 +#, fuzzy +msgid "Scale nodes and handles" +msgstr "Aggancia nodi, tracciati e maniglie" + +#: ../src/live_effects/lpe-show_handles.cpp:29 +#: ../src/ui/tool/multi-path-manipulator.cpp:788 +#: ../src/ui/tool/multi-path-manipulator.cpp:791 +msgid "Rotate nodes" +msgstr "Ruota nodi" + +#: ../src/live_effects/lpe-show_handles.cpp:55 +msgid "" +"The \"show handles\" path effect will remove any custom style on the object " +"you are applying it to. If this is not what you want, click Cancel." +msgstr "" + +#: ../src/live_effects/lpe-simplify.cpp:30 +#, fuzzy +msgid "Steps:" +msgstr "_Passi:" + +#: ../src/live_effects/lpe-simplify.cpp:30 +#, fuzzy +msgid "Change number of simplify steps " +msgstr "Stella: cambia numero di vertici" + +#: ../src/live_effects/lpe-simplify.cpp:31 +#, fuzzy +msgid "Roughly threshold:" +msgstr "Soglia:" + +#: ../src/live_effects/lpe-simplify.cpp:32 +#, fuzzy +msgid "Smooth angles:" +msgstr "Curvatura:" + +#: ../src/live_effects/lpe-simplify.cpp:32 +msgid "Max degree difference on handles to perform a smooth" +msgstr "" + +#: ../src/live_effects/lpe-simplify.cpp:34 +#, fuzzy +msgid "Paths separately" +msgstr "Incolla dimensione separatamente" + +#: ../src/live_effects/lpe-simplify.cpp:34 +#, fuzzy +msgid "Simplifying paths (separately)" +msgstr "Semplificazione tracciati (separatamente):" + +#: ../src/live_effects/lpe-simplify.cpp:36 +#, fuzzy +msgid "Just coalesce" +msgstr "Giustifica righe" + +#: ../src/live_effects/lpe-simplify.cpp:36 +#, fuzzy +msgid "Simplify just coalesce" +msgstr "Semplifica" + #. initialise your parameters here: #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), #: ../src/live_effects/lpe-sketch.cpp:38 @@ -10853,7 +11489,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "Quante linee di costruzione (tangenti) disegnare" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "Ridimensiona:" @@ -10908,6 +11544,166 @@ msgstr "k_max:" msgid "max curvature" msgstr "curvatura massima" +#: ../src/live_effects/lpe-taperstroke.cpp:66 +#, fuzzy +msgid "Extrapolated" +msgstr "Interpola" + +#: ../src/live_effects/lpe-taperstroke.cpp:73 +#: ../share/extensions/edge3d.inx.h:5 ../share/extensions/nicechart.inx.h:25 +msgid "Stroke width:" +msgstr "Larghezza contorno:" + +#: ../src/live_effects/lpe-taperstroke.cpp:73 +#, fuzzy +msgid "The (non-tapered) width of the path" +msgstr "Ridimensiona la larghezza del tracciato di cucitura" + +#: ../src/live_effects/lpe-taperstroke.cpp:74 +#, fuzzy +msgid "Start offset:" +msgstr "Spostamento testo su tracciato" + +#: ../src/live_effects/lpe-taperstroke.cpp:74 +msgid "Taper distance from path start" +msgstr "" + +#: ../src/live_effects/lpe-taperstroke.cpp:75 +#, fuzzy +msgid "End offset:" +msgstr "Spostamento rosso" + +#: ../src/live_effects/lpe-taperstroke.cpp:75 +#, fuzzy +msgid "The ending position of the taper" +msgstr "Usa la dimensione e la posizione salvata per la serie" + +#: ../src/live_effects/lpe-taperstroke.cpp:76 +#, fuzzy +msgid "Taper smoothing:" +msgstr "Smussamento:" + +#: ../src/live_effects/lpe-taperstroke.cpp:76 +msgid "Amount of smoothing to apply to the tapers" +msgstr "" + +#: ../src/live_effects/lpe-taperstroke.cpp:77 +#, fuzzy +msgid "Join type:" +msgstr "Tipo linea:" + +#: ../src/live_effects/lpe-taperstroke.cpp:77 +#, fuzzy +msgid "Join type for non-smooth nodes" +msgstr "Aggancia ai nodi curvi" + +#: ../src/live_effects/lpe-taperstroke.cpp:78 +msgid "Limit for miter joins" +msgstr "" + +#: ../src/live_effects/lpe-taperstroke.cpp:447 +msgid "Start point of the taper" +msgstr "" + +#: ../src/live_effects/lpe-taperstroke.cpp:451 +#, fuzzy +msgid "End point of the taper" +msgstr "Variazione punto finale" + +#: ../src/live_effects/lpe-transform_2pts.cpp:31 +#, fuzzy +msgid "Elastic" +msgstr "Plastilina" + +#: ../src/live_effects/lpe-transform_2pts.cpp:31 +#, fuzzy +msgid "Elastic transform mode" +msgstr "Seleziona e trasforma oggetti" + +#: ../src/live_effects/lpe-transform_2pts.cpp:32 +#, fuzzy +msgid "From original width" +msgstr "Clona tracciato originale" + +#: ../src/live_effects/lpe-transform_2pts.cpp:33 +#, fuzzy +msgid "Lock length" +msgstr "Lunghezza" + +#: ../src/live_effects/lpe-transform_2pts.cpp:33 +#, fuzzy +msgid "Lock length to current distance" +msgstr "Blocca o sblocca il livello attuale" + +#: ../src/live_effects/lpe-transform_2pts.cpp:34 +#, fuzzy +msgid "Lock angle" +msgstr "Angolo del cono" + +#: ../src/live_effects/lpe-transform_2pts.cpp:35 +#, fuzzy +msgid "Flip horizontal" +msgstr "Rifletti orizzontalmente" + +#: ../src/live_effects/lpe-transform_2pts.cpp:36 +#, fuzzy +msgid "Flip vertical" +msgstr "Rifletti verticalmente" + +#: ../src/live_effects/lpe-transform_2pts.cpp:37 +#, fuzzy +msgid "Start point" +msgstr "Ordina punti" + +#: ../src/live_effects/lpe-transform_2pts.cpp:38 +#, fuzzy +msgid "End point" +msgstr "Variazione punto finale" + +#: ../src/live_effects/lpe-transform_2pts.cpp:39 +#, fuzzy +msgid "Stretch" +msgstr "Forza" + +#: ../src/live_effects/lpe-transform_2pts.cpp:39 +#, fuzzy +msgid "Stretch the result" +msgstr "Risoluzione predefinita per l'esportazione" + +#: ../src/live_effects/lpe-transform_2pts.cpp:40 +#, fuzzy +msgid "Offset from knots" +msgstr "Punti proiezione" + +#: ../src/live_effects/lpe-transform_2pts.cpp:41 +#, fuzzy +msgid "First Knot" +msgstr "Primo soccorso" + +#: ../src/live_effects/lpe-transform_2pts.cpp:42 +#, fuzzy +msgid "Last Knot" +msgstr "Nodo" + +#: ../src/live_effects/lpe-transform_2pts.cpp:43 +#, fuzzy +msgid "Rotation helper size" +msgstr "Centro di rotazione" + +#: ../src/live_effects/lpe-transform_2pts.cpp:196 +#, fuzzy +msgid "Change index of knot" +msgstr "Cambia tipo di nodo" + +#: ../src/live_effects/lpe-transform_2pts.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1623 +#: ../src/ui/dialog/pixelartdialog.cpp:296 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:699 +#: ../src/ui/dialog/tracedialog.cpp:813 +#: ../src/ui/widget/preferences-widget.cpp:742 +msgid "Reset" +msgstr "Reimposta " + #: ../src/live_effects/lpe-vonkoch.cpp:46 msgid "N_r of generations:" msgstr "_Numero di generazioni:" @@ -10968,7 +11764,7 @@ msgstr "Complessità _massima:" msgid "Disable effect if the output is too complex" msgstr "Disabilità l'effetto se l'output è troppo complesso" -#: ../src/live_effects/parameter/bool.cpp:67 +#: ../src/live_effects/parameter/bool.cpp:68 msgid "Change bool parameter" msgstr "Modifica parametri booleani" @@ -10976,17 +11772,85 @@ msgstr "Modifica parametri booleani" msgid "Change enumeration parameter" msgstr "Cambia parametri enumerazione" -#: ../src/live_effects/parameter/originalpath.cpp:71 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:778 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:839 +msgid "" +"Chamfer: Ctrl+Click toggle type, Shift+Click open " +"dialog, Ctrl+Alt+Click reset" +msgstr "" + +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:782 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:843 +msgid "" +"Inverse Chamfer: Ctrl+Click toggle type, Shift+Click " +"open dialog, Ctrl+Alt+Click reset" +msgstr "" + +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:786 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:847 +msgid "" +"Inverse Fillet: Ctrl+Click toggle type, Shift+Click " +"open dialog, Ctrl+Alt+Click reset" +msgstr "" + +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:790 +#: ../src/live_effects/parameter/filletchamferpointarray.cpp:851 +msgid "" +"Fillet: Ctrl+Click toggle type, Shift+Click open " +"dialog, Ctrl+Alt+Click reset" +msgstr "" + +#: ../src/live_effects/parameter/originalpath.cpp:67 +#: ../src/live_effects/parameter/originalpatharray.cpp:155 msgid "Link to path" msgstr "Lega al tracciato" -#: ../src/live_effects/parameter/originalpath.cpp:83 +#: ../src/live_effects/parameter/originalpath.cpp:79 msgid "Select original" msgstr "Seleziona originale" -#: ../src/live_effects/parameter/parameter.cpp:147 -msgid "Change scalar parameter" -msgstr "Cambia parametri scalari" +#: ../src/live_effects/parameter/originalpatharray.cpp:90 +#: ../src/widgets/gradient-toolbar.cpp:1205 +msgid "Reverse" +msgstr "Inverti" + +#: ../src/live_effects/parameter/originalpatharray.cpp:130 +#: ../src/live_effects/parameter/originalpatharray.cpp:315 +#: ../src/live_effects/parameter/path.cpp:486 +msgid "Link path parameter to path" +msgstr "Lega il parametro del tracciato al parametro" + +#: ../src/live_effects/parameter/originalpatharray.cpp:167 +#, fuzzy +msgid "Remove Path" +msgstr "_Rimuovi dal tracciato" + +#: ../src/live_effects/parameter/originalpatharray.cpp:179 +#: ../src/ui/dialog/objects.cpp:1854 +#, fuzzy +msgid "Move Down" +msgstr "Sposta a:" + +#: ../src/live_effects/parameter/originalpatharray.cpp:191 +#: ../src/ui/dialog/objects.cpp:1862 +#, fuzzy +msgid "Move Up" +msgstr "Muovi motivi" + +#: ../src/live_effects/parameter/originalpatharray.cpp:231 +#, fuzzy +msgid "Move path up" +msgstr "Muovi motivi" + +#: ../src/live_effects/parameter/originalpatharray.cpp:261 +#, fuzzy +msgid "Move path down" +msgstr "Sposta in basso effetto su tracciato" + +#: ../src/live_effects/parameter/originalpatharray.cpp:279 +#, fuzzy +msgid "Remove path" +msgstr "Muovi motivi" #: ../src/live_effects/parameter/path.cpp:170 msgid "Edit on-canvas" @@ -11004,23 +11868,21 @@ msgstr "Incolla tracciato" msgid "Link to path on clipboard" msgstr "Collega a tracciato negli appunti" -#: ../src/live_effects/parameter/path.cpp:443 +#: ../src/live_effects/parameter/path.cpp:454 msgid "Paste path parameter" msgstr "Incolla parametri tracciato" -#: ../src/live_effects/parameter/path.cpp:475 -msgid "Link path parameter to path" -msgstr "Lega il parametro del tracciato al parametro" - -#: ../src/live_effects/parameter/point.cpp:89 +#: ../src/live_effects/parameter/point.cpp:132 msgid "Change point parameter" msgstr "Modifica parametri del punto" -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:243 -#: ../src/live_effects/parameter/powerstrokepointarray.cpp:255 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:239 +#: ../src/live_effects/parameter/powerstrokepointarray.cpp:256 +#, fuzzy msgid "" "Stroke width control point: drag to alter the stroke width. Ctrl" -"+click adds a control point, Ctrl+Alt+click deletes it." +"+click adds a control point, Ctrl+Alt+click deletes it, Shift" +"+click launches width dialog." msgstr "" "Punto di controllo: trascina per modificare la larghezza del " "contorno. Ctrl+clic aggiunge un punto di controllo, Ctrl-Alt+clic\n" #. " \n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2634 ../src/verbs.cpp:2640 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2715 ../src/verbs.cpp:2723 msgid "_Edit" msgstr "_Modifica" -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2398 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2472 msgid "Paste Si_ze" msgstr "Incolla dimen_sione" @@ -11389,296 +12260,176 @@ msgstr "Clo_na" msgid "Select Sa_me" msgstr "Sele_ziona stesso" -#: ../src/menus-skeleton.h:97 +#: ../src/menus-skeleton.h:100 msgid "_View" msgstr "_Visualizza" -#: ../src/menus-skeleton.h:98 +#: ../src/menus-skeleton.h:101 msgid "_Zoom" msgstr "_Ingrandimento" -#: ../src/menus-skeleton.h:114 +#: ../src/menus-skeleton.h:117 msgid "_Display mode" msgstr "Modalità _visualizzazione" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:123 +#: ../src/menus-skeleton.h:126 msgid "_Color display mode" msgstr "Modalità _colore schermo" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:136 +#: ../src/menus-skeleton.h:139 msgid "Sh_ow/Hide" msgstr "M_ostra/Nascondi" #. Not quite ready to be in the menus. #. " \n" -#: ../src/menus-skeleton.h:156 +#: ../src/menus-skeleton.h:159 msgid "_Layer" msgstr "_Livello" -#: ../src/menus-skeleton.h:180 +#: ../src/menus-skeleton.h:183 msgid "_Object" msgstr "_Oggetto" -#: ../src/menus-skeleton.h:188 +#: ../src/menus-skeleton.h:195 msgid "Cli_p" msgstr "Fi_ssaggio" -#: ../src/menus-skeleton.h:192 +#: ../src/menus-skeleton.h:199 msgid "Mas_k" msgstr "Masc_hera" -#: ../src/menus-skeleton.h:196 +#: ../src/menus-skeleton.h:203 msgid "Patter_n" msgstr "Moti_vo" -#: ../src/menus-skeleton.h:220 +#: ../src/menus-skeleton.h:227 msgid "_Path" msgstr "_Tracciato" -#: ../src/menus-skeleton.h:248 ../src/ui/dialog/find.cpp:78 +#: ../src/menus-skeleton.h:259 ../src/ui/dialog/find.cpp:78 #: ../src/ui/dialog/text-edit.cpp:71 msgid "_Text" msgstr "Te_sto" -#: ../src/menus-skeleton.h:266 +#: ../src/menus-skeleton.h:277 msgid "Filter_s" msgstr "Filt_ri" -#: ../src/menus-skeleton.h:272 +#: ../src/menus-skeleton.h:283 msgid "Exte_nsions" msgstr "Este_nsioni" -#: ../src/menus-skeleton.h:278 +#: ../src/menus-skeleton.h:289 msgid "_Help" msgstr "_Aiuto" -#: ../src/menus-skeleton.h:282 +#: ../src/menus-skeleton.h:293 msgid "Tutorials" msgstr "Lezioni" -#: ../src/object-edit.cpp:439 -msgid "" -"Adjust the horizontal rounding radius; with Ctrl to make the " -"vertical radius the same" -msgstr "" -"Modifica l'arrotondamento orizzontale; con Ctrl per rendere " -"uguale l'arrotondamento verticale" - -#: ../src/object-edit.cpp:444 -msgid "" -"Adjust the vertical rounding radius; with Ctrl to make the " -"horizontal radius the same" -msgstr "" -"Modifica l'arrotondamento verticale; con Ctrl per rendere " -"uguale l'arrotondamento orizzontale" - -#: ../src/object-edit.cpp:449 ../src/object-edit.cpp:454 -msgid "" -"Adjust the width and height of the rectangle; with Ctrl to " -"lock ratio or stretch in one dimension only" -msgstr "" -"Modifica l'altezza e la larghezza del rettangolo; con Ctrl per " -"mantenere la proporzione o allungare su una sola dimensione" - -#: ../src/object-edit.cpp:689 ../src/object-edit.cpp:693 -#: ../src/object-edit.cpp:697 ../src/object-edit.cpp:701 -msgid "" -"Resize box in X/Y direction; with Shift along the Z axis; with " -"Ctrl to constrain to the directions of edges or diagonals" -msgstr "" -"Ridimensiona il solido lungo gli assi X/Y; con Maiusc per l'asse Z; " -"con Ctrl per fissare alle direzioni degli spigoli o delle diagonali" - -#: ../src/object-edit.cpp:705 ../src/object-edit.cpp:709 -#: ../src/object-edit.cpp:713 ../src/object-edit.cpp:717 -msgid "" -"Resize box along the Z axis; with Shift in X/Y direction; with " -"Ctrl to constrain to the directions of edges or diagonals" -msgstr "" -"Ridimensiona il solido lungo l'asse Z; con Maiusc per gli assi X/Y; " -"con Ctrl per fissare alle direzioni degli spigoli o delle diagonali" - -#: ../src/object-edit.cpp:721 -msgid "Move the box in perspective" -msgstr "Sposta il solido in prospettiva" - -#: ../src/object-edit.cpp:948 -msgid "Adjust ellipse width, with Ctrl to make circle" -msgstr "" -"Modifica la larghezza dell'ellisse, con Ctrl per farne un " -"cerchio" - -#: ../src/object-edit.cpp:952 -msgid "Adjust ellipse height, with Ctrl to make circle" -msgstr "" -"Modifica l'altezza dell'ellisse, con Ctrl per farne un cerchio" - -#: ../src/object-edit.cpp:956 -msgid "" -"Position the start point of the arc or segment; with Ctrl to " -"snap angle; drag inside the ellipse for arc, outside for " -"segment" -msgstr "" -"Posiziona il punto iniziale dell'arco o del segmento; con Ctrl " -"per far scattare l'angolo; trascina dentro l'ellisse per un arco, " -"fuori per un segmento" - -#: ../src/object-edit.cpp:961 -msgid "" -"Position the end point of the arc or segment; with Ctrl to " -"snap angle; drag inside the ellipse for arc, outside for " -"segment" -msgstr "" -"Posiziona il punto finale dell'arco o del segmento; con Ctrl " -"per far scattare l'angolo; trascina dentro l'ellisse per un arco, " -"fuori per un segmento" - -#: ../src/object-edit.cpp:1101 -msgid "" -"Adjust the tip radius of the star or polygon; with Shift to " -"round; with Alt to randomize" -msgstr "" -"Modifica il diametro della stella o del poligono; con Maiusc " -"per arrotondare; con Alt per avere casualità" - -#: ../src/object-edit.cpp:1109 -msgid "" -"Adjust the base radius of the star; with Ctrl to keep star " -"rays radial (no skew); with Shift to round; with Alt to " -"randomize" -msgstr "" -"Modifica il diametro interno della stella; con Ctrl per " -"mantenere la direzione dei raggi (senza deformazione); con Maiusc per " -"arrotondare; con Alt per avere casualità" - -#: ../src/object-edit.cpp:1299 -msgid "" -"Roll/unroll the spiral from inside; with Ctrl to snap angle; " -"with Alt to converge/diverge" -msgstr "" -"Arrotola/Srotola una spirale dall'interno; con Ctrl per far " -"scattare l'angolo; con Alt per far convergere/divergere" - -#: ../src/object-edit.cpp:1303 -msgid "" -"Roll/unroll the spiral from outside; with Ctrl to snap angle; " -"with Shift to scale/rotate; with Alt to lock radius" -msgstr "" -"Arrotola/Srotola una spirale dall'esterno; con Ctrl per far " -"scattare l'angolo; con Maiusc per ridimensionare/ruotare; con Alt per bloccare il raggio" - -#: ../src/object-edit.cpp:1348 -msgid "Adjust the offset distance" -msgstr "Regola la distanza di proiezione" - -#: ../src/object-edit.cpp:1384 -msgid "Drag to resize the flowed text frame" -msgstr "Trascina per ridimensionare il riquadro del testo dinamico" - -#: ../src/path-chemistry.cpp:53 +#: ../src/path-chemistry.cpp:63 msgid "Select object(s) to combine." msgstr "Seleziona gli oggetti da combinare." -#: ../src/path-chemistry.cpp:57 +#: ../src/path-chemistry.cpp:67 msgid "Combining paths..." msgstr "Combinazione tracciati..." -#: ../src/path-chemistry.cpp:171 +#: ../src/path-chemistry.cpp:177 msgid "Combine" msgstr "Combina" -#: ../src/path-chemistry.cpp:178 +#: ../src/path-chemistry.cpp:184 msgid "No path(s) to combine in the selection." msgstr "Nessun tracciato da combinare nella selezione." -#: ../src/path-chemistry.cpp:190 +#: ../src/path-chemistry.cpp:196 msgid "Select path(s) to break apart." msgstr "Seleziona il tracciato da separare." -#: ../src/path-chemistry.cpp:194 +#: ../src/path-chemistry.cpp:200 msgid "Breaking apart paths..." msgstr "Separazione tracciati..." -#: ../src/path-chemistry.cpp:285 +#: ../src/path-chemistry.cpp:282 msgid "Break apart" msgstr "Separa" -#: ../src/path-chemistry.cpp:287 +#: ../src/path-chemistry.cpp:285 msgid "No path(s) to break apart in the selection." msgstr "Nessun tracciato da separare nella selezione." -#: ../src/path-chemistry.cpp:297 +#: ../src/path-chemistry.cpp:295 msgid "Select object(s) to convert to path." msgstr "Seleziona l'oggetto da convertire in tracciato." -#: ../src/path-chemistry.cpp:303 +#: ../src/path-chemistry.cpp:301 msgid "Converting objects to paths..." msgstr "Conversione oggetti in tracciati..." -#: ../src/path-chemistry.cpp:325 +#: ../src/path-chemistry.cpp:320 msgid "Object to path" msgstr "Da oggetto a tracciato" -#: ../src/path-chemistry.cpp:327 +#: ../src/path-chemistry.cpp:322 msgid "No objects to convert to path in the selection." msgstr "Nessun oggetto nella selezione da convertire in tracciato." -#: ../src/path-chemistry.cpp:604 +#: ../src/path-chemistry.cpp:609 msgid "Select path(s) to reverse." msgstr "Seleziona il tracciato da invertire." -#: ../src/path-chemistry.cpp:613 +#: ../src/path-chemistry.cpp:618 msgid "Reversing paths..." msgstr "Inversione tracciati..." -#: ../src/path-chemistry.cpp:648 +#: ../src/path-chemistry.cpp:653 msgid "Reverse path" msgstr "Inverti tracciato" -#: ../src/path-chemistry.cpp:650 +#: ../src/path-chemistry.cpp:655 msgid "No paths to reverse in the selection." msgstr "Nessun tracciato nella selezione da invertire." -#: ../src/persp3d.cpp:332 +#: ../src/persp3d.cpp:323 msgid "Toggle vanishing point" msgstr "Attiva punto di fuga" -#: ../src/persp3d.cpp:343 +#: ../src/persp3d.cpp:334 msgid "Toggle multiple vanishing points" msgstr "Attiva punti di fuga multipli" -#: ../src/preferences-skeleton.h:101 +#: ../src/preferences-skeleton.h:102 msgid "Dip pen" msgstr "Calamaio" -#: ../src/preferences-skeleton.h:102 +#: ../src/preferences-skeleton.h:103 msgid "Marker" msgstr "Delimitatore" -#: ../src/preferences-skeleton.h:103 +#: ../src/preferences-skeleton.h:104 msgid "Brush" msgstr "Pennello" -#: ../src/preferences-skeleton.h:104 +#: ../src/preferences-skeleton.h:105 msgid "Wiggly" msgstr "Strisciante" -#: ../src/preferences-skeleton.h:105 +#: ../src/preferences-skeleton.h:106 msgid "Splotchy" msgstr "Macchiato" -#: ../src/preferences-skeleton.h:106 +#: ../src/preferences-skeleton.h:107 msgid "Tracing" msgstr "China" -#: ../src/preferences.cpp:134 +#: ../src/preferences.cpp:136 msgid "" "Inkscape will run with default settings, and new settings will not be saved. " msgstr "" @@ -11688,7 +12439,7 @@ msgstr "" #. the creation failed #. _reportError(Glib::ustring::compose(_("Cannot create profile directory %1."), #. Glib::filename_to_utf8(_prefs_dir)), not_saved); -#: ../src/preferences.cpp:149 +#: ../src/preferences.cpp:151 #, c-format msgid "Cannot create profile directory %s." msgstr "Impossibile creare la cartella di profilo %s." @@ -11696,7 +12447,7 @@ msgstr "Impossibile creare la cartella di profilo %s." #. The profile dir is not actually a directory #. _reportError(Glib::ustring::compose(_("%1 is not a valid directory."), #. Glib::filename_to_utf8(_prefs_dir)), not_saved); -#: ../src/preferences.cpp:167 +#: ../src/preferences.cpp:169 #, c-format msgid "%s is not a valid directory." msgstr "%s non è una cartella valida." @@ -11704,27 +12455,27 @@ msgstr "%s non è una cartella valida." #. The write failed. #. _reportError(Glib::ustring::compose(_("Failed to create the preferences file %1."), #. Glib::filename_to_utf8(_prefs_filename)), not_saved); -#: ../src/preferences.cpp:178 +#: ../src/preferences.cpp:180 #, c-format msgid "Failed to create the preferences file %s." msgstr "Impossibile creare file di impostazioni %s." -#: ../src/preferences.cpp:214 +#: ../src/preferences.cpp:216 #, c-format msgid "The preferences file %s is not a regular file." msgstr "Il file di impostazioni %s non è un file regolare." -#: ../src/preferences.cpp:224 +#: ../src/preferences.cpp:226 #, c-format msgid "The preferences file %s could not be read." msgstr "Il file di impostazioni %s non può essere letto." -#: ../src/preferences.cpp:235 +#: ../src/preferences.cpp:237 #, c-format msgid "The preferences file %s is not a valid XML document." msgstr "Il file di configurazione %s non è un documento XML valido." -#: ../src/preferences.cpp:244 +#: ../src/preferences.cpp:246 #, c-format msgid "The file %s is not a valid Inkscape preferences file." msgstr "Il file %s non è un file di impostazioni Inkscape valido." @@ -11765,8 +12516,10 @@ msgstr "FreeArt" msgid "Open Font License" msgstr "Licenza Open Font" +#. Create the Title label and edit control #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/linking.html#AElementXLinkTitleAttribute -#: ../src/rdf.cpp:235 ../src/ui/dialog/object-attributes.cpp:57 +#: ../src/rdf.cpp:235 ../src/ui/dialog/filedialogimpl-win32.cpp:1960 +#: ../src/ui/dialog/object-attributes.cpp:57 msgid "Title:" msgstr "Titolo:" @@ -11842,7 +12595,7 @@ msgstr "Relazione:" msgid "A related resource" msgstr "Riferimento ad una risorsa correlata" -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1862 +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "Language:" msgstr "Lingua:" @@ -11916,60 +12669,78 @@ msgstr "Frammento XML per la sezione 'License' delle RDF" msgid "Fixup broken links" msgstr "Ripara indirizzo danneggiato" -#: ../src/selection-chemistry.cpp:396 +#: ../src/selection-chemistry.cpp:401 msgid "Delete text" msgstr "Elimina testo" -#: ../src/selection-chemistry.cpp:404 +#: ../src/selection-chemistry.cpp:409 msgid "Nothing was deleted." msgstr "Niente da eliminare." -#: ../src/selection-chemistry.cpp:423 +#: ../src/selection-chemistry.cpp:426 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 -#: ../src/ui/dialog/swatches.cpp:278 ../src/ui/tools/text-tool.cpp:974 -#: ../src/widgets/eraser-toolbar.cpp:93 -#: ../src/widgets/gradient-toolbar.cpp:1178 -#: ../src/widgets/gradient-toolbar.cpp:1192 -#: ../src/widgets/gradient-toolbar.cpp:1206 +#: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:965 +#: ../src/widgets/eraser-toolbar.cpp:120 +#: ../src/widgets/gradient-toolbar.cpp:1181 +#: ../src/widgets/gradient-toolbar.cpp:1195 +#: ../src/widgets/gradient-toolbar.cpp:1209 #: ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "Elimina" -#: ../src/selection-chemistry.cpp:451 +#: ../src/selection-chemistry.cpp:454 msgid "Select object(s) to duplicate." msgstr "Seleziona l'oggetto da duplicare." -#: ../src/selection-chemistry.cpp:560 +#: ../src/selection-chemistry.cpp:551 +#, c-format +msgid "%s copy" +msgstr "%s copia" + +#: ../src/selection-chemistry.cpp:574 msgid "Delete all" msgstr "Elimina tutto" -#: ../src/selection-chemistry.cpp:750 +#: ../src/selection-chemistry.cpp:762 msgid "Select some objects to group." msgstr "Seleziona più oggetti da raggruppare." -#: ../src/selection-chemistry.cpp:765 +#: ../src/selection-chemistry.cpp:775 msgctxt "Verb" msgid "Group" msgstr "Raggruppa" -#: ../src/selection-chemistry.cpp:788 +#: ../src/selection-chemistry.cpp:798 +msgid "No objects selected to pop out of group." +msgstr "Nessun elemento selezionato da estrarre dal gruppo." + +#: ../src/selection-chemistry.cpp:808 +msgid "Selection not in a group." +msgstr "Selezione non in un gruppo." + +#: ../src/selection-chemistry.cpp:822 +msgid "Pop selection from group" +msgstr "Estrai selezione dal gruppo" + +#: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." msgstr "Seleziona un gruppo da dividere." -#: ../src/selection-chemistry.cpp:803 +#: ../src/selection-chemistry.cpp:845 msgid "No groups to ungroup in the selection." msgstr "Nessun gruppo nella selezione da dividere." -#: ../src/selection-chemistry.cpp:861 ../src/sp-item-group.cpp:574 +#: ../src/selection-chemistry.cpp:901 ../src/sp-item-group.cpp:550 +#: ../src/ui/dialog/objects.cpp:1916 msgid "Ungroup" msgstr "Dividi" -#: ../src/selection-chemistry.cpp:942 +#: ../src/selection-chemistry.cpp:988 msgid "Select object(s) to raise." msgstr "Seleziona l'oggetto da alzare." -#: ../src/selection-chemistry.cpp:948 ../src/selection-chemistry.cpp:1004 -#: ../src/selection-chemistry.cpp:1032 ../src/selection-chemistry.cpp:1093 +#: ../src/selection-chemistry.cpp:994 ../src/selection-chemistry.cpp:1047 +#: ../src/selection-chemistry.cpp:1073 ../src/selection-chemistry.cpp:1131 msgid "" "You cannot raise/lower objects from different groups or layers." msgstr "" @@ -11977,214 +12748,214 @@ msgstr "" "differenti." #. TRANSLATORS: "Raise" means "to raise an object" in the undo history -#: ../src/selection-chemistry.cpp:988 +#: ../src/selection-chemistry.cpp:1031 msgctxt "Undo action" msgid "Raise" msgstr "Alza" -#: ../src/selection-chemistry.cpp:996 +#: ../src/selection-chemistry.cpp:1039 msgid "Select object(s) to raise to top." msgstr "Seleziona l'oggetto da spostare in cima." -#: ../src/selection-chemistry.cpp:1019 +#: ../src/selection-chemistry.cpp:1060 msgid "Raise to top" msgstr "Sposta in cima" -#: ../src/selection-chemistry.cpp:1026 +#: ../src/selection-chemistry.cpp:1067 msgid "Select object(s) to lower." msgstr "Seleziona l'oggetto da abbassare." #. TRANSLATORS: "Lower" means "to lower an object" in the undo history -#: ../src/selection-chemistry.cpp:1077 +#: ../src/selection-chemistry.cpp:1115 msgctxt "Undo action" msgid "Lower" msgstr "Abbassa" -#: ../src/selection-chemistry.cpp:1085 +#: ../src/selection-chemistry.cpp:1123 msgid "Select object(s) to lower to bottom." msgstr "Seleziona l'oggetto da spostare in fondo." -#: ../src/selection-chemistry.cpp:1120 +#: ../src/selection-chemistry.cpp:1154 msgid "Lower to bottom" msgstr "Sposta in fondo" -#: ../src/selection-chemistry.cpp:1130 +#: ../src/selection-chemistry.cpp:1164 msgid "Nothing to undo." msgstr "Niente da annullare." -#: ../src/selection-chemistry.cpp:1141 +#: ../src/selection-chemistry.cpp:1175 msgid "Nothing to redo." msgstr "Niente da ripetere." -#: ../src/selection-chemistry.cpp:1208 +#: ../src/selection-chemistry.cpp:1247 msgid "Paste" msgstr "Incolla" -#: ../src/selection-chemistry.cpp:1216 +#: ../src/selection-chemistry.cpp:1255 msgid "Paste style" msgstr "Incolla stile" -#: ../src/selection-chemistry.cpp:1226 +#: ../src/selection-chemistry.cpp:1265 msgid "Paste live path effect" msgstr "Incolla effetto su tracciato" -#: ../src/selection-chemistry.cpp:1248 +#: ../src/selection-chemistry.cpp:1287 msgid "Select object(s) to remove live path effects from." msgstr "Seleziona l'oggetto da cui rimuovere gli effetti su tracciato." -#: ../src/selection-chemistry.cpp:1260 +#: ../src/selection-chemistry.cpp:1299 msgid "Remove live path effect" msgstr "Rimuovi effetto su tracciato" -#: ../src/selection-chemistry.cpp:1271 +#: ../src/selection-chemistry.cpp:1310 msgid "Select object(s) to remove filters from." msgstr "Seleziona l'oggetto da cui rimuovere i filtri." -#: ../src/selection-chemistry.cpp:1281 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1678 +#: ../src/selection-chemistry.cpp:1320 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1695 msgid "Remove filter" msgstr "Rimuovi filtro" -#: ../src/selection-chemistry.cpp:1290 +#: ../src/selection-chemistry.cpp:1329 msgid "Paste size" msgstr "Incolla dimensione" -#: ../src/selection-chemistry.cpp:1299 +#: ../src/selection-chemistry.cpp:1338 msgid "Paste size separately" msgstr "Incolla dimensione separatamente" -#: ../src/selection-chemistry.cpp:1328 +#: ../src/selection-chemistry.cpp:1367 msgid "Select object(s) to move to the layer above." msgstr "Seleziona l'oggetto da spostare al livello superiore." -#: ../src/selection-chemistry.cpp:1355 +#: ../src/selection-chemistry.cpp:1393 msgid "Raise to next layer" msgstr "Sposta al livello successivo" -#: ../src/selection-chemistry.cpp:1362 +#: ../src/selection-chemistry.cpp:1400 msgid "No more layers above." msgstr "Nessun livello superiore." -#: ../src/selection-chemistry.cpp:1374 +#: ../src/selection-chemistry.cpp:1411 msgid "Select object(s) to move to the layer below." msgstr "Seleziona l'oggetto da spostare al livello inferiore." -#: ../src/selection-chemistry.cpp:1401 +#: ../src/selection-chemistry.cpp:1437 msgid "Lower to previous layer" msgstr "Sposta al livello precedente" -#: ../src/selection-chemistry.cpp:1408 +#: ../src/selection-chemistry.cpp:1444 msgid "No more layers below." msgstr "Nessun livello inferiore." -#: ../src/selection-chemistry.cpp:1420 +#: ../src/selection-chemistry.cpp:1454 msgid "Select object(s) to move." msgstr "Seleziona l'oggetto da muovere." -#: ../src/selection-chemistry.cpp:1438 ../src/verbs.cpp:2577 +#: ../src/selection-chemistry.cpp:1472 ../src/verbs.cpp:2658 msgid "Move selection to layer" msgstr "Sposta selezione al livello" #. An SVG element cannot have a transform. We could change 'x' and 'y' in response #. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1525 ../src/seltrans.cpp:388 +#: ../src/selection-chemistry.cpp:1561 ../src/seltrans.cpp:391 msgid "Cannot transform an embedded SVG." msgstr "Impossibile trasformare un SVG incorporato." -#: ../src/selection-chemistry.cpp:1671 +#: ../src/selection-chemistry.cpp:1731 msgid "Remove transform" msgstr "Rimuovi trasformazione" -#: ../src/selection-chemistry.cpp:1774 +#: ../src/selection-chemistry.cpp:1838 msgid "Rotate 90° CCW" msgstr "Ruota di 90° anti-orari" -#: ../src/selection-chemistry.cpp:1774 +#: ../src/selection-chemistry.cpp:1838 msgid "Rotate 90° CW" msgstr "Ruota di 90° orari" -#: ../src/selection-chemistry.cpp:1795 ../src/seltrans.cpp:483 -#: ../src/ui/dialog/transformation.cpp:894 +#: ../src/selection-chemistry.cpp:1859 ../src/seltrans.cpp:484 +#: ../src/ui/dialog/transformation.cpp:890 msgid "Rotate" msgstr "Ruota" -#: ../src/selection-chemistry.cpp:2166 +#: ../src/selection-chemistry.cpp:2208 msgid "Rotate by pixels" msgstr "Ruota tramite pixel" -#: ../src/selection-chemistry.cpp:2196 ../src/seltrans.cpp:480 -#: ../src/ui/dialog/transformation.cpp:869 -#: ../share/extensions/interp_att_g.inx.h:12 +#: ../src/selection-chemistry.cpp:2238 ../src/seltrans.cpp:481 +#: ../src/ui/dialog/transformation.cpp:864 ../src/ui/widget/page-sizer.cpp:450 +#: ../share/extensions/interp_att_g.inx.h:14 msgid "Scale" msgstr "Ridimensiona" -#: ../src/selection-chemistry.cpp:2221 +#: ../src/selection-chemistry.cpp:2263 msgid "Scale by whole factor" msgstr "Ridimensiona di un fattore intero" -#: ../src/selection-chemistry.cpp:2236 +#: ../src/selection-chemistry.cpp:2278 msgid "Move vertically" msgstr "Muovi verticalmente" -#: ../src/selection-chemistry.cpp:2239 +#: ../src/selection-chemistry.cpp:2281 msgid "Move horizontally" msgstr "Muovi orizzontalmente" -#: ../src/selection-chemistry.cpp:2242 ../src/selection-chemistry.cpp:2268 -#: ../src/seltrans.cpp:477 ../src/ui/dialog/transformation.cpp:807 +#: ../src/selection-chemistry.cpp:2284 ../src/selection-chemistry.cpp:2310 +#: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:801 msgid "Move" msgstr "Muovi" -#: ../src/selection-chemistry.cpp:2262 +#: ../src/selection-chemistry.cpp:2304 msgid "Move vertically by pixels" msgstr "Scosta verticalmente di pixel" -#: ../src/selection-chemistry.cpp:2265 +#: ../src/selection-chemistry.cpp:2307 msgid "Move horizontally by pixels" msgstr "Scosta orizzontalmente di pixel" -#: ../src/selection-chemistry.cpp:2397 +#: ../src/selection-chemistry.cpp:2510 msgid "The selection has no applied path effect." msgstr "La selezione non ha applicato alcun effetto su tracciato." -#: ../src/selection-chemistry.cpp:2566 ../src/ui/dialog/clonetiler.cpp:2218 +#: ../src/selection-chemistry.cpp:2602 ../src/ui/dialog/clonetiler.cpp:2238 msgid "Select an object to clone." msgstr "Seleziona un oggetto da clonare." -#: ../src/selection-chemistry.cpp:2602 +#: ../src/selection-chemistry.cpp:2637 msgctxt "Action" msgid "Clone" msgstr "Clona" -#: ../src/selection-chemistry.cpp:2618 +#: ../src/selection-chemistry.cpp:2651 msgid "Select clones to relink." msgstr "Seleziona i cloni da ricollegare." -#: ../src/selection-chemistry.cpp:2625 +#: ../src/selection-chemistry.cpp:2658 msgid "Copy an object to clipboard to relink clones to." msgstr "Copiare un oggetto negli appunti per ricollegargli i cloni." -#: ../src/selection-chemistry.cpp:2649 +#: ../src/selection-chemistry.cpp:2679 msgid "No clones to relink in the selection." msgstr "Nessun clone da ricollegare nella selezione." -#: ../src/selection-chemistry.cpp:2652 +#: ../src/selection-chemistry.cpp:2682 msgid "Relink clone" msgstr "Ricollega clone" -#: ../src/selection-chemistry.cpp:2666 +#: ../src/selection-chemistry.cpp:2696 msgid "Select clones to unlink." msgstr "Seleziona i cloni da scollegare." -#: ../src/selection-chemistry.cpp:2720 +#: ../src/selection-chemistry.cpp:2749 msgid "No clones to unlink in the selection." msgstr "Nessun clone da scollegare nella selezione." -#: ../src/selection-chemistry.cpp:2724 +#: ../src/selection-chemistry.cpp:2753 msgid "Unlink clone" msgstr "Scollega clone" -#: ../src/selection-chemistry.cpp:2737 +#: ../src/selection-chemistry.cpp:2766 msgid "" "Select a clone to go to its original. Select a linked offset " "to go to its source. Select a text on path to go to the path. Select " @@ -12195,7 +12966,7 @@ msgstr "" "su tracciato per andare al tracciato. Seleziona un testo dinamico " "per andare al suo riquadro." -#: ../src/selection-chemistry.cpp:2770 +#: ../src/selection-chemistry.cpp:2816 msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" @@ -12203,227 +12974,229 @@ msgstr "" "Impossibile trovare l'oggetto da selezionare (clone orfano, " "proiezione, testo su percorso o testo dinamico?)" -#: ../src/selection-chemistry.cpp:2776 +#: ../src/selection-chemistry.cpp:2822 msgid "" "The object you're trying to select is not visible (it is in <" "defs>)" msgstr "" "L'oggetto che si vuole selezionare non è visibile (è in <defs>)" -#: ../src/selection-chemistry.cpp:2821 -msgid "Select one path to clone." -msgstr "Seleziona un tracciato da clonare." - -#: ../src/selection-chemistry.cpp:2825 -msgid "Select one path to clone." -msgstr "Seleziona un tracciato da clonare." +#: ../src/selection-chemistry.cpp:2912 +#, fuzzy +msgid "Select path(s) to fill." +msgstr "Seleziona il tracciato da semplificare." -#: ../src/selection-chemistry.cpp:2881 +#: ../src/selection-chemistry.cpp:2930 msgid "Select object(s) to convert to marker." msgstr "Seleziona l'oggetto da convertire in delimitatore." -#: ../src/selection-chemistry.cpp:2948 +#: ../src/selection-chemistry.cpp:3004 msgid "Objects to marker" msgstr "Da oggetto a delimitatore" -#: ../src/selection-chemistry.cpp:2972 +#: ../src/selection-chemistry.cpp:3030 msgid "Select object(s) to convert to guides." msgstr "Seleziona l'oggetto da convertire in guide." -#: ../src/selection-chemistry.cpp:2995 +#: ../src/selection-chemistry.cpp:3051 msgid "Objects to guides" msgstr "Da oggetto a guida" -#: ../src/selection-chemistry.cpp:3031 +#: ../src/selection-chemistry.cpp:3087 msgid "Select objects to convert to symbol." msgstr "Seleziona gli oggetti da convertire in simbolo." -#: ../src/selection-chemistry.cpp:3137 +#: ../src/selection-chemistry.cpp:3188 msgid "Group to symbol" msgstr "Gruppo a simbolo" -#: ../src/selection-chemistry.cpp:3156 +#: ../src/selection-chemistry.cpp:3207 msgid "Select a symbol to extract objects from." msgstr "Seleziona un simbolo da cui estrarre oggetti." -#: ../src/selection-chemistry.cpp:3165 +#: ../src/selection-chemistry.cpp:3216 msgid "Select only one symbol in Symbol dialog to convert to group." msgstr "" "Seleziona solo un simbolo nella finestra Simboli da convertire in " "gruppo." -#: ../src/selection-chemistry.cpp:3223 +#: ../src/selection-chemistry.cpp:3272 msgid "Group from symbol" msgstr "Gruppo da simbolo" -#: ../src/selection-chemistry.cpp:3241 +#: ../src/selection-chemistry.cpp:3290 msgid "Select object(s) to convert to pattern." msgstr "Seleziona l'oggetto da convertire in motivo." -#: ../src/selection-chemistry.cpp:3331 +#: ../src/selection-chemistry.cpp:3386 msgid "Objects to pattern" msgstr "Da oggetto a motivo" -#: ../src/selection-chemistry.cpp:3347 +#: ../src/selection-chemistry.cpp:3402 msgid "Select an object with pattern fill to extract objects from." msgstr "" "Seleziona un oggetto con motivo di riempimento da cui estrarre " "l'oggetto." -#: ../src/selection-chemistry.cpp:3402 +#: ../src/selection-chemistry.cpp:3461 msgid "No pattern fills in the selection." msgstr "Nessun motivo di riempimento nella selezione." -#: ../src/selection-chemistry.cpp:3405 +#: ../src/selection-chemistry.cpp:3464 msgid "Pattern to objects" msgstr "Da motivo a oggetto" -#: ../src/selection-chemistry.cpp:3496 +#: ../src/selection-chemistry.cpp:3550 msgid "Select object(s) to make a bitmap copy." msgstr "Seleziona l'oggetto di cui fare una copia bitmap." -#: ../src/selection-chemistry.cpp:3500 +#: ../src/selection-chemistry.cpp:3554 msgid "Rendering bitmap..." msgstr "Creazione bitmap..." -#: ../src/selection-chemistry.cpp:3679 +#: ../src/selection-chemistry.cpp:3739 msgid "Create bitmap" msgstr "Crea bitmap" -#: ../src/selection-chemistry.cpp:3711 +#: ../src/selection-chemistry.cpp:3764 ../src/selection-chemistry.cpp:3876 msgid "Select object(s) to create clippath or mask from." msgstr "Seleziona l'oggetto da cui creare la maschera o il fissaggio." -#: ../src/selection-chemistry.cpp:3714 +#: ../src/selection-chemistry.cpp:3850 ../src/ui/dialog/objects.cpp:1922 +#, fuzzy +msgid "Create Clip Group" +msgstr "Crea clo_ne" + +#: ../src/selection-chemistry.cpp:3879 msgid "Select mask object and object(s) to apply clippath or mask to." msgstr "" "Selezionare l'oggetto maschera e l'oggetto a cui applicare la " "maschera o il fissaggio." -#: ../src/selection-chemistry.cpp:3897 +#: ../src/selection-chemistry.cpp:4026 msgid "Set clipping path" msgstr "Imposta fissaggio" -#: ../src/selection-chemistry.cpp:3899 +#: ../src/selection-chemistry.cpp:4028 msgid "Set mask" msgstr "Imposta maschera" -#: ../src/selection-chemistry.cpp:3914 +#: ../src/selection-chemistry.cpp:4043 msgid "Select object(s) to remove clippath or mask from." msgstr "" "Seleziona l'oggetto da cui rimuovere la maschera o il fissaggio." -#: ../src/selection-chemistry.cpp:4025 +#: ../src/selection-chemistry.cpp:4159 msgid "Release clipping path" msgstr "Rimuovi fissaggio" -#: ../src/selection-chemistry.cpp:4027 +#: ../src/selection-chemistry.cpp:4161 msgid "Release mask" msgstr "Rimuovi maschera" -#: ../src/selection-chemistry.cpp:4046 +#: ../src/selection-chemistry.cpp:4180 msgid "Select object(s) to fit canvas to." msgstr "Seleziona l'oggetto a cui adattare la tela." #. Fit Page -#: ../src/selection-chemistry.cpp:4066 ../src/verbs.cpp:2905 +#: ../src/selection-chemistry.cpp:4200 ../src/verbs.cpp:3004 msgid "Fit Page to Selection" msgstr "Adatta pagina alla selezione" -#: ../src/selection-chemistry.cpp:4095 ../src/verbs.cpp:2907 +#: ../src/selection-chemistry.cpp:4229 ../src/verbs.cpp:3006 msgid "Fit Page to Drawing" msgstr "Adatta pagina al disegno" -#: ../src/selection-chemistry.cpp:4116 ../src/verbs.cpp:2909 +#: ../src/selection-chemistry.cpp:4250 msgid "Fit Page to Selection or Drawing" msgstr "Adatta pagina alla selezione o al disegno" -#: ../src/selection-describer.cpp:128 +#: ../src/selection-describer.cpp:138 msgid "root" msgstr "(base)" -#: ../src/selection-describer.cpp:130 ../src/widgets/ege-paint-def.cpp:66 +#: ../src/selection-describer.cpp:140 ../src/widgets/ege-paint-def.cpp:66 #: ../src/widgets/ege-paint-def.cpp:90 msgid "none" msgstr "nessuno" -#: ../src/selection-describer.cpp:142 +#: ../src/selection-describer.cpp:152 #, c-format msgid "layer %s" msgstr "livello %s" -#: ../src/selection-describer.cpp:144 +#: ../src/selection-describer.cpp:154 #, c-format msgid "layer %s" msgstr "livello %s" -#: ../src/selection-describer.cpp:155 +#: ../src/selection-describer.cpp:165 #, c-format msgid "%s" msgstr "%s" -#: ../src/selection-describer.cpp:165 +#: ../src/selection-describer.cpp:175 #, c-format msgid " in %s" msgstr " in %s" -#: ../src/selection-describer.cpp:167 +#: ../src/selection-describer.cpp:177 msgid " hidden in definitions" msgstr " nascosto nelle definizioni" -#: ../src/selection-describer.cpp:169 +#: ../src/selection-describer.cpp:179 #, c-format msgid " in group %s (%s)" msgstr " nel gruppo %s (%s)" -#: ../src/selection-describer.cpp:171 +#: ../src/selection-describer.cpp:181 #, c-format msgid " in unnamed group (%s)" msgstr " nel gruppo senza nome (%s)" -#: ../src/selection-describer.cpp:173 +#: ../src/selection-describer.cpp:183 #, fuzzy, c-format msgid " in %i parent (%s)" msgid_plural " in %i parents (%s)" msgstr[0] " in %i genitore (%s)" msgstr[1] " in %i genitori (%s)" -#: ../src/selection-describer.cpp:176 +#: ../src/selection-describer.cpp:186 #, c-format msgid " in %i layer" msgid_plural " in %i layers" msgstr[0] " in %i livello" msgstr[1] " in %i livelli" -#: ../src/selection-describer.cpp:187 +#: ../src/selection-describer.cpp:198 #, fuzzy msgid "Convert symbol to group to edit" msgstr "Converti simbolo a gruppo da modificare" -#: ../src/selection-describer.cpp:191 +#: ../src/selection-describer.cpp:202 msgid "Remove from symbols tray to edit symbol" msgstr "" -#: ../src/selection-describer.cpp:195 +#: ../src/selection-describer.cpp:208 msgid "Use Shift+D to look up original" msgstr "Usa Maiusc+D per trovare l'originale" -#: ../src/selection-describer.cpp:199 +#: ../src/selection-describer.cpp:214 msgid "Use Shift+D to look up path" msgstr "Usa Maiusc+D per trovare il tracciato" -#: ../src/selection-describer.cpp:203 +#: ../src/selection-describer.cpp:220 msgid "Use Shift+D to look up frame" msgstr "Usa Maiusc+D per trovare il riquadro" -#: ../src/selection-describer.cpp:215 +#: ../src/selection-describer.cpp:236 #, c-format -msgid "%i objects selected of type %s" -msgid_plural "%i objects selected of types %s" -msgstr[0] "%i oggetti selezionati di tipo %s" -msgstr[1] "%i oggetti selezionati di tipo %s" +msgid "%1$i objects selected of type %2$s" +msgid_plural "%1$i objects selected of types %2$s" +msgstr[0] "%1$i oggetti selezionati di tipo %2$s" +msgstr[1] "%1$i oggetti selezionati di tipo %2$s" -#: ../src/selection-describer.cpp:225 +#: ../src/selection-describer.cpp:246 #, c-format msgid "; %d filtered object " msgid_plural "; %d filtered objects " @@ -12472,11 +13245,11 @@ msgstr "" "Centro di rotazione e distorsione: trascina per riposizionarlo; anche " "il ridimensionamento con Maiusc usa questo centro" -#: ../src/seltrans.cpp:486 ../src/ui/dialog/transformation.cpp:982 +#: ../src/seltrans.cpp:487 ../src/ui/dialog/transformation.cpp:979 msgid "Skew" msgstr "Distorsione" -#: ../src/seltrans.cpp:499 +#: ../src/seltrans.cpp:501 msgid "Set center" msgstr "Imposta centro" @@ -12488,7 +13261,7 @@ msgstr "Timbro" msgid "Reset center" msgstr "Resetta centro" -#: ../src/seltrans.cpp:955 ../src/seltrans.cpp:1060 +#: ../src/seltrans.cpp:961 ../src/seltrans.cpp:1065 #, c-format msgid "Scale: %0.2f%% x %0.2f%%; with Ctrl to lock ratio" msgstr "" @@ -12497,7 +13270,7 @@ msgstr "" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1199 +#: ../src/seltrans.cpp:1202 #, c-format msgid "Skew: %0.2f°; with Ctrl to snap angle" msgstr "" @@ -12505,18 +13278,18 @@ msgstr "" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1274 +#: ../src/seltrans.cpp:1278 #, c-format msgid "Rotate: %0.2f°; with Ctrl to snap angle" msgstr "" "Rotazione: %0.2f°; con Ctrl per far scattare l'angolo" -#: ../src/seltrans.cpp:1311 +#: ../src/seltrans.cpp:1315 #, c-format msgid "Move center to %s, %s" msgstr "Muove il centro in %s, %s" -#: ../src/seltrans.cpp:1465 +#: ../src/seltrans.cpp:1461 #, c-format msgid "" "Move by %s, %s; with Ctrl to restrict to horizontal/vertical; " @@ -12530,8 +13303,8 @@ msgstr "" msgid "Keyboard directory (%s) is unavailable." msgstr "La cartella delle tavolozze (%s) non è disponibile." -#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1308 -#: ../src/ui/dialog/export.cpp:1342 +#: ../src/shortcuts.cpp:337 ../src/ui/dialog/export.cpp:1305 +#: ../src/ui/dialog/export.cpp:1339 msgid "Select a filename for exporting" msgstr "Seleziona il nome del file per l'esportazione" @@ -12539,36 +13312,36 @@ msgstr "Seleziona il nome del file per l'esportazione" msgid "Select a file to import" msgstr "Seleziona un file da importare" -#: ../src/sp-anchor.cpp:125 +#: ../src/sp-anchor.cpp:111 #, c-format msgid "to %s" msgstr "a %s" -#: ../src/sp-anchor.cpp:129 +#: ../src/sp-anchor.cpp:115 msgid "without URI" msgstr "senza URI" -#: ../src/sp-ellipse.cpp:374 +#: ../src/sp-ellipse.cpp:362 msgid "Segment" msgstr "Segmento" -#: ../src/sp-ellipse.cpp:376 +#: ../src/sp-ellipse.cpp:364 msgid "Arc" msgstr "Arco" #. Ellipse -#: ../src/sp-ellipse.cpp:379 ../src/sp-ellipse.cpp:386 -#: ../src/ui/dialog/inkscape-preferences.cpp:409 -#: ../src/widgets/pencil-toolbar.cpp:158 +#: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 +#: ../src/ui/dialog/inkscape-preferences.cpp:421 +#: ../src/widgets/pencil-toolbar.cpp:179 msgid "Ellipse" msgstr "Ellisse" -#: ../src/sp-ellipse.cpp:383 +#: ../src/sp-ellipse.cpp:371 msgid "Circle" msgstr "Cerchio" #. TRANSLATORS: "Flow region" is an area where text is allowed to flow -#: ../src/sp-flowregion.cpp:192 +#: ../src/sp-flowregion.cpp:181 msgid "Flow Region" msgstr "Regione dinamica" @@ -12576,44 +13349,44 @@ msgstr "Regione dinamica" #. * flow excluded region. flowRegionExclude in SVG 1.2: see #. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and #. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegionExclude-elem. -#: ../src/sp-flowregion.cpp:342 +#: ../src/sp-flowregion.cpp:334 msgid "Flow Excluded Region" msgstr "Regione non dinamica" -#: ../src/sp-flowtext.cpp:289 +#: ../src/sp-flowtext.cpp:282 msgid "Flowed Text" msgstr "Testo dinamico" -#: ../src/sp-flowtext.cpp:291 +#: ../src/sp-flowtext.cpp:284 msgid "Linked Flowed Text" msgstr "Testo dinamico collegato" -#: ../src/sp-flowtext.cpp:298 ../src/sp-text.cpp:341 -#: ../src/ui/tools/text-tool.cpp:1566 +#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:380 +#: ../src/ui/tools/text-tool.cpp:1556 msgid " [truncated]" msgstr " [troncato]" -#: ../src/sp-flowtext.cpp:300 +#: ../src/sp-flowtext.cpp:292 #, c-format msgid "(%d character%s)" msgid_plural "(%d characters%s)" msgstr[0] "(%d carattere%s)" msgstr[1] "(%d caratteri%s)" -#: ../src/sp-guide.cpp:327 +#: ../src/sp-guide.cpp:261 msgid "Create Guides Around the Page" msgstr "Crea guide attorno alla pagina" -#: ../src/sp-guide.cpp:339 ../src/verbs.cpp:2470 +#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Cancella tutte le guide" #. Guide has probably been deleted and no longer has an attached namedview. -#: ../src/sp-guide.cpp:510 +#: ../src/sp-guide.cpp:485 msgid "Deleted" msgstr "Cancellata" -#: ../src/sp-guide.cpp:519 +#: ../src/sp-guide.cpp:494 msgid "" "Shift+drag to rotate, Ctrl+drag to move origin, Del to " "delete" @@ -12621,177 +13394,177 @@ msgstr "" "Maiusc+trascina per ruotare, Ctrl+trascina per spostare " "l'origine, Canc per cancellare" -#: ../src/sp-guide.cpp:523 +#: ../src/sp-guide.cpp:498 #, c-format msgid "vertical, at %s" msgstr "verticale, a %s" -#: ../src/sp-guide.cpp:526 +#: ../src/sp-guide.cpp:501 #, c-format msgid "horizontal, at %s" msgstr "orizzontale, a %s" -#: ../src/sp-guide.cpp:531 +#: ../src/sp-guide.cpp:506 #, c-format msgid "at %d degrees, through (%s,%s)" msgstr "a %d gradi, intersecante (%s,%s)" -#: ../src/sp-image.cpp:525 +#: ../src/sp-image.cpp:517 msgid "embedded" msgstr "integrato" -#: ../src/sp-image.cpp:533 +#: ../src/sp-image.cpp:525 #, c-format msgid "[bad reference]: %s" msgstr "[riferimento errato]: %s" -#: ../src/sp-image.cpp:534 +#: ../src/sp-image.cpp:526 #, c-format msgid "%d × %d: %s" msgstr "%d × %d: %s" -#: ../src/sp-item-group.cpp:329 +#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1915 msgid "Group" msgstr "Gruppo" -#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 +#: ../src/sp-item-group.cpp:313 ../src/sp-switch.cpp:69 #, c-format msgid "of %d object" msgstr "di %d oggetto" -#: ../src/sp-item-group.cpp:335 ../src/sp-switch.cpp:82 +#: ../src/sp-item-group.cpp:313 ../src/sp-switch.cpp:69 #, c-format msgid "of %d objects" msgstr "di %d oggetti" -#: ../src/sp-item.cpp:1035 ../src/verbs.cpp:213 +#: ../src/sp-item.cpp:1031 ../src/verbs.cpp:213 msgid "Object" msgstr "Oggetto" -#: ../src/sp-item.cpp:1052 +#: ../src/sp-item.cpp:1043 #, c-format msgid "%s; clipped" msgstr "%s; con fissaggio" -#: ../src/sp-item.cpp:1058 +#: ../src/sp-item.cpp:1049 #, c-format msgid "%s; masked" msgstr "%s; con maschera" -#: ../src/sp-item.cpp:1068 +#: ../src/sp-item.cpp:1059 #, c-format msgid "%s; filtered (%s)" msgstr "%s; con filtro (%s)" -#: ../src/sp-item.cpp:1070 +#: ../src/sp-item.cpp:1061 #, c-format msgid "%s; filtered" msgstr "%s; con filtro" -#: ../src/sp-line.cpp:126 +#: ../src/sp-line.cpp:113 msgid "Line" msgstr "Linea" -#: ../src/sp-lpe-item.cpp:262 +#: ../src/sp-lpe-item.cpp:258 ../src/sp-lpe-item.cpp:705 msgid "An exception occurred during execution of the Path Effect." msgstr "" "È occorsa un'eccezione durante l'applicazione dell'effetto su tracciato." -#: ../src/sp-offset.cpp:339 +#: ../src/sp-offset.cpp:331 msgid "Linked Offset" msgstr "Proiezione collegata" -#: ../src/sp-offset.cpp:341 +#: ../src/sp-offset.cpp:333 msgid "Dynamic Offset" msgstr "Proiezione dinamica" #. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign -#: ../src/sp-offset.cpp:347 +#: ../src/sp-offset.cpp:339 #, c-format msgid "%s by %f pt" msgstr "%s di %f pt" -#: ../src/sp-offset.cpp:348 +#: ../src/sp-offset.cpp:340 msgid "outset" msgstr "estrusione" -#: ../src/sp-offset.cpp:348 +#: ../src/sp-offset.cpp:340 msgid "inset" msgstr "intrusione" -#: ../src/sp-path.cpp:70 +#: ../src/sp-path.cpp:59 msgid "Path" msgstr "Tracciato" -#: ../src/sp-path.cpp:95 +#: ../src/sp-path.cpp:84 #, c-format msgid ", path effect: %s" msgstr ", effetto su tracciato: %s" -#: ../src/sp-path.cpp:98 +#: ../src/sp-path.cpp:87 #, c-format msgid "%i node%s" msgstr "%i nodo%s" -#: ../src/sp-path.cpp:98 +#: ../src/sp-path.cpp:87 #, c-format msgid "%i nodes%s" msgstr "%i nodi%s" -#: ../src/sp-polygon.cpp:185 +#: ../src/sp-polygon.cpp:172 msgid "Polygon" msgstr "Poligono" -#: ../src/sp-polyline.cpp:131 +#: ../src/sp-polyline.cpp:121 msgid "Polyline" msgstr "Poligonale" #. Rectangle -#: ../src/sp-rect.cpp:163 ../src/ui/dialog/inkscape-preferences.cpp:399 +#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:411 msgid "Rectangle" msgstr "Rettangolo" #. Spiral -#: ../src/sp-spiral.cpp:230 ../src/ui/dialog/inkscape-preferences.cpp:417 +#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:429 #: ../share/extensions/gcodetools_area.inx.h:11 msgid "Spiral" msgstr "Spirale" #. TRANSLATORS: since turn count isn't an integer, please adjust the #. string as needed to deal with an localized plural forms. -#: ../src/sp-spiral.cpp:236 +#: ../src/sp-spiral.cpp:226 #, c-format msgid "with %3f turns" msgstr "con %3f rivoluzioni" #. Star -#: ../src/sp-star.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:413 +#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:425 #: ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "Stella" -#: ../src/sp-star.cpp:257 ../src/widgets/star-toolbar.cpp:462 +#: ../src/sp-star.cpp:248 ../src/widgets/star-toolbar.cpp:462 msgid "Polygon" msgstr "Poligono" #. while there will never be less than 3 vertices, we still need to #. make calls to ngettext because the pluralization may be different #. for various numbers >=3. The singular form is used as the index. -#: ../src/sp-star.cpp:264 +#: ../src/sp-star.cpp:255 #, c-format msgid "with %d vertex" msgstr "con %d vertice" -#: ../src/sp-star.cpp:264 +#: ../src/sp-star.cpp:255 #, c-format msgid "with %d vertices" msgstr "con %d vertici" -#: ../src/sp-switch.cpp:76 +#: ../src/sp-switch.cpp:63 msgid "Conditional Group" msgstr "" -#: ../src/sp-text.cpp:325 ../src/verbs.cpp:328 +#: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 #: ../share/extensions/replace_font.inx.h:11 #: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 @@ -12806,25 +13579,25 @@ msgstr "" msgid "Text" msgstr "Testo" -#: ../src/sp-text.cpp:345 +#: ../src/sp-text.cpp:384 #, c-format msgid "on path%s (%s, %s)" msgstr "su tracciato%s (%s, %s)" -#: ../src/sp-text.cpp:346 +#: ../src/sp-text.cpp:385 #, c-format msgid "%s (%s, %s)" msgstr "%s (%s, %s)" -#: ../src/sp-tref.cpp:230 +#: ../src/sp-tref.cpp:218 msgid "Cloned Character Data" msgstr "" -#: ../src/sp-tref.cpp:246 +#: ../src/sp-tref.cpp:234 msgid " from " msgstr " da " -#: ../src/sp-tref.cpp:252 ../src/sp-use.cpp:264 +#: ../src/sp-tref.cpp:240 ../src/sp-use.cpp:271 msgid "[orphaned]" msgstr "" @@ -12833,67 +13606,60 @@ msgstr "" msgid "Text Span" msgstr "Input testo" -#: ../src/sp-use.cpp:229 +#: ../src/sp-use.cpp:234 msgid "Symbol" msgstr "Simbolo" -#: ../src/sp-use.cpp:232 +#: ../src/sp-use.cpp:236 msgid "Clone" msgstr "Clone" -#: ../src/sp-use.cpp:239 ../src/sp-use.cpp:241 +#: ../src/sp-use.cpp:244 ../src/sp-use.cpp:246 ../src/sp-use.cpp:248 #, c-format msgid "called %s" msgstr "chiamato %s" -#: ../src/sp-use.cpp:241 +#: ../src/sp-use.cpp:248 msgid "Unnamed Symbol" msgstr "Simbolo senza nome" #. TRANSLATORS: Used for statusbar description for long chains: #. * "Clone of: Clone of: ... in Layer 1". -#: ../src/sp-use.cpp:250 +#: ../src/sp-use.cpp:257 msgid "..." msgstr "..." -#: ../src/sp-use.cpp:259 +#: ../src/sp-use.cpp:266 #, c-format msgid "of: %s" msgstr "di: %s" -#: ../src/splivarot.cpp:70 ../src/splivarot.cpp:76 +#: ../src/splivarot.cpp:71 ../src/splivarot.cpp:77 msgid "Union" msgstr "Unione" -#: ../src/splivarot.cpp:82 +#: ../src/splivarot.cpp:83 msgid "Intersection" msgstr "Intersezione" -#: ../src/splivarot.cpp:105 +#: ../src/splivarot.cpp:106 ../src/splivarot.cpp:112 msgid "Division" msgstr "Divisione" -#: ../src/splivarot.cpp:110 +#: ../src/splivarot.cpp:118 msgid "Cut path" msgstr "Taglia tracciato" -#: ../src/splivarot.cpp:333 +#: ../src/splivarot.cpp:342 msgid "Select at least 2 paths to perform a boolean operation." msgstr "" "Seleziona almeno 2 tracciati per effettuare un'operazione booleana." -#: ../src/splivarot.cpp:337 +#: ../src/splivarot.cpp:346 msgid "Select at least 1 path to perform a boolean union." msgstr "Seleziona almeno 1 tracciato per effettuare un'unione booleana." -#: ../src/splivarot.cpp:345 -msgid "" -"Select exactly 2 paths to perform difference, division, or path cut." -msgstr "" -"Seleziona esattamente 2 tracciati per effettuare differenza, " -"divisione o taglio del tracciato." - -#: ../src/splivarot.cpp:361 ../src/splivarot.cpp:376 +#: ../src/splivarot.cpp:363 ../src/splivarot.cpp:378 msgid "" "Unable to determine the z-order of the objects selected for " "difference, XOR, division, or path cut." @@ -12901,90 +13667,90 @@ msgstr "" "Impossibile determinare l'ordinamento-z degli oggetti selezionati per " "la differenza, XOR, divisione o taglio del tracciato." -#: ../src/splivarot.cpp:407 +#: ../src/splivarot.cpp:408 msgid "" "One of the objects is not a path, cannot perform boolean operation." msgstr "" "Uno degli oggetti non è un tracciato, impossibile eseguire " "l'operazione booleana." -#: ../src/splivarot.cpp:1157 +#: ../src/splivarot.cpp:1153 msgid "Select stroked path(s) to convert stroke to path." msgstr "" "Seleziona il tracciato con contorno di cui convertire il contorno in " "tracciato." -#: ../src/splivarot.cpp:1516 +#: ../src/splivarot.cpp:1509 msgid "Convert stroke to path" msgstr "Converti contorno in tracciato" #. TRANSLATORS: "to outline" means "to convert stroke to path" -#: ../src/splivarot.cpp:1519 +#: ../src/splivarot.cpp:1512 msgid "No stroked paths in the selection." msgstr "Nessun tracciato contornato nella selezione." -#: ../src/splivarot.cpp:1590 +#: ../src/splivarot.cpp:1583 msgid "Selected object is not a path, cannot inset/outset." msgstr "" "L'oggetto selezionato non è un tracciato, impossibile intrudere/" "estrudere." -#: ../src/splivarot.cpp:1681 ../src/splivarot.cpp:1746 +#: ../src/splivarot.cpp:1674 ../src/splivarot.cpp:1741 msgid "Create linked offset" msgstr "Crea proiezione collegata" -#: ../src/splivarot.cpp:1682 ../src/splivarot.cpp:1747 +#: ../src/splivarot.cpp:1675 ../src/splivarot.cpp:1742 msgid "Create dynamic offset" msgstr "Crea proiezione dinamica" -#: ../src/splivarot.cpp:1772 +#: ../src/splivarot.cpp:1767 msgid "Select path(s) to inset/outset." msgstr "Seleziona il tracciato da intrudere/estrudere." -#: ../src/splivarot.cpp:1968 +#: ../src/splivarot.cpp:1960 msgid "Outset path" msgstr "Estrudi tracciato" -#: ../src/splivarot.cpp:1968 +#: ../src/splivarot.cpp:1960 msgid "Inset path" msgstr "Intrudi tracciato" -#: ../src/splivarot.cpp:1970 +#: ../src/splivarot.cpp:1962 msgid "No paths to inset/outset in the selection." msgstr "Nessun tracciato da intrudere/estrudere nella selezione." -#: ../src/splivarot.cpp:2132 +#: ../src/splivarot.cpp:2124 msgid "Simplifying paths (separately):" msgstr "Semplificazione tracciati (separatamente):" -#: ../src/splivarot.cpp:2134 +#: ../src/splivarot.cpp:2126 msgid "Simplifying paths:" msgstr "Semplificazione tracciati:" -#: ../src/splivarot.cpp:2171 +#: ../src/splivarot.cpp:2163 #, c-format msgid "%s %d of %d paths simplified..." msgstr "%s %d di %d tracciati semplificati..." -#: ../src/splivarot.cpp:2184 +#: ../src/splivarot.cpp:2176 #, c-format msgid "%d paths simplified." msgstr "%d tracciati semplificati." -#: ../src/splivarot.cpp:2198 +#: ../src/splivarot.cpp:2190 msgid "Select path(s) to simplify." msgstr "Seleziona il tracciato da semplificare." -#: ../src/splivarot.cpp:2214 +#: ../src/splivarot.cpp:2206 msgid "No paths to simplify in the selection." msgstr "Nessun tracciato da semplificare nella selezione." -#: ../src/text-chemistry.cpp:94 +#: ../src/text-chemistry.cpp:91 msgid "Select a text and a path to put text on path." msgstr "" "Seleziona un testo ed un tracciato per mettere il testo sul tracciato." -#: ../src/text-chemistry.cpp:99 +#: ../src/text-chemistry.cpp:96 msgid "" "This text object is already put on a path. Remove it from the path " "first. Use Shift+D to look up its path." @@ -12993,7 +13759,7 @@ msgstr "" "Usa Maiusc+D per trovare il suo tracciato." #. rect is the only SPShape which is not yet, and thus SVG forbids us from putting text on it -#: ../src/text-chemistry.cpp:105 +#: ../src/text-chemistry.cpp:102 msgid "" "You cannot put text on a rectangle in this version. Convert rectangle to " "path first." @@ -13001,37 +13767,37 @@ msgstr "" "In questa versione non è possibile mettere il testo su un rettangolo. " "Convertire prima il rettangolo in tracciato." -#: ../src/text-chemistry.cpp:115 +#: ../src/text-chemistry.cpp:112 msgid "The flowed text(s) must be visible in order to be put on a path." msgstr "" "Il testo dinamico deve essere visibile per esser messo su un " "tracciato." -#: ../src/text-chemistry.cpp:185 ../src/verbs.cpp:2492 +#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2569 msgid "Put text on path" msgstr "Mette il testo sul tracciato" -#: ../src/text-chemistry.cpp:197 +#: ../src/text-chemistry.cpp:194 msgid "Select a text on path to remove it from path." msgstr "Seleziona un testo su tracciato per rimuoverlo dal tracciato." -#: ../src/text-chemistry.cpp:218 +#: ../src/text-chemistry.cpp:213 msgid "No texts-on-paths in the selection." msgstr "Nessun testo su tracciato nella selezione." -#: ../src/text-chemistry.cpp:221 ../src/verbs.cpp:2494 +#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2571 msgid "Remove text from path" msgstr "Rimuove il testo dal tracciato" -#: ../src/text-chemistry.cpp:262 ../src/text-chemistry.cpp:283 +#: ../src/text-chemistry.cpp:257 ../src/text-chemistry.cpp:277 msgid "Select text(s) to remove kerns from." msgstr "Seleziona il testo da cui rimuovere le trasformazioni." -#: ../src/text-chemistry.cpp:286 +#: ../src/text-chemistry.cpp:280 msgid "Remove manual kerns" msgstr "Rimuovi trasformazioni manuali" -#: ../src/text-chemistry.cpp:306 +#: ../src/text-chemistry.cpp:300 msgid "" "Select a text and one or more paths or shapes to flow text " "into frame." @@ -13039,31 +13805,31 @@ msgstr "" "Seleziona un testo ed uno o più tracciati o forme per fluire " "il testo nella struttura." -#: ../src/text-chemistry.cpp:376 +#: ../src/text-chemistry.cpp:369 msgid "Flow text into shape" msgstr "Fluisci testo in struttura" -#: ../src/text-chemistry.cpp:398 +#: ../src/text-chemistry.cpp:391 msgid "Select a flowed text to unflow it." msgstr "Seleziona un testo dinamico da spezzare." -#: ../src/text-chemistry.cpp:472 +#: ../src/text-chemistry.cpp:464 msgid "Unflow flowed text" msgstr "Spezza testo dinamico" -#: ../src/text-chemistry.cpp:484 +#: ../src/text-chemistry.cpp:476 msgid "Select flowed text(s) to convert." msgstr "Seleziona un testo dinamico da convertire." -#: ../src/text-chemistry.cpp:502 +#: ../src/text-chemistry.cpp:494 msgid "The flowed text(s) must be visible in order to be converted." msgstr "Il testo dinamico deve essere visibile per esser convertito." -#: ../src/text-chemistry.cpp:530 +#: ../src/text-chemistry.cpp:521 msgid "Convert flowed text to text" msgstr "Converti testo dinamica in testo" -#: ../src/text-chemistry.cpp:535 +#: ../src/text-chemistry.cpp:526 msgid "No flowed text(s) to convert in the selection." msgstr "Nessun testo dinamico nella selezione da convertire." @@ -13071,173 +13837,8 @@ msgstr "Nessun testo dinamico nella selezione da convertire." msgid "You cannot edit cloned character data." msgstr "Non è possibile modificare caratteri clonati." -#: ../src/tools-switch.cpp:91 -msgid "" -"Click to Select and Transform objects, Drag to select many " -"objects." -msgstr "" -"Clicca per selezionare e trasformare gli oggetti, Trascina per " -"selezionare più oggetti." - -#: ../src/tools-switch.cpp:92 -msgid "Modify selected path points (nodes) directly." -msgstr "Modifica i punti (nodi) selezionati del tracciato direttamente." - -#: ../src/tools-switch.cpp:93 -msgid "To tweak a path by pushing, select it and drag over it." -msgstr "" -"Per ritoccare un tracciato tramite distorsione, selezionarlo e rimodellarlo " -"trascinando." - -#: ../src/tools-switch.cpp:94 -msgid "" -"Drag, click or click and scroll to spray the selected " -"objects." -msgstr "" -"Trascina, clicca, clicca e scorri per spruzzare gli " -"oggetti selezionati." - -#: ../src/tools-switch.cpp:95 -msgid "" -"Drag to create a rectangle. Drag controls to round corners and " -"resize. Click to select." -msgstr "" -"Trascina per creare un rettangolo. Trascina i controlli per " -"arrotondare gli angoli e ridimensionare. Clicca per selezionare." - -#: ../src/tools-switch.cpp:96 -msgid "" -"Drag to create a 3D box. Drag controls to resize in " -"perspective. Click to select (with Ctrl+Alt for single faces)." -msgstr "" -"Trascina per creare un solido 3D. Trascina i controlli per " -"ridimensionarlo in prospettiva. Clicca per selezionare (con Ctrl" -"+Alt per le singole facce)." - -#: ../src/tools-switch.cpp:97 -msgid "" -"Drag to create an ellipse. Drag controls to make an arc or " -"segment. Click to select." -msgstr "" -"Trascina per creare un ellisse. Trascina i controlli per farne " -"un arco o un segmento. Clicca per selezionare." - -#: ../src/tools-switch.cpp:98 -msgid "" -"Drag to create a star. Drag controls to edit the star shape. " -"Click to select." -msgstr "" -"Trascina per creare una stella. Trascina i controlli per " -"modificarne la forma. Clicca per selezionare." - -#: ../src/tools-switch.cpp:99 -msgid "" -"Drag to create a spiral. Drag controls to edit the spiral " -"shape. Click to select." -msgstr "" -"Trascina per creare una spirale. Trascina i controlli per " -"modificarne la forma. Clicca per selezionare." - -#: ../src/tools-switch.cpp:100 -msgid "" -"Drag to create a freehand line. Shift appends to selected " -"path, Alt activates sketch mode." -msgstr "" -"Trascina per creare una linea a mano libera. Con Maiusc per " -"aggiungere al tracciato selezionato, Alt per attivare la modalità a " -"mano libera." - -#: ../src/tools-switch.cpp:101 -msgid "" -"Click or click and drag to start a path; with Shift to " -"append to selected path. Ctrl+click to create single dots (straight " -"line modes only)." -msgstr "" -"Clicca o clicca e trascina per iniziare un percorso; con " -"Maiusc per accodare al percorso selezionato. Ctrl+clic per " -"creare punti singoli (solo in modalità linea semplice)." - -#: ../src/tools-switch.cpp:102 -msgid "" -"Drag to draw a calligraphic stroke; with Ctrl to track a guide " -"path. Arrow keys adjust width (left/right) and angle (up/down)." -msgstr "" -"Trascina per disegnare un tratto di pennino; con Ctrl per " -"ricalcare un tracciato guida. Le frecce modificano la larghezza " -"(sinistra/destra) o l'angolo (su/giù)." - -#: ../src/tools-switch.cpp:103 ../src/ui/tools/text-tool.cpp:1593 -msgid "" -"Click to select or create text, drag to create flowed text; " -"then type." -msgstr "" -"Clicca per selezionare o creare un testo, trascina per creare " -"un testo dinamico; quindi scrivere." - -#: ../src/tools-switch.cpp:104 -msgid "" -"Drag or double click to create a gradient on selected objects, " -"drag handles to adjust gradients." -msgstr "" -"Trascina o doppio clic per creare un gradiente sull'oggetto " -"selezionato; trascina le maniglie per modificare il gradiente." - -#: ../src/tools-switch.cpp:105 -msgid "" -"Drag or double click to create a mesh on selected objects, " -"drag handles to adjust meshes." -msgstr "" -"Trascina o doppio clic per creare un gradiente a maglia " -"sull'oggetto selezionato, trascina le maniglie per modificare il " -"gradiente." - -#: ../src/tools-switch.cpp:106 -msgid "" -"Click or drag around an area to zoom in, Shift+click to " -"zoom out." -msgstr "" -"Clicca o seleziona una zona per ingrandire, Maiusc+clic " -"per rimpicciolire." - -#: ../src/tools-switch.cpp:107 -msgid "Drag to measure the dimensions of objects." -msgstr "Trascina per misurare le dimensioni degli oggetti." - -#: ../src/tools-switch.cpp:108 ../src/ui/tools/dropper-tool.cpp:285 -msgid "" -"Click to set fill, Shift+click to set stroke; drag to " -"average color in area; with Alt to pick inverse color; Ctrl+C " -"to copy the color under mouse to clipboard" -msgstr "" -"Clicca per impostare il colore di riempimento, Maiusc+clic per " -"impostare il colore del contorno; trascina per prelevare il colore " -"medio di un'area; con Alt per prelevare il colore inverso; Ctrl+C per copiare negli appunti il colore sotto al mouse" - -#: ../src/tools-switch.cpp:109 -msgid "Click and drag between shapes to create a connector." -msgstr "Clicca e trascina tra le forme per creare un connettore." - -#: ../src/tools-switch.cpp:110 -msgid "" -"Click to paint a bounded area, Shift+click to union the new " -"fill with the current selection, Ctrl+click to change the clicked " -"object's fill and stroke to the current setting." -msgstr "" -"Clicca per riempire un'area delimitata, Maiusc+clic per unire " -"il nuovo riempimento alla selezione attuale, Ctrl+clic per applicare " -"al riempimento e al contorno dell'oggetto le impostazioni attuali." - -#: ../src/tools-switch.cpp:111 -msgid "Drag to erase." -msgstr "Trascina per cancellare." - -#: ../src/tools-switch.cpp:112 -msgid "Choose a subtool from the toolbar" -msgstr "Seleziona una sottobarra dalla barra degli strumenti" - -#: ../src/trace/potrace/inkscape-potrace.cpp:512 -#: ../src/trace/potrace/inkscape-potrace.cpp:575 +#: ../src/trace/potrace/inkscape-potrace.cpp:511 +#: ../src/trace/potrace/inkscape-potrace.cpp:574 msgid "Trace: %1. %2 nodes" msgstr "Vettorizza: %1. %2 nodi" @@ -13260,28 +13861,28 @@ msgstr "Seleziona un'immagine ed una o più forme sopra di essa" msgid "Trace: No active desktop" msgstr "Vettorizza: Nessun documento attivo" -#: ../src/trace/trace.cpp:313 +#: ../src/trace/trace.cpp:314 msgid "Invalid SIOX result" msgstr "Risultato SIOX non valido" -#: ../src/trace/trace.cpp:406 +#: ../src/trace/trace.cpp:407 msgid "Trace: No active document" msgstr "Vettorizza: Nessun documento attivo" -#: ../src/trace/trace.cpp:438 +#: ../src/trace/trace.cpp:439 msgid "Trace: Image has no bitmap data" msgstr "Vettorizza: L'immagine non contiene bitmap data" -#: ../src/trace/trace.cpp:445 +#: ../src/trace/trace.cpp:446 msgid "Trace: Starting trace..." msgstr "Vettorizza: Inizio processo..." #. ## inform the document, so we can undo -#: ../src/trace/trace.cpp:548 +#: ../src/trace/trace.cpp:549 msgid "Trace bitmap" msgstr "Vettorizza bitmap" -#: ../src/trace/trace.cpp:552 +#: ../src/trace/trace.cpp:553 #, c-format msgid "Trace: Done. %ld nodes created" msgstr "Vettorizza: Eseguito. %ld nodi creati" @@ -13291,37 +13892,37 @@ msgstr "Vettorizza: Eseguito. %ld nodi creati" msgid "Nothing was copied." msgstr "Niente da copiare." -#: ../src/ui/clipboard.cpp:374 ../src/ui/clipboard.cpp:583 -#: ../src/ui/clipboard.cpp:612 +#: ../src/ui/clipboard.cpp:392 ../src/ui/clipboard.cpp:606 +#: ../src/ui/clipboard.cpp:635 msgid "Nothing on the clipboard." msgstr "Niente negli appunti." -#: ../src/ui/clipboard.cpp:432 +#: ../src/ui/clipboard.cpp:450 msgid "Select object(s) to paste style to." msgstr "Seleziona l'oggetto a cui incollare lo stile." -#: ../src/ui/clipboard.cpp:443 ../src/ui/clipboard.cpp:460 +#: ../src/ui/clipboard.cpp:461 ../src/ui/clipboard.cpp:478 msgid "No style on the clipboard." msgstr "Nessun stile negli appunti." -#: ../src/ui/clipboard.cpp:485 +#: ../src/ui/clipboard.cpp:503 msgid "Select object(s) to paste size to." msgstr "Seleziona l'oggetto a cui incollare la dimensione." -#: ../src/ui/clipboard.cpp:492 +#: ../src/ui/clipboard.cpp:510 msgid "No size on the clipboard." msgstr "Nessuna dimensione negli appunti." -#: ../src/ui/clipboard.cpp:545 +#: ../src/ui/clipboard.cpp:567 msgid "Select object(s) to paste live path effect to." msgstr "Seleziona l'oggetto a cui incollare l'effetto su tracciato." #. no_effect: -#: ../src/ui/clipboard.cpp:570 +#: ../src/ui/clipboard.cpp:593 msgid "No effect on the clipboard." msgstr "Nessun effetto negli appunti." -#: ../src/ui/clipboard.cpp:589 ../src/ui/clipboard.cpp:626 +#: ../src/ui/clipboard.cpp:612 ../src/ui/clipboard.cpp:649 msgid "Clipboard does not contain a path." msgstr "Nessun tracciato negli appunti." @@ -13359,13 +13960,13 @@ msgstr "_Licenza" #. FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the #. native filename encoding... and the filename passed to sp_document_new #. should be in UTF-*8.. -#: ../src/ui/dialog/aboutbox.cpp:166 +#: ../src/ui/dialog/aboutbox.cpp:178 msgid "about.svg" msgstr "about.svg" #. TRANSLATORS: Put here your name (and other national contributors') #. one per line in the form of: name surname (email). Use \n for newline. -#: ../src/ui/dialog/aboutbox.cpp:426 +#: ../src/ui/dialog/aboutbox.cpp:438 msgid "translator-credits" msgstr "" "Firas Hanife (FirasHanife@gmail.com)\n" @@ -13373,212 +13974,213 @@ msgstr "" "Luca Ferretti (elle.uca@infinito.it)\n" "Francesco Ricci (tardo2002@libero.it)" -#: ../src/ui/dialog/align-and-distribute.cpp:171 -#: ../src/ui/dialog/align-and-distribute.cpp:852 +#: ../src/ui/dialog/align-and-distribute.cpp:206 +#: ../src/ui/dialog/align-and-distribute.cpp:937 msgid "Align" msgstr "Allineamento" -#: ../src/ui/dialog/align-and-distribute.cpp:341 -#: ../src/ui/dialog/align-and-distribute.cpp:853 +#: ../src/ui/dialog/align-and-distribute.cpp:382 +#: ../src/ui/dialog/align-and-distribute.cpp:938 msgid "Distribute" msgstr "Distribuzione" -#: ../src/ui/dialog/align-and-distribute.cpp:420 +#: ../src/ui/dialog/align-and-distribute.cpp:461 msgid "Minimum horizontal gap (in px units) between bounding boxes" msgstr "Distanza orizzontale minima (in unità px) tra i riquadri" #. TRANSLATORS: "H:" stands for horizontal gap -#: ../src/ui/dialog/align-and-distribute.cpp:422 +#: ../src/ui/dialog/align-and-distribute.cpp:463 msgctxt "Gap" msgid "_H:" msgstr "_H:" -#: ../src/ui/dialog/align-and-distribute.cpp:430 +#: ../src/ui/dialog/align-and-distribute.cpp:471 msgid "Minimum vertical gap (in px units) between bounding boxes" msgstr "Distanza verticale minima (in unità px) tra i riquadri" #. TRANSLATORS: Vertical gap -#: ../src/ui/dialog/align-and-distribute.cpp:432 +#: ../src/ui/dialog/align-and-distribute.cpp:473 msgctxt "Gap" msgid "_V:" msgstr "_V:" -#: ../src/ui/dialog/align-and-distribute.cpp:468 -#: ../src/ui/dialog/align-and-distribute.cpp:855 -#: ../src/widgets/connector-toolbar.cpp:411 +#: ../src/ui/dialog/align-and-distribute.cpp:508 +#: ../src/ui/dialog/align-and-distribute.cpp:940 +#: ../src/widgets/connector-toolbar.cpp:405 msgid "Remove overlaps" msgstr "Rimuovi sovrapposizione" -#: ../src/ui/dialog/align-and-distribute.cpp:499 -#: ../src/widgets/connector-toolbar.cpp:240 +#: ../src/ui/dialog/align-and-distribute.cpp:539 +#: ../src/widgets/connector-toolbar.cpp:234 msgid "Arrange connector network" msgstr "Sistema connettori rete" -#: ../src/ui/dialog/align-and-distribute.cpp:592 +#: ../src/ui/dialog/align-and-distribute.cpp:632 msgid "Exchange Positions" msgstr "Scambia posizioni" -#: ../src/ui/dialog/align-and-distribute.cpp:626 +#: ../src/ui/dialog/align-and-distribute.cpp:666 msgid "Unclump" msgstr "Sparpaglia" -#: ../src/ui/dialog/align-and-distribute.cpp:698 +#: ../src/ui/dialog/align-and-distribute.cpp:737 msgid "Randomize positions" msgstr "Posizione casuale" -#: ../src/ui/dialog/align-and-distribute.cpp:801 +#: ../src/ui/dialog/align-and-distribute.cpp:838 msgid "Distribute text baselines" msgstr "Distribuisci linee del testo" -#: ../src/ui/dialog/align-and-distribute.cpp:824 +#: ../src/ui/dialog/align-and-distribute.cpp:906 msgid "Align text baselines" msgstr "Allinea linee del testo" -#: ../src/ui/dialog/align-and-distribute.cpp:854 +#: ../src/ui/dialog/align-and-distribute.cpp:939 msgid "Rearrange" msgstr "Ordinamento" -#: ../src/ui/dialog/align-and-distribute.cpp:856 -#: ../src/widgets/toolbox.cpp:1728 +#: ../src/ui/dialog/align-and-distribute.cpp:941 +#: ../src/widgets/toolbox.cpp:1788 msgid "Nodes" msgstr "Nodi" -#: ../src/ui/dialog/align-and-distribute.cpp:870 +#: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/ui/dialog/align-and-distribute.cpp:956 msgid "Relative to: " msgstr "Relativo a: " -#: ../src/ui/dialog/align-and-distribute.cpp:871 +#: ../src/ui/dialog/align-and-distribute.cpp:957 msgid "_Treat selection as group: " msgstr "_Tratta selezione come gruppo: " #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:2937 -#: ../src/verbs.cpp:2938 +#: ../src/ui/dialog/align-and-distribute.cpp:963 ../src/verbs.cpp:3036 +#: ../src/verbs.cpp:3037 msgid "Align right edges of objects to the left edge of the anchor" msgstr "Allinea margine destro dell'oggetto al margine sinistro del fisso" -#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:2939 -#: ../src/verbs.cpp:2940 +#: ../src/ui/dialog/align-and-distribute.cpp:966 ../src/verbs.cpp:3038 +#: ../src/verbs.cpp:3039 msgid "Align left edges" msgstr "Allinea margini sinistri" -#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:2941 -#: ../src/verbs.cpp:2942 +#: ../src/ui/dialog/align-and-distribute.cpp:969 ../src/verbs.cpp:3040 +#: ../src/verbs.cpp:3041 msgid "Center on vertical axis" msgstr "Centra sull'asse verticale" -#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:2943 -#: ../src/verbs.cpp:2944 +#: ../src/ui/dialog/align-and-distribute.cpp:972 ../src/verbs.cpp:3042 +#: ../src/verbs.cpp:3043 msgid "Align right sides" msgstr "Allinea i lati destri" -#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:2945 -#: ../src/verbs.cpp:2946 +#: ../src/ui/dialog/align-and-distribute.cpp:975 ../src/verbs.cpp:3044 +#: ../src/verbs.cpp:3045 msgid "Align left edges of objects to the right edge of the anchor" msgstr "Allinea lato sinistro dell'oggetto al lato destro del fisso" -#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:2947 -#: ../src/verbs.cpp:2948 +#: ../src/ui/dialog/align-and-distribute.cpp:978 ../src/verbs.cpp:3046 +#: ../src/verbs.cpp:3047 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "Allinea margine inferiore dell'oggetto al margine superiore del fisso" -#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:2949 -#: ../src/verbs.cpp:2950 +#: ../src/ui/dialog/align-and-distribute.cpp:981 ../src/verbs.cpp:3048 +#: ../src/verbs.cpp:3049 msgid "Align top edges" msgstr "Allinea i margini superiori" -#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:2951 -#: ../src/verbs.cpp:2952 +#: ../src/ui/dialog/align-and-distribute.cpp:984 ../src/verbs.cpp:3050 +#: ../src/verbs.cpp:3051 msgid "Center on horizontal axis" msgstr "Centra sull'asse orizzontale" -#: ../src/ui/dialog/align-and-distribute.cpp:901 ../src/verbs.cpp:2953 -#: ../src/verbs.cpp:2954 +#: ../src/ui/dialog/align-and-distribute.cpp:987 ../src/verbs.cpp:3052 +#: ../src/verbs.cpp:3053 msgid "Align bottom edges" msgstr "Allinea i margini inferiori" -#: ../src/ui/dialog/align-and-distribute.cpp:904 ../src/verbs.cpp:2955 -#: ../src/verbs.cpp:2956 +#: ../src/ui/dialog/align-and-distribute.cpp:990 ../src/verbs.cpp:3054 +#: ../src/verbs.cpp:3055 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "" "Allinea il margine superiore dell'oggetto al margine inferiore del fisso" -#: ../src/ui/dialog/align-and-distribute.cpp:909 +#: ../src/ui/dialog/align-and-distribute.cpp:995 msgid "Align baseline anchors of texts horizontally" msgstr "Allinea orizzontalmente la linea base del testo" -#: ../src/ui/dialog/align-and-distribute.cpp:912 +#: ../src/ui/dialog/align-and-distribute.cpp:998 msgid "Align baselines of texts" msgstr "Allinea le linee base del testo" -#: ../src/ui/dialog/align-and-distribute.cpp:917 +#: ../src/ui/dialog/align-and-distribute.cpp:1003 msgid "Make horizontal gaps between objects equal" msgstr "Distribuisce equamente la distanza orizzontale tra gli oggetti" -#: ../src/ui/dialog/align-and-distribute.cpp:921 +#: ../src/ui/dialog/align-and-distribute.cpp:1007 msgid "Distribute left edges equidistantly" msgstr "Distribuisce i margini sinistri degli oggetti alla stessa distanza" -#: ../src/ui/dialog/align-and-distribute.cpp:924 +#: ../src/ui/dialog/align-and-distribute.cpp:1010 msgid "Distribute centers equidistantly horizontally" msgstr "" "Distribuisce orizzontalmente i centri degli oggetti alla stessa distanza" -#: ../src/ui/dialog/align-and-distribute.cpp:927 +#: ../src/ui/dialog/align-and-distribute.cpp:1013 msgid "Distribute right edges equidistantly" msgstr "Distribuisce i margini destri degli oggetti alla stessa distanza" -#: ../src/ui/dialog/align-and-distribute.cpp:931 +#: ../src/ui/dialog/align-and-distribute.cpp:1017 msgid "Make vertical gaps between objects equal" msgstr "Distribuisce equamente la distanza verticale tra gli oggetti" -#: ../src/ui/dialog/align-and-distribute.cpp:935 +#: ../src/ui/dialog/align-and-distribute.cpp:1021 msgid "Distribute top edges equidistantly" msgstr "Distribuisce i margini superiori degli oggetti alla stessa distanza" -#: ../src/ui/dialog/align-and-distribute.cpp:938 +#: ../src/ui/dialog/align-and-distribute.cpp:1024 msgid "Distribute centers equidistantly vertically" msgstr "Distribuisce verticalmente i centri degli oggetti alla stessa distanza" -#: ../src/ui/dialog/align-and-distribute.cpp:941 +#: ../src/ui/dialog/align-and-distribute.cpp:1027 msgid "Distribute bottom edges equidistantly" msgstr "Distribuisce i lati inferiori in maniera equidistanziale" -#: ../src/ui/dialog/align-and-distribute.cpp:946 +#: ../src/ui/dialog/align-and-distribute.cpp:1032 msgid "Distribute baseline anchors of texts horizontally" msgstr "Distribuisce orizzontalmente la linea base del testo" -#: ../src/ui/dialog/align-and-distribute.cpp:949 +#: ../src/ui/dialog/align-and-distribute.cpp:1035 msgid "Distribute baselines of texts vertically" msgstr "Distribuisce verticalmente le linee base del testo" -#: ../src/ui/dialog/align-and-distribute.cpp:955 -#: ../src/widgets/connector-toolbar.cpp:373 +#: ../src/ui/dialog/align-and-distribute.cpp:1041 +#: ../src/widgets/connector-toolbar.cpp:367 msgid "Nicely arrange selected connector network" msgstr "Dispone ordinatamente i connettori di rete selezionati" -#: ../src/ui/dialog/align-and-distribute.cpp:958 +#: ../src/ui/dialog/align-and-distribute.cpp:1044 msgid "Exchange positions of selected objects - selection order" msgstr "Scambia le posizioni degli oggetti selezionati - ordine di selezione" -#: ../src/ui/dialog/align-and-distribute.cpp:961 +#: ../src/ui/dialog/align-and-distribute.cpp:1047 msgid "Exchange positions of selected objects - stacking order" msgstr "Scambia le posizioni degli oggetti selezionati - ordine di impilamento" -#: ../src/ui/dialog/align-and-distribute.cpp:964 +#: ../src/ui/dialog/align-and-distribute.cpp:1050 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "Scambia le posizioni degli oggetti selezionati - rotazione oraria" -#: ../src/ui/dialog/align-and-distribute.cpp:969 +#: ../src/ui/dialog/align-and-distribute.cpp:1055 msgid "Randomize centers in both dimensions" msgstr "Rende casuali i centri su entrambe le dimensioni" -#: ../src/ui/dialog/align-and-distribute.cpp:972 +#: ../src/ui/dialog/align-and-distribute.cpp:1058 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "" "Sparpaglia oggetti: prova a rendere uguali le distanze da bordo a bordo" -#: ../src/ui/dialog/align-and-distribute.cpp:977 +#: ../src/ui/dialog/align-and-distribute.cpp:1063 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" @@ -13586,43 +14188,57 @@ msgstr "" "Sposta gli oggetti il minimo indispensabile affinché i loro riquadri non si " "sovrappongano" -#: ../src/ui/dialog/align-and-distribute.cpp:985 +#: ../src/ui/dialog/align-and-distribute.cpp:1071 msgid "Align selected nodes to a common horizontal line" msgstr "Allinea i nodi selezionati a una linea comune orizzontale" -#: ../src/ui/dialog/align-and-distribute.cpp:988 +#: ../src/ui/dialog/align-and-distribute.cpp:1074 msgid "Align selected nodes to a common vertical line" msgstr "Allinea i nodi selezionati a una linea comune verticale" -#: ../src/ui/dialog/align-and-distribute.cpp:991 +#: ../src/ui/dialog/align-and-distribute.cpp:1077 msgid "Distribute selected nodes horizontally" msgstr "Distribuisce orizzontalmente i nodi selezionati" -#: ../src/ui/dialog/align-and-distribute.cpp:994 +#: ../src/ui/dialog/align-and-distribute.cpp:1080 msgid "Distribute selected nodes vertically" msgstr "Distribuisce verticalmente i nodi selezionati" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:999 +#: ../src/ui/dialog/align-and-distribute.cpp:1085 +#: ../src/ui/dialog/align-and-distribute.cpp:1095 msgid "Last selected" msgstr "Ultimo selezionato" -#: ../src/ui/dialog/align-and-distribute.cpp:1000 +#: ../src/ui/dialog/align-and-distribute.cpp:1086 +#: ../src/ui/dialog/align-and-distribute.cpp:1096 msgid "First selected" msgstr "Primo selezionato" -#: ../src/ui/dialog/align-and-distribute.cpp:1001 +#: ../src/ui/dialog/align-and-distribute.cpp:1087 msgid "Biggest object" msgstr "Oggetto più grande" -#: ../src/ui/dialog/align-and-distribute.cpp:1002 +#: ../src/ui/dialog/align-and-distribute.cpp:1088 msgid "Smallest object" msgstr "Oggetto più piccolo" -#: ../src/ui/dialog/align-and-distribute.cpp:1005 +#: ../src/ui/dialog/align-and-distribute.cpp:1091 msgid "Selection Area" msgstr "Area selezione" +#: ../src/ui/dialog/align-and-distribute.cpp:1097 +msgid "Middle of selection" +msgstr "Metà selezione" + +#: ../src/ui/dialog/align-and-distribute.cpp:1098 +msgid "Min value" +msgstr "Valore minimo" + +#: ../src/ui/dialog/align-and-distribute.cpp:1099 +msgid "Max value" +msgstr "Valore massimo" + #: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 msgid "Edit profile" @@ -13640,562 +14256,565 @@ msgstr "Salva" msgid "Add profile" msgstr "Aggiungi profilo" -#: ../src/ui/dialog/clonetiler.cpp:112 +#: ../src/ui/dialog/clonetiler.cpp:110 msgid "_Symmetry" msgstr "_Simmetria" #. TRANSLATORS: "translation" means "shift" / "displacement" here. -#: ../src/ui/dialog/clonetiler.cpp:124 +#: ../src/ui/dialog/clonetiler.cpp:122 msgid "P1: simple translation" msgstr "P1: traslazione semplice" -#: ../src/ui/dialog/clonetiler.cpp:125 +#: ../src/ui/dialog/clonetiler.cpp:123 msgid "P2: 180° rotation" msgstr "P2: rotazione 180°" -#: ../src/ui/dialog/clonetiler.cpp:126 +#: ../src/ui/dialog/clonetiler.cpp:124 msgid "PM: reflection" msgstr "PM: riflessione" #. TRANSLATORS: "glide reflection" is a reflection and a translation combined. #. For more info, see http://mathforum.org/sum95/suzanne/symsusan.html -#: ../src/ui/dialog/clonetiler.cpp:129 +#: ../src/ui/dialog/clonetiler.cpp:127 msgid "PG: glide reflection" msgstr "PG: riflessione scorrevole" -#: ../src/ui/dialog/clonetiler.cpp:130 +#: ../src/ui/dialog/clonetiler.cpp:128 msgid "CM: reflection + glide reflection" msgstr "CM: riflessione + riflessione scorrevole" -#: ../src/ui/dialog/clonetiler.cpp:131 +#: ../src/ui/dialog/clonetiler.cpp:129 msgid "PMM: reflection + reflection" msgstr "PMM: riflessione + riflessione" -#: ../src/ui/dialog/clonetiler.cpp:132 +#: ../src/ui/dialog/clonetiler.cpp:130 msgid "PMG: reflection + 180° rotation" msgstr "PMG: riflessione + rotazione 180°" -#: ../src/ui/dialog/clonetiler.cpp:133 +#: ../src/ui/dialog/clonetiler.cpp:131 msgid "PGG: glide reflection + 180° rotation" msgstr "PGG: riflessione scorrevole + rotazione 180°" -#: ../src/ui/dialog/clonetiler.cpp:134 +#: ../src/ui/dialog/clonetiler.cpp:132 msgid "CMM: reflection + reflection + 180° rotation" msgstr "CMM: riflessione + riflessione + rotazione 180°" -#: ../src/ui/dialog/clonetiler.cpp:135 +#: ../src/ui/dialog/clonetiler.cpp:133 msgid "P4: 90° rotation" msgstr "P4: rotazione 90°" -#: ../src/ui/dialog/clonetiler.cpp:136 +#: ../src/ui/dialog/clonetiler.cpp:134 msgid "P4M: 90° rotation + 45° reflection" msgstr "P4M: rotazione 90° + riflessione 45°" -#: ../src/ui/dialog/clonetiler.cpp:137 +#: ../src/ui/dialog/clonetiler.cpp:135 msgid "P4G: 90° rotation + 90° reflection" msgstr "P4G: rotazione 90° + riflessione 90°" -#: ../src/ui/dialog/clonetiler.cpp:138 +#: ../src/ui/dialog/clonetiler.cpp:136 msgid "P3: 120° rotation" msgstr "P3: rotazione 120°" -#: ../src/ui/dialog/clonetiler.cpp:139 +#: ../src/ui/dialog/clonetiler.cpp:137 msgid "P31M: reflection + 120° rotation, dense" msgstr "P31M: riflessione + rotazione 120°, denso" -#: ../src/ui/dialog/clonetiler.cpp:140 +#: ../src/ui/dialog/clonetiler.cpp:138 msgid "P3M1: reflection + 120° rotation, sparse" msgstr "P3M1: riflessione + rotazione 120°, rado" -#: ../src/ui/dialog/clonetiler.cpp:141 +#: ../src/ui/dialog/clonetiler.cpp:139 msgid "P6: 60° rotation" msgstr "P6: rotazione 60°" -#: ../src/ui/dialog/clonetiler.cpp:142 +#: ../src/ui/dialog/clonetiler.cpp:140 msgid "P6M: reflection + 60° rotation" msgstr "P6M: riflessione + rotazione 60°" -#: ../src/ui/dialog/clonetiler.cpp:162 +#: ../src/ui/dialog/clonetiler.cpp:160 msgid "Select one of the 17 symmetry groups for the tiling" msgstr "Seleziona uno dei 17 gruppi di simmetria per le serie" -#: ../src/ui/dialog/clonetiler.cpp:180 +#: ../src/ui/dialog/clonetiler.cpp:178 msgid "S_hift" msgstr "Spos_tamento" #. TRANSLATORS: "shift" means: the tiles will be shifted (offset) horizontally by this amount -#: ../src/ui/dialog/clonetiler.cpp:190 +#: ../src/ui/dialog/clonetiler.cpp:188 #, no-c-format msgid "Shift X:" msgstr "Spostamento X:" -#: ../src/ui/dialog/clonetiler.cpp:198 +#: ../src/ui/dialog/clonetiler.cpp:196 #, no-c-format msgid "Horizontal shift per row (in % of tile width)" msgstr "" "Lo spostamento orizzontale per ogni riga (in % sulla larghezza del clone)" -#: ../src/ui/dialog/clonetiler.cpp:206 +#: ../src/ui/dialog/clonetiler.cpp:204 #, no-c-format msgid "Horizontal shift per column (in % of tile width)" msgstr "" "Lo spostamento orizzontale per ogni colonna (in % sulla larghezza del clone)" -#: ../src/ui/dialog/clonetiler.cpp:212 +#: ../src/ui/dialog/clonetiler.cpp:210 msgid "Randomize the horizontal shift by this percentage" msgstr "Rende casuale di questa percentuale lo spostamento orizzontale" #. TRANSLATORS: "shift" means: the tiles will be shifted (offset) vertically by this amount -#: ../src/ui/dialog/clonetiler.cpp:222 +#: ../src/ui/dialog/clonetiler.cpp:220 #, no-c-format msgid "Shift Y:" msgstr "Spostamento Y:" -#: ../src/ui/dialog/clonetiler.cpp:230 +#: ../src/ui/dialog/clonetiler.cpp:228 #, no-c-format msgid "Vertical shift per row (in % of tile height)" msgstr "Lo spostamento verticale per ogni riga (in % sull'altezza del clone)" -#: ../src/ui/dialog/clonetiler.cpp:238 +#: ../src/ui/dialog/clonetiler.cpp:236 #, no-c-format msgid "Vertical shift per column (in % of tile height)" msgstr "" "Lo spostamento verticale per ogni colonna (in % sull'altezza del clone)" -#: ../src/ui/dialog/clonetiler.cpp:245 +#: ../src/ui/dialog/clonetiler.cpp:243 msgid "Randomize the vertical shift by this percentage" msgstr "Rende casuale di questa percentuale lo spostamento verticale" -#: ../src/ui/dialog/clonetiler.cpp:253 ../src/ui/dialog/clonetiler.cpp:399 +#: ../src/ui/dialog/clonetiler.cpp:251 ../src/ui/dialog/clonetiler.cpp:397 msgid "Exponent:" msgstr "Esponente:" -#: ../src/ui/dialog/clonetiler.cpp:260 +#: ../src/ui/dialog/clonetiler.cpp:258 msgid "Whether rows are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "" "Specifica se le righe sono a spaziatura costante (1), convergenti (<1) o " "divergenti (>1)" -#: ../src/ui/dialog/clonetiler.cpp:267 +#: ../src/ui/dialog/clonetiler.cpp:265 msgid "Whether columns are spaced evenly (1), converge (<1) or diverge (>1)" msgstr "" "Specifica se le colonne sono a spaziatura costante (1), convergenti (<1) o " "divergenti (>1)" #. TRANSLATORS: "Alternate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:275 ../src/ui/dialog/clonetiler.cpp:439 -#: ../src/ui/dialog/clonetiler.cpp:515 ../src/ui/dialog/clonetiler.cpp:588 -#: ../src/ui/dialog/clonetiler.cpp:634 ../src/ui/dialog/clonetiler.cpp:761 +#: ../src/ui/dialog/clonetiler.cpp:273 ../src/ui/dialog/clonetiler.cpp:437 +#: ../src/ui/dialog/clonetiler.cpp:513 ../src/ui/dialog/clonetiler.cpp:586 +#: ../src/ui/dialog/clonetiler.cpp:632 ../src/ui/dialog/clonetiler.cpp:759 msgid "Alternate:" msgstr "Alterna:" -#: ../src/ui/dialog/clonetiler.cpp:281 +#: ../src/ui/dialog/clonetiler.cpp:279 msgid "Alternate the sign of shifts for each row" msgstr "Alterna il segno dello spostamento per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:286 +#: ../src/ui/dialog/clonetiler.cpp:284 msgid "Alternate the sign of shifts for each column" msgstr "Alterna il segno dello spostamento per ogni colonna" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:293 ../src/ui/dialog/clonetiler.cpp:457 -#: ../src/ui/dialog/clonetiler.cpp:533 +#: ../src/ui/dialog/clonetiler.cpp:291 ../src/ui/dialog/clonetiler.cpp:455 +#: ../src/ui/dialog/clonetiler.cpp:531 msgid "Cumulate:" msgstr "Accumula:" -#: ../src/ui/dialog/clonetiler.cpp:299 +#: ../src/ui/dialog/clonetiler.cpp:297 msgid "Cumulate the shifts for each row" msgstr "Accumula lo spostamento per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:304 +#: ../src/ui/dialog/clonetiler.cpp:302 msgid "Cumulate the shifts for each column" msgstr "Accumula lo spostamento per ogni colonna" #. TRANSLATORS: "Cumulate" is a verb here -#: ../src/ui/dialog/clonetiler.cpp:311 +#: ../src/ui/dialog/clonetiler.cpp:309 msgid "Exclude tile:" msgstr "Escludi clone:" -#: ../src/ui/dialog/clonetiler.cpp:317 +#: ../src/ui/dialog/clonetiler.cpp:315 msgid "Exclude tile height in shift" msgstr "Esclude l'altezza del clone nello spostamento" -#: ../src/ui/dialog/clonetiler.cpp:322 +#: ../src/ui/dialog/clonetiler.cpp:320 msgid "Exclude tile width in shift" msgstr "Esclude la larghezza del clone nello spostamento" -#: ../src/ui/dialog/clonetiler.cpp:331 +#: ../src/ui/dialog/clonetiler.cpp:329 msgid "Sc_ale" msgstr "Sc_ala" -#: ../src/ui/dialog/clonetiler.cpp:339 +#: ../src/ui/dialog/clonetiler.cpp:337 msgid "Scale X:" msgstr "Scala X:" -#: ../src/ui/dialog/clonetiler.cpp:347 +#: ../src/ui/dialog/clonetiler.cpp:345 #, no-c-format msgid "Horizontal scale per row (in % of tile width)" msgstr "" "Il ridimensionamento orizzontale per ogni riga (in % sulla larghezza del " "clone)" -#: ../src/ui/dialog/clonetiler.cpp:355 +#: ../src/ui/dialog/clonetiler.cpp:353 #, no-c-format msgid "Horizontal scale per column (in % of tile width)" msgstr "" "Il ridimensionamento orizzontale per ogni colonna (in % sulla larghezza del " "clone)" -#: ../src/ui/dialog/clonetiler.cpp:361 +#: ../src/ui/dialog/clonetiler.cpp:359 msgid "Randomize the horizontal scale by this percentage" msgstr "Rende casuale di questa percentuale il ridimensionamento orizzontale" -#: ../src/ui/dialog/clonetiler.cpp:369 +#: ../src/ui/dialog/clonetiler.cpp:367 msgid "Scale Y:" msgstr "Scala Y:" -#: ../src/ui/dialog/clonetiler.cpp:377 +#: ../src/ui/dialog/clonetiler.cpp:375 #, no-c-format msgid "Vertical scale per row (in % of tile height)" msgstr "" "Il ridimensionamento verticale per ogni riga (in % sulla larghezza del clone)" -#: ../src/ui/dialog/clonetiler.cpp:385 +#: ../src/ui/dialog/clonetiler.cpp:383 #, no-c-format msgid "Vertical scale per column (in % of tile height)" msgstr "" "Il ridimensionamento verticale per ogni colonna (in % sulla larghezza del " "clone)" -#: ../src/ui/dialog/clonetiler.cpp:391 +#: ../src/ui/dialog/clonetiler.cpp:389 msgid "Randomize the vertical scale by this percentage" msgstr "Rende casuale di questa percentuale il ridimensionamento verticale" -#: ../src/ui/dialog/clonetiler.cpp:405 +#: ../src/ui/dialog/clonetiler.cpp:403 msgid "Whether row scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "" "Specifica se le dimensioni delle righe costanti (1), convergenti (<1) o " "divergenti (>1)" -#: ../src/ui/dialog/clonetiler.cpp:411 +#: ../src/ui/dialog/clonetiler.cpp:409 msgid "Whether column scaling is uniform (1), converge (<1) or diverge (>1)" msgstr "" "Specifica se le dimensioni delle righe costanti (1), convergenti (<1) o " "divergenti (>1)" -#: ../src/ui/dialog/clonetiler.cpp:419 +#: ../src/ui/dialog/clonetiler.cpp:417 msgid "Base:" msgstr "Base:" -#: ../src/ui/dialog/clonetiler.cpp:425 ../src/ui/dialog/clonetiler.cpp:431 +#: ../src/ui/dialog/clonetiler.cpp:423 ../src/ui/dialog/clonetiler.cpp:429 msgid "" "Base for a logarithmic spiral: not used (0), converge (<1), or diverge (>1)" msgstr "" "Base per una spirale logaritmica: non usata (0), convergente (<1) o " "divergente (>1)" -#: ../src/ui/dialog/clonetiler.cpp:445 +#: ../src/ui/dialog/clonetiler.cpp:443 msgid "Alternate the sign of scales for each row" msgstr "Alterna il segno del ridimensionamento per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:450 +#: ../src/ui/dialog/clonetiler.cpp:448 msgid "Alternate the sign of scales for each column" msgstr "Alterna il segno del ridimensionamento per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:463 +#: ../src/ui/dialog/clonetiler.cpp:461 msgid "Cumulate the scales for each row" msgstr "Accumula il ridimensionamento per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:468 +#: ../src/ui/dialog/clonetiler.cpp:466 msgid "Cumulate the scales for each column" msgstr "Accumula il ridimensionamento per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:477 +#: ../src/ui/dialog/clonetiler.cpp:475 msgid "_Rotation" msgstr "_Rotazione" -#: ../src/ui/dialog/clonetiler.cpp:485 +#: ../src/ui/dialog/clonetiler.cpp:483 msgid "Angle:" msgstr "Angolo:" -#: ../src/ui/dialog/clonetiler.cpp:493 +#: ../src/ui/dialog/clonetiler.cpp:491 #, no-c-format msgid "Rotate tiles by this angle for each row" msgstr "Ruota i cloni di questo angolo per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:501 +#: ../src/ui/dialog/clonetiler.cpp:499 #, no-c-format msgid "Rotate tiles by this angle for each column" msgstr "Ruota i cloni di questo angolo per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:507 +#: ../src/ui/dialog/clonetiler.cpp:505 msgid "Randomize the rotation angle by this percentage" msgstr "Rende casuale di questa percentuale l'angolo di rotazione" -#: ../src/ui/dialog/clonetiler.cpp:521 +#: ../src/ui/dialog/clonetiler.cpp:519 msgid "Alternate the rotation direction for each row" msgstr "Alterna la direzione della rotazione per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:526 +#: ../src/ui/dialog/clonetiler.cpp:524 msgid "Alternate the rotation direction for each column" msgstr "Alterna la direzione della rotazione per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:539 +#: ../src/ui/dialog/clonetiler.cpp:537 msgid "Cumulate the rotation for each row" msgstr "Accumula la rotazione per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:544 +#: ../src/ui/dialog/clonetiler.cpp:542 msgid "Cumulate the rotation for each column" msgstr "Accumula la rotazione per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:553 +#: ../src/ui/dialog/clonetiler.cpp:551 msgid "_Blur & opacity" msgstr "Sfocatura & _opacità" -#: ../src/ui/dialog/clonetiler.cpp:562 +#: ../src/ui/dialog/clonetiler.cpp:560 msgid "Blur:" msgstr "Sfocatura:" -#: ../src/ui/dialog/clonetiler.cpp:568 +#: ../src/ui/dialog/clonetiler.cpp:566 msgid "Blur tiles by this percentage for each row" msgstr "Sfoca i cloni di questa percentuale per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:574 +#: ../src/ui/dialog/clonetiler.cpp:572 msgid "Blur tiles by this percentage for each column" msgstr "Sfoca i cloni di questa percentuale per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:580 +#: ../src/ui/dialog/clonetiler.cpp:578 msgid "Randomize the tile blur by this percentage" msgstr "Rende casuale di questa percentuale la sfocatura del clone" -#: ../src/ui/dialog/clonetiler.cpp:594 +#: ../src/ui/dialog/clonetiler.cpp:592 msgid "Alternate the sign of blur change for each row" msgstr "Alterna il segno del valore di cambiamento di sfocatura per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:599 +#: ../src/ui/dialog/clonetiler.cpp:597 msgid "Alternate the sign of blur change for each column" msgstr "" "Alterna il segno del valore di cambiamento di sfocatura per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:608 +#: ../src/ui/dialog/clonetiler.cpp:606 msgid "Opacity:" msgstr "Opacità:" -#: ../src/ui/dialog/clonetiler.cpp:614 +#: ../src/ui/dialog/clonetiler.cpp:612 msgid "Decrease tile opacity by this percentage for each row" msgstr "Riduce di questa percentuale per ogni riga l'opacità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:620 +#: ../src/ui/dialog/clonetiler.cpp:618 msgid "Decrease tile opacity by this percentage for each column" msgstr "Riduce di questa percentuale per ogni colonna l'opacità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:626 +#: ../src/ui/dialog/clonetiler.cpp:624 msgid "Randomize the tile opacity by this percentage" msgstr "Rende casuale di questa percentuale l'opacità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:640 +#: ../src/ui/dialog/clonetiler.cpp:638 msgid "Alternate the sign of opacity change for each row" msgstr "Alterna il segno del valore di opacità per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:645 +#: ../src/ui/dialog/clonetiler.cpp:643 msgid "Alternate the sign of opacity change for each column" msgstr "Alterna il segno del valore di opacità per ogni colonna" -#: ../src/ui/dialog/clonetiler.cpp:653 +#: ../src/ui/dialog/clonetiler.cpp:651 msgid "Co_lor" msgstr "Co_lore" -#: ../src/ui/dialog/clonetiler.cpp:663 +#: ../src/ui/dialog/clonetiler.cpp:661 msgid "Initial color: " msgstr "Colore iniziale: " -#: ../src/ui/dialog/clonetiler.cpp:667 +#: ../src/ui/dialog/clonetiler.cpp:665 msgid "Initial color of tiled clones" msgstr "Colore iniziale dei cloni in serie" -#: ../src/ui/dialog/clonetiler.cpp:667 +#: ../src/ui/dialog/clonetiler.cpp:665 +#, fuzzy msgid "" "Initial color for clones (works only if the original has unset fill or " -"stroke)" +"stroke or on spray tool in copy mode)" msgstr "" "Colore iniziale dei cloni (funziona solo se l'originale non possiede " "riempimenti o bordi)" -#: ../src/ui/dialog/clonetiler.cpp:682 +#: ../src/ui/dialog/clonetiler.cpp:680 msgid "H:" msgstr "H:" -#: ../src/ui/dialog/clonetiler.cpp:688 +#: ../src/ui/dialog/clonetiler.cpp:686 msgid "Change the tile hue by this percentage for each row" msgstr "Cambia di questa percentuale per ogni riga l'opacità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:694 +#: ../src/ui/dialog/clonetiler.cpp:692 msgid "Change the tile hue by this percentage for each column" msgstr "Cambia di questa percentuale per ogni colonna l'opacità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:700 +#: ../src/ui/dialog/clonetiler.cpp:698 msgid "Randomize the tile hue by this percentage" msgstr "Rende casuale di questa percentuale l'opacità del clone" -#: ../src/ui/dialog/clonetiler.cpp:709 +#: ../src/ui/dialog/clonetiler.cpp:707 msgid "S:" msgstr "S:" -#: ../src/ui/dialog/clonetiler.cpp:715 +#: ../src/ui/dialog/clonetiler.cpp:713 msgid "Change the color saturation by this percentage for each row" msgstr "Cambia di questa percentuale per ogni riga la saturazione del colore" -#: ../src/ui/dialog/clonetiler.cpp:721 +#: ../src/ui/dialog/clonetiler.cpp:719 msgid "Change the color saturation by this percentage for each column" msgstr "" "Cambia di questa percentuale per ogni colonna la saturazione del colore" -#: ../src/ui/dialog/clonetiler.cpp:727 +#: ../src/ui/dialog/clonetiler.cpp:725 msgid "Randomize the color saturation by this percentage" msgstr "Rende casuale di questa percentuale la saturazione del clone" -#: ../src/ui/dialog/clonetiler.cpp:735 +#: ../src/ui/dialog/clonetiler.cpp:733 msgid "L:" msgstr "L:" -#: ../src/ui/dialog/clonetiler.cpp:741 +#: ../src/ui/dialog/clonetiler.cpp:739 msgid "Change the color lightness by this percentage for each row" msgstr "Riduce di questa percentuale per ogni riga la luminosità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:747 +#: ../src/ui/dialog/clonetiler.cpp:745 msgid "Change the color lightness by this percentage for each column" msgstr "Riduce di questa percentuale per ogni colonna la luminosità dei cloni" -#: ../src/ui/dialog/clonetiler.cpp:753 +#: ../src/ui/dialog/clonetiler.cpp:751 msgid "Randomize the color lightness by this percentage" msgstr "Rende casuale di questa percentuale la luminosità del clone" -#: ../src/ui/dialog/clonetiler.cpp:767 +#: ../src/ui/dialog/clonetiler.cpp:765 msgid "Alternate the sign of color changes for each row" msgstr "Alterna il segno del valore di cambiamento del valore per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:772 +#: ../src/ui/dialog/clonetiler.cpp:770 msgid "Alternate the sign of color changes for each column" msgstr "Alterna il segno del valore di cambiamento del valore per ogni riga" -#: ../src/ui/dialog/clonetiler.cpp:780 +#: ../src/ui/dialog/clonetiler.cpp:778 msgid "_Trace" msgstr "Ve_ttorizza" -#: ../src/ui/dialog/clonetiler.cpp:792 -msgid "Trace the drawing under the tiles" +#: ../src/ui/dialog/clonetiler.cpp:788 +#, fuzzy +msgid "Trace the drawing under the clones/sprayed items" msgstr "Vettorizza il disegno sotto i cloni" -#: ../src/ui/dialog/clonetiler.cpp:796 +#: ../src/ui/dialog/clonetiler.cpp:792 +#, fuzzy msgid "" -"For each clone, pick a value from the drawing in that clone's location and " -"apply it to the clone" +"For each clone/sprayed item, pick a value from the drawing in its location " +"and apply it" msgstr "" "Per ogni clone preleva il valore del disegno su cui il clone è posto e lo " "applica al clone" -#: ../src/ui/dialog/clonetiler.cpp:815 +#: ../src/ui/dialog/clonetiler.cpp:811 msgid "1. Pick from the drawing:" msgstr "1. Preleva dal disegno:" -#: ../src/ui/dialog/clonetiler.cpp:833 +#: ../src/ui/dialog/clonetiler.cpp:829 msgid "Pick the visible color and opacity" msgstr "Preleva il colore visibile e l'opacità" -#: ../src/ui/dialog/clonetiler.cpp:841 +#: ../src/ui/dialog/clonetiler.cpp:837 msgid "Pick the total accumulated opacity" msgstr "Preleva l'opacità accumulata totale" -#: ../src/ui/dialog/clonetiler.cpp:848 +#: ../src/ui/dialog/clonetiler.cpp:844 msgid "R" msgstr "R" -#: ../src/ui/dialog/clonetiler.cpp:849 +#: ../src/ui/dialog/clonetiler.cpp:845 msgid "Pick the Red component of the color" msgstr "Preleva la componente Rossa del colore" -#: ../src/ui/dialog/clonetiler.cpp:856 +#: ../src/ui/dialog/clonetiler.cpp:852 msgid "G" msgstr "G" -#: ../src/ui/dialog/clonetiler.cpp:857 +#: ../src/ui/dialog/clonetiler.cpp:853 msgid "Pick the Green component of the color" msgstr "Preleva la componente Verde del colore" -#: ../src/ui/dialog/clonetiler.cpp:864 +#: ../src/ui/dialog/clonetiler.cpp:860 msgid "B" msgstr "B" -#: ../src/ui/dialog/clonetiler.cpp:865 +#: ../src/ui/dialog/clonetiler.cpp:861 msgid "Pick the Blue component of the color" msgstr "Preleva la componente Blu del colore" -#: ../src/ui/dialog/clonetiler.cpp:872 +#: ../src/ui/dialog/clonetiler.cpp:868 msgctxt "Clonetiler color hue" msgid "H" msgstr "H" -#: ../src/ui/dialog/clonetiler.cpp:873 +#: ../src/ui/dialog/clonetiler.cpp:869 msgid "Pick the hue of the color" msgstr "Preleva l'opacità del colore" -#: ../src/ui/dialog/clonetiler.cpp:880 +#: ../src/ui/dialog/clonetiler.cpp:876 msgctxt "Clonetiler color saturation" msgid "S" msgstr "S" -#: ../src/ui/dialog/clonetiler.cpp:881 +#: ../src/ui/dialog/clonetiler.cpp:877 msgid "Pick the saturation of the color" msgstr "Preleva la saturazione del colore" -#: ../src/ui/dialog/clonetiler.cpp:888 +#: ../src/ui/dialog/clonetiler.cpp:884 msgctxt "Clonetiler color lightness" msgid "L" msgstr "L" -#: ../src/ui/dialog/clonetiler.cpp:889 +#: ../src/ui/dialog/clonetiler.cpp:885 msgid "Pick the lightness of the color" msgstr "Preleva la luminosità del colore" -#: ../src/ui/dialog/clonetiler.cpp:899 +#: ../src/ui/dialog/clonetiler.cpp:895 msgid "2. Tweak the picked value:" msgstr "2. Corregge il valore prelevato:" -#: ../src/ui/dialog/clonetiler.cpp:916 +#: ../src/ui/dialog/clonetiler.cpp:912 msgid "Gamma-correct:" msgstr "Correzione-gamma:" -#: ../src/ui/dialog/clonetiler.cpp:920 +#: ../src/ui/dialog/clonetiler.cpp:916 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "" "Sposta l'intervallo medio del valore prelevato verso l'alto (>0) o verso il " "basso (<0)" -#: ../src/ui/dialog/clonetiler.cpp:927 +#: ../src/ui/dialog/clonetiler.cpp:923 msgid "Randomize:" msgstr "Casualità:" -#: ../src/ui/dialog/clonetiler.cpp:931 +#: ../src/ui/dialog/clonetiler.cpp:927 msgid "Randomize the picked value by this percentage" msgstr "Rende casuale di questa percentuale il valore prelevato" -#: ../src/ui/dialog/clonetiler.cpp:938 +#: ../src/ui/dialog/clonetiler.cpp:934 msgid "Invert:" msgstr "Inverti:" -#: ../src/ui/dialog/clonetiler.cpp:942 +#: ../src/ui/dialog/clonetiler.cpp:938 msgid "Invert the picked value" msgstr "Inverti il valore prelevato" -#: ../src/ui/dialog/clonetiler.cpp:948 +#: ../src/ui/dialog/clonetiler.cpp:944 msgid "3. Apply the value to the clones':" msgstr "3. Applica il valore prelevato ai cloni:" -#: ../src/ui/dialog/clonetiler.cpp:963 +#: ../src/ui/dialog/clonetiler.cpp:959 msgid "Presence" msgstr "Presenza" -#: ../src/ui/dialog/clonetiler.cpp:966 +#: ../src/ui/dialog/clonetiler.cpp:962 msgid "" "Each clone is created with the probability determined by the picked value in " "that point" @@ -14203,16 +14822,16 @@ msgstr "" "Ogni clone viene creato con la probabilità determinata dal valore prelevato " "in quel punto" -#: ../src/ui/dialog/clonetiler.cpp:973 +#: ../src/ui/dialog/clonetiler.cpp:969 msgid "Size" msgstr "Dimensione" -#: ../src/ui/dialog/clonetiler.cpp:976 +#: ../src/ui/dialog/clonetiler.cpp:972 msgid "Each clone's size is determined by the picked value in that point" msgstr "" "La dimensione di ogni clone è determinata dal valore preso in quel punto" -#: ../src/ui/dialog/clonetiler.cpp:986 +#: ../src/ui/dialog/clonetiler.cpp:982 msgid "" "Each clone is painted by the picked color (the original must have unset fill " "or stroke)" @@ -14220,47 +14839,52 @@ msgstr "" "Ogni clone è colorato col colore prelevato (l'originale non deve avere " "riempimento o bordo)" -#: ../src/ui/dialog/clonetiler.cpp:996 +#: ../src/ui/dialog/clonetiler.cpp:992 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "L'opacità di ogni clone è determinata dal valore preso in quel punto" -#: ../src/ui/dialog/clonetiler.cpp:1044 +#: ../src/ui/dialog/clonetiler.cpp:1011 +#, fuzzy +msgid "Apply to tiled clones:" +msgstr "Elimina cloni in serie" + +#: ../src/ui/dialog/clonetiler.cpp:1052 msgid "How many rows in the tiling" msgstr "Il numero di righe della serie" -#: ../src/ui/dialog/clonetiler.cpp:1074 +#: ../src/ui/dialog/clonetiler.cpp:1086 msgid "How many columns in the tiling" msgstr "Il numero di colonne della serie" -#: ../src/ui/dialog/clonetiler.cpp:1119 +#: ../src/ui/dialog/clonetiler.cpp:1131 msgid "Width of the rectangle to be filled" msgstr "Larghezza del rettangolo da riempire" -#: ../src/ui/dialog/clonetiler.cpp:1152 +#: ../src/ui/dialog/clonetiler.cpp:1168 msgid "Height of the rectangle to be filled" msgstr "Altezza del rettangolo da riempire" -#: ../src/ui/dialog/clonetiler.cpp:1169 +#: ../src/ui/dialog/clonetiler.cpp:1185 msgid "Rows, columns: " msgstr "Righe, colonne: " -#: ../src/ui/dialog/clonetiler.cpp:1170 +#: ../src/ui/dialog/clonetiler.cpp:1186 msgid "Create the specified number of rows and columns" msgstr "Crea il numero specificato di righe e colonne" -#: ../src/ui/dialog/clonetiler.cpp:1179 +#: ../src/ui/dialog/clonetiler.cpp:1195 msgid "Width, height: " msgstr "Larghezza, altezza: " -#: ../src/ui/dialog/clonetiler.cpp:1180 +#: ../src/ui/dialog/clonetiler.cpp:1196 msgid "Fill the specified width and height with the tiling" msgstr "Riempie la larghezza e l'altezza specificata con i cloni" -#: ../src/ui/dialog/clonetiler.cpp:1201 +#: ../src/ui/dialog/clonetiler.cpp:1217 msgid "Use saved size and position of the tile" msgstr "Usa la dimensione e la posizione salvata per la serie" -#: ../src/ui/dialog/clonetiler.cpp:1204 +#: ../src/ui/dialog/clonetiler.cpp:1220 msgid "" "Pretend that the size and position of the tile are the same as the last time " "you tiled it (if any), instead of using the current size" @@ -14268,11 +14892,11 @@ msgstr "" "Forza la dimensione e la posizione del clone all'ultima clonazione salvata, " "invece di usare le dimensioni attuali" -#: ../src/ui/dialog/clonetiler.cpp:1238 +#: ../src/ui/dialog/clonetiler.cpp:1254 msgid " _Create " msgstr " _Crea " -#: ../src/ui/dialog/clonetiler.cpp:1240 +#: ../src/ui/dialog/clonetiler.cpp:1256 msgid "Create and tile the clones of the selection" msgstr "Crea e serializza i cloni della selezione" @@ -14281,29 +14905,29 @@ msgstr "Crea e serializza i cloni della selezione" #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1260 +#: ../src/ui/dialog/clonetiler.cpp:1276 msgid " _Unclump " msgstr " Spa_rpaglia " -#: ../src/ui/dialog/clonetiler.cpp:1261 +#: ../src/ui/dialog/clonetiler.cpp:1277 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" "Distribuisce i cloni in modo da ridurre gli agglomerati, può essere ripetuto" -#: ../src/ui/dialog/clonetiler.cpp:1267 +#: ../src/ui/dialog/clonetiler.cpp:1283 msgid " Re_move " msgstr " Ri_muovi " -#: ../src/ui/dialog/clonetiler.cpp:1268 +#: ../src/ui/dialog/clonetiler.cpp:1284 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "Rimuove i cloni in serie dell'oggetto selezionati (solo imparentati)" -#: ../src/ui/dialog/clonetiler.cpp:1284 +#: ../src/ui/dialog/clonetiler.cpp:1301 msgid " R_eset " msgstr " R_eimposta " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1286 +#: ../src/ui/dialog/clonetiler.cpp:1303 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" @@ -14311,40 +14935,40 @@ msgstr "" "Reimposta tutti gli spostamenti, scale, rotazioni, opacità e cambiamenti di " "colore nella sottofinestra a zero" -#: ../src/ui/dialog/clonetiler.cpp:1359 +#: ../src/ui/dialog/clonetiler.cpp:1375 msgid "Nothing selected." msgstr "Nessuna selezione." -#: ../src/ui/dialog/clonetiler.cpp:1365 +#: ../src/ui/dialog/clonetiler.cpp:1381 msgid "More than one object selected." msgstr "Più di un elemento selezionato." -#: ../src/ui/dialog/clonetiler.cpp:1372 +#: ../src/ui/dialog/clonetiler.cpp:1388 #, c-format msgid "Object has %d tiled clones." msgstr "L'oggetto ha %d cloni in serie." -#: ../src/ui/dialog/clonetiler.cpp:1377 +#: ../src/ui/dialog/clonetiler.cpp:1393 msgid "Object has no tiled clones." msgstr "L'oggetto non ha cloni in serie." -#: ../src/ui/dialog/clonetiler.cpp:2097 +#: ../src/ui/dialog/clonetiler.cpp:2117 msgid "Select one object whose tiled clones to unclump." msgstr "Seleziona un oggetto di cui sparpagliare i cloni in serie." -#: ../src/ui/dialog/clonetiler.cpp:2119 +#: ../src/ui/dialog/clonetiler.cpp:2137 msgid "Unclump tiled clones" msgstr "Sparpaglia cloni in serie" -#: ../src/ui/dialog/clonetiler.cpp:2148 +#: ../src/ui/dialog/clonetiler.cpp:2166 msgid "Select one object whose tiled clones to remove." msgstr "Seleziona un oggetto da cui rimuovere i cloni in serie." -#: ../src/ui/dialog/clonetiler.cpp:2171 +#: ../src/ui/dialog/clonetiler.cpp:2191 msgid "Delete tiled clones" msgstr "Elimina cloni in serie" -#: ../src/ui/dialog/clonetiler.cpp:2224 +#: ../src/ui/dialog/clonetiler.cpp:2244 msgid "" "If you want to clone several objects, group them and clone the " "group." @@ -14352,27 +14976,27 @@ msgstr "" "Se si vogliono clonare diversi oggetti, occorre raggrupparli e " "clonare il gruppo." -#: ../src/ui/dialog/clonetiler.cpp:2233 +#: ../src/ui/dialog/clonetiler.cpp:2253 msgid "Creating tiled clones..." msgstr "Creazione cloni in serie..." -#: ../src/ui/dialog/clonetiler.cpp:2648 +#: ../src/ui/dialog/clonetiler.cpp:2669 msgid "Create tiled clones" msgstr "Crea cloni in serie" -#: ../src/ui/dialog/clonetiler.cpp:2881 +#: ../src/ui/dialog/clonetiler.cpp:2906 msgid "Per row:" msgstr "Per riga:" -#: ../src/ui/dialog/clonetiler.cpp:2899 +#: ../src/ui/dialog/clonetiler.cpp:2924 msgid "Per column:" msgstr "Per colonna:" -#: ../src/ui/dialog/clonetiler.cpp:2907 +#: ../src/ui/dialog/clonetiler.cpp:2932 msgid "Randomize:" msgstr "Casualità:" -#: ../src/ui/dialog/color-item.cpp:131 +#: ../src/ui/dialog/color-item.cpp:127 #, c-format msgid "" "Color: %s; Click to set fill, Shift+click to set stroke" @@ -14380,191 +15004,204 @@ msgstr "" "Colore: %s; Clicca per impostare il riempimento, Maiusc" "+clic per impostare il contorno" -#: ../src/ui/dialog/color-item.cpp:509 +#: ../src/ui/dialog/color-item.cpp:505 msgid "Change color definition" msgstr "Modifica definizione colore" -#: ../src/ui/dialog/color-item.cpp:679 +#: ../src/ui/dialog/color-item.cpp:675 msgid "Remove stroke color" msgstr "Rimuovi colore contorno" -#: ../src/ui/dialog/color-item.cpp:679 +#: ../src/ui/dialog/color-item.cpp:675 msgid "Remove fill color" msgstr "Rimuovi colore riempimento" -#: ../src/ui/dialog/color-item.cpp:684 +#: ../src/ui/dialog/color-item.cpp:680 msgid "Set stroke color to none" msgstr "Rimuove il colore del contorno" -#: ../src/ui/dialog/color-item.cpp:684 +#: ../src/ui/dialog/color-item.cpp:680 msgid "Set fill color to none" msgstr "Rimuovi il colore di riempimento" -#: ../src/ui/dialog/color-item.cpp:700 +#: ../src/ui/dialog/color-item.cpp:698 msgid "Set stroke color from swatch" msgstr "Imposta colore contorno dai campioni" -#: ../src/ui/dialog/color-item.cpp:700 +#: ../src/ui/dialog/color-item.cpp:698 msgid "Set fill color from swatch" msgstr "Imposta colore di riempimento dai campioni" -#: ../src/ui/dialog/debug.cpp:73 +#: ../src/ui/dialog/debug.cpp:69 msgid "Messages" msgstr "Messaggi" -#: ../src/ui/dialog/debug.cpp:87 ../src/ui/dialog/messages.cpp:47 +#: ../src/ui/dialog/debug.cpp:83 ../src/ui/dialog/messages.cpp:47 msgid "_Clear" msgstr "_Pulisci" -#: ../src/ui/dialog/debug.cpp:91 ../src/ui/dialog/messages.cpp:48 +#: ../src/ui/dialog/debug.cpp:87 ../src/ui/dialog/messages.cpp:48 msgid "Capture log messages" msgstr "Intercetta i messaggi di log" -#: ../src/ui/dialog/debug.cpp:95 +#: ../src/ui/dialog/debug.cpp:91 msgid "Release log messages" msgstr "Ignora i messaggi di log" #: ../src/ui/dialog/document-metadata.cpp:88 -#: ../src/ui/dialog/document-properties.cpp:159 +#: ../src/ui/dialog/document-properties.cpp:167 msgid "Metadata" msgstr "Metadati" #: ../src/ui/dialog/document-metadata.cpp:89 -#: ../src/ui/dialog/document-properties.cpp:160 +#: ../src/ui/dialog/document-properties.cpp:168 msgid "License" msgstr "Licenza" #: ../src/ui/dialog/document-metadata.cpp:126 -#: ../src/ui/dialog/document-properties.cpp:1007 +#: ../src/ui/dialog/document-properties.cpp:994 msgid "Dublin Core Entities" msgstr "Entità Dublin Core" #: ../src/ui/dialog/document-metadata.cpp:168 -#: ../src/ui/dialog/document-properties.cpp:1069 +#: ../src/ui/dialog/document-properties.cpp:1056 msgid "License" msgstr "Licenza" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:111 +#: ../src/ui/dialog/document-properties.cpp:118 msgid "Use antialiasing" msgstr "Usa antialias" -#: ../src/ui/dialog/document-properties.cpp:111 +#: ../src/ui/dialog/document-properties.cpp:118 msgid "If unset, no antialiasing will be done on the drawing" msgstr "Se attivo, l'antialias verrà abilitato per il disegno" -#: ../src/ui/dialog/document-properties.cpp:112 +#: ../src/ui/dialog/document-properties.cpp:119 +#, fuzzy +msgid "Checkerboard background" +msgstr "Vettorizza sfondo" + +#: ../src/ui/dialog/document-properties.cpp:119 +msgid "" +"If set, use checkerboard for background, otherwise use background color at " +"full opacity." +msgstr "" + +#: ../src/ui/dialog/document-properties.cpp:120 msgid "Show page _border" msgstr "Mostra i _bordi della pagina" -#: ../src/ui/dialog/document-properties.cpp:112 +#: ../src/ui/dialog/document-properties.cpp:120 msgid "If set, rectangular page border is shown" msgstr "Se attivo, il bordo rettangolare della pagina è visibile" -#: ../src/ui/dialog/document-properties.cpp:113 +#: ../src/ui/dialog/document-properties.cpp:121 msgid "Border on _top of drawing" msgstr "Bor_di in cima al disegno" -#: ../src/ui/dialog/document-properties.cpp:113 +#: ../src/ui/dialog/document-properties.cpp:121 msgid "If set, border is always on top of the drawing" msgstr "Se attivo, i bordi sono sempre mostrati in cima al disegno" -#: ../src/ui/dialog/document-properties.cpp:114 +#: ../src/ui/dialog/document-properties.cpp:122 msgid "_Show border shadow" msgstr "Mo_stra l'ombra della pagina" -#: ../src/ui/dialog/document-properties.cpp:114 +#: ../src/ui/dialog/document-properties.cpp:122 msgid "If set, page border shows a shadow on its right and lower side" msgstr "" "Se attivo, il bordo della pagina proietta un'ombra dai lati inferiore e " "sinistro" -#: ../src/ui/dialog/document-properties.cpp:115 +#: ../src/ui/dialog/document-properties.cpp:123 msgid "Back_ground color:" msgstr "Colore di sfo_ndo:" -#: ../src/ui/dialog/document-properties.cpp:115 +#: ../src/ui/dialog/document-properties.cpp:123 +#, fuzzy msgid "" "Color of the page background. Note: transparency setting ignored while " -"editing but used when exporting to bitmap." +"editing if 'Checkerboard background' unset (but used when exporting to " +"bitmap)." msgstr "" "Colore di sfondo della pagina. Nota: l'impostazione della trasparenza è " "ignorata durante la modifica ma utilizzata nell'esportazione bitmap." -#: ../src/ui/dialog/document-properties.cpp:116 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Border _color:" msgstr "_Colore del bordo:" -#: ../src/ui/dialog/document-properties.cpp:116 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Page border color" msgstr "Colore del bordo della pagina" -#: ../src/ui/dialog/document-properties.cpp:116 +#: ../src/ui/dialog/document-properties.cpp:124 msgid "Color of the page border" msgstr "Colore dei bordi della pagina" -#: ../src/ui/dialog/document-properties.cpp:117 -msgid "Default _units:" -msgstr "_Unità predefinite:" +#: ../src/ui/dialog/document-properties.cpp:125 +msgid "Display _units:" +msgstr "_Unità visualizzata:" #. --------------------------------------------------------------- #. General snap options -#: ../src/ui/dialog/document-properties.cpp:121 +#: ../src/ui/dialog/document-properties.cpp:129 msgid "Show _guides" msgstr "Mostra _guide" -#: ../src/ui/dialog/document-properties.cpp:121 +#: ../src/ui/dialog/document-properties.cpp:129 msgid "Show or hide guides" msgstr "Mostra o nasconde le guide" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Guide co_lor:" msgstr "Co_lore delle guide:" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Guideline color" msgstr "Colore delle linee guida" -#: ../src/ui/dialog/document-properties.cpp:122 +#: ../src/ui/dialog/document-properties.cpp:130 msgid "Color of guidelines" msgstr "Colore delle linee guida" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "_Highlight color:" msgstr "Colore di e_videnziazione:" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "Highlighted guideline color" msgstr "Colore di evidenziazione della linea guida" -#: ../src/ui/dialog/document-properties.cpp:123 +#: ../src/ui/dialog/document-properties.cpp:131 msgid "Color of a guideline when it is under mouse" msgstr "Colore di una guida quando è sotto il mouse" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:125 +#: ../src/ui/dialog/document-properties.cpp:133 msgid "Snap _distance" msgstr "Distanza di aggancio" -#: ../src/ui/dialog/document-properties.cpp:125 +#: ../src/ui/dialog/document-properties.cpp:133 msgid "Snap only when _closer than:" msgstr "Aggancia solo se più vi_cino di:" -#: ../src/ui/dialog/document-properties.cpp:125 -#: ../src/ui/dialog/document-properties.cpp:130 -#: ../src/ui/dialog/document-properties.cpp:135 +#: ../src/ui/dialog/document-properties.cpp:133 +#: ../src/ui/dialog/document-properties.cpp:138 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Always snap" msgstr "Aggancia sempre" -#: ../src/ui/dialog/document-properties.cpp:126 +#: ../src/ui/dialog/document-properties.cpp:134 msgid "Snapping distance, in screen pixels, for snapping to objects" msgstr "Distanza di aggancio agli oggetti, in pixel dello schermo" -#: ../src/ui/dialog/document-properties.cpp:126 +#: ../src/ui/dialog/document-properties.cpp:134 msgid "Always snap to objects, regardless of their distance" msgstr "Aggancia sempre agli oggetti, indipendentemente dalla distanza" -#: ../src/ui/dialog/document-properties.cpp:127 +#: ../src/ui/dialog/document-properties.cpp:135 msgid "" "If set, objects only snap to another object when it's within the range " "specified below" @@ -14573,23 +15210,23 @@ msgstr "" "azione specificato" #. Options for snapping to grids -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:138 msgid "Snap d_istance" msgstr "D_istanza di aggancio" -#: ../src/ui/dialog/document-properties.cpp:130 +#: ../src/ui/dialog/document-properties.cpp:138 msgid "Snap only when c_loser than:" msgstr "Aggancia so_lo se più vicino di:" -#: ../src/ui/dialog/document-properties.cpp:131 +#: ../src/ui/dialog/document-properties.cpp:139 msgid "Snapping distance, in screen pixels, for snapping to grid" msgstr "Distanza per l'aggancio alla griglia, in pixel dello schermo" -#: ../src/ui/dialog/document-properties.cpp:131 +#: ../src/ui/dialog/document-properties.cpp:139 msgid "Always snap to grids, regardless of the distance" msgstr "Aggancia sempre alle griglie, indipendentemente dalla distanza" -#: ../src/ui/dialog/document-properties.cpp:132 +#: ../src/ui/dialog/document-properties.cpp:140 msgid "" "If set, objects only snap to a grid line when it's within the range " "specified below" @@ -14598,23 +15235,23 @@ msgstr "" "raggio di azione specificato" #. Options for snapping to guides -#: ../src/ui/dialog/document-properties.cpp:135 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Snap dist_ance" msgstr "Dist_anza di aggancio" -#: ../src/ui/dialog/document-properties.cpp:135 +#: ../src/ui/dialog/document-properties.cpp:143 msgid "Snap only when close_r than:" msgstr "Aggancia solo se più vi_cino di:" -#: ../src/ui/dialog/document-properties.cpp:136 +#: ../src/ui/dialog/document-properties.cpp:144 msgid "Snapping distance, in screen pixels, for snapping to guides" msgstr "Distanza per l'aggancio alle guide, in pixel dello schermo" -#: ../src/ui/dialog/document-properties.cpp:136 +#: ../src/ui/dialog/document-properties.cpp:144 msgid "Always snap to guides, regardless of the distance" msgstr "Aggancia sempre alle guide, indipendentemente dalla distanza" -#: ../src/ui/dialog/document-properties.cpp:137 +#: ../src/ui/dialog/document-properties.cpp:145 msgid "" "If set, objects only snap to a guide when it's within the range specified " "below" @@ -14623,103 +15260,111 @@ msgstr "" "specificato" #. --------------------------------------------------------------- -#: ../src/ui/dialog/document-properties.cpp:140 +#: ../src/ui/dialog/document-properties.cpp:148 msgid "Snap to clip paths" msgstr "Aggancia tracciati fissaggi" -#: ../src/ui/dialog/document-properties.cpp:140 +#: ../src/ui/dialog/document-properties.cpp:148 msgid "When snapping to paths, then also try snapping to clip paths" msgstr "" "Quando aggancia a tracciati, prova ad agganciare ai tracciati dei fissaggi" -#: ../src/ui/dialog/document-properties.cpp:141 +#: ../src/ui/dialog/document-properties.cpp:149 msgid "Snap to mask paths" msgstr "Aggancia tracciati maschere" -#: ../src/ui/dialog/document-properties.cpp:141 +#: ../src/ui/dialog/document-properties.cpp:149 msgid "When snapping to paths, then also try snapping to mask paths" msgstr "" "Quando aggancia a tracciati, prova ad agganciare ai tracciati delle maschere" -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:150 msgid "Snap perpendicularly" msgstr "Aggancia perpendicolarmente" -#: ../src/ui/dialog/document-properties.cpp:142 +#: ../src/ui/dialog/document-properties.cpp:150 msgid "" "When snapping to paths or guides, then also try snapping perpendicularly" msgstr "" "Quando aggancia a tracciati o guide, prova ad agganciare perpendicolarmente" -#: ../src/ui/dialog/document-properties.cpp:143 +#: ../src/ui/dialog/document-properties.cpp:151 msgid "Snap tangentially" msgstr "Aggancia tangenzialmente" -#: ../src/ui/dialog/document-properties.cpp:143 +#: ../src/ui/dialog/document-properties.cpp:151 msgid "When snapping to paths or guides, then also try snapping tangentially" msgstr "" "Quando aggancia a tracciati o guide, prova ad agganciare tangenzialmente" -#: ../src/ui/dialog/document-properties.cpp:146 +#: ../src/ui/dialog/document-properties.cpp:154 msgctxt "Grid" msgid "_New" msgstr "_Nuova" -#: ../src/ui/dialog/document-properties.cpp:146 +#: ../src/ui/dialog/document-properties.cpp:154 msgid "Create new grid." msgstr "Crea nuova griglia." -#: ../src/ui/dialog/document-properties.cpp:147 +#: ../src/ui/dialog/document-properties.cpp:155 msgctxt "Grid" msgid "_Remove" msgstr "_Rimuovi" -#: ../src/ui/dialog/document-properties.cpp:147 +#: ../src/ui/dialog/document-properties.cpp:155 msgid "Remove selected grid." msgstr "Rimuove la griglia selezionata." -#: ../src/ui/dialog/document-properties.cpp:154 -#: ../src/widgets/toolbox.cpp:1835 +#: ../src/ui/dialog/document-properties.cpp:162 +#: ../src/widgets/toolbox.cpp:1895 msgid "Guides" msgstr "Guide" -#: ../src/ui/dialog/document-properties.cpp:156 ../src/verbs.cpp:2744 +#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2837 msgid "Snap" msgstr "Aggancio" -#: ../src/ui/dialog/document-properties.cpp:158 +#: ../src/ui/dialog/document-properties.cpp:166 msgid "Scripting" msgstr "Script" -#: ../src/ui/dialog/document-properties.cpp:322 +#: ../src/ui/dialog/document-properties.cpp:330 msgid "General" msgstr "Generale" -#: ../src/ui/dialog/document-properties.cpp:324 +#: ../src/ui/dialog/document-properties.cpp:333 msgid "Page Size" msgstr "Dimensione Pagina" -#: ../src/ui/dialog/document-properties.cpp:326 +#: ../src/ui/dialog/document-properties.cpp:336 +msgid "Background" +msgstr "Sfondo" + +#: ../src/ui/dialog/document-properties.cpp:339 +msgid "Border" +msgstr "Bordo" + +#: ../src/ui/dialog/document-properties.cpp:342 msgid "Display" msgstr "Visualizzazione" -#: ../src/ui/dialog/document-properties.cpp:361 +#: ../src/ui/dialog/document-properties.cpp:381 msgid "Guides" msgstr "Guide" -#: ../src/ui/dialog/document-properties.cpp:379 +#: ../src/ui/dialog/document-properties.cpp:399 msgid "Snap to objects" msgstr "Aggancio agli oggetti" -#: ../src/ui/dialog/document-properties.cpp:381 +#: ../src/ui/dialog/document-properties.cpp:401 msgid "Snap to grids" msgstr "Aggancio alle griglie" -#: ../src/ui/dialog/document-properties.cpp:383 +#: ../src/ui/dialog/document-properties.cpp:403 msgid "Snap to guides" msgstr "Aggancio alle guide" -#: ../src/ui/dialog/document-properties.cpp:385 +#: ../src/ui/dialog/document-properties.cpp:405 msgid "Miscellaneous" msgstr "Varie" @@ -14727,169 +15372,170 @@ msgstr "Varie" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:498 ../src/verbs.cpp:2921 +#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Collega profilo colore" -#: ../src/ui/dialog/document-properties.cpp:599 +#: ../src/ui/dialog/document-properties.cpp:623 msgid "Remove linked color profile" msgstr "Rimuovi profilo colore collegato" -#: ../src/ui/dialog/document-properties.cpp:613 +#: ../src/ui/dialog/document-properties.cpp:636 msgid "Linked Color Profiles:" msgstr "Profili colore collegati:" -#: ../src/ui/dialog/document-properties.cpp:615 +#: ../src/ui/dialog/document-properties.cpp:638 msgid "Available Color Profiles:" msgstr "Profili colore disponibili:" -#: ../src/ui/dialog/document-properties.cpp:617 +#: ../src/ui/dialog/document-properties.cpp:640 msgid "Link Profile" msgstr "Collega profilo" -#: ../src/ui/dialog/document-properties.cpp:626 +#: ../src/ui/dialog/document-properties.cpp:643 msgid "Unlink Profile" msgstr "Scollega profilo" -#: ../src/ui/dialog/document-properties.cpp:710 +#: ../src/ui/dialog/document-properties.cpp:721 msgid "Profile Name" msgstr "Nome profilo" -#: ../src/ui/dialog/document-properties.cpp:746 +#: ../src/ui/dialog/document-properties.cpp:757 msgid "External scripts" msgstr "Script esterni" -#: ../src/ui/dialog/document-properties.cpp:747 +#: ../src/ui/dialog/document-properties.cpp:758 msgid "Embedded scripts" msgstr "Script incorporati" -#: ../src/ui/dialog/document-properties.cpp:752 +#: ../src/ui/dialog/document-properties.cpp:763 msgid "External script files:" msgstr "File di script esterni:" -#: ../src/ui/dialog/document-properties.cpp:754 +#: ../src/ui/dialog/document-properties.cpp:765 msgid "Add the current file name or browse for a file" msgstr "Aggiunge il nome file attuale o cerca un file" -#: ../src/ui/dialog/document-properties.cpp:763 -#: ../src/ui/dialog/document-properties.cpp:852 -#: ../src/ui/widget/selected-style.cpp:343 +#: ../src/ui/dialog/document-properties.cpp:768 +#: ../src/ui/dialog/document-properties.cpp:845 +#: ../src/ui/widget/selected-style.cpp:356 msgid "Remove" msgstr "Rimuovi" -#: ../src/ui/dialog/document-properties.cpp:833 +#: ../src/ui/dialog/document-properties.cpp:832 msgid "Filename" msgstr "Nome file" -#: ../src/ui/dialog/document-properties.cpp:841 +#: ../src/ui/dialog/document-properties.cpp:840 msgid "Embedded script files:" msgstr "File di script incorporati:" -#: ../src/ui/dialog/document-properties.cpp:843 +#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Nuovo" -#: ../src/ui/dialog/document-properties.cpp:922 +#: ../src/ui/dialog/document-properties.cpp:909 msgid "Script id" msgstr "id script" -#: ../src/ui/dialog/document-properties.cpp:928 +#: ../src/ui/dialog/document-properties.cpp:915 msgid "Content:" msgstr "Contenuto:" -#: ../src/ui/dialog/document-properties.cpp:1045 +#: ../src/ui/dialog/document-properties.cpp:1032 msgid "_Save as default" msgstr "_Salva come predefinito" -#: ../src/ui/dialog/document-properties.cpp:1046 +#: ../src/ui/dialog/document-properties.cpp:1033 msgid "Save this metadata as the default metadata" msgstr "Salva questi metadati come predefiniti" -#: ../src/ui/dialog/document-properties.cpp:1047 +#: ../src/ui/dialog/document-properties.cpp:1034 msgid "Use _default" msgstr "Usa impostazioni pre_definite" -#: ../src/ui/dialog/document-properties.cpp:1048 +#: ../src/ui/dialog/document-properties.cpp:1035 msgid "Use the previously saved default metadata here" msgstr "Usa i metadati precedentemente salvati come predefiniti" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1121 +#: ../src/ui/dialog/document-properties.cpp:1108 msgid "Add external script..." msgstr "Aggiungi script esterno..." -#: ../src/ui/dialog/document-properties.cpp:1160 +#: ../src/ui/dialog/document-properties.cpp:1147 msgid "Select a script to load" msgstr "Seleziona uno script da caricare" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1188 +#: ../src/ui/dialog/document-properties.cpp:1175 msgid "Add embedded script..." msgstr "Aggiungi script incorporato..." #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1219 +#: ../src/ui/dialog/document-properties.cpp:1206 msgid "Remove external script" msgstr "Rimuovi script esterno" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1249 +#: ../src/ui/dialog/document-properties.cpp:1235 msgid "Remove embedded script" msgstr "Rimuovi script incorporato" #. TODO repr->set_content(_EmbeddedContent.get_buffer()->get_text()); #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:1346 +#: ../src/ui/dialog/document-properties.cpp:1331 msgid "Edit embedded script" msgstr "Modifica script incorporato" -#: ../src/ui/dialog/document-properties.cpp:1429 +#: ../src/ui/dialog/document-properties.cpp:1415 msgid "Creation" msgstr "Creazione" -#: ../src/ui/dialog/document-properties.cpp:1430 +#: ../src/ui/dialog/document-properties.cpp:1416 msgid "Defined grids" msgstr "Griglie definite" -#: ../src/ui/dialog/document-properties.cpp:1677 +#: ../src/ui/dialog/document-properties.cpp:1660 msgid "Remove grid" msgstr "Rimuovi griglia" -#: ../src/ui/dialog/document-properties.cpp:1765 -msgid "Changed document unit" -msgstr "Unità documento cambiata" +#: ../src/ui/dialog/document-properties.cpp:1752 +msgid "Changed default display unit" +msgstr "Cambiata unità visualizzata" -#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2796 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2887 msgid "_Page" msgstr "_Pagina" -#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2800 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2891 msgid "_Drawing" msgstr "_Disegno" -#: ../src/ui/dialog/export.cpp:152 ../src/verbs.cpp:2802 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2893 msgid "_Selection" msgstr "_Selezione" -#: ../src/ui/dialog/export.cpp:152 +#: ../src/ui/dialog/export.cpp:147 msgid "_Custom" msgstr "_Personalizzata" -#: ../src/ui/dialog/export.cpp:170 ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "Unità:" -#: ../src/ui/dialog/export.cpp:172 +#: ../src/ui/dialog/export.cpp:167 msgid "_Export As..." msgstr "_Esporta come..." -#: ../src/ui/dialog/export.cpp:175 +#: ../src/ui/dialog/export.cpp:170 msgid "B_atch export all selected objects" msgstr "Esporta se_paratamente tutti gli oggetti selezionati" -#: ../src/ui/dialog/export.cpp:175 +#: ../src/ui/dialog/export.cpp:170 msgid "" "Export each selected object into its own PNG file, using export hints if any " "(caution, overwrites without asking!)" @@ -14898,168 +15544,174 @@ msgstr "" "per l'esportazione quando presenti (attenzione, sovrascrive senza far " "domande!)" -#: ../src/ui/dialog/export.cpp:177 +#: ../src/ui/dialog/export.cpp:172 msgid "Hide a_ll except selected" msgstr "Nascondi _tutto tranne la selezione" -#: ../src/ui/dialog/export.cpp:177 +#: ../src/ui/dialog/export.cpp:172 msgid "In the exported image, hide all objects except those that are selected" msgstr "" "Nasconde tutti gli oggetti nell'immagine esportata tranne quelli selezionati" -#: ../src/ui/dialog/export.cpp:178 +#: ../src/ui/dialog/export.cpp:173 msgid "Close when complete" msgstr "Chiudi al completamento" -#: ../src/ui/dialog/export.cpp:178 +#: ../src/ui/dialog/export.cpp:173 msgid "Once the export completes, close this dialog" msgstr "Una volta completata l'esportazione, chiude questa finestra" -#: ../src/ui/dialog/export.cpp:180 +#: ../src/ui/dialog/export.cpp:175 msgid "_Export" msgstr "_Esporta" -#: ../src/ui/dialog/export.cpp:198 +#: ../src/ui/dialog/export.cpp:193 msgid "Export area" msgstr "Area da esportare" -#: ../src/ui/dialog/export.cpp:237 +#: ../src/ui/dialog/export.cpp:232 msgid "_x0:" msgstr "_X0:" -#: ../src/ui/dialog/export.cpp:241 +#: ../src/ui/dialog/export.cpp:236 msgid "x_1:" msgstr "X_1:" -#: ../src/ui/dialog/export.cpp:245 +#: ../src/ui/dialog/export.cpp:240 msgid "Wid_th:" msgstr "Larg_hezza:" -#: ../src/ui/dialog/export.cpp:249 +#: ../src/ui/dialog/export.cpp:244 msgid "_y0:" msgstr "_Y0:" -#: ../src/ui/dialog/export.cpp:253 +#: ../src/ui/dialog/export.cpp:248 msgid "y_1:" msgstr "Y_1:" -#: ../src/ui/dialog/export.cpp:257 +#: ../src/ui/dialog/export.cpp:252 msgid "Hei_ght:" msgstr "Alte_zza:" -#: ../src/ui/dialog/export.cpp:272 +#: ../src/ui/dialog/export.cpp:267 msgid "Image size" msgstr "Dimensione immagine" -#: ../src/ui/dialog/export.cpp:290 ../src/ui/dialog/export.cpp:301 +#: ../src/ui/dialog/export.cpp:285 ../src/ui/dialog/export.cpp:296 msgid "pixels at" msgstr "pixel a" -#: ../src/ui/dialog/export.cpp:296 +#: ../src/ui/dialog/export.cpp:291 msgid "dp_i" msgstr "dp_i" -#: ../src/ui/dialog/export.cpp:301 ../src/ui/dialog/transformation.cpp:82 -#: ../src/ui/widget/page-sizer.cpp:237 +#: ../src/ui/dialog/export.cpp:296 ../src/ui/dialog/transformation.cpp:75 +#: ../src/ui/widget/page-sizer.cpp:238 msgid "_Height:" msgstr "_Altezza:" -#: ../src/ui/dialog/export.cpp:309 -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 -#: ../src/ui/dialog/inkscape-preferences.cpp:1439 -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 +#: ../src/ui/dialog/export.cpp:304 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "dpi" msgstr "dpi" -#: ../src/ui/dialog/export.cpp:317 +#: ../src/ui/dialog/export.cpp:312 msgid "_Filename" msgstr "Nome del _file" -#: ../src/ui/dialog/export.cpp:359 +#: ../src/ui/dialog/export.cpp:354 msgid "Export the bitmap file with these settings" msgstr "Esporta il file bitmap con queste impostazioni" -#: ../src/ui/dialog/export.cpp:484 +#: ../src/ui/dialog/export.cpp:479 msgid "bitmap" msgstr "bitmap" -#: ../src/ui/dialog/export.cpp:619 +#: ../src/ui/dialog/export.cpp:614 #, c-format msgid "B_atch export %d selected object" msgid_plural "B_atch export %d selected objects" msgstr[0] "Esporta separatamente %d oggetto selezionato" msgstr[1] "Esporta separatamente %d oggetti selezionati" -#: ../src/ui/dialog/export.cpp:935 +#: ../src/ui/dialog/export.cpp:930 msgid "Export in progress" msgstr "Esportazione in avanzamento" -#: ../src/ui/dialog/export.cpp:1027 +#: ../src/ui/dialog/export.cpp:1022 msgid "No items selected." msgstr "Nessun oggetto selezionato." -#: ../src/ui/dialog/export.cpp:1031 ../src/ui/dialog/export.cpp:1033 +#: ../src/ui/dialog/export.cpp:1026 ../src/ui/dialog/export.cpp:1028 msgid "Exporting %1 files" msgstr "Esportazione di %1 file" -#: ../src/ui/dialog/export.cpp:1073 ../src/ui/dialog/export.cpp:1075 +#: ../src/ui/dialog/export.cpp:1069 ../src/ui/dialog/export.cpp:1071 #, c-format msgid "Exporting file %s..." msgstr "Esportazione file %s..." -#: ../src/ui/dialog/export.cpp:1084 ../src/ui/dialog/export.cpp:1175 +#: ../src/ui/dialog/export.cpp:1080 ../src/ui/dialog/export.cpp:1172 #, c-format msgid "Could not export to filename %s.\n" msgstr "Impossibile esportare col nome del file %s.\n" -#: ../src/ui/dialog/export.cpp:1087 +#: ../src/ui/dialog/export.cpp:1083 #, c-format msgid "Could not export to filename %s." msgstr "Impossibile esportare col nome del file %s." -#: ../src/ui/dialog/export.cpp:1102 +#: ../src/ui/dialog/export.cpp:1098 #, c-format msgid "Successfully exported %d files from %d selected items." msgstr "" "Esportati correttamente %d file di %d oggetti selezionati." -#: ../src/ui/dialog/export.cpp:1113 +#: ../src/ui/dialog/export.cpp:1109 msgid "You have to enter a filename." msgstr "Bisogna inserire il nome del file." -#: ../src/ui/dialog/export.cpp:1114 +#: ../src/ui/dialog/export.cpp:1110 msgid "You have to enter a filename" msgstr "Bisogna inserire il nome del file" -#: ../src/ui/dialog/export.cpp:1128 +#: ../src/ui/dialog/export.cpp:1124 msgid "The chosen area to be exported is invalid." msgstr "L'area di esportazione selezionata non è valida." -#: ../src/ui/dialog/export.cpp:1129 +#: ../src/ui/dialog/export.cpp:1125 msgid "The chosen area to be exported is invalid" msgstr "L'area di esportazione selezionata non è valida" -#: ../src/ui/dialog/export.cpp:1144 +#: ../src/ui/dialog/export.cpp:1140 #, c-format msgid "Directory %s does not exist or is not a directory.\n" msgstr "La cartella %s non esiste o non è una cartella.\n" #. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image -#: ../src/ui/dialog/export.cpp:1158 ../src/ui/dialog/export.cpp:1160 +#: ../src/ui/dialog/export.cpp:1154 ../src/ui/dialog/export.cpp:1156 msgid "Exporting %1 (%2 x %3)" msgstr "Sto esportando %1 (%2 x %3) " -#: ../src/ui/dialog/export.cpp:1186 +#: ../src/ui/dialog/export.cpp:1183 #, c-format msgid "Drawing exported to %s." msgstr "Disegno esportato in %s." -#: ../src/ui/dialog/export.cpp:1190 +#: ../src/ui/dialog/export.cpp:1187 msgid "Export aborted." msgstr "Esportazione fallita." -#: ../src/ui/dialog/export.cpp:1312 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2358 ../src/widgets/desktop-widget.cpp:1123 +#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1401 +#: ../src/widgets/desktop-widget.cpp:1185 +#: ../src/widgets/desktop-widget.cpp:1247 +msgid "_Cancel" +msgstr "_Annulla" + +#: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 +#: ../src/verbs.cpp:2432 ../src/widgets/desktop-widget.cpp:1186 msgid "_Save" msgstr "_Salva" @@ -15067,10 +15719,10 @@ msgstr "_Salva" msgid "Information" msgstr "Informazioni" -#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:290 -#: ../src/verbs.cpp:309 ../share/extensions/color_HSL_adjust.inx.h:11 +#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 +#: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:6 +#: ../share/extensions/color_randomize.inx.h:12 #: ../share/extensions/dots.inx.h:7 #: ../share/extensions/draw_from_triangle.inx.h:35 #: ../share/extensions/dxf_input.inx.h:10 @@ -15088,7 +15740,7 @@ msgstr "Informazioni" #: ../share/extensions/gcodetools_tools_library.inx.h:12 #: ../share/extensions/generate_voronoi.inx.h:5 #: ../share/extensions/gimp_xcf.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:27 +#: ../share/extensions/interp_att_g.inx.h:29 #: ../share/extensions/jessyInk_autoTexts.inx.h:8 #: ../share/extensions/jessyInk_effects.inx.h:13 #: ../share/extensions/jessyInk_export.inx.h:7 @@ -15104,11 +15756,11 @@ msgstr "Informazioni" #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 #: ../share/extensions/lorem_ipsum.inx.h:6 -#: ../share/extensions/measure.inx.h:16 +#: ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 -#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/split.inx.h:8 -#: ../share/extensions/voronoi2svg.inx.h:11 +#: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25 +#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:16 #: ../share/extensions/web-set-att.inx.h:25 #: ../share/extensions/web-transmit-att.inx.h:23 #: ../share/extensions/webslicer_create_group.inx.h:11 @@ -15121,103 +15773,103 @@ msgid "Parameters" msgstr "Parametri" #. Fill in the template -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:376 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:427 msgid "No preview" msgstr "Nessuna anteprima" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:480 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:531 msgid "too large for preview" msgstr "troppo grande per l'anteprima" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:565 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:617 msgid "Enable preview" msgstr "Attiva anteprima" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:715 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:728 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:732 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:735 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:743 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:759 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:774 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:767 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:784 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:787 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:795 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:811 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:826 #: ../src/ui/dialog/filedialogimpl-win32.cpp:286 #: ../src/ui/dialog/filedialogimpl-win32.cpp:417 msgid "All Files" msgstr "Tutti i file" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:740 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:756 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:771 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:792 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:808 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:823 #: ../src/ui/dialog/filedialogimpl-win32.cpp:287 msgid "All Inkscape Files" msgstr "Tutti i file di Inkscape" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:747 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:763 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:777 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:799 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:815 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:829 #: ../src/ui/dialog/filedialogimpl-win32.cpp:288 msgid "All Images" msgstr "Tutte le immagini" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:750 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:766 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:780 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:802 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:818 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:832 #: ../src/ui/dialog/filedialogimpl-win32.cpp:289 msgid "All Vectors" msgstr "Tutti i vettoriali" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:753 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:769 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:783 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:821 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:835 #: ../src/ui/dialog/filedialogimpl-win32.cpp:290 msgid "All Bitmaps" msgstr "Tutte le bitmap" #. ###### File options #. ###### Do we want the .xxx extension automatically added? -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1002 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1560 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1054 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1612 msgid "Append filename extension automatically" msgstr "Aggiungi automaticamente l'estensione" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1175 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1428 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1227 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1480 msgid "Guess from extension" msgstr "Rileva tipo dall'estensione" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1447 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1499 msgid "Left edge of source" msgstr "Lato sinistro della sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1448 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1500 msgid "Top edge of source" msgstr "Lato superiore della sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1449 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 msgid "Right edge of source" msgstr "Lato destro della sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1450 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1502 msgid "Bottom edge of source" msgstr "Lato inferiore della sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1451 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1503 msgid "Source width" msgstr "Larghezza sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1452 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1504 msgid "Source height" msgstr "Altezza sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1453 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1505 msgid "Destination width" msgstr "Larghezza destinazione" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1454 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1506 msgid "Destination height" msgstr "Altezza destinazione" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1455 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1507 msgid "Resolution (dots per inch)" msgstr "Risoluzione (punti per pollice)" @@ -15225,30 +15877,30 @@ msgstr "Risoluzione (punti per pollice)" #. ## EXTRA WIDGET -- SOURCE SIDE #. ######################################### #. ##### Export options buttons/spinners, etc -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1493 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 msgid "Document" msgstr "Documento" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2000 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 +#: ../src/widgets/desktop-widget.cpp:2073 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "Selezione" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1505 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1557 msgctxt "Export dialog" msgid "Custom" msgstr "Personalizzata" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1525 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1577 msgid "Source" msgstr "Sorgente" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1545 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1597 msgid "Cairo" msgstr "Cairo" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1548 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600 msgid "Antialias" msgstr "Antialias" @@ -15277,7 +15929,7 @@ msgid "Stroke st_yle" msgstr "St_ile contorno" #. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor -#: ../src/ui/dialog/filter-effects-dialog.cpp:546 +#: ../src/ui/dialog/filter-effects-dialog.cpp:547 msgid "" "This matrix determines a linear transform on color space. Each line affects " "one of the color components. Each column determines how much of each color " @@ -15290,112 +15942,112 @@ msgstr "" "dipende dai colori in input, per cui può essere usata per impostare una " "componente costante." -#: ../src/ui/dialog/filter-effects-dialog.cpp:549 +#: ../src/ui/dialog/filter-effects-dialog.cpp:550 #: ../share/extensions/grid_polar.inx.h:4 msgctxt "Label" msgid "None" msgstr "Nessuna" -#: ../src/ui/dialog/filter-effects-dialog.cpp:656 +#: ../src/ui/dialog/filter-effects-dialog.cpp:657 msgid "Image File" msgstr "File immagine" -#: ../src/ui/dialog/filter-effects-dialog.cpp:659 +#: ../src/ui/dialog/filter-effects-dialog.cpp:660 msgid "Selected SVG Element" msgstr "Selezionato elemento SVG" #. TODO: any image, not just svg -#: ../src/ui/dialog/filter-effects-dialog.cpp:729 +#: ../src/ui/dialog/filter-effects-dialog.cpp:730 msgid "Select an image to be used as feImage input" msgstr "Seleziona un'immagine da usare come input per feImage" -#: ../src/ui/dialog/filter-effects-dialog.cpp:821 +#: ../src/ui/dialog/filter-effects-dialog.cpp:822 msgid "This SVG filter effect does not require any parameters." msgstr "Questo filtro SVG non necessita di alcun parametro." -#: ../src/ui/dialog/filter-effects-dialog.cpp:827 +#: ../src/ui/dialog/filter-effects-dialog.cpp:828 msgid "This SVG filter effect is not yet implemented in Inkscape." msgstr "Questo filtro SVG non è ancora implementato in Inkscape." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1041 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1042 #, fuzzy msgid "Slope" msgstr "Imbusta" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1042 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1043 #, fuzzy msgid "Intercept" msgstr "Interfaccia" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1045 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1046 msgid "Amplitude" msgstr "Ampiezza" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1046 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1047 msgid "Exponent" msgstr "Esponente" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1143 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1144 #, fuzzy msgid "New transfer function type" msgstr "Tipo operazione booleana" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1178 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1179 msgid "Light Source:" msgstr "Sorgente d'illuminazione:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1195 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 msgid "Direction angle for the light source on the XY plane, in degrees" msgstr "Angolo di incidenza della sorgente luminosa sul piano XY, in gradi" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1196 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1197 msgid "Direction angle for the light source on the YZ plane, in degrees" msgstr "Angolo di incidenza della sorgente luminosa sul piano YZ, in gradi" #. default x: #. default y: #. default z: -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 msgid "Location:" msgstr "Posizione:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "X coordinate" msgstr "Coordinata X" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Y coordinate" msgstr "Coordinata Y" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1199 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1202 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1200 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1203 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Z coordinate" msgstr "Coordinata X" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1205 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 msgid "Points At" msgstr "Punta a" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1207 msgid "Specular Exponent" msgstr "Esponente speculare" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1206 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1207 msgid "Exponent value controlling the focus for the light source" msgstr "Valore esponenziale per il controllo del fuoco della sorgente luminosa" #. TODO: here I have used 100 degrees as default value. But spec says that if not specified, no limiting cone is applied. So, there should be a way for the user to set a "no limiting cone" option. -#: ../src/ui/dialog/filter-effects-dialog.cpp:1208 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1209 msgid "Cone Angle" msgstr "Angolo del cono" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1208 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1209 msgid "" "This is the angle between the spot light axis (i.e. the axis between the " "light source and the point to which it is pointing at) and the spot light " @@ -15405,111 +16057,111 @@ msgstr "" "congiungente la sorgente luminosa e il punto illuminato) e il cono " "d'illuminazione. All'infuori di questo coso non verrà proiettata alcuna luce." -#: ../src/ui/dialog/filter-effects-dialog.cpp:1274 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1275 msgid "New light source" msgstr "Nuova sorgente d'illuminazione" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1325 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1326 msgid "_Duplicate" msgstr "_Duplica" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1359 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1360 msgid "_Filter" msgstr "_Filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1379 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1388 msgid "R_ename" msgstr "_Rinomina" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1512 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1522 msgid "Rename filter" msgstr "Rinomina filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1565 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1574 msgid "Apply filter" msgstr "Applica filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1635 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1654 msgid "filter" msgstr "filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1642 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1661 msgid "Add filter" msgstr "Aggiungi filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1711 msgid "Duplicate filter" msgstr "Duplica filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1793 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1810 msgid "_Effect" msgstr "_Effetti" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1803 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1820 msgid "Connections" msgstr "Connessione" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1941 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1958 msgid "Remove filter primitive" msgstr "Rimuovi primitiva filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2529 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 msgid "Remove merge node" msgstr "Rimuovi nodo unito" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2649 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2665 msgid "Reorder filter primitive" msgstr "Riordina primitiva filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2729 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 msgid "Add Effect:" msgstr "Aggiungi effetto:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2730 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 msgid "No effect selected" msgstr "Nessun effetto selezionato" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2731 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2747 msgid "No filter selected" msgstr "Nessun filtro selezionato" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2776 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2814 msgid "Effect parameters" msgstr "Parametri degli effetti" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2777 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2815 msgid "Filter General Settings" msgstr "Impostazioni generali filtri" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Coordinates:" msgstr "Coordinate:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "X coordinate of the left corners of filter effects region" msgstr "Coordinata X dell'angolo sinistro della regione affetta dal filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2835 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Y coordinate of the upper corners of filter effects region" msgstr "Coordinata Y dell'angolo superiore della regione affetta dal filtro" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Dimensions:" msgstr "Dimensioni:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Width of filter effects region" msgstr "Larghezza della regione affetta dal filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2836 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Height of filter effects region" msgstr "Altezza della regione affetta dal filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2842 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "" "Indicates the type of matrix operation. The keyword 'matrix' indicates that " "a full 5x4 matrix of values will be provided. The other keywords represent " @@ -15521,40 +16173,40 @@ msgstr "" "scorciatoie per operazioni sui colori usate frequentemente, che possono " "essere eseguite senza specificare l'intera matrice." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2843 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "Value(s):" msgstr "Valore:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2847 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 msgid "R:" msgstr "R:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2848 -#: ../src/widgets/sp-color-icc-selector.cpp:359 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 +#: ../src/ui/widget/color-icc-selector.cpp:180 msgid "G:" msgstr "G:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2849 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 msgid "B:" msgstr "B:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2890 msgid "A:" msgstr "A:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2853 #: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "Operator:" msgstr "Operatore:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 msgid "K1:" msgstr "K1:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "" "If the arithmetic operation is chosen, each result pixel is computed using " "the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " @@ -15564,38 +16216,38 @@ msgstr "" "della formula k1*i1*i2 + k2*i1 + k3*i2 + k4, in cui i1 e i2 sono i valori " "dei pixel rispettivamente del primo e del secondo input." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2855 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 msgid "K2:" msgstr "K2:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2856 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 msgid "K3:" msgstr "K3:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "K4:" msgstr "K4:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "Size:" msgstr "Dimensione:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "width of the convolve matrix" msgstr "larghezza della matrice di convoluzione" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2860 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "height of the convolve matrix" msgstr "altezza della matrice di convoluzione" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 #: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "Target:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" "X coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." @@ -15603,7 +16255,7 @@ msgstr "" "Coordinata X del punto affetto dalla matrice di convoluzione. La " "convoluzione viene applicata ai pixel attorno a questo punto." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2861 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" "Y coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." @@ -15612,11 +16264,11 @@ msgstr "" "convoluzione viene applicata ai pixel attorno a questo punto." #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 msgid "Kernel:" msgstr "Nucleo:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 msgid "" "This matrix describes the convolve operation that is applied to the input " "image in order to calculate the pixel colors at the output. Different " @@ -15632,11 +16284,11 @@ msgstr "" "(parallela alla diagonale della matrice), mentre una matrice di valori " "costanti non nulli risulta in un effetto di sfocatura normale." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "Divisor:" msgstr "Divisore:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "" "After applying the kernelMatrix to the input image to yield a number, that " "number is divided by divisor to yield the final destination color value. A " @@ -15648,11 +16300,11 @@ msgstr "" "finale. Un divisore che è la somma di tutti i valori della matrice tende ad " "avere un effetto scurente sull'intensità complessiva del colore risultante." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "Bias:" msgstr "Bias:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2866 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "" "This value is added to each component. This is useful to define a constant " "value as the zero response of the filter." @@ -15660,11 +16312,11 @@ msgstr "" "Questo valore verrà aggiunto ad ogni componente. Risulta utile per definire " "un valore costante per l'effetto nullo del filtro." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "Edge Mode:" msgstr "Modalità spigolo:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2867 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "" "Determines how to extend the input image as necessary with color values so " "that the matrix operations can be applied when the kernel is positioned at " @@ -15674,31 +16326,31 @@ msgstr "" "colore affinché la matrice di operazione possa essere applicata quando il " "kernel è posizionata in corrispondenza o vicino al bordo dell'immagine." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "Preserve Alpha" msgstr "Preserva Alpha" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "Se attivo, il canale alpha non verrà alterato da questo filtro." #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 msgid "Diffuse Color:" msgstr "Colore diffuso:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2904 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2944 msgid "Defines the color of the light source" msgstr "Determina il colore della sorgente luminosa" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 msgid "Surface Scale:" msgstr "Ridimensiona superficie:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" @@ -15706,63 +16358,63 @@ msgstr "" "Questo valore amplifica l'altezza della mappa a sbalzo definita dal canale " "alpha" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "Constant:" msgstr "Costante:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2873 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "This constant affects the Phong lighting model." msgstr "Questa costante regola il modello di illuminazione di Phong." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2874 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2914 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2948 msgid "Kernel Unit Length:" msgstr "Unità lunghezza nucleo:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 msgid "This defines the intensity of the displacement effect." msgstr "Questa l'intensità dell'effetto di spostamento." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "X displacement:" msgstr "Spostamento X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Color component that controls the displacement in the X direction" msgstr "" "Componente del colore che controlla la direzione dello spostamento lungo la " "direzione X" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Y displacement:" msgstr "Spostamento Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Color component that controls the displacement in the Y direction" msgstr "" "Componente del colore che controlla la direzione dello spostamento lungo la " "direzione Y" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "Flood Color:" msgstr "Colore uniforme:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "The whole filter region will be filled with this color." msgstr "L'intera regione verrà riempita con questo colore." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "Standard Deviation:" msgstr "Deviazione standard:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "The standard deviation for the blur operation." msgstr "La deviazione standard per l'operazione di sfocatura." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." @@ -15770,43 +16422,43 @@ msgstr "" "Erodi: rende l'immagine più piccola.\n" "Dilata: rende l'immagine più grossa." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2937 msgid "Source of Image:" msgstr "Sorgente per l'immagine:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "Delta X:" msgstr "Delta X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "This is how far the input image gets shifted to the right" msgstr "Determina lo spostamento a destra dell'immagine" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2941 msgid "Delta Y:" msgstr "Delta Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2941 msgid "This is how far the input image gets shifted downwards" msgstr "Determina lo spostamento in basso dell'immagine" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2904 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2944 msgid "Specular Color:" msgstr "Colore speculare:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 #: ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "Esponente:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "" "Esponente per il termini speculare, valori maggiori rendono più \"brillante" "\"." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." @@ -15814,27 +16466,27 @@ msgstr "" "Indica se la primitiva del filtro fornirà una funzione di rumore o " "turbolenza." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2917 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2957 msgid "Base Frequency:" msgstr "Frequenza base:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2958 msgid "Octaves:" msgstr "Ottave:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2959 msgid "Seed:" msgstr "Seme:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2959 msgid "The starting number for the pseudo random number generator." msgstr "Il seme iniziale per il generatore di numeri pseudo-casuali." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 msgid "Add filter primitive" msgstr "Aggiungi primitiva filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2948 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2986 msgid "" "The feBlend filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." @@ -15842,7 +16494,7 @@ msgstr "" "Il filtro feBlend fornisce 4 modalità per miscelare immagini: " "scherma, moltiplica, scurisci e illumina." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2952 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2990 msgid "" "The feColorMatrix filter primitive applies a matrix transformation to " "color of each rendered pixel. This allows for effects like turning object to " @@ -15852,7 +16504,7 @@ msgstr "" "colore di ogni pixel. Questo permette di creare effetti per trasformare " "oggetti in scala di grigi, cambiare la saturazione o la tonalità del colore." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2994 msgid "" "The feComponentTransfer filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " @@ -15864,7 +16516,7 @@ msgstr "" "di cambiamento, permettendo operazioni di correzione luminosità o contrasto, " "bilanciamento o soglia del colore." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2960 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2998 msgid "" "The feComposite filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -15876,7 +16528,7 @@ msgstr "" "L'algoritmo Porter-Duff essenzialmente compie delle operazioni logiche sui " "singoli pixel delle immagini." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2964 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3002 msgid "" "The feConvolveMatrix lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -15890,7 +16542,7 @@ msgstr "" "possa creare una sfocatura gaussiana anche con questo filtro, il filtro " "gaussiano dedicato è più veloce e indipendente dalla risoluzione." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2968 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3006 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -15902,7 +16554,7 @@ msgstr "" "alpha: aree a maggiore opacità sono poste in rilievo verso l'osservatore, " "mentre aree con opacità minore vengono allontanate." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2972 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3010 msgid "" "The feDisplacementMap filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -15914,7 +16566,7 @@ msgstr "" "essere presi i pixel. Esempi classici del filtro sono effetti a spirale e " "pinzature." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2976 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3014 msgid "" "The feFlood filter primitive fills the region with a given color and " "opacity. It is usually used as an input to other filters to apply color to " @@ -15924,7 +16576,7 @@ msgstr "" "Solitamente viene usato come input di altri filtri per applicare del colore " "ad un'immagine." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2980 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3018 msgid "" "The feGaussianBlur filter primitive uniformly blurs its input. It is " "commonly used together with feOffset to create a drop shadow effect." @@ -15933,7 +16585,7 @@ msgstr "" "input. È solitamente usato in accoppiata col filtro feOffset per creare " "semplici ombreggiature." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2984 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3022 msgid "" "The feImage filter primitive fills the region with an external image " "or another part of the document." @@ -15941,7 +16593,7 @@ msgstr "" "Il filtro feImage riempie una regione con un'immagine esterna o " "un'altra parte del documento." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2988 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3026 msgid "" "The feMerge filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -15953,7 +16605,7 @@ msgstr "" "Questo è equivalente all'uso di vari filtri feBlend in modalità 'normale', o " "vari feComposite in modalità 'sovrapposizione'." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2992 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3030 msgid "" "The feMorphology filter primitive provides erode and dilate effects. " "For single-color objects erode makes the object thinner and dilate makes it " @@ -15963,7 +16615,7 @@ msgstr "" "erosione. Per oggetti monocromatici, la dilatazione li rende più larghi " "mentre l'erosione più sottili." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2996 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3034 msgid "" "The feOffset filter primitive offsets the image by an user-defined " "amount. For example, this is useful for drop shadows, where the shadow is in " @@ -15973,7 +16625,7 @@ msgstr "" "dall'utente. È utile per creare le ombre, che risultano sfalsate rispetto " "agli oggetti che le proiettano." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3000 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3038 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives " "create \"embossed\" shadings. The input's alpha channel is used to provide " @@ -15985,12 +16637,16 @@ msgstr "" "canale alpha: aree a maggiore opacità sono poste in rilievo verso " "l'osservatore, mentre aree con opacità minore vengono allontanate." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3004 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 +#, fuzzy msgid "" -"The feTile filter primitive tiles a region with its input graphic" -msgstr "Il filtro feTile pittura una regione con la grafica in input" +"The feTile filter primitive tiles a region with an input graphic. The " +"source tile is defined by the filter primitive subregion of the input." +msgstr "" +"Il filtro feImage riempie una regione con un'immagine esterna o " +"un'altra parte del documento." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3008 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3046 msgid "" "The feTurbulence filter primitive renders Perlin noise. This kind of " "noise is useful in simulating several nature phenomena like clouds, fire and " @@ -16000,11 +16656,11 @@ msgstr "" "rumore può essere utile per simulare vari fenomeni atmosferici (quali " "nuvole, fuoco e fumo) e per generare trame complesse (come marmo e granito)." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3027 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3066 msgid "Duplicate filter primitive" msgstr "Duplica primitiva filtro" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3080 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3119 msgid "Set filter primitive attribute" msgstr "Imposta l'attributo primitiva del filtro" @@ -16190,7 +16846,7 @@ msgstr "Spirali" msgid "Search spirals" msgstr "Cerca spirali" -#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1736 +#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1796 msgid "Paths" msgstr "Tracciati" @@ -16226,6 +16882,7 @@ msgstr "Cerca cloni" #: ../src/ui/dialog/find.cpp:110 ../share/extensions/embedimage.inx.h:3 #: ../share/extensions/extractimage.inx.h:5 +#: ../share/extensions/image_attributes.inx.h:29 msgid "Images" msgstr "Immagini" @@ -16261,12 +16918,12 @@ msgstr "_Sostituisci tutti" msgid "Replace all matches" msgstr "Sostituisci tutte le occorrenze" -#: ../src/ui/dialog/find.cpp:776 +#: ../src/ui/dialog/find.cpp:801 msgid "Nothing to replace" msgstr "Niente da sostituire" #. TRANSLATORS: "%s" is replaced with "exact" or "partial" when this string is displayed -#: ../src/ui/dialog/find.cpp:817 +#: ../src/ui/dialog/find.cpp:842 #, c-format msgid "%d object found (out of %d), %s match." msgid_plural "%d objects found (out of %d), %s match." @@ -16275,49 +16932,49 @@ msgstr[0] "" msgstr[1] "" "%d oggetti trovati (su un totale di %d), corrispondenza %s." -#: ../src/ui/dialog/find.cpp:820 +#: ../src/ui/dialog/find.cpp:845 msgid "exact" msgstr "esatta" -#: ../src/ui/dialog/find.cpp:820 +#: ../src/ui/dialog/find.cpp:845 msgid "partial" msgstr "parziale" #. TRANSLATORS: "%1" is replaced with the number of matches -#: ../src/ui/dialog/find.cpp:823 +#: ../src/ui/dialog/find.cpp:848 msgid "%1 match replaced" msgid_plural "%1 matches replaced" msgstr[0] "%1 occorrenza sostituita" msgstr[1] "%1 occorrenze sostituite" #. TRANSLATORS: "%1" is replaced with the number of matches -#: ../src/ui/dialog/find.cpp:827 +#: ../src/ui/dialog/find.cpp:852 msgid "%1 object found" msgid_plural "%1 objects found" msgstr[0] "%1 oggetto trovato" msgstr[1] "%1 oggetti trovati" -#: ../src/ui/dialog/find.cpp:838 +#: ../src/ui/dialog/find.cpp:866 msgid "Replace text or property" msgstr "Sostituisci testo o proprietà" -#: ../src/ui/dialog/find.cpp:842 +#: ../src/ui/dialog/find.cpp:870 msgid "Nothing found" msgstr "Nessuno trovato" -#: ../src/ui/dialog/find.cpp:847 +#: ../src/ui/dialog/find.cpp:875 msgid "No objects found" msgstr "Nessun oggetto trovato" -#: ../src/ui/dialog/find.cpp:868 +#: ../src/ui/dialog/find.cpp:896 msgid "Select an object type" msgstr "Seleziona un tipo di oggetto" -#: ../src/ui/dialog/find.cpp:886 +#: ../src/ui/dialog/find.cpp:914 msgid "Select a property" msgstr "Seleziona una proprietà" -#: ../src/ui/dialog/font-substitution.cpp:87 +#: ../src/ui/dialog/font-substitution.cpp:79 msgid "" "\n" "Some fonts are not available and have been substituted." @@ -16325,19 +16982,19 @@ msgstr "" "\n" "Alcuni caratteri non sono disponibili e sono stati sostituiti." -#: ../src/ui/dialog/font-substitution.cpp:90 +#: ../src/ui/dialog/font-substitution.cpp:82 msgid "Font substitution" msgstr "Sostituzione carattere" -#: ../src/ui/dialog/font-substitution.cpp:109 +#: ../src/ui/dialog/font-substitution.cpp:101 msgid "Select all the affected items" msgstr "Seleziona tutti gli oggetti affetti" -#: ../src/ui/dialog/font-substitution.cpp:114 +#: ../src/ui/dialog/font-substitution.cpp:106 msgid "Don't show this warning again" msgstr "Non mostrare questo avviso nuovamente" -#: ../src/ui/dialog/font-substitution.cpp:255 +#: ../src/ui/dialog/font-substitution.cpp:245 msgid "Font '%1' substituted with '%2'" msgstr "Il carattere '%1' è stato sostituito con '%2'" @@ -17066,151 +17723,161 @@ msgstr "Insieme: " msgid "Append" msgstr "Aggiungi" -#: ../src/ui/dialog/glyphs.cpp:618 +#: ../src/ui/dialog/glyphs.cpp:619 msgid "Append text" msgstr "Aggiungi testo" -#: ../src/ui/dialog/grid-arrange-tab.cpp:351 +#: ../src/ui/dialog/grid-arrange-tab.cpp:345 msgid "Arrange in a grid" msgstr "Disponi su griglia" -#: ../src/ui/dialog/grid-arrange-tab.cpp:589 +#: ../src/ui/dialog/grid-arrange-tab.cpp:571 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/widgets/desktop-widget.cpp:666 ../src/widgets/node-toolbar.cpp:581 +#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:702 +#: ../src/widgets/node-toolbar.cpp:581 msgid "X:" msgstr "X:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:589 +#: ../src/ui/dialog/grid-arrange-tab.cpp:571 msgid "Horizontal spacing between columns." msgstr "Spaziatura orizzontale tra le colonne." -#: ../src/ui/dialog/grid-arrange-tab.cpp:590 +#: ../src/ui/dialog/grid-arrange-tab.cpp:572 #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:76 -#: ../src/widgets/desktop-widget.cpp:676 ../src/widgets/node-toolbar.cpp:599 +#: ../src/ui/widget/page-sizer.cpp:248 ../src/widgets/desktop-widget.cpp:703 +#: ../src/widgets/node-toolbar.cpp:599 msgid "Y:" msgstr "Y:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:590 +#: ../src/ui/dialog/grid-arrange-tab.cpp:572 msgid "Vertical spacing between rows." msgstr "Spaziatura verticale tra le righe." -#: ../src/ui/dialog/grid-arrange-tab.cpp:637 +#: ../src/ui/dialog/grid-arrange-tab.cpp:618 msgid "_Rows:" msgstr "_Righe:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:646 +#: ../src/ui/dialog/grid-arrange-tab.cpp:627 msgid "Number of rows" msgstr "Numero di righe" -#: ../src/ui/dialog/grid-arrange-tab.cpp:650 +#: ../src/ui/dialog/grid-arrange-tab.cpp:631 msgid "Equal _height" msgstr "_Altezza uguale" -#: ../src/ui/dialog/grid-arrange-tab.cpp:661 +#: ../src/ui/dialog/grid-arrange-tab.cpp:642 msgid "If not set, each row has the height of the tallest object in it" msgstr "Se non impostata, ogni riga ha l'altezza del suo oggetto più alto" #. #### Number of columns #### -#: ../src/ui/dialog/grid-arrange-tab.cpp:677 +#: ../src/ui/dialog/grid-arrange-tab.cpp:658 msgid "_Columns:" msgstr "_Colonne:" -#: ../src/ui/dialog/grid-arrange-tab.cpp:686 +#: ../src/ui/dialog/grid-arrange-tab.cpp:667 msgid "Number of columns" msgstr "Numero di colonne" -#: ../src/ui/dialog/grid-arrange-tab.cpp:690 +#: ../src/ui/dialog/grid-arrange-tab.cpp:671 msgid "Equal _width" msgstr "_Larghezza uguale" -#: ../src/ui/dialog/grid-arrange-tab.cpp:700 +#: ../src/ui/dialog/grid-arrange-tab.cpp:681 msgid "If not set, each column has the width of the widest object in it" msgstr "" "Se non impostata, ogni colonna ha la larghezza del suo oggetto più largo" #. Anchor selection widget -#: ../src/ui/dialog/grid-arrange-tab.cpp:711 +#: ../src/ui/dialog/grid-arrange-tab.cpp:692 msgid "Alignment:" msgstr "Allineamento:" #. #### Radio buttons to control spacing manually or to fit selection bbox #### -#: ../src/ui/dialog/grid-arrange-tab.cpp:720 +#: ../src/ui/dialog/grid-arrange-tab.cpp:701 msgid "_Fit into selection box" msgstr "_Adatta al riquadro della selezione" -#: ../src/ui/dialog/grid-arrange-tab.cpp:727 +#: ../src/ui/dialog/grid-arrange-tab.cpp:708 msgid "_Set spacing:" msgstr "Imposta _spaziatura:" #: ../src/ui/dialog/guides.cpp:47 +msgid "Lo_cked" +msgstr "_Bloccata" + +#: ../src/ui/dialog/guides.cpp:47 +msgid "Lock the movement of guides" +msgstr "" + +#: ../src/ui/dialog/guides.cpp:48 msgid "Rela_tive change" msgstr "Cambiamento rela_tivo" -#: ../src/ui/dialog/guides.cpp:47 +#: ../src/ui/dialog/guides.cpp:48 msgid "Move and/or rotate the guide relative to current settings" msgstr "Sposta o ruota la guida in maniera relativa alle impostazioni attuali" -#: ../src/ui/dialog/guides.cpp:48 +#: ../src/ui/dialog/guides.cpp:49 msgctxt "Guides" msgid "_X:" msgstr "_X:" -#: ../src/ui/dialog/guides.cpp:49 +#: ../src/ui/dialog/guides.cpp:50 msgctxt "Guides" msgid "_Y:" msgstr "_Y:" -#: ../src/ui/dialog/guides.cpp:50 ../src/ui/dialog/object-properties.cpp:59 +#: ../src/ui/dialog/guides.cpp:51 ../src/ui/dialog/object-properties.cpp:59 msgid "_Label:" msgstr "Etichet_ta:" -#: ../src/ui/dialog/guides.cpp:50 +#: ../src/ui/dialog/guides.cpp:51 msgid "Optionally give this guideline a name" msgstr "Assegna un nome a questa guida" -#: ../src/ui/dialog/guides.cpp:51 +#: ../src/ui/dialog/guides.cpp:52 msgid "_Angle:" msgstr "_Angolo:" -#: ../src/ui/dialog/guides.cpp:130 +#: ../src/ui/dialog/guides.cpp:139 msgid "Set guide properties" msgstr "Imposta proprietà della guida" -#: ../src/ui/dialog/guides.cpp:160 +#: ../src/ui/dialog/guides.cpp:169 msgid "Guideline" msgstr "Linea guida" -#: ../src/ui/dialog/guides.cpp:310 +#: ../src/ui/dialog/guides.cpp:336 #, c-format msgid "Guideline ID: %s" msgstr "ID linea guida: %s" -#: ../src/ui/dialog/guides.cpp:316 +#: ../src/ui/dialog/guides.cpp:342 #, c-format msgid "Current: %s" msgstr "Attuale: %s" -#: ../src/ui/dialog/icon-preview.cpp:159 +#: ../src/ui/dialog/icon-preview.cpp:155 #, c-format msgid "%d x %d" msgstr "%d × %d" -#: ../src/ui/dialog/icon-preview.cpp:171 +#: ../src/ui/dialog/icon-preview.cpp:167 msgid "Magnified:" msgstr "Ingrandita:" -#: ../src/ui/dialog/icon-preview.cpp:240 +#: ../src/ui/dialog/icon-preview.cpp:236 msgid "Actual Size:" msgstr "Dimensione effettiva:" -#: ../src/ui/dialog/icon-preview.cpp:245 +#: ../src/ui/dialog/icon-preview.cpp:241 msgctxt "Icon preview window" msgid "Sele_ction" msgstr "Sele_zione" -#: ../src/ui/dialog/icon-preview.cpp:247 +#: ../src/ui/dialog/icon-preview.cpp:243 msgid "Selection only or whole document" msgstr "Solo la selezione o l'intero documento" @@ -17261,11 +17928,24 @@ msgstr "" "Dimensione dei punti creati con Ctrl+clic (relativi alla larghezza del " "contorno attuale)" -#: ../src/ui/dialog/inkscape-preferences.cpp:220 +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +#, fuzzy +msgid "Base simplify:" +msgstr "Semplifica" + +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "on dinamic LPE simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:214 +msgid "Base simplify of dinamic LPE based simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." msgstr "Nessun elemento selezionato da cui prendere lo stile." -#: ../src/ui/dialog/inkscape-preferences.cpp:229 +#: ../src/ui/dialog/inkscape-preferences.cpp:238 msgid "" "More than one object selected. Cannot take style from multiple " "objects." @@ -17273,23 +17953,23 @@ msgstr "" "Più di un elemento selezionato. Impossibile prendere lo stile da più " "oggetti." -#: ../src/ui/dialog/inkscape-preferences.cpp:262 +#: ../src/ui/dialog/inkscape-preferences.cpp:274 msgid "Style of new objects" msgstr "Stile dei nuovi oggetti" -#: ../src/ui/dialog/inkscape-preferences.cpp:264 +#: ../src/ui/dialog/inkscape-preferences.cpp:276 msgid "Last used style" msgstr "Ultimo stile usato" -#: ../src/ui/dialog/inkscape-preferences.cpp:266 +#: ../src/ui/dialog/inkscape-preferences.cpp:278 msgid "Apply the style you last set on an object" msgstr "Applica l'ultimo stile applicato ad un oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:271 +#: ../src/ui/dialog/inkscape-preferences.cpp:283 msgid "This tool's own style:" msgstr "Stile di questo strumento:" -#: ../src/ui/dialog/inkscape-preferences.cpp:275 +#: ../src/ui/dialog/inkscape-preferences.cpp:287 msgid "" "Each tool may store its own style to apply to the newly created objects. Use " "the button below to set it." @@ -17298,55 +17978,55 @@ msgstr "" "saranno creati. Usa il bottone sotto per impostarlo." #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:279 +#: ../src/ui/dialog/inkscape-preferences.cpp:291 msgid "Take from selection" msgstr "Prendi dalla selezione" -#: ../src/ui/dialog/inkscape-preferences.cpp:288 +#: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This tool's style of new objects" msgstr "Lo stile di questo strumento per i nuovi oggetti" -#: ../src/ui/dialog/inkscape-preferences.cpp:295 +#: ../src/ui/dialog/inkscape-preferences.cpp:307 msgid "Remember the style of the (first) selected object as this tool's style" msgstr "" "Imposta lo stile del (primo) elemento selezionato come stile di questo " "strumento" -#: ../src/ui/dialog/inkscape-preferences.cpp:300 +#: ../src/ui/dialog/inkscape-preferences.cpp:312 msgid "Tools" msgstr "Strumenti" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Bounding box to use" msgstr "Riquadro da usare" -#: ../src/ui/dialog/inkscape-preferences.cpp:304 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Visual bounding box" msgstr "Riquadro visivo" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 +#: ../src/ui/dialog/inkscape-preferences.cpp:318 msgid "This bounding box includes stroke width, markers, filter margins, etc." msgstr "" "Questo riquadro include la larghezza dei contorni, i delimitatori, i margini " "dei filtri, ecc." -#: ../src/ui/dialog/inkscape-preferences.cpp:307 +#: ../src/ui/dialog/inkscape-preferences.cpp:319 msgid "Geometric bounding box" msgstr "Riquadro geometrico" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:321 msgid "This bounding box includes only the bare path" msgstr "Questo riquadro include solo il tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:311 +#: ../src/ui/dialog/inkscape-preferences.cpp:323 msgid "Conversion to guides" msgstr "Conversione in guide" -#: ../src/ui/dialog/inkscape-preferences.cpp:312 +#: ../src/ui/dialog/inkscape-preferences.cpp:324 msgid "Keep objects after conversion to guides" msgstr "Mantieni oggetti dopo averli convertiti in guide" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 +#: ../src/ui/dialog/inkscape-preferences.cpp:326 msgid "" "When converting an object to guides, don't delete the object after the " "conversion" @@ -17354,11 +18034,11 @@ msgstr "" "Nella conversione di un oggetto in guide, non cancellare l'oggetto dopo la " "conversione" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 +#: ../src/ui/dialog/inkscape-preferences.cpp:327 msgid "Treat groups as a single object" msgstr "Tratta gruppi come un singolo oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:317 +#: ../src/ui/dialog/inkscape-preferences.cpp:329 msgid "" "Treat groups as a single object during conversion to guides rather than " "converting each child separately" @@ -17366,110 +18046,110 @@ msgstr "" "Tratta i gruppi come un singolo oggetto durante la conversione in guide " "piuttosto che convertire ogni componente separatamente" -#: ../src/ui/dialog/inkscape-preferences.cpp:319 +#: ../src/ui/dialog/inkscape-preferences.cpp:331 msgid "Average all sketches" msgstr "Media tutti i disegni a mano libera" -#: ../src/ui/dialog/inkscape-preferences.cpp:320 +#: ../src/ui/dialog/inkscape-preferences.cpp:332 msgid "Width is in absolute units" msgstr "La larghezza è in unità assolute" -#: ../src/ui/dialog/inkscape-preferences.cpp:321 +#: ../src/ui/dialog/inkscape-preferences.cpp:333 msgid "Select new path" msgstr "Seleziona nuovo tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:322 +#: ../src/ui/dialog/inkscape-preferences.cpp:334 msgid "Don't attach connectors to text objects" msgstr "Non attaccare i connettori agli oggetti testuali" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:337 msgid "Selector" msgstr "Selettore" -#: ../src/ui/dialog/inkscape-preferences.cpp:330 +#: ../src/ui/dialog/inkscape-preferences.cpp:342 msgid "When transforming, show" msgstr "Durante la trasformazione, mostra" -#: ../src/ui/dialog/inkscape-preferences.cpp:331 +#: ../src/ui/dialog/inkscape-preferences.cpp:343 msgid "Objects" msgstr "Oggetti" -#: ../src/ui/dialog/inkscape-preferences.cpp:333 +#: ../src/ui/dialog/inkscape-preferences.cpp:345 msgid "Show the actual objects when moving or transforming" msgstr "Mostra l'oggetto attuale durante il movimento o la trasformazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 +#: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Box outline" msgstr "Riquadro" -#: ../src/ui/dialog/inkscape-preferences.cpp:336 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Show only a box outline of the objects when moving or transforming" msgstr "" "Mostra solo il riquadro dell'oggetto durante il movimento o la trasformazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:337 +#: ../src/ui/dialog/inkscape-preferences.cpp:349 msgid "Per-object selection cue" msgstr "Suggerimento di selezione ad oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:338 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgctxt "Selection cue" msgid "None" msgstr "Nessuno" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "No per-object selection indication" msgstr "Nessuna indicazione di selezione ad oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:341 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 msgid "Mark" msgstr "Segno" -#: ../src/ui/dialog/inkscape-preferences.cpp:343 +#: ../src/ui/dialog/inkscape-preferences.cpp:355 msgid "Each selected object has a diamond mark in the top left corner" msgstr "" "Ogni oggetto selezionato ha un segno a forma di diamante nell'angolo " "superiore sinistro" -#: ../src/ui/dialog/inkscape-preferences.cpp:344 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "Box" msgstr "Riquadro" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "Each selected object displays its bounding box" msgstr "Ogni oggetto selezionato mostra il proprio riquadro" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:361 msgid "Node" msgstr "Nodo" -#: ../src/ui/dialog/inkscape-preferences.cpp:352 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Path outline" msgstr "Scheletro tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:353 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Path outline color" msgstr "Colore scheletro tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:354 +#: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "Selects the color used for showing the path outline" msgstr "Seleziona il colore da usare per mostrare lo scheletro del tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:355 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 msgid "Always show outline" msgstr "Mostra sempre scheletro" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:368 msgid "Show outlines for all paths, not only invisible paths" msgstr "" "Mostra lo scheletro per tutti i tracciati, non solo tracciati invisibili" -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "Update outline when dragging nodes" msgstr "Aggiorna scheletro durante il trascinamento dei nodi" -#: ../src/ui/dialog/inkscape-preferences.cpp:358 +#: ../src/ui/dialog/inkscape-preferences.cpp:370 msgid "" "Update the outline when dragging or transforming nodes; if this is off, the " "outline will only update when completing a drag" @@ -17477,11 +18157,11 @@ msgstr "" "Aggiorna lo scheletro durante il trascinamento o la trasformazione dei nodi; " "se disabilitato, lo scheletro sarà aggiornato al completamento" -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "Update paths when dragging nodes" msgstr "Aggiorna tracciati durante il trascinamento dei nodi" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 +#: ../src/ui/dialog/inkscape-preferences.cpp:372 msgid "" "Update paths when dragging or transforming nodes; if this is off, paths will " "only be updated when completing a drag" @@ -17489,11 +18169,11 @@ msgstr "" "Aggiorna tracciati durante il trascinamento o la trasformazione dei nodi; se " "disabilitato, i tracciati saranno aggiornati al completamento" -#: ../src/ui/dialog/inkscape-preferences.cpp:361 +#: ../src/ui/dialog/inkscape-preferences.cpp:373 msgid "Show path direction on outlines" msgstr "Mostra direzione tracciato sullo scheletro" -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/inkscape-preferences.cpp:374 msgid "" "Visualize the direction of selected paths by drawing small arrows in the " "middle of each outline segment" @@ -17501,30 +18181,30 @@ msgstr "" "Visualizza la direzione del tracciato selezionato disegnando delle piccole " "frecce a metà di ogni segmento dello scheletro" -#: ../src/ui/dialog/inkscape-preferences.cpp:363 +#: ../src/ui/dialog/inkscape-preferences.cpp:375 msgid "Show temporary path outline" msgstr "Mostra scheletro tracciato temporaneo" -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:376 msgid "When hovering over a path, briefly flash its outline" msgstr "" "Al passaggio del mouse sul tracciato, ne evidenzia brevemente lo scheletro" -#: ../src/ui/dialog/inkscape-preferences.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:377 msgid "Show temporary outline for selected paths" msgstr "Mostra scheletro temporaneo dei tracciati selezionati" -#: ../src/ui/dialog/inkscape-preferences.cpp:366 +#: ../src/ui/dialog/inkscape-preferences.cpp:378 msgid "Show temporary outline even when a path is selected for editing" msgstr "" "Mostra lo scheletro temporaneo anche quando un tracciato è selezionato per " "la modifica" -#: ../src/ui/dialog/inkscape-preferences.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "_Flash time:" msgstr "Tempo di _evidenziazione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "" "Specifies how long the path outline will be visible after a mouse-over (in " "milliseconds); specify 0 to have the outline shown until mouse leaves the " @@ -17534,24 +18214,24 @@ msgstr "" "passaggio del mouse (in millisecondi). Specificando 0 lo scheletro resterà " "visibile finché il mouse è sopra il tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:369 +#: ../src/ui/dialog/inkscape-preferences.cpp:381 msgid "Editing preferences" msgstr "Preferenze modifica" -#: ../src/ui/dialog/inkscape-preferences.cpp:370 +#: ../src/ui/dialog/inkscape-preferences.cpp:382 msgid "Show transform handles for single nodes" msgstr "Mostra maniglie di trasformazione per nodi singoli" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:383 msgid "Show transform handles even when only a single node is selected" msgstr "" "Mostra le maniglie di trasformazione anche quando un solo nodo è selezionato" -#: ../src/ui/dialog/inkscape-preferences.cpp:372 +#: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "Deleting nodes preserves shape" msgstr "Elimina nodi preservando la forma" -#: ../src/ui/dialog/inkscape-preferences.cpp:373 +#: ../src/ui/dialog/inkscape-preferences.cpp:385 msgid "" "Move handles next to deleted nodes to resemble original shape; hold Ctrl to " "get the other behavior" @@ -17560,31 +18240,31 @@ msgstr "" "forma originale; premi Ctrl per ottenere il comportamento opposto" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:376 +#: ../src/ui/dialog/inkscape-preferences.cpp:388 msgid "Tweak" msgstr "Ritocco" -#: ../src/ui/dialog/inkscape-preferences.cpp:377 +#: ../src/ui/dialog/inkscape-preferences.cpp:389 msgid "Object paint style" msgstr "Stile tinta oggetto" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:382 -#: ../src/widgets/desktop-widget.cpp:631 +#: ../src/ui/dialog/inkscape-preferences.cpp:394 +#: ../src/widgets/desktop-widget.cpp:667 msgid "Zoom" msgstr "Ingranditore" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:387 ../src/verbs.cpp:2678 +#: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2763 msgctxt "ContextVerb" msgid "Measure" msgstr "Misura" -#: ../src/ui/dialog/inkscape-preferences.cpp:389 +#: ../src/ui/dialog/inkscape-preferences.cpp:401 msgid "Ignore first and last points" msgstr "Ignora primo e ultimo punto" -#: ../src/ui/dialog/inkscape-preferences.cpp:390 +#: ../src/ui/dialog/inkscape-preferences.cpp:402 msgid "" "The start and end of the measurement tool's control line will not be " "considered for calculating lengths. Only lengths between actual curve " @@ -17594,15 +18274,15 @@ msgstr "" "calcolare lunghezze. Solo le lunghezze di intersezione saranno mostrate." #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:393 +#: ../src/ui/dialog/inkscape-preferences.cpp:405 msgid "Shapes" msgstr "Forme" -#: ../src/ui/dialog/inkscape-preferences.cpp:425 +#: ../src/ui/dialog/inkscape-preferences.cpp:438 msgid "Sketch mode" msgstr "Modalità bozzetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:427 +#: ../src/ui/dialog/inkscape-preferences.cpp:440 msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" @@ -17611,17 +18291,17 @@ msgstr "" "invece di fare la media tra il vecchio risultato e l'ultimo disegnato" #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:430 +#: ../src/ui/dialog/inkscape-preferences.cpp:443 #: ../src/ui/dialog/input.cpp:1485 msgid "Pen" msgstr "Penna" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:436 +#: ../src/ui/dialog/inkscape-preferences.cpp:449 msgid "Calligraphy" msgstr "Pennino" -#: ../src/ui/dialog/inkscape-preferences.cpp:440 +#: ../src/ui/dialog/inkscape-preferences.cpp:453 msgid "" "If on, pen width is in absolute units (px) independent of zoom; otherwise " "pen width depends on zoom so that it looks the same at any zoom" @@ -17630,7 +18310,7 @@ msgstr "" "indipendentemente dallo zoom; altrimenti la larghezza dipende dalla zoom, " "ossia sembrerà uguale a qualsiasi ingrandimento" -#: ../src/ui/dialog/inkscape-preferences.cpp:442 +#: ../src/ui/dialog/inkscape-preferences.cpp:455 msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" @@ -17639,27 +18319,27 @@ msgstr "" "la selezione precedente)" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:445 ../src/verbs.cpp:2670 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2755 msgctxt "ContextVerb" msgid "Text" msgstr "Testo" -#: ../src/ui/dialog/inkscape-preferences.cpp:450 +#: ../src/ui/dialog/inkscape-preferences.cpp:463 msgid "Show font samples in the drop-down list" msgstr "Mostra esempi di caratteri nella lista a discesa" -#: ../src/ui/dialog/inkscape-preferences.cpp:451 +#: ../src/ui/dialog/inkscape-preferences.cpp:464 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "" "Mostra gli esempi dei caratteri a fianco dei relativi nomi nella lista a " "discesa nella barra di testo" -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Show font substitution warning dialog" msgstr "Mostra finestra di avviso sostituzione carattere" -#: ../src/ui/dialog/inkscape-preferences.cpp:454 +#: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" @@ -17667,77 +18347,77 @@ msgstr "" "Mostra la finestra di avviso sostituzione carattere quando i caratteri " "richiesti non sono disponibili nel sistema" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pixel" msgstr "Pixel" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pica" msgstr "Pica" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Millimeter" msgstr "Millimetro" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Centimeter" msgstr "Centimetro" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Inch" msgstr "Pollice" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Em square" msgstr "Riquadro Em" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:473 msgid "Text units" msgstr "Unità testo" -#: ../src/ui/dialog/inkscape-preferences.cpp:462 +#: ../src/ui/dialog/inkscape-preferences.cpp:475 msgid "Text size unit type:" msgstr "Unità dimensione testo:" -#: ../src/ui/dialog/inkscape-preferences.cpp:463 +#: ../src/ui/dialog/inkscape-preferences.cpp:476 msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" "Imposta l'unità usata nella barra degli strumenti di testo e nelle finestre " "di testo" -#: ../src/ui/dialog/inkscape-preferences.cpp:464 +#: ../src/ui/dialog/inkscape-preferences.cpp:477 msgid "Always output text size in pixels (px)" msgstr "Output dimensione testo sempre in pixel (px)" #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:470 +#: ../src/ui/dialog/inkscape-preferences.cpp:483 msgid "Spray" msgstr "Spray" #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:475 +#: ../src/ui/dialog/inkscape-preferences.cpp:488 msgid "Eraser" msgstr "Gomma" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:479 +#: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "Paint Bucket" msgstr "Secchiello" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:484 -#: ../src/widgets/gradient-selector.cpp:152 -#: ../src/widgets/gradient-selector.cpp:320 +#: ../src/ui/dialog/inkscape-preferences.cpp:499 +#: ../src/widgets/gradient-selector.cpp:144 +#: ../src/widgets/gradient-selector.cpp:295 msgid "Gradient" msgstr "Gradiente" -#: ../src/ui/dialog/inkscape-preferences.cpp:486 +#: ../src/ui/dialog/inkscape-preferences.cpp:501 msgid "Prevent sharing of gradient definitions" msgstr "Disabilita condivisione definizioni di gradiente" -#: ../src/ui/dialog/inkscape-preferences.cpp:488 +#: ../src/ui/dialog/inkscape-preferences.cpp:503 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " @@ -17748,11 +18428,11 @@ msgstr "" "definizioni di gradiente, affinché la modifica di un oggetto condizioni gli " "altri oggetti che usano lo stesso gradiente" -#: ../src/ui/dialog/inkscape-preferences.cpp:489 +#: ../src/ui/dialog/inkscape-preferences.cpp:504 msgid "Use legacy Gradient Editor" msgstr "Usa vecchio Editor di gradiente" -#: ../src/ui/dialog/inkscape-preferences.cpp:491 +#: ../src/ui/dialog/inkscape-preferences.cpp:506 msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" @@ -17761,11 +18441,11 @@ msgstr "" "mostrerà il vecchio Editor di gradiente. Quando disattivo verrà usato lo " "Strumento gradiente" -#: ../src/ui/dialog/inkscape-preferences.cpp:494 +#: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Linear gradient _angle:" msgstr "_Angolo gradiente lineare:" -#: ../src/ui/dialog/inkscape-preferences.cpp:495 +#: ../src/ui/dialog/inkscape-preferences.cpp:510 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" @@ -17773,16 +18453,16 @@ msgstr "" "orizzontale)" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:499 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Dropper" msgstr "Contagocce" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:504 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Connector" msgstr "Connettore" -#: ../src/ui/dialog/inkscape-preferences.cpp:507 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "If on, connector attachment points will not be shown for text objects" msgstr "" "Se attivo, il punto di attacco del connettore non verrà mostrato per gli " @@ -17790,344 +18470,456 @@ msgstr "" #. LPETool #. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:512 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "LPE Tool" msgstr "Strumento LPE" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Interface" msgstr "Interfaccia" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "System default" msgstr "Impostazione predefinita del sistema" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Albanian (sq)" msgstr "Albanese (sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Amharic (am)" msgstr "Amarico (am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Arabic (ar)" msgstr "Arabo (ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Armenian (hy)" msgstr "Armeno (hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 +msgid "Assamese (as)" +msgstr "Assamese (as)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Azerbaijani (az)" msgstr "Azero (az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Basque (eu)" msgstr "Basco (eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Belarusian (be)" msgstr "Bielorusso (be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bulgarian (bg)" msgstr "Bulgaro (bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali (bn)" msgstr "Bengalese (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali/Bangladesh (bn_BD)" msgstr "Bengalese/Bangladesh (bn_BD)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 +msgid "Bodo (brx)" +msgstr "Bodo (brx)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Breton (br)" msgstr "Bretone (br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Catalan (ca)" msgstr "Catalano (ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Valencian Catalan (ca@valencia)" msgstr "Catalano Valenziano (ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/China (zh_CN)" msgstr "Cinese/Cina (zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/Taiwan (zh_TW)" msgstr "Cinese/Taiwan (zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Croatian (hr)" msgstr "Croato (hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Czech (cs)" msgstr "Ceco (cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Danish (da)" msgstr "Danese (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 +msgid "Dogri (doi)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dutch (nl)" msgstr "Olandese (nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dzongkha (dz)" msgstr "Dzongkha (dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "German (de)" msgstr "Tedesco (de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "Greek (el)" msgstr "Greco (el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English (en)" msgstr "Inglese (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Australia (en_AU)" msgstr "Inglese/Australia (en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Canada (en_CA)" msgstr "Inglese/Canada (en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Great Britain (en_GB)" msgstr "Inglese/Gran Bretagna (en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:526 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Pig Latin (en_US@piglatin)" msgstr "Pig Latin (en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Esperanto (eo)" msgstr "Esperanto (eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Estonian (et)" msgstr "Estone (et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Farsi (fa)" msgstr "Persiano (fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Finnish (fi)" msgstr "Finlandese (fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "French (fr)" msgstr "Francese (fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 -msgid "Irish (ga)" -msgstr "Irlandese (ga)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Galician (gl)" msgstr "Galiziona (gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 +msgid "Gujarati (gu)" +msgstr "Gujarati (gu)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hebrew (he)" msgstr "Ebreo (he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 +msgid "Hindi (hi)" +msgstr "Hindi (hi)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hungarian (hu)" msgstr "Ungherese (hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 +msgid "Icelandic (is)" +msgstr "Islandese (is)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Indonesian (id)" msgstr "Indonesiano (id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 +msgid "Irish (ga)" +msgstr "Irlandese (ga)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Italian (it)" msgstr "Italiano (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Japanese (ja)" msgstr "Giapponese (ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 +msgid "Kannada (kn)" +msgstr "Kannada (kn)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:549 +msgid "Kashmiri in Peso-Arabic script (ks@aran)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:549 +msgid "Kashmiri in Devanagari script (ks@deva)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Khmer (km)" msgstr "Khmer (km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kinyarwanda (rw)" msgstr "Kinyarwanda (rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 +msgid "Konkani (kok)" +msgstr "Konkani (kok)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:549 +#, fuzzy +msgid "Konkani in Latin script (kok@latin)" +msgstr "Serbo in caratteri latini (sr@latin)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Korean (ko)" msgstr "Koreano (ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 -msgid "Lithuanian (lt)" -msgstr "Lituano (lt)" - -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Latvian (lv)" msgstr "Lettone (lv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 +msgid "Lithuanian (lt)" +msgstr "Lituano (lt)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Macedonian (mk)" msgstr "Macedone (mk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 +msgid "Maithili (mai)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:551 +#, fuzzy +msgid "Malayalam (ml)" +msgstr "Malayalam" + +#: ../src/ui/dialog/inkscape-preferences.cpp:551 +msgid "Manipuri (mni)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:551 +msgid "Manipuri in Bengali script (mni@beng)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:551 +msgid "Marathi (mr)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Mongolian (mn)" msgstr "Mongolo (mn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Nepali (ne)" msgstr "Nepalese (ne)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Bokmål (nb)" msgstr "Norvegese Bokmål (nb)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Nynorsk (nn)" msgstr "Norvegese Nynorsk (nn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:553 +msgid "Odia (or)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Panjabi (pa)" msgstr "Panjabi (pa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Polish (pl)" msgstr "Polacco (pl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese (pt)" msgstr "Portoghese (pt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese/Brazil (pt_BR)" msgstr "Portoghese Brasiliano (pt_BR)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Romanian (ro)" msgstr "Rumeno (ro)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Russian (ru)" msgstr "Russo (ru)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 +msgid "Sanskrit (sa)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:556 +#, fuzzy +msgid "Santali (sat)" +msgstr "Italiano (it)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:556 +#, fuzzy +msgid "Santali in Devanagari script (sat@deva)" +msgstr "Serbo in caratteri latini (sr@latin)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian (sr)" msgstr "Serbo (sr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian in Latin script (sr@latin)" msgstr "Serbo in caratteri latini (sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 +msgid "Sindhi (sd)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:557 +#, fuzzy +msgid "Sindhi in Devanagari script (sd@deva)" +msgstr "Serbo in caratteri latini (sr@latin)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovak (sk)" msgstr "Slovacco (sk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovenian (sl)" msgstr "Sloveno (sl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish (es)" msgstr "Spagnolo (es)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish/Mexico (es_MX)" msgstr "Spagnolo messicano (es_MX)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Swedish (sv)" msgstr "Svedese (sv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 +#, fuzzy +msgid "Tamil (ta)" +msgstr "Tamil" + +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Telugu (te)" msgstr "Telugu (te)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Thai (th)" msgstr "Tailandese (th)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Turkish (tr)" msgstr "Turco (tr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Ukrainian (uk)" msgstr "Ucraino (uk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 +msgid "Urdu (ur)" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Vietnamese (vi)" msgstr "Vietnamita (vi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:565 +#: ../src/ui/dialog/inkscape-preferences.cpp:612 msgid "Language (requires restart):" msgstr "Lingua (richiede riapertura):" -#: ../src/ui/dialog/inkscape-preferences.cpp:566 +#: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "Set the language for menus and number formats" msgstr "Imposta la lingua per i menu e il formato dei numeri" -#: ../src/ui/dialog/inkscape-preferences.cpp:569 -#: ../src/ui/dialog/inkscape-preferences.cpp:649 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#, fuzzy +msgctxt "Icon size" +msgid "Larger" +msgstr "Grande" + +#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#, fuzzy +msgctxt "Icon size" msgid "Large" msgstr "Grande" -#: ../src/ui/dialog/inkscape-preferences.cpp:569 -#: ../src/ui/dialog/inkscape-preferences.cpp:649 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#, fuzzy +msgctxt "Icon size" msgid "Small" msgstr "Piccola" -#: ../src/ui/dialog/inkscape-preferences.cpp:569 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#, fuzzy +msgctxt "Icon size" msgid "Smaller" msgstr "Più piccola" -#: ../src/ui/dialog/inkscape-preferences.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "Toolbox icon size:" msgstr "Dimensione icone barra degli strumenti:" -#: ../src/ui/dialog/inkscape-preferences.cpp:574 +#: ../src/ui/dialog/inkscape-preferences.cpp:622 msgid "Set the size for the tool icons (requires restart)" msgstr "" "Imposta la dimensione delle icone degli strumenti (richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:577 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "Control bar icon size:" msgstr "Dimensione icone barra dei controlli:" -#: ../src/ui/dialog/inkscape-preferences.cpp:578 +#: ../src/ui/dialog/inkscape-preferences.cpp:626 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "" "Imposta la dimensione delle icone nella barra dei controlli degli strumenti " "(richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:581 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 msgid "Secondary toolbar icon size:" msgstr "Dimensione icone barra secondaria:" -#: ../src/ui/dialog/inkscape-preferences.cpp:582 +#: ../src/ui/dialog/inkscape-preferences.cpp:630 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" msgstr "" "Imposta la dimensione delle icone nella barre secondarie (richiede " "riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:585 +#: ../src/ui/dialog/inkscape-preferences.cpp:633 msgid "Work-around color sliders not drawing" msgstr "Evita problemi di visualizzazione barre di colore" -#: ../src/ui/dialog/inkscape-preferences.cpp:587 +#: ../src/ui/dialog/inkscape-preferences.cpp:635 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" @@ -18135,15 +18927,15 @@ msgstr "" "Quando attivo, cerca di evitare i problemi nella visualizzazione delle barre " "di colore dovuti ad alcuni temi GTK" -#: ../src/ui/dialog/inkscape-preferences.cpp:592 +#: ../src/ui/dialog/inkscape-preferences.cpp:640 msgid "Clear list" msgstr "Pulisci lista" -#: ../src/ui/dialog/inkscape-preferences.cpp:595 +#: ../src/ui/dialog/inkscape-preferences.cpp:643 msgid "Maximum documents in Open _Recent:" msgstr "Numero massimo di documenti _recenti:" -#: ../src/ui/dialog/inkscape-preferences.cpp:596 +#: ../src/ui/dialog/inkscape-preferences.cpp:644 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" @@ -18151,11 +18943,11 @@ msgstr "" "Imposta la lunghezza massima della lista Apri recente del menu File, o " "pulisce la lista" -#: ../src/ui/dialog/inkscape-preferences.cpp:599 +#: ../src/ui/dialog/inkscape-preferences.cpp:647 msgid "_Zoom correction factor (in %):" msgstr "Fattore di correzione _ingrandimento (in %):" -#: ../src/ui/dialog/inkscape-preferences.cpp:600 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " @@ -18166,13 +18958,25 @@ msgstr "" "ridimensiona 1:1, 1:2 o simili, per visualizzare gli oggetti nelle loro " "dimensioni reali" +#: ../src/ui/dialog/inkscape-preferences.cpp:651 +msgid "Enable dynamic relayout for incomplete sections" +msgstr "Abilita disposizione dinamica per sezioni incomplete" + +#: ../src/ui/dialog/inkscape-preferences.cpp:653 +msgid "" +"When on, will allow dynamic layout of components that are not completely " +"finished being refactored" +msgstr "" +"Quando attivo, permette la disposizione dinamica delle componenti che non " +"sono ancora state completate" + #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:603 +#: ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Show filter primitives infobox (requires restart)" msgstr "" "Mostra le informazioni sulle primitive dei filtri (richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:605 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" @@ -18180,26 +18984,26 @@ msgstr "" "Mostra le icone e le descrizioni per le primitive dei filtri disponibili " "nella finestra dei filtri" -#: ../src/ui/dialog/inkscape-preferences.cpp:608 -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Icons only" msgstr "Solo icone" -#: ../src/ui/dialog/inkscape-preferences.cpp:608 -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Text only" msgstr "Solo testo" -#: ../src/ui/dialog/inkscape-preferences.cpp:608 -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Icons and text" msgstr "Icone e testo" -#: ../src/ui/dialog/inkscape-preferences.cpp:613 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Dockbar style (requires restart):" msgstr "Stile barra dei pannelli (richiede riapertura):" -#: ../src/ui/dialog/inkscape-preferences.cpp:614 +#: ../src/ui/dialog/inkscape-preferences.cpp:667 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" @@ -18207,11 +19011,11 @@ msgstr "" "Seleziona se le barre verticali sulla barra dei pannelli mostrano testo, " "icone o entrambi" -#: ../src/ui/dialog/inkscape-preferences.cpp:621 +#: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "Switcher style (requires restart):" msgstr "Stile icone pannelli (richiede riapertura):" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:675 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" @@ -18219,88 +19023,102 @@ msgstr "" "entrambi" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:626 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Save and restore window geometry for each document" msgstr "Salva e imposta le dimensioni della finestra per ogni documento" -#: ../src/ui/dialog/inkscape-preferences.cpp:627 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "Remember and use last window's geometry" msgstr "Salva e riutilizza la dimensione dell'ultima finestra" -#: ../src/ui/dialog/inkscape-preferences.cpp:628 +#: ../src/ui/dialog/inkscape-preferences.cpp:681 msgid "Don't save window geometry" msgstr "Non salvare la dimensione della finestra" -#: ../src/ui/dialog/inkscape-preferences.cpp:630 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 msgid "Save and restore dialogs status" msgstr "Salva e ripristina lo stato delle sottofinestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:631 -#: ../src/ui/dialog/inkscape-preferences.cpp:667 +#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:720 msgid "Don't save dialogs status" msgstr "Non salvare lo stato delle sottofinestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:633 -#: ../src/ui/dialog/inkscape-preferences.cpp:675 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:728 msgid "Dockable" msgstr "Fissabile" -#: ../src/ui/dialog/inkscape-preferences.cpp:637 +#: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "Native open/save dialogs" msgstr "Finestre apri/salva native" -#: ../src/ui/dialog/inkscape-preferences.cpp:638 +#: ../src/ui/dialog/inkscape-preferences.cpp:691 msgid "GTK open/save dialogs" msgstr "Finestre apri/salva GTK" -#: ../src/ui/dialog/inkscape-preferences.cpp:640 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Dialogs are hidden in taskbar" msgstr "Le sottofinestre vengono nascoste nella barra" -#: ../src/ui/dialog/inkscape-preferences.cpp:641 +#: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "Save and restore documents viewport" msgstr "Salva e ripristina la vista del documento" -#: ../src/ui/dialog/inkscape-preferences.cpp:642 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Zoom when window is resized" msgstr "Adatta al ridimensionamento della finestra" -#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 msgid "Show close button on dialogs" msgstr "Mostra il bottone di chiusura nelle sottofinestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:644 +#: ../src/ui/dialog/inkscape-preferences.cpp:697 msgctxt "Dialog on top" msgid "None" msgstr "Nessuno" -#: ../src/ui/dialog/inkscape-preferences.cpp:646 +#: ../src/ui/dialog/inkscape-preferences.cpp:699 msgid "Aggressive" msgstr "Aggressivo" -#: ../src/ui/dialog/inkscape-preferences.cpp:649 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 +#, fuzzy +msgctxt "Window size" +msgid "Small" +msgstr "Piccola" + +#: ../src/ui/dialog/inkscape-preferences.cpp:702 +#, fuzzy +msgctxt "Window size" +msgid "Large" +msgstr "Grande" + +#: ../src/ui/dialog/inkscape-preferences.cpp:702 +#, fuzzy +msgctxt "Window size" msgid "Maximized" msgstr "Massimizzata" -#: ../src/ui/dialog/inkscape-preferences.cpp:653 +#: ../src/ui/dialog/inkscape-preferences.cpp:706 msgid "Default window size:" msgstr "Dimensione finestra predefinita:" -#: ../src/ui/dialog/inkscape-preferences.cpp:654 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 msgid "Set the default window size" msgstr "Imposta la dimensione finestra predefinita" -#: ../src/ui/dialog/inkscape-preferences.cpp:657 +#: ../src/ui/dialog/inkscape-preferences.cpp:710 msgid "Saving window geometry (size and position)" msgstr "Salvataggio geometria finestra (dimensione e posizione)" -#: ../src/ui/dialog/inkscape-preferences.cpp:659 +#: ../src/ui/dialog/inkscape-preferences.cpp:712 msgid "Let the window manager determine placement of all windows" msgstr "" "Permette al gestore delle finestre di determinare la posizione di tutte le " "finestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:714 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" @@ -18308,7 +19126,7 @@ msgstr "" "Ricorda e usa l'ultima geometria della finestra (salva la geometria nelle " "preferenze dell'utente)" -#: ../src/ui/dialog/inkscape-preferences.cpp:663 +#: ../src/ui/dialog/inkscape-preferences.cpp:716 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" @@ -18316,11 +19134,11 @@ msgstr "" "Salva e reimposta la geometria della finestra di ogni documento (salva la " "geometria nel documento)" -#: ../src/ui/dialog/inkscape-preferences.cpp:665 +#: ../src/ui/dialog/inkscape-preferences.cpp:718 msgid "Saving dialogs status" msgstr "Salvataggio stato sottofinestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:669 +#: ../src/ui/dialog/inkscape-preferences.cpp:722 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" @@ -18328,64 +19146,64 @@ msgstr "" "Salva e ripristina lo stato delle sottofinestre (le ultime sottofinestre " "aperte sono salvate alla chiusura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 +#: ../src/ui/dialog/inkscape-preferences.cpp:726 msgid "Dialog behavior (requires restart)" msgstr "Comportamento sottofinestre (richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:679 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "Desktop integration" msgstr "Integrazione desktop" -#: ../src/ui/dialog/inkscape-preferences.cpp:681 +#: ../src/ui/dialog/inkscape-preferences.cpp:734 msgid "Use Windows like open and save dialogs" msgstr "Usa finestre apri e salva in stile Windows" -#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:736 msgid "Use GTK open and save dialogs " msgstr "Usa finestre apri e salva in stile GTK" -#: ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/ui/dialog/inkscape-preferences.cpp:740 msgid "Dialogs on top:" msgstr "Risalto delle sottofinestre:" -#: ../src/ui/dialog/inkscape-preferences.cpp:690 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 msgid "Dialogs are treated as regular windows" msgstr "Le sottofinestre sono trattate come finestre normali" -#: ../src/ui/dialog/inkscape-preferences.cpp:692 +#: ../src/ui/dialog/inkscape-preferences.cpp:745 msgid "Dialogs stay on top of document windows" msgstr "Le sottofinestre stanno davanti alla finestra del documento" -#: ../src/ui/dialog/inkscape-preferences.cpp:694 +#: ../src/ui/dialog/inkscape-preferences.cpp:747 msgid "Same as Normal but may work better with some window managers" msgstr "Come Normale, ma funziona meglio con alcuni gestori di finestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:750 msgid "Dialog Transparency" msgstr "Trasparenza finestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:752 msgid "_Opacity when focused:" msgstr "_Opacità con il focus:" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:754 msgid "Opacity when _unfocused:" msgstr "Opacità _senza il focus:" -#: ../src/ui/dialog/inkscape-preferences.cpp:703 +#: ../src/ui/dialog/inkscape-preferences.cpp:756 msgid "_Time of opacity change animation:" msgstr "_Durata dell'animazione di cambio opacità:" -#: ../src/ui/dialog/inkscape-preferences.cpp:706 +#: ../src/ui/dialog/inkscape-preferences.cpp:759 msgid "Miscellaneous" msgstr "Varie" -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "" "Le sottofinestre non verranno mostrate nella barra del gestore di finestre" -#: ../src/ui/dialog/inkscape-preferences.cpp:712 +#: ../src/ui/dialog/inkscape-preferences.cpp:765 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " @@ -18396,7 +19214,7 @@ msgstr "" "preimpostato, potrà essere cambiato per ciascuna finestra usando il bottone " "sopra la barra di scorrimento di destra)" -#: ../src/ui/dialog/inkscape-preferences.cpp:714 +#: ../src/ui/dialog/inkscape-preferences.cpp:767 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." @@ -18404,121 +19222,123 @@ msgstr "" "Salva la vista dei documenti (ingrandimento e posizione). Si consiglia di " "disabilitarla in caso di file condivisi controllati da versione." -#: ../src/ui/dialog/inkscape-preferences.cpp:716 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Whether dialog windows have a close button (requires restart)" msgstr "" "Determina se le sottofinestre hanno il bottone di chiusura (richiede " "riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:770 msgid "Windows" msgstr "Finestre" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:720 +#: ../src/ui/dialog/inkscape-preferences.cpp:773 msgid "Line color when zooming out" msgstr "Colore linee durante riduzione ingrandimento" -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 msgid "The gridlines will be shown in minor grid line color" msgstr "Le linee della griglia saranno mostrate con il colore di quelle minori" -#: ../src/ui/dialog/inkscape-preferences.cpp:725 +#: ../src/ui/dialog/inkscape-preferences.cpp:778 msgid "The gridlines will be shown in major grid line color" msgstr "" "Le linee della griglia saranno mostrate con il colore di quelle maggiori" -#: ../src/ui/dialog/inkscape-preferences.cpp:727 +#: ../src/ui/dialog/inkscape-preferences.cpp:780 msgid "Default grid settings" msgstr "Impostazioni predefinite griglia" -#: ../src/ui/dialog/inkscape-preferences.cpp:733 -#: ../src/ui/dialog/inkscape-preferences.cpp:758 +#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:811 msgid "Grid units:" msgstr "Unità della griglia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:738 -#: ../src/ui/dialog/inkscape-preferences.cpp:763 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Origin X:" msgstr "Origine X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:739 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Origin Y:" msgstr "Origine Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:744 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Spacing X:" msgstr "Spaziatura X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:745 -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Spacing Y:" msgstr "Spaziatura Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:747 -#: ../src/ui/dialog/inkscape-preferences.cpp:748 -#: ../src/ui/dialog/inkscape-preferences.cpp:772 -#: ../src/ui/dialog/inkscape-preferences.cpp:773 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:825 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 msgid "Minor grid line color:" msgstr "Colore delle linee minori della griglia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:748 -#: ../src/ui/dialog/inkscape-preferences.cpp:773 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 msgid "Color used for normal grid lines" msgstr "Colore usato per le linee semplici della griglia" -#: ../src/ui/dialog/inkscape-preferences.cpp:749 -#: ../src/ui/dialog/inkscape-preferences.cpp:750 -#: ../src/ui/dialog/inkscape-preferences.cpp:774 -#: ../src/ui/dialog/inkscape-preferences.cpp:775 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 +#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:827 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Major grid line color:" msgstr "Colore delle linee principali della griglia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:750 -#: ../src/ui/dialog/inkscape-preferences.cpp:775 +#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Color used for major (highlighted) grid lines" msgstr "Colore usato per le linee principali (evidenziate) della griglia" -#: ../src/ui/dialog/inkscape-preferences.cpp:752 -#: ../src/ui/dialog/inkscape-preferences.cpp:777 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:830 msgid "Major grid line every:" msgstr "Linee principali della griglia ogni:" -#: ../src/ui/dialog/inkscape-preferences.cpp:753 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "Show dots instead of lines" msgstr "Visualizza punti invece di linee" -#: ../src/ui/dialog/inkscape-preferences.cpp:754 +#: ../src/ui/dialog/inkscape-preferences.cpp:807 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "" "Se impostato, visualizza i punti di intersezione delle griglie invece delle " "linee" -#: ../src/ui/dialog/inkscape-preferences.cpp:835 +#: ../src/ui/dialog/inkscape-preferences.cpp:888 msgid "Input/Output" msgstr "Input/Output" -#: ../src/ui/dialog/inkscape-preferences.cpp:838 +#: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "Use current directory for \"Save As ...\"" msgstr "Usa la cartella attuale per \"Salva come...\"" -#: ../src/ui/dialog/inkscape-preferences.cpp:840 +#: ../src/ui/dialog/inkscape-preferences.cpp:893 +#, fuzzy msgid "" -"When this option is on, the \"Save as...\" and \"Save a Copy\" dialogs will " -"always open in the directory where the currently open document is; when it's " -"off, each will open in the directory where you last saved a file using it" +"When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " +"will always open in the directory where the currently open document is; when " +"it's off, each will open in the directory where you last saved a file using " +"it" msgstr "" "Quando questa opzione è attiva, le finestre di \"Salva come...\" e \"Salva " "una copia...\" verranno aperte alla cartella in cui risiede il documento " "aperto. Se disattivata, verrà aperta l'ultima cartella in cui è stato " "salvato in questa maniera un file" -#: ../src/ui/dialog/inkscape-preferences.cpp:842 +#: ../src/ui/dialog/inkscape-preferences.cpp:895 msgid "Add label comments to printing output" msgstr "Aggiungi i commenti all'output di stampa" -#: ../src/ui/dialog/inkscape-preferences.cpp:844 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" @@ -18527,11 +19347,11 @@ msgstr "" "modo da evidenziare la visualizzazione di stampa di un oggetto con la " "propria etichetta" -#: ../src/ui/dialog/inkscape-preferences.cpp:846 +#: ../src/ui/dialog/inkscape-preferences.cpp:899 msgid "Add default metadata to new documents" msgstr "Aggiungi i metadati predefiniti ai nuovi documenti" -#: ../src/ui/dialog/inkscape-preferences.cpp:848 +#: ../src/ui/dialog/inkscape-preferences.cpp:901 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." @@ -18539,15 +19359,15 @@ msgstr "" "Aggiunge i metadati predefiniti ai nuovi documenti. I metadati predefiniti " "possono essere impostati in Proprietà del documento->Metadati." -#: ../src/ui/dialog/inkscape-preferences.cpp:852 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "_Grab sensitivity:" msgstr "Area di _azione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:852 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "pixels (requires restart)" msgstr "pixel (richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:853 +#: ../src/ui/dialog/inkscape-preferences.cpp:906 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" @@ -18555,37 +19375,37 @@ msgstr "" "La distanza in pixel a cui si può essere da un oggetto per poterlo attivare " "col mouse (in pixel dello schermo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:855 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "_Click/drag threshold:" msgstr "Soglia per il _clic o spostamento:" -#: ../src/ui/dialog/inkscape-preferences.cpp:855 -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 msgid "pixels" msgstr "pixel" -#: ../src/ui/dialog/inkscape-preferences.cpp:856 +#: ../src/ui/dialog/inkscape-preferences.cpp:909 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" "Spostamento in pixel massimo col mouse da considerarsi ancora selezione e " "non spostamento" -#: ../src/ui/dialog/inkscape-preferences.cpp:859 +#: ../src/ui/dialog/inkscape-preferences.cpp:912 msgid "_Handle size:" msgstr "_Dimensione maniglia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:860 +#: ../src/ui/dialog/inkscape-preferences.cpp:913 msgid "Set the relative size of node handles" msgstr "Imposta la dimensione relativa delle maniglie" -#: ../src/ui/dialog/inkscape-preferences.cpp:862 +#: ../src/ui/dialog/inkscape-preferences.cpp:915 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "Utilizza una tavoletta con sensore di pressione (richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:864 +#: ../src/ui/dialog/inkscape-preferences.cpp:917 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " @@ -18595,29 +19415,29 @@ msgstr "" "pressione. Disabilitare solo in caso di problemi con la tavoletta (che " "continuerà a funzionare come un mouse)" -#: ../src/ui/dialog/inkscape-preferences.cpp:866 +#: ../src/ui/dialog/inkscape-preferences.cpp:919 msgid "Switch tool based on tablet device (requires restart)" msgstr "" "Cambia strumento in base al dispositivo usato sulla tavoletta (richiede " "riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:868 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "" "Cambia lo strumento quando dispositivi diversi vengono usati sulla tavoletta " "(penna, gomma, mouse)" -#: ../src/ui/dialog/inkscape-preferences.cpp:869 +#: ../src/ui/dialog/inkscape-preferences.cpp:922 msgid "Input devices" msgstr "Dispositivi di input" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:872 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 msgid "Use named colors" msgstr "Usa nomi colori" -#: ../src/ui/dialog/inkscape-preferences.cpp:873 +#: ../src/ui/dialog/inkscape-preferences.cpp:926 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" @@ -18625,23 +19445,23 @@ msgstr "" "Quando impostato, scrive il nome CSS del colore se disponibile (es. 'red' o " "'magenta') invece del valore numerico" -#: ../src/ui/dialog/inkscape-preferences.cpp:875 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 msgid "XML formatting" msgstr "Formattazione XML" -#: ../src/ui/dialog/inkscape-preferences.cpp:877 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Inline attributes" msgstr "Attributi inline" -#: ../src/ui/dialog/inkscape-preferences.cpp:878 +#: ../src/ui/dialog/inkscape-preferences.cpp:931 msgid "Put attributes on the same line as the element tag" msgstr "Mette gli attributi sulla stessa riga del tag dell'elemento" -#: ../src/ui/dialog/inkscape-preferences.cpp:881 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "_Indent, spaces:" msgstr "_Indentazione, spazi:" -#: ../src/ui/dialog/inkscape-preferences.cpp:881 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" @@ -18649,28 +19469,28 @@ msgstr "" "Numero di spazi usati per l'indentazione di elementi annidati; impostare a " "zero per non avere indentazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:883 +#: ../src/ui/dialog/inkscape-preferences.cpp:936 msgid "Path data" msgstr "Dati tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Absolute" msgstr "Assoluto" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Relative" msgstr "Relativo" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Optimized" msgstr "Ottimizzato" -#: ../src/ui/dialog/inkscape-preferences.cpp:890 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Path string format:" msgstr "Formato stringa tracciato:" -#: ../src/ui/dialog/inkscape-preferences.cpp:890 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " @@ -18680,11 +19500,11 @@ msgstr "" "solo con coordinate relative oppure ottimizzati per la lunghezza della " "stringa (misto coordinate assolute e relative)" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 msgid "Force repeat commands" msgstr "Forza ripetizione comandi" -#: ../src/ui/dialog/inkscape-preferences.cpp:893 +#: ../src/ui/dialog/inkscape-preferences.cpp:946 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" @@ -18692,23 +19512,23 @@ msgstr "" "Forza la ripetizione degli stessi comandi di tracciato (per esempio 'L 1,2 L " "3,4' invece di 'L 1,2 3,4')" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:948 msgid "Numbers" msgstr "Numeri" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "_Numeric precision:" msgstr "Precisione _numerica:" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "Significant figures of the values written to the SVG file" msgstr "Cifre significative dei valori scritti nel file SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:901 +#: ../src/ui/dialog/inkscape-preferences.cpp:954 msgid "Minimum _exponent:" msgstr "Minimo _esponente:" -#: ../src/ui/dialog/inkscape-preferences.cpp:901 +#: ../src/ui/dialog/inkscape-preferences.cpp:954 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -18718,17 +19538,17 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:906 +#: ../src/ui/dialog/inkscape-preferences.cpp:959 msgid "Improper Attributes Actions" msgstr "Attributi impropri" -#: ../src/ui/dialog/inkscape-preferences.cpp:908 -#: ../src/ui/dialog/inkscape-preferences.cpp:916 -#: ../src/ui/dialog/inkscape-preferences.cpp:924 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 +#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 msgid "Print warnings" msgstr "Mostra avvisi" -#: ../src/ui/dialog/inkscape-preferences.cpp:909 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." @@ -18736,20 +19556,20 @@ msgstr "" "Mostra avviso se vengono trovati attributi non validi o non utili. File " "database localizzati in inkscape_data_dir/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:910 +#: ../src/ui/dialog/inkscape-preferences.cpp:963 msgid "Remove attributes" msgstr "Rimuovi attributi" -#: ../src/ui/dialog/inkscape-preferences.cpp:911 +#: ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Delete invalid or non-useful attributes from element tag" msgstr "Elimina attributi non validi o non utili dal tag dell'elemento" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:914 +#: ../src/ui/dialog/inkscape-preferences.cpp:967 msgid "Inappropriate Style Properties Actions" msgstr "Proprietà stile inappropriate" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:970 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." @@ -18758,21 +19578,21 @@ msgstr "" "'carattere' impostato su un ). File database localizzati in " "inkscape_data_dir/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:918 -#: ../src/ui/dialog/inkscape-preferences.cpp:926 +#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:979 msgid "Remove style properties" msgstr "Rimuovi proprietà stile" -#: ../src/ui/dialog/inkscape-preferences.cpp:919 +#: ../src/ui/dialog/inkscape-preferences.cpp:972 msgid "Delete inappropriate style properties" msgstr "Elimina proprietà stile inappropriate" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:922 +#: ../src/ui/dialog/inkscape-preferences.cpp:975 msgid "Non-useful Style Properties Actions" msgstr "Proprietà stile non utili" -#: ../src/ui/dialog/inkscape-preferences.cpp:925 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " @@ -18784,19 +19604,19 @@ msgstr "" "il valore è lo stesso se fosse ereditato). File database localizzati in " "inkscape_data_dir/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:927 +#: ../src/ui/dialog/inkscape-preferences.cpp:980 msgid "Delete redundant style properties" msgstr "Elimina proprietà stile ridondanti" -#: ../src/ui/dialog/inkscape-preferences.cpp:929 +#: ../src/ui/dialog/inkscape-preferences.cpp:982 msgid "Check Attributes and Style Properties on" msgstr "Controlla attributi e proprietà stile durante" -#: ../src/ui/dialog/inkscape-preferences.cpp:931 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "Reading" msgstr "Lettura" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:985 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" @@ -18804,11 +19624,11 @@ msgstr "" "Controlla attributi e proprietà stile durante la lettura dei file SVG " "(inclusi quelli interni a Inkscape che rallentano l'avvio)" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "Editing" msgstr "Modifica" -#: ../src/ui/dialog/inkscape-preferences.cpp:934 +#: ../src/ui/dialog/inkscape-preferences.cpp:987 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" @@ -18816,41 +19636,41 @@ msgstr "" "Controlla attributi e proprietà stile durante la modifica dei file SVG (può " "rallentare Inkscape, utile soprattutto per il debugging)" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 +#: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "Writing" msgstr "Scrittura" -#: ../src/ui/dialog/inkscape-preferences.cpp:936 +#: ../src/ui/dialog/inkscape-preferences.cpp:989 msgid "Check attributes and style properties on writing out SVG files" msgstr "" "Controlla attributi e proprietà stile durante la scrittura dei file SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:991 msgid "SVG output" msgstr "Output SVG" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:944 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Perceptual" msgstr "Percettivo" -#: ../src/ui/dialog/inkscape-preferences.cpp:944 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Relative Colorimetric" msgstr "Colorimetrico relativo" -#: ../src/ui/dialog/inkscape-preferences.cpp:944 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Absolute Colorimetric" msgstr "Colorimetrico assoluto" -#: ../src/ui/dialog/inkscape-preferences.cpp:948 +#: ../src/ui/dialog/inkscape-preferences.cpp:1001 msgid "(Note: Color management has been disabled in this build)" msgstr "(Nota: la gestione del colore è stata disabilitata in questa versione)" -#: ../src/ui/dialog/inkscape-preferences.cpp:952 +#: ../src/ui/dialog/inkscape-preferences.cpp:1005 msgid "Display adjustment" msgstr "Correzione display" -#: ../src/ui/dialog/inkscape-preferences.cpp:962 +#: ../src/ui/dialog/inkscape-preferences.cpp:1015 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" @@ -18859,114 +19679,114 @@ msgstr "" "Il profilo ICC da usare per calibrare l'output del display.\n" "Cartelle di ricerca:%s" -#: ../src/ui/dialog/inkscape-preferences.cpp:963 +#: ../src/ui/dialog/inkscape-preferences.cpp:1016 msgid "Display profile:" msgstr "Profilo display:" -#: ../src/ui/dialog/inkscape-preferences.cpp:968 +#: ../src/ui/dialog/inkscape-preferences.cpp:1021 msgid "Retrieve profile from display" msgstr "Ottieni profilo dal display" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:1024 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "Ottieni i profili relativi ai display tramite XICC" -#: ../src/ui/dialog/inkscape-preferences.cpp:973 +#: ../src/ui/dialog/inkscape-preferences.cpp:1026 msgid "Retrieve profiles from those attached to displays" msgstr "Ottieni i profili relativi ai display" -#: ../src/ui/dialog/inkscape-preferences.cpp:978 +#: ../src/ui/dialog/inkscape-preferences.cpp:1031 msgid "Display rendering intent:" msgstr "Intento del display:" -#: ../src/ui/dialog/inkscape-preferences.cpp:979 +#: ../src/ui/dialog/inkscape-preferences.cpp:1032 msgid "The rendering intent to use to calibrate display output" msgstr "" "L'intento di visualizzazione da usare per calibrare l'output del display" -#: ../src/ui/dialog/inkscape-preferences.cpp:981 +#: ../src/ui/dialog/inkscape-preferences.cpp:1034 msgid "Proofing" msgstr "Correzione" -#: ../src/ui/dialog/inkscape-preferences.cpp:983 +#: ../src/ui/dialog/inkscape-preferences.cpp:1036 msgid "Simulate output on screen" msgstr "Simula l'output su schermo" -#: ../src/ui/dialog/inkscape-preferences.cpp:985 +#: ../src/ui/dialog/inkscape-preferences.cpp:1038 msgid "Simulates output of target device" msgstr "Simula l'output del dispositivo finale" -#: ../src/ui/dialog/inkscape-preferences.cpp:987 +#: ../src/ui/dialog/inkscape-preferences.cpp:1040 msgid "Mark out of gamut colors" msgstr "Segnalazione colore fuori gamma" -#: ../src/ui/dialog/inkscape-preferences.cpp:989 +#: ../src/ui/dialog/inkscape-preferences.cpp:1042 msgid "Highlights colors that are out of gamut for the target device" msgstr "" "Evidenzia i colori che sono fuori dalla gamma cromatica del dispositivo " "finale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1001 +#: ../src/ui/dialog/inkscape-preferences.cpp:1054 msgid "Out of gamut warning color:" msgstr "Colore avviso fuori gamma:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1002 +#: ../src/ui/dialog/inkscape-preferences.cpp:1055 msgid "Selects the color used for out of gamut warning" msgstr "Seleziona il colore da usare per gli avvisi circa i fuori gamma" -#: ../src/ui/dialog/inkscape-preferences.cpp:1004 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 msgid "Device profile:" msgstr "Profilo dispositivo:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1005 +#: ../src/ui/dialog/inkscape-preferences.cpp:1058 msgid "The ICC profile to use to simulate device output" msgstr "Il profilo ICC da usare per simulare l'output del dispositivo" -#: ../src/ui/dialog/inkscape-preferences.cpp:1008 +#: ../src/ui/dialog/inkscape-preferences.cpp:1061 msgid "Device rendering intent:" msgstr "Intento del dispositivo:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1009 +#: ../src/ui/dialog/inkscape-preferences.cpp:1062 msgid "The rendering intent to use to calibrate device output" msgstr "" "L'intento di visualizzazione da usare per calibrare l'output del display" -#: ../src/ui/dialog/inkscape-preferences.cpp:1011 +#: ../src/ui/dialog/inkscape-preferences.cpp:1064 msgid "Black point compensation" msgstr "Compensazione punti neri" -#: ../src/ui/dialog/inkscape-preferences.cpp:1013 +#: ../src/ui/dialog/inkscape-preferences.cpp:1066 msgid "Enables black point compensation" msgstr "Abilita la compensazione dei punti neri" -#: ../src/ui/dialog/inkscape-preferences.cpp:1015 +#: ../src/ui/dialog/inkscape-preferences.cpp:1068 msgid "Preserve black" msgstr "Preserva nero" -#: ../src/ui/dialog/inkscape-preferences.cpp:1022 +#: ../src/ui/dialog/inkscape-preferences.cpp:1075 msgid "(LittleCMS 1.15 or later required)" msgstr "(richiede LittleCMS 1.15 o successivi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1024 +#: ../src/ui/dialog/inkscape-preferences.cpp:1077 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "Preserva il canale K nelle trasformazioni CMYK -> CMYK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1038 -#: ../src/widgets/sp-color-icc-selector.cpp:474 -#: ../src/widgets/sp-color-icc-selector.cpp:766 +#: ../src/ui/dialog/inkscape-preferences.cpp:1091 +#: ../src/ui/widget/color-icc-selector.cpp:394 +#: ../src/ui/widget/color-icc-selector.cpp:685 msgid "" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1083 +#: ../src/ui/dialog/inkscape-preferences.cpp:1136 msgid "Color management" msgstr "Gestione del colore" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1086 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "Enable autosave (requires restart)" msgstr "Abilita salvataggio automatico (richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1087 +#: ../src/ui/dialog/inkscape-preferences.cpp:1140 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" @@ -18974,12 +19794,12 @@ msgstr "" "Salva automaticamente i documenti aperti ad intervalli stabiliti, " "minimizzando la perdita di casi in caso di crash" -#: ../src/ui/dialog/inkscape-preferences.cpp:1093 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "_Cartella di salvataggio automatico:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1093 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " @@ -18988,21 +19808,21 @@ msgstr "" "definita da un percorso assoluto (inizia con / su UNIX o la lettera di un " "disco come C: su Windows). " -#: ../src/ui/dialog/inkscape-preferences.cpp:1095 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "_Interval (in minutes):" msgstr "_Intervallo (in minuti):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1095 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "Interval (in minutes) at which document will be autosaved" msgstr "" "Intervalli di tempo (in minuti) a cui eseguire il salvataggio automatico del " "documento" -#: ../src/ui/dialog/inkscape-preferences.cpp:1097 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "_Maximum number of autosaves:" msgstr "Numero _massimo di salvataggi automatici:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1097 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -19021,15 +19841,15 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1112 +#: ../src/ui/dialog/inkscape-preferences.cpp:1165 msgid "Autosave" msgstr "Salvataggio automatico" -#: ../src/ui/dialog/inkscape-preferences.cpp:1116 +#: ../src/ui/dialog/inkscape-preferences.cpp:1169 msgid "Open Clip Art Library _Server Name:" msgstr "Nome del _server per Open Clip Art Library:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1117 +#: ../src/ui/dialog/inkscape-preferences.cpp:1170 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" @@ -19037,35 +19857,35 @@ msgstr "" "Il nome del server webdav dell'Open Clip Art Library. Serve per importare ed " "esportare Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1119 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "Open Clip Art Library _Username:" msgstr "Nome _utente per Open Clip Art Library:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1120 +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "The username used to log into Open Clip Art Library" msgstr "Il nome utente per autenticarsi in Open Clip Art Library" -#: ../src/ui/dialog/inkscape-preferences.cpp:1122 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "Open Clip Art Library _Password:" msgstr "_Password per Open Clip Art Library:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1123 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "The password used to log into Open Clip Art Library" msgstr "La password per autenticarsi in Open Clip Art Library" -#: ../src/ui/dialog/inkscape-preferences.cpp:1124 +#: ../src/ui/dialog/inkscape-preferences.cpp:1177 msgid "Open Clip Art" msgstr "Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1129 +#: ../src/ui/dialog/inkscape-preferences.cpp:1182 msgid "Behavior" msgstr "Comportamento" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "_Simplification threshold:" msgstr "Soglia per la _semplificazione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1134 +#: ../src/ui/dialog/inkscape-preferences.cpp:1187 msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " "this command several times in quick succession, it will act more and more " @@ -19075,45 +19895,45 @@ msgstr "" "diverse volte in rapida successione, si comporterà in modo sempre più " "aggressivo; effettuando una pausa sarà ripristinata la soglia predefinita." -#: ../src/ui/dialog/inkscape-preferences.cpp:1136 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "Color stock markers the same color as object" msgstr "Colora marcatori dello stesso colore dell'oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 msgid "Color custom markers the same color as object" msgstr "Colora marcatori personalizzati dello stesso colore dell'oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:1138 -#: ../src/ui/dialog/inkscape-preferences.cpp:1348 +#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1411 msgid "Update marker color when object color changes" msgstr "Aggiorna colore delimitatore al cambiamento del colore dell'oggetto" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1141 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 msgid "Select in all layers" msgstr "Seleziona tutto in ogni livello" -#: ../src/ui/dialog/inkscape-preferences.cpp:1142 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Select only within current layer" msgstr "Seleziona solo nel livello attuale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1143 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Select in current layer and sublayers" msgstr "Seleziona solo nel livello attuale e nei sottolivelli" -#: ../src/ui/dialog/inkscape-preferences.cpp:1144 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Ignore hidden objects and layers" msgstr "Ignora oggetti e livelli nascosti" -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 msgid "Ignore locked objects and layers" msgstr "Ignora oggetti e livelli bloccati" -#: ../src/ui/dialog/inkscape-preferences.cpp:1146 +#: ../src/ui/dialog/inkscape-preferences.cpp:1199 msgid "Deselect upon layer change" msgstr "Deseleziona al cambiamento di livello" -#: ../src/ui/dialog/inkscape-preferences.cpp:1149 +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" @@ -19121,23 +19941,23 @@ msgstr "" "Deseleziona questa opzione per mantenere selezionati gli oggetti correnti al " "cambio di livello" -#: ../src/ui/dialog/inkscape-preferences.cpp:1151 +#: ../src/ui/dialog/inkscape-preferences.cpp:1204 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Ctrl+A, Tab, Maiusc+Tab" -#: ../src/ui/dialog/inkscape-preferences.cpp:1153 +#: ../src/ui/dialog/inkscape-preferences.cpp:1206 msgid "Make keyboard selection commands work on objects in all layers" msgstr "" "Permettere ai comandi per selezioni da tastiera di operare sugli oggetti di " "tutti i livelli" -#: ../src/ui/dialog/inkscape-preferences.cpp:1155 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "" "Permettere ai comandi per selezioni da tastiera di operare sugli oggetti del " "livello attuale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1157 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" @@ -19145,7 +19965,7 @@ msgstr "" "Permettere ai comandi per selezioni da tastiera di operare sugli oggetti del " "livello attuale e dei suoi sottolivelli" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" @@ -19153,7 +19973,7 @@ msgstr "" "Deseleziona questa opzione per poter selezionare oggetti non visibili " "(nascosti loro stessi o in un livello nascosto)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1161 +#: ../src/ui/dialog/inkscape-preferences.cpp:1214 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" @@ -19161,73 +19981,73 @@ msgstr "" "Deseleziona questa opzione per poter selezionare oggetti bloccati (bloccati " "loro stessi o in un livello bloccato)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1163 +#: ../src/ui/dialog/inkscape-preferences.cpp:1216 msgid "Wrap when cycling objects in z-order" msgstr "Seleziona ciclicamente gli oggetti in ordine di altezza" -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "Alt+Scroll Wheel" msgstr "Alt+Scorrimento mouse" -#: ../src/ui/dialog/inkscape-preferences.cpp:1167 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "Seleziona ciclicamente all'inizio e alla fine in ordine di altezza" -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 msgid "Selecting" msgstr "Selezione" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1172 -#: ../src/widgets/select-toolbar.cpp:570 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +#: ../src/widgets/select-toolbar.cpp:564 msgid "Scale stroke width" msgstr "Ridimensiona la larghezza del contorno" -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Scale rounded corners in rectangles" msgstr "Adatta gli angoli arrotondati nei rettangoli" -#: ../src/ui/dialog/inkscape-preferences.cpp:1174 +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "Transform gradients" msgstr "Trasforma gradienti" -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 msgid "Transform patterns" msgstr "Trasforma motivi" -#: ../src/ui/dialog/inkscape-preferences.cpp:1177 +#: ../src/ui/dialog/inkscape-preferences.cpp:1230 msgid "Preserved" msgstr "Preserva" -#: ../src/ui/dialog/inkscape-preferences.cpp:1180 -#: ../src/widgets/select-toolbar.cpp:571 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/widgets/select-toolbar.cpp:565 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" "Adatta le dimensioni dei contorni durante il ridimensionamento dell'oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:1182 -#: ../src/widgets/select-toolbar.cpp:582 +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/widgets/select-toolbar.cpp:576 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" "Adatta i raggi degli angoli arrotondati durante il ridimensionamento dei " "rettangoli" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 -#: ../src/widgets/select-toolbar.cpp:593 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/widgets/select-toolbar.cpp:587 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "" "Trasforma i gradienti (di contorno o di riempimento) insieme agli oggetti" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 -#: ../src/widgets/select-toolbar.cpp:604 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/widgets/select-toolbar.cpp:598 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "Trasforma i motivi (di contorno o di riempimento) insieme agli oggetti" -#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "Store transformation" msgstr "Salvataggio trasformazioni" -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1242 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" @@ -19235,19 +20055,19 @@ msgstr "" "Se possibile, applica le trasformazioni all'oggetto senza aggiungere un " "attributo transfom=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "Always store transformation as a transform= attribute on objects" msgstr "Salva sempre le trasformazioni come attributo transform= di un oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1246 msgid "Transforms" msgstr "Trasformazioni" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 msgid "Mouse _wheel scrolls by:" msgstr "Scorrimento con la _rotella del mouse:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1198 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" @@ -19255,24 +20075,24 @@ msgstr "" "Con uno scatto della rotella del mouse si scorre di questa distanza " "(orizzontalmente con Maiusc)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1252 msgid "Ctrl+arrows" msgstr "Ctrl+frecce" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Sc_roll by:" msgstr "_Scorrimento:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1202 +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" "Premendo Ctrl+freccia si scorre di questa distanza (in pixel dello schermo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1204 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "_Acceleration:" msgstr "_Accelerazione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1258 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" @@ -19280,15 +20100,15 @@ msgstr "" "Tenendo premuto Ctrl+freccia si accelererà lo scorrimento (0 per non avere " "accelerazione)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1206 +#: ../src/ui/dialog/inkscape-preferences.cpp:1259 msgid "Autoscrolling" msgstr "Scorrimento automatico" -#: ../src/ui/dialog/inkscape-preferences.cpp:1208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 msgid "_Speed:" msgstr "_Velocità:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1262 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" @@ -19296,12 +20116,12 @@ msgstr "" "La velocità con cui la tela scorrerà automaticamente durante il " "trascinamento fuori dal bordo (0 per disattivarlo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 msgid "_Threshold:" msgstr "_Soglia:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" @@ -19310,16 +20130,20 @@ msgstr "" "scorrimento automatico; un numero positivo indica l'esterno della tela, uno " "negativo l'interno" -#. -#. _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false); -#. _page_scrolling.add_line( false, "", _scroll_space, "", -#. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)")); -#. -#: ../src/ui/dialog/inkscape-preferences.cpp:1218 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#, fuzzy +msgid "Mouse move pans when Space is pressed" +msgstr "Tasto sinistro del mouse sposta la tela quando Spazio è premuto" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +msgid "When on, pressing and holding Space and dragging pans canvas" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" msgstr "La rotella del mouse ingrandisce/rimpicciolisce" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" @@ -19327,51 +20151,55 @@ msgstr "" "Quando attivo, la rotella del mouse ingrandisce senza Ctrl e sposta la tela " "con Ctrl; quando disattivo ingrandisce con Ctrl e sposta la tela senza Ctrl" -#: ../src/ui/dialog/inkscape-preferences.cpp:1221 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Scrolling" msgstr "Scorrimento" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 +#: ../src/ui/dialog/inkscape-preferences.cpp:1275 +msgid "Snap indicator" +msgstr "Indicatore aggancio" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1277 msgid "Enable snap indicator" msgstr "Attiva indicatore aggancio" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1279 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "" "Dopo l'aggancio, viene disegnato un simbolo nel punto in cui è avvenuto " "l'aggancio" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 -msgid "_Delay (in ms):" -msgstr "_Ritardo (in ms):" +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +msgid "Snap indicator persistence (in seconds):" +msgstr "Durata indicatore di aggancio (in secondi):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1230 +#: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "" -"Postpone snapping as long as the mouse is moving, and then wait an " -"additional fraction of a second. This additional delay is specified here. " -"When set to zero or to a very small number, snapping will be immediate." +"Controls how long the snap indicator message will be shown, before it " +"disappears" msgstr "" -"Postpone l'aggancio finché il mouse è in movimento e quindi aspetta un " -"ritardo aggiuntivo, specificabile qui. Se impostato a zero o ad un numero " -"molto piccolo, l'aggancio sarà immediato." -#: ../src/ui/dialog/inkscape-preferences.cpp:1232 +#: ../src/ui/dialog/inkscape-preferences.cpp:1287 +msgid "What should snap" +msgstr "Cosa agganciare" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Only snap the node closest to the pointer" msgstr "Aggancia solo il nodo più vicino al puntatore" -#: ../src/ui/dialog/inkscape-preferences.cpp:1234 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "" "Prova ad agganciare solamente il nodo che è inizialmente più vicino al " "puntatore del mouse" -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "_Weight factor:" msgstr "Fattore _peso:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +#: ../src/ui/dialog/inkscape-preferences.cpp:1295 msgid "" "When multiple snap solutions are found, then Inkscape can either prefer the " "closest transformation (when set to 0), or prefer the node that was " @@ -19381,12 +20209,12 @@ msgstr "" "scegliere la trasformazione più prossima (impostato a 0) o scegliere il nodo " "che era inizialmente più vicino al puntatore (impostato a 1)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1297 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "" "Aggancia il puntatore del mouse durante il trascinamento di un punto annodato" -#: ../src/ui/dialog/inkscape-preferences.cpp:1242 +#: ../src/ui/dialog/inkscape-preferences.cpp:1299 msgid "" "When dragging a knot along a constraint line, then snap the position of the " "mouse pointer instead of snapping the projection of the knot onto the " @@ -19396,16 +20224,34 @@ msgstr "" "posizione del puntatore del mouse invece delle proiezione del nodo lungo il " "tracciato" -#: ../src/ui/dialog/inkscape-preferences.cpp:1244 +#: ../src/ui/dialog/inkscape-preferences.cpp:1301 +msgid "Delayed snap" +msgstr "Aggancio ritardato" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 +msgid "Delay (in seconds):" +msgstr "Ritardo (in secondi):" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1305 +msgid "" +"Postpone snapping as long as the mouse is moving, and then wait an " +"additional fraction of a second. This additional delay is specified here. " +"When set to zero or to a very small number, snapping will be immediate." +msgstr "" +"Ritarda l'aggancio finché il mouse è in movimento e quindi aspetta un " +"ritardo aggiuntivo, specificabile qui. Se impostato a zero o ad un numero " +"molto piccolo, l'aggancio sarà immediato." + +#: ../src/ui/dialog/inkscape-preferences.cpp:1307 msgid "Snapping" msgstr "Aggancio" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgid "_Arrow keys move by:" msgstr "Le _frecce direzionali muovono di:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1313 msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" msgstr "" @@ -19413,27 +20259,27 @@ msgstr "" "di questa distanza" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1316 msgid "> and < _scale by:" msgstr "> e < _ridimensionano di:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1317 msgid "Pressing > or < scales selection up or down by this increment" msgstr "Premendo > o < si ridimensiona la selezione di questo fattore" -#: ../src/ui/dialog/inkscape-preferences.cpp:1256 +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "_Inset/Outset by:" msgstr "_Intrudi/Estrudi di:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1257 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 msgid "Inset and Outset commands displace the path by this distance" msgstr "I comandi Intrudi ed Estrudi spostano il tracciato di questa distanza" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1321 msgid "Compass-like display of angles" msgstr "Visualizzazione tipo bussola degli angoli" -#: ../src/ui/dialog/inkscape-preferences.cpp:1260 +#: ../src/ui/dialog/inkscape-preferences.cpp:1323 msgid "" "When on, angles are displayed with 0 at north, 0 to 360 range, positive " "clockwise; otherwise with 0 at east, -180 to 180 range, positive " @@ -19443,20 +20289,20 @@ msgstr "" "0~360, con positivo in senso orario. Se disattivato, lo 0 è a est, " "nell'intervallo -180~180, con positivo in senso antiorario" -#: ../src/ui/dialog/inkscape-preferences.cpp:1262 +#: ../src/ui/dialog/inkscape-preferences.cpp:1325 msgctxt "Rotation angle" msgid "None" msgstr "Nessuno" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "_Rotation snaps every:" msgstr "La _rotazione scatta ogni:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "degrees" msgstr "gradi" -#: ../src/ui/dialog/inkscape-preferences.cpp:1267 +#: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" @@ -19464,11 +20310,11 @@ msgstr "" "La rotazione con Ctrl premuto scatta di questo ammontare di gradi; inoltre, " "la pressione di [ o ] effettua una rotazione di questi gradi" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1331 msgid "Relative snapping of guideline angles" msgstr "Aggancio relativo degli angoli delle linee guida" -#: ../src/ui/dialog/inkscape-preferences.cpp:1270 +#: ../src/ui/dialog/inkscape-preferences.cpp:1333 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" @@ -19476,15 +20322,17 @@ msgstr "" "Quando attivo, l'angolo che scatta alla rotazione della linea guida sarà " "relativo all'angolo originale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1272 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 msgid "_Zoom in/out by:" msgstr "In_grandimento/Riduzione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1272 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/objects.cpp:1630 +#: ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "%" -#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" @@ -19492,44 +20340,44 @@ msgstr "" "Un clic dell'ingrandimento, i tasti +/- e un clic centrale " "dell'ingrandimento rimpiccioliscono o ingrandiscono di questo fattore" -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 +#: ../src/ui/dialog/inkscape-preferences.cpp:1337 msgid "Steps" msgstr "Scatti" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1277 +#: ../src/ui/dialog/inkscape-preferences.cpp:1340 msgid "Move in parallel" msgstr "Sono mossi in parallelo" -#: ../src/ui/dialog/inkscape-preferences.cpp:1279 +#: ../src/ui/dialog/inkscape-preferences.cpp:1342 msgid "Stay unmoved" msgstr "Restano fermi" -#: ../src/ui/dialog/inkscape-preferences.cpp:1281 +#: ../src/ui/dialog/inkscape-preferences.cpp:1344 msgid "Move according to transform" msgstr "Sono mossi secondo la trasformazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1346 msgid "Are unlinked" msgstr "Scollegati" -#: ../src/ui/dialog/inkscape-preferences.cpp:1285 +#: ../src/ui/dialog/inkscape-preferences.cpp:1348 msgid "Are deleted" msgstr "Cancellati" -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1351 msgid "Moving original: clones and linked offsets" msgstr "Muovendo l'originale: cloni e proiezioni collegate" -#: ../src/ui/dialog/inkscape-preferences.cpp:1290 +#: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Clones are translated by the same vector as their original" msgstr "I cloni vengono traslati dello stesso vettore dell'originale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1292 +#: ../src/ui/dialog/inkscape-preferences.cpp:1355 msgid "Clones preserve their positions when their original is moved" msgstr "I cloni preservano la loro posizione quando l'originale viene spostato" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 msgid "" "Each clone moves according to the value of its transform= attribute; for " "example, a rotated clone will move in a different direction than its original" @@ -19538,27 +20386,27 @@ msgstr "" "esempio, un clone ruotato verrà mosso in una direzione diversa dal suo " "originale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1295 +#: ../src/ui/dialog/inkscape-preferences.cpp:1358 msgid "Deleting original: clones" msgstr "Eliminando l'originale: cloni" -#: ../src/ui/dialog/inkscape-preferences.cpp:1297 +#: ../src/ui/dialog/inkscape-preferences.cpp:1360 msgid "Orphaned clones are converted to regular objects" msgstr "I cloni orfani vengono convertiti in oggetti normali" -#: ../src/ui/dialog/inkscape-preferences.cpp:1299 +#: ../src/ui/dialog/inkscape-preferences.cpp:1362 msgid "Orphaned clones are deleted along with their original" msgstr "I cloni orfani vengono cancellati assieme al loro originale" -#: ../src/ui/dialog/inkscape-preferences.cpp:1301 +#: ../src/ui/dialog/inkscape-preferences.cpp:1364 msgid "Duplicating original+clones/linked offset" msgstr "Duplicando originale+cloni/proiezione collegata" -#: ../src/ui/dialog/inkscape-preferences.cpp:1303 +#: ../src/ui/dialog/inkscape-preferences.cpp:1366 msgid "Relink duplicated clones" msgstr "Ricollega cloni duplicati" -#: ../src/ui/dialog/inkscape-preferences.cpp:1305 +#: ../src/ui/dialog/inkscape-preferences.cpp:1368 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -19569,29 +20417,29 @@ msgstr "" "duplicato invece che al vecchio originale" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1308 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "Clones" msgstr "Cloni" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1311 +#: ../src/ui/dialog/inkscape-preferences.cpp:1374 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" "Durante l'applicazione, usa l'oggetto selezionato superiore come tracciato " "di fissaggio o maschera" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" "Deseleziona per usare l'oggetto selezionato inferiore come tracciato di " "fissaggio o maschera" -#: ../src/ui/dialog/inkscape-preferences.cpp:1314 +#: ../src/ui/dialog/inkscape-preferences.cpp:1377 msgid "Remove clippath/mask object after applying" msgstr "Rimuove il tracciato di fissaggio o la maschera dopo l'applicazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 +#: ../src/ui/dialog/inkscape-preferences.cpp:1379 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" @@ -19599,106 +20447,106 @@ msgstr "" "Dopo l'applicazione, rimuove dal disegno l'oggetto usato come tracciato di " "fissaggio o maschera" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1381 msgid "Before applying" msgstr "Prima di applicare" -#: ../src/ui/dialog/inkscape-preferences.cpp:1320 +#: ../src/ui/dialog/inkscape-preferences.cpp:1383 msgid "Do not group clipped/masked objects" msgstr "Non raggruppare gli oggetti con fissaggio o mascheramento" -#: ../src/ui/dialog/inkscape-preferences.cpp:1321 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Put every clipped/masked object in its own group" msgstr "Metti ogni oggetto con fissaggio o maschera in un proprio gruppo" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 msgid "Put all clipped/masked objects into one group" msgstr "Metti tutti gli oggetti con fissaggio e mascheramento in un gruppo" -#: ../src/ui/dialog/inkscape-preferences.cpp:1325 +#: ../src/ui/dialog/inkscape-preferences.cpp:1388 msgid "Apply clippath/mask to every object" msgstr "Applica a ogni oggetto con fissaggio o mascheramento" -#: ../src/ui/dialog/inkscape-preferences.cpp:1328 +#: ../src/ui/dialog/inkscape-preferences.cpp:1391 msgid "Apply clippath/mask to groups containing single object" msgstr "" "Applica fissaggio o mascheramento a gruppi che contengono un solo oggetto" -#: ../src/ui/dialog/inkscape-preferences.cpp:1331 +#: ../src/ui/dialog/inkscape-preferences.cpp:1394 msgid "Apply clippath/mask to group containing all objects" msgstr "" "Applica fissaggio o mascheramento a un gruppo che contiene tutti gli oggetti" -#: ../src/ui/dialog/inkscape-preferences.cpp:1333 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "After releasing" msgstr "Dopo il rilascio" -#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Ungroup automatically created groups" msgstr "Dividi gruppi creati automaticamente" -#: ../src/ui/dialog/inkscape-preferences.cpp:1337 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Ungroup groups created when setting clip/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1339 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Clippaths and masks" msgstr "Fissaggio e mascheramento" -#: ../src/ui/dialog/inkscape-preferences.cpp:1342 +#: ../src/ui/dialog/inkscape-preferences.cpp:1405 msgid "Stroke Style Markers" msgstr "Stile delimitatori contorno" -#: ../src/ui/dialog/inkscape-preferences.cpp:1344 -#: ../src/ui/dialog/inkscape-preferences.cpp:1346 +#: ../src/ui/dialog/inkscape-preferences.cpp:1407 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1350 +#: ../src/ui/dialog/inkscape-preferences.cpp:1413 #: ../share/extensions/hershey.inx.h:27 msgid "Markers" msgstr "Delimitatori" -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1416 msgid "Document cleanup" msgstr "Pulisci documento" -#: ../src/ui/dialog/inkscape-preferences.cpp:1354 -#: ../src/ui/dialog/inkscape-preferences.cpp:1356 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 msgid "Remove unused swatches when doing a document cleanup" msgstr "Rimuovi campioni inutizzati quando pulisci un documento" #. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1357 +#: ../src/ui/dialog/inkscape-preferences.cpp:1420 msgid "Cleanup" msgstr "Pulisci" -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Number of _Threads:" msgstr "Numero di _Thread:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 -#: ../src/ui/dialog/inkscape-preferences.cpp:1901 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "(requires restart)" msgstr "(richiede riapertura)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1429 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" "Configura il numero di processori/thread da usare per renderizzare i filtri" -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "Rendering _cache size:" msgstr "Dimensione _cache rendering:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "MiB" -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "" "Set the amount of memory per document which can be used to store rendered " "parts of the drawing for later reuse; set to zero to disable caching" @@ -19709,37 +20557,37 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 -#: ../src/ui/dialog/inkscape-preferences.cpp:1397 +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1460 msgid "Best quality (slowest)" msgstr "Qualità ottima (più lenta)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1375 -#: ../src/ui/dialog/inkscape-preferences.cpp:1399 +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 +#: ../src/ui/dialog/inkscape-preferences.cpp:1462 msgid "Better quality (slower)" msgstr "Qualità buona (lenta)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1377 -#: ../src/ui/dialog/inkscape-preferences.cpp:1401 +#: ../src/ui/dialog/inkscape-preferences.cpp:1440 +#: ../src/ui/dialog/inkscape-preferences.cpp:1464 msgid "Average quality" msgstr "Qualità media" -#: ../src/ui/dialog/inkscape-preferences.cpp:1379 -#: ../src/ui/dialog/inkscape-preferences.cpp:1403 +#: ../src/ui/dialog/inkscape-preferences.cpp:1442 +#: ../src/ui/dialog/inkscape-preferences.cpp:1466 msgid "Lower quality (faster)" msgstr "Qualità inferiore (veloce)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1381 -#: ../src/ui/dialog/inkscape-preferences.cpp:1405 +#: ../src/ui/dialog/inkscape-preferences.cpp:1444 +#: ../src/ui/dialog/inkscape-preferences.cpp:1468 msgid "Lowest quality (fastest)" msgstr "Qualità peggiore (più veloce)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1384 +#: ../src/ui/dialog/inkscape-preferences.cpp:1447 msgid "Gaussian blur quality for display" msgstr "Qualità della sfocatura gaussiana in visualizzazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1386 -#: ../src/ui/dialog/inkscape-preferences.cpp:1410 +#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1473 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" @@ -19747,128 +20595,128 @@ msgstr "" "Qualità ottima, ma la visualizzazione può essere molto lenta ad alti " "ingrandimenti (l'esportazione bitmap usa sempre l'ottima qualità)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 -#: ../src/ui/dialog/inkscape-preferences.cpp:1412 +#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1475 msgid "Better quality, but slower display" msgstr "Qualità buona, ma visualizzazione più lenta" -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 -#: ../src/ui/dialog/inkscape-preferences.cpp:1414 +#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1477 msgid "Average quality, acceptable display speed" msgstr "Qualità media, buon compromesso per velocità di visualizzazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1392 -#: ../src/ui/dialog/inkscape-preferences.cpp:1416 +#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1479 msgid "Lower quality (some artifacts), but display is faster" msgstr "Qualità scadente (artefatti visibili), ma veloce in visualizzazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 -#: ../src/ui/dialog/inkscape-preferences.cpp:1418 +#: ../src/ui/dialog/inkscape-preferences.cpp:1457 +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "" "Qualità pessima (pesanti artefatti visibili), ma velocissimo in " "visualizzazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1408 +#: ../src/ui/dialog/inkscape-preferences.cpp:1471 msgid "Filter effects quality for display" msgstr "Qualità degli effetti in visualizzazione" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1420 +#: ../src/ui/dialog/inkscape-preferences.cpp:1483 #: ../src/ui/dialog/print.cpp:215 msgid "Rendering" msgstr "Rendering" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1426 ../src/verbs.cpp:156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1489 ../src/verbs.cpp:156 #: ../src/widgets/calligraphy-toolbar.cpp:626 msgid "Edit" msgstr "Modifica" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 +#: ../src/ui/dialog/inkscape-preferences.cpp:1490 msgid "Automatically reload bitmaps" msgstr "Ricarica automaticamente bitmap" -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 +#: ../src/ui/dialog/inkscape-preferences.cpp:1492 msgid "Automatically reload linked images when file is changed on disk" msgstr "" "Ricarica automaticamente le immagini collegate quando il file viene cambiato" -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 +#: ../src/ui/dialog/inkscape-preferences.cpp:1494 msgid "_Bitmap editor:" msgstr "Editor _bitmap:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1433 -#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:55 +#: ../src/ui/dialog/inkscape-preferences.cpp:1496 +#: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "Esporta" -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 msgid "Default export _resolution:" msgstr "_Risoluzione predefinita per l'esportazione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1499 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "" "Risoluzione predefinita (in punti per pollice) delle bitmap nella " "sottofinestra Esporta" -#: ../src/ui/dialog/inkscape-preferences.cpp:1437 -#: ../src/ui/dialog/xml-tree.cpp:912 +#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/xml-tree.cpp:920 msgid "Create" msgstr "Crea" -#: ../src/ui/dialog/inkscape-preferences.cpp:1439 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 msgid "Resolution for Create Bitmap _Copy:" msgstr "Risoluzione per Crea una copia bit_map:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1440 +#: ../src/ui/dialog/inkscape-preferences.cpp:1503 msgid "Resolution used by the Create Bitmap Copy command" msgstr "Risoluzione usata dal comando Crea una copia bitmap" -#: ../src/ui/dialog/inkscape-preferences.cpp:1443 +#: ../src/ui/dialog/inkscape-preferences.cpp:1506 msgid "Ask about linking and scaling when importing" msgstr "Chiedi modalità e risoluzione dell'importazione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1445 +#: ../src/ui/dialog/inkscape-preferences.cpp:1508 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "" "Mostra la finestra sulla modalità di importazione e risoluzione " "dell'immagine quando un'immagine bitmap è importata." -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1514 msgid "Bitmap link:" msgstr "Collegamento bitmap:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1458 +#: ../src/ui/dialog/inkscape-preferences.cpp:1521 msgid "Bitmap scale (image-rendering):" msgstr "Ridimensionamento bitmap (rendering):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "Default _import resolution:" msgstr "Risoluzione predefinita per l'_importazione:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#: ../src/ui/dialog/inkscape-preferences.cpp:1527 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" "Risoluzione predefinita (in punti per pollice) delle bitmap nella " "sottofinestra Esporta" -#: ../src/ui/dialog/inkscape-preferences.cpp:1465 +#: ../src/ui/dialog/inkscape-preferences.cpp:1528 msgid "Override file resolution" msgstr "Ignora risoluzione file" -#: ../src/ui/dialog/inkscape-preferences.cpp:1467 +#: ../src/ui/dialog/inkscape-preferences.cpp:1530 msgid "Use default bitmap resolution in favor of information from file" msgstr "Usa la risoluzione bitmap predefinita invece di quella del file" #. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1471 +#: ../src/ui/dialog/inkscape-preferences.cpp:1534 msgid "Images in Outline Mode" msgstr "Immagini in Modalità Scheletro" -#: ../src/ui/dialog/inkscape-preferences.cpp:1472 +#: ../src/ui/dialog/inkscape-preferences.cpp:1535 msgid "" "When active will render images while in outline mode instead of a red box " "with an x. This is useful for manual tracing." @@ -19876,45 +20724,38 @@ msgstr "" "Quando attivo, renderizzerà le immagini durante la modalità scheletro invece " "di un riquadro rosso con una x. Utile per la vettorizzazione manuale." -#: ../src/ui/dialog/inkscape-preferences.cpp:1474 +#: ../src/ui/dialog/inkscape-preferences.cpp:1537 msgid "Bitmaps" msgstr "Bitmap" -#: ../src/ui/dialog/inkscape-preferences.cpp:1486 +#: ../src/ui/dialog/inkscape-preferences.cpp:1549 +#, fuzzy msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " -"create will be added seperately to " +"create will be added separately to " msgstr "" "Seleziona un file di scorciatoie predefinite da usare. Qualsiasi scorciatoia " "creata sarà aggiunta separatamente a " -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 +#: ../src/ui/dialog/inkscape-preferences.cpp:1552 msgid "Shortcut file:" msgstr "File scorciatoie:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1492 -#: ../src/ui/dialog/template-load-tab.cpp:48 +#: ../src/ui/dialog/inkscape-preferences.cpp:1555 +#: ../src/ui/dialog/template-load-tab.cpp:49 msgid "Search:" msgstr "Cerca:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1504 +#: ../src/ui/dialog/inkscape-preferences.cpp:1567 msgid "Shortcut" msgstr "Scorciatoia" -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 -#: ../src/ui/widget/page-sizer.cpp:264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 +#: ../src/ui/widget/page-sizer.cpp:287 msgid "Description" msgstr "Descrizione" -#: ../src/ui/dialog/inkscape-preferences.cpp:1560 -#: ../src/ui/dialog/pixelartdialog.cpp:296 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:698 -#: ../src/ui/dialog/tracedialog.cpp:813 -#: ../src/ui/widget/preferences-widget.cpp:749 -msgid "Reset" -msgstr "Reimposta " - -#: ../src/ui/dialog/inkscape-preferences.cpp:1560 +#: ../src/ui/dialog/inkscape-preferences.cpp:1623 msgid "" "Remove all your customized keyboard shortcuts, and revert to the shortcuts " "in the shortcut file listed above" @@ -19922,45 +20763,45 @@ msgstr "" "Rimuove tutte le scorciatoie da tastiera personalizzate e le reimposta come " "nel file scorciatoie sopra elencato" -#: ../src/ui/dialog/inkscape-preferences.cpp:1564 +#: ../src/ui/dialog/inkscape-preferences.cpp:1627 msgid "Import ..." msgstr "Importa..." -#: ../src/ui/dialog/inkscape-preferences.cpp:1564 +#: ../src/ui/dialog/inkscape-preferences.cpp:1627 msgid "Import custom keyboard shortcuts from a file" msgstr "Importa scorciatoie da tastiera personalizzate da un file" -#: ../src/ui/dialog/inkscape-preferences.cpp:1567 +#: ../src/ui/dialog/inkscape-preferences.cpp:1630 msgid "Export ..." msgstr "Esporta..." -#: ../src/ui/dialog/inkscape-preferences.cpp:1567 +#: ../src/ui/dialog/inkscape-preferences.cpp:1630 msgid "Export custom keyboard shortcuts to a file" msgstr "Esporta scorciatoie da tastiera personalizzate in un file" -#: ../src/ui/dialog/inkscape-preferences.cpp:1577 +#: ../src/ui/dialog/inkscape-preferences.cpp:1640 msgid "Keyboard Shortcuts" msgstr "Scorciatoie da tastiera" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1740 +#: ../src/ui/dialog/inkscape-preferences.cpp:1803 msgid "Misc" msgstr "Varie" -#: ../src/ui/dialog/inkscape-preferences.cpp:1842 +#: ../src/ui/dialog/inkscape-preferences.cpp:1905 msgctxt "Spellchecker language" msgid "None" msgstr "Nessuna" -#: ../src/ui/dialog/inkscape-preferences.cpp:1863 +#: ../src/ui/dialog/inkscape-preferences.cpp:1926 msgid "Set the main spell check language" msgstr "Imposta la lingua principale del controllo ortografico" -#: ../src/ui/dialog/inkscape-preferences.cpp:1866 +#: ../src/ui/dialog/inkscape-preferences.cpp:1929 msgid "Second language:" msgstr "Seconda lingua:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1867 +#: ../src/ui/dialog/inkscape-preferences.cpp:1930 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" @@ -19968,11 +20809,11 @@ msgstr "" "Imposta la lingua secondaria per il controllo ortografico; il controllo " "evidenzierà solo parole non presenti in nessuna lingua selezionata" -#: ../src/ui/dialog/inkscape-preferences.cpp:1870 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "Third language:" msgstr "Terza lingua:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1871 +#: ../src/ui/dialog/inkscape-preferences.cpp:1934 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" @@ -19980,31 +20821,31 @@ msgstr "" "Imposta la terza lingua per il controllo ortografico; il controllo " "evidenzierà solo parole non presenti in nessuna lingua selezionata" -#: ../src/ui/dialog/inkscape-preferences.cpp:1873 +#: ../src/ui/dialog/inkscape-preferences.cpp:1936 msgid "Ignore words with digits" msgstr "Ignora parole con numeri" -#: ../src/ui/dialog/inkscape-preferences.cpp:1875 +#: ../src/ui/dialog/inkscape-preferences.cpp:1938 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "Ignora le parole contenenti numeri, come \"R2D2\"" -#: ../src/ui/dialog/inkscape-preferences.cpp:1877 +#: ../src/ui/dialog/inkscape-preferences.cpp:1940 msgid "Ignore words in ALL CAPITALS" msgstr "Ignora parole TUTTE MAIUSCOLE" -#: ../src/ui/dialog/inkscape-preferences.cpp:1879 +#: ../src/ui/dialog/inkscape-preferences.cpp:1942 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "Ignora parole scritte tutte maiuscole, come \"IUPAC\"" -#: ../src/ui/dialog/inkscape-preferences.cpp:1881 +#: ../src/ui/dialog/inkscape-preferences.cpp:1944 msgid "Spellcheck" msgstr "Correttore ortografico" -#: ../src/ui/dialog/inkscape-preferences.cpp:1901 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "Latency _skew:" msgstr "_Ritardo latenza:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1902 +#: ../src/ui/dialog/inkscape-preferences.cpp:1965 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" @@ -20012,11 +20853,11 @@ msgstr "" "Il fattore di ritardo del clock degli eventi dal tempo reale (0.9766 su " "alcuni sistemi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1904 +#: ../src/ui/dialog/inkscape-preferences.cpp:1967 msgid "Pre-render named icons" msgstr "Effettua render anticipato delle icone con nome" -#: ../src/ui/dialog/inkscape-preferences.cpp:1906 +#: ../src/ui/dialog/inkscape-preferences.cpp:1969 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" @@ -20025,83 +20866,83 @@ msgstr "" "mostrate nell'interfaccia. Questo può aiutare ad evitare un bug nelle " "notifiche delle icone di GTK+" -#: ../src/ui/dialog/inkscape-preferences.cpp:1914 +#: ../src/ui/dialog/inkscape-preferences.cpp:1977 msgid "System info" msgstr "Informazione sistema" -#: ../src/ui/dialog/inkscape-preferences.cpp:1918 +#: ../src/ui/dialog/inkscape-preferences.cpp:1981 msgid "User config: " msgstr "Configurazione utente:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1918 +#: ../src/ui/dialog/inkscape-preferences.cpp:1981 msgid "Location of users configuration" msgstr "Locazione della configurazione utente" -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 +#: ../src/ui/dialog/inkscape-preferences.cpp:1985 msgid "User preferences: " msgstr "Preferenze utente: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 +#: ../src/ui/dialog/inkscape-preferences.cpp:1985 msgid "Location of the users preferences file" msgstr "Locazione del file di preferenze dell'utente" -#: ../src/ui/dialog/inkscape-preferences.cpp:1926 +#: ../src/ui/dialog/inkscape-preferences.cpp:1989 msgid "User extensions: " msgstr "Estensioni utente: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1926 +#: ../src/ui/dialog/inkscape-preferences.cpp:1989 msgid "Location of the users extensions" msgstr "Locazione delle estensioni dell'utente" -#: ../src/ui/dialog/inkscape-preferences.cpp:1930 +#: ../src/ui/dialog/inkscape-preferences.cpp:1993 msgid "User cache: " msgstr "Cache utente: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1930 +#: ../src/ui/dialog/inkscape-preferences.cpp:1993 msgid "Location of users cache" msgstr "Locazione della cache dell'utente" -#: ../src/ui/dialog/inkscape-preferences.cpp:1938 +#: ../src/ui/dialog/inkscape-preferences.cpp:2001 msgid "Temporary files: " msgstr "File temporanei: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1938 +#: ../src/ui/dialog/inkscape-preferences.cpp:2001 msgid "Location of the temporary files used for autosave" msgstr "Locazione dei file temporanei usati per l'autosalvataggio" -#: ../src/ui/dialog/inkscape-preferences.cpp:1942 +#: ../src/ui/dialog/inkscape-preferences.cpp:2005 msgid "Inkscape data: " msgstr "Dati Inkscape: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1942 +#: ../src/ui/dialog/inkscape-preferences.cpp:2005 msgid "Location of Inkscape data" msgstr "Locazione dei dati di Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1946 +#: ../src/ui/dialog/inkscape-preferences.cpp:2009 msgid "Inkscape extensions: " msgstr "Estensioni di Inkscape: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1946 +#: ../src/ui/dialog/inkscape-preferences.cpp:2009 msgid "Location of the Inkscape extensions" msgstr "Locazione delle estensioni di Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1955 +#: ../src/ui/dialog/inkscape-preferences.cpp:2018 msgid "System data: " msgstr "Dati sistema: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1955 +#: ../src/ui/dialog/inkscape-preferences.cpp:2018 msgid "Locations of system data" msgstr "Locazione dei dati di sistema" -#: ../src/ui/dialog/inkscape-preferences.cpp:1979 +#: ../src/ui/dialog/inkscape-preferences.cpp:2042 msgid "Icon theme: " msgstr "Tema icone: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1979 +#: ../src/ui/dialog/inkscape-preferences.cpp:2042 msgid "Locations of icon themes" msgstr "Locazione dei temi delle icone" -#: ../src/ui/dialog/inkscape-preferences.cpp:1981 +#: ../src/ui/dialog/inkscape-preferences.cpp:2044 msgid "System" msgstr "Sistema" @@ -20142,7 +20983,8 @@ msgid "Link:" msgstr "Linea" #: ../src/ui/dialog/input.cpp:742 ../src/ui/dialog/input.cpp:743 -#: ../src/ui/dialog/input.cpp:1571 +#: ../src/ui/dialog/input.cpp:1571 ../src/ui/widget/color-scales.cpp:46 +#: ../share/extensions/plotter.inx.h:24 msgid "None" msgstr "Nessuno" @@ -20191,7 +21033,8 @@ msgstr "" "tutto lo 'Schermo' o a una sigola 'Finestra'" #: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 -#: ../src/widgets/spray-toolbar.cpp:224 ../src/widgets/tweak-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:311 ../src/widgets/spray-toolbar.cpp:427 +#: ../src/widgets/spray-toolbar.cpp:476 ../src/widgets/tweak-toolbar.cpp:372 msgid "Pressure" msgstr "Pressione" @@ -20204,7 +21047,7 @@ msgid "Y tilt" msgstr "" #: ../src/ui/dialog/input.cpp:1616 -#: ../src/widgets/sp-color-wheel-selector.cpp:59 +#: ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "Ruota" @@ -20213,6 +21056,38 @@ msgctxt "Input device axe" msgid "None" msgstr "Nessuno" +#: ../src/ui/dialog/knot-properties.cpp:59 +#, fuzzy +msgid "Position X:" +msgstr "Posizione:" + +#: ../src/ui/dialog/knot-properties.cpp:66 +#, fuzzy +msgid "Position Y:" +msgstr "Posizione:" + +#: ../src/ui/dialog/knot-properties.cpp:120 +#, fuzzy +msgid "Modify Knot Position" +msgstr "Posizione x dell'illuminazione" + +#: ../src/ui/dialog/knot-properties.cpp:121 +#: ../src/ui/dialog/layer-properties.cpp:411 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 +#: ../src/ui/dialog/transformation.cpp:107 +msgid "_Move" +msgstr "_Muovi" + +#: ../src/ui/dialog/knot-properties.cpp:180 +#, fuzzy, c-format +msgid "Position X (%s):" +msgstr "Posizione:" + +#: ../src/ui/dialog/knot-properties.cpp:181 +#, fuzzy, c-format +msgid "Position Y (%s):" +msgstr "Posizione:" + #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "Nome del livello:" @@ -20240,7 +21115,7 @@ msgstr "Rinomina livello" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:354 #: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2289 +#: ../src/verbs.cpp:2363 msgid "Layer" msgstr "Livello" @@ -20248,7 +21123,7 @@ msgstr "Livello" msgid "_Rename" msgstr "_Rinomina" -#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:750 +#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:758 msgid "Rename layer" msgstr "Rinomina livello" @@ -20273,60 +21148,58 @@ msgstr "Nuovo livello creato." msgid "Move to Layer" msgstr "Sposta a livello" -#: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/transformation.cpp:114 -msgid "_Move" -msgstr "_Muovi" - -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:610 msgid "Unhide layer" msgstr "Mostra livello" -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:610 msgid "Hide layer" msgstr "Nascondi livello" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:602 msgid "Lock layer" msgstr "Blocca livello" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:602 msgid "Unlock layer" msgstr "Sblocca livello" -#: ../src/ui/dialog/layers.cpp:624 ../src/verbs.cpp:1405 +#: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 +#: ../src/verbs.cpp:1423 msgid "Toggle layer solo" msgstr "Visibilità esclusiva del livello" -#: ../src/ui/dialog/layers.cpp:627 ../src/verbs.cpp:1429 +#: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 +#: ../src/verbs.cpp:1447 msgid "Lock other layers" msgstr "Blocca altri livelli" -#: ../src/ui/dialog/layers.cpp:721 -msgid "Moved layer" +#: ../src/ui/dialog/layers.cpp:730 +#, fuzzy +msgid "Move layer" msgstr "Sposta livello" -#: ../src/ui/dialog/layers.cpp:884 +#: ../src/ui/dialog/layers.cpp:892 msgctxt "Layers" msgid "New" msgstr "Nuovo" -#: ../src/ui/dialog/layers.cpp:889 +#: ../src/ui/dialog/layers.cpp:897 msgctxt "Layers" msgid "Bot" msgstr "Fondo" -#: ../src/ui/dialog/layers.cpp:895 +#: ../src/ui/dialog/layers.cpp:903 msgctxt "Layers" msgid "Dn" msgstr "Abbassa" -#: ../src/ui/dialog/layers.cpp:901 +#: ../src/ui/dialog/layers.cpp:909 msgctxt "Layers" msgid "Up" msgstr "Alza" -#: ../src/ui/dialog/layers.cpp:907 +#: ../src/ui/dialog/layers.cpp:915 msgctxt "Layers" msgid "Top" msgstr "Cima" @@ -20335,76 +21208,123 @@ msgstr "Cima" msgid "Add Path Effect" msgstr "Aggiungi effetto su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:109 +#: ../src/ui/dialog/livepatheffect-editor.cpp:119 msgid "Add path effect" msgstr "Aggiungi effetto su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:119 +#: ../src/ui/dialog/livepatheffect-editor.cpp:123 msgid "Delete current path effect" msgstr "Elimina effetto su tracciato attuale" -#: ../src/ui/dialog/livepatheffect-editor.cpp:129 +#: ../src/ui/dialog/livepatheffect-editor.cpp:127 msgid "Raise the current path effect" msgstr "Alza l'effetto su tracciato attuale" -#: ../src/ui/dialog/livepatheffect-editor.cpp:139 +#: ../src/ui/dialog/livepatheffect-editor.cpp:131 msgid "Lower the current path effect" msgstr "Abbassa l'effetto su tracciato attuale" -#: ../src/ui/dialog/livepatheffect-editor.cpp:313 +#: ../src/ui/dialog/livepatheffect-editor.cpp:298 msgid "Unknown effect is applied" msgstr "È applicato un effetto sconosciuto" -#: ../src/ui/dialog/livepatheffect-editor.cpp:316 +#: ../src/ui/dialog/livepatheffect-editor.cpp:301 msgid "Click button to add an effect" msgstr "Clicca il bottone per aggiungere un effetto" -#: ../src/ui/dialog/livepatheffect-editor.cpp:329 +#: ../src/ui/dialog/livepatheffect-editor.cpp:316 msgid "Click add button to convert clone" msgstr "Clicca aggiungi per convertire il clone" +#: ../src/ui/dialog/livepatheffect-editor.cpp:321 +#: ../src/ui/dialog/livepatheffect-editor.cpp:325 #: ../src/ui/dialog/livepatheffect-editor.cpp:334 -#: ../src/ui/dialog/livepatheffect-editor.cpp:338 -#: ../src/ui/dialog/livepatheffect-editor.cpp:346 msgid "Select a path or shape" msgstr "Seleziona un tracciato o una forma" -#: ../src/ui/dialog/livepatheffect-editor.cpp:342 +#: ../src/ui/dialog/livepatheffect-editor.cpp:330 msgid "Only one item can be selected" msgstr "Può essere selezionato un solo oggetto" -#: ../src/ui/dialog/livepatheffect-editor.cpp:374 +#: ../src/ui/dialog/livepatheffect-editor.cpp:362 msgid "Unknown effect" msgstr "È applicato un effetto sconosciuto" -#: ../src/ui/dialog/livepatheffect-editor.cpp:450 +#: ../src/ui/dialog/livepatheffect-editor.cpp:438 msgid "Create and apply path effect" msgstr "Crea e applica effetti su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:485 +#: ../src/ui/dialog/livepatheffect-editor.cpp:478 msgid "Create and apply Clone original path effect" msgstr "Crea e applica l'effetto Clona tracciato originale" -#: ../src/ui/dialog/livepatheffect-editor.cpp:505 +#: ../src/ui/dialog/livepatheffect-editor.cpp:500 msgid "Remove path effect" msgstr "Rimuovi effetti su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:522 +#: ../src/ui/dialog/livepatheffect-editor.cpp:518 msgid "Move path effect up" msgstr "Sposta in alto effetto su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:538 +#: ../src/ui/dialog/livepatheffect-editor.cpp:535 msgid "Move path effect down" msgstr "Sposta in basso effetto su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:577 +#: ../src/ui/dialog/livepatheffect-editor.cpp:574 msgid "Activate path effect" msgstr "Attiva effetto su tracciato" -#: ../src/ui/dialog/livepatheffect-editor.cpp:577 +#: ../src/ui/dialog/livepatheffect-editor.cpp:574 msgid "Deactivate path effect" msgstr "Disattiva effetto su tracciato" +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:53 +#, fuzzy +msgid "Radius (pixels):" +msgstr "Raggio (px):" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:65 +#, fuzzy +msgid "Chamfer subdivisions:" +msgstr "Suddivisioni:" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:136 +msgid "Modify Fillet-Chamfer" +msgstr "" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:137 +#, fuzzy +msgid "_Modify" +msgstr "Modifica tracciato" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:201 +msgid "Radius" +msgstr "Raggio" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:203 +#, fuzzy +msgid "Radius approximated" +msgstr "(arrotondato)" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:206 +#, fuzzy +msgid "Knot distance" +msgstr "Distanza di aggancio" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:213 +#, fuzzy +msgid "Position (%):" +msgstr "Posizione:" + +#: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:216 +#, fuzzy +msgid "%1:" +msgstr "k1:" + +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:122 +msgid "Modify Node Position" +msgstr "" + #: ../src/ui/dialog/memory.cpp:96 msgid "Heap" msgstr "Heap" @@ -20452,11 +21372,11 @@ msgstr "Cattura log iniziata." msgid "Log capture stopped." msgstr "Cattura log terminata." -#: ../src/ui/dialog/new-from-template.cpp:24 +#: ../src/ui/dialog/new-from-template.cpp:27 msgid "Create from template" msgstr "Crea da modello" -#: ../src/ui/dialog/new-from-template.cpp:26 +#: ../src/ui/dialog/new-from-template.cpp:29 msgid "New From Template" msgstr "Nuovo da modello" @@ -20563,8 +21483,8 @@ msgid "Check to make the object insensitive (not selectable by mouse)" msgstr "Rende l'oggetto bloccato (non selezionabile col mouse)" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2632 -#: ../src/verbs.cpp:2638 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2719 msgid "_Set" msgstr "Impo_sta" @@ -20622,6 +21542,227 @@ msgstr "Nascondi oggetto" msgid "Unhide object" msgstr "Mostra oggetto" +#: ../src/ui/dialog/objects.cpp:874 +#, fuzzy +msgid "Unhide objects" +msgstr "Mostra oggetto" + +#: ../src/ui/dialog/objects.cpp:874 +#, fuzzy +msgid "Hide objects" +msgstr "Nascondi oggetto" + +#: ../src/ui/dialog/objects.cpp:894 +#, fuzzy +msgid "Lock objects" +msgstr "Blocca oggetto" + +#: ../src/ui/dialog/objects.cpp:894 +#, fuzzy +msgid "Unlock objects" +msgstr "Sblocca oggetto" + +#: ../src/ui/dialog/objects.cpp:906 +#, fuzzy +msgid "Layer to group" +msgstr "Sposta livello in cima" + +#: ../src/ui/dialog/objects.cpp:906 +#, fuzzy +msgid "Group to layer" +msgstr "Gruppo a simbolo" + +#: ../src/ui/dialog/objects.cpp:1104 +#, fuzzy +msgid "Moved objects" +msgstr "Nessun oggetto" + +#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:853 +#: ../src/ui/dialog/tags.cpp:860 +#, fuzzy +msgid "Rename object" +msgstr "Ruota oggetti" + +#: ../src/ui/dialog/objects.cpp:1459 +#, fuzzy +msgid "Set object highlight color" +msgstr "Imposta titolo oggetto" + +#: ../src/ui/dialog/objects.cpp:1469 +#, fuzzy +msgid "Set object opacity" +msgstr "Imposta titolo oggetto" + +#: ../src/ui/dialog/objects.cpp:1502 +#, fuzzy +msgid "Set object blend mode" +msgstr "Imposta etichetta oggetto" + +#: ../src/ui/dialog/objects.cpp:1558 +#, fuzzy +msgid "Set object blur" +msgstr "Imposta etichetta oggetto" + +#: ../src/ui/dialog/objects.cpp:1621 +msgctxt "Visibility" +msgid "V" +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1622 +#, fuzzy +msgctxt "Lock" +msgid "L" +msgstr "L" + +#: ../src/ui/dialog/objects.cpp:1623 +msgctxt "Type" +msgid "T" +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1624 +#, fuzzy +msgctxt "Clip and mask" +msgid "CM" +msgstr "CMS" + +#: ../src/ui/dialog/objects.cpp:1625 +#, fuzzy +msgctxt "Highlight" +msgid "HL" +msgstr "HSL" + +#: ../src/ui/dialog/objects.cpp:1626 +msgid "Label" +msgstr "Etichetta" + +#. In order to get tooltips on header, we must create our own label. +#: ../src/ui/dialog/objects.cpp:1668 +#, fuzzy +msgid "Toggle visibility of Layer, Group, or Object." +msgstr "Imposta la visibilità del livello attuale" + +#: ../src/ui/dialog/objects.cpp:1681 +msgid "Toggle lock of Layer, Group, or Object." +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1693 +msgid "" +"Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " +"between the two types." +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1712 +msgid "Is object clipped and/or masked?" +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1723 +msgid "" +"Highlight color of outline in Node tool. Click to set. If alpha is zero, use " +"inherited color." +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1734 +msgid "" +"Layer/Group/Object label (inkscape:label). Double-click to set. Default " +"value is object 'id'." +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1831 +#, fuzzy +msgid "Add layer..." +msgstr "_Aggiungi livello..." + +#: ../src/ui/dialog/objects.cpp:1838 +#, fuzzy +msgid "Remove object" +msgstr "Rimuovi font" + +#: ../src/ui/dialog/objects.cpp:1846 +#, fuzzy +msgid "Move To Bottom" +msgstr "Sposta in fondo" + +#: ../src/ui/dialog/objects.cpp:1870 +#, fuzzy +msgid "Move To Top" +msgstr "Sposta a:" + +#: ../src/ui/dialog/objects.cpp:1878 +#, fuzzy +msgid "Collapse All" +msgstr "Elimina tu_tto" + +#: ../src/ui/dialog/objects.cpp:1892 +#, fuzzy +msgid "Rename" +msgstr "_Rinomina" + +#: ../src/ui/dialog/objects.cpp:1898 +msgid "Solo" +msgstr "" + +#: ../src/ui/dialog/objects.cpp:1899 +#, fuzzy +msgid "Show All" +msgstr "Mostra:" + +#: ../src/ui/dialog/objects.cpp:1900 +#, fuzzy +msgid "Hide All" +msgstr "Mostra tutto" + +#: ../src/ui/dialog/objects.cpp:1904 +#, fuzzy +msgid "Lock Others" +msgstr "Blocca altri livelli" + +#: ../src/ui/dialog/objects.cpp:1905 +#, fuzzy +msgid "Lock All" +msgstr "Sblocca tutto" + +#. LockAndHide +#: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3011 +msgid "Unlock All" +msgstr "Sblocca tutto" + +#: ../src/ui/dialog/objects.cpp:1910 +#, fuzzy +msgid "Up" +msgstr "Alza" + +#: ../src/ui/dialog/objects.cpp:1911 +#, fuzzy +msgid "Down" +msgstr "Contrario" + +#: ../src/ui/dialog/objects.cpp:1920 +#, fuzzy +msgid "Set Clip" +msgstr "Imposta fi_ssaggio" + +#. will never be implemented +#. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) ); +#: ../src/ui/dialog/objects.cpp:1926 +#, fuzzy +msgid "Unset Clip" +msgstr "Imposta fi_ssaggio" + +#. Set mask +#: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1754 +msgid "Set Mask" +msgstr "Imposta maschera" + +#: ../src/ui/dialog/objects.cpp:1931 +#, fuzzy +msgid "Unset Mask" +msgstr "Imposta maschera" + +#: ../src/ui/dialog/objects.cpp:1953 +#, fuzzy +msgid "Select Highlight Color" +msgstr "Colore di e_videnziazione:" + #: ../src/ui/dialog/ocaldialogs.cpp:715 msgid "Clipart found" msgstr "Clipart trovata" @@ -20785,62 +21926,102 @@ msgstr "" msgid "Trace pixel art" msgstr "Vettorizza pixel art" +#: ../src/ui/dialog/polar-arrange-tab.cpp:41 +#, fuzzy +msgctxt "Polar arrange tab" +msgid "Y coordinate of the center" +msgstr "Coordinata Y dei nodi selezionati" + +#: ../src/ui/dialog/polar-arrange-tab.cpp:42 +#, fuzzy +msgctxt "Polar arrange tab" +msgid "X coordinate of the center" +msgstr "Coordinata X dei nodi selezionati" + #: ../src/ui/dialog/polar-arrange-tab.cpp:43 +#, fuzzy +msgctxt "Polar arrange tab" +msgid "Y coordinate of the radius" +msgstr "Coordinata Y dei nodi selezionati" + +#: ../src/ui/dialog/polar-arrange-tab.cpp:44 +#, fuzzy +msgctxt "Polar arrange tab" +msgid "X coordinate of the radius" +msgstr "Coordinata X dei nodi selezionati" + +#: ../src/ui/dialog/polar-arrange-tab.cpp:45 +#, fuzzy +msgctxt "Polar arrange tab" +msgid "Starting angle" +msgstr "Angolo di rotazione" + +#: ../src/ui/dialog/polar-arrange-tab.cpp:46 +#, fuzzy +msgctxt "Polar arrange tab" +msgid "End angle" +msgstr "Angolo del cono" + +#: ../src/ui/dialog/polar-arrange-tab.cpp:48 msgctxt "Polar arrange tab" msgid "Anchor point:" msgstr "Punto di ancoraggio:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:47 +#: ../src/ui/dialog/polar-arrange-tab.cpp:52 msgctxt "Polar arrange tab" msgid "Object's bounding box:" msgstr "Riquadro dell'oggetto:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:54 +#: ../src/ui/dialog/polar-arrange-tab.cpp:59 msgctxt "Polar arrange tab" msgid "Object's rotational center" msgstr "Centro di rotazione dell'oggetto" -#: ../src/ui/dialog/polar-arrange-tab.cpp:59 +#: ../src/ui/dialog/polar-arrange-tab.cpp:64 msgctxt "Polar arrange tab" msgid "Arrange on:" msgstr "Ordina secondo:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:63 +#: ../src/ui/dialog/polar-arrange-tab.cpp:68 msgctxt "Polar arrange tab" msgid "First selected circle/ellipse/arc" msgstr "Primo cerchio/ellisse/arco selezionato" -#: ../src/ui/dialog/polar-arrange-tab.cpp:68 +#: ../src/ui/dialog/polar-arrange-tab.cpp:73 msgctxt "Polar arrange tab" msgid "Last selected circle/ellipse/arc" msgstr "Ultimo cerchio/ellisse/arco selezionato" -#: ../src/ui/dialog/polar-arrange-tab.cpp:73 +#: ../src/ui/dialog/polar-arrange-tab.cpp:78 msgctxt "Polar arrange tab" msgid "Parameterized:" msgstr "Parametri:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:78 +#: ../src/ui/dialog/polar-arrange-tab.cpp:83 +#, fuzzy +msgctxt "Polar arrange tab" msgid "Center X/Y:" msgstr "Centro X/Y:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:91 +#: ../src/ui/dialog/polar-arrange-tab.cpp:105 +#, fuzzy +msgctxt "Polar arrange tab" msgid "Radius X/Y:" msgstr "Raggio X/Y:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:104 +#: ../src/ui/dialog/polar-arrange-tab.cpp:127 msgid "Angle X/Y:" msgstr "Angolo X/Y:" -#: ../src/ui/dialog/polar-arrange-tab.cpp:118 +#: ../src/ui/dialog/polar-arrange-tab.cpp:150 msgid "Rotate objects" msgstr "Ruota oggetti" -#: ../src/ui/dialog/polar-arrange-tab.cpp:306 +#: ../src/ui/dialog/polar-arrange-tab.cpp:336 msgid "Couldn't find an ellipse in selection" msgstr "Non è stata trovata alcuna ellisse nella selezione" -#: ../src/ui/dialog/polar-arrange-tab.cpp:371 +#: ../src/ui/dialog/polar-arrange-tab.cpp:399 msgid "Arrange on ellipse" msgstr "Ordina sull'ellisse" @@ -20939,190 +22120,190 @@ msgstr "Controllo..." msgid "Fix spelling" msgstr "Correggi ortografia" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:138 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:139 msgid "Set SVG Font attribute" msgstr "Imposta attributo font SVG" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:196 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:197 msgid "Adjust kerning value" msgstr "Modifica valore crenatura" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:386 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:387 msgid "Family Name:" msgstr "Famiglia:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:396 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:397 msgid "Set width:" msgstr "Imposta larghezza:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:455 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:456 msgid "glyph" msgstr "glifo" #. SPGlyph* glyph = -#: ../src/ui/dialog/svg-fonts-dialog.cpp:487 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:488 msgid "Add glyph" msgstr "Aggiungi glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:521 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:563 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:522 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:564 msgid "Select a path to define the curves of a glyph" msgstr "Seleziona un tracciato per definire la forma di un glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:529 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:571 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:530 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:572 msgid "The selected object does not have a path description." msgstr "L'oggetto selezionato non descrive un tracciato." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:536 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:537 msgid "No glyph selected in the SVGFonts dialog." msgstr "Nessun glifo selezionato nella finestra SVGFonts." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:547 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:586 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:548 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:587 msgid "Set glyph curves" msgstr "Imposta curve glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:606 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:607 msgid "Reset missing-glyph" msgstr "Azzera glifi mancanti" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:622 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:623 msgid "Edit glyph name" msgstr "Modifica nome glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:636 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:637 msgid "Set glyph unicode" msgstr "Imposta unicode glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:648 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:649 msgid "Remove font" msgstr "Rimuovi font" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:665 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:666 msgid "Remove glyph" msgstr "Rimuovi glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:682 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:683 msgid "Remove kerning pair" msgstr "Rimuovi crenatura a coppia" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:692 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:693 msgid "Missing Glyph:" msgstr "Glifi mancanti:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:696 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:697 msgid "From selection..." msgstr "Dalla selezione..." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:709 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:710 msgid "Glyph name" msgstr "Nome del glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:710 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:711 msgid "Matching string" msgstr "Stringa corrispondente" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:713 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:714 msgid "Add Glyph" msgstr "Aggiungi glifo" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:720 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:721 msgid "Get curves from selection..." msgstr "Prendi forma dalla selezione..." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:769 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:770 msgid "Add kerning pair" msgstr "Aggiungi crenatura a coppia" #. Kerning Setup: -#: ../src/ui/dialog/svg-fonts-dialog.cpp:777 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:778 msgid "Kerning Setup" msgstr "Impostazione crenatura" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:779 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:780 msgid "1st Glyph:" msgstr "Primo glifo:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:781 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:782 msgid "2nd Glyph:" msgstr "Secondo glifo:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:784 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:785 msgid "Add pair" msgstr "Aggiungi coppia" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:796 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:797 msgid "First Unicode range" msgstr "Primo intervallo Unicode" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:797 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:798 msgid "Second Unicode range" msgstr "Secondo intervallo Unicode" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:804 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:805 msgid "Kerning value:" msgstr "Valore crenatura:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:862 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:863 msgid "Set font family" msgstr "Imposta famiglia font" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:871 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:872 msgid "font" msgstr "font" #. select_font(font); -#: ../src/ui/dialog/svg-fonts-dialog.cpp:886 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:887 msgid "Add font" msgstr "Aggiungi font" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:912 ../src/ui/dialog/text-edit.cpp:69 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:913 ../src/ui/dialog/text-edit.cpp:69 msgid "_Font" msgstr "_Carattere" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:920 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:921 msgid "_Global Settings" msgstr "Impostazioni _globali" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:921 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:922 msgid "_Glyphs" msgstr "_Glifi" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:922 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:923 msgid "_Kerning" msgstr "_Crenatura" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:929 #: ../src/ui/dialog/svg-fonts-dialog.cpp:930 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:931 msgid "Sample Text" msgstr "Testo d'esempio" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:934 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:935 msgid "Preview Text:" msgstr "Anteprima testo:" -#: ../src/ui/dialog/swatches.cpp:203 ../src/ui/tools/gradient-tool.cpp:367 -#: ../src/ui/tools/gradient-tool.cpp:465 -#: ../src/widgets/gradient-vector.cpp:814 +#: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 +#: ../src/ui/tools/gradient-tool.cpp:458 +#: ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "Aggiungi passaggio del gradiente" #. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:258 +#: ../src/ui/dialog/swatches.cpp:257 msgid "Set fill" msgstr "Imposta riempimento" #. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:266 +#: ../src/ui/dialog/swatches.cpp:265 msgid "Set stroke" msgstr "Imposta contorno" -#: ../src/ui/dialog/swatches.cpp:287 +#: ../src/ui/dialog/swatches.cpp:286 msgid "Edit..." msgstr "Modifica..." -#: ../src/ui/dialog/swatches.cpp:299 +#: ../src/ui/dialog/swatches.cpp:298 msgid "Convert" msgstr "Converti" @@ -21132,47 +22313,77 @@ msgid "Palettes directory (%s) is unavailable." msgstr "La cartella delle palette (%s) non è disponibile." #. ******************* Symbol Sets ************************ -#: ../src/ui/dialog/symbols.cpp:139 +#: ../src/ui/dialog/symbols.cpp:135 msgid "Symbol set: " msgstr "Set simboli: " #. Fill in later -#: ../src/ui/dialog/symbols.cpp:148 ../src/ui/dialog/symbols.cpp:149 +#: ../src/ui/dialog/symbols.cpp:144 ../src/ui/dialog/symbols.cpp:145 msgid "Current Document" msgstr "Documento attuale" -#: ../src/ui/dialog/symbols.cpp:216 +#: ../src/ui/dialog/symbols.cpp:212 msgid "Add Symbol from the current document." msgstr "Aggiunge simbolo dal documento attuale." -#: ../src/ui/dialog/symbols.cpp:225 +#: ../src/ui/dialog/symbols.cpp:221 msgid "Remove Symbol from the current document." msgstr "Rimuove simbolo dal documento attuale." -#: ../src/ui/dialog/symbols.cpp:239 +#: ../src/ui/dialog/symbols.cpp:235 msgid "Display more icons in row." msgstr "Visualizza più icone per riga." -#: ../src/ui/dialog/symbols.cpp:248 +#: ../src/ui/dialog/symbols.cpp:244 msgid "Display fewer icons in row." msgstr "Visualizza meno icone per riga." -#: ../src/ui/dialog/symbols.cpp:258 +#: ../src/ui/dialog/symbols.cpp:254 msgid "Toggle 'fit' symbols in icon space." msgstr "Imposta adattamento simboli in spazio icona." -#: ../src/ui/dialog/symbols.cpp:270 +#: ../src/ui/dialog/symbols.cpp:266 msgid "Make symbols smaller by zooming out." msgstr "Rende i simboli più piccoli riducendo l'ingrandimento." -#: ../src/ui/dialog/symbols.cpp:280 +#: ../src/ui/dialog/symbols.cpp:276 msgid "Make symbols bigger by zooming in." msgstr "Rende i simboli più grandi aumentando l'ingrandimento." -#: ../src/ui/dialog/symbols.cpp:640 +#: ../src/ui/dialog/symbols.cpp:637 msgid "Unnamed Symbols" msgstr "Simboli senza nome" +#: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 +#: ../src/ui/dialog/tags.cpp:683 ../src/ui/dialog/tags.cpp:946 +#, fuzzy +msgid "Remove from selection set" +msgstr "Rimuovi la maschera dalla selezione" + +#: ../src/ui/dialog/tags.cpp:427 +msgid "Items" +msgstr "" + +#: ../src/ui/dialog/tags.cpp:666 ../src/ui/dialog/tags.cpp:944 +#, fuzzy +msgid "Add selection to set" +msgstr "Sposta la selezione in cima" + +#: ../src/ui/dialog/tags.cpp:824 +#, fuzzy +msgid "Moved sets" +msgstr "Muovi gradiente" + +#: ../src/ui/dialog/tags.cpp:1004 +#, fuzzy +msgid "Add a new selection set" +msgstr "Cambia spaziatura connettori" + +#: ../src/ui/dialog/tags.cpp:1013 +#, fuzzy +msgid "Remove Item/Set" +msgstr "Rimuovi effetti" + #: ../src/ui/dialog/template-widget.cpp:37 msgid "More info" msgstr "Più informazioni" @@ -21181,70 +22392,76 @@ msgstr "Più informazioni" msgid "no template selected" msgstr "nessun modello selezionato" -#: ../src/ui/dialog/template-widget.cpp:123 +#: ../src/ui/dialog/template-widget.cpp:131 msgid "Path: " msgstr "Percorso: " -#: ../src/ui/dialog/template-widget.cpp:126 +#: ../src/ui/dialog/template-widget.cpp:134 msgid "Description: " msgstr "Descrizione: " -#: ../src/ui/dialog/template-widget.cpp:128 +#: ../src/ui/dialog/template-widget.cpp:136 msgid "Keywords: " msgstr "Parole chiave: " -#: ../src/ui/dialog/template-widget.cpp:135 +#: ../src/ui/dialog/template-widget.cpp:143 msgid "By: " msgstr "By: " #: ../src/ui/dialog/text-edit.cpp:72 +#, fuzzy +msgid "_Variants" +msgstr "Variazione" + +#: ../src/ui/dialog/text-edit.cpp:73 msgid "Set as _default" msgstr "Imposta come _predefinito" -#: ../src/ui/dialog/text-edit.cpp:86 +#: ../src/ui/dialog/text-edit.cpp:87 #, fuzzy msgid "AaBbCcIiPpQq12369$ےے?.;/()" msgstr "AaBbCcIiPpQq12369$€¢?.;/()" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1352 -#: ../src/widgets/text-toolbar.cpp:1353 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1680 +#: ../src/widgets/text-toolbar.cpp:1681 msgid "Align left" msgstr "Allinea a sinistra" -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1360 -#: ../src/widgets/text-toolbar.cpp:1361 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1688 +#: ../src/widgets/text-toolbar.cpp:1689 msgid "Align center" msgstr "Allinea al centro" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1368 -#: ../src/widgets/text-toolbar.cpp:1369 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1696 +#: ../src/widgets/text-toolbar.cpp:1697 msgid "Align right" msgstr "Allinea a destra" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1377 +#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1705 msgid "Justify (only flowed text)" msgstr "Giustificato (solo testo dinamico)" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:108 ../src/widgets/text-toolbar.cpp:1412 +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1740 msgid "Horizontal text" msgstr "Testo orizzontale" -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1419 +#: ../src/ui/dialog/text-edit.cpp:110 msgid "Vertical text" msgstr "Testo verticale" -#: ../src/ui/dialog/text-edit.cpp:129 ../src/ui/dialog/text-edit.cpp:130 -msgid "Spacing between lines (percent of font size)" +#: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 +#, fuzzy +msgid "Spacing between baselines (percent of font size)" msgstr "Spaziatura tra le linee (percentuale dimensione carattere)" -#: ../src/ui/dialog/text-edit.cpp:146 +#: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" msgstr "Spostamento testo su tracciato" -#: ../src/ui/dialog/text-edit.cpp:587 ../src/ui/dialog/text-edit.cpp:661 -#: ../src/ui/tools/text-tool.cpp:1455 +#: ../src/ui/dialog/text-edit.cpp:612 ../src/ui/dialog/text-edit.cpp:699 +#: ../src/ui/tools/text-tool.cpp:1446 msgid "Set text style" msgstr "Imposta stile testo" @@ -21518,42 +22735,42 @@ msgstr "" msgid "Preview" msgstr "Anteprima" -#: ../src/ui/dialog/transformation.cpp:76 -#: ../src/ui/dialog/transformation.cpp:86 +#: ../src/ui/dialog/transformation.cpp:69 +#: ../src/ui/dialog/transformation.cpp:79 msgid "_Horizontal:" msgstr "Ori_zzontale:" -#: ../src/ui/dialog/transformation.cpp:76 +#: ../src/ui/dialog/transformation.cpp:69 msgid "Horizontal displacement (relative) or position (absolute)" msgstr "Disposizione orizzontale (relativa) o posizione (assoluta)" -#: ../src/ui/dialog/transformation.cpp:78 -#: ../src/ui/dialog/transformation.cpp:88 +#: ../src/ui/dialog/transformation.cpp:71 +#: ../src/ui/dialog/transformation.cpp:81 msgid "_Vertical:" msgstr "_Verticale:" -#: ../src/ui/dialog/transformation.cpp:78 +#: ../src/ui/dialog/transformation.cpp:71 msgid "Vertical displacement (relative) or position (absolute)" msgstr "Disposizione verticale (relativa) o posizione (assoluta)" -#: ../src/ui/dialog/transformation.cpp:80 +#: ../src/ui/dialog/transformation.cpp:73 msgid "Horizontal size (absolute or percentage of current)" msgstr "Dimensione orizzontale (assoluto o percentuale dell'attuale)" -#: ../src/ui/dialog/transformation.cpp:82 +#: ../src/ui/dialog/transformation.cpp:75 msgid "Vertical size (absolute or percentage of current)" msgstr "Dimensione verticale (assoluto o percentuale dell'attuale)" -#: ../src/ui/dialog/transformation.cpp:84 +#: ../src/ui/dialog/transformation.cpp:77 msgid "A_ngle:" msgstr "A_ngolo:" -#: ../src/ui/dialog/transformation.cpp:84 -#: ../src/ui/dialog/transformation.cpp:1104 +#: ../src/ui/dialog/transformation.cpp:77 +#: ../src/ui/dialog/transformation.cpp:1102 msgid "Rotation angle (positive = counterclockwise)" msgstr "Angolo di rotazione (positivo = antiorario)" -#: ../src/ui/dialog/transformation.cpp:86 +#: ../src/ui/dialog/transformation.cpp:79 msgid "" "Horizontal skew angle (positive = counterclockwise), or absolute " "displacement, or percentage displacement" @@ -21561,7 +22778,7 @@ msgstr "" "Angolo di distorsione orizzontale (positivo = antiorario), o quantità " "assoluta o percentuale" -#: ../src/ui/dialog/transformation.cpp:88 +#: ../src/ui/dialog/transformation.cpp:81 msgid "" "Vertical skew angle (positive = counterclockwise), or absolute displacement, " "or percentage displacement" @@ -21569,246 +22786,624 @@ msgstr "" "Angolo di distorsione verticale (positivo = antiorario), o quantità assoluta " "o percentuale" -#: ../src/ui/dialog/transformation.cpp:91 +#: ../src/ui/dialog/transformation.cpp:84 msgid "Transformation matrix element A" msgstr "Elemento A della matrice di trasformazione" -#: ../src/ui/dialog/transformation.cpp:92 +#: ../src/ui/dialog/transformation.cpp:85 msgid "Transformation matrix element B" msgstr "Elemento B della matrice di trasformazione" -#: ../src/ui/dialog/transformation.cpp:93 +#: ../src/ui/dialog/transformation.cpp:86 msgid "Transformation matrix element C" msgstr "Elemento C della matrice di trasformazione" -#: ../src/ui/dialog/transformation.cpp:94 +#: ../src/ui/dialog/transformation.cpp:87 msgid "Transformation matrix element D" msgstr "Elemento D della matrice di trasformazione" -#: ../src/ui/dialog/transformation.cpp:95 +#: ../src/ui/dialog/transformation.cpp:88 msgid "Transformation matrix element E" msgstr "Elemento E della matrice di trasformazione" -#: ../src/ui/dialog/transformation.cpp:96 +#: ../src/ui/dialog/transformation.cpp:89 msgid "Transformation matrix element F" msgstr "Elemento F della matrice di trasformazione" -#: ../src/ui/dialog/transformation.cpp:101 -msgid "Rela_tive move" -msgstr "Movimento re_lativo" +#: ../src/ui/dialog/transformation.cpp:94 +msgid "Rela_tive move" +msgstr "Movimento re_lativo" + +#: ../src/ui/dialog/transformation.cpp:94 +msgid "" +"Add the specified relative displacement to the current position; otherwise, " +"edit the current absolute position directly" +msgstr "" +"Aggiungi lo spostamento relativo specificato alla posizione; altrimenti, " +"modifica direttamente la posizione assoluta attuale" + +#: ../src/ui/dialog/transformation.cpp:95 +msgid "_Scale proportionally" +msgstr "_Scala proporzionalmente" + +#: ../src/ui/dialog/transformation.cpp:95 +msgid "Preserve the width/height ratio of the scaled objects" +msgstr "Preserva il rapporto larghezza/altezza delle oggetti ridimensionati" + +#: ../src/ui/dialog/transformation.cpp:96 +msgid "Apply to each _object separately" +msgstr "Applica ad ogni _oggetto separatamente" + +#: ../src/ui/dialog/transformation.cpp:96 +msgid "" +"Apply the scale/rotate/skew to each selected object separately; otherwise, " +"transform the selection as a whole" +msgstr "" +"Applica l'ingrandimento/rotazione/distorsione ad ogni oggetto separatamente; " +"altrimenti, trasforma tutta la selezione insieme" + +#: ../src/ui/dialog/transformation.cpp:97 +msgid "Edit c_urrent matrix" +msgstr "Modifica matrice attuale" + +#: ../src/ui/dialog/transformation.cpp:97 +msgid "" +"Edit the current transform= matrix; otherwise, post-multiply transform= by " +"this matrix" +msgstr "" +"Modifica la matrice transform= attuale; altrimenti moltiplica transform= per " +"questa matrice" + +#: ../src/ui/dialog/transformation.cpp:110 +msgid "_Scale" +msgstr "_Scala" + +#: ../src/ui/dialog/transformation.cpp:113 +msgid "_Rotate" +msgstr "_Ruota" + +#: ../src/ui/dialog/transformation.cpp:116 +msgid "Ske_w" +msgstr "D_istorsione" + +#: ../src/ui/dialog/transformation.cpp:119 +msgid "Matri_x" +msgstr "Matri_ce" + +#: ../src/ui/dialog/transformation.cpp:143 +msgid "Reset the values on the current tab to defaults" +msgstr "Reimposta i valori della scheda attuale ai predefiniti" + +#: ../src/ui/dialog/transformation.cpp:150 +msgid "Apply transformation to selection" +msgstr "Applica la trasformazione alla selezione" + +#: ../src/ui/dialog/transformation.cpp:326 +msgid "Rotate in a counterclockwise direction" +msgstr "Ruota in senso antiorario" + +#: ../src/ui/dialog/transformation.cpp:332 +msgid "Rotate in a clockwise direction" +msgstr "Ruota in senso orario" + +#: ../src/ui/dialog/transformation.cpp:905 +#: ../src/ui/dialog/transformation.cpp:916 +#: ../src/ui/dialog/transformation.cpp:930 +#: ../src/ui/dialog/transformation.cpp:949 +#: ../src/ui/dialog/transformation.cpp:960 +#: ../src/ui/dialog/transformation.cpp:970 +#: ../src/ui/dialog/transformation.cpp:994 +msgid "Transform matrix is singular, not used." +msgstr "" + +#: ../src/ui/dialog/transformation.cpp:1010 +msgid "Edit transformation matrix" +msgstr "Modifica la matrice di trasformazione" + +#: ../src/ui/dialog/transformation.cpp:1109 +msgid "Rotation angle (positive = clockwise)" +msgstr "Angolo di rotazione (positivo = orario)" + +#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:126 +msgid "New element node" +msgstr "Nuovo elemento nodo" + +#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:132 +msgid "New text node" +msgstr "Nuovo nodo testuale" + +#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:146 +msgid "nodeAsInXMLdialogTooltip|Delete node" +msgstr "Elimina nodo" + +#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:138 +#: ../src/ui/dialog/xml-tree.cpp:985 +msgid "Duplicate node" +msgstr "Duplica nodo" + +#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:199 +#: ../src/ui/dialog/xml-tree.cpp:1021 +msgid "Delete attribute" +msgstr "Cancella attributo" + +#: ../src/ui/dialog/xml-tree.cpp:87 +msgid "Set" +msgstr "Imposta" + +#: ../src/ui/dialog/xml-tree.cpp:121 +msgid "Drag to reorder nodes" +msgstr "Trascina per riordinare i nodi" + +#: ../src/ui/dialog/xml-tree.cpp:154 ../src/ui/dialog/xml-tree.cpp:155 +#: ../src/ui/dialog/xml-tree.cpp:1143 +msgid "Unindent node" +msgstr "Deindenta nodo" + +#: ../src/ui/dialog/xml-tree.cpp:161 ../src/ui/dialog/xml-tree.cpp:162 +#: ../src/ui/dialog/xml-tree.cpp:1121 +msgid "Indent node" +msgstr "Indenta nodo" + +#: ../src/ui/dialog/xml-tree.cpp:168 ../src/ui/dialog/xml-tree.cpp:169 +#: ../src/ui/dialog/xml-tree.cpp:1072 +msgid "Raise node" +msgstr "Alza nodo" + +#: ../src/ui/dialog/xml-tree.cpp:175 ../src/ui/dialog/xml-tree.cpp:176 +#: ../src/ui/dialog/xml-tree.cpp:1090 +msgid "Lower node" +msgstr "Abbassa nodo" + +#: ../src/ui/dialog/xml-tree.cpp:216 +msgid "Attribute name" +msgstr "Nome attributo" + +#: ../src/ui/dialog/xml-tree.cpp:231 +msgid "Attribute value" +msgstr "Valore attributo" + +#: ../src/ui/dialog/xml-tree.cpp:319 +msgid "Click to select nodes, drag to rearrange." +msgstr "Clicca per selezionare i nodi, trascina per riordinarli." + +#: ../src/ui/dialog/xml-tree.cpp:330 +msgid "Click attribute to edit." +msgstr "Clicca l'attributo da modificare." + +#: ../src/ui/dialog/xml-tree.cpp:334 +#, c-format +msgid "" +"Attribute %s selected. Press Ctrl+Enter when done editing to " +"commit changes." +msgstr "" +"Selezionato l'attributo %s. Premi Ctrl+Invio quando finito per " +"applicare i cambiamenti." + +#: ../src/ui/dialog/xml-tree.cpp:574 +msgid "Drag XML subtree" +msgstr "Trascina sottoalbero XML" + +#: ../src/ui/dialog/xml-tree.cpp:876 +msgid "New element node..." +msgstr "Nuovo elemento nodo..." + +#: ../src/ui/dialog/xml-tree.cpp:914 +msgid "Cancel" +msgstr "Cancella" + +#: ../src/ui/dialog/xml-tree.cpp:951 +msgid "Create new element node" +msgstr "Crea nuovo elemento nodo" + +#: ../src/ui/dialog/xml-tree.cpp:967 +msgid "Create new text node" +msgstr "Crea nuovo nodo testuale" + +#: ../src/ui/dialog/xml-tree.cpp:1002 +msgid "nodeAsInXMLinHistoryDialog|Delete node" +msgstr "Elimina nodo" + +#: ../src/ui/dialog/xml-tree.cpp:1046 +msgid "Change attribute" +msgstr "Cambia attributo" + +#: ../src/ui/interface.cpp:763 +msgctxt "Interface setup" +msgid "Default" +msgstr "Predefinita" + +#: ../src/ui/interface.cpp:763 +msgid "Default interface setup" +msgstr "Impostazione interfaccia predefinita" + +#: ../src/ui/interface.cpp:764 +msgctxt "Interface setup" +msgid "Custom" +msgstr "Personalizzata" + +#: ../src/ui/interface.cpp:764 +msgid "Setup for custom task" +msgstr "Impostazione interfaccia personalizzata" + +#: ../src/ui/interface.cpp:765 +msgctxt "Interface setup" +msgid "Wide" +msgstr "Larga" + +#: ../src/ui/interface.cpp:765 +msgid "Setup for widescreen work" +msgstr "Impostazione interfaccia per schermi larghi" + +# Verb dovrebbe essere parola chiave per menù scritti in XML +# del GTK+ versione 2.6 o superiore -Luca +#: ../src/ui/interface.cpp:875 +#, c-format +msgid "Verb \"%s\" Unknown" +msgstr "Verb \"%s\" sconosciuto" + +#: ../src/ui/interface.cpp:910 +msgid "Open _Recent" +msgstr "Apri _recenti" + +#: ../src/ui/interface.cpp:1018 ../src/ui/interface.cpp:1104 +#: ../src/ui/interface.cpp:1207 ../src/ui/widget/selected-style.cpp:542 +msgid "Drop color" +msgstr "Rilascia colore" + +#: ../src/ui/interface.cpp:1057 ../src/ui/interface.cpp:1167 +msgid "Drop color on gradient" +msgstr "Usa colore per il gradiente" + +#: ../src/ui/interface.cpp:1220 +msgid "Could not parse SVG data" +msgstr "Impossibile leggere i dati SVG" + +#: ../src/ui/interface.cpp:1259 +msgid "Drop SVG" +msgstr "Rilascia SVG" + +#: ../src/ui/interface.cpp:1272 +msgid "Drop Symbol" +msgstr "Rilascia Simbolo" + +#: ../src/ui/interface.cpp:1303 +msgid "Drop bitmap image" +msgstr "Rilascia immagine bitmap" + +#: ../src/ui/interface.cpp:1395 +#, c-format +msgid "" +"A file named \"%s\" already exists. Do " +"you want to replace it?\n" +"\n" +"The file already exists in \"%s\". Replacing it will overwrite its contents." +msgstr "" +"Esiste già un file di nome \"%s\". Lo " +"si vuole rimpiazzare?\n" +"\n" +"Il file esiste già in \"%s\". Rimpiazzandolo si sovrascriverà il contenuto." + +#: ../src/ui/interface.cpp:1402 ../share/extensions/web-set-att.inx.h:21 +#: ../share/extensions/web-transmit-att.inx.h:19 +msgid "Replace" +msgstr "Rimpiazza" + +#: ../src/ui/interface.cpp:1473 +msgid "Go to parent" +msgstr "Livello superiore" + +#. TRANSLATORS: #%1 is the id of the group e.g. , not a number. +#: ../src/ui/interface.cpp:1514 +msgid "Enter group #%1" +msgstr "Modifica gruppo #%1" + +#. Pop selection out of group +#: ../src/ui/interface.cpp:1528 +#, fuzzy +msgid "_Pop selection out of group" +msgstr "_Tratta selezione come gruppo: " + +#. Item dialog +#: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 +msgid "_Object Properties..." +msgstr "Proprietà _oggetto..." + +#: ../src/ui/interface.cpp:1665 +msgid "_Select This" +msgstr "_Seleziona questo" + +#: ../src/ui/interface.cpp:1676 +msgid "Select Same" +msgstr "Seleziona stesso" + +#. Select same fill and stroke +#: ../src/ui/interface.cpp:1686 +msgid "Fill and Stroke" +msgstr "Riempimento e contorni" + +#. Select same fill color +#: ../src/ui/interface.cpp:1693 +msgid "Fill Color" +msgstr "Colore riempimento" -#: ../src/ui/dialog/transformation.cpp:101 -msgid "" -"Add the specified relative displacement to the current position; otherwise, " -"edit the current absolute position directly" -msgstr "" -"Aggiungi lo spostamento relativo specificato alla posizione; altrimenti, " -"modifica direttamente la posizione assoluta attuale" +#. Select same stroke color +#: ../src/ui/interface.cpp:1700 +msgid "Stroke Color" +msgstr "Colore contorno" -#: ../src/ui/dialog/transformation.cpp:102 -msgid "_Scale proportionally" -msgstr "_Scala proporzionalmente" +#. Select same stroke style +#: ../src/ui/interface.cpp:1707 +msgid "Stroke Style" +msgstr "Stile contorno" -#: ../src/ui/dialog/transformation.cpp:102 -msgid "Preserve the width/height ratio of the scaled objects" -msgstr "Preserva il rapporto larghezza/altezza delle oggetti ridimensionati" +#. Select same stroke style +#: ../src/ui/interface.cpp:1714 +msgid "Object type" +msgstr "Tipo oggetto" -#: ../src/ui/dialog/transformation.cpp:103 -msgid "Apply to each _object separately" -msgstr "Applica ad ogni _oggetto separatamente" +#. Move to layer +#: ../src/ui/interface.cpp:1721 +msgid "_Move to layer ..." +msgstr "_Sposta a livello..." -#: ../src/ui/dialog/transformation.cpp:103 -msgid "" -"Apply the scale/rotate/skew to each selected object separately; otherwise, " -"transform the selection as a whole" -msgstr "" -"Applica l'ingrandimento/rotazione/distorsione ad ogni oggetto separatamente; " -"altrimenti, trasforma tutta la selezione insieme" +#. Create link +#: ../src/ui/interface.cpp:1731 +msgid "Create _Link" +msgstr "_Crea collegamento" -#: ../src/ui/dialog/transformation.cpp:104 -msgid "Edit c_urrent matrix" -msgstr "Modifica matrice attuale" +#. Release mask +#: ../src/ui/interface.cpp:1765 +msgid "Release Mask" +msgstr "Rimuovi maschera" -#: ../src/ui/dialog/transformation.cpp:104 -msgid "" -"Edit the current transform= matrix; otherwise, post-multiply transform= by " -"this matrix" -msgstr "" -"Modifica la matrice transform= attuale; altrimenti moltiplica transform= per " -"questa matrice" +#. SSet Clip Group +#: ../src/ui/interface.cpp:1776 +#, fuzzy +msgid "Create Clip G_roup" +msgstr "Crea clo_ne" -#: ../src/ui/dialog/transformation.cpp:117 -msgid "_Scale" -msgstr "_Scala" +#. Set Clip +#: ../src/ui/interface.cpp:1783 +msgid "Set Cl_ip" +msgstr "Imposta fi_ssaggio" -#: ../src/ui/dialog/transformation.cpp:120 -msgid "_Rotate" -msgstr "_Ruota" +#. Release Clip +#: ../src/ui/interface.cpp:1794 +msgid "Release C_lip" +msgstr "Rilascia _fissaggio" -#: ../src/ui/dialog/transformation.cpp:123 -msgid "Ske_w" -msgstr "D_istorsione" +#. Group +#: ../src/ui/interface.cpp:1805 ../src/verbs.cpp:2561 +msgid "_Group" +msgstr "Ra_ggruppa" -#: ../src/ui/dialog/transformation.cpp:126 -msgid "Matri_x" -msgstr "Matri_ce" +#: ../src/ui/interface.cpp:1876 +msgid "Create link" +msgstr "Crea collegamento" -#: ../src/ui/dialog/transformation.cpp:150 -msgid "Reset the values on the current tab to defaults" -msgstr "Reimposta i valori della scheda attuale ai predefiniti" +#. Ungroup +#: ../src/ui/interface.cpp:1911 ../src/verbs.cpp:2563 +msgid "_Ungroup" +msgstr "_Dividi" -#: ../src/ui/dialog/transformation.cpp:157 -msgid "Apply transformation to selection" -msgstr "Applica la trasformazione alla selezione" +#. Link dialog +#: ../src/ui/interface.cpp:1941 +msgid "Link _Properties..." +msgstr "_Proprietà collegamento..." -#: ../src/ui/dialog/transformation.cpp:332 -msgid "Rotate in a counterclockwise direction" -msgstr "Ruota in senso antiorario" +#. Select item +#: ../src/ui/interface.cpp:1947 +msgid "_Follow Link" +msgstr "_Segui collegamento" -#: ../src/ui/dialog/transformation.cpp:338 -msgid "Rotate in a clockwise direction" -msgstr "Ruota in senso orario" +#. Reset transformations +#: ../src/ui/interface.cpp:1953 +msgid "_Remove Link" +msgstr "_Rimuovi collegamento" -#: ../src/ui/dialog/transformation.cpp:908 -#: ../src/ui/dialog/transformation.cpp:919 -#: ../src/ui/dialog/transformation.cpp:933 -#: ../src/ui/dialog/transformation.cpp:952 -#: ../src/ui/dialog/transformation.cpp:963 -#: ../src/ui/dialog/transformation.cpp:973 -#: ../src/ui/dialog/transformation.cpp:997 -msgid "Transform matrix is singular, not used." -msgstr "" +#: ../src/ui/interface.cpp:1984 +msgid "Remove link" +msgstr "Rimuovi collegamento" -#: ../src/ui/dialog/transformation.cpp:1012 -msgid "Edit transformation matrix" -msgstr "Modifica la matrice di trasformazione" +#. Image properties +#: ../src/ui/interface.cpp:1994 +msgid "Image _Properties..." +msgstr "_Proprietà immagine..." -#: ../src/ui/dialog/transformation.cpp:1111 -msgid "Rotation angle (positive = clockwise)" -msgstr "Angolo di rotazione (positivo = orario)" +#. Edit externally +#: ../src/ui/interface.cpp:2000 +msgid "Edit Externally..." +msgstr "Modifica con programma esterno..." -#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:126 -msgid "New element node" -msgstr "Nuovo elemento nodo" +#. Trace Bitmap +#. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) +#: ../src/ui/interface.cpp:2009 ../src/verbs.cpp:2628 +msgid "_Trace Bitmap..." +msgstr "Ve_ttorizza bitmap..." -#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:132 -msgid "New text node" -msgstr "Nuovo nodo testuale" +#. Trace Pixel Art +#: ../src/ui/interface.cpp:2018 +msgid "Trace Pixel Art" +msgstr "Vettorizza Pixel Art" -#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:146 -msgid "nodeAsInXMLdialogTooltip|Delete node" -msgstr "Elimina nodo" +#: ../src/ui/interface.cpp:2028 +msgctxt "Context menu" +msgid "Embed Image" +msgstr "Incorpora immagine" -#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:138 -#: ../src/ui/dialog/xml-tree.cpp:977 -msgid "Duplicate node" -msgstr "Duplica nodo" +#: ../src/ui/interface.cpp:2039 +msgctxt "Context menu" +msgid "Extract Image..." +msgstr "Estrai immagine..." -#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:191 -#: ../src/ui/dialog/xml-tree.cpp:1013 -msgid "Delete attribute" -msgstr "Cancella attributo" +#. Item dialog +#. Fill and Stroke dialog +#: ../src/ui/interface.cpp:2183 ../src/ui/interface.cpp:2203 +#: ../src/verbs.cpp:2903 +msgid "_Fill and Stroke..." +msgstr "Riem_pimento e contorni..." -#: ../src/ui/dialog/xml-tree.cpp:87 -msgid "Set" -msgstr "Imposta" +#. Edit Text dialog +#: ../src/ui/interface.cpp:2209 ../src/verbs.cpp:2922 +msgid "_Text and Font..." +msgstr "_Testo e carattere..." -#: ../src/ui/dialog/xml-tree.cpp:121 -msgid "Drag to reorder nodes" -msgstr "Trascina per riordinare i nodi" +#. Spellcheck dialog +#: ../src/ui/interface.cpp:2215 ../src/verbs.cpp:2930 +msgid "Check Spellin_g..." +msgstr "Controlla orto_grafia..." -#: ../src/ui/dialog/xml-tree.cpp:152 ../src/ui/dialog/xml-tree.cpp:153 -#: ../src/ui/dialog/xml-tree.cpp:1135 -msgid "Unindent node" -msgstr "Deindenta nodo" +#: ../src/ui/object-edit.cpp:450 +msgid "" +"Adjust the horizontal rounding radius; with Ctrl to make the " +"vertical radius the same" +msgstr "" +"Modifica l'arrotondamento orizzontale; con Ctrl per rendere " +"uguale l'arrotondamento verticale" -#: ../src/ui/dialog/xml-tree.cpp:157 ../src/ui/dialog/xml-tree.cpp:158 -#: ../src/ui/dialog/xml-tree.cpp:1113 -msgid "Indent node" -msgstr "Indenta nodo" +#: ../src/ui/object-edit.cpp:455 +msgid "" +"Adjust the vertical rounding radius; with Ctrl to make the " +"horizontal radius the same" +msgstr "" +"Modifica l'arrotondamento verticale; con Ctrl per rendere " +"uguale l'arrotondamento orizzontale" -#: ../src/ui/dialog/xml-tree.cpp:162 ../src/ui/dialog/xml-tree.cpp:163 -#: ../src/ui/dialog/xml-tree.cpp:1064 -msgid "Raise node" -msgstr "Alza nodo" +#: ../src/ui/object-edit.cpp:460 ../src/ui/object-edit.cpp:465 +msgid "" +"Adjust the width and height of the rectangle; with Ctrl to " +"lock ratio or stretch in one dimension only" +msgstr "" +"Modifica l'altezza e la larghezza del rettangolo; con Ctrl per " +"mantenere la proporzione o allungare su una sola dimensione" -#: ../src/ui/dialog/xml-tree.cpp:167 ../src/ui/dialog/xml-tree.cpp:168 -#: ../src/ui/dialog/xml-tree.cpp:1082 -msgid "Lower node" -msgstr "Abbassa nodo" +#: ../src/ui/object-edit.cpp:712 ../src/ui/object-edit.cpp:716 +#: ../src/ui/object-edit.cpp:720 ../src/ui/object-edit.cpp:724 +msgid "" +"Resize box in X/Y direction; with Shift along the Z axis; with " +"Ctrl to constrain to the directions of edges or diagonals" +msgstr "" +"Ridimensiona il solido lungo gli assi X/Y; con Maiusc per l'asse Z; " +"con Ctrl per fissare alle direzioni degli spigoli o delle diagonali" -#: ../src/ui/dialog/xml-tree.cpp:208 -msgid "Attribute name" -msgstr "Nome attributo" +#: ../src/ui/object-edit.cpp:728 ../src/ui/object-edit.cpp:732 +#: ../src/ui/object-edit.cpp:736 ../src/ui/object-edit.cpp:740 +msgid "" +"Resize box along the Z axis; with Shift in X/Y direction; with " +"Ctrl to constrain to the directions of edges or diagonals" +msgstr "" +"Ridimensiona il solido lungo l'asse Z; con Maiusc per gli assi X/Y; " +"con Ctrl per fissare alle direzioni degli spigoli o delle diagonali" -#: ../src/ui/dialog/xml-tree.cpp:223 -msgid "Attribute value" -msgstr "Valore attributo" +#: ../src/ui/object-edit.cpp:744 +msgid "Move the box in perspective" +msgstr "Sposta il solido in prospettiva" -#: ../src/ui/dialog/xml-tree.cpp:311 -msgid "Click to select nodes, drag to rearrange." -msgstr "Clicca per selezionare i nodi, trascina per riordinarli." +#: ../src/ui/object-edit.cpp:983 +msgid "Adjust ellipse width, with Ctrl to make circle" +msgstr "" +"Modifica la larghezza dell'ellisse, con Ctrl per farne un " +"cerchio" -#: ../src/ui/dialog/xml-tree.cpp:322 -msgid "Click attribute to edit." -msgstr "Clicca l'attributo da modificare." +#: ../src/ui/object-edit.cpp:987 +msgid "Adjust ellipse height, with Ctrl to make circle" +msgstr "" +"Modifica l'altezza dell'ellisse, con Ctrl per farne un cerchio" -#: ../src/ui/dialog/xml-tree.cpp:326 -#, c-format +#: ../src/ui/object-edit.cpp:991 msgid "" -"Attribute %s selected. Press Ctrl+Enter when done editing to " -"commit changes." +"Position the start point of the arc or segment; with Ctrl to " +"snap angle; drag inside the ellipse for arc, outside for " +"segment" msgstr "" -"Selezionato l'attributo %s. Premi Ctrl+Invio quando finito per " -"applicare i cambiamenti." +"Posiziona il punto iniziale dell'arco o del segmento; con Ctrl " +"per far scattare l'angolo; trascina dentro l'ellisse per un arco, " +"fuori per un segmento" -#: ../src/ui/dialog/xml-tree.cpp:566 -msgid "Drag XML subtree" -msgstr "Trascina sottoalbero XML" +#: ../src/ui/object-edit.cpp:996 +msgid "" +"Position the end point of the arc or segment; with Ctrl to " +"snap angle; drag inside the ellipse for arc, outside for " +"segment" +msgstr "" +"Posiziona il punto finale dell'arco o del segmento; con Ctrl " +"per far scattare l'angolo; trascina dentro l'ellisse per un arco, " +"fuori per un segmento" -#: ../src/ui/dialog/xml-tree.cpp:868 -msgid "New element node..." -msgstr "Nuovo elemento nodo..." +#: ../src/ui/object-edit.cpp:1142 +msgid "" +"Adjust the tip radius of the star or polygon; with Shift to " +"round; with Alt to randomize" +msgstr "" +"Modifica il diametro della stella o del poligono; con Maiusc " +"per arrotondare; con Alt per avere casualità" -#: ../src/ui/dialog/xml-tree.cpp:906 -msgid "Cancel" -msgstr "Cancella" +#: ../src/ui/object-edit.cpp:1150 +msgid "" +"Adjust the base radius of the star; with Ctrl to keep star " +"rays radial (no skew); with Shift to round; with Alt to " +"randomize" +msgstr "" +"Modifica il diametro interno della stella; con Ctrl per " +"mantenere la direzione dei raggi (senza deformazione); con Maiusc per " +"arrotondare; con Alt per avere casualità" -#: ../src/ui/dialog/xml-tree.cpp:943 -msgid "Create new element node" -msgstr "Crea nuovo elemento nodo" +#: ../src/ui/object-edit.cpp:1345 +msgid "" +"Roll/unroll the spiral from inside; with Ctrl to snap angle; " +"with Alt to converge/diverge" +msgstr "" +"Arrotola/Srotola una spirale dall'interno; con Ctrl per far " +"scattare l'angolo; con Alt per far convergere/divergere" -#: ../src/ui/dialog/xml-tree.cpp:959 -msgid "Create new text node" -msgstr "Crea nuovo nodo testuale" +#: ../src/ui/object-edit.cpp:1349 +msgid "" +"Roll/unroll the spiral from outside; with Ctrl to snap angle; " +"with Shift to scale/rotate; with Alt to lock radius" +msgstr "" +"Arrotola/Srotola una spirale dall'esterno; con Ctrl per far " +"scattare l'angolo; con Maiusc per ridimensionare/ruotare; con Alt per bloccare il raggio" -#: ../src/ui/dialog/xml-tree.cpp:994 -msgid "nodeAsInXMLinHistoryDialog|Delete node" -msgstr "Elimina nodo" +#: ../src/ui/object-edit.cpp:1398 +msgid "Adjust the offset distance" +msgstr "Regola la distanza di proiezione" -#: ../src/ui/dialog/xml-tree.cpp:1038 -msgid "Change attribute" -msgstr "Cambia attributo" +#: ../src/ui/object-edit.cpp:1435 +msgid "Drag to resize the flowed text frame" +msgstr "Trascina per ridimensionare il riquadro del testo dinamico" -#: ../src/ui/tool/curve-drag-point.cpp:100 +#: ../src/ui/tool/curve-drag-point.cpp:131 msgid "Drag curve" msgstr "Trascina curva" -#: ../src/ui/tool/curve-drag-point.cpp:157 -msgid "Add node" -msgstr "Aggiungi nodo" +#: ../src/ui/tool/curve-drag-point.cpp:192 +#, fuzzy +msgctxt "Path segment tip" +msgid "Shift: drag to open or move BSpline handles" +msgstr "Maiusc: trascina per aggiungere nodi alla selezione" -#: ../src/ui/tool/curve-drag-point.cpp:167 +#: ../src/ui/tool/curve-drag-point.cpp:196 msgctxt "Path segment tip" msgid "Shift: click to toggle segment selection" msgstr "Maiusc: clicca per commutare la selezione del segmento" -#: ../src/ui/tool/curve-drag-point.cpp:171 +#: ../src/ui/tool/curve-drag-point.cpp:200 msgctxt "Path segment tip" msgid "Ctrl+Alt: click to insert a node" msgstr "Ctrl+Alt: clicca per inserire un nodo" -#: ../src/ui/tool/curve-drag-point.cpp:175 +#: ../src/ui/tool/curve-drag-point.cpp:204 +#, fuzzy +msgctxt "Path segment tip" +msgid "" +"BSpline segment: drag to shape the segment, doubleclick to insert " +"node, click to select (more: Shift, Ctrl+Alt)" +msgstr "" +"Segmento di Bezier: trascina per formare il segmento, doppio clic per " +"inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl+Alt)" + +#: ../src/ui/tool/curve-drag-point.cpp:209 msgctxt "Path segment tip" msgid "" "Linear segment: drag to convert to a Bezier segment, doubleclick to " @@ -21818,7 +23413,7 @@ msgstr "" "doppio clic per inserire un nodo, clicca per selezionare (altro: Maiusc, Ctrl" "+Alt)" -#: ../src/ui/tool/curve-drag-point.cpp:179 +#: ../src/ui/tool/curve-drag-point.cpp:213 msgctxt "Path segment tip" msgid "" "Bezier segment: drag to shape the segment, doubleclick to insert " @@ -21831,7 +23426,7 @@ msgstr "" msgid "Retract handles" msgstr "Ritira maniglia" -#: ../src/ui/tool/multi-path-manipulator.cpp:315 ../src/ui/tool/node.cpp:270 +#: ../src/ui/tool/multi-path-manipulator.cpp:315 ../src/ui/tool/node.cpp:297 msgid "Change node type" msgstr "Cambia tipo di nodo" @@ -21844,6 +23439,7 @@ msgid "Make segments curves" msgstr "Trasforma segmenti in curve" #: ../src/ui/tool/multi-path-manipulator.cpp:333 +#: ../src/ui/tool/multi-path-manipulator.cpp:347 msgid "Add nodes" msgstr "Aggiunge nodi" @@ -21851,101 +23447,102 @@ msgstr "Aggiunge nodi" msgid "Add extremum nodes" msgstr "Aggiungi nodi all'estremità" -#: ../src/ui/tool/multi-path-manipulator.cpp:346 +#: ../src/ui/tool/multi-path-manipulator.cpp:354 msgid "Duplicate nodes" msgstr "Duplica nodi" -#: ../src/ui/tool/multi-path-manipulator.cpp:409 +#: ../src/ui/tool/multi-path-manipulator.cpp:417 #: ../src/widgets/node-toolbar.cpp:408 msgid "Join nodes" msgstr "Unisci nodi" -#: ../src/ui/tool/multi-path-manipulator.cpp:416 +#: ../src/ui/tool/multi-path-manipulator.cpp:424 #: ../src/widgets/node-toolbar.cpp:419 msgid "Break nodes" msgstr "Spezza nodi" -#: ../src/ui/tool/multi-path-manipulator.cpp:423 +#: ../src/ui/tool/multi-path-manipulator.cpp:431 msgid "Delete nodes" msgstr "Cancella nodi" -#: ../src/ui/tool/multi-path-manipulator.cpp:757 +#: ../src/ui/tool/multi-path-manipulator.cpp:777 msgid "Move nodes" msgstr "Muovi nodi" -#: ../src/ui/tool/multi-path-manipulator.cpp:760 +#: ../src/ui/tool/multi-path-manipulator.cpp:780 msgid "Move nodes horizontally" msgstr "Muove i nodi verticalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:764 +#: ../src/ui/tool/multi-path-manipulator.cpp:784 msgid "Move nodes vertically" msgstr "Muove i nodi verticalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:768 -#: ../src/ui/tool/multi-path-manipulator.cpp:771 -msgid "Rotate nodes" -msgstr "Ruota nodi" - -#: ../src/ui/tool/multi-path-manipulator.cpp:775 -#: ../src/ui/tool/multi-path-manipulator.cpp:781 +#: ../src/ui/tool/multi-path-manipulator.cpp:795 +#: ../src/ui/tool/multi-path-manipulator.cpp:801 msgid "Scale nodes uniformly" msgstr "Ridimensiona nodi uniformemente" -#: ../src/ui/tool/multi-path-manipulator.cpp:778 +#: ../src/ui/tool/multi-path-manipulator.cpp:798 msgid "Scale nodes" msgstr "Ridimensiona nodi" -#: ../src/ui/tool/multi-path-manipulator.cpp:785 +#: ../src/ui/tool/multi-path-manipulator.cpp:805 msgid "Scale nodes horizontally" msgstr "Ridimensiona nodi orizzontalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:789 +#: ../src/ui/tool/multi-path-manipulator.cpp:809 msgid "Scale nodes vertically" msgstr "Ridimensiona nodi verticalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:793 +#: ../src/ui/tool/multi-path-manipulator.cpp:813 msgid "Skew nodes horizontally" msgstr "Distorci nodi orizzontalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:797 +#: ../src/ui/tool/multi-path-manipulator.cpp:817 msgid "Skew nodes vertically" msgstr "Distorci nodi verticalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:801 +#: ../src/ui/tool/multi-path-manipulator.cpp:821 msgid "Flip nodes horizontally" msgstr "Rifletti nodi orizzontalmente" -#: ../src/ui/tool/multi-path-manipulator.cpp:804 +#: ../src/ui/tool/multi-path-manipulator.cpp:824 msgid "Flip nodes vertically" msgstr "Rifletti nodi verticalmente" -#: ../src/ui/tool/node.cpp:245 +#: ../src/ui/tool/node.cpp:272 msgid "Cusp node handle" msgstr "Maniglia del nodo" -#: ../src/ui/tool/node.cpp:246 +#: ../src/ui/tool/node.cpp:273 msgid "Smooth node handle" msgstr "Maniglia nodo curvo" -#: ../src/ui/tool/node.cpp:247 +#: ../src/ui/tool/node.cpp:274 msgid "Symmetric node handle" msgstr "Maniglia nodo simmetrico" -#: ../src/ui/tool/node.cpp:248 +#: ../src/ui/tool/node.cpp:275 msgid "Auto-smooth node handle" msgstr "Maniglia nodo curvo automatico" -#: ../src/ui/tool/node.cpp:432 +#: ../src/ui/tool/node.cpp:494 msgctxt "Path handle tip" msgid "more: Shift, Ctrl, Alt" msgstr "altro: Maiusc, Ctrl, Alt" -#: ../src/ui/tool/node.cpp:434 +#: ../src/ui/tool/node.cpp:496 +#, fuzzy +msgctxt "Path handle tip" +msgid "more: Ctrl" +msgstr "altro: Ctrl, Alt" + +#: ../src/ui/tool/node.cpp:498 msgctxt "Path handle tip" msgid "more: Ctrl, Alt" msgstr "altro: Ctrl, Alt" -#: ../src/ui/tool/node.cpp:440 +#: ../src/ui/tool/node.cpp:504 #, c-format msgctxt "Path handle tip" msgid "" @@ -21955,7 +23552,7 @@ msgstr "" "Maiusc+Ctrl+Alt: mantieni lunghezza, aggancia l'angolo di rotazione " "ogni %g° e ruota entrambe le maniglie" -#: ../src/ui/tool/node.cpp:445 +#: ../src/ui/tool/node.cpp:509 #, c-format msgctxt "Path handle tip" msgid "" @@ -21963,19 +23560,19 @@ msgid "" msgstr "" "Ctrl+Alt: mantieni lunghezza e aggancia l'angolo di rotazione ogni %g°" -#: ../src/ui/tool/node.cpp:451 +#: ../src/ui/tool/node.cpp:515 msgctxt "Path handle tip" msgid "Shift+Alt: preserve handle length and rotate both handles" msgstr "" "Maiusc+Alt: mantieni lunghezza della maniglia e ruota entrambe le " "maniglie" -#: ../src/ui/tool/node.cpp:454 +#: ../src/ui/tool/node.cpp:518 msgctxt "Path handle tip" msgid "Alt: preserve handle length while dragging" msgstr "Alt: mantieni lunghezza della maniglia durante il trascinamento" -#: ../src/ui/tool/node.cpp:461 +#: ../src/ui/tool/node.cpp:525 #, c-format msgctxt "Path handle tip" msgid "" @@ -21985,73 +23582,95 @@ msgstr "" "Maiusc+Ctrl: aggancia l'angolo di rotazione ogni %g° e ruota entrambe " "le maniglie" -#: ../src/ui/tool/node.cpp:465 +#: ../src/ui/tool/node.cpp:529 +msgctxt "Path handle tip" +msgid "Ctrl: Move handle by his actual steps in BSpline Live Effect" +msgstr "" + +#: ../src/ui/tool/node.cpp:532 #, c-format msgctxt "Path handle tip" msgid "Ctrl: snap rotation angle to %g° increments, click to retract" msgstr "" "Ctrl: aggancia l'angolo di rotazione ogni %g°, clicca per reimpostare" -#: ../src/ui/tool/node.cpp:470 +#: ../src/ui/tool/node.cpp:537 msgctxt "Path hande tip" msgid "Shift: rotate both handles by the same angle" msgstr "Maiusc: ruota entrambe le maniglie dello stesso angolo" -#: ../src/ui/tool/node.cpp:477 +#: ../src/ui/tool/node.cpp:540 +#, fuzzy +msgctxt "Path hande tip" +msgid "Shift: move handle" +msgstr "Sposta maniglie dei nodi" + +#: ../src/ui/tool/node.cpp:547 ../src/ui/tool/node.cpp:551 #, c-format msgctxt "Path handle tip" msgid "Auto node handle: drag to convert to smooth node (%s)" msgstr "" "Maniglia nodo automatico: trascina per convertire in nodo curvo (%s)" -#: ../src/ui/tool/node.cpp:480 +#: ../src/ui/tool/node.cpp:554 #, c-format msgctxt "Path handle tip" -msgid "%s: drag to shape the segment (%s)" -msgstr "%s: trascina per formare il segmento (%s)" +msgid "" +"BSpline node handle: Shift to drag, double click to reset (%s). %g " +"power" +msgstr "" -#: ../src/ui/tool/node.cpp:500 +#: ../src/ui/tool/node.cpp:574 #, c-format msgctxt "Path handle tip" msgid "Move handle by %s, %s; angle %.2f°, length %s" msgstr "Muovi maniglia di %s, %s; angolo %.2f°, lunghezza %s" -#: ../src/ui/tool/node.cpp:1270 +#: ../src/ui/tool/node.cpp:1425 msgctxt "Path node tip" msgid "Shift: drag out a handle, click to toggle selection" msgstr "" "Maiusc: trascina una maniglia, clicca per commutare la selezione" -#: ../src/ui/tool/node.cpp:1272 +#: ../src/ui/tool/node.cpp:1427 msgctxt "Path node tip" msgid "Shift: click to toggle selection" msgstr "Maiusc: clicca per commutare la selezione" -#: ../src/ui/tool/node.cpp:1277 +#: ../src/ui/tool/node.cpp:1432 msgctxt "Path node tip" msgid "Ctrl+Alt: move along handle lines, click to delete node" msgstr "" "Ctrl+Alt: muovi lungo le linee della maniglia, clicca per eliminare " "il nodo" -#: ../src/ui/tool/node.cpp:1280 +#: ../src/ui/tool/node.cpp:1435 msgctxt "Path node tip" msgid "Ctrl: move along axes, click to change node type" msgstr "Ctrl: muovi lungo gli assi, clicca per cambiare tipo di nodo" -#: ../src/ui/tool/node.cpp:1284 +#: ../src/ui/tool/node.cpp:1439 msgctxt "Path node tip" msgid "Alt: sculpt nodes" msgstr "Alt: scolpisci nodi" -#: ../src/ui/tool/node.cpp:1292 +#: ../src/ui/tool/node.cpp:1448 #, c-format msgctxt "Path node tip" msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" msgstr "" "%s: trascina per formare il tracciato (altro: Maiusc, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1295 +#: ../src/ui/tool/node.cpp:1451 +#, fuzzy, c-format +msgctxt "Path node tip" +msgid "" +"BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " +"power" +msgstr "" +"%s: trascina per formare il tracciato (altro: Maiusc, Ctrl, Alt)" + +#: ../src/ui/tool/node.cpp:1454 #, c-format msgctxt "Path node tip" msgid "" @@ -22061,7 +23680,7 @@ msgstr "" "%s: trascina per formare il tracciato, clicca per alternare le " "maniglie di ridimensionamento/rotazione (altro: Maiusc, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1298 +#: ../src/ui/tool/node.cpp:1458 #, c-format msgctxt "Path node tip" msgid "" @@ -22071,58 +23690,72 @@ msgstr "" "%s: trascina per formare il tracciato, clicca per selezionare solo " "questo nodo (altro: Maiusc, Ctrl, Alt)" -#: ../src/ui/tool/node.cpp:1309 +#: ../src/ui/tool/node.cpp:1461 +#, fuzzy, c-format +msgctxt "Path node tip" +msgid "" +"BSpline node: drag to shape the path, click to select only this node " +"(more: Shift, Ctrl, Alt). %g power" +msgstr "" +"%s: trascina per formare il tracciato, clicca per selezionare solo " +"questo nodo (altro: Maiusc, Ctrl, Alt)" + +#: ../src/ui/tool/node.cpp:1474 #, c-format msgctxt "Path node tip" msgid "Move node by %s, %s" msgstr "Muovi nodo di %s, %s" -#: ../src/ui/tool/node.cpp:1320 +#: ../src/ui/tool/node.cpp:1485 msgid "Symmetric node" msgstr "Nodo simmetrico" -#: ../src/ui/tool/node.cpp:1321 +#: ../src/ui/tool/node.cpp:1486 msgid "Auto-smooth node" msgstr "Nodo curvo automatico" -#: ../src/ui/tool/path-manipulator.cpp:821 +#: ../src/ui/tool/path-manipulator.cpp:296 +msgid "Add node" +msgstr "Aggiungi nodo" + +#: ../src/ui/tool/path-manipulator.cpp:861 msgid "Scale handle" msgstr "Ridimensiona maniglia" -#: ../src/ui/tool/path-manipulator.cpp:845 +#: ../src/ui/tool/path-manipulator.cpp:885 msgid "Rotate handle" msgstr "Ruota maniglia" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1388 +#: ../src/ui/tool/path-manipulator.cpp:1555 #: ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "Cancella nodo" -#: ../src/ui/tool/path-manipulator.cpp:1396 +#: ../src/ui/tool/path-manipulator.cpp:1563 msgid "Cycle node type" msgstr "Cambia tipo di nodo" -#: ../src/ui/tool/path-manipulator.cpp:1411 +#: ../src/ui/tool/path-manipulator.cpp:1578 msgid "Drag handle" msgstr "Trascina maniglia" -#: ../src/ui/tool/path-manipulator.cpp:1420 +#: ../src/ui/tool/path-manipulator.cpp:1587 msgid "Retract handle" msgstr "Ritira maniglia" -#: ../src/ui/tool/transform-handle-set.cpp:195 +#: ../src/ui/tool/transform-handle-set.cpp:203 msgctxt "Transform handle tip" msgid "Shift+Ctrl: scale uniformly about the rotation center" msgstr "" "Maiusc+Ctrl: ridimensiona uniformemente attorno al centro di rotazione" -#: ../src/ui/tool/transform-handle-set.cpp:197 +#: ../src/ui/tool/transform-handle-set.cpp:205 msgctxt "Transform handle tip" msgid "Ctrl: scale uniformly" msgstr "Ctrl: ridimensiona uniformemente" -#: ../src/ui/tool/transform-handle-set.cpp:202 +#: ../src/ui/tool/transform-handle-set.cpp:210 msgctxt "Transform handle tip" msgid "" "Shift+Alt: scale using an integer ratio about the rotation center" @@ -22130,30 +23763,30 @@ msgstr "" "Maiusc+Alt: ridimensiona usando un rapporto intero attorno al centro " "di rotazione" -#: ../src/ui/tool/transform-handle-set.cpp:204 +#: ../src/ui/tool/transform-handle-set.cpp:212 msgctxt "Transform handle tip" msgid "Shift: scale from the rotation center" msgstr "Maiusc: ridimensiona dal centro di rotazione" -#: ../src/ui/tool/transform-handle-set.cpp:207 +#: ../src/ui/tool/transform-handle-set.cpp:215 msgctxt "Transform handle tip" msgid "Alt: scale using an integer ratio" msgstr "Alt: ridimensiona usando un rapporto intero" -#: ../src/ui/tool/transform-handle-set.cpp:209 +#: ../src/ui/tool/transform-handle-set.cpp:217 msgctxt "Transform handle tip" msgid "Scale handle: drag to scale the selection" msgstr "" "Maniglia di ridimensionamento: trascina per ridimensionare la " "selezione" -#: ../src/ui/tool/transform-handle-set.cpp:214 +#: ../src/ui/tool/transform-handle-set.cpp:222 #, c-format msgctxt "Transform handle tip" msgid "Scale by %.2f%% x %.2f%%" msgstr "Ridimensiona di %.2f%% x %.2f%%" -#: ../src/ui/tool/transform-handle-set.cpp:438 +#: ../src/ui/tool/transform-handle-set.cpp:449 #, c-format msgctxt "Transform handle tip" msgid "" @@ -22163,18 +23796,18 @@ msgstr "" "Maiusc+Ctrl: ruota attorno all'angolo opposto e fa scattare l'angolo " "ogni %f°" -#: ../src/ui/tool/transform-handle-set.cpp:441 +#: ../src/ui/tool/transform-handle-set.cpp:452 msgctxt "Transform handle tip" msgid "Shift: rotate around the opposite corner" msgstr "Maiusc: ruota attorno all'angolo opposto" -#: ../src/ui/tool/transform-handle-set.cpp:445 +#: ../src/ui/tool/transform-handle-set.cpp:456 #, c-format msgctxt "Transform handle tip" msgid "Ctrl: snap angle to %f° increments" msgstr "Ctrl: fa scattare l'angolo ogni %f°" -#: ../src/ui/tool/transform-handle-set.cpp:447 +#: ../src/ui/tool/transform-handle-set.cpp:458 msgctxt "Transform handle tip" msgid "" "Rotation handle: drag to rotate the selection around the rotation " @@ -22184,13 +23817,13 @@ msgstr "" "centro di rotazione" #. event -#: ../src/ui/tool/transform-handle-set.cpp:452 +#: ../src/ui/tool/transform-handle-set.cpp:463 #, c-format msgctxt "Transform handle tip" msgid "Rotate by %.2f°" msgstr "Ruota di %.2f" -#: ../src/ui/tool/transform-handle-set.cpp:578 +#: ../src/ui/tool/transform-handle-set.cpp:588 #, c-format msgctxt "Transform handle tip" msgid "" @@ -22200,18 +23833,18 @@ msgstr "" "Maiusc+Ctrl: distorce attorno al centro di rotazione facendo scattare " "l'angolo ogni %f°" -#: ../src/ui/tool/transform-handle-set.cpp:581 +#: ../src/ui/tool/transform-handle-set.cpp:591 msgctxt "Transform handle tip" msgid "Shift: skew about the rotation center" msgstr "Maiusc: distorce attorno al centro di rotazione" -#: ../src/ui/tool/transform-handle-set.cpp:585 +#: ../src/ui/tool/transform-handle-set.cpp:595 #, c-format msgctxt "Transform handle tip" msgid "Ctrl: snap skew angle to %f° increments" msgstr "Ctrl: fa scattare l'angolo di distorsione ogni %f°" -#: ../src/ui/tool/transform-handle-set.cpp:588 +#: ../src/ui/tool/transform-handle-set.cpp:598 msgctxt "Transform handle tip" msgid "" "Skew handle: drag to skew (shear) selection about the opposite handle" @@ -22219,37 +23852,202 @@ msgstr "" "Maniglia di distorsione: trascina per distorcere la selezione attorno " "alla maniglia opposta" -#: ../src/ui/tool/transform-handle-set.cpp:594 +#: ../src/ui/tool/transform-handle-set.cpp:604 #, c-format msgctxt "Transform handle tip" msgid "Skew horizontally by %.2f°" msgstr "Distorci orizzontalmente di %.2f°" -#: ../src/ui/tool/transform-handle-set.cpp:597 +#: ../src/ui/tool/transform-handle-set.cpp:607 #, c-format msgctxt "Transform handle tip" msgid "Skew vertically by %.2f°" msgstr "Distorci verticalmente di %.2f°" -#: ../src/ui/tool/transform-handle-set.cpp:656 +#: ../src/ui/tool/transform-handle-set.cpp:666 msgctxt "Transform handle tip" msgid "Rotation center: drag to change the origin of transforms" msgstr "" "Centro di rotazione: trascina per cambiare l'origine delle " "trasformazioni" -#: ../src/ui/tools/arc-tool.cpp:252 +#: ../src/ui/tools-switch.cpp:101 +msgid "" +"Click to Select and Transform objects, Drag to select many " +"objects." +msgstr "" +"Clicca per selezionare e trasformare gli oggetti, Trascina per " +"selezionare più oggetti." + +#: ../src/ui/tools-switch.cpp:102 +msgid "Modify selected path points (nodes) directly." +msgstr "Modifica i punti (nodi) selezionati del tracciato direttamente." + +#: ../src/ui/tools-switch.cpp:103 +msgid "To tweak a path by pushing, select it and drag over it." +msgstr "" +"Per ritoccare un tracciato tramite distorsione, selezionarlo e rimodellarlo " +"trascinando." + +#: ../src/ui/tools-switch.cpp:104 +msgid "" +"Drag, click or click and scroll to spray the selected " +"objects." +msgstr "" +"Trascina, clicca, clicca e scorri per spruzzare gli " +"oggetti selezionati." + +#: ../src/ui/tools-switch.cpp:105 +msgid "" +"Drag to create a rectangle. Drag controls to round corners and " +"resize. Click to select." +msgstr "" +"Trascina per creare un rettangolo. Trascina i controlli per " +"arrotondare gli angoli e ridimensionare. Clicca per selezionare." + +#: ../src/ui/tools-switch.cpp:106 +msgid "" +"Drag to create a 3D box. Drag controls to resize in " +"perspective. Click to select (with Ctrl+Alt for single faces)." +msgstr "" +"Trascina per creare un solido 3D. Trascina i controlli per " +"ridimensionarlo in prospettiva. Clicca per selezionare (con Ctrl" +"+Alt per le singole facce)." + +#: ../src/ui/tools-switch.cpp:107 +msgid "" +"Drag to create an ellipse. Drag controls to make an arc or " +"segment. Click to select." +msgstr "" +"Trascina per creare un ellisse. Trascina i controlli per farne " +"un arco o un segmento. Clicca per selezionare." + +#: ../src/ui/tools-switch.cpp:108 +msgid "" +"Drag to create a star. Drag controls to edit the star shape. " +"Click to select." +msgstr "" +"Trascina per creare una stella. Trascina i controlli per " +"modificarne la forma. Clicca per selezionare." + +#: ../src/ui/tools-switch.cpp:109 +msgid "" +"Drag to create a spiral. Drag controls to edit the spiral " +"shape. Click to select." +msgstr "" +"Trascina per creare una spirale. Trascina i controlli per " +"modificarne la forma. Clicca per selezionare." + +#: ../src/ui/tools-switch.cpp:110 +msgid "" +"Drag to create a freehand line. Shift appends to selected " +"path, Alt activates sketch mode." +msgstr "" +"Trascina per creare una linea a mano libera. Con Maiusc per " +"aggiungere al tracciato selezionato, Alt per attivare la modalità a " +"mano libera." + +#: ../src/ui/tools-switch.cpp:111 +msgid "" +"Click or click and drag to start a path; with Shift to " +"append to selected path. Ctrl+click to create single dots (straight " +"line modes only)." +msgstr "" +"Clicca o clicca e trascina per iniziare un percorso; con " +"Maiusc per accodare al percorso selezionato. Ctrl+clic per " +"creare punti singoli (solo in modalità linea semplice)." + +#: ../src/ui/tools-switch.cpp:112 +msgid "" +"Drag to draw a calligraphic stroke; with Ctrl to track a guide " +"path. Arrow keys adjust width (left/right) and angle (up/down)." +msgstr "" +"Trascina per disegnare un tratto di pennino; con Ctrl per " +"ricalcare un tracciato guida. Le frecce modificano la larghezza " +"(sinistra/destra) o l'angolo (su/giù)." + +#: ../src/ui/tools-switch.cpp:113 ../src/ui/tools/text-tool.cpp:1583 +msgid "" +"Click to select or create text, drag to create flowed text; " +"then type." +msgstr "" +"Clicca per selezionare o creare un testo, trascina per creare " +"un testo dinamico; quindi scrivere." + +#: ../src/ui/tools-switch.cpp:114 +msgid "" +"Drag or double click to create a gradient on selected objects, " +"drag handles to adjust gradients." +msgstr "" +"Trascina o doppio clic per creare un gradiente sull'oggetto " +"selezionato; trascina le maniglie per modificare il gradiente." + +#: ../src/ui/tools-switch.cpp:115 +msgid "" +"Drag or double click to create a mesh on selected objects, " +"drag handles to adjust meshes." +msgstr "" +"Trascina o doppio clic per creare un gradiente a maglia " +"sull'oggetto selezionato, trascina le maniglie per modificare il " +"gradiente." + +#: ../src/ui/tools-switch.cpp:116 +msgid "" +"Click or drag around an area to zoom in, Shift+click to " +"zoom out." +msgstr "" +"Clicca o seleziona una zona per ingrandire, Maiusc+clic " +"per rimpicciolire." + +#: ../src/ui/tools-switch.cpp:117 +msgid "Drag to measure the dimensions of objects." +msgstr "Trascina per misurare le dimensioni degli oggetti." + +#: ../src/ui/tools-switch.cpp:118 ../src/ui/tools/dropper-tool.cpp:274 +msgid "" +"Click to set fill, Shift+click to set stroke; drag to " +"average color in area; with Alt to pick inverse color; Ctrl+C " +"to copy the color under mouse to clipboard" +msgstr "" +"Clicca per impostare il colore di riempimento, Maiusc+clic per " +"impostare il colore del contorno; trascina per prelevare il colore " +"medio di un'area; con Alt per prelevare il colore inverso; Ctrl+C per copiare negli appunti il colore sotto al mouse" + +#: ../src/ui/tools-switch.cpp:119 +msgid "Click and drag between shapes to create a connector." +msgstr "Clicca e trascina tra le forme per creare un connettore." + +#: ../src/ui/tools-switch.cpp:121 +msgid "" +"Click to paint a bounded area, Shift+click to union the new " +"fill with the current selection, Ctrl+click to change the clicked " +"object's fill and stroke to the current setting." +msgstr "" +"Clicca per riempire un'area delimitata, Maiusc+clic per unire " +"il nuovo riempimento alla selezione attuale, Ctrl+clic per applicare " +"al riempimento e al contorno dell'oggetto le impostazioni attuali." + +#: ../src/ui/tools-switch.cpp:123 +msgid "Drag to erase." +msgstr "Trascina per cancellare." + +#: ../src/ui/tools-switch.cpp:124 +msgid "Choose a subtool from the toolbar" +msgstr "Seleziona una sottobarra dalla barra degli strumenti" + +#: ../src/ui/tools/arc-tool.cpp:242 msgid "" "Ctrl: make circle or integer-ratio ellipse, snap arc/segment angle" msgstr "" "Ctrl: crea cerchi o ellissi in scala, fa scattare gli angoli di archi/" "segmenti" -#: ../src/ui/tools/arc-tool.cpp:253 ../src/ui/tools/rect-tool.cpp:289 +#: ../src/ui/tools/arc-tool.cpp:243 ../src/ui/tools/rect-tool.cpp:278 msgid "Shift: draw around the starting point" msgstr "Maiusc: disegna attorno al punto iniziale" -#: ../src/ui/tools/arc-tool.cpp:422 +#: ../src/ui/tools/arc-tool.cpp:412 #, c-format msgid "" "Ellipse: %s × %s (constrained to ratio %d:%d); with Shift " @@ -22258,7 +24056,7 @@ msgstr "" "Ellisse: %s × %s; (vincolato al raggio %d:%d); Maiusc per " "disegnare attorno al punto iniziale" -#: ../src/ui/tools/arc-tool.cpp:424 +#: ../src/ui/tools/arc-tool.cpp:414 #, c-format msgid "" "Ellipse: %s × %s; with Ctrl to make square or integer-" @@ -22267,155 +24065,155 @@ msgstr "" "Ellisse: %s × %s; Ctrl per fare cerchi o ellissi in " "scala; Maiusc per disegnare attorno al punto iniziale" -#: ../src/ui/tools/arc-tool.cpp:447 +#: ../src/ui/tools/arc-tool.cpp:437 msgid "Create ellipse" msgstr "Crea ellisse" -#: ../src/ui/tools/box3d-tool.cpp:370 ../src/ui/tools/box3d-tool.cpp:377 -#: ../src/ui/tools/box3d-tool.cpp:384 ../src/ui/tools/box3d-tool.cpp:391 -#: ../src/ui/tools/box3d-tool.cpp:398 ../src/ui/tools/box3d-tool.cpp:405 +#: ../src/ui/tools/box3d-tool.cpp:360 ../src/ui/tools/box3d-tool.cpp:367 +#: ../src/ui/tools/box3d-tool.cpp:374 ../src/ui/tools/box3d-tool.cpp:381 +#: ../src/ui/tools/box3d-tool.cpp:388 ../src/ui/tools/box3d-tool.cpp:395 msgid "Change perspective (angle of PLs)" msgstr "Cambia prospettiva (angolo degli assi prospettici)" #. status text -#: ../src/ui/tools/box3d-tool.cpp:583 +#: ../src/ui/tools/box3d-tool.cpp:573 msgid "3D Box; with Shift to extrude along the Z axis" msgstr "Solido 3D; con Maiusc per estrudere lungo l'asse Z" -#: ../src/ui/tools/box3d-tool.cpp:609 +#: ../src/ui/tools/box3d-tool.cpp:599 msgid "Create 3D box" msgstr "Crea solido 3D" -#: ../src/ui/tools/calligraphic-tool.cpp:536 +#: ../src/ui/tools/calligraphic-tool.cpp:525 msgid "" "Guide path selected; start drawing along the guide with Ctrl" msgstr "" "Tracciato guida selezionato; inizia a disegnare seguendo la guida con " "Ctrl" -#: ../src/ui/tools/calligraphic-tool.cpp:538 +#: ../src/ui/tools/calligraphic-tool.cpp:527 msgid "Select a guide path to track with Ctrl" msgstr "Seleziona un tracciato guida da ricalcare con Ctrl" -#: ../src/ui/tools/calligraphic-tool.cpp:673 +#: ../src/ui/tools/calligraphic-tool.cpp:662 msgid "Tracking: connection to guide path lost!" msgstr "Ricalco: connessione" -#: ../src/ui/tools/calligraphic-tool.cpp:673 +#: ../src/ui/tools/calligraphic-tool.cpp:662 msgid "Tracking a guide path" msgstr "Ricalco di un tracciato guida" -#: ../src/ui/tools/calligraphic-tool.cpp:676 +#: ../src/ui/tools/calligraphic-tool.cpp:665 msgid "Drawing a calligraphic stroke" msgstr "Creazione di una linea calligrafica" -#: ../src/ui/tools/calligraphic-tool.cpp:977 +#: ../src/ui/tools/calligraphic-tool.cpp:966 msgid "Draw calligraphic stroke" msgstr "Crea linea calligrafiche" -#: ../src/ui/tools/connector-tool.cpp:499 +#: ../src/ui/tools/connector-tool.cpp:489 msgid "Creating new connector" msgstr "Creazione nuovo connettore" -#: ../src/ui/tools/connector-tool.cpp:740 +#: ../src/ui/tools/connector-tool.cpp:730 msgid "Connector endpoint drag cancelled." msgstr "Punto finale connettore cancellato." -#: ../src/ui/tools/connector-tool.cpp:783 +#: ../src/ui/tools/connector-tool.cpp:773 msgid "Reroute connector" msgstr "Reinstrada connettore" -#: ../src/ui/tools/connector-tool.cpp:936 +#: ../src/ui/tools/connector-tool.cpp:926 msgid "Create connector" msgstr "Crea connettore" -#: ../src/ui/tools/connector-tool.cpp:953 +#: ../src/ui/tools/connector-tool.cpp:943 msgid "Finishing connector" msgstr "Terminazione connettore" -#: ../src/ui/tools/connector-tool.cpp:1191 +#: ../src/ui/tools/connector-tool.cpp:1181 msgid "Connector endpoint: drag to reroute or connect to new shapes" msgstr "" "Punto finale connettore: trascina per reinstradare o connettere a " "nuove forme" -#: ../src/ui/tools/connector-tool.cpp:1336 +#: ../src/ui/tools/connector-tool.cpp:1324 msgid "Select at least one non-connector object." msgstr "Seleziona almeno un oggetto non-connettore." -#: ../src/ui/tools/connector-tool.cpp:1341 -#: ../src/widgets/connector-toolbar.cpp:314 +#: ../src/ui/tools/connector-tool.cpp:1329 +#: ../src/widgets/connector-toolbar.cpp:308 msgid "Make connectors avoid selected objects" msgstr "Fa sì che i connettori evitino gli oggetti selezionati" -#: ../src/ui/tools/connector-tool.cpp:1342 -#: ../src/widgets/connector-toolbar.cpp:324 +#: ../src/ui/tools/connector-tool.cpp:1330 +#: ../src/widgets/connector-toolbar.cpp:318 msgid "Make connectors ignore selected objects" msgstr "Fa sì che i connettori ignorino gli oggetti selezionati" #. alpha of color under cursor, to show in the statusbar #. locale-sensitive printf is OK, since this goes to the UI, not into SVG -#: ../src/ui/tools/dropper-tool.cpp:281 +#: ../src/ui/tools/dropper-tool.cpp:270 #, c-format msgid " alpha %.3g" msgstr " alpha %.3g" #. where the color is picked, to show in the statusbar -#: ../src/ui/tools/dropper-tool.cpp:283 +#: ../src/ui/tools/dropper-tool.cpp:272 #, c-format msgid ", averaged with radius %d" msgstr ", medio con radiale %d" -#: ../src/ui/tools/dropper-tool.cpp:283 +#: ../src/ui/tools/dropper-tool.cpp:272 msgid " under cursor" msgstr " sotto il cursore" #. message, to show in the statusbar -#: ../src/ui/tools/dropper-tool.cpp:285 +#: ../src/ui/tools/dropper-tool.cpp:274 msgid "Release mouse to set color." msgstr "Rilascia il mouse per impostare il colore." -#: ../src/ui/tools/dropper-tool.cpp:333 +#: ../src/ui/tools/dropper-tool.cpp:322 msgid "Set picked color" msgstr "Imposta colore selezionato" -#: ../src/ui/tools/eraser-tool.cpp:437 +#: ../src/ui/tools/eraser-tool.cpp:436 msgid "Drawing an eraser stroke" msgstr "Disegno di un tratto di cancellazione" -#: ../src/ui/tools/eraser-tool.cpp:770 +#: ../src/ui/tools/eraser-tool.cpp:797 msgid "Draw eraser stroke" msgstr "Disegna tratto di cancellazione" -#: ../src/ui/tools/flood-tool.cpp:192 +#: ../src/ui/tools/flood-tool.cpp:90 msgid "Visible Colors" msgstr "Colori visibili" -#: ../src/ui/tools/flood-tool.cpp:210 +#: ../src/ui/tools/flood-tool.cpp:102 msgctxt "Flood autogap" msgid "None" msgstr "Nessuna" -#: ../src/ui/tools/flood-tool.cpp:211 +#: ../src/ui/tools/flood-tool.cpp:103 msgctxt "Flood autogap" msgid "Small" msgstr "Piccola" -#: ../src/ui/tools/flood-tool.cpp:212 +#: ../src/ui/tools/flood-tool.cpp:104 msgctxt "Flood autogap" msgid "Medium" msgstr "Media" -#: ../src/ui/tools/flood-tool.cpp:213 +#: ../src/ui/tools/flood-tool.cpp:105 msgctxt "Flood autogap" msgid "Large" msgstr "Grande" -#: ../src/ui/tools/flood-tool.cpp:435 +#: ../src/ui/tools/flood-tool.cpp:415 msgid "Too much inset, the result is empty." msgstr "Troppa intrusione, il risultato è vuoto." -#: ../src/ui/tools/flood-tool.cpp:476 +#: ../src/ui/tools/flood-tool.cpp:456 #, c-format msgid "" "Area filled, path with %d node created and unioned with selection." @@ -22426,18 +24224,18 @@ msgstr[0] "" msgstr[1] "" "Area riempita, creato un tracciato di %d nodi unito con la selezione." -#: ../src/ui/tools/flood-tool.cpp:482 +#: ../src/ui/tools/flood-tool.cpp:462 #, c-format msgid "Area filled, path with %d node created." msgid_plural "Area filled, path with %d nodes created." msgstr[0] "Area riempita, creato un tracciato di %d nodo." msgstr[1] "Area riempita, creato un tracciato di %d nodi." -#: ../src/ui/tools/flood-tool.cpp:750 ../src/ui/tools/flood-tool.cpp:1060 +#: ../src/ui/tools/flood-tool.cpp:730 ../src/ui/tools/flood-tool.cpp:1040 msgid "Area is not bounded, cannot fill." msgstr "L'Area non è limitata, impossibile riempirla." -#: ../src/ui/tools/flood-tool.cpp:1065 +#: ../src/ui/tools/flood-tool.cpp:1045 msgid "" "Only the visible part of the bounded area was filled. If you want to " "fill all of the area, undo, zoom out, and fill again." @@ -22446,50 +24244,50 @@ msgstr "" "riempire tutta l'area occorre annullare, rimpicciolire l'immagine e " "procedere col riempimento." -#: ../src/ui/tools/flood-tool.cpp:1083 ../src/ui/tools/flood-tool.cpp:1234 +#: ../src/ui/tools/flood-tool.cpp:1063 ../src/ui/tools/flood-tool.cpp:1214 msgid "Fill bounded area" msgstr "Riempie aree delimitate" -#: ../src/ui/tools/flood-tool.cpp:1099 +#: ../src/ui/tools/flood-tool.cpp:1079 msgid "Set style on object" msgstr "Imposta stile per l'oggetto" -#: ../src/ui/tools/flood-tool.cpp:1159 +#: ../src/ui/tools/flood-tool.cpp:1139 msgid "Draw over areas to add to fill, hold Alt for touch fill" msgstr "" "Disegnare sulle aree per aggiungere un riempimento, premere Alt per riempire al tocco" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:517 +#: ../src/ui/tools/freehand-base.cpp:674 msgid "Path is closed." msgstr "Il tracciato è chiuso." #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:532 +#: ../src/ui/tools/freehand-base.cpp:689 msgid "Closing path." msgstr "Chiusura tracciato." -#: ../src/ui/tools/freehand-base.cpp:634 +#: ../src/ui/tools/freehand-base.cpp:828 msgid "Draw path" msgstr "Disegna tracciato" -#: ../src/ui/tools/freehand-base.cpp:791 +#: ../src/ui/tools/freehand-base.cpp:981 msgid "Creating single dot" msgstr "Creazione singolo punto" -#: ../src/ui/tools/freehand-base.cpp:792 +#: ../src/ui/tools/freehand-base.cpp:982 msgid "Create single dot" msgstr "Crea singolo punto" #. TRANSLATORS: %s will be substituted with the point name (see previous messages); This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:131 ../src/ui/tools/mesh-tool.cpp:130 +#: ../src/ui/tools/gradient-tool.cpp:121 ../src/ui/tools/mesh-tool.cpp:120 #, c-format msgid "%s selected" msgstr "%s selezionato" #. TRANSLATORS: Mind the space in front. This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:133 ../src/ui/tools/gradient-tool.cpp:142 +#: ../src/ui/tools/gradient-tool.cpp:123 ../src/ui/tools/gradient-tool.cpp:132 #, c-format msgid " out of %d gradient handle" msgid_plural " out of %d gradient handles" @@ -22497,9 +24295,9 @@ msgstr[0] " con %d maniglia di gradiente" msgstr[1] " con %d maniglie di gradiente" #. TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message -#: ../src/ui/tools/gradient-tool.cpp:134 ../src/ui/tools/gradient-tool.cpp:143 -#: ../src/ui/tools/gradient-tool.cpp:150 ../src/ui/tools/mesh-tool.cpp:133 -#: ../src/ui/tools/mesh-tool.cpp:144 ../src/ui/tools/mesh-tool.cpp:152 +#: ../src/ui/tools/gradient-tool.cpp:124 ../src/ui/tools/gradient-tool.cpp:133 +#: ../src/ui/tools/gradient-tool.cpp:140 ../src/ui/tools/mesh-tool.cpp:123 +#: ../src/ui/tools/mesh-tool.cpp:134 ../src/ui/tools/mesh-tool.cpp:142 #, c-format msgid " on %d selected object" msgid_plural " on %d selected objects" @@ -22507,7 +24305,7 @@ msgstr[0] " su %d oggetto selezionati" msgstr[1] " su %d oggetti selezionati" #. TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count) -#: ../src/ui/tools/gradient-tool.cpp:140 ../src/ui/tools/mesh-tool.cpp:140 +#: ../src/ui/tools/gradient-tool.cpp:130 ../src/ui/tools/mesh-tool.cpp:130 #, c-format msgid "" "One handle merging %d stop (drag with Shift to separate) selected" @@ -22521,7 +24319,7 @@ msgstr[1] "" "separare) selezionata" #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count) -#: ../src/ui/tools/gradient-tool.cpp:148 +#: ../src/ui/tools/gradient-tool.cpp:138 #, c-format msgid "%d gradient handle selected out of %d" msgid_plural "%d gradient handles selected out of %d" @@ -22529,7 +24327,7 @@ msgstr[0] "%d maniglia di gradiente selezionata su %d" msgstr[1] "%d maniglie di gradiente selezionate su %d" #. TRANSLATORS: The plural refers to number of selected objects -#: ../src/ui/tools/gradient-tool.cpp:155 +#: ../src/ui/tools/gradient-tool.cpp:145 #, c-format msgid "No gradient handles selected out of %d on %d selected object" msgid_plural "" @@ -22541,27 +24339,27 @@ msgstr[1] "" "Nessuna maniglia di gradiente selezionata su %d per %d oggetti nella " "selezione" -#: ../src/ui/tools/gradient-tool.cpp:440 +#: ../src/ui/tools/gradient-tool.cpp:433 msgid "Simplify gradient" msgstr "Semplifica radiente" -#: ../src/ui/tools/gradient-tool.cpp:516 +#: ../src/ui/tools/gradient-tool.cpp:510 msgid "Create default gradient" msgstr "Crea gradiente predefinito" -#: ../src/ui/tools/gradient-tool.cpp:575 ../src/ui/tools/mesh-tool.cpp:570 +#: ../src/ui/tools/gradient-tool.cpp:569 ../src/ui/tools/mesh-tool.cpp:561 msgid "Draw around handles to select them" msgstr "Trascina attorno alle maniglie per selezionarle" -#: ../src/ui/tools/gradient-tool.cpp:698 +#: ../src/ui/tools/gradient-tool.cpp:690 msgid "Ctrl: snap gradient angle" msgstr "Ctrl: fa scattare l'angolo del gradiente" -#: ../src/ui/tools/gradient-tool.cpp:699 +#: ../src/ui/tools/gradient-tool.cpp:691 msgid "Shift: draw gradient around the starting point" msgstr "Maiusc: disegna il gradiente attorno al punto iniziale" -#: ../src/ui/tools/gradient-tool.cpp:953 ../src/ui/tools/mesh-tool.cpp:993 +#: ../src/ui/tools/gradient-tool.cpp:945 ../src/ui/tools/mesh-tool.cpp:977 #, c-format msgid "Gradient for %d object; with Ctrl to snap angle" msgid_plural "Gradient for %d objects; with Ctrl to snap angle" @@ -22570,23 +24368,61 @@ msgstr[0] "" msgstr[1] "" "Gradiente per %d oggetti; con Ctrl per far scattare l'angolo" -#: ../src/ui/tools/gradient-tool.cpp:957 ../src/ui/tools/mesh-tool.cpp:997 +#: ../src/ui/tools/gradient-tool.cpp:949 ../src/ui/tools/mesh-tool.cpp:981 msgid "Select objects on which to create gradient." msgstr "Seleziona l'oggetto su cui creare il gradiente." -#: ../src/ui/tools/lpe-tool.cpp:207 +#: ../src/ui/tools/lpe-tool.cpp:195 msgid "Choose a construction tool from the toolbar." msgstr "Scegliere uno strumento di costruzione dalla barra degli strumenti." +#. create the knots +#: ../src/ui/tools/measure-tool.cpp:349 +msgid "Measure start, Shift+Click for position dialog" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:355 +msgid "Measure end, Shift+Click for position dialog" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 +msgid "Measure" +msgstr "Misura" + +#: ../src/ui/tools/measure-tool.cpp:752 +msgid "Base" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:761 +msgid "Add guides from measure tool" +msgstr "Aggiungi guide dallo strumento di misurazione" + +#: ../src/ui/tools/measure-tool.cpp:781 +msgid "Add Stored to measure tool" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:801 +msgid "Convert measure to items" +msgstr "Converti misura in oggetto" + +#: ../src/ui/tools/measure-tool.cpp:839 +msgid "Add global measure line" +msgstr "" + +#: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 +#, c-format +msgid "Crossing %lu" +msgstr "Intersezione %lu" + #. TRANSLATORS: Mind the space in front. This is part of a compound message -#: ../src/ui/tools/mesh-tool.cpp:132 ../src/ui/tools/mesh-tool.cpp:143 +#: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 #, c-format msgid " out of %d mesh handle" msgid_plural " out of %d mesh handles" msgstr[0] " su %d maniglia del gradiente a maglia" msgstr[1] " su %d maniglie del gradiente a maglia" -#: ../src/ui/tools/mesh-tool.cpp:150 +#: ../src/ui/tools/mesh-tool.cpp:140 #, c-format msgid "%d mesh handle selected out of %d" msgid_plural "%d mesh handles selected out of %d" @@ -22594,7 +24430,7 @@ msgstr[0] "%d maniglia del gradiente a maglia selezionata su %d" msgstr[1] "%d maniglie del gradiente a maglia selezionate su %d" #. TRANSLATORS: The plural refers to number of selected objects -#: ../src/ui/tools/mesh-tool.cpp:157 +#: ../src/ui/tools/mesh-tool.cpp:147 #, fuzzy, c-format msgid "No mesh handles selected out of %d on %d selected object" msgid_plural "No mesh handles selected out of %d on %d selected objects" @@ -22605,46 +24441,51 @@ msgstr[1] "" "Nessuna maniglia di gradiente selezionata su %d per %d oggetti nella " "selezione" -#: ../src/ui/tools/mesh-tool.cpp:321 +#: ../src/ui/tools/mesh-tool.cpp:311 msgid "Split mesh row/column" msgstr "" -#: ../src/ui/tools/mesh-tool.cpp:407 +#: ../src/ui/tools/mesh-tool.cpp:397 msgid "Toggled mesh path type." msgstr "" -#: ../src/ui/tools/mesh-tool.cpp:411 +#: ../src/ui/tools/mesh-tool.cpp:401 msgid "Approximated arc for mesh side." msgstr "" -#: ../src/ui/tools/mesh-tool.cpp:415 +#: ../src/ui/tools/mesh-tool.cpp:405 msgid "Toggled mesh tensors." msgstr "" -#: ../src/ui/tools/mesh-tool.cpp:419 +#: ../src/ui/tools/mesh-tool.cpp:409 #, fuzzy msgid "Smoothed mesh corner color." msgstr "Shader liscio contornato" -#: ../src/ui/tools/mesh-tool.cpp:423 +#: ../src/ui/tools/mesh-tool.cpp:413 #, fuzzy msgid "Picked mesh corner color." msgstr "Preleva l'opacità del colore" -#: ../src/ui/tools/mesh-tool.cpp:498 +#: ../src/ui/tools/mesh-tool.cpp:489 msgid "Create default mesh" msgstr "Crea maglia predefinita" -#: ../src/ui/tools/mesh-tool.cpp:718 +#: ../src/ui/tools/mesh-tool.cpp:713 msgid "FIXMECtrl: snap mesh angle" msgstr "Ctrl: fa scattare l'angolo del gradiente a maglia" -#: ../src/ui/tools/mesh-tool.cpp:719 +#: ../src/ui/tools/mesh-tool.cpp:714 #, fuzzy msgid "FIXMEShift: draw mesh around the starting point" msgstr "Maiusc: disegna attorno al punto iniziale" -#: ../src/ui/tools/node-tool.cpp:594 +#: ../src/ui/tools/mesh-tool.cpp:971 +#, fuzzy +msgid "Create mesh" +msgstr "Crea maglia predefinita" + +#: ../src/ui/tools/node-tool.cpp:653 msgctxt "Node tool tip" msgid "" "Shift: drag to add nodes to the selection, click to toggle object " @@ -22653,19 +24494,19 @@ msgstr "" "Maiusc: trascina per aggiungere nodi alla selezione, clicca per " "commutare la selezione dell'oggetto" -#: ../src/ui/tools/node-tool.cpp:598 +#: ../src/ui/tools/node-tool.cpp:657 msgctxt "Node tool tip" msgid "Shift: drag to add nodes to the selection" msgstr "Maiusc: trascina per aggiungere nodi alla selezione" -#: ../src/ui/tools/node-tool.cpp:610 +#: ../src/ui/tools/node-tool.cpp:686 #, c-format msgid "%u of %u node selected." msgid_plural "%u of %u nodes selected." msgstr[0] "%u di %u nodo selezionato." msgstr[1] "%u di %u nodi selezionati." -#: ../src/ui/tools/node-tool.cpp:616 +#: ../src/ui/tools/node-tool.cpp:693 #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click to edit only this object (more: Shift)" @@ -22673,83 +24514,119 @@ msgstr "" "%s Trascina per selezionare i nodi, clicca per modificare solo questo " "oggetto (altro: Maiusc)" -#: ../src/ui/tools/node-tool.cpp:622 +#: ../src/ui/tools/node-tool.cpp:699 #, c-format msgctxt "Node tool tip" msgid "%s Drag to select nodes, click clear the selection" msgstr "%s Trascina per selezionare i nodi, clicca per annullare la selezione" -#: ../src/ui/tools/node-tool.cpp:631 +#: ../src/ui/tools/node-tool.cpp:708 msgctxt "Node tool tip" msgid "Drag to select nodes, click to edit only this object" msgstr "" "Trascina per selezionare i nodi, clicca per modificare solo questo oggetto" -#: ../src/ui/tools/node-tool.cpp:634 +#: ../src/ui/tools/node-tool.cpp:711 msgctxt "Node tool tip" msgid "Drag to select nodes, click to clear the selection" msgstr "Trascina per selezionare i nodi, clicca per annullare la selezione" -#: ../src/ui/tools/node-tool.cpp:639 +#: ../src/ui/tools/node-tool.cpp:716 msgctxt "Node tool tip" msgid "Drag to select objects to edit, click to edit this object (more: Shift)" msgstr "" "Trascina per selezionare oggetti da modificare, clicca per modificare questo " "oggetto (altro: Maiusc)" -#: ../src/ui/tools/node-tool.cpp:642 +#: ../src/ui/tools/node-tool.cpp:719 msgctxt "Node tool tip" msgid "Drag to select objects to edit" msgstr "Trascina per selezionare gli oggetti da modificare" -#: ../src/ui/tools/pen-tool.cpp:186 ../src/ui/tools/pencil-tool.cpp:465 +#: ../src/ui/tools/pen-tool.cpp:223 ../src/ui/tools/pencil-tool.cpp:455 msgid "Drawing cancelled" msgstr "Disegno cancellato" -#: ../src/ui/tools/pen-tool.cpp:410 ../src/ui/tools/pencil-tool.cpp:203 +#: ../src/ui/tools/pen-tool.cpp:463 ../src/ui/tools/pencil-tool.cpp:196 msgid "Continuing selected path" msgstr "Continuazione del tracciato selezionato" -#: ../src/ui/tools/pen-tool.cpp:420 ../src/ui/tools/pencil-tool.cpp:211 +#: ../src/ui/tools/pen-tool.cpp:473 ../src/ui/tools/pencil-tool.cpp:204 msgid "Creating new path" msgstr "Creazione nuovo tracciato" -#: ../src/ui/tools/pen-tool.cpp:422 ../src/ui/tools/pencil-tool.cpp:214 +#: ../src/ui/tools/pen-tool.cpp:475 ../src/ui/tools/pencil-tool.cpp:207 msgid "Appending to selected path" msgstr "Aggiunta al tracciato selezionato" -#: ../src/ui/tools/pen-tool.cpp:584 +#: ../src/ui/tools/pen-tool.cpp:640 msgid "Click or click and drag to close and finish the path." msgstr "" "Clicca o clicca e trascina per chiudere e terminare il " "tracciato." -#: ../src/ui/tools/pen-tool.cpp:594 +#: ../src/ui/tools/pen-tool.cpp:642 +#, fuzzy +msgid "" +"Click or click and drag to close and finish the path. Shift" +"+Click make a cusp node" +msgstr "" +"Clicca o clicca e trascina per chiudere e terminare il " +"tracciato." + +#: ../src/ui/tools/pen-tool.cpp:654 msgid "" "Click or click and drag to continue the path from this point." msgstr "" "Clicca o clicca e trascina per continuare il tracciato da " "questo punto." -#: ../src/ui/tools/pen-tool.cpp:1218 -#, c-format +#: ../src/ui/tools/pen-tool.cpp:656 +#, fuzzy +msgid "" +"Click or click and drag to continue the path from this point. " +"Shift+Click make a cusp node" +msgstr "" +"Clicca o clicca e trascina per continuare il tracciato da " +"questo punto." + +#: ../src/ui/tools/pen-tool.cpp:1797 +#, fuzzy, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Segmento di curva: angolo %3.2f°, distanza %s; con Ctrl " "angoli a scatti; Invio per terminare il tracciato" -#: ../src/ui/tools/pen-tool.cpp:1219 -#, c-format +#: ../src/ui/tools/pen-tool.cpp:1798 +#, fuzzy, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" +msgstr "" +"Segmento di linea: angolo %3.2f°, distanza %s; con Ctrl " +"angoli a scatti; Invio per terminare il tracciato" + +#: ../src/ui/tools/pen-tool.cpp:1801 +#, fuzzy, c-format +msgid "" +"Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter or Shift+Enter to finish the path" +msgstr "" +"Segmento di curva: angolo %3.2f°, distanza %s; con Ctrl " +"angoli a scatti; Invio per terminare il tracciato" + +#: ../src/ui/tools/pen-tool.cpp:1802 +#, fuzzy, c-format +msgid "" +"Line segment: angle %3.2f°, distance %s; with Shift+Click " +"make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" "Segmento di linea: angolo %3.2f°, distanza %s; con Ctrl " "angoli a scatti; Invio per terminare il tracciato" -#: ../src/ui/tools/pen-tool.cpp:1235 +#: ../src/ui/tools/pen-tool.cpp:1819 #, c-format msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " @@ -22758,7 +24635,7 @@ msgstr "" "Maniglia curva: angolo %3.2f° lunghezza %s; Ctrl per " "angoli a scatti" -#: ../src/ui/tools/pen-tool.cpp:1257 +#: ../src/ui/tools/pen-tool.cpp:1843 #, c-format msgid "" "Curve handle, symmetric: angle %3.2f°, length %s; with CtrlCtrl per angoli a scatti, Maiusc per muovere solo questa " "maniglia" -#: ../src/ui/tools/pen-tool.cpp:1258 +#: ../src/ui/tools/pen-tool.cpp:1844 #, c-format msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " @@ -22777,28 +24654,28 @@ msgstr "" "Maniglia di curva: angolo %3.2f°, lunghezza %s; con Ctrl " "per angoli a scatti, Maiusc per muovere solo questa maniglia" -#: ../src/ui/tools/pen-tool.cpp:1301 +#: ../src/ui/tools/pen-tool.cpp:1978 msgid "Drawing finished" msgstr "Disegno finito" -#: ../src/ui/tools/pencil-tool.cpp:315 +#: ../src/ui/tools/pencil-tool.cpp:308 msgid "Release here to close and finish the path." msgstr "Rilascia qui per chiudere e terminare il tracciato." -#: ../src/ui/tools/pencil-tool.cpp:321 +#: ../src/ui/tools/pencil-tool.cpp:314 msgid "Drawing a freehand path" msgstr "Disegna un percorso a mano libera" -#: ../src/ui/tools/pencil-tool.cpp:326 +#: ../src/ui/tools/pencil-tool.cpp:319 msgid "Drag to continue the path from this point." msgstr "Trascina per continuare il tracciato da questo punto." #. Write curves to object -#: ../src/ui/tools/pencil-tool.cpp:411 +#: ../src/ui/tools/pencil-tool.cpp:402 msgid "Finishing freehand" msgstr "Terminazione mano libera" -#: ../src/ui/tools/pencil-tool.cpp:514 +#: ../src/ui/tools/pencil-tool.cpp:504 msgid "" "Sketch mode: holding Alt interpolates between sketched paths. " "Release Alt to finalize." @@ -22806,11 +24683,11 @@ msgstr "" "Modalità bozzetto: tieni premuto Alt per interpolare i " "tracciati abbozzati. Rilascia Alt per completare." -#: ../src/ui/tools/pencil-tool.cpp:541 +#: ../src/ui/tools/pencil-tool.cpp:531 msgid "Finishing freehand sketch" msgstr "Terminazione mano libera" -#: ../src/ui/tools/rect-tool.cpp:288 +#: ../src/ui/tools/rect-tool.cpp:277 msgid "" "Ctrl: make square or integer-ratio rect, lock a rounded corner " "circular" @@ -22818,7 +24695,7 @@ msgstr "" "Ctrl: Crea un quadrato o un rettangolo intero, un angolo arrotondato " "circolare" -#: ../src/ui/tools/rect-tool.cpp:449 +#: ../src/ui/tools/rect-tool.cpp:438 #, c-format msgid "" "Rectangle: %s × %s (constrained to ratio %d:%d); with ShiftRettangolo: %s × %s (costretto dal rapporto %d:%d); con " "Maiusc per disegnare attorno al punto iniziale" -#: ../src/ui/tools/rect-tool.cpp:452 +#: ../src/ui/tools/rect-tool.cpp:441 #, c-format msgid "" "Rectangle: %s × %s (constrained to golden ratio 1.618 : 1); with " @@ -22836,7 +24713,7 @@ msgstr "" "Rettangolo: %s × %s (costretto al rapporto aureo 1.618 : 1); con " "Maiusc per disegnare attorno al punto iniziale" -#: ../src/ui/tools/rect-tool.cpp:454 +#: ../src/ui/tools/rect-tool.cpp:443 #, c-format msgid "" "Rectangle: %s × %s (constrained to golden ratio 1 : 1.618); with " @@ -22845,7 +24722,7 @@ msgstr "" "Rettangolo: %s × %s (costretto al rapporto aureo 1: 1.618); con " "Maiusc per disegnare attorno al punto iniziale" -#: ../src/ui/tools/rect-tool.cpp:458 +#: ../src/ui/tools/rect-tool.cpp:447 #, c-format msgid "" "Rectangle: %s × %s; with Ctrl to make square or integer-" @@ -22854,16 +24731,16 @@ msgstr "" "Rettangolo: %s × %s; con Ctrl per fare quadrati o " "rettangoli interi; con Maiusc per disegnare attorno al punto iniziale" -#: ../src/ui/tools/rect-tool.cpp:481 +#: ../src/ui/tools/rect-tool.cpp:470 msgid "Create rectangle" msgstr "Crea rettangolo" -#: ../src/ui/tools/select-tool.cpp:169 +#: ../src/ui/tools/select-tool.cpp:156 msgid "Click selection to toggle scale/rotation handles" msgstr "" "Clicca la selezione per alternare le maniglie di ridimensionamento/rotazione" -#: ../src/ui/tools/select-tool.cpp:170 +#: ../src/ui/tools/select-tool.cpp:157 msgid "" "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, " "or drag around objects to select." @@ -22871,15 +24748,15 @@ msgstr "" "Nessun oggetto selezionato. Clicca, Maiusc+clic, Alt+scorrimento mouse sugli " "oggetti, o trascina attorno agli oggetti per selezionare." -#: ../src/ui/tools/select-tool.cpp:223 +#: ../src/ui/tools/select-tool.cpp:210 msgid "Move canceled." msgstr "Spostamento cancellato." -#: ../src/ui/tools/select-tool.cpp:231 +#: ../src/ui/tools/select-tool.cpp:218 msgid "Selection canceled." msgstr "Selezione cancellata." -#: ../src/ui/tools/select-tool.cpp:642 +#: ../src/ui/tools/select-tool.cpp:638 msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" @@ -22887,7 +24764,7 @@ msgstr "" "Disegna sugli oggetti per selezionarli; rilascia Alt per " "passare alla selezione ad elastico" -#: ../src/ui/tools/select-tool.cpp:644 +#: ../src/ui/tools/select-tool.cpp:640 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" @@ -22895,19 +24772,19 @@ msgstr "" "Trascina attorno agli oggetti per selezionarli; premi Alt per " "passare alla selezione col tocco" -#: ../src/ui/tools/select-tool.cpp:932 +#: ../src/ui/tools/select-tool.cpp:921 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "" "Ctrl: clicca per selezionare nei gruppi, trascina per muovere in " "orizzontale o verticale" -#: ../src/ui/tools/select-tool.cpp:933 +#: ../src/ui/tools/select-tool.cpp:922 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" "Maiusc: clicca per commutare la selezione, trascina per usare la " "selezione ad elastico" -#: ../src/ui/tools/select-tool.cpp:934 +#: ../src/ui/tools/select-tool.cpp:923 msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" @@ -22915,19 +24792,19 @@ msgstr "" "Alt: clicca per selezionare sotto, scorri con il mouse per " "selezionare in ciclo, trascina per muovere la selezione o seleziona col tocco" -#: ../src/ui/tools/select-tool.cpp:1142 +#: ../src/ui/tools/select-tool.cpp:1131 msgid "Selected object is not a group. Cannot enter." msgstr "L'oggetto selezionato non è un gruppo, impossibile entrarvi." -#: ../src/ui/tools/spiral-tool.cpp:259 +#: ../src/ui/tools/spiral-tool.cpp:249 msgid "Ctrl: snap angle" msgstr "Ctrl: fa scattare l'angolo" -#: ../src/ui/tools/spiral-tool.cpp:261 +#: ../src/ui/tools/spiral-tool.cpp:251 msgid "Alt: lock spiral radius" msgstr "Alt: mantiene il raggio della spirale" -#: ../src/ui/tools/spiral-tool.cpp:400 +#: ../src/ui/tools/spiral-tool.cpp:390 #, c-format msgid "" "Spiral: radius %s, angle %5g°; with Ctrl to snap angle" @@ -22935,22 +24812,22 @@ msgstr "" "Spirale: raggio %s, angolo %5g°; con Ctrl per far " "scattare l'angolo" -#: ../src/ui/tools/spiral-tool.cpp:421 +#: ../src/ui/tools/spiral-tool.cpp:411 msgid "Create spiral" msgstr "Crea spirale" -#: ../src/ui/tools/spray-tool.cpp:183 ../src/ui/tools/tweak-tool.cpp:167 +#: ../src/ui/tools/spray-tool.cpp:214 ../src/ui/tools/tweak-tool.cpp:157 #, c-format msgid "%i object selected" msgid_plural "%i objects selected" msgstr[0] "%i oggetto selezionato" msgstr[1] "%i oggetti selezionati" -#: ../src/ui/tools/spray-tool.cpp:185 ../src/ui/tools/tweak-tool.cpp:169 +#: ../src/ui/tools/spray-tool.cpp:216 ../src/ui/tools/tweak-tool.cpp:159 msgid "Nothing selected" msgstr "Nessuna selezione" -#: ../src/ui/tools/spray-tool.cpp:190 +#: ../src/ui/tools/spray-tool.cpp:221 #, c-format msgid "" "%s. Drag, click or click and scroll to spray copies of the initial " @@ -22959,7 +24836,7 @@ msgstr "" "%s. Trascina, clicca o clicca e scorri per spruzzare copie della " "selezione iniziale." -#: ../src/ui/tools/spray-tool.cpp:193 +#: ../src/ui/tools/spray-tool.cpp:224 #, c-format msgid "" "%s. Drag, click or click and scroll to spray clones of the initial " @@ -22968,7 +24845,7 @@ msgstr "" "%s. Trascina, clicca o clicca e scorri per spruzzare cloni della " "selezione iniziale." -#: ../src/ui/tools/spray-tool.cpp:196 +#: ../src/ui/tools/spray-tool.cpp:227 #, c-format msgid "" "%s. Drag, click or click and scroll to spray in a single path of the " @@ -22977,27 +24854,27 @@ msgstr "" "%s. Trascina, clicca o clicca e scorri per spruzzare in un singolo " "tracciato della selezione iniziale." -#: ../src/ui/tools/spray-tool.cpp:627 +#: ../src/ui/tools/spray-tool.cpp:1305 msgid "Nothing selected! Select objects to spray." msgstr "Nessuna selezione! Seleziona gli oggetti da spruzzare." -#: ../src/ui/tools/spray-tool.cpp:702 ../src/widgets/spray-toolbar.cpp:166 +#: ../src/ui/tools/spray-tool.cpp:1380 ../src/widgets/spray-toolbar.cpp:360 msgid "Spray with copies" msgstr "Spruzza copie" -#: ../src/ui/tools/spray-tool.cpp:706 ../src/widgets/spray-toolbar.cpp:173 +#: ../src/ui/tools/spray-tool.cpp:1384 ../src/widgets/spray-toolbar.cpp:367 msgid "Spray with clones" msgstr "Spruzza cloni" -#: ../src/ui/tools/spray-tool.cpp:710 +#: ../src/ui/tools/spray-tool.cpp:1388 msgid "Spray in single path" msgstr "Spruzza in un singolo tracciato" -#: ../src/ui/tools/star-tool.cpp:271 +#: ../src/ui/tools/star-tool.cpp:261 msgid "Ctrl: snap angle; keep rays radial" msgstr "Ctrl: fa scattare l'angolo; mantiene la direzione dei raggi" -#: ../src/ui/tools/star-tool.cpp:417 +#: ../src/ui/tools/star-tool.cpp:407 #, c-format msgid "" "Polygon: radius %s, angle %5g°; with Ctrl to snap angle" @@ -23005,69 +24882,69 @@ msgstr "" "Poligono: raggio %s, angolo %5g°; con Ctrl per far " "scattare l'angolo" -#: ../src/ui/tools/star-tool.cpp:418 +#: ../src/ui/tools/star-tool.cpp:408 #, c-format msgid "Star: radius %s, angle %5g°; with Ctrl to snap angle" msgstr "" "Stella: raggio %s, angolo %5g°; con Ctrl per far scattare " "l'angolo" -#: ../src/ui/tools/star-tool.cpp:446 +#: ../src/ui/tools/star-tool.cpp:436 msgid "Create star" msgstr "Crea stella" -#: ../src/ui/tools/text-tool.cpp:379 +#: ../src/ui/tools/text-tool.cpp:370 msgid "Click to edit the text, drag to select part of the text." msgstr "" "Clicca per modificare il testo, trascina per selezionarne una " "parte." -#: ../src/ui/tools/text-tool.cpp:381 +#: ../src/ui/tools/text-tool.cpp:372 msgid "" "Click to edit the flowed text, drag to select part of the text." msgstr "" "Clicca per modificare il testo dinamico, trascina per " "selezionarne una parte." -#: ../src/ui/tools/text-tool.cpp:435 +#: ../src/ui/tools/text-tool.cpp:426 msgid "Create text" msgstr "Crea testo" -#: ../src/ui/tools/text-tool.cpp:460 +#: ../src/ui/tools/text-tool.cpp:451 msgid "Non-printable character" msgstr "Carattere non stampabile" -#: ../src/ui/tools/text-tool.cpp:475 +#: ../src/ui/tools/text-tool.cpp:466 msgid "Insert Unicode character" msgstr "Inserisci carattere Unicode" -#: ../src/ui/tools/text-tool.cpp:510 +#: ../src/ui/tools/text-tool.cpp:501 #, c-format msgid "Unicode (Enter to finish): %s: %s" msgstr "Unicode (Invio per terminare): %s, %s" -#: ../src/ui/tools/text-tool.cpp:512 ../src/ui/tools/text-tool.cpp:817 +#: ../src/ui/tools/text-tool.cpp:503 ../src/ui/tools/text-tool.cpp:808 msgid "Unicode (Enter to finish): " msgstr "Unicode (Invio per terminare): " -#: ../src/ui/tools/text-tool.cpp:595 +#: ../src/ui/tools/text-tool.cpp:586 #, c-format msgid "Flowed text frame: %s × %s" msgstr "Struttura del testo dinamico: %s × %s" -#: ../src/ui/tools/text-tool.cpp:653 +#: ../src/ui/tools/text-tool.cpp:644 msgid "Type text; Enter to start new line." msgstr "Inserisci il testo; Invio per iniziare una nuova riga." -#: ../src/ui/tools/text-tool.cpp:664 +#: ../src/ui/tools/text-tool.cpp:655 msgid "Flowed text is created." msgstr "Il testo dinamico è stato creato." -#: ../src/ui/tools/text-tool.cpp:665 +#: ../src/ui/tools/text-tool.cpp:656 msgid "Create flowed text" msgstr "Crea testo dinamico" -#: ../src/ui/tools/text-tool.cpp:667 +#: ../src/ui/tools/text-tool.cpp:658 msgid "" "The frame is too small for the current font size. Flowed text not " "created." @@ -23075,75 +24952,75 @@ msgstr "" "La struttura è troppo piccola per la dimensione del carattere " "attuale. Testo dinamico non creato." -#: ../src/ui/tools/text-tool.cpp:803 +#: ../src/ui/tools/text-tool.cpp:794 msgid "No-break space" msgstr "Spazio non interrompibile" -#: ../src/ui/tools/text-tool.cpp:804 +#: ../src/ui/tools/text-tool.cpp:795 msgid "Insert no-break space" msgstr "Inserisci spazio non interrompibile" -#: ../src/ui/tools/text-tool.cpp:840 +#: ../src/ui/tools/text-tool.cpp:831 msgid "Make bold" msgstr "Rendi grassetto" -#: ../src/ui/tools/text-tool.cpp:857 +#: ../src/ui/tools/text-tool.cpp:848 msgid "Make italic" msgstr "Imposta corsivo" -#: ../src/ui/tools/text-tool.cpp:895 +#: ../src/ui/tools/text-tool.cpp:886 msgid "New line" msgstr "A capo" -#: ../src/ui/tools/text-tool.cpp:936 +#: ../src/ui/tools/text-tool.cpp:927 msgid "Backspace" msgstr "Backspace" -#: ../src/ui/tools/text-tool.cpp:990 +#: ../src/ui/tools/text-tool.cpp:981 msgid "Kern to the left" msgstr "Kern a sinistra" -#: ../src/ui/tools/text-tool.cpp:1014 +#: ../src/ui/tools/text-tool.cpp:1005 msgid "Kern to the right" msgstr "Kern a destra" -#: ../src/ui/tools/text-tool.cpp:1038 +#: ../src/ui/tools/text-tool.cpp:1029 msgid "Kern up" msgstr "Kern in alto" -#: ../src/ui/tools/text-tool.cpp:1062 +#: ../src/ui/tools/text-tool.cpp:1053 msgid "Kern down" msgstr "Kern in basso" -#: ../src/ui/tools/text-tool.cpp:1137 +#: ../src/ui/tools/text-tool.cpp:1128 msgid "Rotate counterclockwise" msgstr "Ruota antiorario" -#: ../src/ui/tools/text-tool.cpp:1157 +#: ../src/ui/tools/text-tool.cpp:1148 msgid "Rotate clockwise" msgstr "Ruota orario" -#: ../src/ui/tools/text-tool.cpp:1173 +#: ../src/ui/tools/text-tool.cpp:1164 msgid "Contract line spacing" msgstr "Contrai spaziatura linea" -#: ../src/ui/tools/text-tool.cpp:1179 +#: ../src/ui/tools/text-tool.cpp:1170 msgid "Contract letter spacing" msgstr "Riduci spaziatura lettere" -#: ../src/ui/tools/text-tool.cpp:1196 +#: ../src/ui/tools/text-tool.cpp:1187 msgid "Expand line spacing" msgstr "Espandi spaziatura linea" -#: ../src/ui/tools/text-tool.cpp:1202 +#: ../src/ui/tools/text-tool.cpp:1193 msgid "Expand letter spacing" msgstr "Espandi spaziatura lettere" -#: ../src/ui/tools/text-tool.cpp:1332 +#: ../src/ui/tools/text-tool.cpp:1323 msgid "Paste text" msgstr "Incolla testo" -#: ../src/ui/tools/text-tool.cpp:1583 +#: ../src/ui/tools/text-tool.cpp:1573 #, c-format msgid "" "Type or edit flowed text (%d character%s); Enter to start new " @@ -23158,7 +25035,7 @@ msgstr[1] "" "Inserisci o modifica il testo dinamico (%d caratteri%s); Invio per " "iniziare un nuovo paragrafo." -#: ../src/ui/tools/text-tool.cpp:1585 +#: ../src/ui/tools/text-tool.cpp:1575 #, c-format msgid "Type or edit text (%d character%s); Enter to start new line." msgid_plural "" @@ -23170,39 +25047,39 @@ msgstr[1] "" "Inserisci o modifica il testo (%d caratteri%s); Invio per iniziare " "una nuova riga." -#: ../src/ui/tools/text-tool.cpp:1695 +#: ../src/ui/tools/text-tool.cpp:1685 msgid "Type text" msgstr "Inserimento testo" -#: ../src/ui/tools/tool-base.cpp:704 +#: ../src/ui/tools/tool-base.cpp:700 msgid "Space+mouse move to pan canvas" msgstr "Spazio+spostamento puntatore per muovere la tela" -#: ../src/ui/tools/tweak-tool.cpp:174 +#: ../src/ui/tools/tweak-tool.cpp:164 #, c-format msgid "%s. Drag to move." msgstr "%s. Trascina per spostare." -#: ../src/ui/tools/tweak-tool.cpp:178 +#: ../src/ui/tools/tweak-tool.cpp:168 #, c-format msgid "%s. Drag or click to move in; with Shift to move out." msgstr "" "%s. Trascina o clicca per spostare dentro; con Maiusc per spostare " "fuori." -#: ../src/ui/tools/tweak-tool.cpp:186 +#: ../src/ui/tools/tweak-tool.cpp:176 #, c-format msgid "%s. Drag or click to move randomly." msgstr "%s. Trascina o clicca per spostare casualmente." -#: ../src/ui/tools/tweak-tool.cpp:190 +#: ../src/ui/tools/tweak-tool.cpp:180 #, c-format msgid "%s. Drag or click to scale down; with Shift to scale up." msgstr "" "%s. Trascina o clicca per rimpicciolire; con Maiusc per " "ingrandire." -#: ../src/ui/tools/tweak-tool.cpp:198 +#: ../src/ui/tools/tweak-tool.cpp:188 #, c-format msgid "" "%s. Drag or click to rotate clockwise; with Shift, " @@ -23211,47 +25088,47 @@ msgstr "" "%s. Trascina o clicca per ruotare in senso orario; con Maiusc, in " "senso antiorario." -#: ../src/ui/tools/tweak-tool.cpp:206 +#: ../src/ui/tools/tweak-tool.cpp:196 #, c-format msgid "%s. Drag or click to duplicate; with Shift, delete." msgstr "" "%s. Trascina o clicca per duplicare; con Maiusc, per eliminare." -#: ../src/ui/tools/tweak-tool.cpp:214 +#: ../src/ui/tools/tweak-tool.cpp:204 #, c-format msgid "%s. Drag to push paths." msgstr "%s. Trascina per spingere il tracciato." -#: ../src/ui/tools/tweak-tool.cpp:218 +#: ../src/ui/tools/tweak-tool.cpp:208 #, c-format msgid "%s. Drag or click to inset paths; with Shift to outset." msgstr "" "%s. Trascina o clicca per intrudere tracciati; con Maiusc, per " "estrudere." -#: ../src/ui/tools/tweak-tool.cpp:226 +#: ../src/ui/tools/tweak-tool.cpp:216 #, c-format msgid "%s. Drag or click to attract paths; with Shift to repel." msgstr "" "%s. Trascina o clicca per attrarre i tracciati; con Maiusc per " "repellere." -#: ../src/ui/tools/tweak-tool.cpp:234 +#: ../src/ui/tools/tweak-tool.cpp:224 #, c-format msgid "%s. Drag or click to roughen paths." msgstr "%s, Trascina o clicca per increspare i tracciati." -#: ../src/ui/tools/tweak-tool.cpp:238 +#: ../src/ui/tools/tweak-tool.cpp:228 #, c-format msgid "%s. Drag or click to paint objects with color." msgstr "%s. Trascina o clicca per dipingere un oggetto con un colore." -#: ../src/ui/tools/tweak-tool.cpp:242 +#: ../src/ui/tools/tweak-tool.cpp:232 #, c-format msgid "%s. Drag or click to randomize colors." msgstr "%s. Trascina o clicca per rendere casuali i colori." -#: ../src/ui/tools/tweak-tool.cpp:246 +#: ../src/ui/tools/tweak-tool.cpp:236 #, c-format msgid "" "%s. Drag or click to increase blur; with Shift to decrease." @@ -23259,79 +25136,513 @@ msgstr "" "%s. Trascina o clicca per aumentare la sfocatura; con Maiusc, per " "diminuire." -#: ../src/ui/tools/tweak-tool.cpp:1193 +#: ../src/ui/tools/tweak-tool.cpp:1191 msgid "Nothing selected! Select objects to tweak." msgstr "Nessuna selezione! Seleziona gli oggetti da ritoccare." -#: ../src/ui/tools/tweak-tool.cpp:1227 +#: ../src/ui/tools/tweak-tool.cpp:1225 msgid "Move tweak" msgstr "Ritocco spostamento" -#: ../src/ui/tools/tweak-tool.cpp:1231 +#: ../src/ui/tools/tweak-tool.cpp:1229 msgid "Move in/out tweak" msgstr "Ritocco sposta dentro/fuori" -#: ../src/ui/tools/tweak-tool.cpp:1235 +#: ../src/ui/tools/tweak-tool.cpp:1233 msgid "Move jitter tweak" msgstr "Ritocco spostamento sfalsato" -#: ../src/ui/tools/tweak-tool.cpp:1239 +#: ../src/ui/tools/tweak-tool.cpp:1237 msgid "Scale tweak" msgstr "Ritocco ridimensionamento" -#: ../src/ui/tools/tweak-tool.cpp:1243 +#: ../src/ui/tools/tweak-tool.cpp:1241 msgid "Rotate tweak" msgstr "Ritocco rotazione" -#: ../src/ui/tools/tweak-tool.cpp:1247 +#: ../src/ui/tools/tweak-tool.cpp:1245 msgid "Duplicate/delete tweak" msgstr "Ritocco duplicazione/eliminazione" -#: ../src/ui/tools/tweak-tool.cpp:1251 +#: ../src/ui/tools/tweak-tool.cpp:1249 msgid "Push path tweak" msgstr "Ritocco spingi tracciato" -#: ../src/ui/tools/tweak-tool.cpp:1255 +#: ../src/ui/tools/tweak-tool.cpp:1253 msgid "Shrink/grow path tweak" msgstr "Ritocco riduzione/accrescimento" -#: ../src/ui/tools/tweak-tool.cpp:1259 +#: ../src/ui/tools/tweak-tool.cpp:1257 msgid "Attract/repel path tweak" msgstr "Ritocco attrazione/repulsione" -#: ../src/ui/tools/tweak-tool.cpp:1263 +#: ../src/ui/tools/tweak-tool.cpp:1261 msgid "Roughen path tweak" msgstr "Ritocco increspatura" -#: ../src/ui/tools/tweak-tool.cpp:1267 +#: ../src/ui/tools/tweak-tool.cpp:1265 msgid "Color paint tweak" msgstr "Ritocco tinta" -#: ../src/ui/tools/tweak-tool.cpp:1271 +#: ../src/ui/tools/tweak-tool.cpp:1269 msgid "Color jitter tweak" msgstr "Ritocco sfalsamento colore" -#: ../src/ui/tools/tweak-tool.cpp:1275 +#: ../src/ui/tools/tweak-tool.cpp:1273 msgid "Blur tweak" msgstr "Ritocco sfocatura" -#: ../src/ui/widget/filter-effect-chooser.cpp:27 +#: ../src/ui/widget/color-entry.cpp:31 +msgid "Hexadecimal RGBA value of the color" +msgstr "Valore RGBA esadecimale del colore" + +#: ../src/ui/widget/color-icc-selector.cpp:176 +#: ../src/ui/widget/color-scales.cpp:384 +msgid "_R:" +msgstr "_R:" + +#. TYPE_RGB_16 +#: ../src/ui/widget/color-icc-selector.cpp:177 +#: ../src/ui/widget/color-scales.cpp:387 +msgid "_G:" +msgstr "_G:" + +#: ../src/ui/widget/color-icc-selector.cpp:178 +#: ../src/ui/widget/color-scales.cpp:390 +msgid "_B:" +msgstr "_B:" + +#: ../src/ui/widget/color-icc-selector.cpp:180 +#: ../share/extensions/nicechart.inx.h:35 +msgid "Gray" +msgstr "Grigio" + +#. TYPE_GRAY_16 +#: ../src/ui/widget/color-icc-selector.cpp:182 +#: ../src/ui/widget/color-icc-selector.cpp:186 +#: ../src/ui/widget/color-scales.cpp:410 +msgid "_H:" +msgstr "_H:" + +#. TYPE_HSV_16 +#: ../src/ui/widget/color-icc-selector.cpp:183 +#: ../src/ui/widget/color-icc-selector.cpp:188 +#: ../src/ui/widget/color-scales.cpp:413 +msgid "_S:" +msgstr "_S:" + +#. TYPE_HLS_16 +#: ../src/ui/widget/color-icc-selector.cpp:187 +#: ../src/ui/widget/color-scales.cpp:416 +msgid "_L:" +msgstr "_L:" + +#: ../src/ui/widget/color-icc-selector.cpp:190 +#: ../src/ui/widget/color-icc-selector.cpp:195 +#: ../src/ui/widget/color-scales.cpp:438 +msgid "_C:" +msgstr "_C:" + +#. TYPE_CMYK_16 +#. TYPE_CMY_16 +#: ../src/ui/widget/color-icc-selector.cpp:191 +#: ../src/ui/widget/color-icc-selector.cpp:196 +#: ../src/ui/widget/color-scales.cpp:441 +msgid "_M:" +msgstr "_M:" + +#: ../src/ui/widget/color-icc-selector.cpp:192 +#: ../src/ui/widget/color-icc-selector.cpp:197 +#: ../src/ui/widget/color-scales.cpp:444 +msgid "_Y:" +msgstr "_Y:" + +#: ../src/ui/widget/color-icc-selector.cpp:193 +#: ../src/ui/widget/color-scales.cpp:447 +msgid "_K:" +msgstr "_K:" + +#: ../src/ui/widget/color-icc-selector.cpp:310 +msgid "CMS" +msgstr "CMS" + +#: ../src/ui/widget/color-icc-selector.cpp:375 +msgid "Fix" +msgstr "Fissa" + +#: ../src/ui/widget/color-icc-selector.cpp:379 +msgid "Fix RGB fallback to match icc-color() value." +msgstr "Fissa fallback RGB corrispondente al valore icc-color()." + +#. Label +#: ../src/ui/widget/color-icc-selector.cpp:496 +#: ../src/ui/widget/color-scales.cpp:393 ../src/ui/widget/color-scales.cpp:419 +#: ../src/ui/widget/color-scales.cpp:450 +#: ../src/ui/widget/color-wheel-selector.cpp:83 +msgid "_A:" +msgstr "_A:" + +#: ../src/ui/widget/color-icc-selector.cpp:513 +#: ../src/ui/widget/color-icc-selector.cpp:524 +#: ../src/ui/widget/color-scales.cpp:394 ../src/ui/widget/color-scales.cpp:395 +#: ../src/ui/widget/color-scales.cpp:420 ../src/ui/widget/color-scales.cpp:421 +#: ../src/ui/widget/color-scales.cpp:451 ../src/ui/widget/color-scales.cpp:452 +#: ../src/ui/widget/color-wheel-selector.cpp:112 +#: ../src/ui/widget/color-wheel-selector.cpp:142 +msgid "Alpha (opacity)" +msgstr "Alpha (opacità)" + +#: ../src/ui/widget/color-notebook.cpp:182 +msgid "Color Managed" +msgstr "Gestione del colore" + +#: ../src/ui/widget/color-notebook.cpp:189 +msgid "Out of gamut!" +msgstr "Fuori gamma!" + +#: ../src/ui/widget/color-notebook.cpp:196 +msgid "Too much ink!" +msgstr "Troppo inchiostro!" + +#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2766 +msgid "Pick colors from image" +msgstr "Preleva colore dall'immagine" + +#. Create RGBA entry and color preview +#: ../src/ui/widget/color-notebook.cpp:212 +msgid "RGBA_:" +msgstr "RGBA_:" + +#: ../src/ui/widget/color-scales.cpp:46 +msgid "RGB" +msgstr "RGB" + +#: ../src/ui/widget/color-scales.cpp:46 +msgid "HSL" +msgstr "HSL" + +#: ../src/ui/widget/color-scales.cpp:46 +msgid "CMYK" +msgstr "CMYK" + +#: ../src/ui/widget/filter-effect-chooser.cpp:26 +#, fuzzy +msgid "_Blur:" +msgstr "Sfocat_ura:" + +#: ../src/ui/widget/filter-effect-chooser.cpp:29 msgid "Blur (%)" msgstr "Sfocatura (%)" -#: ../src/ui/widget/layer-selector.cpp:118 +#: ../src/ui/widget/font-variants.cpp:38 +msgctxt "Font variant" +msgid "Ligatures" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:39 +#, fuzzy +msgctxt "Font variant" +msgid "Common" +msgstr "Oggetti comuni" + +#: ../src/ui/widget/font-variants.cpp:40 +#, fuzzy +msgctxt "Font variant" +msgid "Discretionary" +msgstr "Direzione" + +#: ../src/ui/widget/font-variants.cpp:41 +#, fuzzy +msgctxt "Font variant" +msgid "Historical" +msgstr "Lezioni" + +#: ../src/ui/widget/font-variants.cpp:42 +#, fuzzy +msgctxt "Font variant" +msgid "Contextual" +msgstr "Contesto" + +#: ../src/ui/widget/font-variants.cpp:44 +#, fuzzy +msgctxt "Font variant" +msgid "Position" +msgstr "Posizione" + +#: ../src/ui/widget/font-variants.cpp:45 ../src/ui/widget/font-variants.cpp:50 +#, fuzzy +msgctxt "Font variant" +msgid "Normal" +msgstr "Normale" + +#: ../src/ui/widget/font-variants.cpp:46 +#, fuzzy +msgctxt "Font variant" +msgid "Subscript" +msgstr "Script" + +#: ../src/ui/widget/font-variants.cpp:47 +#, fuzzy +msgctxt "Font variant" +msgid "Superscript" +msgstr "Abilita apice" + +#: ../src/ui/widget/font-variants.cpp:49 +#, fuzzy +msgctxt "Font variant" +msgid "Capitals" +msgstr "Ospedale" + +#: ../src/ui/widget/font-variants.cpp:51 +#, fuzzy +msgctxt "Font variant" +msgid "Small" +msgstr "Piccola" + +#: ../src/ui/widget/font-variants.cpp:52 +#, fuzzy +msgctxt "Font variant" +msgid "All small" +msgstr "piccola" + +#: ../src/ui/widget/font-variants.cpp:53 +msgctxt "Font variant" +msgid "Petite" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:54 +#, fuzzy +msgctxt "Font variant" +msgid "All petite" +msgstr "Tutti inattivi" + +#: ../src/ui/widget/font-variants.cpp:55 +#, fuzzy +msgctxt "Font variant" +msgid "Unicase" +msgstr "Non caricato" + +#: ../src/ui/widget/font-variants.cpp:56 +#, fuzzy +msgctxt "Font variant" +msgid "Titling" +msgstr "Vela" + +#: ../src/ui/widget/font-variants.cpp:58 +msgctxt "Font variant" +msgid "Numeric" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:59 +#, fuzzy +msgctxt "Font variant" +msgid "Lining" +msgstr "Diradamento:" + +#: ../src/ui/widget/font-variants.cpp:60 +#, fuzzy +msgctxt "Font variant" +msgid "Old Style" +msgstr "Stile" + +#: ../src/ui/widget/font-variants.cpp:61 +#, fuzzy +msgctxt "Font variant" +msgid "Default Style" +msgstr "Titolo predefinito" + +#: ../src/ui/widget/font-variants.cpp:62 +#, fuzzy +msgctxt "Font variant" +msgid "Proportional" +msgstr "Proporzione schede:" + +#: ../src/ui/widget/font-variants.cpp:63 +msgctxt "Font variant" +msgid "Tabular" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:64 +#, fuzzy +msgctxt "Font variant" +msgid "Default Width" +msgstr "Titolo predefinito" + +#: ../src/ui/widget/font-variants.cpp:65 +#, fuzzy +msgctxt "Font variant" +msgid "Diagonal" +msgstr "Guide diagonali" + +#: ../src/ui/widget/font-variants.cpp:66 +#, fuzzy +msgctxt "Font variant" +msgid "Stacked" +msgstr "Terminale" + +#: ../src/ui/widget/font-variants.cpp:67 +#, fuzzy +msgctxt "Font variant" +msgid "Default Fractions" +msgstr "Impostazioni predefinite griglia" + +#: ../src/ui/widget/font-variants.cpp:68 +msgctxt "Font variant" +msgid "Ordinal" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:69 +msgctxt "Font variant" +msgid "Slashed Zero" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:71 +#, fuzzy +msgctxt "Font variant" +msgid "Feature Settings" +msgstr "Impostazioni pagina" + +#: ../src/ui/widget/font-variants.cpp:72 +msgctxt "Font variant" +msgid "Selection has different Feature Settings!" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:85 +msgid "Common ligatures. On by default. OpenType tables: 'liga', 'clig'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:87 +msgid "Discretionary ligatures. Off by default. OpenType table: 'dlig'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:89 +msgid "Historical ligatures. Off by default. OpenType table: 'hlig'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:91 +msgid "Contextual forms. On by default. OpenType table: 'calt'" +msgstr "" + +#. Position ---------------------------------- +#. Add tooltips +#: ../src/ui/widget/font-variants.cpp:112 +#, fuzzy +msgid "Normal position." +msgstr "Posizione X" + +#: ../src/ui/widget/font-variants.cpp:113 +msgid "Subscript. OpenType table: 'subs'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:114 +msgid "Superscript. OpenType table: 'sups'" +msgstr "" + +#. Caps ---------------------------------- +#. Add tooltips +#: ../src/ui/widget/font-variants.cpp:138 +#, fuzzy +msgid "Normal capitalization." +msgstr "Localizzazione" + +#: ../src/ui/widget/font-variants.cpp:139 +msgid "Small-caps (lowercase). OpenType table: 'smcp'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:140 +msgid "" +"All small-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'smcp'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:141 +msgid "Petite-caps (lowercase). OpenType table: 'pcap'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:142 +msgid "" +"All petite-caps (uppercase and lowercase). OpenType tables: 'c2sc' and 'pcap'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:143 +msgid "" +"Unicase (small caps for uppercase, normal for lowercase). OpenType table: " +"'unic'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:144 +msgid "" +"Titling caps (lighter-weight uppercase for use in titles). OpenType table: " +"'titl'" +msgstr "" + +#. Numeric ------------------------------ +#. Add tooltips +#: ../src/ui/widget/font-variants.cpp:180 +#, fuzzy +msgid "Normal style." +msgstr "Proiezione normale:" + +#: ../src/ui/widget/font-variants.cpp:181 +msgid "Lining numerals. OpenType table: 'lnum'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:182 +msgid "Old style numerals. OpenType table: 'onum'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:183 +#, fuzzy +msgid "Normal widths." +msgstr "Luce normale" + +#: ../src/ui/widget/font-variants.cpp:184 +msgid "Proportional width numerals. OpenType table: 'pnum'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:185 +msgid "Same width numerals. OpenType table: 'tnum'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:186 +#, fuzzy +msgid "Normal fractions." +msgstr "Ignora rotazione immagini" + +#: ../src/ui/widget/font-variants.cpp:187 +msgid "Diagonal fractions. OpenType table: 'frac'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:188 +msgid "Stacked fractions. OpenType table: 'afrc'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:189 +msgid "Ordinals (raised 'th', etc.). OpenType table: 'ordn'" +msgstr "" + +#: ../src/ui/widget/font-variants.cpp:190 +msgid "Slashed zeros. OpenType table: 'zero'" +msgstr "" + +#. Feature settings --------------------- +#. Add tooltips +#: ../src/ui/widget/font-variants.cpp:240 +msgid "Feature settings in CSS form. No sanity checking is performed." +msgstr "" + +#: ../src/ui/widget/layer-selector.cpp:116 msgid "Toggle current layer visibility" msgstr "Imposta la visibilità del livello attuale" -#: ../src/ui/widget/layer-selector.cpp:139 +#: ../src/ui/widget/layer-selector.cpp:136 msgid "Lock or unlock current layer" msgstr "Blocca o sblocca il livello attuale" -#: ../src/ui/widget/layer-selector.cpp:142 +#: ../src/ui/widget/layer-selector.cpp:139 msgid "Current layer" msgstr "Livello attuale" -#: ../src/ui/widget/layer-selector.cpp:583 +#: ../src/ui/widget/layer-selector.cpp:580 msgid "(root)" msgstr "(root)" @@ -23343,92 +25654,117 @@ msgstr "Proprietario" msgid "MetadataLicence|Other" msgstr "Altro" -#: ../src/ui/widget/object-composite-settings.cpp:67 -#: ../src/ui/widget/selected-style.cpp:1099 -#: ../src/ui/widget/selected-style.cpp:1100 +#: ../src/ui/widget/licensor.cpp:72 +#, fuzzy +msgid "Document license updated" +msgstr "Pulisci documento" + +#: ../src/ui/widget/object-composite-settings.cpp:47 +#: ../src/ui/widget/selected-style.cpp:1117 +#: ../src/ui/widget/selected-style.cpp:1118 msgid "Opacity (%)" msgstr "Opacità (%)" -#: ../src/ui/widget/object-composite-settings.cpp:180 +#: ../src/ui/widget/object-composite-settings.cpp:160 msgid "Change blur" msgstr "Modifica sfocatura" -#: ../src/ui/widget/object-composite-settings.cpp:220 -#: ../src/ui/widget/selected-style.cpp:931 -#: ../src/ui/widget/selected-style.cpp:1227 +#: ../src/ui/widget/object-composite-settings.cpp:200 +#: ../src/ui/widget/selected-style.cpp:941 +#: ../src/ui/widget/selected-style.cpp:1243 msgid "Change opacity" msgstr "Modifica opacità" -#: ../src/ui/widget/page-sizer.cpp:235 +#: ../src/ui/widget/page-sizer.cpp:236 msgid "U_nits:" msgstr "U_nità:" -#: ../src/ui/widget/page-sizer.cpp:236 +#: ../src/ui/widget/page-sizer.cpp:237 msgid "Width of paper" msgstr "Larghezza del foglio" -#: ../src/ui/widget/page-sizer.cpp:237 +#: ../src/ui/widget/page-sizer.cpp:238 msgid "Height of paper" msgstr "Altezza del foglio" -#: ../src/ui/widget/page-sizer.cpp:238 +#: ../src/ui/widget/page-sizer.cpp:239 msgid "T_op margin:" msgstr "Margine s_uperiore:" -#: ../src/ui/widget/page-sizer.cpp:238 +#: ../src/ui/widget/page-sizer.cpp:239 msgid "Top margin" msgstr "Margine superiore" -#: ../src/ui/widget/page-sizer.cpp:239 +#: ../src/ui/widget/page-sizer.cpp:240 msgid "L_eft:" msgstr "S_inistro:" -#: ../src/ui/widget/page-sizer.cpp:239 +#: ../src/ui/widget/page-sizer.cpp:240 msgid "Left margin" msgstr "Margine sinistro" -#: ../src/ui/widget/page-sizer.cpp:240 +#: ../src/ui/widget/page-sizer.cpp:241 msgid "Ri_ght:" msgstr "D_estro:" -#: ../src/ui/widget/page-sizer.cpp:240 +#: ../src/ui/widget/page-sizer.cpp:241 msgid "Right margin" msgstr "Margine destro" -#: ../src/ui/widget/page-sizer.cpp:241 +#: ../src/ui/widget/page-sizer.cpp:242 msgid "Botto_m:" msgstr "Inferi_ore:" -#: ../src/ui/widget/page-sizer.cpp:241 +#: ../src/ui/widget/page-sizer.cpp:242 msgid "Bottom margin" msgstr "Margine inferiore" -#: ../src/ui/widget/page-sizer.cpp:300 +#: ../src/ui/widget/page-sizer.cpp:244 +#, fuzzy +msgid "Scale _x:" +msgstr "Ridimensionamento x" + +#: ../src/ui/widget/page-sizer.cpp:244 +#, fuzzy +msgid "Scale X" +msgstr "Ridimensionamento x" + +#: ../src/ui/widget/page-sizer.cpp:245 +#, fuzzy +msgid "Scale _y:" +msgstr "Ridimensionamento y" + +#: ../src/ui/widget/page-sizer.cpp:245 +#, fuzzy +msgid "Scale Y" +msgstr "Ridimensionamento x" + +#: ../src/ui/widget/page-sizer.cpp:323 msgid "Orientation:" msgstr "Orientamento:" -#: ../src/ui/widget/page-sizer.cpp:303 +#: ../src/ui/widget/page-sizer.cpp:326 msgid "_Landscape" msgstr "Orizzonta_le" -#: ../src/ui/widget/page-sizer.cpp:308 +#: ../src/ui/widget/page-sizer.cpp:331 msgid "_Portrait" msgstr "Ver_ticale" #. ## Set up custom size frame -#: ../src/ui/widget/page-sizer.cpp:326 +#: ../src/ui/widget/page-sizer.cpp:350 msgid "Custom size" msgstr "Personalizzata" -#: ../src/ui/widget/page-sizer.cpp:371 +#: ../src/ui/widget/page-sizer.cpp:395 msgid "Resi_ze page to content..." msgstr "Ridi_mensiona pagina a contenuto..." -#: ../src/ui/widget/page-sizer.cpp:423 +#: ../src/ui/widget/page-sizer.cpp:447 msgid "_Resize page to drawing or selection" msgstr "_Ridimensiona pagina a disegno o selezione" -#: ../src/ui/widget/page-sizer.cpp:424 +#: ../src/ui/widget/page-sizer.cpp:448 msgid "" "Resize the page to fit the current selection, or the entire drawing if there " "is no selection" @@ -23436,105 +25772,130 @@ msgstr "" "Ridimensiona la pagina per adattarsi alla selezione attuale, o all'intero " "disegno se non è stato selezionato nulla" -#: ../src/ui/widget/page-sizer.cpp:494 +#: ../src/ui/widget/page-sizer.cpp:479 +msgid "" +"While SVG allows non-uniform scaling it is recommended to use only uniform " +"scaling in Inkscape. To set a non-uniform scaling, set the 'viewBox' " +"directly." +msgstr "" + +#: ../src/ui/widget/page-sizer.cpp:483 +#, fuzzy +msgid "_Viewbox..." +msgstr "_Visualizza" + +#: ../src/ui/widget/page-sizer.cpp:590 msgid "Set page size" msgstr "Imposta dimensione pagina" -#: ../src/ui/widget/panel.cpp:116 +#: ../src/ui/widget/page-sizer.cpp:836 +msgid "User units per " +msgstr "" + +#: ../src/ui/widget/page-sizer.cpp:932 +#, fuzzy +msgid "Set page scale" +msgstr "Imposta dimensione pagina" + +#: ../src/ui/widget/page-sizer.cpp:958 +msgid "Set 'viewBox'" +msgstr "" + +#: ../src/ui/widget/panel.cpp:113 msgid "List" msgstr "Elenco" -#: ../src/ui/widget/panel.cpp:139 +#: ../src/ui/widget/panel.cpp:136 msgctxt "Swatches" msgid "Size" msgstr "Dimensione" -#: ../src/ui/widget/panel.cpp:143 +#: ../src/ui/widget/panel.cpp:140 msgctxt "Swatches height" msgid "Tiny" msgstr "Minuscola" -#: ../src/ui/widget/panel.cpp:144 +#: ../src/ui/widget/panel.cpp:141 msgctxt "Swatches height" msgid "Small" msgstr "Piccola" -#: ../src/ui/widget/panel.cpp:145 +#: ../src/ui/widget/panel.cpp:142 msgctxt "Swatches height" msgid "Medium" msgstr "Media" -#: ../src/ui/widget/panel.cpp:146 +#: ../src/ui/widget/panel.cpp:143 msgctxt "Swatches height" msgid "Large" msgstr "Grande" -#: ../src/ui/widget/panel.cpp:147 +#: ../src/ui/widget/panel.cpp:144 msgctxt "Swatches height" msgid "Huge" msgstr "Enorme" -#: ../src/ui/widget/panel.cpp:169 +#: ../src/ui/widget/panel.cpp:166 msgctxt "Swatches" msgid "Width" msgstr "Larghezza" -#: ../src/ui/widget/panel.cpp:173 +#: ../src/ui/widget/panel.cpp:170 msgctxt "Swatches width" msgid "Narrower" msgstr "Più stretta" -#: ../src/ui/widget/panel.cpp:174 +#: ../src/ui/widget/panel.cpp:171 msgctxt "Swatches width" msgid "Narrow" msgstr "Stretta" -#: ../src/ui/widget/panel.cpp:175 +#: ../src/ui/widget/panel.cpp:172 msgctxt "Swatches width" msgid "Medium" msgstr "Media" -#: ../src/ui/widget/panel.cpp:176 +#: ../src/ui/widget/panel.cpp:173 msgctxt "Swatches width" msgid "Wide" msgstr "Larga" -#: ../src/ui/widget/panel.cpp:177 +#: ../src/ui/widget/panel.cpp:174 msgctxt "Swatches width" msgid "Wider" msgstr "Più larga" -#: ../src/ui/widget/panel.cpp:207 +#: ../src/ui/widget/panel.cpp:204 msgctxt "Swatches" msgid "Border" msgstr "Bordo" -#: ../src/ui/widget/panel.cpp:211 +#: ../src/ui/widget/panel.cpp:208 msgctxt "Swatches border" msgid "None" msgstr "Nessuno" -#: ../src/ui/widget/panel.cpp:212 +#: ../src/ui/widget/panel.cpp:209 msgctxt "Swatches border" msgid "Solid" msgstr "Solido" -#: ../src/ui/widget/panel.cpp:213 +#: ../src/ui/widget/panel.cpp:210 msgctxt "Swatches border" msgid "Wide" msgstr "Largo" #. TRANSLATORS: "Wrap" indicates how colour swatches are displayed -#: ../src/ui/widget/panel.cpp:244 +#: ../src/ui/widget/panel.cpp:241 msgctxt "Swatches" msgid "Wrap" msgstr "Avvolgi" -#: ../src/ui/widget/preferences-widget.cpp:802 +#: ../src/ui/widget/preferences-widget.cpp:795 msgid "_Browse..." msgstr "_Sfoglia..." -#: ../src/ui/widget/preferences-widget.cpp:888 +#: ../src/ui/widget/preferences-widget.cpp:881 msgid "Select a bitmap editor" msgstr "Seleziona un editor bitmap" @@ -23586,284 +25947,299 @@ msgstr "" "maggiori e non può essere ridimensionata senza una perdita di qualità, ma " "tutti gli oggetti verranno disegnati esattamente come vengono mostrati." -#: ../src/ui/widget/selected-style.cpp:130 +#: ../src/ui/widget/selected-style.cpp:131 #: ../src/ui/widget/style-swatch.cpp:127 msgid "Fill:" msgstr "Riempimento:" -#: ../src/ui/widget/selected-style.cpp:132 +#: ../src/ui/widget/selected-style.cpp:133 msgid "O:" msgstr "O:" -#: ../src/ui/widget/selected-style.cpp:177 +#: ../src/ui/widget/selected-style.cpp:178 msgid "N/A" msgstr "N/D" -#: ../src/ui/widget/selected-style.cpp:180 -#: ../src/ui/widget/selected-style.cpp:1092 -#: ../src/ui/widget/selected-style.cpp:1093 +#: ../src/ui/widget/selected-style.cpp:181 +#: ../src/ui/widget/selected-style.cpp:1110 +#: ../src/ui/widget/selected-style.cpp:1111 #: ../src/widgets/gradient-toolbar.cpp:162 msgid "Nothing selected" msgstr "Nessuna selezione" -#: ../src/ui/widget/selected-style.cpp:183 +#: ../src/ui/widget/selected-style.cpp:184 msgctxt "Fill" msgid "None" msgstr "Nessuno" -#: ../src/ui/widget/selected-style.cpp:185 +#: ../src/ui/widget/selected-style.cpp:186 msgctxt "Stroke" msgid "None" msgstr "Nessuno" -#: ../src/ui/widget/selected-style.cpp:189 -#: ../src/ui/widget/style-swatch.cpp:322 +#: ../src/ui/widget/selected-style.cpp:190 +#: ../src/ui/widget/style-swatch.cpp:321 msgctxt "Fill and stroke" msgid "No fill" msgstr "Nessun riempimento" -#: ../src/ui/widget/selected-style.cpp:189 -#: ../src/ui/widget/style-swatch.cpp:322 +#: ../src/ui/widget/selected-style.cpp:190 +#: ../src/ui/widget/style-swatch.cpp:321 msgctxt "Fill and stroke" msgid "No stroke" msgstr "Nessun contorno" -#: ../src/ui/widget/selected-style.cpp:191 -#: ../src/ui/widget/style-swatch.cpp:301 ../src/widgets/paint-selector.cpp:242 +#: ../src/ui/widget/selected-style.cpp:192 +#: ../src/ui/widget/style-swatch.cpp:300 ../src/widgets/paint-selector.cpp:231 msgid "Pattern" msgstr "Motivo" -#: ../src/ui/widget/selected-style.cpp:194 -#: ../src/ui/widget/style-swatch.cpp:303 +#: ../src/ui/widget/selected-style.cpp:195 +#: ../src/ui/widget/style-swatch.cpp:302 msgid "Pattern fill" msgstr "Motivo" -#: ../src/ui/widget/selected-style.cpp:194 -#: ../src/ui/widget/style-swatch.cpp:303 +#: ../src/ui/widget/selected-style.cpp:195 +#: ../src/ui/widget/style-swatch.cpp:302 msgid "Pattern stroke" msgstr "Motivo del contorno" -#: ../src/ui/widget/selected-style.cpp:196 +#: ../src/ui/widget/selected-style.cpp:197 msgid "L" msgstr "L" -#: ../src/ui/widget/selected-style.cpp:199 -#: ../src/ui/widget/style-swatch.cpp:295 +#: ../src/ui/widget/selected-style.cpp:200 +#: ../src/ui/widget/style-swatch.cpp:294 msgid "Linear gradient fill" msgstr "Gradiente lineare di riempimento" -#: ../src/ui/widget/selected-style.cpp:199 -#: ../src/ui/widget/style-swatch.cpp:295 +#: ../src/ui/widget/selected-style.cpp:200 +#: ../src/ui/widget/style-swatch.cpp:294 msgid "Linear gradient stroke" msgstr "Gradiente lineare di contorno" -#: ../src/ui/widget/selected-style.cpp:206 +#: ../src/ui/widget/selected-style.cpp:207 msgid "R" msgstr "R" -#: ../src/ui/widget/selected-style.cpp:209 -#: ../src/ui/widget/style-swatch.cpp:299 +#: ../src/ui/widget/selected-style.cpp:210 +#: ../src/ui/widget/style-swatch.cpp:298 msgid "Radial gradient fill" msgstr "Gradiente radiale di riempimento" -#: ../src/ui/widget/selected-style.cpp:209 -#: ../src/ui/widget/style-swatch.cpp:299 +#: ../src/ui/widget/selected-style.cpp:210 +#: ../src/ui/widget/style-swatch.cpp:298 msgid "Radial gradient stroke" msgstr "Gradiente radiale di contorno" -#: ../src/ui/widget/selected-style.cpp:216 +#: ../src/ui/widget/selected-style.cpp:218 +#, fuzzy +msgid "M" +msgstr "L" + +#: ../src/ui/widget/selected-style.cpp:221 +#, fuzzy +msgid "Mesh gradient fill" +msgstr "Gradiente lineare di riempimento" + +#: ../src/ui/widget/selected-style.cpp:221 +#, fuzzy +msgid "Mesh gradient stroke" +msgstr "Gradiente lineare di contorno" + +#: ../src/ui/widget/selected-style.cpp:229 msgid "Different" msgstr "Differente" -#: ../src/ui/widget/selected-style.cpp:219 +#: ../src/ui/widget/selected-style.cpp:232 msgid "Different fills" msgstr "Riempimento differente" -#: ../src/ui/widget/selected-style.cpp:219 +#: ../src/ui/widget/selected-style.cpp:232 msgid "Different strokes" msgstr "Contorno differente" -#: ../src/ui/widget/selected-style.cpp:221 -#: ../src/ui/widget/style-swatch.cpp:325 +#: ../src/ui/widget/selected-style.cpp:234 +#: ../src/ui/widget/style-swatch.cpp:324 msgid "Unset" msgstr "Non impostato" #. TRANSLATORS COMMENT: unset is a verb here -#: ../src/ui/widget/selected-style.cpp:224 -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:563 -#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 +#: ../src/ui/widget/selected-style.cpp:237 +#: ../src/ui/widget/selected-style.cpp:295 +#: ../src/ui/widget/selected-style.cpp:573 +#: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset fill" msgstr "Disattiva riempimento" -#: ../src/ui/widget/selected-style.cpp:224 -#: ../src/ui/widget/selected-style.cpp:282 -#: ../src/ui/widget/selected-style.cpp:579 -#: ../src/ui/widget/style-swatch.cpp:327 ../src/widgets/fill-style.cpp:712 +#: ../src/ui/widget/selected-style.cpp:237 +#: ../src/ui/widget/selected-style.cpp:295 +#: ../src/ui/widget/selected-style.cpp:589 +#: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset stroke" msgstr "Disattiva contorno" -#: ../src/ui/widget/selected-style.cpp:227 +#: ../src/ui/widget/selected-style.cpp:240 msgid "Flat color fill" msgstr "Riempimento con colore uniforme" -#: ../src/ui/widget/selected-style.cpp:227 +#: ../src/ui/widget/selected-style.cpp:240 msgid "Flat color stroke" msgstr "Contorno con colore uniforme" #. TRANSLATOR COMMENT: A means "Averaged" -#: ../src/ui/widget/selected-style.cpp:230 +#: ../src/ui/widget/selected-style.cpp:243 msgid "a" msgstr "a" -#: ../src/ui/widget/selected-style.cpp:233 +#: ../src/ui/widget/selected-style.cpp:246 msgid "Fill is averaged over selected objects" msgstr "Il riempimento è mediato tra gli oggetti selezionati" -#: ../src/ui/widget/selected-style.cpp:233 +#: ../src/ui/widget/selected-style.cpp:246 msgid "Stroke is averaged over selected objects" msgstr "Il contorno è mediato tra gli oggetti selezionati" #. TRANSLATOR COMMENT: M means "Multiple" -#: ../src/ui/widget/selected-style.cpp:236 +#: ../src/ui/widget/selected-style.cpp:249 msgid "m" msgstr "m" -#: ../src/ui/widget/selected-style.cpp:239 +#: ../src/ui/widget/selected-style.cpp:252 msgid "Multiple selected objects have the same fill" msgstr "Più oggetti selezionati hanno lo stesso riempimento" -#: ../src/ui/widget/selected-style.cpp:239 +#: ../src/ui/widget/selected-style.cpp:252 msgid "Multiple selected objects have the same stroke" msgstr "Più oggetti selezionati hanno lo stesso contorno" -#: ../src/ui/widget/selected-style.cpp:241 +#: ../src/ui/widget/selected-style.cpp:254 msgid "Edit fill..." msgstr "Modifica riempimento..." -#: ../src/ui/widget/selected-style.cpp:241 +#: ../src/ui/widget/selected-style.cpp:254 msgid "Edit stroke..." msgstr "Modifica contorno..." -#: ../src/ui/widget/selected-style.cpp:245 +#: ../src/ui/widget/selected-style.cpp:258 msgid "Last set color" msgstr "Ultimo colore impostato" -#: ../src/ui/widget/selected-style.cpp:249 +#: ../src/ui/widget/selected-style.cpp:262 msgid "Last selected color" msgstr "Ultimo colore selezionato" -#: ../src/ui/widget/selected-style.cpp:265 +#: ../src/ui/widget/selected-style.cpp:278 msgid "Copy color" msgstr "Copia colore" -#: ../src/ui/widget/selected-style.cpp:269 +#: ../src/ui/widget/selected-style.cpp:282 msgid "Paste color" msgstr "Incolla colore" -#: ../src/ui/widget/selected-style.cpp:273 -#: ../src/ui/widget/selected-style.cpp:856 +#: ../src/ui/widget/selected-style.cpp:286 +#: ../src/ui/widget/selected-style.cpp:866 msgid "Swap fill and stroke" msgstr "Inverti riempimento e contorno" -#: ../src/ui/widget/selected-style.cpp:277 -#: ../src/ui/widget/selected-style.cpp:588 -#: ../src/ui/widget/selected-style.cpp:597 +#: ../src/ui/widget/selected-style.cpp:290 +#: ../src/ui/widget/selected-style.cpp:598 +#: ../src/ui/widget/selected-style.cpp:607 msgid "Make fill opaque" msgstr "Rendi opaco il riempimento" -#: ../src/ui/widget/selected-style.cpp:277 +#: ../src/ui/widget/selected-style.cpp:290 msgid "Make stroke opaque" msgstr "Rendi il contorno opaco" -#: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:545 ../src/widgets/fill-style.cpp:510 +#: ../src/ui/widget/selected-style.cpp:299 +#: ../src/ui/widget/selected-style.cpp:555 ../src/widgets/fill-style.cpp:503 msgid "Remove fill" msgstr "Rimuovi riempimento" -#: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:554 ../src/widgets/fill-style.cpp:510 +#: ../src/ui/widget/selected-style.cpp:299 +#: ../src/ui/widget/selected-style.cpp:564 ../src/widgets/fill-style.cpp:503 msgid "Remove stroke" msgstr "Rimuovi contorno" -#: ../src/ui/widget/selected-style.cpp:609 +#: ../src/ui/widget/selected-style.cpp:619 msgid "Apply last set color to fill" msgstr "Imposta l'ultimo colore impostato come riempimento" -#: ../src/ui/widget/selected-style.cpp:621 +#: ../src/ui/widget/selected-style.cpp:631 msgid "Apply last set color to stroke" msgstr "Imposta l'ultimo colore impostato come contorno" -#: ../src/ui/widget/selected-style.cpp:632 +#: ../src/ui/widget/selected-style.cpp:642 msgid "Apply last selected color to fill" msgstr "Imposta l'ultimo colore selezionato come riempimento" -#: ../src/ui/widget/selected-style.cpp:643 +#: ../src/ui/widget/selected-style.cpp:653 msgid "Apply last selected color to stroke" msgstr "Imposta l'ultimo colore selezionato come contorno" -#: ../src/ui/widget/selected-style.cpp:669 +#: ../src/ui/widget/selected-style.cpp:679 msgid "Invert fill" msgstr "Inverti riempimento" -#: ../src/ui/widget/selected-style.cpp:693 +#: ../src/ui/widget/selected-style.cpp:703 msgid "Invert stroke" msgstr "Inverti contorno" -#: ../src/ui/widget/selected-style.cpp:705 +#: ../src/ui/widget/selected-style.cpp:715 msgid "White fill" msgstr "Riempimento bianco" -#: ../src/ui/widget/selected-style.cpp:717 +#: ../src/ui/widget/selected-style.cpp:727 msgid "White stroke" msgstr "Contorno bianco" -#: ../src/ui/widget/selected-style.cpp:729 +#: ../src/ui/widget/selected-style.cpp:739 msgid "Black fill" msgstr "Riempimento nero" -#: ../src/ui/widget/selected-style.cpp:741 +#: ../src/ui/widget/selected-style.cpp:751 msgid "Black stroke" msgstr "Contorno nero" -#: ../src/ui/widget/selected-style.cpp:784 +#: ../src/ui/widget/selected-style.cpp:794 msgid "Paste fill" msgstr "Incolla riempimento" -#: ../src/ui/widget/selected-style.cpp:802 +#: ../src/ui/widget/selected-style.cpp:812 msgid "Paste stroke" msgstr "Incolla contorno" -#: ../src/ui/widget/selected-style.cpp:958 +#: ../src/ui/widget/selected-style.cpp:968 msgid "Change stroke width" msgstr "Modifica larghezza contorno" -#: ../src/ui/widget/selected-style.cpp:1053 +#: ../src/ui/widget/selected-style.cpp:1071 msgid ", drag to adjust" msgstr ", trascina per modificare" -#: ../src/ui/widget/selected-style.cpp:1138 +#: ../src/ui/widget/selected-style.cpp:1156 #, c-format msgid "Stroke width: %.5g%s%s" msgstr "Larghezza contorno: %.5g%s%s" -#: ../src/ui/widget/selected-style.cpp:1142 +#: ../src/ui/widget/selected-style.cpp:1160 msgid " (averaged)" msgstr " (media)" -#: ../src/ui/widget/selected-style.cpp:1170 +#: ../src/ui/widget/selected-style.cpp:1186 msgid "0 (transparent)" msgstr "0 (trasparente)" -#: ../src/ui/widget/selected-style.cpp:1194 +#: ../src/ui/widget/selected-style.cpp:1210 msgid "100% (opaque)" msgstr "100% (opaco)" -#: ../src/ui/widget/selected-style.cpp:1368 +#: ../src/ui/widget/selected-style.cpp:1384 msgid "Adjust alpha" msgstr "Modifica alpha" -#: ../src/ui/widget/selected-style.cpp:1370 +#: ../src/ui/widget/selected-style.cpp:1386 #, c-format msgid "" "Adjusting alpha: was %.3g, now %.3g (diff %.3g); with CtrlCtrl per modificare luminosità, con Maiusc per saturazione, " "senza modificatori per colore" -#: ../src/ui/widget/selected-style.cpp:1374 +#: ../src/ui/widget/selected-style.cpp:1390 msgid "Adjust saturation" msgstr "Modifica saturazione" -#: ../src/ui/widget/selected-style.cpp:1376 +#: ../src/ui/widget/selected-style.cpp:1392 #, c-format msgid "" "Adjusting saturation: was %.3g, now %.3g (diff %.3g); with " @@ -23889,11 +26265,11 @@ msgstr "" "con Ctrl per modificare luminosità, con Alt per alpha, senza " "modificatori per colore" -#: ../src/ui/widget/selected-style.cpp:1380 +#: ../src/ui/widget/selected-style.cpp:1396 msgid "Adjust lightness" msgstr "Modifica luminosità" -#: ../src/ui/widget/selected-style.cpp:1382 +#: ../src/ui/widget/selected-style.cpp:1398 #, c-format msgid "" "Adjusting lightness: was %.3g, now %.3g (diff %.3g); with " @@ -23904,11 +26280,11 @@ msgstr "" "Shift per modificare saturazione, con Alt per alpha, senza " "modificatori per colore" -#: ../src/ui/widget/selected-style.cpp:1386 +#: ../src/ui/widget/selected-style.cpp:1402 msgid "Adjust hue" msgstr "Modifica colore" -#: ../src/ui/widget/selected-style.cpp:1388 +#: ../src/ui/widget/selected-style.cpp:1404 #, c-format msgid "" "Adjusting hue: was %.3g, now %.3g (diff %.3g); with ShiftMaiusc per modificare saturazione, con Alt per alpha, con " "Ctrl per luminosità" -#: ../src/ui/widget/selected-style.cpp:1506 -#: ../src/ui/widget/selected-style.cpp:1520 +#: ../src/ui/widget/selected-style.cpp:1522 +#: ../src/ui/widget/selected-style.cpp:1536 msgid "Adjust stroke width" msgstr "Modifica larghezza contorno" -#: ../src/ui/widget/selected-style.cpp:1507 +#: ../src/ui/widget/selected-style.cpp:1523 #, c-format msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" msgstr "" @@ -23936,53 +26312,53 @@ msgctxt "Sliders" msgid "Link" msgstr "Collega" -#: ../src/ui/widget/style-swatch.cpp:293 +#: ../src/ui/widget/style-swatch.cpp:292 msgid "L Gradient" msgstr "Gradiente L" -#: ../src/ui/widget/style-swatch.cpp:297 +#: ../src/ui/widget/style-swatch.cpp:296 msgid "R Gradient" msgstr "Gradiente R" -#: ../src/ui/widget/style-swatch.cpp:313 +#: ../src/ui/widget/style-swatch.cpp:312 #, c-format msgid "Fill: %06x/%.3g" msgstr "Riempimento: %06x/%.3g" -#: ../src/ui/widget/style-swatch.cpp:315 +#: ../src/ui/widget/style-swatch.cpp:314 #, c-format msgid "Stroke: %06x/%.3g" msgstr "Contorno: %06x/%.3g" -#: ../src/ui/widget/style-swatch.cpp:320 +#: ../src/ui/widget/style-swatch.cpp:319 msgctxt "Fill and stroke" msgid "None" msgstr "Nessuno" -#: ../src/ui/widget/style-swatch.cpp:347 +#: ../src/ui/widget/style-swatch.cpp:346 #, c-format msgid "Stroke width: %.5g%s" msgstr "Larghezza contorno: %.5g%s" -#: ../src/ui/widget/style-swatch.cpp:363 +#: ../src/ui/widget/style-swatch.cpp:362 #, c-format msgid "O: %2.0f" msgstr "0: %2.0f" -#: ../src/ui/widget/style-swatch.cpp:368 +#: ../src/ui/widget/style-swatch.cpp:367 #, c-format msgid "Opacity: %2.1f %%" msgstr "Opacità: %2.1f %%" -#: ../src/vanishing-point.cpp:132 +#: ../src/vanishing-point.cpp:133 msgid "Split vanishing points" msgstr "Dividi punti di fuga" -#: ../src/vanishing-point.cpp:177 +#: ../src/vanishing-point.cpp:178 msgid "Merge vanishing points" msgstr "Unisci punti di fuga" -#: ../src/vanishing-point.cpp:245 +#: ../src/vanishing-point.cpp:246 msgid "3D box: Move vanishing point" msgstr "Solido 3D: muovi punto di fuga" @@ -24032,258 +26408,268 @@ msgstr[1] "" msgid "File" msgstr "File" -#: ../src/verbs.cpp:232 +#: ../src/verbs.cpp:232 ../share/extensions/interp_att_g.inx.h:24 +msgid "Tag" +msgstr "Etichetta" + +#: ../src/verbs.cpp:251 msgid "Context" msgstr "Contesto" -#: ../src/verbs.cpp:251 ../src/verbs.cpp:2223 +#: ../src/verbs.cpp:270 ../src/verbs.cpp:2297 #: ../share/extensions/jessyInk_view.inx.h:1 #: ../share/extensions/polyhedron_3d.inx.h:26 msgid "View" msgstr "Visualizza" -#: ../src/verbs.cpp:271 +#: ../src/verbs.cpp:290 msgid "Dialog" msgstr "Finestre" -#: ../src/verbs.cpp:1227 +#: ../src/verbs.cpp:1275 msgid "Switch to next layer" msgstr "Passa al livello successivo" -#: ../src/verbs.cpp:1228 +#: ../src/verbs.cpp:1276 msgid "Switched to next layer." msgstr "Passato al livello successivo." -#: ../src/verbs.cpp:1230 +#: ../src/verbs.cpp:1278 msgid "Cannot go past last layer." msgstr "Impossibile passare ad un livello successivo all'ultimo." -#: ../src/verbs.cpp:1239 +#: ../src/verbs.cpp:1287 msgid "Switch to previous layer" msgstr "Passa al livello precedente" -#: ../src/verbs.cpp:1240 +#: ../src/verbs.cpp:1288 msgid "Switched to previous layer." msgstr "Passato al livello precedente." -#: ../src/verbs.cpp:1242 +#: ../src/verbs.cpp:1290 msgid "Cannot go before first layer." msgstr "Impossibile passare ad un livello precedente al primo." -#: ../src/verbs.cpp:1263 ../src/verbs.cpp:1360 ../src/verbs.cpp:1396 -#: ../src/verbs.cpp:1402 ../src/verbs.cpp:1426 ../src/verbs.cpp:1441 +#: ../src/verbs.cpp:1311 ../src/verbs.cpp:1378 ../src/verbs.cpp:1414 +#: ../src/verbs.cpp:1420 ../src/verbs.cpp:1444 ../src/verbs.cpp:1459 msgid "No current layer." msgstr "Nessun livello attuale." -#: ../src/verbs.cpp:1292 ../src/verbs.cpp:1296 +#: ../src/verbs.cpp:1340 ../src/verbs.cpp:1344 #, c-format msgid "Raised layer %s." msgstr "Alzato il livello %s." -#: ../src/verbs.cpp:1293 +#: ../src/verbs.cpp:1341 msgid "Layer to top" msgstr "Sposta livello in cima" -#: ../src/verbs.cpp:1297 +#: ../src/verbs.cpp:1345 msgid "Raise layer" msgstr "Alza livello" -#: ../src/verbs.cpp:1300 ../src/verbs.cpp:1304 +#: ../src/verbs.cpp:1348 ../src/verbs.cpp:1352 #, c-format msgid "Lowered layer %s." msgstr "Abbassato il livello %s." -#: ../src/verbs.cpp:1301 +#: ../src/verbs.cpp:1349 msgid "Layer to bottom" msgstr "Sposta livello in fondo" -#: ../src/verbs.cpp:1305 +#: ../src/verbs.cpp:1353 msgid "Lower layer" msgstr "Abbassa livello" -#: ../src/verbs.cpp:1314 +#: ../src/verbs.cpp:1362 msgid "Cannot move layer any further." msgstr "Non si può spostare ulteriormente il livello." -#: ../src/verbs.cpp:1328 ../src/verbs.cpp:1347 -#, c-format -msgid "%s copy" -msgstr "%s copia" - -#: ../src/verbs.cpp:1355 +#: ../src/verbs.cpp:1373 msgid "Duplicate layer" msgstr "Duplica livello" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1358 +#: ../src/verbs.cpp:1376 msgid "Duplicated layer." msgstr "Livello duplicato." -#: ../src/verbs.cpp:1391 +#: ../src/verbs.cpp:1409 msgid "Delete layer" msgstr "Elimina livello" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1394 +#: ../src/verbs.cpp:1412 msgid "Deleted layer." msgstr "Livello eliminato." -#: ../src/verbs.cpp:1411 +#: ../src/verbs.cpp:1429 msgid "Show all layers" msgstr "Mostra tutti i livelli" -#: ../src/verbs.cpp:1416 +#: ../src/verbs.cpp:1434 msgid "Hide all layers" msgstr "Nascondi tutti i livelli" -#: ../src/verbs.cpp:1421 +#: ../src/verbs.cpp:1439 msgid "Lock all layers" msgstr "Blocca tutti i livelli" -#: ../src/verbs.cpp:1435 +#: ../src/verbs.cpp:1453 msgid "Unlock all layers" msgstr "Sblocca tutti i livelli" -#: ../src/verbs.cpp:1519 +#: ../src/verbs.cpp:1537 msgid "Flip horizontally" msgstr "Rifletti orizzontalmente" -#: ../src/verbs.cpp:1524 +#: ../src/verbs.cpp:1542 msgid "Flip vertically" msgstr "Rifletti verticalmente" +#: ../src/verbs.cpp:1590 +#, fuzzy, c-format +msgid "Set %d" +msgstr "Imposta ritardo" + +#: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 +#, fuzzy +msgid "Create new selection set" +msgstr "Crea nuovo elemento nodo" + #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language #. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2105 +#: ../src/verbs.cpp:2175 msgid "tutorial-basic.svg" msgstr "tutorial-basic.it.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2109 +#: ../src/verbs.cpp:2179 msgid "tutorial-shapes.svg" msgstr "tutorial-shapes.it.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2113 +#: ../src/verbs.cpp:2183 msgid "tutorial-advanced.svg" msgstr "tutorial-advanced.it.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2117 +#: ../src/verbs.cpp:2189 msgid "tutorial-tracing.svg" msgstr "tutorial-tracing.svg" -#: ../src/verbs.cpp:2120 +#: ../src/verbs.cpp:2194 msgid "tutorial-tracing-pixelart.svg" msgstr "tutorial-tracing-pixelart.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2124 +#: ../src/verbs.cpp:2198 msgid "tutorial-calligraphy.svg" msgstr "tutorial-calligraphy.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2128 +#: ../src/verbs.cpp:2202 msgid "tutorial-interpolate.svg" msgstr "tutorial-interpolate.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2132 +#: ../src/verbs.cpp:2206 msgid "tutorial-elements.svg" msgstr "tutorial-elements.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2136 +#: ../src/verbs.cpp:2210 msgid "tutorial-tips.svg" msgstr "tutorial-tips.it.svg" -#: ../src/verbs.cpp:2322 ../src/verbs.cpp:2913 +#: ../src/verbs.cpp:2396 ../src/verbs.cpp:3012 msgid "Unlock all objects in the current layer" msgstr "Sblocca tutti gli oggetti nel livello attuale" -#: ../src/verbs.cpp:2326 ../src/verbs.cpp:2915 +#: ../src/verbs.cpp:2400 ../src/verbs.cpp:3014 msgid "Unlock all objects in all layers" msgstr "Seleziona tutti gli oggetti in ogni livello" -#: ../src/verbs.cpp:2330 ../src/verbs.cpp:2917 +#: ../src/verbs.cpp:2404 ../src/verbs.cpp:3016 msgid "Unhide all objects in the current layer" msgstr "Mostra tutti gli oggetti nel livello attuale" -#: ../src/verbs.cpp:2334 ../src/verbs.cpp:2919 +#: ../src/verbs.cpp:2408 ../src/verbs.cpp:3018 msgid "Unhide all objects in all layers" msgstr "Mostra tutti gli oggetti in ogni livello" -#: ../src/verbs.cpp:2349 +#: ../src/verbs.cpp:2423 msgctxt "Verb" msgid "None" msgstr "Nessuno" -#: ../src/verbs.cpp:2349 +#: ../src/verbs.cpp:2423 msgid "Does nothing" msgstr "Fa niente" #. File -#: ../src/verbs.cpp:2352 +#. Tag +#: ../src/verbs.cpp:2426 ../src/verbs.cpp:2728 msgid "_New" msgstr "_Nuovo" -#: ../src/verbs.cpp:2352 +#: ../src/verbs.cpp:2426 msgid "Create new document from the default template" msgstr "Crea un nuovo documento dal modello predefinito" -#: ../src/verbs.cpp:2354 +#: ../src/verbs.cpp:2428 msgid "_Open..." msgstr "_Apri..." -#: ../src/verbs.cpp:2355 +#: ../src/verbs.cpp:2429 msgid "Open an existing document" msgstr "Apre un documento esistente" -#: ../src/verbs.cpp:2356 +#: ../src/verbs.cpp:2430 msgid "Re_vert" msgstr "Ri_carica" -#: ../src/verbs.cpp:2357 +#: ../src/verbs.cpp:2431 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "" "Ricarica l'ultima versione salvata del documento (i cambiamenti verranno " "persi)" -#: ../src/verbs.cpp:2358 +#: ../src/verbs.cpp:2432 msgid "Save document" msgstr "Salva il documento" -#: ../src/verbs.cpp:2360 +#: ../src/verbs.cpp:2434 msgid "Save _As..." msgstr "Salv_a come..." -#: ../src/verbs.cpp:2361 +#: ../src/verbs.cpp:2435 msgid "Save document under a new name" msgstr "Salva il documento con un nuovo nome" -#: ../src/verbs.cpp:2362 +#: ../src/verbs.cpp:2436 msgid "Save a Cop_y..." msgstr "Salva una co_pia..." -#: ../src/verbs.cpp:2363 +#: ../src/verbs.cpp:2437 msgid "Save a copy of the document under a new name" msgstr "Salva una copia del documento con un nuovo nome" -#: ../src/verbs.cpp:2364 +#: ../src/verbs.cpp:2438 msgid "_Print..." msgstr "Stam_pa..." -#: ../src/verbs.cpp:2364 +#: ../src/verbs.cpp:2438 msgid "Print document" msgstr "Stampa il documento" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2367 +#: ../src/verbs.cpp:2441 msgid "Clean _up document" msgstr "P_ulisci documento" -#: ../src/verbs.cpp:2367 +#: ../src/verbs.cpp:2441 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" @@ -24291,143 +26677,143 @@ msgstr "" "Elimina definizioni inutilizzate (come gradienti o tracciati di fissaggio) " "dai <defs> del documento" -#: ../src/verbs.cpp:2369 +#: ../src/verbs.cpp:2443 msgid "_Import..." msgstr "_Importa..." -#: ../src/verbs.cpp:2370 +#: ../src/verbs.cpp:2444 msgid "Import a bitmap or SVG image into this document" msgstr "Importa una bitmap o un'immagine SVG nel documento" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2372 +#: ../src/verbs.cpp:2446 msgid "Import Clip Art..." msgstr "Importa Clip Art..." -#: ../src/verbs.cpp:2373 +#: ../src/verbs.cpp:2447 msgid "Import clipart from Open Clip Art Library" msgstr "Importa clipart da Open Clip Art Library" #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2375 +#: ../src/verbs.cpp:2449 msgid "N_ext Window" msgstr "Fin_estra successiva" -#: ../src/verbs.cpp:2376 +#: ../src/verbs.cpp:2450 msgid "Switch to the next document window" msgstr "Passa alla finestra successiva" -#: ../src/verbs.cpp:2377 +#: ../src/verbs.cpp:2451 msgid "P_revious Window" msgstr "Finestra p_recedente" -#: ../src/verbs.cpp:2378 +#: ../src/verbs.cpp:2452 msgid "Switch to the previous document window" msgstr "Passa alla finestra precedente" -#: ../src/verbs.cpp:2379 +#: ../src/verbs.cpp:2453 msgid "_Close" msgstr "_Chiudi" -#: ../src/verbs.cpp:2380 +#: ../src/verbs.cpp:2454 msgid "Close this document window" msgstr "Chiude la finestra di questo documento" -#: ../src/verbs.cpp:2381 +#: ../src/verbs.cpp:2455 msgid "_Quit" msgstr "_Esci" -#: ../src/verbs.cpp:2381 +#: ../src/verbs.cpp:2455 msgid "Quit Inkscape" msgstr "Chiude Inkscape" -#: ../src/verbs.cpp:2382 -msgid "_Templates..." -msgstr "_Modelli..." +#: ../src/verbs.cpp:2456 +msgid "New from _Template..." +msgstr "Nuovo da _modello..." -#: ../src/verbs.cpp:2383 +#: ../src/verbs.cpp:2457 msgid "Create new project from template" msgstr "Crea un nuovo documento da modello" -#: ../src/verbs.cpp:2386 +#: ../src/verbs.cpp:2460 msgid "Undo last action" msgstr "Annulla l'ultima azione" -#: ../src/verbs.cpp:2389 +#: ../src/verbs.cpp:2463 msgid "Do again the last undone action" msgstr "Ripete l'ultima azione annullata" -#: ../src/verbs.cpp:2390 +#: ../src/verbs.cpp:2464 msgid "Cu_t" msgstr "_Taglia" -#: ../src/verbs.cpp:2391 +#: ../src/verbs.cpp:2465 msgid "Cut selection to clipboard" msgstr "Taglia la selezione e la sposta negli appunti" -#: ../src/verbs.cpp:2392 +#: ../src/verbs.cpp:2466 msgid "_Copy" msgstr "_Copia" -#: ../src/verbs.cpp:2393 +#: ../src/verbs.cpp:2467 msgid "Copy selection to clipboard" msgstr "Copia la selezione negli appunti" -#: ../src/verbs.cpp:2394 +#: ../src/verbs.cpp:2468 msgid "_Paste" msgstr "I_ncolla" -#: ../src/verbs.cpp:2395 +#: ../src/verbs.cpp:2469 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "Incolla l'oggetto dagli appunti sotto al puntatore, o incolla il testo" -#: ../src/verbs.cpp:2396 +#: ../src/verbs.cpp:2470 msgid "Paste _Style" msgstr "Incolla _stile" -#: ../src/verbs.cpp:2397 +#: ../src/verbs.cpp:2471 msgid "Apply the style of the copied object to selection" msgstr "Applica alla selezione lo stile dell'oggetto copiato" -#: ../src/verbs.cpp:2399 +#: ../src/verbs.cpp:2473 msgid "Scale selection to match the size of the copied object" msgstr "Ridimensiona la selezione alla stessa dimensione dell'oggetto copiato" -#: ../src/verbs.cpp:2400 +#: ../src/verbs.cpp:2474 msgid "Paste _Width" msgstr "Incolla larg_hezza" -#: ../src/verbs.cpp:2401 +#: ../src/verbs.cpp:2475 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" "Ridimensiona la selezione orizzontalmente per adattarsi alla larghezza " "dell'oggetto copiato" -#: ../src/verbs.cpp:2402 +#: ../src/verbs.cpp:2476 msgid "Paste _Height" msgstr "Incolla al_tezza" -#: ../src/verbs.cpp:2403 +#: ../src/verbs.cpp:2477 msgid "Scale selection vertically to match the height of the copied object" msgstr "" "Ridimensiona la selezione verticalmente per adattarsi all'altezza " "dell'oggetto copiato" -#: ../src/verbs.cpp:2404 +#: ../src/verbs.cpp:2478 msgid "Paste Size Separately" msgstr "Incolla dimensione separatamente" -#: ../src/verbs.cpp:2405 +#: ../src/verbs.cpp:2479 msgid "Scale each selected object to match the size of the copied object" msgstr "" "Ridimensiona ogni oggetto selezionato alla dimensione dell'oggetto " "selezionato" -#: ../src/verbs.cpp:2406 +#: ../src/verbs.cpp:2480 msgid "Paste Width Separately" msgstr "Incolla larghezza separatamente" -#: ../src/verbs.cpp:2407 +#: ../src/verbs.cpp:2481 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" @@ -24435,11 +26821,11 @@ msgstr "" "Ridimensiona orizzontalmente ogni oggetto selezionato alla dimensione " "dell'oggetto copiato" -#: ../src/verbs.cpp:2408 +#: ../src/verbs.cpp:2482 msgid "Paste Height Separately" msgstr "Incolla altezza separatamente" -#: ../src/verbs.cpp:2409 +#: ../src/verbs.cpp:2483 msgid "" "Scale each selected object vertically to match the height of the copied " "object" @@ -24447,68 +26833,68 @@ msgstr "" "Ridimensiona verticalmente ogni oggetto selezionato all'altezza dell'oggetto " "copiato" -#: ../src/verbs.cpp:2410 +#: ../src/verbs.cpp:2484 msgid "Paste _In Place" msgstr "Incolla _in origine" -#: ../src/verbs.cpp:2411 +#: ../src/verbs.cpp:2485 msgid "Paste objects from clipboard to the original location" msgstr "Incolla l'oggetto dagli appunti al suo luogo di origine" -#: ../src/verbs.cpp:2412 +#: ../src/verbs.cpp:2486 msgid "Paste Path _Effect" msgstr "Incolla _effetto su tracciato" -#: ../src/verbs.cpp:2413 +#: ../src/verbs.cpp:2487 msgid "Apply the path effect of the copied object to selection" msgstr "Applica alla selezione l'effetto su tracciato dell'oggetto copiato" -#: ../src/verbs.cpp:2414 +#: ../src/verbs.cpp:2488 msgid "Remove Path _Effect" msgstr "Rimuovi _effetti su tracciato" -#: ../src/verbs.cpp:2415 +#: ../src/verbs.cpp:2489 msgid "Remove any path effects from selected objects" msgstr "Rimuove tutti gli effetti su tracciato dalla selezione" -#: ../src/verbs.cpp:2416 +#: ../src/verbs.cpp:2490 msgid "_Remove Filters" msgstr "_Rimuovi filtri" -#: ../src/verbs.cpp:2417 +#: ../src/verbs.cpp:2491 msgid "Remove any filters from selected objects" msgstr "Rimuove tutti i filtri dagli oggetti selezionati" -#: ../src/verbs.cpp:2418 +#: ../src/verbs.cpp:2492 msgid "_Delete" msgstr "Eli_mina" -#: ../src/verbs.cpp:2419 +#: ../src/verbs.cpp:2493 msgid "Delete selection" msgstr "Elimina la selezione" -#: ../src/verbs.cpp:2420 +#: ../src/verbs.cpp:2494 msgid "Duplic_ate" msgstr "Duplic_a" -#: ../src/verbs.cpp:2421 +#: ../src/verbs.cpp:2495 msgid "Duplicate selected objects" msgstr "Duplica gli oggetti selezionati" -#: ../src/verbs.cpp:2422 +#: ../src/verbs.cpp:2496 msgid "Create Clo_ne" msgstr "Crea clo_ne" -#: ../src/verbs.cpp:2423 +#: ../src/verbs.cpp:2497 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "" "Crea un clone dell'oggetto selezionato (una copia collegata all'originale)" -#: ../src/verbs.cpp:2424 +#: ../src/verbs.cpp:2498 msgid "Unlin_k Clone" msgstr "Scolle_ga clone" -#: ../src/verbs.cpp:2425 +#: ../src/verbs.cpp:2499 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" @@ -24516,27 +26902,27 @@ msgstr "" "Rimuove i collegamenti tra i cloni e gli originali, trasformandoli in " "oggetti separati" -#: ../src/verbs.cpp:2426 +#: ../src/verbs.cpp:2500 msgid "Relink to Copied" msgstr "Ricollega alla copia" -#: ../src/verbs.cpp:2427 +#: ../src/verbs.cpp:2501 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "Ricollega i cloni selezionati con l'oggetto attualmente negli appunti" -#: ../src/verbs.cpp:2428 +#: ../src/verbs.cpp:2502 msgid "Select _Original" msgstr "Seleziona _originale" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2503 msgid "Select the object to which the selected clone is linked" msgstr "Seleziona l'oggetto a cui il clone selezionato è collegato" -#: ../src/verbs.cpp:2430 +#: ../src/verbs.cpp:2504 msgid "Clone original path (LPE)" msgstr "Clona tracciato originale (LPE)" -#: ../src/verbs.cpp:2431 +#: ../src/verbs.cpp:2505 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" @@ -24544,19 +26930,19 @@ msgstr "" "Crea un nuovo tracciato e applica Clona tracciato originale LPE, " "collegandolo al tracciato selezionato" -#: ../src/verbs.cpp:2432 +#: ../src/verbs.cpp:2506 msgid "Objects to _Marker" msgstr "Da oggetto a deli_mitatore" -#: ../src/verbs.cpp:2433 +#: ../src/verbs.cpp:2507 msgid "Convert selection to a line marker" msgstr "Converte la selezione in un delimitatore di tracciato" -#: ../src/verbs.cpp:2434 +#: ../src/verbs.cpp:2508 msgid "Objects to Gu_ides" msgstr "Da oggetto a gu_ida" -#: ../src/verbs.cpp:2435 +#: ../src/verbs.cpp:2509 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" @@ -24564,97 +26950,97 @@ msgstr "" "Converte gli oggetti selezionati in un insieme di linee guida orientate " "secondo gli spigoli" -#: ../src/verbs.cpp:2436 +#: ../src/verbs.cpp:2510 msgid "Objects to Patter_n" msgstr "_Da oggetto a motivo" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2511 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "Converte la selezione in un rettangolo a motivo" -#: ../src/verbs.cpp:2438 +#: ../src/verbs.cpp:2512 msgid "Pattern to _Objects" msgstr "Da moti_vo a oggetto" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2513 msgid "Extract objects from a tiled pattern fill" msgstr "Estrae un oggetto da un motivo" -#: ../src/verbs.cpp:2440 +#: ../src/verbs.cpp:2514 msgid "Group to Symbol" msgstr "Gruppo a Simbolo" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2515 msgid "Convert group to a symbol" msgstr "Converti gruppo in un simbolo" -#: ../src/verbs.cpp:2442 +#: ../src/verbs.cpp:2516 msgid "Symbol to Group" msgstr "Simbolo a Gruppo" -#: ../src/verbs.cpp:2443 +#: ../src/verbs.cpp:2517 msgid "Extract group from a symbol" msgstr "Estrai gruppo da un simbolo" -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2518 msgid "Clea_r All" msgstr "Elimina tu_tto" -#: ../src/verbs.cpp:2445 +#: ../src/verbs.cpp:2519 msgid "Delete all objects from document" msgstr "Elimina tutti gli oggetti dal documento" -#: ../src/verbs.cpp:2446 +#: ../src/verbs.cpp:2520 msgid "Select Al_l" msgstr "Se_leziona tutto" -#: ../src/verbs.cpp:2447 +#: ../src/verbs.cpp:2521 msgid "Select all objects or all nodes" msgstr "Seleziona tutti gli oggetti o nodi" -#: ../src/verbs.cpp:2448 +#: ../src/verbs.cpp:2522 msgid "Select All in All La_yers" msgstr "Seleziona tutto in ogni li_vello" -#: ../src/verbs.cpp:2449 +#: ../src/verbs.cpp:2523 msgid "Select all objects in all visible and unlocked layers" msgstr "Seleziona tutti gli oggetti in tutti i livelli visibili e sbloccati" -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2524 msgid "Fill _and Stroke" msgstr "_Riempimento e Contorni" -#: ../src/verbs.cpp:2451 +#: ../src/verbs.cpp:2525 msgid "" "Select all objects with the same fill and stroke as the selected objects" msgstr "" "Seleziona tutti gli oggetti con lo stesso riempimento e contorno " "dell'oggetto selezionato" -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2526 msgid "_Fill Color" msgstr "Colore _riempimento" -#: ../src/verbs.cpp:2453 +#: ../src/verbs.cpp:2527 msgid "Select all objects with the same fill as the selected objects" msgstr "" "Seleziona tutti gli oggetti con lo stesso riempimento dell'oggetto " "selezionato" -#: ../src/verbs.cpp:2454 +#: ../src/verbs.cpp:2528 msgid "_Stroke Color" msgstr "Colore _contorno" -#: ../src/verbs.cpp:2455 +#: ../src/verbs.cpp:2529 msgid "Select all objects with the same stroke as the selected objects" msgstr "" "Seleziona tutti gli oggetti con lo stesso contorno dell'oggetto selezionato" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2530 msgid "Stroke St_yle" msgstr "St_ile contorno" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2531 msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " "selected objects" @@ -24662,11 +27048,11 @@ msgstr "" "Seleziona tutti gli oggetti con lo stesso stile contorno (larghezza, " "tratteggio, delimitatori) dell'oggetto selezionato" -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2532 msgid "_Object Type" msgstr "Tipo _oggetto" -#: ../src/verbs.cpp:2459 +#: ../src/verbs.cpp:2533 msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " "etc) as the selected objects" @@ -24674,156 +27060,172 @@ msgstr "" "Seleziona tutti gli oggetti con lo stesso tipo oggetto (rettangolo, arco, " "tracciato, bitmap etc) dell'oggetto selezionato" -#: ../src/verbs.cpp:2460 +#: ../src/verbs.cpp:2534 msgid "In_vert Selection" msgstr "In_verti selezione" -#: ../src/verbs.cpp:2461 +#: ../src/verbs.cpp:2535 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "" "Inverte la selezione (deseleziona quel che è selezionato e seleziona tutto " "il resto)" -#: ../src/verbs.cpp:2462 +#: ../src/verbs.cpp:2536 msgid "Invert in All Layers" msgstr "Inverti in tutti livelli" -#: ../src/verbs.cpp:2463 +#: ../src/verbs.cpp:2537 msgid "Invert selection in all visible and unlocked layers" msgstr "Inverte la selezione in tutti i livelli visibili e sbloccati" -#: ../src/verbs.cpp:2464 +#: ../src/verbs.cpp:2538 msgid "Select Next" msgstr "Seleziona successivo" -#: ../src/verbs.cpp:2465 +#: ../src/verbs.cpp:2539 msgid "Select next object or node" msgstr "Seleziona nodo o oggetto successivo" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2540 msgid "Select Previous" msgstr "Seleziona precedente" -#: ../src/verbs.cpp:2467 +#: ../src/verbs.cpp:2541 msgid "Select previous object or node" msgstr "Seleziona nodo o oggetto precedente" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2542 msgid "D_eselect" msgstr "D_eseleziona" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2543 msgid "Deselect any selected objects or nodes" msgstr "Deseleziona tutti i nodi o gli oggetti selezionati" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2545 msgid "Delete all the guides in the document" msgstr "Elimina tutte le guide nel documento" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2546 +msgid "Lock All Guides" +msgstr "Blocca tutte le guide" + +#: ../src/verbs.cpp:2546 ../src/widgets/desktop-widget.cpp:402 +msgid "Toggle lock of all guides in the document" +msgstr "Imposta il blocco di tutte le guide nel documento" + +#: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" msgstr "Crea _guide intorno alla pagina" -#: ../src/verbs.cpp:2473 +#: ../src/verbs.cpp:2548 msgid "Create four guides aligned with the page borders" msgstr "Crea quattro guide allineate con i bordi della pagina" -#: ../src/verbs.cpp:2474 +#: ../src/verbs.cpp:2549 msgid "Next path effect parameter" msgstr "Parametro successivo effetto su tracciato" -#: ../src/verbs.cpp:2475 +#: ../src/verbs.cpp:2550 msgid "Show next editable path effect parameter" msgstr "Mostra il successivo parametro modificabile dell'effetto su tracciato" #. Selection -#: ../src/verbs.cpp:2478 +#: ../src/verbs.cpp:2553 msgid "Raise to _Top" msgstr "Spos_ta in cima" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2554 msgid "Raise selection to top" msgstr "Sposta la selezione in cima" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2555 msgid "Lower to _Bottom" msgstr "Sposta in fondo" -#: ../src/verbs.cpp:2481 +#: ../src/verbs.cpp:2556 msgid "Lower selection to bottom" msgstr "Sposta la selezione in fondo" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2557 msgid "_Raise" msgstr "Al_za" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2558 msgid "Raise selection one step" msgstr "Alza la selezione di un livello" -#: ../src/verbs.cpp:2484 +#: ../src/verbs.cpp:2559 msgid "_Lower" msgstr "A_bbassa" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2560 msgid "Lower selection one step" msgstr "Abbassa la selezione di un livello" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2562 msgid "Group selected objects" msgstr "Raggruppa gli oggetti selezionati" -#: ../src/verbs.cpp:2489 +#: ../src/verbs.cpp:2564 msgid "Ungroup selected groups" msgstr "Divide il gruppo selezionato" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2565 +msgid "_Pop selected objects out of group" +msgstr "_Estrai gli oggetti selezionati dal gruppo" + +#: ../src/verbs.cpp:2566 +msgid "Pop selected objects out of group" +msgstr "Estrae gli oggetti selezionati dal gruppo" + +#: ../src/verbs.cpp:2568 msgid "_Put on Path" msgstr "Metti su tracciato" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2570 msgid "_Remove from Path" msgstr "_Rimuovi dal tracciato" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2572 msgid "Remove Manual _Kerns" msgstr "Rimuovi trasformazioni" #. TRANSLATORS: "glyph": An image used in the visual representation of characters; #. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2575 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "Rimuove tutte le trasformazioni e rotazioni da un oggetto testuale" -#: ../src/verbs.cpp:2500 +#: ../src/verbs.cpp:2577 msgid "_Union" msgstr "_Unione" -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2578 msgid "Create union of selected paths" msgstr "Crea un'unione dei tracciati selezionati" -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2579 msgid "_Intersection" msgstr "_Intersezione" -#: ../src/verbs.cpp:2503 +#: ../src/verbs.cpp:2580 msgid "Create intersection of selected paths" msgstr "Crea un'intersezione tra i percorsi selezionati" -#: ../src/verbs.cpp:2504 +#: ../src/verbs.cpp:2581 msgid "_Difference" msgstr "_Differenza" -#: ../src/verbs.cpp:2505 +#: ../src/verbs.cpp:2582 msgid "Create difference of selected paths (bottom minus top)" msgstr "Differenza tra gli oggetti selezionati (superiore meno inferiore)" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2583 msgid "E_xclusion" msgstr "E_sclusione" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2584 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" @@ -24831,21 +27233,21 @@ msgstr "" "Esegue un OR esclusivo tra i tracciati selezionati (quelle parti che " "appartengono ad un solo tracciato)" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2585 msgid "Di_vision" msgstr "Di_visione" -#: ../src/verbs.cpp:2509 +#: ../src/verbs.cpp:2586 msgid "Cut the bottom path into pieces" msgstr "Taglia il tracciato inferiore in pezzi" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2589 msgid "Cut _Path" msgstr "Taglia _tracciato" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2590 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "" "Taglia il contorno del tracciato inferiore in pezzi, rimuovendo il " @@ -24854,353 +27256,353 @@ msgstr "" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2594 msgid "Outs_et" msgstr "_Estrudi" -#: ../src/verbs.cpp:2518 +#: ../src/verbs.cpp:2595 msgid "Outset selected paths" msgstr "Estrude il tracciato selezionato" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2597 msgid "O_utset Path by 1 px" msgstr "Estr_udi Tracciato di 1px" -#: ../src/verbs.cpp:2521 +#: ../src/verbs.cpp:2598 msgid "Outset selected paths by 1 px" msgstr "Estrude il tracciato selezionato di 1px" -#: ../src/verbs.cpp:2523 +#: ../src/verbs.cpp:2600 msgid "O_utset Path by 10 px" msgstr "Estr_udi Tracciato di 10px" -#: ../src/verbs.cpp:2524 +#: ../src/verbs.cpp:2601 msgid "Outset selected paths by 10 px" msgstr "Estrude il tracciato selezionato di 10px" #. TRANSLATORS: "inset": contract a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2528 +#: ../src/verbs.cpp:2605 msgid "I_nset" msgstr "I_ntrudi" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2606 msgid "Inset selected paths" msgstr "Intrude il tracciato selezionato" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2608 msgid "I_nset Path by 1 px" msgstr "I_ntrudi Tracciato di 1px" -#: ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2609 msgid "Inset selected paths by 1 px" msgstr "Intrude il tracciato selezionato di 1px" -#: ../src/verbs.cpp:2534 +#: ../src/verbs.cpp:2611 msgid "I_nset Path by 10 px" msgstr "I_ntrudi Tracciato di 10px" -#: ../src/verbs.cpp:2535 +#: ../src/verbs.cpp:2612 msgid "Inset selected paths by 10 px" msgstr "Intrude il tracciato selezionato di 10px" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2614 msgid "D_ynamic Offset" msgstr "Proiezione dina_mica" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2614 msgid "Create a dynamic offset object" msgstr "Crea una proiezione dinamica" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2616 msgid "_Linked Offset" msgstr "Proiezione co_llegata" -#: ../src/verbs.cpp:2540 +#: ../src/verbs.cpp:2617 msgid "Create a dynamic offset object linked to the original path" msgstr "Crea una proiezione dinamica del tracciato originale" -#: ../src/verbs.cpp:2542 +#: ../src/verbs.cpp:2619 msgid "_Stroke to Path" msgstr "Da _contorno a tracciato" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2620 msgid "Convert selected object's stroke to paths" msgstr "Converte in tracciati i contorni degli oggetti selezionati" -#: ../src/verbs.cpp:2544 +#: ../src/verbs.cpp:2621 msgid "Si_mplify" msgstr "Se_mplifica" -#: ../src/verbs.cpp:2545 +#: ../src/verbs.cpp:2622 msgid "Simplify selected paths (remove extra nodes)" msgstr "Semplifica il tracciato selezionato (rimuovendo nodi superflui)" -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2623 msgid "_Reverse" msgstr "Inve_rti" -#: ../src/verbs.cpp:2547 +#: ../src/verbs.cpp:2624 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" "Inverte la direzione dei tracciati selezionati (utile per riflettere i " "delimitatori)" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2629 msgid "Create one or more paths from a bitmap by tracing it" msgstr "Crea uno o più tracciati da una bitmap tramite la vettorizzazione" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2632 msgid "Trace Pixel Art..." msgstr "Vettorizza Pixel Art..." -#: ../src/verbs.cpp:2552 +#: ../src/verbs.cpp:2633 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" msgstr "" "Crea tracciati usando l'algoritmo Kopf-Lischinski per la vettorizzazione" -#: ../src/verbs.cpp:2553 +#: ../src/verbs.cpp:2634 msgid "Make a _Bitmap Copy" msgstr "Crea una copia bit_map" -#: ../src/verbs.cpp:2554 +#: ../src/verbs.cpp:2635 msgid "Export selection to a bitmap and insert it into document" msgstr "Esporta la selezione come bitmap e la inserisce nel documento" -#: ../src/verbs.cpp:2555 +#: ../src/verbs.cpp:2636 msgid "_Combine" msgstr "_Combina" -#: ../src/verbs.cpp:2556 +#: ../src/verbs.cpp:2637 msgid "Combine several paths into one" msgstr "Combina diversi tracciati in uno unico" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2559 +#: ../src/verbs.cpp:2640 msgid "Break _Apart" msgstr "Sep_ara" -#: ../src/verbs.cpp:2560 +#: ../src/verbs.cpp:2641 msgid "Break selected paths into subpaths" msgstr "Separa il tracciato selezionato in sotto-tracciati" -#: ../src/verbs.cpp:2561 +#: ../src/verbs.cpp:2642 msgid "_Arrange..." msgstr "_Ordina..." -#: ../src/verbs.cpp:2562 +#: ../src/verbs.cpp:2643 msgid "Arrange selected objects in a table or circle" msgstr "Ordina gli oggetti selezionati in una tabella o in un cerchio" #. Layer -#: ../src/verbs.cpp:2564 +#: ../src/verbs.cpp:2645 msgid "_Add Layer..." msgstr "_Aggiungi livello..." -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2646 msgid "Create a new layer" msgstr "Crea un nuovo livello" -#: ../src/verbs.cpp:2566 +#: ../src/verbs.cpp:2647 msgid "Re_name Layer..." msgstr "Rinomi_na livello..." -#: ../src/verbs.cpp:2567 +#: ../src/verbs.cpp:2648 msgid "Rename the current layer" msgstr "Rinomina il livello attuale" -#: ../src/verbs.cpp:2568 +#: ../src/verbs.cpp:2649 msgid "Switch to Layer Abov_e" msgstr "Passa al livello superiore" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2650 msgid "Switch to the layer above the current" msgstr "Passa al livello superiore all'attuale" -#: ../src/verbs.cpp:2570 +#: ../src/verbs.cpp:2651 msgid "Switch to Layer Belo_w" msgstr "Passa al livello inferiore" -#: ../src/verbs.cpp:2571 +#: ../src/verbs.cpp:2652 msgid "Switch to the layer below the current" msgstr "Passa al livello inferiore all'attuale" -#: ../src/verbs.cpp:2572 +#: ../src/verbs.cpp:2653 msgid "Move Selection to Layer Abo_ve" msgstr "Sposta selezione al li_vello superiore" -#: ../src/verbs.cpp:2573 +#: ../src/verbs.cpp:2654 msgid "Move selection to the layer above the current" msgstr "Sposta selezione al livello superiore all'attuale" -#: ../src/verbs.cpp:2574 +#: ../src/verbs.cpp:2655 msgid "Move Selection to Layer Bel_ow" msgstr "Sposta selezione al li_vello inferiore" -#: ../src/verbs.cpp:2575 +#: ../src/verbs.cpp:2656 msgid "Move selection to the layer below the current" msgstr "Sposta selezione al livello inferiore all'attuale" -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2657 msgid "Move Selection to Layer..." msgstr "Sposta selezione al li_vello..." -#: ../src/verbs.cpp:2578 +#: ../src/verbs.cpp:2659 msgid "Layer to _Top" msgstr "Spos_ta livello in cima" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2660 msgid "Raise the current layer to the top" msgstr "Sposta il livello attuale in cima" -#: ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2661 msgid "Layer to _Bottom" msgstr "Sposta livello in fon_do" -#: ../src/verbs.cpp:2581 +#: ../src/verbs.cpp:2662 msgid "Lower the current layer to the bottom" msgstr "Sposta il livello attuale in fondo" -#: ../src/verbs.cpp:2582 +#: ../src/verbs.cpp:2663 msgid "_Raise Layer" msgstr "Alza li_vello" -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2664 msgid "Raise the current layer" msgstr "Alza il livello attuale" -#: ../src/verbs.cpp:2584 +#: ../src/verbs.cpp:2665 msgid "_Lower Layer" msgstr "Abbassa _livello" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2666 msgid "Lower the current layer" msgstr "Abbassa il livello attuale" -#: ../src/verbs.cpp:2586 +#: ../src/verbs.cpp:2667 msgid "D_uplicate Current Layer" msgstr "D_uplica livello attuale" -#: ../src/verbs.cpp:2587 +#: ../src/verbs.cpp:2668 msgid "Duplicate an existing layer" msgstr "Duplica un livello esistente" -#: ../src/verbs.cpp:2588 +#: ../src/verbs.cpp:2669 msgid "_Delete Current Layer" msgstr "_Elimina livello attuale" -#: ../src/verbs.cpp:2589 +#: ../src/verbs.cpp:2670 msgid "Delete the current layer" msgstr "Elimina il livello attuale" -#: ../src/verbs.cpp:2590 +#: ../src/verbs.cpp:2671 msgid "_Show/hide other layers" msgstr "_Mostra/Nascondi altri livelli" -#: ../src/verbs.cpp:2591 +#: ../src/verbs.cpp:2672 msgid "Solo the current layer" msgstr "Solamente il livello attuale" -#: ../src/verbs.cpp:2592 +#: ../src/verbs.cpp:2673 msgid "_Show all layers" msgstr "_Mostra tutti i livelli" -#: ../src/verbs.cpp:2593 +#: ../src/verbs.cpp:2674 msgid "Show all the layers" msgstr "Mostra tutti i livelli" -#: ../src/verbs.cpp:2594 +#: ../src/verbs.cpp:2675 msgid "_Hide all layers" msgstr "_Nascondi tutti i livelli" -#: ../src/verbs.cpp:2595 +#: ../src/verbs.cpp:2676 msgid "Hide all the layers" msgstr "Nascondi tutti i livelli" -#: ../src/verbs.cpp:2596 +#: ../src/verbs.cpp:2677 msgid "_Lock all layers" msgstr "B_locca tutti i livelli" -#: ../src/verbs.cpp:2597 +#: ../src/verbs.cpp:2678 msgid "Lock all the layers" msgstr "Blocca tutti i livelli" -#: ../src/verbs.cpp:2598 +#: ../src/verbs.cpp:2679 msgid "Lock/Unlock _other layers" msgstr "Blocca/Sblocca _altri livelli" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2680 msgid "Lock all the other layers" msgstr "Blocca tutti gli altri livelli" -#: ../src/verbs.cpp:2600 +#: ../src/verbs.cpp:2681 msgid "_Unlock all layers" msgstr "_Sblocca tutti i livelli" -#: ../src/verbs.cpp:2601 +#: ../src/verbs.cpp:2682 msgid "Unlock all the layers" msgstr "Sblocca tutti i livelli" -#: ../src/verbs.cpp:2602 +#: ../src/verbs.cpp:2683 msgid "_Lock/Unlock Current Layer" msgstr "_Blocca/Sblocca livello attuale" -#: ../src/verbs.cpp:2603 +#: ../src/verbs.cpp:2684 msgid "Toggle lock on current layer" msgstr "Imposta il blocco del livello attuale" -#: ../src/verbs.cpp:2604 +#: ../src/verbs.cpp:2685 msgid "_Show/hide Current Layer" msgstr "_Mostra/Nascondi livello attuale" -#: ../src/verbs.cpp:2605 +#: ../src/verbs.cpp:2686 msgid "Toggle visibility of current layer" msgstr "Imposta la visibilità del livello attuale" #. Object -#: ../src/verbs.cpp:2608 +#: ../src/verbs.cpp:2689 msgid "Rotate _90° CW" msgstr "Ruota di _90° orari" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2611 +#: ../src/verbs.cpp:2692 msgid "Rotate selection 90° clockwise" msgstr "Ruota la selezione di 90° orari" -#: ../src/verbs.cpp:2612 +#: ../src/verbs.cpp:2693 msgid "Rotate 9_0° CCW" msgstr "Ruota di 9_0° anti-orari" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2696 msgid "Rotate selection 90° counter-clockwise" msgstr "Ruota la selezione di 90° anti-orari" -#: ../src/verbs.cpp:2616 +#: ../src/verbs.cpp:2697 msgid "Remove _Transformations" msgstr "Rimuovi _trasformazioni" -#: ../src/verbs.cpp:2617 +#: ../src/verbs.cpp:2698 msgid "Remove transformations from object" msgstr "Rimuove le trasformazioni dall'oggetto" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2699 msgid "_Object to Path" msgstr "Da _oggetto a tracciato" -#: ../src/verbs.cpp:2619 +#: ../src/verbs.cpp:2700 msgid "Convert selected object to path" msgstr "Converte in tracciati gli oggetti selezionati" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2701 msgid "_Flow into Frame" msgstr "_Fluisci in struttura" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2702 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" @@ -25208,742 +27610,749 @@ msgstr "" "Mette il testo in una cornice (tracciato o forma), creando un testo dinamico " "collegato alla cornice" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2703 msgid "_Unflow" msgstr "Spe_zza" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2704 msgid "Remove text from frame (creates a single-line text object)" msgstr "" "Rimuove il testo dalla struttura (crea un oggetto testuale su una riga)" -#: ../src/verbs.cpp:2624 +#: ../src/verbs.cpp:2705 msgid "_Convert to Text" msgstr "_Converti in testo" -#: ../src/verbs.cpp:2625 +#: ../src/verbs.cpp:2706 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "" "Converte in testo semplice il testo dinamico (mantiene le caratteristiche)" -#: ../src/verbs.cpp:2627 +#: ../src/verbs.cpp:2708 msgid "Flip _Horizontal" msgstr "Rifletti _orizzontalmente" -#: ../src/verbs.cpp:2627 +#: ../src/verbs.cpp:2708 msgid "Flip selected objects horizontally" msgstr "Riflette orizzontalmente gli oggetti selezionati" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2711 msgid "Flip _Vertical" msgstr "Rifletti _verticalmente" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2711 msgid "Flip selected objects vertically" msgstr "Riflette verticalmente gli oggetti selezionati" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2714 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "" "Applica la maschera alla selezione (usando come maschera l'oggetto superiore)" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2716 msgid "Edit mask" msgstr "Modifica maschera" -#: ../src/verbs.cpp:2636 ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2717 ../src/verbs.cpp:2725 msgid "_Release" msgstr "_Rimuovi" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2718 msgid "Remove mask from selection" msgstr "Rimuovi la maschera dalla selezione" -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2720 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" msgstr "" "Applica il fissaggio alla selezione (usando l'oggetto più alto come " "tracciato di fissaggio)" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2721 +#, fuzzy +msgid "Create Cl_ip Group" +msgstr "Crea clo_ne" + +#: ../src/verbs.cpp:2722 +#, fuzzy +msgid "Creates a clip group using the selected objects as a base" +msgstr "" +"Crea un clone dell'oggetto selezionato (una copia collegata all'originale)" + +#: ../src/verbs.cpp:2724 msgid "Edit clipping path" msgstr "Modifica fissaggio" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2726 msgid "Remove clipping path from selection" msgstr "Rimuove il fissaggio dalla selezione" #. Tools -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2731 msgctxt "ContextVerb" msgid "Select" msgstr "Seleziona" -#: ../src/verbs.cpp:2647 +#: ../src/verbs.cpp:2732 msgid "Select and transform objects" msgstr "Seleziona e trasforma oggetti" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2733 msgctxt "ContextVerb" msgid "Node Edit" msgstr "Modifica nodo" -#: ../src/verbs.cpp:2649 +#: ../src/verbs.cpp:2734 msgid "Edit paths by nodes" msgstr "Modifica tracciati dai nodi" -#: ../src/verbs.cpp:2650 +#: ../src/verbs.cpp:2735 msgctxt "ContextVerb" msgid "Tweak" msgstr "Ritocco" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2736 msgid "Tweak objects by sculpting or painting" msgstr "Ritocca oggetti scolpendoli o ridipingendoli" -#: ../src/verbs.cpp:2652 +#: ../src/verbs.cpp:2737 msgctxt "ContextVerb" msgid "Spray" msgstr "Spray" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2738 msgid "Spray objects by sculpting or painting" msgstr "Spruzza oggetti scolpendoli o ridipingendoli" -#: ../src/verbs.cpp:2654 +#: ../src/verbs.cpp:2739 msgctxt "ContextVerb" msgid "Rectangle" msgstr "Rettangolo" -#: ../src/verbs.cpp:2655 +#: ../src/verbs.cpp:2740 msgid "Create rectangles and squares" msgstr "Crea rettangoli e quadrati" -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2741 msgctxt "ContextVerb" msgid "3D Box" msgstr "Solido 3D" -#: ../src/verbs.cpp:2657 +#: ../src/verbs.cpp:2742 msgid "Create 3D boxes" msgstr "Crea solido 3D" -#: ../src/verbs.cpp:2658 +#: ../src/verbs.cpp:2743 msgctxt "ContextVerb" msgid "Ellipse" msgstr "Ellisse" -#: ../src/verbs.cpp:2659 +#: ../src/verbs.cpp:2744 msgid "Create circles, ellipses, and arcs" msgstr "Crea cerchi, ellissi e archi" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2745 msgctxt "ContextVerb" msgid "Star" msgstr "Stella" -#: ../src/verbs.cpp:2661 +#: ../src/verbs.cpp:2746 msgid "Create stars and polygons" msgstr "Crea stelle e poligoni" -#: ../src/verbs.cpp:2662 +#: ../src/verbs.cpp:2747 msgctxt "ContextVerb" msgid "Spiral" msgstr "Spirale" -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2748 msgid "Create spirals" msgstr "Crea spirali" -#: ../src/verbs.cpp:2664 +#: ../src/verbs.cpp:2749 msgctxt "ContextVerb" msgid "Pencil" msgstr "Pastello" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2750 msgid "Draw freehand lines" msgstr "Disegna linee a mano libera" -#: ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2751 msgctxt "ContextVerb" msgid "Pen" msgstr "Penna" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2752 msgid "Draw Bezier curves and straight lines" msgstr "Disegna tracciati e linee dritte" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2753 msgctxt "ContextVerb" msgid "Calligraphy" msgstr "Pennino" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2754 msgid "Draw calligraphic or brush strokes" msgstr "Crea linee calligrafiche o pennellate" -#: ../src/verbs.cpp:2671 +#: ../src/verbs.cpp:2756 msgid "Create and edit text objects" msgstr "Crea e modifica gli oggetti testuali" -#: ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2757 msgctxt "ContextVerb" msgid "Gradient" msgstr "Gradiente" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2758 msgid "Create and edit gradients" msgstr "Crea e modifica i gradienti" -#: ../src/verbs.cpp:2674 +#: ../src/verbs.cpp:2759 msgctxt "ContextVerb" msgid "Mesh" msgstr "Gradiente a maglia" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2760 msgid "Create and edit meshes" msgstr "Crea e modifica i gradienti a maglia" -#: ../src/verbs.cpp:2676 +#: ../src/verbs.cpp:2761 msgctxt "ContextVerb" msgid "Zoom" msgstr "Ingrandimento" -#: ../src/verbs.cpp:2677 +#: ../src/verbs.cpp:2762 msgid "Zoom in or out" msgstr "Ingrandisce o rimpicciolisce" -#: ../src/verbs.cpp:2679 +#: ../src/verbs.cpp:2764 msgid "Measurement tool" msgstr "Strumento di misurazione" -#: ../src/verbs.cpp:2680 +#: ../src/verbs.cpp:2765 msgctxt "ContextVerb" msgid "Dropper" msgstr "Contagocce" -#: ../src/verbs.cpp:2681 ../src/widgets/sp-color-notebook.cpp:411 -msgid "Pick colors from image" -msgstr "Preleva colore dall'immagine" - -#: ../src/verbs.cpp:2682 +#: ../src/verbs.cpp:2767 msgctxt "ContextVerb" msgid "Connector" msgstr "Connettore" -#: ../src/verbs.cpp:2683 +#: ../src/verbs.cpp:2768 msgid "Create diagram connectors" msgstr "Crea connettori di diagramma" -#: ../src/verbs.cpp:2684 +#: ../src/verbs.cpp:2771 msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "Secchiello" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2772 msgid "Fill bounded areas" msgstr "Colora aree delimitate" -#: ../src/verbs.cpp:2686 +#: ../src/verbs.cpp:2775 msgctxt "ContextVerb" msgid "LPE Edit" msgstr "Modifica LPE" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2776 msgid "Edit Path Effect parameters" msgstr "Modifica parametri effetto su tracciato" -#: ../src/verbs.cpp:2688 +#: ../src/verbs.cpp:2777 msgctxt "ContextVerb" msgid "Eraser" msgstr "Gomma" -#: ../src/verbs.cpp:2689 +#: ../src/verbs.cpp:2778 msgid "Erase existing paths" msgstr "Cancella tracciato esistente" -#: ../src/verbs.cpp:2690 +#: ../src/verbs.cpp:2779 msgctxt "ContextVerb" msgid "LPE Tool" msgstr "Strumento LPE" -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2780 msgid "Do geometric constructions" msgstr "Crea costruzioni geometriche" #. Tool prefs -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2782 msgid "Selector Preferences" msgstr "Preferenze selettore" -#: ../src/verbs.cpp:2694 +#: ../src/verbs.cpp:2783 msgid "Open Preferences for the Selector tool" msgstr "Apre le preferenze per lo strumento «Selettore»" -#: ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2784 msgid "Node Tool Preferences" msgstr "Preferenze strumento nodo" -#: ../src/verbs.cpp:2696 +#: ../src/verbs.cpp:2785 msgid "Open Preferences for the Node tool" msgstr "Apre le preferenze per lo strumento «Nodo»" -#: ../src/verbs.cpp:2697 +#: ../src/verbs.cpp:2786 msgid "Tweak Tool Preferences" msgstr "Preferenze strumento ritocco" -#: ../src/verbs.cpp:2698 +#: ../src/verbs.cpp:2787 msgid "Open Preferences for the Tweak tool" msgstr "Apre le preferenze per lo strumento «Ritocco»" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2788 msgid "Spray Tool Preferences" msgstr "Preferenze strumento spray" -#: ../src/verbs.cpp:2700 +#: ../src/verbs.cpp:2789 msgid "Open Preferences for the Spray tool" msgstr "Apre le preferenze per lo strumento «Spray»" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2790 msgid "Rectangle Preferences" msgstr "Preferenze rettangolo" -#: ../src/verbs.cpp:2702 +#: ../src/verbs.cpp:2791 msgid "Open Preferences for the Rectangle tool" msgstr "Apre le preferenze per lo strumento «Rettangolo»" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2792 msgid "3D Box Preferences" msgstr "Preferenze solido 3D" -#: ../src/verbs.cpp:2704 +#: ../src/verbs.cpp:2793 msgid "Open Preferences for the 3D Box tool" msgstr "Apre le preferenze per lo strumento «Solido 3D»" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2794 msgid "Ellipse Preferences" msgstr "Preferenze ellisse" -#: ../src/verbs.cpp:2706 +#: ../src/verbs.cpp:2795 msgid "Open Preferences for the Ellipse tool" msgstr "Apre le preferenze per lo strumento «Ellisse»" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2796 msgid "Star Preferences" msgstr "Preferenze stella" -#: ../src/verbs.cpp:2708 +#: ../src/verbs.cpp:2797 msgid "Open Preferences for the Star tool" msgstr "Apre le preferenze per lo strumento «Stella»" -#: ../src/verbs.cpp:2709 +#: ../src/verbs.cpp:2798 msgid "Spiral Preferences" msgstr "Preferenze spirale" -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2799 msgid "Open Preferences for the Spiral tool" msgstr "Apre le preferenze per lo strumento «Spirale»" -#: ../src/verbs.cpp:2711 +#: ../src/verbs.cpp:2800 msgid "Pencil Preferences" msgstr "Preferenze matita" -#: ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2801 msgid "Open Preferences for the Pencil tool" msgstr "Apre le preferenze per lo strumento «Matita»" -#: ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2802 msgid "Pen Preferences" msgstr "Preferenze penna" -#: ../src/verbs.cpp:2714 +#: ../src/verbs.cpp:2803 msgid "Open Preferences for the Pen tool" msgstr "Apre le preferenze per lo strumento «Penna»" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2804 msgid "Calligraphic Preferences" msgstr "Preferenze pennino" -#: ../src/verbs.cpp:2716 +#: ../src/verbs.cpp:2805 msgid "Open Preferences for the Calligraphy tool" msgstr "Apre le preferenze per lo strumento «Pennino»" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2806 msgid "Text Preferences" msgstr "Preferenze testo" -#: ../src/verbs.cpp:2718 +#: ../src/verbs.cpp:2807 msgid "Open Preferences for the Text tool" msgstr "Apre le preferenze per lo strumento «Testo»" -#: ../src/verbs.cpp:2719 +#: ../src/verbs.cpp:2808 msgid "Gradient Preferences" msgstr "Preferenze gradiente" -#: ../src/verbs.cpp:2720 +#: ../src/verbs.cpp:2809 msgid "Open Preferences for the Gradient tool" msgstr "Apre le preferenze per lo strumento «Gradiente»" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2810 msgid "Mesh Preferences" msgstr "Preferenze gradiente a maglia" -#: ../src/verbs.cpp:2722 +#: ../src/verbs.cpp:2811 msgid "Open Preferences for the Mesh tool" msgstr "Apre le preferenze per lo strumento «Gradiente a maglia»" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2812 msgid "Zoom Preferences" msgstr "Preferenze ingranditore" -#: ../src/verbs.cpp:2724 +#: ../src/verbs.cpp:2813 msgid "Open Preferences for the Zoom tool" msgstr "Apre le preferenze per lo strumento «Ingranditore»" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2814 msgid "Measure Preferences" msgstr "Preferenze misura" -#: ../src/verbs.cpp:2726 +#: ../src/verbs.cpp:2815 msgid "Open Preferences for the Measure tool" msgstr "Apre le preferenze per lo strumento «Misura»" -#: ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2816 msgid "Dropper Preferences" msgstr "Preferenze contagocce" -#: ../src/verbs.cpp:2728 +#: ../src/verbs.cpp:2817 msgid "Open Preferences for the Dropper tool" msgstr "Apre le preferenze per lo strumento «Contagocce»" -#: ../src/verbs.cpp:2729 +#: ../src/verbs.cpp:2818 msgid "Connector Preferences" msgstr "Preferenze connettore" -#: ../src/verbs.cpp:2730 +#: ../src/verbs.cpp:2819 msgid "Open Preferences for the Connector tool" msgstr "Apre le preferenze per lo strumento «Connettore»" -#: ../src/verbs.cpp:2731 +#: ../src/verbs.cpp:2822 msgid "Paint Bucket Preferences" msgstr "Preferenze secchiello" -#: ../src/verbs.cpp:2732 +#: ../src/verbs.cpp:2823 msgid "Open Preferences for the Paint Bucket tool" msgstr "Apre le preferenze per lo strumento «Secchiello»" -#: ../src/verbs.cpp:2733 +#: ../src/verbs.cpp:2826 msgid "Eraser Preferences" msgstr "Impostazioni gomma" -#: ../src/verbs.cpp:2734 +#: ../src/verbs.cpp:2827 msgid "Open Preferences for the Eraser tool" msgstr "Apre le preferenze per lo strumento «Gomma»" -#: ../src/verbs.cpp:2735 +#: ../src/verbs.cpp:2828 msgid "LPE Tool Preferences" msgstr "Preferenze LPE" -#: ../src/verbs.cpp:2736 +#: ../src/verbs.cpp:2829 msgid "Open Preferences for the LPETool tool" msgstr "Apre le preferenze per lo strumento «Effetto su tracciato»" #. Zoom/View -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2831 msgid "Zoom In" msgstr "Ingrandisci" -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2831 msgid "Zoom in" msgstr "Aumenta l'ingrandimento" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2832 msgid "Zoom Out" msgstr "Riduci" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2832 msgid "Zoom out" msgstr "Riduce l'ingrandimento" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2833 msgid "_Rulers" msgstr "_Righelli" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2833 msgid "Show or hide the canvas rulers" msgstr "Mostra o nasconde i righelli" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2834 msgid "Scroll_bars" msgstr "_Barre di scorrimento" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2834 msgid "Show or hide the canvas scrollbars" msgstr "Mostra o nasconde le barre di scorrimento" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2835 msgid "Page _Grid" msgstr "_Griglia pagina" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2835 msgid "Show or hide the page grid" msgstr "Mostra o nasconde la griglia" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2836 msgid "G_uides" msgstr "G_uide" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2836 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" "Mostra o nasconde le guide (trascina dal righello per creare una guida)" -#: ../src/verbs.cpp:2744 +#: ../src/verbs.cpp:2837 msgid "Enable snapping" msgstr "Attiva aggancio" -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2838 msgid "_Commands Bar" msgstr "Barra dei _comandi" -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2838 msgid "Show or hide the Commands bar (under the menu)" msgstr "Mostra o nasconde la barra dei comandi (sotto il menu)" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2839 msgid "Sn_ap Controls Bar" msgstr "Barra dei controlli a_ggancio" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2839 msgid "Show or hide the snapping controls" msgstr "Mostra o nasconde i controlli per l'aggancio" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2840 msgid "T_ool Controls Bar" msgstr "Barra dei controlli _strumento" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2840 msgid "Show or hide the Tool Controls bar" msgstr "Mostra o nasconde la barra dei controlli degli strumenti" # cfr la traduzione di Illustrator -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2841 msgid "_Toolbox" msgstr "Barra degli s_trumenti" -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2841 msgid "Show or hide the main toolbox (on the left)" msgstr "Mostra o nasconde la barra degli strumenti (sulla sinistra)" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2842 msgid "_Palette" msgstr "_Paletta" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2842 msgid "Show or hide the color palette" msgstr "Mostra o nasconde la paletta dei colori" -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2843 msgid "_Statusbar" msgstr "Barra di _stato" -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2843 msgid "Show or hide the statusbar (at the bottom of the window)" msgstr "Mostra o nasconde la barra di stato (in fondo alla finestra)" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2844 msgid "Nex_t Zoom" msgstr "Ingrandimen_to successivo" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2844 msgid "Next zoom (from the history of zooms)" msgstr "Ingrandimento successivo (dalla cronologia degli zoom)" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2846 msgid "Pre_vious Zoom" msgstr "Ingrandimento p_recedente" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2846 msgid "Previous zoom (from the history of zooms)" msgstr "Ingrandimento precedente (dalla cronologia degli zoom)" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2848 msgid "Zoom 1:_1" msgstr "Ingrandimento 1:_1" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2848 msgid "Zoom to 1:1" msgstr "Ingrandisce a 1:1" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2850 msgid "Zoom 1:_2" msgstr "Ingrandimento 1:_2" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2850 msgid "Zoom to 1:2" msgstr "Ingrandisce a 1:2" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2852 msgid "_Zoom 2:1" msgstr "In_grandimento 2:1" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2852 msgid "Zoom to 2:1" msgstr "Ingrandisce a 2:1" -#: ../src/verbs.cpp:2762 +#: ../src/verbs.cpp:2854 msgid "_Fullscreen" msgstr "Scher_mo intero" -#: ../src/verbs.cpp:2762 ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2854 ../src/verbs.cpp:2856 msgid "Stretch this document window to full screen" msgstr "Allarga la finestra a pieno schermo" -#: ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2856 msgid "Fullscreen & Focus Mode" msgstr "Schermo intero & Modalità focus" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2858 msgid "Toggle _Focus Mode" msgstr "Commuta modalità focus" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2858 msgid "Remove excess toolbars to focus on drawing" msgstr "Rimuove barre in eccesso per focalizzarsi sul disegno" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2860 msgid "Duplic_ate Window" msgstr "Duplic_a finestra" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2860 msgid "Open a new window with the same document" msgstr "Apre lo stesso documento in una nuova finestra" -#: ../src/verbs.cpp:2771 +#: ../src/verbs.cpp:2862 msgid "_New View Preview" msgstr "_Nuova vista anteprima" -#: ../src/verbs.cpp:2772 +#: ../src/verbs.cpp:2863 msgid "New View Preview" msgstr "Nuova visualizzazione di anteprima" #. "view_new_preview" -#: ../src/verbs.cpp:2774 ../src/verbs.cpp:2782 +#: ../src/verbs.cpp:2865 ../src/verbs.cpp:2873 msgid "_Normal" msgstr "_Normale" -#: ../src/verbs.cpp:2775 +#: ../src/verbs.cpp:2866 msgid "Switch to normal display mode" msgstr "Passa alla modalità di visualizzazione normale" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2867 msgid "No _Filters" msgstr "Nessun _filtro" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2868 msgid "Switch to normal display without filters" msgstr "Passa alla visualizzazione normale senza filtri" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2869 msgid "_Outline" msgstr "Scheletr_o" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2870 msgid "Switch to outline (wireframe) display mode" msgstr "Passa alla modalità di visualizzazione dello scheletro (wireframe)" #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), #. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2780 ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2871 ../src/verbs.cpp:2879 msgid "_Toggle" msgstr "Al_terna" -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2872 msgid "Toggle between normal and outline display modes" msgstr "Alterna tra la visualizzazione normale o solo contorni" -#: ../src/verbs.cpp:2783 +#: ../src/verbs.cpp:2874 msgid "Switch to normal color display mode" msgstr "Passa alla modalità colore schermo normale" -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2875 msgid "_Grayscale" msgstr "Scala di _grigi" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2876 msgid "Switch to grayscale display mode" msgstr "Passa alla modalità colore schermo in scala di grigi" -#: ../src/verbs.cpp:2789 +#: ../src/verbs.cpp:2880 msgid "Toggle between normal and grayscale color display modes" msgstr "Alterna tra le modalità colore schemo normale e in scala di grigi" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2882 msgid "Color-managed view" msgstr "Gestione del colore" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2883 msgid "Toggle color-managed display for this document window" msgstr "" "Attiva la gestione del colore del display per questa finestra di documento" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2885 msgid "Ico_n Preview..." msgstr "Anteprima ico_na..." -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2886 msgid "Open a window to preview objects at different icon resolutions" msgstr "" "Apre una finestra per mostrare l'anteprima come icona a varie risoluzioni" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2888 msgid "Zoom to fit page in window" msgstr "Ingrandisce per adattare la pagina alla finestra" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2889 msgid "Page _Width" msgstr "Larg_hezza pagina" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2890 msgid "Zoom to fit page width in window" msgstr "Ingrandisce per adattare la larghezza della pagina alla finestra" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2892 msgid "Zoom to fit drawing in window" msgstr "Ingrandisce per adattare il disegno alla finestra" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2894 msgid "Zoom to fit selection in window" msgstr "Ingrandisce per adattare la selezione alla finestra" #. Dialogs -#: ../src/verbs.cpp:2806 +#: ../src/verbs.cpp:2897 msgid "P_references..." msgstr "P_referenze..." -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2898 msgid "Edit global Inkscape preferences" msgstr "Modifica le preferenze globali di Inkscape" -#: ../src/verbs.cpp:2808 +#: ../src/verbs.cpp:2899 msgid "_Document Properties..." msgstr "Proprietà del _documento..." -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2900 msgid "Edit properties of this document (to be saved with the document)" msgstr "" "Modifica le proprietà di questo documento (che verranno salvate con esso)" -#: ../src/verbs.cpp:2810 +#: ../src/verbs.cpp:2901 msgid "Document _Metadata..." msgstr "_Metadati del documento..." -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2902 msgid "Edit document metadata (to be saved with the document)" msgstr "Modifica i metadati del documento (salvati con esso)" -#: ../src/verbs.cpp:2813 +#: ../src/verbs.cpp:2904 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " "properties..." @@ -25952,118 +28361,118 @@ msgstr "" "tratteggi..." #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2815 +#: ../src/verbs.cpp:2906 msgid "Gl_yphs..." msgstr "_Glifi..." -#: ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2907 msgid "Select characters from a glyphs palette" msgstr "Seleziona i caratteri da una paletta di glifi" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2910 msgid "S_watches..." msgstr "Campio_ni..." -#: ../src/verbs.cpp:2820 +#: ../src/verbs.cpp:2911 msgid "Select colors from a swatches palette" msgstr "Seleziona i colori da una paletta di campioni" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2912 msgid "S_ymbols..." msgstr "S_imboli..." -#: ../src/verbs.cpp:2822 +#: ../src/verbs.cpp:2913 msgid "Select symbol from a symbols palette" msgstr "Seleziona simbolo da una paletta di simboli" -#: ../src/verbs.cpp:2823 +#: ../src/verbs.cpp:2914 msgid "Transfor_m..." msgstr "Trasfor_ma..." -#: ../src/verbs.cpp:2824 +#: ../src/verbs.cpp:2915 msgid "Precisely control objects' transformations" msgstr "Controlla precisamente le trasformazioni dell'oggetto" -#: ../src/verbs.cpp:2825 +#: ../src/verbs.cpp:2916 msgid "_Align and Distribute..." msgstr "_Allinea e distribuisci..." -#: ../src/verbs.cpp:2826 +#: ../src/verbs.cpp:2917 msgid "Align and distribute objects" msgstr "Allinea e distribuisce gli oggetti" -#: ../src/verbs.cpp:2827 +#: ../src/verbs.cpp:2918 msgid "_Spray options..." msgstr "Opzioni _Spray..." -#: ../src/verbs.cpp:2828 +#: ../src/verbs.cpp:2919 msgid "Some options for the spray" msgstr "Alcune opzioni per lo spray" -#: ../src/verbs.cpp:2829 +#: ../src/verbs.cpp:2920 msgid "Undo _History..." msgstr "Cronologia modifiche..." -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2921 msgid "Undo History" msgstr "Cronologia modifiche" -#: ../src/verbs.cpp:2832 +#: ../src/verbs.cpp:2923 msgid "View and select font family, font size and other text properties" msgstr "" "Mostra e modifica il tipo di font, la dimensione ed altre proprietà del testo" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2924 msgid "_XML Editor..." msgstr "Editor _XML..." -#: ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2925 msgid "View and edit the XML tree of the document" msgstr "Mostra e modifica l'albero XML del documento" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2926 msgid "_Find/Replace..." msgstr "T_rova/Sostituisci..." -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2927 msgid "Find objects in document" msgstr "Trova oggetti nel documento" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2928 msgid "Find and _Replace Text..." msgstr "T_rova e sostituisci testo..." -#: ../src/verbs.cpp:2838 +#: ../src/verbs.cpp:2929 msgid "Find and replace text in document" msgstr "Trova e sostituisci testo nel documento" -#: ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2931 msgid "Check spelling of text in document" msgstr "Controlla ortografia testo nel documento" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2932 msgid "_Messages..." msgstr "_Messaggi..." -#: ../src/verbs.cpp:2842 +#: ../src/verbs.cpp:2933 msgid "View debug messages" msgstr "Mostra i messaggi di debug" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2934 msgid "Show/Hide D_ialogs" msgstr "Mostra/Nascondi sottof_inestre" -#: ../src/verbs.cpp:2844 +#: ../src/verbs.cpp:2935 msgid "Show or hide all open dialogs" msgstr "Mostra o nasconde tutte le sottofinestre attive" -#: ../src/verbs.cpp:2845 +#: ../src/verbs.cpp:2936 msgid "Create Tiled Clones..." msgstr "Crea cloni in serie..." -#: ../src/verbs.cpp:2846 +#: ../src/verbs.cpp:2937 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" @@ -26071,426 +28480,443 @@ msgstr "" "Crea cloni multipli dell'oggetto selezionato, posizionandoli secondo una " "trama" -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2938 msgid "_Object attributes..." msgstr "Attributi _oggetto..." -#: ../src/verbs.cpp:2848 +#: ../src/verbs.cpp:2939 msgid "Edit the object attributes..." msgstr "Modifica gli attributi di un oggetto..." -#: ../src/verbs.cpp:2850 +#: ../src/verbs.cpp:2941 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" "Modifica l'ID, lo stato visibile o bloccato e altre proprietà dell'oggetto" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2942 msgid "_Input Devices..." msgstr "Dispositivi di _input..." -#: ../src/verbs.cpp:2852 +#: ../src/verbs.cpp:2943 msgid "Configure extended input devices, such as a graphics tablet" msgstr "Configura i dispositivi di input esteso, come le tavolette grafiche" -#: ../src/verbs.cpp:2853 +#: ../src/verbs.cpp:2944 msgid "_Extensions..." msgstr "_Estensioni..." -#: ../src/verbs.cpp:2854 +#: ../src/verbs.cpp:2945 msgid "Query information about extensions" msgstr "Richiedi informazioni sulle estensioni" -#: ../src/verbs.cpp:2855 +#: ../src/verbs.cpp:2946 msgid "Layer_s..." msgstr "Liv_elli..." -#: ../src/verbs.cpp:2856 +#: ../src/verbs.cpp:2947 msgid "View Layers" msgstr "Mostra i livelli" -#: ../src/verbs.cpp:2857 +#: ../src/verbs.cpp:2948 +#, fuzzy +msgid "Object_s..." +msgstr "Oggetti" + +#: ../src/verbs.cpp:2949 +#, fuzzy +msgid "View Objects" +msgstr "Oggetti" + +#: ../src/verbs.cpp:2950 +#, fuzzy +msgid "Selection se_ts..." +msgstr "Area selezione" + +#: ../src/verbs.cpp:2951 +#, fuzzy +msgid "View Tags" +msgstr "Mostra i livelli" + +#: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." msgstr "E_ffetti su tracciato..." -#: ../src/verbs.cpp:2858 +#: ../src/verbs.cpp:2953 msgid "Manage, edit, and apply path effects" msgstr "Gestisce, modifica e applica effetti su tracciato" -#: ../src/verbs.cpp:2859 +#: ../src/verbs.cpp:2954 msgid "Filter _Editor..." msgstr "_Editor filtri..." -#: ../src/verbs.cpp:2860 +#: ../src/verbs.cpp:2955 msgid "Manage, edit, and apply SVG filters" msgstr "Gestisce, modifica e applica filtri SVG" -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2956 msgid "SVG Font Editor..." msgstr "Editor font SVG..." -#: ../src/verbs.cpp:2862 +#: ../src/verbs.cpp:2957 msgid "Edit SVG fonts" msgstr "Modifica font SVG" -#: ../src/verbs.cpp:2863 +#: ../src/verbs.cpp:2958 msgid "Print Colors..." msgstr "Colori Stampa..." -#: ../src/verbs.cpp:2864 +#: ../src/verbs.cpp:2959 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" "Seleziona quale separazione colori renderizzare nella modalità anteprima " "colori stampa" -#: ../src/verbs.cpp:2865 +#: ../src/verbs.cpp:2960 msgid "_Export PNG Image..." msgstr "_Esporta immagine PNG..." -#: ../src/verbs.cpp:2866 +#: ../src/verbs.cpp:2961 msgid "Export this document or a selection as a PNG image" msgstr "Esporta questo documento o una selezione come un'immagine PNG" #. Help -#: ../src/verbs.cpp:2868 +#: ../src/verbs.cpp:2963 msgid "About E_xtensions" msgstr "Informazioni sulle e_stensioni" -#: ../src/verbs.cpp:2869 +#: ../src/verbs.cpp:2964 msgid "Information on Inkscape extensions" msgstr "Informazioni sulle estensioni di Inkscape" -#: ../src/verbs.cpp:2870 +#: ../src/verbs.cpp:2965 msgid "About _Memory" msgstr "Informazioni sulla _memoria" -#: ../src/verbs.cpp:2871 +#: ../src/verbs.cpp:2966 msgid "Memory usage information" msgstr "Informazioni sull'uso della memoria" -#: ../src/verbs.cpp:2872 +#: ../src/verbs.cpp:2967 msgid "_About Inkscape" msgstr "Inform_azioni su Inkscape" -#: ../src/verbs.cpp:2873 +#: ../src/verbs.cpp:2968 msgid "Inkscape version, authors, license" msgstr "Versione, autori e licenza di Inkscape" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2878 +#: ../src/verbs.cpp:2973 msgid "Inkscape: _Basic" msgstr "Inkscape: _Base" -#: ../src/verbs.cpp:2879 +#: ../src/verbs.cpp:2974 msgid "Getting started with Inkscape" msgstr "Primi passi con Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2880 +#: ../src/verbs.cpp:2975 msgid "Inkscape: _Shapes" msgstr "Ink_scape: Forme" -#: ../src/verbs.cpp:2881 +#: ../src/verbs.cpp:2976 msgid "Using shape tools to create and edit shapes" msgstr "Utilizzo degli strumenti per creare e modificare forme" -#: ../src/verbs.cpp:2882 +#: ../src/verbs.cpp:2977 msgid "Inkscape: _Advanced" msgstr "Inkscape: _Avanzato" -#: ../src/verbs.cpp:2883 +#: ../src/verbs.cpp:2978 msgid "Advanced Inkscape topics" msgstr "Lezioni avanzate su Inkscape" -#. "tutorial_advanced" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2885 +#: ../src/verbs.cpp:2982 msgid "Inkscape: T_racing" msgstr "Inkscape: Vetto_rizzazione" -#: ../src/verbs.cpp:2886 +#: ../src/verbs.cpp:2983 msgid "Using bitmap tracing" msgstr "Utilizzo della vettorizzazione delle immagini" -#. "tutorial_tracing" -#: ../src/verbs.cpp:2887 +#: ../src/verbs.cpp:2986 msgid "Inkscape: Tracing Pixel Art" msgstr "Inkscape: Vettorizzazione Pixel Art" -#: ../src/verbs.cpp:2888 +#: ../src/verbs.cpp:2987 msgid "Using Trace Pixel Art dialog" msgstr "Utilizzo della vettorizzazione Pixel Art" -#: ../src/verbs.cpp:2889 +#: ../src/verbs.cpp:2988 msgid "Inkscape: _Calligraphy" msgstr "Inks_cape: Pennino" -#: ../src/verbs.cpp:2890 +#: ../src/verbs.cpp:2989 msgid "Using the Calligraphy pen tool" msgstr "Utilizzo del Pennino" -#: ../src/verbs.cpp:2891 +#: ../src/verbs.cpp:2990 msgid "Inkscape: _Interpolate" msgstr "Inkscape: _Interpola" -#: ../src/verbs.cpp:2892 +#: ../src/verbs.cpp:2991 msgid "Using the interpolate extension" msgstr "Utilizzo dell'estensione Interpola" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2893 +#: ../src/verbs.cpp:2992 msgid "_Elements of Design" msgstr "_Elementi di grafica" -#: ../src/verbs.cpp:2894 +#: ../src/verbs.cpp:2993 msgid "Principles of design in the tutorial form" msgstr "Principi di grafica" #. "tutorial_design" -#: ../src/verbs.cpp:2895 +#: ../src/verbs.cpp:2994 msgid "_Tips and Tricks" msgstr "_Trucchi" -#: ../src/verbs.cpp:2896 +#: ../src/verbs.cpp:2995 msgid "Miscellaneous tips and tricks" msgstr "Trucchi vari" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2899 +#: ../src/verbs.cpp:2998 msgid "Previous Exte_nsion" msgstr "Este_nsione precedente" -#: ../src/verbs.cpp:2900 +#: ../src/verbs.cpp:2999 msgid "Repeat the last extension with the same settings" msgstr "Ripete l'ultima estensione con le stesse impostazioni" -#: ../src/verbs.cpp:2901 +#: ../src/verbs.cpp:3000 msgid "_Previous Extension Settings..." msgstr "Impostazioni estensione _precedente..." -#: ../src/verbs.cpp:2902 +#: ../src/verbs.cpp:3001 msgid "Repeat the last extension with new settings" msgstr "Ripete l'ultima estensione con nuove impostazioni" -#: ../src/verbs.cpp:2906 +#: ../src/verbs.cpp:3005 msgid "Fit the page to the current selection" msgstr "Adatta la pagina alla selezione attuale" -#: ../src/verbs.cpp:2908 +#: ../src/verbs.cpp:3007 msgid "Fit the page to the drawing" msgstr "Adatta la pagina al disegno" -#: ../src/verbs.cpp:2910 +#: ../src/verbs.cpp:3008 +msgid "_Resize Page to Selection" +msgstr "_Ridimensiona pagina alla selezione" + +#: ../src/verbs.cpp:3009 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" "Adatta la pagina alla selezione attuale o al disegno se non è selezionato " "nulla" -#. LockAndHide -#: ../src/verbs.cpp:2912 -msgid "Unlock All" -msgstr "Sblocca tutto" - -#: ../src/verbs.cpp:2914 +#: ../src/verbs.cpp:3013 msgid "Unlock All in All Layers" msgstr "Sblocca tutto in ogni livello" -#: ../src/verbs.cpp:2916 +#: ../src/verbs.cpp:3015 msgid "Unhide All" msgstr "Mostra tutto" -#: ../src/verbs.cpp:2918 +#: ../src/verbs.cpp:3017 msgid "Unhide All in All Layers" msgstr "Mostra tutto in ogni livello" -#: ../src/verbs.cpp:2922 +#: ../src/verbs.cpp:3021 msgid "Link an ICC color profile" msgstr "Collega un profilo colore ICC" -#: ../src/verbs.cpp:2923 +#: ../src/verbs.cpp:3022 msgid "Remove Color Profile" msgstr "Rimuovi profilo colore" -#: ../src/verbs.cpp:2924 +#: ../src/verbs.cpp:3023 msgid "Remove a linked ICC color profile" msgstr "Rimuove un profilo colore ICC collegato" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:3026 msgid "Add External Script" msgstr "Aggiungi script esterno" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:3026 msgid "Add an external script" msgstr "Aggiungi uno script esterno" -#: ../src/verbs.cpp:2929 +#: ../src/verbs.cpp:3028 msgid "Add Embedded Script" msgstr "Aggiungi script incorporato" -#: ../src/verbs.cpp:2929 +#: ../src/verbs.cpp:3028 msgid "Add an embedded script" msgstr "Aggiungi uno script incorporato" -#: ../src/verbs.cpp:2931 +#: ../src/verbs.cpp:3030 msgid "Edit Embedded Script" msgstr "Modifica script incorporato" -#: ../src/verbs.cpp:2931 +#: ../src/verbs.cpp:3030 msgid "Edit an embedded script" msgstr "Modifica uno script incorporato" -#: ../src/verbs.cpp:2933 +#: ../src/verbs.cpp:3032 msgid "Remove External Script" msgstr "Rimuovi script esterno" -#: ../src/verbs.cpp:2933 +#: ../src/verbs.cpp:3032 msgid "Remove an external script" msgstr "Rimuovi uno script esterno" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:3034 msgid "Remove Embedded Script" msgstr "Rimuovi script incorporato" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:3034 msgid "Remove an embedded script" msgstr "Rimuovi uno script incorporato" -#: ../src/verbs.cpp:2957 ../src/verbs.cpp:2958 +#: ../src/verbs.cpp:3056 ../src/verbs.cpp:3057 msgid "Center on horizontal and vertical axis" msgstr "Centra sull'asse orizzontale e verticale" -#: ../src/widgets/arc-toolbar.cpp:131 +#: ../src/widgets/arc-toolbar.cpp:129 msgid "Arc: Change start/end" msgstr "Arco: Modifica inizio/fine" -#: ../src/widgets/arc-toolbar.cpp:197 +#: ../src/widgets/arc-toolbar.cpp:191 msgid "Arc: Change open/closed" msgstr "Arco: Commuta aperto/chiuso" -#: ../src/widgets/arc-toolbar.cpp:288 ../src/widgets/arc-toolbar.cpp:317 -#: ../src/widgets/rect-toolbar.cpp:258 ../src/widgets/rect-toolbar.cpp:296 -#: ../src/widgets/spiral-toolbar.cpp:214 ../src/widgets/spiral-toolbar.cpp:238 -#: ../src/widgets/star-toolbar.cpp:383 ../src/widgets/star-toolbar.cpp:444 +#: ../src/widgets/arc-toolbar.cpp:280 ../src/widgets/arc-toolbar.cpp:310 +#: ../src/widgets/rect-toolbar.cpp:260 ../src/widgets/rect-toolbar.cpp:299 +#: ../src/widgets/spiral-toolbar.cpp:210 ../src/widgets/spiral-toolbar.cpp:234 +#: ../src/widgets/star-toolbar.cpp:382 ../src/widgets/star-toolbar.cpp:444 msgid "New:" msgstr "Nuovo:" #. FIXME: implement averaging of all parameters for multiple selected #. gtk_label_set_markup(GTK_LABEL(l), _("Average:")); -#: ../src/widgets/arc-toolbar.cpp:291 ../src/widgets/arc-toolbar.cpp:302 -#: ../src/widgets/rect-toolbar.cpp:266 ../src/widgets/rect-toolbar.cpp:284 -#: ../src/widgets/spiral-toolbar.cpp:216 ../src/widgets/spiral-toolbar.cpp:227 -#: ../src/widgets/star-toolbar.cpp:385 +#: ../src/widgets/arc-toolbar.cpp:283 ../src/widgets/arc-toolbar.cpp:294 +#: ../src/widgets/rect-toolbar.cpp:268 ../src/widgets/rect-toolbar.cpp:286 +#: ../src/widgets/spiral-toolbar.cpp:212 ../src/widgets/spiral-toolbar.cpp:223 +#: ../src/widgets/star-toolbar.cpp:384 msgid "Change:" msgstr "Cambia:" -#: ../src/widgets/arc-toolbar.cpp:326 +#: ../src/widgets/arc-toolbar.cpp:319 msgid "Start:" msgstr "Inizio:" -#: ../src/widgets/arc-toolbar.cpp:327 +#: ../src/widgets/arc-toolbar.cpp:320 msgid "The angle (in degrees) from the horizontal to the arc's start point" msgstr "L'angolo (in gradi) tra l'orizzontale e il punto iniziale dell'arco" -#: ../src/widgets/arc-toolbar.cpp:339 +#: ../src/widgets/arc-toolbar.cpp:332 msgid "End:" msgstr "Fine:" -#: ../src/widgets/arc-toolbar.cpp:340 +#: ../src/widgets/arc-toolbar.cpp:333 msgid "The angle (in degrees) from the horizontal to the arc's end point" msgstr "L'angolo (in gradi) tra l'orizzontale e il punto iniziale dell'arco" -#: ../src/widgets/arc-toolbar.cpp:356 +#: ../src/widgets/arc-toolbar.cpp:349 msgid "Closed arc" msgstr "Arco chiuso" -#: ../src/widgets/arc-toolbar.cpp:357 +#: ../src/widgets/arc-toolbar.cpp:350 msgid "Switch to segment (closed shape with two radii)" msgstr "Commuta in segmento (forma chiusa con due raggi)" -#: ../src/widgets/arc-toolbar.cpp:363 +#: ../src/widgets/arc-toolbar.cpp:356 msgid "Open Arc" msgstr "Arco aperto" -#: ../src/widgets/arc-toolbar.cpp:364 +#: ../src/widgets/arc-toolbar.cpp:357 msgid "Switch to arc (unclosed shape)" msgstr "Trasforma in arco (forma aperta)" -#: ../src/widgets/arc-toolbar.cpp:387 +#: ../src/widgets/arc-toolbar.cpp:380 msgid "Make whole" msgstr "Rendi intero" -#: ../src/widgets/arc-toolbar.cpp:388 +#: ../src/widgets/arc-toolbar.cpp:381 msgid "Make the shape a whole ellipse, not arc or segment" msgstr "Rende la forma in un ellisse intero, non un arco o un segmento" #. TODO: use the correct axis here, too -#: ../src/widgets/box3d-toolbar.cpp:232 +#: ../src/widgets/box3d-toolbar.cpp:233 msgid "3D Box: Change perspective (angle of infinite axis)" msgstr "Solido 3D: cambia prospettiva (angolo degli assi prospettici)" -#: ../src/widgets/box3d-toolbar.cpp:299 +#: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle in X direction" msgstr "Angolo sulla direzione X" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:301 +#: ../src/widgets/box3d-toolbar.cpp:304 msgid "Angle of PLs in X direction" msgstr "Angolo degli assi prospettici lungo la direzione X" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:323 +#: ../src/widgets/box3d-toolbar.cpp:326 msgid "State of VP in X direction" msgstr "Stato del punto di fuga sulla direzione X" -#: ../src/widgets/box3d-toolbar.cpp:324 +#: ../src/widgets/box3d-toolbar.cpp:327 msgid "Toggle VP in X direction between 'finite' and 'infinite' (=parallel)" msgstr "" "Imposta il punto di fuga sulla direzione X come 'finito' o " "'infinito' (=parallelo)" -#: ../src/widgets/box3d-toolbar.cpp:339 +#: ../src/widgets/box3d-toolbar.cpp:342 msgid "Angle in Y direction" msgstr "Angolo sulla direzione Y" -#: ../src/widgets/box3d-toolbar.cpp:339 +#: ../src/widgets/box3d-toolbar.cpp:342 msgid "Angle Y:" msgstr "Angolo Y:" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:341 +#: ../src/widgets/box3d-toolbar.cpp:344 msgid "Angle of PLs in Y direction" msgstr "Angolo degli assi prospettici lungo la direzione Y" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:362 +#: ../src/widgets/box3d-toolbar.cpp:365 msgid "State of VP in Y direction" msgstr "Stato del punto di fuga sulla direzione Y" -#: ../src/widgets/box3d-toolbar.cpp:363 +#: ../src/widgets/box3d-toolbar.cpp:366 msgid "Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)" msgstr "" "Imposta il punto di fuga sulla direzione Y come 'finito' o " "'infinito' (=parallelo)" -#: ../src/widgets/box3d-toolbar.cpp:378 +#: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle in Z direction" msgstr "Angolo sulla direzione Z" #. Translators: PL is short for 'perspective line' -#: ../src/widgets/box3d-toolbar.cpp:380 +#: ../src/widgets/box3d-toolbar.cpp:383 msgid "Angle of PLs in Z direction" msgstr "Angolo degli assi prospettici lungo la direzione Z" #. Translators: VP is short for 'vanishing point' -#: ../src/widgets/box3d-toolbar.cpp:401 +#: ../src/widgets/box3d-toolbar.cpp:404 msgid "State of VP in Z direction" msgstr "Stato del punto di fuga sulla direzione Z" -#: ../src/widgets/box3d-toolbar.cpp:402 +#: ../src/widgets/box3d-toolbar.cpp:405 msgid "Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)" msgstr "" "Imposta il punto di fuga sulla direzione Z come 'finito' o " @@ -26505,7 +28931,7 @@ msgstr "Nessuna preselezione" #. Width #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(hairline)" msgstr "(tratto finissimo)" @@ -26514,22 +28940,22 @@ msgstr "(tratto finissimo)" #. Scale #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:269 -#: ../src/widgets/spray-toolbar.cpp:113 ../src/widgets/spray-toolbar.cpp:129 -#: ../src/widgets/spray-toolbar.cpp:145 ../src/widgets/spray-toolbar.cpp:205 -#: ../src/widgets/spray-toolbar.cpp:235 ../src/widgets/spray-toolbar.cpp:253 -#: ../src/widgets/tweak-toolbar.cpp:125 ../src/widgets/tweak-toolbar.cpp:142 -#: ../src/widgets/tweak-toolbar.cpp:350 +#: ../src/widgets/eraser-toolbar.cpp:151 ../src/widgets/pencil-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 +#: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:408 +#: ../src/widgets/spray-toolbar.cpp:438 ../src/widgets/spray-toolbar.cpp:456 +#: ../src/widgets/spray-toolbar.cpp:605 ../src/widgets/tweak-toolbar.cpp:125 +#: ../src/widgets/tweak-toolbar.cpp:142 ../src/widgets/tweak-toolbar.cpp:350 msgid "(default)" msgstr "(predefinito)" #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(broad stroke)" msgstr "(tratto ampio)" #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 +#: ../src/widgets/eraser-toolbar.cpp:154 msgid "Pen Width" msgstr "Larghezza pennino" @@ -26592,7 +29018,7 @@ msgid "Pen Angle" msgstr "Angolo penna" #: ../src/widgets/calligraphy-toolbar.cpp:463 -#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:10 +#: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:5 msgid "Angle:" msgstr "Angolo:" @@ -26722,18 +29148,22 @@ msgstr "Aumentare per rendere la scrittura più ondulata" #. Mass #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(no inertia)" msgstr "(nessun'inerzia)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(slight smoothing, default)" msgstr "(leggero ritardo, predefinito)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(noticeable lagging)" msgstr "(ritardo apprezzabile)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(maximum inertia)" msgstr "(inerzia massima)" @@ -26742,6 +29172,7 @@ msgid "Pen Mass" msgstr "Inerzia pennino" #: ../src/widgets/calligraphy-toolbar.cpp:549 +#: ../src/widgets/eraser-toolbar.cpp:171 msgid "Mass:" msgstr "Inerzia:" @@ -26791,90 +29222,90 @@ msgstr "Aggiungi/Modifica profilo" msgid "Add or edit calligraphic profile" msgstr "Aggiungi o modifica profilo calligrafico" -#: ../src/widgets/connector-toolbar.cpp:120 +#: ../src/widgets/connector-toolbar.cpp:118 msgid "Set connector type: orthogonal" msgstr "Imposta tipo connettore: ortogonale" -#: ../src/widgets/connector-toolbar.cpp:120 +#: ../src/widgets/connector-toolbar.cpp:118 msgid "Set connector type: polyline" msgstr "Imposta tipo connettore: poligonale" -#: ../src/widgets/connector-toolbar.cpp:169 +#: ../src/widgets/connector-toolbar.cpp:165 msgid "Change connector curvature" msgstr "Cambia curvatura connettore" -#: ../src/widgets/connector-toolbar.cpp:220 +#: ../src/widgets/connector-toolbar.cpp:214 msgid "Change connector spacing" msgstr "Cambia spaziatura connettori" -#: ../src/widgets/connector-toolbar.cpp:313 +#: ../src/widgets/connector-toolbar.cpp:307 msgid "Avoid" msgstr "Evita" -#: ../src/widgets/connector-toolbar.cpp:323 +#: ../src/widgets/connector-toolbar.cpp:317 msgid "Ignore" msgstr "Ignora" -#: ../src/widgets/connector-toolbar.cpp:334 +#: ../src/widgets/connector-toolbar.cpp:328 msgid "Orthogonal" msgstr "Ortogonale" -#: ../src/widgets/connector-toolbar.cpp:335 +#: ../src/widgets/connector-toolbar.cpp:329 msgid "Make connector orthogonal or polyline" msgstr "Fa sì che il connettore sia ortogonale o poligonale" -#: ../src/widgets/connector-toolbar.cpp:349 +#: ../src/widgets/connector-toolbar.cpp:343 msgid "Connector Curvature" msgstr "Curvatura connettore" -#: ../src/widgets/connector-toolbar.cpp:349 +#: ../src/widgets/connector-toolbar.cpp:343 msgid "Curvature:" msgstr "Curvatura:" -#: ../src/widgets/connector-toolbar.cpp:350 +#: ../src/widgets/connector-toolbar.cpp:344 msgid "The amount of connectors curvature" msgstr "La quantità di curvatura del connettore" -#: ../src/widgets/connector-toolbar.cpp:360 +#: ../src/widgets/connector-toolbar.cpp:354 msgid "Connector Spacing" msgstr "Spaziatura connettori" -#: ../src/widgets/connector-toolbar.cpp:360 +#: ../src/widgets/connector-toolbar.cpp:354 msgid "Spacing:" msgstr "Spaziatura:" -#: ../src/widgets/connector-toolbar.cpp:361 +#: ../src/widgets/connector-toolbar.cpp:355 msgid "The amount of space left around objects by auto-routing connectors" msgstr "" "Lo spazio da lasciare intorno agli oggetti quando si tracciano " "automaticamente i connettori" -#: ../src/widgets/connector-toolbar.cpp:372 +#: ../src/widgets/connector-toolbar.cpp:366 msgid "Graph" msgstr "Grafico" -#: ../src/widgets/connector-toolbar.cpp:382 +#: ../src/widgets/connector-toolbar.cpp:376 msgid "Connector Length" msgstr "Lunghezza connettori" -#: ../src/widgets/connector-toolbar.cpp:382 +#: ../src/widgets/connector-toolbar.cpp:376 msgid "Length:" msgstr "Lunghezza:" -#: ../src/widgets/connector-toolbar.cpp:383 +#: ../src/widgets/connector-toolbar.cpp:377 msgid "Ideal length for connectors when layout is applied" msgstr "Lunghezza ideale dei connettori quando il modello è applicato" -#: ../src/widgets/connector-toolbar.cpp:395 +#: ../src/widgets/connector-toolbar.cpp:389 msgid "Downwards" msgstr "Contrario" -#: ../src/widgets/connector-toolbar.cpp:396 +#: ../src/widgets/connector-toolbar.cpp:390 msgid "Make connectors with end-markers (arrows) point downwards" msgstr "" "Fa sì che i connettori con delimitatori finali (frecce) puntino indietro" -#: ../src/widgets/connector-toolbar.cpp:412 +#: ../src/widgets/connector-toolbar.cpp:406 msgid "Do not allow overlapping shapes" msgstr "Non permettere la sovrapposizione delle forme" @@ -26886,20 +29317,20 @@ msgstr "Motivo del tratteggio" msgid "Pattern offset" msgstr "Spostamento del motivo" -#: ../src/widgets/desktop-widget.cpp:466 +#: ../src/widgets/desktop-widget.cpp:494 msgid "Zoom drawing if window size changes" msgstr "Aggiusta l'ingrandimento se cambia la dimensione della finestra" -#: ../src/widgets/desktop-widget.cpp:665 +#: ../src/widgets/desktop-widget.cpp:701 msgid "Cursor coordinates" msgstr "Cordinate del cursore" -#: ../src/widgets/desktop-widget.cpp:691 +#: ../src/widgets/desktop-widget.cpp:722 msgid "Z:" msgstr "Z:" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:734 +#: ../src/widgets/desktop-widget.cpp:775 msgid "" "Welcome to Inkscape! Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." @@ -26907,73 +29338,83 @@ msgstr "" "Benvenuti in Inkscape! Usa le forme o gli strumenti a mano libera per " "creare gli oggetti; usa il selettore (freccia) per muoverli o trasformarli." -#: ../src/widgets/desktop-widget.cpp:828 +#: ../src/widgets/desktop-widget.cpp:869 msgid "grayscale" msgstr "scala di grigi" -#: ../src/widgets/desktop-widget.cpp:829 +#: ../src/widgets/desktop-widget.cpp:870 msgid ", grayscale" msgstr ", scala di grigi" -#: ../src/widgets/desktop-widget.cpp:830 +#: ../src/widgets/desktop-widget.cpp:871 msgid "print colors preview" msgstr "anteprima colori stampa" -#: ../src/widgets/desktop-widget.cpp:831 +#: ../src/widgets/desktop-widget.cpp:872 msgid ", print colors preview" msgstr ", anteprima colori stampa" -#: ../src/widgets/desktop-widget.cpp:832 +#: ../src/widgets/desktop-widget.cpp:873 msgid "outline" msgstr "scheletro" -#: ../src/widgets/desktop-widget.cpp:833 +#: ../src/widgets/desktop-widget.cpp:874 msgid "no filters" msgstr "Nessun filtro" -#: ../src/widgets/desktop-widget.cpp:860 +#: ../src/widgets/desktop-widget.cpp:901 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" msgstr "%s%s: %d (%s%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:862 ../src/widgets/desktop-widget.cpp:866 +#: ../src/widgets/desktop-widget.cpp:903 ../src/widgets/desktop-widget.cpp:907 #, c-format msgid "%s%s: %d (%s) - Inkscape" msgstr "%s%s: %d (%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:868 +#: ../src/widgets/desktop-widget.cpp:909 #, c-format msgid "%s%s: %d - Inkscape" msgstr "%s%s: %d - Inkscape" -#: ../src/widgets/desktop-widget.cpp:874 +#: ../src/widgets/desktop-widget.cpp:915 #, c-format msgid "%s%s (%s%s) - Inkscape" msgstr "%s%s (%s%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:876 ../src/widgets/desktop-widget.cpp:880 +#: ../src/widgets/desktop-widget.cpp:917 ../src/widgets/desktop-widget.cpp:921 #, c-format msgid "%s%s (%s) - Inkscape" msgstr "%s%s (%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:882 +#: ../src/widgets/desktop-widget.cpp:923 #, c-format msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" -#: ../src/widgets/desktop-widget.cpp:1051 +#: ../src/widgets/desktop-widget.cpp:1095 +#, fuzzy +msgid "Locked all guides" +msgstr "Blocca tutti i livelli" + +#: ../src/widgets/desktop-widget.cpp:1097 +#, fuzzy +msgid "Unlocked all guides" +msgstr "Sblocca tutti i livelli" + +#: ../src/widgets/desktop-widget.cpp:1114 #, fuzzy msgid "Color-managed display is enabled in this window" msgstr "" "La gestione del colore del display è abilitata in questa finestra" -#: ../src/widgets/desktop-widget.cpp:1053 +#: ../src/widgets/desktop-widget.cpp:1116 #, fuzzy msgid "Color-managed display is disabled in this window" msgstr "" "La gestione del colore del display è disabilitata in questa finestra" -#: ../src/widgets/desktop-widget.cpp:1108 +#: ../src/widgets/desktop-widget.cpp:1171 #, c-format msgid "" "Save changes to document \"%s\" before " @@ -26986,12 +29427,12 @@ msgstr "" "\n" "Chiudendo senza salvare, le modifiche verranno perse." -#: ../src/widgets/desktop-widget.cpp:1118 -#: ../src/widgets/desktop-widget.cpp:1177 +#: ../src/widgets/desktop-widget.cpp:1181 +#: ../src/widgets/desktop-widget.cpp:1240 msgid "Close _without saving" msgstr "_Chiudi senza salvare" -#: ../src/widgets/desktop-widget.cpp:1167 +#: ../src/widgets/desktop-widget.cpp:1230 #, c-format msgid "" "The file \"%s\" was saved with a " @@ -27004,11 +29445,11 @@ msgstr "" "\n" "Salvarlo come un file Inkscape SVG?" -#: ../src/widgets/desktop-widget.cpp:1179 +#: ../src/widgets/desktop-widget.cpp:1242 msgid "_Save as Inkscape SVG" msgstr "_Salva come Inkscape SVG" -#: ../src/widgets/desktop-widget.cpp:1392 +#: ../src/widgets/desktop-widget.cpp:1455 msgid "Note:" msgstr "Nota:" @@ -27047,201 +29488,230 @@ msgstr "Assegna" msgid "remove" msgstr "rimuovi" -#: ../src/widgets/eraser-toolbar.cpp:94 +#: ../src/widgets/eraser-toolbar.cpp:121 msgid "Delete objects touched by the eraser" msgstr "Cancella oggetti toccati dalla gomma" -#: ../src/widgets/eraser-toolbar.cpp:100 +#: ../src/widgets/eraser-toolbar.cpp:127 msgid "Cut" msgstr "Taglia" -#: ../src/widgets/eraser-toolbar.cpp:101 +#: ../src/widgets/eraser-toolbar.cpp:128 msgid "Cut out from objects" msgstr "Taglia dagli oggetti" -#: ../src/widgets/eraser-toolbar.cpp:129 +#. Width +#: ../src/widgets/eraser-toolbar.cpp:151 +#, fuzzy +msgid "(no width)" +msgstr "Larghezza zero" + +#: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "La larghezza del cancellino (relativa all'area della tela visibile)" -#: ../src/widgets/fill-style.cpp:362 +#: ../src/widgets/eraser-toolbar.cpp:171 +#, fuzzy +msgid "Eraser Mass" +msgstr "Gomma" + +#: ../src/widgets/eraser-toolbar.cpp:172 +#, fuzzy +msgid "Increase to make the eraser drag behind, as if slowed by inertia" +msgstr "" +"Aumentare il valore per impostare il ritardo al pennino, come se fosse " +"rallentato per inerzia" + +#: ../src/widgets/eraser-toolbar.cpp:186 +#, fuzzy +msgid "Break appart cutted items" +msgstr "Separa il percorso nel nodo selezionato" + +#: ../src/widgets/eraser-toolbar.cpp:187 +#, fuzzy +msgid "Break appart cutted itemss" +msgstr "Separa il percorso nel nodo selezionato" + +#: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" msgstr "Modifica regola di riempimento" -#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 +#: ../src/widgets/fill-style.cpp:440 ../src/widgets/fill-style.cpp:518 msgid "Set fill color" msgstr "Imposta colore di riempimento" -#: ../src/widgets/fill-style.cpp:447 ../src/widgets/fill-style.cpp:526 +#: ../src/widgets/fill-style.cpp:440 ../src/widgets/fill-style.cpp:518 msgid "Set stroke color" msgstr "Imposta colore contorno" -#: ../src/widgets/fill-style.cpp:625 +#: ../src/widgets/fill-style.cpp:616 msgid "Set gradient on fill" msgstr "Imposta gradiente per il riempimento" -#: ../src/widgets/fill-style.cpp:625 +#: ../src/widgets/fill-style.cpp:616 msgid "Set gradient on stroke" msgstr "Imposta gradiente per il contorno" -#: ../src/widgets/fill-style.cpp:685 +#: ../src/widgets/fill-style.cpp:676 msgid "Set pattern on fill" msgstr "Imposta motivo per il riempimento" -#: ../src/widgets/fill-style.cpp:686 +#: ../src/widgets/fill-style.cpp:677 msgid "Set pattern on stroke" msgstr "Imposta motivo per il contorno" -#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:964 -#: ../src/widgets/text-toolbar.cpp:1278 +#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1207 +#: ../src/widgets/text-toolbar.cpp:1606 msgid "Font size" msgstr "Dimensione carattere" #. Family frame -#: ../src/widgets/font-selector.cpp:148 +#: ../src/widgets/font-selector.cpp:134 msgid "Font family" msgstr "Carattere" #. Style frame -#: ../src/widgets/font-selector.cpp:193 +#: ../src/widgets/font-selector.cpp:194 msgctxt "Font selector" msgid "Style" msgstr "Stile" -#: ../src/widgets/font-selector.cpp:225 +#: ../src/widgets/font-selector.cpp:226 msgid "Face" msgstr "Face" -#: ../src/widgets/font-selector.cpp:254 ../share/extensions/dots.inx.h:3 +#: ../src/widgets/font-selector.cpp:255 ../share/extensions/dots.inx.h:3 +#: ../share/extensions/nicechart.inx.h:17 msgid "Font size:" msgstr "Dimensione carattere:" -#: ../src/widgets/gradient-selector.cpp:214 +#: ../src/widgets/gradient-selector.cpp:201 msgid "Create a duplicate gradient" msgstr "Crea un duplicato del gradiente" -#: ../src/widgets/gradient-selector.cpp:230 +#: ../src/widgets/gradient-selector.cpp:212 msgid "Edit gradient" msgstr "Modifica gradiente" -#: ../src/widgets/gradient-selector.cpp:306 -#: ../src/widgets/paint-selector.cpp:244 +#: ../src/widgets/gradient-selector.cpp:281 +#: ../src/widgets/paint-selector.cpp:233 msgid "Swatch" msgstr "Campione" -#: ../src/widgets/gradient-selector.cpp:356 +#: ../src/widgets/gradient-selector.cpp:331 msgid "Rename gradient" msgstr "Rinomina gradiente" #: ../src/widgets/gradient-toolbar.cpp:156 #: ../src/widgets/gradient-toolbar.cpp:169 -#: ../src/widgets/gradient-toolbar.cpp:756 -#: ../src/widgets/gradient-toolbar.cpp:1094 +#: ../src/widgets/gradient-toolbar.cpp:758 +#: ../src/widgets/gradient-toolbar.cpp:1097 msgid "No gradient" msgstr "Nessun gradiente" -#: ../src/widgets/gradient-toolbar.cpp:175 +#: ../src/widgets/gradient-toolbar.cpp:176 msgid "Multiple gradients" msgstr "Più gradienti" -#: ../src/widgets/gradient-toolbar.cpp:676 +#: ../src/widgets/gradient-toolbar.cpp:678 msgid "Multiple stops" msgstr "Più passaggi" -#: ../src/widgets/gradient-toolbar.cpp:774 -#: ../src/widgets/gradient-vector.cpp:629 +#: ../src/widgets/gradient-toolbar.cpp:776 +#: ../src/widgets/gradient-vector.cpp:614 msgid "No stops in gradient" msgstr "Nessun passaggio nel gradiente" -#: ../src/widgets/gradient-toolbar.cpp:927 +#: ../src/widgets/gradient-toolbar.cpp:930 msgid "Assign gradient to object" msgstr "Assegna gradiente ad oggetto" -#: ../src/widgets/gradient-toolbar.cpp:949 +#: ../src/widgets/gradient-toolbar.cpp:952 msgid "Set gradient repeat" msgstr "Imposta riperizione gradiente" -#: ../src/widgets/gradient-toolbar.cpp:987 -#: ../src/widgets/gradient-vector.cpp:740 +#: ../src/widgets/gradient-toolbar.cpp:990 +#: ../src/widgets/gradient-vector.cpp:727 msgid "Change gradient stop offset" msgstr "Cambia offset del passaggio del gradiente" -#: ../src/widgets/gradient-toolbar.cpp:1034 +#: ../src/widgets/gradient-toolbar.cpp:1037 msgid "linear" msgstr "lineare" -#: ../src/widgets/gradient-toolbar.cpp:1034 +#: ../src/widgets/gradient-toolbar.cpp:1037 msgid "Create linear gradient" msgstr "Crea gradiente lineare" -#: ../src/widgets/gradient-toolbar.cpp:1038 +#: ../src/widgets/gradient-toolbar.cpp:1041 msgid "radial" msgstr "radiale" -#: ../src/widgets/gradient-toolbar.cpp:1038 +#: ../src/widgets/gradient-toolbar.cpp:1041 msgid "Create radial (elliptic or circular) gradient" msgstr "Crea un gradiente radiale (ellittico o circolare)" -#: ../src/widgets/gradient-toolbar.cpp:1041 -#: ../src/widgets/mesh-toolbar.cpp:211 +#: ../src/widgets/gradient-toolbar.cpp:1044 +#: ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "Nuovo:" -#: ../src/widgets/gradient-toolbar.cpp:1064 -#: ../src/widgets/mesh-toolbar.cpp:234 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "riempimento" -#: ../src/widgets/gradient-toolbar.cpp:1064 -#: ../src/widgets/mesh-toolbar.cpp:234 +#: ../src/widgets/gradient-toolbar.cpp:1067 +#: ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "Crea gradiente per il riempimento" -#: ../src/widgets/gradient-toolbar.cpp:1068 -#: ../src/widgets/mesh-toolbar.cpp:238 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" msgstr "contorno" -#: ../src/widgets/gradient-toolbar.cpp:1068 -#: ../src/widgets/mesh-toolbar.cpp:238 +#: ../src/widgets/gradient-toolbar.cpp:1071 +#: ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "Crea gradiente per il contorno" -#: ../src/widgets/gradient-toolbar.cpp:1071 -#: ../src/widgets/mesh-toolbar.cpp:241 +#: ../src/widgets/gradient-toolbar.cpp:1074 +#: ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "su:" -#: ../src/widgets/gradient-toolbar.cpp:1096 +#: ../src/widgets/gradient-toolbar.cpp:1099 msgid "Select" msgstr "Seleziona" -#: ../src/widgets/gradient-toolbar.cpp:1096 +#: ../src/widgets/gradient-toolbar.cpp:1099 msgid "Choose a gradient" msgstr "Scegli un gradiente" -#: ../src/widgets/gradient-toolbar.cpp:1097 +#: ../src/widgets/gradient-toolbar.cpp:1100 msgid "Select:" msgstr "Seleziona:" -#: ../src/widgets/gradient-toolbar.cpp:1112 +#: ../src/widgets/gradient-toolbar.cpp:1115 msgctxt "Gradient repeat type" msgid "None" msgstr "Nessuna" -#: ../src/widgets/gradient-toolbar.cpp:1115 +#: ../src/widgets/gradient-toolbar.cpp:1118 msgid "Reflected" msgstr "Riflessa" -#: ../src/widgets/gradient-toolbar.cpp:1118 +#: ../src/widgets/gradient-toolbar.cpp:1121 msgid "Direct" msgstr "Diretta" -#: ../src/widgets/gradient-toolbar.cpp:1120 +#: ../src/widgets/gradient-toolbar.cpp:1123 msgid "Repeat" msgstr "Ripetizione" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/pservers.html#LinearGradientSpreadMethodAttribute -#: ../src/widgets/gradient-toolbar.cpp:1122 +#: ../src/widgets/gradient-toolbar.cpp:1125 msgid "" "Whether to fill with flat color beyond the ends of the gradient vector " "(spreadMethod=\"pad\"), or repeat the gradient in the same direction " @@ -27253,104 +29723,127 @@ msgstr "" "(spreadMethod=\"repeat\") o ripetere il gradiente nella direzione opposta " "(spreadMethod=\"reflect\")" -#: ../src/widgets/gradient-toolbar.cpp:1127 +#: ../src/widgets/gradient-toolbar.cpp:1130 msgid "Repeat:" msgstr "Ripetizione:" -#: ../src/widgets/gradient-toolbar.cpp:1141 +#: ../src/widgets/gradient-toolbar.cpp:1144 msgid "No stops" msgstr "Nessun passaggio" -#: ../src/widgets/gradient-toolbar.cpp:1143 +#: ../src/widgets/gradient-toolbar.cpp:1146 msgid "Stops" msgstr "Passaggi" -#: ../src/widgets/gradient-toolbar.cpp:1143 +#: ../src/widgets/gradient-toolbar.cpp:1146 msgid "Select a stop for the current gradient" msgstr "Seleziona un passaggio per il gradiente attuale" -#: ../src/widgets/gradient-toolbar.cpp:1144 +#: ../src/widgets/gradient-toolbar.cpp:1147 msgid "Stops:" msgstr "Passaggi:" #. Label -#: ../src/widgets/gradient-toolbar.cpp:1156 -#: ../src/widgets/gradient-vector.cpp:926 +#: ../src/widgets/gradient-toolbar.cpp:1159 +#: ../src/widgets/gradient-vector.cpp:916 msgctxt "Gradient" msgid "Offset:" msgstr "Posizione:" -#: ../src/widgets/gradient-toolbar.cpp:1156 +#: ../src/widgets/gradient-toolbar.cpp:1159 msgid "Offset of selected stop" msgstr "Posizione del passaggio selezionato" -#: ../src/widgets/gradient-toolbar.cpp:1174 -#: ../src/widgets/gradient-toolbar.cpp:1175 +#: ../src/widgets/gradient-toolbar.cpp:1177 +#: ../src/widgets/gradient-toolbar.cpp:1178 msgid "Insert new stop" msgstr "Inserisci nuovo passaggio" -#: ../src/widgets/gradient-toolbar.cpp:1188 -#: ../src/widgets/gradient-toolbar.cpp:1189 -#: ../src/widgets/gradient-vector.cpp:908 +#: ../src/widgets/gradient-toolbar.cpp:1191 +#: ../src/widgets/gradient-toolbar.cpp:1192 +#: ../src/widgets/gradient-vector.cpp:898 msgid "Delete stop" msgstr "Cancella passaggio" -#: ../src/widgets/gradient-toolbar.cpp:1202 -msgid "Reverse" -msgstr "Inverti" - -#: ../src/widgets/gradient-toolbar.cpp:1203 +#: ../src/widgets/gradient-toolbar.cpp:1206 msgid "Reverse the direction of the gradient" msgstr "Inverti la direzione del gradiente" -#: ../src/widgets/gradient-toolbar.cpp:1217 +#: ../src/widgets/gradient-toolbar.cpp:1220 msgid "Link gradients" msgstr "Collega gradienti" -#: ../src/widgets/gradient-toolbar.cpp:1218 +#: ../src/widgets/gradient-toolbar.cpp:1221 msgid "Link gradients to change all related gradients" msgstr "Collega i gradienti per modificare tutti i gradienti correlati" -#: ../src/widgets/gradient-vector.cpp:332 -#: ../src/widgets/paint-selector.cpp:922 +#: ../src/widgets/gradient-vector.cpp:317 +#: ../src/widgets/paint-selector.cpp:965 #: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "Nessun documento selezionato" -#: ../src/widgets/gradient-vector.cpp:336 +#: ../src/widgets/gradient-vector.cpp:321 msgid "No gradients in document" msgstr "Nessun gradiente nel documento" -#: ../src/widgets/gradient-vector.cpp:340 +#: ../src/widgets/gradient-vector.cpp:325 msgid "No gradient selected" msgstr "Nessun gradiente selezionato" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:903 +#: ../src/widgets/gradient-vector.cpp:893 msgid "Add stop" msgstr "Aggiungi passaggio" -#: ../src/widgets/gradient-vector.cpp:906 +#: ../src/widgets/gradient-vector.cpp:896 msgid "Add another control stop to gradient" msgstr "Aggiunge un altro passaggio al gradiente" -#: ../src/widgets/gradient-vector.cpp:911 +#: ../src/widgets/gradient-vector.cpp:901 msgid "Delete current control stop from gradient" msgstr "Elimina il passaggio corrente dal gradiente" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:979 +#: ../src/widgets/gradient-vector.cpp:975 msgid "Stop Color" msgstr "Colore del passaggio" -#: ../src/widgets/gradient-vector.cpp:1007 +#: ../src/widgets/gradient-vector.cpp:1014 msgid "Gradient editor" msgstr "Editor di gradiente" -#: ../src/widgets/gradient-vector.cpp:1307 +#: ../src/widgets/gradient-vector.cpp:1366 msgid "Change gradient stop color" msgstr "Gradiente lineare di contorno" +#: ../src/widgets/image-menu-item.c:151 +#, fuzzy +msgid "Image widget" +msgstr "File immagine" + +#: ../src/widgets/image-menu-item.c:152 +msgid "Child widget to appear next to the menu text" +msgstr "" + +#: ../src/widgets/image-menu-item.c:167 +#, fuzzy +msgid "Use stock" +msgstr "Incolla contorno" + +#: ../src/widgets/image-menu-item.c:168 +msgid "Whether to use the label text to create a stock menu item" +msgstr "" + +#: ../src/widgets/image-menu-item.c:183 +#, fuzzy +msgid "Accel Group" +msgstr "Gruppo" + +#: ../src/widgets/image-menu-item.c:184 +msgid "The Accel Group to use for stock accelerator keys" +msgstr "" + #: ../src/widgets/lpe-toolbar.cpp:233 msgid "Closed" msgstr "Chiuso" @@ -27367,27 +29860,27 @@ msgstr "Apri fine" msgid "Open both" msgstr "Apri entrambi" -#: ../src/widgets/lpe-toolbar.cpp:298 +#: ../src/widgets/lpe-toolbar.cpp:301 msgid "All inactive" msgstr "Tutti inattivi" -#: ../src/widgets/lpe-toolbar.cpp:299 +#: ../src/widgets/lpe-toolbar.cpp:302 msgid "No geometric tool is active" msgstr "Nessuno strumento geometrico attivo" -#: ../src/widgets/lpe-toolbar.cpp:332 +#: ../src/widgets/lpe-toolbar.cpp:335 msgid "Show limiting bounding box" msgstr "Mostra riquadro limite" -#: ../src/widgets/lpe-toolbar.cpp:333 +#: ../src/widgets/lpe-toolbar.cpp:336 msgid "Show bounding box (used to cut infinite lines)" msgstr "Mostra riquadro (usato per tagliare linee infinite)" -#: ../src/widgets/lpe-toolbar.cpp:344 +#: ../src/widgets/lpe-toolbar.cpp:347 msgid "Get limiting bounding box from selection" msgstr "Preleva riquadro limite dalla selezione" -#: ../src/widgets/lpe-toolbar.cpp:345 +#: ../src/widgets/lpe-toolbar.cpp:348 msgid "" "Set limiting bounding box (used to cut infinite lines) to the bounding box " "of current selection" @@ -27395,120 +29888,304 @@ msgstr "" "Imposta il riquadro limitante (usato per tagliare linee infinite) al " "riquadro della selezione attuale" -#: ../src/widgets/lpe-toolbar.cpp:357 +#: ../src/widgets/lpe-toolbar.cpp:360 msgid "Choose a line segment type" msgstr "Scegliere un tipo di segmento" -#: ../src/widgets/lpe-toolbar.cpp:373 +#: ../src/widgets/lpe-toolbar.cpp:376 msgid "Display measuring info" msgstr "Visualizza informazioni di misura" -#: ../src/widgets/lpe-toolbar.cpp:374 +#: ../src/widgets/lpe-toolbar.cpp:377 msgid "Display measuring info for selected items" msgstr "Visualizza informazioni di misura per gli elementi selezionati" #. Add the units menu. -#: ../src/widgets/lpe-toolbar.cpp:384 ../src/widgets/node-toolbar.cpp:613 -#: ../src/widgets/paintbucket-toolbar.cpp:166 -#: ../src/widgets/rect-toolbar.cpp:375 ../src/widgets/select-toolbar.cpp:536 +#: ../src/widgets/lpe-toolbar.cpp:387 ../src/widgets/node-toolbar.cpp:613 +#: ../src/widgets/paintbucket-toolbar.cpp:167 +#: ../src/widgets/rect-toolbar.cpp:378 ../src/widgets/select-toolbar.cpp:530 +#: ../src/widgets/text-toolbar.cpp:1876 msgid "Units" msgstr "Unità" -#: ../src/widgets/lpe-toolbar.cpp:394 +#: ../src/widgets/lpe-toolbar.cpp:397 msgid "Open LPE dialog" msgstr "Apri finestra LPE" -#: ../src/widgets/lpe-toolbar.cpp:395 +#: ../src/widgets/lpe-toolbar.cpp:398 msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "Apri finestra LPE (per la modifica dei parametri numerici)" -#: ../src/widgets/measure-toolbar.cpp:86 ../src/widgets/text-toolbar.cpp:1281 +#: ../src/widgets/measure-toolbar.cpp:157 +msgid "Start and end measures inactive." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:159 +msgid "Start and end measures active." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:175 +#, fuzzy +msgid "Show all crossings." +msgstr "Mostra tutti i livelli" + +#: ../src/widgets/measure-toolbar.cpp:177 +msgid "Show visible crossings." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:193 +msgid "Use all layers in the measure." +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:195 +#, fuzzy +msgid "Use current layer in the measure." +msgstr "Sposta il livello attuale in cima" + +#: ../src/widgets/measure-toolbar.cpp:211 +#, fuzzy +msgid "Compute all elements." +msgstr "tutorial-elements.svg" + +#: ../src/widgets/measure-toolbar.cpp:213 +#, fuzzy +msgid "Compute max length." +msgstr "Lunghezza tracciato" + +#: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" msgstr "Dimensione carattere" -#: ../src/widgets/measure-toolbar.cpp:86 +#: ../src/widgets/measure-toolbar.cpp:274 msgid "Font Size:" msgstr "Dimensione carattere:" -#: ../src/widgets/measure-toolbar.cpp:87 +#: ../src/widgets/measure-toolbar.cpp:275 msgid "The font size to be used in the measurement labels" msgstr "La dimensione carattere da usare per lo strumento di misurazione" -#: ../src/widgets/measure-toolbar.cpp:99 -#: ../src/widgets/measure-toolbar.cpp:107 +#: ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 msgid "The units to be used for the measurements" msgstr "L'unità da usare per lo strumento di misurazione" -#: ../src/widgets/mesh-toolbar.cpp:204 +#: ../src/widgets/measure-toolbar.cpp:302 ../share/extensions/measure.inx.h:14 +msgid "Precision:" +msgstr "Precisione:" + +#: ../src/widgets/measure-toolbar.cpp:303 +msgid "Decimal precision of measure" +msgstr "Precisione decimale della misura" + +#: ../src/widgets/measure-toolbar.cpp:315 +#, fuzzy +msgid "Scale %" +msgstr "Ridimensionamento x" + +#: ../src/widgets/measure-toolbar.cpp:315 +#, fuzzy +msgid "Scale %:" +msgstr "Ridimensiona:" + +#: ../src/widgets/measure-toolbar.cpp:316 +msgid "Scale the results" +msgstr "" + +#: ../src/widgets/measure-toolbar.cpp:329 +#, fuzzy +msgid "The offset size" +msgstr "Spostamento rosso" + +#: ../src/widgets/measure-toolbar.cpp:341 +#: ../src/widgets/measure-toolbar.cpp:342 +msgid "Ignore first and last" +msgstr "Ignora primo e ultimo punto" + +#: ../src/widgets/measure-toolbar.cpp:352 +#: ../src/widgets/measure-toolbar.cpp:353 +#, fuzzy +msgid "Show hidden intersections" +msgstr "intersezione guide" + +#: ../src/widgets/measure-toolbar.cpp:363 +#: ../src/widgets/measure-toolbar.cpp:364 +msgid "Show measures between items" +msgstr "Mostra misure tra gli oggetti" + +#: ../src/widgets/measure-toolbar.cpp:374 +#: ../src/widgets/measure-toolbar.cpp:375 +msgid "Measure all layers" +msgstr "Misura tutti i livelli" + +#: ../src/widgets/measure-toolbar.cpp:385 +#: ../src/widgets/measure-toolbar.cpp:386 +msgid "Reverse measure" +msgstr "Inverti misurazione" + +#: ../src/widgets/measure-toolbar.cpp:395 +#: ../src/widgets/measure-toolbar.cpp:396 +msgid "Phantom measure" +msgstr "Misura fantasma" + +#: ../src/widgets/measure-toolbar.cpp:405 +#: ../src/widgets/measure-toolbar.cpp:406 +msgid "To guides" +msgstr "Aggiungi guide" + +#: ../src/widgets/measure-toolbar.cpp:415 +#: ../src/widgets/measure-toolbar.cpp:416 +msgid "Mark Dimension" +msgstr "Traccia dimensione" + +#: ../src/widgets/measure-toolbar.cpp:425 +#: ../src/widgets/measure-toolbar.cpp:426 +msgid "Convert to item" +msgstr "Converti in oggetto" + +#: ../src/widgets/mesh-toolbar.cpp:318 +#, fuzzy +msgid "Set mesh type" +msgstr "Imposta stile testo" + +#: ../src/widgets/mesh-toolbar.cpp:380 msgid "normal" msgstr "normale" -#: ../src/widgets/mesh-toolbar.cpp:204 +#: ../src/widgets/mesh-toolbar.cpp:380 msgid "Create mesh gradient" msgstr "Crea gradiente a maglia" -#: ../src/widgets/mesh-toolbar.cpp:208 +#: ../src/widgets/mesh-toolbar.cpp:384 msgid "conical" msgstr "conico" -#: ../src/widgets/mesh-toolbar.cpp:208 +#: ../src/widgets/mesh-toolbar.cpp:384 msgid "Create conical gradient" msgstr "Crea gradiente conico" -#: ../src/widgets/mesh-toolbar.cpp:263 +#: ../src/widgets/mesh-toolbar.cpp:439 msgid "Rows" msgstr "Righe" -#: ../src/widgets/mesh-toolbar.cpp:263 +#: ../src/widgets/mesh-toolbar.cpp:439 #: ../share/extensions/guides_creator.inx.h:5 #: ../share/extensions/layout_nup.inx.h:12 msgid "Rows:" msgstr "Righe:" -#: ../src/widgets/mesh-toolbar.cpp:263 +#: ../src/widgets/mesh-toolbar.cpp:439 msgid "Number of rows in new mesh" msgstr "Numero di righe nella nuova maglia" -#: ../src/widgets/mesh-toolbar.cpp:279 +#: ../src/widgets/mesh-toolbar.cpp:455 msgid "Columns" msgstr "Colonne" -#: ../src/widgets/mesh-toolbar.cpp:279 +#: ../src/widgets/mesh-toolbar.cpp:455 #: ../share/extensions/guides_creator.inx.h:4 msgid "Columns:" msgstr "Colonne:" -#: ../src/widgets/mesh-toolbar.cpp:279 +#: ../src/widgets/mesh-toolbar.cpp:455 msgid "Number of columns in new mesh" msgstr "Numero di colonne nella nuova maglia" -#: ../src/widgets/mesh-toolbar.cpp:293 +#: ../src/widgets/mesh-toolbar.cpp:469 msgid "Edit Fill" msgstr "Modifica riempimento" -#: ../src/widgets/mesh-toolbar.cpp:294 +#: ../src/widgets/mesh-toolbar.cpp:470 #, fuzzy msgid "Edit fill mesh" msgstr "Modifica riempimento..." -#: ../src/widgets/mesh-toolbar.cpp:305 +#: ../src/widgets/mesh-toolbar.cpp:481 msgid "Edit Stroke" msgstr "Modifica contorno" -#: ../src/widgets/mesh-toolbar.cpp:306 +#: ../src/widgets/mesh-toolbar.cpp:482 #, fuzzy msgid "Edit stroke mesh" msgstr "Modifica contorno..." -#: ../src/widgets/mesh-toolbar.cpp:317 ../src/widgets/node-toolbar.cpp:521 +#: ../src/widgets/mesh-toolbar.cpp:493 ../src/widgets/node-toolbar.cpp:521 msgid "Show Handles" msgstr "Mostra maniglie" -#: ../src/widgets/mesh-toolbar.cpp:318 +#: ../src/widgets/mesh-toolbar.cpp:494 #, fuzzy msgid "Show side and tensor handles" msgstr "Salvataggio trasformazioni:" +#: ../src/widgets/mesh-toolbar.cpp:509 +msgid "WARNING: Mesh SVG Syntax Subject to Change" +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:519 +msgctxt "Type" +msgid "Coons" +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:522 +msgid "Bicubic" +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:524 +msgid "Coons" +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:525 +msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:375 +msgid "Smoothing:" +msgstr "Smussamento:" + +#: ../src/widgets/mesh-toolbar.cpp:537 +#, fuzzy +msgid "Toggle Sides" +msgstr "Al_terna" + +#: ../src/widgets/mesh-toolbar.cpp:538 +msgid "Toggle selected sides between Beziers and lines." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:541 +#, fuzzy +msgid "Toggle side:" +msgstr "Al_terna" + +#: ../src/widgets/mesh-toolbar.cpp:548 +#, fuzzy +msgid "Make elliptical" +msgstr "Imposta corsivo" + +#: ../src/widgets/mesh-toolbar.cpp:549 +msgid "" +"Make selected sides elliptical by changing length of handles. Works best if " +"handles already approximate ellipse." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:552 +#, fuzzy +msgid "Make elliptical:" +msgstr "Imposta corsivo" + +#: ../src/widgets/mesh-toolbar.cpp:559 +#, fuzzy +msgid "Pick colors:" +msgstr "Colore punti" + +#: ../src/widgets/mesh-toolbar.cpp:560 +msgid "Pick colors for selected corner nodes from underneath mesh." +msgstr "" + +#: ../src/widgets/mesh-toolbar.cpp:563 +#, fuzzy +msgid "Pick Color" +msgstr "Colore riempimento" + #: ../src/widgets/node-toolbar.cpp:341 msgid "Insert node" msgstr "Inserisci nodo" @@ -27701,28 +30378,33 @@ msgstr "Coordinata Y:" msgid "Y coordinate of selected node(s)" msgstr "Coordinata Y dei nodi selezionati" -#: ../src/widgets/paint-selector.cpp:234 +#: ../src/widgets/paint-selector.cpp:219 msgid "No paint" msgstr "Nessun colore" -#: ../src/widgets/paint-selector.cpp:236 +#: ../src/widgets/paint-selector.cpp:221 msgid "Flat color" msgstr "Colore uniforme" -#: ../src/widgets/paint-selector.cpp:238 +#: ../src/widgets/paint-selector.cpp:223 msgid "Linear gradient" msgstr "Gradiente lineare" -#: ../src/widgets/paint-selector.cpp:240 +#: ../src/widgets/paint-selector.cpp:225 msgid "Radial gradient" msgstr "Gradiente radiale" -#: ../src/widgets/paint-selector.cpp:246 +#: ../src/widgets/paint-selector.cpp:228 +#, fuzzy +msgid "Mesh gradient" +msgstr "Muovi gradiente" + +#: ../src/widgets/paint-selector.cpp:235 msgid "Unset paint (make it undefined so it can be inherited)" msgstr "Disattiva riempimento (affinché possa essere ereditato)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty -#: ../src/widgets/paint-selector.cpp:263 +#: ../src/widgets/paint-selector.cpp:252 msgid "" "Any path self-intersections or subpaths create holes in the fill (fill-rule: " "evenodd)" @@ -27731,43 +30413,48 @@ msgstr "" "riempimento (fill-rule:evenodd)" #. TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty -#: ../src/widgets/paint-selector.cpp:274 +#: ../src/widgets/paint-selector.cpp:263 msgid "" "Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)" msgstr "" "Il riempimento è intero a meno che un sottotracciato sia in direzione " "opposta (fill-rule: nonzero)" -#: ../src/widgets/paint-selector.cpp:590 +#: ../src/widgets/paint-selector.cpp:605 msgid "No objects" msgstr "Nessun oggetto" -#: ../src/widgets/paint-selector.cpp:601 +#: ../src/widgets/paint-selector.cpp:616 msgid "Multiple styles" msgstr "Stili multipli" -#: ../src/widgets/paint-selector.cpp:612 +#: ../src/widgets/paint-selector.cpp:627 msgid "Paint is undefined" msgstr "Il riempimento non è definito" -#: ../src/widgets/paint-selector.cpp:623 +#: ../src/widgets/paint-selector.cpp:638 msgid "No paint" msgstr "Nessun colore" -#: ../src/widgets/paint-selector.cpp:694 +#: ../src/widgets/paint-selector.cpp:722 msgid "Flat color" msgstr "Colore uniforme" #. sp_gradient_selector_set_mode(SP_GRADIENT_SELECTOR(gsel), SP_GRADIENT_SELECTOR_MODE_LINEAR); -#: ../src/widgets/paint-selector.cpp:758 +#: ../src/widgets/paint-selector.cpp:791 msgid "Linear gradient" msgstr "Gradiente lineare" -#: ../src/widgets/paint-selector.cpp:761 +#: ../src/widgets/paint-selector.cpp:794 msgid "Radial gradient" msgstr "Gradiente radiale" -#: ../src/widgets/paint-selector.cpp:1055 +#: ../src/widgets/paint-selector.cpp:799 +#, fuzzy +msgid "Mesh gradient" +msgstr "Gradiente lineare" + +#: ../src/widgets/paint-selector.cpp:1098 msgid "" "Use the Node tool to adjust position, scale, and rotation of the " "pattern on canvas. Use Object > Pattern > Objects to Pattern to " @@ -27777,27 +30464,27 @@ msgstr "" "rotazione del motivo sul disegno. Usa Oggetto > Motivo > Da oggetto " "a motivo per creare un nuovo motivo dalla selezione." -#: ../src/widgets/paint-selector.cpp:1068 +#: ../src/widgets/paint-selector.cpp:1111 msgid "Pattern fill" msgstr "Motivo" -#: ../src/widgets/paint-selector.cpp:1162 +#: ../src/widgets/paint-selector.cpp:1205 msgid "Swatch fill" msgstr "Campione" -#: ../src/widgets/paintbucket-toolbar.cpp:133 +#: ../src/widgets/paintbucket-toolbar.cpp:134 msgid "Fill by" msgstr "Riempi con" -#: ../src/widgets/paintbucket-toolbar.cpp:134 +#: ../src/widgets/paintbucket-toolbar.cpp:135 msgid "Fill by:" msgstr "Riempi con:" -#: ../src/widgets/paintbucket-toolbar.cpp:146 +#: ../src/widgets/paintbucket-toolbar.cpp:147 msgid "Fill Threshold" msgstr "Soglia riempimento" -#: ../src/widgets/paintbucket-toolbar.cpp:147 +#: ../src/widgets/paintbucket-toolbar.cpp:148 msgid "" "The maximum allowed difference between the clicked pixel and the neighboring " "pixels to be counted in the fill" @@ -27805,36 +30492,36 @@ msgstr "" "La differenza massima consentita tra il pixel cliccato e i pixel vicini da " "contare per il riempimento" -#: ../src/widgets/paintbucket-toolbar.cpp:174 +#: ../src/widgets/paintbucket-toolbar.cpp:175 msgid "Grow/shrink by" msgstr "Intrudi/Estrudi di" -#: ../src/widgets/paintbucket-toolbar.cpp:174 +#: ../src/widgets/paintbucket-toolbar.cpp:175 msgid "Grow/shrink by:" msgstr "Intrudi/Estrudi di:" -#: ../src/widgets/paintbucket-toolbar.cpp:175 +#: ../src/widgets/paintbucket-toolbar.cpp:176 msgid "" "The amount to grow (positive) or shrink (negative) the created fill path" msgstr "" "Di quanto estrudere (valore positivo) o intrudere (valore negativo) il " "riempimento creato" -#: ../src/widgets/paintbucket-toolbar.cpp:200 +#: ../src/widgets/paintbucket-toolbar.cpp:199 msgid "Close gaps" msgstr "Area cuscinetto" -#: ../src/widgets/paintbucket-toolbar.cpp:201 +#: ../src/widgets/paintbucket-toolbar.cpp:200 msgid "Close gaps:" msgstr "Area cuscinetto:" -#: ../src/widgets/paintbucket-toolbar.cpp:212 -#: ../src/widgets/pencil-toolbar.cpp:293 ../src/widgets/spiral-toolbar.cpp:289 +#: ../src/widgets/paintbucket-toolbar.cpp:211 +#: ../src/widgets/pencil-toolbar.cpp:396 ../src/widgets/spiral-toolbar.cpp:285 #: ../src/widgets/star-toolbar.cpp:564 msgid "Defaults" msgstr "Predefiniti" -#: ../src/widgets/paintbucket-toolbar.cpp:213 +#: ../src/widgets/paintbucket-toolbar.cpp:212 msgid "" "Reset paint bucket parameters to defaults (use Inkscape Preferences > Tools " "to change defaults)" @@ -27842,84 +30529,95 @@ msgstr "" "Reimposta i parametri del secchiello ai valori predefiniti (usa Preferenze " "di Inkscape > Strumenti per cambiare i valori predefiniti)" -#: ../src/widgets/pencil-toolbar.cpp:96 +#: ../src/widgets/pencil-toolbar.cpp:105 msgid "Bezier" msgstr "Bezier" -#: ../src/widgets/pencil-toolbar.cpp:97 +#: ../src/widgets/pencil-toolbar.cpp:106 msgid "Create regular Bezier path" msgstr "Crea tracciati Bezier normali" -#: ../src/widgets/pencil-toolbar.cpp:104 +#: ../src/widgets/pencil-toolbar.cpp:113 msgid "Create Spiro path" msgstr "Crea tracciato Spiro" -#: ../src/widgets/pencil-toolbar.cpp:111 +#: ../src/widgets/pencil-toolbar.cpp:119 +#, fuzzy +msgid "Create BSpline path" +msgstr "Crea tracciato Spiro" + +#: ../src/widgets/pencil-toolbar.cpp:125 msgid "Zigzag" msgstr "Zigzag" -#: ../src/widgets/pencil-toolbar.cpp:112 +#: ../src/widgets/pencil-toolbar.cpp:126 msgid "Create a sequence of straight line segments" msgstr "Crea una sequenza di segmenti diritti" -#: ../src/widgets/pencil-toolbar.cpp:118 +#: ../src/widgets/pencil-toolbar.cpp:132 msgid "Paraxial" msgstr "Parassiale" -#: ../src/widgets/pencil-toolbar.cpp:119 +#: ../src/widgets/pencil-toolbar.cpp:133 msgid "Create a sequence of paraxial line segments" msgstr "Crea una sequenza di segmenti parassiali" -#: ../src/widgets/pencil-toolbar.cpp:127 +#: ../src/widgets/pencil-toolbar.cpp:141 msgid "Mode of new lines drawn by this tool" msgstr "Modalità delle nuove linee disegnate da questo strumento" -#: ../src/widgets/pencil-toolbar.cpp:155 +#: ../src/widgets/pencil-toolbar.cpp:176 msgctxt "Freehand shape" msgid "None" msgstr "Nessuna" -#: ../src/widgets/pencil-toolbar.cpp:156 +#: ../src/widgets/pencil-toolbar.cpp:177 msgid "Triangle in" msgstr "Triangolo crescente" -#: ../src/widgets/pencil-toolbar.cpp:157 +#: ../src/widgets/pencil-toolbar.cpp:178 msgid "Triangle out" msgstr "Triangolo decrescente" -#: ../src/widgets/pencil-toolbar.cpp:159 +#: ../src/widgets/pencil-toolbar.cpp:180 msgid "From clipboard" msgstr "Dagli appunti" -#: ../src/widgets/pencil-toolbar.cpp:184 ../src/widgets/pencil-toolbar.cpp:185 +#: ../src/widgets/pencil-toolbar.cpp:181 +#, fuzzy +msgid "Bend from clipboard" +msgstr "Dagli appunti" + +#: ../src/widgets/pencil-toolbar.cpp:182 +#, fuzzy +msgid "Last applied" +msgstr "Ultima diapositiva:" + +#: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" msgstr "Forma:" -#: ../src/widgets/pencil-toolbar.cpp:184 +#: ../src/widgets/pencil-toolbar.cpp:207 msgid "Shape of new paths drawn by this tool" msgstr "Forma dei nuovi tracciati disegnati con questo strumento" -#: ../src/widgets/pencil-toolbar.cpp:269 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(many nodes, rough)" msgstr "(molti nodi, grezzo)" -#: ../src/widgets/pencil-toolbar.cpp:269 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(few nodes, smooth)" msgstr "(pochi nodi, smussato)" -#: ../src/widgets/pencil-toolbar.cpp:272 -msgid "Smoothing:" -msgstr "Smussamento:" - -#: ../src/widgets/pencil-toolbar.cpp:272 +#: ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing: " msgstr "Smussamento:" -#: ../src/widgets/pencil-toolbar.cpp:273 +#: ../src/widgets/pencil-toolbar.cpp:376 msgid "How much smoothing (simplifying) is applied to the line" msgstr "Il grado di smussamento (semplificazione) applicato alla linea" -#: ../src/widgets/pencil-toolbar.cpp:294 +#: ../src/widgets/pencil-toolbar.cpp:397 msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" @@ -27927,116 +30625,124 @@ msgstr "" "Reimposta i parametri del pastello ai valori predefiniti (usa Preferenze di " "Inkscape > Strumenti per cambiare i valori predefiniti)" -#: ../src/widgets/rect-toolbar.cpp:122 +#: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 +msgid "LPE based interactive simplify" +msgstr "" + +#: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 +msgid "LPE simplify flatten" +msgstr "" + +#: ../src/widgets/rect-toolbar.cpp:125 msgid "Change rectangle" msgstr "Modifica rettangolo" -#: ../src/widgets/rect-toolbar.cpp:314 +#: ../src/widgets/rect-toolbar.cpp:317 msgid "W:" msgstr "L:" -#: ../src/widgets/rect-toolbar.cpp:314 +#: ../src/widgets/rect-toolbar.cpp:317 msgid "Width of rectangle" msgstr "Larghezza del rettangolo" -#: ../src/widgets/rect-toolbar.cpp:331 +#: ../src/widgets/rect-toolbar.cpp:334 msgid "H:" msgstr "H:" -#: ../src/widgets/rect-toolbar.cpp:331 +#: ../src/widgets/rect-toolbar.cpp:334 msgid "Height of rectangle" msgstr "Altezza del rettangolo" -#: ../src/widgets/rect-toolbar.cpp:345 ../src/widgets/rect-toolbar.cpp:360 +#: ../src/widgets/rect-toolbar.cpp:348 ../src/widgets/rect-toolbar.cpp:363 msgid "not rounded" msgstr "non arrotondato" -#: ../src/widgets/rect-toolbar.cpp:348 +#: ../src/widgets/rect-toolbar.cpp:351 msgid "Horizontal radius" msgstr "Raggio orizzontale" -#: ../src/widgets/rect-toolbar.cpp:348 +#: ../src/widgets/rect-toolbar.cpp:351 msgid "Rx:" msgstr "Rx:" -#: ../src/widgets/rect-toolbar.cpp:348 +#: ../src/widgets/rect-toolbar.cpp:351 msgid "Horizontal radius of rounded corners" msgstr "Raggio orizzontale di un angolo arrotondato" -#: ../src/widgets/rect-toolbar.cpp:363 +#: ../src/widgets/rect-toolbar.cpp:366 msgid "Vertical radius" msgstr "Raggio verticale" -#: ../src/widgets/rect-toolbar.cpp:363 +#: ../src/widgets/rect-toolbar.cpp:366 msgid "Ry:" msgstr "Ry:" -#: ../src/widgets/rect-toolbar.cpp:363 +#: ../src/widgets/rect-toolbar.cpp:366 msgid "Vertical radius of rounded corners" msgstr "Raggio verticale di un angolo arrotondato" -#: ../src/widgets/rect-toolbar.cpp:382 +#: ../src/widgets/rect-toolbar.cpp:385 msgid "Not rounded" msgstr "Non arrotondato" -#: ../src/widgets/rect-toolbar.cpp:383 +#: ../src/widgets/rect-toolbar.cpp:386 msgid "Make corners sharp" msgstr "Rende gli angoli spigolosi" -#: ../src/widgets/ruler.cpp:192 +#: ../src/widgets/ruler.cpp:198 msgid "The orientation of the ruler" msgstr "Orientazione del righello" -#: ../src/widgets/ruler.cpp:202 +#: ../src/widgets/ruler.cpp:208 msgid "Unit of the ruler" msgstr "Unità del righello" -#: ../src/widgets/ruler.cpp:209 +#: ../src/widgets/ruler.cpp:215 msgid "Lower" msgstr "Inferiore" -#: ../src/widgets/ruler.cpp:210 +#: ../src/widgets/ruler.cpp:216 msgid "Lower limit of ruler" msgstr "Limite inferiore del righello" -#: ../src/widgets/ruler.cpp:219 +#: ../src/widgets/ruler.cpp:225 msgid "Upper" msgstr "Superiore" -#: ../src/widgets/ruler.cpp:220 +#: ../src/widgets/ruler.cpp:226 msgid "Upper limit of ruler" msgstr "Limite superiore del righello" -#: ../src/widgets/ruler.cpp:230 +#: ../src/widgets/ruler.cpp:236 #, fuzzy msgid "Position of mark on the ruler" msgstr "Posizione lungo la curva" -#: ../src/widgets/ruler.cpp:239 +#: ../src/widgets/ruler.cpp:245 msgid "Max Size" msgstr "Dimensione massima" -#: ../src/widgets/ruler.cpp:240 +#: ../src/widgets/ruler.cpp:246 msgid "Maximum size of the ruler" msgstr "Dimensione massima del righello" -#: ../src/widgets/select-toolbar.cpp:260 +#: ../src/widgets/select-toolbar.cpp:262 msgid "Transform by toolbar" msgstr "Trasforma tramite barra strumenti" -#: ../src/widgets/select-toolbar.cpp:339 +#: ../src/widgets/select-toolbar.cpp:280 msgid "Now stroke width is scaled when objects are scaled." msgstr "" "Ora la larghezza del contorno viene ridimensionata quando gli oggetti " "vengono ridimensionati." -#: ../src/widgets/select-toolbar.cpp:341 +#: ../src/widgets/select-toolbar.cpp:282 msgid "Now stroke width is not scaled when objects are scaled." msgstr "" "Ora la larghezza del contorno non viene ridimensionata quando gli " "oggetti vengono ridimensionati." -#: ../src/widgets/select-toolbar.cpp:352 +#: ../src/widgets/select-toolbar.cpp:293 msgid "" "Now rounded rectangle corners are scaled when rectangles are " "scaled." @@ -28044,7 +30750,7 @@ msgstr "" "Ora gli angoli arrotondati dei rettangoli vengono ridimensionati " "quando i rettangoli vengono ridimensionati." -#: ../src/widgets/select-toolbar.cpp:354 +#: ../src/widgets/select-toolbar.cpp:295 msgid "" "Now rounded rectangle corners are not scaled when rectangles " "are scaled." @@ -28052,7 +30758,7 @@ msgstr "" "Ora gli angoli arrotondati dei rettangoli non vengono ridimensionati " "quando i rettangoli vengono ridimensionati." -#: ../src/widgets/select-toolbar.cpp:365 +#: ../src/widgets/select-toolbar.cpp:306 msgid "" "Now gradients are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." @@ -28061,7 +30767,7 @@ msgstr "" "quando questi vengono trasformati (spostati, ridimensionati, ruotati o " "distorti)." -#: ../src/widgets/select-toolbar.cpp:367 +#: ../src/widgets/select-toolbar.cpp:308 msgid "" "Now gradients remain fixed when objects are transformed " "(moved, scaled, rotated, or skewed)." @@ -28069,7 +30775,7 @@ msgstr "" "Ora i gradienti restano fissi quando gli oggetti vengono " "trasformati (spostati, ridimensionati, ruotati o distorti)." -#: ../src/widgets/select-toolbar.cpp:378 +#: ../src/widgets/select-toolbar.cpp:319 msgid "" "Now patterns are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." @@ -28078,7 +30784,7 @@ msgstr "" "quando questi vengono trasformati (spostati, ridimensionati, ruotati o " "distorti)." -#: ../src/widgets/select-toolbar.cpp:380 +#: ../src/widgets/select-toolbar.cpp:321 msgid "" "Now patterns remain fixed when objects are transformed (moved, " "scaled, rotated, or skewed)." @@ -28086,80 +30792,95 @@ msgstr "" "Ora i motivi restano fissi quando gli oggetti vengono " "trasformati (spostati, ridimensionati, ruotati o distorti)." -#. four spinbuttons -#: ../src/widgets/select-toolbar.cpp:498 +#. name +#: ../src/widgets/select-toolbar.cpp:441 msgctxt "Select toolbar" msgid "X position" msgstr "Posizione X" -#: ../src/widgets/select-toolbar.cpp:498 +#. label +#: ../src/widgets/select-toolbar.cpp:442 msgctxt "Select toolbar" msgid "X:" msgstr "X:" -#: ../src/widgets/select-toolbar.cpp:500 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:443 +msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" -msgstr "Coordinate orizzontali della selezione" +msgstr "Coordinata orizzontale della selezione" -#: ../src/widgets/select-toolbar.cpp:504 +#. name +#: ../src/widgets/select-toolbar.cpp:460 msgctxt "Select toolbar" msgid "Y position" msgstr "Posizione Y" -#: ../src/widgets/select-toolbar.cpp:504 +#. label +#: ../src/widgets/select-toolbar.cpp:461 msgctxt "Select toolbar" msgid "Y:" msgstr "Y:" -#: ../src/widgets/select-toolbar.cpp:506 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:462 +msgctxt "Select toolbar" msgid "Vertical coordinate of selection" -msgstr "Coordinate verticali della selezione" +msgstr "Coordinata verticale della selezione" -#: ../src/widgets/select-toolbar.cpp:510 +#. name +#: ../src/widgets/select-toolbar.cpp:479 msgctxt "Select toolbar" msgid "Width" msgstr "Larghezza" -#: ../src/widgets/select-toolbar.cpp:510 +#. label +#: ../src/widgets/select-toolbar.cpp:480 msgctxt "Select toolbar" msgid "W:" msgstr "L:" -#: ../src/widgets/select-toolbar.cpp:512 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:481 +msgctxt "Select toolbar" msgid "Width of selection" msgstr "Larghezza della selezione" -#: ../src/widgets/select-toolbar.cpp:519 +#: ../src/widgets/select-toolbar.cpp:499 msgid "Lock width and height" msgstr "Blocca larghezza e altezza" -#: ../src/widgets/select-toolbar.cpp:520 +#: ../src/widgets/select-toolbar.cpp:500 msgid "When locked, change both width and height by the same proportion" msgstr "Se bloccato, cambia l'altezza e la larghezza in maniera proporzionale" -#: ../src/widgets/select-toolbar.cpp:529 +#. name +#: ../src/widgets/select-toolbar.cpp:511 msgctxt "Select toolbar" msgid "Height" msgstr "Altezza" -#: ../src/widgets/select-toolbar.cpp:529 +#. label +#: ../src/widgets/select-toolbar.cpp:512 msgctxt "Select toolbar" msgid "H:" msgstr "H:" -#: ../src/widgets/select-toolbar.cpp:531 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:513 +msgctxt "Select toolbar" msgid "Height of selection" msgstr "Altezza della selezione" -#: ../src/widgets/select-toolbar.cpp:581 +#: ../src/widgets/select-toolbar.cpp:575 msgid "Scale rounded corners" msgstr "Ridimensiona angoli arrotondati" -#: ../src/widgets/select-toolbar.cpp:592 +#: ../src/widgets/select-toolbar.cpp:586 msgid "Move gradients" msgstr "Muovi gradiente" -#: ../src/widgets/select-toolbar.cpp:603 +#: ../src/widgets/select-toolbar.cpp:597 msgid "Move patterns" msgstr "Muovi motivi" @@ -28167,237 +30888,105 @@ msgstr "Muovi motivi" msgid "Set attribute" msgstr "Imposta attributo" -#: ../src/widgets/sp-color-icc-selector.cpp:257 -msgid "CMS" -msgstr "CMS" - -#: ../src/widgets/sp-color-icc-selector.cpp:355 -#: ../src/widgets/sp-color-scales.cpp:428 -msgid "_R:" -msgstr "_R:" - -#. TYPE_RGB_16 -#: ../src/widgets/sp-color-icc-selector.cpp:356 -#: ../src/widgets/sp-color-scales.cpp:431 -msgid "_G:" -msgstr "_G:" - -#: ../src/widgets/sp-color-icc-selector.cpp:357 -#: ../src/widgets/sp-color-scales.cpp:434 -msgid "_B:" -msgstr "_B:" - -#: ../src/widgets/sp-color-icc-selector.cpp:359 -msgid "Gray" -msgstr "Grigio" - -#. TYPE_GRAY_16 -#: ../src/widgets/sp-color-icc-selector.cpp:361 -#: ../src/widgets/sp-color-icc-selector.cpp:365 -#: ../src/widgets/sp-color-scales.cpp:454 -msgid "_H:" -msgstr "_H:" - -#. TYPE_HSV_16 -#: ../src/widgets/sp-color-icc-selector.cpp:362 -#: ../src/widgets/sp-color-icc-selector.cpp:367 -#: ../src/widgets/sp-color-scales.cpp:457 -msgid "_S:" -msgstr "_S:" - -#. TYPE_HLS_16 -#: ../src/widgets/sp-color-icc-selector.cpp:366 -#: ../src/widgets/sp-color-scales.cpp:460 -msgid "_L:" -msgstr "_L:" - -#: ../src/widgets/sp-color-icc-selector.cpp:369 -#: ../src/widgets/sp-color-icc-selector.cpp:374 -#: ../src/widgets/sp-color-scales.cpp:482 -msgid "_C:" -msgstr "_C:" - -#. TYPE_CMYK_16 -#. TYPE_CMY_16 -#: ../src/widgets/sp-color-icc-selector.cpp:370 -#: ../src/widgets/sp-color-icc-selector.cpp:375 -#: ../src/widgets/sp-color-scales.cpp:485 -msgid "_M:" -msgstr "_M:" - -#: ../src/widgets/sp-color-icc-selector.cpp:371 -#: ../src/widgets/sp-color-icc-selector.cpp:376 -#: ../src/widgets/sp-color-scales.cpp:488 -msgid "_Y:" -msgstr "_Y:" - -#: ../src/widgets/sp-color-icc-selector.cpp:372 -#: ../src/widgets/sp-color-scales.cpp:491 -msgid "_K:" -msgstr "_K:" - -#: ../src/widgets/sp-color-icc-selector.cpp:455 -msgid "Fix" -msgstr "Fissa" - -#: ../src/widgets/sp-color-icc-selector.cpp:458 -msgid "Fix RGB fallback to match icc-color() value." -msgstr "Fissa fallback RGB corrispondente al valore icc-color()." - -#. Label -#: ../src/widgets/sp-color-icc-selector.cpp:561 -#: ../src/widgets/sp-color-scales.cpp:437 -#: ../src/widgets/sp-color-scales.cpp:463 -#: ../src/widgets/sp-color-scales.cpp:494 -#: ../src/widgets/sp-color-wheel-selector.cpp:140 -msgid "_A:" -msgstr "_A:" - -#: ../src/widgets/sp-color-icc-selector.cpp:572 -#: ../src/widgets/sp-color-icc-selector.cpp:585 -#: ../src/widgets/sp-color-scales.cpp:438 -#: ../src/widgets/sp-color-scales.cpp:439 -#: ../src/widgets/sp-color-scales.cpp:464 -#: ../src/widgets/sp-color-scales.cpp:465 -#: ../src/widgets/sp-color-scales.cpp:495 -#: ../src/widgets/sp-color-scales.cpp:496 -#: ../src/widgets/sp-color-wheel-selector.cpp:161 -#: ../src/widgets/sp-color-wheel-selector.cpp:185 -msgid "Alpha (opacity)" -msgstr "Alpha (opacità)" - -#: ../src/widgets/sp-color-notebook.cpp:385 -msgid "Color Managed" -msgstr "Gestione del colore" - -#: ../src/widgets/sp-color-notebook.cpp:392 -msgid "Out of gamut!" -msgstr "Fuori gamma!" - -#: ../src/widgets/sp-color-notebook.cpp:399 -msgid "Too much ink!" -msgstr "Troppo inchiostro!" - -#. Create RGBA entry and color preview -#: ../src/widgets/sp-color-notebook.cpp:416 -msgid "RGBA_:" -msgstr "RGBA_:" - -#: ../src/widgets/sp-color-notebook.cpp:424 -msgid "Hexadecimal RGBA value of the color" -msgstr "Valore RGBA esadecimale del colore" - -#: ../src/widgets/sp-color-scales.cpp:80 -msgid "RGB" -msgstr "RGB" - -#: ../src/widgets/sp-color-scales.cpp:80 -msgid "HSL" -msgstr "HSL" - -#: ../src/widgets/sp-color-scales.cpp:80 -msgid "CMYK" -msgstr "CMYK" - -#: ../src/widgets/sp-color-selector.cpp:64 +#: ../src/widgets/sp-color-selector.cpp:43 msgid "Unnamed" msgstr "Senza nome" -#: ../src/widgets/sp-xmlview-attr-list.cpp:64 +#: ../src/widgets/sp-xmlview-attr-list.cpp:59 msgid "Value" msgstr "Valore" -#: ../src/widgets/sp-xmlview-content.cpp:179 +#: ../src/widgets/sp-xmlview-content.cpp:151 msgid "Type text in a text node" msgstr "Scrivi testo in un nodo testuale" -#: ../src/widgets/spiral-toolbar.cpp:100 +#: ../src/widgets/spiral-toolbar.cpp:98 msgid "Change spiral" msgstr "Modifica spirale" -#: ../src/widgets/spiral-toolbar.cpp:246 +#: ../src/widgets/spiral-toolbar.cpp:242 msgid "just a curve" msgstr "curva semplice" -#: ../src/widgets/spiral-toolbar.cpp:246 +#: ../src/widgets/spiral-toolbar.cpp:242 msgid "one full revolution" msgstr "una rivoluzione intera" -#: ../src/widgets/spiral-toolbar.cpp:249 +#: ../src/widgets/spiral-toolbar.cpp:245 msgid "Number of turns" msgstr "Numero di rivoluzioni" -#: ../src/widgets/spiral-toolbar.cpp:249 +#: ../src/widgets/spiral-toolbar.cpp:245 msgid "Turns:" msgstr "Rivoluzioni:" -#: ../src/widgets/spiral-toolbar.cpp:249 +#: ../src/widgets/spiral-toolbar.cpp:245 msgid "Number of revolutions" msgstr "Numero di rivoluzioni" -#: ../src/widgets/spiral-toolbar.cpp:260 +#: ../src/widgets/spiral-toolbar.cpp:256 msgid "circle" msgstr "cerchio" -#: ../src/widgets/spiral-toolbar.cpp:260 +#: ../src/widgets/spiral-toolbar.cpp:256 msgid "edge is much denser" msgstr "contorno molto denso" -#: ../src/widgets/spiral-toolbar.cpp:260 +#: ../src/widgets/spiral-toolbar.cpp:256 msgid "edge is denser" msgstr "contorno denso" -#: ../src/widgets/spiral-toolbar.cpp:260 +#: ../src/widgets/spiral-toolbar.cpp:256 msgid "even" msgstr "pari" -#: ../src/widgets/spiral-toolbar.cpp:260 +#: ../src/widgets/spiral-toolbar.cpp:256 msgid "center is denser" msgstr "centro denso" -#: ../src/widgets/spiral-toolbar.cpp:260 +#: ../src/widgets/spiral-toolbar.cpp:256 msgid "center is much denser" msgstr "centro molto denso" -#: ../src/widgets/spiral-toolbar.cpp:263 +#: ../src/widgets/spiral-toolbar.cpp:259 msgid "Divergence" msgstr "Divergenza" -#: ../src/widgets/spiral-toolbar.cpp:263 +#: ../src/widgets/spiral-toolbar.cpp:259 msgid "Divergence:" msgstr "Divergenza:" -#: ../src/widgets/spiral-toolbar.cpp:263 +#: ../src/widgets/spiral-toolbar.cpp:259 msgid "How much denser/sparser are outer revolutions; 1 = uniform" msgstr "La densità delle rivoluzioni esterne; 1 = uniformi" -#: ../src/widgets/spiral-toolbar.cpp:274 +#: ../src/widgets/spiral-toolbar.cpp:270 msgid "starts from center" msgstr "parte dal centro" -#: ../src/widgets/spiral-toolbar.cpp:274 +#: ../src/widgets/spiral-toolbar.cpp:270 msgid "starts mid-way" msgstr "parte da metà" -#: ../src/widgets/spiral-toolbar.cpp:274 +#: ../src/widgets/spiral-toolbar.cpp:270 msgid "starts near edge" msgstr "parte vicino al termine" -#: ../src/widgets/spiral-toolbar.cpp:277 +#: ../src/widgets/spiral-toolbar.cpp:273 msgid "Inner radius" msgstr "Raggio interno" -#: ../src/widgets/spiral-toolbar.cpp:277 +#: ../src/widgets/spiral-toolbar.cpp:273 msgid "Inner radius:" msgstr "Raggio interno:" -#: ../src/widgets/spiral-toolbar.cpp:277 +#: ../src/widgets/spiral-toolbar.cpp:273 msgid "Radius of the innermost revolution (relative to the spiral size)" msgstr "" "Il raggio delle rivoluzioni più interne (relativo alle dimensioni della " "spirale)" -#: ../src/widgets/spiral-toolbar.cpp:290 ../src/widgets/star-toolbar.cpp:565 +#: ../src/widgets/spiral-toolbar.cpp:286 ../src/widgets/star-toolbar.cpp:565 msgid "" "Reset shape parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" @@ -28406,115 +30995,132 @@ msgstr "" "Inkscape > Strumenti per cambiare i valori predefiniti)" #. Width -#: ../src/widgets/spray-toolbar.cpp:113 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(narrow spray)" msgstr "(area stretta)" -#: ../src/widgets/spray-toolbar.cpp:113 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(broad spray)" msgstr "(area larga)" -#: ../src/widgets/spray-toolbar.cpp:116 +#: ../src/widgets/spray-toolbar.cpp:297 msgid "The width of the spray area (relative to the visible canvas area)" msgstr "" "La larghezza dell'area di spruzzo (relativa all'area della tela visibile)" -#: ../src/widgets/spray-toolbar.cpp:129 +#: ../src/widgets/spray-toolbar.cpp:312 +#, fuzzy +msgid "Use the pressure of the input device to alter the width of spray area" +msgstr "" +"Usa la pressione del dispositivo di input per alterare la larghezza della " +"penna" + +#: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" msgstr "(valore massimo)" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus" msgstr "Focus" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus:" msgstr "Focus:" -#: ../src/widgets/spray-toolbar.cpp:132 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "0 per spruzzare un puntino; aumenta per allargare il raggio dell'area" #. Standard_deviation -#: ../src/widgets/spray-toolbar.cpp:145 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(minimum scatter)" msgstr "(dispersione minima)" -#: ../src/widgets/spray-toolbar.cpp:145 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(maximum scatter)" msgstr "(dispersione massima)" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter" msgstr "Dispersione" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter:" msgstr "Dispersione:" -#: ../src/widgets/spray-toolbar.cpp:148 +#: ../src/widgets/spray-toolbar.cpp:342 msgid "Increase to scatter sprayed objects" msgstr "Aumenta la dispersione degli oggetti spruzzati" -#: ../src/widgets/spray-toolbar.cpp:167 +#: ../src/widgets/spray-toolbar.cpp:361 msgid "Spray copies of the initial selection" msgstr "Spruzza copie della selezione iniziale" -#: ../src/widgets/spray-toolbar.cpp:174 +#: ../src/widgets/spray-toolbar.cpp:368 msgid "Spray clones of the initial selection" msgstr "Spruzza cloni della selezione iniziale" -#: ../src/widgets/spray-toolbar.cpp:180 +#: ../src/widgets/spray-toolbar.cpp:375 msgid "Spray single path" msgstr "Spruzza singolo tracciato" -#: ../src/widgets/spray-toolbar.cpp:181 +#: ../src/widgets/spray-toolbar.cpp:376 msgid "Spray objects in a single path" msgstr "Spruzza oggetti in un singolo tracciato" -#: ../src/widgets/spray-toolbar.cpp:185 ../src/widgets/tweak-toolbar.cpp:253 +#: ../src/widgets/spray-toolbar.cpp:383 +#, fuzzy +msgid "Delete sprayed items" +msgstr "Cancella passaggio del gradiente" + +#: ../src/widgets/spray-toolbar.cpp:384 +#, fuzzy +msgid "Delete sprayed items from selection" +msgstr "Prendi forma dalla selezione..." + +#: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 msgid "Mode" msgstr "Modalità" #. Population -#: ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(low population)" msgstr "(bassa densità)" -#: ../src/widgets/spray-toolbar.cpp:205 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(high population)" msgstr "(alta densità)" -#: ../src/widgets/spray-toolbar.cpp:208 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount" msgstr "Quantità" -#: ../src/widgets/spray-toolbar.cpp:209 +#: ../src/widgets/spray-toolbar.cpp:412 msgid "Adjusts the number of items sprayed per click" msgstr "Modifica la quantità di oggetti spruzzati per clic" -#: ../src/widgets/spray-toolbar.cpp:225 +#: ../src/widgets/spray-toolbar.cpp:428 msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" "Usa la pressione del dispositivo di input per alterare la quantità di " "oggetti spruzzati" -#: ../src/widgets/spray-toolbar.cpp:235 +#: ../src/widgets/spray-toolbar.cpp:438 msgid "(high rotation variation)" msgstr "(grande variazione di rotazione)" -#: ../src/widgets/spray-toolbar.cpp:238 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation" msgstr "Rotazione" -#: ../src/widgets/spray-toolbar.cpp:238 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation:" msgstr "Rotazione:" -#: ../src/widgets/spray-toolbar.cpp:240 +#: ../src/widgets/spray-toolbar.cpp:443 #, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " @@ -28523,21 +31129,21 @@ msgstr "" "Variazione della rotazione degli oggetti spruzzati; 0% per la stessa " "rotazione dell'oggetto originale" -#: ../src/widgets/spray-toolbar.cpp:253 +#: ../src/widgets/spray-toolbar.cpp:456 msgid "(high scale variation)" msgstr "(grande variazione in scala)" -#: ../src/widgets/spray-toolbar.cpp:256 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale" msgstr "Scala" -#: ../src/widgets/spray-toolbar.cpp:256 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale:" msgstr "Scala:" -#: ../src/widgets/spray-toolbar.cpp:258 +#: ../src/widgets/spray-toolbar.cpp:461 #, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " @@ -28546,27 +31152,99 @@ msgstr "" "Variazione in scala degli oggetti spruzzati; 0% per la stessa dimensione " "dell'oggetto originale" -#: ../src/widgets/star-toolbar.cpp:102 +#: ../src/widgets/spray-toolbar.cpp:477 +#, fuzzy +msgid "Use the pressure of the input device to alter the scale of new items" +msgstr "" +"Usa la pressione del dispositivo di input per alterare la larghezza della " +"penna" + +#: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 +msgid "" +"Pick color from the drawing. You can use clonetiler trace dialog for " +"advanced effects. In clone mode original fill or stroke colors must be unset." +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 +msgid "Pick from center instead average area." +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 +msgid "Inverted pick value, retaining color in advanced trace mode" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 +#, fuzzy +msgid "Apply picked color to fill" +msgstr "Imposta l'ultimo colore selezionato come riempimento" + +#: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 +#, fuzzy +msgid "Apply picked color to stroke" +msgstr "Imposta l'ultimo colore selezionato come contorno" + +#: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 +msgid "No overlap between colors" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 +msgid "Apply over transparent areas" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 +msgid "Apply over no transparent areas" +msgstr "" + +#: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 +#, fuzzy +msgid "Prevent overlapping objects" +msgstr "Seleziona un oggetto" + +#: ../src/widgets/spray-toolbar.cpp:605 +#, fuzzy +msgid "(minimum offset)" +msgstr "(forza minima)" + +#: ../src/widgets/spray-toolbar.cpp:605 +#, fuzzy +msgid "(maximum offset)" +msgstr "(forza massima)" + +#: ../src/widgets/spray-toolbar.cpp:608 +#, fuzzy +msgid "Offset %" +msgstr "Scostamento y" + +#: ../src/widgets/spray-toolbar.cpp:608 +#, fuzzy +msgid "Offset %:" +msgstr "Posizione:" + +#: ../src/widgets/spray-toolbar.cpp:609 +msgid "Increase to segregate objects more (value in percent)" +msgstr "" + +#: ../src/widgets/star-toolbar.cpp:103 msgid "Star: Change number of corners" msgstr "Stella: cambia numero di vertici" -#: ../src/widgets/star-toolbar.cpp:155 +#: ../src/widgets/star-toolbar.cpp:156 msgid "Star: Change spoke ratio" msgstr "Stella: Cambia lunghezza dei raggi" -#: ../src/widgets/star-toolbar.cpp:200 +#: ../src/widgets/star-toolbar.cpp:201 msgid "Make polygon" msgstr "Crea poligono" -#: ../src/widgets/star-toolbar.cpp:200 +#: ../src/widgets/star-toolbar.cpp:201 msgid "Make star" msgstr "Crea stella" -#: ../src/widgets/star-toolbar.cpp:239 +#: ../src/widgets/star-toolbar.cpp:240 msgid "Star: Change rounding" msgstr "Stella: Cambia arrotondamento" -#: ../src/widgets/star-toolbar.cpp:279 +#: ../src/widgets/star-toolbar.cpp:280 msgid "Star: Change randomization" msgstr "Stella: Cambia casualità" @@ -28730,508 +31408,598 @@ msgctxt "Stroke width" msgid "_Width:" msgstr "_Larghezza:" -#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:239 -msgid "Miter join" -msgstr "Spigolo vivo" +#. Dash +#: ../src/widgets/stroke-style.cpp:225 +msgid "Dashes:" +msgstr "Tratteggio:" + +#. Drop down marker selectors +#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes +#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. +#: ../src/widgets/stroke-style.cpp:251 +msgid "Markers:" +msgstr "Delimitatori:" + +#: ../src/widgets/stroke-style.cpp:257 +msgid "Start Markers are drawn on the first node of a path or shape" +msgstr "" +"I delimitatori iniziali vengono disegnati sul primo nodo di un tracciato o " +"forma" + +#: ../src/widgets/stroke-style.cpp:266 +msgid "" +"Mid Markers are drawn on every node of a path or shape except the first and " +"last nodes" +msgstr "" +"I delimitatori di mezzo vengono disegnati su tutti i nodi di un tracciato o " +"forma, tranne il primo e l'utimo" + +#: ../src/widgets/stroke-style.cpp:275 +msgid "End Markers are drawn on the last node of a path or shape" +msgstr "" +"I delimitatori finali vengono disegnati sull'ultimo nodo di un tracciato o " +"forma" #. TRANSLATORS: Round join: joining lines with a rounded corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:247 +#: ../src/widgets/stroke-style.cpp:300 msgid "Round join" msgstr "Spigolo arrotondato" #. TRANSLATORS: Bevel join: joining lines with a blunted (flattened) corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:255 +#: ../src/widgets/stroke-style.cpp:308 msgid "Bevel join" msgstr "Spigolo tagliato" -#: ../src/widgets/stroke-style.cpp:280 -msgid "Miter _limit:" -msgstr "Spigo_losità:" +#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:316 +msgid "Miter join" +msgstr "Spigolo vivo" #. Cap type #. TRANSLATORS: cap type specifies the shape for the ends of lines #. spw_label(t, _("_Cap:"), 0, i); -#: ../src/widgets/stroke-style.cpp:296 +#: ../src/widgets/stroke-style.cpp:353 msgid "Cap:" msgstr "Estremi:" #. TRANSLATORS: Butt cap: the line shape does not extend beyond the end point #. of the line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:307 +#: ../src/widgets/stroke-style.cpp:364 msgid "Butt cap" msgstr "Estremo geometrico" #. TRANSLATORS: Round cap: the line shape extends beyond the end point of the #. line; the ends of the line are rounded -#: ../src/widgets/stroke-style.cpp:314 +#: ../src/widgets/stroke-style.cpp:371 msgid "Round cap" msgstr "Estremo arrotondato" #. TRANSLATORS: Square cap: the line shape extends beyond the end point of the #. line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:321 +#: ../src/widgets/stroke-style.cpp:378 msgid "Square cap" msgstr "Estremo squadrato" -#. Dash -#: ../src/widgets/stroke-style.cpp:326 -msgid "Dashes:" -msgstr "Tratteggio:" +#: ../src/widgets/stroke-style.cpp:392 +#, fuzzy +msgid "Fill, Stroke, Markers" +msgstr "Stile delimitatori contorno" -#. Drop down marker selectors -#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes -#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. -#: ../src/widgets/stroke-style.cpp:352 -msgid "Markers:" -msgstr "Delimitatori:" +#: ../src/widgets/stroke-style.cpp:396 +#, fuzzy +msgid "Stroke, Fill, Markers" +msgstr "Stile delimitatori contorno" -#: ../src/widgets/stroke-style.cpp:358 -msgid "Start Markers are drawn on the first node of a path or shape" -msgstr "" -"I delimitatori iniziali vengono disegnati sul primo nodo di un tracciato o " -"forma" +#: ../src/widgets/stroke-style.cpp:400 +#, fuzzy +msgid "Fill, Markers, Stroke" +msgstr "Riempimento e contorni" -#: ../src/widgets/stroke-style.cpp:367 -msgid "" -"Mid Markers are drawn on every node of a path or shape except the first and " -"last nodes" -msgstr "" -"I delimitatori di mezzo vengono disegnati su tutti i nodi di un tracciato o " -"forma, tranne il primo e l'utimo" +#: ../src/widgets/stroke-style.cpp:408 +#, fuzzy +msgid "Markers, Fill, Stroke" +msgstr "Riempimento e contorni" -#: ../src/widgets/stroke-style.cpp:376 -msgid "End Markers are drawn on the last node of a path or shape" +#: ../src/widgets/stroke-style.cpp:412 +#, fuzzy +msgid "Stroke, Markers, Fill" +msgstr "Stile delimitatori contorno" + +#: ../src/widgets/stroke-style.cpp:416 +msgid "Markers, Stroke, Fill" msgstr "" -"I delimitatori finali vengono disegnati sull'ultimo nodo di un tracciato o " -"forma" -#: ../src/widgets/stroke-style.cpp:498 +#: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" msgstr "Imposta delimitatori" -#: ../src/widgets/stroke-style.cpp:1036 ../src/widgets/stroke-style.cpp:1121 +#: ../src/widgets/stroke-style.cpp:1116 ../src/widgets/stroke-style.cpp:1205 msgid "Set stroke style" msgstr "Imposta stile contorno" -#: ../src/widgets/stroke-style.cpp:1209 +#: ../src/widgets/stroke-style.cpp:1309 msgid "Set marker color" msgstr "Imposta colore delimitatore" -#: ../src/widgets/swatch-selector.cpp:137 +#: ../src/widgets/swatch-selector.cpp:89 msgid "Change swatch color" msgstr "Cambia colore campione" -#: ../src/widgets/text-toolbar.cpp:173 +#: ../src/widgets/text-toolbar.cpp:179 msgid "Text: Change font family" msgstr "Testo: Cambia font" -#: ../src/widgets/text-toolbar.cpp:239 +#: ../src/widgets/text-toolbar.cpp:245 msgid "Text: Change font size" msgstr "Testo: Cambia dimensione carattere" -#: ../src/widgets/text-toolbar.cpp:277 +#: ../src/widgets/text-toolbar.cpp:281 msgid "Text: Change font style" msgstr "Testo: Cambia stile" -#: ../src/widgets/text-toolbar.cpp:355 +#: ../src/widgets/text-toolbar.cpp:359 msgid "Text: Change superscript or subscript" msgstr "Testo: Cambia apice o pedice" -#: ../src/widgets/text-toolbar.cpp:500 +#: ../src/widgets/text-toolbar.cpp:502 msgid "Text: Change alignment" msgstr "Testo: Cambia allineamento" -#: ../src/widgets/text-toolbar.cpp:543 +#: ../src/widgets/text-toolbar.cpp:573 msgid "Text: Change line-height" msgstr "Testo: Cambia spaziatura linee" -#: ../src/widgets/text-toolbar.cpp:592 +#: ../src/widgets/text-toolbar.cpp:728 +#, fuzzy +msgid "Text: Change line-height unit" +msgstr "Testo: Cambia spaziatura linee" + +#: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" msgstr "Testo: Cambia spaziatura parole" -#: ../src/widgets/text-toolbar.cpp:633 +#: ../src/widgets/text-toolbar.cpp:817 msgid "Text: Change letter-spacing" msgstr "Testo: Cambia spaziatura lettere" -#: ../src/widgets/text-toolbar.cpp:673 +#: ../src/widgets/text-toolbar.cpp:855 msgid "Text: Change dx (kern)" msgstr "Testo: Cambia crenatura orizzontale" -#: ../src/widgets/text-toolbar.cpp:707 +#: ../src/widgets/text-toolbar.cpp:889 msgid "Text: Change dy" msgstr "Testo: Cambia spostamento verticale" -#: ../src/widgets/text-toolbar.cpp:742 +#: ../src/widgets/text-toolbar.cpp:924 msgid "Text: Change rotate" msgstr "Testo: Cambia rotazione" -#: ../src/widgets/text-toolbar.cpp:790 +#: ../src/widgets/text-toolbar.cpp:977 +#, fuzzy +msgid "Text: Change writing mode" +msgstr "Testo: Cambia orientamento" + +#: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" msgstr "Testo: Cambia orientamento" -#: ../src/widgets/text-toolbar.cpp:1229 +#: ../src/widgets/text-toolbar.cpp:1539 msgid "Font Family" msgstr "Carattere" -#: ../src/widgets/text-toolbar.cpp:1230 +#: ../src/widgets/text-toolbar.cpp:1540 msgid "Select Font Family (Alt-X to access)" msgstr "Seleziona famiglia carattere (Alt+X per accedervi)" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1240 +#: ../src/widgets/text-toolbar.cpp:1550 msgid "Select all text with this font-family" msgstr "Seleziona tutti i testi con questa famiglia carattere" -#: ../src/widgets/text-toolbar.cpp:1244 +#: ../src/widgets/text-toolbar.cpp:1554 msgid "Font not found on system" msgstr "Carattere non trovato nel sistema" -#: ../src/widgets/text-toolbar.cpp:1303 +#: ../src/widgets/text-toolbar.cpp:1631 msgid "Font Style" msgstr "Stile carattere" -#: ../src/widgets/text-toolbar.cpp:1304 +#: ../src/widgets/text-toolbar.cpp:1632 msgid "Font style" msgstr "Stile carattere" #. Name -#: ../src/widgets/text-toolbar.cpp:1321 +#: ../src/widgets/text-toolbar.cpp:1649 msgid "Toggle Superscript" msgstr "Abilita apice" #. Label -#: ../src/widgets/text-toolbar.cpp:1322 +#: ../src/widgets/text-toolbar.cpp:1650 msgid "Toggle superscript" msgstr "Abilita apice" #. Name -#: ../src/widgets/text-toolbar.cpp:1334 +#: ../src/widgets/text-toolbar.cpp:1662 msgid "Toggle Subscript" msgstr "Abilita pedice" #. Label -#: ../src/widgets/text-toolbar.cpp:1335 +#: ../src/widgets/text-toolbar.cpp:1663 msgid "Toggle subscript" msgstr "Abilita pedice" -#: ../src/widgets/text-toolbar.cpp:1376 +#: ../src/widgets/text-toolbar.cpp:1704 msgid "Justify" msgstr "Giustifica" #. Name -#: ../src/widgets/text-toolbar.cpp:1383 +#: ../src/widgets/text-toolbar.cpp:1711 msgid "Alignment" msgstr "Allineamento" #. Label -#: ../src/widgets/text-toolbar.cpp:1384 +#: ../src/widgets/text-toolbar.cpp:1712 msgid "Text alignment" msgstr "Allineamento testo" -#: ../src/widgets/text-toolbar.cpp:1411 +#: ../src/widgets/text-toolbar.cpp:1739 msgid "Horizontal" msgstr "Orizzontale" -#: ../src/widgets/text-toolbar.cpp:1418 -msgid "Vertical" +#: ../src/widgets/text-toolbar.cpp:1746 +#, fuzzy +msgid "Vertical — RL" msgstr "Verticale" +#: ../src/widgets/text-toolbar.cpp:1747 +msgid "Vertical text — lines: right to left" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1753 +#, fuzzy +msgid "Vertical — LR" +msgstr "Verticale" + +#: ../src/widgets/text-toolbar.cpp:1754 +msgid "Vertical text — lines: left to right" +msgstr "" + +#. Name +#: ../src/widgets/text-toolbar.cpp:1759 +#, fuzzy +msgid "Writing mode" +msgstr "Modalità disegno" + #. Label -#: ../src/widgets/text-toolbar.cpp:1425 +#: ../src/widgets/text-toolbar.cpp:1760 +msgid "Block progression" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1789 +#, fuzzy +msgid "Auto glyph orientation" +msgstr "Segui orientamento tracciato" + +#: ../src/widgets/text-toolbar.cpp:1796 +#, fuzzy +msgid "Upright" +msgstr "Schiarisci" + +#: ../src/widgets/text-toolbar.cpp:1797 +#, fuzzy +msgid "Upright glyph orientation" +msgstr "Orientamento testo" + +#: ../src/widgets/text-toolbar.cpp:1804 +msgid "Sideways" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:1805 +#, fuzzy +msgid "Sideways glyph orientation" +msgstr "Segui orientamento tracciato" + +#. Name +#: ../src/widgets/text-toolbar.cpp:1811 msgid "Text orientation" msgstr "Orientamento testo" +#. Label +#: ../src/widgets/text-toolbar.cpp:1812 +msgid "Text (glyph) orientation in vertical text." +msgstr "" + #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1448 +#: ../src/widgets/text-toolbar.cpp:1845 msgid "Smaller spacing" msgstr "Spaziatura minore" -#: ../src/widgets/text-toolbar.cpp:1448 ../src/widgets/text-toolbar.cpp:1479 -#: ../src/widgets/text-toolbar.cpp:1510 +#: ../src/widgets/text-toolbar.cpp:1845 ../src/widgets/text-toolbar.cpp:1884 +#: ../src/widgets/text-toolbar.cpp:1915 msgctxt "Text tool" msgid "Normal" msgstr "Normale" -#: ../src/widgets/text-toolbar.cpp:1448 +#: ../src/widgets/text-toolbar.cpp:1845 msgid "Larger spacing" msgstr "Spaziatura maggiore" #. name -#: ../src/widgets/text-toolbar.cpp:1453 +#: ../src/widgets/text-toolbar.cpp:1850 msgid "Line Height" msgstr "Spaziatura linee" #. label -#: ../src/widgets/text-toolbar.cpp:1454 +#: ../src/widgets/text-toolbar.cpp:1851 msgid "Line:" msgstr "Linea:" #. short label -#: ../src/widgets/text-toolbar.cpp:1455 -msgid "Spacing between lines (times font size)" +#: ../src/widgets/text-toolbar.cpp:1852 +#, fuzzy +msgid "Spacing between baselines (times font size)" msgstr "Spaziatura tra le linee (volte dimensione carattere)" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1479 ../src/widgets/text-toolbar.cpp:1510 +#: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 msgid "Negative spacing" msgstr "Spaziatura negativa" -#: ../src/widgets/text-toolbar.cpp:1479 ../src/widgets/text-toolbar.cpp:1510 +#: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 msgid "Positive spacing" msgstr "Spaziatura positiva" #. name -#: ../src/widgets/text-toolbar.cpp:1484 +#: ../src/widgets/text-toolbar.cpp:1889 msgid "Word spacing" msgstr "Spaziatura parole" #. label -#: ../src/widgets/text-toolbar.cpp:1485 +#: ../src/widgets/text-toolbar.cpp:1890 msgid "Word:" msgstr "Parola:" #. short label -#: ../src/widgets/text-toolbar.cpp:1486 +#: ../src/widgets/text-toolbar.cpp:1891 msgid "Spacing between words (px)" msgstr "Spaziatura tra le parole (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1515 +#: ../src/widgets/text-toolbar.cpp:1920 msgid "Letter spacing" msgstr "Spaziatura lettere" #. label -#: ../src/widgets/text-toolbar.cpp:1516 +#: ../src/widgets/text-toolbar.cpp:1921 msgid "Letter:" msgstr "Lettere:" #. short label -#: ../src/widgets/text-toolbar.cpp:1517 +#: ../src/widgets/text-toolbar.cpp:1922 msgid "Spacing between letters (px)" msgstr "Spaziatura tra le lettere (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1546 +#: ../src/widgets/text-toolbar.cpp:1951 msgid "Kerning" msgstr "Crenatura" #. label -#: ../src/widgets/text-toolbar.cpp:1547 +#: ../src/widgets/text-toolbar.cpp:1952 msgid "Kern:" msgstr "Crenatura:" #. short label -#: ../src/widgets/text-toolbar.cpp:1548 +#: ../src/widgets/text-toolbar.cpp:1953 msgid "Horizontal kerning (px)" msgstr "Crenatura orizzontale (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1577 +#: ../src/widgets/text-toolbar.cpp:1982 msgid "Vertical Shift" msgstr "Spostamento verticale" #. label -#: ../src/widgets/text-toolbar.cpp:1578 +#: ../src/widgets/text-toolbar.cpp:1983 msgid "Vert:" msgstr "Verticale:" #. short label -#: ../src/widgets/text-toolbar.cpp:1579 +#: ../src/widgets/text-toolbar.cpp:1984 msgid "Vertical shift (px)" msgstr "Spostamento verticale (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1608 +#: ../src/widgets/text-toolbar.cpp:2013 msgid "Letter rotation" msgstr "Rotazione lettere" #. label -#: ../src/widgets/text-toolbar.cpp:1609 +#: ../src/widgets/text-toolbar.cpp:2014 msgid "Rot:" msgstr "Rotazione:" #. short label -#: ../src/widgets/text-toolbar.cpp:1610 +#: ../src/widgets/text-toolbar.cpp:2015 msgid "Character rotation (degrees)" msgstr "Rotazione carattere (gradi)" -#: ../src/widgets/toolbox.cpp:182 +#: ../src/widgets/toolbox.cpp:186 msgid "Color/opacity used for color tweaking" msgstr "Colore/opacità usato per il ritocco del colore" -#: ../src/widgets/toolbox.cpp:190 +#: ../src/widgets/toolbox.cpp:194 msgid "Style of new stars" msgstr "Stile dei nuovi poligoni" -#: ../src/widgets/toolbox.cpp:192 +#: ../src/widgets/toolbox.cpp:196 msgid "Style of new rectangles" msgstr "Stile dei nuovi rettangoli" -#: ../src/widgets/toolbox.cpp:194 +#: ../src/widgets/toolbox.cpp:198 msgid "Style of new 3D boxes" msgstr "Stile dei nuovi solidi 3D" -#: ../src/widgets/toolbox.cpp:196 +#: ../src/widgets/toolbox.cpp:200 msgid "Style of new ellipses" msgstr "Stile delle nuove ellissi" -#: ../src/widgets/toolbox.cpp:198 +#: ../src/widgets/toolbox.cpp:202 msgid "Style of new spirals" msgstr "Stile delle nuove spirali" -#: ../src/widgets/toolbox.cpp:200 +#: ../src/widgets/toolbox.cpp:204 msgid "Style of new paths created by Pencil" msgstr "Stile dei nuovi tracciati creati con il «Pastello»" -#: ../src/widgets/toolbox.cpp:202 +#: ../src/widgets/toolbox.cpp:206 msgid "Style of new paths created by Pen" msgstr "Stile dei nuovi tracciati creati con la «Penna»" -#: ../src/widgets/toolbox.cpp:204 +#: ../src/widgets/toolbox.cpp:208 msgid "Style of new calligraphic strokes" msgstr "Stile delle nuove linee calligrafiche" -#: ../src/widgets/toolbox.cpp:206 ../src/widgets/toolbox.cpp:208 +#: ../src/widgets/toolbox.cpp:210 ../src/widgets/toolbox.cpp:212 msgid "TBD" msgstr "Da definire" -#: ../src/widgets/toolbox.cpp:220 +#: ../src/widgets/toolbox.cpp:225 msgid "Style of Paint Bucket fill objects" msgstr "Stile dei nuovi oggetti creati con il «Secchiello»" -#: ../src/widgets/toolbox.cpp:1682 +#: ../src/widgets/toolbox.cpp:1742 msgid "Bounding box" msgstr "Riquadri" -#: ../src/widgets/toolbox.cpp:1682 +#: ../src/widgets/toolbox.cpp:1742 msgid "Snap bounding boxes" msgstr "Aggancia angoli riquadri" -#: ../src/widgets/toolbox.cpp:1691 +#: ../src/widgets/toolbox.cpp:1751 msgid "Bounding box edges" msgstr "Margini riquadri" -#: ../src/widgets/toolbox.cpp:1691 +#: ../src/widgets/toolbox.cpp:1751 msgid "Snap to edges of a bounding box" msgstr "Aggancia ai bordi dei riquadri" -#: ../src/widgets/toolbox.cpp:1700 +#: ../src/widgets/toolbox.cpp:1760 msgid "Bounding box corners" msgstr "Angoli riquadri" -#: ../src/widgets/toolbox.cpp:1700 +#: ../src/widgets/toolbox.cpp:1760 msgid "Snap bounding box corners" msgstr "Aggancia angoli riquadri" -#: ../src/widgets/toolbox.cpp:1709 +#: ../src/widgets/toolbox.cpp:1769 msgid "BBox Edge Midpoints" msgstr "Metà margine riquadro" -#: ../src/widgets/toolbox.cpp:1709 +#: ../src/widgets/toolbox.cpp:1769 msgid "Snap midpoints of bounding box edges" msgstr "Aggancia a e con le metà dei bordi dei riquadri" -#: ../src/widgets/toolbox.cpp:1719 +#: ../src/widgets/toolbox.cpp:1779 msgid "BBox Centers" msgstr "Centri riquadri" -#: ../src/widgets/toolbox.cpp:1719 +#: ../src/widgets/toolbox.cpp:1779 msgid "Snapping centers of bounding boxes" msgstr "Aggancia a e con i centri dei riquadri" -#: ../src/widgets/toolbox.cpp:1728 +#: ../src/widgets/toolbox.cpp:1788 msgid "Snap nodes, paths, and handles" msgstr "Aggancia nodi, tracciati e maniglie" -#: ../src/widgets/toolbox.cpp:1736 +#: ../src/widgets/toolbox.cpp:1796 msgid "Snap to paths" msgstr "Aggancia ai tracciati" -#: ../src/widgets/toolbox.cpp:1745 +#: ../src/widgets/toolbox.cpp:1805 msgid "Path intersections" msgstr "Intersezione tracciati" -#: ../src/widgets/toolbox.cpp:1745 +#: ../src/widgets/toolbox.cpp:1805 msgid "Snap to path intersections" msgstr "Aggancia alle intersezioni dei tracciati" -#: ../src/widgets/toolbox.cpp:1754 +#: ../src/widgets/toolbox.cpp:1814 msgid "To nodes" msgstr "Ai nodi" -#: ../src/widgets/toolbox.cpp:1754 +#: ../src/widgets/toolbox.cpp:1814 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "Aggancia ai nodi angolari, incl. angoli dei rettangoli" -#: ../src/widgets/toolbox.cpp:1763 +#: ../src/widgets/toolbox.cpp:1823 msgid "Smooth nodes" msgstr "Nodi curvi" -#: ../src/widgets/toolbox.cpp:1763 +#: ../src/widgets/toolbox.cpp:1823 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "Aggancia ai nodi curvi, incl. punti cardinali delle ellissi" -#: ../src/widgets/toolbox.cpp:1772 +#: ../src/widgets/toolbox.cpp:1832 msgid "Line Midpoints" msgstr "Metà linea" -#: ../src/widgets/toolbox.cpp:1772 +#: ../src/widgets/toolbox.cpp:1832 msgid "Snap midpoints of line segments" msgstr "Aggancia a e con le metà dei segmenti" -#: ../src/widgets/toolbox.cpp:1781 +#: ../src/widgets/toolbox.cpp:1841 msgid "Others" msgstr "Altri" -#: ../src/widgets/toolbox.cpp:1781 +#: ../src/widgets/toolbox.cpp:1841 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "Aggancia ad altri punti (centri, guide, maniglie gradiente, ecc.)" -#: ../src/widgets/toolbox.cpp:1789 +#: ../src/widgets/toolbox.cpp:1849 msgid "Object Centers" msgstr "Centro oggetti" -#: ../src/widgets/toolbox.cpp:1789 +#: ../src/widgets/toolbox.cpp:1849 msgid "Snap centers of objects" msgstr "Aggancia a e con i centri degli oggetti" -#: ../src/widgets/toolbox.cpp:1798 +#: ../src/widgets/toolbox.cpp:1858 msgid "Rotation Centers" msgstr "Centro di rotazione" -#: ../src/widgets/toolbox.cpp:1798 +#: ../src/widgets/toolbox.cpp:1858 msgid "Snap an item's rotation center" msgstr "Aggancia a e con il centro di rotazione dell'elemento" -#: ../src/widgets/toolbox.cpp:1807 +#: ../src/widgets/toolbox.cpp:1867 msgid "Text baseline" msgstr "Linea base del testo" -#: ../src/widgets/toolbox.cpp:1807 +#: ../src/widgets/toolbox.cpp:1867 msgid "Snap text anchors and baselines" msgstr "Allinea linee del testo" -#: ../src/widgets/toolbox.cpp:1817 +#: ../src/widgets/toolbox.cpp:1877 msgid "Page border" msgstr "Bordo pagina" -#: ../src/widgets/toolbox.cpp:1817 +#: ../src/widgets/toolbox.cpp:1877 msgid "Snap to the page border" msgstr "Aggancia ai bordi della pagina" -#: ../src/widgets/toolbox.cpp:1826 +#: ../src/widgets/toolbox.cpp:1886 msgid "Snap to grids" msgstr "Aggancia alle griglie" -#: ../src/widgets/toolbox.cpp:1835 +#: ../src/widgets/toolbox.cpp:1895 msgid "Snap guides" msgstr "Aggancia alle guide" @@ -29385,6 +32153,8 @@ msgstr "In modalità colore, agisce sulla tonalità dell'oggetto" #. TRANSLATORS: "H" here stands for hue #: ../src/widgets/tweak-toolbar.cpp:291 +#, fuzzy +msgctxt "Hue" msgid "H" msgstr "H" @@ -29394,6 +32164,8 @@ msgstr "In modalità colore, agisce sulla saturazione dell'oggetto" #. TRANSLATORS: "S" here stands for Saturation #: ../src/widgets/tweak-toolbar.cpp:307 +#, fuzzy +msgctxt "Saturation" msgid "S" msgstr "S" @@ -29403,6 +32175,8 @@ msgstr "In modalità colore, agisce sulla luminosità dell'oggetto" #. TRANSLATORS: "L" here stands for Lightness #: ../src/widgets/tweak-toolbar.cpp:323 +#, fuzzy +msgctxt "Lightness" msgid "L" msgstr "L" @@ -29412,6 +32186,8 @@ msgstr "In modalità colore, agisce sull'opacità dell'oggetto" #. TRANSLATORS: "O" here stands for Opacity #: ../src/widgets/tweak-toolbar.cpp:339 +#, fuzzy +msgctxt "Opacity" msgid "O" msgstr "O" @@ -29495,7 +32271,7 @@ msgstr "Semiperimetro (px): " msgid "Area (px^2): " msgstr "Area (px^2): " -#: ../share/extensions/dxf_input.py:520 +#: ../share/extensions/dxf_input.py:528 #, python-format msgid "" "%d ENTITIES of type POLYLINE encountered and ignored. Please try to convert " @@ -29510,13 +32286,13 @@ msgstr "" "Errore nell'importare i moduli numpy o numpy.linalg. Tali moduli sono " "necessari a quest'estensione. Installarli e provare nuovamente." -#: ../share/extensions/dxf_outlines.py:316 +#: ../share/extensions/dxf_outlines.py:315 msgid "" "Error: Field 'Layer match name' must be filled when using 'By name match' " "option" msgstr "" -#: ../share/extensions/dxf_outlines.py:357 +#: ../share/extensions/dxf_outlines.py:356 #, python-format msgid "Warning: Layer '%s' not found!" msgstr "Attenzione: Livello '%s' non trovato!" @@ -29565,11 +32341,14 @@ msgid "Need at least 2 paths selected" msgstr "Sono necessari almeno 2 tracciati selezionati" #: ../share/extensions/funcplot.py:48 -msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" +msgid "" +"x-interval cannot be zero. Please modify 'Start X value' or 'End X value'" msgstr "" #: ../share/extensions/funcplot.py:60 -msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" +msgid "" +"y-interval cannot be zero. Please modify 'Y value of rectangle's top' or 'Y " +"value of rectangle's bottom'" msgstr "" #: ../share/extensions/funcplot.py:315 @@ -29803,14 +32582,19 @@ msgid "Please select an object" msgstr "Seleziona un oggetto" #: ../share/extensions/gimp_xcf.py:39 -msgid "Gimp must be installed and set in your path variable." +#, fuzzy +msgid "Inkscape must be installed and set in your path variable." msgstr "Gimp deve essere installato e impostato nei percorsi." #: ../share/extensions/gimp_xcf.py:43 +msgid "Gimp must be installed and set in your path variable." +msgstr "Gimp deve essere installato e impostato nei percorsi." + +#: ../share/extensions/gimp_xcf.py:47 msgid "An error occurred while processing the XCF file." msgstr "È occorso un errore durante l'elaborazione del file XCF." -#: ../share/extensions/gimp_xcf.py:177 +#: ../share/extensions/gimp_xcf.py:185 msgid "This extension requires at least one non empty layer." msgstr "Questa estensione richiede almeno un livello non vuoto." @@ -29818,14 +32602,14 @@ msgstr "Questa estensione richiede almeno un livello non vuoto." msgid "The sliced bitmaps have been saved as:" msgstr "" -#: ../share/extensions/hpgl_decoder.py:43 +#: ../share/extensions/hpgl_decoder.py:42 #, fuzzy msgid "Movements" msgstr "Muovi gradiente" -#: ../share/extensions/hpgl_decoder.py:44 +#: ../share/extensions/hpgl_decoder.py:43 #, fuzzy -msgid "Pen #" +msgid "Pen " msgstr "Inerzia pennino" #. issue error if no hpgl data found @@ -29846,11 +32630,11 @@ msgid "" "No paths where found. Please convert all objects you want to save into paths." msgstr "" -#: ../share/extensions/inkex.py:116 +#: ../share/extensions/inkex.py:117 #, fuzzy, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " -"this extension. Please download and install the latest version from http://" +"this extension.Please download and install the latest version from http://" "cheeseshop.python.org/pypi/lxml/, or install it through your package manager " "by a command like: sudo apt-get install python-lxml\n" "\n" @@ -29862,26 +32646,26 @@ msgstr "" "http://cheeseshop.python.org/pypi/lxml/ o tramite il proprio gestore di " "pacchetti con un comando simile a `sudo apt-get install python-lxml`" -#: ../share/extensions/inkex.py:169 +#: ../share/extensions/inkex.py:185 #, python-format msgid "Unable to open specified file: %s" msgstr "Impossibile aprire il file specificato: %s" -#: ../share/extensions/inkex.py:178 +#: ../share/extensions/inkex.py:194 #, fuzzy, python-format msgid "Unable to open object member file: %s" msgstr "impossibile trovare il delimitatore: %s" -#: ../share/extensions/inkex.py:283 +#: ../share/extensions/inkex.py:299 #, python-format msgid "No matching node for expression: %s" msgstr "Nessun nodo corrispondente all'espressione: %s" -#: ../share/extensions/inkex.py:313 +#: ../share/extensions/inkex.py:358 msgid "SVG Width not set correctly! Assuming width = 100" msgstr "" -#: ../share/extensions/interp_att_g.py:167 +#: ../share/extensions/interp_att_g.py:176 #, fuzzy msgid "There is no selection to interpolate" msgstr "Sposta la selezione in cima" @@ -30085,7 +32869,17 @@ msgid "" "and then press apply.\n" msgstr "" -#: ../share/extensions/measure.py:50 +#: ../share/extensions/markers_strokepaint.py:83 +#, python-format +msgid "No style attribute found for id: %s" +msgstr "Nessun attributo style trovato per l'id: %s" + +#: ../share/extensions/markers_strokepaint.py:137 +#, python-format +msgid "unable to locate marker: %s" +msgstr "impossibile trovare il delimitatore: %s" + +#: ../share/extensions/measure.py:58 msgid "" "Failed to import the numpy modules. These modules are required by this " "extension. Please install them and try again. On a Debian-like system this " @@ -30096,13 +32890,13 @@ msgstr "" "Debian questo può essere fatto col comando `sudo apt-get install python-" "numpy`." -#: ../share/extensions/measure.py:112 +#: ../share/extensions/measure.py:120 msgid "Area is zero, cannot calculate Center of Mass" msgstr "" #: ../share/extensions/pathalongpath.py:208 #: ../share/extensions/pathscatter.py:228 -#: ../share/extensions/perspective.py:53 +#: ../share/extensions/perspective.py:52 msgid "This extension requires two selected paths." msgstr "Questa estensione richiede che vengan selezionati due tracciati." @@ -30123,7 +32917,7 @@ msgstr "" msgid "Please first convert objects to paths! (Got [%s].)" msgstr "Convertire prima l'oggetto in tracciato! (Ricevuto [%s].)" -#: ../share/extensions/perspective.py:45 +#: ../share/extensions/perspective.py:44 msgid "" "Failed to import the numpy or numpy.linalg modules. These modules are " "required by this extension. Please install them and try again. On a Debian-" @@ -30135,8 +32929,8 @@ msgstr "" "derivati Debian questo può essere fatto col comando `sudo apt-get install " "python-numpy`." -#: ../share/extensions/perspective.py:61 -#: ../share/extensions/summersnight.py:52 +#: ../share/extensions/perspective.py:60 +#: ../share/extensions/summersnight.py:51 #, python-format msgid "" "The first selected object is of type '%s'.\n" @@ -30145,16 +32939,16 @@ msgstr "" "Il primo elemento selezionato è del tipo '%s'.\n" "Provare prima il procedimento Tracciato->Da oggetto a tracciato." -#: ../share/extensions/perspective.py:68 -#: ../share/extensions/summersnight.py:60 +#: ../share/extensions/perspective.py:67 +#: ../share/extensions/summersnight.py:59 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" "Questa estensione richiede che il secondo tracciato selezionato sia lungo " "esattamente quattro nodi." -#: ../share/extensions/perspective.py:94 -#: ../share/extensions/summersnight.py:93 +#: ../share/extensions/perspective.py:93 +#: ../share/extensions/summersnight.py:92 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." @@ -30162,8 +32956,8 @@ msgstr "" "Il secondo elemento selezionato è un gruppo, non un tracciato.\n" "Provare prima il procedimento Oggetto->Dividi." -#: ../share/extensions/perspective.py:96 -#: ../share/extensions/summersnight.py:95 +#: ../share/extensions/perspective.py:95 +#: ../share/extensions/summersnight.py:94 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -30171,8 +32965,8 @@ msgstr "" "Il secondo elemento selezionato non è un tracciato.\n" "Provare prima il procedimento Tracciato->Da oggetto a tracciato." -#: ../share/extensions/perspective.py:99 -#: ../share/extensions/summersnight.py:98 +#: ../share/extensions/perspective.py:98 +#: ../share/extensions/summersnight.py:97 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -30181,12 +32975,12 @@ msgstr "" "Provare prima il procedimento Tracciato->Da oggetto a tracciato." #. issue error if no paths found -#: ../share/extensions/plotter.py:66 +#: ../share/extensions/plotter.py:69 msgid "" "No paths where found. Please convert all objects you want to plot into paths." msgstr "" -#: ../share/extensions/plotter.py:143 +#: ../share/extensions/plotter.py:147 msgid "" "pySerial is not installed.\n" "\n" @@ -30197,13 +32991,13 @@ msgid "" "3. Restart Inkscape." msgstr "" -#: ../share/extensions/plotter.py:163 +#: ../share/extensions/plotter.py:199 msgid "" "Could not open port. Please check that your plotter is running, connected " "and the settings are correct." msgstr "" -#: ../share/extensions/polyhedron_3d.py:65 +#: ../share/extensions/polyhedron_3d.py:66 msgid "" "Failed to import the numpy module. This module is required by this " "extension. Please install it and try again. On a Debian-like system this " @@ -30214,24 +33008,24 @@ msgstr "" "Debian questo può essere fatto col comando `sudo apt-get install python-" "numpy`." -#: ../share/extensions/polyhedron_3d.py:336 +#: ../share/extensions/polyhedron_3d.py:337 msgid "No face data found in specified file." msgstr "Nessuna informazione per le facce trovata nel file specificato." -#: ../share/extensions/polyhedron_3d.py:337 +#: ../share/extensions/polyhedron_3d.py:338 msgid "Try selecting \"Edge Specified\" in the Model File tab.\n" msgstr "Seleziona \"Specificato allo spigolo\" nella scheda «File modello».\n" -#: ../share/extensions/polyhedron_3d.py:343 +#: ../share/extensions/polyhedron_3d.py:344 msgid "No edge data found in specified file." msgstr "Nessuna informazione per gli spigoli trovata nel file specificato." -#: ../share/extensions/polyhedron_3d.py:344 +#: ../share/extensions/polyhedron_3d.py:345 msgid "Try selecting \"Face Specified\" in the Model File tab.\n" msgstr "Seleziona \"Specificato alla faccia\" nella scheda «File modello».\n" #. we cannot generate a list of faces from the edges without a lot of computation -#: ../share/extensions/polyhedron_3d.py:522 +#: ../share/extensions/polyhedron_3d.py:524 msgid "" "Face Data Not Found. Ensure file contains face data, and check the file is " "imported as \"Face-Specified\" under the \"Model File\" tab.\n" @@ -30240,7 +33034,7 @@ msgstr "" "informazioni per le facce e che il file sia importato come \"Specificato " "alla faccia\" nella scheda «File modello».\n" -#: ../share/extensions/polyhedron_3d.py:524 +#: ../share/extensions/polyhedron_3d.py:526 msgid "Internal Error. No view type selected\n" msgstr "Errore interno. Nessun tipo di dato selezionato\n" @@ -30253,22 +33047,22 @@ msgstr "" msgid "Failed to open default printer" msgstr "Impossibile impostare CairoRenderContext" -#: ../share/extensions/render_barcode_datamatrix.py:202 +#: ../share/extensions/render_barcode_datamatrix.py:203 msgid "Unrecognised DataMatrix size" msgstr "" #. we have an invalid bit value -#: ../share/extensions/render_barcode_datamatrix.py:643 +#: ../share/extensions/render_barcode_datamatrix.py:644 msgid "Invalid bit value, this is a bug!" msgstr "" #. abort if converting blank text -#: ../share/extensions/render_barcode_datamatrix.py:678 +#: ../share/extensions/render_barcode_datamatrix.py:679 msgid "Please enter an input string" msgstr "" #. abort if converting blank text -#: ../share/extensions/render_barcode_qrcode.py:1054 +#: ../share/extensions/render_barcode_qrcode.py:1055 #, fuzzy msgid "Please enter an input text" msgstr "Bisogna inserire il nome del file" @@ -30320,7 +33114,12 @@ msgstr "" "Inserisci un carattere sostitutivo nella casella 'Sostituisci tutti i " "caratteri con'." -#: ../share/extensions/summersnight.py:44 +#: ../share/extensions/restack.py:76 +#, fuzzy +msgid "There is no selection to restack." +msgstr "Sposta la selezione in cima" + +#: ../share/extensions/summersnight.py:43 msgid "" "This extension requires two selected paths. \n" "The second path must be exactly four nodes long." @@ -30353,7 +33152,7 @@ msgstr "" "http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" "e installalo nella locazione Python di Inkscape\n" -#: ../share/extensions/voronoi2svg.py:215 +#: ../share/extensions/voronoi2svg.py:206 #, fuzzy msgid "Please select objects!" msgstr "Duplica gli oggetti selezionati" @@ -30413,7 +33212,7 @@ msgstr "" #. PARAMETER PROCESSING #. lines of longitude are odd : abort -#: ../share/extensions/wireframe_sphere.py:116 +#: ../share/extensions/wireframe_sphere.py:117 msgid "Please enter an even number of lines of longitude." msgstr "" @@ -30430,10 +33229,6 @@ msgstr "Metodo di divisione:" msgid "By max. segment length" msgstr "Per lunghezza massima del segmento" -#: ../share/extensions/addnodes.inx.h:4 -msgid "By number of segments" -msgstr "Per numero di segmenti" - #: ../share/extensions/addnodes.inx.h:5 msgid "Maximum segment length (px):" msgstr "Lunghezza massima del segmento (px):" @@ -30446,7 +33241,8 @@ msgstr "Numero di segmenti:" #: ../share/extensions/convert2dashes.inx.h:2 #: ../share/extensions/edge3d.inx.h:9 ../share/extensions/flatten.inx.h:3 #: ../share/extensions/fractalize.inx.h:4 -#: ../share/extensions/interp_att_g.inx.h:29 +#: ../share/extensions/interp_att_g.inx.h:31 +#: ../share/extensions/markers_strokepaint.inx.h:13 #: ../share/extensions/perspective.inx.h:2 #: ../share/extensions/pixelsnap.inx.h:3 #: ../share/extensions/radiusrand.inx.h:10 @@ -30691,10 +33487,27 @@ msgstr "Negativo" msgid "Randomize" msgstr "Casualità" -#: ../share/extensions/color_randomize.inx.h:7 +#: ../share/extensions/color_randomize.inx.h:5 +#, fuzzy, no-c-format +msgid "Hue range (%)" +msgstr "Rotazione tonalità (°)" + +#: ../share/extensions/color_randomize.inx.h:8 +#, fuzzy, no-c-format +msgid "Saturation range (%)" +msgstr "Saturazione (%)" + +#: ../share/extensions/color_randomize.inx.h:11 +#, fuzzy, no-c-format +msgid "Lightness range (%)" +msgstr "Luminosità (%)" + +#: ../share/extensions/color_randomize.inx.h:13 +#, fuzzy msgid "" "Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB." +"converts it back to RGB. Lower the range values to limit the distance " +"between the original color and the randomized one." msgstr "" "Converte in HSL, randomizza la tonalità e/o la saturazione e/o la luminosità " "e converte nuovamente in RGB." @@ -30793,7 +33606,8 @@ msgid "Y Offset:" msgstr "Proiezione lungo Y:" #: ../share/extensions/dimension.inx.h:4 -msgid "Bounding box type :" +#, fuzzy +msgid "Bounding box type:" msgstr "Riquadro da usare:" #: ../share/extensions/dimension.inx.h:5 @@ -30805,7 +33619,7 @@ msgid "Visual" msgstr "Visivo" #: ../share/extensions/dimension.inx.h:7 ../share/extensions/dots.inx.h:13 -#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:25 +#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:42 msgid "Visualize Path" msgstr "Visualizza tracciato" @@ -31048,12 +33862,12 @@ msgid "DXF Input" msgstr "Input DXF" #: ../share/extensions/dxf_input.inx.h:3 -msgid "Use automatic scaling to size A4" -msgstr "Usa ridimensionamento automatico ad A4" +msgid "Method of Scaling:" +msgstr "" #: ../share/extensions/dxf_input.inx.h:4 #, fuzzy -msgid "Or, use manual scale factor:" +msgid "Manual scale factor:" msgstr "Altrimenti, usa un fattore di scala manuale" #: ../share/extensions/dxf_input.inx.h:5 @@ -31082,9 +33896,11 @@ msgstr "Carattere testo:" #, fuzzy msgid "" "- AutoCAD Release 13 and newer.\n" -"- assume dxf drawing is in mm.\n" -"- assume svg drawing is in pixels, at 90 dpi.\n" +"- for manual scaling, assume dxf drawing is in mm.\n" +"- assume svg drawing is in pixels, at 96 dpi.\n" "- scale factor and origin apply only to manual scaling.\n" +"- 'Automatic scaling' will fit the width of an A4 page.\n" +"- 'Read from file' uses the variable $MEASUREMENT.\n" "- layers are preserved only on File->Open, not Import.\n" "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed." msgstr "" @@ -31095,11 +33911,11 @@ msgstr "" "- supporto ai BLOCKS ancora limitato, se necessario usa la funzione «Esplodi " "blocchi» di AutoCAD." -#: ../share/extensions/dxf_input.inx.h:17 +#: ../share/extensions/dxf_input.inx.h:19 msgid "AutoCAD DXF R13 (*.dxf)" msgstr "AutoCAD DXF R13 (*.dxf)" -#: ../share/extensions/dxf_input.inx.h:18 +#: ../share/extensions/dxf_input.inx.h:20 msgid "Import AutoCAD's Document Exchange Format" msgstr "Importa AutoCAD's Document Exchange Format" @@ -31117,21 +33933,23 @@ msgid "use LWPOLYLINE type of line output" msgstr "" #: ../share/extensions/dxf_outlines.inx.h:5 -msgid "Base unit" -msgstr "" +#, fuzzy +msgid "Base unit:" +msgstr "Frequenza base:" #: ../share/extensions/dxf_outlines.inx.h:6 -msgid "Character Encoding" +#, fuzzy +msgid "Character Encoding:" msgstr "Codifica caratteri" #: ../share/extensions/dxf_outlines.inx.h:7 #, fuzzy -msgid "Layer export selection" +msgid "Layer export selection:" msgstr "Elimina la selezione" #: ../share/extensions/dxf_outlines.inx.h:8 #, fuzzy -msgid "Layer match name" +msgid "Layer match name:" msgstr "Nome del livello:" #: ../share/extensions/dxf_outlines.inx.h:9 @@ -31218,7 +34036,7 @@ msgstr "" msgid "" "- AutoCAD Release 14 DXF format.\n" "- The base unit parameter specifies in what unit the coordinates are output " -"(90 px = 1 in).\n" +"(96 px = 1 in).\n" "- Supported element types\n" " - paths (lines and splines)\n" " - rectangles\n" @@ -31274,10 +34092,6 @@ msgstr "Ombreggia:" msgid "Only black and white:" msgstr "Solo bianco e nero:" -#: ../share/extensions/edge3d.inx.h:5 -msgid "Stroke width:" -msgstr "Larghezza contorno:" - #: ../share/extensions/edge3d.inx.h:6 msgid "Blur stdDeviation:" msgstr "Deviazione standard sfocatura:" @@ -31303,9 +34117,85 @@ msgstr "Incorpora solo le immagini selezionate" msgid "Embed Selected Images" msgstr "Incorpora immagini selezionate" -#: ../share/extensions/empty_page.inx.h:1 -msgid "Empty Page" -msgstr "Pagina vuota" +#: ../share/extensions/empty_business_card.inx.h:1 +#, fuzzy +msgid "Business Card" +msgstr "Biglietto da visita 85x54mm" + +#: ../share/extensions/empty_business_card.inx.h:2 +#, fuzzy +msgid "Business card size:" +msgstr "Biglietto da visita 85x54mm" + +#: ../share/extensions/empty_desktop.inx.h:1 +#, fuzzy +msgid "Desktop" +msgstr "Desktop 640x480" + +#: ../share/extensions/empty_desktop.inx.h:2 +#, fuzzy +msgid "Desktop size:" +msgstr "Dimensione punto:" + +#. Maximum size is '16k' +#: ../share/extensions/empty_desktop.inx.h:4 +#: ../share/extensions/empty_generic.inx.h:2 +#: ../share/extensions/empty_video.inx.h:4 +#, fuzzy +msgid "Custom Width:" +msgstr "Personalizzata" + +#: ../share/extensions/empty_desktop.inx.h:5 +#: ../share/extensions/empty_generic.inx.h:3 +#: ../share/extensions/empty_video.inx.h:5 +#, fuzzy +msgid "Custom Height:" +msgstr "Altezza della maiuscola:" + +#: ../share/extensions/empty_dvd_cover.inx.h:1 +#, fuzzy +msgid "DVD Cover" +msgstr "Copertina" + +#: ../share/extensions/empty_dvd_cover.inx.h:2 +#, fuzzy +msgid "DVD spine width:" +msgstr "Larghezza linea" + +#: ../share/extensions/empty_dvd_cover.inx.h:3 +msgid "DVD cover bleed (mm):" +msgstr "" + +#: ../share/extensions/empty_generic.inx.h:1 +#, fuzzy +msgid "Generic Canvas" +msgstr "Tela di lino" + +#: ../share/extensions/empty_generic.inx.h:4 +#, fuzzy +msgid "SVG Unit:" +msgstr "Unità:" + +#: ../share/extensions/empty_generic.inx.h:5 +#, fuzzy +msgid "Canvas background:" +msgstr "Vettorizza sfondo" + +#: ../share/extensions/empty_generic.inx.h:6 +#: ../share/extensions/empty_page.inx.h:5 +#, fuzzy +msgid "Hide border" +msgstr "Bordo con cresta" + +#: ../share/extensions/empty_icon.inx.h:1 +#, fuzzy +msgid "Icon" +msgstr "Iconifica" + +#: ../share/extensions/empty_icon.inx.h:2 +#, fuzzy +msgid "Icon size:" +msgstr "Dimensione carattere:" #: ../share/extensions/empty_page.inx.h:2 msgid "Page size:" @@ -31315,6 +34205,21 @@ msgstr "Dimensione pagina:" msgid "Page orientation:" msgstr "Orientamento della pagina:" +#: ../share/extensions/empty_page.inx.h:4 +#, fuzzy +msgid "Page background:" +msgstr "Vettorizza sfondo" + +#: ../share/extensions/empty_video.inx.h:1 +#, fuzzy +msgid "Video Screen" +msgstr "Scherma" + +#: ../share/extensions/empty_video.inx.h:2 +#, fuzzy +msgid "Video size:" +msgstr "Dimensione punto:" + #: ../share/extensions/eps_input.inx.h:1 msgid "EPS Input" msgstr "Input EPS" @@ -31819,6 +34724,7 @@ msgstr "Preferenze" #: ../share/extensions/gcodetools_graffiti.inx.h:29 #: ../share/extensions/gcodetools_lathe.inx.h:30 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:19 +#: ../share/extensions/nicechart.inx.h:4 msgid "File:" msgstr "File:" @@ -32833,13 +35739,13 @@ msgstr "" #: ../share/extensions/hpgl_input.inx.h:3 #: ../share/extensions/hpgl_output.inx.h:4 -#: ../share/extensions/plotter.inx.h:23 +#: ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "Risoluzione X (dpi):" #: ../share/extensions/hpgl_input.inx.h:4 #: ../share/extensions/hpgl_output.inx.h:5 -#: ../share/extensions/plotter.inx.h:24 +#: ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" @@ -32847,13 +35753,13 @@ msgstr "" #: ../share/extensions/hpgl_input.inx.h:5 #: ../share/extensions/hpgl_output.inx.h:6 -#: ../share/extensions/plotter.inx.h:25 +#: ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "Risoluzione Y (dpi):" #: ../share/extensions/hpgl_input.inx.h:6 #: ../share/extensions/hpgl_output.inx.h:7 -#: ../share/extensions/plotter.inx.h:26 +#: ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -32868,7 +35774,7 @@ msgid "Check this to show movements between paths (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_input.inx.h:9 -#: ../share/extensions/hpgl_output.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:35 msgid "HP Graphics Language file (*.hpgl)" msgstr "File HP Graphics Language (*.hpgl)" @@ -32889,36 +35795,36 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_output.inx.h:3 -#: ../share/extensions/plotter.inx.h:22 +#: ../share/extensions/plotter.inx.h:31 #, fuzzy msgid "Plotter Settings " msgstr "Impostazioni importazione PDF" #: ../share/extensions/hpgl_output.inx.h:8 -#: ../share/extensions/plotter.inx.h:27 +#: ../share/extensions/plotter.inx.h:36 #, fuzzy msgid "Pen number:" msgstr "Angolo de" #: ../share/extensions/hpgl_output.inx.h:9 -#: ../share/extensions/plotter.inx.h:28 +#: ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "" #: ../share/extensions/hpgl_output.inx.h:10 -#: ../share/extensions/plotter.inx.h:29 +#: ../share/extensions/plotter.inx.h:38 msgid "Pen force (g):" msgstr "" #: ../share/extensions/hpgl_output.inx.h:11 -#: ../share/extensions/plotter.inx.h:30 +#: ../share/extensions/plotter.inx.h:39 msgid "" "The amount of force pushing down the pen in grams, set to 0 to omit command; " "most plotters ignore this command (Default: 0)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:12 -#: ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/plotter.inx.h:40 msgid "Pen speed (cm/s or mm/s):" msgstr "" @@ -32934,127 +35840,227 @@ msgid "Rotation (°, Clockwise):" msgstr "Rotazione (°, oraria):" #: ../share/extensions/hpgl_output.inx.h:15 -#: ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/plotter.inx.h:43 msgid "Rotation of the drawing (Default: 0°)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:16 -#: ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/plotter.inx.h:44 #, fuzzy msgid "Mirror X axis" msgstr "Asse Y riflessione" #: ../share/extensions/hpgl_output.inx.h:17 -#: ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/plotter.inx.h:45 msgid "Check this to mirror the X axis (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:18 -#: ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/plotter.inx.h:46 #, fuzzy msgid "Mirror Y axis" msgstr "Asse Y riflessione" #: ../share/extensions/hpgl_output.inx.h:19 -#: ../share/extensions/plotter.inx.h:38 +#: ../share/extensions/plotter.inx.h:47 msgid "Check this to mirror the Y axis (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:20 -#: ../share/extensions/plotter.inx.h:39 +#: ../share/extensions/plotter.inx.h:48 #, fuzzy msgid "Center zero point" msgstr "Centra linee" #: ../share/extensions/hpgl_output.inx.h:21 -#: ../share/extensions/plotter.inx.h:40 +#: ../share/extensions/plotter.inx.h:49 msgid "" "Check this if your plotter uses a centered zero point (Default: Unchecked)" msgstr "" #: ../share/extensions/hpgl_output.inx.h:22 -#: ../share/extensions/plotter.inx.h:41 +#: ../share/extensions/plotter.inx.h:50 +msgid "" +"If you want to use multiple pens on your pen plotter create one layer for " +"each pen, name the layers \"Pen 1\", \"Pen 2\", etc., and put your drawings " +"in the corresponding layers. This overrules the pen number option above." +msgstr "" + +#: ../share/extensions/hpgl_output.inx.h:23 +#: ../share/extensions/plotter.inx.h:51 #, fuzzy msgid "Plot Features " msgstr "Cuoio" -#: ../share/extensions/hpgl_output.inx.h:23 -#: ../share/extensions/plotter.inx.h:42 +#: ../share/extensions/hpgl_output.inx.h:24 +#: ../share/extensions/plotter.inx.h:52 msgid "Overcut (mm):" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:24 -#: ../share/extensions/plotter.inx.h:43 +#: ../share/extensions/hpgl_output.inx.h:25 +#: ../share/extensions/plotter.inx.h:53 msgid "" "The distance in mm that will be cut over the starting point of the path to " "prevent open paths, set to 0.0 to omit command (Default: 1.00)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:25 -#: ../share/extensions/plotter.inx.h:44 +#: ../share/extensions/hpgl_output.inx.h:26 +#: ../share/extensions/plotter.inx.h:54 #, fuzzy -msgid "Tool offset (mm):" +msgid "Tool (Knife) offset correction (mm):" msgstr "Proiezione orizzontale, px" -#: ../share/extensions/hpgl_output.inx.h:26 -#: ../share/extensions/plotter.inx.h:45 +#: ../share/extensions/hpgl_output.inx.h:27 +#: ../share/extensions/plotter.inx.h:55 msgid "" "The offset from the tool tip to the tool axis in mm, set to 0.0 to omit " "command (Default: 0.25)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:27 -#: ../share/extensions/plotter.inx.h:46 +#: ../share/extensions/hpgl_output.inx.h:28 +#: ../share/extensions/plotter.inx.h:56 #, fuzzy -msgid "Use precut" +msgid "Precut" msgstr "Impostazioni predefinita del sistema" -#: ../share/extensions/hpgl_output.inx.h:28 -#: ../share/extensions/plotter.inx.h:47 +#: ../share/extensions/hpgl_output.inx.h:29 +#: ../share/extensions/plotter.inx.h:57 msgid "" "Check this to cut a small line before the real drawing starts to correctly " "align the tool orientation. (Default: Checked)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:29 -#: ../share/extensions/plotter.inx.h:48 +#: ../share/extensions/hpgl_output.inx.h:30 +#: ../share/extensions/plotter.inx.h:58 #, fuzzy msgid "Curve flatness:" msgstr "Appiattimento" -#: ../share/extensions/hpgl_output.inx.h:30 -#: ../share/extensions/plotter.inx.h:49 +#: ../share/extensions/hpgl_output.inx.h:31 +#: ../share/extensions/plotter.inx.h:59 msgid "" "Curves are divided into lines, this number controls how fine the curves will " "be reproduced, the smaller the finer (Default: '1.2')" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:31 -#: ../share/extensions/plotter.inx.h:50 +#: ../share/extensions/hpgl_output.inx.h:32 +#: ../share/extensions/plotter.inx.h:60 #, fuzzy msgid "Auto align" msgstr "Allineamento" -#: ../share/extensions/hpgl_output.inx.h:32 -#: ../share/extensions/plotter.inx.h:51 +#: ../share/extensions/hpgl_output.inx.h:33 +#: ../share/extensions/plotter.inx.h:61 msgid "" "Check this to auto align the drawing to the zero point (Plus the tool offset " "if used). If unchecked you have to make sure that all parts of your drawing " "are within the document border! (Default: Checked)" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:33 -#: ../share/extensions/plotter.inx.h:54 +#: ../share/extensions/hpgl_output.inx.h:34 +#: ../share/extensions/plotter.inx.h:64 msgid "" "All these settings depend on the plotter you use, for more information " "please consult the manual or homepage for your plotter." msgstr "" -#: ../share/extensions/hpgl_output.inx.h:35 +#: ../share/extensions/hpgl_output.inx.h:36 #, fuzzy msgid "Export an HP Graphics Language file" msgstr "Esporta un file HP Graphics Language" +#: ../share/extensions/image_attributes.inx.h:1 +#, fuzzy +msgid "Set Image Attributes" +msgstr "Imposta attributi" + +#. render images like in 0.48 +#: ../share/extensions/image_attributes.inx.h:3 +#, fuzzy +msgid "Basic" +msgstr "Latino di base" + +#. render images like in 0.48 +#: ../share/extensions/image_attributes.inx.h:5 +msgid "Support non-uniform scaling" +msgstr "" + +#. render images like in 0.48 +#: ../share/extensions/image_attributes.inx.h:7 +msgid "Render images blocky" +msgstr "" + +#. render images like in 0.48 +#: ../share/extensions/image_attributes.inx.h:9 +msgid "" +"Render all bitmap images like in older Inskcape versions. Available options:" +msgstr "" + +#. image aspect ratio +#: ../share/extensions/image_attributes.inx.h:11 +#, fuzzy +msgid "Image Aspect Ratio" +msgstr "Semplificazione immagine" + +#. image aspect ratio +#: ../share/extensions/image_attributes.inx.h:13 +msgid "preserveAspectRatio attribute:" +msgstr "" + +#. image aspect ratio +#: ../share/extensions/image_attributes.inx.h:15 +msgid "meetOrSlice:" +msgstr "" + +#. image-rendering +#: ../share/extensions/image_attributes.inx.h:17 +#, fuzzy +msgid "Scope:" +msgstr "Esamina" + +#. image-rendering +#: ../share/extensions/image_attributes.inx.h:19 +#, fuzzy +msgid "Unset" +msgstr "Intrusione" + +#: ../share/extensions/image_attributes.inx.h:20 +#, fuzzy +msgid "Change only selected image(s)" +msgstr "Incorpora solo le immagini selezionate" + +#: ../share/extensions/image_attributes.inx.h:21 +#, fuzzy +msgid "Change all images in selection" +msgstr "Non è stata trovata alcuna ellisse nella selezione" + +#: ../share/extensions/image_attributes.inx.h:22 +#, fuzzy +msgid "Change all images in document" +msgstr "Controlla ortografia testo nel documento" + +#. image-rendering +#: ../share/extensions/image_attributes.inx.h:24 +#, fuzzy +msgid "Image Rendering Quality" +msgstr "Rendering immagine:" + +#. image-rendering +#: ../share/extensions/image_attributes.inx.h:26 +#, fuzzy +msgid "Image rendering attribute:" +msgstr "Modalità rendering immagine:" + +#: ../share/extensions/image_attributes.inx.h:27 +#, fuzzy +msgid "Apply attribute to parent group of selection" +msgstr "Applica la trasformazione alla selezione" + +#: ../share/extensions/image_attributes.inx.h:28 +#, fuzzy +msgid "Apply attribute to SVG root" +msgstr "Attributo da impostare:" + #: ../share/extensions/ink2canvas.inx.h:1 msgid "Convert to html5 canvas" msgstr "Converti in html5 canvas" @@ -33089,11 +36095,6 @@ msgstr "http://inkscape.org/doc/inkscape-man.html" msgid "FAQ" msgstr "FAQ" -#. i18n. Please don't translate it unless a page exists in your language -#: ../share/extensions/inkscape_help_faq.inx.h:3 -msgid "http://wiki.inkscape.org/wiki/index.php/FAQ" -msgstr "http://wiki.inkscape.org/wiki/index.php/itFAQ" - #: ../share/extensions/inkscape_help_keys.inx.h:1 msgid "Keys and Mouse Reference" msgstr "Scorciatoie con mouse e tastiera" @@ -33150,6 +36151,17 @@ msgstr "Duplica nodi finale" msgid "Interpolate style" msgstr "Stile d'interpolazione" +#: ../share/extensions/interp.inx.h:7 +#: ../share/extensions/interp_att_g.inx.h:10 +#, fuzzy +msgid "Use Z-order" +msgstr "Bordo rialzato" + +#: ../share/extensions/interp.inx.h:8 +#: ../share/extensions/interp_att_g.inx.h:11 +msgid "Workaround for reversed selection order in Live Preview cycles" +msgstr "" + #: ../share/extensions/interp_att_g.inx.h:1 msgid "Interpolate Attribute in a group" msgstr "Interpola attributi in un gruppo" @@ -33178,23 +36190,24 @@ msgstr "Valore iniziale:" msgid "End Value:" msgstr "Valore finale:" -#: ../share/extensions/interp_att_g.inx.h:13 +#: ../share/extensions/interp_att_g.inx.h:15 msgid "Translate X" msgstr "Spostamento X" -#: ../share/extensions/interp_att_g.inx.h:14 +#: ../share/extensions/interp_att_g.inx.h:16 msgid "Translate Y" msgstr "Spostamento Y" -#: ../share/extensions/interp_att_g.inx.h:15 +#: ../share/extensions/interp_att_g.inx.h:17 +#: ../share/extensions/markers_strokepaint.inx.h:9 msgid "Fill" msgstr "Riempimento" -#: ../share/extensions/interp_att_g.inx.h:17 +#: ../share/extensions/interp_att_g.inx.h:19 msgid "Other" msgstr "Altro" -#: ../share/extensions/interp_att_g.inx.h:18 +#: ../share/extensions/interp_att_g.inx.h:20 msgid "" "If you select \"Other\", you must know the SVG attributes to identify here " "this \"other\"." @@ -33202,36 +36215,32 @@ msgstr "" "Se si seleziona \"Altro\", occorre conoscere gli attributi SVG per " "determinare questo \"altro\"." -#: ../share/extensions/interp_att_g.inx.h:20 +#: ../share/extensions/interp_att_g.inx.h:22 msgid "Integer Number" msgstr "Numero intero" -#: ../share/extensions/interp_att_g.inx.h:21 +#: ../share/extensions/interp_att_g.inx.h:23 msgid "Float Number" msgstr "Numero decimale" -#: ../share/extensions/interp_att_g.inx.h:22 -msgid "Tag" -msgstr "Etichetta" - -#: ../share/extensions/interp_att_g.inx.h:23 +#: ../share/extensions/interp_att_g.inx.h:25 #: ../share/extensions/polyhedron_3d.inx.h:33 msgid "Style" msgstr "Stile" -#: ../share/extensions/interp_att_g.inx.h:24 +#: ../share/extensions/interp_att_g.inx.h:26 msgid "Transformation" msgstr "Trasformazione" -#: ../share/extensions/interp_att_g.inx.h:25 +#: ../share/extensions/interp_att_g.inx.h:27 msgid "••••••••••••••••••••••••••••••••••••••••••••••••" msgstr "••••••••••••••••••••••••••••••••••••••••••••••••" -#: ../share/extensions/interp_att_g.inx.h:26 +#: ../share/extensions/interp_att_g.inx.h:28 msgid "No Unit" msgstr "Nessuna unità" -#: ../share/extensions/interp_att_g.inx.h:28 +#: ../share/extensions/interp_att_g.inx.h:30 msgid "" "This effect applies a value for any interpolatable attribute for all " "elements inside the selected group or for all elements in a multiple " @@ -33971,67 +36980,159 @@ msgstr "" "esso; altrimenti viene creato in un nuovo livello un testo dinamico, della " "larghezza della pagina intera." +#: ../share/extensions/markers_strokepaint.inx.h:1 +msgid "Color Markers" +msgstr "Colore delimitatori" + +#: ../share/extensions/markers_strokepaint.inx.h:2 +msgid "From object" +msgstr "Da oggetto" + +#: ../share/extensions/markers_strokepaint.inx.h:3 +msgid "Marker type:" +msgstr "Tipo delimitatore:" + +#: ../share/extensions/markers_strokepaint.inx.h:4 +msgid "Invert fill and stroke colors" +msgstr "Inverti colori di riempimento e contorno" + +#: ../share/extensions/markers_strokepaint.inx.h:5 +msgid "Assign alpha" +msgstr "Assegna opacità" + +#: ../share/extensions/markers_strokepaint.inx.h:6 +msgid "solid" +msgstr "solido" + +#: ../share/extensions/markers_strokepaint.inx.h:7 +msgid "filled" +msgstr "riempito" + +#: ../share/extensions/markers_strokepaint.inx.h:10 +msgid "Assign fill color" +msgstr "Assegna colore di riempimento" + +#: ../share/extensions/markers_strokepaint.inx.h:11 +msgid "Stroke" +msgstr "Contorno" + +#: ../share/extensions/markers_strokepaint.inx.h:12 +msgid "Assign stroke color" +msgstr "Assegna colore contorno" + #: ../share/extensions/measure.inx.h:1 msgid "Measure Path" msgstr "Misura tracciato" -#: ../share/extensions/measure.inx.h:2 -msgid "Measure" -msgstr "Misura" - #: ../share/extensions/measure.inx.h:3 msgid "Measurement Type: " msgstr "Tipo di misurazione: " #: ../share/extensions/measure.inx.h:4 -msgid "Text Orientation: " -msgstr "Orientamento testo: " - -#: ../share/extensions/measure.inx.h:5 -msgid "Angle [with Fixed Angle option only] (°):" -msgstr "Angolo [solo con Angolo fisso] (°):" +#, fuzzy +msgid "Text Presets" +msgstr "Preferenze testo" #: ../share/extensions/measure.inx.h:6 +#, fuzzy +msgid "Text on Path" +msgstr "Testo su tracciato" + +#: ../share/extensions/measure.inx.h:8 +#, fuzzy, no-c-format +msgid "Offset (%)" +msgstr "Scostamento (px):" + +#: ../share/extensions/measure.inx.h:9 +#, fuzzy +msgid "Text anchor:" +msgstr "Ancoraggio testo" + +#: ../share/extensions/measure.inx.h:10 +#, fuzzy +msgid "Fixed Text" +msgstr "Testo dinamico" + +#: ../share/extensions/measure.inx.h:11 +#, fuzzy +msgid "Angle (°):" +msgstr "Angolo X:" + +#: ../share/extensions/measure.inx.h:12 msgid "Font size (px):" msgstr "Dimensione carattere (px):" -#: ../share/extensions/measure.inx.h:7 +#: ../share/extensions/measure.inx.h:13 msgid "Offset (px):" msgstr "Scostamento (px):" -#: ../share/extensions/measure.inx.h:8 -msgid "Precision:" -msgstr "Precisione:" - -#: ../share/extensions/measure.inx.h:9 +#: ../share/extensions/measure.inx.h:15 msgid "Scale Factor (Drawing:Real Length) = 1:" msgstr "Fattore di riduzione (Disegno:Lughezza reale) = 1:" -#: ../share/extensions/measure.inx.h:10 +#: ../share/extensions/measure.inx.h:16 msgid "Length Unit:" msgstr "Unità di lunghezza:" -#: ../share/extensions/measure.inx.h:12 +#: ../share/extensions/measure.inx.h:18 msgctxt "measure extension" msgid "Area" msgstr "Area" -#: ../share/extensions/measure.inx.h:13 +#: ../share/extensions/measure.inx.h:19 msgctxt "measure extension" msgid "Center of Mass" msgstr "Centro di massa" -#: ../share/extensions/measure.inx.h:14 -msgctxt "measure extension" -msgid "Text On Path" +#: ../share/extensions/measure.inx.h:21 +#, fuzzy +msgid "Text on Path, Start" msgstr "Testo su tracciato" -#: ../share/extensions/measure.inx.h:15 -msgctxt "measure extension" -msgid "Fixed Angle" -msgstr "Angolo fisso" +#: ../share/extensions/measure.inx.h:22 +#, fuzzy +msgid "Text on Path, Middle" +msgstr "Testo su tracciato" -#: ../share/extensions/measure.inx.h:18 +#: ../share/extensions/measure.inx.h:23 +#, fuzzy +msgid "Text on Path, End" +msgstr "Testo su tracciato" + +#: ../share/extensions/measure.inx.h:24 +msgid "Fixed Text, Start of Path" +msgstr "" + +#: ../share/extensions/measure.inx.h:25 +msgid "Fixed Text, Center of BBox" +msgstr "" + +#: ../share/extensions/measure.inx.h:26 +#, fuzzy +msgid "Fixed Text, Center of Mass" +msgstr "Centro di massa" + +#: ../share/extensions/measure.inx.h:28 +#, fuzzy +msgid "Center" +msgstr "centro" + +#: ../share/extensions/measure.inx.h:30 +#, fuzzy +msgid "Start of Path" +msgstr "Da _contorno a tracciato" + +#: ../share/extensions/measure.inx.h:31 +#, fuzzy +msgid "Center of BBox" +msgstr "Centro di massa" + +#: ../share/extensions/measure.inx.h:32 +#, fuzzy +msgid "Center of Mass" +msgstr "Centro di massa" + +#: ../share/extensions/measure.inx.h:35 #, no-c-format msgid "" "This effect measures the length, area, or center-of-mass of the selected " @@ -34106,6 +37207,175 @@ msgstr "Carattere unicode:" msgid "View Next Glyph" msgstr "Visualizza glifo successivo" +#: ../share/extensions/nicechart.inx.h:1 +msgid "NiceCharts" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:2 +msgid "Data" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:3 +#, fuzzy +msgid "Data from file" +msgstr "Carica da file" + +#: ../share/extensions/nicechart.inx.h:5 +#, fuzzy +msgid "Delimiter:" +msgstr "Spigolosità:" + +#: ../share/extensions/nicechart.inx.h:6 +msgid "Column that contains the keys:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:7 +#, fuzzy +msgid "Column that contains the values:" +msgstr "Angolo di rotazione" + +#: ../share/extensions/nicechart.inx.h:8 +msgid "File encoding (e.g. utf-8):" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:9 +msgid "First line contains headings" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:10 +#, fuzzy +msgid "Direct input" +msgstr "Direzione" + +#: ../share/extensions/nicechart.inx.h:11 +msgid "Data:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:12 +#, fuzzy +msgid "Enter the full path to a CSV file:" +msgstr "Percorso completo al file di log:" + +#: ../share/extensions/nicechart.inx.h:13 +msgid "Type in comma separated values:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:14 +msgid "(format like this: apples:3,bananas:5)" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:15 +#, fuzzy +msgid "Labels" +msgstr "Etichetta" + +#: ../share/extensions/nicechart.inx.h:16 +#, fuzzy +msgid "Font:" +msgstr "Carattere" + +#: ../share/extensions/nicechart.inx.h:18 +#, fuzzy +msgid "Font color:" +msgstr "Colore del mese:" + +#: ../share/extensions/nicechart.inx.h:19 +msgid "Charts" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:20 +#, fuzzy +msgid "Draw horizontally" +msgstr "Muovi orizzontalmente" + +#: ../share/extensions/nicechart.inx.h:21 +#, fuzzy +msgid "Bar length:" +msgstr "Lunghezza p_rincipali:" + +#: ../share/extensions/nicechart.inx.h:22 +#, fuzzy +msgid "Bar width:" +msgstr "Larghezza sfocatura:" + +#: ../share/extensions/nicechart.inx.h:23 +#, fuzzy +msgid "Pie radius:" +msgstr "Raggio interno:" + +#: ../share/extensions/nicechart.inx.h:24 +#, fuzzy +msgid "Bar offset:" +msgstr "Spostamento blu" + +#: ../share/extensions/nicechart.inx.h:26 +msgid "Offset between chart and labels:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:27 +msgid "Offset between chart and chart title:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:28 +msgid "Work around aliasing effects (creates overlapping segments)" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:29 +#, fuzzy +msgid "Color scheme:" +msgstr "Colori:" + +#: ../share/extensions/nicechart.inx.h:30 +#, fuzzy +msgid "Custom colors:" +msgstr "Colore rugosità" + +#: ../share/extensions/nicechart.inx.h:31 +#, fuzzy +msgid "Reverse color scheme" +msgstr "Rimuovi colore contorno" + +#: ../share/extensions/nicechart.inx.h:32 +#, fuzzy +msgid "Drop shadow" +msgstr "Proietta ombra" + +#: ../share/extensions/nicechart.inx.h:37 +msgid "SAP" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:38 +#, fuzzy +msgid "Values" +msgstr "Valore" + +#: ../share/extensions/nicechart.inx.h:39 +#, fuzzy +msgid "Show values" +msgstr "Mostra maniglie" + +#: ../share/extensions/nicechart.inx.h:40 +#, fuzzy +msgid "Chart type:" +msgstr "Tipo ombra:" + +#: ../share/extensions/nicechart.inx.h:41 +#, fuzzy +msgid "Bar chart" +msgstr "Altezza barre:" + +#: ../share/extensions/nicechart.inx.h:42 +msgid "Pie chart" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:43 +msgid "Pie chart (percentage)" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:44 +msgid "Stacked bar chart" +msgstr "" + #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" msgstr "Curva parametrica" @@ -34342,10 +37612,6 @@ msgstr "Margine (in):" msgid "Note: Bond Weight # calculations are a best-guess estimate." msgstr "Nota: i calcoli sul peso dichiaro sono frutto di una stima empirica." -#: ../share/extensions/perspective.inx.h:1 -msgid "Perspective" -msgstr "Prospettiva" - #: ../share/extensions/pixelsnap.inx.h:1 msgid "PixelSnap" msgstr "Aggancia Pixel" @@ -34394,86 +37660,117 @@ msgstr "" #: ../share/extensions/plotter.inx.h:8 #, fuzzy -msgid "Flow control:" +msgid "Serial byte size:" +msgstr "Incolla dimensione" + +#: ../share/extensions/plotter.inx.h:10 +#, no-c-format +msgid "" +"The Byte size of your serial connection, 99% of all plotters use the default " +"setting (Default: 8 Bits)" +msgstr "" + +#: ../share/extensions/plotter.inx.h:11 +#, fuzzy +msgid "Serial stop bits:" +msgstr "Punto verticale:" + +#: ../share/extensions/plotter.inx.h:13 +#, no-c-format +msgid "" +"The Stop bits of your serial connection, 99% of all plotters use the default " +"setting (Default: 1 Bit)" +msgstr "" + +#: ../share/extensions/plotter.inx.h:14 +#, fuzzy +msgid "Serial parity:" +msgstr "Punto verticale:" + +#: ../share/extensions/plotter.inx.h:16 +#, no-c-format +msgid "" +"The Parity of your serial connection, 99% of all plotters use the default " +"setting (Default: None)" +msgstr "" + +#: ../share/extensions/plotter.inx.h:17 +#, fuzzy +msgid "Serial flow control:" msgstr "Navigazione" -#: ../share/extensions/plotter.inx.h:9 +#: ../share/extensions/plotter.inx.h:18 msgid "" "The Software / Hardware flow control of your serial connection (Default: " "Software)" msgstr "" -#: ../share/extensions/plotter.inx.h:10 +#: ../share/extensions/plotter.inx.h:19 #, fuzzy msgid "Command language:" msgstr "Seconda lingua:" -#: ../share/extensions/plotter.inx.h:11 +#: ../share/extensions/plotter.inx.h:20 msgid "The command language to use (Default: HPGL)" msgstr "" -#: ../share/extensions/plotter.inx.h:12 +#: ../share/extensions/plotter.inx.h:21 msgid "Software (XON/XOFF)" msgstr "Software (XON/XOFF)" -#: ../share/extensions/plotter.inx.h:13 +#: ../share/extensions/plotter.inx.h:22 msgid "Hardware (RTS/CTS)" msgstr "Hardware (RTS/CTS)" -#: ../share/extensions/plotter.inx.h:14 +#: ../share/extensions/plotter.inx.h:23 msgid "Hardware (DSR/DTR + RTS/CTS)" msgstr "Hardware (DSR/DTR + RTS/CTS)" -#: ../share/extensions/plotter.inx.h:15 -#, fuzzy -msgctxt "Flow control" -msgid "None" -msgstr "Nessuno" - -#: ../share/extensions/plotter.inx.h:16 +#: ../share/extensions/plotter.inx.h:25 msgid "HPGL" msgstr "HPGL" -#: ../share/extensions/plotter.inx.h:17 +#: ../share/extensions/plotter.inx.h:26 msgid "DMPL" msgstr "DMPL" -#: ../share/extensions/plotter.inx.h:18 -msgid "KNK Zing (HPGL variant)" +#: ../share/extensions/plotter.inx.h:27 +#, fuzzy +msgid "KNK Plotter (HPGL variant)" msgstr "KNK Zing (variante HPGL)" -#: ../share/extensions/plotter.inx.h:19 +#: ../share/extensions/plotter.inx.h:28 msgid "" "Using wrong settings can under certain circumstances cause Inkscape to " "freeze. Always save your work before plotting!" msgstr "" -#: ../share/extensions/plotter.inx.h:20 +#: ../share/extensions/plotter.inx.h:29 msgid "" "This can be a physical serial connection or a USB-to-Serial bridge. Ask your " "plotter manufacturer for drivers if needed." msgstr "" -#: ../share/extensions/plotter.inx.h:21 +#: ../share/extensions/plotter.inx.h:30 msgid "Parallel (LPT) connections are not supported." msgstr "" -#: ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/plotter.inx.h:41 msgid "" "The speed the pen will move with in centimeters or millimeters per second " "(depending on your plotter model), set to 0 to omit command. Most plotters " "ignore this command. (Default: 0)" msgstr "" -#: ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/plotter.inx.h:42 msgid "Rotation (°, clockwise):" msgstr "Rotazione (°, oraria):" -#: ../share/extensions/plotter.inx.h:52 +#: ../share/extensions/plotter.inx.h:62 msgid "Show debug information" msgstr "Mostra informazioni di debug" -#: ../share/extensions/plotter.inx.h:53 +#: ../share/extensions/plotter.inx.h:63 msgid "" "Check this to get verbose information about the plot without actually " "sending something to the plotter (A.k.a. data dump) (Default: Unchecked)" @@ -34773,10 +38070,6 @@ msgstr "Spostamento massimo sulle X (px):" msgid "Maximum displacement in Y (px):" msgstr "Spostamento massimo sulle Y (px):" -#: ../share/extensions/radiusrand.inx.h:5 -msgid "Shift nodes" -msgstr "Sposta nodi" - #: ../share/extensions/radiusrand.inx.h:6 msgid "Shift node handles" msgstr "Sposta maniglie dei nodi" @@ -34841,10 +38134,6 @@ msgid "See http://www.denso-wave.com/qrcode/index-e.html for details" msgstr "" "Consulta http://www.denso-wave.com/qrcode/index-e.html per informazioni" -#: ../share/extensions/render_barcode_qrcode.inx.h:5 -msgid "Auto" -msgstr "Automatico" - #: ../share/extensions/render_barcode_qrcode.inx.h:6 msgid "" "With \"Auto\", the size of the barcode depends on the length of the text and " @@ -34969,64 +38258,105 @@ msgid "Restack" msgstr "Reimpila" #: ../share/extensions/restack.inx.h:2 -msgid "Restack Direction:" -msgstr "Direzione della pila:" +#, fuzzy +msgid "Based on Position" +msgstr "Posizione" #: ../share/extensions/restack.inx.h:3 +#, fuzzy +msgid "Presets" +msgstr "Preimpostato" + +#: ../share/extensions/restack.inx.h:6 +#, fuzzy +msgid "Horizontal:" +msgstr "Ori_zzontale:" + +#: ../share/extensions/restack.inx.h:7 +#, fuzzy +msgid "Vertical:" +msgstr "_Verticale:" + +#: ../share/extensions/restack.inx.h:8 +#, fuzzy +msgid "Restack Direction" +msgstr "Direzione della pila:" + +#: ../share/extensions/restack.inx.h:9 msgid "Left to Right (0)" msgstr "Da sinistra a destra (0)" -#: ../share/extensions/restack.inx.h:4 +#: ../share/extensions/restack.inx.h:10 msgid "Bottom to Top (90)" msgstr "Dal fondo alla cima (90)" -#: ../share/extensions/restack.inx.h:5 +#: ../share/extensions/restack.inx.h:11 msgid "Right to Left (180)" msgstr "Da destra a sinistra (180)" -#: ../share/extensions/restack.inx.h:6 +#: ../share/extensions/restack.inx.h:12 msgid "Top to Bottom (270)" msgstr "Dalla cima al fondo (270)" -#: ../share/extensions/restack.inx.h:7 +#: ../share/extensions/restack.inx.h:13 msgid "Radial Outward" msgstr "Raggio esterno" -#: ../share/extensions/restack.inx.h:8 +#: ../share/extensions/restack.inx.h:14 msgid "Radial Inward" msgstr "Raggio interno" -#: ../share/extensions/restack.inx.h:9 -msgid "Arbitrary Angle" -msgstr "Angolo arbitrario" - -#: ../share/extensions/restack.inx.h:11 -msgid "Horizontal Point:" -msgstr "Punto orizzontale:" +#: ../share/extensions/restack.inx.h:15 +#, fuzzy +msgid "Object Reference Point" +msgstr "Preferenze gradiente" -#: ../share/extensions/restack.inx.h:13 +#: ../share/extensions/restack.inx.h:17 #: ../share/extensions/text_extract.inx.h:9 #: ../share/extensions/text_merge.inx.h:9 msgid "Middle" msgstr "Metà" -#: ../share/extensions/restack.inx.h:15 -msgid "Vertical Point:" -msgstr "Punto verticale:" - -#: ../share/extensions/restack.inx.h:16 +#: ../share/extensions/restack.inx.h:19 #: ../share/extensions/text_extract.inx.h:12 #: ../share/extensions/text_merge.inx.h:12 msgid "Top" msgstr "Cima" -#: ../share/extensions/restack.inx.h:17 +#: ../share/extensions/restack.inx.h:20 #: ../share/extensions/text_extract.inx.h:13 #: ../share/extensions/text_merge.inx.h:13 msgid "Bottom" msgstr "Fondo" -#: ../share/extensions/restack.inx.h:18 +#: ../share/extensions/restack.inx.h:21 +#, fuzzy +msgid "Based on Z-Order" +msgstr "Bordo rialzato" + +#: ../share/extensions/restack.inx.h:22 +#, fuzzy +msgid "Restack Mode" +msgstr "Reimpila" + +#: ../share/extensions/restack.inx.h:23 +#, fuzzy +msgid "Reverse Z-Order" +msgstr "Inverti gradiente" + +#: ../share/extensions/restack.inx.h:24 +msgid "Shuffle Z-Order" +msgstr "" + +#: ../share/extensions/restack.inx.h:26 +msgid "" +"This extension changes the z-order of objects based on their position on the " +"canvas or their current z-order. Selection: The extension restacks either " +"objects inside a single selected group, or a selection of multiple objects " +"on the current drawing level (layer or group)." +msgstr "" + +#: ../share/extensions/restack.inx.h:27 msgid "Arrange" msgstr "Ordinamento" @@ -35042,6 +38372,15 @@ msgstr "Dimensione iniziale:" msgid "Minimum size:" msgstr "Dimensione minima:" +#: ../share/extensions/rtree.inx.h:4 +#, fuzzy +msgid "Omit redundant segments" +msgstr "Appiattisci segmenti" + +#: ../share/extensions/rtree.inx.h:5 +msgid "Lift pen for backward steps" +msgstr "" + #: ../share/extensions/rubberstretch.inx.h:1 msgid "Rubber Stretch" msgstr "Deformazione elastica" @@ -35061,173 +38400,317 @@ msgid "Optimized SVG Output" msgstr "Output SVG ottimizzato" #: ../share/extensions/scour.inx.h:3 +msgid "Number of significant digits for coordinates:" +msgstr "" + +#: ../share/extensions/scour.inx.h:4 +msgid "" +"Specifies the number of significant digits that should be output for " +"coordinates. Note that significant digits are *not* the number of decimals " +"but the overall number of digits in the output. For example if a value of " +"\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " +"coordinate 123.675 is output as 124." +msgstr "" + +#: ../share/extensions/scour.inx.h:5 #, fuzzy msgid "Shorten color values" msgstr "Colori tenui" -#: ../share/extensions/scour.inx.h:4 +#: ../share/extensions/scour.inx.h:6 +msgid "" +"Convert all color specifications to #RRGGBB (or #RGB where applicable) " +"format." +msgstr "" + +#: ../share/extensions/scour.inx.h:7 #, fuzzy msgid "Convert CSS attributes to XML attributes" msgstr "Cancella attributo" -#: ../share/extensions/scour.inx.h:5 -msgid "Group collapsing" +#: ../share/extensions/scour.inx.h:8 +msgid "" +"Convert styles from style tags and inline style=\"\" declarations into XML " +"attributes." msgstr "" -#: ../share/extensions/scour.inx.h:6 +#: ../share/extensions/scour.inx.h:9 +#, fuzzy +msgid "Collapse groups" +msgstr "Area cuscinetto" + +#: ../share/extensions/scour.inx.h:10 +msgid "" +"Remove useless groups, promoting their contents up one level. Requires " +"\"Remove unused IDs\" to be set." +msgstr "" + +#: ../share/extensions/scour.inx.h:11 msgid "Create groups for similar attributes" msgstr "" -#: ../share/extensions/scour.inx.h:7 -#, fuzzy -msgid "Embed rasters" -msgstr "Incorpora immagini" +#: ../share/extensions/scour.inx.h:12 +msgid "" +"Create groups for runs of elements having at least one attribute in common " +"(e.g. fill-color, stroke-opacity, ...)." +msgstr "" -#: ../share/extensions/scour.inx.h:8 +#: ../share/extensions/scour.inx.h:13 msgid "Keep editor data" msgstr "" -#: ../share/extensions/scour.inx.h:9 +#: ../share/extensions/scour.inx.h:14 +msgid "" +"Don't remove editor-specific elements and attributes. Currently supported: " +"Inkscape, Sodipodi and Adobe Illustrator." +msgstr "" + +#: ../share/extensions/scour.inx.h:15 +msgid "Keep unreferenced definitions" +msgstr "" + +#: ../share/extensions/scour.inx.h:16 +msgid "Keep element definitions that are not currently used in the SVG" +msgstr "" + +#: ../share/extensions/scour.inx.h:17 +msgid "Work around renderer bugs" +msgstr "" + +#: ../share/extensions/scour.inx.h:18 +msgid "" +"Works around some common renderer bugs (mainly libRSVG) at the cost of a " +"slightly larger SVG file." +msgstr "" + +#: ../share/extensions/scour.inx.h:20 +#, fuzzy +msgid "Remove the XML declaration" +msgstr "Rimuovi _trasformazioni" + +#: ../share/extensions/scour.inx.h:21 +msgid "" +"Removes the XML declaration (which is optional but should be provided, " +"especially if special characters are used in the document) from the file " +"header." +msgstr "" + +#: ../share/extensions/scour.inx.h:22 #, fuzzy msgid "Remove metadata" msgstr "Rimuovi metadati" -#: ../share/extensions/scour.inx.h:10 +#: ../share/extensions/scour.inx.h:23 +msgid "" +"Remove metadata tags along with all the contained information, which may " +"include license and author information, alternate versions for non-SVG-" +"enabled browsers, etc." +msgstr "" + +#: ../share/extensions/scour.inx.h:24 #, fuzzy msgid "Remove comments" msgstr "Rimuovi font" -#: ../share/extensions/scour.inx.h:11 -msgid "Work around renderer bugs" +#: ../share/extensions/scour.inx.h:25 +msgid "Remove all XML comments from output." msgstr "" -#: ../share/extensions/scour.inx.h:12 +#: ../share/extensions/scour.inx.h:26 +#, fuzzy +msgid "Embed raster images" +msgstr "Incorpora immagini" + +#: ../share/extensions/scour.inx.h:27 +msgid "" +"Resolve external references to raster images and embed them as Base64-" +"encoded data URLs." +msgstr "" + +#: ../share/extensions/scour.inx.h:28 #, fuzzy msgid "Enable viewboxing" msgstr "Attiva anteprima" -#: ../share/extensions/scour.inx.h:13 +#: ../share/extensions/scour.inx.h:30 +#, no-c-format +msgid "" +"Set page size to 100%/100% (full width and height of the display area) and " +"introduce a viewBox specifying the drawings dimensions." +msgstr "" + +#: ../share/extensions/scour.inx.h:31 +msgid "Format output with line-breaks and indentation" +msgstr "" + +#: ../share/extensions/scour.inx.h:32 +msgid "" +"Produce nicely formatted output including line-breaks. If you do not intend " +"to hand-edit the SVG file you can disable this option to bring down the file " +"size even more at the cost of clarity." +msgstr "" + +#: ../share/extensions/scour.inx.h:33 #, fuzzy -msgid "Remove the xml declaration" -msgstr "Rimuovi _trasformazioni" +msgid "Indentation characters:" +msgstr "Carattere unicode:" -#: ../share/extensions/scour.inx.h:14 -msgid "Number of significant digits for coords:" +#: ../share/extensions/scour.inx.h:34 +msgid "" +"The type of indentation used for each level of nesting in the output. " +"Specify \"None\" to disable indentation. This option has no effect if " +"\"Format output with line-breaks and indentation\" is disabled." msgstr "" -#: ../share/extensions/scour.inx.h:15 -msgid "XML indentation (pretty-printing):" +#: ../share/extensions/scour.inx.h:35 +#, fuzzy +msgid "Depth of indentation:" +msgstr "Funzione rosso" + +#: ../share/extensions/scour.inx.h:36 +msgid "" +"The depth of the chosen type of indentation. E.g. if you choose \"2\" every " +"nesting level in the output will be indented by two additional spaces/tabs." msgstr "" -#: ../share/extensions/scour.inx.h:16 +#: ../share/extensions/scour.inx.h:37 +msgid "Strip the \"xml:space\" attribute from the root SVG element" +msgstr "" + +#: ../share/extensions/scour.inx.h:38 +msgid "" +"This is useful if the input file specifies \"xml:space='preserve'\" in the " +"root SVG element which instructs the SVG editor not to change whitespace in " +"the document at all (and therefore overrides the options above)." +msgstr "" + +#: ../share/extensions/scour.inx.h:39 +#, fuzzy +msgid "Document options" +msgstr "Proprietà del _documento..." + +#: ../share/extensions/scour.inx.h:40 +#, fuzzy +msgid "Pretty-printing" +msgstr "Pittura" + +#: ../share/extensions/scour.inx.h:41 #, fuzzy msgid "Space" msgstr "Macchia" -#: ../share/extensions/scour.inx.h:17 +#: ../share/extensions/scour.inx.h:42 #, fuzzy msgid "Tab" msgstr "Tabella" -#: ../share/extensions/scour.inx.h:18 +#: ../share/extensions/scour.inx.h:43 #, fuzzy msgctxt "Indent" msgid "None" msgstr "Nessuno" -#: ../share/extensions/scour.inx.h:19 +#: ../share/extensions/scour.inx.h:44 #, fuzzy -msgid "Ids" -msgstr "_Id" +msgid "IDs" +msgstr "ID" -#: ../share/extensions/scour.inx.h:20 -msgid "Remove unused ID names for elements" +#: ../share/extensions/scour.inx.h:45 +#, fuzzy +msgid "Remove unused IDs" +msgstr "Rimuovi rosso" + +#: ../share/extensions/scour.inx.h:46 +msgid "" +"Remove all unreferenced IDs from elements. Those are not needed for " +"rendering." msgstr "" -#: ../share/extensions/scour.inx.h:21 +#: ../share/extensions/scour.inx.h:47 msgid "Shorten IDs" msgstr "" -#: ../share/extensions/scour.inx.h:22 -msgid "Preserve manually created ID names not ending with digits" +#: ../share/extensions/scour.inx.h:48 +msgid "" +"Minimize the length of IDs using only lowercase letters, assigning the " +"shortest values to the most-referenced elements. For instance, " +"\"linearGradient5621\" will become \"a\" if it is the most used element." msgstr "" -#: ../share/extensions/scour.inx.h:23 -msgid "Preserve these ID names, comma-separated:" +#: ../share/extensions/scour.inx.h:49 +msgid "Prefix shortened IDs with:" msgstr "" -#: ../share/extensions/scour.inx.h:24 -msgid "Preserve ID names starting with:" +#: ../share/extensions/scour.inx.h:50 +msgid "Prepend shortened IDs with the specified prefix." msgstr "" -#: ../share/extensions/scour.inx.h:25 -#, fuzzy -msgid "Help (Options)" -msgstr "Opzioni" +#: ../share/extensions/scour.inx.h:51 +msgid "Preserve manually created IDs not ending with digits" +msgstr "" -#: ../share/extensions/scour.inx.h:27 -#, no-c-format +#: ../share/extensions/scour.inx.h:52 msgid "" -"This extension optimizes the SVG file according to the following options:\n" -" * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -" * Convert CSS attributes to XML attributes: convert styles from style " -"tags and inline style=\"\" declarations into XML attributes.\n" -" * Group collapsing: removes useless g elements, promoting their contents " -"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" -" * Create groups for similar attributes: create g elements for runs of " -"elements having at least one attribute in common (e.g. fill color, stroke " -"opacity, ...).\n" -" * Embed rasters: embed raster images as base64-encoded data URLs.\n" -" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " -"elements and attributes.\n" -" * Remove metadata: remove metadata tags along with all the information " -"in them, which may include license metadata, alternate versions for non-SVG-" -"enabled browsers, etc.\n" -" * Remove comments: remove comment tags.\n" -" * Work around renderer bugs: emits slightly larger SVG data, but works " -"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " -"various applications.\n" -" * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" -" * Number of significant digits for coords: all coordinates are output " -"with that number of significant digits. For example, if 3 is specified, the " -"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " -"472.\n" -" * XML indentation (pretty-printing): either None for no indentation, " -"Space to use one space per nesting level, or Tab to use one tab per nesting " -"level." +"Descriptive IDs which were manually created to reference or label specific " +"elements or groups (e.g. #arrowStart, #arrowEnd or #textLabels) will be " +"preserved while numbered IDs (as they are generated by most SVG editors " +"including Inkscape) will be removed/shortened." msgstr "" -#: ../share/extensions/scour.inx.h:40 -msgid "Help (Ids)" +#: ../share/extensions/scour.inx.h:53 +#, fuzzy +msgid "Preserve the following IDs:" msgstr "" +"Trovati i seguenti caratteri:\n" +"%s" -#: ../share/extensions/scour.inx.h:41 +#: ../share/extensions/scour.inx.h:54 +msgid "A comma-separated list of IDs that are to be preserved." +msgstr "" + +#: ../share/extensions/scour.inx.h:55 +msgid "Preserve IDs starting with:" +msgstr "" + +#: ../share/extensions/scour.inx.h:56 msgid "" -"Ids specific options:\n" -" * Remove unused ID names for elements: remove all unreferenced ID " -"attributes.\n" -" * Shorten IDs: reduce the length of all ID attributes, assigning the " -"shortest to the most-referenced elements. For instance, #linearGradient5621, " -"referenced 100 times, can become #a.\n" -" * Preserve manually created ID names not ending with digits: usually, " -"optimised SVG output removes these, but if they're needed for referencing (e." -"g. #middledot), you may use this option.\n" -" * Preserve these ID names, comma-separated: you can use this in " -"conjunction with the other preserve options if you wish to preserve some " -"more specific ID names.\n" -" * Preserve ID names starting with: usually, optimised SVG output removes " -"all unused ID names, but if all of your preserved ID names start with the " -"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +"Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " +"to preserve \"flag-mx\", \"flag-pt\", etc.)." msgstr "" -#: ../share/extensions/scour.inx.h:47 +#: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" msgstr "SVG ottimizzato (*.svg)" -#: ../share/extensions/scour.inx.h:48 +#: ../share/extensions/scour.inx.h:58 msgid "Scalable Vector Graphics" msgstr "Scalable Vector Graphics" +#: ../share/extensions/seamless_pattern.inx.h:1 +#, fuzzy +msgid "Seamless Pattern" +msgstr "Motivi Braille" + +#: ../share/extensions/seamless_pattern.inx.h:2 +#: ../share/extensions/seamless_pattern_procedural.inx.h:2 +#, fuzzy +msgid "Custom Width (px):" +msgstr "Larghezza contorno (px):" + +#: ../share/extensions/seamless_pattern.inx.h:3 +#: ../share/extensions/seamless_pattern_procedural.inx.h:3 +#, fuzzy +msgid "Custom Height (px):" +msgstr "Destra (px):" + +#: ../share/extensions/seamless_pattern.inx.h:4 +msgid "This extension overwrite current document" +msgstr "" + +#: ../share/extensions/seamless_pattern_procedural.inx.h:1 +msgid "Seamless Pattern Procedural" +msgstr "" + #: ../share/extensions/setup_typography_canvas.inx.h:1 msgid "1 - Setup Typography Canvas" msgstr "1 - Imposta canvas tipografico" @@ -35744,22 +39227,45 @@ msgid "Show the bounding box" msgstr "Mostra il riquadro" #: ../share/extensions/voronoi2svg.inx.h:6 +#, fuzzy +msgid "Triangles color" +msgstr "Triangolo decrescente" + +#: ../share/extensions/voronoi2svg.inx.h:7 msgid "Delaunay Triangulation" msgstr "Triangolazione di Delaunay" -#: ../share/extensions/voronoi2svg.inx.h:7 +#: ../share/extensions/voronoi2svg.inx.h:8 msgid "Voronoi and Delaunay" msgstr "Voronoi e Delaunay" -#: ../share/extensions/voronoi2svg.inx.h:8 +#: ../share/extensions/voronoi2svg.inx.h:9 msgid "Options for Voronoi diagram" msgstr "Opzioni per il diagramma di Voronoi" -#: ../share/extensions/voronoi2svg.inx.h:10 +#: ../share/extensions/voronoi2svg.inx.h:11 msgid "Automatic from selected objects" msgstr "Automatico dagli oggetti selezionati" #: ../share/extensions/voronoi2svg.inx.h:12 +#, fuzzy +msgid "Options for Delaunay Triangulation" +msgstr "Triangolazione di Delaunay" + +#: ../share/extensions/voronoi2svg.inx.h:13 +msgid "Default (Stroke black and no fill)" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:14 +#, fuzzy +msgid "Triangles with item color" +msgstr "Cambia colore campione" + +#: ../share/extensions/voronoi2svg.inx.h:15 +msgid "Triangles with item color (random on apply)" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:17 msgid "" "Select a set of objects. Their centroids will be used as the sites of the " "Voronoi diagram. Text objects are not handled." @@ -36211,64 +39717,338 @@ msgstr "Un formato grafico molto diffuso per clipart" msgid "XAML Input" msgstr "Input XAML" -#~ msgid "CubicBezierJohan" -#~ msgstr "CubicBezierJohan" +#~ msgid "A4 Landscape Page" +#~ msgstr "Pagina A4 Orizzontale" -#~ msgid "You need to install the UniConvertor software.\n" -#~ msgstr "È necessario installare il programma UniConvertor.\n" +#~ msgid "Empty A4 landscape sheet" +#~ msgstr "Foglio A4 orizzontale vuoto" + +#~ msgid "A4 paper sheet empty landscape" +#~ msgstr "A4 pagina foglio vuoto orizzontale" + +#~ msgid "A4 Page" +#~ msgstr "Pagina A4" + +#~ msgid "Empty A4 sheet" +#~ msgstr "Foglio A4 vuoto" + +#~ msgid "A4 paper sheet empty" +#~ msgstr "A4 pagina foglio vuoto" + +#~ msgid "Black Opaque" +#~ msgstr "Nero opaco" + +#~ msgid "Empty black page" +#~ msgstr "Pagina nera vuota" + +#~ msgid "black opaque empty" +#~ msgstr "nero opaco vuoto" + +#~ msgid "White Opaque" +#~ msgstr "Bianco opaco" + +#~ msgid "Empty white page" +#~ msgstr "Pagina bianca vuota" + +#~ msgid "white opaque empty" +#~ msgstr "bianco opaco vuoto" + +#~ msgid "Empty business card template." +#~ msgstr "Modello biglietto da visita vuoto." + +#~ msgid "business card empty 85x54" +#~ msgstr "biglietto visita vuoto 85x54" + +#~ msgid "Business Card 90x50mm" +#~ msgstr "Biglietto da visita 90x50mm" + +#~ msgid "business card empty 90x50" +#~ msgstr "biglietto visita vuoto 90x50" + +#~ msgid "CD Cover 300dpi" +#~ msgstr "Cover CD 300dpi" + +#~ msgid "Empty CD box cover." +#~ msgstr "Cover CD vuota." + +#~ msgid "CD cover disc disk 300dpi box" +#~ msgstr "CD cover disco 300dpi" + +#~ msgid "DVD Cover Regular 300dpi " +#~ msgstr "Cover DVD Normale 300dpi " + +#~ msgid "Template for both-sides DVD covers." +#~ msgstr "Modello per cover DVD fronte-retro." + +#~ msgid "DVD cover regular 300dpi" +#~ msgstr "DVD cover normale 300dpi" + +#~ msgid "DVD Cover Slim 300dpi " +#~ msgstr "Cover DVD slim 300dpi " + +#~ msgid "Template for both-sides DVD slim covers." +#~ msgstr "Modello per cover DVD slim fronte-retro." + +#~ msgid "DVD cover slim 300dpi" +#~ msgstr "DVD cover slim 300dpi" + +#~ msgid "DVD Cover Superslim 300dpi " +#~ msgstr "Cover DVD superslim 300dpi " + +#~ msgid "Template for both-sides DVD superslim covers." +#~ msgstr "Modello per cover DVD fronte-retro superslim." + +#~ msgid "DVD cover superslim 300dpi" +#~ msgstr "DVD cover superslim 300dpi" + +#~ msgid "DVD Cover Ultraslim 300dpi " +#~ msgstr "Cover DVD ultraslim 300dpi " + +#~ msgid "Template for both-sides DVD ultraslim covers." +#~ msgstr "Modello per cover DVD ultraslim fronte-retro." + +#~ msgid "DVD cover ultraslim 300dpi" +#~ msgstr "DVD cover ultraslim 300dpi" + +#~ msgid "Desktop 1024x768" +#~ msgstr "Desktop 1024x768" + +#~ msgid "Empty desktop size sheet" +#~ msgstr "Foglio dimensione desktop vuoto" + +#~ msgid "desktop 1024x768 wallpaper" +#~ msgstr "desktop 1024x768 wallpaper" + +#~ msgid "Desktop 1600x1200" +#~ msgstr "Desktop 1600x1200" + +#~ msgid "desktop 1600x1200 wallpaper" +#~ msgstr "desktop 1600x1200 wallpaper" + +#~ msgid "desktop 640x480 wallpaper" +#~ msgstr "desktop 640x480 wallpaper" + +#~ msgid "Desktop 800x600" +#~ msgstr "Desktop 800x600" + +#~ msgid "desktop 800x600 wallpaper" +#~ msgstr "desktop 800x600 wallpaper" + +#~ msgid "Fontforge Glyph" +#~ msgstr "Glifo Fontforge" + +#~ msgid "font fontforge glyph 1000x1000" +#~ msgstr "font fontforge glifo 1000x1000" + +#~ msgid "Icon 16x16" +#~ msgstr "Icona 16x16" + +#~ msgid "Small 16x16 icon template." +#~ msgstr "Modello icona piccola 16x16." + +#~ msgid "icon 16x16 empty" +#~ msgstr "icona 16x16 vuota" + +#~ msgid "Icon 32x32" +#~ msgstr "Icona 32x32" + +#~ msgid "32x32 icon template." +#~ msgstr "Modello icona 32x32." + +#~ msgid "icon 32x32 empty" +#~ msgstr "icona 32x32 vuota" + +#~ msgid "Icon 48x48" +#~ msgstr "Icona 48x48" + +#~ msgid "48x48 icon template." +#~ msgstr "Modello icona 48x48." + +#~ msgid "icon 48x48 empty" +#~ msgstr "icona 48x48 vuota" + +#~ msgid "Icon 64x64" +#~ msgstr "Icona 64x64" + +#~ msgid "64x64 icon template." +#~ msgstr "Modello icona 64x64." + +#~ msgid "icon 64x64 empty" +#~ msgstr "icona 64x64 vuota" + +#~ msgid "Letter Landscape" +#~ msgstr "Letter Orizzontale" + +#~ msgid "Standard letter landscape sheet - 792x612" +#~ msgstr "Foglio letter standard orizzontale - 792x612" + +#~ msgid "letter landscape 792x612 empty" +#~ msgstr "letter orizzontale 792x612 vuoto" + +#~ msgid "Letter" +#~ msgstr "Letter" + +#~ msgid "Standard letter sheet - 612x792" +#~ msgstr "Foglio letter standard - 612x792" + +#~ msgid "letter 612x792 empty" +#~ msgstr "letter 612x792 vuoto" + +#~ msgid "No Borders" +#~ msgstr "Nessun bordo" + +#~ msgid "Empty sheet with no borders" +#~ msgstr "Foglio vuoto senza bordi" + +#~ msgid "no borders empty" +#~ msgstr "no bordi vuoto" + +#~ msgid "Video HDTV 1920x1080" +#~ msgstr "Video HDTV 1920x1080" + +#~ msgid "HDTV video template for 1920x1080 resolution." +#~ msgstr "Modello video HDTV per risoluzione 1920x1080." + +#~ msgid "HDTV video empty 1920x1080" +#~ msgstr "HDTV video vuoto 1920x1080" + +#~ msgid "Video NTSC 720x486" +#~ msgstr "Video NTSC 720x486" + +#~ msgid "NTSC video template for 720x486 resolution." +#~ msgstr "Modello video NTSC per risoluzione 720x486." + +#~ msgid "NTSC video empty 720x486" +#~ msgstr "NTSC video vuoto 720x486" + +#~ msgid "Video PAL 728x576" +#~ msgstr "Video PAL 728x576" + +#~ msgid "PAL video template for 728x576 resolution." +#~ msgstr "Modello video PAL per risoluzione 728x576." + +#~ msgid "PAL video empty 728x576" +#~ msgstr "PAL video vuoto 728x576" + +#~ msgid "Web Banner 468x60" +#~ msgstr "Web Banner 468x60" + +#~ msgid "Empty 468x60 web banner template." +#~ msgstr "Modello web banner vuoto 468x60." + +#~ msgid "web banner 468x60 empty" +#~ msgstr "web banner 468x60 vuoto" + +#~ msgid "Web Banner 728x90" +#~ msgstr "Web Banner 728x90" + +#~ msgid "Empty 728x90 web banner template." +#~ msgstr "Modello web banner vuoto 728x90." + +#~ msgid "web banner 728x90 empty" +#~ msgstr "web banner 728x90 vuoto" + +#~ msgid "PS+LaTeX: Omit text in PS, and create LaTeX file" +#~ msgstr "PS+LaTeX: ometti testo nel file PS, e crea un file LaTeX" + +#~ msgid "EPS+LaTeX: Omit text in EPS, and create LaTeX file" +#~ msgstr "EPS+LaTeX: ometti testo nel file EPS, e crea un file LaTeX" + +#~ msgid "import via Poppler" +#~ msgstr "importa via Poppler" + +#~ msgid "Text handling:" +#~ msgstr "Gestione testo:" + +#~ msgid "Import text as text" +#~ msgstr "Importa testo come testo" + +#~ msgid "Boolops" +#~ msgstr "Operazione booleana" + +#~ msgid "Select one path to clone." +#~ msgstr "Seleziona un tracciato da clonare." + +#~ msgid "Select one path to clone." +#~ msgstr "Seleziona un tracciato da clonare." #~ msgid "" -#~ "Always convert the text size units above into pixels (px) before saving " -#~ "to file" +#~ "Select exactly 2 paths to perform difference, division, or path " +#~ "cut." #~ msgstr "" -#~ "Converte sempre le unità di dimensione del testo sopra elencate in pixel " -#~ "(px) prima di salvare il file" +#~ "Seleziona esattamente 2 tracciati per effettuare differenza, " +#~ "divisione o taglio del tracciato." -#~ msgid "Enable dynamic relayout for incomplete sections" -#~ msgstr "Abilita disposizione dinamica per sezioni incomplete" +#~ msgid "Default _units:" +#~ msgstr "_Unità predefinite:" #~ msgid "" -#~ "When on, will allow dynamic layout of components that are not completely " -#~ "finished being refactored" -#~ msgstr "" -#~ "Quando attivo, permette la disposizione dinamica delle componenti che non " -#~ "sono ancora state completate" +#~ "The feTile filter primitive tiles a region with its input graphic" +#~ msgstr "Il filtro feTile pittura una regione con la grafica in input" + +#~ msgid "_Delay (in ms):" +#~ msgstr "_Ritardo (in ms):" + +#~ msgctxt "Path handle tip" +#~ msgid "%s: drag to shape the segment (%s)" +#~ msgstr "%s: trascina per formare il segmento (%s)" -#~ msgid "No style attribute found for id: %s" -#~ msgstr "Nessun attributo style trovato per l'id: %s" +#~ msgid "_Templates..." +#~ msgstr "_Modelli..." -#~ msgid "unable to locate marker: %s" -#~ msgstr "impossibile trovare il delimitatore: %s" +#~ msgid "Miter _limit:" +#~ msgstr "Spigo_losità:" -#~ msgid "Color Markers" -#~ msgstr "Colore delimitatori" +#~ msgid "Use automatic scaling to size A4" +#~ msgstr "Usa ridimensionamento automatico ad A4" -#~ msgid "From object" -#~ msgstr "Da oggetto" +#~ msgid "Empty Page" +#~ msgstr "Pagina vuota" -#~ msgid "Marker type:" -#~ msgstr "Tipo delimitatore:" +#~ msgid "http://wiki.inkscape.org/wiki/index.php/FAQ" +#~ msgstr "http://wiki.inkscape.org/wiki/index.php/itFAQ" -#~ msgid "Invert fill and stroke colors" -#~ msgstr "Inverti colori di riempimento e contorno" +#~ msgid "Text Orientation: " +#~ msgstr "Orientamento testo: " -#~ msgid "Assign alpha" -#~ msgstr "Assegna opacità" +#~ msgid "Angle [with Fixed Angle option only] (°):" +#~ msgstr "Angolo [solo con Angolo fisso] (°):" -#~ msgid "solid" -#~ msgstr "solido" +#~ msgctxt "measure extension" +#~ msgid "Fixed Angle" +#~ msgstr "Angolo fisso" -#~ msgid "filled" -#~ msgstr "riempito" +#, fuzzy +#~ msgctxt "Flow control" +#~ msgid "None" +#~ msgstr "Nessuno" + +#~ msgid "Arbitrary Angle" +#~ msgstr "Angolo arbitrario" + +#~ msgid "Horizontal Point:" +#~ msgstr "Punto orizzontale:" + +#~ msgid "Vertical Point:" +#~ msgstr "Punto verticale:" + +#, fuzzy +#~ msgid "Ids" +#~ msgstr "_Id" -#~ msgid "Assign fill color" -#~ msgstr "Assegna colore di riempimento" +#, fuzzy +#~ msgid "Help (Options)" +#~ msgstr "Opzioni" -#~ msgid "Stroke" -#~ msgstr "Contorno" +#~ msgid "You need to install the UniConvertor software.\n" +#~ msgstr "È necessario installare il programma UniConvertor.\n" -#~ msgid "Assign stroke color" -#~ msgstr "Assegna colore contorno" +#~ msgid "" +#~ "Always convert the text size units above into pixels (px) before saving " +#~ "to file" +#~ msgstr "" +#~ "Converte sempre le unità di dimensione del testo sopra elencate in pixel " +#~ "(px) prima di salvare il file" #~ msgctxt "Symbol" #~ msgid "Map Symbols" @@ -36741,26 +40521,14 @@ msgstr "Input XAML" #~ msgid "<no name found>" #~ msgstr "<nessun nome trovato>" -#, fuzzy -#~ msgid "Extrapolated" -#~ msgstr "Interpola" - #, fuzzy #~ msgid "Set Resolution" #~ msgstr "Relazione:" -#, fuzzy -#~ msgid "Set filter resolution" -#~ msgstr "Risoluzione predefinita per l'esportazione" - #, fuzzy #~ msgid "Fill Area" #~ msgstr "Colore uniforme" -#, fuzzy -#~ msgid "Add a new connection point" -#~ msgstr "Cambia spaziatura connettori" - #, fuzzy #~ msgid "Move a connection point" #~ msgstr "Reinstrada connettore" @@ -36854,9 +40622,6 @@ msgstr "Input XAML" #~ msgid "Include l_ocked" #~ msgstr "Includi bloccati" -#~ msgid "Clear values" -#~ msgstr "Pulisci" - #~ msgid "Select objects matching all of the fields you filled in" #~ msgstr "Cerca oggetti corrispondenti a tutti i campi spuntati" @@ -36888,17 +40653,10 @@ msgstr "Input XAML" #~ msgid "Composite:" #~ msgstr "Composto" -#~ msgid "Colors:" -#~ msgstr "Colori:" - #, fuzzy #~ msgid "Glow:" #~ msgstr "Alone" -#, fuzzy -#~ msgid "Simplify:" -#~ msgstr "Semplifica" - #, fuzzy #~ msgid "Blur:" #~ msgstr "Sfocat_ura:" @@ -37140,9 +40898,6 @@ msgstr "Input XAML" #~ msgid "Color" #~ msgstr "Poligono" -#~ msgid "Border" -#~ msgstr "Bordo" - #~ msgid "" #~ "The feDiffuseLighting and feSpecularLighting filter primitives " #~ "create \"embossed\" shadings. The input's alpha channel is used to " @@ -37161,9 +40916,6 @@ msgstr "Input XAML" #~ msgstr "" #~ "Se attivo, nei dati dei tracciati possono venir usate coordinate relative" -#~ msgid "Left mouse button pans when Space is pressed" -#~ msgstr "Tasto sinistro del mouse sposta la tela quando Spazio è premuto" - #, fuzzy #~ msgid "" #~ "When on, pressing and holding Space and dragging with left mouse button " @@ -37204,9 +40956,6 @@ msgstr "Input XAML" #~ msgid "_Execute Ruby" #~ msgstr "_Esegui Ruby" -#~ msgid "Script" -#~ msgstr "Script" - #~ msgid "Errors" #~ msgstr "Errori" @@ -37328,10 +41077,6 @@ msgstr "Input XAML" #~ msgid "Horizontal guide each:" #~ msgstr "Guide orizzontali ogni" -#, fuzzy -#~ msgid "Preset:" -#~ msgstr "Preimpostato" - #, fuzzy #~ msgid "Vertical guide each:" #~ msgstr "Guide verticali ogni" @@ -37398,10 +41143,6 @@ msgstr "Input XAML" #~ msgid "_Description" #~ msgstr "_Descrizione" -#, fuzzy -#~ msgid "_Blur:" -#~ msgstr "Sfocat_ura:" - #~ msgid "Bitmap size" #~ msgstr "Dimensione bitmap" @@ -37493,10 +41234,6 @@ msgstr "Input XAML" #~ msgid "Font size (px)" #~ msgstr "Dimensione carattere [px]" -#, fuzzy -#~ msgid "Toggle Bold" -#~ msgstr "Al_terna" - #, fuzzy #~ msgid "Angle 0" #~ msgstr "Angolo X" @@ -37588,9 +41325,6 @@ msgstr "Input XAML" #~ msgid "Align lines right" #~ msgstr "Allinea linee a destra" -#~ msgid "Justify lines" -#~ msgstr "Giustifica righe" - #~ msgid "Line spacing:" #~ msgstr "Spaziatura linee" @@ -37684,9 +41418,6 @@ msgstr "Input XAML" #~ msgid "Multiple gradients" #~ msgstr "Gradienti multipli" -#~ msgid "No objects" -#~ msgstr "Nessun oggetto" - #~ msgid "Affect:" #~ msgstr "Proprietà:" @@ -37957,9 +41688,6 @@ msgstr "Input XAML" #~ msgid "Draws a black outline around" #~ msgstr "Disegna un contorno esterno nero" -#~ msgid "Color outline" -#~ msgstr "Contorno colorato" - #~ msgid "Draws a colored outline around" #~ msgstr "Disegna un contorno esterno colorato" @@ -38007,18 +41735,12 @@ msgstr "Input XAML" #~ msgstr "" #~ "Crea un effetto in tre toni, col colore regolabile tramite il riempimento" -#~ msgid "Font" -#~ msgstr "Carattere" - #~ msgid "handle" #~ msgstr "maniglia" #~ msgid "convex hull corner" #~ msgstr "angolo convesso" -#~ msgid "center" -#~ msgstr "centro" - #, fuzzy #~ msgid "Experimental" #~ msgstr "Esponente" @@ -38076,9 +41798,6 @@ msgstr "Input XAML" #~ msgid "link" #~ msgstr "linee" -#~ msgid "Iconify" -#~ msgstr "Iconifica" - #, fuzzy #~ msgid "To spray a path by pushing, select it and drag over it." #~ msgstr "" @@ -38113,9 +41832,6 @@ msgstr "Input XAML" #~ msgid "Snap to cusp nodes" #~ msgstr "Aggancia ai nodi angolari" -#~ msgid "Snap to smooth nodes" -#~ msgstr "Aggancia ai nodi curvi" - #, fuzzy #~ msgid "(minimum mean)" #~ msgstr "(forza minima)" @@ -38170,10 +41886,6 @@ msgstr "Input XAML" #~ msgid "Set precision" #~ msgstr "Precisione" -#, fuzzy -#~ msgid "Simplify colors" -#~ msgstr "Semplifica" - #, fuzzy #~ msgid "Style to xml" #~ msgstr "_Stile: " @@ -38479,11 +42191,6 @@ msgstr "Input XAML" #~ msgid "crane covered text" #~ msgstr "Crea testo dinamico" -#, fuzzy -#~ msgctxt "Palette" -#~ msgid "crane background" -#~ msgstr "Vettorizza sfondo" - #, fuzzy #~ msgctxt "Palette" #~ msgid "crane text" @@ -38653,12 +42360,6 @@ msgstr "Input XAML" #~ msgid "find|Clones" #~ msgstr "Cloni" -#~ msgid "Type" -#~ msgstr "Tipo" - -#~ msgid "Radius" -#~ msgstr "Raggio" - #~ msgid "pdfinput|medium" #~ msgstr "medio" @@ -38760,9 +42461,6 @@ msgstr "Input XAML" #~ msgid "swatches|Size" #~ msgstr "Dimensione" -#~ msgid "small" -#~ msgstr "piccola" - #~ msgid "swatchesHeight|medium" #~ msgstr "media" @@ -39004,9 +42702,6 @@ msgstr "Input XAML" #~ msgid "Determines which kind of boolop will be performed." #~ msgstr "Determina il tipo di operazione booleana da effettuare." -#~ msgid "Rotation angle" -#~ msgstr "Angolo di rotazione" - #~ msgid "Angle between two successive copies" #~ msgstr "Angolo tra due copie successive" @@ -39034,9 +42729,6 @@ msgstr "Input XAML" #~ msgid "Sharp" #~ msgstr "Nitidezza" -#~ msgid "Method" -#~ msgstr "Metodo" - #, fuzzy #~ msgid "Choose pen type" #~ msgstr "Cambia tipo di segmento" @@ -39076,54 +42768,12 @@ msgstr "Input XAML" #~ msgid "Strokes end with a round end" #~ msgstr "Metallo pressato con bordi incurvati" -#~ msgid "Control handle 0" -#~ msgstr "Maniglia di controllo 0" - -#~ msgid "Control handle 1" -#~ msgstr "Maniglia di controllo 1" - -#~ msgid "Control handle 2" -#~ msgstr "Maniglia di controllo 3" - -#~ msgid "Control handle 3" -#~ msgstr "Maniglia di controllo 3" - -#~ msgid "Control handle 4" -#~ msgstr "Maniglia di controllo 4" - -#~ msgid "Control handle 5" -#~ msgstr "Maniglia di controllo 5" - -#~ msgid "Control handle 6" -#~ msgstr "Maniglia di controllo 6" - -#~ msgid "Control handle 7" -#~ msgstr "Maniglia di controllo 7" - -#~ msgid "Control handle 8" -#~ msgstr "Maniglia di controllo 8" - #~ msgid "Control handle 9" #~ msgstr "Maniglia di controllo 9" -#~ msgid "Control handle 10" -#~ msgstr "Maniglia di controllo 10" - #~ msgid "Control handle 11" #~ msgstr "Maniglia di controllo 11" -#~ msgid "Control handle 12" -#~ msgstr "Maniglia di controllo 12" - -#~ msgid "Control handle 13" -#~ msgstr "Maniglia di controllo 13" - -#~ msgid "Control handle 14" -#~ msgstr "Maniglia di controllo 14" - -#~ msgid "Control handle 15" -#~ msgstr "Maniglia di controllo 15" - #~ msgid "Check this to only keep the mirrored part of the path" #~ msgstr "" #~ "Selezionare questa opzione per tenere solo la parte speculare del " @@ -39156,24 +42806,15 @@ msgstr "Input XAML" #~ msgid "Adjust the bisector's \"right\" end" #~ msgstr "Modifica i passaggi del gradiente" -#~ msgid "Scale x" -#~ msgstr "Ridimensionamento x" - #~ msgid "Scale factor in x direction" #~ msgstr "Fattore di ridimensionamento nella direzione x" -#~ msgid "Scale y" -#~ msgstr "Ridimensionamento y" - #~ msgid "Scale factor in y direction" #~ msgstr "Fattore di ridimensionamento nella direzione y" #~ msgid "Offset in x direction" #~ msgstr "Scostamento sulla direzione x" -#~ msgid "Offset y" -#~ msgstr "Scostamento y" - #~ msgid "Offset in y direction" #~ msgstr "Scostamento sulla direzione Y" @@ -39230,9 +42871,6 @@ msgstr "Input XAML" #~ msgid "path param" #~ msgstr "parametro tracciato" -#~ msgid "Label" -#~ msgstr "Etichetta" - #~ msgid "Text label attached to the path" #~ msgstr "Etichetta testuale attaccata al tracciato" @@ -39249,9 +42887,6 @@ msgstr "Input XAML" #~ msgid "Active session file:" #~ msgstr "File sessione attiva:" -#~ msgid "Delay (milliseconds):" -#~ msgstr "Ritardo (millisecondi):" - #~ msgid "Close file" #~ msgstr "Chiudi file" @@ -39259,9 +42894,6 @@ msgstr "Input XAML" #~ msgid "Open new file" #~ msgstr "Apri file sessione" -#~ msgid "Set delay" -#~ msgstr "Imposta ritardo" - #~ msgid "Rewind" #~ msgstr "Riavvolgi" @@ -39364,11 +42996,6 @@ msgstr "Input XAML" #~ "Ctrl: cambia il tipo di nodo, fa scattare l'angolo della maniglia, " #~ "muove oriz/vert; Ctrl+Alt: muove tra le maniglie" -#~ msgid "Alt: lock handle length; Ctrl+Alt: move along handles" -#~ msgstr "" -#~ "Alt: blocca la lunghezza della maniglia; Ctrl+Alt: muove " -#~ "tra le maniglie" - #~ msgid "" #~ "Node handle: drag to shape the curve; with Ctrl to snap " #~ "angle; with Alt to lock length; with Shift to rotate both " @@ -39593,9 +43220,6 @@ msgstr "Input XAML" #~ msgid "Export To Open Clip Art Library" #~ msgstr "Esporta Open Clip Art" -#~ msgid "Light x-Position" -#~ msgstr "Posizione x dell'illuminazione" - #~ msgid "Light y-Position" #~ msgstr "Posizione y dell'illuminazione" @@ -39774,10 +43398,6 @@ msgstr "Input XAML" #~ msgid "The resolution used for exporting SVG into bitmap (default 90)" #~ msgstr "La risoluzione per esportare SVG in bitmap (predefinita 90)" -#, fuzzy -#~ msgid "Unicode" -#~ msgstr "Non caricato" - #, fuzzy #~ msgid "gradient level" #~ msgstr "Nessun gradiente selezionato" @@ -40303,9 +43923,6 @@ msgstr "Input XAML" #~ msgid "Gri_d Arrange..." #~ msgstr "_Disponi su griglia..." -#~ msgid "End point jitter" -#~ msgstr "Variazione punto finale" - #, fuzzy #~ msgid "" #~ "Gradient point shared by %d gradient; drag with Shift to " @@ -40429,9 +44046,6 @@ msgstr "Input XAML" #~ msgid "Move by:" #~ msgstr "Sposta di:" -#~ msgid "Move to:" -#~ msgstr "Sposta a:" - #~ msgid "Moving %s %s" #~ msgstr "Sposta %s %s" -- cgit v1.2.3 From 04c19d5757c9ba12a871046dac340b5bd967f973 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Mon, 2 May 2016 21:36:16 +0200 Subject: Fix for cmake installing libs, using a subfolder for clarity when installing system-wide (bzr r14867) --- CMakeLists.txt | 2 +- CMakeScripts/HelperMacros.cmake | 5 ++++- src/CMakeLists.txt | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1494afef7..3592d2e0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ project(inkscape) set(INKSCAPE_VERSION 0.91+devel) set(PROJECT_NAME inkscape) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) -SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/") +SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape") cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake index 4577b5e72..d5e6d8536 100644 --- a/CMakeScripts/HelperMacros.cmake +++ b/CMakeScripts/HelperMacros.cmake @@ -34,7 +34,10 @@ macro(add_inkscape_lib # works fine without having the includes # listed is helpful for IDE's (QtCreator/MSVC) inkscape_source_group("${sources}") - install(TARGETS ${name} LIBRARY DESTINATION lib) + install(TARGETS ${name} + LIBRARY DESTINATION lib/inkscape + ARCHIVE DESTINATION lib/inkscape + ) endmacro() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4d57a59c1..df25728f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -571,7 +571,8 @@ target_link_libraries(inkview inkscape_base) install( TARGETS inkscape_base inkscape inkview RUNTIME DESTINATION bin - LIBRARY DESTINATION lib + LIBRARY DESTINATION lib/inkscape + ARCHIVE DESTINATION lib/inkscape ) -- cgit v1.2.3 From d8f69052ab1a34f0d225aea954785f370611f39b Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 2 May 2016 23:53:38 +0200 Subject: Fixes link on mac os x (bzr r14868) --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3592d2e0a..4196781d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,12 @@ project(inkscape) set(INKSCAPE_VERSION 0.91+devel) set(PROJECT_NAME inkscape) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) -SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape") +if(APPLE) + SET(CMAKE_MACOSX_RPATH TRUE) + SET(CMAKE_INSTALL_RPATH "@loader_path/../lib/inkscape") +else() + SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape") +endif() cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths -- cgit v1.2.3 From c0593c3375902d03899530854baca0b99d00f8ec Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 3 May 2016 10:08:17 +0200 Subject: Correct comment. (bzr r14869) --- src/ui/cache/svg_preview_cache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp index f1d6304cb..eeb99e045 100644 --- a/src/ui/cache/svg_preview_cache.cpp +++ b/src/ui/cache/svg_preview_cache.cpp @@ -1,5 +1,5 @@ /** \file - * SPIcon: Generic icon widget + * SVGPreview: Preview cache */ /* * Authors: -- cgit v1.2.3 From ff29a7752c94cf9fce8894719256647925ab5eeb Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 3 May 2016 15:11:49 +0200 Subject: Remove some GTK3 warnings. (bzr r14869.1.1) --- src/widgets/icon.cpp | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 010b3a6fb..5acdc613c 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -232,8 +232,10 @@ void IconImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation) } } +// GTK3 Only, Doesn't actually seem to be used. gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr) { + std::cout << "IconImpl::draw: Entrance" << std::endl; SPIcon *icon = SP_ICON(widget); if ( !icon->pb ) { fetchPixbuf( icon ); @@ -247,32 +249,34 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr) if (gtk_widget_get_state_flags (GTK_WIDGET(icon)) != GTK_STATE_FLAG_NORMAL && image) { #else if (gtk_widget_get_state (GTK_WIDGET(icon)) != GTK_STATE_NORMAL && image) { + std::cout << "IconImpl::draw: Ooops! It is called in GTK2" << std::endl; #endif - GtkIconSource *source = gtk_icon_source_new(); - gtk_icon_source_set_pixbuf(source, icon->pb); - gtk_icon_source_set_size(source, GTK_ICON_SIZE_SMALL_TOOLBAR); // note: this is boilerplate and not used - gtk_icon_source_set_size_wildcarded(source, FALSE); + std::cerr << "IconImpl::draw: No image, creating fallback" << std::endl; #if GTK_CHECK_VERSION(3,0,0) - image = gtk_render_icon_pixbuf(gtk_widget_get_style_context(widget), - source, - (GtkIconSize)-1); + // image = gtk_render_icon_pixbuf(gtk_widget_get_style_context(widget), + // source, + // (GtkIconSize)-1); // gtk_render_icon_pixbuf deprecated, replaced by: - // GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); - // image = gtk_icon_theme_load_icon (icon_theme, - // name, - // 32, - // 0, - // NULL); + GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); + image = gtk_icon_theme_load_icon (icon_theme, + "gtk-image", + 32, + (GtkIconLookupFlags)0, + NULL); #else + GtkIconSource *source = gtk_icon_source_new(); + gtk_icon_source_set_pixbuf(source, icon->pb); + gtk_icon_source_set_size(source, GTK_ICON_SIZE_SMALL_TOOLBAR); // note: this is boilerplate and not used + gtk_icon_source_set_size_wildcarded(source, FALSE); image = gtk_style_render_icon(gtk_widget_get_style(widget), source, gtk_widget_get_direction(widget), (GtkStateType) gtk_widget_get_state(widget), (GtkIconSize)-1, widget, "gtk-image"); + gtk_icon_source_free(source); #endif - gtk_icon_source_free(source); unref_image = true; } @@ -1000,8 +1004,6 @@ int IconImpl::getPhysSize(int size) "inkscape-decoration" }; - GtkWidget *icon = GTK_WIDGET(g_object_new(SP_TYPE_ICON, NULL)); - for (unsigned i = 0; i < G_N_ELEMENTS(gtkSizes); ++i) { guint const val_ix = (gtkSizes[i] <= GTK_ICON_SIZE_DIALOG) ? (guint)gtkSizes[i] : (guint)Inkscape::ICON_SIZE_DECORATION; @@ -1026,7 +1028,12 @@ int IconImpl::getPhysSize(int size) // gtk_icon_size_lookup(), because themes are free to render the pixbuf however // they like, including changing the usual size." gchar const *id = INKSCAPE_ICON("document-open"); - GdkPixbuf *pb = gtk_widget_render_icon( icon, id, gtkSizes[i], NULL); + GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); + GdkPixbuf *pb = gtk_icon_theme_load_icon (icon_theme, + id, + vals[val_ix], + (GtkIconLookupFlags)0, + NULL); if (pb) { width = gdk_pixbuf_get_width(pb); height = gdk_pixbuf_get_height(pb); @@ -1042,7 +1049,6 @@ int IconImpl::getPhysSize(int size) g_object_unref(G_OBJECT(pb)); } } - //g_object_unref(icon); init = true; } -- cgit v1.2.3 From 41f30faca1b202da59a233f0556fc9580586f893 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 4 May 2016 10:10:42 +0200 Subject: Fix rendering of tool bar icons. (bzr r14869.1.2) --- src/widgets/button.cpp | 16 ++++++++++------ src/widgets/icon.cpp | 8 ++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 54f073c01..6ea8c1360 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -106,11 +106,13 @@ static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width GtkStyleContext *context = gtk_widget_get_style_context (widget); GtkBorder padding; + GtkBorder border; - gtk_style_context_get_border(context, static_cast(0), &padding); + gtk_style_context_get_padding(context, GTK_STATE_FLAG_NORMAL, &padding); + gtk_style_context_get_border( context, GTK_STATE_FLAG_NORMAL, &border ); - *minimal_width += 2 + 2 * MAX(2, padding.left + padding.right); - *natural_width += 2 + 2 * MAX(2, padding.left + padding.right); + *minimal_width += MAX(2, padding.left + padding.right + border.left + border.right); + *natural_width += MAX(2, padding.left + padding.right + border.left + border.right); } static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) @@ -126,11 +128,13 @@ static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_heig GtkStyleContext *context = gtk_widget_get_style_context (widget); GtkBorder padding; + GtkBorder border; - gtk_style_context_get_border(context, static_cast(0), &padding); + gtk_style_context_get_padding(context, GTK_STATE_FLAG_NORMAL, &padding); + gtk_style_context_get_border( context, GTK_STATE_FLAG_NORMAL, &border ); - *minimal_height += 2 + 2 * MAX(2, padding.top + padding.bottom); - *natural_height += 2 + 2 * MAX(2, padding.top + padding.bottom); + *minimal_height += MAX(2, padding.top + padding.bottom + border.top + border.bottom); + *natural_height += MAX(2, padding.top + padding.bottom + border.top + border.bottom); } #else static void sp_button_size_request(GtkWidget *widget, GtkRequisition *requisition) diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 5acdc613c..f2031fe51 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -235,7 +235,6 @@ void IconImpl::sizeAllocate(GtkWidget *widget, GtkAllocation *allocation) // GTK3 Only, Doesn't actually seem to be used. gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr) { - std::cout << "IconImpl::draw: Entrance" << std::endl; SPIcon *icon = SP_ICON(widget); if ( !icon->pb ) { fetchPixbuf( icon ); @@ -249,7 +248,7 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr) if (gtk_widget_get_state_flags (GTK_WIDGET(icon)) != GTK_STATE_FLAG_NORMAL && image) { #else if (gtk_widget_get_state (GTK_WIDGET(icon)) != GTK_STATE_NORMAL && image) { - std::cout << "IconImpl::draw: Ooops! It is called in GTK2" << std::endl; + std::cerr << "IconImpl::draw: Ooops! It is called in GTK2" << std::endl; #endif std::cerr << "IconImpl::draw: No image, creating fallback" << std::endl; @@ -805,6 +804,10 @@ GtkWidget *IconImpl::newFull( Inkscape::IconSize lsize, gchar const *name ) GtkWidget *widget = NULL; gint trySize = CLAMP( static_cast(lsize), 0, static_cast(G_N_ELEMENTS(iconSizeLookup) - 1) ); + if (trySize != lsize ) { + std::cerr << "GtkWidget *IconImple::newFull(): lsize != trySize: lsize: " << lsize + << " try Size: " << trySize << " " << (name?name:"NULL") << std::endl; + } if ( !sizeMapDone ) { injectCustomSize(); } @@ -832,6 +835,7 @@ GtkWidget *IconImpl::newFull( Inkscape::IconSize lsize, gchar const *name ) if ( Inkscape::Preferences::get()->getBool("/options/iconrender/named_nodelay") ) { int psize = getPhysSize(lsize); + // std::cout << " name: " << name << " size: " << psize << std::endl; prerenderIcon(name, mappedSize, psize); } else { addPreRender( mappedSize, name ); -- cgit v1.2.3 From 28d4af68e5f0c3c157b97fd857ef676657b35e01 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 6 May 2016 13:02:22 +0200 Subject: Prevent scrollbar overlay from covering swatches in GTK3 build. And some minor cleanup. (bzr r14871) --- src/ui/dialog/glyphs.h | 2 -- src/ui/previewholder.cpp | 6 ++++++ src/ui/previewholder.h | 1 + src/ui/widget/panel.cpp | 4 +++- src/ui/widget/panel.h | 4 ++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h index 3d0571244..00c3ffa07 100644 --- a/src/ui/dialog/glyphs.h +++ b/src/ui/dialog/glyphs.h @@ -27,8 +27,6 @@ class font_instance; namespace Inkscape { namespace UI { -class PreviewHolder; - namespace Dialog { class GlyphColumns; diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index 21f3f38d7..beb83f35c 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -340,6 +340,12 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int& width = itemCount; height = 1; +#if GTK_CHECK_VERSION(3,16,0) + // Disable overlay scrolling as the scrollbar covers up swatches. + // For some reason this also makes the height 55px. + ((Gtk::ScrolledWindow *)_scroller)->set_overlay_scrolling(false); +#endif + if ( _anchor == SP_ANCHOR_SOUTH || _anchor == SP_ANCHOR_NORTH ) { Gtk::Requisition req; #if GTK_CHECK_VERSION(3,0,0) diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h index f6d1985cc..28c0fd865 100644 --- a/src/ui/previewholder.h +++ b/src/ui/previewholder.h @@ -3,6 +3,7 @@ #define SEEN_PREVIEW_HOLDER_H /* * A simple interface for previewing representations. + * Used by Swatches * * Authors: * Jon A. Cruz diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 8a1e98a63..5d4a25a68 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -73,6 +73,9 @@ Panel::Panel(Glib::ustring const &label, gchar const *prefs_path, _action_area(0), _fillable(0) { +#if WITH_GTKMM_3_0 + set_orientation( Gtk::ORIENTATION_VERTICAL ); +#endif _init(); } @@ -92,7 +95,6 @@ void Panel::_popper(GdkEventButton* event) void Panel::_init() { - Glib::ustring tmp("<"); _anchor = SP_ANCHOR_CENTER; guint panel_size = 0, panel_mode = 0, panel_ratio = 100, panel_border = 0; diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h index a90060e17..7b2836fe8 100644 --- a/src/ui/widget/panel.h +++ b/src/ui/widget/panel.h @@ -64,7 +64,11 @@ namespace Widget { * @see UI::Dialog::DesktopTracker to handle desktop change, selection change and selected object modifications. * @see UI::Dialog::DialogManager manages the dialogs within inkscape. */ +#if WITH_GTKMM_3_0 +class Panel : public Gtk::Box { +#else class Panel : public Gtk::VBox { +#endif public: static void prep(); -- cgit v1.2.3 From 01a611b9d6b1884f25e3deabfa20326168985563 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 7 May 2016 10:48:16 +0200 Subject: Temporarily hard code GTK3 ruler background to off white. (bzr r14872) --- src/widgets/ruler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index fe851d592..5c715b0be 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -284,9 +284,11 @@ sp_ruler_init (SPRuler *ruler) priv->font_scale = DEFAULT_RULER_FONT_SCALE; #if GTK_CHECK_VERSION(3,0,0) + // Hard code off-white for the moment. Where is @bg_color defined? const gchar *str = "SPRuler {\n" - " background-color: @bg_color;\n" +// " background-color: @bg_color;\n" + " background-color: #f8f8f8;\n" "}\n"; GtkCssProvider *css = gtk_css_provider_new (); gtk_css_provider_load_from_data (css, str, -1, NULL); -- cgit v1.2.3 From efb5cb4a7a22316994b7a89b51d3d0ca654dabd4 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 7 May 2016 22:55:11 -0700 Subject: Clarify license. Most Inkscape source code does not specify GPL version, so it is essentially GPL v1+ under section 9. Authors of the few GPL v2 only files were contacted and all agreed to relicense under GPL v2 or later. We also have a few files copies from GIMP, which are GPL v3+, so the complete program is available under GPL v3 or later. (bzr r14873) --- COPYING | 340 ------------------------ COPYING.LIB | 515 ------------------------------------ GPL2.txt | 340 ++++++++++++++++++++++++ LGPL2.1.txt | 515 ++++++++++++++++++++++++++++++++++++ src/display/sp-canvas.cpp | 5 +- src/live_effects/lpe-jointype.cpp | 2 +- src/live_effects/lpe-jointype.h | 2 +- src/main-cmdlineact.cpp | 2 +- src/main-cmdlineact.h | 2 +- src/ui/dialog/object-properties.cpp | 2 +- src/ui/dialog/object-properties.h | 2 +- 11 files changed, 865 insertions(+), 862 deletions(-) delete mode 100644 COPYING delete mode 100644 COPYING.LIB create mode 100644 GPL2.txt create mode 100644 LGPL2.1.txt diff --git a/COPYING b/COPYING deleted file mode 100644 index b83f24b68..000000000 --- a/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/COPYING.LIB b/COPYING.LIB deleted file mode 100644 index 5ca31f63b..000000000 --- a/COPYING.LIB +++ /dev/null @@ -1,515 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper -mail. - -You should also get your employer (if you work as a programmer) or -your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James -Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/GPL2.txt b/GPL2.txt new file mode 100644 index 000000000..b83f24b68 --- /dev/null +++ b/GPL2.txt @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/LGPL2.1.txt b/LGPL2.1.txt new file mode 100644 index 000000000..5ca31f63b --- /dev/null +++ b/LGPL2.1.txt @@ -0,0 +1,515 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. +^L + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. +^L + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper +mail. + +You should also get your employer (if you work as a programmer) or +your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James +Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index decb14184..7d76fa043 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1159,8 +1159,11 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation allocation->width, allocation->height); if (canvas->_backing_store) { cairo_t *cr = cairo_create(new_backing_store); - cairo_set_source_surface(cr, canvas->_backing_store, 0, 0); + cairo_translate(cr, -canvas->_x0, -canvas->_y0); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source(cr, canvas->_background); + cairo_paint(cr); + cairo_set_source_surface(cr, canvas->_backing_store, canvas->_x0, canvas->_y0); cairo_paint(cr); cairo_destroy(cr); cairo_surface_destroy(canvas->_backing_store); diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp index 2eef315dd..fe42932be 100644 --- a/src/live_effects/lpe-jointype.cpp +++ b/src/live_effects/lpe-jointype.cpp @@ -4,7 +4,7 @@ * * Copyright (C) 2014 Authors * -* Released under GNU GPL v2, read the file 'COPYING' for more information +* Released under GNU GPL v2+, read the file 'COPYING' for more information */ #include "live_effects/parameter/enum.h" diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h index fddaeb619..ef7abdcc7 100644 --- a/src/live_effects/lpe-jointype.h +++ b/src/live_effects/lpe-jointype.h @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Authors * - * Released under GNU GPL v2, read the file COPYING for more information + * Released under GNU GPL v2+, read the file COPYING for more information */ #ifndef INKSCAPE_LPE_JOINTYPE_H diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp index ade83dfda..496c16d5d 100644 --- a/src/main-cmdlineact.cpp +++ b/src/main-cmdlineact.cpp @@ -4,7 +4,7 @@ * * Copyright (C) 2007 Authors * - * Released under GNU GPL v2, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information */ #include diff --git a/src/main-cmdlineact.h b/src/main-cmdlineact.h index c8ef64f10..b8ec4403b 100644 --- a/src/main-cmdlineact.h +++ b/src/main-cmdlineact.h @@ -12,7 +12,7 @@ * * Copyright (C) 2007 Authors * - * Released under GNU GPL v2.x, read the file 'COPYING' for more information + * Released under GNU GPL v2+, read the file 'COPYING' for more information */ namespace Inkscape { diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index 75430ed44..be46129c4 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Copyright (C) 2012 Kris De Gussem - * c++ version based on former C-version (GPL v2) with authors: + * c++ version based on former C-version (GPL v2+) with authors: * Lauris Kaplinski * bulia byak * Johan Engelen diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h index 093f273f6..dc28c0bad 100644 --- a/src/ui/dialog/object-properties.h +++ b/src/ui/dialog/object-properties.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * Copyright (C) 2012 Kris De Gussem - * c++version based on former C-version (GPL v2) with authors: + * c++version based on former C-version (GPL v2+) with authors: * Lauris Kaplinski * bulia byak * Johan Engelen -- cgit v1.2.3 From d203a9944763922eef658bb1234315d2a0e8b740 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 7 May 2016 23:35:17 -0700 Subject: Change license in about box to GPLv3 - due to GIMP files (bzr r14874) --- COPYING | 12 + GPL3.txt | 674 +++++++++++++++++++++++++++++++++ Makefile.am | 3 + src/ui/dialog/aboutbox.cpp | 906 +++++++++++++++++++++++++++++++-------------- 4 files changed, 1309 insertions(+), 286 deletions(-) create mode 100644 COPYING create mode 100644 GPL3.txt diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..0223a508e --- /dev/null +++ b/COPYING @@ -0,0 +1,12 @@ +Inkscape license +================ + +Most of Inkscape source code is available under the GNU General Public License, +version 2 or later, with the exception of a few files copied from GIMP, which +are available under GNU GPL version 3 or later. As such, the complete binaries +of Inkscape are currently covered by the terms of GNU GPL version 3 or later. + +Several standalone libraries contained in Inkscape's source code repository are +available under GNU Lesser General Public License or the Mozilla Public License. + +See the files GPL2.txt and GPL3.txt for the full license text. diff --git a/GPL3.txt b/GPL3.txt new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/GPL3.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Makefile.am b/Makefile.am index a4d4b2abf..d4e416d4e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,6 +38,9 @@ man_MANS = \ EXTRA_DIST = \ acinclude.m4 \ autogen.sh \ + GPL2.txt \ + GPL3.txt \ + LGPL2.1.txt \ fix-roff-punct \ intltool-extract.in \ intltool-merge.in \ diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index b653a630d..1a87a9718 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -618,288 +618,629 @@ void AboutBox::initStrings() { * This text is copied from the COPYING file */ license_text = - " GNU GENERAL PUBLIC LICENSE\n" - " Version 2, June 1991\n" + " GNU GENERAL PUBLIC LICENSE\n" + " Version 3, 29 June 2007\n" "\n" - " Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n" - " 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + " Copyright (C) 2007 Free Software Foundation, Inc. \n" " Everyone is permitted to copy and distribute verbatim copies\n" " of this license document, but changing it is not allowed.\n" "\n" - " Preamble\n" + " Preamble\n" "\n" - " The licenses for most software are designed to take away your\n" - "freedom to share and change it. By contrast, the GNU General Public\n" - "License is intended to guarantee your freedom to share and change free\n" - "software--to make sure the software is free for all its users. This\n" - "General Public License applies to most of the Free Software\n" - "Foundation's software and to any other program whose authors commit to\n" - "using it. (Some other Free Software Foundation software is covered by\n" - "the GNU Library General Public License instead.) You can apply it to\n" + " The GNU General Public License is a free, copyleft license for\n" + "software and other kinds of works.\n" + "\n" + " The licenses for most software and other practical works are designed\n" + "to take away your freedom to share and change the works. By contrast,\n" + "the GNU General Public License is intended to guarantee your freedom to\n" + "share and change all versions of a program--to make sure it remains free\n" + "software for all its users. We, the Free Software Foundation, use the\n" + "GNU General Public License for most of our software; it applies also to\n" + "any other work released this way by its authors. You can apply it to\n" "your programs, too.\n" "\n" " When we speak of free software, we are referring to freedom, not\n" "price. Our General Public Licenses are designed to make sure that you\n" "have the freedom to distribute copies of free software (and charge for\n" - "this service if you wish), that you receive source code or can get it\n" - "if you want it, that you can change the software or use pieces of it\n" - "in new free programs; and that you know you can do these things.\n" + "them if you wish), that you receive source code or can get it if you\n" + "want it, that you can change the software or use pieces of it in new\n" + "free programs, and that you know you can do these things.\n" "\n" - " To protect your rights, we need to make restrictions that forbid\n" - "anyone to deny you these rights or to ask you to surrender the rights.\n" - "These restrictions translate to certain responsibilities for you if you\n" - "distribute copies of the software, or if you modify it.\n" + " To protect your rights, we need to prevent others from denying you\n" + "these rights or asking you to surrender the rights. Therefore, you have\n" + "certain responsibilities if you distribute copies of the software, or if\n" + "you modify it: responsibilities to respect the freedom of others.\n" "\n" " For example, if you distribute copies of such a program, whether\n" - "gratis or for a fee, you must give the recipients all the rights that\n" - "you have. You must make sure that they, too, receive or can get the\n" - "source code. And you must show them these terms so they know their\n" - "rights.\n" - "\n" - " We protect your rights with two steps: (1) copyright the software, and\n" - "(2) offer you this license which gives you legal permission to copy,\n" - "distribute and/or modify the software.\n" - "\n" - " Also, for each author's protection and ours, we want to make certain\n" - "that everyone understands that there is no warranty for this free\n" - "software. If the software is modified by someone else and passed on, we\n" - "want its recipients to know that what they have is not the original, so\n" - "that any problems introduced by others will not reflect on the original\n" - "authors' reputations.\n" - "\n" - " Finally, any free program is threatened constantly by software\n" - "patents. We wish to avoid the danger that redistributors of a free\n" - "program will individually obtain patent licenses, in effect making the\n" - "program proprietary. To prevent this, we have made it clear that any\n" - "patent must be licensed for everyone's free use or not licensed at all.\n" + "gratis or for a fee, you must pass on to the recipients the same\n" + "freedoms that you received. You must make sure that they, too, receive\n" + "or can get the source code. And you must show them these terms so they\n" + "know their rights.\n" + "\n" + " Developers that use the GNU GPL protect your rights with two steps:\n" + "(1) assert copyright on the software, and (2) offer you this License\n" + "giving you legal permission to copy, distribute and/or modify it.\n" + "\n" + " For the developers' and authors' protection, the GPL clearly explains\n" + "that there is no warranty for this free software. For both users' and\n" + "authors' sake, the GPL requires that modified versions be marked as\n" + "changed, so that their problems will not be attributed erroneously to\n" + "authors of previous versions.\n" + "\n" + " Some devices are designed to deny users access to install or run\n" + "modified versions of the software inside them, although the manufacturer\n" + "can do so. This is fundamentally incompatible with the aim of\n" + "protecting users' freedom to change the software. The systematic\n" + "pattern of such abuse occurs in the area of products for individuals to\n" + "use, which is precisely where it is most unacceptable. Therefore, we\n" + "have designed this version of the GPL to prohibit the practice for those\n" + "products. If such problems arise substantially in other domains, we\n" + "stand ready to extend this provision to those domains in future versions\n" + "of the GPL, as needed to protect the freedom of users.\n" + "\n" + " Finally, every program is threatened constantly by software patents.\n" + "States should not allow patents to restrict development and use of\n" + "software on general-purpose computers, but in those that do, we wish to\n" + "avoid the special danger that patents applied to a free program could\n" + "make it effectively proprietary. To prevent this, the GPL assures that\n" + "patents cannot be used to render the program non-free.\n" "\n" " The precise terms and conditions for copying, distribution and\n" "modification follow.\n" "\n" - " GNU GENERAL PUBLIC LICENSE\n" - " TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n" - "\n" - " 0. This License applies to any program or other work which contains\n" - "a notice placed by the copyright holder saying it may be distributed\n" - "under the terms of this General Public License. The \"Program\", below,\n" - "refers to any such program or work, and a \"work based on the Program\"\n" - "means either the Program or any derivative work under copyright law:\n" - "that is to say, a work containing the Program or a portion of it,\n" - "either verbatim or with modifications and/or translated into another\n" - "language. (Hereinafter, translation is included without limitation in\n" - "the term \"modification\".) Each licensee is addressed as \"you\".\n" - "\n" - "Activities other than copying, distribution and modification are not\n" - "covered by this License; they are outside its scope. The act of\n" - "running the Program is not restricted, and the output from the Program\n" - "is covered only if its contents constitute a work based on the\n" - "Program (independent of having been made by running the Program).\n" - "Whether that is true depends on what the Program does.\n" - "\n" - " 1. You may copy and distribute verbatim copies of the Program's\n" - "source code as you receive it, in any medium, provided that you\n" - "conspicuously and appropriately publish on each copy an appropriate\n" - "copyright notice and disclaimer of warranty; keep intact all the\n" - "notices that refer to this License and to the absence of any warranty;\n" - "and give any other recipients of the Program a copy of this License\n" - "along with the Program.\n" - "\n" - "You may charge a fee for the physical act of transferring a copy, and\n" - "you may at your option offer warranty protection in exchange for a fee.\n" - "\n" - " 2. You may modify your copy or copies of the Program or any portion\n" - "of it, thus forming a work based on the Program, and copy and\n" - "distribute such modifications or work under the terms of Section 1\n" - "above, provided that you also meet all of these conditions:\n" - "\n" - " a) You must cause the modified files to carry prominent notices\n" - " stating that you changed the files and the date of any change.\n" - "\n" - " b) You must cause any work that you distribute or publish, that in\n" - " whole or in part contains or is derived from the Program or any\n" - " part thereof, to be licensed as a whole at no charge to all third\n" - " parties under the terms of this License.\n" - "\n" - " c) If the modified program normally reads commands interactively\n" - " when run, you must cause it, when started running for such\n" - " interactive use in the most ordinary way, to print or display an\n" - " announcement including an appropriate copyright notice and a\n" - " notice that there is no warranty (or else, saying that you provide\n" - " a warranty) and that users may redistribute the program under\n" - " these conditions, and telling the user how to view a copy of this\n" - " License. (Exception: if the Program itself is interactive but\n" - " does not normally print such an announcement, your work based on\n" - " the Program is not required to print an announcement.)\n" - "\n" - "These requirements apply to the modified work as a whole. If\n" - "identifiable sections of that work are not derived from the Program,\n" - "and can be reasonably considered independent and separate works in\n" - "themselves, then this License, and its terms, do not apply to those\n" - "sections when you distribute them as separate works. But when you\n" - "distribute the same sections as part of a whole which is a work based\n" - "on the Program, the distribution of the whole must be on the terms of\n" - "this License, whose permissions for other licensees extend to the\n" - "entire whole, and thus to each and every part regardless of who wrote it.\n" - "\n" - "Thus, it is not the intent of this section to claim rights or contest\n" - "your rights to work written entirely by you; rather, the intent is to\n" - "exercise the right to control the distribution of derivative or\n" - "collective works based on the Program.\n" - "\n" - "In addition, mere aggregation of another work not based on the Program\n" - "with the Program (or with a work based on the Program) on a volume of\n" - "a storage or distribution medium does not bring the other work under\n" - "the scope of this License.\n" - "\n" - " 3. You may copy and distribute the Program (or a work based on it,\n" - "under Section 2) in object code or executable form under the terms of\n" - "Sections 1 and 2 above provided that you also do one of the following:\n" - "\n" - " a) Accompany it with the complete corresponding machine-readable\n" - " source code, which must be distributed under the terms of Sections\n" - " 1 and 2 above on a medium customarily used for software interchange; or,\n" - "\n" - " b) Accompany it with a written offer, valid for at least three\n" - " years, to give any third party, for a charge no more than your\n" - " cost of physically performing source distribution, a complete\n" - " machine-readable copy of the corresponding source code, to be\n" - " distributed under the terms of Sections 1 and 2 above on a medium\n" - " customarily used for software interchange; or,\n" - "\n" - " c) Accompany it with the information you received as to the offer\n" - " to distribute corresponding source code. (This alternative is\n" - " allowed only for noncommercial distribution and only if you\n" - " received the program in object code or executable form with such\n" - " an offer, in accord with Subsection b above.)\n" - "\n" - "The source code for a work means the preferred form of the work for\n" - "making modifications to it. For an executable work, complete source\n" - "code means all the source code for all modules it contains, plus any\n" - "associated interface definition files, plus the scripts used to\n" - "control compilation and installation of the executable. However, as a\n" - "special exception, the source code distributed need not include\n" - "anything that is normally distributed (in either source or binary\n" - "form) with the major components (compiler, kernel, and so on) of the\n" - "operating system on which the executable runs, unless that component\n" - "itself accompanies the executable.\n" - "\n" - "If distribution of executable or object code is made by offering\n" - "access to copy from a designated place, then offering equivalent\n" - "access to copy the source code from the same place counts as\n" - "distribution of the source code, even though third parties are not\n" - "compelled to copy the source along with the object code.\n" - "\n" - " 4. You may not copy, modify, sublicense, or distribute the Program\n" - "except as expressly provided under this License. Any attempt\n" - "otherwise to copy, modify, sublicense or distribute the Program is\n" - "void, and will automatically terminate your rights under this License.\n" - "However, parties who have received copies, or rights, from you under\n" - "this License will not have their licenses terminated so long as such\n" - "parties remain in full compliance.\n" - "\n" - " 5. You are not required to accept this License, since you have not\n" - "signed it. However, nothing else grants you permission to modify or\n" - "distribute the Program or its derivative works. These actions are\n" - "prohibited by law if you do not accept this License. Therefore, by\n" - "modifying or distributing the Program (or any work based on the\n" - "Program), you indicate your acceptance of this License to do so, and\n" - "all its terms and conditions for copying, distributing or modifying\n" - "the Program or works based on it.\n" - "\n" - " 6. Each time you redistribute the Program (or any work based on the\n" - "Program), the recipient automatically receives a license from the\n" - "original licensor to copy, distribute or modify the Program subject to\n" - "these terms and conditions. You may not impose any further\n" - "restrictions on the recipients' exercise of the rights granted herein.\n" - "You are not responsible for enforcing compliance by third parties to\n" + " TERMS AND CONDITIONS\n" + "\n" + " 0. Definitions.\n" + "\n" + " \"This License\" refers to version 3 of the GNU General Public License.\n" + "\n" + " \"Copyright\" also means copyright-like laws that apply to other kinds of\n" + "works, such as semiconductor masks.\n" + "\n" + " \"The Program\" refers to any copyrightable work licensed under this\n" + "License. Each licensee is addressed as \"you\". \"Licensees\" and\n" + "\"recipients\" may be individuals or organizations.\n" + "\n" + " To \"modify\" a work means to copy from or adapt all or part of the work\n" + "in a fashion requiring copyright permission, other than the making of an\n" + "exact copy. The resulting work is called a \"modified version\" of the\n" + "earlier work or a work \"based on\" the earlier work.\n" + "\n" + " A \"covered work\" means either the unmodified Program or a work based\n" + "on the Program.\n" + "\n" + " To \"propagate\" a work means to do anything with it that, without\n" + "permission, would make you directly or secondarily liable for\n" + "infringement under applicable copyright law, except executing it on a\n" + "computer or modifying a private copy. Propagation includes copying,\n" + "distribution (with or without modification), making available to the\n" + "public, and in some countries other activities as well.\n" + "\n" + " To \"convey\" a work means any kind of propagation that enables other\n" + "parties to make or receive copies. Mere interaction with a user through\n" + "a computer network, with no transfer of a copy, is not conveying.\n" + "\n" + " An interactive user interface displays \"Appropriate Legal Notices\"\n" + "to the extent that it includes a convenient and prominently visible\n" + "feature that (1) displays an appropriate copyright notice, and (2)\n" + "tells the user that there is no warranty for the work (except to the\n" + "extent that warranties are provided), that licensees may convey the\n" + "work under this License, and how to view a copy of this License. If\n" + "the interface presents a list of user commands or options, such as a\n" + "menu, a prominent item in the list meets this criterion.\n" + "\n" + " 1. Source Code.\n" + "\n" + " The \"source code\" for a work means the preferred form of the work\n" + "for making modifications to it. \"Object code\" means any non-source\n" + "form of a work.\n" + "\n" + " A \"Standard Interface\" means an interface that either is an official\n" + "standard defined by a recognized standards body, or, in the case of\n" + "interfaces specified for a particular programming language, one that\n" + "is widely used among developers working in that language.\n" + "\n" + " The \"System Libraries\" of an executable work include anything, other\n" + "than the work as a whole, that (a) is included in the normal form of\n" + "packaging a Major Component, but which is not part of that Major\n" + "Component, and (b) serves only to enable use of the work with that\n" + "Major Component, or to implement a Standard Interface for which an\n" + "implementation is available to the public in source code form. A\n" + "\"Major Component\", in this context, means a major essential component\n" + "(kernel, window system, and so on) of the specific operating system\n" + "(if any) on which the executable work runs, or a compiler used to\n" + "produce the work, or an object code interpreter used to run it.\n" + "\n" + " The \"Corresponding Source\" for a work in object code form means all\n" + "the source code needed to generate, install, and (for an executable\n" + "work) run the object code and to modify the work, including scripts to\n" + "control those activities. However, it does not include the work's\n" + "System Libraries, or general-purpose tools or generally available free\n" + "programs which are used unmodified in performing those activities but\n" + "which are not part of the work. For example, Corresponding Source\n" + "includes interface definition files associated with source files for\n" + "the work, and the source code for shared libraries and dynamically\n" + "linked subprograms that the work is specifically designed to require,\n" + "such as by intimate data communication or control flow between those\n" + "subprograms and other parts of the work.\n" + "\n" + " The Corresponding Source need not include anything that users\n" + "can regenerate automatically from other parts of the Corresponding\n" + "Source.\n" + "\n" + " The Corresponding Source for a work in source code form is that\n" + "same work.\n" + "\n" + " 2. Basic Permissions.\n" + "\n" + " All rights granted under this License are granted for the term of\n" + "copyright on the Program, and are irrevocable provided the stated\n" + "conditions are met. This License explicitly affirms your unlimited\n" + "permission to run the unmodified Program. The output from running a\n" + "covered work is covered by this License only if the output, given its\n" + "content, constitutes a covered work. This License acknowledges your\n" + "rights of fair use or other equivalent, as provided by copyright law.\n" + "\n" + " You may make, run and propagate covered works that you do not\n" + "convey, without conditions so long as your license otherwise remains\n" + "in force. You may convey covered works to others for the sole purpose\n" + "of having them make modifications exclusively for you, or provide you\n" + "with facilities for running those works, provided that you comply with\n" + "the terms of this License in conveying all material for which you do\n" + "not control copyright. Those thus making or running the covered works\n" + "for you must do so exclusively on your behalf, under your direction\n" + "and control, on terms that prohibit them from making any copies of\n" + "your copyrighted material outside their relationship with you.\n" + "\n" + " Conveying under any other circumstances is permitted solely under\n" + "the conditions stated below. Sublicensing is not allowed; section 10\n" + "makes it unnecessary.\n" + "\n" + " 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n" + "\n" + " No covered work shall be deemed part of an effective technological\n" + "measure under any applicable law fulfilling obligations under article\n" + "11 of the WIPO copyright treaty adopted on 20 December 1996, or\n" + "similar laws prohibiting or restricting circumvention of such\n" + "measures.\n" + "\n" + " When you convey a covered work, you waive any legal power to forbid\n" + "circumvention of technological measures to the extent such circumvention\n" + "is effected by exercising rights under this License with respect to\n" + "the covered work, and you disclaim any intention to limit operation or\n" + "modification of the work as a means of enforcing, against the work's\n" + "users, your or third parties' legal rights to forbid circumvention of\n" + "technological measures.\n" + "\n" + " 4. Conveying Verbatim Copies.\n" + "\n" + " You may convey verbatim copies of the Program's source code as you\n" + "receive it, in any medium, provided that you conspicuously and\n" + "appropriately publish on each copy an appropriate copyright notice;\n" + "keep intact all notices stating that this License and any\n" + "non-permissive terms added in accord with section 7 apply to the code;\n" + "keep intact all notices of the absence of any warranty; and give all\n" + "recipients a copy of this License along with the Program.\n" + "\n" + " You may charge any price or no price for each copy that you convey,\n" + "and you may offer support or warranty protection for a fee.\n" + "\n" + " 5. Conveying Modified Source Versions.\n" + "\n" + " You may convey a work based on the Program, or the modifications to\n" + "produce it from the Program, in the form of source code under the\n" + "terms of section 4, provided that you also meet all of these conditions:\n" + "\n" + " a) The work must carry prominent notices stating that you modified\n" + " it, and giving a relevant date.\n" + "\n" + " b) The work must carry prominent notices stating that it is\n" + " released under this License and any conditions added under section\n" + " 7. This requirement modifies the requirement in section 4 to\n" + " \"keep intact all notices\".\n" + "\n" + " c) You must license the entire work, as a whole, under this\n" + " License to anyone who comes into possession of a copy. This\n" + " License will therefore apply, along with any applicable section 7\n" + " additional terms, to the whole of the work, and all its parts,\n" + " regardless of how they are packaged. This License gives no\n" + " permission to license the work in any other way, but it does not\n" + " invalidate such permission if you have separately received it.\n" + "\n" + " d) If the work has interactive user interfaces, each must display\n" + " Appropriate Legal Notices; however, if the Program has interactive\n" + " interfaces that do not display Appropriate Legal Notices, your\n" + " work need not make them do so.\n" + "\n" + " A compilation of a covered work with other separate and independent\n" + "works, which are not by their nature extensions of the covered work,\n" + "and which are not combined with it such as to form a larger program,\n" + "in or on a volume of a storage or distribution medium, is called an\n" + "\"aggregate\" if the compilation and its resulting copyright are not\n" + "used to limit the access or legal rights of the compilation's users\n" + "beyond what the individual works permit. Inclusion of a covered work\n" + "in an aggregate does not cause this License to apply to the other\n" + "parts of the aggregate.\n" + "\n" + " 6. Conveying Non-Source Forms.\n" + "\n" + " You may convey a covered work in object code form under the terms\n" + "of sections 4 and 5, provided that you also convey the\n" + "machine-readable Corresponding Source under the terms of this License,\n" + "in one of these ways:\n" + "\n" + " a) Convey the object code in, or embodied in, a physical product\n" + " (including a physical distribution medium), accompanied by the\n" + " Corresponding Source fixed on a durable physical medium\n" + " customarily used for software interchange.\n" + "\n" + " b) Convey the object code in, or embodied in, a physical product\n" + " (including a physical distribution medium), accompanied by a\n" + " written offer, valid for at least three years and valid for as\n" + " long as you offer spare parts or customer support for that product\n" + " model, to give anyone who possesses the object code either (1) a\n" + " copy of the Corresponding Source for all the software in the\n" + " product that is covered by this License, on a durable physical\n" + " medium customarily used for software interchange, for a price no\n" + " more than your reasonable cost of physically performing this\n" + " conveying of source, or (2) access to copy the\n" + " Corresponding Source from a network server at no charge.\n" + "\n" + " c) Convey individual copies of the object code with a copy of the\n" + " written offer to provide the Corresponding Source. This\n" + " alternative is allowed only occasionally and noncommercially, and\n" + " only if you received the object code with such an offer, in accord\n" + " with subsection 6b.\n" + "\n" + " d) Convey the object code by offering access from a designated\n" + " place (gratis or for a charge), and offer equivalent access to the\n" + " Corresponding Source in the same way through the same place at no\n" + " further charge. You need not require recipients to copy the\n" + " Corresponding Source along with the object code. If the place to\n" + " copy the object code is a network server, the Corresponding Source\n" + " may be on a different server (operated by you or a third party)\n" + " that supports equivalent copying facilities, provided you maintain\n" + " clear directions next to the object code saying where to find the\n" + " Corresponding Source. Regardless of what server hosts the\n" + " Corresponding Source, you remain obligated to ensure that it is\n" + " available for as long as needed to satisfy these requirements.\n" + "\n" + " e) Convey the object code using peer-to-peer transmission, provided\n" + " you inform other peers where the object code and Corresponding\n" + " Source of the work are being offered to the general public at no\n" + " charge under subsection 6d.\n" + "\n" + " A separable portion of the object code, whose source code is excluded\n" + "from the Corresponding Source as a System Library, need not be\n" + "included in conveying the object code work.\n" + "\n" + " A \"User Product\" is either (1) a \"consumer product\", which means any\n" + "tangible personal property which is normally used for personal, family,\n" + "or household purposes, or (2) anything designed or sold for incorporation\n" + "into a dwelling. In determining whether a product is a consumer product,\n" + "doubtful cases shall be resolved in favor of coverage. For a particular\n" + "product received by a particular user, \"normally used\" refers to a\n" + "typical or common use of that class of product, regardless of the status\n" + "of the particular user or of the way in which the particular user\n" + "actually uses, or expects or is expected to use, the product. A product\n" + "is a consumer product regardless of whether the product has substantial\n" + "commercial, industrial or non-consumer uses, unless such uses represent\n" + "the only significant mode of use of the product.\n" + "\n" + " \"Installation Information\" for a User Product means any methods,\n" + "procedures, authorization keys, or other information required to install\n" + "and execute modified versions of a covered work in that User Product from\n" + "a modified version of its Corresponding Source. The information must\n" + "suffice to ensure that the continued functioning of the modified object\n" + "code is in no case prevented or interfered with solely because\n" + "modification has been made.\n" + "\n" + " If you convey an object code work under this section in, or with, or\n" + "specifically for use in, a User Product, and the conveying occurs as\n" + "part of a transaction in which the right of possession and use of the\n" + "User Product is transferred to the recipient in perpetuity or for a\n" + "fixed term (regardless of how the transaction is characterized), the\n" + "Corresponding Source conveyed under this section must be accompanied\n" + "by the Installation Information. But this requirement does not apply\n" + "if neither you nor any third party retains the ability to install\n" + "modified object code on the User Product (for example, the work has\n" + "been installed in ROM).\n" + "\n" + " The requirement to provide Installation Information does not include a\n" + "requirement to continue to provide support service, warranty, or updates\n" + "for a work that has been modified or installed by the recipient, or for\n" + "the User Product in which it has been modified or installed. Access to a\n" + "network may be denied when the modification itself materially and\n" + "adversely affects the operation of the network or violates the rules and\n" + "protocols for communication across the network.\n" + "\n" + " Corresponding Source conveyed, and Installation Information provided,\n" + "in accord with this section must be in a format that is publicly\n" + "documented (and with an implementation available to the public in\n" + "source code form), and must require no special password or key for\n" + "unpacking, reading or copying.\n" + "\n" + " 7. Additional Terms.\n" + "\n" + " \"Additional permissions\" are terms that supplement the terms of this\n" + "License by making exceptions from one or more of its conditions.\n" + "Additional permissions that are applicable to the entire Program shall\n" + "be treated as though they were included in this License, to the extent\n" + "that they are valid under applicable law. If additional permissions\n" + "apply only to part of the Program, that part may be used separately\n" + "under those permissions, but the entire Program remains governed by\n" + "this License without regard to the additional permissions.\n" + "\n" + " When you convey a copy of a covered work, you may at your option\n" + "remove any additional permissions from that copy, or from any part of\n" + "it. (Additional permissions may be written to require their own\n" + "removal in certain cases when you modify the work.) You may place\n" + "additional permissions on material, added by you to a covered work,\n" + "for which you have or can give appropriate copyright permission.\n" + "\n" + " Notwithstanding any other provision of this License, for material you\n" + "add to a covered work, you may (if authorized by the copyright holders of\n" + "that material) supplement the terms of this License with terms:\n" + "\n" + " a) Disclaiming warranty or limiting liability differently from the\n" + " terms of sections 15 and 16 of this License; or\n" + "\n" + " b) Requiring preservation of specified reasonable legal notices or\n" + " author attributions in that material or in the Appropriate Legal\n" + " Notices displayed by works containing it; or\n" + "\n" + " c) Prohibiting misrepresentation of the origin of that material, or\n" + " requiring that modified versions of such material be marked in\n" + " reasonable ways as different from the original version; or\n" + "\n" + " d) Limiting the use for publicity purposes of names of licensors or\n" + " authors of the material; or\n" + "\n" + " e) Declining to grant rights under trademark law for use of some\n" + " trade names, trademarks, or service marks; or\n" + "\n" + " f) Requiring indemnification of licensors and authors of that\n" + " material by anyone who conveys the material (or modified versions of\n" + " it) with contractual assumptions of liability to the recipient, for\n" + " any liability that these contractual assumptions directly impose on\n" + " those licensors and authors.\n" + "\n" + " All other non-permissive additional terms are considered \"further\n" + "restrictions\" within the meaning of section 10. If the Program as you\n" + "received it, or any part of it, contains a notice stating that it is\n" + "governed by this License along with a term that is a further\n" + "restriction, you may remove that term. If a license document contains\n" + "a further restriction but permits relicensing or conveying under this\n" + "License, you may add to a covered work material governed by the terms\n" + "of that license document, provided that the further restriction does\n" + "not survive such relicensing or conveying.\n" + "\n" + " If you add terms to a covered work in accord with this section, you\n" + "must place, in the relevant source files, a statement of the\n" + "additional terms that apply to those files, or a notice indicating\n" + "where to find the applicable terms.\n" + "\n" + " Additional terms, permissive or non-permissive, may be stated in the\n" + "form of a separately written license, or stated as exceptions;\n" + "the above requirements apply either way.\n" + "\n" + " 8. Termination.\n" + "\n" + " You may not propagate or modify a covered work except as expressly\n" + "provided under this License. Any attempt otherwise to propagate or\n" + "modify it is void, and will automatically terminate your rights under\n" + "this License (including any patent licenses granted under the third\n" + "paragraph of section 11).\n" + "\n" + " However, if you cease all violation of this License, then your\n" + "license from a particular copyright holder is reinstated (a)\n" + "provisionally, unless and until the copyright holder explicitly and\n" + "finally terminates your license, and (b) permanently, if the copyright\n" + "holder fails to notify you of the violation by some reasonable means\n" + "prior to 60 days after the cessation.\n" + "\n" + " Moreover, your license from a particular copyright holder is\n" + "reinstated permanently if the copyright holder notifies you of the\n" + "violation by some reasonable means, this is the first time you have\n" + "received notice of violation of this License (for any work) from that\n" + "copyright holder, and you cure the violation prior to 30 days after\n" + "your receipt of the notice.\n" + "\n" + " Termination of your rights under this section does not terminate the\n" + "licenses of parties who have received copies or rights from you under\n" + "this License. If your rights have been terminated and not permanently\n" + "reinstated, you do not qualify to receive new licenses for the same\n" + "material under section 10.\n" + "\n" + " 9. Acceptance Not Required for Having Copies.\n" + "\n" + " You are not required to accept this License in order to receive or\n" + "run a copy of the Program. Ancillary propagation of a covered work\n" + "occurring solely as a consequence of using peer-to-peer transmission\n" + "to receive a copy likewise does not require acceptance. However,\n" + "nothing other than this License grants you permission to propagate or\n" + "modify any covered work. These actions infringe copyright if you do\n" + "not accept this License. Therefore, by modifying or propagating a\n" + "covered work, you indicate your acceptance of this License to do so.\n" + "\n" + " 10. Automatic Licensing of Downstream Recipients.\n" + "\n" + " Each time you convey a covered work, the recipient automatically\n" + "receives a license from the original licensors, to run, modify and\n" + "propagate that work, subject to this License. You are not responsible\n" + "for enforcing compliance by third parties with this License.\n" + "\n" + " An \"entity transaction\" is a transaction transferring control of an\n" + "organization, or substantially all assets of one, or subdividing an\n" + "organization, or merging organizations. If propagation of a covered\n" + "work results from an entity transaction, each party to that\n" + "transaction who receives a copy of the work also receives whatever\n" + "licenses to the work the party's predecessor in interest had or could\n" + "give under the previous paragraph, plus a right to possession of the\n" + "Corresponding Source of the work from the predecessor in interest, if\n" + "the predecessor has it or can get it with reasonable efforts.\n" + "\n" + " You may not impose any further restrictions on the exercise of the\n" + "rights granted or affirmed under this License. For example, you may\n" + "not impose a license fee, royalty, or other charge for exercise of\n" + "rights granted under this License, and you may not initiate litigation\n" + "(including a cross-claim or counterclaim in a lawsuit) alleging that\n" + "any patent claim is infringed by making, using, selling, offering for\n" + "sale, or importing the Program or any portion of it.\n" + "\n" + " 11. Patents.\n" + "\n" + " A \"contributor\" is a copyright holder who authorizes use under this\n" + "License of the Program or a work on which the Program is based. The\n" + "work thus licensed is called the contributor's \"contributor version\".\n" + "\n" + " A contributor's \"essential patent claims\" are all patent claims\n" + "owned or controlled by the contributor, whether already acquired or\n" + "hereafter acquired, that would be infringed by some manner, permitted\n" + "by this License, of making, using, or selling its contributor version,\n" + "but do not include claims that would be infringed only as a\n" + "consequence of further modification of the contributor version. For\n" + "purposes of this definition, \"control\" includes the right to grant\n" + "patent sublicenses in a manner consistent with the requirements of\n" "this License.\n" "\n" - " 7. If, as a consequence of a court judgment or allegation of patent\n" - "infringement or for any other reason (not limited to patent issues),\n" - "conditions are imposed on you (whether by court order, agreement or\n" + " Each contributor grants you a non-exclusive, worldwide, royalty-free\n" + "patent license under the contributor's essential patent claims, to\n" + "make, use, sell, offer for sale, import and otherwise run, modify and\n" + "propagate the contents of its contributor version.\n" + "\n" + " In the following three paragraphs, a \"patent license\" is any express\n" + "agreement or commitment, however denominated, not to enforce a patent\n" + "(such as an express permission to practice a patent or covenant not to\n" + "sue for patent infringement). To \"grant\" such a patent license to a\n" + "party means to make such an agreement or commitment not to enforce a\n" + "patent against the party.\n" + "\n" + " If you convey a covered work, knowingly relying on a patent license,\n" + "and the Corresponding Source of the work is not available for anyone\n" + "to copy, free of charge and under the terms of this License, through a\n" + "publicly available network server or other readily accessible means,\n" + "then you must either (1) cause the Corresponding Source to be so\n" + "available, or (2) arrange to deprive yourself of the benefit of the\n" + "patent license for this particular work, or (3) arrange, in a manner\n" + "consistent with the requirements of this License, to extend the patent\n" + "license to downstream recipients. \"Knowingly relying\" means you have\n" + "actual knowledge that, but for the patent license, your conveying the\n" + "covered work in a country, or your recipient's use of the covered work\n" + "in a country, would infringe one or more identifiable patents in that\n" + "country that you have reason to believe are valid.\n" + "\n" + " If, pursuant to or in connection with a single transaction or\n" + "arrangement, you convey, or propagate by procuring conveyance of, a\n" + "covered work, and grant a patent license to some of the parties\n" + "receiving the covered work authorizing them to use, propagate, modify\n" + "or convey a specific copy of the covered work, then the patent license\n" + "you grant is automatically extended to all recipients of the covered\n" + "work and works based on it.\n" + "\n" + " A patent license is \"discriminatory\" if it does not include within\n" + "the scope of its coverage, prohibits the exercise of, or is\n" + "conditioned on the non-exercise of one or more of the rights that are\n" + "specifically granted under this License. You may not convey a covered\n" + "work if you are a party to an arrangement with a third party that is\n" + "in the business of distributing software, under which you make payment\n" + "to the third party based on the extent of your activity of conveying\n" + "the work, and under which the third party grants, to any of the\n" + "parties who would receive the covered work from you, a discriminatory\n" + "patent license (a) in connection with copies of the covered work\n" + "conveyed by you (or copies made from those copies), or (b) primarily\n" + "for and in connection with specific products or compilations that\n" + "contain the covered work, unless you entered into that arrangement,\n" + "or that patent license was granted, prior to 28 March 2007.\n" + "\n" + " Nothing in this License shall be construed as excluding or limiting\n" + "any implied license or other defenses to infringement that may\n" + "otherwise be available to you under applicable patent law.\n" + "\n" + " 12. No Surrender of Others' Freedom.\n" + "\n" + " If conditions are imposed on you (whether by court order, agreement or\n" "otherwise) that contradict the conditions of this License, they do not\n" - "excuse you from the conditions of this License. If you cannot\n" - "distribute so as to satisfy simultaneously your obligations under this\n" - "License and any other pertinent obligations, then as a consequence you\n" - "may not distribute the Program at all. For example, if a patent\n" - "license would not permit royalty-free redistribution of the Program by\n" - "all those who receive copies directly or indirectly through you, then\n" - "the only way you could satisfy both it and this License would be to\n" - "refrain entirely from distribution of the Program.\n" - "\n" - "If any portion of this section is held invalid or unenforceable under\n" - "any particular circumstance, the balance of the section is intended to\n" - "apply and the section as a whole is intended to apply in other\n" - "circumstances.\n" - "\n" - "It is not the purpose of this section to induce you to infringe any\n" - "patents or other property right claims or to contest validity of any\n" - "such claims; this section has the sole purpose of protecting the\n" - "integrity of the free software distribution system, which is\n" - "implemented by public license practices. Many people have made\n" - "generous contributions to the wide range of software distributed\n" - "through that system in reliance on consistent application of that\n" - "system; it is up to the author/donor to decide if he or she is willing\n" - "to distribute software through any other system and a licensee cannot\n" - "impose that choice.\n" - "\n" - "This section is intended to make thoroughly clear what is believed to\n" - "be a consequence of the rest of this License.\n" - "\n" - " 8. If the distribution and/or use of the Program is restricted in\n" - "certain countries either by patents or by copyrighted interfaces, the\n" - "original copyright holder who places the Program under this License\n" - "may add an explicit geographical distribution limitation excluding\n" - "those countries, so that distribution is permitted only in or among\n" - "countries not thus excluded. In such case, this License incorporates\n" - "the limitation as if written in the body of this License.\n" - "\n" - " 9. The Free Software Foundation may publish revised and/or new versions\n" - "of the General Public License from time to time. Such new versions will\n" + "excuse you from the conditions of this License. If you cannot convey a\n" + "covered work so as to satisfy simultaneously your obligations under this\n" + "License and any other pertinent obligations, then as a consequence you may\n" + "not convey it at all. For example, if you agree to terms that obligate you\n" + "to collect a royalty for further conveying from those to whom you convey\n" + "the Program, the only way you could satisfy both those terms and this\n" + "License would be to refrain entirely from conveying the Program.\n" + "\n" + " 13. Use with the GNU Affero General Public License.\n" + "\n" + " Notwithstanding any other provision of this License, you have\n" + "permission to link or combine any covered work with a work licensed\n" + "under version 3 of the GNU Affero General Public License into a single\n" + "combined work, and to convey the resulting work. The terms of this\n" + "License will continue to apply to the part which is the covered work,\n" + "but the special requirements of the GNU Affero General Public License,\n" + "section 13, concerning interaction through a network will apply to the\n" + "combination as such.\n" + "\n" + " 14. Revised Versions of this License.\n" + "\n" + " The Free Software Foundation may publish revised and/or new versions of\n" + "the GNU General Public License from time to time. Such new versions will\n" "be similar in spirit to the present version, but may differ in detail to\n" "address new problems or concerns.\n" "\n" - "Each version is given a distinguishing version number. If the Program\n" - "specifies a version number of this License which applies to it and \"any\n" - "later version\", you have the option of following the terms and conditions\n" - "either of that version or of any later version published by the Free\n" - "Software Foundation. If the Program does not specify a version number of\n" - "this License, you may choose any version ever published by the Free Software\n" - "Foundation.\n" - "\n" - " 10. If you wish to incorporate parts of the Program into other free\n" - "programs whose distribution conditions are different, write to the author\n" - "to ask for permission. For software which is copyrighted by the Free\n" - "Software Foundation, write to the Free Software Foundation; we sometimes\n" - "make exceptions for this. Our decision will be guided by the two goals\n" - "of preserving the free status of all derivatives of our free software and\n" - "of promoting the sharing and reuse of software generally.\n" - "\n" - " NO WARRANTY\n" - "\n" - " 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n" - "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n" - "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n" - "PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n" - "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n" - "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n" - "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n" - "PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n" - "REPAIR OR CORRECTION.\n" - "\n" - " 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n" - "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n" - "REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n" - "INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n" - "OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n" - "TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n" - "YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n" - "PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n" - "POSSIBILITY OF SUCH DAMAGES.\n" - "\n" - " END OF TERMS AND CONDITIONS\n" - "\n" - " How to Apply These Terms to Your New Programs\n" + " Each version is given a distinguishing version number. If the\n" + "Program specifies that a certain numbered version of the GNU General\n" + "Public License \"or any later version\" applies to it, you have the\n" + "option of following the terms and conditions either of that numbered\n" + "version or of any later version published by the Free Software\n" + "Foundation. If the Program does not specify a version number of the\n" + "GNU General Public License, you may choose any version ever published\n" + "by the Free Software Foundation.\n" + "\n" + " If the Program specifies that a proxy can decide which future\n" + "versions of the GNU General Public License can be used, that proxy's\n" + "public statement of acceptance of a version permanently authorizes you\n" + "to choose that version for the Program.\n" + "\n" + " Later license versions may give you additional or different\n" + "permissions. However, no additional obligations are imposed on any\n" + "author or copyright holder as a result of your choosing to follow a\n" + "later version.\n" + "\n" + " 15. Disclaimer of Warranty.\n" + "\n" + " THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\n" + "APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\n" + "HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\n" + "OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\n" + "THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n" + "PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\n" + "IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\n" + "ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n" + "\n" + " 16. Limitation of Liability.\n" + "\n" + " IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n" + "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\n" + "THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\n" + "GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\n" + "USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\n" + "DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\n" + "PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\n" + "EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\n" + "SUCH DAMAGES.\n" + "\n" + " 17. Interpretation of Sections 15 and 16.\n" + "\n" + " If the disclaimer of warranty and limitation of liability provided\n" + "above cannot be given local legal effect according to their terms,\n" + "reviewing courts shall apply local law that most closely approximates\n" + "an absolute waiver of all civil liability in connection with the\n" + "Program, unless a warranty or assumption of liability accompanies a\n" + "copy of the Program in return for a fee.\n" + "\n" + " END OF TERMS AND CONDITIONS\n" + "\n" + " How to Apply These Terms to Your New Programs\n" "\n" " If you develop a new program, and you want it to be of the greatest\n" "possible use to the public, the best way to achieve this is to make it\n" @@ -907,15 +1248,15 @@ void AboutBox::initStrings() { "\n" " To do so, attach the following notices to the program. It is safest\n" "to attach them to the start of each source file to most effectively\n" - "convey the exclusion of warranty; and each file should have at least\n" + "state the exclusion of warranty; and each file should have at least\n" "the \"copyright\" line and a pointer to where the full notice is found.\n" "\n" " \n" " Copyright (C) \n" "\n" - " This program is free software; you can redistribute it and/or modify\n" + " This program is free software: you can redistribute it and/or modify\n" " it under the terms of the GNU General Public License as published by\n" - " the Free Software Foundation; either version 2 of the License, or\n" + " the Free Software Foundation, either version 3 of the License, or\n" " (at your option) any later version.\n" "\n" " This program is distributed in the hope that it will be useful,\n" @@ -924,40 +1265,33 @@ void AboutBox::initStrings() { " GNU General Public License for more details.\n" "\n" " You should have received a copy of the GNU General Public License\n" - " along with this program; if not, write to the Free Software\n" - " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" - "\n" + " along with this program. If not, see .\n" "\n" "Also add information on how to contact you by electronic and paper mail.\n" "\n" - "If the program is interactive, make it output a short notice like this\n" - "when it starts in an interactive mode:\n" + " If the program does terminal interaction, make it output a short\n" + "notice like this when it starts in an interactive mode:\n" "\n" - " Gnomovision version 69, Copyright (C) year name of author\n" - " Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n" + " Copyright (C) \n" + " This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n" " This is free software, and you are welcome to redistribute it\n" " under certain conditions; type `show c' for details.\n" "\n" "The hypothetical commands `show w' and `show c' should show the appropriate\n" - "parts of the General Public License. Of course, the commands you use may\n" - "be called something other than `show w' and `show c'; they could even be\n" - "mouse-clicks or menu items--whatever suits your program.\n" - "\n" - "You should also get your employer (if you work as a programmer) or your\n" - "school, if any, to sign a \"copyright disclaimer\" for the program, if\n" - "necessary. Here is a sample; alter the names:\n" - "\n" - " Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n" - " `Gnomovision' (which makes passes at compilers) written by James Hacker.\n" + "parts of the General Public License. Of course, your program's commands\n" + "might be different; for a GUI interface, you would use an \"about box\".\n" "\n" - " , 1 April 1989\n" - " Ty Coon, President of Vice\n" + " You should also get your employer (if you work as a programmer) or school,\n" + "if any, to sign a \"copyright disclaimer\" for the program, if necessary.\n" + "For more information on this, and how to apply and follow the GNU GPL, see\n" + ".\n" "\n" - "This General Public License does not permit incorporating your program into\n" - "proprietary programs. If your program is a subroutine library, you may\n" - "consider it more useful to permit linking proprietary applications with the\n" - "library. If this is what you want to do, use the GNU Library General\n" - "Public License instead of this License.\n" + " The GNU General Public License does not permit incorporating your program\n" + "into proprietary programs. If your program is a subroutine library, you\n" + "may consider it more useful to permit linking proprietary applications with\n" + "the library. If this is what you want to do, use the GNU Lesser General\n" + "Public License instead of this License. But first, please read\n" + "." ; } -- cgit v1.2.3 From 626b1a569bb1a6a3fa8c03324c8066fe81332d17 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 8 May 2016 09:06:24 +0200 Subject: fix-bug-734201. stroke-to-path doesn't scale stroke width used in markers Fixed bugs: - https://launchpad.net/bugs/734201 (bzr r14875) --- src/splivarot.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 461445ee0..c37df151c 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -862,7 +862,7 @@ void sp_selected_path_outline_add_marker( SPObject *marker_object, Geom::Affine if (marker->markerUnits == SP_MARKER_UNITS_STROKEWIDTH) { tr = stroke_scale * tr; } - + // total marker transform tr = marker_item->transform * marker->c2p * tr * transform; @@ -1153,7 +1153,9 @@ sp_selected_path_outline(SPDesktop *desktop) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select stroked path(s) to convert stroke to path.")); return; } - + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + bool scale_stroke = prefs->getBool("/options/transform/stroke", true); + prefs->setBool("/options/transform/stroke", true); bool did = false; std::vector il(selection->itemList()); for (std::vector::const_iterator l = il.begin(); l != il.end(); l++){ @@ -1503,7 +1505,7 @@ sp_selected_path_outline(SPDesktop *desktop) delete res; delete orig; } - + prefs->setBool("/options/transform/stroke", scale_stroke); if (did) { DocumentUndo::done(desktop->getDocument(), SP_VERB_SELECTION_OUTLINE, _("Convert stroke to path")); -- cgit v1.2.3 From fbb9317b912eba2ac02019869b687ec637790e9f Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 8 May 2016 09:29:51 +0200 Subject: Start of GTK3 external style sheet support. (bzr r14873.1.1) --- share/ui/CMakeLists.txt | 2 +- share/ui/Makefile.am | 1 + share/ui/style.css | 55 ++++++++++++++++++++++++++++++++++++++++++ src/main.cpp | 34 ++++++++++++++++++++++++++ src/widgets/desktop-widget.cpp | 1 + src/widgets/ruler.cpp | 15 ------------ 6 files changed, 92 insertions(+), 16 deletions(-) create mode 100644 share/ui/style.css diff --git a/share/ui/CMakeLists.txt b/share/ui/CMakeLists.txt index 89b9f9b0f..5e9db74cf 100644 --- a/share/ui/CMakeLists.txt +++ b/share/ui/CMakeLists.txt @@ -1,3 +1,3 @@ -file(GLOB _FILES "*.xml" "*.rc") +file(GLOB _FILES "*.xml" "*.rc" "*.css") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/ui) diff --git a/share/ui/Makefile.am b/share/ui/Makefile.am index 7195af0cb..1e55ea58f 100644 --- a/share/ui/Makefile.am +++ b/share/ui/Makefile.am @@ -4,6 +4,7 @@ uidir = $(datadir)/inkscape/ui ui_DATA = \ keybindings.rc \ menus-bars.xml \ + style.css \ toolbox.xml \ units.xml diff --git a/share/ui/style.css b/share/ui/style.css new file mode 100644 index 000000000..41b8ba426 --- /dev/null +++ b/share/ui/style.css @@ -0,0 +1,55 @@ + +/* GTK3 WIDGET STYLING */ + +/* + * Keep in order of: + * General -> Specific + * Order of default appearance + * Top -> Bottom (e.g. Selector Tool, Node Tool, ...) + * Left -> Right + * + * We need a standardized naming scheme. + */ + +/* Lightest to darkest based on linear rgb */ +@define-color bg_color0 #ffffff; /* White */ +@define-color bg_color05 #f8f8f8; /* Slightly off white */ +@define-color bg_color1 #f0f0f0; +@define-color bg_color2 #e0e0e0; +@define-color bg_color3 #d0d0d0; +@define-color bg_color4 #bbbbbb; /* 50% Gray */ +@define-color bg_color5 #a5a5a5; +@define-color bg_color6 #898989; +@define-color bg_color7 #636363; +@define-color bg_color8 #000000; /* Black */ + +GtkWidget { +/* font-size: 12pt; */ +} + +SPRuler { + background-color: @bg_color05; +} + +SPCanvas { + background-color: @bg_color0; +} + +combobox window.popup scrolledwindow treeview separator { + -GtkWidget-wide-separators: true; + -GtkWidget-separator-height: 6; +} + +#font_selector_family { + -GtkWidget-wide-separators: true; + -GtkWidget-separator-height: 6; +} + +#TextFontFamilyAction_combobox { + -GtkComboBox-appears-as-list: true; +} + +#guides_lock { + padding: 0; +} + diff --git a/src/main.cpp b/src/main.cpp index 840643a90..99e3ccfe6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,6 +52,11 @@ #include #include +#if GTK_CHECK_VERSION(3,0,0) +#include +#include +#endif + #include "inkgc/gc-core.h" #ifdef AND @@ -1051,6 +1056,35 @@ sp_main_gui(int argc, char const **argv) #endif g_free(usericondir); + +#if GTK_CHECK_VERSION(3,0,0) + // Add style sheet (GTK3) + Glib::RefPtr screen = Gdk::Screen::get_default(); + + Glib::ustring inkscape_style = INKSCAPE_UIDIR; + inkscape_style += "/style.css"; + // std::cout << "CSS Stylesheet Inkscape: " << inkscape_style << std::endl; + Glib::RefPtr provider = Gtk::CssProvider::create(); + try { + provider->load_from_path (inkscape_style); + } + catch (const Gtk::CssProviderError& ex) + { + std::cerr << "CSSProviderError::load_from_path(): failed to load: " << inkscape_style << "\n (" << ex.what() << ")" << std::endl; + } + Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + Glib::ustring user_style = Inkscape::Application::profile_path("ui/style.css"); + // std::cout << "CSS Stylesheet User: " << user_style << std::endl; + Glib::RefPtr provider2 = Gtk::CssProvider::create(); + try { + provider2->load_from_path (user_style); + } + catch (const Gtk::CssProviderError& ex) + {} + Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); +#endif + gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); Inkscape::Debug::log_display_config(); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index fe724a964..1a4fcccf4 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -404,6 +404,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) Glib::RefPtr guides_lock_style_provider = Gtk::CssProvider::create(); guides_lock_style_provider->load_from_data("GtkWidget { padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; }"); Gtk::Widget * wnd = Glib::wrap(dtw->guides_lock); + wnd->set_name("guides_lock"); Glib::RefPtr context = wnd->get_style_context(); context->add_provider(guides_lock_style_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); #endif diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 5c715b0be..bcab535f9 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -282,21 +282,6 @@ sp_ruler_init (SPRuler *ruler) priv->pos_redraw_idle_id = 0; priv->font_scale = DEFAULT_RULER_FONT_SCALE; - -#if GTK_CHECK_VERSION(3,0,0) - // Hard code off-white for the moment. Where is @bg_color defined? - const gchar *str = - "SPRuler {\n" -// " background-color: @bg_color;\n" - " background-color: #f8f8f8;\n" - "}\n"; - GtkCssProvider *css = gtk_css_provider_new (); - gtk_css_provider_load_from_data (css, str, -1, NULL); - gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (ruler)), - GTK_STYLE_PROVIDER (css), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - g_object_unref (css); -#endif } static void -- cgit v1.2.3 From 96731f992a6c14dd8a6b80075e1648356b3544ef Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 8 May 2016 09:39:27 +0200 Subject: Fixing page transforms (bzr r13682.1.39) --- src/live_effects/lpe-mirror_symmetry.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 9a2a54a13..c4bd919f8 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -127,10 +127,10 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument(); Geom::Rect view_box_rect = doc->getViewBox(); Geom::Point sp = Geom::Point(view_box_rect.width()/2.0, 0); - sp *= lpeitem->transform.inverse(); + sp *= lpeitem->i2dt_affine().inverse(); start_point.param_setValue(sp); Geom::Point ep = Geom::Point(view_box_rect.width()/2.0, view_box_rect.height()); - ep *= lpeitem->transform.inverse(); + ep *= lpeitem->i2dt_affine().inverse(); end_point.param_setValue(ep); center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); line_separation.setPoints(start_point, end_point); @@ -140,10 +140,10 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument(); Geom::Rect view_box_rect = doc->getViewBox(); Geom::Point sp = Geom::Point(0, view_box_rect.height()/2.0); - sp *= lpeitem->transform.inverse(); + sp *= lpeitem->i2dt_affine().inverse(); start_point.param_setValue(sp); Geom::Point ep = Geom::Point(view_box_rect.width(), view_box_rect.height()/2.0); - ep *= lpeitem->transform.inverse(); + ep *= lpeitem->i2dt_affine().inverse(); end_point.param_setValue(ep); center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); line_separation.setPoints(start_point, end_point); -- cgit v1.2.3 From d756856a3abe21eba762bf7562402feb91f257b1 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 8 May 2016 11:08:40 +0200 Subject: Fix transform in document based axis (bzr r13682.1.41) --- src/live_effects/lpe-mirror_symmetry.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index c4bd919f8..88fee4c47 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -127,10 +127,10 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument(); Geom::Rect view_box_rect = doc->getViewBox(); Geom::Point sp = Geom::Point(view_box_rect.width()/2.0, 0); - sp *= lpeitem->i2dt_affine().inverse(); + sp *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse(); start_point.param_setValue(sp); Geom::Point ep = Geom::Point(view_box_rect.width()/2.0, view_box_rect.height()); - ep *= lpeitem->i2dt_affine().inverse(); + ep *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse(); end_point.param_setValue(ep); center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); line_separation.setPoints(start_point, end_point); @@ -140,10 +140,10 @@ LPEMirrorSymmetry::doBeforeEffect (SPLPEItem const* lpeitem) SPDocument * doc = SP_ACTIVE_DESKTOP->getDocument(); Geom::Rect view_box_rect = doc->getViewBox(); Geom::Point sp = Geom::Point(0, view_box_rect.height()/2.0); - sp *= lpeitem->i2dt_affine().inverse(); + sp *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse(); start_point.param_setValue(sp); Geom::Point ep = Geom::Point(view_box_rect.width(), view_box_rect.height()/2.0); - ep *= lpeitem->i2dt_affine().inverse(); + ep *= i2anc_affine(SP_OBJECT(lpeitem), SP_OBJECT(SP_ACTIVE_DESKTOP->currentLayer()->parent)) .inverse(); end_point.param_setValue(ep); center_point = Geom::middle_point((Geom::Point)start_point, (Geom::Point)end_point); line_separation.setPoints(start_point, end_point); @@ -178,7 +178,7 @@ LPEMirrorSymmetry::doEffect_path (Geom::PathVector const & path_in) Geom::PathVector path_out; if (!discard_orig_path && !fuse_paths) { - path_out = path_in; + path_out = pathv_to_linear_and_cubic_beziers(path_in); } Geom::Point point_a(line_separation.initialPoint()); -- cgit v1.2.3 From da4a2d1737f905daa90392f60746ee445ba9414c Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 8 May 2016 11:41:39 +0200 Subject: add missing POTFILES.in line in mirror symmetry LPE (bzr r14878) --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 057114bd0..1dfd26eb1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -148,6 +148,7 @@ src/live_effects/lpe-interpolate_points.cpp src/live_effects/lpe-jointype.cpp src/live_effects/lpe-knot.cpp src/live_effects/lpe-lattice2.cpp +src/live_effects/lpe-mirror_symmetry.cpp src/live_effects/lpe-patternalongpath.cpp src/live_effects/lpe-perspective-envelope.cpp src/live_effects/lpe-powerstroke.cpp -- cgit v1.2.3 From c3ef09704c74df622967eb75d22288264553a69e Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 8 May 2016 16:30:43 +0200 Subject: Attemt to fix ruler background for GTK 3.20. (bzr r14876.1.1) --- share/ui/style.css | 8 ++++++++ src/widgets/ruler.cpp | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/share/ui/style.css b/share/ui/style.css index 41b8ba426..3ee6f7450 100644 --- a/share/ui/style.css +++ b/share/ui/style.css @@ -9,6 +9,8 @@ * Left -> Right * * We need a standardized naming scheme. + * + * As of Gtk 3.20, you cannot use widget names. */ /* Lightest to darkest based on linear rgb */ @@ -27,10 +29,16 @@ GtkWidget { /* font-size: 12pt; */ } +/* Gtk <= 3.18 */ SPRuler { background-color: @bg_color05; } +/* Gtk > 3.18 */ +ruler-widget { + background-color: @bg_color05; +} + SPCanvas { background-color: @bg_color0; } diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index bcab535f9..deffd384a 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -168,6 +168,10 @@ sp_ruler_class_init (SPRulerClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); +#if GTK_CHECK_VERSION(3,20,0) + gtk_widget_class_set_css_name (widget_class, "ruler-widget"); +#endif + object_class->dispose = sp_ruler_dispose; object_class->set_property = sp_ruler_set_property; object_class->get_property = sp_ruler_get_property; -- cgit v1.2.3 From f406f7e1c62d59ac437111138bbfe69c66efe847 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 9 May 2016 01:33:44 +0200 Subject: Disable fillet-chamfer for 0.92 release (bzr r14880) --- src/live_effects/effect.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp index 437aed5bd..732c67304 100644 --- a/src/live_effects/effect.cpp +++ b/src/live_effects/effect.cpp @@ -112,6 +112,7 @@ const Util::EnumData LPETypeData[] = { {RECURSIVE_SKELETON, N_("Recursive skeleton"), "recursive_skeleton"}, {TANGENT_TO_CURVE, N_("Tangent to curve"), "tangent_to_curve"}, {TEXT_LABEL, N_("Text label"), "text_label"}, + {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, #endif /* 0.46 */ {BEND_PATH, N_("Bend"), "bend_path"}, @@ -135,7 +136,6 @@ const Util::EnumData LPETypeData[] = { {SIMPLIFY, N_("Simplify"), "simplify"}, {LATTICE2, N_("Lattice Deformation 2"), "lattice2"}, {PERSPECTIVE_ENVELOPE, N_("Perspective/Envelope"), "perspective-envelope"}, - {FILLET_CHAMFER, N_("Fillet/Chamfer"), "fillet-chamfer"}, {INTERPOLATE_POINTS, N_("Interpolate points"), "interpolate_points"}, {TRANSFORM_2PTS, N_("Transform by 2 points"), "transform_2pts"}, {SHOW_HANDLES, N_("Show handles"), "show_handles"}, -- cgit v1.2.3 From 63a311053b49afe535bba53369ee5907def13aaa Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 9 May 2016 17:35:29 +0200 Subject: Gtk3: Use theme colors for ruler. Reduce size of spin buttons. (bzr r14881) --- share/ui/style.css | 57 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/share/ui/style.css b/share/ui/style.css index 3ee6f7450..091cfc319 100644 --- a/share/ui/style.css +++ b/share/ui/style.css @@ -4,16 +4,32 @@ /* * Keep in order of: * General -> Specific - * Order of default appearance - * Top -> Bottom (e.g. Selector Tool, Node Tool, ...) - * Left -> Right + * Order of appearance in widget tree. + * See GtkInspector + * GTK_DEBUG=interactive ~/path_to_gtk3/bin/inkscape * * We need a standardized naming scheme. * * As of Gtk 3.20, you cannot use widget names. */ -/* Lightest to darkest based on linear rgb */ +/* Standard theme based colors. Prefer these. + * + * @theme_bg_color + * @theme_fg_color + * @theme_base_color + * @theme_text_color + * @theme_selected_bg_color + * @theme_selected_fg_color + * @theme_tooltip_bg_color + * @theme_tooltip_fg_color + * + */ + + +/* Our own custom shades... better not to use. + * Lightest to darkest based on linear rgb. + */ @define-color bg_color0 #ffffff; /* White */ @define-color bg_color05 #f8f8f8; /* Slightly off white */ @define-color bg_color1 #f0f0f0; @@ -25,22 +41,45 @@ @define-color bg_color7 #636363; @define-color bg_color8 #000000; /* Black */ +/* Gtk <= 3.18 */ GtkWidget { /* font-size: 12pt; */ } -/* Gtk <= 3.18 */ +/* Gtk >= 3.19.2 */ +widget { +/* font-size: 12pt; */ +} + +GtkSpinButton { + padding: 0; +} + +spinbutton { + padding: 0; +} + +GtkSpinButton.entry { + padding-left: 2px; +} + +spinbutton.entry { + padding-left: 2px; +} + SPRuler { - background-color: @bg_color05; + background-color: @theme_bg_color; + color: @theme_fg_color; } -/* Gtk > 3.18 */ ruler-widget { - background-color: @bg_color05; + background-color: @theme_bg_color; + color: @theme_fg_color; } +/* The actual canvas (Inkscape's drawing area). */ SPCanvas { - background-color: @bg_color0; + background-color: white; } combobox window.popup scrolledwindow treeview separator { -- cgit v1.2.3 From 7d03e020cb353dbc006a7f3020375dd7005aa760 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 10 May 2016 12:43:38 +0200 Subject: Fix a bug on Pen tool when use bend path as option and the clipboard has something diferent than shape, path or group (bzr r14882) --- src/ui/tools/freehand-base.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp index 613857626..c98ecb686 100644 --- a/src/ui/tools/freehand-base.cpp +++ b/src/ui/tools/freehand-base.cpp @@ -43,6 +43,7 @@ #include "snap.h" #include "sp-path.h" #include "sp-use.h" +#include "sp-item-group.h" #include "sp-namedview.h" #include "live_effects/lpe-powerstroke.h" #include "style.h" @@ -432,7 +433,7 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, if(cm->paste(SP_ACTIVE_DESKTOP,true) == true){ gchar const *svgd = item->getRepr()->attribute("d"); bend_item = dc->selection->singleItem(); - if(bend_item){ + if(bend_item && (SP_IS_SHAPE(bend_item) || SP_IS_GROUP(bend_item))){ bend_item->moveTo(item,false); bend_item->transform.setTranslation(Geom::Point()); spdc_apply_bend_shape(svgd, dc, bend_item); @@ -440,9 +441,11 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, shape = BEND_CLIPBOARD; } else { + bend_item = NULL; shape = NONE; } } else { + bend_item = NULL; shape = NONE; } break; -- cgit v1.2.3 From bf29ab367c35aa31be31869a08a49f502070879b Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 13 May 2016 21:52:40 +0200 Subject: Extensions. Improving the test launcher. Now works with recent coverage versions. (bzr r14883) --- share/extensions/test/run-all-extension-tests | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/share/extensions/test/run-all-extension-tests b/share/extensions/test/run-all-extension-tests index aa20c8c7b..e7faf672a 100755 --- a/share/extensions/test/run-all-extension-tests +++ b/share/extensions/test/run-all-extension-tests @@ -35,24 +35,32 @@ has_py_coverage=false py_cover_files=$( $MKTEMP ) failed_tests=$( $MKTEMP ) -if coverage.py -e >/dev/null 2>/dev/null; then +if coverage.py erase >/dev/null 2>/dev/null; then has_py_coverage=true cover_py_cmd=coverage.py else - if coverage -e >/dev/null 2>/dev/null; then + if coverage erase >/dev/null 2>/dev/null; then has_py_coverage=true cover_py_cmd=coverage + else + if python-coverage erase >/dev/null 2>/dev/null; then + has_py_coverage=true + cover_py_cmd=python-coverage + fi fi fi +if $has_py_coverage; then + echo -e "\nRunning tests with coverage" +fi #if $has_py_coverage; then # $cover_py_cmd -e #fi function run_py_test() { - echo -e "\n>> Testing $1" + echo -e "\n>>>>>> Testing $1 <<<<<<\n" if $has_py_coverage; then - if ! $cover_py_cmd -x "$1.test.py"; then + if ! $cover_py_cmd run -a "$1.test.py"; then echo "$1" >> $failed_tests fi echo "../$1.py" >> $py_cover_files @@ -77,7 +85,7 @@ else SED_EXTENDED='sed -E' # BSD sed (e.g. on Mac OS X) fi -echo "sed regex command: $SED_EXTENDED" +echo -e "sed regex command: $SED_EXTENDED\n" # --------------------------------------------------------------------- @@ -89,7 +97,7 @@ done if $has_py_coverage; then echo -e "\n>> Coverage Report:" - cat $py_cover_files | xargs $cover_py_cmd -r + cat $py_cover_files | xargs $cover_py_cmd report fi fail=false -- cgit v1.2.3 From 6409a4a7d4bf0254f162e01bbef9a9d4ba622607 Mon Sep 17 00:00:00 2001 From: marenhachmann <> Date: Fri, 13 May 2016 22:04:14 +0200 Subject: [Bug #1579939] Ramdom color extension improvements (and new unit test file). Fixed bugs: - https://launchpad.net/bugs/1579939 Original authors: - marenhachmann - jazzynico (bzr r14884) --- share/extensions/color_randomize.inx | 7 +- share/extensions/color_randomize.py | 105 +++++++++++----------- share/extensions/coloreffect.py | 34 +++++-- share/extensions/test/Makefile.am | 1 + share/extensions/test/color_randomize.test.py | 123 ++++++++++++++++++++++++++ 5 files changed, 205 insertions(+), 65 deletions(-) mode change 100644 => 100755 share/extensions/color_randomize.py create mode 100755 share/extensions/test/color_randomize.test.py diff --git a/share/extensions/color_randomize.inx b/share/extensions/color_randomize.inx index 0c84227ae..c0c0d9ea2 100644 --- a/share/extensions/color_randomize.inx +++ b/share/extensions/color_randomize.inx @@ -7,16 +7,13 @@ simplestyle.py - true 100 - true 100 - true 100 - + 0 - <_param name="instructions" type="description" xml:space="preserve">Converts to HSL, randomizes hue and/or saturation and/or lightness and converts it back to RGB. Lower the range values to limit the distance between the original color and the randomized one. + <_param name="instructions" type="description" xml:space="preserve">Randomizes hue, saturation, lightness and/or opacity (opacity randomization only for objects and groups). Change the range values to limit the distance between the original color and the randomized one. diff --git a/share/extensions/color_randomize.py b/share/extensions/color_randomize.py old mode 100644 new mode 100755 index b8f52cb6b..93abcf174 --- a/share/extensions/color_randomize.py +++ b/share/extensions/color_randomize.py @@ -1,85 +1,84 @@ #!/usr/bin/env python -import coloreffect,random,inkex + +import random + +import coloreffect +import inkex class C(coloreffect.ColorEffect): def __init__(self): coloreffect.ColorEffect.__init__(self) - self.OptionParser.add_option("-x", "--hue", - action="store", type="inkbool", - dest="hue", default=True, - help="Randomize hue") self.OptionParser.add_option("-y", "--hue_range", action="store", type="int", dest="hue_range", default=0, help="Hue range") - self.OptionParser.add_option("-s", "--saturation", - action="store", type="inkbool", - dest="saturation", default=True, - help="Randomize saturation") self.OptionParser.add_option("-t", "--saturation_range", action="store", type="int", dest="saturation_range", default=0, help="Saturation range") - self.OptionParser.add_option("-l", "--lightness", - action="store", type="inkbool", - dest="lightness", default=True, - help="Randomize lightness") self.OptionParser.add_option("-m", "--lightness_range", action="store", type="int", dest="lightness_range", default=0, help="Lightness range") + self.OptionParser.add_option("-o", "--opacity_range", + action="store", type="int", + dest="opacity_range", default=0, + help="Opacity range") self.OptionParser.add_option("--tab", action="store", type="string", dest="tab", help="The selected UI-tab when OK was pressed") + def randomize_hsl(self, limit, current_value): + limit = 255.0 * limit / 100.0 + limit /= 2 + max = int((current_value * 255.0) + limit) + min = int((current_value * 255.0) - limit) + if max > 255: + min = min - (max - 255) + max = 255 + if min < 0: + max = max - min + min = 0 + return random.randrange(min, max) / 255.0 + def colmod(self,r,g,b): hsl = self.rgb_to_hsl(r/255.0, g/255.0, b/255.0) - - if(self.options.hue): - limit = 255.0 * (1 + self.options.hue_range) / 100.0 - limit /= 2 - max = int((hsl[0] * 255.0) + limit) - min = int((hsl[0] * 255.0) - limit) - if max > 255: - min = min - (max - 255) - max = 255 - if min < 0: - max = max - min - min = 0 - hsl[0] = random.randrange(min, max) - hsl[0] /= 255.0 - if(self.options.saturation): - limit = 255.0 * (1 + self.options.saturation_range) / 100.0 - limit /= 2 - max = int((hsl[1] * 255.0) + limit) - min = int((hsl[1] * 255.0) - limit) - if max > 255: - min = min - (max - 255) - max = 255 - if min < 0: - max = max - min - min = 0 - hsl[1] = random.randrange(min, max) - hsl[1] /= 255.0 - if(self.options.lightness): - limit = 255.0 * (1 + self.options.lightness_range) / 100.0 + if self.options.hue_range > 0: + hsl[0] = self.randomize_hsl(self.options.hue_range, hsl[0]) + if self.options.saturation_range > 0: + hsl[1] = self.randomize_hsl(self.options.saturation_range, hsl[1]) + if self.options.lightness_range > 0: + hsl[2] = self.randomize_hsl(self.options.lightness_range, hsl[2]) + rgb = self.hsl_to_rgb(hsl[0], hsl[1], hsl[2]) + return '%02x%02x%02x' % (rgb[0]*255, rgb[1]*255, rgb[2]*255) + + def opacmod(self, opacity): + if self.options.opacity_range > 0: + # maybe not necessary, but better not change things that shouldn't change + try: + opacity = float(opacity) + except ValueError: + return opacity + + limit = self.options.opacity_range limit /= 2 - max = int((hsl[2] * 255.0) + limit) - min = int((hsl[2] * 255.0) - limit) - if max > 255: - min = min - (max - 255) - max = 255 + max = opacity*100 + limit + min = opacity*100 - limit + if max > 100: + min = min - (max - 100) + max = 100 if min < 0: max = max - min min = 0 - hsl[2] = random.randrange(min, max) - hsl[2] /= 255.0 - rgb = self.hsl_to_rgb(hsl[0], hsl[1], hsl[2]) - return '%02x%02x%02x' % (rgb[0]*255, rgb[1]*255, rgb[2]*255) + ret = str(random.uniform(min,max)/100) + return ret + return opacity + -c = C() -c.affect() +if __name__ == '__main__': + c = C() + c.affect() # vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 diff --git a/share/extensions/coloreffect.py b/share/extensions/coloreffect.py index a6b5cfe41..d33ac41fe 100755 --- a/share/extensions/coloreffect.py +++ b/share/extensions/coloreffect.py @@ -21,8 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import sys, copy, simplestyle, inkex import random -color_props_fill = ('fill', 'stop-color', 'flood-color', 'lighting-color') +color_props_fill = ('fill', 'stop-color', 'flood-color', 'lighting-color') color_props_stroke = ('stroke',) +opacity_props = ('opacity',) #'stop-opacity', 'fill-opacity', 'stroke-opacity' don't work with clones color_props = color_props_fill + color_props_stroke @@ -63,13 +64,14 @@ class ColorEffect(inkex.Effect): # # The processing here is just something simple that should usually work, # without trying too hard to get everything right. - # (Won't work for the pathalogical case that someone escapes a property + # (Won't work for the pathological case that someone escapes a property # name, probably does the wrong thing if colon or semicolon is used inside # a comment or string value.) style = node.get('style') # fixme: this will break for presentation attributes! if style: #inkex.debug('old style:'+style) declarations = style.split(';') + opacity_in_style = False for i,decl in enumerate(declarations): parts = decl.split(':', 2) if len(parts) == 2: @@ -80,16 +82,25 @@ class ColorEffect(inkex.Effect): new_val = self.process_prop(val) if new_val != val: declarations[i] = prop + ':' + new_val + elif prop in opacity_props: + opacity_in_style = True + val = val.strip() + new_val = self.process_prop(val) + if new_val != val: + declarations[i] = prop + ':' + new_val + if not opacity_in_style: + new_val = self.process_prop("1") + declarations.append('opacity' + ':' + new_val) #inkex.debug('new style:'+';'.join(declarations)) node.set('style', ';'.join(declarations)) - def process_prop(self,col): - #debug('got:'+col) + def process_prop(self, col): + #inkex.debug('got:'+col+str(type(col))) if simplestyle.isColor(col): c=simplestyle.parseColor(col) - col='#'+self.colmod(c[0],c[1],c[2]) - #debug('made:'+col) - if col.startswith('url(#'): + col='#'+self.colmod(c[0], c[1], c[2]) + #inkex.debug('made:'+col) + elif col.startswith('url(#'): id = col[len('url(#'):col.find(')')] newid = '%s-%d' % (id, int(random.random() * 1000)) #inkex.debug('ID:' + id ) @@ -97,6 +108,11 @@ class ColorEffect(inkex.Effect): for node in self.document.xpath(path, namespaces=inkex.NSS): self.process_gradient(node, newid) col = 'url(#%s)' % newid + # what remains should be opacity + else: + col = self.opacmod(col) + + #inkex.debug('col:'+str(col)) return col def process_gradient(self, node, newid): @@ -128,6 +144,9 @@ class ColorEffect(inkex.Effect): def colmod(self,r,g,b): pass + + def opacmod(self, opacity): + return opacity def rgb_to_hsl(self,r, g, b): rgb_max = max (max (r, g), b) @@ -188,4 +207,5 @@ class ColorEffect(inkex.Effect): rgb[2] = self.hue_2_rgb (v1, v2, h*6 - 2.0) return rgb + # vi: set autoindent shiftwidth=2 tabstop=8 expandtab softtabstop=2 : diff --git a/share/extensions/test/Makefile.am b/share/extensions/test/Makefile.am index 7ff68083d..cd1929a7f 100644 --- a/share/extensions/test/Makefile.am +++ b/share/extensions/test/Makefile.am @@ -6,6 +6,7 @@ EXTRA_DIST = \ addnodes.test.py \ chardataeffect.test.py \ + color_randomize_test.py \ coloreffect.test.py \ create_test_from_template.sh \ dots.test.py \ diff --git a/share/extensions/test/color_randomize.test.py b/share/extensions/test/color_randomize.test.py new file mode 100755 index 000000000..d8549a35a --- /dev/null +++ b/share/extensions/test/color_randomize.test.py @@ -0,0 +1,123 @@ +#!/usr/bin/env python +''' +Unit test file for ../color_randomize.py +-- +If you want to help, read the python unittest documentation: +http://docs.python.org/library/unittest.html +''' + +import os +import sys +import unittest + +sys.path.append('..') # this line allows to import the extension code +from color_randomize import * + +def extract_hsl(e,rgb): + r = int(rgb[:2], 16) + g = int(rgb[2:4], 16) + b = int(rgb[4:6], 16) + return e.rgb_to_hsl(r/255.0, g/255.0, b/255.0) + + +class ColorRandomizeBasicTest(unittest.TestCase): + def setUp(self): + self.e=C() + + def test_default_values(self): + """ The default ranges are set to 0, and thus the color and opacity should not change. """ + args = ['svg/empty-SVG.svg'] + self.e.affect(args, False) + col = self.e.colmod(128, 128, 255) + self.assertEqual("8080ff", col) + opac = self.e.opacmod(5) + self.assertEqual(5, opac) + + +class ColorRandomizeColorModificationTest(unittest.TestCase): + def setUp(self): + self.e=C() + + def test_no_change(self): + """ The user selected 0% values, and thus the color should not change. """ + args = ['-y 0', '-t 0', '-m 0', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + col = self.e.colmod(128, 128, 255) + self.assertEqual("8080ff", col) + + def test_random_hue(self): + """ Random hue only. Saturation and lightness not changed. """ + args = ['-y 50','-t 0','-m 0','svg/empty-SVG.svg'] + self.e.affect(args, False) + 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") + def test_random_lightness(self): + """ Random lightness only. Hue and saturation not changed. """ + args = ['-y 0', '-t 0', '-m 50', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + hsl = extract_hsl(self.e, self.e.colmod(150, 100, 200)) + # Lightness change also affects hue and saturation... + #self.assertEqual(0.75, round(hsl[0], 2)) + #self.assertEqual(0.48, round(hsl[1], 2)) + + def test_random_saturation(self): + """ Random saturation only. Hue and lightness not changed. """ + args = ['-y 0', '-t 50', '-m 0', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + hsl = extract_hsl(self.e, self.e.colmod(150, 100, 200)) + self.assertEqual([0.75, 0.59], [round(hsl[0], 2), round(hsl[2], 2)]) + + def test_range_limits(self): + """ The maximum hsl values should be between 0 and 100% of their maximum """ + args = ['-y 100', '-t 100', '-m 100', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + hsl = extract_hsl(self.e, self.e.colmod(156, 156, 156)) + self.assertLessEqual([hsl[0], hsl[1], hsl[2]], [1, 1, 1]) + self.assertGreaterEqual([hsl[0], hsl[1], hsl[2]], [0, 0, 0]) + + +class ColorRandomizeOpacityModificationTest(unittest.TestCase): + def setUp(self): + self.e=C() + + def test_no_change(self): + """ The user selected 0% opacity range, and thus the opacity should not change. """ + args = ['-o 0', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + opac = self.e.opacmod(0.15) + self.assertEqual(0.15, opac) + + def test_range_min_limit(self): + """ The opacity value should be greater than 0 """ + args = ['-o 100', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + opac = self.e.opacmod(0) + self.assertGreaterEqual(opac, "0") + + def test_range_max_limit(self): + """ The opacity value should be lesser than 1 """ + args = ['-o 100', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + opac = self.e.opacmod(1) + self.assertLessEqual(opac, "1") + + def test_non_float_opacity(self): + """ Non-float opacity value not changed """ + args = ['-o 100', 'svg/empty-SVG.svg'] + self.e.affect(args, False) + opac = self.e.opacmod("toto") + self.assertLessEqual(opac, "toto") + +if __name__ == '__main__': + #unittest.main() + suite = unittest.TestLoader().loadTestsFromTestCase(ColorRandomizeBasicTest) + unittest.TextTestRunner(verbosity=2).run(suite) + suite = unittest.TestLoader().loadTestsFromTestCase(ColorRandomizeColorModificationTest) + unittest.TextTestRunner(verbosity=2).run(suite) + suite = unittest.TestLoader().loadTestsFromTestCase(ColorRandomizeOpacityModificationTest) + unittest.TextTestRunner(verbosity=2).run(suite) + + +# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 -- cgit v1.2.3 From 2888ca593c06275bffc1a54b03ef60a895402ba2 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 13 May 2016 22:08:43 +0200 Subject: Translations. PO template file update. (bzr r14885) --- po/inkscape.pot | 4492 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 2387 insertions(+), 2105 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index 69e849a2c..988d77c9f 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-03-08 14:37+0100\n" +"POT-Creation-Date: 2016-05-13 22:07+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -684,8 +684,7 @@ msgstr "" #: ../share/filters/filters.svg.h:279 ../share/filters/filters.svg.h:835 #: ../share/filters/filters.svg.h:839 ../share/filters/filters.svg.h:843 #: ../src/extension/internal/filter/morphology.h:76 -#: ../src/extension/internal/filter/morphology.h:203 -#: ../src/filter-enums.cpp:32 +#: ../src/extension/internal/filter/morphology.h:203 ../src/filter-enums.cpp:32 msgid "Morphology" msgstr "" @@ -1101,7 +1100,7 @@ msgstr "" #: ../share/extensions/color_morelight.inx.h:2 #: ../share/extensions/color_moresaturation.inx.h:2 #: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:14 +#: ../share/extensions/color_randomize.inx.h:13 #: ../share/extensions/color_removeblue.inx.h:2 #: ../share/extensions/color_removegreen.inx.h:2 #: ../share/extensions/color_removered.inx.h:2 @@ -4445,21 +4444,21 @@ msgstr "" msgid "Move guide" msgstr "" -#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:572 +#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:567 #: ../src/ui/dialog/guides.cpp:147 msgid "Delete guide" msgstr "" -#: ../src/desktop-events.cpp:552 +#: ../src/desktop-events.cpp:547 #, c-format msgid "Guideline: %s" msgstr "" -#: ../src/desktop.cpp:875 +#: ../src/desktop.cpp:870 msgid "No previous zoom." msgstr "" -#: ../src/desktop.cpp:896 +#: ../src/desktop.cpp:891 msgid "No next zoom." msgstr "" @@ -4472,8 +4471,8 @@ msgid "_Origin X:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "X coordinate of grid origin" msgstr "" @@ -4482,8 +4481,8 @@ msgid "O_rigin Y:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:791 -#: ../src/ui/dialog/inkscape-preferences.cpp:816 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Y coordinate of grid origin" msgstr "" @@ -4492,29 +4491,29 @@ msgid "Spacing _Y:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Base length of z-axis" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:822 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:822 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 msgid "Angle of x-axis" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:823 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:823 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 msgid "Angle of z-axis" msgstr "" @@ -4523,7 +4522,7 @@ msgid "Minor grid line _color:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:774 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 msgid "Minor grid line color" msgstr "" @@ -4536,7 +4535,7 @@ msgid "Ma_jor grid line color:" msgstr "" #: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 -#: ../src/ui/dialog/inkscape-preferences.cpp:776 +#: ../src/ui/dialog/inkscape-preferences.cpp:777 msgid "Major grid line color" msgstr "" @@ -4599,12 +4598,12 @@ msgid "Spacing _X:" msgstr "" #: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:796 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Distance between vertical grid lines" msgstr "" #: ../src/display/canvas-grid.cpp:708 -#: ../src/ui/dialog/inkscape-preferences.cpp:797 +#: ../src/ui/dialog/inkscape-preferences.cpp:798 msgid "Distance between horizontal grid lines" msgstr "" @@ -4822,21 +4821,21 @@ msgstr "" msgid " to " msgstr "" -#: ../src/document.cpp:530 +#: ../src/document.cpp:531 #, c-format msgid "New document %d" msgstr "" -#: ../src/document.cpp:535 +#: ../src/document.cpp:536 #, c-format msgid "Memory document %d" msgstr "" -#: ../src/document.cpp:564 +#: ../src/document.cpp:565 msgid "Memory document %1" msgstr "" -#: ../src/document.cpp:872 +#: ../src/document.cpp:873 #, c-format msgid "Unnamed document %d" msgstr "" @@ -4846,31 +4845,31 @@ msgid "[Unchanged]" msgstr "" #. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2461 +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2460 msgid "_Undo" msgstr "" -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2463 +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2462 msgid "_Redo" msgstr "" -#: ../src/extension/dependency.cpp:243 +#: ../src/extension/dependency.cpp:255 msgid "Dependency:" msgstr "" -#: ../src/extension/dependency.cpp:244 +#: ../src/extension/dependency.cpp:256 msgid " type: " msgstr "" -#: ../src/extension/dependency.cpp:245 +#: ../src/extension/dependency.cpp:257 msgid " location: " msgstr "" -#: ../src/extension/dependency.cpp:246 +#: ../src/extension/dependency.cpp:258 msgid " string: " msgstr "" -#: ../src/extension/dependency.cpp:249 +#: ../src/extension/dependency.cpp:261 msgid " description: " msgstr "" @@ -4878,7 +4877,7 @@ msgstr "" msgid " (No preferences)" msgstr "" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2235 +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2234 msgid "Extensions" msgstr "" @@ -4981,7 +4980,7 @@ msgid "" "this extension." msgstr "" -#: ../src/extension/implementation/script.cpp:1112 +#: ../src/extension/implementation/script.cpp:1108 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5014,8 +5013,7 @@ msgstr "" #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 #: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 -#: ../src/widgets/tweak-toolbar.cpp:128 -#: ../share/extensions/foldablebox.inx.h:2 +#: ../src/widgets/tweak-toolbar.cpp:128 ../share/extensions/foldablebox.inx.h:2 msgid "Width:" msgstr "" @@ -5087,8 +5085,8 @@ msgstr "" #: ../src/extension/internal/filter/color.h:1660 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 #: ../src/ui/dialog/object-attributes.cpp:49 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5140,7 +5138,7 @@ msgstr "" #: ../src/extension/internal/bitmap/oilPaint.cpp:39 #: ../src/extension/internal/bitmap/sharpen.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2909 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 msgid "Radius:" msgstr "" @@ -5233,6 +5231,7 @@ msgstr "" #: ../src/extension/internal/bitmap/contrast.cpp:40 #: ../src/extension/internal/filter/color.h:1189 +#: ../share/extensions/nicechart.inx.h:36 msgid "Contrast" msgstr "" @@ -5458,7 +5457,7 @@ msgid "Opacity" msgstr "" #: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2899 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2924 #: ../src/ui/dialog/objects.cpp:1629 ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "" @@ -5621,7 +5620,7 @@ msgstr "" #: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 #: ../share/extensions/pathalongpath.inx.h:18 #: ../share/extensions/pathscatter.inx.h:20 -#: ../share/extensions/voronoi2svg.inx.h:13 +#: ../share/extensions/voronoi2svg.inx.h:18 msgid "Generate from Path" msgstr "" @@ -5752,70 +5751,72 @@ msgstr "" msgid "Output page size:" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:116 +#. Dialog settings +#: ../src/extension/internal/cdr-input.cpp:103 +#: ../src/extension/internal/vsd-input.cpp:105 +msgid "Page Selector" +msgstr "" + +#. Labels +#: ../src/extension/internal/cdr-input.cpp:127 #: ../src/extension/internal/pdfinput/pdf-input.cpp:92 -#: ../src/extension/internal/vsd-input.cpp:116 +#: ../src/extension/internal/vsd-input.cpp:130 msgid "Select page:" msgstr "" #. Display total number of pages -#: ../src/extension/internal/cdr-input.cpp:128 +#: ../src/extension/internal/cdr-input.cpp:135 #: ../src/extension/internal/pdfinput/pdf-input.cpp:111 -#: ../src/extension/internal/vsd-input.cpp:128 +#: ../src/extension/internal/vsd-input.cpp:138 #, c-format msgid "out of %i" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:165 -#: ../src/extension/internal/vsd-input.cpp:165 -msgid "Page Selector" -msgstr "" - -#: ../src/extension/internal/cdr-input.cpp:300 +#: ../src/extension/internal/cdr-input.cpp:293 msgid "Corel DRAW Input" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:305 +#: ../src/extension/internal/cdr-input.cpp:298 msgid "Corel DRAW 7-X4 files (*.cdr)" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:306 +#: ../src/extension/internal/cdr-input.cpp:299 msgid "Open files saved in Corel DRAW 7-X4" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:313 +#: ../src/extension/internal/cdr-input.cpp:306 msgid "Corel DRAW templates input" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:318 +#: ../src/extension/internal/cdr-input.cpp:311 msgid "Corel DRAW 7-13 template files (*.cdt)" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:319 +#: ../src/extension/internal/cdr-input.cpp:312 msgid "Open files saved in Corel DRAW 7-13" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:326 +#: ../src/extension/internal/cdr-input.cpp:319 msgid "Corel DRAW Compressed Exchange files input" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:331 +#: ../src/extension/internal/cdr-input.cpp:324 msgid "Corel DRAW Compressed Exchange files (*.ccx)" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:332 +#: ../src/extension/internal/cdr-input.cpp:325 msgid "Open compressed exchange files saved in Corel DRAW" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:339 +#: ../src/extension/internal/cdr-input.cpp:332 msgid "Corel DRAW Presentation Exchange files input" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:344 +#: ../src/extension/internal/cdr-input.cpp:337 msgid "Corel DRAW Presentation Exchange files (*.cmx)" msgstr "" -#: ../src/extension/internal/cdr-input.cpp:345 +#: ../src/extension/internal/cdr-input.cpp:338 msgid "Open presentation exchange files saved in Corel DRAW" msgstr "" @@ -5977,7 +5978,7 @@ msgstr "" #: ../src/extension/internal/filter/transparency.h:214 #: ../src/extension/internal/filter/transparency.h:287 #: ../src/extension/internal/filter/transparency.h:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1805 +#: ../src/ui/dialog/inkscape-preferences.cpp:1806 #, c-format msgid "Filters" msgstr "" @@ -6188,7 +6189,7 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:697 +#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:698 msgid "Normal" msgstr "" @@ -6227,7 +6228,7 @@ msgstr "" #: ../src/extension/internal/filter/transparency.h:132 #: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:91 #: ../src/ui/widget/color-icc-selector.cpp:176 -#: ../src/ui/widget/color-scales.cpp:379 ../src/ui/widget/color-scales.cpp:380 +#: ../src/ui/widget/color-scales.cpp:385 ../src/ui/widget/color-scales.cpp:386 msgid "Red" msgstr "" @@ -6239,7 +6240,7 @@ msgstr "" #: ../src/extension/internal/filter/transparency.h:133 #: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:92 #: ../src/ui/widget/color-icc-selector.cpp:177 -#: ../src/ui/widget/color-scales.cpp:382 ../src/ui/widget/color-scales.cpp:383 +#: ../src/ui/widget/color-scales.cpp:388 ../src/ui/widget/color-scales.cpp:389 msgid "Green" msgstr "" @@ -6251,7 +6252,8 @@ msgstr "" #: ../src/extension/internal/filter/transparency.h:134 #: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:93 #: ../src/ui/widget/color-icc-selector.cpp:178 -#: ../src/ui/widget/color-scales.cpp:385 ../src/ui/widget/color-scales.cpp:386 +#: ../src/ui/widget/color-scales.cpp:391 ../src/ui/widget/color-scales.cpp:392 +#: ../share/extensions/nicechart.inx.h:34 msgid "Blue" msgstr "" @@ -6289,9 +6291,8 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:707 #: ../src/ui/tools/flood-tool.cpp:96 #: ../src/ui/widget/color-icc-selector.cpp:187 -#: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 +#: ../src/ui/widget/color-scales.cpp:417 ../src/ui/widget/color-scales.cpp:418 #: ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:9 msgid "Lightness" msgstr "" @@ -6441,15 +6442,13 @@ msgid "Transparency type:" msgstr "" #: ../src/extension/internal/filter/bumps.h:353 -#: ../src/extension/internal/filter/morphology.h:176 -#: ../src/filter-enums.cpp:91 +#: ../src/extension/internal/filter/morphology.h:176 ../src/filter-enums.cpp:91 msgid "Atop" msgstr "" #: ../src/extension/internal/filter/bumps.h:354 #: ../src/extension/internal/filter/distort.h:70 -#: ../src/extension/internal/filter/morphology.h:174 -#: ../src/filter-enums.cpp:89 +#: ../src/extension/internal/filter/morphology.h:174 ../src/filter-enums.cpp:89 msgid "In" msgstr "" @@ -6487,13 +6486,12 @@ msgstr "" #: ../src/extension/internal/filter/color.h:157 #: ../src/extension/internal/filter/color.h:332 #: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:996 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 #: ../src/ui/tools/flood-tool.cpp:95 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 -#: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 +#: ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 #: ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:6 msgid "Saturation" msgstr "" @@ -6670,21 +6668,21 @@ msgstr "" #: ../src/extension/internal/filter/color.h:715 #: ../src/ui/widget/color-icc-selector.cpp:190 #: ../src/ui/widget/color-icc-selector.cpp:195 -#: ../src/ui/widget/color-scales.cpp:433 ../src/ui/widget/color-scales.cpp:434 +#: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 msgid "Cyan" msgstr "" #: ../src/extension/internal/filter/color.h:716 #: ../src/ui/widget/color-icc-selector.cpp:191 #: ../src/ui/widget/color-icc-selector.cpp:196 -#: ../src/ui/widget/color-scales.cpp:436 ../src/ui/widget/color-scales.cpp:437 +#: ../src/ui/widget/color-scales.cpp:442 ../src/ui/widget/color-scales.cpp:443 msgid "Magenta" msgstr "" #: ../src/extension/internal/filter/color.h:717 #: ../src/ui/widget/color-icc-selector.cpp:192 #: ../src/ui/widget/color-icc-selector.cpp:197 -#: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 +#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 msgid "Yellow" msgstr "" @@ -6710,7 +6708,7 @@ msgstr "" #: ../src/extension/internal/filter/color.h:819 #: ../src/ui/widget/color-icc-selector.cpp:193 -#: ../src/ui/widget/color-scales.cpp:442 ../src/ui/widget/color-scales.cpp:443 +#: ../src/ui/widget/color-scales.cpp:448 ../src/ui/widget/color-scales.cpp:449 #: ../src/ui/widget/selected-style.cpp:274 msgid "Black" msgstr "" @@ -6793,7 +6791,7 @@ msgstr "" #: ../src/extension/internal/filter/color.h:1119 #: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 -#: ../src/live_effects/effect.cpp:108 +#: ../src/live_effects/effect.cpp:107 #: ../src/live_effects/lpe-transform_2pts.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:1048 #: ../src/widgets/gradient-toolbar.cpp:1159 @@ -6962,8 +6960,7 @@ msgid "Felt Feather" msgstr "" #: ../src/extension/internal/filter/distort.h:71 -#: ../src/extension/internal/filter/morphology.h:175 -#: ../src/filter-enums.cpp:90 +#: ../src/extension/internal/filter/morphology.h:175 ../src/filter-enums.cpp:90 msgid "Out" msgstr "" @@ -7045,7 +7042,7 @@ msgid "Blur and displace edges of shapes and pictures" msgstr "" #: ../src/extension/internal/filter/distort.h:190 -#: ../src/live_effects/effect.cpp:138 +#: ../src/live_effects/effect.cpp:142 msgid "Roughen" msgstr "" @@ -7081,8 +7078,8 @@ msgid "Detect:" msgstr "" #: ../src/extension/internal/filter/image.h:52 -#: ../src/ui/dialog/template-load-tab.cpp:105 -#: ../src/ui/dialog/template-load-tab.cpp:142 +#: ../src/ui/dialog/template-load-tab.cpp:107 +#: ../src/ui/dialog/template-load-tab.cpp:144 msgid "All" msgstr "" @@ -7157,13 +7154,11 @@ msgstr "" msgid "Composite type:" msgstr "" -#: ../src/extension/internal/filter/morphology.h:173 -#: ../src/filter-enums.cpp:88 +#: ../src/extension/internal/filter/morphology.h:173 ../src/filter-enums.cpp:88 msgid "Over" msgstr "" -#: ../src/extension/internal/filter/morphology.h:177 -#: ../src/filter-enums.cpp:92 +#: ../src/extension/internal/filter/morphology.h:177 ../src/filter-enums.cpp:92 msgid "XOR" msgstr "" @@ -7237,8 +7232,8 @@ msgstr "" #: ../src/ui/dialog/tracedialog.cpp:747 #: ../share/extensions/color_HSL_adjust.inx.h:2 #: ../share/extensions/color_custom.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:2 -#: ../share/extensions/dots.inx.h:2 ../share/extensions/dxf_input.inx.h:2 +#: ../share/extensions/color_randomize.inx.h:2 ../share/extensions/dots.inx.h:2 +#: ../share/extensions/dxf_input.inx.h:2 #: ../share/extensions/dxf_outlines.inx.h:2 #: ../share/extensions/gcodetools_area.inx.h:29 #: ../share/extensions/gcodetools_engraving.inx.h:7 @@ -7358,17 +7353,17 @@ msgid "Convert image to an engraving made of vertical and horizontal lines" msgstr "" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:1041 -#: ../src/widgets/desktop-widget.cpp:2049 +#: ../src/ui/dialog/align-and-distribute.cpp:1090 +#: ../src/widgets/desktop-widget.cpp:2070 msgid "Drawing" msgstr "" -#. 0.91 +#. 0.92 #: ../src/extension/internal/filter/paint.h:335 #: ../src/extension/internal/filter/paint.h:496 #: ../src/extension/internal/filter/paint.h:590 #: ../src/extension/internal/filter/paint.h:976 -#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2204 +#: ../src/live_effects/effect.cpp:136 ../src/splivarot.cpp:2206 msgid "Simplify" msgstr "" @@ -7650,7 +7645,7 @@ msgid "Background" msgstr "" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 #: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:133 #: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:389 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 @@ -7717,13 +7712,13 @@ msgid "" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:196 -#: ../src/ui/dialog/inkscape-preferences.cpp:1510 +#: ../src/ui/dialog/inkscape-preferences.cpp:1511 #, c-format msgid "Embed" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:197 ../src/sp-anchor.cpp:105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1510 +#: ../src/ui/dialog/inkscape-preferences.cpp:1511 #, c-format msgid "Link" msgstr "" @@ -7763,19 +7758,19 @@ msgid "" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:206 -#: ../src/ui/dialog/inkscape-preferences.cpp:1517 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "None (auto)" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:207 -#: ../src/ui/dialog/inkscape-preferences.cpp:1517 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "Smooth (optimizeQuality)" msgstr "" #: ../src/extension/internal/gdkpixbuf-input.cpp:208 -#: ../src/ui/dialog/inkscape-preferences.cpp:1517 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "Blocky (optimizeSpeed)" msgstr "" @@ -7802,7 +7797,7 @@ msgstr "" msgid "Gradients used in GIMP" msgstr "" -#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:114 +#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:116 msgid "Grid" msgstr "" @@ -7827,18 +7822,17 @@ msgid "Vertical Offset:" msgstr "" #: ../src/extension/internal/grid.cpp:214 -#: ../src/ui/dialog/inkscape-preferences.cpp:1531 +#: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 -#: ../share/extensions/eqtexsvg.inx.h:4 -#: ../share/extensions/foldablebox.inx.h:9 +#: ../share/extensions/eqtexsvg.inx.h:4 ../share/extensions/foldablebox.inx.h:9 #: ../share/extensions/funcplot.inx.h:38 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 #: ../share/extensions/guides_creator.inx.h:25 -#: ../share/extensions/hershey.inx.h:52 -#: ../share/extensions/layout_nup.inx.h:35 +#: ../share/extensions/hershey.inx.h:52 ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 +#: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 #: ../share/extensions/perfectboundcover.inx.h:19 #: ../share/extensions/polyhedron_3d.inx.h:56 @@ -7859,8 +7853,8 @@ msgstr "" #: ../src/extension/internal/grid.cpp:215 #: ../src/ui/dialog/document-properties.cpp:163 -#: ../src/ui/dialog/inkscape-preferences.cpp:831 -#: ../src/widgets/toolbox.cpp:1879 +#: ../src/ui/dialog/inkscape-preferences.cpp:832 +#: ../src/widgets/toolbox.cpp:1886 msgid "Grids" msgstr "" @@ -8118,48 +8112,48 @@ msgstr "" msgid "Scalable Vector Graphics format compressed with GZip" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:301 +#: ../src/extension/internal/vsd-input.cpp:296 msgid "VSD Input" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:306 +#: ../src/extension/internal/vsd-input.cpp:301 msgid "Microsoft Visio Diagram (*.vsd)" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:307 +#: ../src/extension/internal/vsd-input.cpp:302 msgid "File format used by Microsoft Visio 6 and later" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:314 +#: ../src/extension/internal/vsd-input.cpp:309 msgid "VDX Input" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:319 +#: ../src/extension/internal/vsd-input.cpp:314 msgid "Microsoft Visio XML Diagram (*.vdx)" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:320 +#: ../src/extension/internal/vsd-input.cpp:315 msgid "File format used by Microsoft Visio 2010 and later" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:327 +#: ../src/extension/internal/vsd-input.cpp:322 msgid "VSDM Input" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:332 +#: ../src/extension/internal/vsd-input.cpp:327 msgid "Microsoft Visio 2013 drawing (*.vsdm)" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:333 -#: ../src/extension/internal/vsd-input.cpp:346 +#: ../src/extension/internal/vsd-input.cpp:328 +#: ../src/extension/internal/vsd-input.cpp:341 msgid "File format used by Microsoft Visio 2013 and later" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:340 +#: ../src/extension/internal/vsd-input.cpp:335 msgid "VSDX Input" msgstr "" -#: ../src/extension/internal/vsd-input.cpp:345 +#: ../src/extension/internal/vsd-input.cpp:340 msgid "Microsoft Visio 2013 drawing (*.vsdx)" msgstr "" @@ -8184,8 +8178,7 @@ msgid "Map all fill patterns to standard WMF hatches" msgstr "" #: ../src/extension/internal/wmf-inout.cpp:3208 -#: ../share/extensions/wmf_input.inx.h:2 -#: ../share/extensions/wmf_output.inx.h:2 +#: ../share/extensions/wmf_input.inx.h:2 ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "" @@ -8213,7 +8206,7 @@ msgstr "" msgid "Is the effect previewed live on canvas?" msgstr "" -#: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127 +#: ../src/extension/system.cpp:126 ../src/extension/system.cpp:128 msgid "Format autodetect failed. The file is being opened as SVG." msgstr "" @@ -8317,7 +8310,7 @@ msgstr "" msgid "Saving document..." msgstr "" -#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1504 +#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1505 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "" @@ -8426,9 +8419,8 @@ msgstr "" #: ../src/filter-enums.cpp:65 ../src/ui/tools/flood-tool.cpp:94 #: ../src/ui/widget/color-icc-selector.cpp:182 #: ../src/ui/widget/color-icc-selector.cpp:186 -#: ../src/ui/widget/color-scales.cpp:405 ../src/ui/widget/color-scales.cpp:406 +#: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 #: ../src/widgets/tweak-toolbar.cpp:286 -#: ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "" @@ -8452,10 +8444,9 @@ msgstr "" msgid "Luminance to Alpha" msgstr "" -#: ../src/filter-enums.cpp:87 -#: ../share/extensions/jessyInk_mouseHandler.inx.h:3 +#: ../src/filter-enums.cpp:87 ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 -#: ../share/extensions/measure.inx.h:20 +#: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" msgstr "" @@ -8747,8 +8738,7 @@ msgstr "" msgid "Close this dock" msgstr "" -#: ../src/libgdl/gdl-dock-item-grip.c:723 -#: ../src/libgdl/gdl-dock-tablabel.c:125 +#: ../src/libgdl/gdl-dock-item-grip.c:723 ../src/libgdl/gdl-dock-tablabel.c:125 msgid "Controlling dock item" msgstr "" @@ -8756,7 +8746,7 @@ msgstr "" msgid "Dockitem which 'owns' this grip" msgstr "" -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:197 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:201 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 msgid "Orientation" @@ -8885,12 +8875,12 @@ msgid "" msgstr "" #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:1040 +#: ../src/ui/dialog/align-and-distribute.cpp:1089 #: ../src/ui/dialog/document-properties.cpp:161 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 -#: ../src/widgets/desktop-widget.cpp:2045 +#: ../src/widgets/desktop-widget.cpp:2066 #: ../share/extensions/empty_page.inx.h:1 -#: ../share/extensions/voronoi2svg.inx.h:9 +#: ../share/extensions/voronoi2svg.inx.h:10 msgid "Page" msgstr "" @@ -8900,9 +8890,8 @@ msgstr "" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 -#: ../src/ui/dialog/inkscape-preferences.cpp:1565 -#: ../src/ui/widget/page-sizer.cpp:285 -#: ../src/widgets/gradient-selector.cpp:150 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 +#: ../src/ui/widget/page-sizer.cpp:285 ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "" @@ -8968,7 +8957,7 @@ msgid "" "Attempt to bind to %p an already bound dock object %p (current master: %p)" msgstr "" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:235 +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:239 msgid "Position" msgstr "" @@ -9056,8 +9045,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:686 -#: ../src/ui/dialog/inkscape-preferences.cpp:729 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/ui/dialog/inkscape-preferences.cpp:730 msgid "Floating" msgstr "" @@ -9134,190 +9123,189 @@ msgstr "" msgid "Line Segment" msgstr "" -#: ../src/live_effects/effect.cpp:107 -msgid "Mirror symmetry" +#: ../src/live_effects/effect.cpp:108 +msgid "Parallel" msgstr "" #: ../src/live_effects/effect.cpp:109 -msgid "Parallel" +msgid "Path length" msgstr "" #: ../src/live_effects/effect.cpp:110 -msgid "Path length" +msgid "Perpendicular bisector" msgstr "" #: ../src/live_effects/effect.cpp:111 -msgid "Perpendicular bisector" +msgid "Perspective path" msgstr "" #: ../src/live_effects/effect.cpp:112 -msgid "Perspective path" +msgid "Recursive skeleton" msgstr "" #: ../src/live_effects/effect.cpp:113 -msgid "Rotate copies" +msgid "Tangent to curve" msgstr "" #: ../src/live_effects/effect.cpp:114 -msgid "Recursive skeleton" +msgid "Text label" msgstr "" #: ../src/live_effects/effect.cpp:115 -msgid "Tangent to curve" -msgstr "" - -#: ../src/live_effects/effect.cpp:116 -msgid "Text label" +msgid "Fillet/Chamfer" msgstr "" #. 0.46 -#: ../src/live_effects/effect.cpp:119 +#: ../src/live_effects/effect.cpp:118 msgid "Bend" msgstr "" -#: ../src/live_effects/effect.cpp:120 +#: ../src/live_effects/effect.cpp:119 msgid "Gears" msgstr "" -#: ../src/live_effects/effect.cpp:121 +#: ../src/live_effects/effect.cpp:120 msgid "Pattern Along Path" msgstr "" #. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG -#: ../src/live_effects/effect.cpp:122 +#: ../src/live_effects/effect.cpp:121 msgid "Stitch Sub-Paths" msgstr "" #. 0.47 -#: ../src/live_effects/effect.cpp:124 +#: ../src/live_effects/effect.cpp:123 msgid "VonKoch" msgstr "" -#: ../src/live_effects/effect.cpp:125 +#: ../src/live_effects/effect.cpp:124 msgid "Knot" msgstr "" -#: ../src/live_effects/effect.cpp:126 +#: ../src/live_effects/effect.cpp:125 msgid "Construct grid" msgstr "" -#: ../src/live_effects/effect.cpp:127 +#: ../src/live_effects/effect.cpp:126 msgid "Spiro spline" msgstr "" -#: ../src/live_effects/effect.cpp:128 +#: ../src/live_effects/effect.cpp:127 msgid "Envelope Deformation" msgstr "" -#: ../src/live_effects/effect.cpp:129 +#: ../src/live_effects/effect.cpp:128 msgid "Interpolate Sub-Paths" msgstr "" -#: ../src/live_effects/effect.cpp:130 +#: ../src/live_effects/effect.cpp:129 msgid "Hatches (rough)" msgstr "" -#: ../src/live_effects/effect.cpp:131 +#: ../src/live_effects/effect.cpp:130 msgid "Sketch" msgstr "" -#: ../src/live_effects/effect.cpp:132 +#: ../src/live_effects/effect.cpp:131 msgid "Ruler" msgstr "" #. 0.91 -#: ../src/live_effects/effect.cpp:134 +#: ../src/live_effects/effect.cpp:133 msgid "Power stroke" msgstr "" -#: ../src/live_effects/effect.cpp:135 +#: ../src/live_effects/effect.cpp:134 msgid "Clone original path" msgstr "" -#. EXPERIMENTAL #: ../src/live_effects/effect.cpp:137 -#: ../src/live_effects/lpe-show_handles.cpp:26 -msgid "Show handles" +msgid "Lattice Deformation 2" msgstr "" -#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:118 -msgid "BSpline" +#: ../src/live_effects/effect.cpp:138 +msgid "Perspective/Envelope" +msgstr "" + +#: ../src/live_effects/effect.cpp:139 +msgid "Interpolate points" msgstr "" #: ../src/live_effects/effect.cpp:140 -msgid "Join type" +msgid "Transform by 2 points" msgstr "" #: ../src/live_effects/effect.cpp:141 -msgid "Taper stroke" +#: ../src/live_effects/lpe-show_handles.cpp:26 +msgid "Show handles" msgstr "" -#. Ponyscape -#: ../src/live_effects/effect.cpp:143 -msgid "Attach path" +#: ../src/live_effects/effect.cpp:143 ../src/widgets/pencil-toolbar.cpp:118 +msgid "BSpline" msgstr "" #: ../src/live_effects/effect.cpp:144 -msgid "Fill between strokes" +msgid "Join type" msgstr "" -#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2874 -msgid "Fill between many" +#: ../src/live_effects/effect.cpp:145 +msgid "Taper stroke" msgstr "" #: ../src/live_effects/effect.cpp:146 -msgid "Ellipse by 5 points" +msgid "Mirror symmetry" msgstr "" #: ../src/live_effects/effect.cpp:147 -msgid "Bounding Box" +msgid "Rotate copies" +msgstr "" + +#. Ponyscape -> Inkscape 0.92 +#: ../src/live_effects/effect.cpp:149 +msgid "Attach path" msgstr "" #: ../src/live_effects/effect.cpp:150 -msgid "Lattice Deformation 2" +msgid "Fill between strokes" msgstr "" -#: ../src/live_effects/effect.cpp:151 -msgid "Perspective/Envelope" +#: ../src/live_effects/effect.cpp:151 ../src/selection-chemistry.cpp:2906 +msgid "Fill between many" msgstr "" #: ../src/live_effects/effect.cpp:152 -msgid "Fillet/Chamfer" +msgid "Ellipse by 5 points" msgstr "" #: ../src/live_effects/effect.cpp:153 -msgid "Interpolate points" -msgstr "" - -#: ../src/live_effects/effect.cpp:154 -msgid "Transform by 2 points" +msgid "Bounding Box" msgstr "" -#: ../src/live_effects/effect.cpp:362 +#: ../src/live_effects/effect.cpp:361 msgid "Is visible?" msgstr "" -#: ../src/live_effects/effect.cpp:362 +#: ../src/live_effects/effect.cpp:361 msgid "" "If unchecked, the effect remains applied to the object but is temporarily " "disabled on canvas" msgstr "" -#: ../src/live_effects/effect.cpp:387 +#: ../src/live_effects/effect.cpp:386 msgid "No effect" msgstr "" -#: ../src/live_effects/effect.cpp:495 +#: ../src/live_effects/effect.cpp:498 #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "" -#: ../src/live_effects/effect.cpp:762 +#: ../src/live_effects/effect.cpp:765 #, c-format msgid "Editing parameter %s." msgstr "" -#: ../src/live_effects/effect.cpp:767 +#: ../src/live_effects/effect.cpp:770 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" @@ -9418,7 +9406,7 @@ msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "" #: ../src/live_effects/lpe-bendpath.cpp:178 -#: ../src/live_effects/lpe-patternalongpath.cpp:278 +#: ../src/live_effects/lpe-patternalongpath.cpp:285 msgid "Change the width" msgstr "" @@ -9679,7 +9667,7 @@ msgid "Reverses the second path order" msgstr "" #: ../src/live_effects/lpe-fillet-chamfer.cpp:41 -#: ../src/widgets/text-toolbar.cpp:1540 +#: ../src/widgets/text-toolbar.cpp:1788 #: ../share/extensions/render_barcode_qrcode.inx.h:5 msgid "Auto" msgstr "" @@ -10264,6 +10252,71 @@ msgstr "" msgid "Hide Points" msgstr "" +#: ../src/live_effects/lpe-mirror_symmetry.cpp:36 +msgid "Vertical Page Center" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:37 +msgid "Horizontal Page Center" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:38 +msgid "Free from reflection line" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:39 +msgid "X from middle knot" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:40 +msgid "Y from middle knot" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:72 +#: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 +msgid "Mode" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:72 +msgid "Symmetry move mode" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:73 +msgid "Discard original path?" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:73 +msgid "Check this to only keep the mirrored part of the path" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:74 +msgid "Fuse paths" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:74 +msgid "Fuse original and the reflection into a single path" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:75 +msgid "Oposite fuse" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:75 +msgid "Picks the other side of the mirror as the original" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:76 +msgid "Start mirror line" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:77 +msgid "End mirror line" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:335 +msgid "Adjust the center" +msgstr "" + #: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 msgid "Single" @@ -10781,15 +10834,14 @@ msgstr "" msgid "Distance between successive ruler marks" msgstr "" -#: ../src/live_effects/lpe-ruler.cpp:42 -#: ../share/extensions/foldablebox.inx.h:7 +#: ../src/live_effects/lpe-ruler.cpp:42 ../share/extensions/foldablebox.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:9 #: ../share/extensions/layout_nup.inx.h:3 #: ../share/extensions/printing_marks.inx.h:11 msgid "Unit:" msgstr "" -#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:207 +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:211 msgid "Unit" msgstr "" @@ -10994,7 +11046,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "" @@ -11050,7 +11102,7 @@ msgid "Extrapolated" msgstr "" #: ../src/live_effects/lpe-taperstroke.cpp:73 -#: ../share/extensions/edge3d.inx.h:5 +#: ../share/extensions/edge3d.inx.h:5 ../share/extensions/nicechart.inx.h:25 msgid "Stroke width:" msgstr "" @@ -11171,11 +11223,11 @@ msgid "Change index of knot" msgstr "" #: ../src/live_effects/lpe-transform_2pts.cpp:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1622 +#: ../src/ui/dialog/inkscape-preferences.cpp:1623 #: ../src/ui/dialog/pixelartdialog.cpp:296 #: ../src/ui/dialog/svg-fonts-dialog.cpp:699 #: ../src/ui/dialog/tracedialog.cpp:813 -#: ../src/ui/widget/preferences-widget.cpp:746 +#: ../src/ui/widget/preferences-widget.cpp:742 msgid "Reset" msgstr "" @@ -11285,7 +11337,7 @@ msgstr "" #: ../src/live_effects/parameter/originalpatharray.cpp:130 #: ../src/live_effects/parameter/originalpatharray.cpp:315 -#: ../src/live_effects/parameter/path.cpp:481 +#: ../src/live_effects/parameter/path.cpp:486 msgid "Link path parameter to path" msgstr "" @@ -11331,7 +11383,7 @@ msgstr "" msgid "Link to path on clipboard" msgstr "" -#: ../src/live_effects/parameter/path.cpp:449 +#: ../src/live_effects/parameter/path.cpp:454 msgid "Paste path parameter" msgstr "" @@ -11378,272 +11430,272 @@ msgstr "" msgid "Unable to find node ID: '%s'\n" msgstr "" -#: ../src/main.cpp:295 +#: ../src/main.cpp:300 msgid "Print the Inkscape version number" msgstr "" -#: ../src/main.cpp:300 +#: ../src/main.cpp:305 msgid "Do not use X server (only process files from console)" msgstr "" -#: ../src/main.cpp:305 +#: ../src/main.cpp:310 msgid "Try to use X server (even if $DISPLAY is not set)" msgstr "" -#: ../src/main.cpp:310 +#: ../src/main.cpp:315 msgid "Open specified document(s) (option string may be excluded)" msgstr "" -#: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 -#: ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 -#: ../src/main.cpp:414 ../src/main.cpp:430 ../src/main.cpp:435 +#: ../src/main.cpp:316 ../src/main.cpp:321 ../src/main.cpp:326 +#: ../src/main.cpp:398 ../src/main.cpp:403 ../src/main.cpp:408 +#: ../src/main.cpp:419 ../src/main.cpp:435 ../src/main.cpp:440 msgid "FILENAME" msgstr "" -#: ../src/main.cpp:315 +#: ../src/main.cpp:320 msgid "Print document(s) to specified output file (use '| program' for pipe)" msgstr "" -#: ../src/main.cpp:320 +#: ../src/main.cpp:325 msgid "Export document to a PNG file" msgstr "" -#: ../src/main.cpp:325 +#: ../src/main.cpp:330 msgid "" "Resolution for exporting to bitmap and for rasterization of filters in PS/" "EPS/PDF (default 96)" msgstr "" -#: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 +#: ../src/main.cpp:331 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" msgstr "" -#: ../src/main.cpp:330 +#: ../src/main.cpp:335 msgid "" "Exported area in SVG user units (default is the page; 0,0 is lower-left " "corner)" msgstr "" -#: ../src/main.cpp:331 +#: ../src/main.cpp:336 msgid "x0:y0:x1:y1" msgstr "" -#: ../src/main.cpp:335 +#: ../src/main.cpp:340 msgid "Exported area is the entire drawing (not page)" msgstr "" -#: ../src/main.cpp:340 +#: ../src/main.cpp:345 msgid "Exported area is the entire page" msgstr "" -#: ../src/main.cpp:345 +#: ../src/main.cpp:350 msgid "Only for PS/EPS/PDF, sets margin in mm around exported area (default 0)" msgstr "" -#: ../src/main.cpp:346 ../src/main.cpp:388 +#: ../src/main.cpp:351 ../src/main.cpp:393 msgid "VALUE" msgstr "" -#: ../src/main.cpp:350 +#: ../src/main.cpp:355 msgid "" "Snap the bitmap export area outwards to the nearest integer values (in SVG " "user units)" msgstr "" -#: ../src/main.cpp:355 +#: ../src/main.cpp:360 msgid "The width of exported bitmap in pixels (overrides export-dpi)" msgstr "" -#: ../src/main.cpp:356 +#: ../src/main.cpp:361 msgid "WIDTH" msgstr "" -#: ../src/main.cpp:360 +#: ../src/main.cpp:365 msgid "The height of exported bitmap in pixels (overrides export-dpi)" msgstr "" -#: ../src/main.cpp:361 +#: ../src/main.cpp:366 msgid "HEIGHT" msgstr "" -#: ../src/main.cpp:365 +#: ../src/main.cpp:370 msgid "The ID of the object to export" msgstr "" -#: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1568 +#: ../src/main.cpp:371 ../src/main.cpp:484 +#: ../src/ui/dialog/inkscape-preferences.cpp:1569 msgid "ID" msgstr "" #. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". #. See "man inkscape" for details. -#: ../src/main.cpp:372 +#: ../src/main.cpp:377 msgid "" "Export just the object with export-id, hide all others (only with export-id)" msgstr "" -#: ../src/main.cpp:377 +#: ../src/main.cpp:382 msgid "Use stored filename and DPI hints when exporting (only with export-id)" msgstr "" -#: ../src/main.cpp:382 +#: ../src/main.cpp:387 msgid "Background color of exported bitmap (any SVG-supported color string)" msgstr "" -#: ../src/main.cpp:383 +#: ../src/main.cpp:388 msgid "COLOR" msgstr "" -#: ../src/main.cpp:387 +#: ../src/main.cpp:392 msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" msgstr "" -#: ../src/main.cpp:392 +#: ../src/main.cpp:397 msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" msgstr "" -#: ../src/main.cpp:397 +#: ../src/main.cpp:402 msgid "Export document to a PS file" msgstr "" -#: ../src/main.cpp:402 +#: ../src/main.cpp:407 msgid "Export document to an EPS file" msgstr "" -#: ../src/main.cpp:407 +#: ../src/main.cpp:412 msgid "" "Choose the PostScript Level used to export. Possible choices are 2 and 3 " "(the default)" msgstr "" -#: ../src/main.cpp:409 +#: ../src/main.cpp:414 msgid "PS Level" msgstr "" -#: ../src/main.cpp:413 +#: ../src/main.cpp:418 msgid "Export document to a PDF file" msgstr "" #. TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:419 +#: ../src/main.cpp:424 msgid "" "Export PDF to given version. (hint: make sure to input the exact string " "found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" msgstr "" -#: ../src/main.cpp:420 +#: ../src/main.cpp:425 msgid "PDF_VERSION" msgstr "" -#: ../src/main.cpp:424 +#: ../src/main.cpp:429 msgid "" "Export PDF/PS/EPS without text. Besides the PDF/PS/EPS, a LaTeX file is " "exported, putting the text on top of the PDF/PS/EPS file. Include the result " "in LaTeX like: \\input{latexfile.tex}" msgstr "" -#: ../src/main.cpp:429 +#: ../src/main.cpp:434 msgid "Export document to an Enhanced Metafile (EMF) File" msgstr "" -#: ../src/main.cpp:434 +#: ../src/main.cpp:439 msgid "Export document to a Windows Metafile (WMF) File" msgstr "" -#: ../src/main.cpp:439 +#: ../src/main.cpp:444 msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" msgstr "" -#: ../src/main.cpp:444 +#: ../src/main.cpp:449 msgid "" "Render filtered objects without filters, instead of rasterizing (PS, EPS, " "PDF)" msgstr "" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:450 +#: ../src/main.cpp:455 msgid "" "Query the X coordinate of the drawing or, if specified, of the object with --" "query-id" msgstr "" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:456 +#: ../src/main.cpp:461 msgid "" "Query the Y coordinate of the drawing or, if specified, of the object with --" "query-id" msgstr "" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:462 +#: ../src/main.cpp:467 msgid "" "Query the width of the drawing or, if specified, of the object with --query-" "id" msgstr "" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:468 +#: ../src/main.cpp:473 msgid "" "Query the height of the drawing or, if specified, of the object with --query-" "id" msgstr "" -#: ../src/main.cpp:473 +#: ../src/main.cpp:478 msgid "List id,x,y,w,h for all objects" msgstr "" -#: ../src/main.cpp:478 +#: ../src/main.cpp:483 msgid "The ID of the object whose dimensions are queried" msgstr "" #. TRANSLATORS: this option makes Inkscape print the name (path) of the extension directory -#: ../src/main.cpp:484 +#: ../src/main.cpp:489 msgid "Print out the extension directory and exit" msgstr "" -#: ../src/main.cpp:489 +#: ../src/main.cpp:494 msgid "Remove unused definitions from the defs section(s) of the document" msgstr "" -#: ../src/main.cpp:495 +#: ../src/main.cpp:500 msgid "Enter a listening loop for D-Bus messages in console mode" msgstr "" -#: ../src/main.cpp:500 +#: ../src/main.cpp:505 msgid "" "Specify the D-Bus bus name to listen for messages on (default is org." "inkscape)" msgstr "" -#: ../src/main.cpp:501 +#: ../src/main.cpp:506 msgid "BUS-NAME" msgstr "" -#: ../src/main.cpp:506 +#: ../src/main.cpp:511 msgid "List the IDs of all the verbs in Inkscape" msgstr "" -#: ../src/main.cpp:511 +#: ../src/main.cpp:516 msgid "Verb to call when Inkscape opens." msgstr "" -#: ../src/main.cpp:512 +#: ../src/main.cpp:517 msgid "VERB-ID" msgstr "" -#: ../src/main.cpp:516 +#: ../src/main.cpp:521 msgid "Object ID to select when Inkscape opens." msgstr "" -#: ../src/main.cpp:517 +#: ../src/main.cpp:522 msgid "OBJECT-ID" msgstr "" -#: ../src/main.cpp:521 +#: ../src/main.cpp:526 msgid "Start Inkscape in interactive shell mode." msgstr "" -#: ../src/main.cpp:871 ../src/main.cpp:1284 +#: ../src/main.cpp:876 ../src/main.cpp:1318 msgid "" "[OPTIONS...] [FILE...]\n" "\n" @@ -11657,11 +11709,11 @@ msgstr "" #. " \n" #. " \n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2714 ../src/verbs.cpp:2722 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2715 ../src/verbs.cpp:2723 msgid "_Edit" msgstr "" -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2473 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2472 msgid "Paste Si_ze" msgstr "" @@ -11673,76 +11725,76 @@ msgstr "" msgid "Select Sa_me" msgstr "" -#: ../src/menus-skeleton.h:98 +#: ../src/menus-skeleton.h:100 msgid "_View" msgstr "" -#: ../src/menus-skeleton.h:99 +#: ../src/menus-skeleton.h:101 msgid "_Zoom" msgstr "" -#: ../src/menus-skeleton.h:115 +#: ../src/menus-skeleton.h:117 msgid "_Display mode" msgstr "" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:124 +#: ../src/menus-skeleton.h:126 msgid "_Color display mode" msgstr "" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:137 +#: ../src/menus-skeleton.h:139 msgid "Sh_ow/Hide" msgstr "" #. Not quite ready to be in the menus. #. " \n" -#: ../src/menus-skeleton.h:157 +#: ../src/menus-skeleton.h:159 msgid "_Layer" msgstr "" -#: ../src/menus-skeleton.h:181 +#: ../src/menus-skeleton.h:183 msgid "_Object" msgstr "" -#: ../src/menus-skeleton.h:192 +#: ../src/menus-skeleton.h:195 msgid "Cli_p" msgstr "" -#: ../src/menus-skeleton.h:196 +#: ../src/menus-skeleton.h:199 msgid "Mas_k" msgstr "" -#: ../src/menus-skeleton.h:200 +#: ../src/menus-skeleton.h:203 msgid "Patter_n" msgstr "" -#: ../src/menus-skeleton.h:224 +#: ../src/menus-skeleton.h:227 msgid "_Path" msgstr "" -#: ../src/menus-skeleton.h:256 ../src/ui/dialog/find.cpp:78 +#: ../src/menus-skeleton.h:259 ../src/ui/dialog/find.cpp:78 #: ../src/ui/dialog/text-edit.cpp:71 msgid "_Text" msgstr "" -#: ../src/menus-skeleton.h:274 +#: ../src/menus-skeleton.h:277 msgid "Filter_s" msgstr "" -#: ../src/menus-skeleton.h:280 +#: ../src/menus-skeleton.h:283 msgid "Exte_nsions" msgstr "" -#: ../src/menus-skeleton.h:286 +#: ../src/menus-skeleton.h:289 msgid "_Help" msgstr "" -#: ../src/menus-skeleton.h:290 +#: ../src/menus-skeleton.h:293 msgid "Tutorials" msgstr "" @@ -11770,43 +11822,43 @@ msgstr "" msgid "Breaking apart paths..." msgstr "" -#: ../src/path-chemistry.cpp:288 +#: ../src/path-chemistry.cpp:282 msgid "Break apart" msgstr "" -#: ../src/path-chemistry.cpp:291 +#: ../src/path-chemistry.cpp:285 msgid "No path(s) to break apart in the selection." msgstr "" -#: ../src/path-chemistry.cpp:301 +#: ../src/path-chemistry.cpp:295 msgid "Select object(s) to convert to path." msgstr "" -#: ../src/path-chemistry.cpp:307 +#: ../src/path-chemistry.cpp:301 msgid "Converting objects to paths..." msgstr "" -#: ../src/path-chemistry.cpp:326 +#: ../src/path-chemistry.cpp:320 msgid "Object to path" msgstr "" -#: ../src/path-chemistry.cpp:328 +#: ../src/path-chemistry.cpp:322 msgid "No objects to convert to path in the selection." msgstr "" -#: ../src/path-chemistry.cpp:615 +#: ../src/path-chemistry.cpp:609 msgid "Select path(s) to reverse." msgstr "" -#: ../src/path-chemistry.cpp:624 +#: ../src/path-chemistry.cpp:618 msgid "Reversing paths..." msgstr "" -#: ../src/path-chemistry.cpp:659 +#: ../src/path-chemistry.cpp:653 msgid "Reverse path" msgstr "" -#: ../src/path-chemistry.cpp:661 +#: ../src/path-chemistry.cpp:655 msgid "No paths to reverse in the selection." msgstr "" @@ -12004,7 +12056,7 @@ msgstr "" msgid "A related resource" msgstr "" -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1924 +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "Language:" msgstr "" @@ -12086,8 +12138,7 @@ msgstr "" #: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 -#: ../src/widgets/gradient-toolbar.cpp:1209 -#: ../src/widgets/node-toolbar.cpp:401 +#: ../src/widgets/gradient-toolbar.cpp:1209 ../src/widgets/node-toolbar.cpp:401 msgid "Delete" msgstr "" @@ -12114,373 +12165,385 @@ msgid "Group" msgstr "" #: ../src/selection-chemistry.cpp:798 +msgid "No objects selected to pop out of group." +msgstr "" + +#: ../src/selection-chemistry.cpp:808 +msgid "Selection not in a group." +msgstr "" + +#: ../src/selection-chemistry.cpp:822 +msgid "Pop selection from group" +msgstr "" + +#: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." msgstr "" -#: ../src/selection-chemistry.cpp:813 +#: ../src/selection-chemistry.cpp:845 msgid "No groups to ungroup in the selection." msgstr "" -#: ../src/selection-chemistry.cpp:869 ../src/sp-item-group.cpp:550 +#: ../src/selection-chemistry.cpp:901 ../src/sp-item-group.cpp:550 #: ../src/ui/dialog/objects.cpp:1916 msgid "Ungroup" msgstr "" -#: ../src/selection-chemistry.cpp:956 +#: ../src/selection-chemistry.cpp:988 msgid "Select object(s) to raise." msgstr "" -#: ../src/selection-chemistry.cpp:962 ../src/selection-chemistry.cpp:1015 -#: ../src/selection-chemistry.cpp:1041 ../src/selection-chemistry.cpp:1099 +#: ../src/selection-chemistry.cpp:994 ../src/selection-chemistry.cpp:1047 +#: ../src/selection-chemistry.cpp:1073 ../src/selection-chemistry.cpp:1131 msgid "" "You cannot raise/lower objects from different groups or layers." msgstr "" #. TRANSLATORS: "Raise" means "to raise an object" in the undo history -#: ../src/selection-chemistry.cpp:999 +#: ../src/selection-chemistry.cpp:1031 msgctxt "Undo action" msgid "Raise" msgstr "" -#: ../src/selection-chemistry.cpp:1007 +#: ../src/selection-chemistry.cpp:1039 msgid "Select object(s) to raise to top." msgstr "" -#: ../src/selection-chemistry.cpp:1028 +#: ../src/selection-chemistry.cpp:1060 msgid "Raise to top" msgstr "" -#: ../src/selection-chemistry.cpp:1035 +#: ../src/selection-chemistry.cpp:1067 msgid "Select object(s) to lower." msgstr "" #. TRANSLATORS: "Lower" means "to lower an object" in the undo history -#: ../src/selection-chemistry.cpp:1083 +#: ../src/selection-chemistry.cpp:1115 msgctxt "Undo action" msgid "Lower" msgstr "" -#: ../src/selection-chemistry.cpp:1091 +#: ../src/selection-chemistry.cpp:1123 msgid "Select object(s) to lower to bottom." msgstr "" -#: ../src/selection-chemistry.cpp:1122 +#: ../src/selection-chemistry.cpp:1154 msgid "Lower to bottom" msgstr "" -#: ../src/selection-chemistry.cpp:1132 +#: ../src/selection-chemistry.cpp:1164 msgid "Nothing to undo." msgstr "" -#: ../src/selection-chemistry.cpp:1143 +#: ../src/selection-chemistry.cpp:1175 msgid "Nothing to redo." msgstr "" -#: ../src/selection-chemistry.cpp:1215 +#: ../src/selection-chemistry.cpp:1247 msgid "Paste" msgstr "" -#: ../src/selection-chemistry.cpp:1223 +#: ../src/selection-chemistry.cpp:1255 msgid "Paste style" msgstr "" -#: ../src/selection-chemistry.cpp:1233 +#: ../src/selection-chemistry.cpp:1265 msgid "Paste live path effect" msgstr "" -#: ../src/selection-chemistry.cpp:1255 +#: ../src/selection-chemistry.cpp:1287 msgid "Select object(s) to remove live path effects from." msgstr "" -#: ../src/selection-chemistry.cpp:1267 +#: ../src/selection-chemistry.cpp:1299 msgid "Remove live path effect" msgstr "" -#: ../src/selection-chemistry.cpp:1278 +#: ../src/selection-chemistry.cpp:1310 msgid "Select object(s) to remove filters from." msgstr "" -#: ../src/selection-chemistry.cpp:1288 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 +#: ../src/selection-chemistry.cpp:1320 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1695 msgid "Remove filter" msgstr "" -#: ../src/selection-chemistry.cpp:1297 +#: ../src/selection-chemistry.cpp:1329 msgid "Paste size" msgstr "" -#: ../src/selection-chemistry.cpp:1306 +#: ../src/selection-chemistry.cpp:1338 msgid "Paste size separately" msgstr "" -#: ../src/selection-chemistry.cpp:1335 +#: ../src/selection-chemistry.cpp:1367 msgid "Select object(s) to move to the layer above." msgstr "" -#: ../src/selection-chemistry.cpp:1361 +#: ../src/selection-chemistry.cpp:1393 msgid "Raise to next layer" msgstr "" -#: ../src/selection-chemistry.cpp:1368 +#: ../src/selection-chemistry.cpp:1400 msgid "No more layers above." msgstr "" -#: ../src/selection-chemistry.cpp:1379 +#: ../src/selection-chemistry.cpp:1411 msgid "Select object(s) to move to the layer below." msgstr "" -#: ../src/selection-chemistry.cpp:1405 +#: ../src/selection-chemistry.cpp:1437 msgid "Lower to previous layer" msgstr "" -#: ../src/selection-chemistry.cpp:1412 +#: ../src/selection-chemistry.cpp:1444 msgid "No more layers below." msgstr "" -#: ../src/selection-chemistry.cpp:1422 +#: ../src/selection-chemistry.cpp:1454 msgid "Select object(s) to move." msgstr "" -#: ../src/selection-chemistry.cpp:1440 ../src/verbs.cpp:2657 +#: ../src/selection-chemistry.cpp:1472 ../src/verbs.cpp:2658 msgid "Move selection to layer" msgstr "" #. An SVG element cannot have a transform. We could change 'x' and 'y' in response #. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1529 ../src/seltrans.cpp:391 +#: ../src/selection-chemistry.cpp:1561 ../src/seltrans.cpp:391 msgid "Cannot transform an embedded SVG." msgstr "" -#: ../src/selection-chemistry.cpp:1699 +#: ../src/selection-chemistry.cpp:1731 msgid "Remove transform" msgstr "" -#: ../src/selection-chemistry.cpp:1806 +#: ../src/selection-chemistry.cpp:1838 msgid "Rotate 90° CCW" msgstr "" -#: ../src/selection-chemistry.cpp:1806 +#: ../src/selection-chemistry.cpp:1838 msgid "Rotate 90° CW" msgstr "" -#: ../src/selection-chemistry.cpp:1827 ../src/seltrans.cpp:484 +#: ../src/selection-chemistry.cpp:1859 ../src/seltrans.cpp:484 #: ../src/ui/dialog/transformation.cpp:890 msgid "Rotate" msgstr "" -#: ../src/selection-chemistry.cpp:2176 +#: ../src/selection-chemistry.cpp:2208 msgid "Rotate by pixels" msgstr "" -#: ../src/selection-chemistry.cpp:2206 ../src/seltrans.cpp:481 +#: ../src/selection-chemistry.cpp:2238 ../src/seltrans.cpp:481 #: ../src/ui/dialog/transformation.cpp:864 ../src/ui/widget/page-sizer.cpp:450 #: ../share/extensions/interp_att_g.inx.h:14 msgid "Scale" msgstr "" -#: ../src/selection-chemistry.cpp:2231 +#: ../src/selection-chemistry.cpp:2263 msgid "Scale by whole factor" msgstr "" -#: ../src/selection-chemistry.cpp:2246 +#: ../src/selection-chemistry.cpp:2278 msgid "Move vertically" msgstr "" -#: ../src/selection-chemistry.cpp:2249 +#: ../src/selection-chemistry.cpp:2281 msgid "Move horizontally" msgstr "" -#: ../src/selection-chemistry.cpp:2252 ../src/selection-chemistry.cpp:2278 +#: ../src/selection-chemistry.cpp:2284 ../src/selection-chemistry.cpp:2310 #: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:801 msgid "Move" msgstr "" -#: ../src/selection-chemistry.cpp:2272 +#: ../src/selection-chemistry.cpp:2304 msgid "Move vertically by pixels" msgstr "" -#: ../src/selection-chemistry.cpp:2275 +#: ../src/selection-chemistry.cpp:2307 msgid "Move horizontally by pixels" msgstr "" -#: ../src/selection-chemistry.cpp:2478 +#: ../src/selection-chemistry.cpp:2510 msgid "The selection has no applied path effect." msgstr "" -#: ../src/selection-chemistry.cpp:2570 ../src/ui/dialog/clonetiler.cpp:2230 +#: ../src/selection-chemistry.cpp:2602 ../src/ui/dialog/clonetiler.cpp:2238 msgid "Select an object to clone." msgstr "" -#: ../src/selection-chemistry.cpp:2605 +#: ../src/selection-chemistry.cpp:2637 msgctxt "Action" msgid "Clone" msgstr "" -#: ../src/selection-chemistry.cpp:2619 +#: ../src/selection-chemistry.cpp:2651 msgid "Select clones to relink." msgstr "" -#: ../src/selection-chemistry.cpp:2626 +#: ../src/selection-chemistry.cpp:2658 msgid "Copy an object to clipboard to relink clones to." msgstr "" -#: ../src/selection-chemistry.cpp:2647 +#: ../src/selection-chemistry.cpp:2679 msgid "No clones to relink in the selection." msgstr "" -#: ../src/selection-chemistry.cpp:2650 +#: ../src/selection-chemistry.cpp:2682 msgid "Relink clone" msgstr "" -#: ../src/selection-chemistry.cpp:2664 +#: ../src/selection-chemistry.cpp:2696 msgid "Select clones to unlink." msgstr "" -#: ../src/selection-chemistry.cpp:2717 +#: ../src/selection-chemistry.cpp:2749 msgid "No clones to unlink in the selection." msgstr "" -#: ../src/selection-chemistry.cpp:2721 +#: ../src/selection-chemistry.cpp:2753 msgid "Unlink clone" msgstr "" -#: ../src/selection-chemistry.cpp:2734 +#: ../src/selection-chemistry.cpp:2766 msgid "" "Select a clone to go to its original. Select a linked offset " "to go to its source. Select a text on path to go to the path. Select " "a flowed text to go to its frame." msgstr "" -#: ../src/selection-chemistry.cpp:2784 +#: ../src/selection-chemistry.cpp:2816 msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" msgstr "" -#: ../src/selection-chemistry.cpp:2790 +#: ../src/selection-chemistry.cpp:2822 msgid "" "The object you're trying to select is not visible (it is in <" "defs>)" msgstr "" -#: ../src/selection-chemistry.cpp:2880 +#: ../src/selection-chemistry.cpp:2912 msgid "Select path(s) to fill." msgstr "" -#: ../src/selection-chemistry.cpp:2898 +#: ../src/selection-chemistry.cpp:2930 msgid "Select object(s) to convert to marker." msgstr "" -#: ../src/selection-chemistry.cpp:2972 +#: ../src/selection-chemistry.cpp:3004 msgid "Objects to marker" msgstr "" -#: ../src/selection-chemistry.cpp:2998 +#: ../src/selection-chemistry.cpp:3030 msgid "Select object(s) to convert to guides." msgstr "" -#: ../src/selection-chemistry.cpp:3019 +#: ../src/selection-chemistry.cpp:3051 msgid "Objects to guides" msgstr "" -#: ../src/selection-chemistry.cpp:3055 +#: ../src/selection-chemistry.cpp:3087 msgid "Select objects to convert to symbol." msgstr "" -#: ../src/selection-chemistry.cpp:3156 +#: ../src/selection-chemistry.cpp:3188 msgid "Group to symbol" msgstr "" -#: ../src/selection-chemistry.cpp:3175 +#: ../src/selection-chemistry.cpp:3207 msgid "Select a symbol to extract objects from." msgstr "" -#: ../src/selection-chemistry.cpp:3184 +#: ../src/selection-chemistry.cpp:3216 msgid "Select only one symbol in Symbol dialog to convert to group." msgstr "" -#: ../src/selection-chemistry.cpp:3240 +#: ../src/selection-chemistry.cpp:3272 msgid "Group from symbol" msgstr "" -#: ../src/selection-chemistry.cpp:3258 +#: ../src/selection-chemistry.cpp:3290 msgid "Select object(s) to convert to pattern." msgstr "" -#: ../src/selection-chemistry.cpp:3354 +#: ../src/selection-chemistry.cpp:3386 msgid "Objects to pattern" msgstr "" -#: ../src/selection-chemistry.cpp:3370 +#: ../src/selection-chemistry.cpp:3402 msgid "Select an object with pattern fill to extract objects from." msgstr "" -#: ../src/selection-chemistry.cpp:3429 +#: ../src/selection-chemistry.cpp:3461 msgid "No pattern fills in the selection." msgstr "" -#: ../src/selection-chemistry.cpp:3432 +#: ../src/selection-chemistry.cpp:3464 msgid "Pattern to objects" msgstr "" -#: ../src/selection-chemistry.cpp:3518 +#: ../src/selection-chemistry.cpp:3550 msgid "Select object(s) to make a bitmap copy." msgstr "" -#: ../src/selection-chemistry.cpp:3522 +#: ../src/selection-chemistry.cpp:3554 msgid "Rendering bitmap..." msgstr "" -#: ../src/selection-chemistry.cpp:3707 +#: ../src/selection-chemistry.cpp:3739 msgid "Create bitmap" msgstr "" -#: ../src/selection-chemistry.cpp:3732 ../src/selection-chemistry.cpp:3844 +#: ../src/selection-chemistry.cpp:3764 ../src/selection-chemistry.cpp:3876 msgid "Select object(s) to create clippath or mask from." msgstr "" -#: ../src/selection-chemistry.cpp:3818 ../src/ui/dialog/objects.cpp:1922 +#: ../src/selection-chemistry.cpp:3850 ../src/ui/dialog/objects.cpp:1922 msgid "Create Clip Group" msgstr "" -#: ../src/selection-chemistry.cpp:3847 +#: ../src/selection-chemistry.cpp:3879 msgid "Select mask object and object(s) to apply clippath or mask to." msgstr "" -#: ../src/selection-chemistry.cpp:3994 +#: ../src/selection-chemistry.cpp:4026 msgid "Set clipping path" msgstr "" -#: ../src/selection-chemistry.cpp:3996 +#: ../src/selection-chemistry.cpp:4028 msgid "Set mask" msgstr "" -#: ../src/selection-chemistry.cpp:4011 +#: ../src/selection-chemistry.cpp:4043 msgid "Select object(s) to remove clippath or mask from." msgstr "" -#: ../src/selection-chemistry.cpp:4127 +#: ../src/selection-chemistry.cpp:4159 msgid "Release clipping path" msgstr "" -#: ../src/selection-chemistry.cpp:4129 +#: ../src/selection-chemistry.cpp:4161 msgid "Release mask" msgstr "" -#: ../src/selection-chemistry.cpp:4148 +#: ../src/selection-chemistry.cpp:4180 msgid "Select object(s) to fit canvas to." msgstr "" #. Fit Page -#: ../src/selection-chemistry.cpp:4168 ../src/verbs.cpp:3003 +#: ../src/selection-chemistry.cpp:4200 ../src/verbs.cpp:3004 msgid "Fit Page to Selection" msgstr "" -#: ../src/selection-chemistry.cpp:4197 ../src/verbs.cpp:3005 +#: ../src/selection-chemistry.cpp:4229 ../src/verbs.cpp:3006 msgid "Fit Page to Drawing" msgstr "" -#: ../src/selection-chemistry.cpp:4218 ../src/verbs.cpp:3007 +#: ../src/selection-chemistry.cpp:4250 msgid "Fit Page to Selection or Drawing" msgstr "" @@ -12731,7 +12794,7 @@ msgstr[1] "" msgid "Create Guides Around the Page" msgstr "" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2545 +#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "" @@ -12789,26 +12852,26 @@ msgstr "" msgid "of %d objects" msgstr "" -#: ../src/sp-item.cpp:1030 ../src/verbs.cpp:213 +#: ../src/sp-item.cpp:1031 ../src/verbs.cpp:213 msgid "Object" msgstr "" -#: ../src/sp-item.cpp:1042 +#: ../src/sp-item.cpp:1043 #, c-format msgid "%s; clipped" msgstr "" -#: ../src/sp-item.cpp:1048 +#: ../src/sp-item.cpp:1049 #, c-format msgid "%s; masked" msgstr "" -#: ../src/sp-item.cpp:1058 +#: ../src/sp-item.cpp:1059 #, c-format msgid "%s; filtered (%s)" msgstr "" -#: ../src/sp-item.cpp:1060 +#: ../src/sp-item.cpp:1061 #, c-format msgid "%s; filtered" msgstr "" @@ -12817,29 +12880,29 @@ msgstr "" msgid "Line" msgstr "" -#: ../src/sp-lpe-item.cpp:263 ../src/sp-lpe-item.cpp:710 +#: ../src/sp-lpe-item.cpp:258 ../src/sp-lpe-item.cpp:705 msgid "An exception occurred during execution of the Path Effect." msgstr "" -#: ../src/sp-offset.cpp:329 +#: ../src/sp-offset.cpp:331 msgid "Linked Offset" msgstr "" -#: ../src/sp-offset.cpp:331 +#: ../src/sp-offset.cpp:333 msgid "Dynamic Offset" msgstr "" #. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign -#: ../src/sp-offset.cpp:337 +#: ../src/sp-offset.cpp:339 #, c-format msgid "%s by %f pt" msgstr "" -#: ../src/sp-offset.cpp:338 +#: ../src/sp-offset.cpp:340 msgid "outset" msgstr "" -#: ../src/sp-offset.cpp:338 +#: ../src/sp-offset.cpp:340 msgid "inset" msgstr "" @@ -12917,8 +12980,8 @@ msgstr "" #: ../src/sp-text.cpp:361 ../src/verbs.cpp:347 #: ../share/extensions/lorem_ipsum.inx.h:8 -#: ../share/extensions/replace_font.inx.h:11 -#: ../share/extensions/split.inx.h:10 ../share/extensions/text_braille.inx.h:2 +#: ../share/extensions/replace_font.inx.h:11 ../share/extensions/split.inx.h:10 +#: ../share/extensions/text_braille.inx.h:2 #: ../share/extensions/text_extract.inx.h:14 #: ../share/extensions/text_flipcase.inx.h:2 #: ../share/extensions/text_lowercase.inx.h:2 @@ -13023,66 +13086,66 @@ msgstr "" msgid "Select stroked path(s) to convert stroke to path." msgstr "" -#: ../src/splivarot.cpp:1509 +#: ../src/splivarot.cpp:1511 msgid "Convert stroke to path" msgstr "" #. TRANSLATORS: "to outline" means "to convert stroke to path" -#: ../src/splivarot.cpp:1512 +#: ../src/splivarot.cpp:1514 msgid "No stroked paths in the selection." msgstr "" -#: ../src/splivarot.cpp:1583 +#: ../src/splivarot.cpp:1585 msgid "Selected object is not a path, cannot inset/outset." msgstr "" -#: ../src/splivarot.cpp:1674 ../src/splivarot.cpp:1741 +#: ../src/splivarot.cpp:1676 ../src/splivarot.cpp:1743 msgid "Create linked offset" msgstr "" -#: ../src/splivarot.cpp:1675 ../src/splivarot.cpp:1742 +#: ../src/splivarot.cpp:1677 ../src/splivarot.cpp:1744 msgid "Create dynamic offset" msgstr "" -#: ../src/splivarot.cpp:1767 +#: ../src/splivarot.cpp:1769 msgid "Select path(s) to inset/outset." msgstr "" -#: ../src/splivarot.cpp:1960 +#: ../src/splivarot.cpp:1962 msgid "Outset path" msgstr "" -#: ../src/splivarot.cpp:1960 +#: ../src/splivarot.cpp:1962 msgid "Inset path" msgstr "" -#: ../src/splivarot.cpp:1962 +#: ../src/splivarot.cpp:1964 msgid "No paths to inset/outset in the selection." msgstr "" -#: ../src/splivarot.cpp:2124 +#: ../src/splivarot.cpp:2126 msgid "Simplifying paths (separately):" msgstr "" -#: ../src/splivarot.cpp:2126 +#: ../src/splivarot.cpp:2128 msgid "Simplifying paths:" msgstr "" -#: ../src/splivarot.cpp:2163 +#: ../src/splivarot.cpp:2165 #, c-format msgid "%s %d of %d paths simplified..." msgstr "" -#: ../src/splivarot.cpp:2176 +#: ../src/splivarot.cpp:2178 #, c-format msgid "%d paths simplified." msgstr "" -#: ../src/splivarot.cpp:2190 +#: ../src/splivarot.cpp:2192 msgid "Select path(s) to simplify." msgstr "" -#: ../src/splivarot.cpp:2206 +#: ../src/splivarot.cpp:2208 msgid "No paths to simplify in the selection." msgstr "" @@ -13107,7 +13170,7 @@ msgstr "" msgid "The flowed text(s) must be visible in order to be put on a path." msgstr "" -#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2568 +#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2569 msgid "Put text on path" msgstr "" @@ -13119,7 +13182,7 @@ msgstr "" msgid "No texts-on-paths in the selection." msgstr "" -#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2570 +#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2571 msgid "Remove text from path" msgstr "" @@ -13193,68 +13256,68 @@ msgstr "" msgid "Trace: No active desktop" msgstr "" -#: ../src/trace/trace.cpp:313 +#: ../src/trace/trace.cpp:314 msgid "Invalid SIOX result" msgstr "" -#: ../src/trace/trace.cpp:406 +#: ../src/trace/trace.cpp:407 msgid "Trace: No active document" msgstr "" -#: ../src/trace/trace.cpp:438 +#: ../src/trace/trace.cpp:439 msgid "Trace: Image has no bitmap data" msgstr "" -#: ../src/trace/trace.cpp:445 +#: ../src/trace/trace.cpp:446 msgid "Trace: Starting trace..." msgstr "" #. ## inform the document, so we can undo -#: ../src/trace/trace.cpp:548 +#: ../src/trace/trace.cpp:549 msgid "Trace bitmap" msgstr "" -#: ../src/trace/trace.cpp:552 +#: ../src/trace/trace.cpp:553 #, c-format msgid "Trace: Done. %ld nodes created" msgstr "" #. check whether something is selected -#: ../src/ui/clipboard.cpp:263 +#: ../src/ui/clipboard.cpp:261 msgid "Nothing was copied." msgstr "" -#: ../src/ui/clipboard.cpp:394 ../src/ui/clipboard.cpp:608 -#: ../src/ui/clipboard.cpp:637 +#: ../src/ui/clipboard.cpp:392 ../src/ui/clipboard.cpp:606 +#: ../src/ui/clipboard.cpp:635 msgid "Nothing on the clipboard." msgstr "" -#: ../src/ui/clipboard.cpp:452 +#: ../src/ui/clipboard.cpp:450 msgid "Select object(s) to paste style to." msgstr "" -#: ../src/ui/clipboard.cpp:463 ../src/ui/clipboard.cpp:480 +#: ../src/ui/clipboard.cpp:461 ../src/ui/clipboard.cpp:478 msgid "No style on the clipboard." msgstr "" -#: ../src/ui/clipboard.cpp:505 +#: ../src/ui/clipboard.cpp:503 msgid "Select object(s) to paste size to." msgstr "" -#: ../src/ui/clipboard.cpp:512 +#: ../src/ui/clipboard.cpp:510 msgid "No size on the clipboard." msgstr "" -#: ../src/ui/clipboard.cpp:569 +#: ../src/ui/clipboard.cpp:567 msgid "Select object(s) to paste live path effect to." msgstr "" #. no_effect: -#: ../src/ui/clipboard.cpp:595 +#: ../src/ui/clipboard.cpp:593 msgid "No effect on the clipboard." msgstr "" -#: ../src/ui/clipboard.cpp:614 ../src/ui/clipboard.cpp:651 +#: ../src/ui/clipboard.cpp:612 ../src/ui/clipboard.cpp:649 msgid "Clipboard does not contain a path." msgstr "" @@ -13292,261 +13355,276 @@ msgstr "" #. FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the #. native filename encoding... and the filename passed to sp_document_new #. should be in UTF-*8.. -#: ../src/ui/dialog/aboutbox.cpp:166 +#: ../src/ui/dialog/aboutbox.cpp:178 msgid "about.svg" msgstr "" #. TRANSLATORS: Put here your name (and other national contributors') #. one per line in the form of: name surname (email). Use \n for newline. -#: ../src/ui/dialog/aboutbox.cpp:426 +#: ../src/ui/dialog/aboutbox.cpp:438 msgid "translator-credits" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:169 -#: ../src/ui/dialog/align-and-distribute.cpp:889 +#: ../src/ui/dialog/align-and-distribute.cpp:206 +#: ../src/ui/dialog/align-and-distribute.cpp:937 msgid "Align" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:337 -#: ../src/ui/dialog/align-and-distribute.cpp:890 +#: ../src/ui/dialog/align-and-distribute.cpp:382 +#: ../src/ui/dialog/align-and-distribute.cpp:938 msgid "Distribute" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:416 +#: ../src/ui/dialog/align-and-distribute.cpp:461 msgid "Minimum horizontal gap (in px units) between bounding boxes" msgstr "" #. TRANSLATORS: "H:" stands for horizontal gap -#: ../src/ui/dialog/align-and-distribute.cpp:418 +#: ../src/ui/dialog/align-and-distribute.cpp:463 msgctxt "Gap" msgid "_H:" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:426 +#: ../src/ui/dialog/align-and-distribute.cpp:471 msgid "Minimum vertical gap (in px units) between bounding boxes" msgstr "" #. TRANSLATORS: Vertical gap -#: ../src/ui/dialog/align-and-distribute.cpp:428 +#: ../src/ui/dialog/align-and-distribute.cpp:473 msgctxt "Gap" msgid "_V:" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:463 -#: ../src/ui/dialog/align-and-distribute.cpp:892 +#: ../src/ui/dialog/align-and-distribute.cpp:508 +#: ../src/ui/dialog/align-and-distribute.cpp:940 #: ../src/widgets/connector-toolbar.cpp:405 msgid "Remove overlaps" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:494 +#: ../src/ui/dialog/align-and-distribute.cpp:539 #: ../src/widgets/connector-toolbar.cpp:234 msgid "Arrange connector network" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:587 +#: ../src/ui/dialog/align-and-distribute.cpp:632 msgid "Exchange Positions" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:621 +#: ../src/ui/dialog/align-and-distribute.cpp:666 msgid "Unclump" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:692 +#: ../src/ui/dialog/align-and-distribute.cpp:737 msgid "Randomize positions" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:793 +#: ../src/ui/dialog/align-and-distribute.cpp:838 msgid "Distribute text baselines" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:861 +#: ../src/ui/dialog/align-and-distribute.cpp:906 msgid "Align text baselines" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:891 +#: ../src/ui/dialog/align-and-distribute.cpp:939 msgid "Rearrange" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:893 -#: ../src/widgets/toolbox.cpp:1781 +#: ../src/ui/dialog/align-and-distribute.cpp:941 +#: ../src/widgets/toolbox.cpp:1788 msgid "Nodes" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:907 +#: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/ui/dialog/align-and-distribute.cpp:956 msgid "Relative to: " msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:908 +#: ../src/ui/dialog/align-and-distribute.cpp:957 msgid "_Treat selection as group: " msgstr "" #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:914 ../src/verbs.cpp:3035 -#: ../src/verbs.cpp:3036 +#: ../src/ui/dialog/align-and-distribute.cpp:963 ../src/verbs.cpp:3036 +#: ../src/verbs.cpp:3037 msgid "Align right edges of objects to the left edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:917 ../src/verbs.cpp:3037 -#: ../src/verbs.cpp:3038 +#: ../src/ui/dialog/align-and-distribute.cpp:966 ../src/verbs.cpp:3038 +#: ../src/verbs.cpp:3039 msgid "Align left edges" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:920 ../src/verbs.cpp:3039 -#: ../src/verbs.cpp:3040 +#: ../src/ui/dialog/align-and-distribute.cpp:969 ../src/verbs.cpp:3040 +#: ../src/verbs.cpp:3041 msgid "Center on vertical axis" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:923 ../src/verbs.cpp:3041 -#: ../src/verbs.cpp:3042 +#: ../src/ui/dialog/align-and-distribute.cpp:972 ../src/verbs.cpp:3042 +#: ../src/verbs.cpp:3043 msgid "Align right sides" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:926 ../src/verbs.cpp:3043 -#: ../src/verbs.cpp:3044 +#: ../src/ui/dialog/align-and-distribute.cpp:975 ../src/verbs.cpp:3044 +#: ../src/verbs.cpp:3045 msgid "Align left edges of objects to the right edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:929 ../src/verbs.cpp:3045 -#: ../src/verbs.cpp:3046 +#: ../src/ui/dialog/align-and-distribute.cpp:978 ../src/verbs.cpp:3046 +#: ../src/verbs.cpp:3047 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:932 ../src/verbs.cpp:3047 -#: ../src/verbs.cpp:3048 +#: ../src/ui/dialog/align-and-distribute.cpp:981 ../src/verbs.cpp:3048 +#: ../src/verbs.cpp:3049 msgid "Align top edges" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:935 ../src/verbs.cpp:3049 -#: ../src/verbs.cpp:3050 +#: ../src/ui/dialog/align-and-distribute.cpp:984 ../src/verbs.cpp:3050 +#: ../src/verbs.cpp:3051 msgid "Center on horizontal axis" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:938 ../src/verbs.cpp:3051 -#: ../src/verbs.cpp:3052 +#: ../src/ui/dialog/align-and-distribute.cpp:987 ../src/verbs.cpp:3052 +#: ../src/verbs.cpp:3053 msgid "Align bottom edges" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:941 ../src/verbs.cpp:3053 -#: ../src/verbs.cpp:3054 +#: ../src/ui/dialog/align-and-distribute.cpp:990 ../src/verbs.cpp:3054 +#: ../src/verbs.cpp:3055 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:946 +#: ../src/ui/dialog/align-and-distribute.cpp:995 msgid "Align baseline anchors of texts horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:949 +#: ../src/ui/dialog/align-and-distribute.cpp:998 msgid "Align baselines of texts" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:954 +#: ../src/ui/dialog/align-and-distribute.cpp:1003 msgid "Make horizontal gaps between objects equal" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:958 +#: ../src/ui/dialog/align-and-distribute.cpp:1007 msgid "Distribute left edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:961 +#: ../src/ui/dialog/align-and-distribute.cpp:1010 msgid "Distribute centers equidistantly horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:964 +#: ../src/ui/dialog/align-and-distribute.cpp:1013 msgid "Distribute right edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:968 +#: ../src/ui/dialog/align-and-distribute.cpp:1017 msgid "Make vertical gaps between objects equal" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:972 +#: ../src/ui/dialog/align-and-distribute.cpp:1021 msgid "Distribute top edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:975 +#: ../src/ui/dialog/align-and-distribute.cpp:1024 msgid "Distribute centers equidistantly vertically" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:978 +#: ../src/ui/dialog/align-and-distribute.cpp:1027 msgid "Distribute bottom edges equidistantly" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:983 +#: ../src/ui/dialog/align-and-distribute.cpp:1032 msgid "Distribute baseline anchors of texts horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:986 +#: ../src/ui/dialog/align-and-distribute.cpp:1035 msgid "Distribute baselines of texts vertically" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:992 +#: ../src/ui/dialog/align-and-distribute.cpp:1041 #: ../src/widgets/connector-toolbar.cpp:367 msgid "Nicely arrange selected connector network" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:995 +#: ../src/ui/dialog/align-and-distribute.cpp:1044 msgid "Exchange positions of selected objects - selection order" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:998 +#: ../src/ui/dialog/align-and-distribute.cpp:1047 msgid "Exchange positions of selected objects - stacking order" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1001 +#: ../src/ui/dialog/align-and-distribute.cpp:1050 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1006 +#: ../src/ui/dialog/align-and-distribute.cpp:1055 msgid "Randomize centers in both dimensions" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1009 +#: ../src/ui/dialog/align-and-distribute.cpp:1058 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1014 +#: ../src/ui/dialog/align-and-distribute.cpp:1063 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1022 +#: ../src/ui/dialog/align-and-distribute.cpp:1071 msgid "Align selected nodes to a common horizontal line" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1025 +#: ../src/ui/dialog/align-and-distribute.cpp:1074 msgid "Align selected nodes to a common vertical line" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1028 +#: ../src/ui/dialog/align-and-distribute.cpp:1077 msgid "Distribute selected nodes horizontally" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1031 +#: ../src/ui/dialog/align-and-distribute.cpp:1080 msgid "Distribute selected nodes vertically" msgstr "" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:1036 +#: ../src/ui/dialog/align-and-distribute.cpp:1085 +#: ../src/ui/dialog/align-and-distribute.cpp:1095 msgid "Last selected" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1037 +#: ../src/ui/dialog/align-and-distribute.cpp:1086 +#: ../src/ui/dialog/align-and-distribute.cpp:1096 msgid "First selected" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1038 +#: ../src/ui/dialog/align-and-distribute.cpp:1087 msgid "Biggest object" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1039 +#: ../src/ui/dialog/align-and-distribute.cpp:1088 msgid "Smallest object" msgstr "" -#: ../src/ui/dialog/align-and-distribute.cpp:1042 +#: ../src/ui/dialog/align-and-distribute.cpp:1091 msgid "Selection Area" msgstr "" +#: ../src/ui/dialog/align-and-distribute.cpp:1097 +msgid "Middle of selection" +msgstr "" + +#: ../src/ui/dialog/align-and-distribute.cpp:1098 +msgid "Min value" +msgstr "" + +#: ../src/ui/dialog/align-and-distribute.cpp:1099 +msgid "Max value" +msgstr "" + #: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 msgid "Edit profile" @@ -14123,49 +14201,49 @@ msgstr "" msgid "How many rows in the tiling" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1082 +#: ../src/ui/dialog/clonetiler.cpp:1086 msgid "How many columns in the tiling" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1127 +#: ../src/ui/dialog/clonetiler.cpp:1131 msgid "Width of the rectangle to be filled" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1160 +#: ../src/ui/dialog/clonetiler.cpp:1168 msgid "Height of the rectangle to be filled" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1177 +#: ../src/ui/dialog/clonetiler.cpp:1185 msgid "Rows, columns: " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1178 +#: ../src/ui/dialog/clonetiler.cpp:1186 msgid "Create the specified number of rows and columns" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1187 +#: ../src/ui/dialog/clonetiler.cpp:1195 msgid "Width, height: " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1188 +#: ../src/ui/dialog/clonetiler.cpp:1196 msgid "Fill the specified width and height with the tiling" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1209 +#: ../src/ui/dialog/clonetiler.cpp:1217 msgid "Use saved size and position of the tile" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1212 +#: ../src/ui/dialog/clonetiler.cpp:1220 msgid "" "Pretend that the size and position of the tile are the same as the last time " "you tiled it (if any), instead of using the current size" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1246 +#: ../src/ui/dialog/clonetiler.cpp:1254 msgid " _Create " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1248 +#: ../src/ui/dialog/clonetiler.cpp:1256 msgid "Create and tile the clones of the selection" msgstr "" @@ -14174,89 +14252,89 @@ msgstr "" #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1268 +#: ../src/ui/dialog/clonetiler.cpp:1276 msgid " _Unclump " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1269 +#: ../src/ui/dialog/clonetiler.cpp:1277 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1275 +#: ../src/ui/dialog/clonetiler.cpp:1283 msgid " Re_move " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1276 +#: ../src/ui/dialog/clonetiler.cpp:1284 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1293 +#: ../src/ui/dialog/clonetiler.cpp:1301 msgid " R_eset " msgstr "" #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1295 +#: ../src/ui/dialog/clonetiler.cpp:1303 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1367 +#: ../src/ui/dialog/clonetiler.cpp:1375 msgid "Nothing selected." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1373 +#: ../src/ui/dialog/clonetiler.cpp:1381 msgid "More than one object selected." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1380 +#: ../src/ui/dialog/clonetiler.cpp:1388 #, c-format msgid "Object has %d tiled clones." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1385 +#: ../src/ui/dialog/clonetiler.cpp:1393 msgid "Object has no tiled clones." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2109 +#: ../src/ui/dialog/clonetiler.cpp:2117 msgid "Select one object whose tiled clones to unclump." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2129 +#: ../src/ui/dialog/clonetiler.cpp:2137 msgid "Unclump tiled clones" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2158 +#: ../src/ui/dialog/clonetiler.cpp:2166 msgid "Select one object whose tiled clones to remove." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2183 +#: ../src/ui/dialog/clonetiler.cpp:2191 msgid "Delete tiled clones" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2236 +#: ../src/ui/dialog/clonetiler.cpp:2244 msgid "" "If you want to clone several objects, group them and clone the " "group." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2245 +#: ../src/ui/dialog/clonetiler.cpp:2253 msgid "Creating tiled clones..." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2661 +#: ../src/ui/dialog/clonetiler.cpp:2669 msgid "Create tiled clones" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2894 +#: ../src/ui/dialog/clonetiler.cpp:2906 msgid "Per row:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2912 +#: ../src/ui/dialog/clonetiler.cpp:2924 msgid "Per column:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2920 +#: ../src/ui/dialog/clonetiler.cpp:2932 msgid "Randomize:" msgstr "" @@ -14561,12 +14639,11 @@ msgstr "" msgid "Remove selected grid." msgstr "" -#: ../src/ui/dialog/document-properties.cpp:162 -#: ../src/widgets/toolbox.cpp:1888 +#: ../src/ui/dialog/document-properties.cpp:162 ../src/widgets/toolbox.cpp:1895 msgid "Guides" msgstr "" -#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2836 +#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2837 msgid "Snap" msgstr "" @@ -14618,7 +14695,7 @@ msgstr "" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3019 +#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "" @@ -14751,15 +14828,15 @@ msgstr "" msgid "Changed default display unit" msgstr "" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2886 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2887 msgid "_Page" msgstr "" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2890 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2891 msgid "_Drawing" msgstr "" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2892 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2893 msgid "_Selection" msgstr "" @@ -14853,9 +14930,9 @@ msgid "_Height:" msgstr "" #: ../src/ui/dialog/export.cpp:304 -#: ../src/ui/dialog/inkscape-preferences.cpp:1497 -#: ../src/ui/dialog/inkscape-preferences.cpp:1501 -#: ../src/ui/dialog/inkscape-preferences.cpp:1525 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "dpi" msgstr "" @@ -14945,14 +15022,14 @@ msgstr "" msgid "Export aborted." msgstr "" -#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1389 -#: ../src/widgets/desktop-widget.cpp:1172 -#: ../src/widgets/desktop-widget.cpp:1234 +#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1401 +#: ../src/widgets/desktop-widget.cpp:1186 +#: ../src/widgets/desktop-widget.cpp:1248 msgid "_Cancel" msgstr "" #: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2433 ../src/widgets/desktop-widget.cpp:1173 +#: ../src/verbs.cpp:2432 ../src/widgets/desktop-widget.cpp:1187 msgid "_Save" msgstr "" @@ -14963,7 +15040,7 @@ msgstr "" #: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 #: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:12 +#: ../share/extensions/color_randomize.inx.h:11 #: ../share/extensions/dots.inx.h:7 #: ../share/extensions/draw_from_triangle.inx.h:35 #: ../share/extensions/dxf_input.inx.h:10 @@ -14996,12 +15073,11 @@ msgstr "" #: ../share/extensions/jessyInk_view.inx.h:7 #: ../share/extensions/layout_nup.inx.h:24 #: ../share/extensions/lindenmayer.inx.h:13 -#: ../share/extensions/lorem_ipsum.inx.h:6 -#: ../share/extensions/measure.inx.h:33 +#: ../share/extensions/lorem_ipsum.inx.h:6 ../share/extensions/measure.inx.h:33 #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 #: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25 -#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:11 +#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:16 #: ../share/extensions/web-set-att.inx.h:25 #: ../share/extensions/web-transmit-att.inx.h:23 #: ../share/extensions/webslicer_create_group.inx.h:11 @@ -15123,7 +15199,7 @@ msgid "Document" msgstr "" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2053 +#: ../src/widgets/desktop-widget.cpp:2074 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "" @@ -15299,99 +15375,99 @@ msgstr "" msgid "_Filter" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1387 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1388 msgid "R_ename" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1521 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1522 msgid "Rename filter" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1573 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1574 msgid "Apply filter" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1653 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1654 msgid "filter" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1660 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1661 msgid "Add filter" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1710 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1711 msgid "Duplicate filter" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1809 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1810 msgid "_Effect" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1819 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1820 msgid "Connections" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1957 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1958 msgid "Remove filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2544 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 msgid "Remove merge node" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2664 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2665 msgid "Reorder filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2744 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 msgid "Add Effect:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 msgid "No effect selected" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2747 msgid "No filter selected" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2791 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2814 msgid "Effect parameters" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2792 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2815 msgid "Filter General Settings" msgstr "" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Coordinates:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "X coordinate of the left corners of filter effects region" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Y coordinate of the upper corners of filter effects region" msgstr "" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Dimensions:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Width of filter effects region" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Height of filter effects region" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "" "Indicates the type of matrix operation. The keyword 'matrix' indicates that " "a full 5x4 matrix of values will be provided. The other keywords represent " @@ -15399,95 +15475,95 @@ msgid "" "performed without specifying a complete matrix." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2858 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "Value(s):" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 msgid "R:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 #: ../src/ui/widget/color-icc-selector.cpp:180 msgid "G:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2864 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 msgid "B:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2890 msgid "A:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "Operator:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 msgid "K1:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "" "If the arithmetic operation is chosen, each result pixel is computed using " "the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " "values of the first and second inputs respectively." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 msgid "K2:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 msgid "K3:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "K4:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "Size:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "width of the convolve matrix" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "height of the convolve matrix" msgstr "" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 #: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" "X coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" "Y coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." msgstr "" #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 msgid "Kernel:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 msgid "" "This matrix describes the convolve operation that is applied to the input " "image in order to calculate the pixel colors at the output. Different " @@ -15497,11 +15573,11 @@ msgid "" "would lead to a common blur effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "Divisor:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "" "After applying the kernelMatrix to the input image to yield a number, that " "number is divided by divisor to yield the final destination color value. A " @@ -15509,189 +15585,189 @@ msgid "" "effect on the overall color intensity of the result." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "Bias:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "" "This value is added to each component. This is useful to define a constant " "value as the zero response of the filter." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "Edge Mode:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "" "Determines how to extend the input image as necessary with color values so " "that the matrix operations can be applied when the kernel is positioned at " "or near the edge of the input image." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "Preserve Alpha" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 msgid "Diffuse Color:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2944 msgid "Defines the color of the light source" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 msgid "Surface Scale:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "Constant:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "This constant affects the Phong lighting model." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2914 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2948 msgid "Kernel Unit Length:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 msgid "This defines the intensity of the displacement effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "X displacement:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Color component that controls the displacement in the X direction" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Y displacement:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Color component that controls the displacement in the Y direction" msgstr "" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "Flood Color:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "The whole filter region will be filled with this color." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "Standard Deviation:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "The standard deviation for the blur operation." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2937 msgid "Source of Image:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "Delta X:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "This is how far the input image gets shifted to the right" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2941 msgid "Delta Y:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2941 msgid "This is how far the input image gets shifted downwards" msgstr "" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2944 msgid "Specular Color:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 #: ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2957 msgid "Base Frequency:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2958 msgid "Octaves:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2959 msgid "Seed:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2959 msgid "The starting number for the pseudo random number generator." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 msgid "Add filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2963 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2986 msgid "" "The feBlend filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2967 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2990 msgid "" "The feColorMatrix filter primitive applies a matrix transformation to " "color of each rendered pixel. This allows for effects like turning object to " "grayscale, modifying color saturation and changing color hue." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2994 msgid "" "The feComponentTransfer filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " @@ -15699,7 +15775,7 @@ msgid "" "adjustment, color balance, and thresholding." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2975 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2998 msgid "" "The feComposite filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -15707,7 +15783,7 @@ msgid "" "between the corresponding pixel values of the images." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2979 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3002 msgid "" "The feConvolveMatrix lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -15716,7 +15792,7 @@ msgid "" "is faster and resolution-independent." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2983 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3006 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -15724,7 +15800,7 @@ msgid "" "opacity areas recede away from the viewer." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2987 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3010 msgid "" "The feDisplacementMap filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -15732,26 +15808,26 @@ msgid "" "effects." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2991 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3014 msgid "" "The feFlood filter primitive fills the region with a given color and " "opacity. It is usually used as an input to other filters to apply color to " "a graphic." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2995 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3018 msgid "" "The feGaussianBlur filter primitive uniformly blurs its input. It is " "commonly used together with feOffset to create a drop shadow effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2999 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3022 msgid "" "The feImage filter primitive fills the region with an external image " "or another part of the document." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3003 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3026 msgid "" "The feMerge filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -15759,21 +15835,21 @@ msgid "" "in 'normal' mode or several feComposite primitives in 'over' mode." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3007 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3030 msgid "" "The feMorphology filter primitive provides erode and dilate effects. " "For single-color objects erode makes the object thinner and dilate makes it " "thicker." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3011 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3034 msgid "" "The feOffset filter primitive offsets the image by an user-defined " "amount. For example, this is useful for drop shadows, where the shadow is in " "a slightly different position than the actual object." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3015 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3038 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives " "create \"embossed\" shadings. The input's alpha channel is used to provide " @@ -15781,24 +15857,24 @@ msgid "" "lower opacity areas recede away from the viewer." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3019 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 msgid "" "The feTile filter primitive tiles a region with an input graphic. The " "source tile is defined by the filter primitive subregion of the input." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3023 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3046 msgid "" "The feTurbulence filter primitive renders Perlin noise. This kind of " "noise is useful in simulating several nature phenomena like clouds, fire and " "smoke and in generating complex textures like marble or granite." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3066 msgid "Duplicate filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3095 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3119 msgid "Set filter primitive attribute" msgstr "" @@ -15982,7 +16058,7 @@ msgstr "" msgid "Search spirals" msgstr "" -#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1789 +#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1796 msgid "Paths" msgstr "" @@ -16862,7 +16938,7 @@ msgstr "" #: ../src/ui/dialog/grid-arrange-tab.cpp:571 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:694 +#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:703 #: ../src/widgets/node-toolbar.cpp:581 msgid "X:" msgstr "" @@ -17337,12 +17413,12 @@ msgstr "" #. Zoom #: ../src/ui/dialog/inkscape-preferences.cpp:394 -#: ../src/widgets/desktop-widget.cpp:659 +#: ../src/widgets/desktop-widget.cpp:668 msgid "Zoom" msgstr "" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2762 +#: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2763 msgctxt "ContextVerb" msgid "Measure" msgstr "" @@ -17397,7 +17473,7 @@ msgid "" msgstr "" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2754 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2755 msgctxt "ContextVerb" msgid "Text" msgstr "" @@ -17915,6 +17991,11 @@ msgstr "" msgid "Set the language for menus and number formats" msgstr "" +#: ../src/ui/dialog/inkscape-preferences.cpp:616 +msgctxt "Icon size" +msgid "Larger" +msgstr "" + #: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Large" @@ -17930,399 +18011,399 @@ msgctxt "Icon size" msgid "Smaller" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:620 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "Toolbox icon size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:621 +#: ../src/ui/dialog/inkscape-preferences.cpp:622 msgid "Set the size for the tool icons (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:624 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "Control bar icon size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:625 +#: ../src/ui/dialog/inkscape-preferences.cpp:626 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:628 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 msgid "Secondary toolbar icon size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:629 +#: ../src/ui/dialog/inkscape-preferences.cpp:630 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:632 +#: ../src/ui/dialog/inkscape-preferences.cpp:633 msgid "Work-around color sliders not drawing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:634 +#: ../src/ui/dialog/inkscape-preferences.cpp:635 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:639 +#: ../src/ui/dialog/inkscape-preferences.cpp:640 msgid "Clear list" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:642 +#: ../src/ui/dialog/inkscape-preferences.cpp:643 msgid "Maximum documents in Open _Recent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:644 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:646 +#: ../src/ui/dialog/inkscape-preferences.cpp:647 msgid "_Zoom correction factor (in %):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:647 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " "display objects in their true sizes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 +#: ../src/ui/dialog/inkscape-preferences.cpp:651 msgid "Enable dynamic relayout for incomplete sections" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:652 +#: ../src/ui/dialog/inkscape-preferences.cpp:653 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" msgstr "" #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:655 +#: ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Show filter primitives infobox (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:657 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:660 -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Icons only" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:660 -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Text only" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:660 -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Icons and text" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:665 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Dockbar style (requires restart):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:666 +#: ../src/ui/dialog/inkscape-preferences.cpp:667 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 +#: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "Switcher style (requires restart):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:674 +#: ../src/ui/dialog/inkscape-preferences.cpp:675 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:678 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Save and restore window geometry for each document" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:679 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "Remember and use last window's geometry" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:680 +#: ../src/ui/dialog/inkscape-preferences.cpp:681 msgid "Don't save window geometry" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:682 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 msgid "Save and restore dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:683 -#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:720 msgid "Don't save dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:685 -#: ../src/ui/dialog/inkscape-preferences.cpp:727 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:728 msgid "Dockable" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 +#: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "Native open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:690 +#: ../src/ui/dialog/inkscape-preferences.cpp:691 msgid "GTK open/save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:692 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Dialogs are hidden in taskbar" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:693 +#: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "Save and restore documents viewport" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:694 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Zoom when window is resized" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:695 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 msgid "Show close button on dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:696 +#: ../src/ui/dialog/inkscape-preferences.cpp:697 msgctxt "Dialog on top" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:698 +#: ../src/ui/dialog/inkscape-preferences.cpp:699 msgid "Aggressive" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 msgctxt "Window size" msgid "Small" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 msgctxt "Window size" msgid "Large" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 msgctxt "Window size" msgid "Maximized" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:706 msgid "Default window size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:706 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 msgid "Set the default window size" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:710 msgid "Saving window geometry (size and position)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:711 +#: ../src/ui/dialog/inkscape-preferences.cpp:712 msgid "Let the window manager determine placement of all windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:713 +#: ../src/ui/dialog/inkscape-preferences.cpp:714 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:715 +#: ../src/ui/dialog/inkscape-preferences.cpp:716 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:718 msgid "Saving dialogs status" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:722 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:725 +#: ../src/ui/dialog/inkscape-preferences.cpp:726 msgid "Dialog behavior (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:731 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "Desktop integration" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:733 +#: ../src/ui/dialog/inkscape-preferences.cpp:734 msgid "Use Windows like open and save dialogs" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:735 +#: ../src/ui/dialog/inkscape-preferences.cpp:736 msgid "Use GTK open and save dialogs " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:740 msgid "Dialogs on top:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:742 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 msgid "Dialogs are treated as regular windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:744 +#: ../src/ui/dialog/inkscape-preferences.cpp:745 msgid "Dialogs stay on top of document windows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:746 +#: ../src/ui/dialog/inkscape-preferences.cpp:747 msgid "Same as Normal but may work better with some window managers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:749 +#: ../src/ui/dialog/inkscape-preferences.cpp:750 msgid "Dialog Transparency" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:751 +#: ../src/ui/dialog/inkscape-preferences.cpp:752 msgid "_Opacity when focused:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:753 +#: ../src/ui/dialog/inkscape-preferences.cpp:754 msgid "Opacity when _unfocused:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:755 +#: ../src/ui/dialog/inkscape-preferences.cpp:756 msgid "_Time of opacity change animation:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:758 +#: ../src/ui/dialog/inkscape-preferences.cpp:759 msgid "Miscellaneous" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:761 +#: ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/ui/dialog/inkscape-preferences.cpp:765 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " "above the right scrollbar)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:766 +#: ../src/ui/dialog/inkscape-preferences.cpp:767 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:768 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Whether dialog windows have a close button (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:769 +#: ../src/ui/dialog/inkscape-preferences.cpp:770 msgid "Windows" msgstr "" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:772 +#: ../src/ui/dialog/inkscape-preferences.cpp:773 msgid "Line color when zooming out" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:775 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 msgid "The gridlines will be shown in minor grid line color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:777 +#: ../src/ui/dialog/inkscape-preferences.cpp:778 msgid "The gridlines will be shown in major grid line color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:779 +#: ../src/ui/dialog/inkscape-preferences.cpp:780 msgid "Default grid settings" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:785 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:811 msgid "Grid units:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Origin X:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:791 -#: ../src/ui/dialog/inkscape-preferences.cpp:816 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Origin Y:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:796 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Spacing X:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:797 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 +#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Spacing Y:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:799 #: ../src/ui/dialog/inkscape-preferences.cpp:800 -#: ../src/ui/dialog/inkscape-preferences.cpp:824 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 #: ../src/ui/dialog/inkscape-preferences.cpp:825 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 msgid "Minor grid line color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:800 -#: ../src/ui/dialog/inkscape-preferences.cpp:825 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 msgid "Color used for normal grid lines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:801 #: ../src/ui/dialog/inkscape-preferences.cpp:802 -#: ../src/ui/dialog/inkscape-preferences.cpp:826 +#: ../src/ui/dialog/inkscape-preferences.cpp:803 #: ../src/ui/dialog/inkscape-preferences.cpp:827 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Major grid line color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:802 -#: ../src/ui/dialog/inkscape-preferences.cpp:827 +#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Color used for major (highlighted) grid lines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:804 -#: ../src/ui/dialog/inkscape-preferences.cpp:829 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:830 msgid "Major grid line every:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "Show dots instead of lines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:806 +#: ../src/ui/dialog/inkscape-preferences.cpp:807 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:887 +#: ../src/ui/dialog/inkscape-preferences.cpp:888 msgid "Input/Output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:890 +#: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "Use current directory for \"Save As ...\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:893 msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " @@ -18330,176 +18411,176 @@ msgid "" "it" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:895 msgid "Add label comments to printing output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:896 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 +#: ../src/ui/dialog/inkscape-preferences.cpp:899 msgid "Add default metadata to new documents" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:900 +#: ../src/ui/dialog/inkscape-preferences.cpp:901 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:904 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "_Grab sensitivity:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:904 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "pixels (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:905 +#: ../src/ui/dialog/inkscape-preferences.cpp:906 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:907 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "_Click/drag threshold:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:907 -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 -#: ../src/ui/dialog/inkscape-preferences.cpp:1263 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 msgid "pixels" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:909 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:911 +#: ../src/ui/dialog/inkscape-preferences.cpp:912 msgid "_Handle size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:912 +#: ../src/ui/dialog/inkscape-preferences.cpp:913 msgid "Set the relative size of node handles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:914 +#: ../src/ui/dialog/inkscape-preferences.cpp:915 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:916 +#: ../src/ui/dialog/inkscape-preferences.cpp:917 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " "mouse)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:918 +#: ../src/ui/dialog/inkscape-preferences.cpp:919 msgid "Switch tool based on tablet device (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:920 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:921 +#: ../src/ui/dialog/inkscape-preferences.cpp:922 msgid "Input devices" msgstr "" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:924 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 msgid "Use named colors" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:925 +#: ../src/ui/dialog/inkscape-preferences.cpp:926 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:927 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 msgid "XML formatting" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:929 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Inline attributes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:931 msgid "Put attributes on the same line as the element tag" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "_Indent, spaces:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:933 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 +#: ../src/ui/dialog/inkscape-preferences.cpp:936 msgid "Path data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Absolute" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Relative" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Optimized" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:942 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Path string format:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:942 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " "relative coordinates)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:944 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 msgid "Force repeat commands" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:945 +#: ../src/ui/dialog/inkscape-preferences.cpp:946 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:947 +#: ../src/ui/dialog/inkscape-preferences.cpp:948 msgid "Numbers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:950 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "_Numeric precision:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:950 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "Significant figures of the values written to the SVG file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:953 +#: ../src/ui/dialog/inkscape-preferences.cpp:954 msgid "Minimum _exponent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:953 +#: ../src/ui/dialog/inkscape-preferences.cpp:954 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -18507,56 +18588,56 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:958 +#: ../src/ui/dialog/inkscape-preferences.cpp:959 msgid "Improper Attributes Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:960 -#: ../src/ui/dialog/inkscape-preferences.cpp:968 -#: ../src/ui/dialog/inkscape-preferences.cpp:976 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 +#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 msgid "Print warnings" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:961 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:962 +#: ../src/ui/dialog/inkscape-preferences.cpp:963 msgid "Remove attributes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:963 +#: ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Delete invalid or non-useful attributes from element tag" msgstr "" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:967 msgid "Inappropriate Style Properties Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:970 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:970 -#: ../src/ui/dialog/inkscape-preferences.cpp:978 +#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:979 msgid "Remove style properties" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:972 msgid "Delete inappropriate style properties" msgstr "" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:975 msgid "Non-useful Style Properties Actions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:977 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " @@ -18564,207 +18645,207 @@ msgid "" "attributes." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:979 +#: ../src/ui/dialog/inkscape-preferences.cpp:980 msgid "Delete redundant style properties" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:981 +#: ../src/ui/dialog/inkscape-preferences.cpp:982 msgid "Check Attributes and Style Properties on" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:983 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "Reading" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:984 +#: ../src/ui/dialog/inkscape-preferences.cpp:985 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:985 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "Editing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:987 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:987 +#: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "Writing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:988 +#: ../src/ui/dialog/inkscape-preferences.cpp:989 msgid "Check attributes and style properties on writing out SVG files" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:990 +#: ../src/ui/dialog/inkscape-preferences.cpp:991 msgid "SVG output" msgstr "" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:996 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Perceptual" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:996 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Relative Colorimetric" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:996 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Absolute Colorimetric" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1000 +#: ../src/ui/dialog/inkscape-preferences.cpp:1001 msgid "(Note: Color management has been disabled in this build)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1004 +#: ../src/ui/dialog/inkscape-preferences.cpp:1005 msgid "Display adjustment" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1014 +#: ../src/ui/dialog/inkscape-preferences.cpp:1015 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" "Searched directories:%s" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1015 +#: ../src/ui/dialog/inkscape-preferences.cpp:1016 msgid "Display profile:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1020 +#: ../src/ui/dialog/inkscape-preferences.cpp:1021 msgid "Retrieve profile from display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 +#: ../src/ui/dialog/inkscape-preferences.cpp:1024 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1025 +#: ../src/ui/dialog/inkscape-preferences.cpp:1026 msgid "Retrieve profiles from those attached to displays" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1030 +#: ../src/ui/dialog/inkscape-preferences.cpp:1031 msgid "Display rendering intent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1031 +#: ../src/ui/dialog/inkscape-preferences.cpp:1032 msgid "The rendering intent to use to calibrate display output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1033 +#: ../src/ui/dialog/inkscape-preferences.cpp:1034 msgid "Proofing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1035 +#: ../src/ui/dialog/inkscape-preferences.cpp:1036 msgid "Simulate output on screen" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1037 +#: ../src/ui/dialog/inkscape-preferences.cpp:1038 msgid "Simulates output of target device" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1039 +#: ../src/ui/dialog/inkscape-preferences.cpp:1040 msgid "Mark out of gamut colors" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1041 +#: ../src/ui/dialog/inkscape-preferences.cpp:1042 msgid "Highlights colors that are out of gamut for the target device" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1054 msgid "Out of gamut warning color:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1054 +#: ../src/ui/dialog/inkscape-preferences.cpp:1055 msgid "Selects the color used for out of gamut warning" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1056 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 msgid "Device profile:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1057 +#: ../src/ui/dialog/inkscape-preferences.cpp:1058 msgid "The ICC profile to use to simulate device output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1060 +#: ../src/ui/dialog/inkscape-preferences.cpp:1061 msgid "Device rendering intent:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1061 +#: ../src/ui/dialog/inkscape-preferences.cpp:1062 msgid "The rendering intent to use to calibrate device output" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1063 +#: ../src/ui/dialog/inkscape-preferences.cpp:1064 msgid "Black point compensation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1065 +#: ../src/ui/dialog/inkscape-preferences.cpp:1066 msgid "Enables black point compensation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1067 +#: ../src/ui/dialog/inkscape-preferences.cpp:1068 msgid "Preserve black" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1074 +#: ../src/ui/dialog/inkscape-preferences.cpp:1075 msgid "(LittleCMS 1.15 or later required)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1076 +#: ../src/ui/dialog/inkscape-preferences.cpp:1077 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1090 -#: ../src/ui/widget/color-icc-selector.cpp:395 -#: ../src/ui/widget/color-icc-selector.cpp:674 +#: ../src/ui/dialog/inkscape-preferences.cpp:1091 +#: ../src/ui/widget/color-icc-selector.cpp:394 +#: ../src/ui/widget/color-icc-selector.cpp:685 msgid "" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1136 msgid "Color management" msgstr "" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1138 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "Enable autosave (requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1140 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1147 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "_Interval (in minutes):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1147 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "Interval (in minutes) at which document will be autosaved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1149 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "_Maximum number of autosaves:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1149 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -18781,508 +18862,508 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1164 +#: ../src/ui/dialog/inkscape-preferences.cpp:1165 msgid "Autosave" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1168 +#: ../src/ui/dialog/inkscape-preferences.cpp:1169 msgid "Open Clip Art Library _Server Name:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 +#: ../src/ui/dialog/inkscape-preferences.cpp:1170 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1171 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "Open Clip Art Library _Username:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1172 +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "The username used to log into Open Clip Art Library" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1174 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "Open Clip Art Library _Password:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "The password used to log into Open Clip Art Library" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1177 msgid "Open Clip Art" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 +#: ../src/ui/dialog/inkscape-preferences.cpp:1182 msgid "Behavior" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "_Simplification threshold:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 +#: ../src/ui/dialog/inkscape-preferences.cpp:1187 msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " "this command several times in quick succession, it will act more and more " "aggressively; invoking it again after a pause restores the default threshold." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1188 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "Color stock markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 msgid "Color custom markers the same color as object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1190 -#: ../src/ui/dialog/inkscape-preferences.cpp:1410 +#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1411 msgid "Update marker color when object color changes" msgstr "" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 msgid "Select in all layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1194 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Select only within current layer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Select in current layer and sublayers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1196 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Ignore hidden objects and layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 msgid "Ignore locked objects and layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1198 +#: ../src/ui/dialog/inkscape-preferences.cpp:1199 msgid "Deselect upon layer change" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1204 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1206 msgid "Make keyboard selection commands work on objects in all layers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1213 +#: ../src/ui/dialog/inkscape-preferences.cpp:1214 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1216 msgid "Wrap when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "Alt+Scroll Wheel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1219 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1221 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 msgid "Selecting" msgstr "" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 -#: ../src/widgets/select-toolbar.cpp:572 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +#: ../src/widgets/select-toolbar.cpp:564 msgid "Scale stroke width" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Scale rounded corners in rectangles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "Transform gradients" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1227 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 msgid "Transform patterns" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1230 msgid "Preserved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1232 -#: ../src/widgets/select-toolbar.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/widgets/select-toolbar.cpp:565 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1234 -#: ../src/widgets/select-toolbar.cpp:584 +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/widgets/select-toolbar.cpp:576 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1236 -#: ../src/widgets/select-toolbar.cpp:595 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/widgets/select-toolbar.cpp:587 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 -#: ../src/widgets/select-toolbar.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/widgets/select-toolbar.cpp:598 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "Store transformation" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +#: ../src/ui/dialog/inkscape-preferences.cpp:1242 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +#: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "Always store transformation as a transform= attribute on objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1245 +#: ../src/ui/dialog/inkscape-preferences.cpp:1246 msgid "Transforms" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 msgid "Mouse _wheel scrolls by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1252 msgid "Ctrl+arrows" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Sc_roll by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1256 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "_Acceleration:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1257 +#: ../src/ui/dialog/inkscape-preferences.cpp:1258 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1259 msgid "Autoscrolling" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1260 +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 msgid "_Speed:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1261 +#: ../src/ui/dialog/inkscape-preferences.cpp:1262 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1263 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 msgid "_Threshold:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1265 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Mouse move pans when Space is pressed" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1267 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1270 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1271 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Scrolling" msgstr "" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 +#: ../src/ui/dialog/inkscape-preferences.cpp:1275 msgid "Snap indicator" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 +#: ../src/ui/dialog/inkscape-preferences.cpp:1277 msgid "Enable snap indicator" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 +#: ../src/ui/dialog/inkscape-preferences.cpp:1279 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "Snap indicator persistence (in seconds):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +#: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "" "Controls how long the snap indicator message will be shown, before it " "disappears" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +#: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "What should snap" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Only snap the node closest to the pointer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1290 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1293 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "_Weight factor:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1295 msgid "" "When multiple snap solutions are found, then Inkscape can either prefer the " "closest transformation (when set to 0), or prefer the node that was " "initially the closest to the pointer (when set to 1)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1296 +#: ../src/ui/dialog/inkscape-preferences.cpp:1297 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1298 +#: ../src/ui/dialog/inkscape-preferences.cpp:1299 msgid "" "When dragging a knot along a constraint line, then snap the position of the " "mouse pointer instead of snapping the projection of the knot onto the " "constraint line" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1300 +#: ../src/ui/dialog/inkscape-preferences.cpp:1301 msgid "Delayed snap" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1303 +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 msgid "Delay (in seconds):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1304 +#: ../src/ui/dialog/inkscape-preferences.cpp:1305 msgid "" "Postpone snapping as long as the mouse is moving, and then wait an " "additional fraction of a second. This additional delay is specified here. " "When set to zero or to a very small number, snapping will be immediate." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1306 +#: ../src/ui/dialog/inkscape-preferences.cpp:1307 msgid "Snapping" msgstr "" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1311 +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgid "_Arrow keys move by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +#: ../src/ui/dialog/inkscape-preferences.cpp:1313 msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" msgstr "" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1315 +#: ../src/ui/dialog/inkscape-preferences.cpp:1316 msgid "> and < _scale by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 +#: ../src/ui/dialog/inkscape-preferences.cpp:1317 msgid "Pressing > or < scales selection up or down by this increment" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "_Inset/Outset by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1319 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 msgid "Inset and Outset commands displace the path by this distance" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1320 +#: ../src/ui/dialog/inkscape-preferences.cpp:1321 msgid "Compass-like display of angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#: ../src/ui/dialog/inkscape-preferences.cpp:1323 msgid "" "When on, angles are displayed with 0 at north, 0 to 360 range, positive " "clockwise; otherwise with 0 at east, -180 to 180 range, positive " "counterclockwise" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1325 msgctxt "Rotation angle" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1328 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "_Rotation snaps every:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1328 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "degrees" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +#: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1330 +#: ../src/ui/dialog/inkscape-preferences.cpp:1331 msgid "Relative snapping of guideline angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1332 +#: ../src/ui/dialog/inkscape-preferences.cpp:1333 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1334 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 msgid "_Zoom in/out by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1334 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 #: ../src/ui/dialog/objects.cpp:1630 #: ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1336 +#: ../src/ui/dialog/inkscape-preferences.cpp:1337 msgid "Steps" msgstr "" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1339 +#: ../src/ui/dialog/inkscape-preferences.cpp:1340 msgid "Move in parallel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1341 +#: ../src/ui/dialog/inkscape-preferences.cpp:1342 msgid "Stay unmoved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1343 +#: ../src/ui/dialog/inkscape-preferences.cpp:1344 msgid "Move according to transform" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1345 +#: ../src/ui/dialog/inkscape-preferences.cpp:1346 msgid "Are unlinked" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 +#: ../src/ui/dialog/inkscape-preferences.cpp:1348 msgid "Are deleted" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1350 +#: ../src/ui/dialog/inkscape-preferences.cpp:1351 msgid "Moving original: clones and linked offsets" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1352 +#: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Clones are translated by the same vector as their original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1354 +#: ../src/ui/dialog/inkscape-preferences.cpp:1355 msgid "Clones preserve their positions when their original is moved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1356 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 msgid "" "Each clone moves according to the value of its transform= attribute; for " "example, a rotated clone will move in a different direction than its original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1357 +#: ../src/ui/dialog/inkscape-preferences.cpp:1358 msgid "Deleting original: clones" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1359 +#: ../src/ui/dialog/inkscape-preferences.cpp:1360 msgid "Orphaned clones are converted to regular objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1361 +#: ../src/ui/dialog/inkscape-preferences.cpp:1362 msgid "Orphaned clones are deleted along with their original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1363 +#: ../src/ui/dialog/inkscape-preferences.cpp:1364 msgid "Duplicating original+clones/linked offset" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 +#: ../src/ui/dialog/inkscape-preferences.cpp:1366 msgid "Relink duplicated clones" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1367 +#: ../src/ui/dialog/inkscape-preferences.cpp:1368 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -19290,127 +19371,127 @@ msgid "" msgstr "" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "Clones" msgstr "" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 +#: ../src/ui/dialog/inkscape-preferences.cpp:1374 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1375 +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1376 +#: ../src/ui/dialog/inkscape-preferences.cpp:1377 msgid "Remove clippath/mask object after applying" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1379 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1381 msgid "Before applying" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1382 +#: ../src/ui/dialog/inkscape-preferences.cpp:1383 msgid "Do not group clipped/masked objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Put every clipped/masked object in its own group" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1384 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 msgid "Put all clipped/masked objects into one group" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1388 msgid "Apply clippath/mask to every object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 +#: ../src/ui/dialog/inkscape-preferences.cpp:1391 msgid "Apply clippath/mask to groups containing single object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1394 msgid "Apply clippath/mask to group containing all objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1395 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "After releasing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1397 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Ungroup automatically created groups" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1399 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Ungroup groups created when setting clip/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1401 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Clippaths and masks" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1404 +#: ../src/ui/dialog/inkscape-preferences.cpp:1405 msgid "Stroke Style Markers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1406 -#: ../src/ui/dialog/inkscape-preferences.cpp:1408 +#: ../src/ui/dialog/inkscape-preferences.cpp:1407 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1412 +#: ../src/ui/dialog/inkscape-preferences.cpp:1413 #: ../share/extensions/hershey.inx.h:27 msgid "Markers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1415 +#: ../src/ui/dialog/inkscape-preferences.cpp:1416 msgid "Document cleanup" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1416 -#: ../src/ui/dialog/inkscape-preferences.cpp:1418 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 msgid "Remove unused swatches when doing a document cleanup" msgstr "" #. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1419 +#: ../src/ui/dialog/inkscape-preferences.cpp:1420 msgid "Cleanup" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Number of _Threads:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 -#: ../src/ui/dialog/inkscape-preferences.cpp:1963 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "(requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1428 +#: ../src/ui/dialog/inkscape-preferences.cpp:1429 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "Rendering _cache size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "" "Set the amount of memory per document which can be used to store rendered " "parts of the drawing for later reuse; set to zero to disable caching" @@ -19418,365 +19499,365 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1435 -#: ../src/ui/dialog/inkscape-preferences.cpp:1459 +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1460 msgid "Best quality (slowest)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1437 -#: ../src/ui/dialog/inkscape-preferences.cpp:1461 +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 +#: ../src/ui/dialog/inkscape-preferences.cpp:1462 msgid "Better quality (slower)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1439 -#: ../src/ui/dialog/inkscape-preferences.cpp:1463 +#: ../src/ui/dialog/inkscape-preferences.cpp:1440 +#: ../src/ui/dialog/inkscape-preferences.cpp:1464 msgid "Average quality" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1441 -#: ../src/ui/dialog/inkscape-preferences.cpp:1465 +#: ../src/ui/dialog/inkscape-preferences.cpp:1442 +#: ../src/ui/dialog/inkscape-preferences.cpp:1466 msgid "Lower quality (faster)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1443 -#: ../src/ui/dialog/inkscape-preferences.cpp:1467 +#: ../src/ui/dialog/inkscape-preferences.cpp:1444 +#: ../src/ui/dialog/inkscape-preferences.cpp:1468 msgid "Lowest quality (fastest)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1446 +#: ../src/ui/dialog/inkscape-preferences.cpp:1447 msgid "Gaussian blur quality for display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1448 -#: ../src/ui/dialog/inkscape-preferences.cpp:1472 +#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1473 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1450 -#: ../src/ui/dialog/inkscape-preferences.cpp:1474 +#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1475 msgid "Better quality, but slower display" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1452 -#: ../src/ui/dialog/inkscape-preferences.cpp:1476 +#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1477 msgid "Average quality, acceptable display speed" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1454 -#: ../src/ui/dialog/inkscape-preferences.cpp:1478 +#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1479 msgid "Lower quality (some artifacts), but display is faster" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1456 -#: ../src/ui/dialog/inkscape-preferences.cpp:1480 +#: ../src/ui/dialog/inkscape-preferences.cpp:1457 +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#: ../src/ui/dialog/inkscape-preferences.cpp:1471 msgid "Filter effects quality for display" msgstr "" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1482 +#: ../src/ui/dialog/inkscape-preferences.cpp:1483 #: ../src/ui/dialog/print.cpp:215 msgid "Rendering" msgstr "" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1488 ../src/verbs.cpp:156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1489 ../src/verbs.cpp:156 #: ../src/widgets/calligraphy-toolbar.cpp:626 msgid "Edit" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 +#: ../src/ui/dialog/inkscape-preferences.cpp:1490 msgid "Automatically reload bitmaps" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 +#: ../src/ui/dialog/inkscape-preferences.cpp:1492 msgid "Automatically reload linked images when file is changed on disk" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1493 +#: ../src/ui/dialog/inkscape-preferences.cpp:1494 msgid "_Bitmap editor:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1495 +#: ../src/ui/dialog/inkscape-preferences.cpp:1496 #: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1497 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 msgid "Default export _resolution:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/ui/dialog/inkscape-preferences.cpp:1499 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1499 +#: ../src/ui/dialog/inkscape-preferences.cpp:1500 #: ../src/ui/dialog/xml-tree.cpp:920 msgid "Create" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1501 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 msgid "Resolution for Create Bitmap _Copy:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1502 +#: ../src/ui/dialog/inkscape-preferences.cpp:1503 msgid "Resolution used by the Create Bitmap Copy command" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1505 +#: ../src/ui/dialog/inkscape-preferences.cpp:1506 msgid "Ask about linking and scaling when importing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1508 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1513 +#: ../src/ui/dialog/inkscape-preferences.cpp:1514 msgid "Bitmap link:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1520 +#: ../src/ui/dialog/inkscape-preferences.cpp:1521 msgid "Bitmap scale (image-rendering):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1525 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "Default _import resolution:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1526 +#: ../src/ui/dialog/inkscape-preferences.cpp:1527 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1527 +#: ../src/ui/dialog/inkscape-preferences.cpp:1528 msgid "Override file resolution" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1529 +#: ../src/ui/dialog/inkscape-preferences.cpp:1530 msgid "Use default bitmap resolution in favor of information from file" msgstr "" #. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1533 +#: ../src/ui/dialog/inkscape-preferences.cpp:1534 msgid "Images in Outline Mode" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1534 +#: ../src/ui/dialog/inkscape-preferences.cpp:1535 msgid "" "When active will render images while in outline mode instead of a red box " "with an x. This is useful for manual tracing." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1536 +#: ../src/ui/dialog/inkscape-preferences.cpp:1537 msgid "Bitmaps" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1548 +#: ../src/ui/dialog/inkscape-preferences.cpp:1549 msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1551 +#: ../src/ui/dialog/inkscape-preferences.cpp:1552 msgid "Shortcut file:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1554 -#: ../src/ui/dialog/template-load-tab.cpp:48 +#: ../src/ui/dialog/inkscape-preferences.cpp:1555 +#: ../src/ui/dialog/template-load-tab.cpp:49 msgid "Search:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1566 +#: ../src/ui/dialog/inkscape-preferences.cpp:1567 msgid "Shortcut" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1567 +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 #: ../src/ui/widget/page-sizer.cpp:287 msgid "Description" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1622 +#: ../src/ui/dialog/inkscape-preferences.cpp:1623 msgid "" "Remove all your customized keyboard shortcuts, and revert to the shortcuts " "in the shortcut file listed above" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1626 +#: ../src/ui/dialog/inkscape-preferences.cpp:1627 msgid "Import ..." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1626 +#: ../src/ui/dialog/inkscape-preferences.cpp:1627 msgid "Import custom keyboard shortcuts from a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1629 +#: ../src/ui/dialog/inkscape-preferences.cpp:1630 msgid "Export ..." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1629 +#: ../src/ui/dialog/inkscape-preferences.cpp:1630 msgid "Export custom keyboard shortcuts to a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1639 +#: ../src/ui/dialog/inkscape-preferences.cpp:1640 msgid "Keyboard Shortcuts" msgstr "" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1802 +#: ../src/ui/dialog/inkscape-preferences.cpp:1803 msgid "Misc" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1904 +#: ../src/ui/dialog/inkscape-preferences.cpp:1905 msgctxt "Spellchecker language" msgid "None" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1925 +#: ../src/ui/dialog/inkscape-preferences.cpp:1926 msgid "Set the main spell check language" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1928 +#: ../src/ui/dialog/inkscape-preferences.cpp:1929 msgid "Second language:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1929 +#: ../src/ui/dialog/inkscape-preferences.cpp:1930 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1932 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "Third language:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1933 +#: ../src/ui/dialog/inkscape-preferences.cpp:1934 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1935 +#: ../src/ui/dialog/inkscape-preferences.cpp:1936 msgid "Ignore words with digits" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1937 +#: ../src/ui/dialog/inkscape-preferences.cpp:1938 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1939 +#: ../src/ui/dialog/inkscape-preferences.cpp:1940 msgid "Ignore words in ALL CAPITALS" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1941 +#: ../src/ui/dialog/inkscape-preferences.cpp:1942 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1943 +#: ../src/ui/dialog/inkscape-preferences.cpp:1944 msgid "Spellcheck" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1963 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "Latency _skew:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1964 +#: ../src/ui/dialog/inkscape-preferences.cpp:1965 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1966 +#: ../src/ui/dialog/inkscape-preferences.cpp:1967 msgid "Pre-render named icons" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1968 +#: ../src/ui/dialog/inkscape-preferences.cpp:1969 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1976 +#: ../src/ui/dialog/inkscape-preferences.cpp:1977 msgid "System info" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1980 +#: ../src/ui/dialog/inkscape-preferences.cpp:1981 msgid "User config: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1980 +#: ../src/ui/dialog/inkscape-preferences.cpp:1981 msgid "Location of users configuration" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1984 +#: ../src/ui/dialog/inkscape-preferences.cpp:1985 msgid "User preferences: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1984 +#: ../src/ui/dialog/inkscape-preferences.cpp:1985 msgid "Location of the users preferences file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1988 +#: ../src/ui/dialog/inkscape-preferences.cpp:1989 msgid "User extensions: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1988 +#: ../src/ui/dialog/inkscape-preferences.cpp:1989 msgid "Location of the users extensions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1992 +#: ../src/ui/dialog/inkscape-preferences.cpp:1993 msgid "User cache: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1992 +#: ../src/ui/dialog/inkscape-preferences.cpp:1993 msgid "Location of users cache" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2000 +#: ../src/ui/dialog/inkscape-preferences.cpp:2001 msgid "Temporary files: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2000 +#: ../src/ui/dialog/inkscape-preferences.cpp:2001 msgid "Location of the temporary files used for autosave" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2004 +#: ../src/ui/dialog/inkscape-preferences.cpp:2005 msgid "Inkscape data: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2004 +#: ../src/ui/dialog/inkscape-preferences.cpp:2005 msgid "Location of Inkscape data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2008 +#: ../src/ui/dialog/inkscape-preferences.cpp:2009 msgid "Inkscape extensions: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2008 +#: ../src/ui/dialog/inkscape-preferences.cpp:2009 msgid "Location of the Inkscape extensions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2017 +#: ../src/ui/dialog/inkscape-preferences.cpp:2018 msgid "System data: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2017 +#: ../src/ui/dialog/inkscape-preferences.cpp:2018 msgid "Locations of system data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2041 +#: ../src/ui/dialog/inkscape-preferences.cpp:2042 msgid "Icon theme: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2041 +#: ../src/ui/dialog/inkscape-preferences.cpp:2042 msgid "Locations of icon themes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:2043 +#: ../src/ui/dialog/inkscape-preferences.cpp:2044 msgid "System" msgstr "" @@ -19872,8 +19953,7 @@ msgstr "" msgid "Y tilt" msgstr "" -#: ../src/ui/dialog/input.cpp:1616 -#: ../src/ui/widget/color-wheel-selector.cpp:29 +#: ../src/ui/dialog/input.cpp:1616 ../src/ui/widget/color-wheel-selector.cpp:29 msgid "Wheel" msgstr "" @@ -19938,7 +20018,7 @@ msgstr "" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:354 #: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2364 +#: ../src/verbs.cpp:2363 msgid "Layer" msgstr "" @@ -19971,29 +20051,29 @@ msgstr "" msgid "Move to Layer" msgstr "" -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:610 msgid "Unhide layer" msgstr "" -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:610 msgid "Hide layer" msgstr "" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:602 msgid "Lock layer" msgstr "" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:602 msgid "Unlock layer" msgstr "" #: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 -#: ../src/verbs.cpp:1424 +#: ../src/verbs.cpp:1423 msgid "Toggle layer solo" msgstr "" #: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 -#: ../src/verbs.cpp:1448 +#: ../src/verbs.cpp:1447 msgid "Lock other layers" msgstr "" @@ -20290,8 +20370,8 @@ msgid "Check to make the object insensitive (not selectable by mouse)" msgstr "" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2712 -#: ../src/verbs.cpp:2718 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2719 msgid "_Set" msgstr "" @@ -20503,7 +20583,7 @@ msgid "Lock All" msgstr "" #. LockAndHide -#: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3010 +#: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3011 msgid "Unlock All" msgstr "" @@ -20526,7 +20606,7 @@ msgid "Unset Clip" msgstr "" #. Set mask -#: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1736 +#: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1754 msgid "Set Mask" msgstr "" @@ -20664,18 +20744,15 @@ msgstr "" msgid "Output" msgstr "" -#: ../src/ui/dialog/pixelartdialog.cpp:297 -#: ../src/ui/dialog/tracedialog.cpp:814 +#: ../src/ui/dialog/pixelartdialog.cpp:297 ../src/ui/dialog/tracedialog.cpp:814 msgid "Reset all settings to defaults" msgstr "" -#: ../src/ui/dialog/pixelartdialog.cpp:302 -#: ../src/ui/dialog/tracedialog.cpp:819 +#: ../src/ui/dialog/pixelartdialog.cpp:302 ../src/ui/dialog/tracedialog.cpp:819 msgid "Abort a trace in progress" msgstr "" -#: ../src/ui/dialog/pixelartdialog.cpp:306 -#: ../src/ui/dialog/tracedialog.cpp:823 +#: ../src/ui/dialog/pixelartdialog.cpp:306 ../src/ui/dialog/tracedialog.cpp:823 msgid "Execute the trace" msgstr "" @@ -21042,8 +21119,7 @@ msgid "Preview Text:" msgstr "" #: ../src/ui/dialog/swatches.cpp:202 ../src/ui/tools/gradient-tool.cpp:360 -#: ../src/ui/tools/gradient-tool.cpp:458 -#: ../src/widgets/gradient-vector.cpp:801 +#: ../src/ui/tools/gradient-tool.cpp:458 ../src/widgets/gradient-vector.cpp:801 msgid "Add gradient stop" msgstr "" @@ -21065,7 +21141,7 @@ msgstr "" msgid "Convert" msgstr "" -#: ../src/ui/dialog/swatches.cpp:542 +#: ../src/ui/dialog/swatches.cpp:543 #, c-format msgid "Palettes directory (%s) is unavailable." msgstr "" @@ -21113,7 +21189,7 @@ msgid "Unnamed Symbols" msgstr "" #: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 -#: ../src/ui/dialog/tags.cpp:683 +#: ../src/ui/dialog/tags.cpp:683 ../src/ui/dialog/tags.cpp:946 msgid "Remove from selection set" msgstr "" @@ -21121,7 +21197,7 @@ msgstr "" msgid "Items" msgstr "" -#: ../src/ui/dialog/tags.cpp:666 +#: ../src/ui/dialog/tags.cpp:666 ../src/ui/dialog/tags.cpp:944 msgid "Add selection to set" msgstr "" @@ -21129,11 +21205,11 @@ msgstr "" msgid "Moved sets" msgstr "" -#: ../src/ui/dialog/tags.cpp:994 +#: ../src/ui/dialog/tags.cpp:1004 msgid "Add a new selection set" msgstr "" -#: ../src/ui/dialog/tags.cpp:1003 +#: ../src/ui/dialog/tags.cpp:1013 msgid "Remove Item/Set" msgstr "" @@ -21145,19 +21221,19 @@ msgstr "" msgid "no template selected" msgstr "" -#: ../src/ui/dialog/template-widget.cpp:123 +#: ../src/ui/dialog/template-widget.cpp:131 msgid "Path: " msgstr "" -#: ../src/ui/dialog/template-widget.cpp:126 +#: ../src/ui/dialog/template-widget.cpp:134 msgid "Description: " msgstr "" -#: ../src/ui/dialog/template-widget.cpp:128 +#: ../src/ui/dialog/template-widget.cpp:136 msgid "Keywords: " msgstr "" -#: ../src/ui/dialog/template-widget.cpp:135 +#: ../src/ui/dialog/template-widget.cpp:143 msgid "By: " msgstr "" @@ -21174,27 +21250,27 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1432 -#: ../src/widgets/text-toolbar.cpp:1433 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1680 +#: ../src/widgets/text-toolbar.cpp:1681 msgid "Align left" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1440 -#: ../src/widgets/text-toolbar.cpp:1441 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1688 +#: ../src/widgets/text-toolbar.cpp:1689 msgid "Align center" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1448 -#: ../src/widgets/text-toolbar.cpp:1449 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1696 +#: ../src/widgets/text-toolbar.cpp:1697 msgid "Align right" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1457 +#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1705 msgid "Justify (only flowed text)" msgstr "" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1492 +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1740 msgid "Horizontal text" msgstr "" @@ -21731,68 +21807,68 @@ msgstr "" msgid "Change attribute" msgstr "" -#: ../src/ui/interface.cpp:751 +#: ../src/ui/interface.cpp:763 msgctxt "Interface setup" msgid "Default" msgstr "" -#: ../src/ui/interface.cpp:751 +#: ../src/ui/interface.cpp:763 msgid "Default interface setup" msgstr "" -#: ../src/ui/interface.cpp:752 +#: ../src/ui/interface.cpp:764 msgctxt "Interface setup" msgid "Custom" msgstr "" -#: ../src/ui/interface.cpp:752 +#: ../src/ui/interface.cpp:764 msgid "Setup for custom task" msgstr "" -#: ../src/ui/interface.cpp:753 +#: ../src/ui/interface.cpp:765 msgctxt "Interface setup" msgid "Wide" msgstr "" -#: ../src/ui/interface.cpp:753 +#: ../src/ui/interface.cpp:765 msgid "Setup for widescreen work" msgstr "" -#: ../src/ui/interface.cpp:863 +#: ../src/ui/interface.cpp:875 #, c-format msgid "Verb \"%s\" Unknown" msgstr "" -#: ../src/ui/interface.cpp:898 +#: ../src/ui/interface.cpp:910 msgid "Open _Recent" msgstr "" -#: ../src/ui/interface.cpp:1006 ../src/ui/interface.cpp:1092 -#: ../src/ui/interface.cpp:1195 ../src/ui/widget/selected-style.cpp:544 +#: ../src/ui/interface.cpp:1018 ../src/ui/interface.cpp:1104 +#: ../src/ui/interface.cpp:1207 ../src/ui/widget/selected-style.cpp:542 msgid "Drop color" msgstr "" -#: ../src/ui/interface.cpp:1045 ../src/ui/interface.cpp:1155 +#: ../src/ui/interface.cpp:1057 ../src/ui/interface.cpp:1167 msgid "Drop color on gradient" msgstr "" -#: ../src/ui/interface.cpp:1208 +#: ../src/ui/interface.cpp:1220 msgid "Could not parse SVG data" msgstr "" -#: ../src/ui/interface.cpp:1247 +#: ../src/ui/interface.cpp:1259 msgid "Drop SVG" msgstr "" -#: ../src/ui/interface.cpp:1260 +#: ../src/ui/interface.cpp:1272 msgid "Drop Symbol" msgstr "" -#: ../src/ui/interface.cpp:1291 +#: ../src/ui/interface.cpp:1303 msgid "Drop bitmap image" msgstr "" -#: ../src/ui/interface.cpp:1383 +#: ../src/ui/interface.cpp:1395 #, c-format msgid "" "A file named \"%s\" already exists. Do " @@ -21801,166 +21877,171 @@ msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" -#: ../src/ui/interface.cpp:1390 ../share/extensions/web-set-att.inx.h:21 +#: ../src/ui/interface.cpp:1402 ../share/extensions/web-set-att.inx.h:21 #: ../share/extensions/web-transmit-att.inx.h:19 msgid "Replace" msgstr "" -#: ../src/ui/interface.cpp:1461 +#: ../src/ui/interface.cpp:1473 msgid "Go to parent" msgstr "" #. TRANSLATORS: #%1 is the id of the group e.g. , not a number. -#: ../src/ui/interface.cpp:1502 +#: ../src/ui/interface.cpp:1514 msgid "Enter group #%1" msgstr "" +#. Pop selection out of group +#: ../src/ui/interface.cpp:1528 +msgid "_Pop selection out of group" +msgstr "" + #. Item dialog -#: ../src/ui/interface.cpp:1638 ../src/verbs.cpp:2939 +#: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 msgid "_Object Properties..." msgstr "" -#: ../src/ui/interface.cpp:1647 +#: ../src/ui/interface.cpp:1665 msgid "_Select This" msgstr "" -#: ../src/ui/interface.cpp:1658 +#: ../src/ui/interface.cpp:1676 msgid "Select Same" msgstr "" #. Select same fill and stroke -#: ../src/ui/interface.cpp:1668 +#: ../src/ui/interface.cpp:1686 msgid "Fill and Stroke" msgstr "" #. Select same fill color -#: ../src/ui/interface.cpp:1675 +#: ../src/ui/interface.cpp:1693 msgid "Fill Color" msgstr "" #. Select same stroke color -#: ../src/ui/interface.cpp:1682 +#: ../src/ui/interface.cpp:1700 msgid "Stroke Color" msgstr "" #. Select same stroke style -#: ../src/ui/interface.cpp:1689 +#: ../src/ui/interface.cpp:1707 msgid "Stroke Style" msgstr "" #. Select same stroke style -#: ../src/ui/interface.cpp:1696 +#: ../src/ui/interface.cpp:1714 msgid "Object type" msgstr "" #. Move to layer -#: ../src/ui/interface.cpp:1703 +#: ../src/ui/interface.cpp:1721 msgid "_Move to layer ..." msgstr "" #. Create link -#: ../src/ui/interface.cpp:1713 +#: ../src/ui/interface.cpp:1731 msgid "Create _Link" msgstr "" #. Release mask -#: ../src/ui/interface.cpp:1747 +#: ../src/ui/interface.cpp:1765 msgid "Release Mask" msgstr "" #. SSet Clip Group -#: ../src/ui/interface.cpp:1758 +#: ../src/ui/interface.cpp:1776 msgid "Create Clip G_roup" msgstr "" #. Set Clip -#: ../src/ui/interface.cpp:1765 +#: ../src/ui/interface.cpp:1783 msgid "Set Cl_ip" msgstr "" #. Release Clip -#: ../src/ui/interface.cpp:1776 +#: ../src/ui/interface.cpp:1794 msgid "Release C_lip" msgstr "" #. Group -#: ../src/ui/interface.cpp:1787 ../src/verbs.cpp:2562 +#: ../src/ui/interface.cpp:1805 ../src/verbs.cpp:2561 msgid "_Group" msgstr "" -#: ../src/ui/interface.cpp:1858 +#: ../src/ui/interface.cpp:1876 msgid "Create link" msgstr "" #. Ungroup -#: ../src/ui/interface.cpp:1893 ../src/verbs.cpp:2564 +#: ../src/ui/interface.cpp:1911 ../src/verbs.cpp:2563 msgid "_Ungroup" msgstr "" #. Link dialog -#: ../src/ui/interface.cpp:1917 +#: ../src/ui/interface.cpp:1941 msgid "Link _Properties..." msgstr "" #. Select item -#: ../src/ui/interface.cpp:1923 +#: ../src/ui/interface.cpp:1947 msgid "_Follow Link" msgstr "" #. Reset transformations -#: ../src/ui/interface.cpp:1929 +#: ../src/ui/interface.cpp:1953 msgid "_Remove Link" msgstr "" -#: ../src/ui/interface.cpp:1960 +#: ../src/ui/interface.cpp:1984 msgid "Remove link" msgstr "" #. Image properties -#: ../src/ui/interface.cpp:1970 +#: ../src/ui/interface.cpp:1994 msgid "Image _Properties..." msgstr "" #. Edit externally -#: ../src/ui/interface.cpp:1976 +#: ../src/ui/interface.cpp:2000 msgid "Edit Externally..." msgstr "" #. Trace Bitmap #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/ui/interface.cpp:1985 ../src/verbs.cpp:2627 +#: ../src/ui/interface.cpp:2009 ../src/verbs.cpp:2628 msgid "_Trace Bitmap..." msgstr "" #. Trace Pixel Art -#: ../src/ui/interface.cpp:1994 +#: ../src/ui/interface.cpp:2018 msgid "Trace Pixel Art" msgstr "" -#: ../src/ui/interface.cpp:2004 +#: ../src/ui/interface.cpp:2028 msgctxt "Context menu" msgid "Embed Image" msgstr "" -#: ../src/ui/interface.cpp:2015 +#: ../src/ui/interface.cpp:2039 msgctxt "Context menu" msgid "Extract Image..." msgstr "" #. Item dialog #. Fill and Stroke dialog -#: ../src/ui/interface.cpp:2159 ../src/ui/interface.cpp:2179 -#: ../src/verbs.cpp:2902 +#: ../src/ui/interface.cpp:2183 ../src/ui/interface.cpp:2203 +#: ../src/verbs.cpp:2903 msgid "_Fill and Stroke..." msgstr "" #. Edit Text dialog -#: ../src/ui/interface.cpp:2185 ../src/verbs.cpp:2921 +#: ../src/ui/interface.cpp:2209 ../src/verbs.cpp:2922 msgid "_Text and Font..." msgstr "" #. Spellcheck dialog -#: ../src/ui/interface.cpp:2191 ../src/verbs.cpp:2929 +#: ../src/ui/interface.cpp:2215 ../src/verbs.cpp:2930 msgid "Check Spellin_g..." msgstr "" @@ -22378,8 +22459,7 @@ msgid "Rotate handle" msgstr "" #. We need to call MPM's method because it could have been our last node -#: ../src/ui/tool/path-manipulator.cpp:1555 -#: ../src/widgets/node-toolbar.cpp:397 +#: ../src/ui/tool/path-manipulator.cpp:1555 ../src/widgets/node-toolbar.cpp:397 msgid "Delete node" msgstr "" @@ -22836,24 +22916,24 @@ msgid "Draw over areas to add to fill, hold Alt for touch fill" msgstr "" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:674 +#: ../src/ui/tools/freehand-base.cpp:677 msgid "Path is closed." msgstr "" #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:689 +#: ../src/ui/tools/freehand-base.cpp:692 msgid "Closing path." msgstr "" -#: ../src/ui/tools/freehand-base.cpp:828 +#: ../src/ui/tools/freehand-base.cpp:831 msgid "Draw path" msgstr "" -#: ../src/ui/tools/freehand-base.cpp:981 +#: ../src/ui/tools/freehand-base.cpp:984 msgid "Creating single dot" msgstr "" -#: ../src/ui/tools/freehand-base.cpp:982 +#: ../src/ui/tools/freehand-base.cpp:985 msgid "Create single dot" msgstr "" @@ -22976,9 +23056,9 @@ msgstr "" msgid "Add global measure line" msgstr "" -#: ../src/ui/tools/measure-tool.cpp:1291 ../src/ui/tools/measure-tool.cpp:1293 +#: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 #, c-format -msgid "Crossing %u" +msgid "Crossing %lu" msgstr "" #. TRANSLATORS: Mind the space in front. This is part of a compound message @@ -23132,56 +23212,56 @@ msgid "" "Shift+Click make a cusp node" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1786 +#: ../src/ui/tools/pen-tool.cpp:1797 #, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1787 +#: ../src/ui/tools/pen-tool.cpp:1798 #, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1790 +#: ../src/ui/tools/pen-tool.cpp:1801 #, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" +"b> make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1791 +#: ../src/ui/tools/pen-tool.cpp:1802 #, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " -"make a cusp node, Enter to finish the path" +"make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1808 +#: ../src/ui/tools/pen-tool.cpp:1819 #, c-format msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " "angle" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1832 +#: ../src/ui/tools/pen-tool.cpp:1843 #, c-format msgid "" "Curve handle, symmetric: angle %3.2f°, length %s; with Ctrl to snap angle, with Shift to move this handle only" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1833 +#: ../src/ui/tools/pen-tool.cpp:1844 #, c-format msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " "angle, with Shift to move this handle only" msgstr "" -#: ../src/ui/tools/pen-tool.cpp:1967 +#: ../src/ui/tools/pen-tool.cpp:1978 msgid "Drawing finished" msgstr "" @@ -23660,48 +23740,49 @@ msgid "Hexadecimal RGBA value of the color" msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:176 -#: ../src/ui/widget/color-scales.cpp:378 +#: ../src/ui/widget/color-scales.cpp:384 msgid "_R:" msgstr "" #. TYPE_RGB_16 #: ../src/ui/widget/color-icc-selector.cpp:177 -#: ../src/ui/widget/color-scales.cpp:381 +#: ../src/ui/widget/color-scales.cpp:387 msgid "_G:" msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:178 -#: ../src/ui/widget/color-scales.cpp:384 +#: ../src/ui/widget/color-scales.cpp:390 msgid "_B:" msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:180 +#: ../share/extensions/nicechart.inx.h:35 msgid "Gray" msgstr "" #. TYPE_GRAY_16 #: ../src/ui/widget/color-icc-selector.cpp:182 #: ../src/ui/widget/color-icc-selector.cpp:186 -#: ../src/ui/widget/color-scales.cpp:404 +#: ../src/ui/widget/color-scales.cpp:410 msgid "_H:" msgstr "" #. TYPE_HSV_16 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 -#: ../src/ui/widget/color-scales.cpp:407 +#: ../src/ui/widget/color-scales.cpp:413 msgid "_S:" msgstr "" #. TYPE_HLS_16 #: ../src/ui/widget/color-icc-selector.cpp:187 -#: ../src/ui/widget/color-scales.cpp:410 +#: ../src/ui/widget/color-scales.cpp:416 msgid "_L:" msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:190 #: ../src/ui/widget/color-icc-selector.cpp:195 -#: ../src/ui/widget/color-scales.cpp:432 +#: ../src/ui/widget/color-scales.cpp:438 msgid "_C:" msgstr "" @@ -23709,18 +23790,18 @@ msgstr "" #. TYPE_CMY_16 #: ../src/ui/widget/color-icc-selector.cpp:191 #: ../src/ui/widget/color-icc-selector.cpp:196 -#: ../src/ui/widget/color-scales.cpp:435 +#: ../src/ui/widget/color-scales.cpp:441 msgid "_M:" msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:192 #: ../src/ui/widget/color-icc-selector.cpp:197 -#: ../src/ui/widget/color-scales.cpp:438 +#: ../src/ui/widget/color-scales.cpp:444 msgid "_Y:" msgstr "" #: ../src/ui/widget/color-icc-selector.cpp:193 -#: ../src/ui/widget/color-scales.cpp:441 +#: ../src/ui/widget/color-scales.cpp:447 msgid "_K:" msgstr "" @@ -23737,18 +23818,18 @@ msgid "Fix RGB fallback to match icc-color() value." msgstr "" #. Label -#: ../src/ui/widget/color-icc-selector.cpp:491 -#: ../src/ui/widget/color-scales.cpp:387 ../src/ui/widget/color-scales.cpp:413 -#: ../src/ui/widget/color-scales.cpp:444 +#: ../src/ui/widget/color-icc-selector.cpp:496 +#: ../src/ui/widget/color-scales.cpp:393 ../src/ui/widget/color-scales.cpp:419 +#: ../src/ui/widget/color-scales.cpp:450 #: ../src/ui/widget/color-wheel-selector.cpp:83 msgid "_A:" msgstr "" -#: ../src/ui/widget/color-icc-selector.cpp:502 #: ../src/ui/widget/color-icc-selector.cpp:513 -#: ../src/ui/widget/color-scales.cpp:388 ../src/ui/widget/color-scales.cpp:389 -#: ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 -#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 +#: ../src/ui/widget/color-icc-selector.cpp:524 +#: ../src/ui/widget/color-scales.cpp:394 ../src/ui/widget/color-scales.cpp:395 +#: ../src/ui/widget/color-scales.cpp:420 ../src/ui/widget/color-scales.cpp:421 +#: ../src/ui/widget/color-scales.cpp:451 ../src/ui/widget/color-scales.cpp:452 #: ../src/ui/widget/color-wheel-selector.cpp:112 #: ../src/ui/widget/color-wheel-selector.cpp:142 msgid "Alpha (opacity)" @@ -23766,7 +23847,7 @@ msgstr "" msgid "Too much ink!" msgstr "" -#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2765 +#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2766 msgid "Pick colors from image" msgstr "" @@ -24063,19 +24144,19 @@ msgstr "" msgid "Feature settings in CSS form. No sanity checking is performed." msgstr "" -#: ../src/ui/widget/layer-selector.cpp:118 +#: ../src/ui/widget/layer-selector.cpp:116 msgid "Toggle current layer visibility" msgstr "" -#: ../src/ui/widget/layer-selector.cpp:139 +#: ../src/ui/widget/layer-selector.cpp:136 msgid "Lock or unlock current layer" msgstr "" -#: ../src/ui/widget/layer-selector.cpp:142 +#: ../src/ui/widget/layer-selector.cpp:139 msgid "Current layer" msgstr "" -#: ../src/ui/widget/layer-selector.cpp:583 +#: ../src/ui/widget/layer-selector.cpp:580 msgid "(root)" msgstr "" @@ -24092,8 +24173,8 @@ msgid "Document license updated" msgstr "" #: ../src/ui/widget/object-composite-settings.cpp:47 -#: ../src/ui/widget/selected-style.cpp:1119 -#: ../src/ui/widget/selected-style.cpp:1120 +#: ../src/ui/widget/selected-style.cpp:1117 +#: ../src/ui/widget/selected-style.cpp:1118 msgid "Opacity (%)" msgstr "" @@ -24102,8 +24183,8 @@ msgid "Change blur" msgstr "" #: ../src/ui/widget/object-composite-settings.cpp:200 -#: ../src/ui/widget/selected-style.cpp:943 -#: ../src/ui/widget/selected-style.cpp:1245 +#: ../src/ui/widget/selected-style.cpp:941 +#: ../src/ui/widget/selected-style.cpp:1243 msgid "Change opacity" msgstr "" @@ -24225,101 +24306,101 @@ msgstr "" msgid "Set 'viewBox'" msgstr "" -#: ../src/ui/widget/panel.cpp:113 +#: ../src/ui/widget/panel.cpp:115 msgid "List" msgstr "" -#: ../src/ui/widget/panel.cpp:136 +#: ../src/ui/widget/panel.cpp:138 msgctxt "Swatches" msgid "Size" msgstr "" -#: ../src/ui/widget/panel.cpp:140 +#: ../src/ui/widget/panel.cpp:142 msgctxt "Swatches height" msgid "Tiny" msgstr "" -#: ../src/ui/widget/panel.cpp:141 +#: ../src/ui/widget/panel.cpp:143 msgctxt "Swatches height" msgid "Small" msgstr "" -#: ../src/ui/widget/panel.cpp:142 +#: ../src/ui/widget/panel.cpp:144 msgctxt "Swatches height" msgid "Medium" msgstr "" -#: ../src/ui/widget/panel.cpp:143 +#: ../src/ui/widget/panel.cpp:145 msgctxt "Swatches height" msgid "Large" msgstr "" -#: ../src/ui/widget/panel.cpp:144 +#: ../src/ui/widget/panel.cpp:146 msgctxt "Swatches height" msgid "Huge" msgstr "" -#: ../src/ui/widget/panel.cpp:166 +#: ../src/ui/widget/panel.cpp:168 msgctxt "Swatches" msgid "Width" msgstr "" -#: ../src/ui/widget/panel.cpp:170 +#: ../src/ui/widget/panel.cpp:172 msgctxt "Swatches width" msgid "Narrower" msgstr "" -#: ../src/ui/widget/panel.cpp:171 +#: ../src/ui/widget/panel.cpp:173 msgctxt "Swatches width" msgid "Narrow" msgstr "" -#: ../src/ui/widget/panel.cpp:172 +#: ../src/ui/widget/panel.cpp:174 msgctxt "Swatches width" msgid "Medium" msgstr "" -#: ../src/ui/widget/panel.cpp:173 +#: ../src/ui/widget/panel.cpp:175 msgctxt "Swatches width" msgid "Wide" msgstr "" -#: ../src/ui/widget/panel.cpp:174 +#: ../src/ui/widget/panel.cpp:176 msgctxt "Swatches width" msgid "Wider" msgstr "" -#: ../src/ui/widget/panel.cpp:204 +#: ../src/ui/widget/panel.cpp:206 msgctxt "Swatches" msgid "Border" msgstr "" -#: ../src/ui/widget/panel.cpp:208 +#: ../src/ui/widget/panel.cpp:210 msgctxt "Swatches border" msgid "None" msgstr "" -#: ../src/ui/widget/panel.cpp:209 +#: ../src/ui/widget/panel.cpp:211 msgctxt "Swatches border" msgid "Solid" msgstr "" -#: ../src/ui/widget/panel.cpp:210 +#: ../src/ui/widget/panel.cpp:212 msgctxt "Swatches border" msgid "Wide" msgstr "" #. TRANSLATORS: "Wrap" indicates how colour swatches are displayed -#: ../src/ui/widget/panel.cpp:241 +#: ../src/ui/widget/panel.cpp:243 msgctxt "Swatches" msgid "Wrap" msgstr "" -#: ../src/ui/widget/preferences-widget.cpp:799 +#: ../src/ui/widget/preferences-widget.cpp:795 msgid "_Browse..." msgstr "" -#: ../src/ui/widget/preferences-widget.cpp:885 +#: ../src/ui/widget/preferences-widget.cpp:881 msgid "Select a bitmap editor" msgstr "" @@ -24377,8 +24458,8 @@ msgid "N/A" msgstr "" #: ../src/ui/widget/selected-style.cpp:181 -#: ../src/ui/widget/selected-style.cpp:1112 -#: ../src/ui/widget/selected-style.cpp:1113 +#: ../src/ui/widget/selected-style.cpp:1110 +#: ../src/ui/widget/selected-style.cpp:1111 #: ../src/widgets/gradient-toolbar.cpp:162 msgid "Nothing selected" msgstr "" @@ -24480,14 +24561,14 @@ msgstr "" #. TRANSLATORS COMMENT: unset is a verb here #: ../src/ui/widget/selected-style.cpp:237 #: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:575 +#: ../src/ui/widget/selected-style.cpp:573 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset fill" msgstr "" #: ../src/ui/widget/selected-style.cpp:237 #: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:591 +#: ../src/ui/widget/selected-style.cpp:589 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset stroke" msgstr "" @@ -24551,13 +24632,13 @@ msgid "Paste color" msgstr "" #: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:868 +#: ../src/ui/widget/selected-style.cpp:866 msgid "Swap fill and stroke" msgstr "" #: ../src/ui/widget/selected-style.cpp:290 -#: ../src/ui/widget/selected-style.cpp:600 -#: ../src/ui/widget/selected-style.cpp:609 +#: ../src/ui/widget/selected-style.cpp:598 +#: ../src/ui/widget/selected-style.cpp:607 msgid "Make fill opaque" msgstr "" @@ -24566,93 +24647,93 @@ msgid "Make stroke opaque" msgstr "" #: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:557 ../src/widgets/fill-style.cpp:503 +#: ../src/ui/widget/selected-style.cpp:555 ../src/widgets/fill-style.cpp:503 msgid "Remove fill" msgstr "" #: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:566 ../src/widgets/fill-style.cpp:503 +#: ../src/ui/widget/selected-style.cpp:564 ../src/widgets/fill-style.cpp:503 msgid "Remove stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:621 +#: ../src/ui/widget/selected-style.cpp:619 msgid "Apply last set color to fill" msgstr "" -#: ../src/ui/widget/selected-style.cpp:633 +#: ../src/ui/widget/selected-style.cpp:631 msgid "Apply last set color to stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:644 +#: ../src/ui/widget/selected-style.cpp:642 msgid "Apply last selected color to fill" msgstr "" -#: ../src/ui/widget/selected-style.cpp:655 +#: ../src/ui/widget/selected-style.cpp:653 msgid "Apply last selected color to stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:681 +#: ../src/ui/widget/selected-style.cpp:679 msgid "Invert fill" msgstr "" -#: ../src/ui/widget/selected-style.cpp:705 +#: ../src/ui/widget/selected-style.cpp:703 msgid "Invert stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:717 +#: ../src/ui/widget/selected-style.cpp:715 msgid "White fill" msgstr "" -#: ../src/ui/widget/selected-style.cpp:729 +#: ../src/ui/widget/selected-style.cpp:727 msgid "White stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:741 +#: ../src/ui/widget/selected-style.cpp:739 msgid "Black fill" msgstr "" -#: ../src/ui/widget/selected-style.cpp:753 +#: ../src/ui/widget/selected-style.cpp:751 msgid "Black stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:796 +#: ../src/ui/widget/selected-style.cpp:794 msgid "Paste fill" msgstr "" -#: ../src/ui/widget/selected-style.cpp:814 +#: ../src/ui/widget/selected-style.cpp:812 msgid "Paste stroke" msgstr "" -#: ../src/ui/widget/selected-style.cpp:970 +#: ../src/ui/widget/selected-style.cpp:968 msgid "Change stroke width" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1073 +#: ../src/ui/widget/selected-style.cpp:1071 msgid ", drag to adjust" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1158 +#: ../src/ui/widget/selected-style.cpp:1156 #, c-format msgid "Stroke width: %.5g%s%s" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1162 +#: ../src/ui/widget/selected-style.cpp:1160 msgid " (averaged)" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1188 +#: ../src/ui/widget/selected-style.cpp:1186 msgid "0 (transparent)" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1212 +#: ../src/ui/widget/selected-style.cpp:1210 msgid "100% (opaque)" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1386 +#: ../src/ui/widget/selected-style.cpp:1384 msgid "Adjust alpha" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1388 +#: ../src/ui/widget/selected-style.cpp:1386 #, c-format msgid "" "Adjusting alpha: was %.3g, now %.3g (diff %.3g); with Ctrlsaturation: was %.3g, now %.3g (diff %.3g); with " @@ -24672,11 +24753,11 @@ msgid "" "modifiers to adjust hue" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1398 +#: ../src/ui/widget/selected-style.cpp:1396 msgid "Adjust lightness" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1400 +#: ../src/ui/widget/selected-style.cpp:1398 #, c-format msgid "" "Adjusting lightness: was %.3g, now %.3g (diff %.3g); with " @@ -24684,11 +24765,11 @@ msgid "" "modifiers to adjust hue" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1404 +#: ../src/ui/widget/selected-style.cpp:1402 msgid "Adjust hue" msgstr "" -#: ../src/ui/widget/selected-style.cpp:1406 +#: ../src/ui/widget/selected-style.cpp:1404 #, c-format msgid "" "Adjusting hue: was %.3g, now %.3g (diff %.3g); with Shiftstroke width: was %.3g, now %.3g (diff %.3g)" msgstr "" @@ -24804,7 +24885,7 @@ msgstr "" msgid "Context" msgstr "" -#: ../src/verbs.cpp:270 ../src/verbs.cpp:2298 +#: ../src/verbs.cpp:270 ../src/verbs.cpp:2297 #: ../share/extensions/jessyInk_view.inx.h:1 #: ../share/extensions/polyhedron_3d.inx.h:26 msgid "View" @@ -24814,2285 +24895,2297 @@ msgstr "" msgid "Dialog" msgstr "" -#: ../src/verbs.cpp:1276 +#: ../src/verbs.cpp:1275 msgid "Switch to next layer" msgstr "" -#: ../src/verbs.cpp:1277 +#: ../src/verbs.cpp:1276 msgid "Switched to next layer." msgstr "" -#: ../src/verbs.cpp:1279 +#: ../src/verbs.cpp:1278 msgid "Cannot go past last layer." msgstr "" -#: ../src/verbs.cpp:1288 +#: ../src/verbs.cpp:1287 msgid "Switch to previous layer" msgstr "" -#: ../src/verbs.cpp:1289 +#: ../src/verbs.cpp:1288 msgid "Switched to previous layer." msgstr "" -#: ../src/verbs.cpp:1291 +#: ../src/verbs.cpp:1290 msgid "Cannot go before first layer." msgstr "" -#: ../src/verbs.cpp:1312 ../src/verbs.cpp:1379 ../src/verbs.cpp:1415 -#: ../src/verbs.cpp:1421 ../src/verbs.cpp:1445 ../src/verbs.cpp:1460 +#: ../src/verbs.cpp:1311 ../src/verbs.cpp:1378 ../src/verbs.cpp:1414 +#: ../src/verbs.cpp:1420 ../src/verbs.cpp:1444 ../src/verbs.cpp:1459 msgid "No current layer." msgstr "" -#: ../src/verbs.cpp:1341 ../src/verbs.cpp:1345 +#: ../src/verbs.cpp:1340 ../src/verbs.cpp:1344 #, c-format msgid "Raised layer %s." msgstr "" -#: ../src/verbs.cpp:1342 +#: ../src/verbs.cpp:1341 msgid "Layer to top" msgstr "" -#: ../src/verbs.cpp:1346 +#: ../src/verbs.cpp:1345 msgid "Raise layer" msgstr "" -#: ../src/verbs.cpp:1349 ../src/verbs.cpp:1353 +#: ../src/verbs.cpp:1348 ../src/verbs.cpp:1352 #, c-format msgid "Lowered layer %s." msgstr "" -#: ../src/verbs.cpp:1350 +#: ../src/verbs.cpp:1349 msgid "Layer to bottom" msgstr "" -#: ../src/verbs.cpp:1354 +#: ../src/verbs.cpp:1353 msgid "Lower layer" msgstr "" -#: ../src/verbs.cpp:1363 +#: ../src/verbs.cpp:1362 msgid "Cannot move layer any further." msgstr "" -#: ../src/verbs.cpp:1374 +#: ../src/verbs.cpp:1373 msgid "Duplicate layer" msgstr "" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1377 +#: ../src/verbs.cpp:1376 msgid "Duplicated layer." msgstr "" -#: ../src/verbs.cpp:1410 +#: ../src/verbs.cpp:1409 msgid "Delete layer" msgstr "" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1413 +#: ../src/verbs.cpp:1412 msgid "Deleted layer." msgstr "" -#: ../src/verbs.cpp:1430 +#: ../src/verbs.cpp:1429 msgid "Show all layers" msgstr "" -#: ../src/verbs.cpp:1435 +#: ../src/verbs.cpp:1434 msgid "Hide all layers" msgstr "" -#: ../src/verbs.cpp:1440 +#: ../src/verbs.cpp:1439 msgid "Lock all layers" msgstr "" -#: ../src/verbs.cpp:1454 +#: ../src/verbs.cpp:1453 msgid "Unlock all layers" msgstr "" -#: ../src/verbs.cpp:1538 +#: ../src/verbs.cpp:1537 msgid "Flip horizontally" msgstr "" -#: ../src/verbs.cpp:1543 +#: ../src/verbs.cpp:1542 msgid "Flip vertically" msgstr "" -#: ../src/verbs.cpp:1591 +#: ../src/verbs.cpp:1590 #, c-format msgid "Set %d" msgstr "" -#: ../src/verbs.cpp:1600 ../src/verbs.cpp:2728 +#: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 msgid "Create new selection set" msgstr "" #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language #. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2176 +#: ../src/verbs.cpp:2175 msgid "tutorial-basic.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2180 +#: ../src/verbs.cpp:2179 msgid "tutorial-shapes.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2184 +#: ../src/verbs.cpp:2183 msgid "tutorial-advanced.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2190 +#: ../src/verbs.cpp:2189 msgid "tutorial-tracing.svg" msgstr "" -#: ../src/verbs.cpp:2195 +#: ../src/verbs.cpp:2194 msgid "tutorial-tracing-pixelart.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2199 +#: ../src/verbs.cpp:2198 msgid "tutorial-calligraphy.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2203 +#: ../src/verbs.cpp:2202 msgid "tutorial-interpolate.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2207 +#: ../src/verbs.cpp:2206 msgid "tutorial-elements.svg" msgstr "" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2211 +#: ../src/verbs.cpp:2210 msgid "tutorial-tips.svg" msgstr "" -#: ../src/verbs.cpp:2397 ../src/verbs.cpp:3011 +#: ../src/verbs.cpp:2396 ../src/verbs.cpp:3012 msgid "Unlock all objects in the current layer" msgstr "" -#: ../src/verbs.cpp:2401 ../src/verbs.cpp:3013 +#: ../src/verbs.cpp:2400 ../src/verbs.cpp:3014 msgid "Unlock all objects in all layers" msgstr "" -#: ../src/verbs.cpp:2405 ../src/verbs.cpp:3015 +#: ../src/verbs.cpp:2404 ../src/verbs.cpp:3016 msgid "Unhide all objects in the current layer" msgstr "" -#: ../src/verbs.cpp:2409 ../src/verbs.cpp:3017 +#: ../src/verbs.cpp:2408 ../src/verbs.cpp:3018 msgid "Unhide all objects in all layers" msgstr "" -#: ../src/verbs.cpp:2424 +#: ../src/verbs.cpp:2423 msgctxt "Verb" msgid "None" msgstr "" -#: ../src/verbs.cpp:2424 +#: ../src/verbs.cpp:2423 msgid "Does nothing" msgstr "" #. File #. Tag -#: ../src/verbs.cpp:2427 ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2426 ../src/verbs.cpp:2728 msgid "_New" msgstr "" -#: ../src/verbs.cpp:2427 +#: ../src/verbs.cpp:2426 msgid "Create new document from the default template" msgstr "" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2428 msgid "_Open..." msgstr "" -#: ../src/verbs.cpp:2430 +#: ../src/verbs.cpp:2429 msgid "Open an existing document" msgstr "" -#: ../src/verbs.cpp:2431 +#: ../src/verbs.cpp:2430 msgid "Re_vert" msgstr "" -#: ../src/verbs.cpp:2432 +#: ../src/verbs.cpp:2431 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "" -#: ../src/verbs.cpp:2433 +#: ../src/verbs.cpp:2432 msgid "Save document" msgstr "" -#: ../src/verbs.cpp:2435 +#: ../src/verbs.cpp:2434 msgid "Save _As..." msgstr "" -#: ../src/verbs.cpp:2436 +#: ../src/verbs.cpp:2435 msgid "Save document under a new name" msgstr "" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2436 msgid "Save a Cop_y..." msgstr "" -#: ../src/verbs.cpp:2438 +#: ../src/verbs.cpp:2437 msgid "Save a copy of the document under a new name" msgstr "" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2438 msgid "_Print..." msgstr "" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2438 msgid "Print document" msgstr "" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2442 +#: ../src/verbs.cpp:2441 msgid "Clean _up document" msgstr "" -#: ../src/verbs.cpp:2442 +#: ../src/verbs.cpp:2441 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" msgstr "" -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2443 msgid "_Import..." msgstr "" -#: ../src/verbs.cpp:2445 +#: ../src/verbs.cpp:2444 msgid "Import a bitmap or SVG image into this document" msgstr "" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2447 +#: ../src/verbs.cpp:2446 msgid "Import Clip Art..." msgstr "" -#: ../src/verbs.cpp:2448 +#: ../src/verbs.cpp:2447 msgid "Import clipart from Open Clip Art Library" msgstr "" #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2449 msgid "N_ext Window" msgstr "" -#: ../src/verbs.cpp:2451 +#: ../src/verbs.cpp:2450 msgid "Switch to the next document window" msgstr "" -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2451 msgid "P_revious Window" msgstr "" -#: ../src/verbs.cpp:2453 +#: ../src/verbs.cpp:2452 msgid "Switch to the previous document window" msgstr "" -#: ../src/verbs.cpp:2454 +#: ../src/verbs.cpp:2453 msgid "_Close" msgstr "" -#: ../src/verbs.cpp:2455 +#: ../src/verbs.cpp:2454 msgid "Close this document window" msgstr "" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2455 msgid "_Quit" msgstr "" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2455 msgid "Quit Inkscape" msgstr "" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2456 msgid "New from _Template..." msgstr "" -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2457 msgid "Create new project from template" msgstr "" -#: ../src/verbs.cpp:2461 +#: ../src/verbs.cpp:2460 msgid "Undo last action" msgstr "" -#: ../src/verbs.cpp:2464 +#: ../src/verbs.cpp:2463 msgid "Do again the last undone action" msgstr "" -#: ../src/verbs.cpp:2465 +#: ../src/verbs.cpp:2464 msgid "Cu_t" msgstr "" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2465 msgid "Cut selection to clipboard" msgstr "" -#: ../src/verbs.cpp:2467 +#: ../src/verbs.cpp:2466 msgid "_Copy" msgstr "" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2467 msgid "Copy selection to clipboard" msgstr "" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2468 msgid "_Paste" msgstr "" -#: ../src/verbs.cpp:2470 +#: ../src/verbs.cpp:2469 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2470 msgid "Paste _Style" msgstr "" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2471 msgid "Apply the style of the copied object to selection" msgstr "" -#: ../src/verbs.cpp:2474 +#: ../src/verbs.cpp:2473 msgid "Scale selection to match the size of the copied object" msgstr "" -#: ../src/verbs.cpp:2475 +#: ../src/verbs.cpp:2474 msgid "Paste _Width" msgstr "" -#: ../src/verbs.cpp:2476 +#: ../src/verbs.cpp:2475 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" -#: ../src/verbs.cpp:2477 +#: ../src/verbs.cpp:2476 msgid "Paste _Height" msgstr "" -#: ../src/verbs.cpp:2478 +#: ../src/verbs.cpp:2477 msgid "Scale selection vertically to match the height of the copied object" msgstr "" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2478 msgid "Paste Size Separately" msgstr "" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2479 msgid "Scale each selected object to match the size of the copied object" msgstr "" -#: ../src/verbs.cpp:2481 +#: ../src/verbs.cpp:2480 msgid "Paste Width Separately" msgstr "" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2481 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" msgstr "" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2482 msgid "Paste Height Separately" msgstr "" -#: ../src/verbs.cpp:2484 +#: ../src/verbs.cpp:2483 msgid "" "Scale each selected object vertically to match the height of the copied " "object" msgstr "" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2484 msgid "Paste _In Place" msgstr "" -#: ../src/verbs.cpp:2486 +#: ../src/verbs.cpp:2485 msgid "Paste objects from clipboard to the original location" msgstr "" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2486 msgid "Paste Path _Effect" msgstr "" -#: ../src/verbs.cpp:2488 +#: ../src/verbs.cpp:2487 msgid "Apply the path effect of the copied object to selection" msgstr "" -#: ../src/verbs.cpp:2489 +#: ../src/verbs.cpp:2488 msgid "Remove Path _Effect" msgstr "" -#: ../src/verbs.cpp:2490 +#: ../src/verbs.cpp:2489 msgid "Remove any path effects from selected objects" msgstr "" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2490 msgid "_Remove Filters" msgstr "" -#: ../src/verbs.cpp:2492 +#: ../src/verbs.cpp:2491 msgid "Remove any filters from selected objects" msgstr "" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2492 msgid "_Delete" msgstr "" -#: ../src/verbs.cpp:2494 +#: ../src/verbs.cpp:2493 msgid "Delete selection" msgstr "" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2494 msgid "Duplic_ate" msgstr "" -#: ../src/verbs.cpp:2496 +#: ../src/verbs.cpp:2495 msgid "Duplicate selected objects" msgstr "" -#: ../src/verbs.cpp:2497 +#: ../src/verbs.cpp:2496 msgid "Create Clo_ne" msgstr "" -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2497 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "" -#: ../src/verbs.cpp:2499 +#: ../src/verbs.cpp:2498 msgid "Unlin_k Clone" msgstr "" -#: ../src/verbs.cpp:2500 +#: ../src/verbs.cpp:2499 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" msgstr "" -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2500 msgid "Relink to Copied" msgstr "" -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2501 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "" -#: ../src/verbs.cpp:2503 +#: ../src/verbs.cpp:2502 msgid "Select _Original" msgstr "" -#: ../src/verbs.cpp:2504 +#: ../src/verbs.cpp:2503 msgid "Select the object to which the selected clone is linked" msgstr "" -#: ../src/verbs.cpp:2505 +#: ../src/verbs.cpp:2504 msgid "Clone original path (LPE)" msgstr "" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2505 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" msgstr "" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2506 msgid "Objects to _Marker" msgstr "" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2507 msgid "Convert selection to a line marker" msgstr "" -#: ../src/verbs.cpp:2509 +#: ../src/verbs.cpp:2508 msgid "Objects to Gu_ides" msgstr "" -#: ../src/verbs.cpp:2510 +#: ../src/verbs.cpp:2509 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" msgstr "" -#: ../src/verbs.cpp:2511 +#: ../src/verbs.cpp:2510 msgid "Objects to Patter_n" msgstr "" -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2511 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2512 msgid "Pattern to _Objects" msgstr "" -#: ../src/verbs.cpp:2514 +#: ../src/verbs.cpp:2513 msgid "Extract objects from a tiled pattern fill" msgstr "" -#: ../src/verbs.cpp:2515 +#: ../src/verbs.cpp:2514 msgid "Group to Symbol" msgstr "" -#: ../src/verbs.cpp:2516 +#: ../src/verbs.cpp:2515 msgid "Convert group to a symbol" msgstr "" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2516 msgid "Symbol to Group" msgstr "" -#: ../src/verbs.cpp:2518 +#: ../src/verbs.cpp:2517 msgid "Extract group from a symbol" msgstr "" -#: ../src/verbs.cpp:2519 +#: ../src/verbs.cpp:2518 msgid "Clea_r All" msgstr "" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2519 msgid "Delete all objects from document" msgstr "" -#: ../src/verbs.cpp:2521 +#: ../src/verbs.cpp:2520 msgid "Select Al_l" msgstr "" -#: ../src/verbs.cpp:2522 +#: ../src/verbs.cpp:2521 msgid "Select all objects or all nodes" msgstr "" -#: ../src/verbs.cpp:2523 +#: ../src/verbs.cpp:2522 msgid "Select All in All La_yers" msgstr "" -#: ../src/verbs.cpp:2524 +#: ../src/verbs.cpp:2523 msgid "Select all objects in all visible and unlocked layers" msgstr "" -#: ../src/verbs.cpp:2525 +#: ../src/verbs.cpp:2524 msgid "Fill _and Stroke" msgstr "" -#: ../src/verbs.cpp:2526 +#: ../src/verbs.cpp:2525 msgid "" "Select all objects with the same fill and stroke as the selected objects" msgstr "" -#: ../src/verbs.cpp:2527 +#: ../src/verbs.cpp:2526 msgid "_Fill Color" msgstr "" -#: ../src/verbs.cpp:2528 +#: ../src/verbs.cpp:2527 msgid "Select all objects with the same fill as the selected objects" msgstr "" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2528 msgid "_Stroke Color" msgstr "" -#: ../src/verbs.cpp:2530 +#: ../src/verbs.cpp:2529 msgid "Select all objects with the same stroke as the selected objects" msgstr "" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2530 msgid "Stroke St_yle" msgstr "" -#: ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2531 msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " "selected objects" msgstr "" -#: ../src/verbs.cpp:2533 +#: ../src/verbs.cpp:2532 msgid "_Object Type" msgstr "" -#: ../src/verbs.cpp:2534 +#: ../src/verbs.cpp:2533 msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " "etc) as the selected objects" msgstr "" -#: ../src/verbs.cpp:2535 +#: ../src/verbs.cpp:2534 msgid "In_vert Selection" msgstr "" -#: ../src/verbs.cpp:2536 +#: ../src/verbs.cpp:2535 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2536 msgid "Invert in All Layers" msgstr "" -#: ../src/verbs.cpp:2538 +#: ../src/verbs.cpp:2537 msgid "Invert selection in all visible and unlocked layers" msgstr "" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2538 msgid "Select Next" msgstr "" -#: ../src/verbs.cpp:2540 +#: ../src/verbs.cpp:2539 msgid "Select next object or node" msgstr "" -#: ../src/verbs.cpp:2541 +#: ../src/verbs.cpp:2540 msgid "Select Previous" msgstr "" -#: ../src/verbs.cpp:2542 +#: ../src/verbs.cpp:2541 msgid "Select previous object or node" msgstr "" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2542 msgid "D_eselect" msgstr "" -#: ../src/verbs.cpp:2544 +#: ../src/verbs.cpp:2543 msgid "Deselect any selected objects or nodes" msgstr "" -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2545 msgid "Delete all the guides in the document" msgstr "" -#: ../src/verbs.cpp:2547 +#: ../src/verbs.cpp:2546 msgid "Lock All Guides" msgstr "" -#: ../src/verbs.cpp:2547 ../src/widgets/desktop-widget.cpp:402 +#: ../src/verbs.cpp:2546 ../src/widgets/desktop-widget.cpp:402 msgid "Toggle lock of all guides in the document" msgstr "" -#: ../src/verbs.cpp:2548 +#: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" msgstr "" -#: ../src/verbs.cpp:2549 +#: ../src/verbs.cpp:2548 msgid "Create four guides aligned with the page borders" msgstr "" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2549 msgid "Next path effect parameter" msgstr "" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2550 msgid "Show next editable path effect parameter" msgstr "" #. Selection -#: ../src/verbs.cpp:2554 +#: ../src/verbs.cpp:2553 msgid "Raise to _Top" msgstr "" -#: ../src/verbs.cpp:2555 +#: ../src/verbs.cpp:2554 msgid "Raise selection to top" msgstr "" -#: ../src/verbs.cpp:2556 +#: ../src/verbs.cpp:2555 msgid "Lower to _Bottom" msgstr "" -#: ../src/verbs.cpp:2557 +#: ../src/verbs.cpp:2556 msgid "Lower selection to bottom" msgstr "" -#: ../src/verbs.cpp:2558 +#: ../src/verbs.cpp:2557 msgid "_Raise" msgstr "" -#: ../src/verbs.cpp:2559 +#: ../src/verbs.cpp:2558 msgid "Raise selection one step" msgstr "" -#: ../src/verbs.cpp:2560 +#: ../src/verbs.cpp:2559 msgid "_Lower" msgstr "" -#: ../src/verbs.cpp:2561 +#: ../src/verbs.cpp:2560 msgid "Lower selection one step" msgstr "" -#: ../src/verbs.cpp:2563 +#: ../src/verbs.cpp:2562 msgid "Group selected objects" msgstr "" -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2564 msgid "Ungroup selected groups" msgstr "" -#: ../src/verbs.cpp:2567 +#: ../src/verbs.cpp:2565 +msgid "_Pop selected objects out of group" +msgstr "" + +#: ../src/verbs.cpp:2566 +msgid "Pop selected objects out of group" +msgstr "" + +#: ../src/verbs.cpp:2568 msgid "_Put on Path" msgstr "" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2570 msgid "_Remove from Path" msgstr "" -#: ../src/verbs.cpp:2571 +#: ../src/verbs.cpp:2572 msgid "Remove Manual _Kerns" msgstr "" #. TRANSLATORS: "glyph": An image used in the visual representation of characters; #. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2574 +#: ../src/verbs.cpp:2575 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "" -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2577 msgid "_Union" msgstr "" -#: ../src/verbs.cpp:2577 +#: ../src/verbs.cpp:2578 msgid "Create union of selected paths" msgstr "" -#: ../src/verbs.cpp:2578 +#: ../src/verbs.cpp:2579 msgid "_Intersection" msgstr "" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2580 msgid "Create intersection of selected paths" msgstr "" -#: ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2581 msgid "_Difference" msgstr "" -#: ../src/verbs.cpp:2581 +#: ../src/verbs.cpp:2582 msgid "Create difference of selected paths (bottom minus top)" msgstr "" -#: ../src/verbs.cpp:2582 +#: ../src/verbs.cpp:2583 msgid "E_xclusion" msgstr "" -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2584 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" msgstr "" -#: ../src/verbs.cpp:2584 +#: ../src/verbs.cpp:2585 msgid "Di_vision" msgstr "" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2586 msgid "Cut the bottom path into pieces" msgstr "" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2588 +#: ../src/verbs.cpp:2589 msgid "Cut _Path" msgstr "" -#: ../src/verbs.cpp:2589 +#: ../src/verbs.cpp:2590 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2593 +#: ../src/verbs.cpp:2594 msgid "Outs_et" msgstr "" -#: ../src/verbs.cpp:2594 +#: ../src/verbs.cpp:2595 msgid "Outset selected paths" msgstr "" -#: ../src/verbs.cpp:2596 +#: ../src/verbs.cpp:2597 msgid "O_utset Path by 1 px" msgstr "" -#: ../src/verbs.cpp:2597 +#: ../src/verbs.cpp:2598 msgid "Outset selected paths by 1 px" msgstr "" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2600 msgid "O_utset Path by 10 px" msgstr "" -#: ../src/verbs.cpp:2600 +#: ../src/verbs.cpp:2601 msgid "Outset selected paths by 10 px" msgstr "" #. TRANSLATORS: "inset": contract a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2604 +#: ../src/verbs.cpp:2605 msgid "I_nset" msgstr "" -#: ../src/verbs.cpp:2605 +#: ../src/verbs.cpp:2606 msgid "Inset selected paths" msgstr "" -#: ../src/verbs.cpp:2607 +#: ../src/verbs.cpp:2608 msgid "I_nset Path by 1 px" msgstr "" -#: ../src/verbs.cpp:2608 +#: ../src/verbs.cpp:2609 msgid "Inset selected paths by 1 px" msgstr "" -#: ../src/verbs.cpp:2610 +#: ../src/verbs.cpp:2611 msgid "I_nset Path by 10 px" msgstr "" -#: ../src/verbs.cpp:2611 +#: ../src/verbs.cpp:2612 msgid "Inset selected paths by 10 px" msgstr "" -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2614 msgid "D_ynamic Offset" msgstr "" -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2614 msgid "Create a dynamic offset object" msgstr "" -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2616 msgid "_Linked Offset" msgstr "" -#: ../src/verbs.cpp:2616 +#: ../src/verbs.cpp:2617 msgid "Create a dynamic offset object linked to the original path" msgstr "" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2619 msgid "_Stroke to Path" msgstr "" -#: ../src/verbs.cpp:2619 +#: ../src/verbs.cpp:2620 msgid "Convert selected object's stroke to paths" msgstr "" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2621 msgid "Si_mplify" msgstr "" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2622 msgid "Simplify selected paths (remove extra nodes)" msgstr "" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2623 msgid "_Reverse" msgstr "" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2624 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" -#: ../src/verbs.cpp:2628 +#: ../src/verbs.cpp:2629 msgid "Create one or more paths from a bitmap by tracing it" msgstr "" -#: ../src/verbs.cpp:2631 +#: ../src/verbs.cpp:2632 msgid "Trace Pixel Art..." msgstr "" -#: ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2633 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" msgstr "" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2634 msgid "Make a _Bitmap Copy" msgstr "" -#: ../src/verbs.cpp:2634 +#: ../src/verbs.cpp:2635 msgid "Export selection to a bitmap and insert it into document" msgstr "" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2636 msgid "_Combine" msgstr "" -#: ../src/verbs.cpp:2636 +#: ../src/verbs.cpp:2637 msgid "Combine several paths into one" msgstr "" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2640 msgid "Break _Apart" msgstr "" -#: ../src/verbs.cpp:2640 +#: ../src/verbs.cpp:2641 msgid "Break selected paths into subpaths" msgstr "" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2642 msgid "_Arrange..." msgstr "" -#: ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2643 msgid "Arrange selected objects in a table or circle" msgstr "" #. Layer -#: ../src/verbs.cpp:2644 +#: ../src/verbs.cpp:2645 msgid "_Add Layer..." msgstr "" -#: ../src/verbs.cpp:2645 +#: ../src/verbs.cpp:2646 msgid "Create a new layer" msgstr "" -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2647 msgid "Re_name Layer..." msgstr "" -#: ../src/verbs.cpp:2647 +#: ../src/verbs.cpp:2648 msgid "Rename the current layer" msgstr "" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2649 msgid "Switch to Layer Abov_e" msgstr "" -#: ../src/verbs.cpp:2649 +#: ../src/verbs.cpp:2650 msgid "Switch to the layer above the current" msgstr "" -#: ../src/verbs.cpp:2650 +#: ../src/verbs.cpp:2651 msgid "Switch to Layer Belo_w" msgstr "" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2652 msgid "Switch to the layer below the current" msgstr "" -#: ../src/verbs.cpp:2652 +#: ../src/verbs.cpp:2653 msgid "Move Selection to Layer Abo_ve" msgstr "" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2654 msgid "Move selection to the layer above the current" msgstr "" -#: ../src/verbs.cpp:2654 +#: ../src/verbs.cpp:2655 msgid "Move Selection to Layer Bel_ow" msgstr "" -#: ../src/verbs.cpp:2655 +#: ../src/verbs.cpp:2656 msgid "Move selection to the layer below the current" msgstr "" -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2657 msgid "Move Selection to Layer..." msgstr "" -#: ../src/verbs.cpp:2658 +#: ../src/verbs.cpp:2659 msgid "Layer to _Top" msgstr "" -#: ../src/verbs.cpp:2659 +#: ../src/verbs.cpp:2660 msgid "Raise the current layer to the top" msgstr "" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2661 msgid "Layer to _Bottom" msgstr "" -#: ../src/verbs.cpp:2661 +#: ../src/verbs.cpp:2662 msgid "Lower the current layer to the bottom" msgstr "" -#: ../src/verbs.cpp:2662 +#: ../src/verbs.cpp:2663 msgid "_Raise Layer" msgstr "" -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2664 msgid "Raise the current layer" msgstr "" -#: ../src/verbs.cpp:2664 +#: ../src/verbs.cpp:2665 msgid "_Lower Layer" msgstr "" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2666 msgid "Lower the current layer" msgstr "" -#: ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2667 msgid "D_uplicate Current Layer" msgstr "" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2668 msgid "Duplicate an existing layer" msgstr "" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2669 msgid "_Delete Current Layer" msgstr "" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2670 msgid "Delete the current layer" msgstr "" -#: ../src/verbs.cpp:2670 +#: ../src/verbs.cpp:2671 msgid "_Show/hide other layers" msgstr "" -#: ../src/verbs.cpp:2671 +#: ../src/verbs.cpp:2672 msgid "Solo the current layer" msgstr "" -#: ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2673 msgid "_Show all layers" msgstr "" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2674 msgid "Show all the layers" msgstr "" -#: ../src/verbs.cpp:2674 +#: ../src/verbs.cpp:2675 msgid "_Hide all layers" msgstr "" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2676 msgid "Hide all the layers" msgstr "" -#: ../src/verbs.cpp:2676 +#: ../src/verbs.cpp:2677 msgid "_Lock all layers" msgstr "" -#: ../src/verbs.cpp:2677 +#: ../src/verbs.cpp:2678 msgid "Lock all the layers" msgstr "" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2679 msgid "Lock/Unlock _other layers" msgstr "" -#: ../src/verbs.cpp:2679 +#: ../src/verbs.cpp:2680 msgid "Lock all the other layers" msgstr "" -#: ../src/verbs.cpp:2680 +#: ../src/verbs.cpp:2681 msgid "_Unlock all layers" msgstr "" -#: ../src/verbs.cpp:2681 +#: ../src/verbs.cpp:2682 msgid "Unlock all the layers" msgstr "" -#: ../src/verbs.cpp:2682 +#: ../src/verbs.cpp:2683 msgid "_Lock/Unlock Current Layer" msgstr "" -#: ../src/verbs.cpp:2683 +#: ../src/verbs.cpp:2684 msgid "Toggle lock on current layer" msgstr "" -#: ../src/verbs.cpp:2684 +#: ../src/verbs.cpp:2685 msgid "_Show/hide Current Layer" msgstr "" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2686 msgid "Toggle visibility of current layer" msgstr "" #. Object -#: ../src/verbs.cpp:2688 +#: ../src/verbs.cpp:2689 msgid "Rotate _90° CW" msgstr "" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2692 msgid "Rotate selection 90° clockwise" msgstr "" -#: ../src/verbs.cpp:2692 +#: ../src/verbs.cpp:2693 msgid "Rotate 9_0° CCW" msgstr "" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2696 msgid "Rotate selection 90° counter-clockwise" msgstr "" -#: ../src/verbs.cpp:2696 +#: ../src/verbs.cpp:2697 msgid "Remove _Transformations" msgstr "" -#: ../src/verbs.cpp:2697 +#: ../src/verbs.cpp:2698 msgid "Remove transformations from object" msgstr "" -#: ../src/verbs.cpp:2698 +#: ../src/verbs.cpp:2699 msgid "_Object to Path" msgstr "" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2700 msgid "Convert selected object to path" msgstr "" -#: ../src/verbs.cpp:2700 +#: ../src/verbs.cpp:2701 msgid "_Flow into Frame" msgstr "" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2702 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" msgstr "" -#: ../src/verbs.cpp:2702 +#: ../src/verbs.cpp:2703 msgid "_Unflow" msgstr "" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2704 msgid "Remove text from frame (creates a single-line text object)" msgstr "" -#: ../src/verbs.cpp:2704 +#: ../src/verbs.cpp:2705 msgid "_Convert to Text" msgstr "" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2706 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2708 msgid "Flip _Horizontal" msgstr "" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2708 msgid "Flip selected objects horizontally" msgstr "" -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2711 msgid "Flip _Vertical" msgstr "" -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2711 msgid "Flip selected objects vertically" msgstr "" -#: ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2714 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2716 msgid "Edit mask" msgstr "" -#: ../src/verbs.cpp:2716 ../src/verbs.cpp:2724 +#: ../src/verbs.cpp:2717 ../src/verbs.cpp:2725 msgid "_Release" msgstr "" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2718 msgid "Remove mask from selection" msgstr "" -#: ../src/verbs.cpp:2719 +#: ../src/verbs.cpp:2720 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" msgstr "" -#: ../src/verbs.cpp:2720 +#: ../src/verbs.cpp:2721 msgid "Create Cl_ip Group" msgstr "" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2722 msgid "Creates a clip group using the selected objects as a base" msgstr "" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2724 msgid "Edit clipping path" msgstr "" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2726 msgid "Remove clipping path from selection" msgstr "" #. Tools -#: ../src/verbs.cpp:2730 +#: ../src/verbs.cpp:2731 msgctxt "ContextVerb" msgid "Select" msgstr "" -#: ../src/verbs.cpp:2731 +#: ../src/verbs.cpp:2732 msgid "Select and transform objects" msgstr "" -#: ../src/verbs.cpp:2732 +#: ../src/verbs.cpp:2733 msgctxt "ContextVerb" msgid "Node Edit" msgstr "" -#: ../src/verbs.cpp:2733 +#: ../src/verbs.cpp:2734 msgid "Edit paths by nodes" msgstr "" -#: ../src/verbs.cpp:2734 +#: ../src/verbs.cpp:2735 msgctxt "ContextVerb" msgid "Tweak" msgstr "" -#: ../src/verbs.cpp:2735 +#: ../src/verbs.cpp:2736 msgid "Tweak objects by sculpting or painting" msgstr "" -#: ../src/verbs.cpp:2736 +#: ../src/verbs.cpp:2737 msgctxt "ContextVerb" msgid "Spray" msgstr "" -#: ../src/verbs.cpp:2737 +#: ../src/verbs.cpp:2738 msgid "Spray objects by sculpting or painting" msgstr "" -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2739 msgctxt "ContextVerb" msgid "Rectangle" msgstr "" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2740 msgid "Create rectangles and squares" msgstr "" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2741 msgctxt "ContextVerb" msgid "3D Box" msgstr "" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2742 msgid "Create 3D boxes" msgstr "" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2743 msgctxt "ContextVerb" msgid "Ellipse" msgstr "" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2744 msgid "Create circles, ellipses, and arcs" msgstr "" -#: ../src/verbs.cpp:2744 +#: ../src/verbs.cpp:2745 msgctxt "ContextVerb" msgid "Star" msgstr "" -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2746 msgid "Create stars and polygons" msgstr "" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2747 msgctxt "ContextVerb" msgid "Spiral" msgstr "" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2748 msgid "Create spirals" msgstr "" -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2749 msgctxt "ContextVerb" msgid "Pencil" msgstr "" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2750 msgid "Draw freehand lines" msgstr "" -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2751 msgctxt "ContextVerb" msgid "Pen" msgstr "" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2752 msgid "Draw Bezier curves and straight lines" msgstr "" -#: ../src/verbs.cpp:2752 +#: ../src/verbs.cpp:2753 msgctxt "ContextVerb" msgid "Calligraphy" msgstr "" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2754 msgid "Draw calligraphic or brush strokes" msgstr "" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2756 msgid "Create and edit text objects" msgstr "" -#: ../src/verbs.cpp:2756 +#: ../src/verbs.cpp:2757 msgctxt "ContextVerb" msgid "Gradient" msgstr "" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2758 msgid "Create and edit gradients" msgstr "" -#: ../src/verbs.cpp:2758 +#: ../src/verbs.cpp:2759 msgctxt "ContextVerb" msgid "Mesh" msgstr "" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2760 msgid "Create and edit meshes" msgstr "" -#: ../src/verbs.cpp:2760 +#: ../src/verbs.cpp:2761 msgctxt "ContextVerb" msgid "Zoom" msgstr "" -#: ../src/verbs.cpp:2761 +#: ../src/verbs.cpp:2762 msgid "Zoom in or out" msgstr "" -#: ../src/verbs.cpp:2763 +#: ../src/verbs.cpp:2764 msgid "Measurement tool" msgstr "" -#: ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2765 msgctxt "ContextVerb" msgid "Dropper" msgstr "" -#: ../src/verbs.cpp:2766 +#: ../src/verbs.cpp:2767 msgctxt "ContextVerb" msgid "Connector" msgstr "" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2768 msgid "Create diagram connectors" msgstr "" -#: ../src/verbs.cpp:2770 +#: ../src/verbs.cpp:2771 msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "" -#: ../src/verbs.cpp:2771 +#: ../src/verbs.cpp:2772 msgid "Fill bounded areas" msgstr "" -#: ../src/verbs.cpp:2774 +#: ../src/verbs.cpp:2775 msgctxt "ContextVerb" msgid "LPE Edit" msgstr "" -#: ../src/verbs.cpp:2775 +#: ../src/verbs.cpp:2776 msgid "Edit Path Effect parameters" msgstr "" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2777 msgctxt "ContextVerb" msgid "Eraser" msgstr "" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2778 msgid "Erase existing paths" msgstr "" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2779 msgctxt "ContextVerb" msgid "LPE Tool" msgstr "" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2780 msgid "Do geometric constructions" msgstr "" #. Tool prefs -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2782 msgid "Selector Preferences" msgstr "" -#: ../src/verbs.cpp:2782 +#: ../src/verbs.cpp:2783 msgid "Open Preferences for the Selector tool" msgstr "" -#: ../src/verbs.cpp:2783 +#: ../src/verbs.cpp:2784 msgid "Node Tool Preferences" msgstr "" -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2785 msgid "Open Preferences for the Node tool" msgstr "" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2786 msgid "Tweak Tool Preferences" msgstr "" -#: ../src/verbs.cpp:2786 +#: ../src/verbs.cpp:2787 msgid "Open Preferences for the Tweak tool" msgstr "" -#: ../src/verbs.cpp:2787 +#: ../src/verbs.cpp:2788 msgid "Spray Tool Preferences" msgstr "" -#: ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2789 msgid "Open Preferences for the Spray tool" msgstr "" -#: ../src/verbs.cpp:2789 +#: ../src/verbs.cpp:2790 msgid "Rectangle Preferences" msgstr "" -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2791 msgid "Open Preferences for the Rectangle tool" msgstr "" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2792 msgid "3D Box Preferences" msgstr "" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2793 msgid "Open Preferences for the 3D Box tool" msgstr "" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2794 msgid "Ellipse Preferences" msgstr "" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2795 msgid "Open Preferences for the Ellipse tool" msgstr "" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2796 msgid "Star Preferences" msgstr "" -#: ../src/verbs.cpp:2796 +#: ../src/verbs.cpp:2797 msgid "Open Preferences for the Star tool" msgstr "" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2798 msgid "Spiral Preferences" msgstr "" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2799 msgid "Open Preferences for the Spiral tool" msgstr "" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2800 msgid "Pencil Preferences" msgstr "" -#: ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2801 msgid "Open Preferences for the Pencil tool" msgstr "" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2802 msgid "Pen Preferences" msgstr "" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2803 msgid "Open Preferences for the Pen tool" msgstr "" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2804 msgid "Calligraphic Preferences" msgstr "" -#: ../src/verbs.cpp:2804 +#: ../src/verbs.cpp:2805 msgid "Open Preferences for the Calligraphy tool" msgstr "" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2806 msgid "Text Preferences" msgstr "" -#: ../src/verbs.cpp:2806 +#: ../src/verbs.cpp:2807 msgid "Open Preferences for the Text tool" msgstr "" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2808 msgid "Gradient Preferences" msgstr "" -#: ../src/verbs.cpp:2808 +#: ../src/verbs.cpp:2809 msgid "Open Preferences for the Gradient tool" msgstr "" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2810 msgid "Mesh Preferences" msgstr "" -#: ../src/verbs.cpp:2810 +#: ../src/verbs.cpp:2811 msgid "Open Preferences for the Mesh tool" msgstr "" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2812 msgid "Zoom Preferences" msgstr "" -#: ../src/verbs.cpp:2812 +#: ../src/verbs.cpp:2813 msgid "Open Preferences for the Zoom tool" msgstr "" -#: ../src/verbs.cpp:2813 +#: ../src/verbs.cpp:2814 msgid "Measure Preferences" msgstr "" -#: ../src/verbs.cpp:2814 +#: ../src/verbs.cpp:2815 msgid "Open Preferences for the Measure tool" msgstr "" -#: ../src/verbs.cpp:2815 +#: ../src/verbs.cpp:2816 msgid "Dropper Preferences" msgstr "" -#: ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2817 msgid "Open Preferences for the Dropper tool" msgstr "" -#: ../src/verbs.cpp:2817 +#: ../src/verbs.cpp:2818 msgid "Connector Preferences" msgstr "" -#: ../src/verbs.cpp:2818 +#: ../src/verbs.cpp:2819 msgid "Open Preferences for the Connector tool" msgstr "" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2822 msgid "Paint Bucket Preferences" msgstr "" -#: ../src/verbs.cpp:2822 +#: ../src/verbs.cpp:2823 msgid "Open Preferences for the Paint Bucket tool" msgstr "" -#: ../src/verbs.cpp:2825 +#: ../src/verbs.cpp:2826 msgid "Eraser Preferences" msgstr "" -#: ../src/verbs.cpp:2826 +#: ../src/verbs.cpp:2827 msgid "Open Preferences for the Eraser tool" msgstr "" -#: ../src/verbs.cpp:2827 +#: ../src/verbs.cpp:2828 msgid "LPE Tool Preferences" msgstr "" -#: ../src/verbs.cpp:2828 +#: ../src/verbs.cpp:2829 msgid "Open Preferences for the LPETool tool" msgstr "" #. Zoom/View -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2831 msgid "Zoom In" msgstr "" -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2831 msgid "Zoom in" msgstr "" -#: ../src/verbs.cpp:2831 +#: ../src/verbs.cpp:2832 msgid "Zoom Out" msgstr "" -#: ../src/verbs.cpp:2831 +#: ../src/verbs.cpp:2832 msgid "Zoom out" msgstr "" -#: ../src/verbs.cpp:2832 +#: ../src/verbs.cpp:2833 msgid "_Rulers" msgstr "" -#: ../src/verbs.cpp:2832 +#: ../src/verbs.cpp:2833 msgid "Show or hide the canvas rulers" msgstr "" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2834 msgid "Scroll_bars" msgstr "" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2834 msgid "Show or hide the canvas scrollbars" msgstr "" -#: ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2835 msgid "Page _Grid" msgstr "" -#: ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2835 msgid "Show or hide the page grid" msgstr "" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2836 msgid "G_uides" msgstr "" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2836 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2837 msgid "Enable snapping" msgstr "" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2838 msgid "_Commands Bar" msgstr "" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2838 msgid "Show or hide the Commands bar (under the menu)" msgstr "" -#: ../src/verbs.cpp:2838 +#: ../src/verbs.cpp:2839 msgid "Sn_ap Controls Bar" msgstr "" -#: ../src/verbs.cpp:2838 +#: ../src/verbs.cpp:2839 msgid "Show or hide the snapping controls" msgstr "" -#: ../src/verbs.cpp:2839 +#: ../src/verbs.cpp:2840 msgid "T_ool Controls Bar" msgstr "" -#: ../src/verbs.cpp:2839 +#: ../src/verbs.cpp:2840 msgid "Show or hide the Tool Controls bar" msgstr "" -#: ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2841 msgid "_Toolbox" msgstr "" -#: ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2841 msgid "Show or hide the main toolbox (on the left)" msgstr "" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2842 msgid "_Palette" msgstr "" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2842 msgid "Show or hide the color palette" msgstr "" -#: ../src/verbs.cpp:2842 +#: ../src/verbs.cpp:2843 msgid "_Statusbar" msgstr "" -#: ../src/verbs.cpp:2842 +#: ../src/verbs.cpp:2843 msgid "Show or hide the statusbar (at the bottom of the window)" msgstr "" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2844 msgid "Nex_t Zoom" msgstr "" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2844 msgid "Next zoom (from the history of zooms)" msgstr "" -#: ../src/verbs.cpp:2845 +#: ../src/verbs.cpp:2846 msgid "Pre_vious Zoom" msgstr "" -#: ../src/verbs.cpp:2845 +#: ../src/verbs.cpp:2846 msgid "Previous zoom (from the history of zooms)" msgstr "" -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2848 msgid "Zoom 1:_1" msgstr "" -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2848 msgid "Zoom to 1:1" msgstr "" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2850 msgid "Zoom 1:_2" msgstr "" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2850 msgid "Zoom to 1:2" msgstr "" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2852 msgid "_Zoom 2:1" msgstr "" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2852 msgid "Zoom to 2:1" msgstr "" -#: ../src/verbs.cpp:2853 +#: ../src/verbs.cpp:2854 msgid "_Fullscreen" msgstr "" -#: ../src/verbs.cpp:2853 ../src/verbs.cpp:2855 +#: ../src/verbs.cpp:2854 ../src/verbs.cpp:2856 msgid "Stretch this document window to full screen" msgstr "" -#: ../src/verbs.cpp:2855 +#: ../src/verbs.cpp:2856 msgid "Fullscreen & Focus Mode" msgstr "" -#: ../src/verbs.cpp:2857 +#: ../src/verbs.cpp:2858 msgid "Toggle _Focus Mode" msgstr "" -#: ../src/verbs.cpp:2857 +#: ../src/verbs.cpp:2858 msgid "Remove excess toolbars to focus on drawing" msgstr "" -#: ../src/verbs.cpp:2859 +#: ../src/verbs.cpp:2860 msgid "Duplic_ate Window" msgstr "" -#: ../src/verbs.cpp:2859 +#: ../src/verbs.cpp:2860 msgid "Open a new window with the same document" msgstr "" -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2862 msgid "_New View Preview" msgstr "" -#: ../src/verbs.cpp:2862 +#: ../src/verbs.cpp:2863 msgid "New View Preview" msgstr "" #. "view_new_preview" -#: ../src/verbs.cpp:2864 ../src/verbs.cpp:2872 +#: ../src/verbs.cpp:2865 ../src/verbs.cpp:2873 msgid "_Normal" msgstr "" -#: ../src/verbs.cpp:2865 +#: ../src/verbs.cpp:2866 msgid "Switch to normal display mode" msgstr "" -#: ../src/verbs.cpp:2866 +#: ../src/verbs.cpp:2867 msgid "No _Filters" msgstr "" -#: ../src/verbs.cpp:2867 +#: ../src/verbs.cpp:2868 msgid "Switch to normal display without filters" msgstr "" -#: ../src/verbs.cpp:2868 +#: ../src/verbs.cpp:2869 msgid "_Outline" msgstr "" -#: ../src/verbs.cpp:2869 +#: ../src/verbs.cpp:2870 msgid "Switch to outline (wireframe) display mode" msgstr "" #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), #. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2870 ../src/verbs.cpp:2878 +#: ../src/verbs.cpp:2871 ../src/verbs.cpp:2879 msgid "_Toggle" msgstr "" -#: ../src/verbs.cpp:2871 +#: ../src/verbs.cpp:2872 msgid "Toggle between normal and outline display modes" msgstr "" -#: ../src/verbs.cpp:2873 +#: ../src/verbs.cpp:2874 msgid "Switch to normal color display mode" msgstr "" -#: ../src/verbs.cpp:2874 +#: ../src/verbs.cpp:2875 msgid "_Grayscale" msgstr "" -#: ../src/verbs.cpp:2875 +#: ../src/verbs.cpp:2876 msgid "Switch to grayscale display mode" msgstr "" -#: ../src/verbs.cpp:2879 +#: ../src/verbs.cpp:2880 msgid "Toggle between normal and grayscale color display modes" msgstr "" -#: ../src/verbs.cpp:2881 +#: ../src/verbs.cpp:2882 msgid "Color-managed view" msgstr "" -#: ../src/verbs.cpp:2882 +#: ../src/verbs.cpp:2883 msgid "Toggle color-managed display for this document window" msgstr "" -#: ../src/verbs.cpp:2884 +#: ../src/verbs.cpp:2885 msgid "Ico_n Preview..." msgstr "" -#: ../src/verbs.cpp:2885 +#: ../src/verbs.cpp:2886 msgid "Open a window to preview objects at different icon resolutions" msgstr "" -#: ../src/verbs.cpp:2887 +#: ../src/verbs.cpp:2888 msgid "Zoom to fit page in window" msgstr "" -#: ../src/verbs.cpp:2888 +#: ../src/verbs.cpp:2889 msgid "Page _Width" msgstr "" -#: ../src/verbs.cpp:2889 +#: ../src/verbs.cpp:2890 msgid "Zoom to fit page width in window" msgstr "" -#: ../src/verbs.cpp:2891 +#: ../src/verbs.cpp:2892 msgid "Zoom to fit drawing in window" msgstr "" -#: ../src/verbs.cpp:2893 +#: ../src/verbs.cpp:2894 msgid "Zoom to fit selection in window" msgstr "" #. Dialogs -#: ../src/verbs.cpp:2896 +#: ../src/verbs.cpp:2897 msgid "P_references..." msgstr "" -#: ../src/verbs.cpp:2897 +#: ../src/verbs.cpp:2898 msgid "Edit global Inkscape preferences" msgstr "" -#: ../src/verbs.cpp:2898 +#: ../src/verbs.cpp:2899 msgid "_Document Properties..." msgstr "" -#: ../src/verbs.cpp:2899 +#: ../src/verbs.cpp:2900 msgid "Edit properties of this document (to be saved with the document)" msgstr "" -#: ../src/verbs.cpp:2900 +#: ../src/verbs.cpp:2901 msgid "Document _Metadata..." msgstr "" -#: ../src/verbs.cpp:2901 +#: ../src/verbs.cpp:2902 msgid "Edit document metadata (to be saved with the document)" msgstr "" -#: ../src/verbs.cpp:2903 +#: ../src/verbs.cpp:2904 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " "properties..." msgstr "" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2905 +#: ../src/verbs.cpp:2906 msgid "Gl_yphs..." msgstr "" -#: ../src/verbs.cpp:2906 +#: ../src/verbs.cpp:2907 msgid "Select characters from a glyphs palette" msgstr "" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2909 +#: ../src/verbs.cpp:2910 msgid "S_watches..." msgstr "" -#: ../src/verbs.cpp:2910 +#: ../src/verbs.cpp:2911 msgid "Select colors from a swatches palette" msgstr "" -#: ../src/verbs.cpp:2911 +#: ../src/verbs.cpp:2912 msgid "S_ymbols..." msgstr "" -#: ../src/verbs.cpp:2912 +#: ../src/verbs.cpp:2913 msgid "Select symbol from a symbols palette" msgstr "" -#: ../src/verbs.cpp:2913 +#: ../src/verbs.cpp:2914 msgid "Transfor_m..." msgstr "" -#: ../src/verbs.cpp:2914 +#: ../src/verbs.cpp:2915 msgid "Precisely control objects' transformations" msgstr "" -#: ../src/verbs.cpp:2915 +#: ../src/verbs.cpp:2916 msgid "_Align and Distribute..." msgstr "" -#: ../src/verbs.cpp:2916 +#: ../src/verbs.cpp:2917 msgid "Align and distribute objects" msgstr "" -#: ../src/verbs.cpp:2917 +#: ../src/verbs.cpp:2918 msgid "_Spray options..." msgstr "" -#: ../src/verbs.cpp:2918 +#: ../src/verbs.cpp:2919 msgid "Some options for the spray" msgstr "" -#: ../src/verbs.cpp:2919 +#: ../src/verbs.cpp:2920 msgid "Undo _History..." msgstr "" -#: ../src/verbs.cpp:2920 +#: ../src/verbs.cpp:2921 msgid "Undo History" msgstr "" -#: ../src/verbs.cpp:2922 +#: ../src/verbs.cpp:2923 msgid "View and select font family, font size and other text properties" msgstr "" -#: ../src/verbs.cpp:2923 +#: ../src/verbs.cpp:2924 msgid "_XML Editor..." msgstr "" -#: ../src/verbs.cpp:2924 +#: ../src/verbs.cpp:2925 msgid "View and edit the XML tree of the document" msgstr "" -#: ../src/verbs.cpp:2925 +#: ../src/verbs.cpp:2926 msgid "_Find/Replace..." msgstr "" -#: ../src/verbs.cpp:2926 +#: ../src/verbs.cpp:2927 msgid "Find objects in document" msgstr "" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:2928 msgid "Find and _Replace Text..." msgstr "" -#: ../src/verbs.cpp:2928 +#: ../src/verbs.cpp:2929 msgid "Find and replace text in document" msgstr "" -#: ../src/verbs.cpp:2930 +#: ../src/verbs.cpp:2931 msgid "Check spelling of text in document" msgstr "" -#: ../src/verbs.cpp:2931 +#: ../src/verbs.cpp:2932 msgid "_Messages..." msgstr "" -#: ../src/verbs.cpp:2932 +#: ../src/verbs.cpp:2933 msgid "View debug messages" msgstr "" -#: ../src/verbs.cpp:2933 +#: ../src/verbs.cpp:2934 msgid "Show/Hide D_ialogs" msgstr "" -#: ../src/verbs.cpp:2934 +#: ../src/verbs.cpp:2935 msgid "Show or hide all open dialogs" msgstr "" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:2936 msgid "Create Tiled Clones..." msgstr "" -#: ../src/verbs.cpp:2936 +#: ../src/verbs.cpp:2937 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" msgstr "" -#: ../src/verbs.cpp:2937 +#: ../src/verbs.cpp:2938 msgid "_Object attributes..." msgstr "" -#: ../src/verbs.cpp:2938 +#: ../src/verbs.cpp:2939 msgid "Edit the object attributes..." msgstr "" -#: ../src/verbs.cpp:2940 +#: ../src/verbs.cpp:2941 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" -#: ../src/verbs.cpp:2941 +#: ../src/verbs.cpp:2942 msgid "_Input Devices..." msgstr "" -#: ../src/verbs.cpp:2942 +#: ../src/verbs.cpp:2943 msgid "Configure extended input devices, such as a graphics tablet" msgstr "" -#: ../src/verbs.cpp:2943 +#: ../src/verbs.cpp:2944 msgid "_Extensions..." msgstr "" -#: ../src/verbs.cpp:2944 +#: ../src/verbs.cpp:2945 msgid "Query information about extensions" msgstr "" -#: ../src/verbs.cpp:2945 +#: ../src/verbs.cpp:2946 msgid "Layer_s..." msgstr "" -#: ../src/verbs.cpp:2946 +#: ../src/verbs.cpp:2947 msgid "View Layers" msgstr "" -#: ../src/verbs.cpp:2947 +#: ../src/verbs.cpp:2948 msgid "Object_s..." msgstr "" -#: ../src/verbs.cpp:2948 +#: ../src/verbs.cpp:2949 msgid "View Objects" msgstr "" -#: ../src/verbs.cpp:2949 +#: ../src/verbs.cpp:2950 msgid "Selection se_ts..." msgstr "" -#: ../src/verbs.cpp:2950 +#: ../src/verbs.cpp:2951 msgid "View Tags" msgstr "" -#: ../src/verbs.cpp:2951 +#: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." msgstr "" -#: ../src/verbs.cpp:2952 +#: ../src/verbs.cpp:2953 msgid "Manage, edit, and apply path effects" msgstr "" -#: ../src/verbs.cpp:2953 +#: ../src/verbs.cpp:2954 msgid "Filter _Editor..." msgstr "" -#: ../src/verbs.cpp:2954 +#: ../src/verbs.cpp:2955 msgid "Manage, edit, and apply SVG filters" msgstr "" -#: ../src/verbs.cpp:2955 +#: ../src/verbs.cpp:2956 msgid "SVG Font Editor..." msgstr "" -#: ../src/verbs.cpp:2956 +#: ../src/verbs.cpp:2957 msgid "Edit SVG fonts" msgstr "" -#: ../src/verbs.cpp:2957 +#: ../src/verbs.cpp:2958 msgid "Print Colors..." msgstr "" -#: ../src/verbs.cpp:2958 +#: ../src/verbs.cpp:2959 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" -#: ../src/verbs.cpp:2959 +#: ../src/verbs.cpp:2960 msgid "_Export PNG Image..." msgstr "" -#: ../src/verbs.cpp:2960 +#: ../src/verbs.cpp:2961 msgid "Export this document or a selection as a PNG image" msgstr "" #. Help -#: ../src/verbs.cpp:2962 +#: ../src/verbs.cpp:2963 msgid "About E_xtensions" msgstr "" -#: ../src/verbs.cpp:2963 +#: ../src/verbs.cpp:2964 msgid "Information on Inkscape extensions" msgstr "" -#: ../src/verbs.cpp:2964 +#: ../src/verbs.cpp:2965 msgid "About _Memory" msgstr "" -#: ../src/verbs.cpp:2965 +#: ../src/verbs.cpp:2966 msgid "Memory usage information" msgstr "" -#: ../src/verbs.cpp:2966 +#: ../src/verbs.cpp:2967 msgid "_About Inkscape" msgstr "" -#: ../src/verbs.cpp:2967 +#: ../src/verbs.cpp:2968 msgid "Inkscape version, authors, license" msgstr "" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2972 +#: ../src/verbs.cpp:2973 msgid "Inkscape: _Basic" msgstr "" -#: ../src/verbs.cpp:2973 +#: ../src/verbs.cpp:2974 msgid "Getting started with Inkscape" msgstr "" #. "tutorial_basic" -#: ../src/verbs.cpp:2974 +#: ../src/verbs.cpp:2975 msgid "Inkscape: _Shapes" msgstr "" -#: ../src/verbs.cpp:2975 +#: ../src/verbs.cpp:2976 msgid "Using shape tools to create and edit shapes" msgstr "" -#: ../src/verbs.cpp:2976 +#: ../src/verbs.cpp:2977 msgid "Inkscape: _Advanced" msgstr "" -#: ../src/verbs.cpp:2977 +#: ../src/verbs.cpp:2978 msgid "Advanced Inkscape topics" msgstr "" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2981 +#: ../src/verbs.cpp:2982 msgid "Inkscape: T_racing" msgstr "" -#: ../src/verbs.cpp:2982 +#: ../src/verbs.cpp:2983 msgid "Using bitmap tracing" msgstr "" -#: ../src/verbs.cpp:2985 +#: ../src/verbs.cpp:2986 msgid "Inkscape: Tracing Pixel Art" msgstr "" -#: ../src/verbs.cpp:2986 +#: ../src/verbs.cpp:2987 msgid "Using Trace Pixel Art dialog" msgstr "" -#: ../src/verbs.cpp:2987 +#: ../src/verbs.cpp:2988 msgid "Inkscape: _Calligraphy" msgstr "" -#: ../src/verbs.cpp:2988 +#: ../src/verbs.cpp:2989 msgid "Using the Calligraphy pen tool" msgstr "" -#: ../src/verbs.cpp:2989 +#: ../src/verbs.cpp:2990 msgid "Inkscape: _Interpolate" msgstr "" -#: ../src/verbs.cpp:2990 +#: ../src/verbs.cpp:2991 msgid "Using the interpolate extension" msgstr "" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2991 +#: ../src/verbs.cpp:2992 msgid "_Elements of Design" msgstr "" -#: ../src/verbs.cpp:2992 +#: ../src/verbs.cpp:2993 msgid "Principles of design in the tutorial form" msgstr "" #. "tutorial_design" -#: ../src/verbs.cpp:2993 +#: ../src/verbs.cpp:2994 msgid "_Tips and Tricks" msgstr "" -#: ../src/verbs.cpp:2994 +#: ../src/verbs.cpp:2995 msgid "Miscellaneous tips and tricks" msgstr "" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2997 +#: ../src/verbs.cpp:2998 msgid "Previous Exte_nsion" msgstr "" -#: ../src/verbs.cpp:2998 +#: ../src/verbs.cpp:2999 msgid "Repeat the last extension with the same settings" msgstr "" -#: ../src/verbs.cpp:2999 +#: ../src/verbs.cpp:3000 msgid "_Previous Extension Settings..." msgstr "" -#: ../src/verbs.cpp:3000 +#: ../src/verbs.cpp:3001 msgid "Repeat the last extension with new settings" msgstr "" -#: ../src/verbs.cpp:3004 +#: ../src/verbs.cpp:3005 msgid "Fit the page to the current selection" msgstr "" -#: ../src/verbs.cpp:3006 +#: ../src/verbs.cpp:3007 msgid "Fit the page to the drawing" msgstr "" #: ../src/verbs.cpp:3008 +msgid "_Resize Page to Selection" +msgstr "" + +#: ../src/verbs.cpp:3009 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" -#: ../src/verbs.cpp:3012 +#: ../src/verbs.cpp:3013 msgid "Unlock All in All Layers" msgstr "" -#: ../src/verbs.cpp:3014 +#: ../src/verbs.cpp:3015 msgid "Unhide All" msgstr "" -#: ../src/verbs.cpp:3016 +#: ../src/verbs.cpp:3017 msgid "Unhide All in All Layers" msgstr "" -#: ../src/verbs.cpp:3020 +#: ../src/verbs.cpp:3021 msgid "Link an ICC color profile" msgstr "" -#: ../src/verbs.cpp:3021 +#: ../src/verbs.cpp:3022 msgid "Remove Color Profile" msgstr "" -#: ../src/verbs.cpp:3022 +#: ../src/verbs.cpp:3023 msgid "Remove a linked ICC color profile" msgstr "" -#: ../src/verbs.cpp:3025 +#: ../src/verbs.cpp:3026 msgid "Add External Script" msgstr "" -#: ../src/verbs.cpp:3025 +#: ../src/verbs.cpp:3026 msgid "Add an external script" msgstr "" -#: ../src/verbs.cpp:3027 +#: ../src/verbs.cpp:3028 msgid "Add Embedded Script" msgstr "" -#: ../src/verbs.cpp:3027 +#: ../src/verbs.cpp:3028 msgid "Add an embedded script" msgstr "" -#: ../src/verbs.cpp:3029 +#: ../src/verbs.cpp:3030 msgid "Edit Embedded Script" msgstr "" -#: ../src/verbs.cpp:3029 +#: ../src/verbs.cpp:3030 msgid "Edit an embedded script" msgstr "" -#: ../src/verbs.cpp:3031 +#: ../src/verbs.cpp:3032 msgid "Remove External Script" msgstr "" -#: ../src/verbs.cpp:3031 +#: ../src/verbs.cpp:3032 msgid "Remove an external script" msgstr "" -#: ../src/verbs.cpp:3033 +#: ../src/verbs.cpp:3034 msgid "Remove Embedded Script" msgstr "" -#: ../src/verbs.cpp:3033 +#: ../src/verbs.cpp:3034 msgid "Remove an embedded script" msgstr "" -#: ../src/verbs.cpp:3055 ../src/verbs.cpp:3056 +#: ../src/verbs.cpp:3056 ../src/verbs.cpp:3057 msgid "Center on horizontal and vertical axis" msgstr "" @@ -27599,96 +27692,96 @@ msgstr "" msgid "Pattern offset" msgstr "" -#: ../src/widgets/desktop-widget.cpp:494 +#: ../src/widgets/desktop-widget.cpp:495 msgid "Zoom drawing if window size changes" msgstr "" -#: ../src/widgets/desktop-widget.cpp:693 +#: ../src/widgets/desktop-widget.cpp:702 msgid "Cursor coordinates" msgstr "" -#: ../src/widgets/desktop-widget.cpp:719 +#: ../src/widgets/desktop-widget.cpp:723 msgid "Z:" msgstr "" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:762 +#: ../src/widgets/desktop-widget.cpp:776 msgid "" "Welcome to Inkscape! Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." msgstr "" -#: ../src/widgets/desktop-widget.cpp:856 +#: ../src/widgets/desktop-widget.cpp:870 msgid "grayscale" msgstr "" -#: ../src/widgets/desktop-widget.cpp:857 +#: ../src/widgets/desktop-widget.cpp:871 msgid ", grayscale" msgstr "" -#: ../src/widgets/desktop-widget.cpp:858 +#: ../src/widgets/desktop-widget.cpp:872 msgid "print colors preview" msgstr "" -#: ../src/widgets/desktop-widget.cpp:859 +#: ../src/widgets/desktop-widget.cpp:873 msgid ", print colors preview" msgstr "" -#: ../src/widgets/desktop-widget.cpp:860 +#: ../src/widgets/desktop-widget.cpp:874 msgid "outline" msgstr "" -#: ../src/widgets/desktop-widget.cpp:861 +#: ../src/widgets/desktop-widget.cpp:875 msgid "no filters" msgstr "" -#: ../src/widgets/desktop-widget.cpp:888 +#: ../src/widgets/desktop-widget.cpp:902 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:890 ../src/widgets/desktop-widget.cpp:894 +#: ../src/widgets/desktop-widget.cpp:904 ../src/widgets/desktop-widget.cpp:908 #, c-format msgid "%s%s: %d (%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:896 +#: ../src/widgets/desktop-widget.cpp:910 #, c-format msgid "%s%s: %d - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:902 +#: ../src/widgets/desktop-widget.cpp:916 #, c-format msgid "%s%s (%s%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:904 ../src/widgets/desktop-widget.cpp:908 +#: ../src/widgets/desktop-widget.cpp:918 ../src/widgets/desktop-widget.cpp:922 #, c-format msgid "%s%s (%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:910 +#: ../src/widgets/desktop-widget.cpp:924 #, c-format msgid "%s%s - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1082 +#: ../src/widgets/desktop-widget.cpp:1096 msgid "Locked all guides" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1084 +#: ../src/widgets/desktop-widget.cpp:1098 msgid "Unlocked all guides" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1101 +#: ../src/widgets/desktop-widget.cpp:1115 msgid "Color-managed display is enabled in this window" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1103 +#: ../src/widgets/desktop-widget.cpp:1117 msgid "Color-managed display is disabled in this window" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1158 +#: ../src/widgets/desktop-widget.cpp:1172 #, c-format msgid "" "Save changes to document \"%s\" before " @@ -27697,12 +27790,12 @@ msgid "" "If you close without saving, your changes will be discarded." msgstr "" -#: ../src/widgets/desktop-widget.cpp:1168 -#: ../src/widgets/desktop-widget.cpp:1227 +#: ../src/widgets/desktop-widget.cpp:1182 +#: ../src/widgets/desktop-widget.cpp:1241 msgid "Close _without saving" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1217 +#: ../src/widgets/desktop-widget.cpp:1231 #, c-format msgid "" "The file \"%s\" was saved with a " @@ -27711,11 +27804,11 @@ msgid "" "Do you want to save this file as Inkscape SVG?" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1229 +#: ../src/widgets/desktop-widget.cpp:1243 msgid "_Save as Inkscape SVG" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1442 +#: ../src/widgets/desktop-widget.cpp:1456 msgid "Note:" msgstr "" @@ -27815,8 +27908,8 @@ msgstr "" msgid "Set pattern on stroke" msgstr "" -#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1017 -#: ../src/widgets/text-toolbar.cpp:1358 +#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1207 +#: ../src/widgets/text-toolbar.cpp:1606 msgid "Font size" msgstr "" @@ -27826,16 +27919,17 @@ msgid "Font family" msgstr "" #. Style frame -#: ../src/widgets/font-selector.cpp:179 +#: ../src/widgets/font-selector.cpp:194 msgctxt "Font selector" msgid "Style" msgstr "" -#: ../src/widgets/font-selector.cpp:211 +#: ../src/widgets/font-selector.cpp:226 msgid "Face" msgstr "" -#: ../src/widgets/font-selector.cpp:240 ../share/extensions/dots.inx.h:3 +#: ../src/widgets/font-selector.cpp:255 ../share/extensions/dots.inx.h:3 +#: ../share/extensions/nicechart.inx.h:17 msgid "Font size:" msgstr "" @@ -27905,33 +27999,27 @@ msgstr "" msgid "Create radial (elliptic or circular) gradient" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1044 -#: ../src/widgets/mesh-toolbar.cpp:387 +#: ../src/widgets/gradient-toolbar.cpp:1044 ../src/widgets/mesh-toolbar.cpp:387 msgid "New:" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1067 -#: ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 msgid "fill" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1067 -#: ../src/widgets/mesh-toolbar.cpp:410 +#: ../src/widgets/gradient-toolbar.cpp:1067 ../src/widgets/mesh-toolbar.cpp:410 msgid "Create gradient in the fill" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1071 -#: ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 msgid "stroke" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1071 -#: ../src/widgets/mesh-toolbar.cpp:414 +#: ../src/widgets/gradient-toolbar.cpp:1071 ../src/widgets/mesh-toolbar.cpp:414 msgid "Create gradient in the stroke" msgstr "" -#: ../src/widgets/gradient-toolbar.cpp:1074 -#: ../src/widgets/mesh-toolbar.cpp:417 +#: ../src/widgets/gradient-toolbar.cpp:1074 ../src/widgets/mesh-toolbar.cpp:417 msgid "on:" msgstr "" @@ -28027,8 +28115,7 @@ msgstr "" msgid "Link gradients to change all related gradients" msgstr "" -#: ../src/widgets/gradient-vector.cpp:317 -#: ../src/widgets/paint-selector.cpp:965 +#: ../src/widgets/gradient-vector.cpp:317 ../src/widgets/paint-selector.cpp:965 #: ../src/widgets/stroke-marker-selector.cpp:154 msgid "No document selected" msgstr "" @@ -28055,18 +28142,42 @@ msgid "Delete current control stop from gradient" msgstr "" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:969 +#: ../src/widgets/gradient-vector.cpp:975 msgid "Stop Color" msgstr "" -#: ../src/widgets/gradient-vector.cpp:1008 +#: ../src/widgets/gradient-vector.cpp:1014 msgid "Gradient editor" msgstr "" -#: ../src/widgets/gradient-vector.cpp:1360 +#: ../src/widgets/gradient-vector.cpp:1366 msgid "Change gradient stop color" msgstr "" +#: ../src/widgets/image-menu-item.c:151 +msgid "Image widget" +msgstr "" + +#: ../src/widgets/image-menu-item.c:152 +msgid "Child widget to appear next to the menu text" +msgstr "" + +#: ../src/widgets/image-menu-item.c:167 +msgid "Use stock" +msgstr "" + +#: ../src/widgets/image-menu-item.c:168 +msgid "Whether to use the label text to create a stock menu item" +msgstr "" + +#: ../src/widgets/image-menu-item.c:183 +msgid "Accel Group" +msgstr "" + +#: ../src/widgets/image-menu-item.c:184 +msgid "The Accel Group to use for stock accelerator keys" +msgstr "" + #: ../src/widgets/lpe-toolbar.cpp:233 msgid "Closed" msgstr "" @@ -28124,7 +28235,8 @@ msgstr "" #. Add the units menu. #: ../src/widgets/lpe-toolbar.cpp:387 ../src/widgets/node-toolbar.cpp:613 #: ../src/widgets/paintbucket-toolbar.cpp:167 -#: ../src/widgets/rect-toolbar.cpp:378 ../src/widgets/select-toolbar.cpp:538 +#: ../src/widgets/rect-toolbar.cpp:378 ../src/widgets/select-toolbar.cpp:530 +#: ../src/widgets/text-toolbar.cpp:1876 msgid "Units" msgstr "" @@ -28168,7 +28280,7 @@ msgstr "" msgid "Compute max length." msgstr "" -#: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1361 +#: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" msgstr "" @@ -28871,39 +28983,39 @@ msgstr "" msgid "Make corners sharp" msgstr "" -#: ../src/widgets/ruler.cpp:198 +#: ../src/widgets/ruler.cpp:202 msgid "The orientation of the ruler" msgstr "" -#: ../src/widgets/ruler.cpp:208 +#: ../src/widgets/ruler.cpp:212 msgid "Unit of the ruler" msgstr "" -#: ../src/widgets/ruler.cpp:215 +#: ../src/widgets/ruler.cpp:219 msgid "Lower" msgstr "" -#: ../src/widgets/ruler.cpp:216 +#: ../src/widgets/ruler.cpp:220 msgid "Lower limit of ruler" msgstr "" -#: ../src/widgets/ruler.cpp:225 +#: ../src/widgets/ruler.cpp:229 msgid "Upper" msgstr "" -#: ../src/widgets/ruler.cpp:226 +#: ../src/widgets/ruler.cpp:230 msgid "Upper limit of ruler" msgstr "" -#: ../src/widgets/ruler.cpp:236 +#: ../src/widgets/ruler.cpp:240 msgid "Position of mark on the ruler" msgstr "" -#: ../src/widgets/ruler.cpp:245 +#: ../src/widgets/ruler.cpp:249 msgid "Max Size" msgstr "" -#: ../src/widgets/ruler.cpp:246 +#: ../src/widgets/ruler.cpp:250 msgid "Maximum size of the ruler" msgstr "" @@ -28911,124 +29023,139 @@ msgstr "" msgid "Transform by toolbar" msgstr "" -#: ../src/widgets/select-toolbar.cpp:341 +#: ../src/widgets/select-toolbar.cpp:280 msgid "Now stroke width is scaled when objects are scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:343 +#: ../src/widgets/select-toolbar.cpp:282 msgid "Now stroke width is not scaled when objects are scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:354 +#: ../src/widgets/select-toolbar.cpp:293 msgid "" "Now rounded rectangle corners are scaled when rectangles are " "scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:356 +#: ../src/widgets/select-toolbar.cpp:295 msgid "" "Now rounded rectangle corners are not scaled when rectangles " "are scaled." msgstr "" -#: ../src/widgets/select-toolbar.cpp:367 +#: ../src/widgets/select-toolbar.cpp:306 msgid "" "Now gradients are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/widgets/select-toolbar.cpp:369 +#: ../src/widgets/select-toolbar.cpp:308 msgid "" "Now gradients remain fixed when objects are transformed " "(moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/widgets/select-toolbar.cpp:380 +#: ../src/widgets/select-toolbar.cpp:319 msgid "" "Now patterns are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." msgstr "" -#: ../src/widgets/select-toolbar.cpp:382 +#: ../src/widgets/select-toolbar.cpp:321 msgid "" "Now patterns remain fixed when objects are transformed (moved, " "scaled, rotated, or skewed)." msgstr "" -#. four spinbuttons -#: ../src/widgets/select-toolbar.cpp:500 +#. name +#: ../src/widgets/select-toolbar.cpp:441 msgctxt "Select toolbar" msgid "X position" msgstr "" -#: ../src/widgets/select-toolbar.cpp:500 +#. label +#: ../src/widgets/select-toolbar.cpp:442 msgctxt "Select toolbar" msgid "X:" msgstr "" -#: ../src/widgets/select-toolbar.cpp:502 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:443 +msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "" -#: ../src/widgets/select-toolbar.cpp:506 +#. name +#: ../src/widgets/select-toolbar.cpp:460 msgctxt "Select toolbar" msgid "Y position" msgstr "" -#: ../src/widgets/select-toolbar.cpp:506 +#. label +#: ../src/widgets/select-toolbar.cpp:461 msgctxt "Select toolbar" msgid "Y:" msgstr "" -#: ../src/widgets/select-toolbar.cpp:508 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:462 +msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "" -#: ../src/widgets/select-toolbar.cpp:512 +#. name +#: ../src/widgets/select-toolbar.cpp:479 msgctxt "Select toolbar" msgid "Width" msgstr "" -#: ../src/widgets/select-toolbar.cpp:512 +#. label +#: ../src/widgets/select-toolbar.cpp:480 msgctxt "Select toolbar" msgid "W:" msgstr "" -#: ../src/widgets/select-toolbar.cpp:514 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:481 +msgctxt "Select toolbar" msgid "Width of selection" msgstr "" -#: ../src/widgets/select-toolbar.cpp:521 +#: ../src/widgets/select-toolbar.cpp:499 msgid "Lock width and height" msgstr "" -#: ../src/widgets/select-toolbar.cpp:522 +#: ../src/widgets/select-toolbar.cpp:500 msgid "When locked, change both width and height by the same proportion" msgstr "" -#: ../src/widgets/select-toolbar.cpp:531 +#. name +#: ../src/widgets/select-toolbar.cpp:511 msgctxt "Select toolbar" msgid "Height" msgstr "" -#: ../src/widgets/select-toolbar.cpp:531 +#. label +#: ../src/widgets/select-toolbar.cpp:512 msgctxt "Select toolbar" msgid "H:" msgstr "" -#: ../src/widgets/select-toolbar.cpp:533 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:513 +msgctxt "Select toolbar" msgid "Height of selection" msgstr "" -#: ../src/widgets/select-toolbar.cpp:583 +#: ../src/widgets/select-toolbar.cpp:575 msgid "Scale rounded corners" msgstr "" -#: ../src/widgets/select-toolbar.cpp:594 +#: ../src/widgets/select-toolbar.cpp:586 msgid "Move gradients" msgstr "" -#: ../src/widgets/select-toolbar.cpp:605 +#: ../src/widgets/select-toolbar.cpp:597 msgid "Move patterns" msgstr "" @@ -29218,10 +29345,6 @@ msgstr "" msgid "Delete sprayed items from selection" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 -msgid "Mode" -msgstr "" - #. Population #: ../src/widgets/spray-toolbar.cpp:408 msgid "(low population)" @@ -29638,465 +29761,469 @@ msgstr "" msgid "Set marker color" msgstr "" -#: ../src/widgets/swatch-selector.cpp:127 +#: ../src/widgets/swatch-selector.cpp:89 msgid "Change swatch color" msgstr "" -#: ../src/widgets/text-toolbar.cpp:173 +#: ../src/widgets/text-toolbar.cpp:179 msgid "Text: Change font family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:239 +#: ../src/widgets/text-toolbar.cpp:245 msgid "Text: Change font size" msgstr "" -#: ../src/widgets/text-toolbar.cpp:275 +#: ../src/widgets/text-toolbar.cpp:281 msgid "Text: Change font style" msgstr "" -#: ../src/widgets/text-toolbar.cpp:353 +#: ../src/widgets/text-toolbar.cpp:359 msgid "Text: Change superscript or subscript" msgstr "" -#: ../src/widgets/text-toolbar.cpp:496 +#: ../src/widgets/text-toolbar.cpp:502 msgid "Text: Change alignment" msgstr "" -#: ../src/widgets/text-toolbar.cpp:539 +#: ../src/widgets/text-toolbar.cpp:573 msgid "Text: Change line-height" msgstr "" -#: ../src/widgets/text-toolbar.cpp:587 +#: ../src/widgets/text-toolbar.cpp:728 +msgid "Text: Change line-height unit" +msgstr "" + +#: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:627 +#: ../src/widgets/text-toolbar.cpp:817 msgid "Text: Change letter-spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:665 +#: ../src/widgets/text-toolbar.cpp:855 msgid "Text: Change dx (kern)" msgstr "" -#: ../src/widgets/text-toolbar.cpp:699 +#: ../src/widgets/text-toolbar.cpp:889 msgid "Text: Change dy" msgstr "" -#: ../src/widgets/text-toolbar.cpp:734 +#: ../src/widgets/text-toolbar.cpp:924 msgid "Text: Change rotate" msgstr "" -#: ../src/widgets/text-toolbar.cpp:787 +#: ../src/widgets/text-toolbar.cpp:977 msgid "Text: Change writing mode" msgstr "" -#: ../src/widgets/text-toolbar.cpp:841 +#: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1309 +#: ../src/widgets/text-toolbar.cpp:1539 msgid "Font Family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1310 +#: ../src/widgets/text-toolbar.cpp:1540 msgid "Select Font Family (Alt-X to access)" msgstr "" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1320 +#: ../src/widgets/text-toolbar.cpp:1550 msgid "Select all text with this font-family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1324 +#: ../src/widgets/text-toolbar.cpp:1554 msgid "Font not found on system" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1383 +#: ../src/widgets/text-toolbar.cpp:1631 msgid "Font Style" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1384 +#: ../src/widgets/text-toolbar.cpp:1632 msgid "Font style" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1401 +#: ../src/widgets/text-toolbar.cpp:1649 msgid "Toggle Superscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1402 +#: ../src/widgets/text-toolbar.cpp:1650 msgid "Toggle superscript" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1414 +#: ../src/widgets/text-toolbar.cpp:1662 msgid "Toggle Subscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1415 +#: ../src/widgets/text-toolbar.cpp:1663 msgid "Toggle subscript" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1456 +#: ../src/widgets/text-toolbar.cpp:1704 msgid "Justify" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1463 +#: ../src/widgets/text-toolbar.cpp:1711 msgid "Alignment" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1464 +#: ../src/widgets/text-toolbar.cpp:1712 msgid "Text alignment" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1491 +#: ../src/widgets/text-toolbar.cpp:1739 msgid "Horizontal" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1498 +#: ../src/widgets/text-toolbar.cpp:1746 msgid "Vertical — RL" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1499 +#: ../src/widgets/text-toolbar.cpp:1747 msgid "Vertical text — lines: right to left" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1505 +#: ../src/widgets/text-toolbar.cpp:1753 msgid "Vertical — LR" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1506 +#: ../src/widgets/text-toolbar.cpp:1754 msgid "Vertical text — lines: left to right" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1511 +#: ../src/widgets/text-toolbar.cpp:1759 msgid "Writing mode" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1512 +#: ../src/widgets/text-toolbar.cpp:1760 msgid "Block progression" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1541 +#: ../src/widgets/text-toolbar.cpp:1789 msgid "Auto glyph orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1548 +#: ../src/widgets/text-toolbar.cpp:1796 msgid "Upright" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1549 +#: ../src/widgets/text-toolbar.cpp:1797 msgid "Upright glyph orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1556 +#: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1557 +#: ../src/widgets/text-toolbar.cpp:1805 msgid "Sideways glyph orientation" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1563 +#: ../src/widgets/text-toolbar.cpp:1811 msgid "Text orientation" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1564 +#: ../src/widgets/text-toolbar.cpp:1812 msgid "Text (glyph) orientation in vertical text." msgstr "" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1588 +#: ../src/widgets/text-toolbar.cpp:1845 msgid "Smaller spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1588 ../src/widgets/text-toolbar.cpp:1619 -#: ../src/widgets/text-toolbar.cpp:1650 +#: ../src/widgets/text-toolbar.cpp:1845 ../src/widgets/text-toolbar.cpp:1884 +#: ../src/widgets/text-toolbar.cpp:1915 msgctxt "Text tool" msgid "Normal" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1588 +#: ../src/widgets/text-toolbar.cpp:1845 msgid "Larger spacing" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1593 +#: ../src/widgets/text-toolbar.cpp:1850 msgid "Line Height" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1594 +#: ../src/widgets/text-toolbar.cpp:1851 msgid "Line:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1595 +#: ../src/widgets/text-toolbar.cpp:1852 msgid "Spacing between baselines (times font size)" msgstr "" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 +#: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 msgid "Negative spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 +#: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 msgid "Positive spacing" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1624 +#: ../src/widgets/text-toolbar.cpp:1889 msgid "Word spacing" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1625 +#: ../src/widgets/text-toolbar.cpp:1890 msgid "Word:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1626 +#: ../src/widgets/text-toolbar.cpp:1891 msgid "Spacing between words (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1655 +#: ../src/widgets/text-toolbar.cpp:1920 msgid "Letter spacing" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1656 +#: ../src/widgets/text-toolbar.cpp:1921 msgid "Letter:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1657 +#: ../src/widgets/text-toolbar.cpp:1922 msgid "Spacing between letters (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1686 +#: ../src/widgets/text-toolbar.cpp:1951 msgid "Kerning" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1687 +#: ../src/widgets/text-toolbar.cpp:1952 msgid "Kern:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1688 +#: ../src/widgets/text-toolbar.cpp:1953 msgid "Horizontal kerning (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1717 +#: ../src/widgets/text-toolbar.cpp:1982 msgid "Vertical Shift" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1718 +#: ../src/widgets/text-toolbar.cpp:1983 msgid "Vert:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1719 +#: ../src/widgets/text-toolbar.cpp:1984 msgid "Vertical shift (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1748 +#: ../src/widgets/text-toolbar.cpp:2013 msgid "Letter rotation" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1749 +#: ../src/widgets/text-toolbar.cpp:2014 msgid "Rot:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1750 +#: ../src/widgets/text-toolbar.cpp:2015 msgid "Character rotation (degrees)" msgstr "" -#: ../src/widgets/toolbox.cpp:184 +#: ../src/widgets/toolbox.cpp:186 msgid "Color/opacity used for color tweaking" msgstr "" -#: ../src/widgets/toolbox.cpp:192 +#: ../src/widgets/toolbox.cpp:194 msgid "Style of new stars" msgstr "" -#: ../src/widgets/toolbox.cpp:194 +#: ../src/widgets/toolbox.cpp:196 msgid "Style of new rectangles" msgstr "" -#: ../src/widgets/toolbox.cpp:196 +#: ../src/widgets/toolbox.cpp:198 msgid "Style of new 3D boxes" msgstr "" -#: ../src/widgets/toolbox.cpp:198 +#: ../src/widgets/toolbox.cpp:200 msgid "Style of new ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:200 +#: ../src/widgets/toolbox.cpp:202 msgid "Style of new spirals" msgstr "" -#: ../src/widgets/toolbox.cpp:202 +#: ../src/widgets/toolbox.cpp:204 msgid "Style of new paths created by Pencil" msgstr "" -#: ../src/widgets/toolbox.cpp:204 +#: ../src/widgets/toolbox.cpp:206 msgid "Style of new paths created by Pen" msgstr "" -#: ../src/widgets/toolbox.cpp:206 +#: ../src/widgets/toolbox.cpp:208 msgid "Style of new calligraphic strokes" msgstr "" -#: ../src/widgets/toolbox.cpp:208 ../src/widgets/toolbox.cpp:210 +#: ../src/widgets/toolbox.cpp:210 ../src/widgets/toolbox.cpp:212 msgid "TBD" msgstr "" -#: ../src/widgets/toolbox.cpp:223 +#: ../src/widgets/toolbox.cpp:225 msgid "Style of Paint Bucket fill objects" msgstr "" -#: ../src/widgets/toolbox.cpp:1735 +#: ../src/widgets/toolbox.cpp:1742 msgid "Bounding box" msgstr "" -#: ../src/widgets/toolbox.cpp:1735 +#: ../src/widgets/toolbox.cpp:1742 msgid "Snap bounding boxes" msgstr "" -#: ../src/widgets/toolbox.cpp:1744 +#: ../src/widgets/toolbox.cpp:1751 msgid "Bounding box edges" msgstr "" -#: ../src/widgets/toolbox.cpp:1744 +#: ../src/widgets/toolbox.cpp:1751 msgid "Snap to edges of a bounding box" msgstr "" -#: ../src/widgets/toolbox.cpp:1753 +#: ../src/widgets/toolbox.cpp:1760 msgid "Bounding box corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1753 +#: ../src/widgets/toolbox.cpp:1760 msgid "Snap bounding box corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1762 +#: ../src/widgets/toolbox.cpp:1769 msgid "BBox Edge Midpoints" msgstr "" -#: ../src/widgets/toolbox.cpp:1762 +#: ../src/widgets/toolbox.cpp:1769 msgid "Snap midpoints of bounding box edges" msgstr "" -#: ../src/widgets/toolbox.cpp:1772 +#: ../src/widgets/toolbox.cpp:1779 msgid "BBox Centers" msgstr "" -#: ../src/widgets/toolbox.cpp:1772 +#: ../src/widgets/toolbox.cpp:1779 msgid "Snapping centers of bounding boxes" msgstr "" -#: ../src/widgets/toolbox.cpp:1781 +#: ../src/widgets/toolbox.cpp:1788 msgid "Snap nodes, paths, and handles" msgstr "" -#: ../src/widgets/toolbox.cpp:1789 +#: ../src/widgets/toolbox.cpp:1796 msgid "Snap to paths" msgstr "" -#: ../src/widgets/toolbox.cpp:1798 +#: ../src/widgets/toolbox.cpp:1805 msgid "Path intersections" msgstr "" -#: ../src/widgets/toolbox.cpp:1798 +#: ../src/widgets/toolbox.cpp:1805 msgid "Snap to path intersections" msgstr "" -#: ../src/widgets/toolbox.cpp:1807 +#: ../src/widgets/toolbox.cpp:1814 msgid "To nodes" msgstr "" -#: ../src/widgets/toolbox.cpp:1807 +#: ../src/widgets/toolbox.cpp:1814 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1816 +#: ../src/widgets/toolbox.cpp:1823 msgid "Smooth nodes" msgstr "" -#: ../src/widgets/toolbox.cpp:1816 +#: ../src/widgets/toolbox.cpp:1823 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:1825 +#: ../src/widgets/toolbox.cpp:1832 msgid "Line Midpoints" msgstr "" -#: ../src/widgets/toolbox.cpp:1825 +#: ../src/widgets/toolbox.cpp:1832 msgid "Snap midpoints of line segments" msgstr "" -#: ../src/widgets/toolbox.cpp:1834 +#: ../src/widgets/toolbox.cpp:1841 msgid "Others" msgstr "" -#: ../src/widgets/toolbox.cpp:1834 +#: ../src/widgets/toolbox.cpp:1841 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" -#: ../src/widgets/toolbox.cpp:1842 +#: ../src/widgets/toolbox.cpp:1849 msgid "Object Centers" msgstr "" -#: ../src/widgets/toolbox.cpp:1842 +#: ../src/widgets/toolbox.cpp:1849 msgid "Snap centers of objects" msgstr "" -#: ../src/widgets/toolbox.cpp:1851 +#: ../src/widgets/toolbox.cpp:1858 msgid "Rotation Centers" msgstr "" -#: ../src/widgets/toolbox.cpp:1851 +#: ../src/widgets/toolbox.cpp:1858 msgid "Snap an item's rotation center" msgstr "" -#: ../src/widgets/toolbox.cpp:1860 +#: ../src/widgets/toolbox.cpp:1867 msgid "Text baseline" msgstr "" -#: ../src/widgets/toolbox.cpp:1860 +#: ../src/widgets/toolbox.cpp:1867 msgid "Snap text anchors and baselines" msgstr "" -#: ../src/widgets/toolbox.cpp:1870 +#: ../src/widgets/toolbox.cpp:1877 msgid "Page border" msgstr "" -#: ../src/widgets/toolbox.cpp:1870 +#: ../src/widgets/toolbox.cpp:1877 msgid "Snap to the page border" msgstr "" -#: ../src/widgets/toolbox.cpp:1879 +#: ../src/widgets/toolbox.cpp:1886 msgid "Snap to grids" msgstr "" -#: ../src/widgets/toolbox.cpp:1888 +#: ../src/widgets/toolbox.cpp:1895 msgid "Snap guides" msgstr "" @@ -30699,11 +30826,11 @@ msgid "" "No paths where found. Please convert all objects you want to save into paths." msgstr "" -#: ../share/extensions/inkex.py:116 +#: ../share/extensions/inkex.py:117 #, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " -"this extension. Please download and install the latest version from http://" +"this extension.Please download and install the latest version from http://" "cheeseshop.python.org/pypi/lxml/, or install it through your package manager " "by a command like: sudo apt-get install python-lxml\n" "\n" @@ -30711,22 +30838,22 @@ msgid "" "%s" msgstr "" -#: ../share/extensions/inkex.py:172 +#: ../share/extensions/inkex.py:185 #, python-format msgid "Unable to open specified file: %s" msgstr "" -#: ../share/extensions/inkex.py:181 +#: ../share/extensions/inkex.py:194 #, python-format msgid "Unable to open object member file: %s" msgstr "" -#: ../share/extensions/inkex.py:286 +#: ../share/extensions/inkex.py:299 #, python-format msgid "No matching node for expression: %s" msgstr "" -#: ../share/extensions/inkex.py:340 +#: ../share/extensions/inkex.py:358 msgid "SVG Width not set correctly! Assuming width = 100" msgstr "" @@ -30932,8 +31059,7 @@ msgid "Area is zero, cannot calculate Center of Mass" msgstr "" #: ../share/extensions/pathalongpath.py:208 -#: ../share/extensions/pathscatter.py:228 -#: ../share/extensions/perspective.py:52 +#: ../share/extensions/pathscatter.py:228 ../share/extensions/perspective.py:52 msgid "This extension requires two selected paths." msgstr "" @@ -30962,36 +31088,31 @@ msgid "" "numpy." msgstr "" -#: ../share/extensions/perspective.py:60 -#: ../share/extensions/summersnight.py:51 +#: ../share/extensions/perspective.py:60 ../share/extensions/summersnight.py:51 #, python-format msgid "" "The first selected object is of type '%s'.\n" "Try using the procedure Path->Object to Path." msgstr "" -#: ../share/extensions/perspective.py:67 -#: ../share/extensions/summersnight.py:59 +#: ../share/extensions/perspective.py:67 ../share/extensions/summersnight.py:59 msgid "" "This extension requires that the second selected path be four nodes long." msgstr "" -#: ../share/extensions/perspective.py:93 -#: ../share/extensions/summersnight.py:92 +#: ../share/extensions/perspective.py:93 ../share/extensions/summersnight.py:92 msgid "" "The second selected object is a group, not a path.\n" "Try using the procedure Object->Ungroup." msgstr "" -#: ../share/extensions/perspective.py:95 -#: ../share/extensions/summersnight.py:94 +#: ../share/extensions/perspective.py:95 ../share/extensions/summersnight.py:94 msgid "" "The second selected object is not a path.\n" "Try using the procedure Path->Object to Path." msgstr "" -#: ../share/extensions/perspective.py:98 -#: ../share/extensions/summersnight.py:97 +#: ../share/extensions/perspective.py:98 ../share/extensions/summersnight.py:97 msgid "" "The first selected object is not a path.\n" "Try using the procedure Path->Object to Path." @@ -31152,7 +31273,7 @@ msgid "" "and install into your Inkscape's Python location\n" msgstr "" -#: ../share/extensions/voronoi2svg.py:198 +#: ../share/extensions/voronoi2svg.py:206 msgid "Please select objects!" msgstr "" @@ -31468,25 +31589,30 @@ msgstr "" msgid "Randomize" msgstr "" -#: ../share/extensions/color_randomize.inx.h:5 +#: ../share/extensions/color_randomize.inx.h:4 #, no-c-format msgid "Hue range (%)" msgstr "" -#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_randomize.inx.h:6 #, no-c-format msgid "Saturation range (%)" msgstr "" -#: ../share/extensions/color_randomize.inx.h:11 +#: ../share/extensions/color_randomize.inx.h:8 #, no-c-format msgid "Lightness range (%)" msgstr "" -#: ../share/extensions/color_randomize.inx.h:13 +#: ../share/extensions/color_randomize.inx.h:10 +#, no-c-format +msgid "Opacity range (%)" +msgstr "" + +#: ../share/extensions/color_randomize.inx.h:12 msgid "" -"Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB. Lower the range values to limit the distance " +"Randomizes hue, saturation, lightness and/or opacity (opacity randomization " +"only for objects and groups). Change the range values to limit the distance " "between the original color and the randomized one." msgstr "" @@ -32582,6 +32708,7 @@ msgstr "" #: ../share/extensions/gcodetools_graffiti.inx.h:29 #: ../share/extensions/gcodetools_lathe.inx.h:30 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:19 +#: ../share/extensions/nicechart.inx.h:4 msgid "File:" msgstr "" @@ -33546,28 +33673,24 @@ msgid "" msgstr "" #: ../share/extensions/hpgl_input.inx.h:3 -#: ../share/extensions/hpgl_output.inx.h:4 -#: ../share/extensions/plotter.inx.h:32 +#: ../share/extensions/hpgl_output.inx.h:4 ../share/extensions/plotter.inx.h:32 msgid "Resolution X (dpi):" msgstr "" #: ../share/extensions/hpgl_input.inx.h:4 -#: ../share/extensions/hpgl_output.inx.h:5 -#: ../share/extensions/plotter.inx.h:33 +#: ../share/extensions/hpgl_output.inx.h:5 ../share/extensions/plotter.inx.h:33 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the X axis " "(Default: 1016.0)" msgstr "" #: ../share/extensions/hpgl_input.inx.h:5 -#: ../share/extensions/hpgl_output.inx.h:6 -#: ../share/extensions/plotter.inx.h:34 +#: ../share/extensions/hpgl_output.inx.h:6 ../share/extensions/plotter.inx.h:34 msgid "Resolution Y (dpi):" msgstr "" #: ../share/extensions/hpgl_input.inx.h:6 -#: ../share/extensions/hpgl_output.inx.h:7 -#: ../share/extensions/plotter.inx.h:35 +#: ../share/extensions/hpgl_output.inx.h:7 ../share/extensions/plotter.inx.h:35 msgid "" "The amount of steps the plotter moves if it moves for 1 inch on the Y axis " "(Default: 1016.0)" @@ -33601,18 +33724,15 @@ msgid "" "serial connection." msgstr "" -#: ../share/extensions/hpgl_output.inx.h:3 -#: ../share/extensions/plotter.inx.h:31 +#: ../share/extensions/hpgl_output.inx.h:3 ../share/extensions/plotter.inx.h:31 msgid "Plotter Settings " msgstr "" -#: ../share/extensions/hpgl_output.inx.h:8 -#: ../share/extensions/plotter.inx.h:36 +#: ../share/extensions/hpgl_output.inx.h:8 ../share/extensions/plotter.inx.h:36 msgid "Pen number:" msgstr "" -#: ../share/extensions/hpgl_output.inx.h:9 -#: ../share/extensions/plotter.inx.h:37 +#: ../share/extensions/hpgl_output.inx.h:9 ../share/extensions/plotter.inx.h:37 msgid "The number of the pen (tool) to use (Standard: '1')" msgstr "" @@ -33933,13 +34053,11 @@ msgstr "" msgid "Interpolate style" msgstr "" -#: ../share/extensions/interp.inx.h:7 -#: ../share/extensions/interp_att_g.inx.h:10 +#: ../share/extensions/interp.inx.h:7 ../share/extensions/interp_att_g.inx.h:10 msgid "Use Z-order" msgstr "" -#: ../share/extensions/interp.inx.h:8 -#: ../share/extensions/interp_att_g.inx.h:11 +#: ../share/extensions/interp.inx.h:8 ../share/extensions/interp_att_g.inx.h:11 msgid "Workaround for reversed selection order in Live Preview cycles" msgstr "" @@ -34888,6 +35006,154 @@ msgstr "" msgid "View Next Glyph" msgstr "" +#: ../share/extensions/nicechart.inx.h:1 +msgid "NiceCharts" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:2 +msgid "Data" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:3 +msgid "Data from file" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:5 +msgid "Delimiter:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:6 +msgid "Column that contains the keys:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:7 +msgid "Column that contains the values:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:8 +msgid "File encoding (e.g. utf-8):" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:9 +msgid "First line contains headings" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:10 +msgid "Direct input" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:11 +msgid "Data:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:12 +msgid "Enter the full path to a CSV file:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:13 +msgid "Type in comma separated values:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:14 +msgid "(format like this: apples:3,bananas:5)" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:15 +msgid "Labels" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:16 +msgid "Font:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:18 +msgid "Font color:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:19 +msgid "Charts" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:20 +msgid "Draw horizontally" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:21 +msgid "Bar length:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:22 +msgid "Bar width:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:23 +msgid "Pie radius:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:24 +msgid "Bar offset:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:26 +msgid "Offset between chart and labels:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:27 +msgid "Offset between chart and chart title:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:28 +msgid "Work around aliasing effects (creates overlapping segments)" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:29 +msgid "Color scheme:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:30 +msgid "Custom colors:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:31 +msgid "Reverse color scheme" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:32 +msgid "Drop shadow" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:37 +msgid "SAP" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:38 +msgid "Values" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:39 +msgid "Show values" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:40 +msgid "Chart type:" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:41 +msgid "Bar chart" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:42 +msgid "Pie chart" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:43 +msgid "Pie chart (percentage)" +msgstr "" + +#: ../share/extensions/nicechart.inx.h:44 +msgid "Stacked bar chart" +msgstr "" + #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" msgstr "" @@ -35271,8 +35537,7 @@ msgstr "" msgid "AutoCAD Plot Input" msgstr "" -#: ../share/extensions/plt_input.inx.h:2 -#: ../share/extensions/plt_output.inx.h:2 +#: ../share/extensions/plt_input.inx.h:2 ../share/extensions/plt_output.inx.h:2 msgid "HP Graphics Language Plot file [AutoCAD] (*.plt)" msgstr "" @@ -36190,8 +36455,7 @@ msgstr "" msgid "sK1 vector graphics files input" msgstr "" -#: ../share/extensions/sk1_input.inx.h:2 -#: ../share/extensions/sk1_output.inx.h:2 +#: ../share/extensions/sk1_input.inx.h:2 ../share/extensions/sk1_output.inx.h:2 msgid "sK1 vector graphics files (*.sk1)" msgstr "" @@ -36668,22 +36932,42 @@ msgid "Show the bounding box" msgstr "" #: ../share/extensions/voronoi2svg.inx.h:6 -msgid "Delaunay Triangulation" +msgid "Triangles color" msgstr "" #: ../share/extensions/voronoi2svg.inx.h:7 -msgid "Voronoi and Delaunay" +msgid "Delaunay Triangulation" msgstr "" #: ../share/extensions/voronoi2svg.inx.h:8 +msgid "Voronoi and Delaunay" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:9 msgid "Options for Voronoi diagram" msgstr "" -#: ../share/extensions/voronoi2svg.inx.h:10 +#: ../share/extensions/voronoi2svg.inx.h:11 msgid "Automatic from selected objects" msgstr "" #: ../share/extensions/voronoi2svg.inx.h:12 +msgid "Options for Delaunay Triangulation" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:13 +msgid "Default (Stroke black and no fill)" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:14 +msgid "Triangles with item color" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:15 +msgid "Triangles with item color (random on apply)" +msgstr "" + +#: ../share/extensions/voronoi2svg.inx.h:17 msgid "" "Select a set of objects. Their centroids will be used as the sites of the " "Voronoi diagram. Text objects are not handled." @@ -37088,13 +37372,11 @@ msgstr "" msgid "Hide lines behind the sphere" msgstr "" -#: ../share/extensions/wmf_input.inx.h:1 -#: ../share/extensions/wmf_output.inx.h:1 +#: ../share/extensions/wmf_input.inx.h:1 ../share/extensions/wmf_output.inx.h:1 msgid "Windows Metafile Input" msgstr "" -#: ../share/extensions/wmf_input.inx.h:3 -#: ../share/extensions/wmf_output.inx.h:3 +#: ../share/extensions/wmf_input.inx.h:3 ../share/extensions/wmf_output.inx.h:3 msgid "A popular graphics file format for clipart" msgstr "" -- cgit v1.2.3 From add4c0a5a08febba27f376ee2649ce766a551b1c Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Sat, 14 May 2016 22:31:37 +0200 Subject: Fixing build.xml file after Python update in the devlibs. (bzr r14886) --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 2589eb103..498b2ecfc 100644 --- a/build.xml +++ b/build.xml @@ -761,12 +761,12 @@ - + - + -- cgit v1.2.3 From 424f8f6d1fd8e77e948edbe9fe9a712b75ec5385 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 15 May 2016 10:21:07 +0200 Subject: GTK3: Fix compile for GTK3 versions less than 3.16. (bzr r14887) --- src/main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 99e3ccfe6..4ce8ff145 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1068,10 +1068,12 @@ sp_main_gui(int argc, char const **argv) try { provider->load_from_path (inkscape_style); } +#if GTK_CHECK_VERSION(3,16,0) catch (const Gtk::CssProviderError& ex) { std::cerr << "CSSProviderError::load_from_path(): failed to load: " << inkscape_style << "\n (" << ex.what() << ")" << std::endl; } +#endif Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); Glib::ustring user_style = Inkscape::Application::profile_path("ui/style.css"); @@ -1080,8 +1082,10 @@ sp_main_gui(int argc, char const **argv) try { provider2->load_from_path (user_style); } +#if GTK_CHECK_VERSION(3,16,0) catch (const Gtk::CssProviderError& ex) {} +#endif Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); #endif -- cgit v1.2.3 From 3af39402688bbb3c73b5e74161a3297cb4ccbe6f Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Sun, 15 May 2016 11:07:00 -0400 Subject: modify build files for COPYING.LIB->LGPL2.1.txt, as per http://article.gmane.org/gmane.comp.graphics.inkscape.devel/48212 (bzr r14888) --- build-lx.xml | 2 +- build-x64-gtk3.xml | 2 +- build-x64.xml | 2 +- build.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-lx.xml b/build-lx.xml index f00b4551e..c62b836b6 100644 --- a/build-lx.xml +++ b/build-lx.xml @@ -435,7 +435,7 @@ - + diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml index ffea1a848..edc15305f 100644 --- a/build-x64-gtk3.xml +++ b/build-x64-gtk3.xml @@ -685,7 +685,7 @@ - + diff --git a/build-x64.xml b/build-x64.xml index 35373a5c9..509d5bbb5 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -671,7 +671,7 @@ - + diff --git a/build.xml b/build.xml index 498b2ecfc..186af2cde 100644 --- a/build.xml +++ b/build.xml @@ -652,7 +652,7 @@ - + -- cgit v1.2.3 From b24b02a0474d6bdaba2e5a77fe91e285217abccd Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Sun, 15 May 2016 21:47:09 +0200 Subject: Added normalized path to flowtext Fixed bugs: - https://launchpad.net/bugs/1555152 (bzr r14889) --- src/sp-flowtext.h | 5 +++++ src/splivarot.cpp | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/sp-flowtext.h b/src/sp-flowtext.h index 9e6046469..9ee676893 100644 --- a/src/sp-flowtext.h +++ b/src/sp-flowtext.h @@ -49,6 +49,11 @@ public: bool _optimizeScaledText; + /** Converts the text object to its component curves */ + SPCurve *getNormalizedBpath() const { + return layout.convertToCurves(); + } + /** Optimize scaled flow text on next set_transform. */ void optimizeScaledText() {_optimizeScaledText = true;} diff --git a/src/splivarot.cpp b/src/splivarot.cpp index c37df151c..1bc6da3e1 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -1776,11 +1776,14 @@ sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset) SPItem *item = *l; SPCurve *curve = NULL; - if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item)) + if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item) && !SP_IS_FLOWTEXT(item)) continue; else if (SP_IS_SHAPE(item)) { curve = SP_SHAPE(item)->getCurve(); } + else if (SP_IS_FLOWTEXT(item)) { + curve = SP_FLOWTEXT(item)->getNormalizedBpath(); + } else { // Item must be SP_TEXT curve = SP_TEXT(item)->getNormalizedBpath(); } -- cgit v1.2.3 From fa0599a0d660f2eadfb563d16750dafdbfdb584d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 15 May 2016 22:14:30 +0200 Subject: GTK3: Give names to many widgets. Useful for debugging and for using CSS. (bzr r14890) --- src/ui/widget/dock.cpp | 1 + src/widgets/desktop-widget.cpp | 39 +++++++++++++++++++++++++++++---------- src/widgets/toolbox.cpp | 5 +++++ 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp index c5e14d4f0..fda647182 100644 --- a/src/ui/widget/dock.cpp +++ b/src/ui/widget/dock.cpp @@ -56,6 +56,7 @@ Dock::Dock(Gtk::Orientation orientation) #endif _scrolled_window (Gtk::manage(new Gtk::ScrolledWindow)) { + _scrolled_window->set_name("Dock"); #if WITH_GDL_3_6 gtk_orientable_set_orientation(GTK_ORIENTABLE(_gdl_dock_bar), static_cast(orientation)); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 1a4fcccf4..4bd32daca 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -346,6 +346,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) /* Main table */ #if GTK_CHECK_VERSION(3,0,0) dtw->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_name(dtw->vbox, "DesktopMainTable"); #else dtw->vbox = gtk_vbox_new (FALSE, 0); #endif @@ -353,6 +354,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) dtw->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + gtk_widget_set_name(dtw->statusbar, "DesktopStatusBar"); #else dtw->statusbar = gtk_hbox_new (FALSE, 0); #endif @@ -364,7 +366,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->panels = new SwatchesPanel("/embedded/swatches" /*false*/); dtw->panels->setOrientation(SP_ANCHOR_SOUTH); - + dtw->panels->set_name("SwatchesPanel"); #if GTK_CHECK_VERSION(3,0,0) dtw->panels->set_vexpand(false); #endif @@ -374,6 +376,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) dtw->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + gtk_widget_set_name(dtw->hbox, "DesktopHbox"); #else dtw->hbox = gtk_hbox_new(FALSE, 0); #endif @@ -404,7 +407,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) Glib::RefPtr guides_lock_style_provider = Gtk::CssProvider::create(); guides_lock_style_provider->load_from_data("GtkWidget { padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; }"); Gtk::Widget * wnd = Glib::wrap(dtw->guides_lock); - wnd->set_name("guides_lock"); + wnd->set_name("LockGuides"); Glib::RefPtr context = wnd->get_style_context(); context->add_provider(guides_lock_style_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); #endif @@ -412,6 +415,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) /* Horizontal ruler */ GtkWidget *eventbox = gtk_event_box_new (); dtw->hruler = sp_ruler_new(GTK_ORIENTATION_HORIZONTAL); + gtk_widget_set_name(dtw->hruler, "HorizontalRuler"); dtw->hruler_box = eventbox; Inkscape::Util::Unit const *pt = unit_table.getUnit("pt"); sp_ruler_set_unit(SP_RULER(dtw->hruler), pt); @@ -422,13 +426,15 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect (G_OBJECT (eventbox), "motion_notify_event", G_CALLBACK (sp_dt_hruler_event), dtw); #if GTK_CHECK_VERSION(3,0,0) - GtkWidget *tbl = gtk_grid_new(); + GtkWidget *tbl_wrapper = gtk_grid_new(); // Is this widget really needed? + gtk_widget_set_name(tbl_wrapper, "CanvasTableWrapper"); dtw->canvas_tbl = gtk_grid_new(); + gtk_widget_set_name(dtw->canvas_tbl, "CanvasTable"); gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), dtw->guides_lock, 0, 0, 1, 1); gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), eventbox, 1, 0, 1, 1); #else - GtkWidget *tbl = gtk_table_new(2, 3, FALSE); + GtkWidget *tbl_wrapper = gtk_table_new(2, 3, FALSE); dtw->canvas_tbl = gtk_table_new(3, 3, FALSE); gtk_table_attach(GTK_TABLE(dtw->canvas_tbl), @@ -443,11 +449,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) 0, 0); #endif g_signal_connect (G_OBJECT (dtw->guides_lock), "toggled", G_CALLBACK (sp_update_guides_lock), dtw); - gtk_box_pack_start( GTK_BOX(dtw->hbox), tbl, TRUE, TRUE, 1 ); + gtk_box_pack_start( GTK_BOX(dtw->hbox), tbl_wrapper, TRUE, TRUE, 1 ); /* Vertical ruler */ eventbox = gtk_event_box_new (); dtw->vruler = sp_ruler_new(GTK_ORIENTATION_VERTICAL); + gtk_widget_set_name(dtw->vruler, "VerticalRuler"); /* Vertical ruler */ dtw->vruler_box = eventbox; @@ -477,6 +484,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) dtw->hscrollbar = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (dtw->hadj)); + gtk_widget_set_name(dtw->hscrollbar, "HorizontalScrollbar"); gtk_grid_attach(GTK_GRID(dtw->canvas_tbl), dtw->hscrollbar, 1, 2, 1, 1); dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); #else @@ -493,6 +501,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) NULL, INKSCAPE_ICON("zoom-original"), _("Zoom drawing if window size changes")); + gtk_widget_set_name(dtw->sticky_zoom, "StickyZoom"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("/options/stickyzoom/value")); gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->sticky_zoom, FALSE, FALSE, 0); g_signal_connect (G_OBJECT (dtw->sticky_zoom), "toggled", G_CALLBACK (sp_dtw_sticky_zoom_toggled), dtw); @@ -502,6 +511,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) dtw->vscrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT(dtw->vadj)); + gtk_widget_set_name(dtw->vscrollbar, "VerticalScrollbar"); #else dtw->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (dtw->vadj)); #endif @@ -529,6 +539,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) NULL, INKSCAPE_ICON("color-management"), tip ); + gtk_widget_set_name(dtw->cms_adjust, "CMS_Adjust"); + #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) { Glib::ustring current = prefs->getString("/options/displayprofile/uri"); @@ -608,9 +620,9 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) if (create_dock) { dtw->dock = new Inkscape::UI::Widget::Dock(); - #if WITH_GTKMM_3_0 Gtk::Paned *paned = new Gtk::Paned(); + paned->set_name("Canvas_and_Dock"); #else Gtk::HPaned *paned = new Gtk::HPaned(); #endif @@ -627,9 +639,9 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) gtk_widget_set_hexpand(GTK_WIDGET(paned->gobj()), TRUE); gtk_widget_set_vexpand(GTK_WIDGET(paned->gobj()), TRUE); - gtk_grid_attach(GTK_GRID(tbl), GTK_WIDGET (paned->gobj()), 1, 1, 1, 1); + gtk_grid_attach(GTK_GRID(tbl_wrapper), GTK_WIDGET (paned->gobj()), 1, 1, 1, 1); #else - gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (paned->gobj()), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + gtk_table_attach (GTK_TABLE (tbl_wrapper), GTK_WIDGET (paned->gobj()), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0); #endif @@ -637,9 +649,9 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) gtk_widget_set_hexpand(GTK_WIDGET(dtw->canvas_tbl), TRUE); gtk_widget_set_vexpand(GTK_WIDGET(dtw->canvas_tbl), TRUE); - gtk_grid_attach(GTK_GRID(tbl), GTK_WIDGET (dtw->canvas_tbl), 1, 1, 1, 1); + gtk_grid_attach(GTK_GRID(tbl_wrapper), GTK_WIDGET (dtw->canvas_tbl), 1, 1, 1, 1); #else - gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (dtw->canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + gtk_table_attach (GTK_TABLE (tbl_wrapper), GTK_WIDGET (dtw->canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0); #endif } @@ -661,10 +673,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect (G_OBJECT (dtw->vadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); GtkWidget *statusbar_tail=gtk_statusbar_new(); + gtk_widget_set_name(statusbar_tail, "StatusBarTail"); gtk_box_pack_end (GTK_BOX (dtw->statusbar), statusbar_tail, FALSE, FALSE, 0); // zoom status spinbutton dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1); + gtk_widget_set_name(dtw->zoom_status, "ZoomStatus"); gtk_widget_set_tooltip_text (dtw->zoom_status, _("Zoom")); gtk_widget_set_size_request (dtw->zoom_status, STATUS_ZOOM_WIDTH, -1); gtk_entry_set_width_chars (GTK_ENTRY (dtw->zoom_status), 6); @@ -681,6 +695,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) // cursor coordinates #if GTK_CHECK_VERSION(3,0,0) dtw->coord_status = gtk_grid_new(); + gtk_widget_set_name(dtw->coord_status, "CoordinateStatus"); gtk_grid_set_row_spacing(GTK_GRID(dtw->coord_status), 0); gtk_grid_set_column_spacing(GTK_GRID(dtw->coord_status), 2); GtkWidget* sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); @@ -721,6 +736,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_label_set_markup( GTK_LABEL(dtw->coord_status_y), " 0.00 " ); GtkWidget* label_z = gtk_label_new(_("Z:")); + gtk_widget_set_name(label_z, "ZLabel"); #if GTK_CHECK_VERSION(3,0,0) gtk_widget_set_halign(dtw->coord_status_x, GTK_ALIGN_END); @@ -762,6 +778,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect( G_OBJECT(dtw->_tracker), "changed", G_CALLBACK(sp_dtw_color_profile_event), dtw ); dtw->select_status_eventbox = gtk_event_box_new (); + gtk_widget_set_name(dtw->select_status_eventbox, "SelectStatusEventBox"); dtw->select_status = gtk_label_new (NULL); gtk_label_set_ellipsize (GTK_LABEL(dtw->select_status), PANGO_ELLIPSIZE_END); @@ -1453,6 +1470,7 @@ bool SPDesktopWidget::showInfoDialog( Glib::ustring const &message ) GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message.c_str()); + gtk_widget_set_name(dialog, "InfoDialog"); gtk_window_set_title( GTK_WINDOW(dialog), _("Note:")); // probably want to take this as a parameter. gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); @@ -1765,6 +1783,7 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview) dtw->layer_selector->setDesktop(dtw->desktop); dtw->menubar = sp_ui_main_menubar (dtw->desktop); + gtk_widget_set_name(dtw->menubar, "MenuBar"); gtk_widget_show_all (dtw->menubar); gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0); diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 0697ff0fb..6c3997657 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -999,6 +999,7 @@ static GtkWidget* toolboxNewCommon( GtkWidget* tb, BarId id, GtkPositionType /*h gtk_widget_set_sensitive(tb, FALSE); GtkWidget *hb = gtk_event_box_new(); // A simple, neutral container. + gtk_widget_set_name(hb, "ToolboxCommon"); gtk_container_add(GTK_CONTAINER(hb), tb); gtk_widget_show(GTK_WIDGET(tb)); @@ -1016,6 +1017,7 @@ GtkWidget *ToolboxFactory::createToolToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_name(tb, "ToolToolbox"); gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); @@ -1028,6 +1030,7 @@ GtkWidget *ToolboxFactory::createAuxToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_name(tb, "AuxToolbox"); gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); @@ -1044,6 +1047,7 @@ GtkWidget *ToolboxFactory::createCommandsToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_name(tb, "CommandsToolbox"); gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); @@ -1056,6 +1060,7 @@ GtkWidget *ToolboxFactory::createSnapToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_name(tb, "SnapToolbox"); gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); -- cgit v1.2.3 From 1984f31c4efcc8be0cdd90a9eb7cc4882890f3cd Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Mon, 16 May 2016 12:35:28 +0200 Subject: GTK3: Fix compile for GTK3 versions less than 3.16. Try 2. (bzr r14891) --- src/main.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 4ce8ff145..07d970d59 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1065,28 +1065,39 @@ sp_main_gui(int argc, char const **argv) inkscape_style += "/style.css"; // std::cout << "CSS Stylesheet Inkscape: " << inkscape_style << std::endl; Glib::RefPtr provider = Gtk::CssProvider::create(); + + // From 3.16, throws an error which we must catch. try { provider->load_from_path (inkscape_style); } #if GTK_CHECK_VERSION(3,16,0) + // Gtk::CssProviderError not defined until 3.16. catch (const Gtk::CssProviderError& ex) { std::cerr << "CSSProviderError::load_from_path(): failed to load: " << inkscape_style << "\n (" << ex.what() << ")" << std::endl; } +#else + catch (...) + {} #endif + provider->load_from_path (inkscape_style); + Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); Glib::ustring user_style = Inkscape::Application::profile_path("ui/style.css"); // std::cout << "CSS Stylesheet User: " << user_style << std::endl; Glib::RefPtr provider2 = Gtk::CssProvider::create(); + + // From 3.16, throws an error which we must catch. try { provider2->load_from_path (user_style); } -#if GTK_CHECK_VERSION(3,16,0) - catch (const Gtk::CssProviderError& ex) + catch (...) {} -#endif + provider2->load_from_path (user_style); + Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + #endif gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); -- cgit v1.2.3 From af7395f396e12ad136af68dee514bbe362cdf101 Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Mon, 16 May 2016 07:02:58 -0400 Subject: copy files GPL2.txt and GPL3.txt (bzr r14892) --- build-lx.xml | 2 ++ build-x64-gtk3.xml | 2 ++ build-x64.xml | 2 ++ build.xml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/build-lx.xml b/build-lx.xml index c62b836b6..5bc10da39 100644 --- a/build-lx.xml +++ b/build-lx.xml @@ -435,6 +435,8 @@ + + diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml index edc15305f..c9f6db905 100644 --- a/build-x64-gtk3.xml +++ b/build-x64-gtk3.xml @@ -685,6 +685,8 @@ + + diff --git a/build-x64.xml b/build-x64.xml index 509d5bbb5..b83e5137e 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -671,6 +671,8 @@ + + diff --git a/build.xml b/build.xml index 186af2cde..0485365d3 100644 --- a/build.xml +++ b/build.xml @@ -652,6 +652,8 @@ + + -- cgit v1.2.3 From 13368e189e2189c9dff0b5cc11fff4acdf90ba54 Mon Sep 17 00:00:00 2001 From: TimeWaster Date: Mon, 16 May 2016 16:26:25 +0200 Subject: Extensions: Corrected pySerial download information in plotting extension (bzr r14893) --- share/extensions/plotter.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index 60858cc6c..1c4a683c1 100755 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -144,10 +144,12 @@ class Plot(inkex.Effect): try: import serial except ImportError, e: - inkex.errormsg(_("pySerial is not installed." - + "\n\n1. Download pySerial here (not the \".exe\"!): http://pypi.python.org/pypi/pyserial" - + "\n2. Extract the \"serial\" subfolder from the zip to the following folder: C:\\[Program files]\\inkscape\\python\\Lib\\" - + "\n3. Restart Inkscape.")) + inkex.errormsg(_("pySerial is not installed. Please follow these steps:") + + "\n\n" + _("1. Download and extract (unzip) this file to your local harddisk:") + + "\n" + " https://pypi.python.org/packages/source/p/pyserial/pyserial-2.7.tar.gz" + + "\n" + _("2. Copy the \"serial\" folder (Can be found inside the just extracted folder)") + + "\n" + _(" into the following Inkscape folder: C:\\\\inkscape\\python\\Lib\\") + + "\n" + _("3. Close and restart Inkscape.")) return # init serial framework mySerial = serial.Serial() -- cgit v1.2.3 From f93510e1fdca73da2e7755a5c2a40341e9355830 Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Mon, 16 May 2016 16:40:00 +0200 Subject: UI. Fixing typos in original strings. Translations. PO template update. (bzr r14894) --- po/inkscape.pot | 18 +++++++----------- src/live_effects/lpe-mirror_symmetry.cpp | 2 +- src/ui/dialog/inkscape-preferences.cpp | 4 ++-- src/widgets/eraser-toolbar.cpp | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/po/inkscape.pot b/po/inkscape.pot index 988d77c9f..76ce4fa0b 100644 --- a/po/inkscape.pot +++ b/po/inkscape.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2016-05-13 22:07+0200\n" +"POT-Creation-Date: 2016-05-16 16:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -10298,7 +10298,7 @@ msgid "Fuse original and the reflection into a single path" msgstr "" #: ../src/live_effects/lpe-mirror_symmetry.cpp:75 -msgid "Oposite fuse" +msgid "Opposite fuse" msgstr "" #: ../src/live_effects/lpe-mirror_symmetry.cpp:75 @@ -11695,7 +11695,7 @@ msgstr "" msgid "Start Inkscape in interactive shell mode." msgstr "" -#: ../src/main.cpp:876 ../src/main.cpp:1318 +#: ../src/main.cpp:876 ../src/main.cpp:1322 msgid "" "[OPTIONS...] [FILE...]\n" "\n" @@ -17128,11 +17128,11 @@ msgid "Base simplify:" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:213 -msgid "on dinamic LPE simplify" +msgid "on dynamic LPE simplify" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:214 -msgid "Base simplify of dinamic LPE based simplify" +msgid "Base simplify of dynamic LPE based simplify" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:229 @@ -27872,12 +27872,8 @@ msgstr "" msgid "Increase to make the eraser drag behind, as if slowed by inertia" msgstr "" -#: ../src/widgets/eraser-toolbar.cpp:186 -msgid "Break appart cutted items" -msgstr "" - -#: ../src/widgets/eraser-toolbar.cpp:187 -msgid "Break appart cutted itemss" +#: ../src/widgets/eraser-toolbar.cpp:186 ../src/widgets/eraser-toolbar.cpp:187 +msgid "Break apart cut items" msgstr "" #: ../src/widgets/fill-style.cpp:356 diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp index 88fee4c47..9f3070ff4 100644 --- a/src/live_effects/lpe-mirror_symmetry.cpp +++ b/src/live_effects/lpe-mirror_symmetry.cpp @@ -72,7 +72,7 @@ LPEMirrorSymmetry::LPEMirrorSymmetry(LivePathEffectObject *lpeobject) : mode(_("Mode"), _("Symmetry move mode"), "mode", MTConverter, &wr, this, MT_FREE), discard_orig_path(_("Discard original path?"), _("Check this to only keep the mirrored part of the path"), "discard_orig_path", &wr, this, false), fuse_paths(_("Fuse paths"), _("Fuse original and the reflection into a single path"), "fuse_paths", &wr, this, false), - oposite_fuse(_("Oposite fuse"), _("Picks the other side of the mirror as the original"), "oposite_fuse", &wr, this, false), + oposite_fuse(_("Opposite fuse"), _("Picks the other side of the mirror as the original"), "oposite_fuse", &wr, this, false), start_point(_("Start mirror line"), _("Start mirror line"), "start_point", &wr, this, "Adjust the start of mirroring"), end_point(_("End mirror line"), _("End mirror line"), "end_point", &wr, this, "Adjust end of mirroring") { diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index c7a168dee..30bbd95c9 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -210,8 +210,8 @@ void InkscapePreferences::AddBaseSimplifySpinbutton(DialogPage &p, Glib::ustring { PrefSpinButton* sb = Gtk::manage( new PrefSpinButton); sb->init ( prefs_path + "/base-simplify", 0.0, 100.0, 1.0, 10.0, def_value, false, false); - p.add_line( false, _("Base simplify:"), *sb, _("on dinamic LPE simplify"), - _("Base simplify of dinamic LPE based simplify"), + p.add_line( false, _("Base simplify:"), *sb, _("on dynamic LPE simplify"), + _("Base simplify of dynamic LPE based simplify"), false ); } diff --git a/src/widgets/eraser-toolbar.cpp b/src/widgets/eraser-toolbar.cpp index 45989936f..bb553f4e6 100644 --- a/src/widgets/eraser-toolbar.cpp +++ b/src/widgets/eraser-toolbar.cpp @@ -183,8 +183,8 @@ void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb /* Overlap */ { InkToggleAction* act = ink_toggle_action_new( "EraserBreakAppart", - _("Break appart cutted items"), - _("Break appart cutted itemss"), + _("Break apart cut items"), + _("Break apart cut items"), INKSCAPE_ICON("distribute-randomize"), secondarySize ); gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/eraser/break_apart", false) ); -- cgit v1.2.3 From 157c71ad98aa683fed72e9a82e6fc7d2df04df39 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Mon, 16 May 2016 16:42:23 +0200 Subject: Translations. Ukrainian translation update. Fixed bugs: - https://launchpad.net/bugs/1407331 (bzr r14895) --- po/uk.po | 6486 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 3614 insertions(+), 2872 deletions(-) diff --git a/po/uk.po b/po/uk.po index 9ab3fbdc5..4f7751c08 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,13 +7,13 @@ # Yuri Syrota , 2000. # Maxim Dziumanenko , 2004-2007. # Alex , 2005. -# Yuri Chornoivan , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Yuri Chornoivan , 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-12-26 15:46+0200\n" -"PO-Revision-Date: 2015-12-26 19:16+0200\n" +"POT-Creation-Date: 2016-05-14 17:02+0300\n" +"PO-Revision-Date: 2016-05-14 22:34+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -24,14 +24,46 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: ../inkscape.desktop.in.h:1 +#: ../inkscape.appdata.xml.in.h:1 ../inkscape.desktop.in.h:1 msgid "Inkscape" msgstr "Inkscape" -#: ../inkscape.desktop.in.h:2 +#: ../inkscape.appdata.xml.in.h:2 ../inkscape.desktop.in.h:2 msgid "Vector Graphics Editor" msgstr "Редактор векторної графіки" +#: ../inkscape.appdata.xml.in.h:3 +msgid "" +"An Open Source vector graphics editor, with capabilities similar to " +"Illustrator, CorelDraw, or Xara X, using the W3C standard Scalable Vector " +"Graphics (SVG) file format." +msgstr "" +"Засіб для редагування векторної графіки із відкритим кодом. Можливості " +"програми подібні до можливостей Illustrator, CorelDraw або Xara X. Для " +"зберігання даних у програмі використано стандарт W3C для формату файлів " +"масштабованої векторної графіки (SVG)." + +#: ../inkscape.appdata.xml.in.h:4 +msgid "" +"Inkscape supports many advanced SVG features (markers, clones, alpha " +"blending, etc.) and great care is taken in designing a streamlined " +"interface. It is very easy to edit nodes, perform complex path operations, " +"trace bitmaps and much more. We also aim to maintain a thriving user and " +"developer community by using open, community-oriented development." +msgstr "" +"У Inkscape передбачено підтримку багатьох складних можливостей SVG (маркерів, " +"клонів, накладань із прозорістю тощо) та приділено значну увагу створенню " +"якомога простішого інтерфейсу. За допомогою цієї програми дуже просто " +"редагувати розташування вузлів контуру, виконувати складні дії з контуром, " +"перетворювати растрові зображення на векторні (трасувати зображення) тощо. " +"Супровід програми здійснюється зацікавленою у цьому спільнотою користувачів " +"та розробників на основі принципів відкритої розробки із орієнтацією на " +"потреби спільноти." + +#: ../inkscape.appdata.xml.in.h:5 +msgid "Main application window" +msgstr "Основне вікно програми" + #: ../inkscape.desktop.in.h:3 msgid "Inkscape Vector Graphics Editor" msgstr "Редактор векторної графіки Inkscape" @@ -305,7 +337,7 @@ msgstr "Імітувати малювання олійною фарбою" #. Pencil #: ../share/filters/filters.svg.h:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:424 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 msgid "Pencil" msgstr "Олівець" @@ -1111,7 +1143,7 @@ msgstr "Чорне світло" #: ../share/extensions/color_morelight.inx.h:2 #: ../share/extensions/color_moresaturation.inx.h:2 #: ../share/extensions/color_negative.inx.h:2 -#: ../share/extensions/color_randomize.inx.h:8 +#: ../share/extensions/color_randomize.inx.h:13 #: ../share/extensions/color_removeblue.inx.h:2 #: ../share/extensions/color_removegreen.inx.h:2 #: ../share/extensions/color_removered.inx.h:2 @@ -4465,7 +4497,7 @@ msgstr "типографічне полотно з напрямними" #. 3D box #: ../src/box3d.cpp:255 ../src/box3d.cpp:1309 -#: ../src/ui/dialog/inkscape-preferences.cpp:407 +#: ../src/ui/dialog/inkscape-preferences.cpp:416 msgid "3D Box" msgstr "Просторовий об'єкт" @@ -4503,21 +4535,21 @@ msgstr "Створити напрямну" msgid "Move guide" msgstr "Пересунути напрямну" -#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:572 +#: ../src/desktop-events.cpp:507 ../src/desktop-events.cpp:567 #: ../src/ui/dialog/guides.cpp:147 msgid "Delete guide" msgstr "Вилучити напрямну" -#: ../src/desktop-events.cpp:552 +#: ../src/desktop-events.cpp:547 #, c-format msgid "Guideline: %s" msgstr "Напрямна: %s" -#: ../src/desktop.cpp:875 +#: ../src/desktop.cpp:870 msgid "No previous zoom." msgstr "Немає попереднього масштабу." -#: ../src/desktop.cpp:896 +#: ../src/desktop.cpp:891 msgid "No next zoom." msgstr "Немає наступного масштабу." @@ -4530,8 +4562,8 @@ msgid "_Origin X:" msgstr "_Початок за X:" #: ../src/display/canvas-axonomgrid.cpp:359 ../src/display/canvas-grid.cpp:699 -#: ../src/ui/dialog/inkscape-preferences.cpp:780 -#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "X coordinate of grid origin" msgstr "Координата X початку сітки" @@ -4540,8 +4572,8 @@ msgid "O_rigin Y:" msgstr "П_очаток по Y:" #: ../src/display/canvas-axonomgrid.cpp:362 ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:781 -#: ../src/ui/dialog/inkscape-preferences.cpp:806 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Y coordinate of grid origin" msgstr "Координата Y початку сітки" @@ -4550,29 +4582,29 @@ msgid "Spacing _Y:" msgstr "Інтервал за _Y:" #: ../src/display/canvas-axonomgrid.cpp:365 -#: ../src/ui/dialog/inkscape-preferences.cpp:809 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Base length of z-axis" msgstr "Базова довжина вісі z" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 #: ../src/widgets/box3d-toolbar.cpp:302 msgid "Angle X:" msgstr "Кут X:" #: ../src/display/canvas-axonomgrid.cpp:368 -#: ../src/ui/dialog/inkscape-preferences.cpp:812 +#: ../src/ui/dialog/inkscape-preferences.cpp:823 msgid "Angle of x-axis" msgstr "Кут вісі x" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 #: ../src/widgets/box3d-toolbar.cpp:381 msgid "Angle Z:" msgstr "Кут Z:" #: ../src/display/canvas-axonomgrid.cpp:370 -#: ../src/ui/dialog/inkscape-preferences.cpp:813 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 msgid "Angle of z-axis" msgstr "Кут вісі z" @@ -4581,7 +4613,7 @@ msgid "Minor grid line _color:" msgstr "Колір _другорядної лінії сітки:" #: ../src/display/canvas-axonomgrid.cpp:374 ../src/display/canvas-grid.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:764 +#: ../src/ui/dialog/inkscape-preferences.cpp:775 msgid "Minor grid line color" msgstr "Колір другорядних ліній сітки" @@ -4594,7 +4626,7 @@ msgid "Ma_jor grid line color:" msgstr "Колір о_сновної лінії сітки:" #: ../src/display/canvas-axonomgrid.cpp:379 ../src/display/canvas-grid.cpp:718 -#: ../src/ui/dialog/inkscape-preferences.cpp:766 +#: ../src/ui/dialog/inkscape-preferences.cpp:777 msgid "Major grid line color" msgstr "Колір основних ліній сітки" @@ -4663,12 +4695,12 @@ msgid "Spacing _X:" msgstr "Інтервал за _X:" #: ../src/display/canvas-grid.cpp:705 -#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Distance between vertical grid lines" msgstr "Відстань між вертикальними лініями сітки" #: ../src/display/canvas-grid.cpp:708 -#: ../src/ui/dialog/inkscape-preferences.cpp:787 +#: ../src/ui/dialog/inkscape-preferences.cpp:798 msgid "Distance between horizontal grid lines" msgstr "Відстань між горизонтальними лініями сітки" @@ -4886,21 +4918,21 @@ msgstr "Кратність проміжку між лініями сітки" msgid " to " msgstr " у " -#: ../src/document.cpp:528 +#: ../src/document.cpp:531 #, c-format msgid "New document %d" msgstr "Новий документ %d" -#: ../src/document.cpp:533 +#: ../src/document.cpp:536 #, c-format msgid "Memory document %d" msgstr "Документ у пам'яті %d" -#: ../src/document.cpp:562 +#: ../src/document.cpp:565 msgid "Memory document %1" msgstr "Документ у пам'яті %1" -#: ../src/document.cpp:870 +#: ../src/document.cpp:873 #, c-format msgid "Unnamed document %d" msgstr "Документ без назви %d" @@ -4910,31 +4942,31 @@ msgid "[Unchanged]" msgstr "(Не змінено)" #. Edit -#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2463 +#: ../src/event-log.cpp:371 ../src/event-log.cpp:374 ../src/verbs.cpp:2460 msgid "_Undo" msgstr "В_ернути" -#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2465 +#: ../src/event-log.cpp:381 ../src/event-log.cpp:385 ../src/verbs.cpp:2462 msgid "_Redo" msgstr "Повт_орити" -#: ../src/extension/dependency.cpp:243 +#: ../src/extension/dependency.cpp:255 msgid "Dependency:" msgstr "Залежність:" -#: ../src/extension/dependency.cpp:244 +#: ../src/extension/dependency.cpp:256 msgid " type: " msgstr " тип: " -#: ../src/extension/dependency.cpp:245 +#: ../src/extension/dependency.cpp:257 msgid " location: " msgstr " розташування: " -#: ../src/extension/dependency.cpp:246 +#: ../src/extension/dependency.cpp:258 msgid " string: " msgstr " рядок: " -#: ../src/extension/dependency.cpp:249 +#: ../src/extension/dependency.cpp:261 msgid " description: " msgstr " опис: " @@ -4942,7 +4974,7 @@ msgstr " опис: " msgid " (No preferences)" msgstr " (Немає уподобань)" -#: ../src/extension/effect.h:70 ../src/verbs.cpp:2237 +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2234 msgid "Extensions" msgstr "Додатки" @@ -5056,7 +5088,7 @@ msgstr "" "відвідайте сайт Inkscape або запитайте у списках листування, якщо у вас " "виникли питання, що стосуються цього додатка." -#: ../src/extension/implementation/script.cpp:1062 +#: ../src/extension/implementation/script.cpp:1108 msgid "" "Inkscape has received additional data from the script executed. The script " "did not return an error, but this may indicate the results will not be as " @@ -5095,7 +5127,7 @@ msgstr "Адаптивна постеризація" #: ../src/ui/dialog/object-attributes.cpp:77 #: ../src/ui/widget/page-sizer.cpp:249 #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 ../src/widgets/spray-toolbar.cpp:287 +#: ../src/widgets/eraser-toolbar.cpp:154 ../src/widgets/spray-toolbar.cpp:297 #: ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/foldablebox.inx.h:2 msgid "Width:" @@ -5111,7 +5143,7 @@ msgid "Height:" msgstr "Висота:" #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43 -#: ../src/widgets/measure-toolbar.cpp:320 +#: ../src/widgets/measure-toolbar.cpp:328 #: ../share/extensions/printing_marks.inx.h:12 msgid "Offset:" msgstr "Зсув:" @@ -5169,8 +5201,8 @@ msgstr "Додати шум" #: ../src/extension/internal/filter/color.h:1660 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:244 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 #: ../src/ui/dialog/object-attributes.cpp:49 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5222,7 +5254,7 @@ msgstr "Розмиття" #: ../src/extension/internal/bitmap/oilPaint.cpp:39 #: ../src/extension/internal/bitmap/sharpen.cpp:40 #: ../src/extension/internal/bitmap/unsharpmask.cpp:43 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2909 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 msgid "Radius:" msgstr "Радіус:" @@ -5317,6 +5349,7 @@ msgstr "" #: ../src/extension/internal/bitmap/contrast.cpp:40 #: ../src/extension/internal/filter/color.h:1189 +#: ../share/extensions/nicechart.inx.h:36 msgid "Contrast" msgstr "Контраст" @@ -5361,7 +5394,7 @@ msgstr "Обертання карти кольорів" #: ../src/extension/internal/bitmap/cycleColormap.cpp:39 #: ../src/extension/internal/bitmap/spread.cpp:39 #: ../src/extension/internal/bitmap/unsharpmask.cpp:45 -#: ../src/widgets/spray-toolbar.cpp:401 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount:" msgstr "Кількість:" @@ -5558,8 +5591,8 @@ msgid "Opacity" msgstr "Непрозорість" #: ../src/extension/internal/bitmap/opacity.cpp:40 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2899 -#: ../src/ui/dialog/objects.cpp:1625 ../src/widgets/dropper-toolbar.cpp:83 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2924 +#: ../src/ui/dialog/objects.cpp:1629 ../src/widgets/dropper-toolbar.cpp:83 msgid "Opacity:" msgstr "Непрозорість:" @@ -5586,7 +5619,10 @@ msgstr "" msgid "Reduce Noise" msgstr "Зменшити шум" +#. Paint order +#. TRANSLATORS: Paint order determines the order the 'fill', 'stroke', and 'markers are painted. #: ../src/extension/internal/bitmap/reduceNoise.cpp:42 +#: ../src/widgets/stroke-style.cpp:384 #: ../share/extensions/jessyInk_effects.inx.h:3 #: ../share/extensions/jessyInk_view.inx.h:3 #: ../share/extensions/lindenmayer.inx.h:5 @@ -5731,7 +5767,7 @@ msgstr "Кількість копій втягування/розтягуван #: ../share/extensions/interp.inx.h:9 ../share/extensions/motion.inx.h:4 #: ../share/extensions/pathalongpath.inx.h:18 #: ../share/extensions/pathscatter.inx.h:20 -#: ../share/extensions/voronoi2svg.inx.h:13 +#: ../share/extensions/voronoi2svg.inx.h:18 msgid "Generate from Path" msgstr "Використання контуру" @@ -5862,147 +5898,149 @@ msgstr "PDF 1.4" msgid "Output page size:" msgstr "Розмір сторінки-результату:" -#: ../src/extension/internal/cdr-input.cpp:116 +#. Dialog settings +#: ../src/extension/internal/cdr-input.cpp:103 +#: ../src/extension/internal/vsd-input.cpp:105 +msgid "Page Selector" +msgstr "Вибір сторінок" + +#. Labels +#: ../src/extension/internal/cdr-input.cpp:127 #: ../src/extension/internal/pdfinput/pdf-input.cpp:92 -#: ../src/extension/internal/vsd-input.cpp:116 +#: ../src/extension/internal/vsd-input.cpp:130 msgid "Select page:" msgstr "Обрати сторінку:" #. Display total number of pages -#: ../src/extension/internal/cdr-input.cpp:128 +#: ../src/extension/internal/cdr-input.cpp:135 #: ../src/extension/internal/pdfinput/pdf-input.cpp:111 -#: ../src/extension/internal/vsd-input.cpp:128 +#: ../src/extension/internal/vsd-input.cpp:138 #, c-format msgid "out of %i" msgstr "з %i" -#: ../src/extension/internal/cdr-input.cpp:165 -#: ../src/extension/internal/vsd-input.cpp:165 -msgid "Page Selector" -msgstr "Вибір сторінок" - -#: ../src/extension/internal/cdr-input.cpp:300 +#: ../src/extension/internal/cdr-input.cpp:293 msgid "Corel DRAW Input" msgstr "Імпорт Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:305 +#: ../src/extension/internal/cdr-input.cpp:298 msgid "Corel DRAW 7-X4 files (*.cdr)" msgstr "Файли Corel DRAW 7-X4 (*.cdr)" -#: ../src/extension/internal/cdr-input.cpp:306 +#: ../src/extension/internal/cdr-input.cpp:299 msgid "Open files saved in Corel DRAW 7-X4" msgstr "Відкрити файли, збережені за допомогою Corel DRAW 7-X4" -#: ../src/extension/internal/cdr-input.cpp:313 +#: ../src/extension/internal/cdr-input.cpp:306 msgid "Corel DRAW templates input" msgstr "Імпорт шаблонів Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:318 +#: ../src/extension/internal/cdr-input.cpp:311 msgid "Corel DRAW 7-13 template files (*.cdt)" msgstr "Файли шаблонів Corel DRAW 7-13 (*.cdt)" -#: ../src/extension/internal/cdr-input.cpp:319 +#: ../src/extension/internal/cdr-input.cpp:312 msgid "Open files saved in Corel DRAW 7-13" msgstr "Відкрити файли, збережені за допомогою Corel DRAW 7-13" -#: ../src/extension/internal/cdr-input.cpp:326 +#: ../src/extension/internal/cdr-input.cpp:319 msgid "Corel DRAW Compressed Exchange files input" msgstr "Імпорт файлів Compressed Exchange Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:331 +#: ../src/extension/internal/cdr-input.cpp:324 msgid "Corel DRAW Compressed Exchange files (*.ccx)" msgstr "Файли Compressed Exchange Corel DRAW (*.ccx)" -#: ../src/extension/internal/cdr-input.cpp:332 +#: ../src/extension/internal/cdr-input.cpp:325 msgid "Open compressed exchange files saved in Corel DRAW" msgstr "Відкриті файли compressed exchange, збережені за допомогою Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:339 +#: ../src/extension/internal/cdr-input.cpp:332 msgid "Corel DRAW Presentation Exchange files input" msgstr "Імпорт файлів обміну презентаціями Corel DRAW" -#: ../src/extension/internal/cdr-input.cpp:344 +#: ../src/extension/internal/cdr-input.cpp:337 msgid "Corel DRAW Presentation Exchange files (*.cmx)" msgstr "Файли обміну презентаціями Corel DRAW (*.cmx)" -#: ../src/extension/internal/cdr-input.cpp:345 +#: ../src/extension/internal/cdr-input.cpp:338 msgid "Open presentation exchange files saved in Corel DRAW" msgstr "Відкрити файли обміну презентаціями, збережені за допомогою Corel DRAW" -#: ../src/extension/internal/emf-inout.cpp:3581 +#: ../src/extension/internal/emf-inout.cpp:3601 msgid "EMF Input" msgstr "Імпорт EMF" -#: ../src/extension/internal/emf-inout.cpp:3586 +#: ../src/extension/internal/emf-inout.cpp:3606 msgid "Enhanced Metafiles (*.emf)" msgstr "Розширений метафайл (*.emf)" -#: ../src/extension/internal/emf-inout.cpp:3587 +#: ../src/extension/internal/emf-inout.cpp:3607 msgid "Enhanced Metafiles" msgstr "Розширені метафайли" -#: ../src/extension/internal/emf-inout.cpp:3595 +#: ../src/extension/internal/emf-inout.cpp:3615 msgid "EMF Output" msgstr "Експорт до EMF" -#: ../src/extension/internal/emf-inout.cpp:3597 -#: ../src/extension/internal/wmf-inout.cpp:3176 +#: ../src/extension/internal/emf-inout.cpp:3617 +#: ../src/extension/internal/wmf-inout.cpp:3196 msgid "Convert texts to paths" msgstr "Перетворити текст на контури" -#: ../src/extension/internal/emf-inout.cpp:3598 -#: ../src/extension/internal/wmf-inout.cpp:3177 +#: ../src/extension/internal/emf-inout.cpp:3618 +#: ../src/extension/internal/wmf-inout.cpp:3197 msgid "Map Unicode to Symbol font" msgstr "Пов’язати Unicode зі шрифтом Symbol" -#: ../src/extension/internal/emf-inout.cpp:3599 -#: ../src/extension/internal/wmf-inout.cpp:3178 +#: ../src/extension/internal/emf-inout.cpp:3619 +#: ../src/extension/internal/wmf-inout.cpp:3198 msgid "Map Unicode to Wingdings" msgstr "Пов’язати Unicode з Wingdings" -#: ../src/extension/internal/emf-inout.cpp:3600 -#: ../src/extension/internal/wmf-inout.cpp:3179 +#: ../src/extension/internal/emf-inout.cpp:3620 +#: ../src/extension/internal/wmf-inout.cpp:3199 msgid "Map Unicode to Zapf Dingbats" msgstr "Пов’язати Unicode з Zapf Dingbats" -#: ../src/extension/internal/emf-inout.cpp:3601 -#: ../src/extension/internal/wmf-inout.cpp:3180 +#: ../src/extension/internal/emf-inout.cpp:3621 +#: ../src/extension/internal/wmf-inout.cpp:3200 msgid "Use MS Unicode PUA (0xF020-0xF0FF) for converted characters" msgstr "" "Використовувати для перетворених символів MS Unicode PUA (0xF020-0xF0FF)" -#: ../src/extension/internal/emf-inout.cpp:3602 -#: ../src/extension/internal/wmf-inout.cpp:3181 +#: ../src/extension/internal/emf-inout.cpp:3622 +#: ../src/extension/internal/wmf-inout.cpp:3201 msgid "Compensate for PPT font bug" msgstr "Компенсувати ваду щодо шрифтів у PPT" -#: ../src/extension/internal/emf-inout.cpp:3603 -#: ../src/extension/internal/wmf-inout.cpp:3182 +#: ../src/extension/internal/emf-inout.cpp:3623 +#: ../src/extension/internal/wmf-inout.cpp:3202 msgid "Convert dashed/dotted lines to single lines" msgstr "Перетворювати штрихову та пунктир у одну лінію" -#: ../src/extension/internal/emf-inout.cpp:3604 -#: ../src/extension/internal/wmf-inout.cpp:3183 +#: ../src/extension/internal/emf-inout.cpp:3624 +#: ../src/extension/internal/wmf-inout.cpp:3203 msgid "Convert gradients to colored polygon series" msgstr "Перетворити градієнти на послідовність кольорових багатокутників" -#: ../src/extension/internal/emf-inout.cpp:3605 +#: ../src/extension/internal/emf-inout.cpp:3625 msgid "Use native rectangular linear gradients" msgstr "Використовувати природні прямокутні лінійні градієнти" -#: ../src/extension/internal/emf-inout.cpp:3606 +#: ../src/extension/internal/emf-inout.cpp:3626 msgid "Map all fill patterns to standard EMF hatches" msgstr "Пов’язати усі заповнення візерунками зі стандартними шаблонами EMF" -#: ../src/extension/internal/emf-inout.cpp:3607 +#: ../src/extension/internal/emf-inout.cpp:3627 msgid "Ignore image rotations" msgstr "Ігнорувати обертання зображення" -#: ../src/extension/internal/emf-inout.cpp:3611 +#: ../src/extension/internal/emf-inout.cpp:3631 msgid "Enhanced Metafile (*.emf)" msgstr "Розширений метафайл (*.emf)" -#: ../src/extension/internal/emf-inout.cpp:3612 +#: ../src/extension/internal/emf-inout.cpp:3632 msgid "Enhanced Metafile" msgstr "Розширений метафайл" @@ -6088,7 +6126,7 @@ msgstr "Колір підсвічення" #: ../src/extension/internal/filter/transparency.h:214 #: ../src/extension/internal/filter/transparency.h:287 #: ../src/extension/internal/filter/transparency.h:349 -#: ../src/ui/dialog/inkscape-preferences.cpp:1795 +#: ../src/ui/dialog/inkscape-preferences.cpp:1806 #, c-format msgid "Filters" msgstr "Фільтри" @@ -6243,7 +6281,7 @@ msgstr "Поєднати вертикальне і горизонтальне р #: ../src/extension/internal/filter/blurs.h:260 msgid "Feather" -msgstr "Перо" +msgstr "Розтушування" #: ../src/extension/internal/filter/blurs.h:270 msgid "Blurred mask on the edge without altering the contents" @@ -6301,7 +6339,7 @@ msgstr "Тип змішування:" #: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/textures.h:77 #: ../src/extension/internal/filter/transparency.h:61 -#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/filter-enums.cpp:52 ../src/ui/dialog/inkscape-preferences.cpp:698 msgid "Normal" msgstr "Звичайний" @@ -6340,7 +6378,7 @@ msgstr "Витискання джерела" #: ../src/extension/internal/filter/transparency.h:132 #: ../src/filter-enums.cpp:128 ../src/ui/tools/flood-tool.cpp:91 #: ../src/ui/widget/color-icc-selector.cpp:176 -#: ../src/ui/widget/color-scales.cpp:379 ../src/ui/widget/color-scales.cpp:380 +#: ../src/ui/widget/color-scales.cpp:385 ../src/ui/widget/color-scales.cpp:386 msgid "Red" msgstr "Червоний" @@ -6352,7 +6390,7 @@ msgstr "Червоний" #: ../src/extension/internal/filter/transparency.h:133 #: ../src/filter-enums.cpp:129 ../src/ui/tools/flood-tool.cpp:92 #: ../src/ui/widget/color-icc-selector.cpp:177 -#: ../src/ui/widget/color-scales.cpp:382 ../src/ui/widget/color-scales.cpp:383 +#: ../src/ui/widget/color-scales.cpp:388 ../src/ui/widget/color-scales.cpp:389 msgid "Green" msgstr "Зелений" @@ -6364,7 +6402,8 @@ msgstr "Зелений" #: ../src/extension/internal/filter/transparency.h:134 #: ../src/filter-enums.cpp:130 ../src/ui/tools/flood-tool.cpp:93 #: ../src/ui/widget/color-icc-selector.cpp:178 -#: ../src/ui/widget/color-scales.cpp:385 ../src/ui/widget/color-scales.cpp:386 +#: ../src/ui/widget/color-scales.cpp:391 ../src/ui/widget/color-scales.cpp:392 +#: ../share/extensions/nicechart.inx.h:34 msgid "Blue" msgstr "Синій" @@ -6402,15 +6441,14 @@ msgstr "Висота" #: ../src/extension/internal/filter/paint.h:707 #: ../src/ui/tools/flood-tool.cpp:96 #: ../src/ui/widget/color-icc-selector.cpp:187 -#: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 +#: ../src/ui/widget/color-scales.cpp:417 ../src/ui/widget/color-scales.cpp:418 #: ../src/widgets/tweak-toolbar.cpp:318 -#: ../share/extensions/color_randomize.inx.h:5 msgid "Lightness" msgstr "Яскравість" #: ../src/extension/internal/filter/bumps.h:100 #: ../src/extension/internal/filter/bumps.h:331 -#: ../src/widgets/measure-toolbar.cpp:294 +#: ../src/widgets/measure-toolbar.cpp:302 msgid "Precision" msgstr "Точність" @@ -6427,7 +6465,7 @@ msgid "Distant" msgstr "Віддалене" #: ../src/extension/internal/filter/bumps.h:106 -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Point" msgstr "Точка" @@ -6600,13 +6638,12 @@ msgstr "Малювання за каналами" #: ../src/extension/internal/filter/color.h:157 #: ../src/extension/internal/filter/color.h:332 #: ../src/extension/internal/filter/paint.h:87 ../src/filter-enums.cpp:66 -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 #: ../src/ui/tools/flood-tool.cpp:95 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 -#: ../src/ui/widget/color-scales.cpp:408 ../src/ui/widget/color-scales.cpp:409 +#: ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 #: ../src/widgets/tweak-toolbar.cpp:302 -#: ../share/extensions/color_randomize.inx.h:4 msgid "Saturation" msgstr "Насиченість" @@ -6783,21 +6820,21 @@ msgstr "Видобування каналу" #: ../src/extension/internal/filter/color.h:715 #: ../src/ui/widget/color-icc-selector.cpp:190 #: ../src/ui/widget/color-icc-selector.cpp:195 -#: ../src/ui/widget/color-scales.cpp:433 ../src/ui/widget/color-scales.cpp:434 +#: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 msgid "Cyan" msgstr "Блакитний" #: ../src/extension/internal/filter/color.h:716 #: ../src/ui/widget/color-icc-selector.cpp:191 #: ../src/ui/widget/color-icc-selector.cpp:196 -#: ../src/ui/widget/color-scales.cpp:436 ../src/ui/widget/color-scales.cpp:437 +#: ../src/ui/widget/color-scales.cpp:442 ../src/ui/widget/color-scales.cpp:443 msgid "Magenta" msgstr "Бузковий" #: ../src/extension/internal/filter/color.h:717 #: ../src/ui/widget/color-icc-selector.cpp:192 #: ../src/ui/widget/color-icc-selector.cpp:197 -#: ../src/ui/widget/color-scales.cpp:439 ../src/ui/widget/color-scales.cpp:440 +#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 msgid "Yellow" msgstr "Жовтий" @@ -6823,7 +6860,7 @@ msgstr "Перетворення на:" #: ../src/extension/internal/filter/color.h:819 #: ../src/ui/widget/color-icc-selector.cpp:193 -#: ../src/ui/widget/color-scales.cpp:442 ../src/ui/widget/color-scales.cpp:443 +#: ../src/ui/widget/color-scales.cpp:448 ../src/ui/widget/color-scales.cpp:449 #: ../src/ui/widget/selected-style.cpp:274 msgid "Black" msgstr "Чорний" @@ -6906,11 +6943,11 @@ msgstr "Тіні" #: ../src/extension/internal/filter/color.h:1119 #: ../src/extension/internal/filter/paint.h:356 ../src/filter-enums.cpp:33 -#: ../src/live_effects/effect.cpp:108 +#: ../src/live_effects/effect.cpp:107 #: ../src/live_effects/lpe-transform_2pts.cpp:40 #: ../src/ui/dialog/filter-effects-dialog.cpp:1048 #: ../src/widgets/gradient-toolbar.cpp:1159 -#: ../src/widgets/measure-toolbar.cpp:320 +#: ../src/widgets/measure-toolbar.cpp:328 msgid "Offset" msgstr "Зміщення" @@ -7074,7 +7111,7 @@ msgstr "" #: ../src/extension/internal/filter/distort.h:67 msgid "Felt Feather" -msgstr "Фетр" +msgstr "Фетрове розтушування" #: ../src/extension/internal/filter/distort.h:71 #: ../src/extension/internal/filter/morphology.h:175 @@ -7160,7 +7197,7 @@ msgid "Blur and displace edges of shapes and pictures" msgstr "Розмити і змінити розташування форм і зображень" #: ../src/extension/internal/filter/distort.h:190 -#: ../src/live_effects/effect.cpp:138 +#: ../src/live_effects/effect.cpp:142 msgid "Roughen" msgstr "Грубішання" @@ -7198,8 +7235,8 @@ msgid "Detect:" msgstr "Позначити:" #: ../src/extension/internal/filter/image.h:52 -#: ../src/ui/dialog/template-load-tab.cpp:105 -#: ../src/ui/dialog/template-load-tab.cpp:142 +#: ../src/ui/dialog/template-load-tab.cpp:107 +#: ../src/ui/dialog/template-load-tab.cpp:144 msgid "All" msgstr "Всі" @@ -7240,7 +7277,7 @@ msgstr "Відкрите" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/libgdl/gdl-dock-placeholder.c:167 ../src/libgdl/gdl-dock.c:191 #: ../src/ui/widget/page-sizer.cpp:249 ../src/widgets/rect-toolbar.cpp:317 -#: ../src/widgets/spray-toolbar.cpp:287 ../src/widgets/tweak-toolbar.cpp:128 +#: ../src/widgets/spray-toolbar.cpp:297 ../src/widgets/tweak-toolbar.cpp:128 #: ../share/extensions/interp_att_g.inx.h:12 msgid "Width" msgstr "Ширина" @@ -7478,17 +7515,17 @@ msgstr "" "горизонтальних ліній" #: ../src/extension/internal/filter/paint.h:331 -#: ../src/ui/dialog/align-and-distribute.cpp:998 -#: ../src/widgets/desktop-widget.cpp:2051 +#: ../src/ui/dialog/align-and-distribute.cpp:1090 +#: ../src/widgets/desktop-widget.cpp:2070 msgid "Drawing" msgstr "Малюнок" -#. 0.91 +#. 0.92 #: ../src/extension/internal/filter/paint.h:335 #: ../src/extension/internal/filter/paint.h:496 #: ../src/extension/internal/filter/paint.h:590 #: ../src/extension/internal/filter/paint.h:976 -#: ../src/live_effects/effect.cpp:149 ../src/splivarot.cpp:2204 +#: ../src/live_effects/effect.cpp:136 ../src/splivarot.cpp:2206 msgid "Simplify" msgstr "Спростити" @@ -7559,7 +7596,7 @@ msgid "Contrasted" msgstr "Контрастний" #: ../src/extension/internal/filter/paint.h:591 -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Line width" msgstr "Товщина ліній" @@ -7771,9 +7808,9 @@ msgid "Background" msgstr "Тло" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2854 -#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:106 -#: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:379 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2879 +#: ../src/ui/dialog/input.cpp:1088 ../src/widgets/eraser-toolbar.cpp:133 +#: ../src/widgets/pencil-toolbar.cpp:141 ../src/widgets/spray-toolbar.cpp:389 #: ../src/widgets/tweak-toolbar.cpp:254 ../share/extensions/extrude.inx.h:2 #: ../share/extensions/triangle.inx.h:8 msgid "Mode:" @@ -7840,13 +7877,13 @@ msgstr "" "документом SVG і всі файли буде об'єднано у єдиному документі." #: ../src/extension/internal/gdkpixbuf-input.cpp:196 -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1511 #, c-format msgid "Embed" msgstr "Вбудувати" #: ../src/extension/internal/gdkpixbuf-input.cpp:197 ../src/sp-anchor.cpp:105 -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1511 #, c-format msgid "Link" msgstr "Пов'язати" @@ -7891,19 +7928,19 @@ msgstr "" "(Працює не в усіх засобах перегляду.)" #: ../src/extension/internal/gdkpixbuf-input.cpp:206 -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "None (auto)" msgstr "Немає (автоматично)" #: ../src/extension/internal/gdkpixbuf-input.cpp:207 -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "Smooth (optimizeQuality)" msgstr "Згладжування (оптимальна якість)" #: ../src/extension/internal/gdkpixbuf-input.cpp:208 -#: ../src/ui/dialog/inkscape-preferences.cpp:1507 +#: ../src/ui/dialog/inkscape-preferences.cpp:1518 #, c-format msgid "Blocky (optimizeSpeed)" msgstr "Блоками (оптимальна швидкість)" @@ -7931,7 +7968,7 @@ msgstr "Градієнт GIMP (*.ggr)" msgid "Gradients used in GIMP" msgstr "Градієнти, що використовуються у GIMP" -#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:114 +#: ../src/extension/internal/grid.cpp:204 ../src/ui/widget/panel.cpp:116 msgid "Grid" msgstr "Сітка" @@ -7956,7 +7993,7 @@ msgid "Vertical Offset:" msgstr "Вертикальний зсув:" #: ../src/extension/internal/grid.cpp:214 -#: ../src/ui/dialog/inkscape-preferences.cpp:1521 +#: ../src/ui/dialog/inkscape-preferences.cpp:1532 #: ../share/extensions/draw_from_triangle.inx.h:58 #: ../share/extensions/eqtexsvg.inx.h:4 #: ../share/extensions/foldablebox.inx.h:9 @@ -7968,6 +8005,7 @@ msgstr "Вертикальний зсув:" #: ../share/extensions/hershey.inx.h:52 #: ../share/extensions/layout_nup.inx.h:35 #: ../share/extensions/lindenmayer.inx.h:34 +#: ../share/extensions/nicechart.inx.h:45 #: ../share/extensions/param_curves.inx.h:30 #: ../share/extensions/perfectboundcover.inx.h:19 #: ../share/extensions/polyhedron_3d.inx.h:56 @@ -7988,8 +8026,8 @@ msgstr "Відтворення" #: ../src/extension/internal/grid.cpp:215 #: ../src/ui/dialog/document-properties.cpp:163 -#: ../src/ui/dialog/inkscape-preferences.cpp:821 -#: ../src/widgets/toolbox.cpp:1872 +#: ../src/ui/dialog/inkscape-preferences.cpp:832 +#: ../src/widgets/toolbox.cpp:1886 msgid "Grids" msgstr "Сітки" @@ -8216,7 +8254,7 @@ msgstr "Файл Inkscape SVG (*.svg)" msgid "SVG format with Inkscape extensions" msgstr "Формат SVG з додатками Inkscape" -#: ../src/extension/internal/svg.cpp:128 +#: ../src/extension/internal/svg.cpp:128 ../share/extensions/scour.inx.h:19 msgid "SVG Output" msgstr "Експорт до SVG" @@ -8256,81 +8294,81 @@ msgstr "Стиснений звичайний SVG (*.svgz)" msgid "Scalable Vector Graphics format compressed with GZip" msgstr "Формат масштабованої векторної графіки стиснений за допомогою GZip" -#: ../src/extension/internal/vsd-input.cpp:301 +#: ../src/extension/internal/vsd-input.cpp:296 msgid "VSD Input" msgstr "Імпорт з VSD" -#: ../src/extension/internal/vsd-input.cpp:306 +#: ../src/extension/internal/vsd-input.cpp:301 msgid "Microsoft Visio Diagram (*.vsd)" msgstr "Діаграма Microsoft Visio (*.vsd)" -#: ../src/extension/internal/vsd-input.cpp:307 +#: ../src/extension/internal/vsd-input.cpp:302 msgid "File format used by Microsoft Visio 6 and later" msgstr "" "Формат файлів, що використовується у Microsoft Visio 6 і новіших версіях" -#: ../src/extension/internal/vsd-input.cpp:314 +#: ../src/extension/internal/vsd-input.cpp:309 msgid "VDX Input" msgstr "Імпорт з VDX" -#: ../src/extension/internal/vsd-input.cpp:319 +#: ../src/extension/internal/vsd-input.cpp:314 msgid "Microsoft Visio XML Diagram (*.vdx)" msgstr "Діаграма Microsoft Visio у форматі XML (*.vdx)" -#: ../src/extension/internal/vsd-input.cpp:320 +#: ../src/extension/internal/vsd-input.cpp:315 msgid "File format used by Microsoft Visio 2010 and later" msgstr "" "Формат файлів, що використовується у Microsoft Visio 2010 і новіших версіях" -#: ../src/extension/internal/vsd-input.cpp:327 +#: ../src/extension/internal/vsd-input.cpp:322 msgid "VSDM Input" msgstr "Імпорт з VSDM" -#: ../src/extension/internal/vsd-input.cpp:332 +#: ../src/extension/internal/vsd-input.cpp:327 msgid "Microsoft Visio 2013 drawing (*.vsdm)" msgstr "Малюнок Microsoft Visio 2013 (*.vsdm)" -#: ../src/extension/internal/vsd-input.cpp:333 -#: ../src/extension/internal/vsd-input.cpp:346 +#: ../src/extension/internal/vsd-input.cpp:328 +#: ../src/extension/internal/vsd-input.cpp:341 msgid "File format used by Microsoft Visio 2013 and later" msgstr "" "Формат файлів, що використовується у Microsoft Visio 2013 і новіших версіях" -#: ../src/extension/internal/vsd-input.cpp:340 +#: ../src/extension/internal/vsd-input.cpp:335 msgid "VSDX Input" msgstr "Імпорт з VSDX" -#: ../src/extension/internal/vsd-input.cpp:345 +#: ../src/extension/internal/vsd-input.cpp:340 msgid "Microsoft Visio 2013 drawing (*.vsdx)" msgstr "Малюнок Microsoft Visio 2013 (*.vsdx)" -#: ../src/extension/internal/wmf-inout.cpp:3160 +#: ../src/extension/internal/wmf-inout.cpp:3180 msgid "WMF Input" msgstr "Імпорт WMF" -#: ../src/extension/internal/wmf-inout.cpp:3165 +#: ../src/extension/internal/wmf-inout.cpp:3185 msgid "Windows Metafiles (*.wmf)" msgstr "Метафайл Windows (*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3166 +#: ../src/extension/internal/wmf-inout.cpp:3186 msgid "Windows Metafiles" msgstr "Метафайл Windows" -#: ../src/extension/internal/wmf-inout.cpp:3174 +#: ../src/extension/internal/wmf-inout.cpp:3194 msgid "WMF Output" msgstr "Експорт до WMF" -#: ../src/extension/internal/wmf-inout.cpp:3184 +#: ../src/extension/internal/wmf-inout.cpp:3204 msgid "Map all fill patterns to standard WMF hatches" msgstr "Пов’язати усі заповнення візерунками зі стандартними шаблонами WMF" -#: ../src/extension/internal/wmf-inout.cpp:3188 +#: ../src/extension/internal/wmf-inout.cpp:3208 #: ../share/extensions/wmf_input.inx.h:2 #: ../share/extensions/wmf_output.inx.h:2 msgid "Windows Metafile (*.wmf)" msgstr "Метафайл Windows (*.wmf)" -#: ../src/extension/internal/wmf-inout.cpp:3189 +#: ../src/extension/internal/wmf-inout.cpp:3209 msgid "Windows Metafile" msgstr "Метафайл Windows (WMF)" @@ -8354,50 +8392,50 @@ msgstr "Перегляд у дії" msgid "Is the effect previewed live on canvas?" msgstr "Контролює, чи буде показано параметри ефекту вживу на полотні" -#: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127 +#: ../src/extension/system.cpp:126 ../src/extension/system.cpp:128 msgid "Format autodetect failed. The file is being opened as SVG." msgstr "Не вдається визначити формат файла. Файл відкривається як SVG." -#: ../src/file.cpp:183 +#: ../src/file.cpp:185 msgid "default.svg" msgstr "типовий.svg" -#: ../src/file.cpp:328 +#: ../src/file.cpp:332 msgid "Broken links have been changed to point to existing files." msgstr "Помилкові посилання змінено так, щоб вони вказували на поточні файли." -#: ../src/file.cpp:339 ../src/file.cpp:1274 +#: ../src/file.cpp:343 ../src/file.cpp:1278 #, c-format msgid "Failed to load the requested file %s" msgstr "Не вдається завантажити потрібний файл %s" -#: ../src/file.cpp:365 +#: ../src/file.cpp:369 msgid "Document not saved yet. Cannot revert." msgstr "" "Документ ще не був збережений. Неможливо повернутись до попереднього стану." -#: ../src/file.cpp:371 +#: ../src/file.cpp:375 msgid "Changes will be lost! Are you sure you want to reload document %1?" msgstr "" "Зміни буде втрачено! Ви впевнені, що бажаєте перезавантажити документ %1?" -#: ../src/file.cpp:397 +#: ../src/file.cpp:401 msgid "Document reverted." msgstr "Документ повернутий до попереднього стану." -#: ../src/file.cpp:399 +#: ../src/file.cpp:403 msgid "Document not reverted." msgstr "Документ не повернутий до попереднього стану." -#: ../src/file.cpp:549 +#: ../src/file.cpp:553 msgid "Select file to open" msgstr "Виберіть файл" -#: ../src/file.cpp:631 +#: ../src/file.cpp:635 msgid "Clean up document" msgstr "Очистити документ" -#: ../src/file.cpp:638 +#: ../src/file.cpp:642 #, c-format msgid "Removed %i unused definition in <defs>." msgid_plural "Removed %i unused definitions in <defs>." @@ -8405,11 +8443,11 @@ msgstr[0] "Вилучено %i непотрібний елемент у & msgstr[1] "Вилучено %i непотрібні елементи у <defs>." msgstr[2] "Вилучено %i непотрібних елементів у <defs>." -#: ../src/file.cpp:643 +#: ../src/file.cpp:647 msgid "No unused definitions in <defs>." msgstr "Немає непотрібних елементів у <defs>." -#: ../src/file.cpp:675 +#: ../src/file.cpp:679 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8418,12 +8456,12 @@ msgstr "" "Не знайдено модуль збереження документа (%s). Можливо, невідомий суфікс " "назви файла." -#: ../src/file.cpp:676 ../src/file.cpp:684 ../src/file.cpp:692 -#: ../src/file.cpp:698 ../src/file.cpp:703 +#: ../src/file.cpp:680 ../src/file.cpp:688 ../src/file.cpp:696 +#: ../src/file.cpp:702 ../src/file.cpp:707 msgid "Document not saved." msgstr "Документ не збережено." -#: ../src/file.cpp:683 +#: ../src/file.cpp:687 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." @@ -8431,54 +8469,54 @@ msgstr "" "Файл %s захищено від запису. Будь ласка, зніміть захист від запису і " "повторіть спробу." -#: ../src/file.cpp:691 +#: ../src/file.cpp:695 #, c-format msgid "File %s could not be saved." msgstr "Файл %s неможливо зберегти." -#: ../src/file.cpp:721 ../src/file.cpp:723 +#: ../src/file.cpp:725 ../src/file.cpp:727 msgid "Document saved." msgstr "Документ збережено." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:866 ../src/file.cpp:1433 +#: ../src/file.cpp:870 ../src/file.cpp:1437 msgid "drawing" msgstr "рисунок" -#: ../src/file.cpp:871 +#: ../src/file.cpp:875 msgid "drawing-%1" msgstr "рисунок-%1" -#: ../src/file.cpp:888 +#: ../src/file.cpp:892 msgid "Select file to save a copy to" msgstr "Оберіть файл для збереження копії" -#: ../src/file.cpp:890 +#: ../src/file.cpp:894 msgid "Select file to save to" msgstr "Виберіть файл для збереження" -#: ../src/file.cpp:995 ../src/file.cpp:997 +#: ../src/file.cpp:999 ../src/file.cpp:1001 msgid "No changes need to be saved." msgstr "Файл не було змінено. Збереження непотрібне." -#: ../src/file.cpp:1016 +#: ../src/file.cpp:1020 msgid "Saving document..." msgstr "Збереження документа…" -#: ../src/file.cpp:1271 ../src/ui/dialog/inkscape-preferences.cpp:1494 +#: ../src/file.cpp:1275 ../src/ui/dialog/inkscape-preferences.cpp:1505 #: ../src/ui/dialog/ocaldialogs.cpp:1244 msgid "Import" msgstr "Імпорт" -#: ../src/file.cpp:1321 +#: ../src/file.cpp:1325 msgid "Select file to import" msgstr "Виберіть файл для імпорту" -#: ../src/file.cpp:1454 +#: ../src/file.cpp:1458 msgid "Select file to export to" msgstr "Оберіть файл для експорту" -#: ../src/file.cpp:1707 +#: ../src/file.cpp:1711 msgid "Import Clip Art" msgstr "Імпортування шаблонів" @@ -8574,9 +8612,8 @@ msgstr "Виключення" #: ../src/filter-enums.cpp:65 ../src/ui/tools/flood-tool.cpp:94 #: ../src/ui/widget/color-icc-selector.cpp:182 #: ../src/ui/widget/color-icc-selector.cpp:186 -#: ../src/ui/widget/color-scales.cpp:405 ../src/ui/widget/color-scales.cpp:406 +#: ../src/ui/widget/color-scales.cpp:411 ../src/ui/widget/color-scales.cpp:412 #: ../src/widgets/tweak-toolbar.cpp:286 -#: ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "Відтінок" @@ -8603,7 +8640,7 @@ msgstr "Освітленість до прозорості" #: ../src/filter-enums.cpp:87 #: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 -#: ../share/extensions/measure.inx.h:20 +#: ../share/extensions/measure.inx.h:20 ../share/extensions/nicechart.inx.h:33 msgid "Default" msgstr "Типовий" @@ -8645,7 +8682,7 @@ msgid "Arithmetic" msgstr "Арифметичний" #: ../src/filter-enums.cpp:120 ../src/selection-chemistry.cpp:545 -#: ../src/ui/dialog/objects.cpp:1889 +#: ../src/ui/dialog/objects.cpp:1893 msgid "Duplicate" msgstr "Дублювати" @@ -8690,7 +8727,7 @@ msgstr "Інвертувати кольори градієнта" msgid "Reverse gradient" msgstr "Обернути градієнт" -#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:226 +#: ../src/gradient-chemistry.cpp:1621 ../src/widgets/gradient-selector.cpp:222 msgid "Delete swatch" msgstr "Вилучити зразок" @@ -8766,7 +8803,7 @@ msgstr "" #: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434 msgid " (stroke)" -msgstr " (штрих)" +msgstr " (штрих)" #: ../src/gradient-drag.cpp:1431 #, c-format @@ -8927,7 +8964,7 @@ msgstr "Контролюючий елемент панелі" msgid "Dockitem which 'owns' this grip" msgstr "Елемент, що є «володарем» цього" -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:192 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/ruler.cpp:201 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:2 msgid "Orientation" @@ -9073,12 +9110,12 @@ msgstr "" "панелей можна називати контролерами." #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:997 +#: ../src/ui/dialog/align-and-distribute.cpp:1089 #: ../src/ui/dialog/document-properties.cpp:161 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1549 -#: ../src/widgets/desktop-widget.cpp:2047 +#: ../src/widgets/desktop-widget.cpp:2066 #: ../share/extensions/empty_page.inx.h:1 -#: ../share/extensions/voronoi2svg.inx.h:9 +#: ../share/extensions/voronoi2svg.inx.h:10 msgid "Page" msgstr "Сторінка" @@ -9088,9 +9125,9 @@ msgstr "Індекс поточної сторінки" #: ../src/libgdl/gdl-dock-object.c:125 #: ../src/live_effects/parameter/originalpatharray.cpp:82 -#: ../src/ui/dialog/inkscape-preferences.cpp:1555 +#: ../src/ui/dialog/inkscape-preferences.cpp:1566 #: ../src/ui/widget/page-sizer.cpp:285 -#: ../src/widgets/gradient-selector.cpp:154 +#: ../src/widgets/gradient-selector.cpp:150 #: ../src/widgets/sp-xmlview-attr-list.cpp:49 msgid "Name" msgstr "Назва" @@ -9163,7 +9200,7 @@ msgstr "" "Спроба прив'язування до %p вже прив'язаного об'єкта %p (поточний господар: " "%p)" -#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:230 +#: ../src/libgdl/gdl-dock-paned.c:130 ../src/widgets/ruler.cpp:239 msgid "Position" msgstr "Розташування" @@ -9259,8 +9296,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "Елемент панелі, що «володіє» цією міткою вкладки" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:676 -#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/ui/dialog/inkscape-preferences.cpp:730 msgid "Floating" msgstr "Вільно переміщуються екраном" @@ -9337,165 +9374,164 @@ msgstr "Деформація за сіткою" msgid "Line Segment" msgstr "Сегмент лінії" -#: ../src/live_effects/effect.cpp:107 -msgid "Mirror symmetry" -msgstr "Дзеркальна симетрія" - -#: ../src/live_effects/effect.cpp:109 +#: ../src/live_effects/effect.cpp:108 msgid "Parallel" msgstr "Паралельна" -#: ../src/live_effects/effect.cpp:110 +#: ../src/live_effects/effect.cpp:109 msgid "Path length" msgstr "Довжина контуру" -#: ../src/live_effects/effect.cpp:111 +#: ../src/live_effects/effect.cpp:110 msgid "Perpendicular bisector" msgstr "Серединний перпендикуляр" -#: ../src/live_effects/effect.cpp:112 +#: ../src/live_effects/effect.cpp:111 msgid "Perspective path" msgstr "Контур з перспективою" -#: ../src/live_effects/effect.cpp:113 -msgid "Rotate copies" -msgstr "Обертання копій" - -#: ../src/live_effects/effect.cpp:114 +#: ../src/live_effects/effect.cpp:112 msgid "Recursive skeleton" msgstr "Рекурсивний каркас" -#: ../src/live_effects/effect.cpp:115 +#: ../src/live_effects/effect.cpp:113 msgid "Tangent to curve" msgstr "Дотична до кривої" -#: ../src/live_effects/effect.cpp:116 +#: ../src/live_effects/effect.cpp:114 msgid "Text label" msgstr "Текстова мітка" +#: ../src/live_effects/effect.cpp:115 +msgid "Fillet/Chamfer" +msgstr "Кромка/Фаска" + #. 0.46 -#: ../src/live_effects/effect.cpp:119 +#: ../src/live_effects/effect.cpp:118 msgid "Bend" msgstr "Вигнути" -#: ../src/live_effects/effect.cpp:120 +#: ../src/live_effects/effect.cpp:119 msgid "Gears" msgstr "Зубчасте колесо" -#: ../src/live_effects/effect.cpp:121 +#: ../src/live_effects/effect.cpp:120 msgid "Pattern Along Path" msgstr "Візерунок вздовж контуру" #. for historic reasons, this effect is called skeletal(strokes) in Inkscape:SVG -#: ../src/live_effects/effect.cpp:122 +#: ../src/live_effects/effect.cpp:121 msgid "Stitch Sub-Paths" msgstr "Зшити підконтури" #. 0.47 -#: ../src/live_effects/effect.cpp:124 +#: ../src/live_effects/effect.cpp:123 msgid "VonKoch" msgstr "фон Кох" -#: ../src/live_effects/effect.cpp:125 +#: ../src/live_effects/effect.cpp:124 msgid "Knot" msgstr "Вузол" -#: ../src/live_effects/effect.cpp:126 +#: ../src/live_effects/effect.cpp:125 msgid "Construct grid" msgstr "Побудувати сітку" -#: ../src/live_effects/effect.cpp:127 +#: ../src/live_effects/effect.cpp:126 msgid "Spiro spline" msgstr "Крива Спіро" -#: ../src/live_effects/effect.cpp:128 +#: ../src/live_effects/effect.cpp:127 msgid "Envelope Deformation" msgstr "Викривлення обгортки" -#: ../src/live_effects/effect.cpp:129 +#: ../src/live_effects/effect.cpp:128 msgid "Interpolate Sub-Paths" msgstr "Інтерполяція підконтурами" -#: ../src/live_effects/effect.cpp:130 +#: ../src/live_effects/effect.cpp:129 msgid "Hatches (rough)" msgstr "Штрихування (грубо)" -#: ../src/live_effects/effect.cpp:131 +#: ../src/live_effects/effect.cpp:130 msgid "Sketch" msgstr "Ескіз" -#: ../src/live_effects/effect.cpp:132 +#: ../src/live_effects/effect.cpp:131 msgid "Ruler" msgstr "Лінійка" #. 0.91 -#: ../src/live_effects/effect.cpp:134 +#: ../src/live_effects/effect.cpp:133 msgid "Power stroke" msgstr "Потужний штрих" -#: ../src/live_effects/effect.cpp:135 +#: ../src/live_effects/effect.cpp:134 msgid "Clone original path" msgstr "Клонувати початковий контур" -#. EXPERIMENTAL #: ../src/live_effects/effect.cpp:137 +msgid "Lattice Deformation 2" +msgstr "Деформація за сіткою 2" + +#: ../src/live_effects/effect.cpp:138 +msgid "Perspective/Envelope" +msgstr "Перспектива/Обгортання" + +#: ../src/live_effects/effect.cpp:139 +msgid "Interpolate points" +msgstr "Точки інтерполяції" + +#: ../src/live_effects/effect.cpp:140 +msgid "Transform by 2 points" +msgstr "Перетворення за 2 точками" + +#: ../src/live_effects/effect.cpp:141 #: ../src/live_effects/lpe-show_handles.cpp:26 msgid "Show handles" msgstr "Показувати елементи керування" -#: ../src/live_effects/effect.cpp:139 ../src/widgets/pencil-toolbar.cpp:118 +#: ../src/live_effects/effect.cpp:143 ../src/widgets/pencil-toolbar.cpp:118 msgid "BSpline" msgstr "B-сплайн" -#: ../src/live_effects/effect.cpp:140 +#: ../src/live_effects/effect.cpp:144 msgid "Join type" msgstr "Тип з’єднання" -#: ../src/live_effects/effect.cpp:141 +#: ../src/live_effects/effect.cpp:145 msgid "Taper stroke" msgstr "Звужений штрих" -#. Ponyscape -#: ../src/live_effects/effect.cpp:143 +#: ../src/live_effects/effect.cpp:146 +msgid "Mirror symmetry" +msgstr "Дзеркальна симетрія" + +#: ../src/live_effects/effect.cpp:147 +msgid "Rotate copies" +msgstr "Обертання копій" + +#. Ponyscape -> Inkscape 0.92 +#: ../src/live_effects/effect.cpp:149 msgid "Attach path" msgstr "Долучити до контуру" -#: ../src/live_effects/effect.cpp:144 +#: ../src/live_effects/effect.cpp:150 msgid "Fill between strokes" msgstr "Заповнення між штрихами" -#: ../src/live_effects/effect.cpp:145 ../src/selection-chemistry.cpp:2874 +#: ../src/live_effects/effect.cpp:151 ../src/selection-chemistry.cpp:2906 msgid "Fill between many" msgstr "Заповнення між багатьма" -#: ../src/live_effects/effect.cpp:146 +#: ../src/live_effects/effect.cpp:152 msgid "Ellipse by 5 points" msgstr "Еліпс за 5 точками" -#: ../src/live_effects/effect.cpp:147 +#: ../src/live_effects/effect.cpp:153 msgid "Bounding Box" msgstr "Обмежувальна рамка" -#: ../src/live_effects/effect.cpp:150 -msgid "Lattice Deformation 2" -msgstr "Деформація за сіткою 2" - -#: ../src/live_effects/effect.cpp:151 -msgid "Perspective/Envelope" -msgstr "Перспектива/Обгортання" - -#: ../src/live_effects/effect.cpp:152 -msgid "Fillet/Chamfer" -msgstr "Кромка/Фаска" - -#: ../src/live_effects/effect.cpp:153 -msgid "Interpolate points" -msgstr "Точки інтерполяції" - -#: ../src/live_effects/effect.cpp:154 -msgid "Transform by 2 points" -msgstr "Перетворення за 2 точками" - #: ../src/live_effects/effect.cpp:361 msgid "Is visible?" msgstr "Видиме?" @@ -9512,19 +9548,19 @@ msgstr "" msgid "No effect" msgstr "Без ефекту" -#: ../src/live_effects/effect.cpp:494 +#: ../src/live_effects/effect.cpp:498 #, c-format msgid "Please specify a parameter path for the LPE '%s' with %d mouse clicks" msgstr "" "Будь ласка, вкажіть параметр контуру для геометричних побудов «%s» за " "допомогою %d клацань мишею" -#: ../src/live_effects/effect.cpp:761 +#: ../src/live_effects/effect.cpp:765 #, c-format msgid "Editing parameter %s." msgstr "Редагування параметра %s." -#: ../src/live_effects/effect.cpp:766 +#: ../src/live_effects/effect.cpp:770 msgid "None of the applied path effect's parameters can be edited on-canvas." msgstr "" "Жоден із застосованих параметрів ефекту контуру не можна редагувати на " @@ -9626,8 +9662,8 @@ msgstr "По_чатковий контур вертикальний" msgid "Rotates the original 90 degrees, before bending it along the bend path" msgstr "Повернути початковий контур на 90°, перш ніж вигинати його за контуром" -#: ../src/live_effects/lpe-bendpath.cpp:181 -#: ../src/live_effects/lpe-patternalongpath.cpp:278 +#: ../src/live_effects/lpe-bendpath.cpp:178 +#: ../src/live_effects/lpe-patternalongpath.cpp:285 msgid "Change the width" msgstr "Змінити товщину" @@ -9709,8 +9745,8 @@ msgid "Change to 0 weight" msgstr "Змінити до потужності 0" #: ../src/live_effects/lpe-bspline.cpp:160 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:232 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:240 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:262 #: ../src/live_effects/parameter/parameter.cpp:170 msgid "Change scalar parameter" msgstr "Змінити скалярний параметр" @@ -9898,7 +9934,7 @@ msgid "Reverses the second path order" msgstr "Обернути напрямок другого контуру" #: ../src/live_effects/lpe-fillet-chamfer.cpp:41 -#: ../src/widgets/text-toolbar.cpp:1540 +#: ../src/widgets/text-toolbar.cpp:1788 #: ../share/extensions/render_barcode_qrcode.inx.h:5 msgid "Auto" msgstr "Авто" @@ -9963,40 +9999,48 @@ msgstr "Допоміжний розмір із напрямком:" msgid "Helper size with direction" msgstr "Допоміжний розмір із напрямком" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:157 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:103 +msgid "IMPORTANT! New version soon..." +msgstr "ВАЖЛИВО! Скоро нова версія…" + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:107 +msgid "Not compatible. Convert to path after." +msgstr "Не є сумісним. Наступне перетворення на контур." + +#: ../src/live_effects/lpe-fillet-chamfer.cpp:165 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:72 msgid "Fillet" msgstr "Кромка" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:161 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:169 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:74 msgid "Inverse fillet" msgstr "Зворотня кромка" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:166 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:174 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:76 msgid "Chamfer" msgstr "Фаска" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:170 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:178 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:78 msgid "Inverse chamfer" msgstr "Зворотня фаска" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:239 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:247 msgid "Convert to fillet" msgstr "Перетворити на кромку" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:246 -#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:254 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:278 msgid "Convert to inverse fillet" msgstr "Перетворити на зворотну кромку" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:262 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:270 msgid "Convert to chamfer" msgstr "Перетворити на фаску" -#: ../src/live_effects/lpe-fillet-chamfer.cpp:282 +#: ../src/live_effects/lpe-fillet-chamfer.cpp:290 msgid "Knots and helper paths refreshed" msgstr "Оновлено вузли і допоміжні контури" @@ -10020,27 +10064,27 @@ msgstr "" "Кут контакту зубців (зазвичай, 20-25°). Характеризує кількість зубців, що не " "контактують." -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Trajectory:" msgstr "Траєкторія:" -#: ../src/live_effects/lpe-interpolate.cpp:31 +#: ../src/live_effects/lpe-interpolate.cpp:30 msgid "Path along which intermediate steps are created." msgstr "Контур, за яким буде створено проміжні кроки." -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Steps_:" msgstr "_Кроків:" -#: ../src/live_effects/lpe-interpolate.cpp:32 +#: ../src/live_effects/lpe-interpolate.cpp:31 msgid "Determines the number of steps from start to end path." msgstr "Визначає кількість кроків від початкового до кінцевого контурів." -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "E_quidistant spacing" msgstr "Одн_акові проміжки" -#: ../src/live_effects/lpe-interpolate.cpp:33 +#: ../src/live_effects/lpe-interpolate.cpp:32 msgid "" "If true, the spacing between intermediates is constant along the length of " "the path. If false, the distance depends on the location of the nodes of the " @@ -10091,7 +10135,7 @@ msgid "Beveled" msgstr "З фаскою" #: ../src/live_effects/lpe-jointype.cpp:32 -#: ../src/live_effects/lpe-jointype.cpp:40 +#: ../src/live_effects/lpe-jointype.cpp:43 #: ../src/live_effects/lpe-powerstroke.cpp:167 #: ../src/live_effects/lpe-taperstroke.cpp:64 #: ../src/widgets/star-toolbar.cpp:534 @@ -10114,122 +10158,134 @@ msgstr "Обмеження фацета" msgid "Extrapolated arc" msgstr "Екстрапольована дуга" -#: ../src/live_effects/lpe-jointype.cpp:39 +#: ../src/live_effects/lpe-jointype.cpp:36 +msgid "Extrapolated arc Alt1" +msgstr "Екстрапольована дуга Alt1" + +#: ../src/live_effects/lpe-jointype.cpp:37 +msgid "Extrapolated arc Alt2" +msgstr "Екстрапольована дуга Alt2" + +#: ../src/live_effects/lpe-jointype.cpp:38 +msgid "Extrapolated arc Alt3" +msgstr "Екстрапольована дуга Alt3" + +#: ../src/live_effects/lpe-jointype.cpp:42 #: ../src/live_effects/lpe-powerstroke.cpp:149 msgid "Butt" msgstr "Обрізок" -#: ../src/live_effects/lpe-jointype.cpp:41 +#: ../src/live_effects/lpe-jointype.cpp:44 #: ../src/live_effects/lpe-powerstroke.cpp:150 msgid "Square" msgstr "Квадрат" -#: ../src/live_effects/lpe-jointype.cpp:42 +#: ../src/live_effects/lpe-jointype.cpp:45 #: ../src/live_effects/lpe-powerstroke.cpp:152 msgid "Peak" msgstr "Пік" -#: ../src/live_effects/lpe-jointype.cpp:51 +#: ../src/live_effects/lpe-jointype.cpp:54 msgid "Thickness of the stroke" msgstr "Товщина штриха" -#: ../src/live_effects/lpe-jointype.cpp:52 +#: ../src/live_effects/lpe-jointype.cpp:55 msgid "Line cap" msgstr "Кінчик лінії" -#: ../src/live_effects/lpe-jointype.cpp:52 +#: ../src/live_effects/lpe-jointype.cpp:55 msgid "The end shape of the stroke" msgstr "Форма кінця штриха" #. Join type #. TRANSLATORS: The line join style specifies the shape to be used at the #. corners of paths. It can be "miter", "round" or "bevel". -#: ../src/live_effects/lpe-jointype.cpp:53 +#: ../src/live_effects/lpe-jointype.cpp:56 #: ../src/live_effects/lpe-powerstroke.cpp:182 -#: ../src/widgets/stroke-style.cpp:227 +#: ../src/widgets/stroke-style.cpp:288 msgid "Join:" msgstr "З'єднання:" -#: ../src/live_effects/lpe-jointype.cpp:53 +#: ../src/live_effects/lpe-jointype.cpp:56 #: ../src/live_effects/lpe-powerstroke.cpp:182 msgid "Determines the shape of the path's corners" msgstr "Визначає форму кутів контуру" #. start_lean(_("Start path lean"), _("Start path lean"), "start_lean", &wr, this, 0.), #. end_lean(_("End path lean"), _("End path lean"), "end_lean", &wr, this, 0.), -#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-jointype.cpp:59 #: ../src/live_effects/lpe-powerstroke.cpp:183 #: ../src/live_effects/lpe-taperstroke.cpp:78 msgid "Miter limit:" msgstr "Межа вістря:" -#: ../src/live_effects/lpe-jointype.cpp:56 +#: ../src/live_effects/lpe-jointype.cpp:59 msgid "Maximum length of the miter join (in units of stroke width)" msgstr "Найбільша довжина з’єднання з вістрям (у одиницях товщини штриха)" -#: ../src/live_effects/lpe-jointype.cpp:57 +#: ../src/live_effects/lpe-jointype.cpp:60 msgid "Force miter" msgstr "Примусове вістря" -#: ../src/live_effects/lpe-jointype.cpp:57 +#: ../src/live_effects/lpe-jointype.cpp:60 msgid "Overrides the miter limit and forces a join." msgstr "Перевизначає обмеження вістря і примусово встановлює з’єднання." #. initialise your parameters here: -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/live_effects/lpe-knot.cpp:350 msgid "Fi_xed width:" msgstr "_Фіксована ширина:" -#: ../src/live_effects/lpe-knot.cpp:351 +#: ../src/live_effects/lpe-knot.cpp:350 msgid "Size of hidden region of lower string" msgstr "Розмір схованого фрагмента нижнього рядка" -#: ../src/live_effects/lpe-knot.cpp:352 +#: ../src/live_effects/lpe-knot.cpp:351 msgid "_In units of stroke width" msgstr "_У одиницях товщини штриха" -#: ../src/live_effects/lpe-knot.cpp:352 +#: ../src/live_effects/lpe-knot.cpp:351 msgid "Consider 'Interruption width' as a ratio of stroke width" msgstr "Обчислювати «ширину проміжку» відносно товщини штриха" -#: ../src/live_effects/lpe-knot.cpp:353 +#: ../src/live_effects/lpe-knot.cpp:352 msgid "St_roke width" msgstr "Тов_щина штриха" -#: ../src/live_effects/lpe-knot.cpp:353 +#: ../src/live_effects/lpe-knot.cpp:352 msgid "Add the stroke width to the interruption size" msgstr "Додати ширину штриха до розміру проміжку" -#: ../src/live_effects/lpe-knot.cpp:354 +#: ../src/live_effects/lpe-knot.cpp:353 msgid "_Crossing path stroke width" msgstr "Товщина штриха _контуру перетинання" -#: ../src/live_effects/lpe-knot.cpp:354 +#: ../src/live_effects/lpe-knot.cpp:353 msgid "Add crossed stroke width to the interruption size" msgstr "Додати ширину перпендикулярного штриха до розміру проміжку" -#: ../src/live_effects/lpe-knot.cpp:355 +#: ../src/live_effects/lpe-knot.cpp:354 msgid "S_witcher size:" msgstr "Розм_ір перемикача:" -#: ../src/live_effects/lpe-knot.cpp:355 +#: ../src/live_effects/lpe-knot.cpp:354 msgid "Orientation indicator/switcher size" msgstr "Розмір індикатора/перемикача орієнтації" -#: ../src/live_effects/lpe-knot.cpp:356 +#: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossing Signs" msgstr "Знаки перехресть" -#: ../src/live_effects/lpe-knot.cpp:356 +#: ../src/live_effects/lpe-knot.cpp:355 msgid "Crossings signs" msgstr "Знаки перехресть" -#: ../src/live_effects/lpe-knot.cpp:627 +#: ../src/live_effects/lpe-knot.cpp:626 msgid "Drag to select a crossing, click to flip it" msgstr "Перетягніть, щоб вибрати перехрестя, клацніть, щоб віддзеркалити його" #. / @todo Is this the right verb? -#: ../src/live_effects/lpe-knot.cpp:665 +#: ../src/live_effects/lpe-knot.cpp:664 msgid "Change knot crossing" msgstr "Змінити перехрестя у вузлі" @@ -10244,258 +10300,262 @@ msgid "Mirror movements in vertical" msgstr "Дзеркальні пересування вертикально" #: ../src/live_effects/lpe-lattice2.cpp:49 +msgid "Update while moving knots (maybe slow)" +msgstr "Оновлювати під час пересування вузлів (уповільнює роботу)" + +#: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0:" msgstr "Керування 0:" -#: ../src/live_effects/lpe-lattice2.cpp:49 +#: ../src/live_effects/lpe-lattice2.cpp:50 msgid "Control 0 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 0 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1:" msgstr "Керування 1:" -#: ../src/live_effects/lpe-lattice2.cpp:50 +#: ../src/live_effects/lpe-lattice2.cpp:51 msgid "Control 1 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 1 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:51 +#: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2:" msgstr "Керування 2:" -#: ../src/live_effects/lpe-lattice2.cpp:51 +#: ../src/live_effects/lpe-lattice2.cpp:52 msgid "Control 2 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 2 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:52 +#: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3:" msgstr "Керування 3:" -#: ../src/live_effects/lpe-lattice2.cpp:52 +#: ../src/live_effects/lpe-lattice2.cpp:53 msgid "Control 3 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 3 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:53 +#: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4:" msgstr "Керування 4:" -#: ../src/live_effects/lpe-lattice2.cpp:53 +#: ../src/live_effects/lpe-lattice2.cpp:54 msgid "Control 4 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 4 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:54 +#: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5:" msgstr "Керування 5:" -#: ../src/live_effects/lpe-lattice2.cpp:54 +#: ../src/live_effects/lpe-lattice2.cpp:55 msgid "Control 5 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 5 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:55 +#: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6:" msgstr "Керування 6:" -#: ../src/live_effects/lpe-lattice2.cpp:55 +#: ../src/live_effects/lpe-lattice2.cpp:56 msgid "Control 6 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 6 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:56 +#: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7:" msgstr "Керування 7:" -#: ../src/live_effects/lpe-lattice2.cpp:56 +#: ../src/live_effects/lpe-lattice2.cpp:57 msgid "Control 7 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 7 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:57 +#: ../src/live_effects/lpe-lattice2.cpp:58 msgid "Control 8x9:" msgstr "Керування 8⨯9:" -#: ../src/live_effects/lpe-lattice2.cpp:57 +#: ../src/live_effects/lpe-lattice2.cpp:58 msgid "" "Control 8x9 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 8⨯9 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:58 +#: ../src/live_effects/lpe-lattice2.cpp:59 msgid "Control 10x11:" msgstr "Керування 10⨯11:" -#: ../src/live_effects/lpe-lattice2.cpp:58 +#: ../src/live_effects/lpe-lattice2.cpp:59 msgid "" "Control 10x11 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 10⨯11 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:59 +#: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12:" msgstr "Керування 12:" -#: ../src/live_effects/lpe-lattice2.cpp:59 +#: ../src/live_effects/lpe-lattice2.cpp:60 msgid "Control 12 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 12 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:60 +#: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13:" msgstr "Керування 13:" -#: ../src/live_effects/lpe-lattice2.cpp:60 +#: ../src/live_effects/lpe-lattice2.cpp:61 msgid "Control 13 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 13 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:61 +#: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14:" msgstr "Керування 14:" -#: ../src/live_effects/lpe-lattice2.cpp:61 +#: ../src/live_effects/lpe-lattice2.cpp:62 msgid "Control 14 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 14 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:62 +#: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15:" msgstr "Керування 15:" -#: ../src/live_effects/lpe-lattice2.cpp:62 +#: ../src/live_effects/lpe-lattice2.cpp:63 msgid "Control 15 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 15 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:63 +#: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16:" msgstr "Керування 16:" -#: ../src/live_effects/lpe-lattice2.cpp:63 +#: ../src/live_effects/lpe-lattice2.cpp:64 msgid "Control 16 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 16 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:64 +#: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17:" msgstr "Керування 17:" -#: ../src/live_effects/lpe-lattice2.cpp:64 +#: ../src/live_effects/lpe-lattice2.cpp:65 msgid "Control 17 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 17 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:65 +#: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18:" msgstr "Керування 18:" -#: ../src/live_effects/lpe-lattice2.cpp:65 +#: ../src/live_effects/lpe-lattice2.cpp:66 msgid "Control 18 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 18 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:66 +#: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19:" msgstr "Керування 19:" -#: ../src/live_effects/lpe-lattice2.cpp:66 +#: ../src/live_effects/lpe-lattice2.cpp:67 msgid "Control 19 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 19 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:67 +#: ../src/live_effects/lpe-lattice2.cpp:68 msgid "Control 20x21:" msgstr "Керування 20⨯21:" -#: ../src/live_effects/lpe-lattice2.cpp:67 +#: ../src/live_effects/lpe-lattice2.cpp:68 msgid "" "Control 20x21 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 20⨯21 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:68 +#: ../src/live_effects/lpe-lattice2.cpp:69 msgid "Control 22x23:" msgstr "Керування 22⨯23:" -#: ../src/live_effects/lpe-lattice2.cpp:68 +#: ../src/live_effects/lpe-lattice2.cpp:69 msgid "" "Control 22x23 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 22⨯23 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:69 +#: ../src/live_effects/lpe-lattice2.cpp:70 msgid "Control 24x26:" msgstr "Керування 24⨯26:" -#: ../src/live_effects/lpe-lattice2.cpp:69 +#: ../src/live_effects/lpe-lattice2.cpp:70 msgid "" "Control 24x26 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 24⨯26 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:70 +#: ../src/live_effects/lpe-lattice2.cpp:71 msgid "Control 25x27:" msgstr "Керування 25⨯27:" -#: ../src/live_effects/lpe-lattice2.cpp:70 +#: ../src/live_effects/lpe-lattice2.cpp:71 msgid "" "Control 25x27 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 25⨯27 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:71 +#: ../src/live_effects/lpe-lattice2.cpp:72 msgid "Control 28x30:" msgstr "Керування 28⨯30:" -#: ../src/live_effects/lpe-lattice2.cpp:71 +#: ../src/live_effects/lpe-lattice2.cpp:72 msgid "" "Control 28x30 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 28⨯30 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:72 +#: ../src/live_effects/lpe-lattice2.cpp:73 msgid "Control 29x31:" msgstr "Керування 29⨯31:" -#: ../src/live_effects/lpe-lattice2.cpp:72 +#: ../src/live_effects/lpe-lattice2.cpp:73 msgid "" "Control 29x31 - Ctrl+Alt+Click: reset, Ctrl: move along axes" msgstr "" "Керування 29⨯31 — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:73 +#: ../src/live_effects/lpe-lattice2.cpp:74 msgid "Control 32x33x34x35:" msgstr "Керування 32⨯33⨯34⨯35:" -#: ../src/live_effects/lpe-lattice2.cpp:73 +#: ../src/live_effects/lpe-lattice2.cpp:74 msgid "" "Control 32x33x34x35 - Ctrl+Alt+Click: reset, Ctrl: move along " "axes" @@ -10503,19 +10563,85 @@ msgstr "" "Керування 32⨯33⨯34⨯35 — Ctrl+Alt+клацання, щоб скинути, Ctrl, " "щоб рухатися вздовж осей" -#: ../src/live_effects/lpe-lattice2.cpp:236 +#: ../src/live_effects/lpe-lattice2.cpp:239 msgid "Reset grid" msgstr "Скинути сітку" -#: ../src/live_effects/lpe-lattice2.cpp:268 -#: ../src/live_effects/lpe-lattice2.cpp:283 +#: ../src/live_effects/lpe-lattice2.cpp:271 +#: ../src/live_effects/lpe-lattice2.cpp:286 msgid "Show Points" msgstr "Показати точки" -#: ../src/live_effects/lpe-lattice2.cpp:281 +#: ../src/live_effects/lpe-lattice2.cpp:284 msgid "Hide Points" msgstr "Приховати точки" +#: ../src/live_effects/lpe-mirror_symmetry.cpp:36 +msgid "Vertical Page Center" +msgstr "Центр сторінки за вертикаллю" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:37 +msgid "Horizontal Page Center" +msgstr "Центр сторінки за горизонталлю" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:38 +msgid "Free from reflection line" +msgstr "Довільно від лінії відбиття" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:39 +msgid "X from middle knot" +msgstr "За X від середнього вузла" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:40 +msgid "Y from middle knot" +msgstr "За Y від середнього вузла" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:72 +#: ../src/widgets/spray-toolbar.cpp:388 ../src/widgets/tweak-toolbar.cpp:253 +msgid "Mode" +msgstr "Режим" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:72 +msgid "Symmetry move mode" +msgstr "Режим симетричного пересування" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:73 +msgid "Discard original path?" +msgstr "Відкинути початковий контур?" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:73 +msgid "Check this to only keep the mirrored part of the path" +msgstr "" +"Позначте цей пункт, щоб програма зберегла лише віддзеркалену частину контуру" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:74 +msgid "Fuse paths" +msgstr "Об’єднати контури" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:74 +msgid "Fuse original and the reflection into a single path" +msgstr "Об’єднати оригінал і відбиток у єдиний контур" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:75 +msgid "Oposite fuse" +msgstr "" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:75 +msgid "Picks the other side of the mirror as the original" +msgstr "Визначає зображення по той бік дзеркала як оригінал" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:76 +msgid "Start mirror line" +msgstr "Початок лінії віддзеркалення" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:77 +msgid "End mirror line" +msgstr "Кінець лінії віддзеркалення" + +#: ../src/live_effects/lpe-mirror_symmetry.cpp:335 +msgid "Adjust the center" +msgstr "Скоригувати центр" + #: ../src/live_effects/lpe-patternalongpath.cpp:63 #: ../share/extensions/pathalongpath.inx.h:10 msgid "Single" @@ -10671,7 +10797,7 @@ msgstr "" "Нижній правий — Ctrl+Alt+клацання, щоб скинути, Ctrl, щоб " "рухатися вздовж осей" -#: ../src/live_effects/lpe-perspective-envelope.cpp:268 +#: ../src/live_effects/lpe-perspective-envelope.cpp:269 msgid "Handles:" msgstr "Елементи керування:" @@ -10729,7 +10855,7 @@ msgid "Determines the shape of the path's start" msgstr "Визначає форму початку контуру" #: ../src/live_effects/lpe-powerstroke.cpp:183 -#: ../src/widgets/stroke-style.cpp:278 +#: ../src/widgets/stroke-style.cpp:335 msgid "Maximum length of the miter (in units of stroke width)" msgstr "Найбільша довжина вістря (у одиницях товщини штриха)" @@ -11006,20 +11132,20 @@ msgstr "Сумісне із інструментом «Розкидання»" msgid "For use with spray tool in copy mode" msgstr "Для використання із інструментом розкидання у режимі копіювання" -#: ../src/live_effects/lpe-roughen.cpp:123 +#: ../src/live_effects/lpe-roughen.cpp:121 msgid "Add nodes Subdivide each segment" msgstr "Додати вузли — поділити кожен із сегментів" -#: ../src/live_effects/lpe-roughen.cpp:132 +#: ../src/live_effects/lpe-roughen.cpp:130 msgid "Jitter nodes Move nodes/handles" msgstr "" "Тремтіння вузлів — пересунути вузли або елементи керування (вуса)" -#: ../src/live_effects/lpe-roughen.cpp:141 +#: ../src/live_effects/lpe-roughen.cpp:139 msgid "Extra roughen Add a extra layer of rough" msgstr "Додаткове згрубішання — додати додатковий шар згрубішання" -#: ../src/live_effects/lpe-roughen.cpp:150 +#: ../src/live_effects/lpe-roughen.cpp:148 msgid "Options Modify options to rough" msgstr "Параметри змінити параметри грубішання" @@ -11048,13 +11174,13 @@ msgstr "Немає" #: ../src/live_effects/lpe-ruler.cpp:33 #: ../src/live_effects/lpe-transform_2pts.cpp:37 -#: ../src/ui/tools/measure-tool.cpp:728 ../src/widgets/arc-toolbar.cpp:319 +#: ../src/ui/tools/measure-tool.cpp:756 ../src/widgets/arc-toolbar.cpp:319 msgid "Start" msgstr "Початок" #: ../src/live_effects/lpe-ruler.cpp:34 #: ../src/live_effects/lpe-transform_2pts.cpp:38 -#: ../src/ui/tools/measure-tool.cpp:729 ../src/widgets/arc-toolbar.cpp:332 +#: ../src/ui/tools/measure-tool.cpp:757 ../src/widgets/arc-toolbar.cpp:332 msgid "End" msgstr "Кінець" @@ -11074,7 +11200,7 @@ msgstr "Відстань між послідовними позначками н msgid "Unit:" msgstr "Одиниця:" -#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:202 +#: ../src/live_effects/lpe-ruler.cpp:42 ../src/widgets/ruler.cpp:211 msgid "Unit" msgstr "Одиниця" @@ -11288,7 +11414,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "Кількість ліній побудови (дотичних) для малювання" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "Масштаб:" @@ -11347,7 +11473,7 @@ msgid "Extrapolated" msgstr "Екстраполяція" #: ../src/live_effects/lpe-taperstroke.cpp:73 -#: ../share/extensions/edge3d.inx.h:5 +#: ../share/extensions/edge3d.inx.h:5 ../share/extensions/nicechart.inx.h:25 msgid "Stroke width:" msgstr "Товщина штриха:" @@ -11463,16 +11589,16 @@ msgstr "Останній вузол" msgid "Rotation helper size" msgstr "Розмір допоміжного елемента обертання" -#: ../src/live_effects/lpe-transform_2pts.cpp:197 +#: ../src/live_effects/lpe-transform_2pts.cpp:196 msgid "Change index of knot" msgstr "Змінити індекс вузла" -#: ../src/live_effects/lpe-transform_2pts.cpp:350 -#: ../src/ui/dialog/inkscape-preferences.cpp:1612 +#: ../src/live_effects/lpe-transform_2pts.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1623 #: ../src/ui/dialog/pixelartdialog.cpp:296 #: ../src/ui/dialog/svg-fonts-dialog.cpp:699 #: ../src/ui/dialog/tracedialog.cpp:813 -#: ../src/ui/widget/preferences-widget.cpp:746 +#: ../src/ui/widget/preferences-widget.cpp:742 msgid "Reset" msgstr "Скинути" @@ -11592,7 +11718,7 @@ msgstr "Обернути" #: ../src/live_effects/parameter/originalpatharray.cpp:130 #: ../src/live_effects/parameter/originalpatharray.cpp:315 -#: ../src/live_effects/parameter/path.cpp:481 +#: ../src/live_effects/parameter/path.cpp:486 msgid "Link path parameter to path" msgstr "Пов'язати параметр контуру з контуром" @@ -11601,12 +11727,12 @@ msgid "Remove Path" msgstr "Вилучити контур" #: ../src/live_effects/parameter/originalpatharray.cpp:179 -#: ../src/ui/dialog/objects.cpp:1850 +#: ../src/ui/dialog/objects.cpp:1854 msgid "Move Down" msgstr "Пересунути нижче" #: ../src/live_effects/parameter/originalpatharray.cpp:191 -#: ../src/ui/dialog/objects.cpp:1858 +#: ../src/ui/dialog/objects.cpp:1862 msgid "Move Up" msgstr "Пересунути вище" @@ -11638,11 +11764,11 @@ msgstr "Вставити контур" msgid "Link to path on clipboard" msgstr "Пов’язати з контуром у буфері обміну" -#: ../src/live_effects/parameter/path.cpp:449 +#: ../src/live_effects/parameter/path.cpp:454 msgid "Paste path parameter" msgstr "Вставити параметр контуру" -#: ../src/live_effects/parameter/point.cpp:124 +#: ../src/live_effects/parameter/point.cpp:132 msgid "Change point parameter" msgstr "Змінити параметр точки" @@ -11690,41 +11816,41 @@ msgstr "" msgid "Unable to find node ID: '%s'\n" msgstr "Не вдається знайти ідентифікатор вузла: '%s'\n" -#: ../src/main.cpp:295 +#: ../src/main.cpp:300 msgid "Print the Inkscape version number" msgstr "Вивести версію Inkscape" -#: ../src/main.cpp:300 +#: ../src/main.cpp:305 msgid "Do not use X server (only process files from console)" msgstr "Не використовувати X сервер (лише консольні операції)" -#: ../src/main.cpp:305 +#: ../src/main.cpp:310 msgid "Try to use X server (even if $DISPLAY is not set)" msgstr "" "Намагатися використовувати X сервер, навіть якщо змінну $DISPLAY не " "встановлено" -#: ../src/main.cpp:310 +#: ../src/main.cpp:315 msgid "Open specified document(s) (option string may be excluded)" msgstr "Відкрити вказані документи (аргумент може бути виключений)" -#: ../src/main.cpp:311 ../src/main.cpp:316 ../src/main.cpp:321 -#: ../src/main.cpp:393 ../src/main.cpp:398 ../src/main.cpp:403 -#: ../src/main.cpp:414 ../src/main.cpp:430 ../src/main.cpp:435 +#: ../src/main.cpp:316 ../src/main.cpp:321 ../src/main.cpp:326 +#: ../src/main.cpp:398 ../src/main.cpp:403 ../src/main.cpp:408 +#: ../src/main.cpp:419 ../src/main.cpp:435 ../src/main.cpp:440 msgid "FILENAME" msgstr "НАЗВА_ФАЙЛА" -#: ../src/main.cpp:315 +#: ../src/main.cpp:320 msgid "Print document(s) to specified output file (use '| program' for pipe)" msgstr "" "Друкувати документ(и) у вказаний файл (для передавання програмі " "використовуйте '| program')" -#: ../src/main.cpp:320 +#: ../src/main.cpp:325 msgid "Export document to a PNG file" msgstr "Експортувати документ у файл формату PNG" -#: ../src/main.cpp:325 +#: ../src/main.cpp:330 msgid "" "Resolution for exporting to bitmap and for rasterization of filters in PS/" "EPS/PDF (default 96)" @@ -11732,11 +11858,11 @@ msgstr "" "Роздільна здатність для експортування у растр і для растеризації фільтрів у " "PS/EPS/PDF (типове значення 96)" -#: ../src/main.cpp:326 ../src/ui/widget/rendering-options.cpp:37 +#: ../src/main.cpp:331 ../src/ui/widget/rendering-options.cpp:37 msgid "DPI" msgstr "Роздільність" -#: ../src/main.cpp:330 +#: ../src/main.cpp:335 msgid "" "Exported area in SVG user units (default is the page; 0,0 is lower-left " "corner)" @@ -11744,29 +11870,29 @@ msgstr "" "Область експорту у одиницях SVG (типово — вся сторінка; 0,0 — лівий нижній " "кут)" -#: ../src/main.cpp:331 +#: ../src/main.cpp:336 msgid "x0:y0:x1:y1" msgstr "x0:y0:x1:y1" -#: ../src/main.cpp:335 +#: ../src/main.cpp:340 msgid "Exported area is the entire drawing (not page)" msgstr "Область експорту є суцільним малюнком (не сторінкою)" -#: ../src/main.cpp:340 +#: ../src/main.cpp:345 msgid "Exported area is the entire page" msgstr "Ділянкою експорту є вся сторінка" -#: ../src/main.cpp:345 +#: ../src/main.cpp:350 msgid "Only for PS/EPS/PDF, sets margin in mm around exported area (default 0)" msgstr "" "Лише для PS/EPS/PDF, встановлює ширину полів навколо експортованої ділянки у " "міліметрах (типово 0)" -#: ../src/main.cpp:346 ../src/main.cpp:388 +#: ../src/main.cpp:351 ../src/main.cpp:393 msgid "VALUE" msgstr "ЗНАЧЕННЯ" -#: ../src/main.cpp:350 +#: ../src/main.cpp:355 msgid "" "Snap the bitmap export area outwards to the nearest integer values (in SVG " "user units)" @@ -11774,75 +11900,75 @@ msgstr "" "Округлити область експорту растру назовні до найближчого цілого значення (у " "одиницях SVG)" -#: ../src/main.cpp:355 +#: ../src/main.cpp:360 msgid "The width of exported bitmap in pixels (overrides export-dpi)" msgstr "Ширина зображення для експорту у точках (перевизначає export-dpi)" -#: ../src/main.cpp:356 +#: ../src/main.cpp:361 msgid "WIDTH" msgstr "ШИРИНА" -#: ../src/main.cpp:360 +#: ../src/main.cpp:365 msgid "The height of exported bitmap in pixels (overrides export-dpi)" msgstr "Висота зображення для експорту у точках (перевизначає export-dpi)" -#: ../src/main.cpp:361 +#: ../src/main.cpp:366 msgid "HEIGHT" msgstr "ВИСОТА" -#: ../src/main.cpp:365 +#: ../src/main.cpp:370 msgid "The ID of the object to export" msgstr "Ідентифікатор об'єкта, що експортується" -#: ../src/main.cpp:366 ../src/main.cpp:479 -#: ../src/ui/dialog/inkscape-preferences.cpp:1558 +#: ../src/main.cpp:371 ../src/main.cpp:484 +#: ../src/ui/dialog/inkscape-preferences.cpp:1569 msgid "ID" msgstr "Ідентифікатор" #. TRANSLATORS: this means: "Only export the object whose id is given in --export-id". #. See "man inkscape" for details. -#: ../src/main.cpp:372 +#: ../src/main.cpp:377 msgid "" "Export just the object with export-id, hide all others (only with export-id)" msgstr "" "Експортувати лише об'єкт з заданим ідентифікатором, усі інші приховати (лише " "з export-id)" -#: ../src/main.cpp:377 +#: ../src/main.cpp:382 msgid "Use stored filename and DPI hints when exporting (only with export-id)" msgstr "" "При експорті використовувати збережену назву файла та розширення (лише з " "export-id)" -#: ../src/main.cpp:382 +#: ../src/main.cpp:387 msgid "Background color of exported bitmap (any SVG-supported color string)" msgstr "" "Колір тла для експорту растрового зображення (будь-яка підтримувана SVG-" "кольорова гама)" -#: ../src/main.cpp:383 +#: ../src/main.cpp:388 msgid "COLOR" msgstr "КОЛІР" -#: ../src/main.cpp:387 +#: ../src/main.cpp:392 msgid "Background opacity of exported bitmap (either 0.0 to 1.0, or 1 to 255)" msgstr "Прозорість тла для експорту растру (від 0.0 до 1.0, або від 1 до 255)" -#: ../src/main.cpp:392 +#: ../src/main.cpp:397 msgid "Export document to plain SVG file (no sodipodi or inkscape namespaces)" msgstr "" "Експортувати документ у формат «звичайний SVG» (без елементів sodipodi: або " "inkscape:)" -#: ../src/main.cpp:397 +#: ../src/main.cpp:402 msgid "Export document to a PS file" msgstr "Експортувати документ у файл формату PS" -#: ../src/main.cpp:402 +#: ../src/main.cpp:407 msgid "Export document to an EPS file" msgstr "Експортувати документ у файл формату EPS" -#: ../src/main.cpp:407 +#: ../src/main.cpp:412 msgid "" "Choose the PostScript Level used to export. Possible choices are 2 and 3 " "(the default)" @@ -11850,16 +11976,16 @@ msgstr "" "Виберіть рівень мови PostScript для експортованих даних. Можливі варіанти: 2 " "і 3 (типовий)" -#: ../src/main.cpp:409 +#: ../src/main.cpp:414 msgid "PS Level" msgstr "Рівень PS" -#: ../src/main.cpp:413 +#: ../src/main.cpp:418 msgid "Export document to a PDF file" msgstr "Експортувати документ у файл формату PDF" #. TRANSLATORS: "--export-pdf-version" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:419 +#: ../src/main.cpp:424 msgid "" "Export PDF to given version. (hint: make sure to input the exact string " "found in the PDF export dialog, e.g. \"PDF 1.4\" which is PDF-a conformant)" @@ -11868,11 +11994,11 @@ msgstr "" "з діалогового вікна експортування PDF точно (приклад: \"PDF 1.4\"), щоб " "зберегти сумісність зі стандартом PDF-a)" -#: ../src/main.cpp:420 +#: ../src/main.cpp:425 msgid "PDF_VERSION" msgstr "ВЕРСІЯ_PDF" -#: ../src/main.cpp:424 +#: ../src/main.cpp:429 msgid "" "Export PDF/PS/EPS without text. Besides the PDF/PS/EPS, a LaTeX file is " "exported, putting the text on top of the PDF/PS/EPS file. Include the result " @@ -11883,21 +12009,21 @@ msgstr "" "накласти на дані з файла PDF/PS/EPS. Вставити результат до вашого файла " "LaTeX можна буде командою: \\input{файл_latex.tex}" -#: ../src/main.cpp:429 +#: ../src/main.cpp:434 msgid "Export document to an Enhanced Metafile (EMF) File" msgstr "Експортувати документ у файл формату EMF" -#: ../src/main.cpp:434 +#: ../src/main.cpp:439 msgid "Export document to a Windows Metafile (WMF) File" msgstr "Експортувати документ до метафайла Windows (WMF)" -#: ../src/main.cpp:439 +#: ../src/main.cpp:444 msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" msgstr "" "Перетворити тестовий об'єкт на контури під час експортування (PS, EPS, PDF? " "SVG)" -#: ../src/main.cpp:444 +#: ../src/main.cpp:449 msgid "" "Render filtered objects without filters, instead of rasterizing (PS, EPS, " "PDF)" @@ -11906,56 +12032,56 @@ msgstr "" "PDF)" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:450 +#: ../src/main.cpp:455 msgid "" "Query the X coordinate of the drawing or, if specified, of the object with --" "query-id" msgstr "Запитати X-координату рисунка чи, якщо вказано, об'єкта з --query-id" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:456 +#: ../src/main.cpp:461 msgid "" "Query the Y coordinate of the drawing or, if specified, of the object with --" "query-id" msgstr "Запитати Y-координату рисунка чи, якщо вказано, об'єкта з --query-id" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:462 +#: ../src/main.cpp:467 msgid "" "Query the width of the drawing or, if specified, of the object with --query-" "id" msgstr "Запитати ширину рисунка чи, якщо вказано, об'єкта з --query-id" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" -#: ../src/main.cpp:468 +#: ../src/main.cpp:473 msgid "" "Query the height of the drawing or, if specified, of the object with --query-" "id" msgstr "Запитати висоту рисунка чи, якщо вказано, об'єкта з --query-id" -#: ../src/main.cpp:473 +#: ../src/main.cpp:478 msgid "List id,x,y,w,h for all objects" msgstr "Список ід,x,y,ш,в всіх об'єктів" -#: ../src/main.cpp:478 +#: ../src/main.cpp:483 msgid "The ID of the object whose dimensions are queried" msgstr "Ідентифікатор об'єкта, розміри якого опитуються" #. TRANSLATORS: this option makes Inkscape print the name (path) of the extension directory -#: ../src/main.cpp:484 +#: ../src/main.cpp:489 msgid "Print out the extension directory and exit" msgstr "Вивести на екран каталог додатка і вийти" -#: ../src/main.cpp:489 +#: ../src/main.cpp:494 msgid "Remove unused definitions from the defs section(s) of the document" msgstr "Вилучити з розділу defs документа визначення, що не використовуються" -#: ../src/main.cpp:495 +#: ../src/main.cpp:500 msgid "Enter a listening loop for D-Bus messages in console mode" msgstr "" "Увійти у цикл очікування повідомлень D-Bus, працюючи у консольному режимі" -#: ../src/main.cpp:500 +#: ../src/main.cpp:505 msgid "" "Specify the D-Bus bus name to listen for messages on (default is org." "inkscape)" @@ -11963,35 +12089,35 @@ msgstr "" "Вкажіть назву каналу D-Bus, на якому слід очікувати на повідомлення (типовою " "є org.inkscape)" -#: ../src/main.cpp:501 +#: ../src/main.cpp:506 msgid "BUS-NAME" msgstr "НАЗВА-КАНАЛУ" -#: ../src/main.cpp:506 +#: ../src/main.cpp:511 msgid "List the IDs of all the verbs in Inkscape" msgstr "Список ідентифікаторів усіх дієслів у Inkscape" -#: ../src/main.cpp:511 +#: ../src/main.cpp:516 msgid "Verb to call when Inkscape opens." msgstr "Дієслово, що викликається при відкриванні Inkscape." -#: ../src/main.cpp:512 +#: ../src/main.cpp:517 msgid "VERB-ID" msgstr "ІД-ДІЄСЛОВА" -#: ../src/main.cpp:516 +#: ../src/main.cpp:521 msgid "Object ID to select when Inkscape opens." msgstr "Ідентифікатор об'єкта, який визначається при відкриванні Inkscape." -#: ../src/main.cpp:517 +#: ../src/main.cpp:522 msgid "OBJECT-ID" msgstr "ІД-ОБ'ЄКТА" -#: ../src/main.cpp:521 +#: ../src/main.cpp:526 msgid "Start Inkscape in interactive shell mode." msgstr "Запустити Inkscape у режимі інтерактивної оболонки." -#: ../src/main.cpp:871 ../src/main.cpp:1284 +#: ../src/main.cpp:876 ../src/main.cpp:1318 msgid "" "[OPTIONS...] [FILE...]\n" "\n" @@ -12008,11 +12134,11 @@ msgstr "_Файл" #. " \n" #. " \n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2716 ../src/verbs.cpp:2724 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2715 ../src/verbs.cpp:2723 msgid "_Edit" msgstr "_Зміни" -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2475 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2472 msgid "Paste Si_ze" msgstr "Вставити за р_озміром" @@ -12024,76 +12150,76 @@ msgstr "Клон_увати" msgid "Select Sa_me" msgstr "Позначи_ти те саме" -#: ../src/menus-skeleton.h:98 +#: ../src/menus-skeleton.h:100 msgid "_View" msgstr "П_ерегляд" -#: ../src/menus-skeleton.h:99 +#: ../src/menus-skeleton.h:101 msgid "_Zoom" msgstr "_Масштаб" -#: ../src/menus-skeleton.h:115 +#: ../src/menus-skeleton.h:117 msgid "_Display mode" msgstr "Режим відобра_ження" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:124 +#: ../src/menus-skeleton.h:126 msgid "_Color display mode" msgstr "Режим показу _кольорів" #. Better location in menu needs to be found #. " \n" #. " \n" -#: ../src/menus-skeleton.h:137 +#: ../src/menus-skeleton.h:139 msgid "Sh_ow/Hide" msgstr "По_казати/Сховати" #. Not quite ready to be in the menus. #. " \n" -#: ../src/menus-skeleton.h:157 +#: ../src/menus-skeleton.h:159 msgid "_Layer" msgstr "_Шар" -#: ../src/menus-skeleton.h:181 +#: ../src/menus-skeleton.h:183 msgid "_Object" msgstr "_Об'єкт" -#: ../src/menus-skeleton.h:192 +#: ../src/menus-skeleton.h:195 msgid "Cli_p" msgstr "Відсі_кання" -#: ../src/menus-skeleton.h:196 +#: ../src/menus-skeleton.h:199 msgid "Mas_k" msgstr "Ма_ска" -#: ../src/menus-skeleton.h:200 +#: ../src/menus-skeleton.h:203 msgid "Patter_n" msgstr "В_ізерунок" -#: ../src/menus-skeleton.h:224 +#: ../src/menus-skeleton.h:227 msgid "_Path" msgstr "_Контур" -#: ../src/menus-skeleton.h:256 ../src/ui/dialog/find.cpp:78 +#: ../src/menus-skeleton.h:259 ../src/ui/dialog/find.cpp:78 #: ../src/ui/dialog/text-edit.cpp:71 msgid "_Text" msgstr "_Текст" -#: ../src/menus-skeleton.h:274 +#: ../src/menus-skeleton.h:277 msgid "Filter_s" msgstr "Філ_ьтри" -#: ../src/menus-skeleton.h:280 +#: ../src/menus-skeleton.h:283 msgid "Exte_nsions" msgstr "Дод_атки" -#: ../src/menus-skeleton.h:286 +#: ../src/menus-skeleton.h:289 msgid "_Help" msgstr "_Довідка" -#: ../src/menus-skeleton.h:290 +#: ../src/menus-skeleton.h:293 msgid "Tutorials" msgstr "Підручники" @@ -12121,43 +12247,43 @@ msgstr "Виберіть контур(и) для розділення." msgid "Breaking apart paths..." msgstr "Поділ контурів на частини…" -#: ../src/path-chemistry.cpp:287 +#: ../src/path-chemistry.cpp:282 msgid "Break apart" msgstr "Розділення" -#: ../src/path-chemistry.cpp:289 +#: ../src/path-chemistry.cpp:285 msgid "No path(s) to break apart in the selection." msgstr "У позначеному немає контурів, що можуть розділитись." -#: ../src/path-chemistry.cpp:299 +#: ../src/path-chemistry.cpp:295 msgid "Select object(s) to convert to path." msgstr "Позначте об'єкти для перетворення у контур." -#: ../src/path-chemistry.cpp:305 +#: ../src/path-chemistry.cpp:301 msgid "Converting objects to paths..." msgstr "Перетворення об'єктів на контури…" -#: ../src/path-chemistry.cpp:324 +#: ../src/path-chemistry.cpp:320 msgid "Object to path" msgstr "Об'єкт у контур" -#: ../src/path-chemistry.cpp:326 +#: ../src/path-chemistry.cpp:322 msgid "No objects to convert to path in the selection." msgstr "У позначеному немає об'єктів, що перетворюються у контур." -#: ../src/path-chemistry.cpp:613 +#: ../src/path-chemistry.cpp:609 msgid "Select path(s) to reverse." msgstr "Виберіть контур(и) для зміни напряму." -#: ../src/path-chemistry.cpp:622 +#: ../src/path-chemistry.cpp:618 msgid "Reversing paths..." msgstr "Розвертання контурів…" -#: ../src/path-chemistry.cpp:657 +#: ../src/path-chemistry.cpp:653 msgid "Reverse path" msgstr "Розвернути контур" -#: ../src/path-chemistry.cpp:659 +#: ../src/path-chemistry.cpp:655 msgid "No paths to reverse in the selection." msgstr "У позначеному немає контурів для зміни напряму." @@ -12358,7 +12484,7 @@ msgstr "Зв'язок:" msgid "A related resource" msgstr "Пов’язаний ресурс" -#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1914 +#: ../src/rdf.cpp:267 ../src/ui/dialog/inkscape-preferences.cpp:1925 msgid "Language:" msgstr "Мова:" @@ -12440,7 +12566,7 @@ msgstr "Нічого не було вилучено." #: ../src/selection-chemistry.cpp:426 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:75 #: ../src/ui/dialog/swatches.cpp:277 ../src/ui/tools/text-tool.cpp:965 -#: ../src/widgets/eraser-toolbar.cpp:93 +#: ../src/widgets/eraser-toolbar.cpp:120 #: ../src/widgets/gradient-toolbar.cpp:1181 #: ../src/widgets/gradient-toolbar.cpp:1195 #: ../src/widgets/gradient-toolbar.cpp:1209 @@ -12471,239 +12597,251 @@ msgid "Group" msgstr "Згрупувати" #: ../src/selection-chemistry.cpp:798 +msgid "No objects selected to pop out of group." +msgstr "Немає позначених об'єктів для виключення з групи." + +#: ../src/selection-chemistry.cpp:808 +msgid "Selection not in a group." +msgstr "Позначене не є частиною групи." + +#: ../src/selection-chemistry.cpp:822 +msgid "Pop selection from group" +msgstr "Виключити позначене з групи" + +#: ../src/selection-chemistry.cpp:830 msgid "Select a group to ungroup." msgstr "Позначте групу для розгрупування." -#: ../src/selection-chemistry.cpp:813 +#: ../src/selection-chemistry.cpp:845 msgid "No groups to ungroup in the selection." msgstr "У позначеному немає груп." -#: ../src/selection-chemistry.cpp:869 ../src/sp-item-group.cpp:550 -#: ../src/ui/dialog/objects.cpp:1912 +#: ../src/selection-chemistry.cpp:901 ../src/sp-item-group.cpp:550 +#: ../src/ui/dialog/objects.cpp:1916 msgid "Ungroup" msgstr "Розгрупувати" -#: ../src/selection-chemistry.cpp:956 +#: ../src/selection-chemistry.cpp:988 msgid "Select object(s) to raise." msgstr "Оберіть об'єкт(и) для підняття." -#: ../src/selection-chemistry.cpp:962 ../src/selection-chemistry.cpp:1015 -#: ../src/selection-chemistry.cpp:1041 ../src/selection-chemistry.cpp:1099 +#: ../src/selection-chemistry.cpp:994 ../src/selection-chemistry.cpp:1047 +#: ../src/selection-chemistry.cpp:1073 ../src/selection-chemistry.cpp:1131 msgid "" "You cannot raise/lower objects from different groups or layers." msgstr "" "Не можна піднімати/опускати об'єкти з різних груп чи шарів." #. TRANSLATORS: "Raise" means "to raise an object" in the undo history -#: ../src/selection-chemistry.cpp:999 +#: ../src/selection-chemistry.cpp:1031 msgctxt "Undo action" msgid "Raise" msgstr "підняття" -#: ../src/selection-chemistry.cpp:1007 +#: ../src/selection-chemistry.cpp:1039 msgid "Select object(s) to raise to top." msgstr "Позначте об'єкт(и) для піднімання нагору." -#: ../src/selection-chemistry.cpp:1028 +#: ../src/selection-chemistry.cpp:1060 msgid "Raise to top" msgstr "Підняти на передній план" -#: ../src/selection-chemistry.cpp:1035 +#: ../src/selection-chemistry.cpp:1067 msgid "Select object(s) to lower." msgstr "Позначте об'єкт(и) для опускання." #. TRANSLATORS: "Lower" means "to lower an object" in the undo history -#: ../src/selection-chemistry.cpp:1083 +#: ../src/selection-chemistry.cpp:1115 msgctxt "Undo action" msgid "Lower" msgstr "опускання" -#: ../src/selection-chemistry.cpp:1091 +#: ../src/selection-chemistry.cpp:1123 msgid "Select object(s) to lower to bottom." msgstr "Позначте об'єкт(и) для опускання на низ." -#: ../src/selection-chemistry.cpp:1122 +#: ../src/selection-chemistry.cpp:1154 msgid "Lower to bottom" msgstr "Опустити на задній план" -#: ../src/selection-chemistry.cpp:1132 +#: ../src/selection-chemistry.cpp:1164 msgid "Nothing to undo." msgstr "Немає операцій, що можна скасувати." -#: ../src/selection-chemistry.cpp:1143 +#: ../src/selection-chemistry.cpp:1175 msgid "Nothing to redo." msgstr "Немає операцій, що можна вернути." -#: ../src/selection-chemistry.cpp:1215 +#: ../src/selection-chemistry.cpp:1247 msgid "Paste" msgstr "Вставити" -#: ../src/selection-chemistry.cpp:1223 +#: ../src/selection-chemistry.cpp:1255 msgid "Paste style" msgstr "Вставити стиль" -#: ../src/selection-chemistry.cpp:1233 +#: ../src/selection-chemistry.cpp:1265 msgid "Paste live path effect" msgstr "Вставити ефект динамічного контуру" -#: ../src/selection-chemistry.cpp:1255 +#: ../src/selection-chemistry.cpp:1287 msgid "Select object(s) to remove live path effects from." msgstr "Оберіть об'єкт(и) для вилучення анімованих ефектів контурів." -#: ../src/selection-chemistry.cpp:1267 +#: ../src/selection-chemistry.cpp:1299 msgid "Remove live path effect" msgstr "Вилучити анімований ефект контуру" -#: ../src/selection-chemistry.cpp:1278 +#: ../src/selection-chemistry.cpp:1310 msgid "Select object(s) to remove filters from." msgstr "Виберіть об'єкт(и), з яких слід вилучити фільтри." -#: ../src/selection-chemistry.cpp:1288 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1694 +#: ../src/selection-chemistry.cpp:1320 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1695 msgid "Remove filter" msgstr "Вилучити фільтр" -#: ../src/selection-chemistry.cpp:1297 +#: ../src/selection-chemistry.cpp:1329 msgid "Paste size" msgstr "Вставити розмір" -#: ../src/selection-chemistry.cpp:1306 +#: ../src/selection-chemistry.cpp:1338 msgid "Paste size separately" msgstr "Вставити розмір окремо" -#: ../src/selection-chemistry.cpp:1335 +#: ../src/selection-chemistry.cpp:1367 msgid "Select object(s) to move to the layer above." msgstr "Позначте об'єкти для переміщення на шар вище." -#: ../src/selection-chemistry.cpp:1361 +#: ../src/selection-chemistry.cpp:1393 msgid "Raise to next layer" msgstr "Піднятися на наступний шар" -#: ../src/selection-chemistry.cpp:1368 +#: ../src/selection-chemistry.cpp:1400 msgid "No more layers above." msgstr "Більше немає вищих шарів." -#: ../src/selection-chemistry.cpp:1379 +#: ../src/selection-chemistry.cpp:1411 msgid "Select object(s) to move to the layer below." msgstr "Позначте об'єкти для переміщення на шар нижче." -#: ../src/selection-chemistry.cpp:1405 +#: ../src/selection-chemistry.cpp:1437 msgid "Lower to previous layer" msgstr "Опуститися на попередній шар" -#: ../src/selection-chemistry.cpp:1412 +#: ../src/selection-chemistry.cpp:1444 msgid "No more layers below." msgstr "Немає нижчого шару." -#: ../src/selection-chemistry.cpp:1422 +#: ../src/selection-chemistry.cpp:1454 msgid "Select object(s) to move." msgstr "Позначте об'єкти для пересування." -#: ../src/selection-chemistry.cpp:1440 ../src/verbs.cpp:2659 +#: ../src/selection-chemistry.cpp:1472 ../src/verbs.cpp:2658 msgid "Move selection to layer" msgstr "Пересунути позначене до шару" #. An SVG element cannot have a transform. We could change 'x' and 'y' in response #. to a translation... but leave that for another day. -#: ../src/selection-chemistry.cpp:1529 ../src/seltrans.cpp:391 +#: ../src/selection-chemistry.cpp:1561 ../src/seltrans.cpp:391 msgid "Cannot transform an embedded SVG." msgstr "Перетворення вбудованого SVG неможливе." -#: ../src/selection-chemistry.cpp:1699 +#: ../src/selection-chemistry.cpp:1731 msgid "Remove transform" msgstr "Прибрати трансформацію" -#: ../src/selection-chemistry.cpp:1806 +#: ../src/selection-chemistry.cpp:1838 msgid "Rotate 90° CCW" msgstr "Обернути на 90° проти годинникової стрілки" -#: ../src/selection-chemistry.cpp:1806 +#: ../src/selection-chemistry.cpp:1838 msgid "Rotate 90° CW" msgstr "Обернути на 90° за годинниковою стрілкою" -#: ../src/selection-chemistry.cpp:1827 ../src/seltrans.cpp:484 +#: ../src/selection-chemistry.cpp:1859 ../src/seltrans.cpp:484 #: ../src/ui/dialog/transformation.cpp:890 msgid "Rotate" msgstr "Обертати" -#: ../src/selection-chemistry.cpp:2176 +#: ../src/selection-chemistry.cpp:2208 msgid "Rotate by pixels" msgstr "Обертати поточково" -#: ../src/selection-chemistry.cpp:2206 ../src/seltrans.cpp:481 +#: ../src/selection-chemistry.cpp:2238 ../src/seltrans.cpp:481 #: ../src/ui/dialog/transformation.cpp:864 ../src/ui/widget/page-sizer.cpp:450 #: ../share/extensions/interp_att_g.inx.h:14 msgid "Scale" msgstr "Масштабувати" -#: ../src/selection-chemistry.cpp:2231 +#: ../src/selection-chemistry.cpp:2263 msgid "Scale by whole factor" msgstr "Масштабувати за повним коефіцієнтом" -#: ../src/selection-chemistry.cpp:2246 +#: ../src/selection-chemistry.cpp:2278 msgid "Move vertically" msgstr "Перемістити вертикально" -#: ../src/selection-chemistry.cpp:2249 +#: ../src/selection-chemistry.cpp:2281 msgid "Move horizontally" msgstr "Перемістити горизонтально" -#: ../src/selection-chemistry.cpp:2252 ../src/selection-chemistry.cpp:2278 +#: ../src/selection-chemistry.cpp:2284 ../src/selection-chemistry.cpp:2310 #: ../src/seltrans.cpp:478 ../src/ui/dialog/transformation.cpp:801 msgid "Move" msgstr "Перемістити" -#: ../src/selection-chemistry.cpp:2272 +#: ../src/selection-chemistry.cpp:2304 msgid "Move vertically by pixels" msgstr "Перемістити вертикально поточково" -#: ../src/selection-chemistry.cpp:2275 +#: ../src/selection-chemistry.cpp:2307 msgid "Move horizontally by pixels" msgstr "Перемістити горизонтально поточково" -#: ../src/selection-chemistry.cpp:2478 +#: ../src/selection-chemistry.cpp:2510 msgid "The selection has no applied path effect." msgstr "Обране не має застосованого ефекту контуру." -#: ../src/selection-chemistry.cpp:2570 ../src/ui/dialog/clonetiler.cpp:2230 +#: ../src/selection-chemistry.cpp:2602 ../src/ui/dialog/clonetiler.cpp:2238 msgid "Select an object to clone." msgstr "Позначте об'єкт для клонування." -#: ../src/selection-chemistry.cpp:2605 +#: ../src/selection-chemistry.cpp:2637 msgctxt "Action" msgid "Clone" msgstr "Клонувати" -#: ../src/selection-chemistry.cpp:2619 +#: ../src/selection-chemistry.cpp:2651 msgid "Select clones to relink." msgstr "Позначте клон для перез'єднання." -#: ../src/selection-chemistry.cpp:2626 +#: ../src/selection-chemistry.cpp:2658 msgid "Copy an object to clipboard to relink clones to." msgstr "" "Копіювати об'єкт до буфера обміну інформації для перез'єднання клонів." -#: ../src/selection-chemistry.cpp:2647 +#: ../src/selection-chemistry.cpp:2679 msgid "No clones to relink in the selection." msgstr "У позначеному немає клонів для перез'єднання." -#: ../src/selection-chemistry.cpp:2650 +#: ../src/selection-chemistry.cpp:2682 msgid "Relink clone" msgstr "Перез'єднати клон" -#: ../src/selection-chemistry.cpp:2664 +#: ../src/selection-chemistry.cpp:2696 msgid "Select clones to unlink." msgstr "Позначте клон для від'єднання." -#: ../src/selection-chemistry.cpp:2717 +#: ../src/selection-chemistry.cpp:2749 msgid "No clones to unlink in the selection." msgstr "У позначеному немає клонів." -#: ../src/selection-chemistry.cpp:2721 +#: ../src/selection-chemistry.cpp:2753 msgid "Unlink clone" msgstr "Від'єднати клон" -#: ../src/selection-chemistry.cpp:2734 +#: ../src/selection-chemistry.cpp:2766 msgid "" "Select a clone to go to its original. Select a linked offset " "to go to its source. Select a text on path to go to the path. Select " @@ -12713,7 +12851,7 @@ msgstr "" "перейти до її контуру; текст вздовж контуру, щоб перейти до його " "контуру. Позначте текст у рамці, щоб перейти до рамки." -#: ../src/selection-chemistry.cpp:2784 +#: ../src/selection-chemistry.cpp:2816 msgid "" "Cannot find the object to select (orphaned clone, offset, textpath, " "flowed text?)" @@ -12721,7 +12859,7 @@ msgstr "" "Не вдається знайти об'єкт, що позначається (осиротілий клон, втяжка, " "текст вздовж контуру чи текст у рамці?)" -#: ../src/selection-chemistry.cpp:2790 +#: ../src/selection-chemistry.cpp:2822 msgid "" "The object you're trying to select is not visible (it is in <" "defs>)" @@ -12729,132 +12867,132 @@ msgstr "" "Об'єкт, який ви намагаєтесь позначити, є невидимим (знаходиться у <" "defs>)" -#: ../src/selection-chemistry.cpp:2880 +#: ../src/selection-chemistry.cpp:2912 msgid "Select path(s) to fill." msgstr "Позначте контури для заповнення." -#: ../src/selection-chemistry.cpp:2898 +#: ../src/selection-chemistry.cpp:2930 msgid "Select object(s) to convert to marker." msgstr "Позначте об'єкт(и) для перетворення у маркер." -#: ../src/selection-chemistry.cpp:2972 +#: ../src/selection-chemistry.cpp:3004 msgid "Objects to marker" msgstr "Об'єкти у маркер" -#: ../src/selection-chemistry.cpp:2998 +#: ../src/selection-chemistry.cpp:3030 msgid "Select object(s) to convert to guides." msgstr "Позначте об'єкт(и) для перетворення у напрямні." -#: ../src/selection-chemistry.cpp:3019 +#: ../src/selection-chemistry.cpp:3051 msgid "Objects to guides" msgstr "Об'єкти у напрямні" -#: ../src/selection-chemistry.cpp:3055 +#: ../src/selection-chemistry.cpp:3087 msgid "Select objects to convert to symbol." msgstr "Позначте об’єкти для перетворення на символ." -#: ../src/selection-chemistry.cpp:3156 +#: ../src/selection-chemistry.cpp:3188 msgid "Group to symbol" msgstr "Групу у символ" -#: ../src/selection-chemistry.cpp:3175 +#: ../src/selection-chemistry.cpp:3207 msgid "Select a symbol to extract objects from." msgstr "Позначте символ для видобування з нього об’єктів." -#: ../src/selection-chemistry.cpp:3184 +#: ../src/selection-chemistry.cpp:3216 msgid "Select only one symbol in Symbol dialog to convert to group." msgstr "" "Позначте лише один символ у діалоговому вікні символів для " "перетворення на групу." -#: ../src/selection-chemistry.cpp:3240 +#: ../src/selection-chemistry.cpp:3272 msgid "Group from symbol" msgstr "Група з символу" -#: ../src/selection-chemistry.cpp:3258 +#: ../src/selection-chemistry.cpp:3290 msgid "Select object(s) to convert to pattern." msgstr "Позначте об'єкт(и) для перетворення у візерунок." -#: ../src/selection-chemistry.cpp:3354 +#: ../src/selection-chemistry.cpp:3386 msgid "Objects to pattern" msgstr "Об'єкти у візерунок" -#: ../src/selection-chemistry.cpp:3370 +#: ../src/selection-chemistry.cpp:3402 msgid "Select an object with pattern fill to extract objects from." msgstr "" "Позначте об'єкт із заповненням візерунком для витягування об'єктів з " "нього." -#: ../src/selection-chemistry.cpp:3429 +#: ../src/selection-chemistry.cpp:3461 msgid "No pattern fills in the selection." msgstr "У позначеному немає заповнення візерунком." -#: ../src/selection-chemistry.cpp:3432 +#: ../src/selection-chemistry.cpp:3464 msgid "Pattern to objects" msgstr "Візерунок у об'єкти" -#: ../src/selection-chemistry.cpp:3518 +#: ../src/selection-chemistry.cpp:3550 msgid "Select object(s) to make a bitmap copy." msgstr "Позначте об'єкти для створення їхньої растрової копії." -#: ../src/selection-chemistry.cpp:3522 +#: ../src/selection-chemistry.cpp:3554 msgid "Rendering bitmap..." msgstr "Показ растрового зображення…" -#: ../src/selection-chemistry.cpp:3707 +#: ../src/selection-chemistry.cpp:3739 msgid "Create bitmap" msgstr "Створення растрового зображення" -#: ../src/selection-chemistry.cpp:3732 ../src/selection-chemistry.cpp:3844 +#: ../src/selection-chemistry.cpp:3764 ../src/selection-chemistry.cpp:3876 msgid "Select object(s) to create clippath or mask from." msgstr "" "Оберіть об'єкт(и) для створення з них контуру вирізання або маски." -#: ../src/selection-chemistry.cpp:3818 ../src/ui/dialog/objects.cpp:1918 +#: ../src/selection-chemistry.cpp:3850 ../src/ui/dialog/objects.cpp:1922 msgid "Create Clip Group" msgstr "Створити групу-обгортку" -#: ../src/selection-chemistry.cpp:3847 +#: ../src/selection-chemistry.cpp:3879 msgid "Select mask object and object(s) to apply clippath or mask to." msgstr "" "Оберіть об'єкт-маску та об'єкт(и) для застосування вирізання або " "маскування." -#: ../src/selection-chemistry.cpp:3994 +#: ../src/selection-chemistry.cpp:4026 msgid "Set clipping path" msgstr "Задати контур вирізання" -#: ../src/selection-chemistry.cpp:3996 +#: ../src/selection-chemistry.cpp:4028 msgid "Set mask" msgstr "Задати маску" -#: ../src/selection-chemistry.cpp:4011 +#: ../src/selection-chemistry.cpp:4043 msgid "Select object(s) to remove clippath or mask from." msgstr "" "Оберіть об'єкт(и) для вилучення контуру вирізання або маскування." -#: ../src/selection-chemistry.cpp:4127 +#: ../src/selection-chemistry.cpp:4159 msgid "Release clipping path" msgstr "Від'єднати закріплений контур" -#: ../src/selection-chemistry.cpp:4129 +#: ../src/selection-chemistry.cpp:4161 msgid "Release mask" msgstr "Маску знято" -#: ../src/selection-chemistry.cpp:4148 +#: ../src/selection-chemistry.cpp:4180 msgid "Select object(s) to fit canvas to." msgstr "Оберіть об'єкт(и) для підбирання їхніх розмірів під полотно." #. Fit Page -#: ../src/selection-chemistry.cpp:4168 ../src/verbs.cpp:3007 +#: ../src/selection-chemistry.cpp:4200 ../src/verbs.cpp:3004 msgid "Fit Page to Selection" msgstr "Підігнати полотно до позначеної області" -#: ../src/selection-chemistry.cpp:4197 ../src/verbs.cpp:3009 +#: ../src/selection-chemistry.cpp:4229 ../src/verbs.cpp:3006 msgid "Fit Page to Drawing" msgstr "Підігнати полотно під намальоване" -#: ../src/selection-chemistry.cpp:4218 ../src/verbs.cpp:3011 +#: ../src/selection-chemistry.cpp:4250 msgid "Fit Page to Selection or Drawing" msgstr "Підігнати полотно під позначену область чи область креслення" @@ -13076,8 +13214,8 @@ msgstr "Дуга" #. Ellipse #: ../src/sp-ellipse.cpp:367 ../src/sp-ellipse.cpp:374 -#: ../src/ui/dialog/inkscape-preferences.cpp:412 -#: ../src/widgets/pencil-toolbar.cpp:178 +#: ../src/ui/dialog/inkscape-preferences.cpp:421 +#: ../src/widgets/pencil-toolbar.cpp:179 msgid "Ellipse" msgstr "Еліпс" @@ -13106,7 +13244,7 @@ msgstr "Контурний текст" msgid "Linked Flowed Text" msgstr "Пов’язаний контурний текст" -#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:377 +#: ../src/sp-flowtext.cpp:290 ../src/sp-text.cpp:380 #: ../src/ui/tools/text-tool.cpp:1556 msgid " [truncated]" msgstr " (обрізано)" @@ -13123,7 +13261,7 @@ msgstr[2] "(%d символів%s)" msgid "Create Guides Around the Page" msgstr "Створити напрямні навколо сторінки" -#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2547 +#: ../src/sp-guide.cpp:274 ../src/verbs.cpp:2544 msgid "Delete All Guides" msgstr "Вилучити всі напрямні" @@ -13169,7 +13307,7 @@ msgstr "[помилкове посилання]: %s" msgid "%d × %d: %s" msgstr "%d × %d: %s" -#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1911 +#: ../src/sp-item-group.cpp:307 ../src/ui/dialog/objects.cpp:1915 msgid "Group" msgstr "Згрупувати" @@ -13183,26 +13321,26 @@ msgstr "з %d об'єкта" msgid "of %d objects" msgstr "з %d об'єкта" -#: ../src/sp-item.cpp:1030 ../src/verbs.cpp:213 +#: ../src/sp-item.cpp:1031 ../src/verbs.cpp:213 msgid "Object" msgstr "Об'єкт" -#: ../src/sp-item.cpp:1042 +#: ../src/sp-item.cpp:1043 #, c-format msgid "%s; clipped" msgstr "%s; закріплено" -#: ../src/sp-item.cpp:1048 +#: ../src/sp-item.cpp:1049 #, c-format msgid "%s; masked" msgstr "%s; масковано" -#: ../src/sp-item.cpp:1058 +#: ../src/sp-item.cpp:1059 #, c-format msgid "%s; filtered (%s)" msgstr "%s; відфільтровано (%s)" -#: ../src/sp-item.cpp:1060 +#: ../src/sp-item.cpp:1061 #, c-format msgid "%s; filtered" msgstr "%s; відфільтровано" @@ -13211,29 +13349,29 @@ msgstr "%s; відфільтровано" msgid "Line" msgstr "Лінія" -#: ../src/sp-lpe-item.cpp:260 +#: ../src/sp-lpe-item.cpp:258 ../src/sp-lpe-item.cpp:705 msgid "An exception occurred during execution of the Path Effect." msgstr "Під час застосування ефекту контуру сталася помилка типу виключення." -#: ../src/sp-offset.cpp:329 +#: ../src/sp-offset.cpp:331 msgid "Linked Offset" msgstr "Пов’язаний відступ" -#: ../src/sp-offset.cpp:331 +#: ../src/sp-offset.cpp:333 msgid "Dynamic Offset" msgstr "Динамічний відступ" #. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign -#: ../src/sp-offset.cpp:337 +#: ../src/sp-offset.cpp:339 #, c-format msgid "%s by %f pt" msgstr "%s на %f пт" -#: ../src/sp-offset.cpp:338 +#: ../src/sp-offset.cpp:340 msgid "outset" msgstr "розтягнута" -#: ../src/sp-offset.cpp:338 +#: ../src/sp-offset.cpp:340 msgid "inset" msgstr "втягнена" @@ -13265,12 +13403,12 @@ msgid "Polyline" msgstr "Полілінія" #. Rectangle -#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:402 +#: ../src/sp-rect.cpp:161 ../src/ui/dialog/inkscape-preferences.cpp:411 msgid "Rectangle" msgstr "Прямокутник" #. Spiral -#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:420 +#: ../src/sp-spiral.cpp:220 ../src/ui/dialog/inkscape-preferences.cpp:429 #: ../share/extensions/gcodetools_area.inx.h:11 msgid "Spiral" msgstr "Спіраль" @@ -13283,7 +13421,7 @@ msgid "with %3f turns" msgstr "з %3f обертами" #. Star -#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:416 +#: ../src/sp-star.cpp:247 ../src/ui/dialog/inkscape-preferences.cpp:425 #: ../src/widgets/star-toolbar.cpp:469 msgid "Star" msgstr "Зірка" @@ -13324,12 +13462,12 @@ msgstr "Умовна група" msgid "Text" msgstr "Текст" -#: ../src/sp-text.cpp:381 +#: ../src/sp-text.cpp:384 #, c-format msgid "on path%s (%s, %s)" msgstr "за контуром%s (%s, %s)" -#: ../src/sp-text.cpp:382 +#: ../src/sp-text.cpp:385 #, c-format msgid "%s (%s, %s)" msgstr "%s (%s, %s)" @@ -13386,29 +13524,22 @@ msgstr "Об'єднання" msgid "Intersection" msgstr "Перетин" -#: ../src/splivarot.cpp:106 +#: ../src/splivarot.cpp:106 ../src/splivarot.cpp:112 msgid "Division" msgstr "Ділення" -#: ../src/splivarot.cpp:111 +#: ../src/splivarot.cpp:118 msgid "Cut path" msgstr "Обрізати контур" -#: ../src/splivarot.cpp:335 +#: ../src/splivarot.cpp:342 msgid "Select at least 2 paths to perform a boolean operation." msgstr "Для логічної операції треба позначити не менше двох контурів." -#: ../src/splivarot.cpp:339 +#: ../src/splivarot.cpp:346 msgid "Select at least 1 path to perform a boolean union." msgstr "Оберіть хоча б 1 контур для виконання об'єднання." -#: ../src/splivarot.cpp:347 -msgid "" -"Select exactly 2 paths to perform difference, division, or path cut." -msgstr "" -"Для операції виключного АБО, ділення та розрізання контуру виберіть точно " -"2 контури." - #: ../src/splivarot.cpp:363 ../src/splivarot.cpp:378 msgid "" "Unable to determine the z-order of the objects selected for " @@ -13427,67 +13558,67 @@ msgstr "Один з об'єктів не є контуром, логіч msgid "Select stroked path(s) to convert stroke to path." msgstr "Оберіть контур(и) з штрихів для перетворення на контур." -#: ../src/splivarot.cpp:1509 +#: ../src/splivarot.cpp:1511 msgid "Convert stroke to path" msgstr "Перетворити штрих на контур" #. TRANSLATORS: "to outline" means "to convert stroke to path" -#: ../src/splivarot.cpp:1512 +#: ../src/splivarot.cpp:1514 msgid "No stroked paths in the selection." msgstr "У позначеному немає контурів зі штрихів." -#: ../src/splivarot.cpp:1583 +#: ../src/splivarot.cpp:1585 msgid "Selected object is not a path, cannot inset/outset." msgstr "" "позначений об'єкт не є контуром, втягування/розтягування неможливі." -#: ../src/splivarot.cpp:1674 ../src/splivarot.cpp:1741 +#: ../src/splivarot.cpp:1676 ../src/splivarot.cpp:1743 msgid "Create linked offset" msgstr "Створити зв'язану втяжку" -#: ../src/splivarot.cpp:1675 ../src/splivarot.cpp:1742 +#: ../src/splivarot.cpp:1677 ../src/splivarot.cpp:1744 msgid "Create dynamic offset" msgstr "Створити динамічний відступ" -#: ../src/splivarot.cpp:1767 +#: ../src/splivarot.cpp:1769 msgid "Select path(s) to inset/outset." msgstr "Позначте контур(и) для втягування/розтягування." -#: ../src/splivarot.cpp:1960 +#: ../src/splivarot.cpp:1962 msgid "Outset path" msgstr "Розтягнений контур" -#: ../src/splivarot.cpp:1960 +#: ../src/splivarot.cpp:1962 msgid "Inset path" msgstr "Втягнутий контур" -#: ../src/splivarot.cpp:1962 +#: ../src/splivarot.cpp:1964 msgid "No paths to inset/outset in the selection." msgstr "У позначеному немає контурів для втягування/розтягування." -#: ../src/splivarot.cpp:2124 +#: ../src/splivarot.cpp:2126 msgid "Simplifying paths (separately):" msgstr "Спрощення контурів (окремо):" -#: ../src/splivarot.cpp:2126 +#: ../src/splivarot.cpp:2128 msgid "Simplifying paths:" msgstr "Спрощення контурів:" -#: ../src/splivarot.cpp:2163 +#: ../src/splivarot.cpp:2165 #, c-format msgid "%s %d of %d paths simplified..." msgstr "%s %d з %d контурів спрощено…" -#: ../src/splivarot.cpp:2176 +#: ../src/splivarot.cpp:2178 #, c-format msgid "%d paths simplified." msgstr "%d контурів спрощено." -#: ../src/splivarot.cpp:2190 +#: ../src/splivarot.cpp:2192 msgid "Select path(s) to simplify." msgstr "Позначте контур(и) для спрощення." -#: ../src/splivarot.cpp:2206 +#: ../src/splivarot.cpp:2208 msgid "No paths to simplify in the selection." msgstr "У позначеному немає контурів для спрощення." @@ -13518,7 +13649,7 @@ msgstr "" "Щоб розташувати текст за контуром, контурний текст слід зробити видимим." -#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2570 +#: ../src/text-chemistry.cpp:182 ../src/verbs.cpp:2569 msgid "Put text on path" msgstr "Розмістити текст вздовж контуру" @@ -13530,7 +13661,7 @@ msgstr "Позначте текст вздовж контуру, щоб msgid "No texts-on-paths in the selection." msgstr "У позначеному немає тексту на контурі." -#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2572 +#: ../src/text-chemistry.cpp:216 ../src/verbs.cpp:2571 msgid "Remove text from path" msgstr "Зняти текст з контуру" @@ -13606,68 +13737,68 @@ msgstr "Оберіть одну картинку та одну або декіл msgid "Trace: No active desktop" msgstr "Векторизація: відсутній робочий стіл" -#: ../src/trace/trace.cpp:313 +#: ../src/trace/trace.cpp:314 msgid "Invalid SIOX result" msgstr "Некоректний результат SIOX" -#: ../src/trace/trace.cpp:406 +#: ../src/trace/trace.cpp:407 msgid "Trace: No active document" msgstr "Векторизація: немає активного документа" -#: ../src/trace/trace.cpp:438 +#: ../src/trace/trace.cpp:439 msgid "Trace: Image has no bitmap data" msgstr "Векторизація: у зображенні немає растрових даних" -#: ../src/trace/trace.cpp:445 +#: ../src/trace/trace.cpp:446 msgid "Trace: Starting trace..." msgstr "Векторизація: Початок векторизації…" #. ## inform the document, so we can undo -#: ../src/trace/trace.cpp:548 +#: ../src/trace/trace.cpp:549 msgid "Trace bitmap" msgstr "Векторизація растрового зображення" -#: ../src/trace/trace.cpp:552 +#: ../src/trace/trace.cpp:553 #, c-format msgid "Trace: Done. %ld nodes created" msgstr "Векторизація: Завершено. Створено %ld вузлів." #. check whether something is selected -#: ../src/ui/clipboard.cpp:263 +#: ../src/ui/clipboard.cpp:261 msgid "Nothing was copied." msgstr "Нічого не було скопійовано." -#: ../src/ui/clipboard.cpp:394 ../src/ui/clipboard.cpp:608 -#: ../src/ui/clipboard.cpp:637 +#: ../src/ui/clipboard.cpp:392 ../src/ui/clipboard.cpp:606 +#: ../src/ui/clipboard.cpp:635 msgid "Nothing on the clipboard." msgstr "У буфері обміну нічого немає." -#: ../src/ui/clipboard.cpp:452 +#: ../src/ui/clipboard.cpp:450 msgid "Select object(s) to paste style to." msgstr "Позначте об'єкти(и) для застосування стилю." -#: ../src/ui/clipboard.cpp:463 ../src/ui/clipboard.cpp:480 +#: ../src/ui/clipboard.cpp:461 ../src/ui/clipboard.cpp:478 msgid "No style on the clipboard." msgstr "У буфері обміну немає стилів." -#: ../src/ui/clipboard.cpp:505 +#: ../src/ui/clipboard.cpp:503 msgid "Select object(s) to paste size to." msgstr "Оберіть об'єкт(и) для застосування розміру." -#: ../src/ui/clipboard.cpp:512 +#: ../src/ui/clipboard.cpp:510 msgid "No size on the clipboard." msgstr "У буфері обміну немає розмірів." -#: ../src/ui/clipboard.cpp:569 +#: ../src/ui/clipboard.cpp:567 msgid "Select object(s) to paste live path effect to." msgstr "Оберіть об'єкти для застосування ефекту динамічного контуру." #. no_effect: -#: ../src/ui/clipboard.cpp:595 +#: ../src/ui/clipboard.cpp:593 msgid "No effect on the clipboard." msgstr "У буфері обміну немає ефектів." -#: ../src/ui/clipboard.cpp:614 ../src/ui/clipboard.cpp:651 +#: ../src/ui/clipboard.cpp:612 ../src/ui/clipboard.cpp:649 msgid "Clipboard does not contain a path." msgstr "У буфері обміну відсутній контур." @@ -13705,13 +13836,13 @@ msgstr "_Ліцензія" #. FIXME? INKSCAPE_SCREENSDIR and "about.svg" are in UTF-8, not the #. native filename encoding... and the filename passed to sp_document_new #. should be in UTF-*8.. -#: ../src/ui/dialog/aboutbox.cpp:166 +#: ../src/ui/dialog/aboutbox.cpp:178 msgid "about.svg" msgstr "about.svg" #. TRANSLATORS: Put here your name (and other national contributors') #. one per line in the form of: name surname (email). Use \n for newline. -#: ../src/ui/dialog/aboutbox.cpp:426 +#: ../src/ui/dialog/aboutbox.cpp:438 msgid "translator-credits" msgstr "" "Yuri Syrota (rasta@renome.rovno.ua)\n" @@ -13719,255 +13850,270 @@ msgstr "" "Максим Дзюманенко (dziumanenko@gmail.com)\n" "Юрій Чорноіван (yurchor@ukr.net)" -#: ../src/ui/dialog/align-and-distribute.cpp:169 -#: ../src/ui/dialog/align-and-distribute.cpp:846 +#: ../src/ui/dialog/align-and-distribute.cpp:206 +#: ../src/ui/dialog/align-and-distribute.cpp:937 msgid "Align" msgstr "Вирівнювання" -#: ../src/ui/dialog/align-and-distribute.cpp:337 -#: ../src/ui/dialog/align-and-distribute.cpp:847 +#: ../src/ui/dialog/align-and-distribute.cpp:382 +#: ../src/ui/dialog/align-and-distribute.cpp:938 msgid "Distribute" msgstr "Розставити" -#: ../src/ui/dialog/align-and-distribute.cpp:416 +#: ../src/ui/dialog/align-and-distribute.cpp:461 msgid "Minimum horizontal gap (in px units) between bounding boxes" msgstr "Мінімальна горизонтальна відстань (у точках) між рамками" #. TRANSLATORS: "H:" stands for horizontal gap -#: ../src/ui/dialog/align-and-distribute.cpp:418 +#: ../src/ui/dialog/align-and-distribute.cpp:463 msgctxt "Gap" msgid "_H:" msgstr "_Г:" -#: ../src/ui/dialog/align-and-distribute.cpp:426 +#: ../src/ui/dialog/align-and-distribute.cpp:471 msgid "Minimum vertical gap (in px units) between bounding boxes" msgstr "Мінімальна вертикальна відстань (у точках) між рамками" #. TRANSLATORS: Vertical gap -#: ../src/ui/dialog/align-and-distribute.cpp:428 +#: ../src/ui/dialog/align-and-distribute.cpp:473 msgctxt "Gap" msgid "_V:" msgstr "_В:" -#: ../src/ui/dialog/align-and-distribute.cpp:463 -#: ../src/ui/dialog/align-and-distribute.cpp:849 +#: ../src/ui/dialog/align-and-distribute.cpp:508 +#: ../src/ui/dialog/align-and-distribute.cpp:940 #: ../src/widgets/connector-toolbar.cpp:405 msgid "Remove overlaps" msgstr "Вилучити перекриття" -#: ../src/ui/dialog/align-and-distribute.cpp:494 +#: ../src/ui/dialog/align-and-distribute.cpp:539 #: ../src/widgets/connector-toolbar.cpp:234 msgid "Arrange connector network" msgstr "Впорядкувати сітку з'єднувальних ліній" -#: ../src/ui/dialog/align-and-distribute.cpp:587 +#: ../src/ui/dialog/align-and-distribute.cpp:632 msgid "Exchange Positions" msgstr "Обміняти позиціями" -#: ../src/ui/dialog/align-and-distribute.cpp:621 +#: ../src/ui/dialog/align-and-distribute.cpp:666 msgid "Unclump" msgstr "Розгрупувати" -#: ../src/ui/dialog/align-and-distribute.cpp:692 +#: ../src/ui/dialog/align-and-distribute.cpp:737 msgid "Randomize positions" msgstr "Зробити позиції випадковими" -#: ../src/ui/dialog/align-and-distribute.cpp:794 +#: ../src/ui/dialog/align-and-distribute.cpp:838 msgid "Distribute text baselines" msgstr "Розставити базові рядки тексту" -#: ../src/ui/dialog/align-and-distribute.cpp:818 +#: ../src/ui/dialog/align-and-distribute.cpp:906 msgid "Align text baselines" msgstr "Вирівняти базові лінії тексту" -#: ../src/ui/dialog/align-and-distribute.cpp:848 +#: ../src/ui/dialog/align-and-distribute.cpp:939 msgid "Rearrange" msgstr "Перевпорядкувати" -#: ../src/ui/dialog/align-and-distribute.cpp:850 -#: ../src/widgets/toolbox.cpp:1774 +#: ../src/ui/dialog/align-and-distribute.cpp:941 +#: ../src/widgets/toolbox.cpp:1788 msgid "Nodes" msgstr "Вузли" -#: ../src/ui/dialog/align-and-distribute.cpp:864 +#: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/ui/dialog/align-and-distribute.cpp:956 msgid "Relative to: " msgstr "Відносно: " -#: ../src/ui/dialog/align-and-distribute.cpp:865 +#: ../src/ui/dialog/align-and-distribute.cpp:957 msgid "_Treat selection as group: " msgstr "Вва_жати вибране групою: " #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:871 ../src/verbs.cpp:3039 -#: ../src/verbs.cpp:3040 +#: ../src/ui/dialog/align-and-distribute.cpp:963 ../src/verbs.cpp:3036 +#: ../src/verbs.cpp:3037 msgid "Align right edges of objects to the left edge of the anchor" msgstr "Вирівняти праві краї об'єктів до лівого краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:874 ../src/verbs.cpp:3041 -#: ../src/verbs.cpp:3042 +#: ../src/ui/dialog/align-and-distribute.cpp:966 ../src/verbs.cpp:3038 +#: ../src/verbs.cpp:3039 msgid "Align left edges" msgstr "Вирівняти ліві сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:877 ../src/verbs.cpp:3043 -#: ../src/verbs.cpp:3044 +#: ../src/ui/dialog/align-and-distribute.cpp:969 ../src/verbs.cpp:3040 +#: ../src/verbs.cpp:3041 msgid "Center on vertical axis" msgstr "Центрувати за вертикальною віссю" -#: ../src/ui/dialog/align-and-distribute.cpp:880 ../src/verbs.cpp:3045 -#: ../src/verbs.cpp:3046 +#: ../src/ui/dialog/align-and-distribute.cpp:972 ../src/verbs.cpp:3042 +#: ../src/verbs.cpp:3043 msgid "Align right sides" msgstr "Вирівняти праві сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:883 ../src/verbs.cpp:3047 -#: ../src/verbs.cpp:3048 +#: ../src/ui/dialog/align-and-distribute.cpp:975 ../src/verbs.cpp:3044 +#: ../src/verbs.cpp:3045 msgid "Align left edges of objects to the right edge of the anchor" msgstr "Вирівняти ліві краї об'єктів до правого краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:886 ../src/verbs.cpp:3049 -#: ../src/verbs.cpp:3050 +#: ../src/ui/dialog/align-and-distribute.cpp:978 ../src/verbs.cpp:3046 +#: ../src/verbs.cpp:3047 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "Вирівняти нижні краї об'єктів до верхнього краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:889 ../src/verbs.cpp:3051 -#: ../src/verbs.cpp:3052 +#: ../src/ui/dialog/align-and-distribute.cpp:981 ../src/verbs.cpp:3048 +#: ../src/verbs.cpp:3049 msgid "Align top edges" msgstr "Вирівняти верхні сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:892 ../src/verbs.cpp:3053 -#: ../src/verbs.cpp:3054 +#: ../src/ui/dialog/align-and-distribute.cpp:984 ../src/verbs.cpp:3050 +#: ../src/verbs.cpp:3051 msgid "Center on horizontal axis" msgstr "Центрувати на горизонтальній осі" -#: ../src/ui/dialog/align-and-distribute.cpp:895 ../src/verbs.cpp:3055 -#: ../src/verbs.cpp:3056 +#: ../src/ui/dialog/align-and-distribute.cpp:987 ../src/verbs.cpp:3052 +#: ../src/verbs.cpp:3053 msgid "Align bottom edges" msgstr "Вирівняти нижні сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:898 ../src/verbs.cpp:3057 -#: ../src/verbs.cpp:3058 +#: ../src/ui/dialog/align-and-distribute.cpp:990 ../src/verbs.cpp:3054 +#: ../src/verbs.cpp:3055 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "Вирівняти верхні краї об'єктів до нижнього краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:903 +#: ../src/ui/dialog/align-and-distribute.cpp:995 msgid "Align baseline anchors of texts horizontally" msgstr "Розташувати базову лінію тексту горизонтально" -#: ../src/ui/dialog/align-and-distribute.cpp:906 +#: ../src/ui/dialog/align-and-distribute.cpp:998 msgid "Align baselines of texts" msgstr "Вирівняти базові лінії тексту" -#: ../src/ui/dialog/align-and-distribute.cpp:911 +#: ../src/ui/dialog/align-and-distribute.cpp:1003 msgid "Make horizontal gaps between objects equal" msgstr "Зробити однаковими інтервали між об'єктами по горизонталі" -#: ../src/ui/dialog/align-and-distribute.cpp:915 +#: ../src/ui/dialog/align-and-distribute.cpp:1007 msgid "Distribute left edges equidistantly" msgstr "Рівномірно розподілити ліві краї" -#: ../src/ui/dialog/align-and-distribute.cpp:918 +#: ../src/ui/dialog/align-and-distribute.cpp:1010 msgid "Distribute centers equidistantly horizontally" msgstr "Розставити центри об'єктів на однаковій відстані по горизонталі" -#: ../src/ui/dialog/align-and-distribute.cpp:921 +#: ../src/ui/dialog/align-and-distribute.cpp:1013 msgid "Distribute right edges equidistantly" msgstr "Рівномірно розподілити праві краї" -#: ../src/ui/dialog/align-and-distribute.cpp:925 +#: ../src/ui/dialog/align-and-distribute.cpp:1017 msgid "Make vertical gaps between objects equal" msgstr "Вирівняти інтервали між об'єктами по вертикалі" -#: ../src/ui/dialog/align-and-distribute.cpp:929 +#: ../src/ui/dialog/align-and-distribute.cpp:1021 msgid "Distribute top edges equidistantly" msgstr "Рівномірно розподілити верхні краї" -#: ../src/ui/dialog/align-and-distribute.cpp:932 +#: ../src/ui/dialog/align-and-distribute.cpp:1024 msgid "Distribute centers equidistantly vertically" msgstr "Розставити центри об'єктів на однаковій відстані по вертикалі" -#: ../src/ui/dialog/align-and-distribute.cpp:935 +#: ../src/ui/dialog/align-and-distribute.cpp:1027 msgid "Distribute bottom edges equidistantly" msgstr "Рівномірно розподілити нижні краї" -#: ../src/ui/dialog/align-and-distribute.cpp:940 +#: ../src/ui/dialog/align-and-distribute.cpp:1032 msgid "Distribute baseline anchors of texts horizontally" msgstr "Розподілити базові якорі символів рівномірно по горизонталі" -#: ../src/ui/dialog/align-and-distribute.cpp:943 +#: ../src/ui/dialog/align-and-distribute.cpp:1035 msgid "Distribute baselines of texts vertically" msgstr "Розподілити базові лінії тексту вертикально" -#: ../src/ui/dialog/align-and-distribute.cpp:949 +#: ../src/ui/dialog/align-and-distribute.cpp:1041 #: ../src/widgets/connector-toolbar.cpp:367 msgid "Nicely arrange selected connector network" msgstr "Гармонійно розташувати вибране з'єднання об'єктів" -#: ../src/ui/dialog/align-and-distribute.cpp:952 +#: ../src/ui/dialog/align-and-distribute.cpp:1044 msgid "Exchange positions of selected objects - selection order" msgstr "Обмін позиціями позначених об'єктів — порядок позначення" -#: ../src/ui/dialog/align-and-distribute.cpp:955 +#: ../src/ui/dialog/align-and-distribute.cpp:1047 msgid "Exchange positions of selected objects - stacking order" msgstr "Обмін позиціями позначених об'єктів — порядок стосування" -#: ../src/ui/dialog/align-and-distribute.cpp:958 +#: ../src/ui/dialog/align-and-distribute.cpp:1050 msgid "Exchange positions of selected objects - clockwise rotate" msgstr "" "Обмін позиціями позначених об'єктів — циклічний перехід за годинниковою " "стрілкою" -#: ../src/ui/dialog/align-and-distribute.cpp:963 +#: ../src/ui/dialog/align-and-distribute.cpp:1055 msgid "Randomize centers in both dimensions" msgstr "Випадково розташувати центри у обох напрямках" -#: ../src/ui/dialog/align-and-distribute.cpp:966 +#: ../src/ui/dialog/align-and-distribute.cpp:1058 msgid "Unclump objects: try to equalize edge-to-edge distances" msgstr "" "Розгрупувати об'єкт: спробувати встановити рівну відстань між межами об'єктів" -#: ../src/ui/dialog/align-and-distribute.cpp:971 +#: ../src/ui/dialog/align-and-distribute.cpp:1063 msgid "" "Move objects as little as possible so that their bounding boxes do not " "overlap" msgstr "" "Переміщувати об'єкти якомога менше, так щоб їхні рамки не перекривалися" -#: ../src/ui/dialog/align-and-distribute.cpp:979 +#: ../src/ui/dialog/align-and-distribute.cpp:1071 msgid "Align selected nodes to a common horizontal line" msgstr "Вирівняти вибрані вузли до спільної горизонталі" -#: ../src/ui/dialog/align-and-distribute.cpp:982 +#: ../src/ui/dialog/align-and-distribute.cpp:1074 msgid "Align selected nodes to a common vertical line" msgstr "Вирівняти вибрані вузли до спільної вертикалі" -#: ../src/ui/dialog/align-and-distribute.cpp:985 +#: ../src/ui/dialog/align-and-distribute.cpp:1077 msgid "Distribute selected nodes horizontally" msgstr "Розподілити вибрані вузли по горизонталі" -#: ../src/ui/dialog/align-and-distribute.cpp:988 +#: ../src/ui/dialog/align-and-distribute.cpp:1080 msgid "Distribute selected nodes vertically" msgstr "Розподілити вибрані вузли по вертикалі" #. Rest of the widgetry -#: ../src/ui/dialog/align-and-distribute.cpp:993 +#: ../src/ui/dialog/align-and-distribute.cpp:1085 +#: ../src/ui/dialog/align-and-distribute.cpp:1095 msgid "Last selected" msgstr "Останній позначений" -#: ../src/ui/dialog/align-and-distribute.cpp:994 +#: ../src/ui/dialog/align-and-distribute.cpp:1086 +#: ../src/ui/dialog/align-and-distribute.cpp:1096 msgid "First selected" msgstr "Перший позначений" -#: ../src/ui/dialog/align-and-distribute.cpp:995 +#: ../src/ui/dialog/align-and-distribute.cpp:1087 msgid "Biggest object" msgstr "Найбільший об'єкт" -#: ../src/ui/dialog/align-and-distribute.cpp:996 +#: ../src/ui/dialog/align-and-distribute.cpp:1088 msgid "Smallest object" msgstr "Найменший об'єкт" -#: ../src/ui/dialog/align-and-distribute.cpp:999 +#: ../src/ui/dialog/align-and-distribute.cpp:1091 msgid "Selection Area" msgstr "Позначена область" +#: ../src/ui/dialog/align-and-distribute.cpp:1097 +msgid "Middle of selection" +msgstr "Середина позначеного" + +#: ../src/ui/dialog/align-and-distribute.cpp:1098 +msgid "Min value" +msgstr "Мін. значення" + +#: ../src/ui/dialog/align-and-distribute.cpp:1099 +msgid "Max value" +msgstr "Макс. значення" + #: ../src/ui/dialog/calligraphic-profile-rename.cpp:40 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:138 msgid "Edit profile" @@ -14563,39 +14709,39 @@ msgstr "Застосувати до мозаїки клонів:" msgid "How many rows in the tiling" msgstr "Кількість рядків у мозаїці" -#: ../src/ui/dialog/clonetiler.cpp:1082 +#: ../src/ui/dialog/clonetiler.cpp:1086 msgid "How many columns in the tiling" msgstr "Кількість стовпчиків у мозаїці" -#: ../src/ui/dialog/clonetiler.cpp:1127 +#: ../src/ui/dialog/clonetiler.cpp:1131 msgid "Width of the rectangle to be filled" msgstr "Ширина області, що заповнюється" -#: ../src/ui/dialog/clonetiler.cpp:1160 +#: ../src/ui/dialog/clonetiler.cpp:1168 msgid "Height of the rectangle to be filled" msgstr "Висота області, що заповнюється" -#: ../src/ui/dialog/clonetiler.cpp:1177 +#: ../src/ui/dialog/clonetiler.cpp:1185 msgid "Rows, columns: " msgstr "Рядків, стовпчиків: " -#: ../src/ui/dialog/clonetiler.cpp:1178 +#: ../src/ui/dialog/clonetiler.cpp:1186 msgid "Create the specified number of rows and columns" msgstr "Створити вказану кількість рядків та стовпчиків" -#: ../src/ui/dialog/clonetiler.cpp:1187 +#: ../src/ui/dialog/clonetiler.cpp:1195 msgid "Width, height: " msgstr "Ширина, висота: " -#: ../src/ui/dialog/clonetiler.cpp:1188 +#: ../src/ui/dialog/clonetiler.cpp:1196 msgid "Fill the specified width and height with the tiling" msgstr "Заповнити мозаїкою вказану область" -#: ../src/ui/dialog/clonetiler.cpp:1209 +#: ../src/ui/dialog/clonetiler.cpp:1217 msgid "Use saved size and position of the tile" msgstr "Використовувати збережені розмір та позицію плитки" -#: ../src/ui/dialog/clonetiler.cpp:1212 +#: ../src/ui/dialog/clonetiler.cpp:1220 msgid "" "Pretend that the size and position of the tile are the same as the last time " "you tiled it (if any), instead of using the current size" @@ -14603,11 +14749,11 @@ msgstr "" "Сприяти, щоб розмір та позиція плиток були такі самі, як і останнього разу, " "коли ви їх розбивали на мозаїку, замість використання поточного розміру" -#: ../src/ui/dialog/clonetiler.cpp:1246 +#: ../src/ui/dialog/clonetiler.cpp:1254 msgid " _Create " msgstr "_Створити " -#: ../src/ui/dialog/clonetiler.cpp:1248 +#: ../src/ui/dialog/clonetiler.cpp:1256 msgid "Create and tile the clones of the selection" msgstr "Створити мозаїку з клонів позначеної ділянки" @@ -14616,31 +14762,31 @@ msgstr "Створити мозаїку з клонів позначеної д #. diagrams on the left in the following screenshot: #. http://www.inkscape.org/screenshots/gallery/inkscape-0.42-CVS-tiles-unclump.png #. So unclumping is the process of spreading a number of objects out more evenly. -#: ../src/ui/dialog/clonetiler.cpp:1268 +#: ../src/ui/dialog/clonetiler.cpp:1276 msgid " _Unclump " msgstr "_Розгрупувати " -#: ../src/ui/dialog/clonetiler.cpp:1269 +#: ../src/ui/dialog/clonetiler.cpp:1277 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" "Розповсюдити клони для послаблення групування; може бути застосовано повторно" -#: ../src/ui/dialog/clonetiler.cpp:1275 +#: ../src/ui/dialog/clonetiler.cpp:1283 msgid " Re_move " msgstr " В_илучити " -#: ../src/ui/dialog/clonetiler.cpp:1276 +#: ../src/ui/dialog/clonetiler.cpp:1284 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" "Вилучити існуючі мозаїчні клони позначеного об'єкта (лише нащадків одного " "об'єкта)" -#: ../src/ui/dialog/clonetiler.cpp:1293 +#: ../src/ui/dialog/clonetiler.cpp:1301 msgid " R_eset " msgstr "С_кинути " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1295 +#: ../src/ui/dialog/clonetiler.cpp:1303 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" @@ -14648,40 +14794,40 @@ msgstr "" "Скинути усі зсуви, масштабування, обертання та зміни прозорості й кольору на " "нуль" -#: ../src/ui/dialog/clonetiler.cpp:1367 +#: ../src/ui/dialog/clonetiler.cpp:1375 msgid "Nothing selected." msgstr "Нічого не позначено." -#: ../src/ui/dialog/clonetiler.cpp:1373 +#: ../src/ui/dialog/clonetiler.cpp:1381 msgid "More than one object selected." msgstr "позначено більше ніж один об'єкт." -#: ../src/ui/dialog/clonetiler.cpp:1380 +#: ../src/ui/dialog/clonetiler.cpp:1388 #, c-format msgid "Object has %d tiled clones." msgstr "Об'єкт має%d мозаїчних клонів." -#: ../src/ui/dialog/clonetiler.cpp:1385 +#: ../src/ui/dialog/clonetiler.cpp:1393 msgid "Object has no tiled clones." msgstr "Об'єкт не має мозаїчних клонів." -#: ../src/ui/dialog/clonetiler.cpp:2109 +#: ../src/ui/dialog/clonetiler.cpp:2117 msgid "Select one object whose tiled clones to unclump." msgstr "Позначте один об'єкт, клони якого слід розгрупувати." -#: ../src/ui/dialog/clonetiler.cpp:2129 +#: ../src/ui/dialog/clonetiler.cpp:2137 msgid "Unclump tiled clones" msgstr "Розгрупувати мозаїку з клонів" -#: ../src/ui/dialog/clonetiler.cpp:2158 +#: ../src/ui/dialog/clonetiler.cpp:2166 msgid "Select one object whose tiled clones to remove." msgstr "Позначте один об'єкт, клони якого слід вилучити." -#: ../src/ui/dialog/clonetiler.cpp:2183 +#: ../src/ui/dialog/clonetiler.cpp:2191 msgid "Delete tiled clones" msgstr "Вилучити мозаїку з клонів" -#: ../src/ui/dialog/clonetiler.cpp:2236 +#: ../src/ui/dialog/clonetiler.cpp:2244 msgid "" "If you want to clone several objects, group them and clone the " "group." @@ -14689,23 +14835,23 @@ msgstr "" "Для клонування кількох об'єктів, згрупуйте їх та клонуйте групу." -#: ../src/ui/dialog/clonetiler.cpp:2245 +#: ../src/ui/dialog/clonetiler.cpp:2253 msgid "Creating tiled clones..." msgstr "Створення мозаїчних клонів…" -#: ../src/ui/dialog/clonetiler.cpp:2661 +#: ../src/ui/dialog/clonetiler.cpp:2669 msgid "Create tiled clones" msgstr "Створити мозаїку з клонів" -#: ../src/ui/dialog/clonetiler.cpp:2894 +#: ../src/ui/dialog/clonetiler.cpp:2906 msgid "Per row:" msgstr "На рядок:" -#: ../src/ui/dialog/clonetiler.cpp:2912 +#: ../src/ui/dialog/clonetiler.cpp:2924 msgid "Per column:" msgstr "На стовпчик:" -#: ../src/ui/dialog/clonetiler.cpp:2920 +#: ../src/ui/dialog/clonetiler.cpp:2932 msgid "Randomize:" msgstr "Випадковість:" @@ -14837,10 +14983,12 @@ msgstr "Ко_лір тла:" #: ../src/ui/dialog/document-properties.cpp:123 msgid "" "Color of the page background. Note: transparency setting ignored while " -"editing if 'Checkerboard background' set (but used when exporting to bitmap)." +"editing if 'Checkerboard background' unset (but used when exporting to " +"bitmap)." msgstr "" "Колір тла сторінки. Зауваження: параметр прозорості буде проігноровано під " -"час редагування, якщо позначено пункт «Тло-шахівниця» (але враховано під час " +"час редагування, якщо не позначено пункт «Тло-шахівниця» (але враховано під " +"час " "експортування до растра)." #: ../src/ui/dialog/document-properties.cpp:124 @@ -15030,11 +15178,11 @@ msgid "Remove selected grid." msgstr "Вилучити вибрану сітку." #: ../src/ui/dialog/document-properties.cpp:162 -#: ../src/widgets/toolbox.cpp:1881 +#: ../src/widgets/toolbox.cpp:1895 msgid "Guides" msgstr "Напрямні" -#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2838 +#: ../src/ui/dialog/document-properties.cpp:164 ../src/verbs.cpp:2837 msgid "Snap" msgstr "Прилипання" @@ -15086,7 +15234,7 @@ msgstr "Інше" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3023 +#: ../src/ui/dialog/document-properties.cpp:526 ../src/verbs.cpp:3020 msgid "Link Color Profile" msgstr "Пов'язати профіль кольорів" @@ -15145,7 +15293,7 @@ msgid "Embedded script files:" msgstr "Файли вбудованих скриптів:" #: ../src/ui/dialog/document-properties.cpp:842 -#: ../src/ui/dialog/objects.cpp:1890 +#: ../src/ui/dialog/objects.cpp:1894 msgid "New" msgstr "Створити" @@ -15219,15 +15367,15 @@ msgstr "Вилучити сітку" msgid "Changed default display unit" msgstr "Змінено типову одиницю виміру" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2890 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2887 msgid "_Page" msgstr "_Сторінка" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2894 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2891 msgid "_Drawing" msgstr "_Малюнок" -#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2896 +#: ../src/ui/dialog/export.cpp:147 ../src/verbs.cpp:2893 msgid "_Selection" msgstr "Поз_начене" @@ -15235,8 +15383,8 @@ msgstr "Поз_начене" msgid "_Custom" msgstr "_Інше" -#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:278 -#: ../src/widgets/measure-toolbar.cpp:286 +#: ../src/ui/dialog/export.cpp:165 ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 #: ../share/extensions/render_gears.inx.h:6 msgid "Units:" msgstr "Одиниці:" @@ -15325,9 +15473,9 @@ msgid "_Height:" msgstr "_Висота:" #: ../src/ui/dialog/export.cpp:304 -#: ../src/ui/dialog/inkscape-preferences.cpp:1487 -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 -#: ../src/ui/dialog/inkscape-preferences.cpp:1515 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "dpi" msgstr "т/д" @@ -15418,14 +15566,14 @@ msgstr "Малюнок експортовано до %s." msgid "Export aborted." msgstr "Експорт перервано." -#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1389 -#: ../src/widgets/desktop-widget.cpp:1172 -#: ../src/widgets/desktop-widget.cpp:1234 +#: ../src/ui/dialog/export.cpp:1308 ../src/ui/interface.cpp:1401 +#: ../src/widgets/desktop-widget.cpp:1186 +#: ../src/widgets/desktop-widget.cpp:1248 msgid "_Cancel" msgstr "_Скасувати" #: ../src/ui/dialog/export.cpp:1309 ../src/ui/dialog/input.cpp:1082 -#: ../src/verbs.cpp:2435 ../src/widgets/desktop-widget.cpp:1173 +#: ../src/verbs.cpp:2432 ../src/widgets/desktop-widget.cpp:1187 msgid "_Save" msgstr "З_берегти" @@ -15436,7 +15584,7 @@ msgstr "Інформація" #: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:309 #: ../src/verbs.cpp:328 ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_custom.inx.h:7 -#: ../share/extensions/color_randomize.inx.h:6 +#: ../share/extensions/color_randomize.inx.h:11 #: ../share/extensions/dots.inx.h:7 #: ../share/extensions/draw_from_triangle.inx.h:35 #: ../share/extensions/dxf_input.inx.h:10 @@ -15474,7 +15622,7 @@ msgstr "Інформація" #: ../share/extensions/pathalongpath.inx.h:16 #: ../share/extensions/pathscatter.inx.h:18 #: ../share/extensions/radiusrand.inx.h:8 ../share/extensions/restack.inx.h:25 -#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:11 +#: ../share/extensions/split.inx.h:8 ../share/extensions/voronoi2svg.inx.h:16 #: ../share/extensions/web-set-att.inx.h:25 #: ../share/extensions/web-transmit-att.inx.h:23 #: ../share/extensions/webslicer_create_group.inx.h:11 @@ -15596,7 +15744,7 @@ msgid "Document" msgstr "Документ" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1553 ../src/verbs.cpp:175 -#: ../src/widgets/desktop-widget.cpp:2055 +#: ../src/widgets/desktop-widget.cpp:2074 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "позначене" @@ -15784,99 +15932,99 @@ msgstr "_Дублювати" msgid "_Filter" msgstr "_Фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1387 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1388 msgid "R_ename" msgstr "Пере_йменувати" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1521 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1522 msgid "Rename filter" msgstr "Перейменувати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1573 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1574 msgid "Apply filter" msgstr "Застосувати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1653 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1654 msgid "filter" msgstr "фільтрувати" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1660 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1661 msgid "Add filter" msgstr "Додати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1710 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1711 msgid "Duplicate filter" msgstr "Дублювати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1809 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1810 msgid "_Effect" msgstr "_Ефект" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1819 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1820 msgid "Connections" msgstr "З'єднання" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1957 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1958 msgid "Remove filter primitive" msgstr "Вилучити примітив фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2544 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 msgid "Remove merge node" msgstr "Вилучити вузол об'єднання" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2664 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2665 msgid "Reorder filter primitive" msgstr "Зміна порядку примітивів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2744 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 msgid "Add Effect:" msgstr "Додати ефект:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2745 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 msgid "No effect selected" msgstr "Не вибрано жодного ефекту" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2746 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2747 msgid "No filter selected" msgstr "Не вибрано жодного фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2791 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2814 msgid "Effect parameters" msgstr "Параметри ефекту" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2792 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2815 msgid "Filter General Settings" msgstr "Загальні параметри фільтра" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Coordinates:" msgstr "Координати:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "X coordinate of the left corners of filter effects region" msgstr "Координата X лівих кутів області дії ефектів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2850 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 msgid "Y coordinate of the upper corners of filter effects region" msgstr "Координата X верхніх кутів області дії ефектів фільтра" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Dimensions:" msgstr "Розміри:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Width of filter effects region" msgstr "Ширина області дії ефектів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2851 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 msgid "Height of filter effects region" msgstr "Висота області дії ефектів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2857 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 msgid "" "Indicates the type of matrix operation. The keyword 'matrix' indicates that " "a full 5x4 matrix of values will be provided. The other keywords represent " @@ -15887,40 +16035,40 @@ msgstr "" "матрицю значень розміром 5×4. Інші варіанти — це простий спосіб виконати " "найпростіші операції без визначення всієї матриці вручну." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2858 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 msgid "Value(s):" msgstr "Значення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2862 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 msgid "R:" msgstr "Ч:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2863 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 #: ../src/ui/widget/color-icc-selector.cpp:180 msgid "G:" msgstr "З:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2864 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 msgid "B:" msgstr "С:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2865 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2890 msgid "A:" msgstr "П:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2868 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "Operator:" msgstr "Оператор:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 msgid "K1:" msgstr "K1:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2869 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "" "If the arithmetic operation is chosen, each result pixel is computed using " "the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel " @@ -15930,38 +16078,38 @@ msgstr "" "за формулою k1*i1*i2 + k2*i1 + k3*i2 + k4, де i1 і i2 — значення пікселів " "першого і другого вхідних значень відповідно." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2870 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 msgid "K2:" msgstr "K2:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2871 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2896 msgid "K3:" msgstr "K3:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2872 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2897 msgid "K4:" msgstr "K4:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "Size:" msgstr "Розмір:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "width of the convolve matrix" msgstr "ширина матриці згортки" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2875 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2900 msgid "height of the convolve matrix" msgstr "висота матриці згортки" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 #: ../src/ui/dialog/object-attributes.cpp:48 msgid "Target:" msgstr "Target:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" "X coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." @@ -15969,7 +16117,7 @@ msgstr "" "Координата X кінцевої точки матриці згортки. Згортка застосовується до " "пікселів навколо цієї точки." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2876 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2901 msgid "" "Y coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." @@ -15978,11 +16126,11 @@ msgstr "" "пікселів навколо цієї точки." #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 msgid "Kernel:" msgstr "Ядро:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2878 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2903 msgid "" "This matrix describes the convolve operation that is applied to the input " "image in order to calculate the pixel colors at the output. Different " @@ -15997,11 +16145,11 @@ msgstr "" "у той час, як матриця, заповнена сталим ненульовим значенням дасть звичайний " "ефект розмивання." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "Divisor:" msgstr "Дільник:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2880 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2905 msgid "" "After applying the kernelMatrix to the input image to yield a number, that " "number is divided by divisor to yield the final destination color value. A " @@ -16013,11 +16161,11 @@ msgstr "" "кольору. Дільник, що є сумою всіх значень матриці, приглушує загальну " "інтенсивність кольорів остаточного зображення." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "Bias:" msgstr "Зміщення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2881 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2906 msgid "" "This value is added to each component. This is useful to define a constant " "value as the zero response of the filter." @@ -16025,11 +16173,11 @@ msgstr "" "Це значення додається до кожного компонента. Корисно для задання сталої, як " "нульового відгуку фільтра." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "Edge Mode:" msgstr "Режим країв:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2882 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2907 msgid "" "Determines how to extend the input image as necessary with color values so " "that the matrix operations can be applied when the kernel is positioned at " @@ -16039,31 +16187,31 @@ msgstr "" "щоб матричні операції могли працювати з ядром, розташованим на краю " "зображення або поблизу нього." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "Preserve Alpha" msgstr "Зберігати α-канал" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2883 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "Якщо встановлено, α-канал не буде змінено цим примітивом фільтра." #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 msgid "Diffuse Color:" msgstr "Колір дифузії:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2886 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2911 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2944 msgid "Defines the color of the light source" msgstr "Визначає колір джерела світла" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 msgid "Surface Scale:" msgstr "Масштаб поверхні:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2887 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2945 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" @@ -16071,59 +16219,59 @@ msgstr "" "Це значення визначає множник висоти карти рельєфу, що задається вхідним α-" "каналом" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "Constant:" msgstr "Константа:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2888 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2921 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2913 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 msgid "This constant affects the Phong lighting model." msgstr "Ця стала стосується моделі освітлення Фонга" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2889 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2914 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2948 msgid "Kernel Unit Length:" msgstr "Одиниця довжини у ядрі:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2893 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2918 msgid "This defines the intensity of the displacement effect." msgstr "Ця величина визначає інтенсивність ефекту зміщення." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "X displacement:" msgstr "Зміщення за X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2894 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 msgid "Color component that controls the displacement in the X direction" msgstr "Компонент кольору, що керує зміщенням у напрямку осі X" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Y displacement:" msgstr "Зміщення за Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2895 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2920 msgid "Color component that controls the displacement in the Y direction" msgstr "Компонент кольору, що керує зміщенням у напрямку осі Y" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "Flood Color:" msgstr "Колір заливки:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2898 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2923 msgid "The whole filter region will be filled with this color." msgstr "Всю область дії фільтра буде залито цим кольором." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "Standard Deviation:" msgstr "Стандартне відхилення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2902 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2927 msgid "The standard deviation for the blur operation." msgstr "Стандартне відхилення під час виконання операції розмивання" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2908 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." @@ -16131,41 +16279,41 @@ msgstr "" "Ерозія: виконує «витончення» вхідного зображення\n" "Розтягування: «потовщує» вхідне зображення" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2912 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2937 msgid "Source of Image:" msgstr "Джерело зображення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "Delta X:" msgstr "Крок за X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2915 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2940 msgid "This is how far the input image gets shifted to the right" msgstr "Визначає як далеко вхідне зображення зміщується праворуч" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2941 msgid "Delta Y:" msgstr "Крок за Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2916 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2941 msgid "This is how far the input image gets shifted downwards" msgstr "Визначає як далеко вхідне зображення зміщується донизу" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2919 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2944 msgid "Specular Color:" msgstr "Колір відбиття:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 #: ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "Експонента:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2922 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2947 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "Степінь відбиття: більше значення дає «яскравіше»." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2931 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2956 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." @@ -16173,27 +16321,27 @@ msgstr "" "Позначає чи повинен примітив виконувати функцію створення турбулентності або " "шуму." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2932 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2957 msgid "Base Frequency:" msgstr "Опорна частота:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2933 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2958 msgid "Octaves:" msgstr "Октави:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2959 msgid "Seed:" msgstr "Випадкове значення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2934 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2959 msgid "The starting number for the pseudo random number generator." msgstr "Початкове число для генератора псевдовипадкових чисел." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2946 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 msgid "Add filter primitive" msgstr "Додати примітив фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2963 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2986 msgid "" "The feBlend filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." @@ -16201,7 +16349,7 @@ msgstr "" "Примітив фільтра feBlend надає можливість використовувати 4 режими " "змішування: просвічування, множення, темнішання та світлішання." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2967 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2990 msgid "" "The feColorMatrix filter primitive applies a matrix transformation to " "color of each rendered pixel. This allows for effects like turning object to " @@ -16211,7 +16359,7 @@ msgstr "" "кольору до кожної відображеної точки. Все це включає до себе перетворення " "об'єкта до півтонів сірого, зміну насиченості кольору і зміну відтінку." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2971 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2994 msgid "" "The feComponentTransfer filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " @@ -16223,7 +16371,7 @@ msgstr "" "з окремими функціями переходу, роблячи можливим операції на зразок " "регулювання яскравості і контрасту, баланс кольорів та постеризацію." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2975 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2998 msgid "" "The feComposite filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -16235,7 +16383,7 @@ msgstr "" "описаного у стандарті SVG. Режими змішування Портера-Даффа по суті є " "булівськими операціями між значеннями кольорів відповідних точок зображень." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2979 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3002 msgid "" "The feConvolveMatrix lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -16250,7 +16398,7 @@ msgstr "" "за допомогою цього примітиву фільтра, особливий примітив фільтра для " "Гаусового розмивання є швидшим та незалежним від роздільної здатності." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2983 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3006 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -16262,7 +16410,7 @@ msgstr "" "використовується для відтворення глибини: непрозоріші області наближаються " "до глядача, а прозоріші — віддаляються." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2987 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3010 msgid "" "The feDisplacementMap filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -16274,7 +16422,7 @@ msgstr "" "у якому напрямку і на яку відстань слід змістити точку. Класичними " "прикладами фільтра є ефекти «вихор» і «затискання»." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2991 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3014 msgid "" "The feFlood filter primitive fills the region with a given color and " "opacity. It is usually used as an input to other filters to apply color to " @@ -16284,7 +16432,7 @@ msgstr "" "непрозорістю. Зазвичай, його використовують як початковий для інших " "фільтрів, з метою надати графіці кольору." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2995 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3018 msgid "" "The feGaussianBlur filter primitive uniformly blurs its input. It is " "commonly used together with feOffset to create a drop shadow effect." @@ -16293,7 +16441,7 @@ msgstr "" "його застосовано. Зазвичай, він використовується разом з feOffset для " "створення ефекту відкидання тіні." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2999 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3022 msgid "" "The feImage filter primitive fills the region with an external image " "or another part of the document." @@ -16301,7 +16449,7 @@ msgstr "" "Примітив фільтра feImage заливає область зовнішнім зображенням або " "іншою частиною документа." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3003 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3026 msgid "" "The feMerge filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -16314,7 +16462,7 @@ msgstr "" "кратне застосування примітивів feBlend у 'звичайному' режимі або кратне " "застосування примітивів feComposite у 'над'-режимі." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3007 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3030 msgid "" "The feMorphology filter primitive provides erode and dilate effects. " "For single-color objects erode makes the object thinner and dilate makes it " @@ -16324,7 +16472,7 @@ msgstr "" "ерозії та розширення. Для однокольорових об'єктів ерозія робить об'єкт " "меншим, а розширення — більшим." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3011 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3034 msgid "" "The feOffset filter primitive offsets the image by an user-defined " "amount. For example, this is useful for drop shadows, where the shadow is in " @@ -16334,7 +16482,7 @@ msgstr "" "відстань. Це, наприклад, корисно для відображення тіней, коли тінь " "розташовано з невеликим зсувом відносно об'єкта, що її відкидає." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3015 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3038 msgid "" "The feDiffuseLighting and feSpecularLighting filter primitives " "create \"embossed\" shadings. The input's alpha channel is used to provide " @@ -16346,7 +16494,7 @@ msgstr "" "матеріалу, використовується для відтворення глибини: непрозоріші області " "наближаються до глядача, а прозоріші — віддаляються." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3019 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 msgid "" "The feTile filter primitive tiles a region with an input graphic. The " "source tile is defined by the filter primitive subregion of the input." @@ -16355,7 +16503,7 @@ msgstr "" "графічного зображення. Початковий фрагмент мозаїки визначається підобластю " "примітива фільтра на вході." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3023 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3046 msgid "" "The feTurbulence filter primitive renders Perlin noise. This kind of " "noise is useful in simulating several nature phenomena like clouds, fire and " @@ -16365,11 +16513,11 @@ msgstr "" "шумів корисний для імітації деяких природних явищ на зразок хмар, полум'я та " "диму, та під час створення складних текстур на зразок мармуру та граніту." -#: ../src/ui/dialog/filter-effects-dialog.cpp:3042 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3066 msgid "Duplicate filter primitive" msgstr "Дублювати примітив фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:3095 +#: ../src/ui/dialog/filter-effects-dialog.cpp:3119 msgid "Set filter primitive attribute" msgstr "Встановити атрибут примітива фільтра" @@ -16555,7 +16703,7 @@ msgstr "Спіралі" msgid "Search spirals" msgstr "Шукати спіралі" -#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1782 +#: ../src/ui/dialog/find.cpp:103 ../src/widgets/toolbox.cpp:1796 msgid "Paths" msgstr "Контури" @@ -17440,7 +17588,7 @@ msgstr "Розташування на сітці" #: ../src/ui/dialog/grid-arrange-tab.cpp:571 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:694 +#: ../src/ui/widget/page-sizer.cpp:247 ../src/widgets/desktop-widget.cpp:703 #: ../src/widgets/node-toolbar.cpp:581 msgid "X:" msgstr "X:" @@ -17633,11 +17781,23 @@ msgstr "" "Розмір точок, створених за допомогою Ctrl+клацання (у порівнянні з поточною " "товщиною штриха)" -#: ../src/ui/dialog/inkscape-preferences.cpp:220 +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "Base simplify:" +msgstr "Базове спрощення:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:213 +msgid "on dinamic LPE simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:214 +msgid "Base simplify of dinamic LPE based simplify" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:229 msgid "No objects selected to take the style from." msgstr "Немає вибраних об'єктів, звідки б можна було б узяти стиль." -#: ../src/ui/dialog/inkscape-preferences.cpp:229 +#: ../src/ui/dialog/inkscape-preferences.cpp:238 msgid "" "More than one object selected. Cannot take style from multiple " "objects." @@ -17645,23 +17805,23 @@ msgstr "" "позначено більше ніж один об'єкт. Не вдається взяти стиль від " "кількох об'єктів." -#: ../src/ui/dialog/inkscape-preferences.cpp:265 +#: ../src/ui/dialog/inkscape-preferences.cpp:274 msgid "Style of new objects" msgstr "Стиль нових об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:267 +#: ../src/ui/dialog/inkscape-preferences.cpp:276 msgid "Last used style" msgstr "Останній використаний стиль" -#: ../src/ui/dialog/inkscape-preferences.cpp:269 +#: ../src/ui/dialog/inkscape-preferences.cpp:278 msgid "Apply the style you last set on an object" msgstr "Застосувати стиль, який ви застосовували останнім" -#: ../src/ui/dialog/inkscape-preferences.cpp:274 +#: ../src/ui/dialog/inkscape-preferences.cpp:283 msgid "This tool's own style:" msgstr "Власний стиль інструмента:" -#: ../src/ui/dialog/inkscape-preferences.cpp:278 +#: ../src/ui/dialog/inkscape-preferences.cpp:287 msgid "" "Each tool may store its own style to apply to the newly created objects. Use " "the button below to set it." @@ -17670,62 +17830,62 @@ msgstr "" "об'єктів. Скористайтеся кнопкою внизу для встановлення цього стилю." #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:282 +#: ../src/ui/dialog/inkscape-preferences.cpp:291 msgid "Take from selection" msgstr "Взяти з позначеного" -#: ../src/ui/dialog/inkscape-preferences.cpp:291 +#: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This tool's style of new objects" msgstr "Стиль цього інструмента нових об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 +#: ../src/ui/dialog/inkscape-preferences.cpp:307 msgid "Remember the style of the (first) selected object as this tool's style" msgstr "" "Запам'ятати стиль (першого) позначеного об'єкта як стиль даного інструмента" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:312 msgid "Tools" msgstr "Інструменти" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Bounding box to use" msgstr "Рамка, що використовується" -#: ../src/ui/dialog/inkscape-preferences.cpp:307 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Visual bounding box" msgstr "Видима рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:318 msgid "This bounding box includes stroke width, markers, filter margins, etc." msgstr "Ця рамка включає ширину пунктиру, маркери, поля фільтрування тощо." -#: ../src/ui/dialog/inkscape-preferences.cpp:310 +#: ../src/ui/dialog/inkscape-preferences.cpp:319 msgid "Geometric bounding box" msgstr "Геометрична рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:312 +#: ../src/ui/dialog/inkscape-preferences.cpp:321 msgid "This bounding box includes only the bare path" msgstr "Ця рамка включає лише простий контур" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 +#: ../src/ui/dialog/inkscape-preferences.cpp:323 msgid "Conversion to guides" msgstr "Перетворення у напрямні" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 +#: ../src/ui/dialog/inkscape-preferences.cpp:324 msgid "Keep objects after conversion to guides" msgstr "Зберегти об'єкти після перетворення у напрямні" -#: ../src/ui/dialog/inkscape-preferences.cpp:317 +#: ../src/ui/dialog/inkscape-preferences.cpp:326 msgid "" "When converting an object to guides, don't delete the object after the " "conversion" msgstr "Після перетворення об'єкта на напрямні не вилучати сам об'єкт." -#: ../src/ui/dialog/inkscape-preferences.cpp:318 +#: ../src/ui/dialog/inkscape-preferences.cpp:327 msgid "Treat groups as a single object" msgstr "Поводитися з групами як з окремим об'єктом" -#: ../src/ui/dialog/inkscape-preferences.cpp:320 +#: ../src/ui/dialog/inkscape-preferences.cpp:329 msgid "" "Treat groups as a single object during conversion to guides rather than " "converting each child separately" @@ -17733,108 +17893,108 @@ msgstr "" "Вважати групи окремими об'єктів під час перетворення на напрямні, а не " "перетворювати кожен з елементів окремо." -#: ../src/ui/dialog/inkscape-preferences.cpp:322 +#: ../src/ui/dialog/inkscape-preferences.cpp:331 msgid "Average all sketches" msgstr "Осереднення всіх ескізів" -#: ../src/ui/dialog/inkscape-preferences.cpp:323 +#: ../src/ui/dialog/inkscape-preferences.cpp:332 msgid "Width is in absolute units" msgstr "Ширина у абсолютних одиницях" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 +#: ../src/ui/dialog/inkscape-preferences.cpp:333 msgid "Select new path" msgstr "Обрати новий контур" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:334 msgid "Don't attach connectors to text objects" msgstr "Не приєднувати лінії з'єднання до тексту" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:328 +#: ../src/ui/dialog/inkscape-preferences.cpp:337 msgid "Selector" msgstr "Селектор" -#: ../src/ui/dialog/inkscape-preferences.cpp:333 +#: ../src/ui/dialog/inkscape-preferences.cpp:342 msgid "When transforming, show" msgstr "При трансформації показувати" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 +#: ../src/ui/dialog/inkscape-preferences.cpp:343 msgid "Objects" msgstr "Об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:336 +#: ../src/ui/dialog/inkscape-preferences.cpp:345 msgid "Show the actual objects when moving or transforming" msgstr "Показувати об'єкти повністю при переміщенні чи трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:337 +#: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Box outline" msgstr "Рамку" -#: ../src/ui/dialog/inkscape-preferences.cpp:339 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Show only a box outline of the objects when moving or transforming" msgstr "" "Показувати лише прямокутну рамку об'єктів при переміщенні чи трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:349 msgid "Per-object selection cue" msgstr "Ознака позначення окремого об’єкта" -#: ../src/ui/dialog/inkscape-preferences.cpp:341 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgctxt "Selection cue" msgid "None" msgstr "Немає" -#: ../src/ui/dialog/inkscape-preferences.cpp:343 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "No per-object selection indication" msgstr "позначені об'єкти ніяк не позначені" -#: ../src/ui/dialog/inkscape-preferences.cpp:344 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 msgid "Mark" msgstr "Позначка" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:355 msgid "Each selected object has a diamond mark in the top left corner" msgstr "" "Кожен позначений об'єкт має позначку у формі ромба у лівому верхньому куті" -#: ../src/ui/dialog/inkscape-preferences.cpp:347 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "Box" msgstr "Рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "Each selected object displays its bounding box" msgstr "Кожен позначений об'єкт позначений пунктирною рамкою" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:352 +#: ../src/ui/dialog/inkscape-preferences.cpp:361 msgid "Node" msgstr "Вузол" -#: ../src/ui/dialog/inkscape-preferences.cpp:355 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Path outline" msgstr "Обрис контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Path outline color" msgstr "Колір обрису контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "Selects the color used for showing the path outline" msgstr "Обирає колір, що використовуватиметься для обрису контуру." -#: ../src/ui/dialog/inkscape-preferences.cpp:358 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 msgid "Always show outline" msgstr "Завжди показувати обрис" -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:368 msgid "Show outlines for all paths, not only invisible paths" msgstr "Показувати обриси для всіх ліній, а не лише для невидимих" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 +#: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "Update outline when dragging nodes" msgstr "Оновлювати обриси під час перетягування вузлів" -#: ../src/ui/dialog/inkscape-preferences.cpp:361 +#: ../src/ui/dialog/inkscape-preferences.cpp:370 msgid "" "Update the outline when dragging or transforming nodes; if this is off, the " "outline will only update when completing a drag" @@ -17843,11 +18003,11 @@ msgstr "" "цей пункт не буде позначено, вигляд обрису буде оновлено лише після " "завершення дії." -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "Update paths when dragging nodes" msgstr "Оновлювати контури під час перетягування вузлів" -#: ../src/ui/dialog/inkscape-preferences.cpp:363 +#: ../src/ui/dialog/inkscape-preferences.cpp:372 msgid "" "Update paths when dragging or transforming nodes; if this is off, paths will " "only be updated when completing a drag" @@ -17856,11 +18016,11 @@ msgstr "" "цей пункт не буде позначено, вигляд контуру буде оновлено лише після " "завершення дії." -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:373 msgid "Show path direction on outlines" msgstr "Показувати напрям контуру на обрисах" -#: ../src/ui/dialog/inkscape-preferences.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:374 msgid "" "Visualize the direction of selected paths by drawing small arrows in the " "middle of each outline segment" @@ -17868,28 +18028,28 @@ msgstr "" "Показувати напрям позначених контурів малюванням невеличких стрілочок " "всередині кожного з сегментів обрису" -#: ../src/ui/dialog/inkscape-preferences.cpp:366 +#: ../src/ui/dialog/inkscape-preferences.cpp:375 msgid "Show temporary path outline" msgstr "Показувати обрис тимчасового контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:367 +#: ../src/ui/dialog/inkscape-preferences.cpp:376 msgid "When hovering over a path, briefly flash its outline" msgstr "Після наведення вказівника на контур блимати його рамкою" -#: ../src/ui/dialog/inkscape-preferences.cpp:368 +#: ../src/ui/dialog/inkscape-preferences.cpp:377 msgid "Show temporary outline for selected paths" msgstr "Показувати тимчасовий обрис для позначених контурів" -#: ../src/ui/dialog/inkscape-preferences.cpp:369 +#: ../src/ui/dialog/inkscape-preferences.cpp:378 msgid "Show temporary outline even when a path is selected for editing" msgstr "" "Показувати тимчасовий обрис, навіть якщо контур позначено для редагування" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "_Flash time:" msgstr "Час _блимання:" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 msgid "" "Specifies how long the path outline will be visible after a mouse-over (in " "milliseconds); specify 0 to have the outline shown until mouse leaves the " @@ -17899,25 +18059,25 @@ msgstr "" "мілісекундах). Вкажіть 0, щоб рамку контуру було показано до того часу, доки " "вказівник не буде відведено від рамки." -#: ../src/ui/dialog/inkscape-preferences.cpp:372 +#: ../src/ui/dialog/inkscape-preferences.cpp:381 msgid "Editing preferences" msgstr "Параметри редагування" -#: ../src/ui/dialog/inkscape-preferences.cpp:373 +#: ../src/ui/dialog/inkscape-preferences.cpp:382 msgid "Show transform handles for single nodes" msgstr "Показувати елементи керування перетворенням для окремих вузлів" -#: ../src/ui/dialog/inkscape-preferences.cpp:374 +#: ../src/ui/dialog/inkscape-preferences.cpp:383 msgid "Show transform handles even when only a single node is selected" msgstr "" "Показувати елементи керування перетворенням, навіть якщо позначено лише один " "вузол" -#: ../src/ui/dialog/inkscape-preferences.cpp:375 +#: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "Deleting nodes preserves shape" msgstr "Вилучення вузлів зберігає форму" -#: ../src/ui/dialog/inkscape-preferences.cpp:376 +#: ../src/ui/dialog/inkscape-preferences.cpp:385 msgid "" "Move handles next to deleted nodes to resemble original shape; hold Ctrl to " "get the other behavior" @@ -17926,31 +18086,31 @@ msgstr "" "Натисніть Ctrl, щоб скасувати таку поведінку" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:379 +#: ../src/ui/dialog/inkscape-preferences.cpp:388 msgid "Tweak" msgstr "Корекція" -#: ../src/ui/dialog/inkscape-preferences.cpp:380 +#: ../src/ui/dialog/inkscape-preferences.cpp:389 msgid "Object paint style" msgstr "Стиль малювання об'єктів" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:385 -#: ../src/widgets/desktop-widget.cpp:659 +#: ../src/ui/dialog/inkscape-preferences.cpp:394 +#: ../src/widgets/desktop-widget.cpp:668 msgid "Zoom" msgstr "Масштаб" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:390 ../src/verbs.cpp:2764 +#: ../src/ui/dialog/inkscape-preferences.cpp:399 ../src/verbs.cpp:2763 msgctxt "ContextVerb" msgid "Measure" msgstr "Міра" -#: ../src/ui/dialog/inkscape-preferences.cpp:392 +#: ../src/ui/dialog/inkscape-preferences.cpp:401 msgid "Ignore first and last points" msgstr "Ігнорувати першу і останню точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:393 +#: ../src/ui/dialog/inkscape-preferences.cpp:402 msgid "" "The start and end of the measurement tool's control line will not be " "considered for calculating lengths. Only lengths between actual curve " @@ -17961,15 +18121,15 @@ msgstr "" "кривих." #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:396 +#: ../src/ui/dialog/inkscape-preferences.cpp:405 msgid "Shapes" msgstr "Фігури" -#: ../src/ui/dialog/inkscape-preferences.cpp:428 +#: ../src/ui/dialog/inkscape-preferences.cpp:438 msgid "Sketch mode" msgstr "Режим ескіза" -#: ../src/ui/dialog/inkscape-preferences.cpp:430 +#: ../src/ui/dialog/inkscape-preferences.cpp:440 msgid "" "If on, the sketch result will be the normal average of all sketches made, " "instead of averaging the old result with the new sketch" @@ -17978,17 +18138,17 @@ msgstr "" "ескізів, замість осереднення старого результату з новим ескізом." #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:433 +#: ../src/ui/dialog/inkscape-preferences.cpp:443 #: ../src/ui/dialog/input.cpp:1485 msgid "Pen" msgstr "Перо" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:439 +#: ../src/ui/dialog/inkscape-preferences.cpp:449 msgid "Calligraphy" msgstr "Каліграфія" -#: ../src/ui/dialog/inkscape-preferences.cpp:443 +#: ../src/ui/dialog/inkscape-preferences.cpp:453 msgid "" "If on, pen width is in absolute units (px) independent of zoom; otherwise " "pen width depends on zoom so that it looks the same at any zoom" @@ -17997,7 +18157,7 @@ msgstr "" "від масштабу; інакше товщина лінії підбиратиметься так, щоб бути візуально " "однаковою за будь-якого масштабу" -#: ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/ui/dialog/inkscape-preferences.cpp:455 msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" @@ -18006,27 +18166,27 @@ msgstr "" "знімається попереднє позначення)" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:448 ../src/verbs.cpp:2756 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 ../src/verbs.cpp:2755 msgctxt "ContextVerb" msgid "Text" msgstr "Текст" -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:463 msgid "Show font samples in the drop-down list" msgstr "Показувати зразки шрифтів у спадному списку" -#: ../src/ui/dialog/inkscape-preferences.cpp:454 +#: ../src/ui/dialog/inkscape-preferences.cpp:464 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "" "Показувати зразки шрифтів поряд з назвами шрифтів у спадному списку панелі " "тексту." -#: ../src/ui/dialog/inkscape-preferences.cpp:456 +#: ../src/ui/dialog/inkscape-preferences.cpp:466 msgid "Show font substitution warning dialog" msgstr "Показувати діалогове вікно попередження щодо заміни шрифтів" -#: ../src/ui/dialog/inkscape-preferences.cpp:457 +#: ../src/ui/dialog/inkscape-preferences.cpp:467 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" @@ -18034,77 +18194,77 @@ msgstr "" "Показувати діалогове вікно попередження щодо заміни шрифтів, якщо у системі " "не буде виявлено потрібних шрифтів." -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pixel" msgstr "Точка" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Pica" msgstr "Піка" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Millimeter" msgstr "Міліметр" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Centimeter" msgstr "Сантиметр" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Inch" msgstr "Дюйм" -#: ../src/ui/dialog/inkscape-preferences.cpp:460 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Em square" msgstr "Em квадрат" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:463 +#: ../src/ui/dialog/inkscape-preferences.cpp:473 msgid "Text units" msgstr "Одиниці тексту" -#: ../src/ui/dialog/inkscape-preferences.cpp:465 +#: ../src/ui/dialog/inkscape-preferences.cpp:475 msgid "Text size unit type:" msgstr "Тип одиниць розміру символів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:466 +#: ../src/ui/dialog/inkscape-preferences.cpp:476 msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" "Встановити тип одиниці на панелі інструментів тексту та у діалогових вікна " "параметрів тексту" -#: ../src/ui/dialog/inkscape-preferences.cpp:467 +#: ../src/ui/dialog/inkscape-preferences.cpp:477 msgid "Always output text size in pixels (px)" msgstr "Завжди виводити розмір символів у пікселях (пк)" #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:473 +#: ../src/ui/dialog/inkscape-preferences.cpp:483 msgid "Spray" msgstr "Розкидання" #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:478 +#: ../src/ui/dialog/inkscape-preferences.cpp:488 msgid "Eraser" msgstr "Гумка" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:483 +#: ../src/ui/dialog/inkscape-preferences.cpp:493 msgid "Paint Bucket" msgstr "Відро з фарбою" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:489 -#: ../src/widgets/gradient-selector.cpp:148 -#: ../src/widgets/gradient-selector.cpp:299 +#: ../src/ui/dialog/inkscape-preferences.cpp:499 +#: ../src/widgets/gradient-selector.cpp:144 +#: ../src/widgets/gradient-selector.cpp:295 msgid "Gradient" msgstr "Градієнт" -#: ../src/ui/dialog/inkscape-preferences.cpp:491 +#: ../src/ui/dialog/inkscape-preferences.cpp:501 msgid "Prevent sharing of gradient definitions" msgstr "Не поділяти визначення градієнтів між об'єктами" -#: ../src/ui/dialog/inkscape-preferences.cpp:493 +#: ../src/ui/dialog/inkscape-preferences.cpp:503 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " @@ -18115,11 +18275,11 @@ msgstr "" "об'єктами так, що зміна градієнта для одного об'єкта може вплинути на інші " "об'єкти, що використовують той самий градієнт" -#: ../src/ui/dialog/inkscape-preferences.cpp:494 +#: ../src/ui/dialog/inkscape-preferences.cpp:504 msgid "Use legacy Gradient Editor" msgstr "Використовувати застарілий редактор градієнтів" -#: ../src/ui/dialog/inkscape-preferences.cpp:496 +#: ../src/ui/dialog/inkscape-preferences.cpp:506 msgid "" "When on, the Gradient Edit button in the Fill & Stroke dialog will show the " "legacy Gradient Editor dialog, when off the Gradient Tool will be used" @@ -18129,11 +18289,11 @@ msgstr "" "градієнтів. Якщо не буде позначено, використовуватиметься інструмент " "градієнтів нового зразка." -#: ../src/ui/dialog/inkscape-preferences.cpp:499 +#: ../src/ui/dialog/inkscape-preferences.cpp:509 msgid "Linear gradient _angle:" msgstr "_Кут лінійного градієнта:" -#: ../src/ui/dialog/inkscape-preferences.cpp:500 +#: ../src/ui/dialog/inkscape-preferences.cpp:510 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" @@ -18141,452 +18301,457 @@ msgstr "" "від горизонталі)" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:504 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Dropper" msgstr "Піпетка" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Connector" msgstr "Лінія з'єднання" -#: ../src/ui/dialog/inkscape-preferences.cpp:512 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "If on, connector attachment points will not be shown for text objects" msgstr "" "У разі вибрання кінці лінії з'єднання не буде показано для текстових об'єктів" #. LPETool #. disabled, because the LPETool is not finished yet. -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:527 msgid "LPE Tool" msgstr "Інструмент геометричної побудови" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:534 msgid "Interface" msgstr "Інтерфейс" -#: ../src/ui/dialog/inkscape-preferences.cpp:527 +#: ../src/ui/dialog/inkscape-preferences.cpp:537 msgid "System default" msgstr "Типова системна" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Albanian (sq)" msgstr "Албанська (sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Amharic (am)" msgstr "Амхарська (am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Arabic (ar)" msgstr "Арабська (ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Armenian (hy)" msgstr "Вірменська (hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Assamese (as)" msgstr "Ассамська (as)" -#: ../src/ui/dialog/inkscape-preferences.cpp:528 +#: ../src/ui/dialog/inkscape-preferences.cpp:538 msgid "Azerbaijani (az)" msgstr "Азербайджанська (az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Basque (eu)" msgstr "Баскська (eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Belarusian (be)" msgstr "Білоруська (be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bulgarian (bg)" msgstr "Болгарська (bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali (bn)" msgstr "Бенгальська (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bengali/Bangladesh (bn_BD)" msgstr "Бенгальська, Бангладеш (bn_BD)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Bodo (brx)" msgstr "Бодо (brx)" -#: ../src/ui/dialog/inkscape-preferences.cpp:529 +#: ../src/ui/dialog/inkscape-preferences.cpp:539 msgid "Breton (br)" msgstr "Бретонська (br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Catalan (ca)" msgstr "Каталанська (ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Valencian Catalan (ca@valencia)" msgstr "Валенсійска каталанська (ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/China (zh_CN)" msgstr "Китайська/Китай (zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Chinese/Taiwan (zh_TW)" msgstr "Китайська/Тайвань (zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Croatian (hr)" msgstr "Хорватська (hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:530 +#: ../src/ui/dialog/inkscape-preferences.cpp:540 msgid "Czech (cs)" msgstr "Чеська (cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Danish (da)" msgstr "Данська (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dogri (doi)" msgstr "Догрі (doi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dutch (nl)" msgstr "Голландська (nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:531 +#: ../src/ui/dialog/inkscape-preferences.cpp:541 msgid "Dzongkha (dz)" msgstr "Джонка (dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "German (de)" msgstr "Німецька (de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:532 +#: ../src/ui/dialog/inkscape-preferences.cpp:542 msgid "Greek (el)" msgstr "Грецька (el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English (en)" msgstr "Англійська (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Australia (en_AU)" msgstr "Англійська/Австралія (en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Canada (en_CA)" msgstr "Англійська/Канада (en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "English/Great Britain (en_GB)" msgstr "Англійська/Великобританія (en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Pig Latin (en_US@piglatin)" msgstr "Свиняча латина (en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Esperanto (eo)" msgstr "Есперанто (eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:533 +#: ../src/ui/dialog/inkscape-preferences.cpp:543 msgid "Estonian (et)" msgstr "Естонська (et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Farsi (fa)" msgstr "Фарсі (fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "Finnish (fi)" msgstr "Фінська (fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:534 +#: ../src/ui/dialog/inkscape-preferences.cpp:544 msgid "French (fr)" msgstr "Французька (fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Galician (gl)" msgstr "Галісійська (gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:535 +#: ../src/ui/dialog/inkscape-preferences.cpp:545 msgid "Gujarati (gu)" msgstr "Гуджараті (gu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hebrew (he)" msgstr "Єврейська (he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hindi (hi)" msgstr "Хінді (hi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:536 +#: ../src/ui/dialog/inkscape-preferences.cpp:546 msgid "Hungarian (hu)" msgstr "Угорська (hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Icelandic (is)" msgstr "ісландська (is)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Indonesian (id)" msgstr "Індонезійська (id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Irish (ga)" msgstr "Ірландська (ga)" -#: ../src/ui/dialog/inkscape-preferences.cpp:537 +#: ../src/ui/dialog/inkscape-preferences.cpp:547 msgid "Italian (it)" msgstr "Італійська (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:538 +#: ../src/ui/dialog/inkscape-preferences.cpp:548 msgid "Japanese (ja)" msgstr "Японська (ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kannada (kn)" msgstr "Каннада (kn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Peso-Arabic script (ks@aran)" msgstr "Кашмірська, записана арабською писемністю (ks@aran)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kashmiri in Devanagari script (ks@deva)" msgstr "Кашмірська, записана писемністю деванагарі (ks@deva)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Khmer (km)" msgstr "Кхмерська (km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Kinyarwanda (rw)" msgstr "Руандійська (rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Konkani (kok)" msgstr "Конканська (kok)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Konkani in Latin script (kok@latin)" msgstr "Конканська (латиниця) (sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:539 +#: ../src/ui/dialog/inkscape-preferences.cpp:549 msgid "Korean (ko)" msgstr "Корейська (ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Latvian (lv)" msgstr "Латвійська (lv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:540 +#: ../src/ui/dialog/inkscape-preferences.cpp:550 msgid "Lithuanian (lt)" msgstr "Литовська (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Macedonian (mk)" msgstr "Македонська (mk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Maithili (mai)" msgstr "Майтілі (mai)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Malayalam (ml)" msgstr "Малаялам (ml)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri (mni)" msgstr "Маніпурі (mni)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Manipuri in Bengali script (mni@beng)" msgstr "Маніпурі, записана бенгальською писемністю (mni@beng)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Marathi (mr)" msgstr "Маратійська (gu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:541 +#: ../src/ui/dialog/inkscape-preferences.cpp:551 msgid "Mongolian (mn)" msgstr "Монгольська (mn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Nepali (ne)" msgstr "Непальська (ne)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Bokmål (nb)" msgstr "Норвезька (букмол) (nb)" -#: ../src/ui/dialog/inkscape-preferences.cpp:542 +#: ../src/ui/dialog/inkscape-preferences.cpp:552 msgid "Norwegian Nynorsk (nn)" msgstr "Норвезька (нюноршк) (nn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:543 +#: ../src/ui/dialog/inkscape-preferences.cpp:553 msgid "Odia (or)" msgstr "Орія (or)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Panjabi (pa)" msgstr "Пенджабі (pa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Polish (pl)" msgstr "Польська (pl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese (pt)" msgstr "Португальська (pt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:544 +#: ../src/ui/dialog/inkscape-preferences.cpp:554 msgid "Portuguese/Brazil (pt_BR)" msgstr "Португальська бразильська (pt_BR)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Romanian (ro)" msgstr "Румунська (ro)" -#: ../src/ui/dialog/inkscape-preferences.cpp:545 +#: ../src/ui/dialog/inkscape-preferences.cpp:555 msgid "Russian (ru)" msgstr "Російська (ru)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Sanskrit (sa)" msgstr "Санскрит (sa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Santali (sat)" msgstr "Санталі (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Santali in Devanagari script (sat@deva)" msgstr "Санталі, записана писемністю деванагарі (sat@deva)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian (sr)" msgstr "Сербська (sr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:546 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Serbian in Latin script (sr@latin)" msgstr "Сербська (латиниця) (sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi (sd)" msgstr "Сіндхська (sd)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Sindhi in Devanagari script (sd@deva)" msgstr "Сіндхська, записана писемністю деванагарі (sd@deva)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovak (sk)" msgstr "Словацька (sk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Slovenian (sl)" msgstr "Словенська (sl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish (es)" msgstr "Іспанська (es)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Spanish/Mexico (es_MX)" msgstr "Іспанська (Мексика) (es_MX)" -#: ../src/ui/dialog/inkscape-preferences.cpp:547 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Swedish (sv)" msgstr "Шведська (sv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Tamil (ta)" msgstr "Тамільська (ta)" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Telugu (te)" msgstr "Телугу (te)" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Thai (th)" msgstr "Тайська (th)" -#: ../src/ui/dialog/inkscape-preferences.cpp:548 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Turkish (tr)" msgstr "Турецька (tr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:549 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Ukrainian (uk)" msgstr "Українська (uk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:549 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Urdu (ur)" msgstr "Урду (ur)" -#: ../src/ui/dialog/inkscape-preferences.cpp:550 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Vietnamese (vi)" msgstr "В'єтнамська (vi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:602 +#: ../src/ui/dialog/inkscape-preferences.cpp:612 msgid "Language (requires restart):" msgstr "Мова (потребує перезапуску):" -#: ../src/ui/dialog/inkscape-preferences.cpp:603 +#: ../src/ui/dialog/inkscape-preferences.cpp:613 msgid "Set the language for menus and number formats" msgstr "Встановити мову для пунктів меню і формату чисел" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 +msgctxt "Icon size" +msgid "Larger" +msgstr "Більший" + +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Large" msgstr "Великий" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Small" msgstr "Малий" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgctxt "Icon size" msgid "Smaller" msgstr "Менший" -#: ../src/ui/dialog/inkscape-preferences.cpp:610 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "Toolbox icon size:" msgstr "Розмір піктограм інструментів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:611 +#: ../src/ui/dialog/inkscape-preferences.cpp:622 msgid "Set the size for the tool icons (requires restart)" msgstr "Встановити розмір основних інструментів (потрібен перезапуск)" -#: ../src/ui/dialog/inkscape-preferences.cpp:614 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "Control bar icon size:" msgstr "Розмір піктограм панелі керування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:615 +#: ../src/ui/dialog/inkscape-preferences.cpp:626 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "Вказати розмір піктограм панелі керування (потрібен перезапуск)" -#: ../src/ui/dialog/inkscape-preferences.cpp:618 +#: ../src/ui/dialog/inkscape-preferences.cpp:629 msgid "Secondary toolbar icon size:" msgstr "Розмір піктограм вторинної панелі інструментів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:619 +#: ../src/ui/dialog/inkscape-preferences.cpp:630 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" msgstr "Вказати розмір вторинної панелі інструментів (потрібен перезапуск)" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:633 msgid "Work-around color sliders not drawing" msgstr "Вирішення для випадків, коли програма не малює кольорові повзунки" -#: ../src/ui/dialog/inkscape-preferences.cpp:624 +#: ../src/ui/dialog/inkscape-preferences.cpp:635 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" @@ -18594,15 +18759,15 @@ msgstr "" "Якщо позначити, програма намагатиметься уникнути вад у певних темах GTK, " "пов'язаних з малюванням кольорових повзунків." -#: ../src/ui/dialog/inkscape-preferences.cpp:629 +#: ../src/ui/dialog/inkscape-preferences.cpp:640 msgid "Clear list" msgstr "Спорожнити список" -#: ../src/ui/dialog/inkscape-preferences.cpp:632 +#: ../src/ui/dialog/inkscape-preferences.cpp:643 msgid "Maximum documents in Open _Recent:" msgstr "Максимальна кількість _недавніх документів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:633 +#: ../src/ui/dialog/inkscape-preferences.cpp:644 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" @@ -18610,11 +18775,11 @@ msgstr "" "Максимальна довжина підменю недавніх документів у меню «Файл», за допомогою " "цього пункту можна спорожнити список" -#: ../src/ui/dialog/inkscape-preferences.cpp:636 +#: ../src/ui/dialog/inkscape-preferences.cpp:647 msgid "_Zoom correction factor (in %):" msgstr "Кое_фіцієнт виправлення масштабу (у %):" -#: ../src/ui/dialog/inkscape-preferences.cpp:637 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 msgid "" "Adjust the slider until the length of the ruler on your screen matches its " "real length. This information is used when zooming to 1:1, 1:2, etc., to " @@ -18624,11 +18789,11 @@ msgstr "" "збігатиметься з її дійсною довжиною. Ці відомості буде використано під час " "масштабування 1:1, 1:2 тощо, щоб показувати об'єкти з істинними розмірами" -#: ../src/ui/dialog/inkscape-preferences.cpp:640 +#: ../src/ui/dialog/inkscape-preferences.cpp:651 msgid "Enable dynamic relayout for incomplete sections" msgstr "Увімкнути динамічне перекомпонування для незавершених частин" -#: ../src/ui/dialog/inkscape-preferences.cpp:642 +#: ../src/ui/dialog/inkscape-preferences.cpp:653 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" @@ -18637,11 +18802,11 @@ msgstr "" "які не було повністю завершено до зміни масштабів." #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Show filter primitives infobox (requires restart)" msgstr "Показувати довідку з примітивів фільтра (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:647 +#: ../src/ui/dialog/inkscape-preferences.cpp:658 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" @@ -18649,26 +18814,26 @@ msgstr "" "Показувати піктограми і описи для всіх примітивів фільтрів у діалозі ефектів " "фільтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Icons only" msgstr "Лише піктограми" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Text only" msgstr "Лише текст" -#: ../src/ui/dialog/inkscape-preferences.cpp:650 -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:669 msgid "Icons and text" msgstr "Піктограми і текст" -#: ../src/ui/dialog/inkscape-preferences.cpp:655 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Dockbar style (requires restart):" msgstr "Стиль бічної панелі (потребує перезапуску):" -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:667 msgid "" "Selects whether the vertical bars on the dockbar will show text labels, " "icons, or both" @@ -18676,11 +18841,11 @@ msgstr "" "Надає змогу визначити, що буде показано на вертикальних смугах бічної " "панелі: текстові мітки, піктограми чи текстові мітки і піктограми одразу." -#: ../src/ui/dialog/inkscape-preferences.cpp:663 +#: ../src/ui/dialog/inkscape-preferences.cpp:674 msgid "Switcher style (requires restart):" msgstr "Стиль перемикача (потребує перезапуску):" -#: ../src/ui/dialog/inkscape-preferences.cpp:664 +#: ../src/ui/dialog/inkscape-preferences.cpp:675 msgid "" "Selects whether the dockbar switcher will show text labels, icons, or both" msgstr "" @@ -18688,98 +18853,98 @@ msgstr "" "текстові мітки, піктограми чи текстові мітки і піктограми одразу." #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:668 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Save and restore window geometry for each document" msgstr "" "Запам'ятовувати і використовувати геометрію вікна для кожного документа" -#: ../src/ui/dialog/inkscape-preferences.cpp:669 +#: ../src/ui/dialog/inkscape-preferences.cpp:680 msgid "Remember and use last window's geometry" msgstr "Запам'ятати і використовувати останню геометрію вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:670 +#: ../src/ui/dialog/inkscape-preferences.cpp:681 msgid "Don't save window geometry" msgstr "Не зберігати геометрію вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:672 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 msgid "Save and restore dialogs status" msgstr "Зберігати і відновлювати параметри діалогових вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:720 msgid "Don't save dialogs status" msgstr "Не зберігати параметри діалогових вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:675 -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:728 msgid "Dockable" msgstr "Закріплюються до правого краю вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:679 +#: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "Native open/save dialogs" msgstr "Стандартні вікна відкриття і збереження" -#: ../src/ui/dialog/inkscape-preferences.cpp:680 +#: ../src/ui/dialog/inkscape-preferences.cpp:691 msgid "GTK open/save dialogs" msgstr "Вікна відкриття і збереження GTK" -#: ../src/ui/dialog/inkscape-preferences.cpp:682 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Dialogs are hidden in taskbar" msgstr "Не показувати діалоги на панелі задач" -#: ../src/ui/dialog/inkscape-preferences.cpp:683 +#: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "Save and restore documents viewport" msgstr "Зберігати і відновлювати поле зору у документах" -#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Zoom when window is resized" msgstr "Масштабувати при зміні розмірів вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:685 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 msgid "Show close button on dialogs" msgstr "Показувати кнопку закриття у діалогах" -#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:697 msgctxt "Dialog on top" msgid "None" msgstr "Жодного" -#: ../src/ui/dialog/inkscape-preferences.cpp:688 +#: ../src/ui/dialog/inkscape-preferences.cpp:699 msgid "Aggressive" msgstr "Примусово" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 msgctxt "Window size" msgid "Small" msgstr "Малий" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 msgctxt "Window size" msgid "Large" msgstr "Великий" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 msgctxt "Window size" msgid "Maximized" msgstr "Максимізований" -#: ../src/ui/dialog/inkscape-preferences.cpp:695 +#: ../src/ui/dialog/inkscape-preferences.cpp:706 msgid "Default window size:" msgstr "Типовий розмір вікна:" -#: ../src/ui/dialog/inkscape-preferences.cpp:696 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 msgid "Set the default window size" msgstr "Встановити типовий розмір вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:699 +#: ../src/ui/dialog/inkscape-preferences.cpp:710 msgid "Saving window geometry (size and position)" msgstr "Зберігати геометрію вікон (розмір і розташування)" -#: ../src/ui/dialog/inkscape-preferences.cpp:701 +#: ../src/ui/dialog/inkscape-preferences.cpp:712 msgid "Let the window manager determine placement of all windows" msgstr "Дозволити менеджеру вікон розташовувати всі вікна самостійно" -#: ../src/ui/dialog/inkscape-preferences.cpp:703 +#: ../src/ui/dialog/inkscape-preferences.cpp:714 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" @@ -18787,7 +18952,7 @@ msgstr "" "Запам'ятовувати і використовувати геометрію останнього вікна (геометрія " "зберігається у налаштуваннях користувача)" -#: ../src/ui/dialog/inkscape-preferences.cpp:705 +#: ../src/ui/dialog/inkscape-preferences.cpp:716 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" @@ -18795,11 +18960,11 @@ msgstr "" "Запам'ятовувати і відновлювати геометрію вікна для кожного документа " "(геометрія зберігається у документі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:718 msgid "Saving dialogs status" msgstr "Збереження параметрів діалогових вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:711 +#: ../src/ui/dialog/inkscape-preferences.cpp:722 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" @@ -18807,66 +18972,66 @@ msgstr "" "Зберігати і відновлювати параметри діалогових вікон (параметри останніх " "відкритих діалогових вікон зберігатимуться під час їхнього закриття)" -#: ../src/ui/dialog/inkscape-preferences.cpp:715 +#: ../src/ui/dialog/inkscape-preferences.cpp:726 msgid "Dialog behavior (requires restart)" msgstr "Поведінка діалогів (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "Desktop integration" msgstr "Інтеграція до стільниці" -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:734 msgid "Use Windows like open and save dialogs" msgstr "" "Використовувати вікна подібні до вікон Windows для відкриття та збереження" -#: ../src/ui/dialog/inkscape-preferences.cpp:725 +#: ../src/ui/dialog/inkscape-preferences.cpp:736 msgid "Use GTK open and save dialogs " msgstr "Використовувати вікна GTK для відкриття та збереження " -#: ../src/ui/dialog/inkscape-preferences.cpp:729 +#: ../src/ui/dialog/inkscape-preferences.cpp:740 msgid "Dialogs on top:" msgstr "Діалоги над вікном:" -#: ../src/ui/dialog/inkscape-preferences.cpp:732 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 msgid "Dialogs are treated as regular windows" msgstr "Діалоги вважаються звичайними вікнами" -#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:745 msgid "Dialogs stay on top of document windows" msgstr "Діалоги залишаються над вікнами документів" -#: ../src/ui/dialog/inkscape-preferences.cpp:736 +#: ../src/ui/dialog/inkscape-preferences.cpp:747 msgid "Same as Normal but may work better with some window managers" msgstr "" "Те саме що і Звичайне, але може працювати краще з деякими віконними " "середовищами" -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:750 msgid "Dialog Transparency" msgstr "Прозорість вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:752 msgid "_Opacity when focused:" msgstr "Неп_розорість при фокусуванні:" -#: ../src/ui/dialog/inkscape-preferences.cpp:743 +#: ../src/ui/dialog/inkscape-preferences.cpp:754 msgid "Opacity when _unfocused:" msgstr "Непро_зорість без фокусування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:745 +#: ../src/ui/dialog/inkscape-preferences.cpp:756 msgid "_Time of opacity change animation:" msgstr "_Час зміни непрозорості у анімації:" -#: ../src/ui/dialog/inkscape-preferences.cpp:748 +#: ../src/ui/dialog/inkscape-preferences.cpp:759 msgid "Miscellaneous" msgstr "Інше" -#: ../src/ui/dialog/inkscape-preferences.cpp:751 +#: ../src/ui/dialog/inkscape-preferences.cpp:762 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "Чи прибирати діалогові вікна з панелі завдань віконного менеджера" -#: ../src/ui/dialog/inkscape-preferences.cpp:754 +#: ../src/ui/dialog/inkscape-preferences.cpp:765 msgid "" "Zoom drawing when document window is resized, to keep the same area visible " "(this is the default which can be changed in any window using the button " @@ -18875,7 +19040,7 @@ msgstr "" "Масштабувати малюнок при зміні розмірів вікна, щоб зберегти видиму область " "(можна змінювати кнопкою над правою смугою гортання)" -#: ../src/ui/dialog/inkscape-preferences.cpp:756 +#: ../src/ui/dialog/inkscape-preferences.cpp:767 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." @@ -18884,101 +19049,101 @@ msgstr "" "панорамування). Варто вимкнути, якщо файл зберігається у системі керування " "версіями." -#: ../src/ui/dialog/inkscape-preferences.cpp:758 +#: ../src/ui/dialog/inkscape-preferences.cpp:769 msgid "Whether dialog windows have a close button (requires restart)" msgstr "Чи матиме вікно діалогу кнопку закриття (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:759 +#: ../src/ui/dialog/inkscape-preferences.cpp:770 msgid "Windows" msgstr "Вікна" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:762 +#: ../src/ui/dialog/inkscape-preferences.cpp:773 msgid "Line color when zooming out" msgstr "Колір ліній у разі зменшення масштабу" -#: ../src/ui/dialog/inkscape-preferences.cpp:765 +#: ../src/ui/dialog/inkscape-preferences.cpp:776 msgid "The gridlines will be shown in minor grid line color" msgstr "Лінії сітки буде показано кольором другорядних ліній сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:767 +#: ../src/ui/dialog/inkscape-preferences.cpp:778 msgid "The gridlines will be shown in major grid line color" msgstr "Лінії сітки буде показано кольором основних ліній сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:769 +#: ../src/ui/dialog/inkscape-preferences.cpp:780 msgid "Default grid settings" msgstr "Типові налаштування сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:775 -#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:811 msgid "Grid units:" msgstr "Одиниці сітки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:780 -#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:791 +#: ../src/ui/dialog/inkscape-preferences.cpp:816 msgid "Origin X:" msgstr "Початок за X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:781 -#: ../src/ui/dialog/inkscape-preferences.cpp:806 +#: ../src/ui/dialog/inkscape-preferences.cpp:792 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Origin Y:" msgstr "Початок за Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:786 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Spacing X:" msgstr "Інтервал за X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:787 -#: ../src/ui/dialog/inkscape-preferences.cpp:809 +#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Spacing Y:" msgstr "Інтервал за Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:789 -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:814 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:825 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 msgid "Minor grid line color:" msgstr "Колір другорядних ліній сітки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 msgid "Color used for normal grid lines" msgstr "Колір, що використовуватиметься для звичайних ліній сітки." -#: ../src/ui/dialog/inkscape-preferences.cpp:791 -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:816 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 +#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:827 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Major grid line color:" msgstr "Колір основної лінії сітки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:792 -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Color used for major (highlighted) grid lines" msgstr "Колір основних (підсвічених) ліній сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:794 -#: ../src/ui/dialog/inkscape-preferences.cpp:819 +#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:830 msgid "Major grid line every:" msgstr "Основна лінія через кожні:" -#: ../src/ui/dialog/inkscape-preferences.cpp:795 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "Show dots instead of lines" msgstr "Показувати точки замість ліній" -#: ../src/ui/dialog/inkscape-preferences.cpp:796 +#: ../src/ui/dialog/inkscape-preferences.cpp:807 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "Якщо позначено, замість ліній сітки показуються точки сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:877 +#: ../src/ui/dialog/inkscape-preferences.cpp:888 msgid "Input/Output" msgstr "Вхідні/Вихідні дані" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 +#: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "Use current directory for \"Save As ...\"" msgstr "Використовувати для «Зберегти як…» поточний каталог" -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:893 msgid "" "When this option is on, the \"Save as...\" and \"Save a Copy...\" dialogs " "will always open in the directory where the currently open document is; when " @@ -18991,11 +19156,11 @@ msgstr "" "відкрито у каталозі, куди було збережено файл під час попереднього " "використання цього діалогового вікна." -#: ../src/ui/dialog/inkscape-preferences.cpp:884 +#: ../src/ui/dialog/inkscape-preferences.cpp:895 msgid "Add label comments to printing output" msgstr "Додати коментар до виводу друку" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" @@ -19003,11 +19168,11 @@ msgstr "" "Якщо увімкнено, до необробленого виводу друку буде додано коментар, що " "позначає вивід об'єкта з його позначкою" -#: ../src/ui/dialog/inkscape-preferences.cpp:888 +#: ../src/ui/dialog/inkscape-preferences.cpp:899 msgid "Add default metadata to new documents" msgstr "Додавати до нових документів типові метадані" -#: ../src/ui/dialog/inkscape-preferences.cpp:890 +#: ../src/ui/dialog/inkscape-preferences.cpp:901 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." @@ -19015,15 +19180,15 @@ msgstr "" "Додавати до нових документів типові метадані. Змінити типові метадані можна " "за допомогою пункту меню «Властивості документа -> Mетадані»." -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "_Grab sensitivity:" msgstr "Раді_ус захоплення:" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "pixels (requires restart)" msgstr "пікселів (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:906 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" @@ -19031,39 +19196,39 @@ msgstr "" "Як близько (у точках) потрібно підвести курсор миші до об'єкта, щоб захопити " "його" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 msgid "_Click/drag threshold:" msgstr "Вва_жати клацанням перетягування на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 msgid "pixels" msgstr "точок" -#: ../src/ui/dialog/inkscape-preferences.cpp:898 +#: ../src/ui/dialog/inkscape-preferences.cpp:909 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" "Максимальна кількість точок, перетягування на яку сприймається як клацання, " "а не перетягування" -#: ../src/ui/dialog/inkscape-preferences.cpp:901 +#: ../src/ui/dialog/inkscape-preferences.cpp:912 msgid "_Handle size:" msgstr "Розмір в_уса:" -#: ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/ui/dialog/inkscape-preferences.cpp:913 msgid "Set the relative size of node handles" msgstr "Встановити відносний розмір вусів вузла" -#: ../src/ui/dialog/inkscape-preferences.cpp:904 +#: ../src/ui/dialog/inkscape-preferences.cpp:915 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "" "Використовувати графічний планшет чи інший пристрій (потребує " "перезавантаження)" -#: ../src/ui/dialog/inkscape-preferences.cpp:906 +#: ../src/ui/dialog/inkscape-preferences.cpp:917 msgid "" "Use the capabilities of a tablet or other pressure-sensitive device. Disable " "this only if you have problems with the tablet (you can still use it as a " @@ -19073,26 +19238,26 @@ msgstr "" "пристрою. Вимикайте це, лише якщо виникають проблеми з графічним планшетом " "(залишається можливість використовувати мишу) ." -#: ../src/ui/dialog/inkscape-preferences.cpp:908 +#: ../src/ui/dialog/inkscape-preferences.cpp:919 msgid "Switch tool based on tablet device (requires restart)" msgstr "Перемикати інструмент за пристроєм планшета (потребує перезапуску):" -#: ../src/ui/dialog/inkscape-preferences.cpp:910 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "" "Змінювати інструмент зі зміною пристроїв на планшеті (перо, гумка, мишка)" -#: ../src/ui/dialog/inkscape-preferences.cpp:911 +#: ../src/ui/dialog/inkscape-preferences.cpp:922 msgid "Input devices" msgstr "Пристрої введення" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:914 +#: ../src/ui/dialog/inkscape-preferences.cpp:925 msgid "Use named colors" msgstr "Використовувати кольори з назвами" -#: ../src/ui/dialog/inkscape-preferences.cpp:915 +#: ../src/ui/dialog/inkscape-preferences.cpp:926 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" @@ -19100,23 +19265,23 @@ msgstr "" "Якщо позначено, записувати CSS-назву кольору, якщо вона доступна (наприклад, " "«red» або «magenta») замість числового значення" -#: ../src/ui/dialog/inkscape-preferences.cpp:917 +#: ../src/ui/dialog/inkscape-preferences.cpp:928 msgid "XML formatting" msgstr "XML-форматування" -#: ../src/ui/dialog/inkscape-preferences.cpp:919 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Inline attributes" msgstr "Вбудовані атрибути" -#: ../src/ui/dialog/inkscape-preferences.cpp:920 +#: ../src/ui/dialog/inkscape-preferences.cpp:931 msgid "Put attributes on the same line as the element tag" msgstr "Вказувати атрибути у тому ж рядку, що і теґ елемента" -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "_Indent, spaces:" msgstr "Ві_дступ, у пробілах:" -#: ../src/ui/dialog/inkscape-preferences.cpp:923 +#: ../src/ui/dialog/inkscape-preferences.cpp:934 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" @@ -19124,28 +19289,28 @@ msgstr "" "Кількість пробілів, які буде використано для створення відступів елементів, " "встановіть значення 0, щоб усунути відступи" -#: ../src/ui/dialog/inkscape-preferences.cpp:925 +#: ../src/ui/dialog/inkscape-preferences.cpp:936 msgid "Path data" msgstr "Дані контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Absolute" msgstr "Абсолютний" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Relative" msgstr "Відносний" -#: ../src/ui/dialog/inkscape-preferences.cpp:928 -#: ../src/ui/dialog/inkscape-preferences.cpp:1218 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Optimized" msgstr "З оптимізацією" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Path string format:" msgstr "Формат рядка контуру:" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "" "Path data should be written: only with absolute coordinates, only with " "relative coordinates, or optimized for string length (mixed absolute and " @@ -19155,11 +19320,11 @@ msgstr "" "відносних координатах або оптимізовано за довжиною рядка (використовуючи як " "абсолютні, так і відносні координати)" -#: ../src/ui/dialog/inkscape-preferences.cpp:934 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 msgid "Force repeat commands" msgstr "Примусове повторення команд" -#: ../src/ui/dialog/inkscape-preferences.cpp:935 +#: ../src/ui/dialog/inkscape-preferences.cpp:946 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" @@ -19167,23 +19332,23 @@ msgstr "" "Примусове повторення тої самої команди контуру (наприклад, 'L 1,2 L 3,4' " "замість 'L 1,2 3,4')" -#: ../src/ui/dialog/inkscape-preferences.cpp:937 +#: ../src/ui/dialog/inkscape-preferences.cpp:948 msgid "Numbers" msgstr "Числа" -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "_Numeric precision:" msgstr "_Числова точність:" -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "Significant figures of the values written to the SVG file" msgstr "Значущі частини значень, які буде записано до файла SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 +#: ../src/ui/dialog/inkscape-preferences.cpp:954 msgid "Minimum _exponent:" msgstr "Мінімальний по_казник:" -#: ../src/ui/dialog/inkscape-preferences.cpp:943 +#: ../src/ui/dialog/inkscape-preferences.cpp:954 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -19193,17 +19358,17 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:948 +#: ../src/ui/dialog/inkscape-preferences.cpp:959 msgid "Improper Attributes Actions" msgstr "Дії з неналежними атрибутами" -#: ../src/ui/dialog/inkscape-preferences.cpp:950 -#: ../src/ui/dialog/inkscape-preferences.cpp:958 -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 +#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:977 msgid "Print warnings" msgstr "Повідомляти про помилки" -#: ../src/ui/dialog/inkscape-preferences.cpp:951 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." @@ -19212,20 +19377,20 @@ msgstr "" "атрибут. Файли бази даних зберігаються у теці каталог_даних_inkscape/" "attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:952 +#: ../src/ui/dialog/inkscape-preferences.cpp:963 msgid "Remove attributes" msgstr "Вилучати атрибути" -#: ../src/ui/dialog/inkscape-preferences.cpp:953 +#: ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Delete invalid or non-useful attributes from element tag" msgstr "Вилучати некоректні та непотрібні атрибути з теґів елемента" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:956 +#: ../src/ui/dialog/inkscape-preferences.cpp:967 msgid "Inappropriate Style Properties Actions" msgstr "Дії з неналежними властивостями стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:959 +#: ../src/ui/dialog/inkscape-preferences.cpp:970 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a ). Database files located in inkscape_data_dir/attributes." @@ -19234,21 +19399,21 @@ msgstr "" "(наприклад, «font-family» у ). Файли бази даних зберігаються у теці " "каталог_даних_inkscape/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:960 -#: ../src/ui/dialog/inkscape-preferences.cpp:968 +#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:979 msgid "Remove style properties" msgstr "Вилучати властивості стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:961 +#: ../src/ui/dialog/inkscape-preferences.cpp:972 msgid "Delete inappropriate style properties" msgstr "Вилучати невідповідні властивості стилю" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:964 +#: ../src/ui/dialog/inkscape-preferences.cpp:975 msgid "Non-useful Style Properties Actions" msgstr "Дії з непотрібними властивостями стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:967 +#: ../src/ui/dialog/inkscape-preferences.cpp:978 msgid "" "Print warning if redundant style properties found (i.e. if a property has " "the default value and a different value is not inherited or if value is the " @@ -19260,19 +19425,19 @@ msgstr "" "самим, яке було успадковано). Файли бази даних зберігаються у теці " "каталог_даних_inkscape/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:969 +#: ../src/ui/dialog/inkscape-preferences.cpp:980 msgid "Delete redundant style properties" msgstr "Вилучати зайві властивості стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:971 +#: ../src/ui/dialog/inkscape-preferences.cpp:982 msgid "Check Attributes and Style Properties on" msgstr "Перевіряти атрибути і властивості стилів під час" -#: ../src/ui/dialog/inkscape-preferences.cpp:973 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "Reading" msgstr "читання" -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:985 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" @@ -19280,11 +19445,11 @@ msgstr "" "Перевіряти атрибути і властивості стилів під час читання файлів SVG (зокрема " "перевіряти вбудовані файли Inkscape, що може уповільнити запуск програми)" -#: ../src/ui/dialog/inkscape-preferences.cpp:975 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "Editing" msgstr "редагування" -#: ../src/ui/dialog/inkscape-preferences.cpp:976 +#: ../src/ui/dialog/inkscape-preferences.cpp:987 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" @@ -19292,42 +19457,42 @@ msgstr "" "Перевіряти атрибути і властивості стилів під час редагування файлів SVG " "(може уповільнити Inkscape, корисне для діагностики негараздів)" -#: ../src/ui/dialog/inkscape-preferences.cpp:977 +#: ../src/ui/dialog/inkscape-preferences.cpp:988 msgid "Writing" msgstr "запису" -#: ../src/ui/dialog/inkscape-preferences.cpp:978 +#: ../src/ui/dialog/inkscape-preferences.cpp:989 msgid "Check attributes and style properties on writing out SVG files" msgstr "" "Перевіряти атрибути і властивості стилів під час запису даних до файлів SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:980 +#: ../src/ui/dialog/inkscape-preferences.cpp:991 msgid "SVG output" msgstr "Експорт до SVG" #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Perceptual" msgstr "Придатна для сприйняття" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Relative Colorimetric" msgstr "Відносна колориметрична" -#: ../src/ui/dialog/inkscape-preferences.cpp:986 +#: ../src/ui/dialog/inkscape-preferences.cpp:997 msgid "Absolute Colorimetric" msgstr "Абсолютна колориметрична" -#: ../src/ui/dialog/inkscape-preferences.cpp:990 +#: ../src/ui/dialog/inkscape-preferences.cpp:1001 msgid "(Note: Color management has been disabled in this build)" msgstr "" "(Зауваження: під час збирання цієї програми керування кольором було вимкнено)" -#: ../src/ui/dialog/inkscape-preferences.cpp:994 +#: ../src/ui/dialog/inkscape-preferences.cpp:1005 msgid "Display adjustment" msgstr "Налаштування показу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1004 +#: ../src/ui/dialog/inkscape-preferences.cpp:1015 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" @@ -19336,116 +19501,116 @@ msgstr "" "Профіль ICC, який буде використано для калібрування показу на екрані.\n" "Каталоги для пошуку:%s" -#: ../src/ui/dialog/inkscape-preferences.cpp:1005 +#: ../src/ui/dialog/inkscape-preferences.cpp:1016 msgid "Display profile:" msgstr "Профіль дисплея:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1010 +#: ../src/ui/dialog/inkscape-preferences.cpp:1021 msgid "Retrieve profile from display" msgstr "Отримати профіль з дисплея" -#: ../src/ui/dialog/inkscape-preferences.cpp:1013 +#: ../src/ui/dialog/inkscape-preferences.cpp:1024 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "Отримати профілі з тих, що прив'язані до дисплеїв через XICC" -#: ../src/ui/dialog/inkscape-preferences.cpp:1015 +#: ../src/ui/dialog/inkscape-preferences.cpp:1026 msgid "Retrieve profiles from those attached to displays" msgstr "Отримати профілі з тих, що прив'язано до дисплеїв" -#: ../src/ui/dialog/inkscape-preferences.cpp:1020 +#: ../src/ui/dialog/inkscape-preferences.cpp:1031 msgid "Display rendering intent:" msgstr "Ціль відтворення кольорів на дисплеї:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1021 +#: ../src/ui/dialog/inkscape-preferences.cpp:1032 msgid "The rendering intent to use to calibrate display output" msgstr "" "Режим відтворення кольорів, що використовуватиметься для калібрування виводу " "на дисплей" -#: ../src/ui/dialog/inkscape-preferences.cpp:1023 +#: ../src/ui/dialog/inkscape-preferences.cpp:1034 msgid "Proofing" msgstr "Проба кольорів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1025 +#: ../src/ui/dialog/inkscape-preferences.cpp:1036 msgid "Simulate output on screen" msgstr "Імітувати пристрій виводу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1027 +#: ../src/ui/dialog/inkscape-preferences.cpp:1038 msgid "Simulates output of target device" msgstr "Імітувати вивід на цільовий пристрій" -#: ../src/ui/dialog/inkscape-preferences.cpp:1029 +#: ../src/ui/dialog/inkscape-preferences.cpp:1040 msgid "Mark out of gamut colors" msgstr "Позначати кольори поза гамою" -#: ../src/ui/dialog/inkscape-preferences.cpp:1031 +#: ../src/ui/dialog/inkscape-preferences.cpp:1042 msgid "Highlights colors that are out of gamut for the target device" msgstr "Підсвічує кольори, що лежать поза гамою цільового пристрою" -#: ../src/ui/dialog/inkscape-preferences.cpp:1043 +#: ../src/ui/dialog/inkscape-preferences.cpp:1054 msgid "Out of gamut warning color:" msgstr "Колір для попередження про гаму:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1044 +#: ../src/ui/dialog/inkscape-preferences.cpp:1055 msgid "Selects the color used for out of gamut warning" msgstr "" "Обирає колір, що використовуватиметься для попередження про відсутність у " "гамі" -#: ../src/ui/dialog/inkscape-preferences.cpp:1046 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 msgid "Device profile:" msgstr "Профіль пристрою виводу:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1047 +#: ../src/ui/dialog/inkscape-preferences.cpp:1058 msgid "The ICC profile to use to simulate device output" msgstr "Профіль ICC, що використовуватиметься для імітації пристрою виведення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1050 +#: ../src/ui/dialog/inkscape-preferences.cpp:1061 msgid "Device rendering intent:" msgstr "Ціль відтворення кольорів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1051 +#: ../src/ui/dialog/inkscape-preferences.cpp:1062 msgid "The rendering intent to use to calibrate device output" msgstr "" "Ціль відтворення кольорів, що використовуватиметься для калібрування " "виведення на пристрій" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1064 msgid "Black point compensation" msgstr "Компенсація чорної точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1055 +#: ../src/ui/dialog/inkscape-preferences.cpp:1066 msgid "Enables black point compensation" msgstr "Вмикає компенсацію чорної точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1057 +#: ../src/ui/dialog/inkscape-preferences.cpp:1068 msgid "Preserve black" msgstr "Зберігати чорний" -#: ../src/ui/dialog/inkscape-preferences.cpp:1064 +#: ../src/ui/dialog/inkscape-preferences.cpp:1075 msgid "(LittleCMS 1.15 or later required)" msgstr "(потрібна бібліотека LittleCMS версії 1.15 або новіша)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1066 +#: ../src/ui/dialog/inkscape-preferences.cpp:1077 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "Зберігати канал K під час перетворень CMYK → CMYK" -#: ../src/ui/dialog/inkscape-preferences.cpp:1080 -#: ../src/ui/widget/color-icc-selector.cpp:395 -#: ../src/ui/widget/color-icc-selector.cpp:674 +#: ../src/ui/dialog/inkscape-preferences.cpp:1091 +#: ../src/ui/widget/color-icc-selector.cpp:394 +#: ../src/ui/widget/color-icc-selector.cpp:685 msgid "" msgstr "<немає>" -#: ../src/ui/dialog/inkscape-preferences.cpp:1125 +#: ../src/ui/dialog/inkscape-preferences.cpp:1136 msgid "Color management" msgstr "Керування кольором" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1128 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "Enable autosave (requires restart)" msgstr "Увімкнути автозбереження (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1129 +#: ../src/ui/dialog/inkscape-preferences.cpp:1140 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" @@ -19453,12 +19618,12 @@ msgstr "" "Автоматично зберігати поточні документи через вказані проміжки часу, таким " "чином зменшуючи втрати у випадку аварійного завершення програми" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "Каталог _автозбереження:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1135 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgid "" "The directory where autosaves will be written. This should be an absolute " "path (starts with / on UNIX or a drive letter such as C: on Windows). " @@ -19467,19 +19632,19 @@ msgstr "" "вказати абсолютну адресу (адресу, що починається з / у UNIX або літери " "диска, наприклад C:, у Windows). " -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "_Interval (in minutes):" msgstr "_Інтервал (у хвилинах):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "Interval (in minutes) at which document will be autosaved" msgstr "Інтервал (у хвилинах) між автоматичними зберіганнями копій" -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "_Maximum number of autosaves:" msgstr "Макс_имальна кількість копій автозбереження:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -19498,15 +19663,15 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1154 +#: ../src/ui/dialog/inkscape-preferences.cpp:1165 msgid "Autosave" msgstr "Автозбереження" -#: ../src/ui/dialog/inkscape-preferences.cpp:1158 +#: ../src/ui/dialog/inkscape-preferences.cpp:1169 msgid "Open Clip Art Library _Server Name:" msgstr "_Назва сервера бібліотеки Open Clip Art:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1170 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" @@ -19514,35 +19679,35 @@ msgstr "" "Назва сервера webdav бібліотеки Open Clip Art. Його буде використано " "функціями імпорту з та експорту до OCAL." -#: ../src/ui/dialog/inkscape-preferences.cpp:1161 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "Open Clip Art Library _Username:" msgstr "Ім'_я користувача бібліотеки Open Clip Art:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1162 +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "The username used to log into Open Clip Art Library" msgstr "Ім'я користувача для авторизації у системі бібліотеки Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1164 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "Open Clip Art Library _Password:" msgstr "Паро_ль до бібліотеки Open Clip Art:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "The password used to log into Open Clip Art Library" msgstr "Пароль для авторизації у системі бібліотеки Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1166 +#: ../src/ui/dialog/inkscape-preferences.cpp:1177 msgid "Open Clip Art" msgstr "Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1171 +#: ../src/ui/dialog/inkscape-preferences.cpp:1182 msgid "Behavior" msgstr "Поведінка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "_Simplification threshold:" msgstr "Поріг спро_щення:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1187 msgid "" "How strong is the Node tool's Simplify command by default. If you invoke " "this command several times in quick succession, it will act more and more " @@ -19553,45 +19718,45 @@ msgstr "" "більш агресивно; щоб повернутися до типового значення, зробіть паузу перед " "черговим викликом команди." -#: ../src/ui/dialog/inkscape-preferences.cpp:1178 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "Color stock markers the same color as object" msgstr "Колір опорних маркерів збігається з кольором об’єкта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1179 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 msgid "Color custom markers the same color as object" msgstr "Колір нетипових маркерів збігається з кольором об’єкта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1180 -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 +#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1411 msgid "Update marker color when object color changes" msgstr "Оновлювати колір маркера у разі зміни кольора об’єкта" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1183 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 msgid "Select in all layers" msgstr "Позначити все в усіх шарах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Select only within current layer" msgstr "Позначити лише у поточному шарі" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Select in current layer and sublayers" msgstr "Позначити у поточному шарі та підшарах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1186 +#: ../src/ui/dialog/inkscape-preferences.cpp:1197 msgid "Ignore hidden objects and layers" msgstr "Ігнорувати приховані об'єкти і шари" -#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/ui/dialog/inkscape-preferences.cpp:1198 msgid "Ignore locked objects and layers" msgstr "Ігнорувати заблоковані об'єкти і шари" -#: ../src/ui/dialog/inkscape-preferences.cpp:1188 +#: ../src/ui/dialog/inkscape-preferences.cpp:1199 msgid "Deselect upon layer change" msgstr "Зняти позначення після зміни шару" -#: ../src/ui/dialog/inkscape-preferences.cpp:1191 +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" @@ -19599,25 +19764,25 @@ msgstr "" "Вимкніть це параметр, якщо бажаєте зберегти позначення після зміни поточного " "шару" -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1204 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Ctrl+A, Tab, Shift+Tab" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1206 msgid "Make keyboard selection commands work on objects in all layers" msgstr "Позначати з клавіатури об'єкти в усіх шарах одночасно" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "Позначати з клавіатури об'єкти тільки у поточному шарі" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" msgstr "Позначати з клавіатури об'єкти в поточному шарі та усіх його підшарах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" @@ -19625,7 +19790,7 @@ msgstr "" "Вимкніть цей параметр, якщо бажаєте позначити приховані (невидимі) об'єкти " "(окремо або у прихованому шарі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1214 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" @@ -19633,72 +19798,72 @@ msgstr "" "Вимкніть це параметр, якщо бажаєте позначити заблоковані об'єкти (окремо або " "у заблокованому шарі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1216 msgid "Wrap when cycling objects in z-order" msgstr "Циклічний перехід між об'єктами у напрямку z" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "Alt+Scroll Wheel" msgstr "Alt+Коліщатко гортання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "Замкнути циклічний перехід між об'єктами у напрямку вісі z." -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 msgid "Selecting" msgstr "Позначення" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1214 -#: ../src/widgets/select-toolbar.cpp:572 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +#: ../src/widgets/select-toolbar.cpp:564 msgid "Scale stroke width" msgstr "Змінювати ширину штриха" -#: ../src/ui/dialog/inkscape-preferences.cpp:1215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Scale rounded corners in rectangles" msgstr "Змінювати радіус округлених кутів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "Transform gradients" msgstr "Перетворювати градієнти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1228 msgid "Transform patterns" msgstr "Перетворювати візерунки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1219 +#: ../src/ui/dialog/inkscape-preferences.cpp:1230 msgid "Preserved" msgstr "Без оптимізації" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 -#: ../src/widgets/select-toolbar.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/widgets/select-toolbar.cpp:565 msgid "When scaling objects, scale the stroke width by the same proportion" msgstr "" "При зміні розміру об'єктів змінювати ширину штриха у відповідній пропорції" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 -#: ../src/widgets/select-toolbar.cpp:584 +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/widgets/select-toolbar.cpp:576 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" "При зміні розміру прямокутників міняти радіус округлених кутів у тій самій " "пропорції" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 -#: ../src/widgets/select-toolbar.cpp:595 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/widgets/select-toolbar.cpp:587 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "Перетворювати градієнти (у заповненні чи штрихах) разом з об'єктом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 -#: ../src/widgets/select-toolbar.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/widgets/select-toolbar.cpp:598 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "Перетворювати візерунки (у заповненнях чи штрихах) разом з об'єктом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "Store transformation" msgstr "Збереження трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +#: ../src/ui/dialog/inkscape-preferences.cpp:1242 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" @@ -19706,19 +19871,19 @@ msgstr "" "При можливості застосовувати до об'єктів трансформацію без додавання " "атрибута transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "Always store transformation as a transform= attribute on objects" msgstr "Завжди зберігати трансформацію у вигляді атрибута transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/ui/dialog/inkscape-preferences.cpp:1246 msgid "Transforms" msgstr "Трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:1239 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 msgid "Mouse _wheel scrolls by:" msgstr "Ко_лесо миші гортає на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" @@ -19726,24 +19891,24 @@ msgstr "" "На цю відстань у точках зсувається зображення одним клацанням колеса миші (з " "натиснутою клавішею Shift — по горизонталі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1241 +#: ../src/ui/dialog/inkscape-preferences.cpp:1252 msgid "Ctrl+arrows" msgstr "Ctrl+стрілки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Sc_roll by:" msgstr "К_рок гортання:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1244 +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" "На цю відстань у точках зсувається зображення при натисканні Ctrl+стрілки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1246 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "_Acceleration:" msgstr "_Прискорення:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1247 +#: ../src/ui/dialog/inkscape-preferences.cpp:1258 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" @@ -19751,15 +19916,15 @@ msgstr "" "Якщо утримувати натиснутими Ctrl+стрілку, швидкість гортання буде зростати " "(0 скасовує прискорення)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1248 +#: ../src/ui/dialog/inkscape-preferences.cpp:1259 msgid "Autoscrolling" msgstr "Автогортання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1261 msgid "_Speed:" msgstr "_Швидкість:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1262 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" @@ -19767,12 +19932,12 @@ msgstr "" "Як швидко буде відбуватись гортання при перетягуванні об'єкта за межі вікна " "(0 скасовує автогортання)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1264 #: ../src/ui/dialog/tracedialog.cpp:522 ../src/ui/dialog/tracedialog.cpp:721 msgid "_Threshold:" msgstr "_Поріг:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "" "How far (in screen pixels) you need to be from the canvas edge to trigger " "autoscroll; positive is outside the canvas, negative is within the canvas" @@ -19780,21 +19945,21 @@ msgstr "" "Як далеко (у точках) від краю вікна потрібно бути, щоб увімкнулась " "автогортання; додатні значення — за межами вікна, від'ємні — всередині вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Mouse move pans when Space is pressed" msgstr "Ліва кнопка миші переміщує область видимості, коли натиснуто пробіл" -#: ../src/ui/dialog/inkscape-preferences.cpp:1257 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "When on, pressing and holding Space and dragging pans canvas" msgstr "" "Якщо позначено, затискання клавіші Пробіл із перетягуванням надає змогу " "пересувати полотно" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1269 msgid "Mouse wheel zooms by default" msgstr "Колесо миші типово змінює масштаб" -#: ../src/ui/dialog/inkscape-preferences.cpp:1260 +#: ../src/ui/dialog/inkscape-preferences.cpp:1271 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" @@ -19803,28 +19968,28 @@ msgstr "" "гортання з Ctrl; якщо зняти позначку, воно змінюватиме масштаб з Ctrl і " "гортатиме без Ctrl." -#: ../src/ui/dialog/inkscape-preferences.cpp:1261 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Scrolling" msgstr "Гортання" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1275 msgid "Snap indicator" msgstr "Індикатор прилипання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1277 msgid "Enable snap indicator" msgstr "Увімкнути індикатор прилипання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1279 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "Після прилипання у точні прилипання буде намальовано цей символ" -#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +#: ../src/ui/dialog/inkscape-preferences.cpp:1284 msgid "Snap indicator persistence (in seconds):" msgstr "Тривалість показу індикатора прилипання (у с):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 +#: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "" "Controls how long the snap indicator message will be shown, before it " "disappears" @@ -19832,24 +19997,24 @@ msgstr "" "Керує тим, наскільки довго буде показано повідомлення індикатора прилипання " "до його зникнення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 +#: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "What should snap" msgstr "Місце прилипання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Only snap the node closest to the pointer" msgstr "Прилипання лише до вузла, найближчого до вказівника" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "Виконувати прилипання лише до вузла, найближчого до вказівника миші" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "_Weight factor:" msgstr "_Ваговий коефіцієнт:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1284 +#: ../src/ui/dialog/inkscape-preferences.cpp:1295 msgid "" "When multiple snap solutions are found, then Inkscape can either prefer the " "closest transformation (when set to 0), or prefer the node that was " @@ -19859,11 +20024,11 @@ msgstr "" "найближче перетворення (якщо встановлено 0), або вибрати вузол, який " "спочатку був найближчим до вказівника миші (якщо встановлено 1)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +#: ../src/ui/dialog/inkscape-preferences.cpp:1297 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "Прилипання до вказівника миші під час перетягування обмеженого вузла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1299 msgid "" "When dragging a knot along a constraint line, then snap the position of the " "mouse pointer instead of snapping the projection of the knot onto the " @@ -19872,15 +20037,15 @@ msgstr "" "Під час перетягування вузла вздовж лінії обмеження виконувати прилипання до " "позиції вказівника миші, а не до проекції вузла на лінію обмеження" -#: ../src/ui/dialog/inkscape-preferences.cpp:1290 +#: ../src/ui/dialog/inkscape-preferences.cpp:1301 msgid "Delayed snap" msgstr "Затримане прилипання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1293 +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 msgid "Delay (in seconds):" msgstr "Затримка у секундах:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1305 msgid "" "Postpone snapping as long as the mouse is moving, and then wait an " "additional fraction of a second. This additional delay is specified here. " @@ -19891,16 +20056,16 @@ msgstr "" "встановити нульове або близьке до нульового значення, прилипання буде " "миттєвим." -#: ../src/ui/dialog/inkscape-preferences.cpp:1296 +#: ../src/ui/dialog/inkscape-preferences.cpp:1307 msgid "Snapping" msgstr "Прилипання" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1301 +#: ../src/ui/dialog/inkscape-preferences.cpp:1312 msgid "_Arrow keys move by:" msgstr "С_трілки переміщують на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1302 +#: ../src/ui/dialog/inkscape-preferences.cpp:1313 msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" msgstr "" @@ -19908,28 +20073,28 @@ msgstr "" "клавіші зі стрілкою" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1305 +#: ../src/ui/dialog/inkscape-preferences.cpp:1316 msgid "> and < _scale by:" msgstr "Кр_ок зміни масштабу при > та <:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1306 +#: ../src/ui/dialog/inkscape-preferences.cpp:1317 msgid "Pressing > or < scales selection up or down by this increment" msgstr "" "На цю величину змінюється розмір позначеного при натисканні клавіш > чи <" -#: ../src/ui/dialog/inkscape-preferences.cpp:1308 +#: ../src/ui/dialog/inkscape-preferences.cpp:1319 msgid "_Inset/Outset by:" msgstr "В_тягнути/розтягнути на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1309 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 msgid "Inset and Outset commands displace the path by this distance" msgstr "На цю відстань переміщують контур команди втягування та розтягування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1321 msgid "Compass-like display of angles" msgstr "Подібне до компасу відображення кутів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1312 +#: ../src/ui/dialog/inkscape-preferences.cpp:1323 msgid "" "When on, angles are displayed with 0 at north, 0 to 360 range, positive " "clockwise; otherwise with 0 at east, -180 to 180 range, positive " @@ -19940,20 +20105,20 @@ msgstr "" "випадку 0 вказує на схід, діапазон значень знаходиться між -180 та 180, " "приріст кута відбувається проти годинникової стрілки." -#: ../src/ui/dialog/inkscape-preferences.cpp:1314 +#: ../src/ui/dialog/inkscape-preferences.cpp:1325 msgctxt "Rotation angle" msgid "None" msgstr "Нульовий" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "_Rotation snaps every:" msgstr "О_бмеження обертання:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "degrees" msgstr "градусів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1319 +#: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" @@ -19961,11 +20126,11 @@ msgstr "" "Обертання з натиснутою Ctrl обмежує кут значеннями, кратними вибраному; " "натискання «[» чи «]» повертає на вибраний кут" -#: ../src/ui/dialog/inkscape-preferences.cpp:1320 +#: ../src/ui/dialog/inkscape-preferences.cpp:1331 msgid "Relative snapping of guideline angles" msgstr "Відносне прилипання кутів нахилу напрямних" -#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#: ../src/ui/dialog/inkscape-preferences.cpp:1333 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" @@ -19973,17 +20138,17 @@ msgstr "" "Якщо позначено, кути прилипання під час обертання напрямної будуть " "обчислюватися відносно початкового кута" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 msgid "_Zoom in/out by:" msgstr "Крок _масштабування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1324 -#: ../src/ui/dialog/objects.cpp:1626 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/objects.cpp:1630 #: ../src/ui/widget/filter-effect-chooser.cpp:27 msgid "%" msgstr "%" -#: ../src/ui/dialog/inkscape-preferences.cpp:1325 +#: ../src/ui/dialog/inkscape-preferences.cpp:1336 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" @@ -19991,44 +20156,44 @@ msgstr "" "Крок при клацанні інструментом масштабу, натисканні клавіш +/- та клацанні " "середньою кнопкою миші" -#: ../src/ui/dialog/inkscape-preferences.cpp:1326 +#: ../src/ui/dialog/inkscape-preferences.cpp:1337 msgid "Steps" msgstr "Кроки" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +#: ../src/ui/dialog/inkscape-preferences.cpp:1340 msgid "Move in parallel" msgstr "Переміщуються паралельно" -#: ../src/ui/dialog/inkscape-preferences.cpp:1331 +#: ../src/ui/dialog/inkscape-preferences.cpp:1342 msgid "Stay unmoved" msgstr "Залишаються нерухомими" -#: ../src/ui/dialog/inkscape-preferences.cpp:1333 +#: ../src/ui/dialog/inkscape-preferences.cpp:1344 msgid "Move according to transform" msgstr "Рухаються у відповідності до перетворення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1346 msgid "Are unlinked" msgstr "Від'єднуються" -#: ../src/ui/dialog/inkscape-preferences.cpp:1337 +#: ../src/ui/dialog/inkscape-preferences.cpp:1348 msgid "Are deleted" msgstr "Вилучаються" -#: ../src/ui/dialog/inkscape-preferences.cpp:1340 +#: ../src/ui/dialog/inkscape-preferences.cpp:1351 msgid "Moving original: clones and linked offsets" msgstr "Пересування оригіналу: клони та прив'язані розтяжки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1342 +#: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Clones are translated by the same vector as their original" msgstr "Кожен клон зсувається на той самий вектор, що й оригінал" -#: ../src/ui/dialog/inkscape-preferences.cpp:1344 +#: ../src/ui/dialog/inkscape-preferences.cpp:1355 msgid "Clones preserve their positions when their original is moved" msgstr "Клони залишаються на місці, коли рухаються їхні оригінали" -#: ../src/ui/dialog/inkscape-preferences.cpp:1346 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 msgid "" "Each clone moves according to the value of its transform= attribute; for " "example, a rotated clone will move in a different direction than its original" @@ -20037,27 +20202,27 @@ msgstr "" "Наприклад, повернутий клон буде переміщуватись у іншому напрямку, ніж його " "оригінал." -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 +#: ../src/ui/dialog/inkscape-preferences.cpp:1358 msgid "Deleting original: clones" msgstr "Вилучення оригіналу: клони" -#: ../src/ui/dialog/inkscape-preferences.cpp:1349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1360 msgid "Orphaned clones are converted to regular objects" msgstr "Осиротілі клони перетворюються у звичайні об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1351 +#: ../src/ui/dialog/inkscape-preferences.cpp:1362 msgid "Orphaned clones are deleted along with their original" msgstr "Осиротілі клони вилучаються разом з оригіналом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1364 msgid "Duplicating original+clones/linked offset" msgstr "Дублювання оригінал+клони/прив'язані розтяжки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1355 +#: ../src/ui/dialog/inkscape-preferences.cpp:1366 msgid "Relink duplicated clones" msgstr "Повторно пов'язувати дубльовані клони" -#: ../src/ui/dialog/inkscape-preferences.cpp:1357 +#: ../src/ui/dialog/inkscape-preferences.cpp:1368 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -20068,28 +20233,28 @@ msgstr "" "старим оригіналом" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1360 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "Clones" msgstr "Клони" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1363 +#: ../src/ui/dialog/inkscape-preferences.cpp:1374 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" "При застосуванні найвищий позначений об'єкт є контуром вирізання або маскою" -#: ../src/ui/dialog/inkscape-preferences.cpp:1365 +#: ../src/ui/dialog/inkscape-preferences.cpp:1376 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" "Зніміть позначку щоб використовувати нижній позначений об'єкт як контур " "вирізання або маску" -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1377 msgid "Remove clippath/mask object after applying" msgstr "Вилучати контур вирізання або маску після застосування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1368 +#: ../src/ui/dialog/inkscape-preferences.cpp:1379 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" @@ -20097,57 +20262,57 @@ msgstr "" "Після застосування вилучається об'єкт, що використовувався як контур " "вирізання чи маска з малюнку" -#: ../src/ui/dialog/inkscape-preferences.cpp:1370 +#: ../src/ui/dialog/inkscape-preferences.cpp:1381 msgid "Before applying" msgstr "До застосування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1372 +#: ../src/ui/dialog/inkscape-preferences.cpp:1383 msgid "Do not group clipped/masked objects" msgstr "Не групувати обрізані/замасковані об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Put every clipped/masked object in its own group" msgstr "Додавати для кожного обрізаного/замаскованого об'єкта власну групу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 msgid "Put all clipped/masked objects into one group" msgstr "Зібрати всі обрізані/замасковані об'єкти у одну групу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1377 +#: ../src/ui/dialog/inkscape-preferences.cpp:1388 msgid "Apply clippath/mask to every object" msgstr "Застосувати контур обрізання/маскування до всіх об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1391 msgid "Apply clippath/mask to groups containing single object" msgstr "" "Застосувати контур обрізання/маскування до груп, що містять окремі об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 +#: ../src/ui/dialog/inkscape-preferences.cpp:1394 msgid "Apply clippath/mask to group containing all objects" msgstr "Застосувати контур обрізання/маскування до групи всіх об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "After releasing" msgstr "Після відпускання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Ungroup automatically created groups" msgstr "Розгрупувати автоматично створені групи" -#: ../src/ui/dialog/inkscape-preferences.cpp:1389 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Ungroup groups created when setting clip/mask" msgstr "Розгрупувати групи, створені застосування обрізання/маскування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1391 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Clippaths and masks" msgstr "Вирізання та маскування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 +#: ../src/ui/dialog/inkscape-preferences.cpp:1405 msgid "Stroke Style Markers" msgstr "Маркери стилю штриха" -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +#: ../src/ui/dialog/inkscape-preferences.cpp:1407 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" @@ -20155,50 +20320,50 @@ msgstr "" "Колір штриха збігається з кольором об’єкта, колір заповнення є або кольором " "об’єкта або кольором заповнення маркера" -#: ../src/ui/dialog/inkscape-preferences.cpp:1402 +#: ../src/ui/dialog/inkscape-preferences.cpp:1413 #: ../share/extensions/hershey.inx.h:27 msgid "Markers" msgstr "Маркери" -#: ../src/ui/dialog/inkscape-preferences.cpp:1405 +#: ../src/ui/dialog/inkscape-preferences.cpp:1416 msgid "Document cleanup" msgstr "Очищення документа" -#: ../src/ui/dialog/inkscape-preferences.cpp:1406 -#: ../src/ui/dialog/inkscape-preferences.cpp:1408 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +#: ../src/ui/dialog/inkscape-preferences.cpp:1419 msgid "Remove unused swatches when doing a document cleanup" msgstr "Вилучати невикористані елементи під час очищення документа" #. tooltip -#: ../src/ui/dialog/inkscape-preferences.cpp:1409 +#: ../src/ui/dialog/inkscape-preferences.cpp:1420 msgid "Cleanup" msgstr "Очищення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 msgid "Number of _Threads:" msgstr "Кількість _потоків:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1417 -#: ../src/ui/dialog/inkscape-preferences.cpp:1953 +#: ../src/ui/dialog/inkscape-preferences.cpp:1428 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "(requires restart)" msgstr "(потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1418 +#: ../src/ui/dialog/inkscape-preferences.cpp:1429 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" "Налаштувати кількість процесорів/потоків, які слід використовувати для " "обробки фільтрування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "Rendering _cache size:" msgstr "Розмір _кешу обробки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "МіБ" -#: ../src/ui/dialog/inkscape-preferences.cpp:1422 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 msgid "" "Set the amount of memory per document which can be used to store rendered " "parts of the drawing for later reuse; set to zero to disable caching" @@ -20209,37 +20374,37 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1425 -#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1460 msgid "Best quality (slowest)" msgstr "Найвища якість (найповільніше)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1427 -#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1438 +#: ../src/ui/dialog/inkscape-preferences.cpp:1462 msgid "Better quality (slower)" msgstr "Добра якість (повільно)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 -#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1440 +#: ../src/ui/dialog/inkscape-preferences.cpp:1464 msgid "Average quality" msgstr "Посередня якість" -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 -#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1442 +#: ../src/ui/dialog/inkscape-preferences.cpp:1466 msgid "Lower quality (faster)" msgstr "Низька якість (швидко)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1433 -#: ../src/ui/dialog/inkscape-preferences.cpp:1457 +#: ../src/ui/dialog/inkscape-preferences.cpp:1444 +#: ../src/ui/dialog/inkscape-preferences.cpp:1468 msgid "Lowest quality (fastest)" msgstr "Найнижча якість (найшвидше)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1436 +#: ../src/ui/dialog/inkscape-preferences.cpp:1447 msgid "Gaussian blur quality for display" msgstr "Якість гаусового розмивання для показу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1438 -#: ../src/ui/dialog/inkscape-preferences.cpp:1462 +#: ../src/ui/dialog/inkscape-preferences.cpp:1449 +#: ../src/ui/dialog/inkscape-preferences.cpp:1473 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" @@ -20247,125 +20412,125 @@ msgstr "" "Найкраща якість, але відображення може бути дуже повільним за великого " "збільшення (експорт растрових зображень завжди використовує найвищу якість)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1440 -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#: ../src/ui/dialog/inkscape-preferences.cpp:1451 +#: ../src/ui/dialog/inkscape-preferences.cpp:1475 msgid "Better quality, but slower display" msgstr "Краща якість, але повільніше відображення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1442 -#: ../src/ui/dialog/inkscape-preferences.cpp:1466 +#: ../src/ui/dialog/inkscape-preferences.cpp:1453 +#: ../src/ui/dialog/inkscape-preferences.cpp:1477 msgid "Average quality, acceptable display speed" msgstr "Посередня якість, прийнятна швидкість відображення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1444 -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#: ../src/ui/dialog/inkscape-preferences.cpp:1455 +#: ../src/ui/dialog/inkscape-preferences.cpp:1479 msgid "Lower quality (some artifacts), but display is faster" msgstr "Нижча якість (певні похибки), але відображення швидше" -#: ../src/ui/dialog/inkscape-preferences.cpp:1446 -#: ../src/ui/dialog/inkscape-preferences.cpp:1470 +#: ../src/ui/dialog/inkscape-preferences.cpp:1457 +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "Найнижча якість (значні похибки), але відображення найшвидше" -#: ../src/ui/dialog/inkscape-preferences.cpp:1460 +#: ../src/ui/dialog/inkscape-preferences.cpp:1471 msgid "Filter effects quality for display" msgstr "Якість ефектів фільтрування для показу" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1472 +#: ../src/ui/dialog/inkscape-preferences.cpp:1483 #: ../src/ui/dialog/print.cpp:215 msgid "Rendering" msgstr "Обробка" #. Note: /options/bitmapoversample removed with Cairo renderer -#: ../src/ui/dialog/inkscape-preferences.cpp:1478 ../src/verbs.cpp:156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1489 ../src/verbs.cpp:156 #: ../src/widgets/calligraphy-toolbar.cpp:626 msgid "Edit" msgstr "Змінити" -#: ../src/ui/dialog/inkscape-preferences.cpp:1479 +#: ../src/ui/dialog/inkscape-preferences.cpp:1490 msgid "Automatically reload bitmaps" msgstr "Автоматично перезавантажувати растр" -#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +#: ../src/ui/dialog/inkscape-preferences.cpp:1492 msgid "Automatically reload linked images when file is changed on disk" msgstr "" "Автоматично перезавантажувати пов'язані зображення після зміни файла на диску" -#: ../src/ui/dialog/inkscape-preferences.cpp:1483 +#: ../src/ui/dialog/inkscape-preferences.cpp:1494 msgid "_Bitmap editor:" msgstr "_Растровий редактор:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1485 +#: ../src/ui/dialog/inkscape-preferences.cpp:1496 #: ../share/extensions/guillotine.inx.h:5 ../share/extensions/plotter.inx.h:65 #: ../share/extensions/print_win32_vector.inx.h:2 msgid "Export" msgstr "Експорт" -#: ../src/ui/dialog/inkscape-preferences.cpp:1487 +#: ../src/ui/dialog/inkscape-preferences.cpp:1498 msgid "Default export _resolution:" msgstr "Типова роз_дільна здатність для експорту:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1488 +#: ../src/ui/dialog/inkscape-preferences.cpp:1499 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "Типова роздільна здатність (у точках на дюйм) у вікні експорту" -#: ../src/ui/dialog/inkscape-preferences.cpp:1489 +#: ../src/ui/dialog/inkscape-preferences.cpp:1500 #: ../src/ui/dialog/xml-tree.cpp:920 msgid "Create" msgstr "Створити" -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 +#: ../src/ui/dialog/inkscape-preferences.cpp:1502 msgid "Resolution for Create Bitmap _Copy:" msgstr "Роздільна здатність для створення растрової копі_ї:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1492 +#: ../src/ui/dialog/inkscape-preferences.cpp:1503 msgid "Resolution used by the Create Bitmap Copy command" msgstr "" "Роздільна здатність, яку буде використано у команді створення растрової копії" -#: ../src/ui/dialog/inkscape-preferences.cpp:1495 +#: ../src/ui/dialog/inkscape-preferences.cpp:1506 msgid "Ask about linking and scaling when importing" msgstr "Запитувати щодо пов’язування і масштабування під час імпортування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1497 +#: ../src/ui/dialog/inkscape-preferences.cpp:1508 msgid "Pop-up linking and scaling dialog when importing bitmap image." msgstr "" "Показувати діалогове вікно пов’язування і масштабування під час імпортування " "растрових зображень." -#: ../src/ui/dialog/inkscape-preferences.cpp:1503 +#: ../src/ui/dialog/inkscape-preferences.cpp:1514 msgid "Bitmap link:" msgstr "Пов’язування растра:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1510 +#: ../src/ui/dialog/inkscape-preferences.cpp:1521 msgid "Bitmap scale (image-rendering):" msgstr "Масштаб растра (обробка зображення):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1515 +#: ../src/ui/dialog/inkscape-preferences.cpp:1526 msgid "Default _import resolution:" msgstr "Типова роздільна здатність для _імпортування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1516 +#: ../src/ui/dialog/inkscape-preferences.cpp:1527 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" "Типова роздільна здатність (у точках на дюйм) для імпортованих растрових " "зображень" -#: ../src/ui/dialog/inkscape-preferences.cpp:1517 +#: ../src/ui/dialog/inkscape-preferences.cpp:1528 msgid "Override file resolution" msgstr "Перевизначити роздільну здатність з файла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1519 +#: ../src/ui/dialog/inkscape-preferences.cpp:1530 msgid "Use default bitmap resolution in favor of information from file" msgstr "Надавати перевагу типові роздільній здатності перед даними з файла" #. rendering outlines for pixmap image tags -#: ../src/ui/dialog/inkscape-preferences.cpp:1523 +#: ../src/ui/dialog/inkscape-preferences.cpp:1534 msgid "Images in Outline Mode" msgstr "Зображення у режимі ескіза" -#: ../src/ui/dialog/inkscape-preferences.cpp:1524 +#: ../src/ui/dialog/inkscape-preferences.cpp:1535 msgid "" "When active will render images while in outline mode instead of a red box " "with an x. This is useful for manual tracing." @@ -20373,11 +20538,11 @@ msgstr "" "Якщо позначено, у режимі ескіза замість червоного прямокутника з x " "показувати зображення. Корисно для трасування вручну." -#: ../src/ui/dialog/inkscape-preferences.cpp:1526 +#: ../src/ui/dialog/inkscape-preferences.cpp:1537 msgid "Bitmaps" msgstr "Растрові зображення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1538 +#: ../src/ui/dialog/inkscape-preferences.cpp:1549 msgid "" "Select a file of predefined shortcuts to use. Any customized shortcuts you " "create will be added separately to " @@ -20385,25 +20550,25 @@ msgstr "" "Виберіть файл попередньо визначених скорочень, яким слід скористатися. Всі " "створені вами нетипові скорочення буде окремо додано до " -#: ../src/ui/dialog/inkscape-preferences.cpp:1541 +#: ../src/ui/dialog/inkscape-preferences.cpp:1552 msgid "Shortcut file:" msgstr "Файл скорочень:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1544 -#: ../src/ui/dialog/template-load-tab.cpp:48 +#: ../src/ui/dialog/inkscape-preferences.cpp:1555 +#: ../src/ui/dialog/template-load-tab.cpp:49 msgid "Search:" msgstr "Шукати:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1556 +#: ../src/ui/dialog/inkscape-preferences.cpp:1567 msgid "Shortcut" msgstr "Скорочення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1557 +#: ../src/ui/dialog/inkscape-preferences.cpp:1568 #: ../src/ui/widget/page-sizer.cpp:287 msgid "Description" msgstr "Опис" -#: ../src/ui/dialog/inkscape-preferences.cpp:1612 +#: ../src/ui/dialog/inkscape-preferences.cpp:1623 msgid "" "Remove all your customized keyboard shortcuts, and revert to the shortcuts " "in the shortcut file listed above" @@ -20411,45 +20576,45 @@ msgstr "" "Вилучити всі нетипові клавіатурні скорочення і повернутися до скорочень, " "визначених у файлів, вказаному вище." -#: ../src/ui/dialog/inkscape-preferences.cpp:1616 +#: ../src/ui/dialog/inkscape-preferences.cpp:1627 msgid "Import ..." msgstr "Імпорт…" -#: ../src/ui/dialog/inkscape-preferences.cpp:1616 +#: ../src/ui/dialog/inkscape-preferences.cpp:1627 msgid "Import custom keyboard shortcuts from a file" msgstr "Імпортувати нетипові клавіатурні скорочення з файла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1619 +#: ../src/ui/dialog/inkscape-preferences.cpp:1630 msgid "Export ..." msgstr "Експортувати…" -#: ../src/ui/dialog/inkscape-preferences.cpp:1619 +#: ../src/ui/dialog/inkscape-preferences.cpp:1630 msgid "Export custom keyboard shortcuts to a file" msgstr "Експортувати нетипові клавіатурні скорочення до файла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1629 +#: ../src/ui/dialog/inkscape-preferences.cpp:1640 msgid "Keyboard Shortcuts" msgstr "Клавіатурні скорочення" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1792 +#: ../src/ui/dialog/inkscape-preferences.cpp:1803 msgid "Misc" msgstr "Інше" -#: ../src/ui/dialog/inkscape-preferences.cpp:1894 +#: ../src/ui/dialog/inkscape-preferences.cpp:1905 msgctxt "Spellchecker language" msgid "None" msgstr "Жодної" -#: ../src/ui/dialog/inkscape-preferences.cpp:1915 +#: ../src/ui/dialog/inkscape-preferences.cpp:1926 msgid "Set the main spell check language" msgstr "Встановити основну мову перевірки правопису" -#: ../src/ui/dialog/inkscape-preferences.cpp:1918 +#: ../src/ui/dialog/inkscape-preferences.cpp:1929 msgid "Second language:" msgstr "Друга мова:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1919 +#: ../src/ui/dialog/inkscape-preferences.cpp:1930 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" @@ -20457,11 +20622,11 @@ msgstr "" "Встановіть другу мову для перевірки правопису: перевірка зупинятиметься лише " "на словах, яких немає у ВСІХ вказаних мовах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1922 +#: ../src/ui/dialog/inkscape-preferences.cpp:1933 msgid "Third language:" msgstr "Третя мова:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1923 +#: ../src/ui/dialog/inkscape-preferences.cpp:1934 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" @@ -20469,31 +20634,31 @@ msgstr "" "Встановіть третю мову для перевірки правопису: перевірка зупинятиметься лише " "на словах, яких немає у ВСІХ вказаних мовах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1925 +#: ../src/ui/dialog/inkscape-preferences.cpp:1936 msgid "Ignore words with digits" msgstr "Ігнорувати слова з цифрами" -#: ../src/ui/dialog/inkscape-preferences.cpp:1927 +#: ../src/ui/dialog/inkscape-preferences.cpp:1938 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "Ігнорувати слова, що містять цифри, наприклад, «R2D2»" -#: ../src/ui/dialog/inkscape-preferences.cpp:1929 +#: ../src/ui/dialog/inkscape-preferences.cpp:1940 msgid "Ignore words in ALL CAPITALS" msgstr "Ігнорувати слова ПРОПИСНИМИ" -#: ../src/ui/dialog/inkscape-preferences.cpp:1931 +#: ../src/ui/dialog/inkscape-preferences.cpp:1942 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "Ігнорувати слова, написані прописними літерами, наприклад, «IUPAC»" -#: ../src/ui/dialog/inkscape-preferences.cpp:1933 +#: ../src/ui/dialog/inkscape-preferences.cpp:1944 msgid "Spellcheck" msgstr "Перевірка правопису" -#: ../src/ui/dialog/inkscape-preferences.cpp:1953 +#: ../src/ui/dialog/inkscape-preferences.cpp:1964 msgid "Latency _skew:" msgstr "Від_хилення латентності:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1954 +#: ../src/ui/dialog/inkscape-preferences.cpp:1965 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" @@ -20501,11 +20666,11 @@ msgstr "" "Коефіцієнт, на який годинник подій відхилятиметься від справжнього часу " "(0,9766 на деяких системах)." -#: ../src/ui/dialog/inkscape-preferences.cpp:1956 +#: ../src/ui/dialog/inkscape-preferences.cpp:1967 msgid "Pre-render named icons" msgstr "Іменовані піктограми, що залежать від показу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1958 +#: ../src/ui/dialog/inkscape-preferences.cpp:1969 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" @@ -20514,85 +20679,85 @@ msgstr "" "користувача. Це зроблено для обходу вад у сповіщенні іменованою піктограмою " "у GTK+" -#: ../src/ui/dialog/inkscape-preferences.cpp:1966 +#: ../src/ui/dialog/inkscape-preferences.cpp:1977 msgid "System info" msgstr "Відомості щодо системи" -#: ../src/ui/dialog/inkscape-preferences.cpp:1970 +#: ../src/ui/dialog/inkscape-preferences.cpp:1981 msgid "User config: " msgstr "Налаштування користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1970 +#: ../src/ui/dialog/inkscape-preferences.cpp:1981 msgid "Location of users configuration" msgstr "Розташування налаштувань користувача" -#: ../src/ui/dialog/inkscape-preferences.cpp:1974 +#: ../src/ui/dialog/inkscape-preferences.cpp:1985 msgid "User preferences: " msgstr "Параметри користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1974 +#: ../src/ui/dialog/inkscape-preferences.cpp:1985 msgid "Location of the users preferences file" msgstr "Розташування файлів з параметрами користувачів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1978 +#: ../src/ui/dialog/inkscape-preferences.cpp:1989 msgid "User extensions: " msgstr "Додатки користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1978 +#: ../src/ui/dialog/inkscape-preferences.cpp:1989 msgid "Location of the users extensions" msgstr "Розташування додатків користувача" -#: ../src/ui/dialog/inkscape-preferences.cpp:1982 +#: ../src/ui/dialog/inkscape-preferences.cpp:1993 msgid "User cache: " msgstr "Кеш користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1982 +#: ../src/ui/dialog/inkscape-preferences.cpp:1993 msgid "Location of users cache" msgstr "Розташування кешу даних користувача" -#: ../src/ui/dialog/inkscape-preferences.cpp:1990 +#: ../src/ui/dialog/inkscape-preferences.cpp:2001 msgid "Temporary files: " msgstr "Тимчасові файли: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1990 +#: ../src/ui/dialog/inkscape-preferences.cpp:2001 msgid "Location of the temporary files used for autosave" msgstr "" "Розташування тимчасових файлів, які використовуватимуться для створення " "автоматичних копій" -#: ../src/ui/dialog/inkscape-preferences.cpp:1994 +#: ../src/ui/dialog/inkscape-preferences.cpp:2005 msgid "Inkscape data: " msgstr "Дані Inkscape: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1994 +#: ../src/ui/dialog/inkscape-preferences.cpp:2005 msgid "Location of Inkscape data" msgstr "Розташування даних Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1998 +#: ../src/ui/dialog/inkscape-preferences.cpp:2009 msgid "Inkscape extensions: " msgstr "Додатки Inkscape: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1998 +#: ../src/ui/dialog/inkscape-preferences.cpp:2009 msgid "Location of the Inkscape extensions" msgstr "Розташування додатків Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:2007 +#: ../src/ui/dialog/inkscape-preferences.cpp:2018 msgid "System data: " msgstr "Системна дата: " -#: ../src/ui/dialog/inkscape-preferences.cpp:2007 +#: ../src/ui/dialog/inkscape-preferences.cpp:2018 msgid "Locations of system data" msgstr "Розташування загальносистемних даних" -#: ../src/ui/dialog/inkscape-preferences.cpp:2031 +#: ../src/ui/dialog/inkscape-preferences.cpp:2042 msgid "Icon theme: " msgstr "Тема піктограм: " -#: ../src/ui/dialog/inkscape-preferences.cpp:2031 +#: ../src/ui/dialog/inkscape-preferences.cpp:2042 msgid "Locations of icon themes" msgstr "Розташування тем піктограм" -#: ../src/ui/dialog/inkscape-preferences.cpp:2033 +#: ../src/ui/dialog/inkscape-preferences.cpp:2044 msgid "System" msgstr "Система" @@ -20679,8 +20844,8 @@ msgstr "" "або на окреме (зазвичай те, яке перебуває у фокусі) «Вікно»" #: ../src/ui/dialog/input.cpp:1616 ../src/widgets/calligraphy-toolbar.cpp:578 -#: ../src/widgets/spray-toolbar.cpp:301 ../src/widgets/spray-toolbar.cpp:417 -#: ../src/widgets/spray-toolbar.cpp:466 ../src/widgets/tweak-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:311 ../src/widgets/spray-toolbar.cpp:427 +#: ../src/widgets/spray-toolbar.cpp:476 ../src/widgets/tweak-toolbar.cpp:372 msgid "Pressure" msgstr "Тиск" @@ -20702,6 +20867,35 @@ msgctxt "Input device axe" msgid "None" msgstr "Немає" +#: ../src/ui/dialog/knot-properties.cpp:59 +msgid "Position X:" +msgstr "X координата:" + +#: ../src/ui/dialog/knot-properties.cpp:66 +msgid "Position Y:" +msgstr "Y координата:" + +#: ../src/ui/dialog/knot-properties.cpp:120 +msgid "Modify Knot Position" +msgstr "Змінити позицію вузла" + +#: ../src/ui/dialog/knot-properties.cpp:121 +#: ../src/ui/dialog/layer-properties.cpp:411 +#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 +#: ../src/ui/dialog/transformation.cpp:107 +msgid "_Move" +msgstr "_Переміщення" + +#: ../src/ui/dialog/knot-properties.cpp:180 +#, c-format +msgid "Position X (%s):" +msgstr "Розташування за X (%s):" + +#: ../src/ui/dialog/knot-properties.cpp:181 +#, c-format +msgid "Position Y (%s):" +msgstr "Розташування за Y (%s):" + #: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "Назва шару:" @@ -20729,7 +20923,7 @@ msgstr "Перейменування шару" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:354 #: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:194 -#: ../src/verbs.cpp:2366 +#: ../src/verbs.cpp:2363 msgid "Layer" msgstr "Шар" @@ -20762,35 +20956,29 @@ msgstr "Новий шар створено." msgid "Move to Layer" msgstr "Пересунути до шару" -#: ../src/ui/dialog/layer-properties.cpp:411 -#: ../src/ui/dialog/lpe-powerstroke-properties.cpp:123 -#: ../src/ui/dialog/transformation.cpp:107 -msgid "_Move" -msgstr "_Переміщення" - -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:610 msgid "Unhide layer" msgstr "Показати шар" -#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:613 +#: ../src/ui/dialog/layers.cpp:525 ../src/ui/widget/layer-selector.cpp:610 msgid "Hide layer" msgstr "Сховати шар" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:602 msgid "Lock layer" msgstr "Заблокувати шар" -#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:605 +#: ../src/ui/dialog/layers.cpp:536 ../src/ui/widget/layer-selector.cpp:602 msgid "Unlock layer" msgstr "Розблокувати шар" #: ../src/ui/dialog/layers.cpp:624 ../src/ui/dialog/objects.cpp:844 -#: ../src/verbs.cpp:1424 +#: ../src/verbs.cpp:1423 msgid "Toggle layer solo" msgstr "Увімкнути або вимкнути соло шару" #: ../src/ui/dialog/layers.cpp:627 ../src/ui/dialog/objects.cpp:847 -#: ../src/verbs.cpp:1448 +#: ../src/verbs.cpp:1447 msgid "Lock other layers" msgstr "Заблокувати інші шари" @@ -21095,8 +21283,8 @@ msgid "Check to make the object insensitive (not selectable by mouse)" msgstr "Зробити цей об'єкт нечутливим до позначення" #. Button for setting the object's id, label, title and description. -#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2714 -#: ../src/verbs.cpp:2720 +#: ../src/ui/dialog/object-properties.cpp:325 ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2719 msgid "_Set" msgstr "_Встановити" @@ -21182,8 +21370,8 @@ msgstr "Групу на шар" msgid "Moved objects" msgstr "Пересунуті об’єкти" -#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:857 -#: ../src/ui/dialog/tags.cpp:864 +#: ../src/ui/dialog/objects.cpp:1353 ../src/ui/dialog/tags.cpp:853 +#: ../src/ui/dialog/tags.cpp:860 msgid "Rename object" msgstr "Перейменувати об'єкт" @@ -21203,45 +21391,45 @@ msgstr "Встановити режим змішування об’єкта" msgid "Set object blur" msgstr "Встановити розмиття об’єкта" -#: ../src/ui/dialog/objects.cpp:1617 +#: ../src/ui/dialog/objects.cpp:1621 msgctxt "Visibility" msgid "V" msgstr "В" -#: ../src/ui/dialog/objects.cpp:1618 +#: ../src/ui/dialog/objects.cpp:1622 msgctxt "Lock" msgid "L" msgstr "Б" -#: ../src/ui/dialog/objects.cpp:1619 +#: ../src/ui/dialog/objects.cpp:1623 msgctxt "Type" msgid "T" msgstr "Т" -#: ../src/ui/dialog/objects.cpp:1620 +#: ../src/ui/dialog/objects.cpp:1624 msgctxt "Clip and mask" msgid "CM" msgstr "МО" -#: ../src/ui/dialog/objects.cpp:1621 +#: ../src/ui/dialog/objects.cpp:1625 msgctxt "Highlight" msgid "HL" msgstr "П" -#: ../src/ui/dialog/objects.cpp:1622 +#: ../src/ui/dialog/objects.cpp:1626 msgid "Label" msgstr "Мітка" #. In order to get tooltips on header, we must create our own label. -#: ../src/ui/dialog/objects.cpp:1664 +#: ../src/ui/dialog/objects.cpp:1668 msgid "Toggle visibility of Layer, Group, or Object." msgstr "Увімкнути або вимкнути видимість шару, групи або об’єкта." -#: ../src/ui/dialog/objects.cpp:1677 +#: ../src/ui/dialog/objects.cpp:1681 msgid "Toggle lock of Layer, Group, or Object." msgstr "Увімкнути або вимкнути блокування шару, групи або об’єкта." -#: ../src/ui/dialog/objects.cpp:1689 +#: ../src/ui/dialog/objects.cpp:1693 msgid "" "Type: Layer, Group, or Object. Clicking on Layer or Group icon, toggles " "between the two types." @@ -21249,11 +21437,11 @@ msgstr "" "Тип: шар, група чи об’єкт. Клацання на піктограмі шару або групи перемикає " "між цими двома типами." -#: ../src/ui/dialog/objects.cpp:1708 +#: ../src/ui/dialog/objects.cpp:1712 msgid "Is object clipped and/or masked?" msgstr "Чи є об’єкт обрізаним або замаскованим?" -#: ../src/ui/dialog/objects.cpp:1719 +#: ../src/ui/dialog/objects.cpp:1723 msgid "" "Highlight color of outline in Node tool. Click to set. If alpha is zero, use " "inherited color." @@ -21261,7 +21449,7 @@ msgstr "" "Колір підсвічування контурів інструмента «Вузол». Клацніть для встановлення. " "Якщо рівень прозорості є нульовим, використовується успадкований колір." -#: ../src/ui/dialog/objects.cpp:1730 +#: ../src/ui/dialog/objects.cpp:1734 msgid "" "Layer/Group/Object label (inkscape:label). Double-click to set. Default " "value is object 'id'." @@ -21269,83 +21457,83 @@ msgstr "" "Мітка шару, групи або об’єкта (inkscape:label). Двічі клацніть для " "встановлення. Типовою міткою є рядок «id» об’єкта." -#: ../src/ui/dialog/objects.cpp:1827 +#: ../src/ui/dialog/objects.cpp:1831 msgid "Add layer..." msgstr "Додати шар…" -#: ../src/ui/dialog/objects.cpp:1834 +#: ../src/ui/dialog/objects.cpp:1838 msgid "Remove object" msgstr "Вилучити об’єкт" -#: ../src/ui/dialog/objects.cpp:1842 +#: ../src/ui/dialog/objects.cpp:1846 msgid "Move To Bottom" msgstr "Пересунути вниз" -#: ../src/ui/dialog/objects.cpp:1866 +#: ../src/ui/dialog/objects.cpp:1870 msgid "Move To Top" msgstr "Пересунути нагору" -#: ../src/ui/dialog/objects.cpp:1874 +#: ../src/ui/dialog/objects.cpp:1878 msgid "Collapse All" msgstr "Згорнути все" -#: ../src/ui/dialog/objects.cpp:1888 +#: ../src/ui/dialog/objects.cpp:1892 msgid "Rename" msgstr "Перейменувати" -#: ../src/ui/dialog/objects.cpp:1894 +#: ../src/ui/dialog/objects.cpp:1898 msgid "Solo" msgstr "Соло" -#: ../src/ui/dialog/objects.cpp:1895 +#: ../src/ui/dialog/objects.cpp:1899 msgid "Show All" msgstr "Показати все" -#: ../src/ui/dialog/objects.cpp:1896 +#: ../src/ui/dialog/objects.cpp:1900 msgid "Hide All" msgstr "Сховати все" -#: ../src/ui/dialog/objects.cpp:1900 +#: ../src/ui/dialog/objects.cpp:1904 msgid "Lock Others" msgstr "Заблокувати інше" -#: ../src/ui/dialog/objects.cpp:1901 +#: ../src/ui/dialog/objects.cpp:1905 msgid "Lock All" msgstr "Заблокувати все" #. LockAndHide -#: ../src/ui/dialog/objects.cpp:1902 ../src/verbs.cpp:3014 +#: ../src/ui/dialog/objects.cpp:1906 ../src/verbs.cpp:3011 msgid "Unlock All" msgstr "Розблокувати все" -#: ../src/ui/dialog/objects.cpp:1906 +#: ../src/ui/dialog/objects.cpp:1910 msgid "Up" msgstr "Вище" -#: ../src/ui/dialog/objects.cpp:1907 +#: ../src/ui/dialog/objects.cpp:1911 msgid "Down" msgstr "Нижче" -#: ../src/ui/dialog/objects.cpp:1916 +#: ../src/ui/dialog/objects.cpp:1920 msgid "Set Clip" msgstr "Встановити обрізання" #. will never be implemented #. _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_OBJECT_SET_INVERSE_CLIPPATH, 0, "Set Inverse Clip", (int)BUTTON_SETINVCLIP ) ); -#: ../src/ui/dialog/objects.cpp:1922 +#: ../src/ui/dialog/objects.cpp:1926 msgid "Unset Clip" msgstr "Скасувати обрізання" #. Set mask -#: ../src/ui/dialog/objects.cpp:1926 ../src/ui/interface.cpp:1736 +#: ../src/ui/dialog/objects.cpp:1930 ../src/ui/interface.cpp:1754 msgid "Set Mask" msgstr "Встановити маскування" -#: ../src/ui/dialog/objects.cpp:1927 +#: ../src/ui/dialog/objects.cpp:1931 msgid "Unset Mask" msgstr "Скасувати маскування" -#: ../src/ui/dialog/objects.cpp:1949 +#: ../src/ui/dialog/objects.cpp:1953 msgid "Select Highlight Color" msgstr "Виберіть колір підсвічування" @@ -21882,7 +22070,7 @@ msgstr "Редагування…" msgid "Convert" msgstr "Перетворити" -#: ../src/ui/dialog/swatches.cpp:542 +#: ../src/ui/dialog/swatches.cpp:543 #, c-format msgid "Palettes directory (%s) is unavailable." msgstr "Каталог з палітрами (%s) недоступний." @@ -21929,28 +22117,28 @@ msgstr "Робити позначки більшими збільшенням м msgid "Unnamed Symbols" msgstr "Символи без назв" -#: ../src/ui/dialog/tags.cpp:274 ../src/ui/dialog/tags.cpp:573 -#: ../src/ui/dialog/tags.cpp:687 +#: ../src/ui/dialog/tags.cpp:270 ../src/ui/dialog/tags.cpp:569 +#: ../src/ui/dialog/tags.cpp:683 ../src/ui/dialog/tags.cpp:946 msgid "Remove from selection set" msgstr "Вилучити із набору позначеного" -#: ../src/ui/dialog/tags.cpp:431 +#: ../src/ui/dialog/tags.cpp:427 msgid "Items" msgstr "Елементи" -#: ../src/ui/dialog/tags.cpp:670 +#: ../src/ui/dialog/tags.cpp:666 ../src/ui/dialog/tags.cpp:944 msgid "Add selection to set" msgstr "Додати позначене до набору" -#: ../src/ui/dialog/tags.cpp:828 +#: ../src/ui/dialog/tags.cpp:824 msgid "Moved sets" msgstr "Пересунуті набори" -#: ../src/ui/dialog/tags.cpp:998 +#: ../src/ui/dialog/tags.cpp:1004 msgid "Add a new selection set" msgstr "Додати новий набір позначеного" -#: ../src/ui/dialog/tags.cpp:1007 +#: ../src/ui/dialog/tags.cpp:1013 msgid "Remove Item/Set" msgstr "Вилучити елемент або набір" @@ -21962,19 +22150,19 @@ msgstr "Додаткова інформація" msgid "no template selected" msgstr "не вибрано шаблону" -#: ../src/ui/dialog/template-widget.cpp:123 +#: ../src/ui/dialog/template-widget.cpp:131 msgid "Path: " msgstr "Шлях: " -#: ../src/ui/dialog/template-widget.cpp:126 +#: ../src/ui/dialog/template-widget.cpp:134 msgid "Description: " msgstr "Опис: " -#: ../src/ui/dialog/template-widget.cpp:128 +#: ../src/ui/dialog/template-widget.cpp:136 msgid "Keywords: " msgstr "Ключові слова: " -#: ../src/ui/dialog/template-widget.cpp:135 +#: ../src/ui/dialog/template-widget.cpp:143 msgid "By: " msgstr "Автор: " @@ -21991,27 +22179,27 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "АаБбВвЇїЄєҐґIiPpQq12369$€¢?.;/()" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1432 -#: ../src/widgets/text-toolbar.cpp:1433 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1680 +#: ../src/widgets/text-toolbar.cpp:1681 msgid "Align left" msgstr "Вирівнювання ліворуч" -#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1440 -#: ../src/widgets/text-toolbar.cpp:1441 +#: ../src/ui/dialog/text-edit.cpp:98 ../src/widgets/text-toolbar.cpp:1688 +#: ../src/widgets/text-toolbar.cpp:1689 msgid "Align center" msgstr "Посередині" -#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1448 -#: ../src/widgets/text-toolbar.cpp:1449 +#: ../src/ui/dialog/text-edit.cpp:99 ../src/widgets/text-toolbar.cpp:1696 +#: ../src/widgets/text-toolbar.cpp:1697 msgid "Align right" msgstr "Вирівнювання праворуч" -#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1457 +#: ../src/ui/dialog/text-edit.cpp:100 ../src/widgets/text-toolbar.cpp:1705 msgid "Justify (only flowed text)" msgstr "Вирівняти раз шириною (лише неконтурний текст)" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1492 +#: ../src/ui/dialog/text-edit.cpp:109 ../src/widgets/text-toolbar.cpp:1740 msgid "Horizontal text" msgstr "Горизонтальний текст" @@ -22020,8 +22208,8 @@ msgid "Vertical text" msgstr "Вертикальний текст" #: ../src/ui/dialog/text-edit.cpp:130 ../src/ui/dialog/text-edit.cpp:131 -msgid "Spacing between lines (percent of font size)" -msgstr "Інтервал між рядками (у відсотках щодо розміру шрифту)" +msgid "Spacing between baselines (percent of font size)" +msgstr "Інтервал між базовими лініями (у відсотках щодо розміру шрифту)" #: ../src/ui/dialog/text-edit.cpp:147 msgid "Text path offset" @@ -22576,68 +22764,68 @@ msgstr "Вилучити вузол" msgid "Change attribute" msgstr "Змінити атрибут" -#: ../src/ui/interface.cpp:751 +#: ../src/ui/interface.cpp:763 msgctxt "Interface setup" msgid "Default" msgstr "Типовий" -#: ../src/ui/interface.cpp:751 +#: ../src/ui/interface.cpp:763 msgid "Default interface setup" msgstr "Типові налаштування інтерфейсу" -#: ../src/ui/interface.cpp:752 +#: ../src/ui/interface.cpp:764 msgctxt "Interface setup" msgid "Custom" msgstr "Нетиповий" -#: ../src/ui/interface.cpp:752 +#: ../src/ui/interface.cpp:764 msgid "Setup for custom task" msgstr "Налаштування для виконання певного завдання" -#: ../src/ui/interface.cpp:753 +#: ../src/ui/interface.cpp:765 msgctxt "Interface setup" msgid "Wide" msgstr "Широкий" -#: ../src/ui/interface.cpp:753 +#: ../src/ui/interface.cpp:765 msgid "Setup for widescreen work" msgstr "Налаштування для широкоекранних моніторів" -#: ../src/ui/interface.cpp:863 +#: ../src/ui/interface.cpp:875 #, c-format msgid "Verb \"%s\" Unknown" msgstr "Невідоме дієслово «%s»" -#: ../src/ui/interface.cpp:898 +#: ../src/ui/interface.cpp:910 msgid "Open _Recent" msgstr "Відкрити не_давній" -#: ../src/ui/interface.cpp:1006 ../src/ui/interface.cpp:1092 -#: ../src/ui/interface.cpp:1195 ../src/ui/widget/selected-style.cpp:544 +#: ../src/ui/interface.cpp:1018 ../src/ui/interface.cpp:1104 +#: ../src/ui/interface.cpp:1207 ../src/ui/widget/selected-style.cpp:542 msgid "Drop color" msgstr "Скинути колір" -#: ../src/ui/interface.cpp:1045 ../src/ui/interface.cpp:1155 +#: ../src/ui/interface.cpp:1057 ../src/ui/interface.cpp:1167 msgid "Drop color on gradient" msgstr "Перенесення кольору на градієнт" -#: ../src/ui/interface.cpp:1208 +#: ../src/ui/interface.cpp:1220 msgid "Could not parse SVG data" msgstr "Не вдається прочитати SVG-дані" -#: ../src/ui/interface.cpp:1247 +#: ../src/ui/interface.cpp:1259 msgid "Drop SVG" msgstr "Скинути SVG" -#: ../src/ui/interface.cpp:1260 +#: ../src/ui/interface.cpp:1272 msgid "Drop Symbol" msgstr "Скинути символ" -#: ../src/ui/interface.cpp:1291 +#: ../src/ui/interface.cpp:1303 msgid "Drop bitmap image" msgstr "Скинути растрову картинку" -#: ../src/ui/interface.cpp:1383 +#: ../src/ui/interface.cpp:1395 #, c-format msgid "" "A file named \"%s\" already exists. Do " @@ -22650,166 +22838,171 @@ msgstr "" "\n" "Файл вже існує у «%s». Заміна призведе до перезапису його вмісту." -#: ../src/ui/interface.cpp:1390 ../share/extensions/web-set-att.inx.h:21 +#: ../src/ui/interface.cpp:1402 ../share/extensions/web-set-att.inx.h:21 #: ../share/extensions/web-transmit-att.inx.h:19 msgid "Replace" msgstr "Замінити" -#: ../src/ui/interface.cpp:1461 +#: ../src/ui/interface.cpp:1473 msgid "Go to parent" msgstr "На рівень вище" #. TRANSLATORS: #%1 is the id of the group e.g. , not a number. -#: ../src/ui/interface.cpp:1502 +#: ../src/ui/interface.cpp:1514 msgid "Enter group #%1" msgstr "Увійти до групи №%1" +#. Pop selection out of group +#: ../src/ui/interface.cpp:1528 +msgid "_Pop selection out of group" +msgstr "Ви_ключити позначене з групи" + #. Item dialog -#: ../src/ui/interface.cpp:1638 ../src/verbs.cpp:2943 +#: ../src/ui/interface.cpp:1656 ../src/verbs.cpp:2940 msgid "_Object Properties..." msgstr "В_ластивості об'єкта…" -#: ../src/ui/interface.cpp:1647 +#: ../src/ui/interface.cpp:1665 msgid "_Select This" msgstr "_Позначити це" -#: ../src/ui/interface.cpp:1658 +#: ../src/ui/interface.cpp:1676 msgid "Select Same" msgstr "Позначити те саме" #. Select same fill and stroke -#: ../src/ui/interface.cpp:1668 +#: ../src/ui/interface.cpp:1686 msgid "Fill and Stroke" msgstr "Заповнення та штрих" #. Select same fill color -#: ../src/ui/interface.cpp:1675 +#: ../src/ui/interface.cpp:1693 msgid "Fill Color" msgstr "Колір заповнення" #. Select same stroke color -#: ../src/ui/interface.cpp:1682 +#: ../src/ui/interface.cpp:1700 msgid "Stroke Color" msgstr "Колір штриха" #. Select same stroke style -#: ../src/ui/interface.cpp:1689 +#: ../src/ui/interface.cpp:1707 msgid "Stroke Style" msgstr "Стиль штриха" #. Select same stroke style -#: ../src/ui/interface.cpp:1696 +#: ../src/ui/interface.cpp:1714 msgid "Object type" msgstr "Тип об'єкта" #. Move to layer -#: ../src/ui/interface.cpp:1703 +#: ../src/ui/interface.cpp:1721 msgid "_Move to layer ..." msgstr "П_ересунути до шару…" #. Create link -#: ../src/ui/interface.cpp:1713 +#: ../src/ui/interface.cpp:1731 msgid "Create _Link" msgstr "С_творити посилання" #. Release mask -#: ../src/ui/interface.cpp:1747 +#: ../src/ui/interface.cpp:1765 msgid "Release Mask" msgstr "Зняти маску" #. SSet Clip Group -#: ../src/ui/interface.cpp:1758 +#: ../src/ui/interface.cpp:1776 msgid "Create Clip G_roup" msgstr "Створити пришпилену гр_упу" #. Set Clip -#: ../src/ui/interface.cpp:1765 +#: ../src/ui/interface.cpp:1783 msgid "Set Cl_ip" msgstr "Встановити _обрізання" #. Release Clip -#: ../src/ui/interface.cpp:1776 +#: ../src/ui/interface.cpp:1794 msgid "Release C_lip" msgstr "Зн_яти обрізання" #. Group -#: ../src/ui/interface.cpp:1787 ../src/verbs.cpp:2564 +#: ../src/ui/interface.cpp:1805 ../src/verbs.cpp:2561 msgid "_Group" msgstr "З_групувати" -#: ../src/ui/interface.cpp:1858 +#: ../src/ui/interface.cpp:1876 msgid "Create link" msgstr "Створити посилання" #. Ungroup -#: ../src/ui/interface.cpp:1893 ../src/verbs.cpp:2566 +#: ../src/ui/interface.cpp:1911 ../src/verbs.cpp:2563 msgid "_Ungroup" msgstr "Розгр_упувати" #. Link dialog -#: ../src/ui/interface.cpp:1917 +#: ../src/ui/interface.cpp:1941 msgid "Link _Properties..." msgstr "В_ластивості посилання…" #. Select item -#: ../src/ui/interface.cpp:1923 +#: ../src/ui/interface.cpp:1947 msgid "_Follow Link" msgstr "_Перейти за посиланням" #. Reset transformations -#: ../src/ui/interface.cpp:1929 +#: ../src/ui/interface.cpp:1953 msgid "_Remove Link" msgstr "Ви_лучити посилання" -#: ../src/ui/interface.cpp:1960 +#: ../src/ui/interface.cpp:1984 msgid "Remove link" msgstr "Вилучити прив'язку" #. Image properties -#: ../src/ui/interface.cpp:1970 +#: ../src/ui/interface.cpp:1994 msgid "Image _Properties..." msgstr "В_ластивості зображення…" #. Edit externally -#: ../src/ui/interface.cpp:1976 +#: ../src/ui/interface.cpp:2000 msgid "Edit Externally..." msgstr "Редагувати у зовнішній програмі…" #. Trace Bitmap #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/ui/interface.cpp:1985 ../src/verbs.cpp:2629 +#: ../src/ui/interface.cpp:2009 ../src/verbs.cpp:2628 msgid "_Trace Bitmap..." msgstr "_Векторизувати растр" #. Trace Pixel Art -#: ../src/ui/interface.cpp:1994 +#: ../src/ui/interface.cpp:2018 msgid "Trace Pixel Art" msgstr "Трасування растрової графіки" -#: ../src/ui/interface.cpp:2004 +#: ../src/ui/interface.cpp:2028 msgctxt "Context menu" msgid "Embed Image" msgstr "Вбудувати зображення" -#: ../src/ui/interface.cpp:2015 +#: ../src/ui/interface.cpp:2039 msgctxt "Context menu" msgid "Extract Image..." msgstr "Видобути зображення…" #. Item dialog #. Fill and Stroke dialog -#: ../src/ui/interface.cpp:2159 ../src/ui/interface.cpp:2179 -#: ../src/verbs.cpp:2906 +#: ../src/ui/interface.cpp:2183 ../src/ui/interface.cpp:2203 +#: ../src/verbs.cpp:2903 msgid "_Fill and Stroke..." msgstr "_Заповнення та штрих" #. Edit Text dialog -#: ../src/ui/interface.cpp:2185 ../src/verbs.cpp:2925 +#: ../src/ui/interface.cpp:2209 ../src/verbs.cpp:2922 msgid "_Text and Font..." msgstr "_Текст та шрифт…" #. Spellcheck dialog -#: ../src/ui/interface.cpp:2191 ../src/verbs.cpp:2933 +#: ../src/ui/interface.cpp:2215 ../src/verbs.cpp:2930 msgid "Check Spellin_g..." msgstr "Перевірити п_равопис…" @@ -23428,7 +23621,7 @@ msgstr "" "Центр обертання: перетягніть, щоб змінити розташування центра " "перетворень" -#: ../src/ui/tools-switch.cpp:95 +#: ../src/ui/tools-switch.cpp:101 msgid "" "Click to Select and Transform objects, Drag to select many " "objects." @@ -23436,15 +23629,15 @@ msgstr "" "Клацніть, щоб позначити і перетворити об’єкти, перетягуванням " "можна позначити декілька об’єктів." -#: ../src/ui/tools-switch.cpp:96 +#: ../src/ui/tools-switch.cpp:102 msgid "Modify selected path points (nodes) directly." msgstr "Змінити позначені точки контуру (вузли) безпосередньо." -#: ../src/ui/tools-switch.cpp:97 +#: ../src/ui/tools-switch.cpp:103 msgid "To tweak a path by pushing, select it and drag over it." msgstr "Щоб коригувати контур штовханням, позначте його і перетягніть його." -#: ../src/ui/tools-switch.cpp:98 +#: ../src/ui/tools-switch.cpp:104 msgid "" "Drag, click or click and scroll to spray the selected " "objects." @@ -23452,7 +23645,7 @@ msgstr "" "Перетягніть, клацніть або клацніть і покрутіть коліщатко, щоб розкидати позначені об'єкти." -#: ../src/ui/tools-switch.cpp:99 +#: ../src/ui/tools-switch.cpp:105 msgid "" "Drag to create a rectangle. Drag controls to round corners and " "resize. Click to select." @@ -23460,7 +23653,7 @@ msgstr "" "Перетягування малює прямокутник. Перетягування ручок змінює " "розмір та округляє кути. Клацання позначає об'єкт." -#: ../src/ui/tools-switch.cpp:100 +#: ../src/ui/tools-switch.cpp:106 msgid "" "Drag to create a 3D box. Drag controls to resize in " "perspective. Click to select (with Ctrl+Alt for single faces)." @@ -23469,7 +23662,7 @@ msgstr "" "змінює його перспективу. Клацання позначає об'єкт (з Ctrl+Alt " "окремі поверхні)." -#: ../src/ui/tools-switch.cpp:101 +#: ../src/ui/tools-switch.cpp:107 msgid "" "Drag to create an ellipse. Drag controls to make an arc or " "segment. Click to select." @@ -23477,7 +23670,7 @@ msgstr "" "Перетягування малює еліпс. Перетягування ручок створює дугу " "або сегмент. Клацання позначає об'єкт." -#: ../src/ui/tools-switch.cpp:102 +#: ../src/ui/tools-switch.cpp:108 msgid "" "Drag to create a star. Drag controls to edit the star shape. " "Click to select." @@ -23485,7 +23678,7 @@ msgstr "" "Перетягування малює зірку. Перетягування ручок змінює її " "форму. Клацання позначає об'єкт." -#: ../src/ui/tools-switch.cpp:103 +#: ../src/ui/tools-switch.cpp:109 msgid "" "Drag to create a spiral. Drag controls to edit the spiral " "shape. Click to select." @@ -23493,7 +23686,7 @@ msgstr "" "Перетягування малює спіраль. Перетягування ручок змінює її " "форму. Клацання позначає об'єкт." -#: ../src/ui/tools-switch.cpp:104 +#: ../src/ui/tools-switch.cpp:110 msgid "" "Drag to create a freehand line. Shift appends to selected " "path, Alt activates sketch mode." @@ -23501,7 +23694,7 @@ msgstr "" "Перетягування малює довільну лінію. Щоб додати до позначеної лінії, " "натисніть спочатку Shift. Alt вмикає режим ескіза." -#: ../src/ui/tools-switch.cpp:105 +#: ../src/ui/tools-switch.cpp:111 msgid "" "Click or click and drag to start a path; with Shift to " "append to selected path. Ctrl+click to create single dots (straight " @@ -23511,7 +23704,7 @@ msgstr "" "додати до позначеного контуру, натисніть спочатку Shift. Ctrl" "+клацання створює одиничні точки (лише для прямих ліній)." -#: ../src/ui/tools-switch.cpp:106 +#: ../src/ui/tools-switch.cpp:112 msgid "" "Drag to draw a calligraphic stroke; with Ctrl to track a guide " "path. Arrow keys adjust width (left/right) and angle (up/down)." @@ -23520,7 +23713,7 @@ msgstr "" "напрямної, Клавіші-стрілки — налаштування товщини (ліворуч/праворуч) " "і кута (вгору/вниз)." -#: ../src/ui/tools-switch.cpp:107 ../src/ui/tools/text-tool.cpp:1583 +#: ../src/ui/tools-switch.cpp:113 ../src/ui/tools/text-tool.cpp:1583 msgid "" "Click to select or create text, drag to create flowed text; " "then type." @@ -23528,7 +23721,7 @@ msgstr "" "Клацання позначає чи створює текстовий об'єкт; перетягніть щоб " "створити плаваючу тестову область; після чого можна набирати текст." -#: ../src/ui/tools-switch.cpp:108 +#: ../src/ui/tools-switch.cpp:114 msgid "" "Drag or double click to create a gradient on selected objects, " "drag handles to adjust gradients." @@ -23536,7 +23729,7 @@ msgstr "" "Перетягніть або двічі клацніть, щоб створити градієнт на " "позначеному об'єкті, перетягніть вуса для коригування градієнта." -#: ../src/ui/tools-switch.cpp:109 +#: ../src/ui/tools-switch.cpp:115 msgid "" "Drag or double click to create a mesh on selected objects, " "drag handles to adjust meshes." @@ -23544,7 +23737,7 @@ msgstr "" "Перетягніть або двічі клацніть, щоб створити сітку на " "позначеному об'єкті, перетягніть вуса для коригування сітки." -#: ../src/ui/tools-switch.cpp:110 +#: ../src/ui/tools-switch.cpp:116 msgid "" "Click or drag around an area to zoom in, Shift+click to " "zoom out." @@ -23552,11 +23745,11 @@ msgstr "" "Клацання чи обведення рамкою наближають, Shift+клацання " "віддаляють полотно." -#: ../src/ui/tools-switch.cpp:111 +#: ../src/ui/tools-switch.cpp:117 msgid "Drag to measure the dimensions of objects." msgstr "Перетягніть вказівник, щоб виміряти об'єкти." -#: ../src/ui/tools-switch.cpp:112 ../src/ui/tools/dropper-tool.cpp:274 +#: ../src/ui/tools-switch.cpp:118 ../src/ui/tools/dropper-tool.cpp:274 msgid "" "Click to set fill, Shift+click to set stroke; drag to " "average color in area; with Alt to pick inverse color; Ctrl+C " @@ -23567,12 +23760,12 @@ msgstr "" "разом з Alt береться інверсний колір; Ctrl+C копіює у буфер " "колір під курсором." -#: ../src/ui/tools-switch.cpp:113 +#: ../src/ui/tools-switch.cpp:119 msgid "Click and drag between shapes to create a connector." msgstr "" "Клацання + перетягування між фігурами створюють лінію з'єднання." -#: ../src/ui/tools-switch.cpp:114 +#: ../src/ui/tools-switch.cpp:121 msgid "" "Click to paint a bounded area, Shift+click to union the new " "fill with the current selection, Ctrl+click to change the clicked " @@ -23582,11 +23775,11 @@ msgstr "" "поєднання нового заповнення з поточною позначеною областю, Ctrl+click " "- змінити на поточне значення заповнення та штрих об'єкта, на якому клацнули." -#: ../src/ui/tools-switch.cpp:115 +#: ../src/ui/tools-switch.cpp:123 msgid "Drag to erase." msgstr "Перетягніть, щоб витерти." -#: ../src/ui/tools-switch.cpp:116 +#: ../src/ui/tools-switch.cpp:124 msgid "Choose a subtool from the toolbar" msgstr "Оберіть підінструмент на панелі інструментів" @@ -23733,11 +23926,11 @@ msgstr "Відпустіть кнопку для встановлення msgid "Set picked color" msgstr "Встановити знятий піпеткою колір" -#: ../src/ui/tools/eraser-tool.cpp:427 +#: ../src/ui/tools/eraser-tool.cpp:436 msgid "Drawing an eraser stroke" msgstr "Малювання штриха гумки" -#: ../src/ui/tools/eraser-tool.cpp:753 +#: ../src/ui/tools/eraser-tool.cpp:797 msgid "Draw eraser stroke" msgstr "Намалювати штрих гумкою" @@ -23821,24 +24014,24 @@ msgstr "" "b> — для заповнення дотиком" #. We hit green anchor, closing Green-Blue-Red -#: ../src/ui/tools/freehand-base.cpp:669 +#: ../src/ui/tools/freehand-base.cpp:677 msgid "Path is closed." msgstr "Контур замкнено." #. We hit bot start and end of single curve, closing paths -#: ../src/ui/tools/freehand-base.cpp:684 +#: ../src/ui/tools/freehand-base.cpp:692 msgid "Closing path." msgstr "Закривається контур." -#: ../src/ui/tools/freehand-base.cpp:823 +#: ../src/ui/tools/freehand-base.cpp:831 msgid "Draw path" msgstr "Малювання контуру" -#: ../src/ui/tools/freehand-base.cpp:976 +#: ../src/ui/tools/freehand-base.cpp:984 msgid "Creating single dot" msgstr "Створення одиночної точки" -#: ../src/ui/tools/freehand-base.cpp:977 +#: ../src/ui/tools/freehand-base.cpp:985 msgid "Create single dot" msgstr "Створити одиночну точку" @@ -23941,38 +24134,42 @@ msgid "Choose a construction tool from the toolbar." msgstr "Вибрати інструмент побудови з панелі інструментів." #. create the knots -#: ../src/ui/tools/measure-tool.cpp:338 -msgid "Measure start" -msgstr "Початок вимірювання" +#: ../src/ui/tools/measure-tool.cpp:349 +msgid "Measure start, Shift+Click for position dialog" +msgstr "Початкова точка вимірювання, Shift+клацання — вікно позиції" -#: ../src/ui/tools/measure-tool.cpp:344 -msgid "Measure end" -msgstr "Кінець вимірювання" +#: ../src/ui/tools/measure-tool.cpp:355 +msgid "Measure end, Shift+Click for position dialog" +msgstr "Кінцева точка вимірювання, Shift+клацання — вікно позиції" -#: ../src/ui/tools/measure-tool.cpp:719 ../share/extensions/measure.inx.h:2 +#: ../src/ui/tools/measure-tool.cpp:747 ../share/extensions/measure.inx.h:2 msgid "Measure" msgstr "Міра" -#: ../src/ui/tools/measure-tool.cpp:724 +#: ../src/ui/tools/measure-tool.cpp:752 msgid "Base" msgstr "Основа" -#: ../src/ui/tools/measure-tool.cpp:733 +#: ../src/ui/tools/measure-tool.cpp:761 msgid "Add guides from measure tool" msgstr "Додати напрямні з інструмента вимірювання" -#: ../src/ui/tools/measure-tool.cpp:753 +#: ../src/ui/tools/measure-tool.cpp:781 +msgid "Add Stored to measure tool" +msgstr "Додати збережене до інструмента вимірювання" + +#: ../src/ui/tools/measure-tool.cpp:801 msgid "Convert measure to items" msgstr "Перетворити вимірювання на об’єкти" -#: ../src/ui/tools/measure-tool.cpp:791 +#: ../src/ui/tools/measure-tool.cpp:839 msgid "Add global measure line" msgstr "Додати загальну лінію вимірювання" -#: ../src/ui/tools/measure-tool.cpp:1221 ../src/ui/tools/measure-tool.cpp:1223 +#: ../src/ui/tools/measure-tool.cpp:1290 ../src/ui/tools/measure-tool.cpp:1292 #, c-format -msgid "Crossing %d" -msgstr "Перетин %d" +msgid "Crossing %lu" +msgstr "Перетин %lu" #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 @@ -24146,43 +24343,45 @@ msgstr "" "Клацання або перетягування продовжує контур з цієї точки, " "Shift+клацання — створити гострий вузол." -#: ../src/ui/tools/pen-tool.cpp:1786 +#: ../src/ui/tools/pen-tool.cpp:1797 #, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Сегмент кривої: кут %3.2f°, відстань %s; з Ctrl — кут " -"прилипання, Enter — завершити контур" +"прилипання, Enter або Shift+Enter — завершити контур" -#: ../src/ui/tools/pen-tool.cpp:1787 +#: ../src/ui/tools/pen-tool.cpp:1798 #, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Ctrl to " -"snap angle, Enter to finish the path" +"snap angle, Enter or Shift+Enter to finish the path" msgstr "" "Сегмент лінії: кут %3.2f°, відстань %s; з Ctrl — кут " -"прилипання, Enter — завершити контур" +"прилипання, Enter або Shift+Enter — завершити контур" -#: ../src/ui/tools/pen-tool.cpp:1790 +#: ../src/ui/tools/pen-tool.cpp:1801 #, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" +"b> make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Сегмент кривої: кут %3.2f°, відстань %s; з , Shift+клацанням — створити гострий вузол, Enter — завершити контур" +"Сегмент кривої: кут %3.2f°, відстань %s; з Shift+клацанням — створити гострий вузол, Enter або Shift+Enter — завершити " +"контур" -#: ../src/ui/tools/pen-tool.cpp:1791 +#: ../src/ui/tools/pen-tool.cpp:1802 #, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " -"make a cusp node, Enter to finish the path" +"make a cusp node, Enter or Shift+Enter to finish the path" msgstr "" -"Сегмент прямої: кут %3.2f°, відстань %s; з , Shift+клацанням — створити гострий вузол, Enter — завершити контур" +"Сегмент прямої: кут %3.2f°, відстань %s; з Shift+клацанням — створити гострий вузол, Enter або Shift+Enter — завершити " +"контур" -#: ../src/ui/tools/pen-tool.cpp:1808 +#: ../src/ui/tools/pen-tool.cpp:1819 #, c-format msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " @@ -24190,7 +24389,7 @@ msgid "" msgstr "" "Вус вузла кривої: кут %3.2f°, довжина %s; Ctrl обмежує кут" -#: ../src/ui/tools/pen-tool.cpp:1832 +#: ../src/ui/tools/pen-tool.cpp:1843 #, c-format msgid "" "Curve handle, symmetric: angle %3.2f°, length %s; with CtrlВус кривої, симетричний: кут %3.2f°, довжина %s; з Ctrl — " "кут прилипання, з Shift — лише пересунути вус" -#: ../src/ui/tools/pen-tool.cpp:1833 +#: ../src/ui/tools/pen-tool.cpp:1844 #, c-format msgid "" "Curve handle: angle %3.2f°, length %s; with Ctrl to snap " @@ -24208,7 +24407,7 @@ msgstr "" "Вус кривої: кут %3.2f°, довжина %s; з Ctrl — кут " "прилипання, Shift — лише пересування вуса" -#: ../src/ui/tools/pen-tool.cpp:1967 +#: ../src/ui/tools/pen-tool.cpp:1978 msgid "Drawing finished" msgstr "Малювання завершено" @@ -24310,7 +24509,7 @@ msgstr "Переміщення скасовано." msgid "Selection canceled." msgstr "Позначення скасовано." -#: ../src/ui/tools/select-tool.cpp:636 +#: ../src/ui/tools/select-tool.cpp:638 msgid "" "Draw over objects to select them; release Alt to switch to " "rubberband selection" @@ -24318,7 +24517,7 @@ msgstr "" "Малювати по об'єктах для їхнього позначення; відпустіть Alt " "для переходу до позначення гумовою ниткою" -#: ../src/ui/tools/select-tool.cpp:638 +#: ../src/ui/tools/select-tool.cpp:640 msgid "" "Drag around objects to select them; press Alt to switch to " "touch selection" @@ -24326,19 +24525,19 @@ msgstr "" "Малювати навколо об'єктів для їхнього позначення; відпустіть Alt для переходу до позначення дотиком" -#: ../src/ui/tools/select-tool.cpp:919 +#: ../src/ui/tools/select-tool.cpp:921 msgid "Ctrl: click to select in groups; drag to move hor/vert" msgstr "" "Ctrl: позначення у групі; перетягування — переміщення по горизонталі/" "вертикалі" -#: ../src/ui/tools/select-tool.cpp:920 +#: ../src/ui/tools/select-tool.cpp:922 msgid "Shift: click to toggle select; drag for rubberband selection" msgstr "" "Shift: позначити/зняти позначення; перетягування — позначення гумовою " "ниткою" -#: ../src/ui/tools/select-tool.cpp:921 +#: ../src/ui/tools/select-tool.cpp:923 msgid "" "Alt: click to select under; scroll mouse-wheel to cycle-select; drag " "to move selected or select by touch" @@ -24346,7 +24545,7 @@ msgstr "" "Alt: клацніть для позначення; прокручування коліщатка — циклічний " "вибір; перетягування — переміщення позначеної області чи вибір торканням" -#: ../src/ui/tools/select-tool.cpp:1129 +#: ../src/ui/tools/select-tool.cpp:1131 msgid "Selected object is not a group. Cannot enter." msgstr "позначений об'єкт не є групою. Неможливо увійти." @@ -24411,11 +24610,11 @@ msgstr "" msgid "Nothing selected! Select objects to spray." msgstr "Нічого не позначено! Позначте об'єкти, які слід розкидати." -#: ../src/ui/tools/spray-tool.cpp:1380 ../src/widgets/spray-toolbar.cpp:350 +#: ../src/ui/tools/spray-tool.cpp:1380 ../src/widgets/spray-toolbar.cpp:360 msgid "Spray with copies" msgstr "Розкидання копій" -#: ../src/ui/tools/spray-tool.cpp:1384 ../src/widgets/spray-toolbar.cpp:357 +#: ../src/ui/tools/spray-tool.cpp:1384 ../src/widgets/spray-toolbar.cpp:367 msgid "Spray with clones" msgstr "Розкидання клонів" @@ -24752,48 +24951,49 @@ msgid "Hexadecimal RGBA value of the color" msgstr "Шістнадцяткове значення кольору RGBA" #: ../src/ui/widget/color-icc-selector.cpp:176 -#: ../src/ui/widget/color-scales.cpp:378 +#: ../src/ui/widget/color-scales.cpp:384 msgid "_R:" msgstr "_R:" #. TYPE_RGB_16 #: ../src/ui/widget/color-icc-selector.cpp:177 -#: ../src/ui/widget/color-scales.cpp:381 +#: ../src/ui/widget/color-scales.cpp:387 msgid "_G:" msgstr "_G:" #: ../src/ui/widget/color-icc-selector.cpp:178 -#: ../src/ui/widget/color-scales.cpp:384 +#: ../src/ui/widget/color-scales.cpp:390 msgid "_B:" msgstr "_B:" #: ../src/ui/widget/color-icc-selector.cpp:180 +#: ../share/extensions/nicechart.inx.h:35 msgid "Gray" msgstr "Сірий" #. TYPE_GRAY_16 #: ../src/ui/widget/color-icc-selector.cpp:182 #: ../src/ui/widget/color-icc-selector.cpp:186 -#: ../src/ui/widget/color-scales.cpp:404 +#: ../src/ui/widget/color-scales.cpp:410 msgid "_H:" msgstr "_H:" #. TYPE_HSV_16 #: ../src/ui/widget/color-icc-selector.cpp:183 #: ../src/ui/widget/color-icc-selector.cpp:188 -#: ../src/ui/widget/color-scales.cpp:407 +#: ../src/ui/widget/color-scales.cpp:413 msgid "_S:" msgstr "_S:" #. TYPE_HLS_16 #: ../src/ui/widget/color-icc-selector.cpp:187 -#: ../src/ui/widget/color-scales.cpp:410 +#: ../src/ui/widget/color-scales.cpp:416 msgid "_L:" msgstr "_L:" #: ../src/ui/widget/color-icc-selector.cpp:190 #: ../src/ui/widget/color-icc-selector.cpp:195 -#: ../src/ui/widget/color-scales.cpp:432 +#: ../src/ui/widget/color-scales.cpp:438 msgid "_C:" msgstr "_C:" @@ -24801,18 +25001,18 @@ msgstr "_C:" #. TYPE_CMY_16 #: ../src/ui/widget/color-icc-selector.cpp:191 #: ../src/ui/widget/color-icc-selector.cpp:196 -#: ../src/ui/widget/color-scales.cpp:435 +#: ../src/ui/widget/color-scales.cpp:441 msgid "_M:" msgstr "_M:" #: ../src/ui/widget/color-icc-selector.cpp:192 #: ../src/ui/widget/color-icc-selector.cpp:197 -#: ../src/ui/widget/color-scales.cpp:438 +#: ../src/ui/widget/color-scales.cpp:444 msgid "_Y:" msgstr "_Y:" #: ../src/ui/widget/color-icc-selector.cpp:193 -#: ../src/ui/widget/color-scales.cpp:441 +#: ../src/ui/widget/color-scales.cpp:447 msgid "_K:" msgstr "_K:" @@ -24829,18 +25029,18 @@ msgid "Fix RGB fallback to match icc-color() value." msgstr "Виправити колір до RGB на основі значення icc-color()" #. Label -#: ../src/ui/widget/color-icc-selector.cpp:491 -#: ../src/ui/widget/color-scales.cpp:387 ../src/ui/widget/color-scales.cpp:413 -#: ../src/ui/widget/color-scales.cpp:444 +#: ../src/ui/widget/color-icc-selector.cpp:496 +#: ../src/ui/widget/color-scales.cpp:393 ../src/ui/widget/color-scales.cpp:419 +#: ../src/ui/widget/color-scales.cpp:450 #: ../src/ui/widget/color-wheel-selector.cpp:83 msgid "_A:" msgstr "_A:" -#: ../src/ui/widget/color-icc-selector.cpp:502 #: ../src/ui/widget/color-icc-selector.cpp:513 -#: ../src/ui/widget/color-scales.cpp:388 ../src/ui/widget/color-scales.cpp:389 -#: ../src/ui/widget/color-scales.cpp:414 ../src/ui/widget/color-scales.cpp:415 -#: ../src/ui/widget/color-scales.cpp:445 ../src/ui/widget/color-scales.cpp:446 +#: ../src/ui/widget/color-icc-selector.cpp:524 +#: ../src/ui/widget/color-scales.cpp:394 ../src/ui/widget/color-scales.cpp:395 +#: ../src/ui/widget/color-scales.cpp:420 ../src/ui/widget/color-scales.cpp:421 +#: ../src/ui/widget/color-scales.cpp:451 ../src/ui/widget/color-scales.cpp:452 #: ../src/ui/widget/color-wheel-selector.cpp:112 #: ../src/ui/widget/color-wheel-selector.cpp:142 msgid "Alpha (opacity)" @@ -24858,7 +25058,7 @@ msgstr "Поза гамою!" msgid "Too much ink!" msgstr "Забагато чорнила!" -#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2767 +#: ../src/ui/widget/color-notebook.cpp:207 ../src/verbs.cpp:2766 msgid "Pick colors from image" msgstr "Взяти кольори з зображення" @@ -25165,19 +25365,19 @@ msgid "Feature settings in CSS form. No sanity checking is performed." msgstr "" "Параметри модифікацій у формі CSS. Перевірки щодо коректності не виконується." -#: ../src/ui/widget/layer-selector.cpp:118 +#: ../src/ui/widget/layer-selector.cpp:116 msgid "Toggle current layer visibility" msgstr "Сховати чи відкрити поточний шар" -#: ../src/ui/widget/layer-selector.cpp:139 +#: ../src/ui/widget/layer-selector.cpp:136 msgid "Lock or unlock current layer" msgstr "Заблокувати чи розблокувати поточний шар" -#: ../src/ui/widget/layer-selector.cpp:142 +#: ../src/ui/widget/layer-selector.cpp:139 msgid "Current layer" msgstr "Поточний шар" -#: ../src/ui/widget/layer-selector.cpp:583 +#: ../src/ui/widget/layer-selector.cpp:580 msgid "(root)" msgstr "(основа)" @@ -25194,8 +25394,8 @@ msgid "Document license updated" msgstr "Оновлено умови ліцензування документа" #: ../src/ui/widget/object-composite-settings.cpp:47 -#: ../src/ui/widget/selected-style.cpp:1119 -#: ../src/ui/widget/selected-style.cpp:1120 +#: ../src/ui/widget/selected-style.cpp:1117 +#: ../src/ui/widget/selected-style.cpp:1118 msgid "Opacity (%)" msgstr "Непрозорість (у %)" @@ -25204,8 +25404,8 @@ msgid "Change blur" msgstr "Зміна розмивання" #: ../src/ui/widget/object-composite-settings.cpp:200 -#: ../src/ui/widget/selected-style.cpp:943 -#: ../src/ui/widget/selected-style.cpp:1245 +#: ../src/ui/widget/selected-style.cpp:941 +#: ../src/ui/widget/selected-style.cpp:1243 msgid "Change opacity" msgstr "Зміна непрозорості" @@ -25332,101 +25532,101 @@ msgstr "Встановити масштаб сторінки" msgid "Set 'viewBox'" msgstr "Встановити «viewBox»" -#: ../src/ui/widget/panel.cpp:113 +#: ../src/ui/widget/panel.cpp:115 msgid "List" msgstr "Список" -#: ../src/ui/widget/panel.cpp:136 +#: ../src/ui/widget/panel.cpp:138 msgctxt "Swatches" msgid "Size" msgstr "Розмір" -#: ../src/ui/widget/panel.cpp:140 +#: ../src/ui/widget/panel.cpp:142 msgctxt "Swatches height" msgid "Tiny" msgstr "Крихітна" -#: ../src/ui/widget/panel.cpp:141 +#: ../src/ui/widget/panel.cpp:143 msgctxt "Swatches height" msgid "Small" msgstr "Мала" -#: ../src/ui/widget/panel.cpp:142 +#: ../src/ui/widget/panel.cpp:144 msgctxt "Swatches height" msgid "Medium" msgstr "Середня" -#: ../src/ui/widget/panel.cpp:143 +#: ../src/ui/widget/panel.cpp:145 msgctxt "Swatches height" msgid "Large" msgstr "Велика" -#: ../src/ui/widget/panel.cpp:144 +#: ../src/ui/widget/panel.cpp:146 msgctxt "Swatches height" msgid "Huge" msgstr "Величезна" -#: ../src/ui/widget/panel.cpp:166 +#: ../src/ui/widget/panel.cpp:168 msgctxt "Swatches" msgid "Width" msgstr "Ширина" -#: ../src/ui/widget/panel.cpp:170 +#: ../src/ui/widget/panel.cpp:172 msgctxt "Swatches width" msgid "Narrower" msgstr "Вужча" -#: ../src/ui/widget/panel.cpp:171 +#: ../src/ui/widget/panel.cpp:173 msgctxt "Swatches width" msgid "Narrow" msgstr "Вузька" -#: ../src/ui/widget/panel.cpp:172 +#: ../src/ui/widget/panel.cpp:174 msgctxt "Swatches width" msgid "Medium" msgstr "Середня" -#: ../src/ui/widget/panel.cpp:173 +#: ../src/ui/widget/panel.cpp:175 msgctxt "Swatches width" msgid "Wide" msgstr "Широка" -#: ../src/ui/widget/panel.cpp:174 +#: ../src/ui/widget/panel.cpp:176 msgctxt "Swatches width" msgid "Wider" msgstr "Ширша" -#: ../src/ui/widget/panel.cpp:204 +#: ../src/ui/widget/panel.cpp:206 msgctxt "Swatches" msgid "Border" msgstr "Рамка" -#: ../src/ui/widget/panel.cpp:208 +#: ../src/ui/widget/panel.cpp:210 msgctxt "Swatches border" msgid "None" msgstr "Немає" -#: ../src/ui/widget/panel.cpp:209 +#: ../src/ui/widget/panel.cpp:211 msgctxt "Swatches border" msgid "Solid" msgstr "Суцільна" -#: ../src/ui/widget/panel.cpp:210 +#: ../src/ui/widget/panel.cpp:212 msgctxt "Swatches border" msgid "Wide" msgstr "Широка" #. TRANSLATORS: "Wrap" indicates how colour swatches are displayed -#: ../src/ui/widget/panel.cpp:241 +#: ../src/ui/widget/panel.cpp:243 msgctxt "Swatches" msgid "Wrap" msgstr "З перенесенням" -#: ../src/ui/widget/preferences-widget.cpp:799 +#: ../src/ui/widget/preferences-widget.cpp:795 msgid "_Browse..." msgstr "Ви_брати…" -#: ../src/ui/widget/preferences-widget.cpp:885 +#: ../src/ui/widget/preferences-widget.cpp:881 msgid "Select a bitmap editor" msgstr "Виберіть редактор растрової графіки" @@ -25492,8 +25692,8 @@ msgid "N/A" msgstr "Н/Д" #: ../src/ui/widget/selected-style.cpp:181 -#: ../src/ui/widget/selected-style.cpp:1112 -#: ../src/ui/widget/selected-style.cpp:1113 +#: ../src/ui/widget/selected-style.cpp:1110 +#: ../src/ui/widget/selected-style.cpp:1111 #: ../src/widgets/gradient-toolbar.cpp:162 msgid "Nothing selected" msgstr "Нічого не позначено" @@ -25595,14 +25795,14 @@ msgstr "Не встановлено" #. TRANSLATORS COMMENT: unset is a verb here #: ../src/ui/widget/selected-style.cpp:237 #: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:575 +#: ../src/ui/widget/selected-style.cpp:573 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset fill" msgstr "Не заливати" #: ../src/ui/widget/selected-style.cpp:237 #: ../src/ui/widget/selected-style.cpp:295 -#: ../src/ui/widget/selected-style.cpp:591 +#: ../src/ui/widget/selected-style.cpp:589 #: ../src/ui/widget/style-swatch.cpp:326 ../src/widgets/fill-style.cpp:703 msgid "Unset stroke" msgstr "Зняття штриха" @@ -25666,13 +25866,13 @@ msgid "Paste color" msgstr "Вставити колір" #: ../src/ui/widget/selected-style.cpp:286 -#: ../src/ui/widget/selected-style.cpp:868 +#: ../src/ui/widget/selected-style.cpp:866 msgid "Swap fill and stroke" msgstr "Поміняти місцями кольори заповнення та штриха" #: ../src/ui/widget/selected-style.cpp:290 -#: ../src/ui/widget/selected-style.cpp:600 -#: ../src/ui/widget/selected-style.cpp:609 +#: ../src/ui/widget/selected-style.cpp:598 +#: ../src/ui/widget/selected-style.cpp:607 msgid "Make fill opaque" msgstr "Зробити заповнення непрозорим" @@ -25681,93 +25881,93 @@ msgid "Make stroke opaque" msgstr "Зробити штрихи непрозорими" #: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:557 ../src/widgets/fill-style.cpp:503 +#: ../src/ui/widget/selected-style.cpp:555 ../src/widgets/fill-style.cpp:503 msgid "Remove fill" msgstr "Вилучити заповнення" #: ../src/ui/widget/selected-style.cpp:299 -#: ../src/ui/widget/selected-style.cpp:566 ../src/widgets/fill-style.cpp:503 +#: ../src/ui/widget/selected-style.cpp:564 ../src/widgets/fill-style.cpp:503 msgid "Remove stroke" msgstr "Вилучити штрих" -#: ../src/ui/widget/selected-style.cpp:621 +#: ../src/ui/widget/selected-style.cpp:619 msgid "Apply last set color to fill" msgstr "Застосувати останній використаний колір для заповнення" -#: ../src/ui/widget/selected-style.cpp:633 +#: ../src/ui/widget/selected-style.cpp:631 msgid "Apply last set color to stroke" msgstr "Застосувати останній використаний колір для штриха" -#: ../src/ui/widget/selected-style.cpp:644 +#: ../src/ui/widget/selected-style.cpp:642 msgid "Apply last selected color to fill" msgstr "Застосувати останній вибраний колір для заповнення" -#: ../src/ui/widget/selected-style.cpp:655 +#: ../src/ui/widget/selected-style.cpp:653 msgid "Apply last selected color to stroke" msgstr "Застосувати останній вибраний колір для штриха" -#: ../src/ui/widget/selected-style.cpp:681 +#: ../src/ui/widget/selected-style.cpp:679 msgid "Invert fill" msgstr "Інвертувати заповнення" -#: ../src/ui/widget/selected-style.cpp:705 +#: ../src/ui/widget/selected-style.cpp:703 msgid "Invert stroke" msgstr "Інвертувати штрих" -#: ../src/ui/widget/selected-style.cpp:717 +#: ../src/ui/widget/selected-style.cpp:715 msgid "White fill" msgstr "Заповнення білим" -#: ../src/ui/widget/selected-style.cpp:729 +#: ../src/ui/widget/selected-style.cpp:727 msgid "White stroke" msgstr "Білий штрих" -#: ../src/ui/widget/selected-style.cpp:741 +#: ../src/ui/widget/selected-style.cpp:739 msgid "Black fill" msgstr "Заповнення чорним" -#: ../src/ui/widget/selected-style.cpp:753 +#: ../src/ui/widget/selected-style.cpp:751 msgid "Black stroke" msgstr "Чорний штрих" -#: ../src/ui/widget/selected-style.cpp:796 +#: ../src/ui/widget/selected-style.cpp:794 msgid "Paste fill" msgstr "Вставити заповнення" -#: ../src/ui/widget/selected-style.cpp:814 +#: ../src/ui/widget/selected-style.cpp:812 msgid "Paste stroke" msgstr "Вставити штрих" -#: ../src/ui/widget/selected-style.cpp:970 +#: ../src/ui/widget/selected-style.cpp:968 msgid "Change stroke width" msgstr "Змінити товщину штриха" -#: ../src/ui/widget/selected-style.cpp:1073 +#: ../src/ui/widget/selected-style.cpp:1071 msgid ", drag to adjust" msgstr ", налаштуйте шляхом перетягування" -#: ../src/ui/widget/selected-style.cpp:1158 +#: ../src/ui/widget/selected-style.cpp:1156 #, c-format msgid "Stroke width: %.5g%s%s" msgstr "Товщина штриха: %.5g%s%s" -#: ../src/ui/widget/selected-style.cpp:1162 +#: ../src/ui/widget/selected-style.cpp:1160 msgid " (averaged)" msgstr " (осереднений)" -#: ../src/ui/widget/selected-style.cpp:1188 +#: ../src/ui/widget/selected-style.cpp:1186 msgid "0 (transparent)" msgstr "0 (прозорий)" -#: ../src/ui/widget/selected-style.cpp:1212 +#: ../src/ui/widget/selected-style.cpp:1210 msgid "100% (opaque)" msgstr "100% (непрозорий)" -#: ../src/ui/widget/selected-style.cpp:1386 +#: ../src/ui/widget/selected-style.cpp:1384 msgid "Adjust alpha" msgstr "Скоригувати канал прозорості" -#: ../src/ui/widget/selected-style.cpp:1388 +#: ../src/ui/widget/selected-style.cpp:1386 #, c-format msgid "" "Adjusting alpha: was %.3g, now %.3g (diff %.3g); with CtrlCtrl для зміни освітленості;Shift — для " "зміни насиченості, без модифікаторів — виправлення відтінку" -#: ../src/ui/widget/selected-style.cpp:1392 +#: ../src/ui/widget/selected-style.cpp:1390 msgid "Adjust saturation" msgstr "Корекція насиченості" -#: ../src/ui/widget/selected-style.cpp:1394 +#: ../src/ui/widget/selected-style.cpp:1392 #, c-format msgid "" "Adjusting saturation: was %.3g, now %.3g (diff %.3g); with " @@ -25793,11 +25993,11 @@ msgstr "" "скористайтеся Ctrl для корекції освітленості, Alt — для зміни " "прозорості, без модифікаторів – корекція відтінку" -#: ../src/ui/widget/selected-style.cpp:1398 +#: ../src/ui/widget/selected-style.cpp:1396 msgid "Adjust lightness" msgstr "Корекція освітленості" -#: ../src/ui/widget/selected-style.cpp:1400 +#: ../src/ui/widget/selected-style.cpp:1398 #, c-format msgid "" "Adjusting lightness: was %.3g, now %.3g (diff %.3g); with " @@ -25808,11 +26008,11 @@ msgstr "" "скористайтеся Shift для зміни насиченості, Alt — для зміни " "прозорості, без модифікаторів — виправлення відтінку" -#: ../src/ui/widget/selected-style.cpp:1404 +#: ../src/ui/widget/selected-style.cpp:1402 msgid "Adjust hue" msgstr "Корекція відтінку" -#: ../src/ui/widget/selected-style.cpp:1406 +#: ../src/ui/widget/selected-style.cpp:1404 #, c-format msgid "" "Adjusting hue: was %.3g, now %.3g (diff %.3g); with ShiftShift для зміни насиченості, Alt — для зміни " "прозорості, а Ctrl для зміни освітленості" -#: ../src/ui/widget/selected-style.cpp:1524 -#: ../src/ui/widget/selected-style.cpp:1538 +#: ../src/ui/widget/selected-style.cpp:1522 +#: ../src/ui/widget/selected-style.cpp:1536 msgid "Adjust stroke width" msgstr "Скоригувати товщину штриха" -#: ../src/ui/widget/selected-style.cpp:1525 +#: ../src/ui/widget/selected-style.cpp:1523 #, c-format msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" msgstr "" @@ -25890,7 +26090,7 @@ msgstr "Об'єднати точки сходу" msgid "3D box: Move vanishing point" msgstr "Просторовий об'єкт: Пересування точки сходу" -#: ../src/vanishing-point.cpp:330 +#: ../src/vanishing-point.cpp:329 #, c-format msgid "Finite vanishing point shared by %d box" msgid_plural "" @@ -25902,7 +26102,7 @@ msgstr[2] "Скінченна точка сходу, спільна дл #. This won't make sense any more when infinite VPs are not shown on the canvas, #. but currently we update the status message anyway -#: ../src/vanishing-point.cpp:337 +#: ../src/vanishing-point.cpp:336 #, c-format msgid "Infinite vanishing point shared by %d box" msgid_plural "" @@ -25912,7 +26112,7 @@ msgstr[0] "Нескінченна точка сходу для %d msgstr[1] "Нескінченна точка сходу, спільна для %d об'єктів" msgstr[2] "Нескінченна точка сходу, спільна для %d об'єктів" -#: ../src/vanishing-point.cpp:345 +#: ../src/vanishing-point.cpp:344 #, c-format msgid "" "shared by %d box; drag with Shift to separate selected box(es)" @@ -25941,7 +26141,7 @@ msgstr "Мітка" msgid "Context" msgstr "Контекст" -#: ../src/verbs.cpp:270 ../src/verbs.cpp:2300 +#: ../src/verbs.cpp:270 ../src/verbs.cpp:2297 #: ../share/extensions/jessyInk_view.inx.h:1 #: ../share/extensions/polyhedron_3d.inx.h:26 msgid "View" @@ -25951,242 +26151,247 @@ msgstr "Перегляд" msgid "Dialog" msgstr "Діалогове вікно" -#: ../src/verbs.cpp:1276 +#: ../src/verbs.cpp:1275 msgid "Switch to next layer" msgstr "Перемкнутися на наступний шар" -#: ../src/verbs.cpp:1277 +#: ../src/verbs.cpp:1276 msgid "Switched to next layer." msgstr "Перемикання на наступний шар." -#: ../src/verbs.cpp:1279 +#: ../src/verbs.cpp:1278 msgid "Cannot go past last layer." msgstr "Неможливо переміститися вище за останній шар." -#: ../src/verbs.cpp:1288 +#: ../src/verbs.cpp:1287 msgid "Switch to previous layer" msgstr "Перемкнутися на попередній шар" -#: ../src/verbs.cpp:1289 +#: ../src/verbs.cpp:1288 msgid "Switched to previous layer." msgstr "Перемикання на попередній шар." -#: ../src/verbs.cpp:1291 +#: ../src/verbs.cpp:1290 msgid "Cannot go before first layer." msgstr "Неможливо переміститися нижче за перший шар." -#: ../src/verbs.cpp:1312 ../src/verbs.cpp:1379 ../src/verbs.cpp:1415 -#: ../src/verbs.cpp:1421 ../src/verbs.cpp:1445 ../src/verbs.cpp:1460 +#: ../src/verbs.cpp:1311 ../src/verbs.cpp:1378 ../src/verbs.cpp:1414 +#: ../src/verbs.cpp:1420 ../src/verbs.cpp:1444 ../src/verbs.cpp:1459 msgid "No current layer." msgstr "Немає поточного шару." -#: ../src/verbs.cpp:1341 ../src/verbs.cpp:1345 +#: ../src/verbs.cpp:1340 ../src/verbs.cpp:1344 #, c-format msgid "Raised layer %s." msgstr "Шар %s піднято." -#: ../src/verbs.cpp:1342 +#: ../src/verbs.cpp:1341 msgid "Layer to top" msgstr "Підняти шар нагору" -#: ../src/verbs.cpp:1346 +#: ../src/verbs.cpp:1345 msgid "Raise layer" msgstr "Підняти шар" -#: ../src/verbs.cpp:1349 ../src/verbs.cpp:1353 +#: ../src/verbs.cpp:1348 ../src/verbs.cpp:1352 #, c-format msgid "Lowered layer %s." msgstr "Шар %s опущено." -#: ../src/verbs.cpp:1350 +#: ../src/verbs.cpp:1349 msgid "Layer to bottom" msgstr "Опустити шар додолу" -#: ../src/verbs.cpp:1354 +#: ../src/verbs.cpp:1353 msgid "Lower layer" msgstr "Опустити шар" -#: ../src/verbs.cpp:1363 +#: ../src/verbs.cpp:1362 msgid "Cannot move layer any further." msgstr "Неможливо перемістити шар далі." -#: ../src/verbs.cpp:1374 +#: ../src/verbs.cpp:1373 msgid "Duplicate layer" msgstr "Дублювати шар" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1377 +#: ../src/verbs.cpp:1376 msgid "Duplicated layer." msgstr "Дубльований шар." -#: ../src/verbs.cpp:1410 +#: ../src/verbs.cpp:1409 msgid "Delete layer" msgstr "Вилучити шар" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1413 +#: ../src/verbs.cpp:1412 msgid "Deleted layer." msgstr "Шар вилучено." -#: ../src/verbs.cpp:1430 +#: ../src/verbs.cpp:1429 msgid "Show all layers" msgstr "Показати всі шари" -#: ../src/verbs.cpp:1435 +#: ../src/verbs.cpp:1434 msgid "Hide all layers" msgstr "Приховати всі шари" -#: ../src/verbs.cpp:1440 +#: ../src/verbs.cpp:1439 msgid "Lock all layers" msgstr "Заблокувати всі шари" -#: ../src/verbs.cpp:1454 +#: ../src/verbs.cpp:1453 msgid "Unlock all layers" msgstr "Розблокувати всі шари" -#: ../src/verbs.cpp:1538 +#: ../src/verbs.cpp:1537 msgid "Flip horizontally" msgstr "Віддзеркалити горизонтально" -#: ../src/verbs.cpp:1543 +#: ../src/verbs.cpp:1542 msgid "Flip vertically" msgstr "Віддзеркалити вертикально" -#: ../src/verbs.cpp:1600 ../src/verbs.cpp:2730 +#: ../src/verbs.cpp:1590 +#, c-format +msgid "Set %d" +msgstr "Набір %d" + +#: ../src/verbs.cpp:1599 ../src/verbs.cpp:2729 msgid "Create new selection set" msgstr "Створити новий набір позначеного" #. TRANSLATORS: If you have translated the tutorial-basic.en.svgz file to your language, #. then translate this string as "tutorial-basic.LANG.svgz" (where LANG is your language #. code); otherwise leave as "tutorial-basic.svg". -#: ../src/verbs.cpp:2178 +#: ../src/verbs.cpp:2175 msgid "tutorial-basic.svg" msgstr "tutorial-basic.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2182 +#: ../src/verbs.cpp:2179 msgid "tutorial-shapes.svg" msgstr "tutorial-shapes.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2186 +#: ../src/verbs.cpp:2183 msgid "tutorial-advanced.svg" msgstr "tutorial-advanced.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2192 +#: ../src/verbs.cpp:2189 msgid "tutorial-tracing.svg" msgstr "tutorial-tracing.svg" -#: ../src/verbs.cpp:2197 +#: ../src/verbs.cpp:2194 msgid "tutorial-tracing-pixelart.svg" msgstr "tutorial-tracing-pixelart.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2201 +#: ../src/verbs.cpp:2198 msgid "tutorial-calligraphy.svg" msgstr "tutorial-calligraphy.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2205 +#: ../src/verbs.cpp:2202 msgid "tutorial-interpolate.svg" msgstr "tutorial-interpolate.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2209 +#: ../src/verbs.cpp:2206 msgid "tutorial-elements.svg" msgstr "tutorial-elements.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2213 +#: ../src/verbs.cpp:2210 msgid "tutorial-tips.svg" msgstr "tutorial-tips.svg" -#: ../src/verbs.cpp:2399 ../src/verbs.cpp:3015 +#: ../src/verbs.cpp:2396 ../src/verbs.cpp:3012 msgid "Unlock all objects in the current layer" msgstr "Розблокувати усі об'єкти у поточному шарі" -#: ../src/verbs.cpp:2403 ../src/verbs.cpp:3017 +#: ../src/verbs.cpp:2400 ../src/verbs.cpp:3014 msgid "Unlock all objects in all layers" msgstr "Розблокувати усі об'єкти в усіх шарах" -#: ../src/verbs.cpp:2407 ../src/verbs.cpp:3019 +#: ../src/verbs.cpp:2404 ../src/verbs.cpp:3016 msgid "Unhide all objects in the current layer" msgstr "Розблокувати усі об'єкти у поточному шарі" -#: ../src/verbs.cpp:2411 ../src/verbs.cpp:3021 +#: ../src/verbs.cpp:2408 ../src/verbs.cpp:3018 msgid "Unhide all objects in all layers" msgstr "Показати усі об'єкти в усіх шарах" -#: ../src/verbs.cpp:2426 +#: ../src/verbs.cpp:2423 msgctxt "Verb" msgid "None" msgstr "Немає" -#: ../src/verbs.cpp:2426 +#: ../src/verbs.cpp:2423 msgid "Does nothing" msgstr "Немає дій" #. File #. Tag -#: ../src/verbs.cpp:2429 ../src/verbs.cpp:2729 +#: ../src/verbs.cpp:2426 ../src/verbs.cpp:2728 msgid "_New" msgstr "_Створити" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2426 msgid "Create new document from the default template" msgstr "Створити новий документ зі стандартного шаблону" -#: ../src/verbs.cpp:2431 +#: ../src/verbs.cpp:2428 msgid "_Open..." msgstr "_Відкрити…" -#: ../src/verbs.cpp:2432 +#: ../src/verbs.cpp:2429 msgid "Open an existing document" msgstr "Відкрити існуючий документ" -#: ../src/verbs.cpp:2433 +#: ../src/verbs.cpp:2430 msgid "Re_vert" msgstr "Від_новити" -#: ../src/verbs.cpp:2434 +#: ../src/verbs.cpp:2431 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "Відновити останню збережену версію документа (зміни будуть втрачені)" -#: ../src/verbs.cpp:2435 +#: ../src/verbs.cpp:2432 msgid "Save document" msgstr "Зберегти документ" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2434 msgid "Save _As..." msgstr "Зберегти _як…" -#: ../src/verbs.cpp:2438 +#: ../src/verbs.cpp:2435 msgid "Save document under a new name" msgstr "Зберегти документ під іншою назвою" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2436 msgid "Save a Cop_y..." msgstr "Зберегти _копію…" -#: ../src/verbs.cpp:2440 +#: ../src/verbs.cpp:2437 msgid "Save a copy of the document under a new name" msgstr "Зберегти копію документа під іншою назвою" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2438 msgid "_Print..." msgstr "Над_рукувати…" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2438 msgid "Print document" msgstr "Надрукувати документ" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2441 msgid "Clean _up document" msgstr "О_чистити документ" -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2441 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" @@ -26194,145 +26399,145 @@ msgstr "" "Прибрати непотрібні визначення (наприклад, градієнти чи вирізання) з <" "defs> документа" -#: ../src/verbs.cpp:2446 +#: ../src/verbs.cpp:2443 msgid "_Import..." msgstr "_Імпортувати…" -#: ../src/verbs.cpp:2447 +#: ../src/verbs.cpp:2444 msgid "Import a bitmap or SVG image into this document" msgstr "Імпортувати зображення (растрове чи SVG) до документа" #. new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."), N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")), -#: ../src/verbs.cpp:2449 +#: ../src/verbs.cpp:2446 msgid "Import Clip Art..." msgstr "_Імпортувати шаблон…" -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2447 msgid "Import clipart from Open Clip Art Library" msgstr "Імпортувати шаблон з бібліотеки Open Clip Art" #. new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL), -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2449 msgid "N_ext Window" msgstr "_Наступне вікно" -#: ../src/verbs.cpp:2453 +#: ../src/verbs.cpp:2450 msgid "Switch to the next document window" msgstr "Перейти до наступного вікна документа" -#: ../src/verbs.cpp:2454 +#: ../src/verbs.cpp:2451 msgid "P_revious Window" msgstr "_Попереднє вікно" -#: ../src/verbs.cpp:2455 +#: ../src/verbs.cpp:2452 msgid "Switch to the previous document window" msgstr "Перейти до попереднього вікна документа" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2453 msgid "_Close" msgstr "_Закрити" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2454 msgid "Close this document window" msgstr "Закрити це вікно документа" -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2455 msgid "_Quit" msgstr "Ви_йти" -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2455 msgid "Quit Inkscape" msgstr "Вийти з Inkscape" -#: ../src/verbs.cpp:2459 +#: ../src/verbs.cpp:2456 msgid "New from _Template..." msgstr "Створити з _шаблона…" -#: ../src/verbs.cpp:2460 +#: ../src/verbs.cpp:2457 msgid "Create new project from template" msgstr "Створити новий проект на основі шаблону" -#: ../src/verbs.cpp:2463 +#: ../src/verbs.cpp:2460 msgid "Undo last action" msgstr "Скасувати останню операцію" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2463 msgid "Do again the last undone action" msgstr "Повторити останню скасовану дію" -#: ../src/verbs.cpp:2467 +#: ../src/verbs.cpp:2464 msgid "Cu_t" msgstr "_Вирізати" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2465 msgid "Cut selection to clipboard" msgstr "Вирізати позначені об'єкти у буфер обміну" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2466 msgid "_Copy" msgstr "_Копіювати" -#: ../src/verbs.cpp:2470 +#: ../src/verbs.cpp:2467 msgid "Copy selection to clipboard" msgstr "Скопіювати позначені об'єкти у буфер обміну" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2468 msgid "_Paste" msgstr "Вст_авити" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2469 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "Вставити об'єкти з буферу обміну або текст у позицію курсора миші" -#: ../src/verbs.cpp:2473 +#: ../src/verbs.cpp:2470 msgid "Paste _Style" msgstr "Вставити _стиль" -#: ../src/verbs.cpp:2474 +#: ../src/verbs.cpp:2471 msgid "Apply the style of the copied object to selection" msgstr "Застосувати стиль скопійованого об'єкта до позначених об'єктів" -#: ../src/verbs.cpp:2476 +#: ../src/verbs.cpp:2473 msgid "Scale selection to match the size of the copied object" msgstr "" "Зміна масштабу позначених об'єктів з метою задовольнити розміру копійованого " "об'єкта" -#: ../src/verbs.cpp:2477 +#: ../src/verbs.cpp:2474 msgid "Paste _Width" msgstr "Вставити _ширину" -#: ../src/verbs.cpp:2478 +#: ../src/verbs.cpp:2475 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" "Змінити масштаб позначених об'єктів за горизонтальним розміром з метою " "відповідності ширині копійованого об'єкта" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2476 msgid "Paste _Height" msgstr "Вставити _висоту" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2477 msgid "Scale selection vertically to match the height of the copied object" msgstr "" "Змінити масштаб позначених об'єктів за вертикальним розміром з метою " "відповідності висоті копійованого об'єкта" -#: ../src/verbs.cpp:2481 +#: ../src/verbs.cpp:2478 msgid "Paste Size Separately" msgstr "Вставити розмір окремо" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2479 msgid "Scale each selected object to match the size of the copied object" msgstr "" "Змінити кожного позначеного об'єкта з метою відповідності розміру " "копійованого об'єкта" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2480 msgid "Paste Width Separately" msgstr "Вставити ширину окремо" -#: ../src/verbs.cpp:2484 +#: ../src/verbs.cpp:2481 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" @@ -26340,11 +26545,11 @@ msgstr "" "Змінити масштаб кожного позначеного об'єкта за горизонтальним розміром з " "метою відповідності ширині копійованого об'єкта" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2482 msgid "Paste Height Separately" msgstr "Вставити висоту окремо" -#: ../src/verbs.cpp:2486 +#: ../src/verbs.cpp:2483 msgid "" "Scale each selected object vertically to match the height of the copied " "object" @@ -26352,67 +26557,67 @@ msgstr "" "Змінити масштаб кожного позначеного об'єкта за вертикальним розміром з метою " "відповідності висоті копійованого об'єкта" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2484 msgid "Paste _In Place" msgstr "Вставити на _місце" -#: ../src/verbs.cpp:2488 +#: ../src/verbs.cpp:2485 msgid "Paste objects from clipboard to the original location" msgstr "Вставити об'єкти з буфера у місце, де вони були раніше" -#: ../src/verbs.cpp:2489 +#: ../src/verbs.cpp:2486 msgid "Paste Path _Effect" msgstr "Вставити _ефект контуру" -#: ../src/verbs.cpp:2490 +#: ../src/verbs.cpp:2487 msgid "Apply the path effect of the copied object to selection" msgstr "Застосувати ефект контуру скопійованого об'єкта до позначених об'єктів" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2488 msgid "Remove Path _Effect" msgstr "Вилучити _ефект контуру" -#: ../src/verbs.cpp:2492 +#: ../src/verbs.cpp:2489 msgid "Remove any path effects from selected objects" msgstr "Вилучити всі ефекти контурів з позначених об'єктів" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2490 msgid "_Remove Filters" msgstr "В_илучити фільтри" -#: ../src/verbs.cpp:2494 +#: ../src/verbs.cpp:2491 msgid "Remove any filters from selected objects" msgstr "Вилучити всі наслідки застосування фільтрів з позначених об'єктів" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2492 msgid "_Delete" msgstr "В_илучити" -#: ../src/verbs.cpp:2496 +#: ../src/verbs.cpp:2493 msgid "Delete selection" msgstr "Вилучити позначені об'єкти" -#: ../src/verbs.cpp:2497 +#: ../src/verbs.cpp:2494 msgid "Duplic_ate" msgstr "_Дублювати" -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2495 msgid "Duplicate selected objects" msgstr "Дублювати позначені об'єкти" -#: ../src/verbs.cpp:2499 +#: ../src/verbs.cpp:2496 msgid "Create Clo_ne" msgstr "Створити к_лон" -#: ../src/verbs.cpp:2500 +#: ../src/verbs.cpp:2497 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "Створити клон (копію, пов'язану з оригіналом) позначеного об'єкта" -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2498 msgid "Unlin_k Clone" msgstr "В_ід'єднати клон" -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2499 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" @@ -26420,29 +26625,29 @@ msgstr "" "Вирізати вибрані посилання клонів на оригінали з перетворенням їх на окремі " "об'єкти" -#: ../src/verbs.cpp:2503 +#: ../src/verbs.cpp:2500 msgid "Relink to Copied" msgstr "Перез'єднати з копійованим" -#: ../src/verbs.cpp:2504 +#: ../src/verbs.cpp:2501 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "" "Перез'єднати вибрані клони з об'єктом, який зараз перебуває у буфері обміну " "даними" -#: ../src/verbs.cpp:2505 +#: ../src/verbs.cpp:2502 msgid "Select _Original" msgstr "Позначити о_ригінал" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2503 msgid "Select the object to which the selected clone is linked" msgstr "Позначити об'єкт, з яким пов'язаний вибраний клон" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2504 msgid "Clone original path (LPE)" msgstr "Клонувати початковий контур (геометрично)" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2505 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" @@ -26450,19 +26655,19 @@ msgstr "" "Створює новий контур, застосовує геометричне перетворення клонування " "початкового контуру і пов'язує його з вибраним контуром" -#: ../src/verbs.cpp:2509 +#: ../src/verbs.cpp:2506 msgid "Objects to _Marker" msgstr "Об'єкти у _маркер" -#: ../src/verbs.cpp:2510 +#: ../src/verbs.cpp:2507 msgid "Convert selection to a line marker" msgstr "Перетворити вибране на маркер лінії" -#: ../src/verbs.cpp:2511 +#: ../src/verbs.cpp:2508 msgid "Objects to Gu_ides" msgstr "Об'єкти у на_прямні" -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2509 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" @@ -26470,92 +26675,92 @@ msgstr "" "Перетворити вибрані об'єкти на декілька напрямних, вирівняних за краями " "об'єктів" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2510 msgid "Objects to Patter_n" msgstr "О_б'єкти у візерунок" -#: ../src/verbs.cpp:2514 +#: ../src/verbs.cpp:2511 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "Перетворити позначені об'єкти у прямокутник, заповнений візерунком" -#: ../src/verbs.cpp:2515 +#: ../src/verbs.cpp:2512 msgid "Pattern to _Objects" msgstr "_Візерунок у об'єкти" -#: ../src/verbs.cpp:2516 +#: ../src/verbs.cpp:2513 msgid "Extract objects from a tiled pattern fill" msgstr "Витягнути об'єкти з текстурного заповнення" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2514 msgid "Group to Symbol" msgstr "Групу на символ" -#: ../src/verbs.cpp:2518 +#: ../src/verbs.cpp:2515 msgid "Convert group to a symbol" msgstr "Перетворити групу на символ" -#: ../src/verbs.cpp:2519 +#: ../src/verbs.cpp:2516 msgid "Symbol to Group" msgstr "Символ у групу" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2517 msgid "Extract group from a symbol" msgstr "Видобути групу з символу" -#: ../src/verbs.cpp:2521 +#: ../src/verbs.cpp:2518 msgid "Clea_r All" msgstr "О_чистити все" -#: ../src/verbs.cpp:2522 +#: ../src/verbs.cpp:2519 msgid "Delete all objects from document" msgstr "Вилучити усі об'єкти з документа" -#: ../src/verbs.cpp:2523 +#: ../src/verbs.cpp:2520 msgid "Select Al_l" msgstr "Поз_начити все" -#: ../src/verbs.cpp:2524 +#: ../src/verbs.cpp:2521 msgid "Select all objects or all nodes" msgstr "Позначити всі об'єкти чи всі вузли" -#: ../src/verbs.cpp:2525 +#: ../src/verbs.cpp:2522 msgid "Select All in All La_yers" msgstr "Позначити все в усіх _шарах" -#: ../src/verbs.cpp:2526 +#: ../src/verbs.cpp:2523 msgid "Select all objects in all visible and unlocked layers" msgstr "Позначити усі об'єкти в усіх видимих та розблокованих шарах" -#: ../src/verbs.cpp:2527 +#: ../src/verbs.cpp:2524 msgid "Fill _and Stroke" msgstr "Заповнення _та штрих" -#: ../src/verbs.cpp:2528 +#: ../src/verbs.cpp:2525 msgid "" "Select all objects with the same fill and stroke as the selected objects" msgstr "Позначити всі об'єкти з тим самим заповненням та штрихом" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2526 msgid "_Fill Color" msgstr "За_повнити кольором" -#: ../src/verbs.cpp:2530 +#: ../src/verbs.cpp:2527 msgid "Select all objects with the same fill as the selected objects" msgstr "Позначити всі об'єкти з тим самим заповненням" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2528 msgid "_Stroke Color" msgstr "Колір _штриха" -#: ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2529 msgid "Select all objects with the same stroke as the selected objects" msgstr "Позначити всі об'єкти з тим самим штрихом" -#: ../src/verbs.cpp:2533 +#: ../src/verbs.cpp:2530 msgid "Stroke St_yle" msgstr "С_тиль штриха" -#: ../src/verbs.cpp:2534 +#: ../src/verbs.cpp:2531 msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " "selected objects" @@ -26563,11 +26768,11 @@ msgstr "" "Позначити всі об'єкти з тим самим типом штриха (товщиною, рисками, " "позначками)" -#: ../src/verbs.cpp:2535 +#: ../src/verbs.cpp:2532 msgid "_Object Type" msgstr "Тип _об'єкта" -#: ../src/verbs.cpp:2536 +#: ../src/verbs.cpp:2533 msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " "etc) as the selected objects" @@ -26575,164 +26780,172 @@ msgstr "" "Позначити всі об'єкти з тим самим типом об'єкта (прямокутник, дуга, текст, " "контур, растрове зображення тощо), що і позначені об'єкти" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2534 msgid "In_vert Selection" msgstr "_Інвертувати позначення" -#: ../src/verbs.cpp:2538 +#: ../src/verbs.cpp:2535 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "" "Інвертувати позначення (зняти позначення з позначеного та позначити решту)" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2536 msgid "Invert in All Layers" msgstr "Інвертувати в усіх шарах" -#: ../src/verbs.cpp:2540 +#: ../src/verbs.cpp:2537 msgid "Invert selection in all visible and unlocked layers" msgstr "Інвертувати позначення в усіх видимих та незаблокованих шарах" -#: ../src/verbs.cpp:2541 +#: ../src/verbs.cpp:2538 msgid "Select Next" msgstr "Обрати наступний" -#: ../src/verbs.cpp:2542 +#: ../src/verbs.cpp:2539 msgid "Select next object or node" msgstr "Обрати наступний об'єкт або вузол" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2540 msgid "Select Previous" msgstr "Обрати попереднє" -#: ../src/verbs.cpp:2544 +#: ../src/verbs.cpp:2541 msgid "Select previous object or node" msgstr "Обрати попередній об'єкт чи вузол" -#: ../src/verbs.cpp:2545 +#: ../src/verbs.cpp:2542 msgid "D_eselect" msgstr "Зн_яти позначення" -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2543 msgid "Deselect any selected objects or nodes" msgstr "Зняти позначення з усіх об'єктів чи вузлів" -#: ../src/verbs.cpp:2548 +#: ../src/verbs.cpp:2545 msgid "Delete all the guides in the document" msgstr "Вилучити усі напрямні у документі" -#: ../src/verbs.cpp:2549 +#: ../src/verbs.cpp:2546 msgid "Lock All Guides" msgstr "Заблокувати усі напрямні" -#: ../src/verbs.cpp:2549 ../src/widgets/desktop-widget.cpp:402 +#: ../src/verbs.cpp:2546 ../src/widgets/desktop-widget.cpp:402 msgid "Toggle lock of all guides in the document" msgstr "Увімкнути або вимкнути блокування усіх напрямних у документі" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2547 msgid "Create _Guides Around the Page" msgstr "Створити _напрямні навколо сторінки" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2548 msgid "Create four guides aligned with the page borders" msgstr "Створити чотири напрямні за краями сторінки" -#: ../src/verbs.cpp:2552 +#: ../src/verbs.cpp:2549 msgid "Next path effect parameter" msgstr "Наступний параметр ефекту контуру" -#: ../src/verbs.cpp:2553 +#: ../src/verbs.cpp:2550 msgid "Show next editable path effect parameter" msgstr "Показати наступний придатний до редагування параметр ефекту контуру" #. Selection -#: ../src/verbs.cpp:2556 +#: ../src/verbs.cpp:2553 msgid "Raise to _Top" msgstr "Підняти на п_ередній план" -#: ../src/verbs.cpp:2557 +#: ../src/verbs.cpp:2554 msgid "Raise selection to top" msgstr "Підняти позначені об'єкти на передній план" -#: ../src/verbs.cpp:2558 +#: ../src/verbs.cpp:2555 msgid "Lower to _Bottom" msgstr "Опустити на з_адній план" -#: ../src/verbs.cpp:2559 +#: ../src/verbs.cpp:2556 msgid "Lower selection to bottom" msgstr "Опустити позначені об'єкти на задній план" -#: ../src/verbs.cpp:2560 +#: ../src/verbs.cpp:2557 msgid "_Raise" msgstr "_Підняти" -#: ../src/verbs.cpp:2561 +#: ../src/verbs.cpp:2558 msgid "Raise selection one step" msgstr "Підняти позначені об'єкти на один рівень" -#: ../src/verbs.cpp:2562 +#: ../src/verbs.cpp:2559 msgid "_Lower" msgstr "_Опустити" -#: ../src/verbs.cpp:2563 +#: ../src/verbs.cpp:2560 msgid "Lower selection one step" msgstr "Опустити позначені об'єкти на один рівень" -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2562 msgid "Group selected objects" msgstr "Згрупувати позначені об'єкти" -#: ../src/verbs.cpp:2567 +#: ../src/verbs.cpp:2564 msgid "Ungroup selected groups" msgstr "Розгрупувати позначені групи" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2565 +msgid "_Pop selected objects out of group" +msgstr "Ви_ключити позначені об’єкти з групи" + +#: ../src/verbs.cpp:2566 +msgid "Pop selected objects out of group" +msgstr "Виключити позначені об’єкти з групи" + +#: ../src/verbs.cpp:2568 msgid "_Put on Path" msgstr "_Розмістити по контуру" -#: ../src/verbs.cpp:2571 +#: ../src/verbs.cpp:2570 msgid "_Remove from Path" msgstr "Відокрем_ити від контуру" -#: ../src/verbs.cpp:2573 +#: ../src/verbs.cpp:2572 msgid "Remove Manual _Kerns" msgstr "Вилучити ручний _міжлітерний інтервал" #. TRANSLATORS: "glyph": An image used in the visual representation of characters; #. roughly speaking, how a character looks. A font is a set of glyphs. -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2575 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "" "Вилучити з текстового об'єкта усі додані вручну повороти кернів та гліфів" -#: ../src/verbs.cpp:2578 +#: ../src/verbs.cpp:2577 msgid "_Union" msgstr "С_ума" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2578 msgid "Create union of selected paths" msgstr "Створення об'єднання позначених контурів" -#: ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2579 msgid "_Intersection" msgstr "_Перетин" -#: ../src/verbs.cpp:2581 +#: ../src/verbs.cpp:2580 msgid "Create intersection of selected paths" msgstr "Створення перетину позначених контурів" -#: ../src/verbs.cpp:2582 +#: ../src/verbs.cpp:2581 msgid "_Difference" msgstr "Р_ізниця" -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2582 msgid "Create difference of selected paths (bottom minus top)" msgstr "Створення різниці позначених контурів (низ мінус верх)" -#: ../src/verbs.cpp:2584 +#: ../src/verbs.cpp:2583 msgid "E_xclusion" msgstr "Виключне _АБО" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2584 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" @@ -26740,21 +26953,21 @@ msgstr "" "Створити контур шляхом виключного АБО з позначених контурів (ті частини, що " "належать тільки одному з контурів)" -#: ../src/verbs.cpp:2586 +#: ../src/verbs.cpp:2585 msgid "Di_vision" msgstr "_Ділення" -#: ../src/verbs.cpp:2587 +#: ../src/verbs.cpp:2586 msgid "Cut the bottom path into pieces" msgstr "Розрізати нижній контур верхнім на частини" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2590 +#: ../src/verbs.cpp:2589 msgid "Cut _Path" msgstr "Розрізати _контур" -#: ../src/verbs.cpp:2591 +#: ../src/verbs.cpp:2590 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "" "Розрізати штрих нижнього контуру верхнім на частини, з вилученням заповнення" @@ -26762,357 +26975,357 @@ msgstr "" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2595 +#: ../src/verbs.cpp:2594 msgid "Outs_et" msgstr "Ро_зтягнути" -#: ../src/verbs.cpp:2596 +#: ../src/verbs.cpp:2595 msgid "Outset selected paths" msgstr "Розтягнути позначені контури" -#: ../src/verbs.cpp:2598 +#: ../src/verbs.cpp:2597 msgid "O_utset Path by 1 px" msgstr "Р_озтягнути на 1 точку" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2598 msgid "Outset selected paths by 1 px" msgstr "Розтягнути позначені контури на 1 точку" -#: ../src/verbs.cpp:2601 +#: ../src/verbs.cpp:2600 msgid "O_utset Path by 10 px" msgstr "Р_озтягнути на 10 точок" -#: ../src/verbs.cpp:2602 +#: ../src/verbs.cpp:2601 msgid "Outset selected paths by 10 px" msgstr "Розтягнути позначені контури на 10 точок" #. TRANSLATORS: "inset": contract a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. #. See also the Advanced Tutorial for explanation. -#: ../src/verbs.cpp:2606 +#: ../src/verbs.cpp:2605 msgid "I_nset" msgstr "В_тягнути" -#: ../src/verbs.cpp:2607 +#: ../src/verbs.cpp:2606 msgid "Inset selected paths" msgstr "Втягнути позначені контури" -#: ../src/verbs.cpp:2609 +#: ../src/verbs.cpp:2608 msgid "I_nset Path by 1 px" msgstr "Вт_ягнути контур на 1 точку" -#: ../src/verbs.cpp:2610 +#: ../src/verbs.cpp:2609 msgid "Inset selected paths by 1 px" msgstr "Втягнути позначені контури на 1 точку" -#: ../src/verbs.cpp:2612 +#: ../src/verbs.cpp:2611 msgid "I_nset Path by 10 px" msgstr "Вт_ягнути контур на 10 точок" -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2612 msgid "Inset selected paths by 10 px" msgstr "Втягнути позначені контури на 10 точок" -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2614 msgid "D_ynamic Offset" msgstr "Д_инамічний відступ" -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2614 msgid "Create a dynamic offset object" msgstr "" "Створити об'єкт, втягування/розтягування якого можна змінювати динамічно" -#: ../src/verbs.cpp:2617 +#: ../src/verbs.cpp:2616 msgid "_Linked Offset" msgstr "Зв'_язане втягування" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2617 msgid "Create a dynamic offset object linked to the original path" msgstr "" "Створити втягування/розтягування, динамічно пов'язане з початковим контуром" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2619 msgid "_Stroke to Path" msgstr "_Штрих у контур" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2620 msgid "Convert selected object's stroke to paths" msgstr "Перетворити штрих позначеного об'єкта на контури" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2621 msgid "Si_mplify" msgstr "_Спростити" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2622 msgid "Simplify selected paths (remove extra nodes)" msgstr "Спростити позначені контури вилученням зайвих вузлів" -#: ../src/verbs.cpp:2624 +#: ../src/verbs.cpp:2623 msgid "_Reverse" msgstr "Роз_вернути" -#: ../src/verbs.cpp:2625 +#: ../src/verbs.cpp:2624 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" "Змінити напрямок позначених контурів на протилежний (корисно для " "віддзеркалення маркерів)" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2629 msgid "Create one or more paths from a bitmap by tracing it" msgstr "" "Створення одного або більше контурів з растрового файла шляхом трасування" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2632 msgid "Trace Pixel Art..." msgstr "Трасування растрової графіки…" -#: ../src/verbs.cpp:2634 +#: ../src/verbs.cpp:2633 msgid "Create paths using Kopf-Lischinski algorithm to vectorize pixel art" msgstr "" "Створити контури за алгоритмом Копфа-Ліщинського для векторизації растрової " "графіки" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2634 msgid "Make a _Bitmap Copy" msgstr "З_робити растрову копію" -#: ../src/verbs.cpp:2636 +#: ../src/verbs.cpp:2635 msgid "Export selection to a bitmap and insert it into document" msgstr "Експортувати позначені об'єкти у растр та вставити його у документ" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2636 msgid "_Combine" msgstr "Об'_єднати" -#: ../src/verbs.cpp:2638 +#: ../src/verbs.cpp:2637 msgid "Combine several paths into one" msgstr "Об'єднати декілька контурів у один" #. TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the #. Advanced tutorial for more info -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2640 msgid "Break _Apart" msgstr "_Розділити" -#: ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2641 msgid "Break selected paths into subpaths" msgstr "Розділити позначені контури на частини" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2642 msgid "_Arrange..." msgstr "_Компонувати…" -#: ../src/verbs.cpp:2644 +#: ../src/verbs.cpp:2643 msgid "Arrange selected objects in a table or circle" msgstr "Компонувати позначені об'єкти у формі таблиці або за колом" #. Layer -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2645 msgid "_Add Layer..." msgstr "_Додати шар…" -#: ../src/verbs.cpp:2647 +#: ../src/verbs.cpp:2646 msgid "Create a new layer" msgstr "Створити новий шар" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2647 msgid "Re_name Layer..." msgstr "Пере_йменувати шар…" -#: ../src/verbs.cpp:2649 +#: ../src/verbs.cpp:2648 msgid "Rename the current layer" msgstr "Перейменувати поточний шар" -#: ../src/verbs.cpp:2650 +#: ../src/verbs.cpp:2649 msgid "Switch to Layer Abov_e" msgstr "Перейти на шар _вище" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2650 msgid "Switch to the layer above the current" msgstr "Перейти на шар, що знаходиться вище від поточного" -#: ../src/verbs.cpp:2652 +#: ../src/verbs.cpp:2651 msgid "Switch to Layer Belo_w" msgstr "Перейти на шар _нижче" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2652 msgid "Switch to the layer below the current" msgstr "Перейти на шар, що знаходиться нижче від поточного" -#: ../src/verbs.cpp:2654 +#: ../src/verbs.cpp:2653 msgid "Move Selection to Layer Abo_ve" msgstr "Перемістити позначені об'єкти на шар ви_ще" -#: ../src/verbs.cpp:2655 +#: ../src/verbs.cpp:2654 msgid "Move selection to the layer above the current" msgstr "Перемістити на шар, що знаходиться над поточним" -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2655 msgid "Move Selection to Layer Bel_ow" msgstr "Перемістити на шар ни_жче" -#: ../src/verbs.cpp:2657 +#: ../src/verbs.cpp:2656 msgid "Move selection to the layer below the current" msgstr "Перемістити на шар, що знаходиться під поточним" -#: ../src/verbs.cpp:2658 +#: ../src/verbs.cpp:2657 msgid "Move Selection to Layer..." msgstr "Пересунути позначене до шару…" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2659 msgid "Layer to _Top" msgstr "Підняти шар до_гори" -#: ../src/verbs.cpp:2661 +#: ../src/verbs.cpp:2660 msgid "Raise the current layer to the top" msgstr "Підняти поточний шар догори" -#: ../src/verbs.cpp:2662 +#: ../src/verbs.cpp:2661 msgid "Layer to _Bottom" msgstr "Опустити шар в _основу" -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2662 msgid "Lower the current layer to the bottom" msgstr "Опустити поточний шар на найнижчий рівень" -#: ../src/verbs.cpp:2664 +#: ../src/verbs.cpp:2663 msgid "_Raise Layer" msgstr "_Підняти шар" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2664 msgid "Raise the current layer" msgstr "Підняти поточний шар" -#: ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2665 msgid "_Lower Layer" msgstr "_Опустити шар" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2666 msgid "Lower the current layer" msgstr "Опустити поточний шар" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2667 msgid "D_uplicate Current Layer" msgstr "Д_ублювати поточний шар" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2668 msgid "Duplicate an existing layer" msgstr "Дублювати поточний шар" -#: ../src/verbs.cpp:2670 +#: ../src/verbs.cpp:2669 msgid "_Delete Current Layer" msgstr "В_илучити поточний шар" -#: ../src/verbs.cpp:2671 +#: ../src/verbs.cpp:2670 msgid "Delete the current layer" msgstr "Вилучити поточний шар" -#: ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2671 msgid "_Show/hide other layers" msgstr "_Показати або сховати інші шари" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2672 msgid "Solo the current layer" msgstr "Виокремити поточний шар" -#: ../src/verbs.cpp:2674 +#: ../src/verbs.cpp:2673 msgid "_Show all layers" msgstr "По_казати всі шари" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2674 msgid "Show all the layers" msgstr "Показати всі шари" -#: ../src/verbs.cpp:2676 +#: ../src/verbs.cpp:2675 msgid "_Hide all layers" msgstr "При_ховати всі шари" -#: ../src/verbs.cpp:2677 +#: ../src/verbs.cpp:2676 msgid "Hide all the layers" msgstr "Приховати всі шари" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2677 msgid "_Lock all layers" msgstr "За_блокувати всі шари" -#: ../src/verbs.cpp:2679 +#: ../src/verbs.cpp:2678 msgid "Lock all the layers" msgstr "Заблокувати всі шари" -#: ../src/verbs.cpp:2680 +#: ../src/verbs.cpp:2679 msgid "Lock/Unlock _other layers" msgstr "Заблокувати чи розблокувати ін_ші шари" -#: ../src/verbs.cpp:2681 +#: ../src/verbs.cpp:2680 msgid "Lock all the other layers" msgstr "Заблокувати всі інші шари" -#: ../src/verbs.cpp:2682 +#: ../src/verbs.cpp:2681 msgid "_Unlock all layers" msgstr "_Розблокувати всі шари" -#: ../src/verbs.cpp:2683 +#: ../src/verbs.cpp:2682 msgid "Unlock all the layers" msgstr "Розблокувати всі шари" -#: ../src/verbs.cpp:2684 +#: ../src/verbs.cpp:2683 msgid "_Lock/Unlock Current Layer" msgstr "За_блокувати чи розблокувати поточний шар" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2684 msgid "Toggle lock on current layer" msgstr "Заблокувати або розблокувати поточний шар" -#: ../src/verbs.cpp:2686 +#: ../src/verbs.cpp:2685 msgid "_Show/hide Current Layer" msgstr "_Показати або сховати поточний шар" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2686 msgid "Toggle visibility of current layer" msgstr "Увімкнути/Вимкнути видимість поточного шару" #. Object -#: ../src/verbs.cpp:2690 +#: ../src/verbs.cpp:2689 msgid "Rotate _90° CW" msgstr "Обернути на _90° за годинниковою стрілкою" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2692 msgid "Rotate selection 90° clockwise" msgstr "Обернути позначені об'єкти на 90° за годинниковою стрілкою" -#: ../src/verbs.cpp:2694 +#: ../src/verbs.cpp:2693 msgid "Rotate 9_0° CCW" msgstr "Обернути на 9_0° проти годинникової стрілки" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2697 +#: ../src/verbs.cpp:2696 msgid "Rotate selection 90° counter-clockwise" msgstr "Обернути позначені об'єкти на 90° проти годинникової стрілки" -#: ../src/verbs.cpp:2698 +#: ../src/verbs.cpp:2697 msgid "Remove _Transformations" msgstr "Прибрати _трансформацію" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2698 msgid "Remove transformations from object" msgstr "Прибрати трансформації з об'єкта" -#: ../src/verbs.cpp:2700 +#: ../src/verbs.cpp:2699 msgid "_Object to Path" msgstr "_Об'єкт у контур" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2700 msgid "Convert selected object to path" msgstr "Перетворити позначений об'єкт на контур" -#: ../src/verbs.cpp:2702 +#: ../src/verbs.cpp:2701 msgid "_Flow into Frame" msgstr "_Огорнути в рамку" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2702 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" @@ -27120,746 +27333,746 @@ msgstr "" "Вкласти текст у рамку (контур чи форму), створивши контурний текст " "прив'язаний до об'єкта рамки" -#: ../src/verbs.cpp:2704 +#: ../src/verbs.cpp:2703 msgid "_Unflow" msgstr "_Вийняти з рамки" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2704 msgid "Remove text from frame (creates a single-line text object)" msgstr "Вийняти тест з рамки, створивши звичайний тестовий об'єкт в один рядок" -#: ../src/verbs.cpp:2706 +#: ../src/verbs.cpp:2705 msgid "_Convert to Text" msgstr "_Перетворити у текст" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2706 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "Перетворити контурний текст у звичайний текст (із збереженням вигляду)" -#: ../src/verbs.cpp:2709 +#: ../src/verbs.cpp:2708 msgid "Flip _Horizontal" msgstr "Віддзеркалити гор_изонтально" -#: ../src/verbs.cpp:2709 +#: ../src/verbs.cpp:2708 msgid "Flip selected objects horizontally" msgstr "Віддзеркалити позначені об'єкти горизонтально" -#: ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2711 msgid "Flip _Vertical" msgstr "Віддзеркалити _вертикально" -#: ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2711 msgid "Flip selected objects vertically" msgstr "Віддзеркалити позначені об'єкти вертикально" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2714 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "" "Застосувати маску до позначених об'єктів (використовуючи найвищий об'єкт як " "маску)" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2716 msgid "Edit mask" msgstr "Змінити маску" -#: ../src/verbs.cpp:2718 ../src/verbs.cpp:2726 +#: ../src/verbs.cpp:2717 ../src/verbs.cpp:2725 msgid "_Release" msgstr "_Скинути" -#: ../src/verbs.cpp:2719 +#: ../src/verbs.cpp:2718 msgid "Remove mask from selection" msgstr "Вилучити маску з позначеного" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2720 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" msgstr "" "Застосувати контур-обгортку до позначених об'єктів (використовуючи найвищий " "об'єкт як контур-обгортку)" -#: ../src/verbs.cpp:2722 +#: ../src/verbs.cpp:2721 msgid "Create Cl_ip Group" msgstr "Створити групу-обгор_тку" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2722 msgid "Creates a clip group using the selected objects as a base" msgstr "Створити групу-обгортку на основі позначених об’єктів" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2724 msgid "Edit clipping path" msgstr "Змінити контур-обгортку" -#: ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2726 msgid "Remove clipping path from selection" msgstr "Вилучити контур-обгортку з позначених об'єктів'" #. Tools -#: ../src/verbs.cpp:2732 +#: ../src/verbs.cpp:2731 msgctxt "ContextVerb" msgid "Select" msgstr "Позначення" -#: ../src/verbs.cpp:2733 +#: ../src/verbs.cpp:2732 msgid "Select and transform objects" msgstr "Позначення та трансформація об'єктів" -#: ../src/verbs.cpp:2734 +#: ../src/verbs.cpp:2733 msgctxt "ContextVerb" msgid "Node Edit" msgstr "Редактор вузлів" -#: ../src/verbs.cpp:2735 +#: ../src/verbs.cpp:2734 msgid "Edit paths by nodes" msgstr "Редагування контурів за вузлами" -#: ../src/verbs.cpp:2736 +#: ../src/verbs.cpp:2735 msgctxt "ContextVerb" msgid "Tweak" msgstr "Корекція" -#: ../src/verbs.cpp:2737 +#: ../src/verbs.cpp:2736 msgid "Tweak objects by sculpting or painting" msgstr "Коригувати об'єкти за допомогою профілювання або розфарбовування" -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2737 msgctxt "ContextVerb" msgid "Spray" msgstr "Розкидання" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2738 msgid "Spray objects by sculpting or painting" msgstr "Розкидати об'єкти за допомогою профілювання або розфарбовування" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2739 msgctxt "ContextVerb" msgid "Rectangle" msgstr "Прямокутник" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2740 msgid "Create rectangles and squares" msgstr "Створення прямокутників та квадратів" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2741 msgctxt "ContextVerb" msgid "3D Box" msgstr "Просторовий об'єкт" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2742 msgid "Create 3D boxes" msgstr "Створити тривимірні об'єкти" -#: ../src/verbs.cpp:2744 +#: ../src/verbs.cpp:2743 msgctxt "ContextVerb" msgid "Ellipse" msgstr "Еліпс" -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2744 msgid "Create circles, ellipses, and arcs" msgstr "Створення кіл, еліпсів та дуг" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2745 msgctxt "ContextVerb" msgid "Star" msgstr "Зірка" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2746 msgid "Create stars and polygons" msgstr "Створення зірок та багатокутників" -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2747 msgctxt "ContextVerb" msgid "Spiral" msgstr "Спіраль" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2748 msgid "Create spirals" msgstr "Створення спіралей" -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2749 msgctxt "ContextVerb" msgid "Pencil" msgstr "Олівець" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2750 msgid "Draw freehand lines" msgstr "Малювання довільних контурів" -#: ../src/verbs.cpp:2752 +#: ../src/verbs.cpp:2751 msgctxt "ContextVerb" msgid "Pen" msgstr "Перо" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2752 msgid "Draw Bezier curves and straight lines" msgstr "Малювання кривих Безьє чи прямих ліній" -#: ../src/verbs.cpp:2754 +#: ../src/verbs.cpp:2753 msgctxt "ContextVerb" msgid "Calligraphy" msgstr "Каліграфія" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2754 msgid "Draw calligraphic or brush strokes" msgstr "Малювати каліграфічним пером або пензлем" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2756 msgid "Create and edit text objects" msgstr "Створення та зміна текстових об'єктів" -#: ../src/verbs.cpp:2758 +#: ../src/verbs.cpp:2757 msgctxt "ContextVerb" msgid "Gradient" msgstr "Градієнт" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2758 msgid "Create and edit gradients" msgstr "Створення та зміна градієнтів" -#: ../src/verbs.cpp:2760 +#: ../src/verbs.cpp:2759 msgctxt "ContextVerb" msgid "Mesh" msgstr "Сітка" -#: ../src/verbs.cpp:2761 +#: ../src/verbs.cpp:2760 msgid "Create and edit meshes" msgstr "Створення та зміна сіток" -#: ../src/verbs.cpp:2762 +#: ../src/verbs.cpp:2761 msgctxt "ContextVerb" msgid "Zoom" msgstr "Масштаб" -#: ../src/verbs.cpp:2763 +#: ../src/verbs.cpp:2762 msgid "Zoom in or out" msgstr "Змінити масштаб" -#: ../src/verbs.cpp:2765 +#: ../src/verbs.cpp:2764 msgid "Measurement tool" msgstr "Інструмент вимірювання" -#: ../src/verbs.cpp:2766 +#: ../src/verbs.cpp:2765 msgctxt "ContextVerb" msgid "Dropper" msgstr "Піпетка" -#: ../src/verbs.cpp:2768 +#: ../src/verbs.cpp:2767 msgctxt "ContextVerb" msgid "Connector" msgstr "Лінія з'єднання" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2768 msgid "Create diagram connectors" msgstr "Створити лінії з'єднання на діаграмі" -#: ../src/verbs.cpp:2772 +#: ../src/verbs.cpp:2771 msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "Відро з фарбою" -#: ../src/verbs.cpp:2773 +#: ../src/verbs.cpp:2772 msgid "Fill bounded areas" msgstr "Заповнити замкнені області" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2775 msgctxt "ContextVerb" msgid "LPE Edit" msgstr "Редагування геометричних побудов" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2776 msgid "Edit Path Effect parameters" msgstr "Змінити параметри ефекту контуру" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2777 msgctxt "ContextVerb" msgid "Eraser" msgstr "Гумка" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2778 msgid "Erase existing paths" msgstr "Витерти існуючі контури" -#: ../src/verbs.cpp:2780 +#: ../src/verbs.cpp:2779 msgctxt "ContextVerb" msgid "LPE Tool" msgstr "Інструмент геометричної побудови" -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2780 msgid "Do geometric constructions" msgstr "Виконати геометричну побудову" #. Tool prefs -#: ../src/verbs.cpp:2783 +#: ../src/verbs.cpp:2782 msgid "Selector Preferences" msgstr "Параметри селектора" -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2783 msgid "Open Preferences for the Selector tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента позначення" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2784 msgid "Node Tool Preferences" msgstr "Параметри редактора вузлів" -#: ../src/verbs.cpp:2786 +#: ../src/verbs.cpp:2785 msgid "Open Preferences for the Node tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Редактор вузлів»" -#: ../src/verbs.cpp:2787 +#: ../src/verbs.cpp:2786 msgid "Tweak Tool Preferences" msgstr "Параметри інструмента «Корекція»" -#: ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2787 msgid "Open Preferences for the Tweak tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Корекція»" -#: ../src/verbs.cpp:2789 +#: ../src/verbs.cpp:2788 msgid "Spray Tool Preferences" msgstr "Параметри інструмента «Розкидання»" -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2789 msgid "Open Preferences for the Spray tool" msgstr "Відкрити вікно параметрів для інструмента «Розкидання»" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2790 msgid "Rectangle Preferences" msgstr "Параметри прямокутника" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2791 msgid "Open Preferences for the Rectangle tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Прямокутник»" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2792 msgid "3D Box Preferences" msgstr "Параметри просторового об'єкта" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2793 msgid "Open Preferences for the 3D Box tool" msgstr "" "Відкрити вікно параметрів Inkscape для інструмента «Просторовий об'єкт»" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2794 msgid "Ellipse Preferences" msgstr "Параметри еліпса" -#: ../src/verbs.cpp:2796 +#: ../src/verbs.cpp:2795 msgid "Open Preferences for the Ellipse tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Еліпс»" -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2796 msgid "Star Preferences" msgstr "Властивості зірки" -#: ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2797 msgid "Open Preferences for the Star tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Зірка»" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2798 msgid "Spiral Preferences" msgstr "Властивості спіралі" -#: ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2799 msgid "Open Preferences for the Spiral tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Спіраль»" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2800 msgid "Pencil Preferences" msgstr "Параметри олівця" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2801 msgid "Open Preferences for the Pencil tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Олівець»" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2802 msgid "Pen Preferences" msgstr "Параметри пера" -#: ../src/verbs.cpp:2804 +#: ../src/verbs.cpp:2803 msgid "Open Preferences for the Pen tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Перо»" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2804 msgid "Calligraphic Preferences" msgstr "Параметри каліграфічного пера" -#: ../src/verbs.cpp:2806 +#: ../src/verbs.cpp:2805 msgid "Open Preferences for the Calligraphy tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Каліграфічне перо»" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2806 msgid "Text Preferences" msgstr "Параметри тексту" -#: ../src/verbs.cpp:2808 +#: ../src/verbs.cpp:2807 msgid "Open Preferences for the Text tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Текст»" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2808 msgid "Gradient Preferences" msgstr "Параметри градієнта" -#: ../src/verbs.cpp:2810 +#: ../src/verbs.cpp:2809 msgid "Open Preferences for the Gradient tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Градієнт»" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2810 msgid "Mesh Preferences" msgstr "Параметри сітки" -#: ../src/verbs.cpp:2812 +#: ../src/verbs.cpp:2811 msgid "Open Preferences for the Mesh tool" msgstr "Відкрити вікно параметрів для інструмента «Сітка»" -#: ../src/verbs.cpp:2813 +#: ../src/verbs.cpp:2812 msgid "Zoom Preferences" msgstr "Параметри масштабу" -#: ../src/verbs.cpp:2814 +#: ../src/verbs.cpp:2813 msgid "Open Preferences for the Zoom tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Масштаб»" -#: ../src/verbs.cpp:2815 +#: ../src/verbs.cpp:2814 msgid "Measure Preferences" msgstr "Властивості вимірювання" -#: ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2815 msgid "Open Preferences for the Measure tool" msgstr "Відкрити вікно параметрів для інструмента «Вимірювання»" -#: ../src/verbs.cpp:2817 +#: ../src/verbs.cpp:2816 msgid "Dropper Preferences" msgstr "Параметри піпетки" -#: ../src/verbs.cpp:2818 +#: ../src/verbs.cpp:2817 msgid "Open Preferences for the Dropper tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Піпетка»" -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2818 msgid "Connector Preferences" msgstr "Параметри лінії з'єднання" -#: ../src/verbs.cpp:2820 +#: ../src/verbs.cpp:2819 msgid "Open Preferences for the Connector tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Лінії з'єднання»" -#: ../src/verbs.cpp:2823 +#: ../src/verbs.cpp:2822 msgid "Paint Bucket Preferences" msgstr "Параметри відра з фарбою" -#: ../src/verbs.cpp:2824 +#: ../src/verbs.cpp:2823 msgid "Open Preferences for the Paint Bucket tool" msgstr "Відкрити параметри для інструмента «Відро з фарбою»" -#: ../src/verbs.cpp:2827 +#: ../src/verbs.cpp:2826 msgid "Eraser Preferences" msgstr "Властивості гумки" -#: ../src/verbs.cpp:2828 +#: ../src/verbs.cpp:2827 msgid "Open Preferences for the Eraser tool" msgstr "Відкрити вікно параметрів для інструмента «Гумка»" -#: ../src/verbs.cpp:2829 +#: ../src/verbs.cpp:2828 msgid "LPE Tool Preferences" msgstr "Параметри інструмента «Геометричні побудови»" -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2829 msgid "Open Preferences for the LPETool tool" msgstr "Відкрити вікно параметрів для інструмента «Геометричні побудови»" #. Zoom/View -#: ../src/verbs.cpp:2832 +#: ../src/verbs.cpp:2831 msgid "Zoom In" msgstr "Збільшити" -#: ../src/verbs.cpp:2832 +#: ../src/verbs.cpp:2831 msgid "Zoom in" msgstr "Збільшити" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2832 msgid "Zoom Out" msgstr "Зменшити" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2832 msgid "Zoom out" msgstr "Зменшити" -#: ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2833 msgid "_Rulers" msgstr "_Лінійки" -#: ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2833 msgid "Show or hide the canvas rulers" msgstr "Показати або сховати лінійки полотна" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2834 msgid "Scroll_bars" msgstr "_Смуги гортання" -#: ../src/verbs.cpp:2835 +#: ../src/verbs.cpp:2834 msgid "Show or hide the canvas scrollbars" msgstr "Показати/Сховати смуги гортання полотна" -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2835 msgid "Page _Grid" msgstr "С_ітка сторінки" -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2835 msgid "Show or hide the page grid" msgstr "Показати або сховати сітку сторінки" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2836 msgid "G_uides" msgstr "Нап_рямні" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2836 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" "Показати чи сховати напрямні (потягніть від лінійки для створення напрямної)" -#: ../src/verbs.cpp:2838 +#: ../src/verbs.cpp:2837 msgid "Enable snapping" msgstr "Дозволити прилипання" -#: ../src/verbs.cpp:2839 +#: ../src/verbs.cpp:2838 msgid "_Commands Bar" msgstr "Панель ко_манд" -#: ../src/verbs.cpp:2839 +#: ../src/verbs.cpp:2838 msgid "Show or hide the Commands bar (under the menu)" msgstr "Показати/сховати панель команд (під меню)" -#: ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2839 msgid "Sn_ap Controls Bar" msgstr "Панель керування при_липанням" -#: ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2839 msgid "Show or hide the snapping controls" msgstr "Показати або сховати інструменти керування прилипанням" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2840 msgid "T_ool Controls Bar" msgstr "Па_нель параметрів інструментів" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2840 msgid "Show or hide the Tool Controls bar" msgstr "Показати або сховати панель з параметрами інструментів" -#: ../src/verbs.cpp:2842 +#: ../src/verbs.cpp:2841 msgid "_Toolbox" msgstr "Панель _інструментів" -#: ../src/verbs.cpp:2842 +#: ../src/verbs.cpp:2841 msgid "Show or hide the main toolbox (on the left)" msgstr "Показати або сховати головну панель інструментів (зліва)" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2842 msgid "_Palette" msgstr "_Палітру" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2842 msgid "Show or hide the color palette" msgstr "Показати або сховати панель з палітрою кольорів" -#: ../src/verbs.cpp:2844 +#: ../src/verbs.cpp:2843 msgid "_Statusbar" msgstr "_Рядок стану" -#: ../src/verbs.cpp:2844 +#: ../src/verbs.cpp:2843 msgid "Show or hide the statusbar (at the bottom of the window)" msgstr "Показати або сховати рядок стану (внизу вікна)" -#: ../src/verbs.cpp:2845 +#: ../src/verbs.cpp:2844 msgid "Nex_t Zoom" msgstr "Н_аступний масштаб" -#: ../src/verbs.cpp:2845 +#: ../src/verbs.cpp:2844 msgid "Next zoom (from the history of zooms)" msgstr "Наступний масштаб (з історії зміни масштабу)" -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2846 msgid "Pre_vious Zoom" msgstr "П_опередній масштаб" -#: ../src/verbs.cpp:2847 +#: ../src/verbs.cpp:2846 msgid "Previous zoom (from the history of zooms)" msgstr "Попередній масштаб (з історії зміни масштабу)" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2848 msgid "Zoom 1:_1" msgstr "Масштаб 1:_1" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2848 msgid "Zoom to 1:1" msgstr "Масштаб 1:1" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2850 msgid "Zoom 1:_2" msgstr "Масштаб 1:_2" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2850 msgid "Zoom to 1:2" msgstr "Масштаб 1:2" -#: ../src/verbs.cpp:2853 +#: ../src/verbs.cpp:2852 msgid "_Zoom 2:1" msgstr "Мас_штаб 2:1" -#: ../src/verbs.cpp:2853 +#: ../src/verbs.cpp:2852 msgid "Zoom to 2:1" msgstr "Масштаб 2:1" -#: ../src/verbs.cpp:2856 +#: ../src/verbs.cpp:2854 msgid "_Fullscreen" msgstr "На весь _екран" -#: ../src/verbs.cpp:2856 ../src/verbs.cpp:2858 +#: ../src/verbs.cpp:2854 ../src/verbs.cpp:2856 msgid "Stretch this document window to full screen" msgstr "Розтягнути вікно документа на весь екран" -#: ../src/verbs.cpp:2858 +#: ../src/verbs.cpp:2856 msgid "Fullscreen & Focus Mode" msgstr "Повноекранний режим та режим фокусування" -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2858 msgid "Toggle _Focus Mode" msgstr "Перемкнути режим _фокусування" -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2858 msgid "Remove excess toolbars to focus on drawing" msgstr "Вилучити зайві панелі інструментів для фокусування на малюванні" -#: ../src/verbs.cpp:2863 +#: ../src/verbs.cpp:2860 msgid "Duplic_ate Window" msgstr "_Дублювати вікно" -#: ../src/verbs.cpp:2863 +#: ../src/verbs.cpp:2860 msgid "Open a new window with the same document" msgstr "Відкрити нове вікно з цим самим документом" -#: ../src/verbs.cpp:2865 +#: ../src/verbs.cpp:2862 msgid "_New View Preview" msgstr "_Створити попередній перегляд" -#: ../src/verbs.cpp:2866 +#: ../src/verbs.cpp:2863 msgid "New View Preview" msgstr "Створити нове вікно попереднього перегляду" #. "view_new_preview" -#: ../src/verbs.cpp:2868 ../src/verbs.cpp:2876 +#: ../src/verbs.cpp:2865 ../src/verbs.cpp:2873 msgid "_Normal" msgstr "_Звичайний" -#: ../src/verbs.cpp:2869 +#: ../src/verbs.cpp:2866 msgid "Switch to normal display mode" msgstr "Перемикання на звичайний режим відображення" -#: ../src/verbs.cpp:2870 +#: ../src/verbs.cpp:2867 msgid "No _Filters" msgstr "Без _фільтрів" -#: ../src/verbs.cpp:2871 +#: ../src/verbs.cpp:2868 msgid "Switch to normal display without filters" msgstr "Перемикання на звичайний режим без фільтрів" -#: ../src/verbs.cpp:2872 +#: ../src/verbs.cpp:2869 msgid "_Outline" msgstr "_Обрис" -#: ../src/verbs.cpp:2873 +#: ../src/verbs.cpp:2870 msgid "Switch to outline (wireframe) display mode" msgstr "Перемкнутися на каркасний режим відображення" #. new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_PRINT_COLORS_PREVIEW, "ViewColorModePrintColorsPreview", N_("_Print Colors Preview"), #. N_("Switch to print colors preview mode"), NULL), -#: ../src/verbs.cpp:2874 ../src/verbs.cpp:2882 +#: ../src/verbs.cpp:2871 ../src/verbs.cpp:2879 msgid "_Toggle" msgstr "_Перемкнутися" -#: ../src/verbs.cpp:2875 +#: ../src/verbs.cpp:2872 msgid "Toggle between normal and outline display modes" msgstr "Перемикач між нормальним та каркасним режимами відображення" -#: ../src/verbs.cpp:2877 +#: ../src/verbs.cpp:2874 msgid "Switch to normal color display mode" msgstr "Перемикання на звичайний режим показу кольорів" -#: ../src/verbs.cpp:2878 +#: ../src/verbs.cpp:2875 msgid "_Grayscale" msgstr "Сі_рі півтони" -#: ../src/verbs.cpp:2879 +#: ../src/verbs.cpp:2876 msgid "Switch to grayscale display mode" msgstr "Перемикання на режим показу тонів сірого" -#: ../src/verbs.cpp:2883 +#: ../src/verbs.cpp:2880 msgid "Toggle between normal and grayscale color display modes" msgstr "" "Перемикач між нормальним режимом показу та режимом показу у відтінках сірого" -#: ../src/verbs.cpp:2885 +#: ../src/verbs.cpp:2882 msgid "Color-managed view" msgstr "Перегляд керування кольором" -#: ../src/verbs.cpp:2886 +#: ../src/verbs.cpp:2883 msgid "Toggle color-managed display for this document window" msgstr "" "Перемикач узгодження відображення кольорів дисплеєм для цього вікна документа" -#: ../src/verbs.cpp:2888 +#: ../src/verbs.cpp:2885 msgid "Ico_n Preview..." msgstr "Переглянути як п_іктограму…" -#: ../src/verbs.cpp:2889 +#: ../src/verbs.cpp:2886 msgid "Open a window to preview objects at different icon resolutions" msgstr "Переглянути позначений елемент у формі піктограми різних розмірів" -#: ../src/verbs.cpp:2891 +#: ../src/verbs.cpp:2888 msgid "Zoom to fit page in window" msgstr "Змінити масштаб, щоб розмістити сторінку цілком" -#: ../src/verbs.cpp:2892 +#: ../src/verbs.cpp:2889 msgid "Page _Width" msgstr "Ш_ирина сторінки" -#: ../src/verbs.cpp:2893 +#: ../src/verbs.cpp:2890 msgid "Zoom to fit page width in window" msgstr "Змінити масштаб, щоб розмістити сторінку по ширині" -#: ../src/verbs.cpp:2895 +#: ../src/verbs.cpp:2892 msgid "Zoom to fit drawing in window" msgstr "Змінити масштаб, щоб розмістити малюнок цілком" -#: ../src/verbs.cpp:2897 +#: ../src/verbs.cpp:2894 msgid "Zoom to fit selection in window" msgstr "Змінити масштаб, щоб розмістити позначену область" #. Dialogs -#: ../src/verbs.cpp:2900 +#: ../src/verbs.cpp:2897 msgid "P_references..." msgstr "На_лаштування…" -#: ../src/verbs.cpp:2901 +#: ../src/verbs.cpp:2898 msgid "Edit global Inkscape preferences" msgstr "Редагування загальних параметрів Inkscape" -#: ../src/verbs.cpp:2902 +#: ../src/verbs.cpp:2899 msgid "_Document Properties..." msgstr "Параметри д_окумента…" -#: ../src/verbs.cpp:2903 +#: ../src/verbs.cpp:2900 msgid "Edit properties of this document (to be saved with the document)" msgstr "" "Редагування властивостей поточного документа (вони будуть збережені разом з " "ним)" -#: ../src/verbs.cpp:2904 +#: ../src/verbs.cpp:2901 msgid "Document _Metadata..." msgstr "_Метадані документа" -#: ../src/verbs.cpp:2905 +#: ../src/verbs.cpp:2902 msgid "Edit document metadata (to be saved with the document)" msgstr "Редагування метаданих документа (вони будуть збережені разом з ним)" -#: ../src/verbs.cpp:2907 +#: ../src/verbs.cpp:2904 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " "properties..." @@ -27868,118 +28081,118 @@ msgstr "" "заповнення та штриха…" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-font" icon -#: ../src/verbs.cpp:2909 +#: ../src/verbs.cpp:2906 msgid "Gl_yphs..." msgstr "Г_ліфи…" -#: ../src/verbs.cpp:2910 +#: ../src/verbs.cpp:2907 msgid "Select characters from a glyphs palette" msgstr "Виберіть символи з палітри гліфів" #. FIXME: Probably better to either use something from the icon naming spec or ship our own "select-color" icon #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2913 +#: ../src/verbs.cpp:2910 msgid "S_watches..." msgstr "Зразки _кольорів…" -#: ../src/verbs.cpp:2914 +#: ../src/verbs.cpp:2911 msgid "Select colors from a swatches palette" msgstr "Виберіть колір з палітри зразків" -#: ../src/verbs.cpp:2915 +#: ../src/verbs.cpp:2912 msgid "S_ymbols..." msgstr "С_имволи…" -#: ../src/verbs.cpp:2916 +#: ../src/verbs.cpp:2913 msgid "Select symbol from a symbols palette" msgstr "Виберіть символ з палітри символів" -#: ../src/verbs.cpp:2917 +#: ../src/verbs.cpp:2914 msgid "Transfor_m..." msgstr "_Перетворити…" -#: ../src/verbs.cpp:2918 +#: ../src/verbs.cpp:2915 msgid "Precisely control objects' transformations" msgstr "Контролювати точність перетворень об'єктів" -#: ../src/verbs.cpp:2919 +#: ../src/verbs.cpp:2916 msgid "_Align and Distribute..." msgstr "Вирів_няти та розподілити…" -#: ../src/verbs.cpp:2920 +#: ../src/verbs.cpp:2917 msgid "Align and distribute objects" msgstr "Вирівняти та розподілити об'єкти" -#: ../src/verbs.cpp:2921 +#: ../src/verbs.cpp:2918 msgid "_Spray options..." msgstr "Параметри _розкидання…" -#: ../src/verbs.cpp:2922 +#: ../src/verbs.cpp:2919 msgid "Some options for the spray" msgstr "Параметри розкидання" -#: ../src/verbs.cpp:2923 +#: ../src/verbs.cpp:2920 msgid "Undo _History..." msgstr "Істо_рія змін…" -#: ../src/verbs.cpp:2924 +#: ../src/verbs.cpp:2921 msgid "Undo History" msgstr "Історія для скасування змін" -#: ../src/verbs.cpp:2926 +#: ../src/verbs.cpp:2923 msgid "View and select font family, font size and other text properties" msgstr "" "Перегляд та вибір назви шрифту, його розміру та інших властивостей тексту" -#: ../src/verbs.cpp:2927 +#: ../src/verbs.cpp:2924 msgid "_XML Editor..." msgstr "Редактор _XML…" -#: ../src/verbs.cpp:2928 +#: ../src/verbs.cpp:2925 msgid "View and edit the XML tree of the document" msgstr "Перегляд та редагування дерева XML поточного документа" -#: ../src/verbs.cpp:2929 +#: ../src/verbs.cpp:2926 msgid "_Find/Replace..." msgstr "Знайти і з_амінити…" -#: ../src/verbs.cpp:2930 +#: ../src/verbs.cpp:2927 msgid "Find objects in document" msgstr "Знайти об'єкти у документі" -#: ../src/verbs.cpp:2931 +#: ../src/verbs.cpp:2928 msgid "Find and _Replace Text..." msgstr "Знайти і з_амінити текст…" -#: ../src/verbs.cpp:2932 +#: ../src/verbs.cpp:2929 msgid "Find and replace text in document" msgstr "Знайти і замінити текст у документі" -#: ../src/verbs.cpp:2934 +#: ../src/verbs.cpp:2931 msgid "Check spelling of text in document" msgstr "Перевірити правопис тексту у документі" -#: ../src/verbs.cpp:2935 +#: ../src/verbs.cpp:2932 msgid "_Messages..." msgstr "По_відомлення…" -#: ../src/verbs.cpp:2936 +#: ../src/verbs.cpp:2933 msgid "View debug messages" msgstr "Переглянути діагностичні повідомлення" -#: ../src/verbs.cpp:2937 +#: ../src/verbs.cpp:2934 msgid "Show/Hide D_ialogs" msgstr "Показати/сховати діало_ги" -#: ../src/verbs.cpp:2938 +#: ../src/verbs.cpp:2935 msgid "Show or hide all open dialogs" msgstr "Показати чи сховати всі активні діалогові вікна" -#: ../src/verbs.cpp:2939 +#: ../src/verbs.cpp:2936 msgid "Create Tiled Clones..." msgstr "Створити мозаїку з клонів…" -#: ../src/verbs.cpp:2940 +#: ../src/verbs.cpp:2937 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" @@ -27987,306 +28200,310 @@ msgstr "" "Створити множину клонів позначеного об'єкта, з розташуванням їх у формі " "візерунку або покриття" -#: ../src/verbs.cpp:2941 +#: ../src/verbs.cpp:2938 msgid "_Object attributes..." msgstr "_Атрибути об'єкта…" -#: ../src/verbs.cpp:2942 +#: ../src/verbs.cpp:2939 msgid "Edit the object attributes..." msgstr "Змінити атрибути об'єкта…" -#: ../src/verbs.cpp:2944 +#: ../src/verbs.cpp:2941 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" "Редагування ідентифікатора, стану заблокованості та видимості та інших " "властивостей об'єкта" -#: ../src/verbs.cpp:2945 +#: ../src/verbs.cpp:2942 msgid "_Input Devices..." msgstr "_Пристрої введення…" -#: ../src/verbs.cpp:2946 +#: ../src/verbs.cpp:2943 msgid "Configure extended input devices, such as a graphics tablet" msgstr "Налаштовування розширених пристроїв введення" -#: ../src/verbs.cpp:2947 +#: ../src/verbs.cpp:2944 msgid "_Extensions..." msgstr "_Про додатки…" -#: ../src/verbs.cpp:2948 +#: ../src/verbs.cpp:2945 msgid "Query information about extensions" msgstr "Зібрати інформацію про додатки" -#: ../src/verbs.cpp:2949 +#: ../src/verbs.cpp:2946 msgid "Layer_s..." msgstr "_Шари…" -#: ../src/verbs.cpp:2950 +#: ../src/verbs.cpp:2947 msgid "View Layers" msgstr "Переглянути шари" -#: ../src/verbs.cpp:2951 +#: ../src/verbs.cpp:2948 msgid "Object_s..." msgstr "Об'_єкти…" -#: ../src/verbs.cpp:2952 +#: ../src/verbs.cpp:2949 msgid "View Objects" msgstr "Переглянути об'єкти" -#: ../src/verbs.cpp:2953 +#: ../src/verbs.cpp:2950 msgid "Selection se_ts..." msgstr "На_бори позначеного…" -#: ../src/verbs.cpp:2954 +#: ../src/verbs.cpp:2951 msgid "View Tags" msgstr "Переглянути теґи" -#: ../src/verbs.cpp:2955 +#: ../src/verbs.cpp:2952 msgid "Path E_ffects ..." msgstr "Е_фекти контурів…" -#: ../src/verbs.cpp:2956 +#: ../src/verbs.cpp:2953 msgid "Manage, edit, and apply path effects" msgstr "Керування, редагування і застосування ефектів контурів" -#: ../src/verbs.cpp:2957 +#: ../src/verbs.cpp:2954 msgid "Filter _Editor..." msgstr "Р_едактор фільтрів…" -#: ../src/verbs.cpp:2958 +#: ../src/verbs.cpp:2955 msgid "Manage, edit, and apply SVG filters" msgstr "Керування, редагування і застосування фільтрів SVG" -#: ../src/verbs.cpp:2959 +#: ../src/verbs.cpp:2956 msgid "SVG Font Editor..." msgstr "Редактор шрифтів SVG…" -#: ../src/verbs.cpp:2960 +#: ../src/verbs.cpp:2957 msgid "Edit SVG fonts" msgstr "Редагувати шрифти SVG" -#: ../src/verbs.cpp:2961 +#: ../src/verbs.cpp:2958 msgid "Print Colors..." msgstr "Друкувати кольори…" -#: ../src/verbs.cpp:2962 +#: ../src/verbs.cpp:2959 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" "Вкажіть ділянки кольорів, які слід обробляти у режимі обробки попереднього " "перегляду кольорів друку." -#: ../src/verbs.cpp:2963 +#: ../src/verbs.cpp:2960 msgid "_Export PNG Image..." msgstr "_Експортувати як зображення PNG…" -#: ../src/verbs.cpp:2964 +#: ../src/verbs.cpp:2961 msgid "Export this document or a selection as a PNG image" msgstr "Експортувати документ чи позначену частину як зображення PNG" #. Help -#: ../src/verbs.cpp:2966 +#: ../src/verbs.cpp:2963 msgid "About E_xtensions" msgstr "Про _додатки" -#: ../src/verbs.cpp:2967 +#: ../src/verbs.cpp:2964 msgid "Information on Inkscape extensions" msgstr "Інформація про додатки Inkscape" -#: ../src/verbs.cpp:2968 +#: ../src/verbs.cpp:2965 msgid "About _Memory" msgstr "Про п_ам'ять" -#: ../src/verbs.cpp:2969 +#: ../src/verbs.cpp:2966 msgid "Memory usage information" msgstr "Інформація про використання пам'яті" -#: ../src/verbs.cpp:2970 +#: ../src/verbs.cpp:2967 msgid "_About Inkscape" msgstr "_Про програму Inkscape" -#: ../src/verbs.cpp:2971 +#: ../src/verbs.cpp:2968 msgid "Inkscape version, authors, license" msgstr "Версія, автори та ліцензія Inkscape" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2976 +#: ../src/verbs.cpp:2973 msgid "Inkscape: _Basic" msgstr "Inkscape: _Початковий рівень" -#: ../src/verbs.cpp:2977 +#: ../src/verbs.cpp:2974 msgid "Getting started with Inkscape" msgstr "Починаємо роботу з Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2978 +#: ../src/verbs.cpp:2975 msgid "Inkscape: _Shapes" msgstr "Inkscape: _Фігури" -#: ../src/verbs.cpp:2979 +#: ../src/verbs.cpp:2976 msgid "Using shape tools to create and edit shapes" msgstr "Використання інструментів малювання та редагування фігур" -#: ../src/verbs.cpp:2980 +#: ../src/verbs.cpp:2977 msgid "Inkscape: _Advanced" msgstr "Inkscape: _Другий рівень" -#: ../src/verbs.cpp:2981 +#: ../src/verbs.cpp:2978 msgid "Advanced Inkscape topics" msgstr "Додаткові теми з Inkscape" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2985 +#: ../src/verbs.cpp:2982 msgid "Inkscape: T_racing" msgstr "Inkscape: _Векторизація" -#: ../src/verbs.cpp:2986 +#: ../src/verbs.cpp:2983 msgid "Using bitmap tracing" msgstr "Використання векторизації растру" -#: ../src/verbs.cpp:2989 +#: ../src/verbs.cpp:2986 msgid "Inkscape: Tracing Pixel Art" msgstr "Inkscape: Трасування растрової графіки" -#: ../src/verbs.cpp:2990 +#: ../src/verbs.cpp:2987 msgid "Using Trace Pixel Art dialog" msgstr "Користування діалоговим вікном трасування растрової графіки" -#: ../src/verbs.cpp:2991 +#: ../src/verbs.cpp:2988 msgid "Inkscape: _Calligraphy" msgstr "Inkscape: _Каліграфія" -#: ../src/verbs.cpp:2992 +#: ../src/verbs.cpp:2989 msgid "Using the Calligraphy pen tool" msgstr "Використання каліграфічного пера" -#: ../src/verbs.cpp:2993 +#: ../src/verbs.cpp:2990 msgid "Inkscape: _Interpolate" msgstr "Inkscape: _Інтерполяція" -#: ../src/verbs.cpp:2994 +#: ../src/verbs.cpp:2991 msgid "Using the interpolate extension" msgstr "Використання додатка інтерполяції" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2995 +#: ../src/verbs.cpp:2992 msgid "_Elements of Design" msgstr "_Елементи дизайну" -#: ../src/verbs.cpp:2996 +#: ../src/verbs.cpp:2993 msgid "Principles of design in the tutorial form" msgstr "Підручник з принципів дизайну" #. "tutorial_design" -#: ../src/verbs.cpp:2997 +#: ../src/verbs.cpp:2994 msgid "_Tips and Tricks" msgstr "_Поради та прийоми" -#: ../src/verbs.cpp:2998 +#: ../src/verbs.cpp:2995 msgid "Miscellaneous tips and tricks" msgstr "Різноманітні поради та прийоми" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:3001 +#: ../src/verbs.cpp:2998 msgid "Previous Exte_nsion" msgstr "Попередній _додаток" -#: ../src/verbs.cpp:3002 +#: ../src/verbs.cpp:2999 msgid "Repeat the last extension with the same settings" msgstr "" "Повторити ефекти використання попереднього додатка з тими самими параметрами" -#: ../src/verbs.cpp:3003 +#: ../src/verbs.cpp:3000 msgid "_Previous Extension Settings..." msgstr "П_араметри попереднього додатка…" -#: ../src/verbs.cpp:3004 +#: ../src/verbs.cpp:3001 msgid "Repeat the last extension with new settings" msgstr "Повторити останній ефект з новими параметрами" -#: ../src/verbs.cpp:3008 +#: ../src/verbs.cpp:3005 msgid "Fit the page to the current selection" msgstr "Підігнати полотно до поточного позначеної області" -#: ../src/verbs.cpp:3010 +#: ../src/verbs.cpp:3007 msgid "Fit the page to the drawing" msgstr "Підганяє полотно під вже намальоване" -#: ../src/verbs.cpp:3012 +#: ../src/verbs.cpp:3008 +msgid "_Resize Page to Selection" +msgstr "_Підігнати розмір сторінки за позначеним" + +#: ../src/verbs.cpp:3009 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" "Підігнати область видимості під поточну позначену область або під область " "креслення, якщо нічого не позначено" -#: ../src/verbs.cpp:3016 +#: ../src/verbs.cpp:3013 msgid "Unlock All in All Layers" msgstr "Розблокувати все в усіх шарах" -#: ../src/verbs.cpp:3018 +#: ../src/verbs.cpp:3015 msgid "Unhide All" msgstr "Показати все" -#: ../src/verbs.cpp:3020 +#: ../src/verbs.cpp:3017 msgid "Unhide All in All Layers" msgstr "Показати все в усіх шарах" -#: ../src/verbs.cpp:3024 +#: ../src/verbs.cpp:3021 msgid "Link an ICC color profile" msgstr "Посилання на профіль кольорів ICC" -#: ../src/verbs.cpp:3025 +#: ../src/verbs.cpp:3022 msgid "Remove Color Profile" msgstr "Вилучити профіль кольорів" -#: ../src/verbs.cpp:3026 +#: ../src/verbs.cpp:3023 msgid "Remove a linked ICC color profile" msgstr "Вилучити пов'язаний профіль кольорів ICC" -#: ../src/verbs.cpp:3029 +#: ../src/verbs.cpp:3026 msgid "Add External Script" msgstr "Додати зовнішній скрипт" -#: ../src/verbs.cpp:3029 +#: ../src/verbs.cpp:3026 msgid "Add an external script" msgstr "Додати зовнішній скрипт" -#: ../src/verbs.cpp:3031 +#: ../src/verbs.cpp:3028 msgid "Add Embedded Script" msgstr "Додати вбудований скрипт" -#: ../src/verbs.cpp:3031 +#: ../src/verbs.cpp:3028 msgid "Add an embedded script" msgstr "Додати вбудований скрипт" -#: ../src/verbs.cpp:3033 +#: ../src/verbs.cpp:3030 msgid "Edit Embedded Script" msgstr "Редагувати вбудований скрипт" -#: ../src/verbs.cpp:3033 +#: ../src/verbs.cpp:3030 msgid "Edit an embedded script" msgstr "Редагувати вбудований скрипт" -#: ../src/verbs.cpp:3035 +#: ../src/verbs.cpp:3032 msgid "Remove External Script" msgstr "Вилучити зовнішній скрипт" -#: ../src/verbs.cpp:3035 +#: ../src/verbs.cpp:3032 msgid "Remove an external script" msgstr "Вилучити зовнішній скрипт" -#: ../src/verbs.cpp:3037 +#: ../src/verbs.cpp:3034 msgid "Remove Embedded Script" msgstr "Вилучити вбудований скрипт" -#: ../src/verbs.cpp:3037 +#: ../src/verbs.cpp:3034 msgid "Remove an embedded script" msgstr "Вилучити вбудований скрипт" -#: ../src/verbs.cpp:3059 ../src/verbs.cpp:3060 +#: ../src/verbs.cpp:3056 ../src/verbs.cpp:3057 msgid "Center on horizontal and vertical axis" msgstr "Центрувати на горизонтальній і вертикальній осі" @@ -28433,7 +28650,7 @@ msgstr "Без шаблону" #. Width #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(hairline)" msgstr "(мотузка)" @@ -28442,22 +28659,22 @@ msgstr "(мотузка)" #. Scale #: ../src/widgets/calligraphy-toolbar.cpp:427 #: ../src/widgets/calligraphy-toolbar.cpp:460 -#: ../src/widgets/eraser-toolbar.cpp:125 ../src/widgets/pencil-toolbar.cpp:371 -#: ../src/widgets/spray-toolbar.cpp:284 ../src/widgets/spray-toolbar.cpp:313 -#: ../src/widgets/spray-toolbar.cpp:329 ../src/widgets/spray-toolbar.cpp:398 -#: ../src/widgets/spray-toolbar.cpp:428 ../src/widgets/spray-toolbar.cpp:446 -#: ../src/widgets/spray-toolbar.cpp:595 ../src/widgets/tweak-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 ../src/widgets/pencil-toolbar.cpp:372 +#: ../src/widgets/spray-toolbar.cpp:294 ../src/widgets/spray-toolbar.cpp:323 +#: ../src/widgets/spray-toolbar.cpp:339 ../src/widgets/spray-toolbar.cpp:408 +#: ../src/widgets/spray-toolbar.cpp:438 ../src/widgets/spray-toolbar.cpp:456 +#: ../src/widgets/spray-toolbar.cpp:605 ../src/widgets/tweak-toolbar.cpp:125 #: ../src/widgets/tweak-toolbar.cpp:142 ../src/widgets/tweak-toolbar.cpp:350 msgid "(default)" msgstr "(типова)" #: ../src/widgets/calligraphy-toolbar.cpp:427 -#: ../src/widgets/eraser-toolbar.cpp:125 +#: ../src/widgets/eraser-toolbar.cpp:151 msgid "(broad stroke)" msgstr "(широкий штрих)" #: ../src/widgets/calligraphy-toolbar.cpp:430 -#: ../src/widgets/eraser-toolbar.cpp:128 +#: ../src/widgets/eraser-toolbar.cpp:154 msgid "Pen Width" msgstr "Ширина пера" @@ -28650,18 +28867,22 @@ msgstr "Збільшення параметру збільшує хвилепо #. Mass #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(no inertia)" msgstr "(без інерції)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(slight smoothing, default)" msgstr "(невелике згладжування, типово)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(noticeable lagging)" msgstr "(помітне запізнення)" #: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/eraser-toolbar.cpp:168 msgid "(maximum inertia)" msgstr "(максимальна інерція)" @@ -28670,6 +28891,7 @@ msgid "Pen Mass" msgstr "Маса пера" #: ../src/widgets/calligraphy-toolbar.cpp:549 +#: ../src/widgets/eraser-toolbar.cpp:171 msgid "Mass:" msgstr "Маса:" @@ -28807,20 +29029,20 @@ msgstr "Пунктир" msgid "Pattern offset" msgstr "Зміщення пунктиру" -#: ../src/widgets/desktop-widget.cpp:494 +#: ../src/widgets/desktop-widget.cpp:495 msgid "Zoom drawing if window size changes" msgstr "Змінювати масштаб при зміні розмірів вікна" -#: ../src/widgets/desktop-widget.cpp:693 +#: ../src/widgets/desktop-widget.cpp:702 msgid "Cursor coordinates" msgstr "Координати курсора" -#: ../src/widgets/desktop-widget.cpp:719 +#: ../src/widgets/desktop-widget.cpp:723 msgid "Z:" msgstr "Z:" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:762 +#: ../src/widgets/desktop-widget.cpp:776 msgid "" "Welcome to Inkscape! Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." @@ -28829,77 +29051,77 @@ msgstr "" "малювання для створення об'єктів; для їх переміщення чи трансформації " "використовуйте селектор (стрілку)." -#: ../src/widgets/desktop-widget.cpp:856 +#: ../src/widgets/desktop-widget.cpp:870 msgid "grayscale" msgstr "сірі півтони" -#: ../src/widgets/desktop-widget.cpp:857 +#: ../src/widgets/desktop-widget.cpp:871 msgid ", grayscale" msgstr ", сірі півтони" -#: ../src/widgets/desktop-widget.cpp:858 +#: ../src/widgets/desktop-widget.cpp:872 msgid "print colors preview" msgstr "друк попереднього перегляду кольорів" -#: ../src/widgets/desktop-widget.cpp:859 +#: ../src/widgets/desktop-widget.cpp:873 msgid ", print colors preview" msgstr ", друк попереднього перегляду кольорів" -#: ../src/widgets/desktop-widget.cpp:860 +#: ../src/widgets/desktop-widget.cpp:874 msgid "outline" msgstr "обрис" -#: ../src/widgets/desktop-widget.cpp:861 +#: ../src/widgets/desktop-widget.cpp:875 msgid "no filters" msgstr "без фільтрування" -#: ../src/widgets/desktop-widget.cpp:888 +#: ../src/widgets/desktop-widget.cpp:902 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" msgstr "%s%s: %d (%s%s) – Inkscape" -#: ../src/widgets/desktop-widget.cpp:890 ../src/widgets/desktop-widget.cpp:894 +#: ../src/widgets/desktop-widget.cpp:904 ../src/widgets/desktop-widget.cpp:908 #, c-format msgid "%s%s: %d (%s) - Inkscape" msgstr "%s%s: %d (%s) — Inkscape" -#: ../src/widgets/desktop-widget.cpp:896 +#: ../src/widgets/desktop-widget.cpp:910 #, c-format msgid "%s%s: %d - Inkscape" msgstr "%s%s: %d — Inkscape" -#: ../src/widgets/desktop-widget.cpp:902 +#: ../src/widgets/desktop-widget.cpp:916 #, c-format msgid "%s%s (%s%s) - Inkscape" msgstr "%s%s (%s%s) — Inkscape" -#: ../src/widgets/desktop-widget.cpp:904 ../src/widgets/desktop-widget.cpp:908 +#: ../src/widgets/desktop-widget.cpp:918 ../src/widgets/desktop-widget.cpp:922 #, c-format msgid "%s%s (%s) - Inkscape" msgstr "%s%s (%s) — Inkscape" -#: ../src/widgets/desktop-widget.cpp:910 +#: ../src/widgets/desktop-widget.cpp:924 #, c-format msgid "%s%s - Inkscape" msgstr "%s%s — Inkscape" -#: ../src/widgets/desktop-widget.cpp:1082 +#: ../src/widgets/desktop-widget.cpp:1096 msgid "Locked all guides" msgstr "Заблоковано усі напрямні" -#: ../src/widgets/desktop-widget.cpp:1084 +#: ../src/widgets/desktop-widget.cpp:1098 msgid "Unlocked all guides" msgstr "Розблоковано усі напрямні" -#: ../src/widgets/desktop-widget.cpp:1101 +#: ../src/widgets/desktop-widget.cpp:1115 msgid "Color-managed display is enabled in this window" msgstr "Показ з керуванням кольорами у цьому вікні увімкнено" -#: ../src/widgets/desktop-widget.cpp:1103 +#: ../src/widgets/desktop-widget.cpp:1117 msgid "Color-managed display is disabled in this window" msgstr "Показ з керуванням кольорами у цьому вікні вимкнено" -#: ../src/widgets/desktop-widget.cpp:1158 +#: ../src/widgets/desktop-widget.cpp:1172 #, c-format msgid "" "Save changes to document \"%s\" before " @@ -28912,12 +29134,12 @@ msgstr "" "\n" "Якщо ви закриєте документ без збереження, усі зміни будуть втрачені." -#: ../src/widgets/desktop-widget.cpp:1168 -#: ../src/widgets/desktop-widget.cpp:1227 +#: ../src/widgets/desktop-widget.cpp:1182 +#: ../src/widgets/desktop-widget.cpp:1241 msgid "Close _without saving" msgstr "_Не зберігати" -#: ../src/widgets/desktop-widget.cpp:1217 +#: ../src/widgets/desktop-widget.cpp:1231 #, c-format msgid "" "The file \"%s\" was saved with a " @@ -28930,11 +29152,11 @@ msgstr "" "\n" "Зберегти документ у форматі SVG Inkscape?" -#: ../src/widgets/desktop-widget.cpp:1229 +#: ../src/widgets/desktop-widget.cpp:1243 msgid "_Save as Inkscape SVG" msgstr "_Зберегти як SVG Inkscape" -#: ../src/widgets/desktop-widget.cpp:1442 +#: ../src/widgets/desktop-widget.cpp:1456 msgid "Note:" msgstr "Примітка:" @@ -28972,22 +29194,45 @@ msgstr "Призначити" msgid "remove" msgstr "вилучити" -#: ../src/widgets/eraser-toolbar.cpp:94 +#: ../src/widgets/eraser-toolbar.cpp:121 msgid "Delete objects touched by the eraser" msgstr "Вилучати об'єкти, яких торкнулася гумка" -#: ../src/widgets/eraser-toolbar.cpp:100 +#: ../src/widgets/eraser-toolbar.cpp:127 msgid "Cut" msgstr "Вирізати" -#: ../src/widgets/eraser-toolbar.cpp:101 +#: ../src/widgets/eraser-toolbar.cpp:128 msgid "Cut out from objects" msgstr "Вирізати з об'єктів" -#: ../src/widgets/eraser-toolbar.cpp:129 +#. Width +#: ../src/widgets/eraser-toolbar.cpp:151 +msgid "(no width)" +msgstr "(без ширини)" + +#: ../src/widgets/eraser-toolbar.cpp:155 msgid "The width of the eraser pen (relative to the visible canvas area)" msgstr "Ширина гумки (відносно видимої області полотна)" +#: ../src/widgets/eraser-toolbar.cpp:171 +msgid "Eraser Mass" +msgstr "Маса гумки" + +#: ../src/widgets/eraser-toolbar.cpp:172 +msgid "Increase to make the eraser drag behind, as if slowed by inertia" +msgstr "Збільшення веде до відставання гумки так, неначе її сповільнює інерція" + +#: ../src/widgets/eraser-toolbar.cpp:186 +#, fuzzy +msgid "Break appart cutted items" +msgstr "Розірвати контур у позначеному вузлі" + +#: ../src/widgets/eraser-toolbar.cpp:187 +#, fuzzy +msgid "Break appart cutted itemss" +msgstr "Розірвати контур у позначеному вузлі" + #: ../src/widgets/fill-style.cpp:356 msgid "Change fill rule" msgstr "Зміна правила заповнення" @@ -29016,8 +29261,8 @@ msgstr "Встановлення візерунку для заповнення" msgid "Set pattern on stroke" msgstr "Додати візерунок до штриха" -#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1017 -#: ../src/widgets/text-toolbar.cpp:1358 +#: ../src/widgets/font-selector.cpp:120 ../src/widgets/text-toolbar.cpp:1207 +#: ../src/widgets/text-toolbar.cpp:1606 msgid "Font size" msgstr "Розмір шрифту" @@ -29027,33 +29272,34 @@ msgid "Font family" msgstr "Гарнітура шрифту" #. Style frame -#: ../src/widgets/font-selector.cpp:179 +#: ../src/widgets/font-selector.cpp:194 msgctxt "Font selector" msgid "Style" msgstr "Стиль" -#: ../src/widgets/font-selector.cpp:211 +#: ../src/widgets/font-selector.cpp:226 msgid "Face" msgstr "Гарнітура" -#: ../src/widgets/font-selector.cpp:240 ../share/extensions/dots.inx.h:3 +#: ../src/widgets/font-selector.cpp:255 ../share/extensions/dots.inx.h:3 +#: ../share/extensions/nicechart.inx.h:17 msgid "Font size:" msgstr "Розмір шрифту:" -#: ../src/widgets/gradient-selector.cpp:205 +#: ../src/widgets/gradient-selector.cpp:201 msgid "Create a duplicate gradient" msgstr "Створення дублікат градієнта" -#: ../src/widgets/gradient-selector.cpp:216 +#: ../src/widgets/gradient-selector.cpp:212 msgid "Edit gradient" msgstr "Змінити градієнт" -#: ../src/widgets/gradient-selector.cpp:285 +#: ../src/widgets/gradient-selector.cpp:281 #: ../src/widgets/paint-selector.cpp:233 msgid "Swatch" msgstr "Зразок" -#: ../src/widgets/gradient-selector.cpp:335 +#: ../src/widgets/gradient-selector.cpp:331 msgid "Rename gradient" msgstr "Перейменувати градієнт" @@ -29259,18 +29505,43 @@ msgid "Delete current control stop from gradient" msgstr "Вилучити опорну точку градієнта" #. TRANSLATORS: "Stop" means: a "phase" of a gradient -#: ../src/widgets/gradient-vector.cpp:969 +#: ../src/widgets/gradient-vector.cpp:975 msgid "Stop Color" msgstr "Колір опорної точки" -#: ../src/widgets/gradient-vector.cpp:1008 +#: ../src/widgets/gradient-vector.cpp:1014 msgid "Gradient editor" msgstr "Редактор градієнтів" -#: ../src/widgets/gradient-vector.cpp:1360 +#: ../src/widgets/gradient-vector.cpp:1366 msgid "Change gradient stop color" msgstr "Змінити колір опорної точки градієнта" +#: ../src/widgets/image-menu-item.c:151 +msgid "Image widget" +msgstr "Віджет зображення" + +#: ../src/widgets/image-menu-item.c:152 +msgid "Child widget to appear next to the menu text" +msgstr "Дочірній віджет, який буде показано поряд із текстом меню" + +#: ../src/widgets/image-menu-item.c:167 +msgid "Use stock" +msgstr "Використовувати стос" + +#: ../src/widgets/image-menu-item.c:168 +msgid "Whether to use the label text to create a stock menu item" +msgstr "" +"Визначає, чи слід використовувати текст мітки для створення пункту меню стосу" + +#: ../src/widgets/image-menu-item.c:183 +msgid "Accel Group" +msgstr "Група доступу" + +#: ../src/widgets/image-menu-item.c:184 +msgid "The Accel Group to use for stock accelerator keys" +msgstr "Група доступу для клавіш керування стосом" + #: ../src/widgets/lpe-toolbar.cpp:233 msgid "Closed" msgstr "Заблокований" @@ -29331,7 +29602,8 @@ msgstr "Показувати відомості щодо виміру для в #. Add the units menu. #: ../src/widgets/lpe-toolbar.cpp:387 ../src/widgets/node-toolbar.cpp:613 #: ../src/widgets/paintbucket-toolbar.cpp:167 -#: ../src/widgets/rect-toolbar.cpp:378 ../src/widgets/select-toolbar.cpp:538 +#: ../src/widgets/rect-toolbar.cpp:378 ../src/widgets/select-toolbar.cpp:530 +#: ../src/widgets/text-toolbar.cpp:1876 msgid "Units" msgstr "Одиниці" @@ -29354,13 +29626,13 @@ msgid "Start and end measures active." msgstr "Початок і кінець вимірювання увімкнено." #: ../src/widgets/measure-toolbar.cpp:175 -msgid "Show only visible crossings." -msgstr "Показувати лише видимі перетини." - -#: ../src/widgets/measure-toolbar.cpp:177 msgid "Show all crossings." msgstr "Показувати усі перетини." +#: ../src/widgets/measure-toolbar.cpp:177 +msgid "Show visible crossings." +msgstr "Показувати видимі перетини." + #: ../src/widgets/measure-toolbar.cpp:193 msgid "Use all layers in the measure." msgstr "Використовувати для вимірювання усі шари." @@ -29377,84 +29649,89 @@ msgstr "Обчислювати усі елементи." msgid "Compute max length." msgstr "Обчислити максимальну довжину." -#: ../src/widgets/measure-toolbar.cpp:266 ../src/widgets/text-toolbar.cpp:1361 +#: ../src/widgets/measure-toolbar.cpp:274 ../src/widgets/text-toolbar.cpp:1609 msgid "Font Size" msgstr "Розмір шрифту" -#: ../src/widgets/measure-toolbar.cpp:266 +#: ../src/widgets/measure-toolbar.cpp:274 msgid "Font Size:" msgstr "Розмір шрифту:" -#: ../src/widgets/measure-toolbar.cpp:267 +#: ../src/widgets/measure-toolbar.cpp:275 msgid "The font size to be used in the measurement labels" msgstr "Розмір шрифту, який буде використано для міток вимірювання" -#: ../src/widgets/measure-toolbar.cpp:278 #: ../src/widgets/measure-toolbar.cpp:286 +#: ../src/widgets/measure-toolbar.cpp:294 msgid "The units to be used for the measurements" msgstr "Одиниці, які буде використано для вимірювання" -#: ../src/widgets/measure-toolbar.cpp:294 ../share/extensions/measure.inx.h:14 +#: ../src/widgets/measure-toolbar.cpp:302 ../share/extensions/measure.inx.h:14 msgid "Precision:" msgstr "Точність:" -#: ../src/widgets/measure-toolbar.cpp:295 +#: ../src/widgets/measure-toolbar.cpp:303 msgid "Decimal precision of measure" msgstr "Десяткова точність вимірювання" -#: ../src/widgets/measure-toolbar.cpp:307 +#: ../src/widgets/measure-toolbar.cpp:315 msgid "Scale %" msgstr "Масштаб у %" -#: ../src/widgets/measure-toolbar.cpp:307 +#: ../src/widgets/measure-toolbar.cpp:315 msgid "Scale %:" msgstr "Масштаб у %:" -#: ../src/widgets/measure-toolbar.cpp:308 +#: ../src/widgets/measure-toolbar.cpp:316 msgid "Scale the results" msgstr "Масштабувати результати" -#: ../src/widgets/measure-toolbar.cpp:321 +#: ../src/widgets/measure-toolbar.cpp:329 msgid "The offset size" msgstr "Розмір зміщення" -#: ../src/widgets/measure-toolbar.cpp:333 -#: ../src/widgets/measure-toolbar.cpp:334 +#: ../src/widgets/measure-toolbar.cpp:341 +#: ../src/widgets/measure-toolbar.cpp:342 msgid "Ignore first and last" msgstr "Ігнорувати першу і останню" -#: ../src/widgets/measure-toolbar.cpp:344 -#: ../src/widgets/measure-toolbar.cpp:345 -msgid "Only visible intersections" -msgstr "Лише видимі перетини" +#: ../src/widgets/measure-toolbar.cpp:352 +#: ../src/widgets/measure-toolbar.cpp:353 +msgid "Show hidden intersections" +msgstr "Показати приховані перетини" -#: ../src/widgets/measure-toolbar.cpp:355 -#: ../src/widgets/measure-toolbar.cpp:356 +#: ../src/widgets/measure-toolbar.cpp:363 +#: ../src/widgets/measure-toolbar.cpp:364 msgid "Show measures between items" msgstr "Показувати відстані між об’єктами" -#: ../src/widgets/measure-toolbar.cpp:366 -#: ../src/widgets/measure-toolbar.cpp:367 +#: ../src/widgets/measure-toolbar.cpp:374 +#: ../src/widgets/measure-toolbar.cpp:375 msgid "Measure all layers" msgstr "Виміряти усі шари" -#: ../src/widgets/measure-toolbar.cpp:377 -#: ../src/widgets/measure-toolbar.cpp:378 +#: ../src/widgets/measure-toolbar.cpp:385 +#: ../src/widgets/measure-toolbar.cpp:386 msgid "Reverse measure" msgstr "Обернути вимірювання" -#: ../src/widgets/measure-toolbar.cpp:387 -#: ../src/widgets/measure-toolbar.cpp:388 +#: ../src/widgets/measure-toolbar.cpp:395 +#: ../src/widgets/measure-toolbar.cpp:396 +msgid "Phantom measure" +msgstr "Фантомне вимірювання" + +#: ../src/widgets/measure-toolbar.cpp:405 +#: ../src/widgets/measure-toolbar.cpp:406 msgid "To guides" msgstr "До напрямних" -#: ../src/widgets/measure-toolbar.cpp:397 -#: ../src/widgets/measure-toolbar.cpp:398 +#: ../src/widgets/measure-toolbar.cpp:415 +#: ../src/widgets/measure-toolbar.cpp:416 msgid "Mark Dimension" msgstr "Позначити розмірність" -#: ../src/widgets/measure-toolbar.cpp:407 -#: ../src/widgets/measure-toolbar.cpp:408 +#: ../src/widgets/measure-toolbar.cpp:425 +#: ../src/widgets/measure-toolbar.cpp:426 msgid "Convert to item" msgstr "Перетворити на об’єкт" @@ -29551,7 +29828,7 @@ msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." msgstr "" "Коонса: без згладжування. Бікубічний: згладжування упоперек до меж фрагмента." -#: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:374 +#: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing:" msgstr "Згладжування:" @@ -29934,7 +30211,7 @@ msgid "Close gaps:" msgstr "Закриті проміжки:" #: ../src/widgets/paintbucket-toolbar.cpp:211 -#: ../src/widgets/pencil-toolbar.cpp:395 ../src/widgets/spiral-toolbar.cpp:285 +#: ../src/widgets/pencil-toolbar.cpp:396 ../src/widgets/spiral-toolbar.cpp:285 #: ../src/widgets/star-toolbar.cpp:564 msgid "Defaults" msgstr "Типово" @@ -29983,56 +30260,56 @@ msgstr "Створити послідовність парааксіальних msgid "Mode of new lines drawn by this tool" msgstr "Режим малювання нових ліній за допомогою цього інструмента" -#: ../src/widgets/pencil-toolbar.cpp:175 +#: ../src/widgets/pencil-toolbar.cpp:176 msgctxt "Freehand shape" msgid "None" msgstr "Немає" -#: ../src/widgets/pencil-toolbar.cpp:176 +#: ../src/widgets/pencil-toolbar.cpp:177 msgid "Triangle in" msgstr "Послаблення" -#: ../src/widgets/pencil-toolbar.cpp:177 +#: ../src/widgets/pencil-toolbar.cpp:178 msgid "Triangle out" msgstr "Посилення" -#: ../src/widgets/pencil-toolbar.cpp:179 +#: ../src/widgets/pencil-toolbar.cpp:180 msgid "From clipboard" msgstr "З буфера обміну даними" -#: ../src/widgets/pencil-toolbar.cpp:180 +#: ../src/widgets/pencil-toolbar.cpp:181 msgid "Bend from clipboard" msgstr "Вигин з буфера обміну даними" -#: ../src/widgets/pencil-toolbar.cpp:181 +#: ../src/widgets/pencil-toolbar.cpp:182 msgid "Last applied" msgstr "Останнє застосоване" -#: ../src/widgets/pencil-toolbar.cpp:206 ../src/widgets/pencil-toolbar.cpp:207 +#: ../src/widgets/pencil-toolbar.cpp:207 ../src/widgets/pencil-toolbar.cpp:208 msgid "Shape:" msgstr "Форма:" -#: ../src/widgets/pencil-toolbar.cpp:206 +#: ../src/widgets/pencil-toolbar.cpp:207 msgid "Shape of new paths drawn by this tool" msgstr "Форма нових контурів, створений за допомогою цього інструмента" -#: ../src/widgets/pencil-toolbar.cpp:371 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(many nodes, rough)" msgstr "(багато вузлів, груба)" -#: ../src/widgets/pencil-toolbar.cpp:371 +#: ../src/widgets/pencil-toolbar.cpp:372 msgid "(few nodes, smooth)" msgstr "(мало вузлів, гладка)" -#: ../src/widgets/pencil-toolbar.cpp:374 +#: ../src/widgets/pencil-toolbar.cpp:375 msgid "Smoothing: " msgstr "Згладжування: " -#: ../src/widgets/pencil-toolbar.cpp:375 +#: ../src/widgets/pencil-toolbar.cpp:376 msgid "How much smoothing (simplifying) is applied to the line" msgstr "Міра згладжування (спрощення), яку буде застосовано до лінії" -#: ../src/widgets/pencil-toolbar.cpp:396 +#: ../src/widgets/pencil-toolbar.cpp:397 msgid "" "Reset pencil parameters to defaults (use Inkscape Preferences > Tools to " "change defaults)" @@ -30040,11 +30317,11 @@ msgstr "" "Відновити типові параметри пера (типові параметри можна змінити у вікні " "Параметри Inkscape->Інструменти)" -#: ../src/widgets/pencil-toolbar.cpp:406 ../src/widgets/pencil-toolbar.cpp:407 +#: ../src/widgets/pencil-toolbar.cpp:407 ../src/widgets/pencil-toolbar.cpp:408 msgid "LPE based interactive simplify" msgstr "Інтерактивне спрощення на основі LPE" -#: ../src/widgets/pencil-toolbar.cpp:417 ../src/widgets/pencil-toolbar.cpp:418 +#: ../src/widgets/pencil-toolbar.cpp:418 ../src/widgets/pencil-toolbar.cpp:419 msgid "LPE simplify flatten" msgstr "Спрощення на основі LPE" @@ -30104,39 +30381,39 @@ msgstr "Не округлений" msgid "Make corners sharp" msgstr "Прибрати округлення кутів" -#: ../src/widgets/ruler.cpp:193 +#: ../src/widgets/ruler.cpp:202 msgid "The orientation of the ruler" msgstr "Орієнтація лінійки" -#: ../src/widgets/ruler.cpp:203 +#: ../src/widgets/ruler.cpp:212 msgid "Unit of the ruler" msgstr "Одиниця виміру на лінійці" -#: ../src/widgets/ruler.cpp:210 +#: ../src/widgets/ruler.cpp:219 msgid "Lower" msgstr "Нижня" -#: ../src/widgets/ruler.cpp:211 +#: ../src/widgets/ruler.cpp:220 msgid "Lower limit of ruler" msgstr "Нижня межа на лінійці" -#: ../src/widgets/ruler.cpp:220 +#: ../src/widgets/ruler.cpp:229 msgid "Upper" msgstr "Верхня" -#: ../src/widgets/ruler.cpp:221 +#: ../src/widgets/ruler.cpp:230 msgid "Upper limit of ruler" msgstr "Верхня межа на лінійці" -#: ../src/widgets/ruler.cpp:231 +#: ../src/widgets/ruler.cpp:240 msgid "Position of mark on the ruler" msgstr "Розташування позначки на лінійці" -#: ../src/widgets/ruler.cpp:240 +#: ../src/widgets/ruler.cpp:249 msgid "Max Size" msgstr "Макс. розмір" -#: ../src/widgets/ruler.cpp:241 +#: ../src/widgets/ruler.cpp:250 msgid "Maximum size of the ruler" msgstr "Максимальний розмір лінійки" @@ -30144,19 +30421,19 @@ msgstr "Максимальний розмір лінійки" msgid "Transform by toolbar" msgstr "Перетворення за панеллю інструментів" -#: ../src/widgets/select-toolbar.cpp:341 +#: ../src/widgets/select-toolbar.cpp:280 msgid "Now stroke width is scaled when objects are scaled." msgstr "" "Тепер товщина штриха масштабується під час зміни масштабу " "об'єктів." -#: ../src/widgets/select-toolbar.cpp:343 +#: ../src/widgets/select-toolbar.cpp:282 msgid "Now stroke width is not scaled when objects are scaled." msgstr "" "Тепер товщина штриха не масштабується під час зміни масштабу " "об'єктів." -#: ../src/widgets/select-toolbar.cpp:354 +#: ../src/widgets/select-toolbar.cpp:293 msgid "" "Now rounded rectangle corners are scaled when rectangles are " "scaled." @@ -30164,7 +30441,7 @@ msgstr "" "Тепер закруглені кути прямокутника змінюватимуть масштаб під " "час зміни масштабу прямокутника." -#: ../src/widgets/select-toolbar.cpp:356 +#: ../src/widgets/select-toolbar.cpp:295 msgid "" "Now rounded rectangle corners are not scaled when rectangles " "are scaled." @@ -30172,7 +30449,7 @@ msgstr "" "Тепер закруглені кути прямокутника не змінюватимуть масштаб " "під час зміни масштабу прямокутника." -#: ../src/widgets/select-toolbar.cpp:367 +#: ../src/widgets/select-toolbar.cpp:306 msgid "" "Now gradients are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." @@ -30181,7 +30458,7 @@ msgstr "" "коли вони перетворюватимуться (переміщуватимуться, змінюватимуть масштаб, " "повертатимуться або нахилятимуться)." -#: ../src/widgets/select-toolbar.cpp:369 +#: ../src/widgets/select-toolbar.cpp:308 msgid "" "Now gradients remain fixed when objects are transformed " "(moved, scaled, rotated, or skewed)." @@ -30189,7 +30466,7 @@ msgstr "" "Тепер закруглені кути прямокутника не змінюватимуться під час " "зміни масштабу прямокутника." -#: ../src/widgets/select-toolbar.cpp:380 +#: ../src/widgets/select-toolbar.cpp:319 msgid "" "Now patterns are transformed along with their objects when " "those are transformed (moved, scaled, rotated, or skewed)." @@ -30198,7 +30475,7 @@ msgstr "" "коли вони перетворюватимуться (переміщуватимуться, змінюватимуть масштаб, " "повертатимуться або нахилятимуться)." -#: ../src/widgets/select-toolbar.cpp:382 +#: ../src/widgets/select-toolbar.cpp:321 msgid "" "Now patterns remain fixed when objects are transformed (moved, " "scaled, rotated, or skewed)." @@ -30207,80 +30484,95 @@ msgstr "" "коли вони перетворюватимуться (переміщуватимуться, змінюватимуть масштаб, " "повертатимуться або нахилятимуться)." -#. four spinbuttons -#: ../src/widgets/select-toolbar.cpp:500 +#. name +#: ../src/widgets/select-toolbar.cpp:441 msgctxt "Select toolbar" msgid "X position" msgstr "Розташування за X" -#: ../src/widgets/select-toolbar.cpp:500 +#. label +#: ../src/widgets/select-toolbar.cpp:442 msgctxt "Select toolbar" msgid "X:" msgstr "X:" -#: ../src/widgets/select-toolbar.cpp:502 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:443 +msgctxt "Select toolbar" msgid "Horizontal coordinate of selection" msgstr "Горизонтальна координата позначення" -#: ../src/widgets/select-toolbar.cpp:506 +#. name +#: ../src/widgets/select-toolbar.cpp:460 msgctxt "Select toolbar" msgid "Y position" msgstr "Розташування за Y" -#: ../src/widgets/select-toolbar.cpp:506 +#. label +#: ../src/widgets/select-toolbar.cpp:461 msgctxt "Select toolbar" msgid "Y:" msgstr "Y:" -#: ../src/widgets/select-toolbar.cpp:508 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:462 +msgctxt "Select toolbar" msgid "Vertical coordinate of selection" msgstr "Вертикальна координата позначення" -#: ../src/widgets/select-toolbar.cpp:512 +#. name +#: ../src/widgets/select-toolbar.cpp:479 msgctxt "Select toolbar" msgid "Width" msgstr "Ширина" -#: ../src/widgets/select-toolbar.cpp:512 +#. label +#: ../src/widgets/select-toolbar.cpp:480 msgctxt "Select toolbar" msgid "W:" msgstr "Ш:" -#: ../src/widgets/select-toolbar.cpp:514 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:481 +msgctxt "Select toolbar" msgid "Width of selection" msgstr "Ширина позначення" -#: ../src/widgets/select-toolbar.cpp:521 +#: ../src/widgets/select-toolbar.cpp:499 msgid "Lock width and height" msgstr "Заблокувати ширину і висоту" -#: ../src/widgets/select-toolbar.cpp:522 +#: ../src/widgets/select-toolbar.cpp:500 msgid "When locked, change both width and height by the same proportion" msgstr "Коли заблоковано, пропорційно змінювати ширину та висоту" -#: ../src/widgets/select-toolbar.cpp:531 +#. name +#: ../src/widgets/select-toolbar.cpp:511 msgctxt "Select toolbar" msgid "Height" msgstr "Висота" -#: ../src/widgets/select-toolbar.cpp:531 +#. label +#: ../src/widgets/select-toolbar.cpp:512 msgctxt "Select toolbar" msgid "H:" msgstr "В:" -#: ../src/widgets/select-toolbar.cpp:533 +#. shortLabel +#: ../src/widgets/select-toolbar.cpp:513 +msgctxt "Select toolbar" msgid "Height of selection" msgstr "Висота позначення" -#: ../src/widgets/select-toolbar.cpp:583 +#: ../src/widgets/select-toolbar.cpp:575 msgid "Scale rounded corners" msgstr "Змінити розмір округлених кутів" -#: ../src/widgets/select-toolbar.cpp:594 +#: ../src/widgets/select-toolbar.cpp:586 msgid "Move gradients" msgstr "Перемістити градієнти" -#: ../src/widgets/select-toolbar.cpp:605 +#: ../src/widgets/select-toolbar.cpp:597 msgid "Move patterns" msgstr "Перемістити текстури" @@ -30288,7 +30580,7 @@ msgstr "Перемістити текстури" msgid "Set attribute" msgstr "Встановити атрибут" -#: ../src/widgets/sp-color-selector.cpp:47 +#: ../src/widgets/sp-color-selector.cpp:43 msgid "Unnamed" msgstr "Без назви" @@ -30393,130 +30685,126 @@ msgstr "" "Параметри Inkscape->Інструменти)" #. Width -#: ../src/widgets/spray-toolbar.cpp:284 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(narrow spray)" msgstr "(вузьке розкидання)" -#: ../src/widgets/spray-toolbar.cpp:284 +#: ../src/widgets/spray-toolbar.cpp:294 msgid "(broad spray)" msgstr "(широке розкидання)" -#: ../src/widgets/spray-toolbar.cpp:287 +#: ../src/widgets/spray-toolbar.cpp:297 msgid "The width of the spray area (relative to the visible canvas area)" msgstr "Ширина області розкидання (відносно видимої області полотна)" -#: ../src/widgets/spray-toolbar.cpp:302 +#: ../src/widgets/spray-toolbar.cpp:312 msgid "Use the pressure of the input device to alter the width of spray area" msgstr "" "Використовувати силу натиску пристроєм введення для зміни ширини області " "розкидання" -#: ../src/widgets/spray-toolbar.cpp:313 +#: ../src/widgets/spray-toolbar.cpp:323 msgid "(maximum mean)" msgstr "(максимальне середнє)" -#: ../src/widgets/spray-toolbar.cpp:316 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus" msgstr "Фокусування" -#: ../src/widgets/spray-toolbar.cpp:316 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "Focus:" msgstr "Фокусування:" -#: ../src/widgets/spray-toolbar.cpp:316 +#: ../src/widgets/spray-toolbar.cpp:326 msgid "0 to spray a spot; increase to enlarge the ring radius" msgstr "" "0 призведе до малювання п'ятна. Збільшення значення збільшить радіус кільця." #. Standard_deviation -#: ../src/widgets/spray-toolbar.cpp:329 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(minimum scatter)" msgstr "(мінімальне розсіювання)" -#: ../src/widgets/spray-toolbar.cpp:329 +#: ../src/widgets/spray-toolbar.cpp:339 msgid "(maximum scatter)" msgstr "(максимальне розсіювання)" -#: ../src/widgets/spray-toolbar.cpp:332 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter" msgstr "Розсіювання" -#: ../src/widgets/spray-toolbar.cpp:332 +#: ../src/widgets/spray-toolbar.cpp:342 msgctxt "Spray tool" msgid "Scatter:" msgstr "Розсіювання:" -#: ../src/widgets/spray-toolbar.cpp:332 +#: ../src/widgets/spray-toolbar.cpp:342 msgid "Increase to scatter sprayed objects" msgstr "Збільшити розсіювання розкиданих об'єктів" -#: ../src/widgets/spray-toolbar.cpp:351 +#: ../src/widgets/spray-toolbar.cpp:361 msgid "Spray copies of the initial selection" msgstr "Розкидати копії початкової позначеної області" -#: ../src/widgets/spray-toolbar.cpp:358 +#: ../src/widgets/spray-toolbar.cpp:368 msgid "Spray clones of the initial selection" msgstr "Розкидати клони початкової позначеної області" -#: ../src/widgets/spray-toolbar.cpp:365 +#: ../src/widgets/spray-toolbar.cpp:375 msgid "Spray single path" msgstr "Розкидати окремий контур" -#: ../src/widgets/spray-toolbar.cpp:366 +#: ../src/widgets/spray-toolbar.cpp:376 msgid "Spray objects in a single path" msgstr "Розкидати об'єкти за окремим контуром" -#: ../src/widgets/spray-toolbar.cpp:373 +#: ../src/widgets/spray-toolbar.cpp:383 msgid "Delete sprayed items" msgstr "Вилучити розкидані об’єкти" -#: ../src/widgets/spray-toolbar.cpp:374 +#: ../src/widgets/spray-toolbar.cpp:384 msgid "Delete sprayed items from selection" msgstr "Вилучити розкидані об’єкти з позначеного" -#: ../src/widgets/spray-toolbar.cpp:378 ../src/widgets/tweak-toolbar.cpp:253 -msgid "Mode" -msgstr "Режим" - #. Population -#: ../src/widgets/spray-toolbar.cpp:398 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(low population)" msgstr "(низька щільність)" -#: ../src/widgets/spray-toolbar.cpp:398 +#: ../src/widgets/spray-toolbar.cpp:408 msgid "(high population)" msgstr "(висока щільність)" -#: ../src/widgets/spray-toolbar.cpp:401 +#: ../src/widgets/spray-toolbar.cpp:411 msgid "Amount" msgstr "Величина" -#: ../src/widgets/spray-toolbar.cpp:402 +#: ../src/widgets/spray-toolbar.cpp:412 msgid "Adjusts the number of items sprayed per click" msgstr "" "За допомогою цього параметра можна вказати кількість об'єктів, які буде " "розкидано за одне клацання" -#: ../src/widgets/spray-toolbar.cpp:418 +#: ../src/widgets/spray-toolbar.cpp:428 msgid "" "Use the pressure of the input device to alter the amount of sprayed objects" msgstr "" "Використовувати силу натиску пристрою введення для зміни кількості об'єктів" -#: ../src/widgets/spray-toolbar.cpp:428 +#: ../src/widgets/spray-toolbar.cpp:438 msgid "(high rotation variation)" msgstr "(значне відхилення обертання)" -#: ../src/widgets/spray-toolbar.cpp:431 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation" msgstr "Обертання" -#: ../src/widgets/spray-toolbar.cpp:431 +#: ../src/widgets/spray-toolbar.cpp:441 msgid "Rotation:" msgstr "Обертання:" -#: ../src/widgets/spray-toolbar.cpp:433 +#: ../src/widgets/spray-toolbar.cpp:443 #, no-c-format msgid "" "Variation of the rotation of the sprayed objects; 0% for the same rotation " @@ -30525,21 +30813,21 @@ msgstr "" "Припустиме відхилення у куті повороту розкиданих об'єктів. Значення 0% " "призведе до рівності цього кута куту повороту початкового об'єкта." -#: ../src/widgets/spray-toolbar.cpp:446 +#: ../src/widgets/spray-toolbar.cpp:456 msgid "(high scale variation)" msgstr "(значне відхилення масштабу)" -#: ../src/widgets/spray-toolbar.cpp:449 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale" msgstr "Масштабувати" -#: ../src/widgets/spray-toolbar.cpp:449 +#: ../src/widgets/spray-toolbar.cpp:459 msgctxt "Spray tool" msgid "Scale:" msgstr "Масштаб:" -#: ../src/widgets/spray-toolbar.cpp:451 +#: ../src/widgets/spray-toolbar.cpp:461 #, no-c-format msgid "" "Variation in the scale of the sprayed objects; 0% for the same scale than " @@ -30548,73 +30836,73 @@ msgstr "" "Припустиме відхилення у масштабі розкиданих об'єктів. Значення 0% призведе " "до рівності цього масштабу масштабу початкового об'єкта." -#: ../src/widgets/spray-toolbar.cpp:467 +#: ../src/widgets/spray-toolbar.cpp:477 msgid "Use the pressure of the input device to alter the scale of new items" msgstr "" "Використовувати силу натиску пристроєм введення для зміни масштабу нових " "об’єктів" -#: ../src/widgets/spray-toolbar.cpp:479 ../src/widgets/spray-toolbar.cpp:480 +#: ../src/widgets/spray-toolbar.cpp:489 ../src/widgets/spray-toolbar.cpp:490 msgid "" -"Pick color from the drawing. You can use clonetiler trace dialog for advanced " -"effects. In clone mode original fill or stroke colors must be unset." +"Pick color from the drawing. You can use clonetiler trace dialog for " +"advanced effects. In clone mode original fill or stroke colors must be unset." msgstr "" "Вибрати колір із зображення. Ви можете скористатися діалоговим вікном " "трасування мозаїчних клонів для створення додаткових ефектів. У режимі " "клонування має бути вимкнено врахування початкових кольорів заповнення або " "штриха." -#: ../src/widgets/spray-toolbar.cpp:492 ../src/widgets/spray-toolbar.cpp:493 +#: ../src/widgets/spray-toolbar.cpp:502 ../src/widgets/spray-toolbar.cpp:503 msgid "Pick from center instead average area." msgstr "Вибрати з центра, а не середній за областю." -#: ../src/widgets/spray-toolbar.cpp:505 ../src/widgets/spray-toolbar.cpp:506 +#: ../src/widgets/spray-toolbar.cpp:515 ../src/widgets/spray-toolbar.cpp:516 msgid "Inverted pick value, retaining color in advanced trace mode" msgstr "" "Інвертоване вибране значення зі збереженням кольору у режимі розширеної " "векторизації" -#: ../src/widgets/spray-toolbar.cpp:518 ../src/widgets/spray-toolbar.cpp:519 +#: ../src/widgets/spray-toolbar.cpp:528 ../src/widgets/spray-toolbar.cpp:529 msgid "Apply picked color to fill" msgstr "Застосувати вибраний колір для заповнення" -#: ../src/widgets/spray-toolbar.cpp:531 ../src/widgets/spray-toolbar.cpp:532 +#: ../src/widgets/spray-toolbar.cpp:541 ../src/widgets/spray-toolbar.cpp:542 msgid "Apply picked color to stroke" msgstr "Застосувати вибраний колір до штриха" -#: ../src/widgets/spray-toolbar.cpp:544 ../src/widgets/spray-toolbar.cpp:545 +#: ../src/widgets/spray-toolbar.cpp:554 ../src/widgets/spray-toolbar.cpp:555 msgid "No overlap between colors" msgstr "Без перекриття між кольорами" -#: ../src/widgets/spray-toolbar.cpp:557 ../src/widgets/spray-toolbar.cpp:558 +#: ../src/widgets/spray-toolbar.cpp:567 ../src/widgets/spray-toolbar.cpp:568 msgid "Apply over transparent areas" msgstr "Застосувати до прозорих областей" -#: ../src/widgets/spray-toolbar.cpp:570 ../src/widgets/spray-toolbar.cpp:571 +#: ../src/widgets/spray-toolbar.cpp:580 ../src/widgets/spray-toolbar.cpp:581 msgid "Apply over no transparent areas" msgstr "Застосувати до непрозорих областей" -#: ../src/widgets/spray-toolbar.cpp:583 ../src/widgets/spray-toolbar.cpp:584 +#: ../src/widgets/spray-toolbar.cpp:593 ../src/widgets/spray-toolbar.cpp:594 msgid "Prevent overlapping objects" msgstr "Запобігати перекриттю об’єктів" -#: ../src/widgets/spray-toolbar.cpp:595 +#: ../src/widgets/spray-toolbar.cpp:605 msgid "(minimum offset)" msgstr "(мінімальний відступ)" -#: ../src/widgets/spray-toolbar.cpp:595 +#: ../src/widgets/spray-toolbar.cpp:605 msgid "(maximum offset)" msgstr "(максимальний відступ)" -#: ../src/widgets/spray-toolbar.cpp:598 +#: ../src/widgets/spray-toolbar.cpp:608 msgid "Offset %" msgstr "Відступ у %" -#: ../src/widgets/spray-toolbar.cpp:598 +#: ../src/widgets/spray-toolbar.cpp:608 msgid "Offset %:" msgstr "Відступ у %:" -#: ../src/widgets/spray-toolbar.cpp:599 +#: ../src/widgets/spray-toolbar.cpp:609 msgid "Increase to segregate objects more (value in percent)" msgstr "Збільшити окремі об’єкти (значення у відсотках)" @@ -30802,557 +31090,581 @@ msgctxt "Stroke width" msgid "_Width:" msgstr "_Ширина:" -#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. -#. For an example, draw a triangle with a large stroke width and modify the -#. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:239 -msgid "Miter join" -msgstr "Гостре" +#. Dash +#: ../src/widgets/stroke-style.cpp:225 +msgid "Dashes:" +msgstr "Пунктир:" + +#. Drop down marker selectors +#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes +#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. +#: ../src/widgets/stroke-style.cpp:251 +msgid "Markers:" +msgstr "Маркери:" + +#: ../src/widgets/stroke-style.cpp:257 +msgid "Start Markers are drawn on the first node of a path or shape" +msgstr "Початкові маркери малюються на першому вузлі контуру або форми" + +#: ../src/widgets/stroke-style.cpp:266 +msgid "" +"Mid Markers are drawn on every node of a path or shape except the first and " +"last nodes" +msgstr "" +"Серединні маркери малюються на кожному вузлі контуру або форми окрім першого " +"і останнього вузлів" + +#: ../src/widgets/stroke-style.cpp:275 +msgid "End Markers are drawn on the last node of a path or shape" +msgstr "Кінцеві маркери малюються на останньому вузлі контуру або форми" #. TRANSLATORS: Round join: joining lines with a rounded corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:247 +#: ../src/widgets/stroke-style.cpp:300 msgid "Round join" msgstr "Округлене" #. TRANSLATORS: Bevel join: joining lines with a blunted (flattened) corner. #. For an example, draw a triangle with a large stroke width and modify the #. "Join" option (in the Fill and Stroke dialog). -#: ../src/widgets/stroke-style.cpp:255 +#: ../src/widgets/stroke-style.cpp:308 msgid "Bevel join" msgstr "Фасочне" -#: ../src/widgets/stroke-style.cpp:280 -msgid "Miter _limit:" -msgstr "Ме_жа вістря:" +#. TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner. +#. For an example, draw a triangle with a large stroke width and modify the +#. "Join" option (in the Fill and Stroke dialog). +#: ../src/widgets/stroke-style.cpp:316 +msgid "Miter join" +msgstr "Гостре" #. Cap type #. TRANSLATORS: cap type specifies the shape for the ends of lines #. spw_label(t, _("_Cap:"), 0, i); -#: ../src/widgets/stroke-style.cpp:296 +#: ../src/widgets/stroke-style.cpp:353 msgid "Cap:" msgstr "Закінчення:" #. TRANSLATORS: Butt cap: the line shape does not extend beyond the end point #. of the line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:307 +#: ../src/widgets/stroke-style.cpp:364 msgid "Butt cap" msgstr "Плоскі" #. TRANSLATORS: Round cap: the line shape extends beyond the end point of the #. line; the ends of the line are rounded -#: ../src/widgets/stroke-style.cpp:314 +#: ../src/widgets/stroke-style.cpp:371 msgid "Round cap" msgstr "Округлені" #. TRANSLATORS: Square cap: the line shape extends beyond the end point of the #. line; the ends of the line are square -#: ../src/widgets/stroke-style.cpp:321 +#: ../src/widgets/stroke-style.cpp:378 msgid "Square cap" msgstr "Квадратні" -#. Dash -#: ../src/widgets/stroke-style.cpp:326 -msgid "Dashes:" -msgstr "Пунктир:" +#: ../src/widgets/stroke-style.cpp:392 +msgid "Fill, Stroke, Markers" +msgstr "Заповнення, штрих, маркери" -#. Drop down marker selectors -#. TRANSLATORS: Path markers are an SVG feature that allows you to attach arbitrary shapes -#. (arrowheads, bullets, faces, whatever) to the start, end, or middle nodes of a path. -#: ../src/widgets/stroke-style.cpp:352 -msgid "Markers:" -msgstr "Маркери:" +#: ../src/widgets/stroke-style.cpp:396 +msgid "Stroke, Fill, Markers" +msgstr "Штрих, заповнення, маркери" -#: ../src/widgets/stroke-style.cpp:358 -msgid "Start Markers are drawn on the first node of a path or shape" -msgstr "Початкові маркери малюються на першому вузлі контуру або форми" +#: ../src/widgets/stroke-style.cpp:400 +msgid "Fill, Markers, Stroke" +msgstr "Заповнення, маркери, штрих" -#: ../src/widgets/stroke-style.cpp:367 -msgid "" -"Mid Markers are drawn on every node of a path or shape except the first and " -"last nodes" -msgstr "" -"Серединні маркери малюються на кожному вузлі контуру або форми окрім першого " -"і останнього вузлів" +#: ../src/widgets/stroke-style.cpp:408 +msgid "Markers, Fill, Stroke" +msgstr "Маркери, заповнення, штрих" -#: ../src/widgets/stroke-style.cpp:376 -msgid "End Markers are drawn on the last node of a path or shape" -msgstr "Кінцеві маркери малюються на останньому вузлі контуру або форми" +#: ../src/widgets/stroke-style.cpp:412 +msgid "Stroke, Markers, Fill" +msgstr "Штрих, маркери, заповнення" + +#: ../src/widgets/stroke-style.cpp:416 +msgid "Markers, Stroke, Fill" +msgstr "Маркери, штрих, заповнення" -#: ../src/widgets/stroke-style.cpp:498 +#: ../src/widgets/stroke-style.cpp:534 msgid "Set markers" msgstr "Встановити маркери" -#: ../src/widgets/stroke-style.cpp:1033 ../src/widgets/stroke-style.cpp:1117 +#: ../src/widgets/stroke-style.cpp:1116 ../src/widgets/stroke-style.cpp:1205 msgid "Set stroke style" msgstr "Встановлення стилю штриха" -#: ../src/widgets/stroke-style.cpp:1206 +#: ../src/widgets/stroke-style.cpp:1309 msgid "Set marker color" msgstr "Встановити колір маркера" -#: ../src/widgets/swatch-selector.cpp:127 +#: ../src/widgets/swatch-selector.cpp:89 msgid "Change swatch color" msgstr "Змінити колір зразка" -#: ../src/widgets/text-toolbar.cpp:173 +#: ../src/widgets/text-toolbar.cpp:179 msgid "Text: Change font family" msgstr "Текст: Зміна сімейства шрифту" -#: ../src/widgets/text-toolbar.cpp:239 +#: ../src/widgets/text-toolbar.cpp:245 msgid "Text: Change font size" msgstr "Текст: Зміна розміру шрифту" -#: ../src/widgets/text-toolbar.cpp:275 +#: ../src/widgets/text-toolbar.cpp:281 msgid "Text: Change font style" msgstr "Текст: Зміна нарису шрифту" -#: ../src/widgets/text-toolbar.cpp:353 +#: ../src/widgets/text-toolbar.cpp:359 msgid "Text: Change superscript or subscript" msgstr "Текст: змінити на верхній або нижній індекс" -#: ../src/widgets/text-toolbar.cpp:496 +#: ../src/widgets/text-toolbar.cpp:502 msgid "Text: Change alignment" msgstr "Текст: Зміна вирівнювання" -#: ../src/widgets/text-toolbar.cpp:539 +#: ../src/widgets/text-toolbar.cpp:573 msgid "Text: Change line-height" msgstr "Текст: Зміна висоти рядків" -#: ../src/widgets/text-toolbar.cpp:587 +#: ../src/widgets/text-toolbar.cpp:728 +msgid "Text: Change line-height unit" +msgstr "Текст: Зміна одиниці висоти рядків" + +#: ../src/widgets/text-toolbar.cpp:777 msgid "Text: Change word-spacing" msgstr "Текст: Зміна інтервалів між словами" -#: ../src/widgets/text-toolbar.cpp:627 +#: ../src/widgets/text-toolbar.cpp:817 msgid "Text: Change letter-spacing" msgstr "Текст: Зміна інтервалів між літерами" -#: ../src/widgets/text-toolbar.cpp:665 +#: ../src/widgets/text-toolbar.cpp:855 msgid "Text: Change dx (kern)" msgstr "Текст: Зміна приросту за x (керна)" -#: ../src/widgets/text-toolbar.cpp:699 +#: ../src/widgets/text-toolbar.cpp:889 msgid "Text: Change dy" msgstr "Текст: Зміна приросту за y" -#: ../src/widgets/text-toolbar.cpp:734 +#: ../src/widgets/text-toolbar.cpp:924 msgid "Text: Change rotate" msgstr "Текст: Зміна кута обертання" -#: ../src/widgets/text-toolbar.cpp:787 +#: ../src/widgets/text-toolbar.cpp:977 msgid "Text: Change writing mode" msgstr "Текст: Зміна режиму написання" -#: ../src/widgets/text-toolbar.cpp:841 +#: ../src/widgets/text-toolbar.cpp:1031 msgid "Text: Change orientation" msgstr "Текст: Зміна орієнтації" -#: ../src/widgets/text-toolbar.cpp:1309 +#: ../src/widgets/text-toolbar.cpp:1539 msgid "Font Family" msgstr "Гарнітура шрифту" -#: ../src/widgets/text-toolbar.cpp:1310 +#: ../src/widgets/text-toolbar.cpp:1540 msgid "Select Font Family (Alt-X to access)" msgstr "Виберіть гарнітуру шрифту (Alt-X для доступу)" #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1320 +#: ../src/widgets/text-toolbar.cpp:1550 msgid "Select all text with this font-family" msgstr "Позначити всі фрагменти тексту з цією гарнітурою шрифту" -#: ../src/widgets/text-toolbar.cpp:1324 +#: ../src/widgets/text-toolbar.cpp:1554 msgid "Font not found on system" msgstr "Шрифту у системі не виявлено" -#: ../src/widgets/text-toolbar.cpp:1383 +#: ../src/widgets/text-toolbar.cpp:1631 msgid "Font Style" msgstr "Стиль шрифту" -#: ../src/widgets/text-toolbar.cpp:1384 +#: ../src/widgets/text-toolbar.cpp:1632 msgid "Font style" msgstr "Стиль шрифту" #. Name -#: ../src/widgets/text-toolbar.cpp:1401 +#: ../src/widgets/text-toolbar.cpp:1649 msgid "Toggle Superscript" msgstr "Увімкнути/Вимкнути режим верхнього індексу" #. Label -#: ../src/widgets/text-toolbar.cpp:1402 +#: ../src/widgets/text-toolbar.cpp:1650 msgid "Toggle superscript" msgstr "Увімкнути/Вимкнути режим верхнього індексу" #. Name -#: ../src/widgets/text-toolbar.cpp:1414 +#: ../src/widgets/text-toolbar.cpp:1662 msgid "Toggle Subscript" msgstr "Увімкнути/Вимкнути режим нижнього індексу" #. Label -#: ../src/widgets/text-toolbar.cpp:1415 +#: ../src/widgets/text-toolbar.cpp:1663 msgid "Toggle subscript" msgstr "Увімкнути/Вимкнути режим нижнього індексу" -#: ../src/widgets/text-toolbar.cpp:1456 +#: ../src/widgets/text-toolbar.cpp:1704 msgid "Justify" msgstr "Вирівняти з заповненням" #. Name -#: ../src/widgets/text-toolbar.cpp:1463 +#: ../src/widgets/text-toolbar.cpp:1711 msgid "Alignment" msgstr "Вирівнювання" #. Label -#: ../src/widgets/text-toolbar.cpp:1464 +#: ../src/widgets/text-toolbar.cpp:1712 msgid "Text alignment" msgstr "Вирівнювання тексту" -#: ../src/widgets/text-toolbar.cpp:1491 +#: ../src/widgets/text-toolbar.cpp:1739 msgid "Horizontal" msgstr "Горизонтально" -#: ../src/widgets/text-toolbar.cpp:1498 +#: ../src/widgets/text-toolbar.cpp:1746 msgid "Vertical — RL" msgstr "Вертикально — лівопис" -#: ../src/widgets/text-toolbar.cpp:1499 +#: ../src/widgets/text-toolbar.cpp:1747 msgid "Vertical text — lines: right to left" msgstr "Вертикальний текст — рядки: справа ліворуч" -#: ../src/widgets/text-toolbar.cpp:1505 +#: ../src/widgets/text-toolbar.cpp:1753 msgid "Vertical — LR" msgstr "Вертикально — правопис" -#: ../src/widgets/text-toolbar.cpp:1506 +#: ../src/widgets/text-toolbar.cpp:1754 msgid "Vertical text — lines: left to right" msgstr "Вертикальний текст — рядки: зліва праворуч" #. Name -#: ../src/widgets/text-toolbar.cpp:1511 +#: ../src/widgets/text-toolbar.cpp:1759 msgid "Writing mode" msgstr "Режим написання" #. Label -#: ../src/widgets/text-toolbar.cpp:1512 +#: ../src/widgets/text-toolbar.cpp:1760 msgid "Block progression" msgstr "Поступ блоку" -#: ../src/widgets/text-toolbar.cpp:1541 +#: ../src/widgets/text-toolbar.cpp:1789 msgid "Auto glyph orientation" msgstr "Автоматична орієнтації гліфів" -#: ../src/widgets/text-toolbar.cpp:1548 +#: ../src/widgets/text-toolbar.cpp:1796 msgid "Upright" msgstr "Вертикальна" -#: ../src/widgets/text-toolbar.cpp:1549 +#: ../src/widgets/text-toolbar.cpp:1797 msgid "Upright glyph orientation" msgstr "Вертикальна орієнтація гліфів" -#: ../src/widgets/text-toolbar.cpp:1556 +#: ../src/widgets/text-toolbar.cpp:1804 msgid "Sideways" msgstr "Бічна" -#: ../src/widgets/text-toolbar.cpp:1557 +#: ../src/widgets/text-toolbar.cpp:1805 msgid "Sideways glyph orientation" msgstr "Бічна орієнтація гліфів" #. Name -#: ../src/widgets/text-toolbar.cpp:1563 +#: ../src/widgets/text-toolbar.cpp:1811 msgid "Text orientation" msgstr "Орієнтація тексту" #. Label -#: ../src/widgets/text-toolbar.cpp:1564 +#: ../src/widgets/text-toolbar.cpp:1812 msgid "Text (glyph) orientation in vertical text." msgstr "Орієнтація тексту (гліфів) у вертикальному тексті." #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1588 +#: ../src/widgets/text-toolbar.cpp:1845 msgid "Smaller spacing" msgstr "Менший інтервал" -#: ../src/widgets/text-toolbar.cpp:1588 ../src/widgets/text-toolbar.cpp:1619 -#: ../src/widgets/text-toolbar.cpp:1650 +#: ../src/widgets/text-toolbar.cpp:1845 ../src/widgets/text-toolbar.cpp:1884 +#: ../src/widgets/text-toolbar.cpp:1915 msgctxt "Text tool" msgid "Normal" msgstr "Звичайний" -#: ../src/widgets/text-toolbar.cpp:1588 +#: ../src/widgets/text-toolbar.cpp:1845 msgid "Larger spacing" msgstr "Більший інтервал" #. name -#: ../src/widgets/text-toolbar.cpp:1593 +#: ../src/widgets/text-toolbar.cpp:1850 msgid "Line Height" msgstr "Висота рядка" #. label -#: ../src/widgets/text-toolbar.cpp:1594 +#: ../src/widgets/text-toolbar.cpp:1851 msgid "Line:" msgstr "Рядок:" #. short label -#: ../src/widgets/text-toolbar.cpp:1595 -msgid "Spacing between lines (times font size)" -msgstr "Інтервал між рядками (у одиницях розміру шрифту)" +#: ../src/widgets/text-toolbar.cpp:1852 +msgid "Spacing between baselines (times font size)" +msgstr "Інтервал між базовими лініями (у одиницях розміру шрифту)" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 +#: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 msgid "Negative spacing" msgstr "Від'ємний інтервал" -#: ../src/widgets/text-toolbar.cpp:1619 ../src/widgets/text-toolbar.cpp:1650 +#: ../src/widgets/text-toolbar.cpp:1884 ../src/widgets/text-toolbar.cpp:1915 msgid "Positive spacing" msgstr "Додатний інтервал" #. name -#: ../src/widgets/text-toolbar.cpp:1624 +#: ../src/widgets/text-toolbar.cpp:1889 msgid "Word spacing" msgstr "Інтервал між словами" #. label -#: ../src/widgets/text-toolbar.cpp:1625 +#: ../src/widgets/text-toolbar.cpp:1890 msgid "Word:" msgstr "Слово:" #. short label -#: ../src/widgets/text-toolbar.cpp:1626 +#: ../src/widgets/text-toolbar.cpp:1891 msgid "Spacing between words (px)" msgstr "Інтервал між словами (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1655 +#: ../src/widgets/text-toolbar.cpp:1920 msgid "Letter spacing" msgstr "Інтервал між літерами" #. label -#: ../src/widgets/text-toolbar.cpp:1656 +#: ../src/widgets/text-toolbar.cpp:1921 msgid "Letter:" msgstr "Літера:" #. short label -#: ../src/widgets/text-toolbar.cpp:1657 +#: ../src/widgets/text-toolbar.cpp:1922 msgid "Spacing between letters (px)" msgstr "Інтервал між літерами (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1686 +#: ../src/widgets/text-toolbar.cpp:1951 msgid "Kerning" msgstr "Кернінґ" #. label -#: ../src/widgets/text-toolbar.cpp:1687 +#: ../src/widgets/text-toolbar.cpp:1952 msgid "Kern:" msgstr "Керн:" #. short label -#: ../src/widgets/text-toolbar.cpp:1688 +#: ../src/widgets/text-toolbar.cpp:1953 msgid "Horizontal kerning (px)" msgstr "Горизонтальний кернінґ (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1717 +#: ../src/widgets/text-toolbar.cpp:1982 msgid "Vertical Shift" msgstr "Вертикальний зсув" #. label -#: ../src/widgets/text-toolbar.cpp:1718 +#: ../src/widgets/text-toolbar.cpp:1983 msgid "Vert:" msgstr "Верт.:" #. short label -#: ../src/widgets/text-toolbar.cpp:1719 +#: ../src/widgets/text-toolbar.cpp:1984 msgid "Vertical shift (px)" msgstr "Вертикальний зсув (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1748 +#: ../src/widgets/text-toolbar.cpp:2013 msgid "Letter rotation" msgstr "Обертання літер" #. label -#: ../src/widgets/text-toolbar.cpp:1749 +#: ../src/widgets/text-toolbar.cpp:2014 msgid "Rot:" msgstr "Обер.:" #. short label -#: ../src/widgets/text-toolbar.cpp:1750 +#: ../src/widgets/text-toolbar.cpp:2015 msgid "Character rotation (degrees)" msgstr "Обертання символів (у градусах)" -#: ../src/widgets/toolbox.cpp:184 +#: ../src/widgets/toolbox.cpp:186 msgid "Color/opacity used for color tweaking" msgstr "Колір/непрозорість, що використовуватимуться для корекції кольору" -#: ../src/widgets/toolbox.cpp:192 +#: ../src/widgets/toolbox.cpp:194 msgid "Style of new stars" msgstr "Стиль нових зірок" -#: ../src/widgets/toolbox.cpp:194 +#: ../src/widgets/toolbox.cpp:196 msgid "Style of new rectangles" msgstr "Стиль нових прямокутників" -#: ../src/widgets/toolbox.cpp:196 +#: ../src/widgets/toolbox.cpp:198 msgid "Style of new 3D boxes" msgstr "Стиль нових просторових об'єктів" -#: ../src/widgets/toolbox.cpp:198 +#: ../src/widgets/toolbox.cpp:200 msgid "Style of new ellipses" msgstr "Стиль нових еліпсів" -#: ../src/widgets/toolbox.cpp:200 +#: ../src/widgets/toolbox.cpp:202 msgid "Style of new spirals" msgstr "Стиль нових спіралей" -#: ../src/widgets/toolbox.cpp:202 +#: ../src/widgets/toolbox.cpp:204 msgid "Style of new paths created by Pencil" msgstr "Стиль нових контурів, що створені Олівцем" -#: ../src/widgets/toolbox.cpp:204 +#: ../src/widgets/toolbox.cpp:206 msgid "Style of new paths created by Pen" msgstr "Стиль нових контурів, що створені Пером" -#: ../src/widgets/toolbox.cpp:206 +#: ../src/widgets/toolbox.cpp:208 msgid "Style of new calligraphic strokes" msgstr "Стиль нових каліграфічних штрихів" -#: ../src/widgets/toolbox.cpp:208 ../src/widgets/toolbox.cpp:210 +#: ../src/widgets/toolbox.cpp:210 ../src/widgets/toolbox.cpp:212 msgid "TBD" msgstr "Ще не визначено" -#: ../src/widgets/toolbox.cpp:223 +#: ../src/widgets/toolbox.cpp:225 msgid "Style of Paint Bucket fill objects" msgstr "Стиль нових об'єктів, що створені інструментом заповнення" -#: ../src/widgets/toolbox.cpp:1728 +#: ../src/widgets/toolbox.cpp:1742 msgid "Bounding box" msgstr "Рамка-обгортка" -#: ../src/widgets/toolbox.cpp:1728 +#: ../src/widgets/toolbox.cpp:1742 msgid "Snap bounding boxes" msgstr "Прилипання до рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1737 +#: ../src/widgets/toolbox.cpp:1751 msgid "Bounding box edges" msgstr "Краї рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1737 +#: ../src/widgets/toolbox.cpp:1751 msgid "Snap to edges of a bounding box" msgstr "Прилипання до країв рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1746 +#: ../src/widgets/toolbox.cpp:1760 msgid "Bounding box corners" msgstr "Кути рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1746 +#: ../src/widgets/toolbox.cpp:1760 msgid "Snap bounding box corners" msgstr "Прилипання до кутів рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1755 +#: ../src/widgets/toolbox.cpp:1769 msgid "BBox Edge Midpoints" msgstr "Середні точки країв рамки-обгортки" -#: ../src/widgets/toolbox.cpp:1755 +#: ../src/widgets/toolbox.cpp:1769 msgid "Snap midpoints of bounding box edges" msgstr "Прилипання до середніх точок країв рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1765 +#: ../src/widgets/toolbox.cpp:1779 msgid "BBox Centers" msgstr "Центри рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1765 +#: ../src/widgets/toolbox.cpp:1779 msgid "Snapping centers of bounding boxes" msgstr "Прилипання до центрів рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1774 +#: ../src/widgets/toolbox.cpp:1788 msgid "Snap nodes, paths, and handles" msgstr "Прилипання до вузлів, контурів та вусів" -#: ../src/widgets/toolbox.cpp:1782 +#: ../src/widgets/toolbox.cpp:1796 msgid "Snap to paths" msgstr "Прилипання до контурів" -#: ../src/widgets/toolbox.cpp:1791 +#: ../src/widgets/toolbox.cpp:1805 msgid "Path intersections" msgstr "Перетин контурів" -#: ../src/widgets/toolbox.cpp:1791 +#: ../src/widgets/toolbox.cpp:1805 msgid "Snap to path intersections" msgstr "Прилипання до перетинів контурів" -#: ../src/widgets/toolbox.cpp:1800 +#: ../src/widgets/toolbox.cpp:1814 msgid "To nodes" msgstr "До вузлів" -#: ../src/widgets/toolbox.cpp:1800 +#: ../src/widgets/toolbox.cpp:1814 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "Прилипання до вузлів-вершин, зокрема кутів прямокутників" -#: ../src/widgets/toolbox.cpp:1809 +#: ../src/widgets/toolbox.cpp:1823 msgid "Smooth nodes" msgstr "Гладкі вузли" -#: ../src/widgets/toolbox.cpp:1809 +#: ../src/widgets/toolbox.cpp:1823 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "Прилипання до гладких вузлів, зокрема вершин еліпсів" -#: ../src/widgets/toolbox.cpp:1818 +#: ../src/widgets/toolbox.cpp:1832 msgid "Line Midpoints" msgstr "Середні точки лінії" -#: ../src/widgets/toolbox.cpp:1818 +#: ../src/widgets/toolbox.cpp:1832 msgid "Snap midpoints of line segments" msgstr "Прилипання до середніх точок сегментів лінії" -#: ../src/widgets/toolbox.cpp:1827 +#: ../src/widgets/toolbox.cpp:1841 msgid "Others" msgstr "Інші" -#: ../src/widgets/toolbox.cpp:1827 +#: ../src/widgets/toolbox.cpp:1841 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" "Прилипання до інших точок (центрів, початків напрямних, опорних точок " "градієнтів тощо)" -#: ../src/widgets/toolbox.cpp:1835 +#: ../src/widgets/toolbox.cpp:1849 msgid "Object Centers" msgstr "Центри об'єктів" -#: ../src/widgets/toolbox.cpp:1835 +#: ../src/widgets/toolbox.cpp:1849 msgid "Snap centers of objects" msgstr "Прилипання до центрів об'єктів" -#: ../src/widgets/toolbox.cpp:1844 +#: ../src/widgets/toolbox.cpp:1858 msgid "Rotation Centers" msgstr "Центри обертання" -#: ../src/widgets/toolbox.cpp:1844 +#: ../src/widgets/toolbox.cpp:1858 msgid "Snap an item's rotation center" msgstr "Прилипання до центру обертання елемента" -#: ../src/widgets/toolbox.cpp:1853 +#: ../src/widgets/toolbox.cpp:1867 msgid "Text baseline" msgstr "Базова лінія тексту" -#: ../src/widgets/toolbox.cpp:1853 +#: ../src/widgets/toolbox.cpp:1867 msgid "Snap text anchors and baselines" msgstr "Прилипання до прив'язок тексту та центрів об'єктів" -#: ../src/widgets/toolbox.cpp:1863 +#: ../src/widgets/toolbox.cpp:1877 msgid "Page border" msgstr "Межа сторінки" -#: ../src/widgets/toolbox.cpp:1863 +#: ../src/widgets/toolbox.cpp:1877 msgid "Snap to the page border" msgstr "Прилипання до межі сторінки" -#: ../src/widgets/toolbox.cpp:1872 +#: ../src/widgets/toolbox.cpp:1886 msgid "Snap to grids" msgstr "Прилипання до сітки" -#: ../src/widgets/toolbox.cpp:1881 +#: ../src/widgets/toolbox.cpp:1895 msgid "Snap guides" msgstr "Прилипання до напрямних" @@ -31676,7 +31988,7 @@ msgid "" "The export_gpl.py module requires PyXML. Please download the latest version " "from http://pyxml.sourceforge.net/." msgstr "" -"Для роботи export_gpl.py потрібен PyXML. Будь ласка, звантажте останню " +"Для роботи export_gpl.py потрібен PyXML. Будь ласка, отримайте останню " "версію з сайта http://pyxml.sourceforge.net/." #: ../share/extensions/extractimage.py:68 @@ -32043,11 +32355,11 @@ msgstr "" "Контурів не знайдено. Будь ласка, перетворіть усі потрібні вам об’єкти для " "збереження на контури." -#: ../share/extensions/inkex.py:116 +#: ../share/extensions/inkex.py:117 #, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " -"this extension. Please download and install the latest version from http://" +"this extension.Please download and install the latest version from http://" "cheeseshop.python.org/pypi/lxml/, or install it through your package manager " "by a command like: sudo apt-get install python-lxml\n" "\n" @@ -32055,29 +32367,29 @@ msgid "" "%s" msgstr "" "Для inkex.py, а отже і для цього додатка, потрібна чудова оболонка lxml для " -"libxml2. Будь ласка звантажте і встановіть найостаннішу версію з http://" +"libxml2. Будь ласка, отримайте і встановіть найостаннішу версію з http://" "cheeseshop.python.org/pypi/lxml/ або встановіть його за допомогою вашого " "інструмента керування пакунками командою на зразок: sudo apt-get install " "python-lxml\n" "Технічна інформація:\n" "%s" -#: ../share/extensions/inkex.py:169 +#: ../share/extensions/inkex.py:185 #, python-format msgid "Unable to open specified file: %s" msgstr "Не вдалося відкрити вказаний файл: %s" -#: ../share/extensions/inkex.py:178 +#: ../share/extensions/inkex.py:194 #, python-format msgid "Unable to open object member file: %s" msgstr "Не вдалося відкрити файл-частину об’єкта: %s" -#: ../share/extensions/inkex.py:283 +#: ../share/extensions/inkex.py:299 #, python-format msgid "No matching node for expression: %s" msgstr "Не знайдено відповідного вузла для виразу: %s" -#: ../share/extensions/inkex.py:313 +#: ../share/extensions/inkex.py:358 msgid "SVG Width not set correctly! Assuming width = 100" msgstr "Ширину SVG вказано некоректно! Припускаємо ширину, що дорівнює 100" @@ -32585,7 +32897,7 @@ msgstr "" "http://sk1project.org/modules.php?name=Products&product=uniconvertor\n" "і встановіть його до теки Python Inkscape.\n" -#: ../share/extensions/voronoi2svg.py:198 +#: ../share/extensions/voronoi2svg.py:206 msgid "Please select objects!" msgstr "Будь ласка, позначте об'єкт." @@ -32925,13 +33237,36 @@ msgstr "Негатив" msgid "Randomize" msgstr "Випадково" -#: ../share/extensions/color_randomize.inx.h:7 +#: ../share/extensions/color_randomize.inx.h:4 +#, no-c-format +msgid "Hue range (%)" +msgstr "Діапазон відтінку (у %)" + +#: ../share/extensions/color_randomize.inx.h:6 +#, no-c-format +msgid "Saturation range (%)" +msgstr "Діапазон насиченості (у %)" + +#: ../share/extensions/color_randomize.inx.h:8 +#, no-c-format +msgid "Lightness range (%)" +msgstr "Діапазон освітленості (у %)" + +#: ../share/extensions/color_randomize.inx.h:10 +#, no-c-format +msgid "Opacity range (%)" +msgstr "Діапазон непрозорості (у %)" + +#: ../share/extensions/color_randomize.inx.h:12 msgid "" -"Converts to HSL, randomizes hue and/or saturation and/or lightness and " -"converts it back to RGB." +"Randomizes hue, saturation, lightness and/or opacity (opacity randomization " +"only for objects and groups). Change the range values to limit the distance " +"between the original color and the randomized one." msgstr "" -"Перетворює у ВНО, випадково змінює відтінок, і/або насиченість, і/або " -"освітленість, а потім перетворює зображення назад у простір RGB." +"Змінює значення відтінку, насиченості, освітленості і/або непрозорості на " +"випадкове (випадкове значення непрозорості можна використовувати лише для " +"об’єктів і груп). Змініть значення діапазонів, щоб обмежити відхилення " +"випадкового кольору від початкового." #: ../share/extensions/color_removeblue.inx.h:1 msgid "Remove Blue" @@ -33004,7 +33339,7 @@ msgid "" "at http://live.gnome.org/Dia" msgstr "" "З метою уможливити імпорт файлів Dia, має бути встановлено саму Dia. Ви " -"можете звантажити Dia за адресою http://live.gnome.org/Dia" +"можете отримати Dia за адресою http://live.gnome.org/Dia" #: ../share/extensions/dia.inx.h:4 msgid "Dia Diagram (*.dia)" @@ -34159,6 +34494,7 @@ msgstr "Налаштування" #: ../share/extensions/gcodetools_graffiti.inx.h:29 #: ../share/extensions/gcodetools_lathe.inx.h:30 #: ../share/extensions/gcodetools_path_to_gcode.inx.h:19 +#: ../share/extensions/nicechart.inx.h:4 msgid "File:" msgstr "Файл:" @@ -36686,6 +37022,155 @@ msgstr "Символ Unicode:" msgid "View Next Glyph" msgstr "Переглянути наступний гліф" +#: ../share/extensions/nicechart.inx.h:1 +msgid "NiceCharts" +msgstr "Красиві діаграми" + +#: ../share/extensions/nicechart.inx.h:2 +msgid "Data" +msgstr "Дані" + +#: ../share/extensions/nicechart.inx.h:3 +msgid "Data from file" +msgstr "Дані з файла" + +#: ../share/extensions/nicechart.inx.h:5 +msgid "Delimiter:" +msgstr "Роздільник:" + +#: ../share/extensions/nicechart.inx.h:6 +msgid "Column that contains the keys:" +msgstr "Стовпчик, що містить ключі:" + +#: ../share/extensions/nicechart.inx.h:7 +msgid "Column that contains the values:" +msgstr "Стовпчик, що містить значення:" + +#: ../share/extensions/nicechart.inx.h:8 +msgid "File encoding (e.g. utf-8):" +msgstr "Кодування файла (наприклад utf-8):" + +#: ../share/extensions/nicechart.inx.h:9 +msgid "First line contains headings" +msgstr "У першому рядку містяться заголовки" + +#: ../share/extensions/nicechart.inx.h:10 +msgid "Direct input" +msgstr "Безпосереднє введення" + +#: ../share/extensions/nicechart.inx.h:11 +msgid "Data:" +msgstr "Дані:" + +#: ../share/extensions/nicechart.inx.h:12 +msgid "Enter the full path to a CSV file:" +msgstr "Шлях до файла CSV повністю:" + +#: ../share/extensions/nicechart.inx.h:13 +msgid "Type in comma separated values:" +msgstr "Тип відокремлених комами значень:" + +#: ../share/extensions/nicechart.inx.h:14 +msgid "(format like this: apples:3,bananas:5)" +msgstr "(формат: яблука:3,банани:5)" + +#: ../share/extensions/nicechart.inx.h:15 +msgid "Labels" +msgstr "Мітки" + +#: ../share/extensions/nicechart.inx.h:16 +msgid "Font:" +msgstr "Шрифт:" + +#: ../share/extensions/nicechart.inx.h:18 +msgid "Font color:" +msgstr "Колір шрифту:" + +#: ../share/extensions/nicechart.inx.h:19 +msgid "Charts" +msgstr "Діаграми" + +#: ../share/extensions/nicechart.inx.h:20 +msgid "Draw horizontally" +msgstr "Малювати горизонтально" + +#: ../share/extensions/nicechart.inx.h:21 +msgid "Bar length:" +msgstr "Довжина стовпчика:" + +#: ../share/extensions/nicechart.inx.h:22 +msgid "Bar width:" +msgstr "Ширина стовпчика:" + +#: ../share/extensions/nicechart.inx.h:23 +msgid "Pie radius:" +msgstr "Радіус круга:" + +#: ../share/extensions/nicechart.inx.h:24 +msgid "Bar offset:" +msgstr "Відступ стовпчика:" + +#: ../share/extensions/nicechart.inx.h:26 +msgid "Offset between chart and labels:" +msgstr "Відступ міток від діаграми:" + +#: ../share/extensions/nicechart.inx.h:27 +msgid "Offset between chart and chart title:" +msgstr "Відступ заголовка діаграми від самої діаграми:" + +#: ../share/extensions/nicechart.inx.h:28 +msgid "Work around aliasing effects (creates overlapping segments)" +msgstr "" +"Обходити ефекти згладжування (зі створенням сегментів, що перекриваються)" + +#: ../share/extensions/nicechart.inx.h:29 +msgid "Color scheme:" +msgstr "Схема кольорів:" + +#: ../share/extensions/nicechart.inx.h:30 +msgid "Custom colors:" +msgstr "Нетипові кольори:" + +#: ../share/extensions/nicechart.inx.h:31 +msgid "Reverse color scheme" +msgstr "Обернена схема кольорів" + +#: ../share/extensions/nicechart.inx.h:32 +msgid "Drop shadow" +msgstr "Тінь" + +#: ../share/extensions/nicechart.inx.h:37 +msgid "SAP" +msgstr "SAP" + +#: ../share/extensions/nicechart.inx.h:38 +msgid "Values" +msgstr "Значення" + +#: ../share/extensions/nicechart.inx.h:39 +msgid "Show values" +msgstr "Показати значення" + +#: ../share/extensions/nicechart.inx.h:40 +msgid "Chart type:" +msgstr "Тип діаграми:" + +#: ../share/extensions/nicechart.inx.h:41 +msgid "Bar chart" +msgstr "Стовпчикова діаграма" + +#: ../share/extensions/nicechart.inx.h:42 +msgid "Pie chart" +msgstr "Кругова діаграма" + +#: ../share/extensions/nicechart.inx.h:43 +msgid "Pie chart (percentage)" +msgstr "Кругова діаграма (у відсотках)" + +#: ../share/extensions/nicechart.inx.h:44 +msgid "Stacked bar chart" +msgstr "Стосова стовпчикова діаграма" + #: ../share/extensions/param_curves.inx.h:1 msgid "Parametric Curves" msgstr "Параметричні криві" @@ -37720,211 +38205,329 @@ msgid "Optimized SVG Output" msgstr "Оптимізований експорт до SVG" #: ../share/extensions/scour.inx.h:3 -msgid "Shorten color values" -msgstr "Скорочувати назви кольорів" +msgid "Number of significant digits for coordinates:" +msgstr "Кількість значимих цифр у координатах:" #: ../share/extensions/scour.inx.h:4 -msgid "Convert CSS attributes to XML attributes" -msgstr "Перетворити атрибути CSS на атрибути XML" +msgid "" +"Specifies the number of significant digits that should be output for " +"coordinates. Note that significant digits are *not* the number of decimals " +"but the overall number of digits in the output. For example if a value of " +"\"3\" is specified, the coordinate 3.14159 is output as 3.14 while the " +"coordinate 123.675 is output as 124." +msgstr "" +"Визначає кількість значущих цифр у записі координат остаточного файла. " +"Зауважте, що ця кількість — це *не* кількість цифр у дробовій частині числа, " +"а загальна кількість цифр. Наприклад, якщо вказано значення «3», запис " +"координат 3.14159 у файлі-результаті виглядатиме так: 3.14, — а якщо маємо " +"координату 123.675, то так: 124." #: ../share/extensions/scour.inx.h:5 -msgid "Group collapsing" -msgstr "Згортання груп" +msgid "Shorten color values" +msgstr "Скорочувати назви кольорів" #: ../share/extensions/scour.inx.h:6 -msgid "Create groups for similar attributes" -msgstr "Створити групи для подібних атрибутів" +msgid "" +"Convert all color specifications to #RRGGBB (or #RGB where applicable) " +"format." +msgstr "" +"Перетворити усі специфікації кольору на запис у форматі #RRGGBB (або #RGB, " +"якщо це можливо)." #: ../share/extensions/scour.inx.h:7 -msgid "Embed rasters" -msgstr "Вбудувати растр" +msgid "Convert CSS attributes to XML attributes" +msgstr "Перетворити атрибути CSS на атрибути XML" #: ../share/extensions/scour.inx.h:8 -msgid "Keep editor data" -msgstr "Зберегти дані редактора" +msgid "" +"Convert styles from style tags and inline style=\"\" declarations into XML " +"attributes." +msgstr "" +"Перетворити записи стилів із теґів на вбудовані до атрибутів XML оголошення " +"style=\"\"." #: ../share/extensions/scour.inx.h:9 -msgid "Remove metadata" -msgstr "Вилучати метадані" +msgid "Collapse groups" +msgstr "Згорнути групи" #: ../share/extensions/scour.inx.h:10 -msgid "Remove comments" -msgstr "Вилучати коментарі" +msgid "" +"Remove useless groups, promoting their contents up one level. Requires " +"\"Remove unused IDs\" to be set." +msgstr "" +"Вилучити непотрібні групи, перенісши їхній вміст на рівень вище. Потребує " +"позначення пункту «Вилучати невикористані ідентифікатори»." #: ../share/extensions/scour.inx.h:11 -msgid "Work around renderer bugs" -msgstr "Виправити вади показу" +msgid "Create groups for similar attributes" +msgstr "Створити групи для подібних атрибутів" #: ../share/extensions/scour.inx.h:12 -msgid "Enable viewboxing" -msgstr "Увімкнути поле перегляду" +msgid "" +"Create groups for runs of elements having at least one attribute in common " +"(e.g. fill-color, stroke-opacity, ...)." +msgstr "" +"Створити групи для записів елементів, які мають принаймні один спільний " +"атрибут (наприклад колір заповнення, непрозорість штриха тощо)." #: ../share/extensions/scour.inx.h:13 -msgid "Remove the xml declaration" -msgstr "Вилучати оголошення XML" +msgid "Keep editor data" +msgstr "Зберегти дані редактора" #: ../share/extensions/scour.inx.h:14 -msgid "Number of significant digits for coords:" -msgstr "Кількість значимих цифр у координатах:" +msgid "" +"Don't remove editor-specific elements and attributes. Currently supported: " +"Inkscape, Sodipodi and Adobe Illustrator." +msgstr "" +"Не вилучати специфічні для засобу редагування елементи та атрибути. У " +"поточній версії передбачено підтримку таких редакторів: Inkscape, Sodipodi та " +"Adobe Illustrator." #: ../share/extensions/scour.inx.h:15 -msgid "XML indentation (pretty-printing):" -msgstr "Відступи у XML (для полегшення перегляду):" +msgid "Keep unreferenced definitions" +msgstr "Зберегти визначення без посилань" #: ../share/extensions/scour.inx.h:16 -msgid "Space" -msgstr "Пробіли" +msgid "Keep element definitions that are not currently used in the SVG" +msgstr "" +"Зберегти визначення елементів, які у поточному форматі не використовуються у " +"SVG." #: ../share/extensions/scour.inx.h:17 -msgid "Tab" -msgstr "Табуляція" +msgid "Work around renderer bugs" +msgstr "Виправити вади показу" #: ../share/extensions/scour.inx.h:18 -msgctxt "Indent" -msgid "None" -msgstr "Немає" - -#: ../share/extensions/scour.inx.h:19 -msgid "Ids" -msgstr "Ідентифікатори" +msgid "" +"Works around some common renderer bugs (mainly libRSVG) at the cost of a " +"slightly larger SVG file." +msgstr "" +"Обійти деякі загальні вади обробника зображення (в основному libRSVG) за " +"рахунок незначного збільшення файла SVG." #: ../share/extensions/scour.inx.h:20 -msgid "Remove unused ID names for elements" -msgstr "Вилучати ідентифікатори з невикористаними назвами для елементів" +msgid "Remove the XML declaration" +msgstr "Вилучати оголошення XML" #: ../share/extensions/scour.inx.h:21 -msgid "Shorten IDs" -msgstr "Скорочувати ідентифікатори" +msgid "" +"Removes the XML declaration (which is optional but should be provided, " +"especially if special characters are used in the document) from the file " +"header." +msgstr "" +"Вилучити оголошення XML (воно є необов’язковим, але має надаватися, особливо " +"якщо у документі використано спеціальні символи) із заголовка файла." #: ../share/extensions/scour.inx.h:22 -msgid "Preserve manually created ID names not ending with digits" -msgstr "" -"Зберігати створені вручну ідентифікатори з назвами, які не завершуються " -"цифрами" +msgid "Remove metadata" +msgstr "Вилучати метадані" #: ../share/extensions/scour.inx.h:23 -msgid "Preserve these ID names, comma-separated:" -msgstr "Зберігати ідентифікатори з такими назвами, відокремленими комами:" +msgid "" +"Remove metadata tags along with all the contained information, which may " +"include license and author information, alternate versions for non-SVG-" +"enabled browsers, etc." +msgstr "" +"Вилучити теґи метаданих, разом із даними, що у них містяться, зокрема даними " +"щодо ліцензування та авторства, альтернативними версіями для засобів " +"перегляду інтернету без можливостей показу SVG тощо." #: ../share/extensions/scour.inx.h:24 -msgid "Preserve ID names starting with:" -msgstr "Зберігати ідентифікатори з назвами на:" +msgid "Remove comments" +msgstr "Вилучати коментарі" #: ../share/extensions/scour.inx.h:25 -msgid "Help (Options)" -msgstr "Довідка (параметри)" +msgid "Remove all XML comments from output." +msgstr "Вилучити із результатів усі коментарі до XML." + +#: ../share/extensions/scour.inx.h:26 +msgid "Embed raster images" +msgstr "Вбудувати растрові зображення" #: ../share/extensions/scour.inx.h:27 +msgid "" +"Resolve external references to raster images and embed them as Base64-" +"encoded data URLs." +msgstr "" +"Визначити джерела посилань на растрові зображення і вбудувати ці зображення у " +"кодуванні даних Base64." + +#: ../share/extensions/scour.inx.h:28 +msgid "Enable viewboxing" +msgstr "Увімкнути поле перегляду" + +#: ../share/extensions/scour.inx.h:30 #, no-c-format msgid "" -"This extension optimizes the SVG file according to the following options:\n" -" * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" -" * Convert CSS attributes to XML attributes: convert styles from style " -"tags and inline style=\"\" declarations into XML attributes.\n" -" * Group collapsing: removes useless g elements, promoting their contents " -"up one level. Requires \"Remove unused ID names for elements\" to be set.\n" -" * Create groups for similar attributes: create g elements for runs of " -"elements having at least one attribute in common (e.g. fill color, stroke " -"opacity, ...).\n" -" * Embed rasters: embed raster images as base64-encoded data URLs.\n" -" * Keep editor data: don't remove Inkscape, Sodipodi or Adobe Illustrator " -"elements and attributes.\n" -" * Remove metadata: remove metadata tags along with all the information " -"in them, which may include license metadata, alternate versions for non-SVG-" -"enabled browsers, etc.\n" -" * Remove comments: remove comment tags.\n" -" * Work around renderer bugs: emits slightly larger SVG data, but works " -"around a bug in librsvg's renderer, which is used in Eye of GNOME and other " -"various applications.\n" -" * Enable viewboxing: size image to 100%/100% and introduce a viewBox.\n" -" * Number of significant digits for coords: all coordinates are output " -"with that number of significant digits. For example, if 3 is specified, the " -"coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is output as " -"472.\n" -" * XML indentation (pretty-printing): either None for no indentation, " -"Space to use one space per nesting level, or Tab to use one tab per nesting " -"level." -msgstr "" -"За допомогою цього додатка можна оптимізувати файл SVG відповідно до значень " -"таких пунктів:\n" -" * Скорочувати назви кольорів: перетворити всі кольори у формат #RRGGBB " -"або #RGB.\n" -" * Перетворити атрибути CSS на атрибути XML: перетворити стилі з теґів " -"<style> та вбудованих оголошень style=\"\" на атрибути XML.\n" -" * Згортання груп: вилучити непотрібні елементи <g>, піднімаючи " -"рівень таких елементів на один рівень. Потребує позначення пункту «Вилучати " -"ідентифікатори з невикористаними назвами для елементів».\n" -" * Створити групи для подібних атрибутів: створити елементи <g> для " -"груп елементів, які мають принаймні один спільний атрибут (наприклад, колір " -"заповнення, рівень прозорості ліній...).\n" -" * Вбудувати растр: вбудувати растрові зображення у форматі даних у " -"кодуванні base64.\n" -" * Зберегти дані редактора: не вилучати елементи Inkscape, Sodipodi або " -"Adobe Illustrator та атрибути.\n" -" * Вилучати метадані: вилучати теґи <metadata> разом з усіма " -"даними, що у них зберігаються, зокрема метаданими ліцензії, даними версій " -"для переглядачів без підтримки SVG тощо.\n" -" * Вилучати коментарі: вилучати теґи <!-- -->.\n" -" * Виправлити вади показу: трохи збільшити об'єм даних SVG з метою " -"уникнення вади у системі показу librsvg, яка використовується у GNOME та " -"інших програмах.\n" -" * Увімкнути поле перегляду: обрізати зображення до формату 100%/100% і " -"додати viewBox.\n" -" * Кількість значимих цифр у координатах: скоротити всі координати до " -"вказаної кількості значущих цифр. Наприклад, якщо вказано обрізання до 3 " -"цифр, координату 3.5153 буде обрізано до 3.51, а координату 471.55 — до " -"472.\n" -" * Відступи у XML (для полегшення перегляду): можливі значення: «Немає», " -"якщо відступи не потрібні, «Пробіли», якщо слід використовувати додатковий " -"пробіл для позначення рівнів, або «Табуляція», якщо слід використовувати " -"позначення рівнів табуляцію." +"Set page size to 100%/100% (full width and height of the display area) and " +"introduce a viewBox specifying the drawings dimensions." +msgstr "" +"Встановити розміри сторінки 100%/100% (повна ширина і висота області показу) " +"і впровадити viewBox із визначенням розмірностей креслень." + +#: ../share/extensions/scour.inx.h:31 +msgid "Format output with line-breaks and indentation" +msgstr "Форматувати виведені дані розбиттям на рядки і відступами" + +#: ../share/extensions/scour.inx.h:32 +msgid "" +"Produce nicely formatted output including line-breaks. If you do not intend " +"to hand-edit the SVG file you can disable this option to bring down the file " +"size even more at the cost of clarity." +msgstr "" +"Створити код із красивим форматуванням і розбиттям на рядки. Якщо у вас немає " +"намірів редагувати файл SVG вручну, ви можете зняти позначення з цього пункту " +"і зменшити розмір файла незначно погіршивши придатність коду до читання " +"людиною." + +#: ../share/extensions/scour.inx.h:33 +msgid "Indentation characters:" +msgstr "Символ відступів:" + +#: ../share/extensions/scour.inx.h:34 +msgid "" +"The type of indentation used for each level of nesting in the output. " +"Specify \"None\" to disable indentation. This option has no effect if " +"\"Format output with line-breaks and indentation\" is disabled." +msgstr "" +"Тип відступів, який використовуватиметься на кожному рівні вкладеності " +"оброблених даних. Виберіть пункт «Немає», щоб вимкнути відступи. Цей пункт ні " +"на що не вплине, якщо не позначено пункт «Форматувати виведені дані розбиттям " +"на рядки і відступами»." + +#: ../share/extensions/scour.inx.h:35 +msgid "Depth of indentation:" +msgstr "Ширина відступу:" + +#: ../share/extensions/scour.inx.h:36 +msgid "" +"The depth of the chosen type of indentation. E.g. if you choose \"2\" every " +"nesting level in the output will be indented by two additional spaces/tabs." +msgstr "" +"Ширина вибраного типу відступів. Наприклад, якщо ви виберете «2», кожен " +"рівень вкладеності у виведених даних матиме додатковий відступ у два пробіли " +"або символи табуляції." + +#: ../share/extensions/scour.inx.h:37 +msgid "Strip the \"xml:space\" attribute from the root SVG element" +msgstr "Вилучити атрибут «xml:space» і кореневого елемента SVG" + +#: ../share/extensions/scour.inx.h:38 +msgid "" +"This is useful if the input file specifies \"xml:space='preserve'\" in the " +"root SVG element which instructs the SVG editor not to change whitespace in " +"the document at all (and therefore overrides the options above)." +msgstr "" +"Цей пункт буде корисним, якщо у вхідному файлі визначено " +"«xml:space='preserve'» у кореневому елементі SVG. Таке визначення наказує " +"редактору SVG не змінювати розташування пробілів у коді (тобто скасувати дію " +"пунктів, розташованих вище)." + +#: ../share/extensions/scour.inx.h:39 +msgid "Document options" +msgstr "Параметри документа" #: ../share/extensions/scour.inx.h:40 -msgid "Help (Ids)" -msgstr "Довідка (ідентифікатори)" +msgid "Pretty-printing" +msgstr "Структурний друк" #: ../share/extensions/scour.inx.h:41 +msgid "Space" +msgstr "Пробіли" + +#: ../share/extensions/scour.inx.h:42 +msgid "Tab" +msgstr "Табуляція" + +#: ../share/extensions/scour.inx.h:43 +msgctxt "Indent" +msgid "None" +msgstr "Немає" + +#: ../share/extensions/scour.inx.h:44 +msgid "IDs" +msgstr "Ідентифікатори" + +#: ../share/extensions/scour.inx.h:45 +msgid "Remove unused IDs" +msgstr "Вилучати невикористані ідентифікатори" + +#: ../share/extensions/scour.inx.h:46 msgid "" -"Ids specific options:\n" -" * Remove unused ID names for elements: remove all unreferenced ID " -"attributes.\n" -" * Shorten IDs: reduce the length of all ID attributes, assigning the " -"shortest to the most-referenced elements. For instance, #linearGradient5621, " -"referenced 100 times, can become #a.\n" -" * Preserve manually created ID names not ending with digits: usually, " -"optimised SVG output removes these, but if they're needed for referencing (e." -"g. #middledot), you may use this option.\n" -" * Preserve these ID names, comma-separated: you can use this in " -"conjunction with the other preserve options if you wish to preserve some " -"more specific ID names.\n" -" * Preserve ID names starting with: usually, optimised SVG output removes " -"all unused ID names, but if all of your preserved ID names start with the " -"same prefix (e.g. #flag-mx, #flag-pt), you may use this option." -msgstr "" -"Специфічні для ідентифікаторів параметри:\n" -" * Вилучати ідентифікатори з невикористаними назвами для елементів: " -"вилучити всі атрибути ідентифікаторів без посилань.\n" -" * Скорочувати ідентифікатори: зменшити довжину всіх атрибутів " -"ідентифікаторів з призначенням найкоротших записів до найвживаніших " -"посилань. Наприклад, якщо #linearGradient5621 має посилань, його буде " -"замінено на #a.\n" -" * Зберігати створені вручну ідентифікатори з назвами, які не " -"завершуються цифрами: зазвичай, у оптимізованому SVG такі записи " -"вилучаються, але якщо ці записи потрібні (наприклад, #middledot), ви можете " -"скористатися цим пунктом.\n" -" * Зберігати ідентифікатори з такими назвами, відокремленими комами: ви " -"можете скористатися цим пунктом разом з іншими пунктами зберігання деяких " -"інших специфічних назв ідентифікаторів.\n" -" * Зберігати ідентифікатори з назвами на: зазвичай, у оптимізованому SVG " -"вилучаються всі ідентифікатори з невикористаними назвами, але якщо всі " -"потрібні вам назви ідентифікаторів починаються з одного префікса (наприклад, " -"#flag-mx, #flag-pt), ви можете скористатися цим пунктом." +"Remove all unreferenced IDs from elements. Those are not needed for " +"rendering." +msgstr "" +"Вилучити із елементів усі ідентифікатори, на які немає посилань. Такі " +"ідентифікатори не потрібні для показу зображення." #: ../share/extensions/scour.inx.h:47 +msgid "Shorten IDs" +msgstr "Скорочувати ідентифікатори" + +#: ../share/extensions/scour.inx.h:48 +msgid "" +"Minimize the length of IDs using only lowercase letters, assigning the " +"shortest values to the most-referenced elements. For instance, " +"\"linearGradient5621\" will become \"a\" if it is the most used element." +msgstr "" +"Мінімізувати довжину ідентифікаторів, використовуючи літери нижнього регістру " +"і призначаючи найкоротші значення елементам, на які найбільше посилань. " +"Наприклад, «linearGradient5621» буде перетворено «a», якщо цей елемент є " +"найвживанішим." + +#: ../share/extensions/scour.inx.h:49 +msgid "Prefix shortened IDs with:" +msgstr "Додавати до скорочених ід. такий префікс:" + +#: ../share/extensions/scour.inx.h:50 +msgid "Prepend shortened IDs with the specified prefix." +msgstr "Додавати перед скороченими ідентифікаторами вказаний префікс." + +#: ../share/extensions/scour.inx.h:51 +msgid "Preserve manually created IDs not ending with digits" +msgstr "" +"Зберігати створені вручну ідентифікатори з назвами, які не завершуються " +"цифрами" + +#: ../share/extensions/scour.inx.h:52 +msgid "" +"Descriptive IDs which were manually created to reference or label specific " +"elements or groups (e.g. #arrowStart, #arrowEnd or #textLabels) will be " +"preserved while numbered IDs (as they are generated by most SVG editors " +"including Inkscape) will be removed/shortened." +msgstr "" +"Описові ідентифікатори, які було створено вручну для посилання або позначення " +"певних елементів або груп (наприклад, #pochatokStrilky, #kinecStrilky або " +"#tekstoviMitky) буде збережено, а нумеровані ідентифікатори (які створюються " +"більшістю програм для редагування SVG, зокрема Inkscape) буде вилучено або " +"скорочено." + +#: ../share/extensions/scour.inx.h:53 +msgid "Preserve the following IDs:" +msgstr "Зберегти такі ідентифікатори:" + +#: ../share/extensions/scour.inx.h:54 +msgid "A comma-separated list of IDs that are to be preserved." +msgstr "Список відокремлених комами ідентифікаторів, які слід зберегти." + +#: ../share/extensions/scour.inx.h:55 +msgid "Preserve IDs starting with:" +msgstr "Зберегти ідентифікатори з назвами на:" + +#: ../share/extensions/scour.inx.h:56 +msgid "" +"Preserve all IDs that start with the specified prefix (e.g. specify \"flag\" " +"to preserve \"flag-mx\", \"flag-pt\", etc.)." +msgstr "" +"Зберегти усі ідентифікатори, які починаються із вказаного префікса " +"(наприклад, якщо вказано «flag», буде збережено ідентифікатори «flag-mx», " +"«flag-pt» тощо)." + +#: ../share/extensions/scour.inx.h:57 msgid "Optimized SVG (*.svg)" msgstr "Оптимізований SVG (*.svg)" -#: ../share/extensions/scour.inx.h:48 +#: ../share/extensions/scour.inx.h:58 msgid "Scalable Vector Graphics" msgstr "Масштабована векторна графіка" @@ -38468,22 +39071,42 @@ msgid "Show the bounding box" msgstr "Показати контур-обгортку" #: ../share/extensions/voronoi2svg.inx.h:6 -msgid "Delaunay Triangulation" -msgstr "Тріангуляція Делоне" +msgid "Triangles color" +msgstr "Колір трикутників" #: ../share/extensions/voronoi2svg.inx.h:7 +msgid "Delaunay Triangulation" +msgstr "Триангуляція Делоне" + +#: ../share/extensions/voronoi2svg.inx.h:8 msgid "Voronoi and Delaunay" msgstr "Вороного і Делоне" -#: ../share/extensions/voronoi2svg.inx.h:8 +#: ../share/extensions/voronoi2svg.inx.h:9 msgid "Options for Voronoi diagram" msgstr "Параметри діаграми Вороного" -#: ../share/extensions/voronoi2svg.inx.h:10 +#: ../share/extensions/voronoi2svg.inx.h:11 msgid "Automatic from selected objects" msgstr "Автоматично за позначеними об'єктами" #: ../share/extensions/voronoi2svg.inx.h:12 +msgid "Options for Delaunay Triangulation" +msgstr "Параметри триангуляції Делоне" + +#: ../share/extensions/voronoi2svg.inx.h:13 +msgid "Default (Stroke black and no fill)" +msgstr "Типовий (чорний штрих без заповнення)" + +#: ../share/extensions/voronoi2svg.inx.h:14 +msgid "Triangles with item color" +msgstr "Трикутники із кольором елемента" + +#: ../share/extensions/voronoi2svg.inx.h:15 +msgid "Triangles with item color (random on apply)" +msgstr "Трикутники із кольором елемента (випадкові при застосуванні)" + +#: ../share/extensions/voronoi2svg.inx.h:17 msgid "" "Select a set of objects. Their centroids will be used as the sites of the " "Voronoi diagram. Text objects are not handled." @@ -38925,6 +39548,155 @@ msgstr "Популярний графічний формат для кліпар msgid "XAML Input" msgstr "Імпорт з XAML" +#~ msgid "" +#~ "Select exactly 2 paths to perform difference, division, or path " +#~ "cut." +#~ msgstr "" +#~ "Для операції виключного АБО, ділення та розрізання контуру виберіть " +#~ "точно 2 контури." + +#~ msgid "Measure start" +#~ msgstr "Початок вимірювання" + +#~ msgid "Measure end" +#~ msgstr "Кінець вимірювання" + +#~ msgid "Only visible intersections" +#~ msgstr "Лише видимі перетини" + +#~ msgid "Miter _limit:" +#~ msgstr "Ме_жа вістря:" + +#~ msgid "" +#~ "Converts to HSL, randomizes hue and/or saturation and/or lightness and " +#~ "converts it back to RGB." +#~ msgstr "" +#~ "Перетворює у ВНО, випадково змінює відтінок, і/або насиченість, і/або " +#~ "освітленість, а потім перетворює зображення назад у простір RGB." + +#~ msgid "Group collapsing" +#~ msgstr "Згортання груп" + +#~ msgid "XML indentation (pretty-printing):" +#~ msgstr "Відступи у XML (для полегшення перегляду):" + +#~ msgid "Ids" +#~ msgstr "Ідентифікатори" + +#~ msgid "Remove unused ID names for elements" +#~ msgstr "Вилучати ідентифікатори з невикористаними назвами для елементів" + +#~ msgid "Preserve these ID names, comma-separated:" +#~ msgstr "Зберігати ідентифікатори з такими назвами, відокремленими комами:" + +#~ msgid "Help (Options)" +#~ msgstr "Довідка (параметри)" + +#~ msgid "" +#~ "This extension optimizes the SVG file according to the following " +#~ "options:\n" +#~ " * Shorten color names: convert all colors to #RRGGBB or #RGB format.\n" +#~ " * Convert CSS attributes to XML attributes: convert styles from style " +#~ "tags and inline style=\"\" declarations into XML attributes.\n" +#~ " * Group collapsing: removes useless g elements, promoting their " +#~ "contents up one level. Requires \"Remove unused ID names for elements\" " +#~ "to be set.\n" +#~ " * Create groups for similar attributes: create g elements for runs of " +#~ "elements having at least one attribute in common (e.g. fill color, stroke " +#~ "opacity, ...).\n" +#~ " * Embed rasters: embed raster images as base64-encoded data URLs.\n" +#~ " * Keep editor data: don't remove Inkscape, Sodipodi or Adobe " +#~ "Illustrator elements and attributes.\n" +#~ " * Remove metadata: remove metadata tags along with all the " +#~ "information in them, which may include license metadata, alternate " +#~ "versions for non-SVG-enabled browsers, etc.\n" +#~ " * Remove comments: remove comment tags.\n" +#~ " * Work around renderer bugs: emits slightly larger SVG data, but " +#~ "works around a bug in librsvg's renderer, which is used in Eye of GNOME " +#~ "and other various applications.\n" +#~ " * Enable viewboxing: size image to 100%/100% and introduce a " +#~ "viewBox.\n" +#~ " * Number of significant digits for coords: all coordinates are output " +#~ "with that number of significant digits. For example, if 3 is specified, " +#~ "the coordinate 3.5153 is output as 3.51 and the coordinate 471.55 is " +#~ "output as 472.\n" +#~ " * XML indentation (pretty-printing): either None for no indentation, " +#~ "Space to use one space per nesting level, or Tab to use one tab per " +#~ "nesting level." +#~ msgstr "" +#~ "За допомогою цього додатка можна оптимізувати файл SVG відповідно до " +#~ "значень таких пунктів:\n" +#~ " * Скорочувати назви кольорів: перетворити всі кольори у формат " +#~ "#RRGGBB або #RGB.\n" +#~ " * Перетворити атрибути CSS на атрибути XML: перетворити стилі з теґів " +#~ "<style> та вбудованих оголошень style=\"\" на атрибути XML.\n" +#~ " * Згортання груп: вилучити непотрібні елементи <g>, піднімаючи " +#~ "рівень таких елементів на один рівень. Потребує позначення пункту " +#~ "«Вилучати ідентифікатори з невикористаними назвами для елементів».\n" +#~ " * Створити групи для подібних атрибутів: створити елементи <g> " +#~ "для груп елементів, які мають принаймні один спільний атрибут (наприклад, " +#~ "колір заповнення, рівень прозорості ліній...).\n" +#~ " * Вбудувати растр: вбудувати растрові зображення у форматі даних у " +#~ "кодуванні base64.\n" +#~ " * Зберегти дані редактора: не вилучати елементи Inkscape, Sodipodi " +#~ "або Adobe Illustrator та атрибути.\n" +#~ " * Вилучати метадані: вилучати теґи <metadata> разом з усіма " +#~ "даними, що у них зберігаються, зокрема метаданими ліцензії, даними версій " +#~ "для переглядачів без підтримки SVG тощо.\n" +#~ " * Вилучати коментарі: вилучати теґи <!-- -->.\n" +#~ " * Виправлити вади показу: трохи збільшити об'єм даних SVG з метою " +#~ "уникнення вади у системі показу librsvg, яка використовується у GNOME та " +#~ "інших програмах.\n" +#~ " * Увімкнути поле перегляду: обрізати зображення до формату 100%/100% " +#~ "і додати viewBox.\n" +#~ " * Кількість значимих цифр у координатах: скоротити всі координати до " +#~ "вказаної кількості значущих цифр. Наприклад, якщо вказано обрізання до 3 " +#~ "цифр, координату 3.5153 буде обрізано до 3.51, а координату 471.55 — до " +#~ "472.\n" +#~ " * Відступи у XML (для полегшення перегляду): можливі значення: " +#~ "«Немає», якщо відступи не потрібні, «Пробіли», якщо слід використовувати " +#~ "додатковий пробіл для позначення рівнів, або «Табуляція», якщо слід " +#~ "використовувати позначення рівнів табуляцію." + +#~ msgid "Help (Ids)" +#~ msgstr "Довідка (ідентифікатори)" + +#~ msgid "" +#~ "Ids specific options:\n" +#~ " * Remove unused ID names for elements: remove all unreferenced ID " +#~ "attributes.\n" +#~ " * Shorten IDs: reduce the length of all ID attributes, assigning the " +#~ "shortest to the most-referenced elements. For instance, " +#~ "#linearGradient5621, referenced 100 times, can become #a.\n" +#~ " * Preserve manually created ID names not ending with digits: usually, " +#~ "optimised SVG output removes these, but if they're needed for referencing " +#~ "(e.g. #middledot), you may use this option.\n" +#~ " * Preserve these ID names, comma-separated: you can use this in " +#~ "conjunction with the other preserve options if you wish to preserve some " +#~ "more specific ID names.\n" +#~ " * Preserve ID names starting with: usually, optimised SVG output " +#~ "removes all unused ID names, but if all of your preserved ID names start " +#~ "with the same prefix (e.g. #flag-mx, #flag-pt), you may use this option." +#~ msgstr "" +#~ "Специфічні для ідентифікаторів параметри:\n" +#~ " * Вилучати ідентифікатори з невикористаними назвами для елементів: " +#~ "вилучити всі атрибути ідентифікаторів без посилань.\n" +#~ " * Скорочувати ідентифікатори: зменшити довжину всіх атрибутів " +#~ "ідентифікаторів з призначенням найкоротших записів до найвживаніших " +#~ "посилань. Наприклад, якщо #linearGradient5621 має посилань, його буде " +#~ "замінено на #a.\n" +#~ " * Зберігати створені вручну ідентифікатори з назвами, які не " +#~ "завершуються цифрами: зазвичай, у оптимізованому SVG такі записи " +#~ "вилучаються, але якщо ці записи потрібні (наприклад, #middledot), ви " +#~ "можете скористатися цим пунктом.\n" +#~ " * Зберігати ідентифікатори з такими назвами, відокремленими комами: " +#~ "ви можете скористатися цим пунктом разом з іншими пунктами зберігання " +#~ "деяких інших специфічних назв ідентифікаторів.\n" +#~ " * Зберігати ідентифікатори з назвами на: зазвичай, у оптимізованому " +#~ "SVG вилучаються всі ідентифікатори з невикористаними назвами, але якщо " +#~ "всі потрібні вам назви ідентифікаторів починаються з одного префікса " +#~ "(наприклад, #flag-mx, #flag-pt), ви можете скористатися цим пунктом." + #~ msgid "Max. smooth handle angle" #~ msgstr "Макс. кут елемента керування згладженого вузла" @@ -38965,12 +39737,6 @@ msgstr "Імпорт з XAML" #~ msgid "Arbitrary Angle" #~ msgstr "Довільний кут" -#~ msgid "Horizontal Point:" -#~ msgstr "Горизонтальна точка:" - -#~ msgid "Vertical Point:" -#~ msgstr "Вертикальна точка:" - #~ msgid "Ignore cusp nodes" #~ msgstr "Ігнорувати гострі вузли" @@ -39795,10 +40561,6 @@ msgstr "Імпорт з XAML" #~ msgid "Alternate Process" #~ msgstr "Альтернативний процес" -#~ msgctxt "Symbol" -#~ msgid "Data I/O" -#~ msgstr "Введення-виведення даних" - #~ msgctxt "Symbol" #~ msgid "Card" #~ msgstr "Картка" @@ -40048,14 +40810,6 @@ msgstr "Імпорт з XAML" #~ msgid "Determines on which side the line or line segment is infinite." #~ msgstr "Визначає, який з кінців лінії або її сегмента буде нескінченним." -#~ msgid "Discard original path?" -#~ msgstr "Відкинути початковий контур?" - -#~ msgid "Check this to only keep the mirrored part of the path" -#~ msgstr "" -#~ "Позначте цей пункт, щоб програма зберегла лише віддзеркалену частину " -#~ "контуру" - #~ msgid "Reflection line:" #~ msgstr "Лінія відбиття:" @@ -40065,9 +40819,6 @@ msgstr "Імпорт з XAML" #~ msgid "Handle to control the distance of the offset from the curve" #~ msgstr "Інструмент керування, який визначатиме відстань відступу від кривої" -#~ msgid "Adjust the offset" -#~ msgstr "Скоригувати відступ" - #~ msgid "Specifies the left end of the parallel" #~ msgstr "Визначає лівий кінець паралельної" @@ -40700,12 +41451,6 @@ msgstr "Імпорт з XAML" #~ msgid "Contrast:" #~ msgstr "Контрастність:" -#~ msgid "Colors:" -#~ msgstr "Кольори:" - -#~ msgid "Simplify:" -#~ msgstr "Спрощення:" - #~ msgid "Select only one group to convert to symbol." #~ msgstr "Позначте лише одну групу для перетворення на символ." @@ -40825,9 +41570,6 @@ msgstr "Імпорт з XAML" #~ msgid "Include l_ocked" #~ msgstr "Включити _заблоковані" -#~ msgid "Clear values" -#~ msgstr "Очистити значення" - #~ msgid "Select objects matching all of the fields you filled in" #~ msgstr "Позначити об'єкти, що відповідають усім критеріям пошуку" -- cgit v1.2.3 From f7fb27e90abba4f8c0b033b88c5039dae9339b94 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 17 May 2016 11:49:21 +0200 Subject: GTK3: Give names to more widgets. (bzr r14896) --- src/ui/widget/color-preview.cpp | 1 + src/ui/widget/layer-selector.cpp | 2 ++ src/ui/widget/selected-style.cpp | 1 + src/ui/widget/style-swatch.cpp | 2 ++ src/widgets/desktop-widget.cpp | 3 +++ src/widgets/toolbox.cpp | 4 +++- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp index 5bcd16528..62c7cca1d 100644 --- a/src/ui/widget/color-preview.cpp +++ b/src/ui/widget/color-preview.cpp @@ -23,6 +23,7 @@ ColorPreview::ColorPreview (guint32 rgba) { _rgba = rgba; set_has_window(false); + set_name("ColorPreview"); } void diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp index 2a1fa352b..1a9ce617f 100644 --- a/src/ui/widget/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -45,6 +45,7 @@ public: AlternateIcons(Inkscape::IconSize size, gchar const *a, gchar const *b) : _a(NULL), _b(NULL) { + set_name("AlternateIcons"); if (a) { _a = Gtk::manage(sp_icon_get_icon(a, size)); _a->set_no_show_all(true); @@ -94,6 +95,7 @@ private: LayerSelector::LayerSelector(SPDesktop *desktop) : _desktop(NULL), _layer(NULL) { + set_name("LayerSelector"); AlternateIcons *label; label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION, diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 87cf0b8c4..f7fd63f51 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -155,6 +155,7 @@ SelectedStyle::SelectedStyle(bool /*layout*/) _unit_mis(NULL), _sw_unit(NULL) { + set_name("SelectedStyle"); _drop[0] = _drop[1] = 0; _dropEnabled[0] = _dropEnabled[1] = false; diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp index fa8543c46..188be705d 100644 --- a/src/ui/widget/style-swatch.cpp +++ b/src/ui/widget/style-swatch.cpp @@ -124,6 +124,8 @@ StyleSwatch::StyleSwatch(SPCSSAttr *css, gchar const *main_tip) #endif _sw_unit(NULL) { + set_name("StyleSwatch"); + _label[SS_FILL].set_markup(_("Fill:")); _label[SS_STROKE].set_markup(_("Stroke:")); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 4bd32daca..bae26f98c 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -793,6 +793,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_label_set_markup (GTK_LABEL (dtw->select_status), _("Welcome to Inkscape! Use shape or freehand tools to create objects; use selector (arrow) to move or transform them.")); // space label 2 pixels from left edge gtk_container_add (GTK_CONTAINER (dtw->select_status_eventbox), dtw->select_status); + +// WHAT DOES THE FOLLOWING GTK_BOX DO? #if GTK_CHECK_VERSION(3,0,0) gtk_box_pack_start(GTK_BOX(dtw->statusbar), gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0), @@ -800,6 +802,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #else gtk_box_pack_start (GTK_BOX (dtw->statusbar), gtk_hbox_new(FALSE, 0), FALSE, FALSE, 2); #endif + gtk_box_pack_start (GTK_BOX (dtw->statusbar), dtw->select_status_eventbox, TRUE, TRUE, 0); gtk_widget_show_all (dtw->vbox); diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 6c3997657..f7b5e585f 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1411,6 +1411,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) // converted to GtkActions and UIManager GtkWidget* kludge = gtk_toolbar_new(); + gtk_widget_set_name( kludge, "Kludge" ); g_object_set_data( G_OBJECT(kludge), "dtw", desktop->canvas); g_object_set_data( G_OBJECT(kludge), "desktop", desktop); dataHolders[aux_toolboxes[i].type_name] = kludge; @@ -1423,7 +1424,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) } else { sub_toolbox = aux_toolboxes[i].create_func(desktop); } - + gtk_widget_set_name( sub_toolbox, "SubToolBox" ); gtk_size_group_add_widget( grouper, sub_toolbox ); gtk_container_add(GTK_CONTAINER(toolbox), sub_toolbox); @@ -1441,6 +1442,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) #if GTK_CHECK_VERSION(3,0,0) GtkWidget* holder = gtk_grid_new(); + gtk_widget_set_name( holder, "ToolbarHolder" ); gtk_grid_attach( GTK_GRID(holder), kludge, 2, 0, 1, 1); #else GtkWidget* holder = gtk_table_new( 1, 3, FALSE ); -- cgit v1.2.3 From 742cc9ebed209c412c7ec315697a373d008320d3 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 17 May 2016 13:22:07 +0200 Subject: GTK3: Fix error if default style.css file not found. Modified patch from houz. (bzr r14897) --- src/main.cpp | 82 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 07d970d59..8cf52127b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -493,7 +493,7 @@ struct poptOption options[] = { POPT_ARG_NONE, &sp_vacuum_defs, SP_ARG_VACUUM_DEFS, N_("Remove unused definitions from the defs section(s) of the document"), NULL}, - + #ifdef WITH_DBUS {"dbus-listen", 0, POPT_ARG_NONE, &sp_dbus_listen, SP_ARG_DBUS_LISTEN, @@ -551,7 +551,7 @@ static void _win32_set_inkscape_env(gchar const *exe) gchar *perl = g_build_filename(exe, "python", NULL); gchar *pythonlib = g_build_filename(exe, "python", "Lib", NULL); gchar *pythondll = g_build_filename(exe, "python", "DLLs", NULL); - + // Python 2.x needs short paths in PYTHONPATH. // Otherwise it doesn't work when Inkscape is installed in Unicode directories. // g_win32_locale_filename_from_utf8 is the GLib wrapper for GetShortPathName. @@ -602,14 +602,14 @@ static void _win32_set_inkscape_env(gchar const *exe) g_free(perl); g_free(pythonlib); g_free(pythondll); - + g_free(python_s); g_free(pythonlib_s); g_free(pythondll_s); g_free(new_path); g_free(new_pythonpath); - + g_free(localepath); } #endif @@ -619,7 +619,7 @@ static void set_extensions_env() gchar const *pythonpath = g_getenv("PYTHONPATH"); gchar *extdir; gchar *new_pythonpath; - + #ifdef WIN32 extdir = g_win32_locale_filename_from_utf8(INKSCAPE_EXTENSIONDIR); #else @@ -905,7 +905,7 @@ static int sp_common_main( int argc, char const **argv, GSList **flDest ) if ( sp_global_printer ) sp_global_printer_utf8 = g_strdup( sp_global_printer ); } - + #ifdef WITH_DBUS // Before initializing extensions, we must set the DBus bus name if required if (sp_dbus_name != NULL) { @@ -1064,40 +1064,56 @@ sp_main_gui(int argc, char const **argv) Glib::ustring inkscape_style = INKSCAPE_UIDIR; inkscape_style += "/style.css"; // std::cout << "CSS Stylesheet Inkscape: " << inkscape_style << std::endl; - Glib::RefPtr provider = Gtk::CssProvider::create(); - // From 3.16, throws an error which we must catch. - try { - provider->load_from_path (inkscape_style); - } + if (g_file_test (inkscape_style.c_str(), G_FILE_TEST_EXISTS)) { + Glib::RefPtr provider = Gtk::CssProvider::create(); + + // From 3.16, throws an error which we must catch. + try { + provider->load_from_path (inkscape_style); + } #if GTK_CHECK_VERSION(3,16,0) - // Gtk::CssProviderError not defined until 3.16. - catch (const Gtk::CssProviderError& ex) - { - std::cerr << "CSSProviderError::load_from_path(): failed to load: " << inkscape_style << "\n (" << ex.what() << ")" << std::endl; - } + // Gtk::CssProviderError not defined until 3.16. + catch (const Gtk::CssProviderError& ex) + { + std::cerr << "CSSProviderError::load_from_path(): failed to load: " << inkscape_style + << "\n (" << ex.what() << ")" << std::endl; + } #else - catch (...) - {} + catch (...) + {} #endif - provider->load_from_path (inkscape_style); - Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + Gtk::StyleContext::add_provider_for_screen (screen, provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } else { + std::cerr << "sp_main_gui: Cannot find default style file:\n (" << inkscape_style + << ")" << std::endl; + } Glib::ustring user_style = Inkscape::Application::profile_path("ui/style.css"); // std::cout << "CSS Stylesheet User: " << user_style << std::endl; - Glib::RefPtr provider2 = Gtk::CssProvider::create(); - // From 3.16, throws an error which we must catch. - try { - provider2->load_from_path (user_style); - } - catch (...) - {} - provider2->load_from_path (user_style); + if (g_file_test (user_style.c_str(), G_FILE_TEST_EXISTS)) { + Glib::RefPtr provider2 = Gtk::CssProvider::create(); - Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + // From 3.16, throws an error which we must catch. + try { + provider2->load_from_path (user_style); + } +#if GTK_CHECK_VERSION(3,16,0) + // Gtk::CssProviderError not defined until 3.16. + catch (const Gtk::CssProviderError& ex) + { + std::cerr << "CSSProviderError::load_from_path(): failed to load: " << user_style + << "\n (" << ex.what() << ")" << std::endl; + } +#else + catch (...) + {} +#endif + Gtk::StyleContext::add_provider_for_screen (screen, provider2, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } #endif gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); @@ -1183,7 +1199,7 @@ static int sp_process_file_list(GSList *fl) if (sp_vacuum_defs) { doc->vacuumDocument(); } - + // Execute command-line actions (selections and verbs) using our local models bool has_performed_actions = Inkscape::CmdLineAction::doList(INKSCAPE.active_action_context()); @@ -1694,9 +1710,9 @@ static int sp_do_export_png(SPDocument *doc) g_print("Background RRGGBBAA: %08x\n", bgcolor); g_print("Area %g:%g:%g:%g exported to %lu x %lu pixels (%g dpi)\n", area[Geom::X][0], area[Geom::Y][0], area[Geom::X][1], area[Geom::Y][1], width, height, dpi); - + reverse(items.begin(),items.end()); - + if ((width >= 1) && (height >= 1) && (width <= PNG_UINT_31_MAX) && (height <= PNG_UINT_31_MAX)) { if( sp_export_png_file(doc, path.c_str(), area, width, height, dpi, dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : std::vector()) == 1 ) { @@ -1866,7 +1882,7 @@ static int do_export_ps_pdf(SPDocument* doc, gchar const* uri, char const* mime) } /** - * Export a document to EMF or WMF + * Export a document to EMF or WMF * * \param doc Document to export. * \param uri URI to export to. -- cgit v1.2.3 From bf37c1d8ecb463130faf2e756dffff0f7efb868c Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 17 May 2016 21:21:49 +0200 Subject: Remove three unneeded widgets in desktop status bar. (bzr r14898) --- src/widgets/desktop-widget.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index bae26f98c..80e5fdb4f 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -672,10 +672,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect (G_OBJECT (dtw->hadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); g_signal_connect (G_OBJECT (dtw->vadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); - GtkWidget *statusbar_tail=gtk_statusbar_new(); - gtk_widget_set_name(statusbar_tail, "StatusBarTail"); - gtk_box_pack_end (GTK_BOX (dtw->statusbar), statusbar_tail, FALSE, FALSE, 0); - // zoom status spinbutton dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1); gtk_widget_set_name(dtw->zoom_status, "ZoomStatus"); @@ -712,9 +708,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) GTK_FILL, GTK_FILL, 0, 0); #endif - eventbox = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (eventbox), dtw->coord_status); - gtk_widget_set_tooltip_text (eventbox, _("Cursor coordinates")); + gtk_widget_set_tooltip_text (dtw->coord_status, _("Cursor coordinates")); GtkWidget *label_x = gtk_label_new(_("X:")); GtkWidget *label_y = gtk_label_new(_("Y:")); @@ -755,7 +749,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #endif sp_set_font_size_smaller (dtw->coord_status); - gtk_box_pack_end (GTK_BOX (statusbar_tail), eventbox, FALSE, FALSE, 1); + + gtk_box_pack_end (GTK_BOX (dtw->statusbar), dtw->coord_status, FALSE, FALSE, 0); dtw->layer_selector = new Inkscape::Widgets::LayerSelector(NULL); // FIXME: need to unreference on container destruction to avoid leak @@ -794,15 +789,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) // space label 2 pixels from left edge gtk_container_add (GTK_CONTAINER (dtw->select_status_eventbox), dtw->select_status); -// WHAT DOES THE FOLLOWING GTK_BOX DO? -#if GTK_CHECK_VERSION(3,0,0) - gtk_box_pack_start(GTK_BOX(dtw->statusbar), - gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0), - FALSE, FALSE, 2); -#else - gtk_box_pack_start (GTK_BOX (dtw->statusbar), gtk_hbox_new(FALSE, 0), FALSE, FALSE, 2); -#endif - gtk_box_pack_start (GTK_BOX (dtw->statusbar), dtw->select_status_eventbox, TRUE, TRUE, 0); gtk_widget_show_all (dtw->vbox); -- cgit v1.2.3 From e2d369f573b2336dd19c66478adad70b8e474251 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Tue, 17 May 2016 23:15:25 +0200 Subject: Dutch translation update (bzr r14899) --- po/nl.po | 248 +++++++++++++++++++++++++++------------------------------------ 1 file changed, 104 insertions(+), 144 deletions(-) diff --git a/po/nl.po b/po/nl.po index 5711e614b..e4916f9e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -59,7 +59,7 @@ msgstr "" "Project-Id-Version: inkscape 0.92\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-12-27 14:26+0100\n" -"PO-Revision-Date: 2016-02-04 22:35+0100\n" +"PO-Revision-Date: 2016-05-17 23:14+0100\n" "Last-Translator: Kris De Gussem \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -87,7 +87,7 @@ msgstr "Scalable Vector Graphics-afbeeldingen maken en bewerken" #: ../inkscape.desktop.in.h:5 msgid "image;editor;vector;drawing;" -msgstr "" +msgstr "image;editor;vector;drawing;" #: ../inkscape.desktop.in.h:6 msgid "New Drawing" @@ -8756,7 +8756,7 @@ msgstr "Tensor meshgradiënt" #: ../src/gradient-drag.cpp:565 msgid "Added patch row or column" -msgstr "" +msgstr "Patchrij of -kolom toegevoegd" #: ../src/gradient-drag.cpp:798 msgid "Merge gradient handles" @@ -9645,7 +9645,6 @@ msgstr "" #: ../src/live_effects/lpe-bendpath.cpp:181 #: ../src/live_effects/lpe-patternalongpath.cpp:278 -#, fuzzy msgid "Change the width" msgstr "Lijndikte aanpassen" @@ -22962,10 +22961,9 @@ msgid "Drag curve" msgstr "Kromme verslepen" #: ../src/ui/tool/curve-drag-point.cpp:192 -#, fuzzy msgctxt "Path segment tip" msgid "Shift: drag to open or move BSpline handles" -msgstr "Knooppunthandvatten verschuiven" +msgstr "Shift: sleep om BSpline handvatten te openen of verplaatsen" #: ../src/ui/tool/curve-drag-point.cpp:196 msgctxt "Path segment tip" @@ -22978,15 +22976,13 @@ msgid "Ctrl+Alt: click to insert a node" msgstr "Ctrl+Alt: klik om knooppunt in te voegen" #: ../src/ui/tool/curve-drag-point.cpp:204 -#, fuzzy msgctxt "Path segment tip" msgid "" "BSpline segment: drag to shape the segment, doubleclick to insert " "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" -"Beziersegment: sleep om het segment te vervormen, dubbelklik om een " -"knooppunt in te voegen, klik om te selecteren (toetscombinaties: Shift, Ctrl" -"+Alt)" +"BSpline segment: sleep om het segment te vervormen, dubbelklik om een " +"knooppunt in te voegen, klik om te selecteren (meer: Shift, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:209 msgctxt "Path segment tip" @@ -22995,8 +22991,8 @@ msgid "" "insert node, click to select (more: Shift, Ctrl+Alt)" msgstr "" "Recht segment: sleep om te converteren naar een Beziersegment, " -"dubbelklik om een knooppunt in te voegen, klik om te selecteren " -"(toetscombinaties: Shift, Ctrl+Alt)" +"dubbelklik om een knooppunt in te voegen, klik om te selecteren (meer: " +"Shift, Ctrl+Alt)" #: ../src/ui/tool/curve-drag-point.cpp:213 msgctxt "Path segment tip" @@ -23005,8 +23001,7 @@ msgid "" "node, click to select (more: Shift, Ctrl+Alt)" msgstr "" "Beziersegment: sleep om het segment te vervormen, dubbelklik om een " -"knooppunt in te voegen, klik om te selecteren (toetscombinaties: Shift, Ctrl" -"+Alt)" +"knooppunt in te voegen, klik om te selecteren (meer: Shift, Ctrl+Alt)" #: ../src/ui/tool/multi-path-manipulator.cpp:315 msgid "Retract handles" @@ -23118,10 +23113,9 @@ msgid "more: Shift, Ctrl, Alt" msgstr "meer: Shift, Ctrl, Alt" #: ../src/ui/tool/node.cpp:496 -#, fuzzy msgctxt "Path handle tip" msgid "more: Ctrl" -msgstr "meer: Ctrl, Alt" +msgstr "meer: Ctrl" #: ../src/ui/tool/node.cpp:498 msgctxt "Path handle tip" @@ -23170,6 +23164,8 @@ msgstr "" msgctxt "Path handle tip" msgid "Ctrl: Move handle by his actual steps in BSpline Live Effect" msgstr "" +"Ctrl: handvat met dit aantal stappen verplaaten in het BSpline Live " +"Effect" #: ../src/ui/tool/node.cpp:532 #, c-format @@ -23184,10 +23180,9 @@ msgid "Shift: rotate both handles by the same angle" msgstr "Shift: beide handvatten met dezelfde hoek roteren" #: ../src/ui/tool/node.cpp:540 -#, fuzzy msgctxt "Path hande tip" msgid "Shift: move handle" -msgstr "Knooppunthandvatten verschuiven" +msgstr "Shift: handvat verschuiven" #: ../src/ui/tool/node.cpp:547 ../src/ui/tool/node.cpp:551 #, c-format @@ -23198,14 +23193,14 @@ msgstr "" "knooppunt (%s)" #: ../src/ui/tool/node.cpp:554 -#, fuzzy, c-format +#, c-format msgctxt "Path handle tip" msgid "" "BSpline node handle: Shift to drag, double click to reset (%s). %g " "power" msgstr "" -"Automatischknooppunthandvat: sleep om om te zetten naar een glad " -"knooppunt (%s)" +"BSpline knooppunthandvat: Shift om te verslepen, dubbelklik om te " +"resetten (%s). %g kracht" #: ../src/ui/tool/node.cpp:574 #, c-format @@ -23245,17 +23240,17 @@ msgstr "Alt: knooppunten boetseren" #, c-format msgctxt "Path node tip" msgid "%s: drag to shape the path (more: Shift, Ctrl, Alt)" -msgstr "" -"%s: sleep om het pad te vervormen (toetscombinatie: Shift, Ctrl, Alt)" +msgstr "%s: sleep om het pad te vervormen (meer: Shift, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1451 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path (more: Shift, Ctrl, Alt). %g " "power" msgstr "" -"%s: sleep om het pad te vervormen (toetscombinatie: Shift, Ctrl, Alt)" +"BSpline knooppunt: sleep om het pad te vervormen (meer: Shift, Ctrl, " +"Alt). %g kracht" #: ../src/ui/tool/node.cpp:1454 #, c-format @@ -23265,7 +23260,7 @@ msgid "" "(more: Shift, Ctrl, Alt)" msgstr "" "%s: sleep om het pad te vervormen, klik om te schakelen tussen " -"schalings- en rotatiehandvatten (toetscombinaties: Shift, Ctrl, Alt)" +"schalings- en rotatiehandvatten (meer: Shift, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1458 #, c-format @@ -23275,17 +23270,17 @@ msgid "" "Shift, Ctrl, Alt)" msgstr "" "%s: sleep om het pad te vervormen, klik om enkel dit knooppunt te " -"selecteren (toetscombinaties: Shift, Ctrl, Alt)" +"selecteren (meer: Shift, Ctrl, Alt)" #: ../src/ui/tool/node.cpp:1461 -#, fuzzy, c-format +#, c-format msgctxt "Path node tip" msgid "" "BSpline node: drag to shape the path, click to select only this node " "(more: Shift, Ctrl, Alt). %g power" msgstr "" -"%s: sleep om het pad te vervormen, klik om enkel dit knooppunt te " -"selecteren (toetscombinaties: Shift, Ctrl, Alt)" +"BSpline knooppunt: sleep om het pad te vervormen, klik om enkel dit " +"knooppunt te selecteren (meer: Shift, Ctrl, Alt). %g kracht" #: ../src/ui/tool/node.cpp:1474 #, c-format @@ -23961,14 +23956,12 @@ msgstr "Kies een gereedschap van de gereedschappenbalk." #. create the knots #: ../src/ui/tools/measure-tool.cpp:338 -#, fuzzy msgid "Measure start" -msgstr "Pad opmeten" +msgstr "Begin meetlat" #: ../src/ui/tools/measure-tool.cpp:344 -#, fuzzy msgid "Measure end" -msgstr "Meetlat" +msgstr "Einde meetlat" #: ../src/ui/tools/measure-tool.cpp:719 ../share/extensions/measure.inx.h:2 msgid "Measure" @@ -23976,25 +23969,24 @@ msgstr "Meetlat" #: ../src/ui/tools/measure-tool.cpp:724 msgid "Base" -msgstr "" +msgstr "Basis" #: ../src/ui/tools/measure-tool.cpp:733 msgid "Add guides from measure tool" -msgstr "" +msgstr "Hulplijnen van meetlat toevoegen" #: ../src/ui/tools/measure-tool.cpp:753 -#, fuzzy msgid "Convert measure to items" -msgstr "Omlijning omzetten naar pad" +msgstr "Meting omzetten naar items" #: ../src/ui/tools/measure-tool.cpp:791 msgid "Add global measure line" -msgstr "" +msgstr "Globale meetlijn toevoegen" #: ../src/ui/tools/measure-tool.cpp:1221 ../src/ui/tools/measure-tool.cpp:1223 -#, fuzzy, c-format +#, c-format msgid "Crossing %d" -msgstr "Kruisingstekens" +msgstr "Kruisingv %d" #. TRANSLATORS: Mind the space in front. This is part of a compound message #: ../src/ui/tools/mesh-tool.cpp:122 ../src/ui/tools/mesh-tool.cpp:133 @@ -24060,9 +24052,8 @@ msgid "FIXMEShift: draw mesh around the starting point" msgstr "Shift: mesh rond het beginpunt tekenen" #: ../src/ui/tools/mesh-tool.cpp:971 -#, fuzzy msgid "Create mesh" -msgstr "Standaardmesh maken" +msgstr "Mesh maken" #: ../src/ui/tools/node-tool.cpp:653 msgctxt "Node tool tip" @@ -24115,7 +24106,7 @@ msgctxt "Node tool tip" msgid "Drag to select objects to edit, click to edit this object (more: Shift)" msgstr "" "Sleep om te bewerken objecten te selecteren, klik om dit object te bewerken " -"(toetscombinatie: Shift)" +"(meer: Shift)" #: ../src/ui/tools/node-tool.cpp:719 msgctxt "Node tool tip" @@ -24143,11 +24134,12 @@ msgid "Click or click and drag to close and finish the path." msgstr "Klik of klik en sleep om een pad te sluiten." #: ../src/ui/tools/pen-tool.cpp:642 -#, fuzzy msgid "" "Click or click and drag to close and finish the path. Shift" "+Click make a cusp node" -msgstr "Klik of klik en sleep om een pad te sluiten." +msgstr "" +"Klik of klik en sleep om een pad te sluiten en af te werken. " +"Shift+klik om een hoekig knooppunt te maken." #: ../src/ui/tools/pen-tool.cpp:654 msgid "" @@ -24156,12 +24148,12 @@ msgstr "" "Klik of klik en sleep om vanaf daar het pad voort te zetten." #: ../src/ui/tools/pen-tool.cpp:656 -#, fuzzy msgid "" "Click or click and drag to continue the path from this point. " "Shift+Click make a cusp node" msgstr "" -"Klik of klik en sleep om vanaf daar het pad voort te zetten." +"Klik of klik en sleep om vanaf dit punt het pad voort te " +"zetten. Shift+klik om een hoekig knooppunt te maken." #: ../src/ui/tools/pen-tool.cpp:1786 #, c-format @@ -24182,22 +24174,22 @@ msgstr "" "stappen te draaien, Enter om het pad af te maken" #: ../src/ui/tools/pen-tool.cpp:1790 -#, fuzzy, c-format +#, c-format msgid "" "Curve segment: angle %3.2f°, distance %s; with Shift+Click make a cusp node, Enter to finish the path" msgstr "" -"Segment curve: hoek %3.2f°, afstand %s; gebruik Ctrl om " -"in stappen te draaien, Enter om het pad af te maken" +"Segment curve: hoek %3.2f°, afstand %s; gebruik Shit+Klik " +"om een hoekig knooppunt te maken, Enter om het pad af te maken" #: ../src/ui/tools/pen-tool.cpp:1791 -#, fuzzy, c-format +#, c-format msgid "" "Line segment: angle %3.2f°, distance %s; with Shift+Click " "make a cusp node, Enter to finish the path" msgstr "" -"Segment lijn: hoek %3.2f°, afstand %s; gebruik Ctrl om in " -"stappen te draaien, Enter om het pad af te maken" +"Segment lijn: hoek %3.2f°, afstand %s; gebruik Shit+Klik " +"om een hoekig knooppunt te maken, Enter om het pad af te maken" #: ../src/ui/tools/pen-tool.cpp:1808 #, c-format @@ -25586,19 +25578,16 @@ msgid "Radial gradient stroke" msgstr "Radiaal lijnkleurverloop" #: ../src/ui/widget/selected-style.cpp:218 -#, fuzzy msgid "M" -msgstr "L" +msgstr "M" #: ../src/ui/widget/selected-style.cpp:221 -#, fuzzy msgid "Mesh gradient fill" -msgstr "Lineair vulkleurverloop" +msgstr "Vulling meshgradiënt" #: ../src/ui/widget/selected-style.cpp:221 -#, fuzzy msgid "Mesh gradient stroke" -msgstr "Lineair lijnkleurverloop" +msgstr "Lijn meshgradiënt" #: ../src/ui/widget/selected-style.cpp:229 msgid "Different" @@ -26277,7 +26266,7 @@ msgstr "Inkscape afsluiten" #: ../src/verbs.cpp:2459 #, fuzzy msgid "New from _Template..." -msgstr "Nieuw van sjabloon" +msgstr "Nieuw van sjabloon..." #: ../src/verbs.cpp:2460 msgid "Create new project from template" @@ -26646,14 +26635,12 @@ msgid "Delete all the guides in the document" msgstr "Alle hulplijnen uit het document verwijderen" #: ../src/verbs.cpp:2549 -#, fuzzy msgid "Lock All Guides" -msgstr "Alles vergrendelen" +msgstr "Alle hulplijnen vergrendelen" #: ../src/verbs.cpp:2549 ../src/widgets/desktop-widget.cpp:402 -#, fuzzy msgid "Toggle lock of all guides in the document" -msgstr "Alle hulplijnen uit het document verwijderen" +msgstr "Alle hulplijnen in het document ver- of ontgrendelen" #: ../src/verbs.cpp:2550 msgid "Create _Guides Around the Page" @@ -27205,11 +27192,8 @@ msgid "Create Cl_ip Group" msgstr "_Klonen" #: ../src/verbs.cpp:2723 -#, fuzzy msgid "Creates a clip group using the selected objects as a base" -msgstr "" -"Een kloon (een aan het origineel gekoppelde kopie) maken van het " -"geselecteerde object" +msgstr "Een afsnijgroep op basis van de geselecteerde objecten maken" #: ../src/verbs.cpp:2725 msgid "Edit clipping path" @@ -28053,19 +28037,16 @@ msgid "Object_s..." msgstr "Objecten tonen" #: ../src/verbs.cpp:2952 -#, fuzzy msgid "View Objects" msgstr "Objecten tonen" #: ../src/verbs.cpp:2953 -#, fuzzy msgid "Selection se_ts..." -msgstr "Selectie" +msgstr "" #: ../src/verbs.cpp:2954 -#, fuzzy msgid "View Tags" -msgstr "Informatie over de aanwezige lagen tonen" +msgstr "Tags tonen" #: ../src/verbs.cpp:2955 msgid "Path E_ffects ..." @@ -28914,14 +28895,12 @@ msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" #: ../src/widgets/desktop-widget.cpp:1082 -#, fuzzy msgid "Locked all guides" -msgstr "Alle lagen vergrendelen" +msgstr "Alle hulplijnen vergrendeld" #: ../src/widgets/desktop-widget.cpp:1084 -#, fuzzy msgid "Unlocked all guides" -msgstr "Alle lagen ontgrendelen" +msgstr "Alle hulplijnen ontgrendeld" #: ../src/widgets/desktop-widget.cpp:1101 msgid "Color-managed display is enabled in this window" @@ -29378,39 +29357,35 @@ msgstr "Padeffectenvenster openen (om parameters numeriek aan te passen)" #: ../src/widgets/measure-toolbar.cpp:157 msgid "Start and end measures inactive." -msgstr "" +msgstr "Begin en einde meting inactief." #: ../src/widgets/measure-toolbar.cpp:159 msgid "Start and end measures active." -msgstr "" +msgstr "Begin en einde meting actief." #: ../src/widgets/measure-toolbar.cpp:175 msgid "Show only visible crossings." -msgstr "" +msgstr "Alleen zichtbare kruisings tonen." #: ../src/widgets/measure-toolbar.cpp:177 -#, fuzzy msgid "Show all crossings." -msgstr "Alle lagen tonen" +msgstr "Alle kruisings tonen." #: ../src/widgets/measure-toolbar.cpp:193 msgid "Use all layers in the measure." -msgstr "" +msgstr "Alle lagen in de meetlat gebruiken." #: ../src/widgets/measure-toolbar.cpp:195 -#, fuzzy msgid "Use current layer in the measure." -msgstr "Huidige laag boven alle andere plaatsen" +msgstr "Huidige laag in de meetlat gebruiken." #: ../src/widgets/measure-toolbar.cpp:211 -#, fuzzy msgid "Compute all elements." -msgstr "tutorial-elements.nl.svg" +msgstr "Alle elementen berekenen." #: ../src/widgets/measure-toolbar.cpp:213 -#, fuzzy msgid "Compute max length." -msgstr "In-uit padlengte" +msgstr "Max lengte berekenen." #: ../src/widgets/measure-toolbar.cpp:266 ../src/widgets/text-toolbar.cpp:1361 msgid "Font Size" @@ -29438,7 +29413,6 @@ msgid "Decimal precision of measure" msgstr "Decimale precisie van meetlat" #: ../src/widgets/measure-toolbar.cpp:307 -#, fuzzy msgid "Scale %" msgstr "Schaal %" @@ -29483,9 +29457,8 @@ msgstr "Meting omkeren" #: ../src/widgets/measure-toolbar.cpp:387 #: ../src/widgets/measure-toolbar.cpp:388 -#, fuzzy msgid "To guides" -msgstr "_Hulplijnen weergeven" +msgstr "Naar hulplijnen" #: ../src/widgets/measure-toolbar.cpp:397 #: ../src/widgets/measure-toolbar.cpp:398 @@ -29570,12 +29543,12 @@ msgstr "Zijde- en tensorhandvatten tonen" #: ../src/widgets/mesh-toolbar.cpp:509 msgid "WARNING: Mesh SVG Syntax Subject to Change" -msgstr "" +msgstr "WAARSCHUWING: mesh SVG syntax onderhevig aan veranderingen" #: ../src/widgets/mesh-toolbar.cpp:519 msgctxt "Type" msgid "Coons" -msgstr "" +msgstr "Coons" #: ../src/widgets/mesh-toolbar.cpp:522 msgid "Bicubic" @@ -29583,54 +29556,51 @@ msgstr "Bicubisch" #: ../src/widgets/mesh-toolbar.cpp:524 msgid "Coons" -msgstr "" +msgstr "Coons" #: ../src/widgets/mesh-toolbar.cpp:525 msgid "Coons: no smoothing. Bicubic: smoothing across patch boundaries." -msgstr "" +msgstr "Coons: geen afvlakking. Bicubisch: afvlakking langs patchranden." #: ../src/widgets/mesh-toolbar.cpp:527 ../src/widgets/pencil-toolbar.cpp:374 msgid "Smoothing:" msgstr "Afvlakking:" #: ../src/widgets/mesh-toolbar.cpp:537 -#, fuzzy msgid "Toggle Sides" -msgstr "Superscript" +msgstr "Zijden aanpassen" #: ../src/widgets/mesh-toolbar.cpp:538 msgid "Toggle selected sides between Beziers and lines." -msgstr "" +msgstr "Zijden veranderen tussen Beziers en lijnen." #: ../src/widgets/mesh-toolbar.cpp:541 -#, fuzzy msgid "Toggle side:" -msgstr "_Focus modus aan/uitzetten" +msgstr "Zijde aanpassen:" #: ../src/widgets/mesh-toolbar.cpp:548 -#, fuzzy msgid "Make elliptical" -msgstr "Cursief maken" +msgstr "Elliptisch maken" #: ../src/widgets/mesh-toolbar.cpp:549 msgid "" "Make selected sides elliptical by changing length of handles. Works best if " "handles already approximate ellipse." msgstr "" +"Geselecteerde zijden elliptisch maken door het aanpassen van de " +"handvatlengte. Werkt het beste indien de handvatten reeds ellipsen benaderen." #: ../src/widgets/mesh-toolbar.cpp:552 -#, fuzzy msgid "Make elliptical:" -msgstr "Cursief maken" +msgstr "Elliptisch maken:" #: ../src/widgets/mesh-toolbar.cpp:559 -#, fuzzy msgid "Pick colors:" -msgstr "Kleur punten" +msgstr "Kleuren kiezen:" #: ../src/widgets/mesh-toolbar.cpp:560 msgid "Pick colors for selected corner nodes from underneath mesh." -msgstr "" +msgstr "Kleuren van geselecteerde hoekknooppunten onder mesh kiezen." #: ../src/widgets/mesh-toolbar.cpp:563 msgid "Pick Color" @@ -31047,7 +31017,7 @@ msgstr "Verticaal — RL" #: ../src/widgets/text-toolbar.cpp:1499 msgid "Vertical text — lines: right to left" -msgstr "" +msgstr "Verticale tekst — lijnen: rechts naar links" #: ../src/widgets/text-toolbar.cpp:1505 msgid "Vertical — LR" @@ -31055,7 +31025,7 @@ msgstr "Verticaal — LR" #: ../src/widgets/text-toolbar.cpp:1506 msgid "Vertical text — lines: left to right" -msgstr "" +msgstr "Verticale tekst — lijnen: links naar rechts" #. Name #: ../src/widgets/text-toolbar.cpp:1511 @@ -33614,9 +33584,8 @@ msgid "SVG Unit:" msgstr "SVG-eenheid:" #: ../share/extensions/empty_generic.inx.h:5 -#, fuzzy msgid "Canvas background:" -msgstr "Achtergrond bewaren" +msgstr "Canvasachtergrond:" #: ../share/extensions/empty_generic.inx.h:6 #: ../share/extensions/empty_page.inx.h:5 @@ -35401,9 +35370,8 @@ msgstr "" #: ../share/extensions/hpgl_output.inx.h:28 #: ../share/extensions/plotter.inx.h:56 -#, fuzzy msgid "Precut" -msgstr "Voorsnijden gebruiken" +msgstr "Voorsnijden" #: ../share/extensions/hpgl_output.inx.h:29 #: ../share/extensions/plotter.inx.h:57 @@ -35459,15 +35427,13 @@ msgid "Export an HP Graphics Language file" msgstr "Naar een HP Graphics Language bestand exporteren" #: ../share/extensions/image_attributes.inx.h:1 -#, fuzzy msgid "Set Image Attributes" -msgstr "Attributen instellen" +msgstr "Afbeeldingsattributen instellen" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:3 -#, fuzzy msgid "Basic" -msgstr "Latijns, basis" +msgstr "Basis" #. render images like in 0.48 #: ../share/extensions/image_attributes.inx.h:5 @@ -35503,9 +35469,8 @@ msgstr "" #. image-rendering #: ../share/extensions/image_attributes.inx.h:17 -#, fuzzy msgid "Scope:" -msgstr "Bereik" +msgstr "Bereik:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:19 @@ -35514,41 +35479,34 @@ msgid "Unset" msgstr "Vergroten" #: ../share/extensions/image_attributes.inx.h:20 -#, fuzzy msgid "Change only selected image(s)" -msgstr "Alleen geselecteerde knooppunten veranderen" +msgstr "Alleen geselecteerde afbeelding(en) aanpassen" #: ../share/extensions/image_attributes.inx.h:21 -#, fuzzy msgid "Change all images in selection" -msgstr "Kon geen ellips in selectie vinden" +msgstr "Alle afbeeldingen in selectie aanpassen" #: ../share/extensions/image_attributes.inx.h:22 -#, fuzzy msgid "Change all images in document" -msgstr "De spelling van de tekst in het document controleren" +msgstr "Alle afbeeldingen in het document aanpassen" #. image-rendering #: ../share/extensions/image_attributes.inx.h:24 -#, fuzzy msgid "Image Rendering Quality" -msgstr "Renderen van afbeelding:" +msgstr "Kwaliteit renderen van afbeelding:" #. image-rendering #: ../share/extensions/image_attributes.inx.h:26 -#, fuzzy msgid "Image rendering attribute:" -msgstr "Rendermodus afbeelding:" +msgstr "Renderattribuut afbeelding:" #: ../share/extensions/image_attributes.inx.h:27 -#, fuzzy msgid "Apply attribute to parent group of selection" -msgstr "Transformatie toepassen op selectie" +msgstr "attribuut toepassen op oudergroep of selectie" #: ../share/extensions/image_attributes.inx.h:28 -#, fuzzy msgid "Apply attribute to SVG root" -msgstr "Te veranderen attribuut:" +msgstr "Attribuut toepassen op SVG-root" #: ../share/extensions/ink2canvas.inx.h:1 msgid "Convert to html5 canvas" @@ -35640,9 +35598,8 @@ msgstr "Stijl interpoleren" #: ../share/extensions/interp.inx.h:7 #: ../share/extensions/interp_att_g.inx.h:10 -#, fuzzy msgid "Use Z-order" -msgstr "Verhoogde rand" +msgstr "Z-orde gebruiken" #: ../share/extensions/interp.inx.h:8 #: ../share/extensions/interp_att_g.inx.h:11 @@ -36602,9 +36559,8 @@ msgid "Start of Path" msgstr "Begin van pad" #: ../share/extensions/measure.inx.h:31 -#, fuzzy msgid "Center of BBox" -msgstr "Massacentrum" +msgstr "Middelpunt van omvattend vak" #: ../share/extensions/measure.inx.h:32 msgid "Center of Mass" @@ -36980,6 +36936,8 @@ msgid "" "The Byte size of your serial connection, 99% of all plotters use the default " "setting (Default: 8 Bits)" msgstr "" +"Bytegrootte van de seriële verbinding, 99% van de plotters gebruiken de " +"standaardwaarde (8 bits)" #: ../share/extensions/plotter.inx.h:11 msgid "Serial stop bits:" @@ -36991,6 +36949,8 @@ msgid "" "The Stop bits of your serial connection, 99% of all plotters use the default " "setting (Default: 1 Bit)" msgstr "" +"Stopbits van de seriële verbinding, 99% van de plotters gebruiken de " +"standaardwaarde (1 bit)" #: ../share/extensions/plotter.inx.h:14 msgid "Serial parity:" @@ -37002,6 +36962,8 @@ msgid "" "The Parity of your serial connection, 99% of all plotters use the default " "setting (Default: None)" msgstr "" +"Pariteit van de seriële verbinding, 99% van de plotters gebruiken de " +"standaardwaarde (geen)" #: ../share/extensions/plotter.inx.h:17 msgid "Serial flow control:" @@ -37641,9 +37603,8 @@ msgid "Bottom" msgstr "Onderaan" #: ../share/extensions/restack.inx.h:21 -#, fuzzy msgid "Based on Z-Order" -msgstr "Verhoogde rand" +msgstr "Gebaseerd op Z-orde" #: ../share/extensions/restack.inx.h:22 #, fuzzy @@ -37651,13 +37612,12 @@ msgid "Restack Mode" msgstr "Herstapelen" #: ../share/extensions/restack.inx.h:23 -#, fuzzy msgid "Reverse Z-Order" -msgstr "Kleurverloop omdraaien" +msgstr "Z-orde omkeren" #: ../share/extensions/restack.inx.h:24 msgid "Shuffle Z-Order" -msgstr "" +msgstr "Z-orde shuffelen" #: ../share/extensions/restack.inx.h:26 msgid "" -- cgit v1.2.3 From dcda41314bb620511d799e7cb633831f5ab18cab Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 18 May 2016 10:45:50 +0200 Subject: Remove unneeded widget in Status Bar. Reorder code. Use two lines for status message in Gtk3. (bzr r14900) --- share/ui/style.css | 12 +++---- src/widgets/desktop-widget.cpp | 79 +++++++++++++++++++++++------------------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/share/ui/style.css b/share/ui/style.css index 091cfc319..6729344d2 100644 --- a/share/ui/style.css +++ b/share/ui/style.css @@ -41,13 +41,9 @@ @define-color bg_color7 #636363; @define-color bg_color8 #000000; /* Black */ -/* Gtk <= 3.18 */ -GtkWidget { -/* font-size: 12pt; */ -} - -/* Gtk >= 3.19.2 */ -widget { +/* 'GtkWidget' for Gtk <= 3.18 */ +/* 'widget' for Gtk <= 3.19.2 */ +GtkWidget, widget { /* font-size: 12pt; */ } @@ -96,7 +92,7 @@ combobox window.popup scrolledwindow treeview separator { -GtkComboBox-appears-as-list: true; } -#guides_lock { +#LockGuides { padding: 0; } diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 80e5fdb4f..c3e0ae372 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -249,7 +249,7 @@ SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message) gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(sb)), TRUE); } - gtk_widget_set_tooltip_text (this->select_status_eventbox, gtk_label_get_text (sb)); + gtk_widget_set_tooltip_text (this->select_status, gtk_label_get_text (sb)); } Geom::Point @@ -479,9 +479,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) // Horizontal scrollbar dtw->hadj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0)); - - - #if GTK_CHECK_VERSION(3,0,0) dtw->hscrollbar = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (dtw->hadj)); gtk_widget_set_name(dtw->hscrollbar, "HorizontalScrollbar"); @@ -656,10 +653,19 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #endif } + // connect scrollbar signals + g_signal_connect (G_OBJECT (dtw->hadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); + g_signal_connect (G_OBJECT (dtw->vadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); + + + // --------------- Status Tool Bar ------------------// + + // Selected Style (Fill/Stroke/Opacity) dtw->selected_style = new Inkscape::UI::Widget::SelectedStyle(true); GtkHBox *ss_ = dtw->selected_style->gobj(); gtk_box_pack_start (GTK_BOX (dtw->statusbar), GTK_WIDGET(ss_), FALSE, FALSE, 0); + // Separator gtk_box_pack_start(GTK_BOX(dtw->statusbar), #if GTK_CHECK_VERSION(3,0,0) gtk_separator_new(GTK_ORIENTATION_VERTICAL), @@ -668,11 +674,37 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #endif FALSE, FALSE, 0); - // connect scrollbar signals - g_signal_connect (G_OBJECT (dtw->hadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); - g_signal_connect (G_OBJECT (dtw->vadj), "value-changed", G_CALLBACK (sp_desktop_widget_adjustment_value_changed), dtw); + // Layer Selector + dtw->layer_selector = new Inkscape::Widgets::LayerSelector(NULL); + // FIXME: need to unreference on container destruction to avoid leak + dtw->layer_selector->reference(); + //dtw->layer_selector->set_size_request(-1, SP_ICON_SIZE_BUTTON); + gtk_box_pack_start(GTK_BOX(dtw->statusbar), GTK_WIDGET(dtw->layer_selector->gobj()), FALSE, FALSE, 1); + + // Select Status + dtw->select_status = gtk_label_new (NULL); + gtk_widget_set_name( dtw->select_status, "SelectStatus"); + gtk_label_set_ellipsize (GTK_LABEL(dtw->select_status), PANGO_ELLIPSIZE_END); +#if GTK_CHECK_VERSION(3,10,0) + gtk_label_set_line_wrap (GTK_LABEL(dtw->select_status), true); + gtk_label_set_lines (GTK_LABEL(dtw->select_status), 2); +#endif + +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_halign(dtw->select_status, GTK_ALIGN_START); +#else + gtk_misc_set_alignment (GTK_MISC (dtw->select_status), 0.0, 0.5); +#endif + + gtk_widget_set_size_request (dtw->select_status, 1, -1); + + // Display the initial welcome message in the statusbar + gtk_label_set_markup (GTK_LABEL (dtw->select_status), _("Welcome to Inkscape! Use shape or freehand tools to create objects; use selector (arrow) to move or transform them.")); + + gtk_box_pack_start (GTK_BOX (dtw->statusbar), dtw->select_status, TRUE, TRUE, 0); + - // zoom status spinbutton + // Zoom status spinbutton dtw->zoom_status = gtk_spin_button_new_with_range (log(SP_DESKTOP_ZOOM_MIN)/log(2), log(SP_DESKTOP_ZOOM_MAX)/log(2), 0.1); gtk_widget_set_name(dtw->zoom_status, "ZoomStatus"); gtk_widget_set_tooltip_text (dtw->zoom_status, _("Zoom")); @@ -688,10 +720,10 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "value_changed", G_CALLBACK (sp_dtw_zoom_value_changed), dtw); dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "populate_popup", G_CALLBACK (sp_dtw_zoom_populate_popup), dtw); - // cursor coordinates + // Cursor coordinates #if GTK_CHECK_VERSION(3,0,0) dtw->coord_status = gtk_grid_new(); - gtk_widget_set_name(dtw->coord_status, "CoordinateStatus"); + gtk_widget_set_name(dtw->coord_status, "CoordinateAndZStatus"); gtk_grid_set_row_spacing(GTK_GRID(dtw->coord_status), 0); gtk_grid_set_column_spacing(GTK_GRID(dtw->coord_status), 2); GtkWidget* sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); @@ -752,12 +784,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_box_pack_end (GTK_BOX (dtw->statusbar), dtw->coord_status, FALSE, FALSE, 0); - dtw->layer_selector = new Inkscape::Widgets::LayerSelector(NULL); - // FIXME: need to unreference on container destruction to avoid leak - dtw->layer_selector->reference(); - //dtw->layer_selector->set_size_request(-1, SP_ICON_SIZE_BUTTON); - gtk_box_pack_start(GTK_BOX(dtw->statusbar), GTK_WIDGET(dtw->layer_selector->gobj()), FALSE, FALSE, 1); - + // --------------- Color Management ---------------- // dtw->_tracker = ege_color_prof_tracker_new(GTK_WIDGET(dtw->layer_selector->gobj())); #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) bool fromDisplay = prefs->getBool( "/options/displayprofile/from_display"); @@ -772,25 +799,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) g_signal_connect( G_OBJECT(dtw->_tracker), "changed", G_CALLBACK(sp_dtw_color_profile_event), dtw ); - dtw->select_status_eventbox = gtk_event_box_new (); - gtk_widget_set_name(dtw->select_status_eventbox, "SelectStatusEventBox"); - dtw->select_status = gtk_label_new (NULL); - gtk_label_set_ellipsize (GTK_LABEL(dtw->select_status), PANGO_ELLIPSIZE_END); - -#if GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_halign(dtw->select_status, GTK_ALIGN_START); -#else - gtk_misc_set_alignment (GTK_MISC (dtw->select_status), 0.0, 0.5); -#endif - - gtk_widget_set_size_request (dtw->select_status, 1, -1); - // display the initial welcome message in the statusbar - gtk_label_set_markup (GTK_LABEL (dtw->select_status), _("Welcome to Inkscape! Use shape or freehand tools to create objects; use selector (arrow) to move or transform them.")); - // space label 2 pixels from left edge - gtk_container_add (GTK_CONTAINER (dtw->select_status_eventbox), dtw->select_status); - - gtk_box_pack_start (GTK_BOX (dtw->statusbar), dtw->select_status_eventbox, TRUE, TRUE, 0); - + // ------------------ Finish Up -------------------- // gtk_widget_show_all (dtw->vbox); gtk_widget_grab_focus (GTK_WIDGET(dtw->canvas)); -- cgit v1.2.3 From 30cdce52c67422b6403fc5bc54fbc4a0404a5b3a Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 18 May 2016 13:47:57 +0200 Subject: GTK3: Give even more widgets names. (bzr r14901) --- src/ui/dialog/swatches.cpp | 1 + src/ui/previewholder.cpp | 4 ++++ src/ui/widget/panel.cpp | 6 +++++- src/widgets/desktop-widget.cpp | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 924ebe03d..f2298b59b 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -594,6 +594,7 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) : _currentDesktop(0), _currentDocument(0) { + set_name( "SwatchesPanel" ); Gtk::RadioMenuItem* hotItem = 0; _holder = new PreviewHolder(); _clear = new ColorItem( ege::PaintDef::CLEAR ); diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index beb83f35c..5e75179a3 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -49,16 +49,20 @@ PreviewHolder::PreviewHolder() : _wrap(false), _border(BORDER_NONE) { + set_name( "PreviewHolder" ); _scroller = Gtk::manage(new Gtk::ScrolledWindow()); + _scroller->set_name( "PreviewHolderScroller" ); ((Gtk::ScrolledWindow *)_scroller)->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); #if WITH_GTKMM_3_0 _insides = Gtk::manage(new Gtk::Grid()); + _insides->set_name( "PreviewHolderGrid" ); _insides->set_column_spacing(8); // Add a container with the scroller and a spacer Gtk::Grid* spaceHolder = Gtk::manage(new Gtk::Grid()); + spaceHolder->set_name( "PreviewHolderSpaceHolder" ); _scroller->set_hexpand(); _scroller->set_vexpand(); diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 5d4a25a68..ab13577d7 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -73,6 +73,7 @@ Panel::Panel(Glib::ustring const &label, gchar const *prefs_path, _action_area(0), _fillable(0) { + set_name( "InkscapePanel" ); #if WITH_GTKMM_3_0 set_orientation( Gtk::ORIENTATION_VERTICAL ); #endif @@ -284,7 +285,10 @@ void Panel::_init() pack_start(_top_bar, false, false); Gtk::HBox* boxy = Gtk::manage(new Gtk::HBox()); - + boxy->set_name( "PanelBoxY" ); + _contents.set_name( "PanelContents" ); + _right_bar.set_name( "PanelRightBar" ); + _top_bar.set_name( "PanelTopBar" ); boxy->pack_start(_contents, true, true); boxy->pack_start(_right_bar, false, true); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index c3e0ae372..0cee426b6 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -366,7 +366,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->panels = new SwatchesPanel("/embedded/swatches" /*false*/); dtw->panels->setOrientation(SP_ANCHOR_SOUTH); - dtw->panels->set_name("SwatchesPanel"); #if GTK_CHECK_VERSION(3,0,0) dtw->panels->set_vexpand(false); #endif @@ -727,6 +726,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_grid_set_row_spacing(GTK_GRID(dtw->coord_status), 0); gtk_grid_set_column_spacing(GTK_GRID(dtw->coord_status), 2); GtkWidget* sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL); + gtk_widget_set_name(sep, "CoordinateSeparator"); gtk_grid_attach(GTK_GRID(dtw->coord_status), GTK_WIDGET(sep), 0, 0, 1, 2); -- cgit v1.2.3 From 0a5ca4a41841f4d42dc051255562724a3b64bf66 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Wed, 18 May 2016 15:35:03 +0200 Subject: GTK3: Another widget named. (bzr r14902) --- src/ui/dialog/color-item.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index 6603d5c69..34cdb92e3 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -571,6 +571,8 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS widget = lbl; } else { GtkWidget* eekWidget = eek_preview_new(); + gtk_widget_set_name( eekWidget, "ColorItemPreview" ); + EekPreview * preview = EEK_PREVIEW(eekWidget); Gtk::Widget* newBlot = Glib::wrap(eekWidget); _regenPreview(preview); -- cgit v1.2.3