From 577e007bb19822739a75702b7672cdd16cb86275 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sun, 31 Mar 2013 19:55:16 -0400 Subject: Fix copyright email for Martin Owens (bzr r12261) --- share/extensions/Barcode/Code128.py | 2 +- src/connector-context.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py index 3036b5f98..8734fc330 100644 --- a/share/extensions/Barcode/Code128.py +++ b/share/extensions/Barcode/Code128.py @@ -1,5 +1,5 @@ # -# Authored by Martin Owens +# Authored by Martin Owens # Debugged by Ralf Heinecke & Martin Siepmann 2007-09-07 # Horst Schottky 2010-02-27 # diff --git a/src/connector-context.cpp b/src/connector-context.cpp index 9631eecb1..9468894a0 100644 --- a/src/connector-context.cpp +++ b/src/connector-context.cpp @@ -5,7 +5,7 @@ * Michael Wybrow * Abhishek Sharma * Jon A. Cruz - * Martin Owens + * Martin Owens * * Copyright (C) 2005-2008 Michael Wybrow * Copyright (C) 2009 Monash University -- cgit v1.2.3 From a42a1dbbd2c131de7fc9481abc4f7f159b9dc8ac Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Tue, 2 Apr 2013 14:59:31 +0200 Subject: =?UTF-8?q?Translations.=20Latvian=20translation=20update=20by=20J?= =?UTF-8?q?=C4=81nis=20Eisaks.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (bzr r12262) --- po/lv.po | 280 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 138 insertions(+), 142 deletions(-) diff --git a/po/lv.po b/po/lv.po index 7e3e619e4..1f814ff13 100644 --- a/po/lv.po +++ b/po/lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Inkscape\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-03-28 20:28+0100\n" -"PO-Revision-Date: 2013-03-30 10:58+0300\n" +"PO-Revision-Date: 2013-03-30 22:52+0300\n" "Last-Translator: Jānis Eisaks \n" "Language-Team: Latvian\n" "Language: lv\n" @@ -3773,7 +3773,7 @@ msgstr "Raksta elementa klonu sākotnējā krāsa" #: ../src/ui/dialog/clonetiler.cpp:667 msgid "Initial color for clones (works only if the original has unset fill or stroke)" -msgstr "Klonu sākotnējā krāsa (darbojas tikai tad, ja oriģinālam nav iestatīts aizpildījums vai vilkums)" +msgstr "Klonu sākotnējā krāsa (darbojas tikai tad, ja oriģinālam nav iestatīts aizpildījums vai apmale)" #: ../src/ui/dialog/clonetiler.cpp:682 msgid "H:" @@ -3965,7 +3965,7 @@ msgstr "Katra klona izmērs ir noteikts atbilstoši izvēlētajai vērtībai ša #: ../src/ui/dialog/clonetiler.cpp:986 msgid "Each clone is painted by the picked color (the original must have unset fill or stroke)" -msgstr "Katrs klons ir izkrāsots izvēlētajā krāsā (darbojas tikai tad, ja oriģinālam nav iestatīts aizpildījums vai vilkums)" +msgstr "Katrs klons ir izkrāsots izvēlētajā krāsā (darbojas tikai tad, ja oriģinālam nav iestatīts aizpildījums vai apmale)" #: ../src/ui/dialog/clonetiler.cpp:996 msgid "Each clone's opacity is determined by the picked value in that point" @@ -5008,7 +5008,7 @@ msgstr "Atlaidiet peli, lai iestatītu krāsu." #: ../src/dropper-context.cpp:328 #: ../src/tools-switch.cpp:231 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 "Uzklikšķiniet, lai iestatītu aizpildījumu, Shift+klikšķis - lai iestatītu vilkumu; velciet, lai izlīdzinātu laukuma krāsu; ar Alt izvēlieties pretējo krāsu; ar Ctrl+C nokopējiet krāsu zem peles kursora uz starpliktuvi" +msgstr "Uzklikšķiniet, lai iestatītu aizpildījumu, Shift+klikšķis - lai iestatītu apmali; velciet, lai izlīdzinātu laukuma krāsu; ar Alt izvēlieties pretējo krāsu; ar Ctrl+C nokopējiet krāsu zem peles kursora uz starpliktuvi" #: ../src/dropper-context.cpp:376 msgid "Set picked color" @@ -5032,19 +5032,19 @@ msgstr "Vektorizē vadlīnijas ceļu" #: ../src/dyna-draw-context.cpp:731 msgid "Drawing a calligraphic stroke" -msgstr "Zīmē kaligrāfisku vilkumu" +msgstr "Zīmē kaligrāfisku apmali" #: ../src/dyna-draw-context.cpp:1020 msgid "Draw calligraphic stroke" -msgstr "Zīmēt kaligrāfisku vilkumu" +msgstr "Zīmēt kaligrāfisku apmali" #: ../src/eraser-context.cpp:504 msgid "Drawing an eraser stroke" -msgstr "Zīme dzēšgumijas vilkumu" +msgstr "Zīmē dzēšgumijas līniju" #: ../src/eraser-context.cpp:810 msgid "Draw eraser stroke" -msgstr "Zīmēt dzēšgumijas vilkumu" +msgstr "Zīmēt dzēšgumijas līniju" #: ../src/event-context.cpp:671 msgid "Space+mouse move to pan canvas" @@ -6975,7 +6975,7 @@ msgstr "" #: ../src/ui/widget/selected-style.cpp:128 #: ../src/ui/widget/style-swatch.cpp:127 msgid "Stroke:" -msgstr "Vilkums:" +msgstr "Apmale:" #: ../src/extension/internal/filter/distort.h:79 #: ../src/extension/internal/filter/textures.h:76 @@ -7217,7 +7217,7 @@ msgstr "Aizpildījuma necaurspīdība:" #: ../src/extension/internal/filter/morphology.h:196 msgid "Stroke opacity:" -msgstr "Vilkuma necaurspīdība:" +msgstr "Apmales necaurspīdība:" #: ../src/extension/internal/filter/morphology.h:206 msgid "Adds a colorizable outline" @@ -7367,7 +7367,7 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:354 msgid "Stroke color" -msgstr "Vilkuma krāsa:" +msgstr "Apmales krāsa:" #: ../src/extension/internal/filter/paint.h:355 msgid "Image on stroke" @@ -7600,7 +7600,7 @@ msgstr "Izvēles" #: ../src/extension/internal/filter/textures.h:83 msgid "Custom stroke options" -msgstr "Pielāgotas vilkuma iespejas" +msgstr "Pielāgotas apmales iespējas" #: ../src/extension/internal/filter/textures.h:84 msgid "k1:" @@ -8252,7 +8252,7 @@ msgstr "Aizpildījuma krāsa" #: ../src/filter-enums.cpp:45 msgid "Stroke Paint" -msgstr "Vilkuma krāsa" +msgstr "Apmales krāsa" #: ../src/filter-enums.cpp:61 msgid "Matrix" @@ -8610,7 +8610,7 @@ msgstr "%s %d objektam: %s%s; velciet ar Ctrl, lai piesaistītu novirzei; #: ../src/gradient-drag.cpp:1427 #: ../src/gradient-drag.cpp:1434 msgid " (stroke)" -msgstr "(vilkums)" +msgstr "(apmale)" #: ../src/gradient-drag.cpp:1431 #, c-format @@ -8985,7 +8985,7 @@ msgstr "Atlasīt vienādos" #. Select same fill and stroke #: ../src/interface.cpp:1767 msgid "Fill and Stroke" -msgstr "Aizpildījums un vilkums" +msgstr "Aizpildījums un apmale" #. Select same fill color #: ../src/interface.cpp:1774 @@ -8995,12 +8995,12 @@ msgstr "Aizpildījuma krāsa" #. Select same stroke color #: ../src/interface.cpp:1781 msgid "Stroke Color" -msgstr "Vilkuma krāsa" +msgstr "Apmales krāsa" #. Select same stroke style #: ../src/interface.cpp:1788 msgid "Stroke Style" -msgstr "Vilkuma stils" +msgstr "Apmales stils" #. Select same stroke style #: ../src/interface.cpp:1795 @@ -9105,7 +9105,7 @@ msgstr "Ekstraģēt attēlu..." #: ../src/interface.cpp:2255 #: ../src/verbs.cpp:2748 msgid "_Fill and Stroke..." -msgstr "_Aizpildījums un vilkums..." +msgstr "_Aizpildījums un apmale..." #. Edit Text dialog #: ../src/interface.cpp:2261 @@ -9545,7 +9545,7 @@ msgstr "Riņķis pēc trim punktiem" #: ../src/live_effects/effect.cpp:92 msgid "Dynamic stroke" -msgstr "Dinamiskais vilkums" +msgstr "Dinamiskā apmale" #: ../src/live_effects/effect.cpp:93 #: ../share/extensions/extrude.inx.h:1 @@ -9906,23 +9906,23 @@ msgstr "V_ilkuma platuma vienībās" #: ../src/live_effects/lpe-knot.cpp:348 msgid "Consider 'Interruption width' as a ratio of stroke width" -msgstr "Noteikt 'Pārtraukuma lielumu' kā vilkuma platuma attiecību" +msgstr "Noteikt 'Pārtraukuma lielumu' kā apmales platuma attiecību" #: ../src/live_effects/lpe-knot.cpp:349 msgid "St_roke width" -msgstr "Vilkuma platums" +msgstr "Apmales platums" #: ../src/live_effects/lpe-knot.cpp:349 msgid "Add the stroke width to the interruption size" -msgstr "Pievienot vilkuma platumu pārtraukuma lielumam" +msgstr "Pievienot apmales platumu pārtraukuma lielumam" #: ../src/live_effects/lpe-knot.cpp:350 msgid "_Crossing path stroke width" -msgstr "Krustojošos _ceļu vilkuma platums" +msgstr "Krustojošos _ceļu apmales platums" #: ../src/live_effects/lpe-knot.cpp:350 msgid "Add crossed stroke width to the interruption size" -msgstr "Pievienot krustotā vilkuma platumu pārtraukuma lielumam" +msgstr "Pievienot krustotās apmales platumu pārtraukuma lielumam" #: ../src/live_effects/lpe-knot.cpp:351 msgid "S_witcher size:" @@ -10119,7 +10119,7 @@ msgstr "Interpolēšanas tips:" #: ../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 "Nosaka interpolatora veidu, kas tiks izmantots vilkuma platuma interpolācijai gar ceļu" +msgstr "Nosaka interpolatora veidu, kas tiks izmantots apmales platuma interpolācijai gar ceļu" #: ../src/live_effects/lpe-powerstroke.cpp:236 msgid "Sets the smoothness for the CubicBezierJohan interpolator; 0 = linear interpolation, 1 = smooth" @@ -10181,7 +10181,7 @@ msgstr "Attāluma pieaugums starp svītrojumiem." #. FIXME: top/bottom names are inverted in the UI/svg and in the code!! #: ../src/live_effects/lpe-rough-hatches.cpp:228 msgid "Half-turns smoothness: 1st side, in:" -msgstr "" +msgstr "Pupagriezienu gludums: 1 mala:" #: ../src/live_effects/lpe-rough-hatches.cpp:228 msgid "Set smoothness/sharpness of path when reaching a 'bottom' half-turn. 0=sharp, 1=default" @@ -10260,7 +10260,7 @@ msgstr "Izveido treknu/tievu ceļu" #: ../src/live_effects/lpe-rough-hatches.cpp:239 msgid "Simulate a stroke of varying width" -msgstr "Atdarina mainīga biezuma vilkumu" +msgstr "Atdarina mainīga biezuma apmali" #: ../src/live_effects/lpe-rough-hatches.cpp:240 msgid "Bend hatches" @@ -10272,11 +10272,11 @@ msgstr "Pievienot globālu svītrojumu liekšanu (lēnāks)" #: ../src/live_effects/lpe-rough-hatches.cpp:241 msgid "Thickness: at 1st side:" -msgstr "" +msgstr "Biezums: pie pirmās malas:" #: ../src/live_effects/lpe-rough-hatches.cpp:241 msgid "Width at 'bottom' half-turns" -msgstr "" +msgstr "'Apakšējo' puspagriezienu platums" #: ../src/live_effects/lpe-rough-hatches.cpp:242 msgid "at 2nd side:" @@ -10284,7 +10284,7 @@ msgstr "pie otrās malas:" #: ../src/live_effects/lpe-rough-hatches.cpp:242 msgid "Width at 'top' half-turns" -msgstr "" +msgstr "'Augšējo' puspagriezienu platums" #. #: ../src/live_effects/lpe-rough-hatches.cpp:244 @@ -10423,27 +10423,27 @@ msgstr "Izvēlieties, vai rādīt aizzīmes ceļa sākuma un beigās" #. testpointA(_("Test Point A"), _("Test A"), "ptA", &wr, this, Geom::Point(100,100)), #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Strokes:" -msgstr "Vilkumi:" +msgstr "Apmales:" #: ../src/live_effects/lpe-sketch.cpp:38 msgid "Draw that many approximating strokes" -msgstr "Zīmēt norādīto skaitu tuvinošos vilkumu" +msgstr "Zīmēt norādīto skaitu tuvinošos apmaļu" #: ../src/live_effects/lpe-sketch.cpp:39 msgid "Max stroke length:" -msgstr "Maks. vilkuma garums:" +msgstr "Maks. apmales garums:" #: ../src/live_effects/lpe-sketch.cpp:40 msgid "Maximum length of approximating strokes" -msgstr "Tuvinošos vilkumu maksimālais garums" +msgstr "Tuvinošos apmaļu maksimālais garums" #: ../src/live_effects/lpe-sketch.cpp:41 msgid "Stroke length variation:" -msgstr "Vilkuma garuma variācija:" +msgstr "Apmales garuma variācija:" #: ../src/live_effects/lpe-sketch.cpp:42 msgid "Random variation of stroke length (relative to maximum length)" -msgstr "Vilkuma garuma dažādošana (attiecībā pret maksimālo garumu)" +msgstr "Apmales garuma dažādošana (attiecībā pret maksimālo garumu)" #: ../src/live_effects/lpe-sketch.cpp:43 msgid "Max. overlap:" @@ -10451,7 +10451,7 @@ msgstr "Maks. pārklāšanās:" #: ../src/live_effects/lpe-sketch.cpp:44 msgid "How much successive strokes should overlap (relative to maximum length)" -msgstr "Cik daudziem secīgiem vilkumiem jāpārklājas (attiecībā pret maksimālo garumu)" +msgstr "Cik daudziem secīgām apmalēm jāpārklājas (attiecībā pret maksimālo garumu)" #: ../src/live_effects/lpe-sketch.cpp:45 msgid "Overlap variation:" @@ -10475,7 +10475,7 @@ msgstr "Vidējā nobīde:" #: ../src/live_effects/lpe-sketch.cpp:50 msgid "Average distance each stroke is away from the original path" -msgstr "Aptuvenais katra vilkuma attālums no sākotnējā ceļa" +msgstr "Aptuvenais katras apmales attālums no sākotnējā ceļa" #: ../src/live_effects/lpe-sketch.cpp:51 msgid "Max. tremble:" @@ -10491,7 +10491,7 @@ msgstr "Plīvošanas biežums:" #: ../src/live_effects/lpe-sketch.cpp:54 msgid "Average number of tremble periods in a stroke" -msgstr "Vidējais trīcēšanas periodu skaits vilkumā" +msgstr "Vidējais trīcēšanas periodu skaits apmalē" #: ../src/live_effects/lpe-sketch.cpp:56 msgid "Construction lines:" @@ -12608,7 +12608,7 @@ msgstr "Atlasiet tieši 2 ceļus, lai veiktu atņemsanu, dalīšanu vai c #: ../src/splivarot.cpp:149 #: ../src/splivarot.cpp:164 msgid "Unable to determine the z-order of the objects selected for difference, XOR, division, or path cut." -msgstr "" +msgstr "Nav iespējams noteikt kārtību uz z-ass objektiem, kas atlasīti atņemšanai, XOR, dalīšanai vai ceļa griešanai." #: ../src/splivarot.cpp:194 msgid "One of the objects is not a path, cannot perform boolean operation." @@ -12616,11 +12616,11 @@ msgstr "Viens no objektiem nav ceļš, nav iespējams izpildīt Bula darb #: ../src/splivarot.cpp:913 msgid "Select stroked path(s) to convert stroke to path." -msgstr "Atlasiet vilkuma ceļu(s), lai pārveidotu vilkumu par ceļu." +msgstr "Atlasiet apmales ceļu(s), lai pārveidotu apmali par ceļu." #: ../src/splivarot.cpp:1266 msgid "Convert stroke to path" -msgstr "Pārvērst vilkumu par ceļu" +msgstr "Pārvērst apmali par ceļu" #. TRANSLATORS: "to outline" means "to convert stroke to path" #: ../src/splivarot.cpp:1269 @@ -12996,7 +12996,7 @@ msgstr "Uzklikšķiniet vai uzklikšķiniet un velciet, lai sāktu #: ../src/tools-switch.cpp:195 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 "Velciet, lai izveidotu kaligrāfisku vilkumu; ar Ctrl - sekot palīglīnijas ceļam. Ar bultiņām pieskaņojiet platumu (kreisā/labā) un leņķi (augšup/lejup)." +msgstr "Velciet, lai izveidotu kaligrāfisku apmali; ar Ctrl - sekot palīglīnijas ceļam. Ar bultiņām pieskaņojiet platumu (kreisā/labā) un leņķi (augšup/lejup)." #: ../src/tools-switch.cpp:207 msgid "Drag or double click to create a gradient on selected objects, drag handles to adjust gradients." @@ -13093,7 +13093,7 @@ msgstr "" #: ../src/tweak-context.cpp:195 #, c-format msgid "%s. Drag or click to move randomly." -msgstr "" +msgstr "%s. Velciet vai uzklikšķiniet, lai move randomly." #: ../src/tweak-context.cpp:199 #, c-format @@ -13113,7 +13113,7 @@ msgstr "%s. Velciet vai uzklikšķiniet, lai dublētu; ar Shift - dzē #: ../src/tweak-context.cpp:211 #, c-format msgid "%s. Drag to push paths." -msgstr "" +msgstr "%s. Velciet lai stumtu ceļus." #: ../src/tweak-context.cpp:215 #, c-format @@ -13123,7 +13123,7 @@ msgstr "%s.Velciet vai uzklikšķiniet, lai saīsinātu ceļus; ar shift #: ../src/tweak-context.cpp:223 #, c-format msgid "%s. Drag or click to attract paths; with Shift to repel." -msgstr "" +msgstr "%s. Velciet vai uzklikšķiniet lai pievilktu ceļus; ar Shift - lai atgrūstu." #: ../src/tweak-context.cpp:231 #, c-format @@ -13564,7 +13564,7 @@ msgstr "Pievienot profilu" #: ../src/ui/dialog/color-item.cpp:122 #, c-format msgid "Color: %s; Click to set fill, Shift+click to set stroke" -msgstr "Krāsa: %s; Uzklikšķiniet, lai iestatītu aizpildījumu, Shift+klikšķis - lai iestatītu vilkumu" +msgstr "Krāsa: %s; Uzklikšķiniet, lai iestatītu aizpildījumu, Shift+klikšķis - lai iestatītu apmali" #: ../src/ui/dialog/color-item.cpp:504 msgid "Change color definition" @@ -13572,7 +13572,7 @@ msgstr "Mainiet krāsas definīciju" #: ../src/ui/dialog/color-item.cpp:678 msgid "Remove stroke color" -msgstr "Aizvākt vilkuma krāsu" +msgstr "Aizvākt apmales krāsu" #: ../src/ui/dialog/color-item.cpp:678 msgid "Remove fill color" @@ -13580,7 +13580,7 @@ msgstr "Aizvākt aizpildījuma krāsu" #: ../src/ui/dialog/color-item.cpp:683 msgid "Set stroke color to none" -msgstr "Iestatīt vilkuma krāsu par nekādu" +msgstr "Iestatīt apmales krāsu par nekādu" #: ../src/ui/dialog/color-item.cpp:683 msgid "Set fill color to none" @@ -13588,7 +13588,7 @@ msgstr "Iestatīt aizpildījuma krāsu par nekādu" #: ../src/ui/dialog/color-item.cpp:699 msgid "Set stroke color from swatch" -msgstr "Iestatiet vilkuma krāsu no paletes" +msgstr "Iestatiet apmales krāsu no paletes" #: ../src/ui/dialog/color-item.cpp:699 msgid "Set fill color from swatch" @@ -14226,11 +14226,11 @@ msgstr "_Aizpildīt" #: ../src/ui/dialog/fill-and-stroke.cpp:63 msgid "Stroke _paint" -msgstr "Vilkuma krāsa" +msgstr "Apmales krāsa" #: ../src/ui/dialog/fill-and-stroke.cpp:64 msgid "Stroke st_yle" -msgstr "Vilkuma st_ils" +msgstr "Apmales st_ils" #. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor #: ../src/ui/dialog/filter-effects-dialog.cpp:515 @@ -14672,9 +14672,8 @@ msgstr "Pievienot filtra primitīvu" # http://www.w3.org/TR/SVG/intro.html#TermFilterPrimitiveElement # A filter primitive element is one that can be used as a child of a ‘filter’ element to specify a node in the filter graph. #: ../src/ui/dialog/filter-effects-dialog.cpp:2723 -#, fuzzy msgid "The feBlend filter primitive provides 4 image blending modes: screen, multiply, darken and lighten." -msgstr "feBlend filtra primitīvs nodrošina 4 attēlu sajaukšanas veidus: screen, pavairot, padarīt tumšāku un padarīt gaišāku." +msgstr "feBlend filtra primitīvs nodrošina 4 attēlu sajaukšanas veidus: uz ekrāna, pavairot, padarīt tumšāku un padarīt gaišāku." #: ../src/ui/dialog/filter-effects-dialog.cpp:2727 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." @@ -14712,7 +14711,7 @@ msgstr "feGaussianBlur filtrs vienādā mērā izpludina sākotnējo obje #: ../src/ui/dialog/filter-effects-dialog.cpp:2759 msgid "The feImage filter primitive fills the region with an external image or another part of the document." -msgstr "" +msgstr "feImage filtra primitīvs aizpilda apgabalu ar ārējā attēla vai citu dokumenta daļu kopijām." #: ../src/ui/dialog/filter-effects-dialog.cpp:2763 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." @@ -14732,7 +14731,7 @@ msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:2779 msgid "The feTile filter primitive tiles a region with its input graphic" -msgstr "" +msgstr "feTile filtra primitīvs aizpilda apgabalu ar ievadītās grafikas kopijām." #: ../src/ui/dialog/filter-effects-dialog.cpp:2783 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." @@ -15077,9 +15076,8 @@ msgid "Don't show this warning again" msgstr "Nerādīt atkārtoti šo brīdinājumu" #: ../src/ui/dialog/font-substitution.cpp:239 -#, fuzzy msgid "Font '%1' substituted with '%2'" -msgstr "Fontu aizvietojums" +msgstr "Fonts '%1' aizvietots ar '%2'" #: ../src/ui/dialog/glyphs.cpp:60 #: ../src/ui/dialog/glyphs.cpp:152 @@ -15692,7 +15690,7 @@ msgstr "Bopomofo paplašinātais" #: ../src/ui/dialog/glyphs.cpp:258 msgid "CJK Strokes" -msgstr "CJK izvilkumi" +msgstr "CJK apmales" #: ../src/ui/dialog/glyphs.cpp:259 msgid "Katakana Phonetic Extensions" @@ -15959,11 +15957,11 @@ msgstr "Ctrl-klikšķis, lai iestatītu punkta izmēru:" #: ../src/ui/dialog/inkscape-preferences.cpp:202 msgid "times current stroke width" -msgstr "reiz pašreizējā vilkuma platums" +msgstr "reiz pašreizējās apmales platums" #: ../src/ui/dialog/inkscape-preferences.cpp:203 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" -msgstr "Ar Ctrl+klikšķis izveidoto punktu lielums (attiecībā pret pašreizējo vilkuma platumu)" +msgstr "Ar Ctrl+klikšķis izveidoto punktu lielums (attiecībā pret pašreizējo apmales platumu)" #: ../src/ui/dialog/inkscape-preferences.cpp:218 msgid "No objects selected to take the style from." @@ -16020,7 +16018,7 @@ msgstr "Redzams robežrāmis" #: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This bounding box includes stroke width, markers, filter margins, etc." -msgstr "Robežrāmis ietver vilkuma platumu, marķierus, filtru malas utt." +msgstr "Robežrāmis ietver apmales platumu, marķierus, filtru malas utt." #: ../src/ui/dialog/inkscape-preferences.cpp:301 msgid "Geometric bounding box" @@ -16351,7 +16349,7 @@ msgstr "Lieto vēsturisko krāsu pāreju redaktoru" #: ../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 "Ja ieslēgts, poga Labot krāsu pāreju dialoglodziņā Aizpildījums & Vilkums atvērs Krāsu pārejas redaktora dialoglodziņu, ja izslēgts - tiks izmantots Krāsu pāreju rīks" +msgstr "Ja ieslēgts, poga Labot krāsu pāreju dialoglodziņā Aizpildījums & Apmale atvērs Krāsu pārejas redaktora dialoglodziņu, ja izslēgts - tiks izmantots Krāsu pāreju rīks" #: ../src/ui/dialog/inkscape-preferences.cpp:488 msgid "Linear gradient _angle:" @@ -16769,7 +16767,7 @@ msgstr "Pārslēdzēja stils (nepieciešams restarts)" #: ../src/ui/dialog/inkscape-preferences.cpp:619 msgid "Selects whether the dockbar switcher will show text labels, icons, or both" -msgstr "" +msgstr "Nosaka, vai dokjoslas pārslēdzējs rādīt teksta iezīmes, ikonas vai abus." #. Windows #: ../src/ui/dialog/inkscape-preferences.cpp:623 @@ -17543,7 +17541,7 @@ msgstr "Izvēlas" #: ../src/ui/dialog/inkscape-preferences.cpp:1156 #: ../src/widgets/select-toolbar.cpp:572 msgid "Scale stroke width" -msgstr "Mainīt vilkuma platumu" +msgstr "Mainīt apmales platumu" #: ../src/ui/dialog/inkscape-preferences.cpp:1157 msgid "Scale rounded corners in rectangles" @@ -17568,7 +17566,7 @@ msgstr "Saglabāts" #: ../src/ui/dialog/inkscape-preferences.cpp:1164 #: ../src/widgets/select-toolbar.cpp:573 msgid "When scaling objects, scale the stroke width by the same proportion" -msgstr "Mērogojot objektus, proporcionāli mērogot arī vilkuma platumu" +msgstr "Mērogojot objektus, proporcionāli mērogot arī apmales platumu" #: ../src/ui/dialog/inkscape-preferences.cpp:1166 #: ../src/widgets/select-toolbar.cpp:584 @@ -17578,12 +17576,12 @@ msgstr "Mērogojot taisnstūrus, mērogot arī noapaļoto stūru rādiusus" #: ../src/ui/dialog/inkscape-preferences.cpp:1168 #: ../src/widgets/select-toolbar.cpp:595 msgid "Move gradients (in fill or stroke) along with the objects" -msgstr "Pārvietot krāsu pārejas (aizpildījumā vai vilkumā) kopā ar objektiem" +msgstr "Pārvietot krāsu pārejas (aizpildījumā vai apmalē) kopā ar objektiem" #: ../src/ui/dialog/inkscape-preferences.cpp:1170 #: ../src/widgets/select-toolbar.cpp:606 msgid "Move patterns (in fill or stroke) along with the objects" -msgstr "Pārvietot faktūras (aizpildījumā vai vilkumā) kopā ar objektiem" +msgstr "Pārvietot faktūras (aizpildījumā vai apmalē) kopā ar objektiem" #: ../src/ui/dialog/inkscape-preferences.cpp:1171 msgid "Store transformation" @@ -17908,12 +17906,12 @@ msgstr "Izgriešanas ceļi un maskas" #: ../src/ui/dialog/inkscape-preferences.cpp:1326 msgid "Stroke Style Markers" -msgstr "Vilkuma stilu marķieri" +msgstr "Apmaļu stilu marķieri" #: ../src/ui/dialog/inkscape-preferences.cpp:1328 #: ../src/ui/dialog/inkscape-preferences.cpp:1330 msgid "Stroke color same as object, fill color either object fill color or marker fill color" -msgstr "Vilkuma krāsa tāda pati, kā objekta, aizpildījuma krāsa - vai nu objekta aizpildījuma krāsa vai marķiera aizpildījuma krāsa" +msgstr "Apmales krāsa tāda pati, kā objektam, aizpildījuma krāsa - vai nu objekta aizpildījuma krāsa vai marķiera aizpildījuma krāsa" #: ../src/ui/dialog/inkscape-preferences.cpp:1334 msgid "Markers" @@ -19078,7 +19076,7 @@ msgstr "Iestatīt aizpildījumu" #. TRANSLATORS: An item in context menu on a colour in the swatches #: ../src/ui/dialog/swatches.cpp:266 msgid "Set stroke" -msgstr "Iestatīt vilkumu" +msgstr "Iestatīt apmali" #: ../src/ui/dialog/swatches.cpp:287 msgid "Edit..." @@ -20279,7 +20277,7 @@ msgstr "Bez aizpildījuma" #: ../src/ui/widget/style-swatch.cpp:321 msgctxt "Fill and stroke" msgid "No stroke" -msgstr "Nav vilkuma" +msgstr "Nav apmales" #: ../src/ui/widget/selected-style.cpp:184 #: ../src/ui/widget/style-swatch.cpp:300 @@ -20295,7 +20293,7 @@ msgstr "Aizpildījums ar faktūru" #: ../src/ui/widget/selected-style.cpp:187 #: ../src/ui/widget/style-swatch.cpp:302 msgid "Pattern stroke" -msgstr "Faktūras vilkums" +msgstr "Faktūras apmale" #: ../src/ui/widget/selected-style.cpp:189 msgid "L" @@ -20309,7 +20307,7 @@ msgstr "Lineārs krāsu pārejas aizpildījums" #: ../src/ui/widget/selected-style.cpp:192 #: ../src/ui/widget/style-swatch.cpp:294 msgid "Linear gradient stroke" -msgstr "Lineārs krāsu pārejas vilkums" +msgstr "Lineāra krāsu pārejas apmale" #: ../src/ui/widget/selected-style.cpp:199 msgid "R" @@ -20323,7 +20321,7 @@ msgstr "Radiāls krāsu pārejas aizpildījums" #: ../src/ui/widget/selected-style.cpp:202 #: ../src/ui/widget/style-swatch.cpp:298 msgid "Radial gradient stroke" -msgstr "Radiāls krāsu pārejas vilkums" +msgstr "Radiāla krāsu pārejas apmale" #: ../src/ui/widget/selected-style.cpp:209 msgid "Different" @@ -20335,7 +20333,7 @@ msgstr "Atšķirīgi aizpildījumi" #: ../src/ui/widget/selected-style.cpp:212 msgid "Different strokes" -msgstr "Atšķirīgi vilkumi" +msgstr "Atšķirīgas apmales" #: ../src/ui/widget/selected-style.cpp:214 #: ../src/ui/widget/style-swatch.cpp:324 @@ -20357,7 +20355,7 @@ msgstr "Atiestatīt aizpildījumu" #: ../src/ui/widget/style-swatch.cpp:326 #: ../src/widgets/fill-style.cpp:708 msgid "Unset stroke" -msgstr "Atiestatīt vilkumu" +msgstr "Atiestatīt apmali" #: ../src/ui/widget/selected-style.cpp:220 msgid "Flat color fill" @@ -20365,7 +20363,7 @@ msgstr "Aizpildījums ar vienlaidu krāsu" #: ../src/ui/widget/selected-style.cpp:220 msgid "Flat color stroke" -msgstr "Vilkums ar vienlaidu krāsu" +msgstr "Apmale ar vienlaidu krāsu" #. TRANSLATOR COMMENT: A means "Averaged" #: ../src/ui/widget/selected-style.cpp:223 @@ -20378,7 +20376,7 @@ msgstr "Aizpildījums ir izlīdzināts starp atlasītajiem objektiem" #: ../src/ui/widget/selected-style.cpp:226 msgid "Stroke is averaged over selected objects" -msgstr "Vilkums ir izlīdzināts starp atlasītajiem objektiem" +msgstr "Apmale ir izlīdzināta starp atlasītajiem objektiem" #. TRANSLATOR COMMENT: M means "Multiple" #: ../src/ui/widget/selected-style.cpp:229 @@ -20391,7 +20389,7 @@ msgstr "Vairākiem atlasītajiem objektiem ir vienāds aizpildījums" #: ../src/ui/widget/selected-style.cpp:232 msgid "Multiple selected objects have the same stroke" -msgstr "Vairākiem atlasītajiem objektiem ir vienāds vilkums" +msgstr "Vairākiem atlasītajiem objektiem ir viena un tā pati apmale" #: ../src/ui/widget/selected-style.cpp:234 msgid "Edit fill..." @@ -20399,7 +20397,7 @@ msgstr "Labot aizpildījumu..." #: ../src/ui/widget/selected-style.cpp:234 msgid "Edit stroke..." -msgstr "Labot vilkumu..." +msgstr "Labot apmali..." #: ../src/ui/widget/selected-style.cpp:238 msgid "Last set color" @@ -20420,7 +20418,7 @@ msgstr "Ielīmēt krāsu" #: ../src/ui/widget/selected-style.cpp:266 #: ../src/ui/widget/selected-style.cpp:847 msgid "Swap fill and stroke" -msgstr "Apmainīt aizpildījumu un vilkumu" +msgstr "Apmainīt aizpildījumu un apmali" #: ../src/ui/widget/selected-style.cpp:270 #: ../src/ui/widget/selected-style.cpp:579 @@ -20430,7 +20428,7 @@ msgstr "Padarīt aizpildījumu necaurspīdīgu" #: ../src/ui/widget/selected-style.cpp:270 msgid "Make stroke opaque" -msgstr "Padarīt vilkumu necaurspīdīgu" +msgstr "Padarīt apmali necaurspīdīgu" #: ../src/ui/widget/selected-style.cpp:279 #: ../src/ui/widget/selected-style.cpp:536 @@ -20442,7 +20440,7 @@ msgstr "Aizvākt aizpildījumu" #: ../src/ui/widget/selected-style.cpp:545 #: ../src/widgets/fill-style.cpp:506 msgid "Remove stroke" -msgstr "Aizvākt vilkumu" +msgstr "Aizvākt apmali" #: ../src/ui/widget/selected-style.cpp:600 msgid "Apply last set color to fill" @@ -20450,7 +20448,7 @@ msgstr "Pielietot aizpildījumam pēdējo iestatīto krāsu" #: ../src/ui/widget/selected-style.cpp:612 msgid "Apply last set color to stroke" -msgstr "Pielietot vilkumam pēdējo iestatīto krāsu" +msgstr "Pielietot apmalei pēdējo iestatīto krāsu" #: ../src/ui/widget/selected-style.cpp:623 msgid "Apply last selected color to fill" @@ -20458,7 +20456,7 @@ msgstr "Pielietot aizpildījumam pēdējo izvēlēto krāsu" #: ../src/ui/widget/selected-style.cpp:634 msgid "Apply last selected color to stroke" -msgstr "Pielietot vilkumam pēdējo izvēlēto krāsu" +msgstr "Pielietot apmalei pēdējo izvēlēto krāsu" #: ../src/ui/widget/selected-style.cpp:660 msgid "Invert fill" @@ -20466,7 +20464,7 @@ msgstr "Invertēt aizpildījumu" #: ../src/ui/widget/selected-style.cpp:684 msgid "Invert stroke" -msgstr "Invertēt vilkumu" +msgstr "Invertēt apmali" #: ../src/ui/widget/selected-style.cpp:696 msgid "White fill" @@ -20474,7 +20472,7 @@ msgstr "Aizpildīt ar baltu" #: ../src/ui/widget/selected-style.cpp:708 msgid "White stroke" -msgstr "Baltais vilkums" +msgstr "Baltā apmale" #: ../src/ui/widget/selected-style.cpp:720 msgid "Black fill" @@ -20482,7 +20480,7 @@ msgstr "Melnais aizpildījums" #: ../src/ui/widget/selected-style.cpp:732 msgid "Black stroke" -msgstr "Melnais vilkums" +msgstr "Melnā apmale" #: ../src/ui/widget/selected-style.cpp:775 msgid "Paste fill" @@ -20490,11 +20488,11 @@ msgstr "Ielīmēt aizpildījumu" #: ../src/ui/widget/selected-style.cpp:793 msgid "Paste stroke" -msgstr "Ielīmēt vilkumu" +msgstr "Ielīmēt apmali" #: ../src/ui/widget/selected-style.cpp:949 msgid "Change stroke width" -msgstr "Mainīt vilkuma platumu" +msgstr "Mainīt apmales platumu" #: ../src/ui/widget/selected-style.cpp:1044 msgid ", drag to adjust" @@ -20503,7 +20501,7 @@ msgstr ", vilkt, lai pieskaņotu" #: ../src/ui/widget/selected-style.cpp:1129 #, c-format msgid "Stroke width: %.5g%s%s" -msgstr "Vilkuma platums: %.5g%s%s" +msgstr "Apmales platums: %.5g%s%s" #: ../src/ui/widget/selected-style.cpp:1133 msgid " (averaged)" @@ -20556,12 +20554,12 @@ msgstr "Pieskaņo toni: bija %.3g, tagad %.3g (starpība %.3g); ar #: ../src/ui/widget/selected-style.cpp:1492 #: ../src/ui/widget/selected-style.cpp:1506 msgid "Adjust stroke width" -msgstr "Pielāgot vilkuma platumu" +msgstr "Pielāgot apmales platumu" #: ../src/ui/widget/selected-style.cpp:1493 #, c-format msgid "Adjusting stroke width: was %.3g, now %.3g (diff %.3g)" -msgstr "Pieskaņo vilkuma platumu: bija %.3g, tagad %.3g (starpība %.3g)" +msgstr "Pieskaņo apmales platumu: bija %.3g, tagad %.3g (starpība %.3g)" #. TRANSLATORS: "Link" means to _link_ two sliders together #: ../src/ui/widget/spin-slider.cpp:156 @@ -20585,12 +20583,12 @@ msgstr "Aizpildījums: %06x/%.3g" #: ../src/ui/widget/style-swatch.cpp:314 #, c-format msgid "Stroke: %06x/%.3g" -msgstr "Vilkums: %06x/%.3g" +msgstr "Apmale: %06x/%.3g" #: ../src/ui/widget/style-swatch.cpp:346 #, c-format msgid "Stroke width: %.5g%s" -msgstr "Vilkuma platums: %.5g%s" +msgstr "Apmales platums: %.5g%s" #: ../src/ui/widget/style-swatch.cpp:362 #, c-format @@ -21214,11 +21212,11 @@ msgstr "Izvēlēties visus objektus visos redzamajos un atvērtajos slāņos" #: ../src/verbs.cpp:2388 msgid "Fill _and Stroke" -msgstr "Aizpildījums un vilkums" +msgstr "Aizpildījums un apmale" #: ../src/verbs.cpp:2389 msgid "Select all objects with the same fill and stroke as the selected objects" -msgstr "Atlasīt visus objektus ar līdzīgu aizpildījumu un vilkuma platumu, kā jau atlasītajiem" +msgstr "Atlasīt visus objektus ar līdzīgu aizpildījumu un apmales platumu, kā jau atlasītajiem" #: ../src/verbs.cpp:2390 msgid "_Fill Color" @@ -21230,19 +21228,19 @@ msgstr "Atlasīt visus objektus ar līdzīgu aizpildījumu, kā jau atlasītajie #: ../src/verbs.cpp:2392 msgid "_Stroke Color" -msgstr "_Vilkuma krāsa" +msgstr "_Apmales krāsa" #: ../src/verbs.cpp:2393 msgid "Select all objects with the same stroke as the selected objects" -msgstr "Atlasīt visus objektus ar līdzīgu vilkuma platumu, kā jau atlasītajiem" +msgstr "Atlasīt visus objektus ar līdzīgu apmales platumu, kā jau atlasītajiem" #: ../src/verbs.cpp:2394 msgid "Stroke St_yle" -msgstr "Vilkuma sti_ls" +msgstr "Apmales sti_ls" #: ../src/verbs.cpp:2395 msgid "Select all objects with the same stroke style (width, dash, markers) as the selected objects" -msgstr "Atlasīt visus objektus ar līdzīgu vilkuma stilu (platums, dalījumu, marķieri), kā jau atlasītajiem" +msgstr "Atlasīt visus objektus ar līdzīgu apmales stilu (platums, dalījumu, marķieri), kā jau atlasītajiem" #: ../src/verbs.cpp:2396 msgid "_Object Type" @@ -21416,7 +21414,7 @@ msgstr "Pārgriezt _ceļu" #: ../src/verbs.cpp:2451 msgid "Cut the bottom path's stroke into pieces, removing fill" -msgstr "Pārgriezt apakšējā ceļa vilkumu, aizvācot aizpildījumu" +msgstr "Sagriezt apakšējā ceļa apmali posmos, aizvācot aizpildījumu" #. TRANSLATORS: "outset": expand a shape by offsetting the object's path, #. i.e. by displacing it perpendicular to the path in each point. @@ -21494,7 +21492,7 @@ msgstr "Vilku_mu par ceļu" #: ../src/verbs.cpp:2481 msgid "Convert selected object's stroke to paths" -msgstr "Pārvērst atlasītā objekta vilkumu ceļos" +msgstr "Pārvērst atlasītā objekta apmali ceļos" #: ../src/verbs.cpp:2482 msgid "Si_mplify" @@ -21928,7 +21926,7 @@ msgstr "Kaligrāfija" #: ../src/verbs.cpp:2605 msgid "Draw calligraphic or brush strokes" -msgstr "Zīmējiet kaligrāfiskos vai otas vilkumus" +msgstr "Zīmējiet kaligrāfiskās vai otas līnijas" #: ../src/verbs.cpp:2607 msgid "Create and edit text objects" @@ -22491,7 +22489,7 @@ msgstr "Labot šī dokumenta matadatus (tiks saglabāti kopā ar dokumentu)" #: ../src/verbs.cpp:2749 msgid "Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..." -msgstr "Labojiet objekta krāsas, krāsu pārejas, bultu galus un citas aizpildījuma un vilkuma īpašības..." +msgstr "Labojiet objekta krāsas, krāsu pārejas, bultu galus un citas aizpildījuma un apmales īpašības..." #: ../src/verbs.cpp:2750 msgid "Gl_yphs..." @@ -23021,7 +23019,7 @@ msgstr "(noklusētais)" #: ../src/widgets/calligraphy-toolbar.cpp:448 #: ../src/widgets/erasor-toolbar.cpp:146 msgid "(broad stroke)" -msgstr "(plats vilkums)" +msgstr "(plata apmale)" #: ../src/widgets/calligraphy-toolbar.cpp:451 #: ../src/widgets/erasor-toolbar.cpp:149 @@ -23035,7 +23033,7 @@ msgstr "Kaligrāfijas spalvas platums (attiecībā pret redzamo auduma laukumu)" #. Thinning #: ../src/widgets/calligraphy-toolbar.cpp:465 msgid "(speed blows up stroke)" -msgstr "(ātrums paplašina vilkumu)" +msgstr "(ātrums paplašina apmali)" #: ../src/widgets/calligraphy-toolbar.cpp:465 msgid "(slight widening)" @@ -23051,11 +23049,11 @@ msgstr "(viegla sašaurināšanās, noklusētais)" #: ../src/widgets/calligraphy-toolbar.cpp:465 msgid "(speed deflates stroke)" -msgstr "(ātrums sašaurina vilkumu)" +msgstr "(ātrums sašaurina apmali)" #: ../src/widgets/calligraphy-toolbar.cpp:468 msgid "Stroke Thinning" -msgstr "Vilkuma sašaurināšanās" +msgstr "Apmales sašaurināšanās" #: ../src/widgets/calligraphy-toolbar.cpp:468 msgid "Thinning:" @@ -23063,7 +23061,7 @@ msgstr "Sašaurināšanās:" #: ../src/widgets/calligraphy-toolbar.cpp:469 msgid "How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 makes them broader, 0 makes width independent of velocity)" -msgstr "Cik lielā mērā ātrums ietekmē vilkuma platumu (>0 padara ātrus vilkumus šaurākus, <0 - platākus, 0 - padara vilkuma platumu nejūtīgu pret ātrumu)" +msgstr "Cik lielā mērā ātrums ietekmē apmales platumu (>0 padara ātri vilktas apmales šaurākas, <0 - platākas, 0 - padara apmales platumu nejūtīgu pret ātrumu)" #. Angle #: ../src/widgets/calligraphy-toolbar.cpp:481 @@ -23095,7 +23093,7 @@ msgstr "Spalvas gala leņķis (grādos; 0 - horizontāls; neatstāj ietekmi, ja #. Fixation #: ../src/widgets/calligraphy-toolbar.cpp:499 msgid "(perpendicular to stroke, \"brush\")" -msgstr "(perpendikulārs vilkumam, \"brush\")" +msgstr "(perpendikulārs apmalei, \"brush\")" #: ../src/widgets/calligraphy-toolbar.cpp:499 msgid "(almost fixed, default)" @@ -23115,7 +23113,7 @@ msgstr "Fiksācija:" #: ../src/widgets/calligraphy-toolbar.cpp:503 msgid "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = fixed angle)" -msgstr "Leņķa uzvedība (0 = spalvas gals vienmēr perpendikulārs vilkuma virzienam , 100 = nemainīgs leņķis)" +msgstr "Leņķa uzvedība (0 = spalvas gals vienmēr perpendikulārs apmales virzienam , 100 = nemainīgs leņķis)" #. Cap Rounding #: ../src/widgets/calligraphy-toolbar.cpp:515 @@ -23144,7 +23142,7 @@ msgstr "Gali:" #: ../src/widgets/calligraphy-toolbar.cpp:520 msgid "Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = round caps)" -msgstr "Palieliniet, lai vilkumos beigās to gali vairāk izvirzītos uz āru (0 - nav, 1 - apaļi gali)" +msgstr "Palieliniet, lai apmales beigās tās gali vairāk izvirzītos uz āru (0 - nav, 1 - apaļi gali)" #. Tremor #: ../src/widgets/calligraphy-toolbar.cpp:532 @@ -23165,7 +23163,7 @@ msgstr "(maksimāla trīcēšana)" #: ../src/widgets/calligraphy-toolbar.cpp:535 msgid "Stroke Tremor" -msgstr "Vilkuma trīcēšana" +msgstr "Apmales trīcēšana" #: ../src/widgets/calligraphy-toolbar.cpp:535 msgid "Tremor:" @@ -23173,7 +23171,7 @@ msgstr "Trīcēšana:" #: ../src/widgets/calligraphy-toolbar.cpp:536 msgid "Increase to make strokes rugged and trembling" -msgstr "Palieliniet, lai padarītu vilkumus raupjus un trīcošus" +msgstr "Palieliniet, lai padarītu apmales raupjas un trīcošas" #. Wiggle #: ../src/widgets/calligraphy-toolbar.cpp:550 @@ -23483,7 +23481,7 @@ msgstr "Norādīt necaurspīdību" #: ../src/widgets/dropper-toolbar.cpp:132 msgid "If alpha was picked, assign it to selection as fill or stroke transparency" -msgstr "Ja ir izvēlēta alfa, piešķiriet to atlasītajam kā aizpildījuma vai vilkuma caurspīdīgumu" +msgstr "Ja ir izvēlēta alfa, piešķiriet to atlasītajam kā aizpildījuma vai apmales caurspīdīgumu" #: ../src/widgets/dropper-toolbar.cpp:135 msgid "Assign" @@ -23526,7 +23524,7 @@ msgstr "Iestatīt aizpildījuma krāsu" #: ../src/widgets/fill-style.cpp:443 #: ../src/widgets/fill-style.cpp:522 msgid "Set stroke color" -msgstr "Iestatīt vilkuma krāsu" +msgstr "Iestatīt apmales krāsu" #: ../src/widgets/fill-style.cpp:621 msgid "Set gradient on fill" @@ -23534,7 +23532,7 @@ msgstr "Iestatīt aizpildījuma krāsu pāreju" #: ../src/widgets/fill-style.cpp:621 msgid "Set gradient on stroke" -msgstr "Iestatīt vilkuma krāsu pāreju" +msgstr "Iestatīt apmales krāsu pāreju" #: ../src/widgets/fill-style.cpp:681 msgid "Set pattern on fill" @@ -23542,7 +23540,7 @@ msgstr "Iestatīt aizpildījuma faktūru" #: ../src/widgets/fill-style.cpp:682 msgid "Set pattern on stroke" -msgstr "Iestatīt vilkuma faktūru" +msgstr "Iestatīt apmales faktūru" #: ../src/widgets/font-selector.cpp:135 #: ../src/widgets/text-toolbar.cpp:966 @@ -23651,12 +23649,12 @@ msgstr "Izveidot krāsu pāreju aizpildījumā" #: ../src/widgets/gradient-toolbar.cpp:1084 #: ../src/widgets/mesh-toolbar.cpp:238 msgid "stroke" -msgstr "vilkums" +msgstr "apmale" #: ../src/widgets/gradient-toolbar.cpp:1084 #: ../src/widgets/mesh-toolbar.cpp:238 msgid "Create gradient in the stroke" -msgstr "Izveidot krāsu pāreju vilkumā" +msgstr "Izveidot krāsu pāreju uz apmales" #: ../src/widgets/gradient-toolbar.cpp:1087 #: ../src/widgets/mesh-toolbar.cpp:241 @@ -23906,14 +23904,12 @@ msgid "Edit fill mesh" msgstr "Labot aizpildījuma režģtīklu" #: ../src/widgets/mesh-toolbar.cpp:305 -#, fuzzy msgid "Edit Stroke" -msgstr "Labot vilkumu..." +msgstr "Labot apmali" #: ../src/widgets/mesh-toolbar.cpp:306 -#, fuzzy msgid "Edit stroke mesh" -msgstr "Labot vilkumu..." +msgstr "Labot apmales režgtīklu" #: ../src/widgets/mesh-toolbar.cpp:317 #: ../src/widgets/node-toolbar.cpp:530 @@ -24374,11 +24370,11 @@ msgstr "Pārveidošana ar rīkjoslas palīdzību" #: ../src/widgets/select-toolbar.cpp:341 msgid "Now stroke width is scaled when objects are scaled." -msgstr "Tagad mērogojot objektus vilkuma platums tiek mērogots." +msgstr "Tagad mērogojot objektus apmales platums tiek mērogots." #: ../src/widgets/select-toolbar.cpp:343 msgid "Now stroke width is not scaled when objects are scaled." -msgstr "Tagad mērogojot objektus vilkuma platums netiek mērogots." +msgstr "Tagad mērogojot objektus apmales platums netiek mērogots." #: ../src/widgets/select-toolbar.cpp:354 msgid "Now rounded rectangle corners are scaled when rectangles are scaled." @@ -25016,7 +25012,7 @@ msgstr "Brīvi izkliedēt stūrus un leņķus" #: ../src/widgets/stroke-style.cpp:185 msgid "Stroke width" -msgstr "Vilkuma platums" +msgstr "Apmales platums" #: ../src/widgets/stroke-style.cpp:187 msgctxt "Stroke width" @@ -25109,7 +25105,7 @@ msgstr "Iestatīt marķierus" #: ../src/widgets/stroke-style.cpp:1100 #: ../src/widgets/stroke-style.cpp:1185 msgid "Set stroke style" -msgstr "Iestatīt vilkuma stilu" +msgstr "Iestatīt apmales stilu" #: ../src/widgets/stroke-style.cpp:1273 msgid "Set marker color" @@ -25391,7 +25387,7 @@ msgstr "Jauno, ar spalvas rīku veidoto ceļu stils" #: ../src/widgets/toolbox.cpp:199 msgid "Style of new calligraphic strokes" -msgstr "Jauno kaligrāfisko vilkumu stils" +msgstr "Jauno kaligrāfisko apmaļu stils" #: ../src/widgets/toolbox.cpp:201 #: ../src/widgets/toolbox.cpp:203 @@ -27218,7 +27214,7 @@ msgstr "Tikai melns un balts:" #: ../share/extensions/edge3d.inx.h:5 msgid "Stroke width:" -msgstr "Vilkuma platums:" +msgstr "Apmales platums:" #: ../share/extensions/edge3d.inx.h:6 msgid "Blur stdDeviation:" @@ -27326,7 +27322,7 @@ msgstr "Papīra biezums:" #: ../share/extensions/foldablebox.inx.h:6 msgid "Tab Proportion:" -msgstr "" +msgstr "Tabulācijas proporcijas:" #: ../share/extensions/foldablebox.inx.h:8 msgid "Add Guide Lines" @@ -28130,7 +28126,7 @@ msgid "" "\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." msgstr "" -"Izveidot nejaušu Voronoja šūnu faktūru. Faktūra būs pieejama Aizpildījuma un vilkuma dialoglodziņā. Jums ir jāizvēlas kāds objekts vai grupa.\n" +"Izveidot nejaušu Voronoja šūnu faktūru. Faktūra būs pieejama Aizpildījuma un apmales dialoglodziņā. Jums ir jāizvēlas kāds objekts vai grupa.\n" "\n" "Ja apmale ir 0, faktūra tiks pārtraukta pie malām Izmantojiet pozitīvu apmales lielumu, vēlams, lielāku par šūnas izmēru, lai panāktu gludu faktūras elementu savienojumu pie malām. Izmantojiet negatīvu apmales lielumu, lai samazinātu faktūras elementu lielumu un iegūtu tukšu apmali." @@ -29286,7 +29282,7 @@ msgstr "Izciršanas zīmes" #: ../share/extensions/layout_nup.inx.h:20 msgid "Padding guide" -msgstr "" +msgstr "Papildinājuma vadlīnija" #: ../share/extensions/layout_nup.inx.h:21 msgid "Margin guide" @@ -29294,7 +29290,7 @@ msgstr "Malu palīglīnijas" #: ../share/extensions/layout_nup.inx.h:22 msgid "Padding box" -msgstr "" +msgstr "Papildinājuma rāmis" #: ../share/extensions/layout_nup.inx.h:23 msgid "Margin box" @@ -29426,7 +29422,7 @@ msgstr "Marķiera tips:" #: ../share/extensions/markers_strokepaint.inx.h:4 msgid "Invert fill and stroke colors" -msgstr "Invertēt aizpildījuma un vilkuma krasas" +msgstr "Invertēt aizpildījuma un apmales krāsas" #: ../share/extensions/markers_strokepaint.inx.h:5 msgid "Assign alpha" @@ -29447,11 +29443,11 @@ msgstr "Piešķirt aizpildījuma krāsu" #. K.Kalvišķis (karlo@lanet.lv): Ja nepatīk vārds „līnija”, tad varētu lietot vārdu „apmale”, jo Inkscape jebkuru līniju uztver kā nenoslēgtu daudzstūri, kuram var piešķirt gan aizpildījuma krāsu un veidu, gan apmales (līnijas) krāsu un veidu. #: ../share/extensions/markers_strokepaint.inx.h:11 msgid "Stroke" -msgstr "Vilkums" +msgstr "Apmale" #: ../share/extensions/markers_strokepaint.inx.h:12 msgid "Assign stroke color" -msgstr "Piešķirt vilkuma krāsu" +msgstr "Piešķirt apmales krāsu" #: ../share/extensions/measure.inx.h:1 msgid "Measure Path" @@ -29959,11 +29955,11 @@ msgstr "Aizpildījuma necaurspīdība (%):" #: ../share/extensions/polyhedron_3d.inx.h:41 #, no-c-format msgid "Stroke opacity (%):" -msgstr "Vilkuma necaurspīdība (%):" +msgstr "Apmales necaurspīdība (%):" #: ../share/extensions/polyhedron_3d.inx.h:42 msgid "Stroke width (px):" -msgstr "Vilkuma platums (px):" +msgstr "Apmales platums (px):" #: ../share/extensions/polyhedron_3d.inx.h:43 msgid "Shading" @@ -30424,7 +30420,7 @@ msgstr "" " * Saīsināt krāsu nosaukumus: pārvērš visas krāsas #RRGGBB vai #RGB formātā.\n" " * Pārvērst CSS atribūtus par XML atribūtiem: pārvērst stilus no stilu tagiem un inline style=\"\" deklarācijām par XML atribūtiem.\n" " * Grupu savēršana: aizvāc nevajadzīgus g elementus, paaugstinot to saturu par vienu līmeni. Nepieciešams iestatīts \"Aizvākt neizmantotos ID nosaukumus no elementiem\".\n" -" * Izveidot līdzīgu atribūtu grupas: izveidot g elementus elementu kopām ar vismaz vienu kopēju atribūtu (piem. aizpildījuma krāsa, vilkuma necauspīdīgums, ...).\n" +" * Izveidot līdzīgu atribūtu grupas: izveidot g elementus elementu kopām ar vismaz vienu kopēju atribūtu (piem. aizpildījuma krāsa, apmale, necauspīdīgums, ...).\n" " * Iegult rastrus: iegult rastra attēlus kā base64-kodētu datu URL.\n" " * Saglabāt redaktora datus: neaizvākt Inkscape, Sodipodi vai Adobe Illustrator elementus un atribūtus.\n" " * Aizvākt metadatus: aizvākt metadatu tagus kopā ar visu tajos esošo informāciju, kas var saturēt licences metadatus, alternatīvās versijas pārlūkiem bez SVG atbalsta, utt.\n" -- cgit v1.2.3 From 3c213cec8c2aab1a53d0d5cb9d87659b584ac876 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Wed, 3 Apr 2013 22:47:48 +0200 Subject: Checking file presence before calling lstat (should fix Bug #785701 Inkscape freezes at opening) (bzr r12263) --- src/inkscape.cpp | 16 +++++++++------- src/io/sys.cpp | 6 ++++-- src/sp-image.cpp | 19 +++++++++++++------ src/ui/dialog/filedialogimpl-gtkmm.cpp | 2 +- src/ui/widget/imageicon.cpp | 2 +- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/inkscape.cpp b/src/inkscape.cpp index ac419784f..eca19c4b9 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -364,15 +364,17 @@ static gint inkscape_autosave(gpointer) while( (filename = g_dir_read_name(autosave_dir_ptr)) != NULL ){ if ( strncmp(filename, baseName, strlen(baseName)) == 0 ){ gchar* full_path = g_build_filename( autosave_dir.c_str(), filename, NULL ); - if ( g_stat(full_path, &sb) != -1 ) { - if ( difftime(sb.st_ctime, min_time) < 0 || min_time == 0 ){ - min_time = sb.st_ctime; - if ( oldest_autosave ) { - g_free(oldest_autosave); + if (g_file_test (full_path, G_FILE_TEST_EXISTS)){ + if ( g_stat(full_path, &sb) != -1 ) { + if ( difftime(sb.st_ctime, min_time) < 0 || min_time == 0 ){ + min_time = sb.st_ctime; + if ( oldest_autosave ) { + g_free(oldest_autosave); + } + oldest_autosave = g_strdup(full_path); } - oldest_autosave = g_strdup(full_path); + count ++; } - count ++; } g_free(full_path); } diff --git a/src/io/sys.cpp b/src/io/sys.cpp index 60e850c96..94175176a 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -227,8 +227,10 @@ bool Inkscape::IO::file_is_writable( char const *utf8name) } if ( filename ) { struct stat st; - if(g_lstat (filename, &st) == 0) { - success = ((st.st_mode & S_IWRITE) != 0); + if (g_file_test (filename, G_FILE_TEST_EXISTS)){ + if (g_lstat (filename, &st) == 0) { + success = ((st.st_mode & S_IWRITE) != 0); + } } g_free(filename); filename = NULL; diff --git a/src/sp-image.cpp b/src/sp-image.cpp index ce8879f70..dacea3417 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -417,8 +417,12 @@ GdkPixbuf* pixbuf_new_from_file( const char *filename, time_t &modTime, gchar*& pixPath = NULL; } + //test correctness of filename + if (!g_file_test (filename, G_FILE_TEST_EXISTS)){ + return NULL; + } struct stat stdir; - g_stat(filename, &stdir); + int val = g_stat(filename, &stdir); if (stdir.st_mode & S_IFDIR){ //filename is not correct: it is a directory name and hence further code can not return valid results return NULL; @@ -429,11 +433,11 @@ GdkPixbuf* pixbuf_new_from_file( const char *filename, time_t &modTime, gchar*& if ( fp ) { { - struct stat st; - memset(&st, 0, sizeof(st)); - int val = g_stat(filename, &st); + // struct stat st; + // memset(&st, 0, sizeof(st)); + // int val = g_stat(filename, &st); if ( !val ) { - modTime = st.st_mtime; + modTime = stdir.st_mtime;//st.st_mtime; pixPath = g_strdup(filename); } } @@ -1495,7 +1499,10 @@ void sp_image_refresh_if_outdated( SPImage* image ) struct stat st; memset(&st, 0, sizeof(st)); - int val = g_stat(image->pixPath, &st); + int val = 0; + if (g_file_test (image->pixPath, G_FILE_TEST_EXISTS)){ + val = g_stat(image->pixPath, &st); + } if ( !val ) { // stat call worked. Check time now if ( st.st_mtime != image->lastMod ) { diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 5808d7d21..fdc9cecc3 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -529,7 +529,7 @@ bool SVGPreview::set(Glib::ustring &fileName, int dialogType) Glib::ustring fileNameUtf8 = Glib::filename_to_utf8(fileName); gchar *fName = const_cast(fileNameUtf8.c_str()); struct stat info; - if (g_stat(fName, &info)) + if (g_file_test (fName, G_FILE_TEST_EXISTS) && g_stat(fName, &info)) { g_warning("SVGPreview::set() : %s : %s", fName, strerror(errno)); diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp index 1c36dc36e..cf41a16a4 100644 --- a/src/ui/widget/imageicon.cpp +++ b/src/ui/widget/imageicon.cpp @@ -382,7 +382,7 @@ bool ImageIcon::show(const Glib::ustring &fileName) if (Glib::file_test(fileName, Glib::FILE_TEST_IS_REGULAR)) { struct stat info; - if (stat(fName, &info)) + if (g_file_test (fName, G_FILE_TEST_EXISTS) && stat(fName, &info)) { Glib::ustring err = "cannot get file info"; showBrokenImage(err); -- cgit v1.2.3 From 88c905293309b6f8f712d97a71514220bce29be3 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Wed, 3 Apr 2013 22:53:32 +0200 Subject: odf export: code clean up and preparatory work to allow gradients in export. Now only linear fill gradients are shown (not taking orientation and position into account). part of bug #474956 (odg export still doesn't work) (bzr r12264) --- src/extension/internal/odf.cpp | 1035 +++++++++++++++------------------------- src/extension/internal/odf.h | 6 +- 2 files changed, 376 insertions(+), 665 deletions(-) diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 4c27925ae..9fc6ecfdb 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -89,7 +89,7 @@ #include "io/inkscapestream.h" #include "io/bufferstream.h" - +#include namespace Inkscape { namespace Extension @@ -805,7 +805,6 @@ void SingularValueDecomposition::calculate() } - /** * Return the left singular vectors * @return U @@ -903,7 +902,6 @@ static Glib::ustring getAttribute( Inkscape::XML::Node *node, char const *attrNa } - /** * Get the extension suffix from the end of a file name */ @@ -923,7 +921,6 @@ static Glib::ustring getExtension(const Glib::ustring &fname) return ext; } - static Glib::ustring formatTransform(Geom::Affine &tf) { Glib::ustring str; @@ -939,9 +936,6 @@ static Glib::ustring formatTransform(Geom::Affine &tf) } - - - /** * Get the general transform from SVG pixels to * ODF cm @@ -960,8 +954,6 @@ static Geom::Affine getODFTransform(const SPItem *item) } - - /** * Get the bounding box of an item, as mapped onto * an ODF document, in cm. @@ -977,7 +969,6 @@ static Geom::OptRect getODFBoundingBox(const SPItem *item) } - /** * Get the transform for an item, correcting for * handedness reversal @@ -991,7 +982,6 @@ static Geom::Affine getODFItemTransform(const SPItem *item) } - /** * Get some fun facts from the transform */ @@ -1015,16 +1005,9 @@ static void analyzeTransform(Geom::Affine &tf, double s1 = svd.getS(1); xscale = s0; yscale = s1; - //g_message("## s0:%.3f s1:%.3f", s0, s1); - //g_message("## u:%.3f %.3f %.3f %.3f", U(0,0), U(0,1), U(1,0), U(1,1)); - //g_message("## v:%.3f %.3f %.3f %.3f", V(0,0), V(0,1), V(1,0), V(1,1)); - //g_message("## vt:%.3f %.3f %.3f %.3f", Vt(0,0), Vt(0,1), Vt(1,0), Vt(1,1)); - //g_message("## uvt:%.3f %.3f %.3f %.3f", UVt(0,0), UVt(0,1), UVt(1,0), UVt(1,1)); rotate = UVt(0,0); } - - static void gatherText(Inkscape::XML::Node *node, Glib::ustring &buf) { if (node->type() == Inkscape::XML::TEXT_NODE) @@ -1047,10 +1030,8 @@ static void gatherText(Inkscape::XML::Node *node, Glib::ustring &buf) * Method descends into the repr tree, converting image, style, and gradient info * into forms compatible in ODF. */ -void -OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node) +void OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node) { - Glib::ustring nodeName = node->name(); Glib::ustring id = getAttribute(node, "id"); @@ -1085,13 +1066,9 @@ OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node) { return; } - //SPItem *item = SP_ITEM(reprobj); - //### Get SVG-to-ODF transform - //Geom::Affine tf = getODFTransform(item); if (nodeName == "image" || nodeName == "svg:image") { - //g_message("image"); Glib::ustring href = getAttribute(node, "xlink:href"); if (href.size() > 0) { @@ -1109,11 +1086,9 @@ OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node) Glib::ustring comment = "old name was: "; comment.append(oldName); URI oldUri(oldName); - //g_message("oldpath:%s", oldUri.getNativePath().c_str()); //# if relative to the documentURI, get proper path URI resUri = documentUri.resolve(oldUri); DOMString pathName = resUri.getNativePath(); - //g_message("native path:%s", pathName.c_str()); ZipEntry *ze = zf.addFile(pathName, comment); if (ze) { @@ -1133,7 +1108,6 @@ OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node) } - /** * Writes the manifest. Currently it only changes according to the * file names of images packed into the zip file. @@ -1146,25 +1120,25 @@ bool OdfOutput::writeManifest(ZipFile &zf) time_t tim; time(&tim); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); std::map::iterator iter; for (iter = imageTable.begin() ; iter!=imageTable.end() ; ++iter) { @@ -1224,29 +1198,29 @@ bool OdfOutput::writeMeta(ZipFile &zf) date = iter->second; } - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); Glib::ustring tmp = Glib::ustring(" ") + InkscapeVersion + "\n"; outs.writeUString(tmp); outs.printf(" %s\n", creator.c_str()); @@ -1261,18 +1235,17 @@ bool OdfOutput::writeMeta(ZipFile &zf) outs.writeUString(tmp); } } - outs.printf(" 2\n"); - outs.printf(" PT56S\n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - + outs.writeString(" 2\n"); + outs.writeString(" PT56S\n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); outs.close(); @@ -1285,208 +1258,6 @@ bool OdfOutput::writeMeta(ZipFile &zf) } - - -/** - * This is called just before writeTree(), since it will write style and - * gradient information above the tag in the content.xml file - */ -bool OdfOutput::writeStyle(ZipFile &zf) -{ - BufferOutputStream bouts; - OutputStreamWriter outs(bouts); - - /* - ========================================================== - Dump our style table. Styles should have a general layout - something like the following. Look in: - http://books.evc-cit.info/odbook/ch06.html#draw-style-file-section - for style and gradient information. - - - - ========================================================== - */ - outs.printf("\n"); - std::vector::iterator iter; - for (iter = styleTable.begin() ; iter != styleTable.end() ; ++iter) - { - outs.printf("name.c_str()); - StyleInfo s(*iter); - outs.printf(" style:family=\"graphic\" style:parent-style-name=\"standard\">\n"); - outs.printf(" \n"); - outs.printf("\n"); - } - - //## Dump our gradient table - unsigned int gradientCount = 0; - outs.printf("\n"); - outs.printf("\n"); - std::vector::iterator giter; - for (giter = gradientTable.begin() ; giter != gradientTable.end() ; ++giter) - { - GradientInfo gi(*giter); - if (gi.style == "linear") - { - /* - =================================================================== - LINEAR gradient. We need something that looks like this: - - =================================================================== - */ - if (gi.stops.size() < 2) - { - g_warning("Need at least 2 tops for a linear gradient"); - continue; - } - outs.printf("\n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf("\n"); - } - else if (gi.style == "radial") - { - /* - =================================================================== - RADIAL gradient. We need something that looks like this: - - - =================================================================== - */ - if (gi.stops.size() < 2) - { - g_warning("Need at least 2 tops for a radial gradient"); - continue; - } - outs.printf("\n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf("\n"); - } - else - { - g_warning("unsupported gradient style '%s'", gi.style.c_str()); - } - outs.printf("\n"); - outs.printf(" \n"); - outs.printf("\n\n"); - - gradientCount++; - } - - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - - //Make our entry - ZipEntry *ze = zf.newEntry("styles.xml", "ODF style file"); - ze->setUncompressedData(bouts.getBuffer()); - ze->finish(); - - return true; -} - - - /** * Writes an SVG path as an ODF and returns the number of points written */ @@ -1544,24 +1315,29 @@ writePath(Writer &outs, Geom::PathVector const &pathv, return nrPoints; } - - -bool OdfOutput::processStyle(Writer &outs, SPItem *item, - const Glib::ustring &id) +bool OdfOutput::processStyle(Writer &outs, SPItem *item, const Glib::ustring &id, const Glib::ustring &gradientNameFill)//, Glib::ustring &styleString) { + if (!item) + { + return false; + } + SPStyle *style = item->style; - + if (!style) + { + return false; + } + StyleInfo si; - //## FILL + // FILL if (style->fill.isColor()) - { + { guint32 fillCol = style->fill.value.color.toRGBA32( 0 ); char buf[16]; int r = (fillCol >> 24) & 0xff; int g = (fillCol >> 16) & 0xff; int b = (fillCol >> 8) & 0xff; - //g_message("## %s %lx", id.c_str(), (unsigned int)fillCol); snprintf(buf, 15, "#%02x%02x%02x", r, g, b); si.fillColor = buf; si.fill = "solid"; @@ -1569,11 +1345,19 @@ bool OdfOutput::processStyle(Writer &outs, SPItem *item, (SP_SCALE24_TO_FLOAT(style->fill_opacity.value)); snprintf(buf, 15, "%.3f%%", opacityPercent); si.fillOpacity = buf; + } + else if (style->fill.isPaintserver()) + { + SPGradient *gradient = SP_GRADIENT(SP_STYLE_FILL_SERVER(style)); + if (gradient) + { + si.fill = "gradient"; } + } - //## STROKE + // STROKE if (style->stroke.isColor()) - { + { guint32 strokeCol = style->stroke.value.color.toRGBA32( 0 ); char buf[16]; int r = (strokeCol >> 24) & 0xff; @@ -1588,157 +1372,169 @@ bool OdfOutput::processStyle(Writer &outs, SPItem *item, (SP_SCALE24_TO_FLOAT(style->stroke_opacity.value)); snprintf(buf, 15, "%.3f%%", opacityPercent); si.strokeOpacity = buf; + } + else if (style->stroke.isPaintserver()) + { + SPGradient *gradient = SP_GRADIENT(SP_STYLE_STROKE_SERVER(style)); + if (gradient) + { + si.stroke = "gradient"; } + } //Look for existing identical style; bool styleMatch = false; std::vector::iterator iter; for (iter=styleTable.begin() ; iter!=styleTable.end() ; ++iter) - { + { if (si.equals(*iter)) - { + { //map to existing styleTable entry Glib::ustring styleName = iter->name; - //g_message("found duplicate style:%s", styleName.c_str()); styleLookupTable[id] = styleName; styleMatch = true; break; - } } + } - //## Dont need a new style + // Dont need a new style if (styleMatch) + { return false; + } - char buf[16]; - snprintf(buf, 15, "style%d", (int)styleTable.size()); - Glib::ustring styleName = buf; + Glib::ustring styleName = Glib::ustring::compose("style%1", styleTable.size()); si.name = styleName; styleTable.push_back(si); styleLookupTable[id] = styleName; - outs.printf("\n"); - outs.printf(" \n", si.name); + // Glib::ustring tmpstring; + tmpstring += "\n"); - outs.printf("\n"); + } + tmpstring += "/>\n\n"; + outs.writeUString (tmpstring); return true; } - - - bool OdfOutput::processGradient(Writer &outs, SPItem *item, - const Glib::ustring &id, Geom::Affine &/*tf*/) + const Glib::ustring &id, Geom::Affine &/*tf*/, + Glib::ustring& gradientName, Glib::ustring& output, bool checkFillGradient) { + output.clear(); if (!item) + { return false; + } SPStyle *style = item->style; - if (!style) + { return false; + } - if (!style->fill.isPaintserver()) - return false; - - //## Gradient. Look in writeStyle() below to see what info - // we need to read into GradientInfo. - if (!SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style))) + if ((checkFillGradient? (!style->fill.isPaintserver()) : (!style->stroke.isPaintserver()))) + { return false; + } - SPGradient *gradient = SP_GRADIENT(SP_STYLE_FILL_SERVER(style)); + //## Gradient + SPGradient *gradient = SP_GRADIENT((checkFillGradient?(SP_STYLE_FILL_SERVER(style)) :(SP_STYLE_STROKE_SERVER(style)))); + if (gradient == NULL) + { + return false; + } GradientInfo gi; - SPGradient *grvec = gradient->getVector(FALSE); - for (SPStop *stop = grvec->getFirstStop() ; + for (SPStop *stop = grvec->getFirstStop(); stop ; stop = stop->getNextStop()) - { + { unsigned long rgba = sp_stop_get_rgba32(stop); unsigned long rgb = (rgba >> 8) & 0xffffff; - double opacity = ((double)(rgba & 0xff)) / 256.0; + double opacity = (static_cast(rgba & 0xff)) / 256.0; GradientStop gs(rgb, opacity); gi.stops.push_back(gs); - } + } if (SP_IS_LINEARGRADIENT(gradient)) - { + { gi.style = "linear"; SPLinearGradient *linGrad = SP_LINEARGRADIENT(gradient); - /* - Geom::Point p1(linGrad->x1.value, linGrad->y1.value); - p1 = p1 * tf; - gi.x1 = p1[Geom::X]; - gi.y1 = p1[Geom::Y]; - Geom::Point p2(linGrad->x2.value, linGrad->y2.value); - p2 = p2 * tf; - gi.x2 = p2[Geom::X]; - gi.y2 = p2[Geom::Y]; - */ gi.x1 = linGrad->x1.value; gi.y1 = linGrad->y1.value; gi.x2 = linGrad->x2.value; gi.y2 = linGrad->y2.value; - } + } else if (SP_IS_RADIALGRADIENT(gradient)) - { + { gi.style = "radial"; SPRadialGradient *radGrad = SP_RADIALGRADIENT(gradient); gi.cx = radGrad->cx.computed * 100.0;//ODG cx is percentages gi.cy = radGrad->cy.computed * 100.0; - } + } else - { + { g_warning("not a supported gradient type"); return false; - } + } //Look for existing identical style; bool gradientMatch = false; std::vector::iterator iter; for (iter=gradientTable.begin() ; iter!=gradientTable.end() ; ++iter) - { + { if (gi.equals(*iter)) - { + { //map to existing gradientTable entry - Glib::ustring gradientName = iter->name; - //g_message("found duplicate style:%s", gradientName.c_str()); + // Glib::ustring gradientName = iter->name; + gradientName = iter->name; gradientLookupTable[id] = gradientName; gradientMatch = true; break; - } } + } if (gradientMatch) + { return true; + } - //## No match, let us write a new entry - char buf[16]; - snprintf(buf, 15, "gradient%d", (int)gradientTable.size()); - Glib::ustring gradientName = buf; + // No match, let us write a new entry + // Glib::ustring gradientName = Glib::ustring::compose("gradient%1", gradientTable.size()); + gradientName = Glib::ustring::compose("gradient%1", gradientTable.size()); gi.name = gradientName; gradientTable.push_back(gi); gradientLookupTable[id] = gradientName; int gradientCount = gradientTable.size(); - + char buf[128]; if (gi.style == "linear") - { + { /* =================================================================== LINEAR gradient. We need something that looks like this: @@ -1751,36 +1547,24 @@ bool OdfOutput::processGradient(Writer &outs, SPItem *item, =================================================================== */ if (gi.stops.size() < 2) - { + { g_warning("Need at least 2 stops for a linear gradient"); - return false;; - } - outs.printf("\n", - gi.x2 * pxToCm, gi.y2 * pxToCm); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf("\n"); + return false; } + output += Glib::ustring::compose("\n", + gi.stops[0].opacity * 100.0, gi.stops[1].opacity * 100.0); + // outs.writeUString (tmpstring); + } else if (gi.style == "radial") - { + { /* =================================================================== RADIAL gradient. We need something that looks like this: @@ -1794,10 +1578,11 @@ bool OdfOutput::processGradient(Writer &outs, SPItem *item, =================================================================== */ if (gi.stops.size() < 2) - { + { g_warning("Need at least 2 stops for a radial gradient"); return false; - } + } + /* outs.printf("\n"); outs.printf("\n"); - } + */ + } else - { + { g_warning("unsupported gradient style '%s'", gi.style.c_str()); return false; - } - outs.printf("\n"); - outs.printf(" \n"); - outs.printf("\n\n"); - + } return true; } - - /** * SECOND PASS. - * This is the main SPObject tree output to ODF. preprocess() - * must be called prior to this, as elements will often reference - * data parsed and tabled in preprocess(). + * This is the main SPObject tree output to ODF. */ bool OdfOutput::writeTree(Writer &couts, Writer &souts, Inkscape::XML::Node *node) @@ -1857,22 +1629,19 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, //# Get the SPItem, if applicable SPObject *reprobj = SP_ACTIVE_DOCUMENT->getObjectByRepr(node); if (!reprobj) + { return true; + } if (!SP_IS_ITEM(reprobj)) - { + { return true; - } + } SPItem *item = SP_ITEM(reprobj); - Glib::ustring nodeName = node->name(); Glib::ustring id = getAttribute(node, "id"); - - //### Get SVG-to-ODF transform - Geom::Affine tf = getODFTransform(item); - - //### Get ODF bounding box params for item - Geom::OptRect bbox = getODFBoundingBox(item); + Geom::Affine tf = getODFTransform(item);//Get SVG-to-ODF transform + Geom::OptRect bbox = getODFBoundingBox(item);//Get ODF bounding box params for item if (!bbox) { return true; } @@ -1892,8 +1661,6 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, //# Do our stuff SPCurve *curve = NULL; - - if (nodeName == "svg" || nodeName == "svg:svg") { //# Iterate through the children @@ -1937,26 +1704,26 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, return true; } - //###################################### - //# S T Y L E - //###################################### - processStyle(souts, item, id); - - //###################################### - //# G R A D I E N T - //###################################### - processGradient(souts, item, id, tf); - - - //###################################### - //# I T E M D A T A - //###################################### - //g_message("##### %s #####", nodeName.c_str()); + //# GRADIENT + Glib::ustring gradientNameFill; + Glib::ustring gradientNameStroke; + Glib::ustring outputFill; + Glib::ustring outputStroke; + // Glib::ustring styleString; + + processGradient(souts, item, id, tf, gradientNameFill, outputFill, 1); + souts.writeUString(outputFill); + + //# STYLE + processStyle(souts, item, id, gradientNameFill);//, styleString); + + + //# ITEM DATA if (nodeName == "image" || nodeName == "svg:image") { if (!SP_IS_IMAGE(item)) { - g_warning(" is not an SPImage. Why? ;-)"); + g_warning(" is not an SPImage."); return false; } @@ -2005,13 +1772,13 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, couts.printf("draw:transform=\"translate(%.3fcm, %.3fcm)\" ", ix, iy); } - couts.printf(">\n"); + couts.writeString(">\n"); couts.printf(" \n"); - couts.printf(" \n"); - couts.printf(" \n"); - couts.printf("\n"); + couts.writeString(" xlink:show=\"embed\" xlink:actuate=\"onLoad\">\n"); + couts.writeString(" \n"); + couts.writeString(" \n"); + couts.writeString("\n"); return true; } else if (SP_IS_SHAPE(item)) @@ -2026,7 +1793,7 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, if (curve) { //### Default output - couts.printf("second; couts.printf("draw:style-name=\"%s\" ", styleName.c_str()); } + // couts.writeUString(styleString); - std::map::iterator giter; - giter = gradientLookupTable.find(id); - if (giter != gradientLookupTable.end()) - { - Glib::ustring gradientName = giter->second; - couts.printf("draw:fill-gradient-name=\"%s\" ", - gradientName.c_str()); - } + // std::map::iterator giter; + // giter = gradientLookupTable.find(id); + // if (giter != gradientLookupTable.end()) + // { + // Glib::ustring gradientName = giter->second; + // couts.printf("draw:fill-gradient-name=\"%s\" ", + // gradientName.c_str()); + // } couts.printf("draw:layer=\"layout\" svg:x=\"%.3fcm\" svg:y=\"%.3fcm\" ", bbox_x, bbox_y); @@ -2059,12 +1827,11 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, couts.printf(" svg:d=\""); int nrPoints = writePath(couts, curve->get_pathvector(), tf, bbox_x, bbox_y); - couts.printf("\""); + couts.writeString("\""); - couts.printf(">\n"); + couts.writeString(">\n"); couts.printf(" \n", nrPoints); - couts.printf("\n\n"); - + couts.writeString("\n\n"); curve->unref(); } @@ -2073,7 +1840,6 @@ bool OdfOutput::writeTree(Writer &couts, Writer &souts, } - /** * Write the header for the content.xml file */ @@ -2082,59 +1848,56 @@ bool OdfOutput::writeStyleHeader(Writer &outs) time_t tim; time(&tim); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); return true; } @@ -2145,58 +1908,49 @@ bool OdfOutput::writeStyleHeader(Writer &outs) */ bool OdfOutput::writeStyleFooter(Writer &outs) { - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf(" \n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf(" \n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf(" \n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + +///TODO: add default document style here + + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString(" \n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString(" \n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString(" \n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); return true; } - - /** * Write the header for the content.xml file */ @@ -2205,69 +1959,61 @@ bool OdfOutput::writeContentHeader(Writer &outs) time_t tim; time(&tim); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); return true; } @@ -2277,37 +2023,18 @@ bool OdfOutput::writeContentHeader(Writer &outs) */ bool OdfOutput::writeContentFooter(Writer &outs) { - outs.printf("\n"); - outs.printf("\n"); - - outs.printf("\n"); - outs.printf("\n"); - - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - outs.printf("\n"); - + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); + outs.writeString("\n"); return true; } - /** * Write the content.xml file. Writes the namesspace headers, then * calls writeTree(). @@ -2346,8 +2073,6 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node) setlocale (LC_NUMERIC, oldlocale); g_free (oldlocale); - - //# Finish content file if (!writeContentFooter(couts)) { @@ -2358,8 +2083,6 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node) ze->setUncompressedData(cbouts.getBuffer()); ze->finish(); - - //# Finish style file if (!writeStyleFooter(souts)) { @@ -2377,8 +2100,7 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node) /** * Resets class to its pristine condition, ready to use again */ -void -OdfOutput::reset() +void OdfOutput::reset() { metadata.clear(); styleTable.clear(); @@ -2386,20 +2108,16 @@ OdfOutput::reset() gradientTable.clear(); gradientLookupTable.clear(); imageTable.clear(); - - } /** * Descends into the SVG tree, mapping things to ODF when appropriate */ -void -OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar const *filename) +void OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar const *filename) { reset(); - //g_message("native file:%s\n", filename); documentUri = URI(filename); /* fixme: It looks like we really are using documentUri as a URI, so we ought to call * g_filename_to_uri for the URI constructor. */ @@ -2437,8 +2155,7 @@ OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar con * calls the extension system with the memory allocated XML that * describes the data. */ -void -OdfOutput::init() +void OdfOutput::init() { Inkscape::Extension::build_from_mem( "\n" @@ -2457,8 +2174,7 @@ OdfOutput::init() /** * Make sure that we are in the database */ -bool -OdfOutput::check (Inkscape::Extension::Extension */*module*/) +bool OdfOutput::check (Inkscape::Extension::Extension */*module*/) { /* We don't need a Key if (NULL == Inkscape::Extension::db.get(SP_MODULE_KEY_OUTPUT_POV)) @@ -2468,9 +2184,6 @@ OdfOutput::check (Inkscape::Extension::Extension */*module*/) return TRUE; } - - - } //namespace Internal } //namespace Extension } //namespace Inkscape diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 001f5e1f1..5fcad2630 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -313,10 +313,10 @@ private: bool writeStyle(ZipFile &zf); - bool processStyle(Writer &outs, SPItem *item, const Glib::ustring &id); + bool processStyle(Writer &outs, SPItem *item, const Glib::ustring &id, const Glib::ustring &gradientNameFill);//, Glib::ustring &styleString); bool processGradient(Writer &outs, SPItem *item, - const Glib::ustring &id, Geom::Affine &tf); + const Glib::ustring &id, Geom::Affine &tf, Glib::ustring& gradientName, Glib::ustring& output, bool checkFillGradient = 1); bool writeStyleHeader(Writer &outs); @@ -333,8 +333,6 @@ private: }; - - } //namespace Internal } //namespace Extension } //namespace Inkscape -- cgit v1.2.3 From dc325db99e4e1b17293fac9ecb6de9da00bd30da Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Thu, 4 Apr 2013 08:55:13 +0200 Subject: Fix for Bug #1163759 (Mouse selection ignores transform). (bzr r12265) --- src/helper/geom.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 077344380..879026521 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -281,12 +281,12 @@ geom_cubic_bbox_wind_distance (Geom::Coord x000, Geom::Coord y000, y0 = std::min (y000, y001); y0 = std::min (y0, y011); y0 = std::min (y0, y111); - x1 = std::min (x000, x001); - x1 = std::min (x1, x011); - x1 = std::min (x1, x111); - y1 = std::min (y000, y001); - y1 = std::min (y1, y011); - y1 = std::min (y1, y111); + x1 = std::max (x000, x001); + x1 = std::max (x1, x011); + x1 = std::max (x1, x111); + y1 = std::max (y000, y001); + y1 = std::max (y1, y011); + y1 = std::max (y1, y111); if (best) { /* Quickly adjust to endpoints */ -- cgit v1.2.3