diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-01-01 18:24:47 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-01-01 18:24:47 +0000 |
| commit | 0b3b386881da011ac7ee60dd20bd610fd9670677 (patch) | |
| tree | 59d08dfb788ebbe333fa21140fcd8203faadc356 | |
| parent | merge from trunk (r11952) (diff) | |
| parent | clip path visual bbox refresh, second try (Bug 1005085) (diff) | |
| download | inkscape-0b3b386881da011ac7ee60dd20bd610fd9670677.tar.gz inkscape-0b3b386881da011ac7ee60dd20bd610fd9670677.zip | |
merge from trunk (r12005)
(bzr r11668.1.47)
115 files changed, 7532 insertions, 6322 deletions
diff --git a/configure.ac b/configure.ac index 7e3159302..dad532a28 100644 --- a/configure.ac +++ b/configure.ac @@ -696,7 +696,7 @@ AC_ARG_ENABLE(wpg, with_libvisio=no if test "x$enable_visio" = "xyes"; then - PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.15 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no) + PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.20 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no) if test "x$with_libvisio" = "xyes"; then AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio]) @@ -9,21 +9,20 @@ # Jose Antonio Salgueiro Aquino <developer@telefonica.net>, 2003. # Francisco Javier F. Serrador <serrador@arrakis.es>, 2003. # Lucas Vieites Fariña <lucas@codexion.com>, 2003-2010. -#: ../share/filters/filters.svg.h:1 msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-10-08 22:42+0200\n" -"PO-Revision-Date: 2010-12-21 10:36+0100\n" -"Last-Translator: \n" -"Language-Team: <en@li.org>\n" -"Language: \n" +"POT-Creation-Date: 2012-10-25 13:31+0200\n" +"PO-Revision-Date: 2012-12-14 11:25+0100\n" +"Last-Translator: Lucas Vieites <lucas.vieites@gmail.com>\n" +"Language-Team: Inkscape translators <inkscape-translator@lists.sourceforge." +"net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Poedit 1.5.4\n" #: ../inkscape.desktop.in.h:1 msgid "Create and edit Scalable Vector Graphics images" @@ -38,16 +37,14 @@ msgid "Inkscape Vector Graphics Editor" msgstr "Editor de gráficos vectoriales Inkscape" #: ../inkscape.desktop.in.h:4 -#, fuzzy msgid "New Drawing" -msgstr "Dibujo" +msgstr "Dibujo nuevo" #: ../inkscape.desktop.in.h:5 msgid "Vector Graphics Editor" msgstr "Editor de gráficos vectoriales" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Smart Jelly" msgstr "Gelatina inteligente" @@ -63,7 +60,6 @@ msgid "Same as Matte jelly but with more controls" msgstr "Igual que gelatina mate pero con más controles" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Metal Casting" msgstr "Metal fundido" @@ -89,7 +85,6 @@ msgid "Edges are partly feathered out" msgstr "Los bordes son parcialmente difuminados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Jigsaw Piece" msgstr "Pieza de puzle" @@ -98,7 +93,6 @@ msgid "Low, sharp bevel" msgstr "Bisel bajo, agudo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Rubber Stamp" msgstr "Sello de goma" @@ -112,7 +106,6 @@ msgid "Random whiteouts inside" msgstr "Parches de nieve aleatorios" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Ink Bleed" msgstr "Exceso de tinta" @@ -141,7 +134,6 @@ msgid "Soft, cushion-like bevel with matte highlights" msgstr "Bisel suave, como un cojín, con realces mates" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Ridged Border" msgstr "Borde rugoso" @@ -172,7 +164,6 @@ msgid "Fill object with sparse translucent specks" msgstr "Rellenar el objeto con motas traslúcidas diseminadas" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Oil Slick" msgstr "Marea negra" @@ -189,7 +180,6 @@ msgid "Flake-like white splotches" msgstr "Manchones blancos como copos de nieve" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Leopard Fur" msgstr "Piel de leopardo" @@ -225,7 +215,6 @@ msgstr "Enfocar" #: ../share/filters/filters.svg.h:1 #: ../src/extension/internal/filter/image.h:62 -#, fuzzy msgid "Image Effects" msgstr "Efectos de imagen" @@ -234,7 +223,6 @@ msgid "Sharpen edges and boundaries within the object, force=0.15" msgstr "Agudizar los bordes y límites dentro del objeto, fuerza=0.15" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Sharpen More" msgstr "Agudizar más" @@ -252,11 +240,11 @@ msgstr "Pintura al óleo" #: ../src/extension/internal/filter/paint.h:364 #: ../src/extension/internal/filter/paint.h:508 #: ../src/extension/internal/filter/paint.h:603 -#: ../src/extension/internal/filter/paint.h:727 -#: ../src/extension/internal/filter/paint.h:879 -#: ../src/extension/internal/filter/paint.h:983 +#: ../src/extension/internal/filter/paint.h:726 +#: ../src/extension/internal/filter/paint.h:878 +#: ../src/extension/internal/filter/paint.h:982 msgid "Image Paint and Draw" -msgstr "" +msgstr "Pintar y dibujar imagen" #: ../share/filters/filters.svg.h:1 msgid "Simulate oil painting style" @@ -301,7 +289,6 @@ msgid "Bulging, knotty, slick 3D surface" msgstr "Superficie 3D abultada, nudosa, resbaladiza" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Barbed Wire" msgstr "Alambre de espinas" @@ -310,7 +297,6 @@ msgid "Gray bevelled wires with drop shadows" msgstr "Cables grises biselados con sombras paralelas" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Swiss Cheese" msgstr "Queso suizo" @@ -319,7 +305,6 @@ msgid "Random inner-bevel holes" msgstr "Agujeros aleatorios con bisel interior" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Blue Cheese" msgstr "Queso azul" @@ -357,16 +342,14 @@ msgid "Random paint streaks downwards" msgstr "Trazos aleatorios de pintura hacia abajo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Jam Spread" -msgstr "Mermelada extendida" +msgstr "Mermelada" #: ../share/filters/filters.svg.h:1 msgid "Glossy clumpy jam spread" msgstr "Mermelada brillante con tropezones extendida" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Pixel Smear" msgstr "Emborronado de píxeles" @@ -375,7 +358,6 @@ msgid "Van Gogh painting effect for bitmaps" msgstr "Efecto de pintura de Van Gogh para mapas de bits" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Cracked Glass" msgstr "Vidrio roto" @@ -398,7 +380,6 @@ msgid "Flexible bubbles effect with some displacement" msgstr "Efecto de burbujas flexible con algo de desplazamiento" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Glowing Bubble" msgstr "Burbuja radiante" @@ -419,7 +400,6 @@ msgid "Neon light effect" msgstr "Efecto de luz de neón" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Molten Metal" msgstr "Metal fundido" @@ -428,7 +408,6 @@ msgid "Melting parts of object together, with a glossy bevel and a glow" msgstr "Fusionar partes de un objeto, con un bisel brillante" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Pressed Steel" msgstr "Acero prensado" @@ -437,7 +416,6 @@ msgid "Pressed metal with a rolled edge" msgstr "Metal prensado con un borde enrollado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Matte Bevel" msgstr "Bisel mate" @@ -454,7 +432,6 @@ msgid "Thin like a soap membrane" msgstr "Membrana delgado como de jabón" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Matte Ridge" msgstr "Cresta mate" @@ -463,7 +440,6 @@ msgid "Soft pastel ridge" msgstr "Cresta suave pastel" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Glowing Metal" msgstr "Metal radiante" @@ -493,7 +469,6 @@ msgid "Illuminated translucent plastic or glass effect" msgstr "Efecto de plástico o vidrio iluminado traslúcido" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Iridescent Beeswax" msgstr "Cera de abejas iridescente" @@ -504,7 +479,6 @@ msgstr "" "relleno" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Eroded Metal" msgstr "Metal erosionado" @@ -529,7 +503,6 @@ msgid "Bark texture, vertical; use with deep colors" msgstr "Textura de corteza, vertical; usar con colores profundos" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Lizard Skin" msgstr "Piel de lagarto" @@ -538,7 +511,6 @@ msgid "Stylized reptile skin texture" msgstr "Textura de reptil estilizada" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Stone Wall" msgstr "Pared de piedra" @@ -548,7 +520,6 @@ msgstr "" "Textura de pared de piedra para usar con colores no demasiado saturados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Silk Carpet" msgstr "Alfombra de seda" @@ -557,7 +528,6 @@ msgid "Silk carpet texture, horizontal stripes" msgstr "Textura de alfombra de seda, rayas horizontales" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Refractive Gel A" msgstr "Gel refractivo A" @@ -566,7 +536,6 @@ msgid "Gel effect with light refraction" msgstr "Efecto de gel con una ligera refracción" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Refractive Gel B" msgstr "Gel refractivo B" @@ -575,7 +544,6 @@ msgid "Gel effect with strong refraction" msgstr "Efecto de gel con una fuerte refracción" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Metallized Paint" msgstr "Pintura metalizada" @@ -594,7 +562,6 @@ msgid "Gel Ridge with a pearlescent look" msgstr "Cresta de gel con aspecto nacarado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Raised Border" msgstr "Borde elevado" @@ -603,7 +570,6 @@ msgid "Strongly raised border around a flat surface" msgstr "Borde fuertemente elevado alrededor de una superficie plana" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Metallized Ridge" msgstr "Cresta metalizada" @@ -612,7 +578,6 @@ msgid "Gel Ridge metallized at its top" msgstr "Cresta de gel, metalizada en la cumbre" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Fat Oil" msgstr "Aceite denso" @@ -621,7 +586,6 @@ msgid "Fat oil with some adjustable turbulence" msgstr "Aceite denso con turbulencia ajustable" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Black Hole" msgstr "Agujero negro" @@ -645,7 +609,6 @@ msgid "Scattered cubes; adjust the Morphology primitive to vary size" msgstr "Cubos esparcidos; ajuste la primitiva Morfología para variar el tamaño" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Peel Off" msgstr "Pelar" @@ -654,7 +617,6 @@ msgid "Peeling painting on a wall" msgstr "Pintura pelada en una pared" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Gold Splatter" msgstr "Salpicadura dorada" @@ -663,7 +625,6 @@ msgid "Splattered cast metal, with golden highlights" msgstr "Salpicaduras de metal con brillos dorados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Gold Paste" msgstr "Pasta dorada" @@ -672,7 +633,6 @@ msgid "Fat pasted cast metal, with golden highlights" msgstr "Metal fundido con brillos dorados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Crumpled Plastic" msgstr "Plástico arrugado" @@ -681,7 +641,6 @@ msgid "Crumpled matte plastic, with melted edge" msgstr "Plástico mate arrugado, con borde derretido" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Enamel Jewelry" msgstr "Joyería de esmalte" @@ -690,7 +649,6 @@ msgid "Slightly cracked enameled texture" msgstr "Textura de esmalte ligeramente agrietado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Rough Paper" msgstr "Papel áspero" @@ -701,7 +659,6 @@ msgstr "" "para objetos" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Rough and Glossy" msgstr "Áspero y brillante" @@ -721,7 +678,6 @@ msgid "Inner colorized shadow, outer black shadow" msgstr "Sombra colorizada dentro, sombra negra fuera" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Air Spray" msgstr "Spray de aire" @@ -730,7 +686,6 @@ msgid "Convert to small scattered particles with some thickness" msgstr "Convertir a partículas diseminadas con algún grosor" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Warm Inside" msgstr "Calor dentro" @@ -739,7 +694,6 @@ msgid "Blurred colorized contour, filled inside" msgstr "Contorno colorizado difuminado, relleno por dentro" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Cool Outside" msgstr "Frío fuera" @@ -748,7 +702,6 @@ msgid "Blurred colorized contour, empty inside" msgstr "Contorno colorizado difuminado, vacío por dentro" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Electronic Microscopy" msgstr "Microscopía electrónica" @@ -767,7 +720,6 @@ msgid "Checkered tartan pattern" msgstr "Patrón de cuadros escoceses" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Shaken Liquid" msgstr "Líquido batido" @@ -776,7 +728,6 @@ msgid "Colorizable filling with flow inside like transparency" msgstr "Relleno colorizable con fluido interior como transparencia" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Soft Focus Lens" msgstr "Lente de foco suave" @@ -785,7 +736,6 @@ msgid "Glowing image content without blurring it" msgstr "Contenido de imagen brillante sin difuminar" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Stained Glass" msgstr "Vidriera" @@ -794,7 +744,6 @@ msgid "Illuminated stained glass effect" msgstr "Efecto de vidriera iluminada" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Dark Glass" msgstr "Vidrio oscuro" @@ -803,7 +752,6 @@ msgid "Illuminated glass effect with light coming from beneath" msgstr "Efecto de vidrio iluminado con luz desde abajo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "HSL Bumps Alpha" msgstr "Bultos alfa HSL" @@ -812,7 +760,6 @@ msgid "Same as HSL Bumps but with transparent highlights" msgstr "Igual que los bultos HSL pero con brillos transparentes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Bubbly Bumps Alpha" msgstr "Bultos burbujeantes, alfa" @@ -821,7 +768,6 @@ msgid "Same as Bubbly Bumps but with transparent highlights" msgstr "Igual que los bultos burbujeantes pero con brillos transparentes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Torn Edges" msgstr "Bordes rasgados" @@ -832,7 +778,6 @@ msgstr "" "Desplazar la parte exterior de formas e imágenes sin alterar su contenido" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Roughen Inside" msgstr "Áspero por dentro" @@ -853,7 +798,6 @@ msgstr "" "transparencia progresiva en los bordes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Chalk and Sponge" msgstr "Tiza y esponja" @@ -906,7 +850,6 @@ msgid "Emboss effect : 3D relief where white is replaced by black" msgstr "Efecto de repujado: relieve 3D en el que el negro reemplaza al blanco" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Bubbly Bumps Matte" msgstr "Bultos burbujeantes, mate" @@ -916,7 +859,6 @@ msgstr "" "Igual que los bultos burbujeantes pero con luz difusa en vez de especular" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Blotting Paper" msgstr "Papel secante" @@ -925,7 +867,6 @@ msgid "Inkblot on blotting paper" msgstr "Mancha de tinta sobre papel secante" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Wax Print" msgstr "Impresión de cera" @@ -953,7 +894,6 @@ msgstr "" "bordes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Ink Paint" msgstr "Pintura de tinta" @@ -962,7 +902,6 @@ msgid "Ink paint on paper with some turbulent color shift" msgstr "Pintura de tinta sobre papel con algún cambio de color turbulento" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Tinted Rainbow" msgstr "Arco iris tintado" @@ -972,7 +911,6 @@ msgstr "" "Colores del arco iris derretidos a lo largo de los bordes y colorizables" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Melted Rainbow" msgstr "Arco iris derretido" @@ -982,7 +920,6 @@ msgstr "" "Colores del arco iris suaves, ligeramente derretidos a lo largo de los bordes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Flex Metal" msgstr "Metal flexible" @@ -991,7 +928,6 @@ msgid "Bright, polished uneven metal casting, colorizable" msgstr "Fundición de metal pulido, desigual y colorizable" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Wavy Tartan" msgstr "Tartán ondulado" @@ -1000,7 +936,6 @@ msgid "Tartan pattern with a wavy displacement and bevel around the edges" msgstr "Patrón de tartán con un desplazamiento ondulado y bisel en los bordes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "3D Marble" msgstr "Mármol 3D" @@ -1010,14 +945,13 @@ msgstr "Textura de mármol distorsionado en 3D" #: ../share/filters/filters.svg.h:1 msgid "3D Wood" -msgstr "" +msgstr "Madera 3D" #: ../share/filters/filters.svg.h:1 msgid "3D warped, fibered wood texture" msgstr "Textura de madera fibrosa distrosionada en 3D" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "3D Mother of Pearl" msgstr "Nácar 3D" @@ -1026,7 +960,6 @@ msgid "3D warped, iridescent pearly shell texture" msgstr "Textura de concha nacarada iridescente distorsionada en 3D" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Tiger Fur" msgstr "Piel de tigre" @@ -1067,8 +1000,8 @@ msgstr "Luz negra" #: ../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:715 -#: ../src/extension/internal/filter/paint.h:719 +#: ../src/extension/internal/filter/paint.h:714 +#: ../src/extension/internal/filter/paint.h:718 #: ../src/extension/internal/filter/shadows.h:71 #: ../src/extension/internal/filter/transparency.h:345 #: ../src/ui/dialog/document-properties.cpp:148 @@ -1101,7 +1034,6 @@ msgid "Light areas turn to black" msgstr "Las áreas blancas se convierten en negro" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Film Grain" msgstr "Granulado de película" @@ -1110,14 +1042,12 @@ msgid "Adds a small scale graininess" msgstr "Añade una pequeña granularidad" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Plaster Color" -msgstr "Pegar color" +msgstr "Yeso de color" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Colored plaster emboss effect" -msgstr "Efecto de acuarela nubosa" +msgstr "Efecto de repujado de yeso de color" #: ../share/filters/filters.svg.h:1 msgid "Velvet Bumps" @@ -1128,7 +1058,6 @@ msgid "Gives Smooth Bumps velvet like" msgstr "Añadir bulto suave aterciopelado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Comics Cream" msgstr "Crema de cómic" @@ -1141,9 +1070,8 @@ msgid "Comics shader with creamy waves transparency" msgstr "Difusor de cómic con transparencia de ondas cremosas" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Chewing Gum" -msgstr "Goma de mascar" +msgstr "Chicle" #: ../share/filters/filters.svg.h:1 msgid "" @@ -1154,7 +1082,6 @@ msgstr "" "líneas en sus cruces" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Dark And Glow" msgstr "Oscuro y brillo" @@ -1164,7 +1091,6 @@ msgstr "" "Oscurece el borde con un desenfoque interior y añade un brillo flexible" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Warped Rainbow" msgstr "Arco iris arrojado" @@ -1174,7 +1100,6 @@ msgstr "" "Colores del arco iris arrojados a lo largo de los bordes y colorizables" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Rough and Dilate" msgstr "Áspero y dilatar" @@ -1183,7 +1108,6 @@ msgid "Create a turbulent contour around" msgstr "Crea un contorno turbulento" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Old Postcard" msgstr "Postal antigua" @@ -1193,7 +1117,6 @@ msgstr "" "Posterizar ligeramente y dibujar bordes como en tarjetas postales antiguas" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Dots Transparency" msgstr "Transparencia de puntos" @@ -1202,17 +1125,14 @@ msgid "Gives a pointillist HSL sensitive transparency" msgstr "Proporciona una transparencia puntillista sensible a HSL" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Canvas Transparency" msgstr "Transparencia de lienzo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Gives a canvas like HSL sensitive transparency." msgstr "Proporciona una transparencia similar al lienzo sensible a HSL" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Smear Transparency" msgstr "Transparencia de borrón" @@ -1223,7 +1143,6 @@ msgstr "" "Pintar objetos con una turbulencia transparente que envuelve bordes de color" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Thick Paint" msgstr "Pintura espesa" @@ -1240,7 +1159,6 @@ msgid "Burst balloon texture crumpled and with holes" msgstr "Textura de globo reventado, arrugado y con agujeros" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Embossed Leather" msgstr "Cuero repujado" @@ -1284,7 +1202,6 @@ msgstr "" "y arrugada" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Rough Transparency" msgstr "Transparencia bruta" @@ -1301,7 +1218,6 @@ msgid "Partly opaque water color effect with bleed" msgstr "Efecto de acuarela diluida con sangrado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Alpha Engraving" msgstr "Grabado alfa" @@ -1310,7 +1226,6 @@ msgid "Gives a transparent engraving effect with rough line and filling" msgstr "Añade un efecto de grabado transparente con línea dura y relleno" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Alpha Draw Liquid" msgstr "Dibujo alfa, líquido" @@ -1320,7 +1235,6 @@ msgstr "" "Proporciona un efecto de dibujo fluido transparente con línea bruta y relleno" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Liquid Drawing" msgstr "Dibujo líquido" @@ -1330,7 +1244,6 @@ msgstr "" "Proporciona un efecto de dibujo expresionista fluido y ondulado a imágenes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Marbled Ink" msgstr "Tinta marmoleada" @@ -1341,7 +1254,6 @@ msgstr "" "la imagen" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Thick Acrylic" msgstr "Acrílica espeso" @@ -1350,7 +1262,6 @@ msgid "Thick acrylic paint texture with high texture depth" msgstr "Textura de pintura acrílica espesa con profundidad de textura" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Alpha Engraving B" msgstr "Grabado alfa B" @@ -1370,7 +1281,6 @@ msgid "Something like a water noise" msgstr "Algo parecido al sonido del agua" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Monochrome Transparency" msgstr "Transparencia monocromática" @@ -1380,16 +1290,14 @@ msgstr "Transparencia monocromática" #: ../src/extension/internal/filter/transparency.h:215 #: ../src/extension/internal/filter/transparency.h:288 #: ../src/extension/internal/filter/transparency.h:350 -#, fuzzy msgid "Fill and Transparency" -msgstr "Transparencia de diálogos" +msgstr "Relleno y transparencia" #: ../share/filters/filters.svg.h:1 msgid "Convert to a colorizable transparent positive or negative" msgstr "Convertir a un positivo o negativo colorizable transparente" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Saturation Map" msgstr "Mapa de saturación" @@ -1410,7 +1318,6 @@ msgid "Riddle the surface and add bump to images" msgstr "Acribillar la superficie y añadir bultos a imágenes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Wrinkled Varnish" msgstr "Barniz arrugado" @@ -1427,9 +1334,8 @@ msgid "Canvas texture with an HSL sensitive height map" msgstr "Textura de lienzo con un mapa de altura sensible a HSL" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Canvas Bumps Matte" -msgstr "Bultos de lienzo" +msgstr "Bultos de lienzo, mate" #: ../share/filters/filters.svg.h:1 msgid "Same as Canvas Bumps but with a diffuse light instead of a specular one" @@ -1437,7 +1343,6 @@ msgstr "" "Igual que las los bultos de lienzo pero con luz difusa en vez de especular" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Canvas Bumps Alpha" msgstr "Bultos de lienzo alfa" @@ -1446,7 +1351,6 @@ msgid "Same as Canvas Bumps but with transparent highlights" msgstr "Igual que las los bultos de lienzo pero con brillos transparentes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Bright Metal" msgstr "Metal luminoso" @@ -1455,7 +1359,6 @@ msgid "Bright metallic effect for any color" msgstr "Efecto metálico luminoso para cualquier color" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Deep Colors Plastic" msgstr "Plástico con colores profundos" @@ -1464,7 +1367,6 @@ msgid "Transparent plastic with deep colors" msgstr "Plástico transparente con colores profundos" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Melted Jelly Matte" msgstr "Gelatina fundida, mate" @@ -1473,7 +1375,6 @@ msgid "Matte bevel with blurred edges" msgstr "Bisel mate con bordes difuminados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Melted Jelly" msgstr "Gelatina fundida" @@ -1482,7 +1383,6 @@ msgid "Glossy bevel with blurred edges" msgstr "Bisel brillante con bordes difuminados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Combined Lighting" msgstr "Iluminación combinada" @@ -1502,7 +1402,6 @@ msgstr "" "variables" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Soft Colors" msgstr "Color suaves" @@ -1511,7 +1410,6 @@ msgid "Adds a colorizable edges glow inside objects and pictures" msgstr "Añade un brillo de bordes colorizables dentro de objetos e imágenes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Relief Print" msgstr "Impresión en relieve" @@ -1520,7 +1418,6 @@ msgid "Bumps effect with a bevel, color flood and complex lighting" msgstr "Abulta el efecto con un bisel, relleno de color e iluminación compleja" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Growing Cells" msgstr "Células crecientes" @@ -1537,114 +1434,100 @@ msgid "Oversaturate colors which can be fluorescent in real world" msgstr "Sobresaturar colores que pueden ser fluorescentes en el mundo real" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Pixellize" -msgstr "Pixel" +msgstr "Pixelizar" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Pixel tools" -msgstr "Píxeles" +msgstr "Herramientas de píxeles" #: ../share/filters/filters.svg.h:1 msgid "Reduce or remove antialiasing around shapes" -msgstr "" +msgstr "Reducir o eliminar antialiasing alrededor de formas" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Set Resolution" -msgstr "Resolución:" +msgstr "Fijar resolución" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Set filter resolution" -msgstr "Resolución de exportación predeterminada:" +msgstr "Fijar la resolución del filtro" #: ../share/filters/filters.svg.h:1 msgid "Basic Diffuse Bump" -msgstr "" +msgstr "Bulto difuso básico" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Matte emboss effect" -msgstr "Eliminar efectos" +msgstr "Efecto de repujado mate" #: ../share/filters/filters.svg.h:1 msgid "Basic Specular Bump" -msgstr "" +msgstr "Bulto especular básico" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Specular emboss effect" -msgstr "Exponente especular" +msgstr "Efecto de repujado especular" #: ../share/filters/filters.svg.h:1 msgid "Basic Two Lights Bump" -msgstr "" +msgstr "Bulto de dos luces básico" #: ../share/filters/filters.svg.h:1 msgid "Two types of lighting emboss effect" -msgstr "" +msgstr "Dos tipos de efecto de repujado ligero" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Linen Canvas" -msgstr "Lienzo" +msgstr "Lienzo de lino" #: ../share/filters/filters.svg.h:1 msgid "Painting canvas emboss effect" -msgstr "" +msgstr "Efecto de repujado de lienzo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Plasticine" -msgstr "Yeso" +msgstr "Plastilina" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Matte modeling paste emboss effect" -msgstr "Pegar efecto de trayecto vivo" +msgstr "Efecto de repujado de plastilina mate" #: ../share/filters/filters.svg.h:1 msgid "Rough Canvas Painting" -msgstr "" +msgstr "Pintura de lienzo áspero" #: ../share/filters/filters.svg.h:1 msgid "Paper Bump" -msgstr "" +msgstr "Bulto de papel" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Paper like emboss effect" -msgstr "Pegar efecto de trayecto vivo" +msgstr "Efecto de repujado similar al papel" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Jelly Bump" -msgstr "Bultos burbujeantes" +msgstr "Bultos de gelatina" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Convert pictures to thick jelly" -msgstr "Convertir textos en trayectos" +msgstr "Convertir imágenes a gelatina densa" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Blend Opposites" -msgstr "Modo de me_zcla:" +msgstr "Mezclar opuestos" #: ../share/filters/filters.svg.h:1 msgid "Blend an image with its hue opposite" -msgstr "" +msgstr "Fundir una imagen con su opuesto tonal" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Hue to White" -msgstr "Rotar tono" +msgstr "Tono a blanco" #: ../share/filters/filters.svg.h:1 msgid "Fades hue progressively to white" -msgstr "" +msgstr "Desvanece el tono progresivamente a blanco" #: ../share/filters/filters.svg.h:1 #: ../src/extension/internal/bitmap/swirl.cpp:37 @@ -1652,186 +1535,166 @@ msgid "Swirl" msgstr "Arremolinar" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "" "Paint objects with a transparent turbulence which wraps around color edges" msgstr "" "Pintar objetos con una turbulencia transparente que envuelve bordes de color" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Pointillism" -msgstr "Puntos" +msgstr "Puntillismo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Gives a turbulent pointillist HSL sensitive transparency" -msgstr "Proporciona una transparencia puntillista sensible a HSL" +msgstr "Proporciona una turbulencia puntillista sensible a transparencia HSL" #: ../share/filters/filters.svg.h:1 msgid "Silhouette Marbled" -msgstr "" +msgstr "Silueta de mármol" #: ../share/filters/filters.svg.h:1 msgid "Basic noise transparency texture" msgstr "Textura básica de transparencia de ruido" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Fill Background" -msgstr "Color de fondo" +msgstr "Rellenar fondo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Adds a colorizable opaque background" -msgstr "Añade una sombra interios colorizable" +msgstr "Añade un fondo opaco colorizable" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Flatten Transparency" -msgstr "Transparencia de diálogos" +msgstr "Aplanar transparencia" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Adds a white opaque background" -msgstr "Eliminar color de fondo" +msgstr "Añade un fondo blanco opaco" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Fill Area" -msgstr "Aplicar color de relleno" +msgstr "Área de relleno" #: ../share/filters/filters.svg.h:1 msgid "Fills object bounding box with color" -msgstr "" +msgstr "Rellena la caja de contorno del objeto con color" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Blur Double" -msgstr "Modo desenfoque" +msgstr "Desenfoque doble" #: ../share/filters/filters.svg.h:1 msgid "" "Overlays two copies with different blur amounts and modifiable blend and " "composite" msgstr "" +"Superpone dos copias con diferentes cantidades de desenfoque, mezcla y " +"composición modificables" #: ../share/filters/filters.svg.h:1 msgid "Image Drawing Basic" -msgstr "" +msgstr "Dibujo de imagen básico" #: ../share/filters/filters.svg.h:1 msgid "Enhance and redraw color edges in 1 bit black and white" -msgstr "" +msgstr "Mejorar y redibujar bordes de color en blanco y negro de 1 bit" #: ../share/filters/filters.svg.h:1 msgid "Poster Draw" -msgstr "" +msgstr "Dibujo póster" #: ../share/filters/filters.svg.h:1 msgid "Enhance and redraw edges around posterized areas" -msgstr "" +msgstr "Mejorar y redibujar bordes alrededor de áreas posterizadas" #: ../share/filters/filters.svg.h:1 msgid "Cross Noise Poster" -msgstr "" +msgstr "Póster de ruido cruzado" #: ../share/filters/filters.svg.h:1 msgid "Overlay with a small scale screen like noise" -msgstr "" +msgstr "Revestimiento con ruido a pequeña escala similar a pantalla" #: ../share/filters/filters.svg.h:1 msgid "Cross Noise Poster B" -msgstr "" +msgstr "Póster de ruido cruzado B" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Adds a small scale screen like noise locally" -msgstr "Añade una pequeña granularidad" +msgstr "Añade ruido de pantalla a pequeña escala localmente" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Poster Color Fun" -msgstr "Pegar color" +msgstr "Diversión de color de póster" #: ../share/filters/filters.svg.h:1 msgid "Poster Rough" -msgstr "" +msgstr "Póster áspero" #: ../share/filters/filters.svg.h:1 msgid "Adds roughness to one of the two channels of the Poster paint filter" -msgstr "" +msgstr "Añade aspereza a uno de los canales de filtro Pintura de póster" #: ../share/filters/filters.svg.h:1 msgid "Alpha Monochrome Cracked" -msgstr "" +msgstr "Alfa monocromático roto" #: ../share/filters/filters.svg.h:1 msgid "Basic noise fill texture; adjust color in Flood" msgstr "Textura de relleno de ruido básico; ajuste el color en Relleno" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Alpha Turbulent" -msgstr "Repintado alfa" +msgstr "Alfa Turbulento" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Colorize Turbulent" -msgstr "Colorizar" +msgstr "Colorizar turbulento" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Cross Noise B" -msgstr "Ruido de Poisson" +msgstr "Ruido de Poisson B" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Adds a small scale crossy graininess" -msgstr "Añade una pequeña granularidad" +msgstr "Añade una granularidad a pequeña escala" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Cross Noise" msgstr "Ruido de Poisson" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Adds a small scale screen like graininess" -msgstr "Añade una pequeña granularidad" +msgstr "Añade una pequeña granularidad de tipo pantalla" #: ../share/filters/filters.svg.h:1 msgid "Duotone Turbulent" -msgstr "" +msgstr "Duotono turbulento" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Light Eraser Cracked" -msgstr "Borrador claro" +msgstr "Borrador claro roto" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Poster Turbulent" -msgstr "Turbulencia" +msgstr "Turbulencia póster" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Tartan Smart" -msgstr "Tartán" +msgstr "Tartán " #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Highly configurable checkered tartan pattern" -msgstr "Patrón de cuadros escoceses" +msgstr "Patrón de cuadros escoceses muy configurable" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Light Contour" -msgstr "Fuente de luz:" +msgstr "Contorno de luz" #: ../share/filters/filters.svg.h:1 msgid "Uses vertical specular light to draw lines" -msgstr "" +msgstr "Usa luz especular vertical para trazar líneas" #: ../share/filters/filters.svg.h:1 msgid "Liquid" @@ -1846,21 +1709,18 @@ msgid "Aluminium" msgstr "Aluminio" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Aluminium effect with sharp brushed reflections" -msgstr "Efecto de gel con una fuerte refracción" +msgstr "Efecto aluminio con reflejos nítidos pulidos" #: ../share/filters/filters.svg.h:1 msgid "Comics" msgstr "Cómics" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Comics cartoon drawing effect" -msgstr "Fluido pulido estitlo cómic" +msgstr "Fluido pulido estilo cómic" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Comics Draft" msgstr "Boceto de cómic" @@ -1869,7 +1729,6 @@ msgid "Draft painted cartoon shading with a glassy look" msgstr "Sombreado de boceto de cómic con un aspecto vidrioso" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Comics Fading" msgstr "Difuminado de cómics " @@ -1878,18 +1737,16 @@ msgid "Cartoon paint style with some fading at the edges" msgstr "Estilo de dibujo de cómic con un ligero difuminado en los bordes" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Brushed Metal" -msgstr "Metal erosionado" +msgstr "Metal pulido" #: ../share/filters/filters.svg.h:1 msgid "Satiny metal surface effect" -msgstr "" +msgstr "Efecto de superficie de metal satinado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Opaline" -msgstr "Contorno" +msgstr "Opalino" #: ../share/filters/filters.svg.h:1 msgid "Contouring version of smooth shader" @@ -1900,1025 +1757,992 @@ msgid "Chrome" msgstr "Cromado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Bright chrome effect" -msgstr "Metal luminoso" +msgstr "Efecto de metal brillante" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Deep Chrome" -msgstr "Cromado" +msgstr "Cromado profundo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Dark chrome effect" -msgstr "Efecto actual" +msgstr "Efecto de cromo oscuro" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Emboss Shader" msgstr "Sombreador de repujado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Combination of satiny and emboss effect" -msgstr "Combinación de sombreado suave y repujado" +msgstr "Combinación de efectos satinado y repujado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Sharp Metal" -msgstr "Enfocar" +msgstr "Metal afilado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Chrome effect with darkened edges" -msgstr "Metal prensado con un borde enrollado" +msgstr "Efecto cromado con bordes oscurecidos" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Brush Draw" -msgstr "Brocha" +msgstr "Trazo de brocha" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Chrome Emboss" -msgstr "Repujado oscuro" +msgstr "Repujado cromado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Embossed chrome effect" -msgstr "Eliminar efecto de trayecto" +msgstr "Efecto de cromo repujado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Contour Emboss" -msgstr "Repujado de color" +msgstr "Repujado de contorno" #: ../share/filters/filters.svg.h:1 msgid "Satiny and embossed contour effect" -msgstr "" +msgstr "Efecto de contorno satinado y repujado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Sharp Deco" -msgstr "Enfocar" +msgstr "Deco nítido" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Unrealistic reflections with sharp edges" -msgstr "Metal prensado con un borde enrollado" +msgstr "Reflejos no realistas con bordes nítidos" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Deep Metal" -msgstr "Metal flexible" +msgstr "Metal profundo" #: ../share/filters/filters.svg.h:1 msgid "Deep and dark metal shading" -msgstr "" +msgstr "Sombreado de metal profundo y oscuro" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Aluminium Emboss" -msgstr "Aluminio" +msgstr "Repujado de aluminio" #: ../share/filters/filters.svg.h:1 msgid "Satiny aluminium effect with embossing" -msgstr "" +msgstr "Efecto de aluminio satinado con repujado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Refractive Glass" -msgstr "Gel refractivo A" +msgstr "Vidrio refractivo" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Double reflection through glass with some refraction" -msgstr "Efecto de gel con una fuerte refracción" +msgstr "Doble reflejo a través de vidrio con algo de refracción" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Frosted Glass" -msgstr "Cristal helado" +msgstr "Vidrio helado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Satiny glass effect" -msgstr "Efecto de vidriera iluminada" +msgstr "Efecto de vidrio satinado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Bump Engraving" -msgstr "Grabado alfa" +msgstr "Grabado de bulto (bump)" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Carving emboss effect" -msgstr "Pegar efecto de trayecto vivo" +msgstr "Efecto de repujado tallado" #: ../share/filters/filters.svg.h:1 msgid "Chromolitho Alternate" -msgstr "" +msgstr "Cromolito alternativo" #: ../share/filters/filters.svg.h:1 msgid "Old chromolithographic effect" -msgstr "" +msgstr "Efecto cromolitográfico antiguo" #: ../share/filters/filters.svg.h:1 msgid "Convoluted Bump" -msgstr "" +msgstr "Bulto convolucionado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Convoluted emboss effect" -msgstr "Efecto de acuarela nubosa" +msgstr "Efecto de repujado convolucionado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Emergence" -msgstr "Divergencia" +msgstr "Emergencia" #: ../share/filters/filters.svg.h:1 msgid "Cut out, add inner shadow and colorize some parts of an image" -msgstr "" +msgstr "Recorte, añade sombra interior y coloriza algunas partes de una imagen" #: ../share/filters/filters.svg.h:1 msgid "Litho" -msgstr "" +msgstr "Lito" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Create a two colors lithographic effect" -msgstr "Crear y aplicar un efecto de trayecto" +msgstr "Crea un efecto litográfico de dos colores" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Paint Channels" -msgstr "Canal cian" +msgstr "Canales de relleno" #: ../share/filters/filters.svg.h:1 msgid "Colorize separately the three color channels" -msgstr "" +msgstr "Colorizar los tres canales de relleno por separado" #: ../share/filters/filters.svg.h:1 -#, fuzzy -msgid "Posterized Light Eraser 4" -msgstr "Borrador claro" +msgid "Posterized Light Eraser" +msgstr "Borrador claro posterizado" #: ../share/filters/filters.svg.h:1 msgid "Create a semi transparent posterized image" -msgstr "" +msgstr "Crea una imagen posterizada semitransparente" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Trichrome" -msgstr "Cromado" +msgstr "Tricromado" #: ../share/filters/filters.svg.h:1 msgid "Like Duochrome but with three colors" -msgstr "" +msgstr "Como Duocromado pero con tres colores" #: ../share/filters/filters.svg.h:1 msgid "Simulate CMY" -msgstr "" +msgstr "Simular CMY" #: ../share/filters/filters.svg.h:1 msgid "Render Cyan, Magenta and Yellow channels with a colorizable background" -msgstr "" +msgstr "Generar canales Cián, Magenta y Amarillo con un fondo colorizado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Contouring table" -msgstr "Triángulo de contacto" +msgstr "Tabla de contorneado" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Blurred multiple contours for objects" -msgstr "Contorno colorizado difuminado, vacío por dentro" +msgstr "Varios contornos difunimados para objetos" #: ../share/filters/filters.svg.h:1 msgid "Posterized Blur" -msgstr "" +msgstr "Difuminado posterizado" #: ../share/filters/filters.svg.h:1 msgid "Converts blurred contour to posterized steps" -msgstr "" +msgstr "Convierte el contorno difuminado en pasos posterizados" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Contouring discrete" -msgstr "Elemento acoplable controlador" +msgstr "Contorneado discreto" #: ../share/filters/filters.svg.h:1 -#, fuzzy msgid "Sharp multiple contour for objects" -msgstr "Ajustar a y desde centros de objetos" +msgstr "Contorno nítido múltiple para objetos" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:2 -#, fuzzy msgctxt "Palette" msgid "Black" msgstr "Negro" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:3 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "90% Gray" -msgstr "Gris" +msgstr "Gris 90%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:4 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "80% Gray" -msgstr "Gris" +msgstr "Gris 80%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:5 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "70% Gray" -msgstr "Gris" +msgstr "Gris 70%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:6 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "60% Gray" -msgstr "Gris" +msgstr "Gris 60%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:7 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "50% Gray" -msgstr "Gris" +msgstr "Gris 50%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:8 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "40% Gray" -msgstr "Gris" +msgstr "Gris 40%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:9 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "30% Gray" -msgstr "Gris" +msgstr "Gris 30%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:10 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "20% Gray" -msgstr "Gris" +msgstr "Gris 20%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:11 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "10% Gray" -msgstr "Gris" +msgstr "Gris 10%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:12 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "7.5% Gray" -msgstr "Gris" +msgstr "Gris 7,5%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:13 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "5% Gray" -msgstr "Gris" +msgstr "Gris 5%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:14 -#, fuzzy, no-c-format +#, no-c-format msgctxt "Palette" msgid "2.5% Gray" -msgstr "Gris" +msgstr "Gris 2,5%" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:15 -#, fuzzy msgctxt "Palette" msgid "White" -msgstr "Blanca" +msgstr "Blanco" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:16 msgctxt "Palette" msgid "Maroon (#800000)" -msgstr "" +msgstr "Granate (#800000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:17 msgctxt "Palette" msgid "Red (#FF0000)" -msgstr "" +msgstr "Rojo (#FF0000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:18 msgctxt "Palette" msgid "Olive (#808000)" -msgstr "" +msgstr "Oliva (#808000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:19 msgctxt "Palette" msgid "Yellow (#FFFF00)" -msgstr "" +msgstr "Amarillo (#FFFF00)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:20 msgctxt "Palette" msgid "Green (#008000)" -msgstr "" +msgstr "Verde (#008000)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:21 msgctxt "Palette" msgid "Lime (#00FF00)" -msgstr "" +msgstr "Lima (#00FF00)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:22 msgctxt "Palette" msgid "Teal (#008080)" -msgstr "" +msgstr "Musgo (#008080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:23 msgctxt "Palette" msgid "Aqua (#00FFFF)" -msgstr "" +msgstr "Aguamarina (#00FFFF)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:24 msgctxt "Palette" msgid "Navy (#000080)" -msgstr "" +msgstr "Azul marino (#000080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:25 msgctxt "Palette" msgid "Blue (#0000FF)" -msgstr "" +msgstr "Azul (#0000FF)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:26 msgctxt "Palette" msgid "Purple (#800080)" -msgstr "" +msgstr "Púrpura (#800080)" #. Palette: ./inkscape.gpl #: ../share/palettes/palettes.h:27 msgctxt "Palette" msgid "Fuchsia (#FF00FF)" -msgstr "" +msgstr "Fucsia (#FF00FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:28 msgctxt "Palette" msgid "black (#000000)" -msgstr "" +msgstr "negro (#000000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:29 msgctxt "Palette" msgid "dimgray (#696969)" -msgstr "" +msgstr "gris tenue (#696969)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:30 msgctxt "Palette" msgid "gray (#808080)" -msgstr "" +msgstr "gris (#808080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:31 msgctxt "Palette" msgid "darkgray (#A9A9A9)" -msgstr "" +msgstr "gris oscuro (#A9A9A9)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:32 msgctxt "Palette" msgid "silver (#C0C0C0)" -msgstr "" +msgstr "plata (#C0C0C0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:33 msgctxt "Palette" msgid "lightgray (#D3D3D3)" -msgstr "" +msgstr "gris claro (#D3D3D3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:34 msgctxt "Palette" msgid "gainsboro (#DCDCDC)" -msgstr "" +msgstr "gris gainsboro (#DCDCDC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:35 msgctxt "Palette" msgid "whitesmoke (#F5F5F5)" -msgstr "" +msgstr "humo blanco (#F5F5F5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:36 msgctxt "Palette" msgid "white (#FFFFFF)" -msgstr "" +msgstr "blanco (#FFFFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:37 msgctxt "Palette" msgid "rosybrown (#BC8F8F)" -msgstr "" +msgstr "marrón rosado (#BC8F8F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:38 msgctxt "Palette" msgid "indianred (#CD5C5C)" -msgstr "" +msgstr "rojo de la india (#CD5C5C)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:39 msgctxt "Palette" msgid "brown (#A52A2A)" -msgstr "" +msgstr "marrón (#A52A2A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:40 msgctxt "Palette" msgid "firebrick (#B22222)" -msgstr "" +msgstr "rojo ladrillo (#B22222)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:41 msgctxt "Palette" msgid "lightcoral (#F08080)" -msgstr "" +msgstr "coral claro (#F08080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:42 msgctxt "Palette" msgid "maroon (#800000)" -msgstr "" +msgstr "granate (#800000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:43 msgctxt "Palette" msgid "darkred (#8B0000)" -msgstr "" +msgstr "rojo oscuro (#8B0000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:44 msgctxt "Palette" msgid "red (#FF0000)" -msgstr "" +msgstr "rojo (#FF0000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:45 msgctxt "Palette" msgid "snow (#FFFAFA)" -msgstr "" +msgstr "nieve (#FFFAFA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:46 msgctxt "Palette" msgid "mistyrose (#FFE4E1)" -msgstr "" +msgstr "rosa niebla (#FFE4E1)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:47 msgctxt "Palette" msgid "salmon (#FA8072)" -msgstr "" +msgstr "salmón (#FA8072)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:48 msgctxt "Palette" msgid "tomato (#FF6347)" -msgstr "" +msgstr "tomate (#FF6347)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:49 msgctxt "Palette" msgid "darksalmon (#E9967A)" -msgstr "" +msgstr "salmón oscuro (#E9967A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:50 msgctxt "Palette" msgid "coral (#FF7F50)" -msgstr "" +msgstr "coral (#FF7F50)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:51 msgctxt "Palette" msgid "orangered (#FF4500)" -msgstr "" +msgstr "rojo anaranjado (#FF4500)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:52 msgctxt "Palette" msgid "lightsalmon (#FFA07A)" -msgstr "" +msgstr "salmón claro (#FFA07A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:53 msgctxt "Palette" msgid "sienna (#A0522D)" -msgstr "" +msgstr "sienna (#A0522D)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:54 msgctxt "Palette" msgid "seashell (#FFF5EE)" -msgstr "" +msgstr "concha marina (#FFF5EE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:55 msgctxt "Palette" msgid "chocolate (#D2691E)" -msgstr "" +msgstr "chocolate (#D2691E)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:56 msgctxt "Palette" msgid "saddlebrown (#8B4513)" -msgstr "" +msgstr "marrón cuero (#8B4513)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:57 msgctxt "Palette" msgid "sandybrown (#F4A460)" -msgstr "" +msgstr "marrón arena (#F4A460)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:58 msgctxt "Palette" msgid "peachpuff (#FFDAB9)" -msgstr "" +msgstr "melocotón (#FFDAB9)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:59 msgctxt "Palette" msgid "peru (#CD853F)" -msgstr "" +msgstr "perú (#CD853F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:60 msgctxt "Palette" msgid "linen (#FAF0E6)" -msgstr "" +msgstr "lino (#FAF0E6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:61 msgctxt "Palette" msgid "bisque (#FFE4C4)" -msgstr "" +msgstr "almendra oscura (#FFE4C4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:62 msgctxt "Palette" msgid "darkorange (#FF8C00)" -msgstr "" +msgstr "naranja oscuro (#FF8C00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:63 msgctxt "Palette" msgid "burlywood (#DEB887)" -msgstr "" +msgstr "arena madera (#DEB887)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:64 msgctxt "Palette" msgid "tan (#D2B48C)" -msgstr "" +msgstr "moreno (#D2B48C)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:65 msgctxt "Palette" msgid "antiquewhite (#FAEBD7)" -msgstr "" +msgstr "blanco antiguo (#FAEBD7)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:66 msgctxt "Palette" msgid "navajowhite (#FFDEAD)" -msgstr "" +msgstr "blanco navajo (#FFDEAD)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:67 msgctxt "Palette" msgid "blanchedalmond (#FFEBCD)" -msgstr "" +msgstr "almendra clara (#FFEBCD)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:68 msgctxt "Palette" msgid "papayawhip (#FFEFD5)" -msgstr "" +msgstr "mousse de papaya (#FFEFD5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:69 msgctxt "Palette" msgid "moccasin (#FFE4B5)" -msgstr "" +msgstr "crema (#FFE4B5)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:70 msgctxt "Palette" msgid "orange (#FFA500)" -msgstr "" +msgstr "naranja (#FFA500)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:71 msgctxt "Palette" msgid "wheat (#F5DEB3)" -msgstr "" +msgstr "trigo (#F5DEB3)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:72 msgctxt "Palette" msgid "oldlace (#FDF5E6)" -msgstr "" +msgstr "encaje antiguo (#FDF5E6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:73 msgctxt "Palette" msgid "floralwhite (#FFFAF0)" -msgstr "" +msgstr "blanco floral (#FFFAF0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:74 msgctxt "Palette" msgid "darkgoldenrod (#B8860B)" -msgstr "" +msgstr "dorado oscuro (#B8860B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:75 msgctxt "Palette" msgid "goldenrod (#DAA520)" -msgstr "" +msgstr "dorado (#DAA520)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:76 msgctxt "Palette" msgid "cornsilk (#FFF8DC)" -msgstr "" +msgstr "seda de maíz (#FFF8DC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:77 msgctxt "Palette" msgid "gold (#FFD700)" -msgstr "" +msgstr "oro (#FFD700)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:78 msgctxt "Palette" msgid "khaki (#F0E68C)" -msgstr "" +msgstr "kaki (#F0E68C)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:79 msgctxt "Palette" msgid "lemonchiffon (#FFFACD)" -msgstr "" +msgstr "raso limón (#FFFACD)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:80 msgctxt "Palette" msgid "palegoldenrod (#EEE8AA)" -msgstr "" +msgstr "dorado pálido (#EEE8AA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:81 msgctxt "Palette" msgid "darkkhaki (#BDB76B)" -msgstr "" +msgstr "kaki oscuro (#BDB76B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:82 msgctxt "Palette" msgid "beige (#F5F5DC)" -msgstr "" +msgstr "beis (#F5F5DC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:83 msgctxt "Palette" msgid "lightgoldenrodyellow (#FAFAD2)" -msgstr "" +msgstr "dorado amarillo claro (#FAFAD2)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:84 msgctxt "Palette" msgid "olive (#808000)" -msgstr "" +msgstr "oliva (#808000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:85 msgctxt "Palette" msgid "yellow (#FFFF00)" -msgstr "" +msgstr "amarillo (#FFFF00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:86 msgctxt "Palette" msgid "lightyellow (#FFFFE0)" -msgstr "" +msgstr "amarillo claro (#FFFFE0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:87 msgctxt "Palette" msgid "ivory (#FFFFF0)" -msgstr "" +msgstr "marfil (#FFFFF0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:88 msgctxt "Palette" msgid "olivedrab (#6B8E23)" -msgstr "" +msgstr "oliva claro (#6B8E23)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:89 msgctxt "Palette" msgid "yellowgreen (#9ACD32)" -msgstr "" +msgstr "amarillo verdoso (#9ACD32)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:90 msgctxt "Palette" msgid "darkolivegreen (#556B2F)" -msgstr "" +msgstr "verde oliva oscuro (#556B2F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:91 msgctxt "Palette" msgid "greenyellow (#ADFF2F)" -msgstr "" +msgstr "verde amarillento (#ADFF2F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:92 msgctxt "Palette" msgid "chartreuse (#7FFF00)" -msgstr "" +msgstr "cartuja (#7FFF00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:93 msgctxt "Palette" msgid "lawngreen (#7CFC00)" -msgstr "" +msgstr "verde hierba (#7CFC00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:94 msgctxt "Palette" msgid "darkseagreen (#8FBC8F)" -msgstr "" +msgstr "verde mar oscuro (#8FBC8F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:95 msgctxt "Palette" msgid "forestgreen (#228B22)" -msgstr "" +msgstr "verde bosque (#228B22)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:96 msgctxt "Palette" msgid "limegreen (#32CD32)" -msgstr "" +msgstr "verde lima (#32CD32)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:97 msgctxt "Palette" msgid "lightgreen (#90EE90)" -msgstr "" +msgstr "verde claro (#90EE90)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:98 msgctxt "Palette" msgid "palegreen (#98FB98)" -msgstr "" +msgstr "verde pálido (#98FB98)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:99 msgctxt "Palette" msgid "darkgreen (#006400)" -msgstr "" +msgstr "verde oscuro (#006400)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:100 msgctxt "Palette" msgid "green (#008000)" -msgstr "" +msgstr "verde (#008000)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:101 msgctxt "Palette" msgid "lime (#00FF00)" -msgstr "" +msgstr "lima (#00FF00)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:102 msgctxt "Palette" msgid "honeydew (#F0FFF0)" -msgstr "" +msgstr "melón (#F0FFF0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:103 msgctxt "Palette" msgid "seagreen (#2E8B57)" -msgstr "" +msgstr "verde mar (#2E8B57)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:104 msgctxt "Palette" msgid "mediumseagreen (#3CB371)" -msgstr "" +msgstr "verde mar medio (#3CB371)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:105 msgctxt "Palette" msgid "springgreen (#00FF7F)" -msgstr "" +msgstr "verde primavera (#00FF7F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:106 msgctxt "Palette" msgid "mintcream (#F5FFFA)" -msgstr "" +msgstr "crema de menta (#F5FFFA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:107 msgctxt "Palette" msgid "mediumspringgreen (#00FA9A)" -msgstr "" +msgstr "verde primavera medio (#00FA9A)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:108 msgctxt "Palette" msgid "mediumaquamarine (#66CDAA)" -msgstr "" +msgstr "aguamarina medio (#66CDAA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:109 msgctxt "Palette" msgid "aquamarine (#7FFFD4)" -msgstr "" +msgstr "aguamarina (#7FFFD4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:110 msgctxt "Palette" msgid "turquoise (#40E0D0)" -msgstr "" +msgstr "turquesa (#40E0D0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:111 msgctxt "Palette" msgid "lightseagreen (#20B2AA)" -msgstr "" +msgstr "verde mar claro (#20B2AA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:112 msgctxt "Palette" msgid "mediumturquoise (#48D1CC)" -msgstr "" +msgstr "turquesa medio (#48D1CC)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:113 msgctxt "Palette" msgid "darkslategray (#2F4F4F)" -msgstr "" +msgstr "pizarra oscura (#2F4F4F)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:114 msgctxt "Palette" msgid "paleturquoise (#AFEEEE)" -msgstr "" +msgstr "turquesa pálido (#AFEEEE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:115 msgctxt "Palette" msgid "teal (#008080)" -msgstr "" +msgstr "turquesa (#008080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:116 msgctxt "Palette" msgid "darkcyan (#008B8B)" -msgstr "" +msgstr "cián oscuro (#008B8B)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:117 msgctxt "Palette" msgid "cyan (#00FFFF)" -msgstr "" +msgstr "cián (#00FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:118 msgctxt "Palette" msgid "lightcyan (#E0FFFF)" -msgstr "" +msgstr "cián claro (#E0FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:119 msgctxt "Palette" msgid "azure (#F0FFFF)" -msgstr "" +msgstr "azul mar (#F0FFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:120 msgctxt "Palette" msgid "darkturquoise (#00CED1)" -msgstr "" +msgstr "turquesa oscuro (#00CED1)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:121 msgctxt "Palette" msgid "cadetblue (#5F9EA0)" -msgstr "" +msgstr "azul cadete (#5F9EA0)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:122 msgctxt "Palette" msgid "powderblue (#B0E0E6)" -msgstr "" +msgstr "azul pastel (#B0E0E6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:123 msgctxt "Palette" msgid "lightblue (#ADD8E6)" -msgstr "" +msgstr "azul claro (#ADD8E6)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:124 msgctxt "Palette" msgid "deepskyblue (#00BFFF)" -msgstr "" +msgstr "azul cielo profundo (#00BFFF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:125 msgctxt "Palette" msgid "skyblue (#87CEEB)" -msgstr "" +msgstr "azul cielo (#87CEEB)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:126 msgctxt "Palette" msgid "lightskyblue (#87CEFA)" -msgstr "" +msgstr "azul cielo claro (#87CEFA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:127 msgctxt "Palette" msgid "steelblue (#4682B4)" -msgstr "" +msgstr "azul acero (#4682B4)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:128 msgctxt "Palette" msgid "aliceblue (#F0F8FF)" -msgstr "" +msgstr "azul alicia (#F0F8FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:129 msgctxt "Palette" msgid "dodgerblue (#1E90FF)" -msgstr "" +msgstr "azul dodger (#1E90FF)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:130 msgctxt "Palette" msgid "slategray (#708090)" -msgstr "" +msgstr "pizarra (#708090)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:131 msgctxt "Palette" msgid "lightslategray (#778899)" -msgstr "" +msgstr "pizarra clara (#778899)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:132 msgctxt "Palette" msgid "lightsteelblue (#B0C4DE)" -msgstr "" +msgstr "azul acero claro (#B0C4DE)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:133 msgctxt "Palette" msgid "cornflowerblue (#6495ED)" -msgstr "" +msgstr "aciano (#6495ED)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:134 @@ -2936,13 +2760,13 @@ msgstr "" #: ../share/palettes/palettes.h:136 msgctxt "Palette" msgid "lavender (#E6E6FA)" -msgstr "" +msgstr "lavanda (#E6E6FA)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:137 msgctxt "Palette" msgid "navy (#000080)" -msgstr "" +msgstr "azul marino (#000080)" #. Palette: ./svg.gpl #: ../share/palettes/palettes.h:138 @@ -3114,180 +2938,165 @@ msgstr "" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:166 -#, fuzzy msgctxt "Palette" msgid "Butter 1" -msgstr "Tope embutido" +msgstr "Manteca 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:167 -#, fuzzy msgctxt "Palette" msgid "Butter 2" -msgstr "Tope embutido" +msgstr "Manteca 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:168 -#, fuzzy msgctxt "Palette" msgid "Butter 3" -msgstr "Tope embutido" +msgstr "Manteca 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:169 msgctxt "Palette" msgid "Chameleon 1" -msgstr "" +msgstr "Camaleón 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:170 msgctxt "Palette" msgid "Chameleon 2" -msgstr "" +msgstr "Camaleón 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:171 msgctxt "Palette" msgid "Chameleon 3" -msgstr "" +msgstr "Camaleón 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:172 -#, fuzzy msgctxt "Palette" msgid "Orange 1" -msgstr "Ordenar" +msgstr "Naranja 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:173 -#, fuzzy msgctxt "Palette" msgid "Orange 2" -msgstr "Ordenar" +msgstr "Naranja 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:174 -#, fuzzy msgctxt "Palette" msgid "Orange 3" -msgstr "Ordenar" +msgstr "Naranja 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:175 msgctxt "Palette" msgid "Sky Blue 1" -msgstr "" +msgstr "Azul cielo 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:176 msgctxt "Palette" msgid "Sky Blue 2" -msgstr "" +msgstr "Azul cielo 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:177 msgctxt "Palette" msgid "Sky Blue 3" -msgstr "" +msgstr "Azul cielo 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:178 msgctxt "Palette" msgid "Plum 1" -msgstr "" +msgstr "Ciruela 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:179 msgctxt "Palette" msgid "Plum 2" -msgstr "" +msgstr "Ciruela 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:180 msgctxt "Palette" msgid "Plum 3" -msgstr "" +msgstr "Ciruela 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:181 msgctxt "Palette" msgid "Chocolate 1" -msgstr "" +msgstr "Chocolate 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:182 msgctxt "Palette" msgid "Chocolate 2" -msgstr "" +msgstr "Chocolate 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:183 msgctxt "Palette" msgid "Chocolate 3" -msgstr "" +msgstr "Chocolate 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:184 -#, fuzzy msgctxt "Palette" msgid "Scarlet Red 1" -msgstr "Modo escala" +msgstr "Rojo escarlata 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:185 -#, fuzzy msgctxt "Palette" msgid "Scarlet Red 2" -msgstr "Modo escala" +msgstr "Rojo escarlata 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:186 -#, fuzzy msgctxt "Palette" msgid "Scarlet Red 3" -msgstr "Modo escala" +msgstr "Rojo escarlata 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:187 -#, fuzzy msgctxt "Palette" msgid "Aluminium 1" -msgstr "Aluminio" +msgstr "Aluminio 1" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:188 -#, fuzzy msgctxt "Palette" msgid "Aluminium 2" -msgstr "Aluminio" +msgstr "Aluminio 2" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:189 -#, fuzzy msgctxt "Palette" msgid "Aluminium 3" -msgstr "Aluminio" +msgstr "Aluminio 3" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:190 -#, fuzzy msgctxt "Palette" msgid "Aluminium 4" -msgstr "Aluminio" +msgstr "Aluminio 4" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:191 -#, fuzzy msgctxt "Palette" msgid "Aluminium 5" -msgstr "Aluminio" +msgstr "Aluminio 5" #. Palette: ./Tango-Palette.gpl #: ../share/palettes/palettes.h:192 -#, fuzzy msgctxt "Palette" msgid "Aluminium 6" -msgstr "Aluminio" +msgstr "Aluminio 6" #: ../share/patterns/patterns.svg.h:1 msgid "Stripes 1:1" @@ -3618,22 +3427,22 @@ msgstr "Crear guía" msgid "Move guide" msgstr "Mover guía" -#: ../src/desktop-events.cpp:482 ../src/desktop-events.cpp:532 +#: ../src/desktop-events.cpp:482 ../src/desktop-events.cpp:541 #: ../src/ui/dialog/guides.cpp:138 msgid "Delete guide" msgstr "Borrar guía" # create dialog -#: ../src/desktop-events.cpp:512 +#: ../src/desktop-events.cpp:521 #, c-format msgid "<b>Guideline</b>: %s" msgstr "<b>Línea guía</b>: %s" -#: ../src/desktop.cpp:850 +#: ../src/desktop.cpp:889 msgid "No previous zoom." msgstr "No hay menos zoom." -#: ../src/desktop.cpp:871 +#: ../src/desktop.cpp:910 msgid "No next zoom." msgstr "No hay más zoom." @@ -3990,9 +3799,8 @@ msgid "Alternate the sign of blur change for each column" msgstr "Alternar el signo del desenfoque para cada columna" #: ../src/ui/dialog/clonetiler.cpp:608 -#, fuzzy msgid "<b>Opacity:</b>" -msgstr "Opacidad:" +msgstr "<b>Opacidad:</b>" #: ../src/ui/dialog/clonetiler.cpp:614 msgid "Decrease tile opacity by this percentage for each row" @@ -4151,7 +3959,6 @@ msgid "Pick the Blue component of the color" msgstr "Seleccionar el componente azul del color" #: ../src/ui/dialog/clonetiler.cpp:866 -#, fuzzy msgctxt "Clonetiler color hue" msgid "H" msgstr "T" @@ -4161,7 +3968,6 @@ msgid "Pick the hue of the color" msgstr "Seleccionar el tono del color" #: ../src/ui/dialog/clonetiler.cpp:874 -#, fuzzy msgctxt "Clonetiler color saturation" msgid "S" msgstr "S" @@ -4171,7 +3977,6 @@ msgid "Pick the saturation of the color" msgstr "Seleccionar la saturación del color" #: ../src/ui/dialog/clonetiler.cpp:882 -#, fuzzy msgctxt "Clonetiler color lightness" msgid "L" msgstr "C" @@ -4373,7 +4178,7 @@ msgstr "Seleccione <b>el objeto</b> cuyos clones desea eliminar." msgid "Delete tiled clones" msgstr "Suprimir clones en mosaico" -#: ../src/ui/dialog/clonetiler.cpp:2193 ../src/selection-chemistry.cpp:2467 +#: ../src/ui/dialog/clonetiler.cpp:2193 ../src/selection-chemistry.cpp:2469 msgid "Select an <b>object</b> to clone." msgstr "Seleccione el <b>objeto</b> que desea clonar." @@ -4410,14 +4215,12 @@ msgid "Units:" msgstr "Unidades:" #: ../src/ui/dialog/export.cpp:140 -#, fuzzy msgid "_Export As..." -msgstr "_Exportar mapa de bits..." +msgstr "_Exportar como..." #: ../src/ui/dialog/export.cpp:143 -#, fuzzy msgid "B_atch export all selected objects" -msgstr "Exportar todos los objetos seleccionados por separado" +msgstr "Export_ar por lotes todos los objetos seleccionados" #: ../src/ui/dialog/export.cpp:143 msgid "" @@ -4428,9 +4231,8 @@ msgstr "" "de exportación, si existen (¡Atención, sobrescribe sin preguntar!)" #: ../src/ui/dialog/export.cpp:145 -#, fuzzy msgid "Hide a_ll except selected" -msgstr "Ocultar todos excepto los seleccionados" +msgstr "Ocu_ltar todos excepto los seleccionados" #: ../src/ui/dialog/export.cpp:145 msgid "In the exported image, hide all objects except those that are selected" @@ -4438,9 +4240,8 @@ msgstr "" "Ocultar todos los objetos, excepto los seleccionados, en la imagen exportada" #: ../src/ui/dialog/export.cpp:146 -#, fuzzy msgid "Close when complete" -msgstr "Autoguardado completado." +msgstr "Cerrar al terminar" #: ../src/ui/dialog/export.cpp:146 msgid "Once the export completes, close this dialog" @@ -4451,9 +4252,8 @@ msgid "_Export" msgstr "_Exportar" #: ../src/ui/dialog/export.cpp:166 -#, fuzzy msgid "<b>Export area</b>" -msgstr "<big><b>Área de exportación</b></big>" +msgstr "<b>Área de exportación</b>" #: ../src/ui/dialog/export.cpp:196 msgid "_x0:" @@ -4480,9 +4280,8 @@ msgid "Hei_ght:" msgstr "Al_to:" #: ../src/ui/dialog/export.cpp:231 -#, fuzzy msgid "<b>Image size</b>" -msgstr "<b>Tamaño de página</b>" +msgstr "<b>Tamaño de imagen</b>" #: ../src/ui/dialog/export.cpp:241 ../src/live_effects/lpe-bendpath.cpp:54 #: ../src/live_effects/lpe-patternalongpath.cpp:62 @@ -4511,39 +4310,36 @@ msgid "dpi" msgstr "ppp" #: ../src/ui/dialog/export.cpp:268 -#, fuzzy msgid "<b>_Filename</b>" -msgstr "<big><b>Nombre del _archivo</b></big>" +msgstr "<b>Nombre del _archivo</b>" #: ../src/ui/dialog/export.cpp:310 msgid "Export the bitmap file with these settings" msgstr "Exportar el archivo de mapa de bits con estos ajustes" #: ../src/ui/dialog/export.cpp:544 -#, fuzzy, c-format +#, c-format msgid "B_atch export %d selected object" msgid_plural "B_atch export %d selected objects" -msgstr[0] "Exportar por separado %d objeto seleccionado" -msgstr[1] "Exportar por separado %d objetos seleccionados" +msgstr[0] "Export_ar por separado %d objeto seleccionado" +msgstr[1] "Export_ar por separado %d objetos seleccionados" #: ../src/ui/dialog/export.cpp:862 msgid "Export in progress" msgstr "Realizando exportación" #: ../src/ui/dialog/export.cpp:941 -#, fuzzy msgid "No items selected." -msgstr "No se ha seleccionado ningún filtro" +msgstr "No se han seleccionado elementos" #: ../src/ui/dialog/export.cpp:945 ../src/ui/dialog/export.cpp:947 -#, fuzzy msgid "Exporting %1 files" msgstr "Exportando %d archivos" #: ../src/ui/dialog/export.cpp:987 ../src/ui/dialog/export.cpp:989 -#, fuzzy, c-format +#, c-format msgid "Exporting file <b>%s</b>..." -msgstr "Exportando %d archivos" +msgstr "Exportando archivo <b>%s</b>..." #: ../src/ui/dialog/export.cpp:998 ../src/ui/dialog/export.cpp:1089 #, c-format @@ -4551,9 +4347,9 @@ msgid "Could not export to filename %s.\n" msgstr "No se ha podido exportar al archivo %s.\n" #: ../src/ui/dialog/export.cpp:1001 -#, fuzzy, c-format +#, c-format msgid "Could not export to filename <b>%s</b>." -msgstr "No se ha podido exportar al archivo %s.\n" +msgstr "No se ha podido exportar al archivo <b>%s</b>." #: ../src/ui/dialog/export.cpp:1016 #, c-format @@ -4561,18 +4357,16 @@ msgid "Successfully exported <b>%d</b> files from <b>%d</b> selected items." msgstr "" #: ../src/ui/dialog/export.cpp:1027 -#, fuzzy msgid "You have to enter a filename." -msgstr "Debe indicar un nombre de archivo" +msgstr "Debe indicar un nombre de archivo." #: ../src/ui/dialog/export.cpp:1028 msgid "You have to enter a filename" msgstr "Debe indicar un nombre de archivo" #: ../src/ui/dialog/export.cpp:1042 -#, fuzzy msgid "The chosen area to be exported is invalid." -msgstr "El área seleccionada para exportación no es válida" +msgstr "El área seleccionada para exportación no es válida." #: ../src/ui/dialog/export.cpp:1043 msgid "The chosen area to be exported is invalid" @@ -4585,23 +4379,21 @@ msgstr "El directorio %s no existe o no es un directorio.\n" #. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image #: ../src/ui/dialog/export.cpp:1072 ../src/ui/dialog/export.cpp:1074 -#, fuzzy msgid "Exporting %1 (%2 x %3)" -msgstr "Exportando %s (%lu x %lu)" +msgstr "Exportando %1 (%2 x %3)" # FIXME: implement averaging of all parameters for multiple selected stars # gtk_label_set_markup (GTK_LABEL(l), _("<b>Average:</b>")); # FIXME: implement averaging of all parameters for multiple selected # gtk_label_set_markup (GTK_LABEL(l), _("<b>Average:</b>")); #: ../src/ui/dialog/export.cpp:1100 -#, fuzzy, c-format +#, c-format msgid "Drawing exported to <b>%s</b>." -msgstr "Editando el parámetro <b>%s</b>." +msgstr "Dibujo exportado a <b>%s</b>." #: ../src/ui/dialog/export.cpp:1104 -#, fuzzy msgid "Export aborted." -msgstr "Realizando exportación" +msgstr "Exportación cancelada." #: ../src/ui/dialog/export.cpp:1222 ../src/ui/dialog/export.cpp:1256 msgid "Select a filename for exporting" @@ -4686,7 +4478,7 @@ msgid "Search paths, lines, polylines" msgstr "Buscar en trayectos, líneas, polilíneas" #: ../src/dialogs/find.cpp:647 ../src/ui/dialog/find.cpp:98 -#: ../src/widgets/toolbox.cpp:1764 +#: ../src/widgets/toolbox.cpp:1783 msgid "Paths" msgstr "Trayectos" @@ -4712,7 +4504,6 @@ msgstr "Buscar en clones" #. TRANSLATORS: "Clones" is a noun indicating type of object to find #: ../src/dialogs/find.cpp:664 ../src/ui/dialog/find.cpp:103 -#, fuzzy msgctxt "Find dialog" msgid "Clones" msgstr "Clones" @@ -4736,9 +4527,8 @@ msgid "Offsets" msgstr "Desvíos" #: ../src/dialogs/find.cpp:744 -#, fuzzy msgid "_Text:" -msgstr "_Texto: " +msgstr "_Texto:" #: ../src/dialogs/find.cpp:744 msgid "Find objects by their text content (exact or partial match)" @@ -4749,9 +4539,8 @@ msgstr "" #: ../src/ui/dialog/object-properties.cpp:265 #: ../src/ui/dialog/object-properties.cpp:322 #: ../src/ui/dialog/object-properties.cpp:329 -#, fuzzy msgid "_ID:" -msgstr "_ID: " +msgstr "_ID:" #: ../src/dialogs/find.cpp:745 msgid "Find objects by the value of the id attribute (exact or partial match)" @@ -4759,9 +4548,8 @@ msgstr "" "Buscar objetos por el valor del atributo «id» (coincidencia exacta o parcial)" #: ../src/dialogs/find.cpp:746 -#, fuzzy msgid "_Style:" -msgstr "E_stilo: " +msgstr "E_stilo:" #: ../src/dialogs/find.cpp:746 msgid "" @@ -4771,9 +4559,8 @@ msgstr "" "parcial)" #: ../src/dialogs/find.cpp:747 -#, fuzzy msgid "_Attribute:" -msgstr "_Atributo: " +msgstr "_Atributo:" #: ../src/dialogs/find.cpp:747 msgid "Find objects by the name of an attribute (exact or partial match)" @@ -4844,7 +4631,7 @@ msgstr "_Ignorar" #: ../src/ui/dialog/spellcheck.cpp:76 msgid "A_dd" -msgstr "" +msgstr "Aña_dir" #: ../src/ui/dialog/spellcheck.cpp:78 msgid "_Stop" @@ -4909,15 +4696,14 @@ msgstr "Corregir ortografía" msgid "_Font" msgstr "Tipogra_fía" -#: ../src/ui/dialog/text-edit.cpp:69 ../src/menus-skeleton.h:248 +#: ../src/ui/dialog/text-edit.cpp:69 ../src/menus-skeleton.h:253 #: ../src/ui/dialog/find.cpp:73 msgid "_Text" msgstr "_Texto" #: ../src/ui/dialog/text-edit.cpp:70 -#, fuzzy msgid "Set as _default" -msgstr "Definir como predeterminado" +msgstr "Definir como pre_determinado" #: ../src/ui/dialog/text-edit.cpp:84 msgid "AaBbCcIiPpQq12369$€¢?.;/()" @@ -4953,9 +4739,8 @@ msgid "Vertical text" msgstr "Texto vertical" #: ../src/ui/dialog/text-edit.cpp:135 ../src/ui/dialog/text-edit.cpp:136 -#, fuzzy msgid "Spacing between lines (percent of font size)" -msgstr "Espacio entre líneas (veces el tamaño de la fuente)" +msgstr "Espacio entre líneas (porcentaje del tamaño de la fuente)" #: ../src/ui/dialog/text-edit.cpp:578 ../src/text-context.cpp:1519 msgid "Set text style" @@ -5125,20 +4910,17 @@ msgid "Angle of z-axis" msgstr "Ángulo del eje z" #: ../src/display/canvas-axonomgrid.cpp:345 ../src/display/canvas-grid.cpp:706 -#, fuzzy msgid "Minor grid line _color:" -msgstr "Color de las líneas primarias:" +msgstr "_Color de las líneas secundarias:" #: ../src/display/canvas-axonomgrid.cpp:345 ../src/display/canvas-grid.cpp:706 #: ../src/ui/dialog/inkscape-preferences.cpp:686 -#, fuzzy msgid "Minor grid line color" -msgstr "Color de las líneas primarias de la rejilla" +msgstr "Color de las líneas secundarias de la rejilla" #: ../src/display/canvas-axonomgrid.cpp:345 ../src/display/canvas-grid.cpp:706 -#, fuzzy msgid "Color of the minor grid lines" -msgstr "Color de las líneas de la rejilla" +msgstr "Color de las líneas secundarias de la rejilla" #: ../src/display/canvas-axonomgrid.cpp:350 ../src/display/canvas-grid.cpp:711 msgid "Ma_jor grid line color:" @@ -5247,9 +5029,8 @@ msgid "grid intersection" msgstr "intersección de rejilla" #: ../src/display/snap-indicator.cpp:84 -#, fuzzy msgid "grid line (perpendicular)" -msgstr "Bisector perpendicular" +msgstr "línea guía (perpendicular)" #: ../src/display/snap-indicator.cpp:87 msgid "guide" @@ -5264,9 +5045,8 @@ msgid "guide origin" msgstr "origen de guía" #: ../src/display/snap-indicator.cpp:96 -#, fuzzy msgid "guide (perpendicular)" -msgstr "Bisector perpendicular" +msgstr "guía (perpendicular)" #: ../src/display/snap-indicator.cpp:99 msgid "grid-guide intersection" @@ -5285,32 +5065,28 @@ msgid "path" msgstr "trayecto" #: ../src/display/snap-indicator.cpp:111 -#, fuzzy msgid "path (perpendicular)" -msgstr "Bisector perpendicular" +msgstr "trayecto (perpendicular)" #: ../src/display/snap-indicator.cpp:114 msgid "path (tangential)" -msgstr "" +msgstr "trazo (tangencial)" #: ../src/display/snap-indicator.cpp:117 msgid "path intersection" msgstr "intersección de trayectos" #: ../src/display/snap-indicator.cpp:120 -#, fuzzy msgid "guide-path intersection" -msgstr "intersección de guías" +msgstr "intersección trayecto-guía" #: ../src/display/snap-indicator.cpp:123 -#, fuzzy msgid "clip-path" -msgstr "Crear trayecto de recorte" +msgstr "trayecto-recorte" #: ../src/display/snap-indicator.cpp:126 -#, fuzzy msgid "mask-path" -msgstr "Pegar trayecto" +msgstr "trayecto-máscara" #: ../src/display/snap-indicator.cpp:129 msgid "bounding box corner" @@ -5358,7 +5134,7 @@ msgstr "esquina" #: ../src/display/snap-indicator.cpp:163 msgid "text anchor" -msgstr "" +msgstr "ancla de texto" #: ../src/display/snap-indicator.cpp:166 msgid "text baseline" @@ -5433,9 +5209,8 @@ msgid "Corner" msgstr "Esquina" #: ../src/display/snap-indicator.cpp:232 -#, fuzzy msgid "Text anchor" -msgstr "Entrada de texto" +msgstr "Ancla de texto" #: ../src/display/snap-indicator.cpp:235 msgid "Multiple of grid spacing" @@ -5445,17 +5220,16 @@ msgstr "Múltiplo de espaciado de rejilla" msgid " to " msgstr " a " -#: ../src/document.cpp:488 +#: ../src/document.cpp:491 #, c-format msgid "New document %d" msgstr "Documento nuevo %d" -#: ../src/document.cpp:514 -#, fuzzy +#: ../src/document.cpp:517 msgid "Memory document %1" -msgstr "Documento de memoria %d" +msgstr "Documento de memoria %1" -#: ../src/document.cpp:704 +#: ../src/document.cpp:707 #, c-format msgid "Unnamed document %d" msgstr "Documento sin nombre %d" @@ -5564,11 +5338,11 @@ msgid "[Unchanged]" msgstr "[Sin cambios]" #. Edit -#: ../src/event-log.cpp:264 ../src/event-log.cpp:267 ../src/verbs.cpp:2288 +#: ../src/event-log.cpp:264 ../src/event-log.cpp:267 ../src/verbs.cpp:2334 msgid "_Undo" msgstr "_Deshacer" -#: ../src/event-log.cpp:274 ../src/event-log.cpp:278 ../src/verbs.cpp:2290 +#: ../src/event-log.cpp:274 ../src/event-log.cpp:278 ../src/verbs.cpp:2336 msgid "_Redo" msgstr "_Rehacer" @@ -5857,7 +5631,6 @@ msgid "Poisson Noise" msgstr "Ruido de Poisson" #: ../src/extension/internal/bitmap/addNoise.cpp:60 -#, fuzzy msgid "Add random noise to selected bitmap(s)" msgstr "Añadir ruido aleatorio a los mapas de bits seleccionados" @@ -5884,9 +5657,8 @@ msgstr "Radio:" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:41 #: ../src/extension/internal/bitmap/sharpen.cpp:41 #: ../src/extension/internal/bitmap/unsharpmask.cpp:44 -#, fuzzy msgid "Sigma:" -msgstr "Sigma" +msgstr "Sigma:" #: ../src/extension/internal/bitmap/blur.cpp:47 msgid "Blur selected bitmap(s)" @@ -5897,9 +5669,8 @@ msgid "Channel" msgstr "Canal" #: ../src/extension/internal/bitmap/channel.cpp:50 -#, fuzzy msgid "Layer:" -msgstr "Capa" +msgstr "Capa:" #: ../src/extension/internal/bitmap/channel.cpp:51 #: ../src/extension/internal/bitmap/levelChannel.cpp:55 @@ -5947,18 +5718,16 @@ msgid "Matte Channel" msgstr "Canal mate" #: ../src/extension/internal/bitmap/channel.cpp:66 -#, fuzzy msgid "Extract specific channel from image" -msgstr "Extraer un canal específico de la imagen." +msgstr "Extraer un canal específico de la imagen" #: ../src/extension/internal/bitmap/charcoal.cpp:38 msgid "Charcoal" msgstr "Carboncillo" #: ../src/extension/internal/bitmap/charcoal.cpp:47 -#, fuzzy msgid "Apply charcoal stylization to selected bitmap(s)" -msgstr "Aplicar esitilzado de carboncillo a los mapas de bits seleccionados." +msgstr "Aplicar esitilzado de carboncillo a los mapas de bits seleccionados" #: ../src/extension/internal/bitmap/colorize.cpp:50 #: ../src/extension/internal/filter/color.h:316 @@ -5966,20 +5735,17 @@ msgid "Colorize" msgstr "Colorizar" #: ../src/extension/internal/bitmap/colorize.cpp:58 -#, fuzzy msgid "Colorize selected bitmap(s) with specified color, using given opacity" msgstr "" -"Colorizar los mapas de bits seleccionados con el color y la opacidad " -"indicada." +"Colorizar los mapas de bits seleccionados con el color y la opacidad indicada" #: ../src/extension/internal/bitmap/contrast.cpp:40 msgid "Contrast" msgstr "Contraste" #: ../src/extension/internal/bitmap/contrast.cpp:42 -#, fuzzy msgid "Adjust:" -msgstr "Ajustar" +msgstr "Ajustar:" #: ../src/extension/internal/bitmap/contrast.cpp:48 msgid "Increase or decrease contrast in bitmap(s)" @@ -5987,31 +5753,27 @@ msgstr "Aumentar o disminuir contraste en mapas de bits" #: ../src/extension/internal/bitmap/crop.cpp:66 msgid "Crop" -msgstr "" +msgstr "Recortar" #: ../src/extension/internal/bitmap/crop.cpp:68 msgid "Top (px):" -msgstr "" +msgstr "Arriba (px):" #: ../src/extension/internal/bitmap/crop.cpp:69 -#, fuzzy msgid "Bottom (px):" -msgstr "Inferior:" +msgstr "Abajo (px):" #: ../src/extension/internal/bitmap/crop.cpp:70 -#, fuzzy msgid "Left (px):" -msgstr "Desvío [px]" +msgstr "Izquierda (px):" #: ../src/extension/internal/bitmap/crop.cpp:71 -#, fuzzy msgid "Right (px):" -msgstr "Derecha:" +msgstr "Derecha (px):" #: ../src/extension/internal/bitmap/crop.cpp:77 -#, fuzzy msgid "Crop selected bitmap(s)." -msgstr "Desenfocar los mapas de bits seleccionados" +msgstr "Recortar los mapas de bits seleccionados." #: ../src/extension/internal/bitmap/cycleColormap.cpp:37 msgid "Cycle Colormap" @@ -6085,9 +5847,8 @@ msgstr "Desenfoque gaussiano" #: ../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 "Factor" +msgstr "Factor:" #: ../src/extension/internal/bitmap/gaussianBlur.cpp:47 #, fuzzy @@ -6109,21 +5870,18 @@ msgstr "Nivel" #: ../src/extension/internal/bitmap/level.cpp:43 #: ../src/extension/internal/bitmap/levelChannel.cpp:65 -#, fuzzy msgid "Black Point:" -msgstr "Punto negro" +msgstr "Punto negro:" #: ../src/extension/internal/bitmap/level.cpp:44 #: ../src/extension/internal/bitmap/levelChannel.cpp:66 -#, fuzzy msgid "White Point:" -msgstr "Punto blanco" +msgstr "Punto blanco:" #: ../src/extension/internal/bitmap/level.cpp:45 #: ../src/extension/internal/bitmap/levelChannel.cpp:67 -#, fuzzy msgid "Gamma Correction:" -msgstr "Corrección de gamma" +msgstr "Corrección de gamma:" #: ../src/extension/internal/bitmap/level.cpp:51 #, fuzzy @@ -6140,9 +5898,8 @@ msgstr "Nivelar (con el canal)" #: ../src/extension/internal/bitmap/levelChannel.cpp:54 #: ../src/extension/internal/filter/color.h:635 -#, fuzzy msgid "Channel:" -msgstr "Canales:" +msgstr "Canal:" #: ../src/extension/internal/bitmap/levelChannel.cpp:73 #, fuzzy @@ -6170,26 +5927,23 @@ msgid "HSB Adjust" msgstr "Ajuste HSB (TSC)" #: ../src/extension/internal/bitmap/modulate.cpp:42 -#, fuzzy msgid "Hue:" -msgstr "Tono" +msgstr "Tono:" #: ../src/extension/internal/bitmap/modulate.cpp:43 #: ../src/extension/internal/filter/color.h:155 #: ../src/extension/internal/filter/color.h:256 #: ../src/extension/internal/filter/paint.h:87 -#, fuzzy msgid "Saturation:" -msgstr "Saturación" +msgstr "Saturación:" #: ../src/extension/internal/bitmap/modulate.cpp:44 #: ../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:73 -#, fuzzy msgid "Brightness:" -msgstr "Claridad" +msgstr "Claridad:" #: ../src/extension/internal/bitmap/modulate.cpp:50 msgid "" @@ -6203,16 +5957,14 @@ msgid "Negate" msgstr "Negar" #: ../src/extension/internal/bitmap/negate.cpp:43 -#, fuzzy msgid "Negate (take inverse) selected bitmap(s)" -msgstr "Negar (obtener el inverso) los mapas de bits seleccionados." +msgstr "Negar (obtener el inverso) los mapas de bits seleccionados" #: ../src/extension/internal/bitmap/normalize.cpp:36 msgid "Normalize" msgstr "Normalizar" #: ../src/extension/internal/bitmap/normalize.cpp:43 -#, fuzzy msgid "" "Normalize selected bitmap(s), expanding color range to the full possible " "range of color" @@ -6225,11 +5977,10 @@ msgid "Oil Paint" msgstr "Pintura al óleo" #: ../src/extension/internal/bitmap/oilPaint.cpp:45 -#, fuzzy msgid "Stylize selected bitmap(s) so that they appear to be painted with oils" msgstr "" "Estilizar los mapas de bits seleccionados de modo que parezcan pintados al " -"óleo." +"óleo" #: ../src/extension/internal/bitmap/opacity.cpp:40 #: ../src/extension/internal/filter/blurs.h:333 @@ -6251,12 +6002,11 @@ msgid "Raised" msgstr "Elevado" #: ../src/extension/internal/bitmap/raise.cpp:50 -#, fuzzy msgid "" "Alter lightness the edges of selected bitmap(s) to create a raised appearance" msgstr "" -"Alterar la luminancia de los bordes de los mapas de bits para aparentar " -"elevación." +"Alterar la luminancia de los bordes de los mapas de bits seleccionados para " +"aparentar elevación" #: ../src/extension/internal/bitmap/reduceNoise.cpp:40 msgid "Reduce Noise" @@ -6270,12 +6020,11 @@ msgid "Order:" msgstr "Orden:" #: ../src/extension/internal/bitmap/reduceNoise.cpp:48 -#, fuzzy msgid "" "Reduce noise in selected bitmap(s) using a noise peak elimination filter" msgstr "" "Reducir el ruido en los mapas de bits seleccionados utilizando un filtro de " -"eliminación de picos de ruido." +"eliminación de picos de ruido" #: ../src/extension/internal/bitmap/sample.cpp:39 msgid "Resample" @@ -6295,27 +6044,24 @@ msgstr "Sombra" #: ../src/extension/internal/bitmap/shade.cpp:42 #: ../src/extension/internal/filter/bumps.h:110 #: ../src/extension/internal/filter/bumps.h:335 -#, fuzzy msgid "Azimuth:" -msgstr "Acimut" +msgstr "Acimut:" #: ../src/extension/internal/bitmap/shade.cpp:43 #: ../src/extension/internal/filter/bumps.h:111 #: ../src/extension/internal/filter/bumps.h:336 -#, fuzzy msgid "Elevation:" -msgstr "Elevación" +msgstr "Elevación:" #: ../src/extension/internal/bitmap/shade.cpp:44 msgid "Colored Shading" msgstr "Sombra coloreada" #: ../src/extension/internal/bitmap/shade.cpp:50 -#, fuzzy msgid "Shade selected bitmap(s) simulating distant light source" msgstr "" "Ensombrecer los mapas de bits seleccionados simulando una fuente de luz " -"lejana." +"lejana" #: ../src/extension/internal/bitmap/sharpen.cpp:47 #, fuzzy @@ -6456,7 +6202,7 @@ msgstr "Postscript nivel 2" #: ../src/extension/internal/cairo-ps-out.cpp:317 #: ../src/extension/internal/cairo-ps-out.cpp:357 #: ../src/extension/internal/cairo-renderer-pdf-out.cpp:241 -#: ../src/extension/internal/emf-win32-inout.cpp:2544 +#: ../src/extension/internal/emf-win32-inout.cpp:2548 msgid "Convert texts to paths" msgstr "Convertir textos en trayectos" @@ -6549,39 +6295,39 @@ msgstr "PDF 1.4" msgid "PDF+LaTeX: Omit text in PDF, and create LaTeX file" msgstr "PDF+LaTeX: Omitir texto en PDF, y crear archivo LaTeX" -#: ../src/extension/internal/emf-win32-inout.cpp:2514 +#: ../src/extension/internal/emf-win32-inout.cpp:2518 msgid "EMF Input" msgstr "Entrada EMF" -#: ../src/extension/internal/emf-win32-inout.cpp:2519 +#: ../src/extension/internal/emf-win32-inout.cpp:2523 msgid "Enhanced Metafiles (*.emf)" msgstr "Metaarchivos realzados (*.emf)" -#: ../src/extension/internal/emf-win32-inout.cpp:2520 +#: ../src/extension/internal/emf-win32-inout.cpp:2524 msgid "Enhanced Metafiles" msgstr "Metaarchivos realzados" -#: ../src/extension/internal/emf-win32-inout.cpp:2528 +#: ../src/extension/internal/emf-win32-inout.cpp:2532 msgid "WMF Input" msgstr "Entrada WMF" -#: ../src/extension/internal/emf-win32-inout.cpp:2533 +#: ../src/extension/internal/emf-win32-inout.cpp:2537 msgid "Windows Metafiles (*.wmf)" msgstr "Metaarchivos de Windows (*.wmf)" -#: ../src/extension/internal/emf-win32-inout.cpp:2534 +#: ../src/extension/internal/emf-win32-inout.cpp:2538 msgid "Windows Metafiles" msgstr "Metaarchivos de Windows" -#: ../src/extension/internal/emf-win32-inout.cpp:2542 +#: ../src/extension/internal/emf-win32-inout.cpp:2546 msgid "EMF Output" msgstr "Salida EMF" -#: ../src/extension/internal/emf-win32-inout.cpp:2548 +#: ../src/extension/internal/emf-win32-inout.cpp:2552 msgid "Enhanced Metafile (*.emf)" msgstr "Metaarchivo realzado (*.emf)" -#: ../src/extension/internal/emf-win32-inout.cpp:2549 +#: ../src/extension/internal/emf-win32-inout.cpp:2553 msgid "Enhanced Metafile" msgstr "Metaarchivo realzado" @@ -6594,7 +6340,7 @@ msgstr "Luz difusa" #: ../src/extension/internal/filter/bevels.h:135 #: ../src/extension/internal/filter/bevels.h:219 #: ../src/extension/internal/filter/paint.h:89 -#: ../src/live_effects/lpe-powerstroke.cpp:210 +#: ../src/live_effects/lpe-powerstroke.cpp:236 #: ../share/extensions/fractalize.inx.h:3 #, fuzzy msgid "Smoothness:" @@ -6660,9 +6406,9 @@ msgstr "Color del _resaltado:" #: ../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:726 -#: ../src/extension/internal/filter/paint.h:878 -#: ../src/extension/internal/filter/paint.h:982 +#: ../src/extension/internal/filter/paint.h:725 +#: ../src/extension/internal/filter/paint.h:877 +#: ../src/extension/internal/filter/paint.h:981 #: ../src/extension/internal/filter/protrusions.h:54 #: ../src/extension/internal/filter/shadows.h:78 #: ../src/extension/internal/filter/textures.h:90 @@ -6765,7 +6511,7 @@ msgstr "Mezclar" #: ../src/extension/internal/filter/color.h:1340 #: ../src/extension/internal/filter/color.h:1513 #: ../src/extension/internal/filter/color.h:1519 -#: ../src/extension/internal/filter/paint.h:707 +#: ../src/extension/internal/filter/paint.h:706 #: ../src/extension/internal/filter/transparency.h:63 #: ../src/filter-enums.cpp:54 #, fuzzy @@ -6784,7 +6530,7 @@ msgstr "Oscurecer" #: ../src/extension/internal/filter/color.h:1332 #: ../src/extension/internal/filter/color.h:1337 #: ../src/extension/internal/filter/color.h:1511 -#: ../src/extension/internal/filter/paint.h:705 +#: ../src/extension/internal/filter/paint.h:704 #: ../src/extension/internal/filter/transparency.h:62 #: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:365 msgid "Screen" @@ -6803,7 +6549,7 @@ msgstr "Pantalla" #: ../src/extension/internal/filter/color.h:1338 #: ../src/extension/internal/filter/color.h:1512 #: ../src/extension/internal/filter/color.h:1518 -#: ../src/extension/internal/filter/paint.h:703 +#: ../src/extension/internal/filter/paint.h:702 #: ../src/extension/internal/filter/transparency.h:60 #: ../src/filter-enums.cpp:52 #, fuzzy @@ -6819,7 +6565,7 @@ msgstr "Multiplicar" #: ../src/extension/internal/filter/color.h:334 #: ../src/extension/internal/filter/color.h:1339 #: ../src/extension/internal/filter/color.h:1510 -#: ../src/extension/internal/filter/paint.h:706 +#: ../src/extension/internal/filter/paint.h:705 #: ../src/extension/internal/filter/transparency.h:64 #: ../src/filter-enums.cpp:55 #, fuzzy @@ -6895,7 +6641,7 @@ msgstr "Mezclar" #: ../src/extension/internal/filter/color.h:1503 #: ../src/extension/internal/filter/color.h:1517 #: ../src/extension/internal/filter/distort.h:78 -#: ../src/extension/internal/filter/paint.h:704 +#: ../src/extension/internal/filter/paint.h:703 #: ../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:618 @@ -6992,7 +6738,7 @@ msgstr "Luz difusa" #: ../src/extension/internal/filter/color.h:1112 #: ../src/extension/internal/filter/paint.h:86 #: ../src/extension/internal/filter/paint.h:593 -#: ../src/extension/internal/filter/paint.h:709 +#: ../src/extension/internal/filter/paint.h:708 #, fuzzy msgid "Lightness:" msgstr "Luminancia" @@ -7113,7 +6859,7 @@ msgstr "Color de _fondo:" #: ../src/extension/internal/filter/bumps.h:325 #: ../src/extension/internal/filter/color.h:1218 #: ../src/extension/internal/filter/transparency.h:57 -#: ../src/filter-enums.cpp:29 ../src/selection-describer.cpp:54 +#: ../src/filter-enums.cpp:29 ../src/selection-describer.cpp:55 msgid "Image" msgstr "Imagen" @@ -7284,7 +7030,7 @@ msgid "Discrete" msgstr "Discreto" #: ../src/extension/internal/filter/color.h:429 ../src/filter-enums.cpp:85 -#: ../src/live_effects/lpe-powerstroke.cpp:162 +#: ../src/live_effects/lpe-powerstroke.cpp:188 msgid "Linear" msgstr "Lineal" @@ -7433,7 +7179,7 @@ msgid "Fade to:" msgstr "<b>Desvanecer:</b>" #: ../src/extension/internal/filter/color.h:743 -#: ../src/ui/widget/selected-style.cpp:245 +#: ../src/ui/widget/selected-style.cpp:246 #: ../src/widgets/sp-color-icc-selector.cpp:234 #: ../src/widgets/sp-color-scales.cpp:464 #: ../src/widgets/sp-color-scales.cpp:465 @@ -7441,7 +7187,7 @@ msgid "Black" msgstr "Negro" #: ../src/extension/internal/filter/color.h:744 -#: ../src/ui/widget/selected-style.cpp:241 +#: ../src/ui/widget/selected-style.cpp:242 msgid "White" msgstr "Blanca" @@ -7467,7 +7213,7 @@ msgid "Customize greyscale components" msgstr "" #: ../src/extension/internal/filter/color.h:904 -#: ../src/ui/widget/selected-style.cpp:237 +#: ../src/ui/widget/selected-style.cpp:238 msgid "Invert" msgstr "Invertir" @@ -7561,7 +7307,7 @@ msgstr "Desvío del patrón" #: ../src/extension/internal/filter/color.h:1206 #: ../src/ui/dialog/object-attributes.cpp:65 #: ../src/ui/dialog/object-attributes.cpp:73 ../src/ui/dialog/tile.cpp:615 -#: ../src/widgets/desktop-widget.cpp:589 ../src/widgets/node-toolbar.cpp:591 +#: ../src/widgets/desktop-widget.cpp:671 ../src/widgets/node-toolbar.cpp:591 msgid "X:" msgstr "X:" @@ -7570,7 +7316,7 @@ msgstr "X:" #: ../src/extension/internal/filter/color.h:1207 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:74 ../src/ui/dialog/tile.cpp:616 -#: ../src/widgets/desktop-widget.cpp:592 ../src/widgets/node-toolbar.cpp:609 +#: ../src/widgets/desktop-widget.cpp:681 ../src/widgets/node-toolbar.cpp:609 msgid "Y:" msgstr "Y:" @@ -7712,7 +7458,7 @@ msgstr "Fuera" #: ../src/extension/internal/filter/distort.h:77 #: ../src/extension/internal/filter/textures.h:75 -#: ../src/ui/widget/selected-style.cpp:124 +#: ../src/ui/widget/selected-style.cpp:125 #: ../src/ui/widget/style-swatch.cpp:120 msgid "Stroke:" msgstr "Trazo:" @@ -7740,7 +7486,7 @@ 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:694 +#: ../src/extension/internal/filter/paint.h:693 #, fuzzy msgid "Fractal noise" msgstr "Ruido fractal" @@ -7748,7 +7494,7 @@ msgstr "Ruido 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:695 ../src/filter-enums.cpp:35 +#: ../src/extension/internal/filter/paint.h:694 ../src/filter-enums.cpp:35 #: ../src/filter-enums.cpp:117 msgid "Turbulence" msgstr "Turbulencia" @@ -7757,7 +7503,7 @@ msgstr "Turbulencia" #: ../src/extension/internal/filter/distort.h:196 #: ../src/extension/internal/filter/overlays.h:64 #: ../src/extension/internal/filter/paint.h:93 -#: ../src/extension/internal/filter/paint.h:697 +#: ../src/extension/internal/filter/paint.h:696 #, fuzzy msgid "Horizontal frequency:" msgstr "Desvío horizontal" @@ -7766,7 +7512,7 @@ msgstr "Desvío horizontal" #: ../src/extension/internal/filter/distort.h:197 #: ../src/extension/internal/filter/overlays.h:65 #: ../src/extension/internal/filter/paint.h:94 -#: ../src/extension/internal/filter/paint.h:698 +#: ../src/extension/internal/filter/paint.h:697 #, fuzzy msgid "Vertical frequency:" msgstr "Frecuencia de temblor" @@ -7775,7 +7521,7 @@ msgstr "Frecuencia de temblor" #: ../src/extension/internal/filter/distort.h:198 #: ../src/extension/internal/filter/overlays.h:66 #: ../src/extension/internal/filter/paint.h:95 -#: ../src/extension/internal/filter/paint.h:699 +#: ../src/extension/internal/filter/paint.h:698 #: ../src/extension/internal/filter/textures.h:69 #, fuzzy msgid "Complexity:" @@ -7785,7 +7531,7 @@ msgstr "Complejidad máxima" #: ../src/extension/internal/filter/distort.h:199 #: ../src/extension/internal/filter/overlays.h:67 #: ../src/extension/internal/filter/paint.h:96 -#: ../src/extension/internal/filter/paint.h:700 +#: ../src/extension/internal/filter/paint.h:699 #: ../src/extension/internal/filter/textures.h:70 #, fuzzy msgid "Variation:" @@ -7807,7 +7553,7 @@ msgstr "Áspero" #: ../src/extension/internal/filter/distort.h:192 #: ../src/extension/internal/filter/overlays.h:60 -#: ../src/extension/internal/filter/paint.h:693 +#: ../src/extension/internal/filter/paint.h:692 #: ../src/extension/internal/filter/textures.h:64 #, fuzzy msgid "Turbulence type:" @@ -7995,7 +7741,7 @@ msgid "Noise Fill" msgstr "Relleno de ruido" #: ../src/extension/internal/filter/overlays.h:59 -#: ../src/extension/internal/filter/paint.h:692 +#: ../src/extension/internal/filter/paint.h:691 #: ../src/extension/internal/filter/shadows.h:59 ../src/ui/dialog/find.cpp:83 #: ../src/ui/dialog/tracedialog.cpp:746 #: ../share/extensions/color_custom.inx.h:14 @@ -8054,7 +7800,7 @@ msgid "Dented" msgstr "centro" #: ../src/extension/internal/filter/paint.h:88 -#: ../src/extension/internal/filter/paint.h:701 +#: ../src/extension/internal/filter/paint.h:700 #, fuzzy msgid "Noise reduction:" msgstr "Dirección" @@ -8106,7 +7852,7 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:332 #: ../src/ui/dialog/align-and-distribute.cpp:1049 #: ../src/ui/dialog/align-and-distribute.cpp:1057 -#: ../src/widgets/desktop-widget.cpp:1821 +#: ../src/widgets/desktop-widget.cpp:1926 msgid "Drawing" msgstr "Dibujo" @@ -8115,7 +7861,7 @@ msgid "Simplify" msgstr "Simplificar" #: ../src/extension/internal/filter/paint.h:339 -#: ../src/extension/internal/filter/paint.h:711 +#: ../src/extension/internal/filter/paint.h:710 #, fuzzy msgid "Erase:" msgstr "Goma de borrar" @@ -8130,13 +7876,13 @@ msgid "Melt" msgstr "" #: ../src/extension/internal/filter/paint.h:351 -#: ../src/extension/internal/filter/paint.h:714 +#: ../src/extension/internal/filter/paint.h:713 #, fuzzy msgid "Fill color" msgstr "Aplicar color de relleno" #: ../src/extension/internal/filter/paint.h:352 -#: ../src/extension/internal/filter/paint.h:716 +#: ../src/extension/internal/filter/paint.h:715 #, fuzzy msgid "Image on fill" msgstr "Archivo de Imagen" @@ -8162,20 +7908,20 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:497 #: ../src/extension/internal/filter/paint.h:591 -#: ../src/extension/internal/filter/paint.h:978 +#: ../src/extension/internal/filter/paint.h:977 #, fuzzy msgid "Simplify:" msgstr "Simplificar" #: ../src/extension/internal/filter/paint.h:498 -#: ../src/extension/internal/filter/paint.h:854 +#: ../src/extension/internal/filter/paint.h:853 #, fuzzy msgid "Effect type:" msgstr "Lista de efectos" #: ../src/extension/internal/filter/paint.h:502 -#: ../src/extension/internal/filter/paint.h:862 -#: ../src/extension/internal/filter/paint.h:977 +#: ../src/extension/internal/filter/paint.h:861 +#: ../src/extension/internal/filter/paint.h:976 #, fuzzy msgid "Levels:" msgstr "Nivel" @@ -8191,138 +7937,115 @@ msgid "Neon Draw" msgstr "Neón" #: ../src/extension/internal/filter/paint.h:587 -#, fuzzy msgid "Line type:" -msgstr " tipo: " +msgstr "Tipo de línea:" #: ../src/extension/internal/filter/paint.h:588 -#, fuzzy msgid "Smoothed" -msgstr "Suave" +msgstr "Suavizado" #: ../src/extension/internal/filter/paint.h:589 -#, fuzzy msgid "Contrasted" -msgstr "Contraste" +msgstr "Contrastado" #: ../src/extension/internal/filter/paint.h:592 -#, fuzzy msgid "Line width:" -msgstr "Ancho de línea" +msgstr "Ancho de línea:" #: ../src/extension/internal/filter/paint.h:594 -#: ../src/extension/internal/filter/paint.h:863 +#: ../src/extension/internal/filter/paint.h:862 #: ../src/ui/widget/filter-effect-chooser.cpp:25 -#, fuzzy msgid "Blend mode:" -msgstr "Modo de me_zcla:" +msgstr "Modo de mezcla:" #: ../src/extension/internal/filter/paint.h:606 msgid "Posterize and draw smooth lines around color shapes" -msgstr "" +msgstr "Posterizar y trazar líneas alrededor de formas de color" -#: ../src/extension/internal/filter/paint.h:689 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:688 msgid "Point Engraving" -msgstr "Grabado alfa" +msgstr "Grabado punta" -#: ../src/extension/internal/filter/paint.h:702 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:701 msgid "Noise blend:" -msgstr "Burbuja radiante" +msgstr "Mezcla de ruido:" -#: ../src/extension/internal/filter/paint.h:710 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:709 msgid "Grain lightness:" -msgstr "Claridad" +msgstr "Ligereza de grano:" -#: ../src/extension/internal/filter/paint.h:712 +#: ../src/extension/internal/filter/paint.h:711 #: ../src/extension/internal/filter/transparency.h:343 -#, fuzzy msgid "Blur:" -msgstr "Desen_foque:" +msgstr "Desenfoque:" -#: ../src/extension/internal/filter/paint.h:718 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:717 msgid "Points color" -msgstr "Color de meses" +msgstr "Color de puntos" -#: ../src/extension/internal/filter/paint.h:720 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:719 msgid "Image on points" -msgstr "Archivo de Imagen" +msgstr "Imagen en puntos" -#: ../src/extension/internal/filter/paint.h:730 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:729 msgid "Convert image to a transparent point engraving" -msgstr "Convertir a un positivo o negativo colorizable transparente" +msgstr "Convertir imagen en grabado de puntos transparente" -#: ../src/extension/internal/filter/paint.h:852 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:851 msgid "Poster Paint" -msgstr "restricción" +msgstr "Pintura de póster" -#: ../src/extension/internal/filter/paint.h:858 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:857 msgid "Transfer type:" -msgstr " tipo: " +msgstr "Tipo de transferencia:" -#: ../src/extension/internal/filter/paint.h:859 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:858 msgid "Poster" -msgstr "Yeso" +msgstr "Póster" -#: ../src/extension/internal/filter/paint.h:860 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:859 msgid "Painting" -msgstr "Pintura al óleo" +msgstr "Pintura" -#: ../src/extension/internal/filter/paint.h:870 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:869 msgid "Simplify (primary):" -msgstr "Simplificando trayectos:" +msgstr "Simplificar (primario):" -#: ../src/extension/internal/filter/paint.h:871 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:870 msgid "Simplify (secondary):" -msgstr "Simplificar colores" +msgstr "Simplificar (secundario):" -#: ../src/extension/internal/filter/paint.h:872 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:871 msgid "Pre-saturation:" -msgstr "Saturación" +msgstr "Presaturación:" -#: ../src/extension/internal/filter/paint.h:873 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:872 msgid "Post-saturation:" -msgstr "Saturación" +msgstr "Post-saturación:" -#: ../src/extension/internal/filter/paint.h:874 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:873 msgid "Simulate antialiasing" -msgstr "Simular el estilo de la pintura al óleo" +msgstr "Simular antialiasing" -#: ../src/extension/internal/filter/paint.h:882 -#, fuzzy +#: ../src/extension/internal/filter/paint.h:881 msgid "Poster and painting effects" -msgstr "Pegar efecto de trayecto vivo" +msgstr "Efectos de póster y pintura" -#: ../src/extension/internal/filter/paint.h:975 +#: ../src/extension/internal/filter/paint.h:974 msgid "Posterize Basic" -msgstr "" +msgstr "Posterización básica" -#: ../src/extension/internal/filter/paint.h:986 +#: ../src/extension/internal/filter/paint.h:985 msgid "Simple posterizing effect" -msgstr "" +msgstr "Efecto de posterizado sencillo" #: ../src/extension/internal/filter/protrusions.h:48 msgid "Snow crest" msgstr "Pico nevado" #: ../src/extension/internal/filter/protrusions.h:50 -#, fuzzy msgid "Drift Size:" -msgstr "Tamaño del montón" +msgstr "Tamaño de la deriva:" #: ../src/extension/internal/filter/protrusions.h:58 msgid "Snow has fallen on object" @@ -8333,24 +8056,20 @@ msgid "Drop Shadow" msgstr "Sombra paralela" #: ../src/extension/internal/filter/shadows.h:60 -#, fuzzy msgid "Blur radius (px):" -msgstr "Radio de desenfoque, px" +msgstr "Radio de desenfoque (px):" #: ../src/extension/internal/filter/shadows.h:61 -#, fuzzy msgid "Horizontal offset (px):" -msgstr "Desvío horizontal, px" +msgstr "Desvío horizontal (px):" #: ../src/extension/internal/filter/shadows.h:62 -#, fuzzy msgid "Vertical offset (px):" -msgstr "Desvío vertical, px" +msgstr "Desvío vertical (px):" #: ../src/extension/internal/filter/shadows.h:63 -#, fuzzy msgid "Blur type:" -msgstr "Retoque de desenfoque" +msgstr "Tipo de desenfoque:" #: ../src/extension/internal/filter/shadows.h:66 msgid "Outer cutout" @@ -8609,7 +8328,7 @@ msgstr "Generar" #: ../src/extension/internal/grid.cpp:212 #: ../src/ui/dialog/document-properties.cpp:146 #: ../src/ui/dialog/inkscape-preferences.cpp:743 -#: ../src/widgets/toolbox.cpp:1854 +#: ../src/widgets/toolbox.cpp:1873 msgid "Grids" msgstr "Rejillas" @@ -8765,27 +8484,27 @@ msgctxt "PDF input precision" msgid "very fine" msgstr "muy fino" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:753 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:761 msgid "PDF Input" msgstr "Entrada PDF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:758 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:766 msgid "Adobe PDF (*.pdf)" msgstr "Adobe PDF (*.pdf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:759 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:767 msgid "Adobe Portable Document Format" msgstr "Formato de documento portable de Adobe" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:766 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:774 msgid "AI Input" msgstr "Entrada AI" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:771 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:779 msgid "Adobe Illustrator 9.0 and above (*.ai)" msgstr "Adobe Illustrator 9.0 y superiores (*.ai)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:772 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:780 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" msgstr "" "Abrir archivos guardados con Adobe Illustrator 9.0 y versiones superiores" @@ -8878,15 +8597,15 @@ msgstr "Gráficos WordPerfect (*.wpg)" msgid "Vector graphics format used by Corel WordPerfect" msgstr "Formato de gráficos vectoriales utilizados por Corel WordPerfect" -#: ../src/extension/prefdialog.cpp:251 +#: ../src/extension/prefdialog.cpp:249 msgid "Live preview" msgstr "Vista en directo" -#: ../src/extension/prefdialog.cpp:251 +#: ../src/extension/prefdialog.cpp:249 msgid "Is the effect previewed live on canvas?" msgstr "¿Se previsualiza el el efecto en el lienzo?" -#: ../src/extension/system.cpp:153 ../src/extension/system.cpp:155 +#: ../src/extension/system.cpp:154 ../src/extension/system.cpp:156 msgid "Format autodetect failed. The file is being opened as SVG." msgstr "" "Ha fallado la detección automática de formato. Se abrirá el archivo como SVG." @@ -8895,54 +8614,54 @@ msgstr "" msgid "default.svg" msgstr "default.es.svg" -#: ../src/file.cpp:281 +#: ../src/file.cpp:285 msgid "Broken links have been changed to point to existing files." msgstr "" -#: ../src/file.cpp:292 ../src/file.cpp:1205 +#: ../src/file.cpp:296 ../src/file.cpp:1211 #, c-format msgid "Failed to load the requested file %s" msgstr "Error al cargar el archivo pedido %s" -#: ../src/file.cpp:316 +#: ../src/file.cpp:322 msgid "Document not saved yet. Cannot revert." msgstr "Todavía no se ha guardado el documento. No se puede revertir." -#: ../src/file.cpp:322 +#: ../src/file.cpp:328 #, c-format msgid "Changes will be lost! Are you sure you want to reload document %s?" msgstr "" "Se perderán los cambios. ¿Está seguro de querer recargar el documento %s?" -#: ../src/file.cpp:351 +#: ../src/file.cpp:357 msgid "Document reverted." msgstr "Documento revertido." -#: ../src/file.cpp:353 +#: ../src/file.cpp:359 msgid "Document not reverted." msgstr "No se ha revertido el documento." -#: ../src/file.cpp:503 +#: ../src/file.cpp:509 msgid "Select file to open" msgstr "Seleccione el archivo que desea abrir" -#: ../src/file.cpp:587 +#: ../src/file.cpp:593 #, fuzzy msgid "Clean up document" msgstr "Guardar documento" -#: ../src/file.cpp:592 +#: ../src/file.cpp:598 #, c-format msgid "Removed <b>%i</b> unused definition in <defs>." msgid_plural "Removed <b>%i</b> unused definitions in <defs>." msgstr[0] "Se ha eliminado <b>%i</b> definición no usada en <defs>." msgstr[1] "Se han eliminado <b>%i</b> definiciones no usadas en <defs>." -#: ../src/file.cpp:597 +#: ../src/file.cpp:603 msgid "No unused definitions in <defs>." msgstr "No hay definiciones sin usar en <defs>." -#: ../src/file.cpp:628 +#: ../src/file.cpp:634 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8951,12 +8670,12 @@ msgstr "" "No se ha encontrado una extensión de inkscape para guardar el documento " "(%s). Esto pudo ser causado por una extensión de archivo desconocida." -#: ../src/file.cpp:629 ../src/file.cpp:637 ../src/file.cpp:645 -#: ../src/file.cpp:651 ../src/file.cpp:656 +#: ../src/file.cpp:635 ../src/file.cpp:643 ../src/file.cpp:651 +#: ../src/file.cpp:657 ../src/file.cpp:662 msgid "Document not saved." msgstr "No se ha guardado el documento." -#: ../src/file.cpp:636 +#: ../src/file.cpp:642 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." @@ -8964,60 +8683,60 @@ msgstr "" "El archivo %s está protegido contra escritura. Retire la protección contra " "escritura e inténtelo de nuevo." -#: ../src/file.cpp:644 +#: ../src/file.cpp:650 #, c-format msgid "File %s could not be saved." msgstr "No se ha podido guardar el archivo %s." -#: ../src/file.cpp:672 +#: ../src/file.cpp:678 msgid "Document saved." msgstr "Documento guardado." #. We are saving for the first time; create a unique default filename -#: ../src/file.cpp:819 ../src/file.cpp:1368 +#: ../src/file.cpp:825 ../src/file.cpp:1374 #, c-format msgid "drawing%s" msgstr "dibujo%s" -#: ../src/file.cpp:825 +#: ../src/file.cpp:831 #, c-format msgid "drawing-%d%s" msgstr "dibujo-%d%s" -#: ../src/file.cpp:829 +#: ../src/file.cpp:835 #, c-format msgid "%s" msgstr "%s" -#: ../src/file.cpp:844 +#: ../src/file.cpp:850 msgid "Select file to save a copy to" msgstr "Seleccione el archivo en el que se guardará una copia" -#: ../src/file.cpp:846 +#: ../src/file.cpp:852 msgid "Select file to save to" msgstr "Seleccione el archivo en el que se guardará" -#: ../src/file.cpp:949 +#: ../src/file.cpp:955 msgid "No changes need to be saved." msgstr "No hay cambios que necesiten ser guardados." -#: ../src/file.cpp:967 +#: ../src/file.cpp:973 msgid "Saving document..." msgstr "Guardando documento..." -#: ../src/file.cpp:1202 ../src/ui/dialog/ocaldialogs.cpp:1211 +#: ../src/file.cpp:1208 ../src/ui/dialog/ocaldialogs.cpp:1211 msgid "Import" msgstr "Importar" -#: ../src/file.cpp:1252 +#: ../src/file.cpp:1258 msgid "Select file to import" msgstr "Seleccionar el archivo a importar" -#: ../src/file.cpp:1390 +#: ../src/file.cpp:1396 msgid "Select file to export to" msgstr "Seleccionar el archivo de exportación" -#: ../src/file.cpp:1643 +#: ../src/file.cpp:1649 #, fuzzy msgid "Import Clip Art" msgstr "Importar/Exportar" @@ -9105,7 +8824,7 @@ msgstr "Luminescencia a alfa" # File #. File -#: ../src/filter-enums.cpp:70 ../src/verbs.cpp:2255 +#: ../src/filter-enums.cpp:70 ../src/verbs.cpp:2301 #: ../share/extensions/jessyInk_mouseHandler.inx.h:1 #: ../share/extensions/jessyInk_transitions.inx.h:2 msgid "Default" @@ -9115,7 +8834,7 @@ msgstr "Predeterminado" msgid "Arithmetic" msgstr "Aritmético" -#: ../src/filter-enums.cpp:92 ../src/selection-chemistry.cpp:484 +#: ../src/filter-enums.cpp:92 ../src/selection-chemistry.cpp:486 msgid "Duplicate" msgstr "Duplicar" @@ -9132,7 +8851,7 @@ msgstr "Ajustar" #: ../src/ui/dialog/inkscape-preferences.cpp:1440 #: ../src/ui/dialog/input.cpp:613 ../src/ui/dialog/input.cpp:615 #: ../src/ui/dialog/input.cpp:617 ../src/ui/dialog/input.cpp:1287 -#: ../src/ui/dialog/input.cpp:1290 ../src/verbs.cpp:2252 +#: ../src/ui/dialog/input.cpp:1290 ../src/verbs.cpp:2298 #: ../src/widgets/pencil-toolbar.cpp:190 #: ../share/extensions/gcodetools_area.inx.h:32 #: ../share/extensions/gcodetools_dxf_points.inx.h:15 @@ -9670,12 +9389,13 @@ msgstr "Ex cuadrados" #: ../src/inkscape.cpp:316 #, fuzzy -msgid "Autosave failed! Cannot create directory " +msgid "Autosave failed! Cannot create directory %1." msgstr "No se puede crear el directorio de perfil %s." #: ../src/inkscape.cpp:325 -msgid "Autosave failed! Cannot open directory " -msgstr "" +#, fuzzy +msgid "Autosave failed! Cannot open directory %1." +msgstr "No se puede crear el directorio de perfil %s." #: ../src/inkscape.cpp:341 msgid "Autosaving documents..." @@ -9718,122 +9438,69 @@ msgstr "" msgid "Automatic backup of the following documents failed:\n" msgstr "Ha fallado la copia de seguridad de los siguientes documentos:\n" -#. sp_ui_menu_append_check_item_from_verb(m, view, _("_Menu"), _("Show or hide the menu bar"), "menu", -#. checkitem_toggled, checkitem_update, 0); -#: ../src/interface.cpp:899 -#, fuzzy -msgid "_Commands Bar" -msgstr "Barra de comandos" - -#: ../src/interface.cpp:899 -msgid "Show or hide the Commands bar (under the menu)" -msgstr "Mostrar u ocultar la barra de comandos (bajo el menú)" - -#: ../src/interface.cpp:901 -#, fuzzy -msgid "Sn_ap Controls Bar" -msgstr "Barra de controles de ajuste" - -#: ../src/interface.cpp:901 -msgid "Show or hide the snapping controls" -msgstr "Mostrar u ocultar los controles de ajuste" - -#: ../src/interface.cpp:903 -#, fuzzy -msgid "T_ool Controls Bar" -msgstr "Barra de controles de herramienta" - -#: ../src/interface.cpp:903 -msgid "Show or hide the Tool Controls bar" -msgstr "Mostrar u ocultar la barra de controles de herramienta" - -#: ../src/interface.cpp:905 -msgid "_Toolbox" -msgstr "Caja de herramien_tas" - -#: ../src/interface.cpp:905 -msgid "Show or hide the main toolbox (on the left)" -msgstr "Mostrar u ocultar la caja de herramientas principal (a la izquierda)" - -#: ../src/interface.cpp:911 -msgid "_Palette" -msgstr "_Paleta" - -#: ../src/interface.cpp:911 -msgid "Show or hide the color palette" -msgstr "Mostrar u ocultar la paleta de color" - -#: ../src/interface.cpp:913 -msgid "_Statusbar" -msgstr "Barra de e_stado" - -#: ../src/interface.cpp:913 -msgid "Show or hide the statusbar (at the bottom of the window)" -msgstr "Mostrar u ocultar la barra de estado (abajo en la ventana)" - # File -#: ../src/interface.cpp:921 +#: ../src/interface.cpp:918 #, fuzzy msgctxt "Interface setup" msgid "Default" msgstr "Predeterminado" -#: ../src/interface.cpp:921 +#: ../src/interface.cpp:918 msgid "Default interface setup" msgstr "Configuración predeterminada de la interfaz" -#: ../src/interface.cpp:922 +#: ../src/interface.cpp:919 #, fuzzy msgctxt "Interface setup" msgid "Custom" msgstr "Personalizado" -#: ../src/interface.cpp:922 +#: ../src/interface.cpp:919 #, fuzzy msgid "Setup for custom task" msgstr "Fijar la tarea personalizada" -#: ../src/interface.cpp:923 +#: ../src/interface.cpp:920 #, fuzzy msgctxt "Interface setup" msgid "Wide" msgstr "Ancho" -#: ../src/interface.cpp:923 +#: ../src/interface.cpp:920 msgid "Setup for widescreen work" msgstr "Disposición para pantalla ancha" -#: ../src/interface.cpp:1035 +#: ../src/interface.cpp:1032 #, c-format msgid "Verb \"%s\" Unknown" msgstr "Verbo «%s» desconocido" -#: ../src/interface.cpp:1077 +#: ../src/interface.cpp:1074 msgid "Open _Recent" msgstr "Abrir _reciente" -#: ../src/interface.cpp:1185 ../src/interface.cpp:1271 -#: ../src/interface.cpp:1374 ../src/ui/widget/selected-style.cpp:496 +#: ../src/interface.cpp:1182 ../src/interface.cpp:1268 +#: ../src/interface.cpp:1371 ../src/ui/widget/selected-style.cpp:498 msgid "Drop color" msgstr "Soltar color" -#: ../src/interface.cpp:1224 ../src/interface.cpp:1334 +#: ../src/interface.cpp:1221 ../src/interface.cpp:1331 msgid "Drop color on gradient" msgstr "Soltar color en degradado" -#: ../src/interface.cpp:1387 +#: ../src/interface.cpp:1384 msgid "Could not parse SVG data" msgstr "No se pudieron interpretar los datos SVG" -#: ../src/interface.cpp:1426 +#: ../src/interface.cpp:1423 msgid "Drop SVG" msgstr "Soltar SVG" -#: ../src/interface.cpp:1463 +#: ../src/interface.cpp:1460 msgid "Drop bitmap image" msgstr "Soltar mapa de bits" -#: ../src/interface.cpp:1555 +#: ../src/interface.cpp:1552 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">A file named \"%s\" already exists. Do " @@ -9846,158 +9513,158 @@ msgstr "" "\n" "El archivo ya existe en «%s». Al reemplazarlo sobrescribirá su contenido." -#: ../src/interface.cpp:1562 ../share/extensions/web-set-att.inx.h:7 +#: ../src/interface.cpp:1559 ../share/extensions/web-set-att.inx.h:7 #: ../share/extensions/web-transmit-att.inx.h:7 msgid "Replace" msgstr "Reemplazar" -#: ../src/interface.cpp:1631 +#: ../src/interface.cpp:1628 msgid "Go to parent" msgstr "Ir al padre" #. TRANSLATORS: #%1 is the id of the group e.g. <g id="#g7">, not a number. -#: ../src/interface.cpp:1672 +#: ../src/interface.cpp:1669 #, fuzzy msgid "Enter group #%1" msgstr "Entrar en el grupo #%s" #. Item dialog -#: ../src/interface.cpp:1811 ../src/verbs.cpp:2731 +#: ../src/interface.cpp:1808 ../src/verbs.cpp:2795 msgid "_Object Properties..." msgstr "Propiedades del _objeto..." -#: ../src/interface.cpp:1820 +#: ../src/interface.cpp:1817 msgid "_Select This" msgstr "_Seleccionar esto" -#: ../src/interface.cpp:1831 +#: ../src/interface.cpp:1828 #, fuzzy msgid "Select Same" msgstr "Seleccionar página" #. Select same fill and stroke -#: ../src/interface.cpp:1841 +#: ../src/interface.cpp:1838 #, fuzzy msgid "Fill and Stroke" msgstr "_Relleno y borde" #. Select same fill color -#: ../src/interface.cpp:1848 +#: ../src/interface.cpp:1845 #, fuzzy msgid "Fill Color" msgstr "Aplicar color de relleno" #. Select same stroke color -#: ../src/interface.cpp:1855 +#: ../src/interface.cpp:1852 #, fuzzy msgid "Stroke Color" msgstr "Fijar color del trazo" #. Select same stroke style -#: ../src/interface.cpp:1862 +#: ../src/interface.cpp:1859 #, fuzzy msgid "Stroke Style" msgstr "Est_ilo de trazo" #. Select same stroke style -#: ../src/interface.cpp:1869 +#: ../src/interface.cpp:1866 #, fuzzy msgid "Object type" msgstr "Tipo de objeto" #. Move to layer -#: ../src/interface.cpp:1876 +#: ../src/interface.cpp:1873 #, fuzzy msgid "_Move to layer ..." msgstr "Bajar capa" #. Create link -#: ../src/interface.cpp:1886 +#: ../src/interface.cpp:1883 #, fuzzy msgid "Create _Link" msgstr "_Crear enlace" #. Set mask -#: ../src/interface.cpp:1909 +#: ../src/interface.cpp:1906 msgid "Set Mask" msgstr "Aplicar máscara" #. Release mask -#: ../src/interface.cpp:1920 +#: ../src/interface.cpp:1917 msgid "Release Mask" msgstr "Liberar máscara" #. Set Clip -#: ../src/interface.cpp:1931 +#: ../src/interface.cpp:1928 #, fuzzy msgid "Set Cl_ip" msgstr "Aplicar recorte" #. Release Clip -#: ../src/interface.cpp:1942 +#: ../src/interface.cpp:1939 #, fuzzy msgid "Release C_lip" msgstr "Liberar recorte" #. Group -#: ../src/interface.cpp:1953 ../src/verbs.cpp:2384 +#: ../src/interface.cpp:1950 ../src/verbs.cpp:2434 msgid "_Group" msgstr "A_grupar" -#: ../src/interface.cpp:2024 +#: ../src/interface.cpp:2021 msgid "Create link" msgstr "Crear enlace" #. Ungroup -#: ../src/interface.cpp:2055 ../src/verbs.cpp:2386 +#: ../src/interface.cpp:2052 ../src/verbs.cpp:2436 msgid "_Ungroup" msgstr "Desagr_upar" #. Link dialog -#: ../src/interface.cpp:2080 +#: ../src/interface.cpp:2077 #, fuzzy msgid "Link _Properties..." msgstr "_Propiedades del enlace" #. Select item -#: ../src/interface.cpp:2086 +#: ../src/interface.cpp:2083 msgid "_Follow Link" msgstr "Se_guir enlace" #. Reset transformations -#: ../src/interface.cpp:2092 +#: ../src/interface.cpp:2089 msgid "_Remove Link" msgstr "_Eliminar enlace" -#: ../src/interface.cpp:2123 +#: ../src/interface.cpp:2120 #, fuzzy msgid "Remove link" msgstr "_Eliminar enlace" #. Image properties -#: ../src/interface.cpp:2134 +#: ../src/interface.cpp:2131 #, fuzzy msgid "Image _Properties..." msgstr "_Propiedades de la imagen" #. Edit externally -#: ../src/interface.cpp:2140 +#: ../src/interface.cpp:2137 msgid "Edit Externally..." msgstr "Editar externamente..." #. Trace Bitmap #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/interface.cpp:2149 ../src/verbs.cpp:2447 +#: ../src/interface.cpp:2146 ../src/verbs.cpp:2497 msgid "_Trace Bitmap..." msgstr "Vec_torizar mapa de bits..." -#: ../src/interface.cpp:2159 +#: ../src/interface.cpp:2156 #, fuzzy msgctxt "Context menu" msgid "Embed Image" msgstr "Incrustar imágenes" -#: ../src/interface.cpp:2170 +#: ../src/interface.cpp:2167 #, fuzzy msgctxt "Context menu" msgid "Extract Image..." @@ -10005,17 +9672,17 @@ msgstr "Extraer imagen" #. Item dialog #. Fill and Stroke dialog -#: ../src/interface.cpp:2309 ../src/interface.cpp:2329 ../src/verbs.cpp:2696 +#: ../src/interface.cpp:2306 ../src/interface.cpp:2326 ../src/verbs.cpp:2758 msgid "_Fill and Stroke..." msgstr "_Relleno y borde..." #. Edit Text dialog -#: ../src/interface.cpp:2335 ../src/verbs.cpp:2711 +#: ../src/interface.cpp:2332 ../src/verbs.cpp:2775 msgid "_Text and Font..." msgstr "_Texto y tipografía..." #. Spellcheck dialog -#: ../src/interface.cpp:2341 ../src/verbs.cpp:2719 +#: ../src/interface.cpp:2338 ../src/verbs.cpp:2783 msgid "Check Spellin_g..." msgstr "Comprobar orto_grafía..." @@ -10230,7 +9897,7 @@ msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:1056 #: ../src/ui/dialog/document-properties.cpp:144 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1540 -#: ../src/widgets/desktop-widget.cpp:1817 +#: ../src/widgets/desktop-widget.cpp:1922 #: ../share/extensions/voronoi2svg.inx.h:8 msgid "Page" msgstr "Página" @@ -10240,7 +9907,7 @@ msgid "The index of the current page" msgstr "El índice de la página actual" #: ../src/libgdl/gdl-dock-object.c:125 ../src/ui/widget/page-sizer.cpp:258 -#: ../src/widgets/gradient-selector.cpp:152 +#: ../src/widgets/gradient-selector.cpp:153 #: ../src/widgets/sp-xmlview-attr-list.cpp:57 msgid "Name" msgstr "Nombre" @@ -10604,7 +10271,7 @@ msgstr "Regla" msgid "Power stroke" msgstr "Trazo de mosaico" -#: ../src/live_effects/effect.cpp:125 ../src/selection-chemistry.cpp:2758 +#: ../src/live_effects/effect.cpp:125 ../src/selection-chemistry.cpp:2760 #, fuzzy msgid "Clone original path" msgstr "Reemplazar texto" @@ -11073,111 +10740,111 @@ msgstr "Fundir tramos cercanos" msgid "Fuse ends closer than this number. 0 means don't fuse." msgstr "Fundir tramos más cercanos que este número. 0 significa no fundir." -#: ../src/live_effects/lpe-powerstroke.cpp:163 +#: ../src/live_effects/lpe-powerstroke.cpp:189 #, fuzzy msgid "CubicBezierFit" msgstr "Bézier" -#: ../src/live_effects/lpe-powerstroke.cpp:164 +#: ../src/live_effects/lpe-powerstroke.cpp:190 msgid "CubicBezierJohan" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:165 +#: ../src/live_effects/lpe-powerstroke.cpp:191 #, fuzzy msgid "SpiroInterpolator" msgstr "Interpolar" -#: ../src/live_effects/lpe-powerstroke.cpp:177 +#: ../src/live_effects/lpe-powerstroke.cpp:203 #, fuzzy msgid "Butt" msgstr "Botón" -#: ../src/live_effects/lpe-powerstroke.cpp:178 +#: ../src/live_effects/lpe-powerstroke.cpp:204 #, fuzzy msgid "Square" msgstr "Tope cuadrado" -#: ../src/live_effects/lpe-powerstroke.cpp:179 +#: ../src/live_effects/lpe-powerstroke.cpp:205 #: ../share/extensions/gcodetools_prepare_path_for_plasma.inx.h:16 #, fuzzy msgid "Round" msgstr "Redondeado" -#: ../src/live_effects/lpe-powerstroke.cpp:180 +#: ../src/live_effects/lpe-powerstroke.cpp:206 msgid "Peak" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:181 +#: ../src/live_effects/lpe-powerstroke.cpp:207 #, fuzzy msgid "Zero width" msgstr "Ancho de trazo" -#: ../src/live_effects/lpe-powerstroke.cpp:194 +#: ../src/live_effects/lpe-powerstroke.cpp:220 #, fuzzy msgid "Beveled" msgstr "Biseles" -#: ../src/live_effects/lpe-powerstroke.cpp:195 +#: ../src/live_effects/lpe-powerstroke.cpp:221 #: ../src/widgets/star-toolbar.cpp:547 msgid "Rounded" msgstr "Redondeado" -#: ../src/live_effects/lpe-powerstroke.cpp:196 +#: ../src/live_effects/lpe-powerstroke.cpp:222 #, fuzzy msgid "Extrapolated" msgstr "Interpolar" -#: ../src/live_effects/lpe-powerstroke.cpp:197 +#: ../src/live_effects/lpe-powerstroke.cpp:223 #, fuzzy msgid "Miter" msgstr "Unión de tipo inglete" -#: ../src/live_effects/lpe-powerstroke.cpp:198 +#: ../src/live_effects/lpe-powerstroke.cpp:224 #: ../src/widgets/pencil-toolbar.cpp:138 msgid "Spiro" msgstr "Spiro" -#: ../src/live_effects/lpe-powerstroke.cpp:200 +#: ../src/live_effects/lpe-powerstroke.cpp:226 msgid "Extrapolated arc" msgstr "" -#: ../src/live_effects/lpe-powerstroke.cpp:207 +#: ../src/live_effects/lpe-powerstroke.cpp:233 #, fuzzy msgid "Offset points" msgstr "Trayecto de desvío" -#: ../src/live_effects/lpe-powerstroke.cpp:208 +#: ../src/live_effects/lpe-powerstroke.cpp:234 #, fuzzy msgid "Sort points" msgstr "Orientación" -#: ../src/live_effects/lpe-powerstroke.cpp:208 +#: ../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:209 +#: ../src/live_effects/lpe-powerstroke.cpp:235 #, fuzzy msgid "Interpolator type:" msgstr "Interpolar estilo" -#: ../src/live_effects/lpe-powerstroke.cpp:209 +#: ../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:210 +#: ../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:211 +#: ../src/live_effects/lpe-powerstroke.cpp:237 #, fuzzy msgid "Start cap:" msgstr "Inicio:" -#: ../src/live_effects/lpe-powerstroke.cpp:211 +#: ../src/live_effects/lpe-powerstroke.cpp:237 #, fuzzy msgid "Determines the shape of the path's start" msgstr "Determina el número de pasos desde el inicio hasta el fin." @@ -11185,31 +10852,32 @@ msgstr "Determina el número de pasos desde el inicio hasta el fin." #. 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:212 +#: ../src/live_effects/lpe-powerstroke.cpp:238 #: ../src/widgets/stroke-style.cpp:186 msgid "Join:" msgstr "Unión:" -#: ../src/live_effects/lpe-powerstroke.cpp:212 -msgid "Specifies the shape of the path's corners" -msgstr "" +#: ../src/live_effects/lpe-powerstroke.cpp:238 +#, fuzzy +msgid "Determines the shape of the path's corners" +msgstr "Determina el número de pasos desde el inicio hasta el fin." -#: ../src/live_effects/lpe-powerstroke.cpp:213 +#: ../src/live_effects/lpe-powerstroke.cpp:239 #, fuzzy msgid "Miter limit:" msgstr "Límite de inglete:" -#: ../src/live_effects/lpe-powerstroke.cpp:213 +#: ../src/live_effects/lpe-powerstroke.cpp:239 #: ../src/widgets/stroke-style.cpp:234 msgid "Maximum length of the miter (in units of stroke width)" msgstr "Longitud máxima del inglete (en unidades de ancho de trazo)" -#: ../src/live_effects/lpe-powerstroke.cpp:214 +#: ../src/live_effects/lpe-powerstroke.cpp:240 #, fuzzy msgid "End cap:" msgstr "Tope redondo" -#: ../src/live_effects/lpe-powerstroke.cpp:214 +#: ../src/live_effects/lpe-powerstroke.cpp:240 #, fuzzy msgid "Determines the shape of the path's end" msgstr "Determina el número de pasos desde el inicio hasta el fin." @@ -11980,7 +11648,8 @@ msgid "Export document to an Enhanced Metafile (EMF) File" msgstr "Exportar el documento a un Metaarchivo mejorado (EMF)" #: ../src/main.cpp:393 -msgid "Convert text object to paths on export (PS, EPS, PDF)" +#, fuzzy +msgid "Convert text object to paths on export (PS, EPS, PDF, SVG)" msgstr "Convertir el texto a trayectos al exportar (PS, EPS, PDF)" #: ../src/main.cpp:398 @@ -12087,11 +11756,11 @@ msgstr "_Nuevo" #. " <verb verb-id=\"FileExportToOCAL\" />\n" #. " <verb verb-id=\"DialogMetadata\" />\n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2524 ../src/verbs.cpp:2530 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2580 ../src/verbs.cpp:2586 msgid "_Edit" msgstr "_Edición" -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2300 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2346 msgid "Paste Si_ze" msgstr "Pegar ta_maño" @@ -12143,39 +11812,44 @@ msgstr "_Capa" msgid "_Object" msgstr "_Objeto" -#: ../src/menus-skeleton.h:189 +#: ../src/menus-skeleton.h:190 msgid "Cli_p" msgstr "_Recorte" -#: ../src/menus-skeleton.h:193 +#: ../src/menus-skeleton.h:194 msgid "Mas_k" msgstr "Más_cara" -#: ../src/menus-skeleton.h:197 +#: ../src/menus-skeleton.h:198 msgid "Patter_n" msgstr "Patró_n" -#: ../src/menus-skeleton.h:221 +#: ../src/menus-skeleton.h:202 +#, fuzzy +msgid "Symbo_l" +msgstr "Símbolos Jemeres" + +#: ../src/menus-skeleton.h:226 msgid "_Path" msgstr "_Trayecto" -#: ../src/menus-skeleton.h:268 +#: ../src/menus-skeleton.h:273 msgid "Filter_s" msgstr "Filtro_s" -#: ../src/menus-skeleton.h:274 +#: ../src/menus-skeleton.h:279 msgid "Exte_nsions" msgstr "Exte_nsiones" -#: ../src/menus-skeleton.h:281 +#: ../src/menus-skeleton.h:286 msgid "Whiteboa_rd" msgstr "Piza_rra blanca" -#: ../src/menus-skeleton.h:285 +#: ../src/menus-skeleton.h:290 msgid "_Help" msgstr "A_yuda" -#: ../src/menus-skeleton.h:289 +#: ../src/menus-skeleton.h:294 msgid "Tutorials" msgstr "Tutoriales" @@ -12888,15 +12562,15 @@ msgstr "" msgid "Selected object is not a group. Cannot enter." msgstr "El objeto seleccionado no es un grupo, no se puede entrar." -#: ../src/selection-chemistry.cpp:346 +#: ../src/selection-chemistry.cpp:348 msgid "Delete text" msgstr "Borrar texto" -#: ../src/selection-chemistry.cpp:354 +#: ../src/selection-chemistry.cpp:356 msgid "<b>Nothing</b> was deleted." msgstr "No se ha borrado <b>nada</b>." -#: ../src/selection-chemistry.cpp:372 ../src/text-context.cpp:1031 +#: ../src/selection-chemistry.cpp:374 ../src/text-context.cpp:1031 #: ../src/ui/dialog/swatches.cpp:209 ../src/ui/dialog/swatches.cpp:275 #: ../src/widgets/erasor-toolbar.cpp:114 #: ../src/widgets/gradient-toolbar.cpp:1193 @@ -12906,247 +12580,247 @@ msgstr "No se ha borrado <b>nada</b>." msgid "Delete" msgstr "Borrar" -#: ../src/selection-chemistry.cpp:400 +#: ../src/selection-chemistry.cpp:402 msgid "Select <b>object(s)</b> to duplicate." msgstr "Seleccione los <b>objetos</b> para duplicar." -#: ../src/selection-chemistry.cpp:509 +#: ../src/selection-chemistry.cpp:511 msgid "Delete all" msgstr "Borrar todo" -#: ../src/selection-chemistry.cpp:705 +#: ../src/selection-chemistry.cpp:707 msgid "Select <b>some objects</b> to group." msgstr "Seleccione <b>varios objetos</b> para agrupar." -#: ../src/selection-chemistry.cpp:720 ../src/selection-describer.cpp:52 +#: ../src/selection-chemistry.cpp:722 ../src/selection-describer.cpp:53 msgid "Group" msgstr "Grupo" -#: ../src/selection-chemistry.cpp:734 +#: ../src/selection-chemistry.cpp:736 msgid "Select a <b>group</b> to ungroup." msgstr "Seleccione un <b>grupo</b> para desagrupar." -#: ../src/selection-chemistry.cpp:775 +#: ../src/selection-chemistry.cpp:777 msgid "<b>No groups</b> to ungroup in the selection." msgstr "<b>No hay grupos</b> desagrupables en la selección." -#: ../src/selection-chemistry.cpp:781 ../src/sp-item-group.cpp:501 +#: ../src/selection-chemistry.cpp:783 ../src/sp-item-group.cpp:501 msgid "Ungroup" msgstr "Desagrupar" -#: ../src/selection-chemistry.cpp:867 +#: ../src/selection-chemistry.cpp:869 msgid "Select <b>object(s)</b> to raise." msgstr "Seleccione los <b>objetos</b> para elevar." -#: ../src/selection-chemistry.cpp:873 ../src/selection-chemistry.cpp:933 -#: ../src/selection-chemistry.cpp:966 ../src/selection-chemistry.cpp:1030 +#: ../src/selection-chemistry.cpp:875 ../src/selection-chemistry.cpp:935 +#: ../src/selection-chemistry.cpp:968 ../src/selection-chemistry.cpp:1032 msgid "" "You cannot raise/lower objects from <b>different groups</b> or <b>layers</b>." msgstr "" "No puede elevar/bajar objetos de <b>diferentes grupos</b> o <b>capas</b>." #. TRANSLATORS: "Raise" means "to raise an object" in the undo history -#: ../src/selection-chemistry.cpp:913 +#: ../src/selection-chemistry.cpp:915 #, fuzzy msgctxt "Undo action" msgid "Raise" msgstr "Elevar" -#: ../src/selection-chemistry.cpp:925 +#: ../src/selection-chemistry.cpp:927 msgid "Select <b>object(s)</b> to raise to top." msgstr "Seleccione los <b>objetos</b> que desea traer al frente." -#: ../src/selection-chemistry.cpp:948 +#: ../src/selection-chemistry.cpp:950 msgid "Raise to top" msgstr "Traer al frente" -#: ../src/selection-chemistry.cpp:960 +#: ../src/selection-chemistry.cpp:962 msgid "Select <b>object(s)</b> to lower." msgstr "Seleccione los <b>objetos</b> que desea enviar al fondo." -#: ../src/selection-chemistry.cpp:1010 +#: ../src/selection-chemistry.cpp:1012 msgid "Lower" msgstr "Bajar" -#: ../src/selection-chemistry.cpp:1022 +#: ../src/selection-chemistry.cpp:1024 msgid "Select <b>object(s)</b> to lower to bottom." msgstr "Seleccione los <b>objetos</b> para enviar al fondo." -#: ../src/selection-chemistry.cpp:1057 +#: ../src/selection-chemistry.cpp:1059 msgid "Lower to bottom" msgstr "Bajar al fondo" -#: ../src/selection-chemistry.cpp:1064 +#: ../src/selection-chemistry.cpp:1066 msgid "Nothing to undo." msgstr "Nada para deshacer." -#: ../src/selection-chemistry.cpp:1072 +#: ../src/selection-chemistry.cpp:1074 msgid "Nothing to redo." msgstr "Nada para rehacer." -#: ../src/selection-chemistry.cpp:1133 +#: ../src/selection-chemistry.cpp:1135 msgid "Paste" msgstr "Pegar" -#: ../src/selection-chemistry.cpp:1141 +#: ../src/selection-chemistry.cpp:1143 msgid "Paste style" msgstr "Pegar estilo" -#: ../src/selection-chemistry.cpp:1151 +#: ../src/selection-chemistry.cpp:1153 msgid "Paste live path effect" msgstr "Pegar efecto de trayecto vivo" -#: ../src/selection-chemistry.cpp:1172 +#: ../src/selection-chemistry.cpp:1174 msgid "Select <b>object(s)</b> to remove live path effects from." msgstr "" "Seleccione los <b>objetos</b> de los que retirar el efecto de trayecto vivo." -#: ../src/selection-chemistry.cpp:1184 +#: ../src/selection-chemistry.cpp:1186 msgid "Remove live path effect" msgstr "Retirar efecto de trayecto vivo" -#: ../src/selection-chemistry.cpp:1195 +#: ../src/selection-chemistry.cpp:1197 msgid "Select <b>object(s)</b> to remove filters from." msgstr "Seleccione los <b>objetos</b> de los que desea retirar los filtros." -#: ../src/selection-chemistry.cpp:1205 +#: ../src/selection-chemistry.cpp:1207 #: ../src/ui/dialog/filter-effects-dialog.cpp:1393 msgid "Remove filter" msgstr "Eliminar filtro" -#: ../src/selection-chemistry.cpp:1214 +#: ../src/selection-chemistry.cpp:1216 msgid "Paste size" msgstr "Pegar tamaño" -#: ../src/selection-chemistry.cpp:1223 +#: ../src/selection-chemistry.cpp:1225 msgid "Paste size separately" msgstr "Pegar los tamaños por separado" -#: ../src/selection-chemistry.cpp:1233 +#: ../src/selection-chemistry.cpp:1235 msgid "Select <b>object(s)</b> to move to the layer above." msgstr "Seleccione los <b>objetos</b> que desea mover a la capa superior." -#: ../src/selection-chemistry.cpp:1259 +#: ../src/selection-chemistry.cpp:1261 msgid "Raise to next layer" msgstr "Mover a la siguiente capa" -#: ../src/selection-chemistry.cpp:1266 +#: ../src/selection-chemistry.cpp:1268 msgid "No more layers above." msgstr "No hay capas superiores." -#: ../src/selection-chemistry.cpp:1278 +#: ../src/selection-chemistry.cpp:1280 msgid "Select <b>object(s)</b> to move to the layer below." msgstr "Seleccione los <b>objetos</b> que desea mover a la capa inferior." -#: ../src/selection-chemistry.cpp:1304 +#: ../src/selection-chemistry.cpp:1306 msgid "Lower to previous layer" msgstr "Bajar a la capa anterior" -#: ../src/selection-chemistry.cpp:1311 +#: ../src/selection-chemistry.cpp:1313 msgid "No more layers below." msgstr "No hay capas inferiores." -#: ../src/selection-chemistry.cpp:1323 +#: ../src/selection-chemistry.cpp:1325 #, fuzzy msgid "Select <b>object(s)</b> to move." msgstr "Seleccione los <b>objetos</b> que desea enviar al fondo." -#: ../src/selection-chemistry.cpp:1340 ../src/verbs.cpp:2473 +#: ../src/selection-chemistry.cpp:1342 ../src/verbs.cpp:2523 #, fuzzy msgid "Move selection to layer" msgstr "Mover la selección a la capa superior a la actual" -#: ../src/selection-chemistry.cpp:1564 +#: ../src/selection-chemistry.cpp:1566 msgid "Remove transform" msgstr "Eliminar transformación" -#: ../src/selection-chemistry.cpp:1667 +#: ../src/selection-chemistry.cpp:1669 msgid "Rotate 90° CCW" msgstr "Rotar 90° a la izquierda" -#: ../src/selection-chemistry.cpp:1667 +#: ../src/selection-chemistry.cpp:1669 msgid "Rotate 90° CW" msgstr "Rotar 90° a la derecha" -#: ../src/selection-chemistry.cpp:1688 ../src/seltrans.cpp:479 +#: ../src/selection-chemistry.cpp:1690 ../src/seltrans.cpp:479 #: ../src/ui/dialog/transformation.cpp:800 msgid "Rotate" msgstr "Rotar" -#: ../src/selection-chemistry.cpp:2067 +#: ../src/selection-chemistry.cpp:2069 msgid "Rotate by pixels" msgstr "Rotar por píxeles" -#: ../src/selection-chemistry.cpp:2097 ../src/seltrans.cpp:476 +#: ../src/selection-chemistry.cpp:2099 ../src/seltrans.cpp:476 #: ../src/ui/dialog/transformation.cpp:775 #: ../share/extensions/interp_att_g.inx.h:19 msgid "Scale" msgstr "Escalar" -#: ../src/selection-chemistry.cpp:2122 +#: ../src/selection-chemistry.cpp:2124 msgid "Scale by whole factor" msgstr "Escalar por factor entero" -#: ../src/selection-chemistry.cpp:2137 +#: ../src/selection-chemistry.cpp:2139 msgid "Move vertically" msgstr "Mover verticalmente" -#: ../src/selection-chemistry.cpp:2140 +#: ../src/selection-chemistry.cpp:2142 msgid "Move horizontally" msgstr "Mover horizontalmente" -#: ../src/selection-chemistry.cpp:2143 ../src/selection-chemistry.cpp:2169 +#: ../src/selection-chemistry.cpp:2145 ../src/selection-chemistry.cpp:2171 #: ../src/seltrans.cpp:473 ../src/ui/dialog/transformation.cpp:714 msgid "Move" msgstr "Mover" -#: ../src/selection-chemistry.cpp:2163 +#: ../src/selection-chemistry.cpp:2165 msgid "Move vertically by pixels" msgstr "Mover verticalmente por píxeles" -#: ../src/selection-chemistry.cpp:2166 +#: ../src/selection-chemistry.cpp:2168 msgid "Move horizontally by pixels" msgstr "Mover horizontalmente por píxeles" -#: ../src/selection-chemistry.cpp:2298 +#: ../src/selection-chemistry.cpp:2300 msgid "The selection has no applied path effect." msgstr "La selección no tiene aplicado ningún efecto de trayecto." -#: ../src/selection-chemistry.cpp:2501 +#: ../src/selection-chemistry.cpp:2503 #, fuzzy msgctxt "Action" msgid "Clone" msgstr "Clonado" -#: ../src/selection-chemistry.cpp:2517 +#: ../src/selection-chemistry.cpp:2519 msgid "Select <b>clones</b> to relink." msgstr "Seleccione los <b>clones</b> que desea reconectar." -#: ../src/selection-chemistry.cpp:2524 +#: ../src/selection-chemistry.cpp:2526 msgid "Copy an <b>object</b> to clipboard to relink clones to." msgstr "Copie un <b>objeto</b> al portapapeles al que reconectar los clones." -#: ../src/selection-chemistry.cpp:2548 +#: ../src/selection-chemistry.cpp:2550 msgid "<b>No clones to relink</b> in the selection." msgstr "<b>No hay clones reasociables</b> en la selección." -#: ../src/selection-chemistry.cpp:2551 +#: ../src/selection-chemistry.cpp:2553 msgid "Relink clone" msgstr "Resconectar clon" -#: ../src/selection-chemistry.cpp:2565 +#: ../src/selection-chemistry.cpp:2567 msgid "Select <b>clones</b> to unlink." msgstr "Seleccione los <b>clones</b> que desea desconectar." -#: ../src/selection-chemistry.cpp:2619 +#: ../src/selection-chemistry.cpp:2621 msgid "<b>No clones to unlink</b> in the selection." msgstr "<b>No hay clones desconectables</b> en la selección." -#: ../src/selection-chemistry.cpp:2623 +#: ../src/selection-chemistry.cpp:2625 msgid "Unlink clone" msgstr "Desconectar clon" -#: ../src/selection-chemistry.cpp:2636 +#: ../src/selection-chemistry.cpp:2638 msgid "" "Select a <b>clone</b> to go to its original. Select a <b>linked offset</b> " "to go to its source. Select a <b>text on path</b> to go to the path. Select " @@ -13156,7 +12830,7 @@ msgstr "" "enlazado</b> para ir a su origen. Seleccione un <b>texto en trayecto</b> " "para ir al trayecto. Seleccione un <b>texto fluido</b> para ir a su marco." -#: ../src/selection-chemistry.cpp:2669 +#: ../src/selection-chemistry.cpp:2671 msgid "" "<b>Cannot find</b> the object to select (orphaned clone, offset, textpath, " "flowed text?)" @@ -13164,127 +12838,165 @@ msgstr "" "<b>No se pudo encontrar</b> el objeto que quiere seleccionar (¿clon " "huérfano, desvío, trayecto de un texto o texto fluido?)" -#: ../src/selection-chemistry.cpp:2675 +#: ../src/selection-chemistry.cpp:2677 msgid "" "The object you're trying to select is <b>not visible</b> (it is in <" "defs>)" msgstr "" "El objeto que desea seleccionar <b>no es visible</b> (está en <defs>)" -#: ../src/selection-chemistry.cpp:2720 +#: ../src/selection-chemistry.cpp:2722 #, fuzzy msgid "Select <b>one</b> path to clone." msgstr "Seleccione el <b>objeto</b> que desea clonar." -#: ../src/selection-chemistry.cpp:2724 +#: ../src/selection-chemistry.cpp:2726 #, fuzzy msgid "Select one <b>path</b> to clone." msgstr "Seleccione el <b>objeto</b> que desea clonar." -#: ../src/selection-chemistry.cpp:2779 +#: ../src/selection-chemistry.cpp:2781 msgid "Select <b>object(s)</b> to convert to marker." msgstr "Seleccione los <b>objetos</b> que desea convertir a marcador." -#: ../src/selection-chemistry.cpp:2847 +#: ../src/selection-chemistry.cpp:2849 msgid "Objects to marker" msgstr "Objetos a marcador" -#: ../src/selection-chemistry.cpp:2875 +#: ../src/selection-chemistry.cpp:2877 msgid "Select <b>object(s)</b> to convert to guides." msgstr "Seleccione los <b>objetos</b> que desea convertir a guías." -#: ../src/selection-chemistry.cpp:2887 +#: ../src/selection-chemistry.cpp:2889 msgid "Objects to guides" msgstr "Objetos a guías" -#: ../src/selection-chemistry.cpp:2904 +#: ../src/selection-chemistry.cpp:2909 +#, fuzzy +msgid "Select one <b>group</b> to convert to symbol." +msgstr "Seleccione el <b>objeto</b> que desea clonar." + +#: ../src/selection-chemistry.cpp:2917 +#, fuzzy +msgid "Select only one <b>group</b> to convert to symbol." +msgstr "Seleccione solamente una <b>imagen</b> para vectorizar" + +#: ../src/selection-chemistry.cpp:2923 +#, fuzzy +msgid "Select original (<b>Shift+D</b>) to convert to symbol." +msgstr "Seleccione los <b>objetos</b> que desea convertir a marcador." + +#: ../src/selection-chemistry.cpp:2929 +msgid "Group selection first to convert to symbol." +msgstr "" + +#: ../src/selection-chemistry.cpp:2968 +msgid "Group to symbol" +msgstr "" + +#: ../src/selection-chemistry.cpp:2988 +#, fuzzy +msgid "Select a <b>symbol</b> to extract objects from." +msgstr "" +"Seleccione un <b>objeto con relleno de mosaico</b> del que extraer objetos." + +#: ../src/selection-chemistry.cpp:2996 ../src/selection-chemistry.cpp:3002 +#, fuzzy +msgid "Select only one <b>symbol</b> to convert to group." +msgstr "Seleccione los <b>objetos</b> que desea convertir a guías." + +#: ../src/selection-chemistry.cpp:3045 +msgid "Group from symbol" +msgstr "" + +#: ../src/selection-chemistry.cpp:3062 msgid "Select <b>object(s)</b> to convert to pattern." msgstr "Seleccione los <b>objetos</b> que desea convertir en patrón." -#: ../src/selection-chemistry.cpp:2992 +#: ../src/selection-chemistry.cpp:3150 msgid "Objects to pattern" msgstr "Objetos a patrón" -#: ../src/selection-chemistry.cpp:3008 +#: ../src/selection-chemistry.cpp:3166 msgid "Select an <b>object with pattern fill</b> to extract objects from." msgstr "" "Seleccione un <b>objeto con relleno de mosaico</b> del que extraer objetos." -#: ../src/selection-chemistry.cpp:3061 +#: ../src/selection-chemistry.cpp:3219 msgid "<b>No pattern fills</b> in the selection." msgstr "No hay <b>rellenos de mosaico</b> en la selección." -#: ../src/selection-chemistry.cpp:3064 +#: ../src/selection-chemistry.cpp:3222 msgid "Pattern to objects" msgstr "Patrón a objetos" -#: ../src/selection-chemistry.cpp:3155 +#: ../src/selection-chemistry.cpp:3313 msgid "Select <b>object(s)</b> to make a bitmap copy." msgstr "" "Seleccione los <b>objetos</b> de los que desea hacer una copia en mapa de " "bits." -#: ../src/selection-chemistry.cpp:3159 +#: ../src/selection-chemistry.cpp:3317 msgid "Rendering bitmap..." msgstr "Generando mapa de bits..." -#: ../src/selection-chemistry.cpp:3333 +#: ../src/selection-chemistry.cpp:3491 msgid "Create bitmap" msgstr "Crear mapa de bits" -#: ../src/selection-chemistry.cpp:3365 +#: ../src/selection-chemistry.cpp:3523 msgid "Select <b>object(s)</b> to create clippath or mask from." msgstr "" "Seleccione los <b>objetos</b> de los que crear el trayecto o la máscara de " "recorte." -#: ../src/selection-chemistry.cpp:3368 +#: ../src/selection-chemistry.cpp:3526 msgid "Select mask object and <b>object(s)</b> to apply clippath or mask to." msgstr "" "Seleccione el objeto de máscara y los <b>objetos</b> a los que aplicar el " "trayecto o máscara de recorte." -#: ../src/selection-chemistry.cpp:3549 +#: ../src/selection-chemistry.cpp:3707 msgid "Set clipping path" msgstr "Crear trayecto de recorte" -#: ../src/selection-chemistry.cpp:3551 +#: ../src/selection-chemistry.cpp:3709 msgid "Set mask" msgstr "Crear máscara" -#: ../src/selection-chemistry.cpp:3566 +#: ../src/selection-chemistry.cpp:3724 msgid "Select <b>object(s)</b> to remove clippath or mask from." msgstr "" "Seleccione los <b>objetos</b> de los que desea eliminar el trayecto o la " "máscara de recorte." -#: ../src/selection-chemistry.cpp:3677 +#: ../src/selection-chemistry.cpp:3835 msgid "Release clipping path" msgstr "Liberar trayecto de recorte" -#: ../src/selection-chemistry.cpp:3679 +#: ../src/selection-chemistry.cpp:3837 msgid "Release mask" msgstr "Liberar máscara" -#: ../src/selection-chemistry.cpp:3698 +#: ../src/selection-chemistry.cpp:3856 msgid "Select <b>object(s)</b> to fit canvas to." msgstr "Seleccione los <b>objetos</b> a los que ajustar el lienzo." #. Fit Page -#: ../src/selection-chemistry.cpp:3718 ../src/verbs.cpp:2790 +#: ../src/selection-chemistry.cpp:3876 ../src/verbs.cpp:2854 msgid "Fit Page to Selection" msgstr "Ajustar la página a la selección" -#: ../src/selection-chemistry.cpp:3747 ../src/verbs.cpp:2792 +#: ../src/selection-chemistry.cpp:3905 ../src/verbs.cpp:2856 msgid "Fit Page to Drawing" msgstr "Ajustar el lienzo al dibujo" -#: ../src/selection-chemistry.cpp:3768 ../src/verbs.cpp:2794 +#: ../src/selection-chemistry.cpp:3926 ../src/verbs.cpp:2858 msgid "Fit Page to Selection or Drawing" msgstr "Ajustar el lienzo a la selección o el dibujo" #. TRANSLATORS: "Link" means internet link (anchor) -#: ../src/selection-describer.cpp:44 +#: ../src/selection-describer.cpp:45 #, fuzzy msgctxt "Web" msgid "Link" @@ -13294,138 +13006,143 @@ msgstr "Enlace:" # gtk_label_set_markup (GTK_LABEL(l), _("<b>Average:</b>")); # FIXME: implement averaging of all parameters for multiple selected # gtk_label_set_markup (GTK_LABEL(l), _("<b>Average:</b>")); -#: ../src/selection-describer.cpp:46 +#: ../src/selection-describer.cpp:47 msgid "Circle" msgstr "Círculo" #. Ellipse -#: ../src/selection-describer.cpp:48 ../src/selection-describer.cpp:73 +#: ../src/selection-describer.cpp:49 ../src/selection-describer.cpp:74 #: ../src/ui/dialog/inkscape-preferences.cpp:397 #: ../src/widgets/pencil-toolbar.cpp:193 msgid "Ellipse" msgstr "Elipse" -#: ../src/selection-describer.cpp:50 +#: ../src/selection-describer.cpp:51 msgid "Flowed text" msgstr "Texto fluido" -#: ../src/selection-describer.cpp:56 +#: ../src/selection-describer.cpp:57 msgid "Line" msgstr "Línea" -#: ../src/selection-describer.cpp:58 +#: ../src/selection-describer.cpp:59 msgid "Path" msgstr "Trayecto" -#: ../src/selection-describer.cpp:60 ../src/widgets/star-toolbar.cpp:475 +#: ../src/selection-describer.cpp:61 ../src/widgets/star-toolbar.cpp:475 msgid "Polygon" msgstr "Polígono" -#: ../src/selection-describer.cpp:62 +#: ../src/selection-describer.cpp:63 msgid "Polyline" msgstr "Polilínea" #. Rectangle -#: ../src/selection-describer.cpp:64 +#: ../src/selection-describer.cpp:65 #: ../src/ui/dialog/inkscape-preferences.cpp:387 msgid "Rectangle" msgstr "Rectángulo" #. 3D box -#: ../src/selection-describer.cpp:66 +#: ../src/selection-describer.cpp:67 #: ../src/ui/dialog/inkscape-preferences.cpp:392 msgid "3D Box" msgstr "Caja 3D" -#: ../src/selection-describer.cpp:68 +#: ../src/selection-describer.cpp:69 #, fuzzy msgctxt "Object" msgid "Text" msgstr "Texto" #. TRANSLATORS: "Clone" is a noun, type of object -#: ../src/selection-describer.cpp:71 +#: ../src/selection-describer.cpp:72 #, fuzzy msgctxt "Object" msgid "Clone" msgstr "Clonado" -#: ../src/selection-describer.cpp:75 +#: ../src/selection-describer.cpp:76 #: ../share/extensions/gcodetools_lathe.inx.h:31 msgid "Offset path" msgstr "Trayecto de desvío" #. Spiral -#: ../src/selection-describer.cpp:77 +#: ../src/selection-describer.cpp:78 #: ../src/ui/dialog/inkscape-preferences.cpp:405 #: ../share/extensions/gcodetools_area.inx.h:45 msgid "Spiral" msgstr "Espiral" #. Star -#: ../src/selection-describer.cpp:79 +#: ../src/selection-describer.cpp:80 #: ../src/ui/dialog/inkscape-preferences.cpp:401 #: ../src/widgets/star-toolbar.cpp:482 msgid "Star" msgstr "Estrella" -#: ../src/selection-describer.cpp:149 +#: ../src/selection-describer.cpp:150 msgid "root" msgstr "raíz" -#: ../src/selection-describer.cpp:161 +#: ../src/selection-describer.cpp:162 #, c-format msgid "layer <b>%s</b>" msgstr "capa <b>%s</b>" -#: ../src/selection-describer.cpp:163 +#: ../src/selection-describer.cpp:164 #, c-format msgid "layer <b><i>%s</i></b>" msgstr "capa <b><i>%s</i></b>" -#: ../src/selection-describer.cpp:172 +#: ../src/selection-describer.cpp:173 #, c-format msgid "<i>%s</i>" msgstr "<i>%s</i>" -#: ../src/selection-describer.cpp:181 +#: ../src/selection-describer.cpp:182 #, c-format msgid " in %s" msgstr " en %s" -#: ../src/selection-describer.cpp:183 +#: ../src/selection-describer.cpp:184 #, c-format msgid " in group %s (%s)" msgstr " en el grupo %s (%s)" -#: ../src/selection-describer.cpp:185 +#: ../src/selection-describer.cpp:186 #, c-format msgid " in <b>%i</b> parents (%s)" msgid_plural " in <b>%i</b> parents (%s)" msgstr[0] " en <b>%i</b> pariente (%s)" msgstr[1] " en <b>%i</b> parientes (%s)" -#: ../src/selection-describer.cpp:188 +#: ../src/selection-describer.cpp:189 #, c-format msgid " in <b>%i</b> layers" msgid_plural " in <b>%i</b> layers" msgstr[0] " en <b>%i</b> capa" msgstr[1] " en <b>%i</b> capas" -#: ../src/selection-describer.cpp:198 +#: ../src/selection-describer.cpp:199 +#, fuzzy +msgid "Convert symbol to group to edit" +msgstr "Convertir pincelada en trayecto" + +#: ../src/selection-describer.cpp:203 msgid "Use <b>Shift+D</b> to look up original" msgstr "Utilice <b>Mayús+D</b> para buscar el original." -#: ../src/selection-describer.cpp:202 +#: ../src/selection-describer.cpp:207 msgid "Use <b>Shift+D</b> to look up path" msgstr "Utilice <b>Mayús+D</b> para buscar el trayecto" -#: ../src/selection-describer.cpp:206 +#: ../src/selection-describer.cpp:211 msgid "Use <b>Shift+D</b> to look up frame" msgstr "Utilice <b>Mayús+D</b> para buscar el marco" #. this is only used with 2 or more objects -#: ../src/selection-describer.cpp:221 ../src/spray-context.cpp:227 +#: ../src/selection-describer.cpp:226 ../src/spray-context.cpp:227 #: ../src/tweak-context.cpp:204 #, c-format msgid "<b>%i</b> object selected" @@ -13434,7 +13151,7 @@ msgstr[0] "<b>%i</b> objeto seleccionado" msgstr[1] "<b>%i</b> objetos seleccionados" #. this is only used with 2 or more objects -#: ../src/selection-describer.cpp:226 +#: ../src/selection-describer.cpp:231 #, c-format msgid "<b>%i</b> object of type <b>%s</b>" msgid_plural "<b>%i</b> objects of type <b>%s</b>" @@ -13442,7 +13159,7 @@ msgstr[0] "<b>%i</b> objeto de tipo <b>%s</b>" msgstr[1] "<b>%i</b> objetos de tipo <b>%s</b>" #. this is only used with 2 or more objects -#: ../src/selection-describer.cpp:231 +#: ../src/selection-describer.cpp:236 #, c-format msgid "<b>%i</b> object of types <b>%s</b>, <b>%s</b>" msgid_plural "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>" @@ -13450,7 +13167,7 @@ msgstr[0] "<b>%i</b> objeto de los tipos <b>%s</b>, <b>%s</b>" msgstr[1] "<b>%i</b> objetos de los tipos <b>%s</b>, <b>%s</b>" #. this is only used with 2 or more objects -#: ../src/selection-describer.cpp:236 +#: ../src/selection-describer.cpp:241 #, c-format msgid "<b>%i</b> object of types <b>%s</b>, <b>%s</b>, <b>%s</b>" msgid_plural "<b>%i</b> objects of types <b>%s</b>, <b>%s</b>, <b>%s</b>" @@ -13458,14 +13175,14 @@ msgstr[0] "<b>%i</b> objeto de los tipos <b>%s</b>, <b>%s</b>, <b>%s</b>" msgstr[1] "<b>%i</b> objetos de los tipos <b>%s</b>, <b>%s</b>, <b>%s</b>" #. this is only used with 2 or more objects -#: ../src/selection-describer.cpp:241 +#: ../src/selection-describer.cpp:246 #, c-format msgid "<b>%i</b> object of <b>%i</b> types" msgid_plural "<b>%i</b> objects of <b>%i</b> types" msgstr[0] "<b>%i</b> objeto de <b>%i</b> tipos" msgstr[1] "<b>%i</b> objetos de <b>%i</b> tipos" -#: ../src/selection-describer.cpp:251 +#: ../src/selection-describer.cpp:256 #, fuzzy, c-format msgid "; <i>%d filtered object</i> " msgid_plural "; <i>%d filtered objects</i> " @@ -13613,7 +13330,7 @@ msgstr "Región excluida de flujo" msgid "Create Guides Around the Page" msgstr "Guías alrededor de la página" -#: ../src/sp-guide.cpp:327 ../src/verbs.cpp:2370 +#: ../src/sp-guide.cpp:327 ../src/verbs.cpp:2420 #, fuzzy msgid "Delete All Guides" msgstr "Borrar guía" @@ -13807,18 +13524,24 @@ msgstr "<b>Datos de carácter clonados huérfanos</b>" msgid "<b>Text span</b>" msgstr "<b>Envergadura del texto</b>" +#. char *symbol_desc = SP_ITEM(use->child)->description(); +#. g_free(symbol_desc); +#: ../src/sp-use.cpp:328 +msgid "<b>Clone of Symbol</b>" +msgstr "" + #. TRANSLATORS: Used for statusbar description for long <use> chains: #. * "Clone of: Clone of: ... in Layer 1". -#: ../src/sp-use.cpp:328 +#: ../src/sp-use.cpp:336 msgid "..." msgstr "..." -#: ../src/sp-use.cpp:336 +#: ../src/sp-use.cpp:344 #, c-format msgid "<b>Clone</b> of: %s" msgstr "<b>Clon</b> de: %s" -#: ../src/sp-use.cpp:340 +#: ../src/sp-use.cpp:348 msgid "<b>Orphaned clone</b>" msgstr "<b>Clon huérfano</b>" @@ -14068,7 +13791,7 @@ msgstr "" "El texto fluido debe ser <b>visible</b> para que se pueda poner en un " "trayecto." -#: ../src/text-chemistry.cpp:195 ../src/verbs.cpp:2390 +#: ../src/text-chemistry.cpp:195 ../src/verbs.cpp:2440 msgid "Put text on path" msgstr "Poner texto en trayecto" @@ -14080,7 +13803,7 @@ msgstr "Seleccione <b>un texto en trayecto</b> para quitarlo del trayecto." msgid "<b>No texts-on-paths</b> in the selection." msgstr "<b>No hay trazos en trayecto</b> en la selección." -#: ../src/text-chemistry.cpp:231 ../src/verbs.cpp:2392 +#: ../src/text-chemistry.cpp:231 ../src/verbs.cpp:2442 msgid "Remove text from path" msgstr "Retirar texto de trayecto" @@ -14606,42 +14329,42 @@ msgid "Blur tweak" msgstr "Retoque de desenfoque" #. check whether something is selected -#: ../src/ui/clipboard.cpp:257 +#: ../src/ui/clipboard.cpp:262 msgid "Nothing was copied." msgstr "No se ha copiado nada." -#: ../src/ui/clipboard.cpp:329 ../src/ui/clipboard.cpp:538 -#: ../src/ui/clipboard.cpp:561 +#: ../src/ui/clipboard.cpp:371 ../src/ui/clipboard.cpp:580 +#: ../src/ui/clipboard.cpp:603 msgid "Nothing on the clipboard." msgstr "No hay nada en el portapapeles." -#: ../src/ui/clipboard.cpp:387 +#: ../src/ui/clipboard.cpp:429 msgid "Select <b>object(s)</b> to paste style to." msgstr "Seleccione los <b>objetos</b> a los que pegar el estilo." -#: ../src/ui/clipboard.cpp:398 ../src/ui/clipboard.cpp:415 +#: ../src/ui/clipboard.cpp:440 ../src/ui/clipboard.cpp:457 msgid "No style on the clipboard." msgstr "No hay estilo en el portapapeles." -#: ../src/ui/clipboard.cpp:440 +#: ../src/ui/clipboard.cpp:482 msgid "Select <b>object(s)</b> to paste size to." msgstr "Seleccione los <b>objetos</b> a los que pegar el tamaño." -#: ../src/ui/clipboard.cpp:447 +#: ../src/ui/clipboard.cpp:489 msgid "No size on the clipboard." msgstr "No hay tamaño en el portapapeles." -#: ../src/ui/clipboard.cpp:500 +#: ../src/ui/clipboard.cpp:542 msgid "Select <b>object(s)</b> to paste live path effect to." msgstr "" "Seleccione los <b>objetos</b> a los que pegar el el efecto de trayecto vivo." #. no_effect: -#: ../src/ui/clipboard.cpp:525 +#: ../src/ui/clipboard.cpp:567 msgid "No effect on the clipboard." msgstr "No hay efecto en el portapapeles." -#: ../src/ui/clipboard.cpp:544 ../src/ui/clipboard.cpp:572 +#: ../src/ui/clipboard.cpp:586 ../src/ui/clipboard.cpp:614 msgid "Clipboard does not contain a path." msgstr "El portapapeles no contiene un trayecto" @@ -14762,7 +14485,7 @@ msgid "Rearrange" msgstr "Ordenar" #: ../src/ui/dialog/align-and-distribute.cpp:900 -#: ../src/widgets/toolbox.cpp:1756 +#: ../src/widgets/toolbox.cpp:1775 msgid "Nodes" msgstr "Nodos" @@ -14776,53 +14499,53 @@ msgid "_Treat selection as group: " msgstr "Tratar a la selección como grupo: " #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:921 ../src/verbs.cpp:2812 -#: ../src/verbs.cpp:2813 +#: ../src/ui/dialog/align-and-distribute.cpp:921 ../src/verbs.cpp:2876 +#: ../src/verbs.cpp:2877 msgid "Align right edges of objects to the left edge of the anchor" msgstr "Alinear el lado derecho de los objetos al borde izquierdo del ancla" -#: ../src/ui/dialog/align-and-distribute.cpp:924 ../src/verbs.cpp:2814 -#: ../src/verbs.cpp:2815 +#: ../src/ui/dialog/align-and-distribute.cpp:924 ../src/verbs.cpp:2878 +#: ../src/verbs.cpp:2879 msgid "Align left edges" msgstr "Alinear lados izquierdos" -#: ../src/ui/dialog/align-and-distribute.cpp:927 ../src/verbs.cpp:2816 -#: ../src/verbs.cpp:2817 +#: ../src/ui/dialog/align-and-distribute.cpp:927 ../src/verbs.cpp:2880 +#: ../src/verbs.cpp:2881 msgid "Center on vertical axis" msgstr "Centrar en el eje vertical" -#: ../src/ui/dialog/align-and-distribute.cpp:930 ../src/verbs.cpp:2818 -#: ../src/verbs.cpp:2819 +#: ../src/ui/dialog/align-and-distribute.cpp:930 ../src/verbs.cpp:2882 +#: ../src/verbs.cpp:2883 msgid "Align right sides" msgstr "Alinear lados izquierdos" -#: ../src/ui/dialog/align-and-distribute.cpp:933 ../src/verbs.cpp:2820 -#: ../src/verbs.cpp:2821 +#: ../src/ui/dialog/align-and-distribute.cpp:933 ../src/verbs.cpp:2884 +#: ../src/verbs.cpp:2885 msgid "Align left edges of objects to the right edge of the anchor" msgstr "Alinear el lado izquierdo de los objetos al borde derecho del ancla" -#: ../src/ui/dialog/align-and-distribute.cpp:936 ../src/verbs.cpp:2822 -#: ../src/verbs.cpp:2823 +#: ../src/ui/dialog/align-and-distribute.cpp:936 ../src/verbs.cpp:2886 +#: ../src/verbs.cpp:2887 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "Alinear el lado inferior de los objetos al borde superior del ancla" -#: ../src/ui/dialog/align-and-distribute.cpp:939 ../src/verbs.cpp:2824 -#: ../src/verbs.cpp:2825 +#: ../src/ui/dialog/align-and-distribute.cpp:939 ../src/verbs.cpp:2888 +#: ../src/verbs.cpp:2889 msgid "Align top edges" msgstr "Alinear los bordes superiores" -#: ../src/ui/dialog/align-and-distribute.cpp:942 ../src/verbs.cpp:2826 -#: ../src/verbs.cpp:2827 +#: ../src/ui/dialog/align-and-distribute.cpp:942 ../src/verbs.cpp:2890 +#: ../src/verbs.cpp:2891 msgid "Center on horizontal axis" msgstr "Centrar en el eje horizontal" -#: ../src/ui/dialog/align-and-distribute.cpp:945 ../src/verbs.cpp:2828 -#: ../src/verbs.cpp:2829 +#: ../src/ui/dialog/align-and-distribute.cpp:945 ../src/verbs.cpp:2892 +#: ../src/verbs.cpp:2893 msgid "Align bottom edges" msgstr "Alinear los bordes inferiores" -#: ../src/ui/dialog/align-and-distribute.cpp:948 ../src/verbs.cpp:2830 -#: ../src/verbs.cpp:2831 +#: ../src/ui/dialog/align-and-distribute.cpp:948 ../src/verbs.cpp:2894 +#: ../src/verbs.cpp:2895 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "Alinear el lado superior de los objetos al borde inferior del ancla" @@ -14946,7 +14669,7 @@ msgstr "Objeto menor" #: ../src/ui/dialog/align-and-distribute.cpp:1050 #: ../src/ui/dialog/align-and-distribute.cpp:1058 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1544 -#: ../src/widgets/desktop-widget.cpp:1825 +#: ../src/widgets/desktop-widget.cpp:1930 #: ../share/extensions/printing_marks.inx.h:17 msgid "Selection" msgstr "Selección" @@ -15255,11 +14978,11 @@ msgid "Remove selected grid." msgstr "Eliminar rejilla seleccionada" #: ../src/ui/dialog/document-properties.cpp:145 -#: ../src/widgets/toolbox.cpp:1863 +#: ../src/widgets/toolbox.cpp:1882 msgid "Guides" msgstr "Guías" -#: ../src/ui/dialog/document-properties.cpp:147 ../src/verbs.cpp:2634 +#: ../src/ui/dialog/document-properties.cpp:147 ../src/verbs.cpp:2690 msgid "Snap" msgstr "Ajustar" @@ -15309,7 +15032,7 @@ msgstr "Varios:" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:429 ../src/verbs.cpp:2806 +#: ../src/ui/dialog/document-properties.cpp:429 ../src/verbs.cpp:2870 msgid "Link Color Profile" msgstr "Asociar perfil de color" @@ -15358,7 +15081,7 @@ msgstr "" #: ../src/ui/dialog/document-properties.cpp:626 #: ../src/ui/dialog/document-properties.cpp:665 -#: ../src/ui/widget/selected-style.cpp:325 +#: ../src/ui/widget/selected-style.cpp:326 msgid "Remove" msgstr "Eliminar" @@ -17744,12 +17467,12 @@ msgstr "Punto medio de objetos" #. Zoom #: ../src/ui/dialog/inkscape-preferences.cpp:370 -#: ../src/widgets/desktop-widget.cpp:562 +#: ../src/widgets/desktop-widget.cpp:636 msgid "Zoom" msgstr "Zoom" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:375 ../src/verbs.cpp:2568 +#: ../src/ui/dialog/inkscape-preferences.cpp:375 ../src/verbs.cpp:2624 #, fuzzy msgctxt "ContextVerb" msgid "Measure" @@ -17812,7 +17535,7 @@ msgstr "" "selección previa)" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:433 ../src/verbs.cpp:2560 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 ../src/verbs.cpp:2616 #, fuzzy msgctxt "ContextVerb" msgid "Text" @@ -17883,7 +17606,7 @@ msgstr "Cubo de pintura" #. Gradient #: ../src/ui/dialog/inkscape-preferences.cpp:472 -#: ../src/widgets/gradient-selector.cpp:146 +#: ../src/widgets/gradient-selector.cpp:147 msgid "Gradient" msgstr "Degradado" @@ -20223,7 +19946,7 @@ msgstr "tableta" msgid "_Use pressure-sensitive tablet (requires restart)" msgstr "Utilizar una tableta sensible a la presión (necesita reiniciar)" -#: ../src/ui/dialog/input.cpp:898 ../src/verbs.cpp:2261 +#: ../src/ui/dialog/input.cpp:898 ../src/verbs.cpp:2307 msgid "_Save" msgstr "_Guardar" @@ -20253,8 +19976,7 @@ msgstr "Renombrar capa" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" #: ../src/ui/dialog/layer-properties.cpp:313 -#: ../src/ui/dialog/layer-properties.cpp:335 -#: ../src/ui/dialog/layer-properties.cpp:366 +#: ../src/ui/dialog/layer-properties.cpp:369 msgid "Layer" msgstr "Capa" @@ -20267,7 +19989,7 @@ msgid "Rename layer" msgstr "Renombrar capa" #. TRANSLATORS: This means "The layer has been renamed" -#: ../src/ui/dialog/layer-properties.cpp:329 ../src/ui/dialog/layers.cpp:681 +#: ../src/ui/dialog/layer-properties.cpp:329 ../src/ui/dialog/layers.cpp:709 msgid "Renamed layer" msgstr "Capa renombrada" @@ -20275,76 +19997,76 @@ msgstr "Capa renombrada" msgid "Add Layer" msgstr "Añadir capa" -#: ../src/ui/dialog/layer-properties.cpp:336 +#: ../src/ui/dialog/layer-properties.cpp:339 msgid "_Add" msgstr "_Añadir" -#: ../src/ui/dialog/layer-properties.cpp:360 +#: ../src/ui/dialog/layer-properties.cpp:363 msgid "New layer created." msgstr "Se ha creado una capa nueva." -#: ../src/ui/dialog/layer-properties.cpp:364 +#: ../src/ui/dialog/layer-properties.cpp:367 #, fuzzy msgid "Move to Layer" msgstr "Bajar capa" -#: ../src/ui/dialog/layer-properties.cpp:367 +#: ../src/ui/dialog/layer-properties.cpp:370 #: ../src/ui/dialog/transformation.cpp:109 msgid "_Move" msgstr "_Mover" -#: ../src/ui/dialog/layers.cpp:504 ../src/ui/widget/layer-selector.cpp:620 +#: ../src/ui/dialog/layers.cpp:522 ../src/ui/widget/layer-selector.cpp:620 msgid "Unhide layer" msgstr "Mostrar capa" -#: ../src/ui/dialog/layers.cpp:504 ../src/ui/widget/layer-selector.cpp:620 +#: ../src/ui/dialog/layers.cpp:522 ../src/ui/widget/layer-selector.cpp:620 msgid "Hide layer" msgstr "Ocultar capa" -#: ../src/ui/dialog/layers.cpp:515 ../src/ui/widget/layer-selector.cpp:612 +#: ../src/ui/dialog/layers.cpp:533 ../src/ui/widget/layer-selector.cpp:612 msgid "Lock layer" msgstr "Bloquear capa" -#: ../src/ui/dialog/layers.cpp:515 ../src/ui/widget/layer-selector.cpp:612 +#: ../src/ui/dialog/layers.cpp:533 ../src/ui/widget/layer-selector.cpp:612 msgid "Unlock layer" msgstr "Desbloquear capa" -#: ../src/ui/dialog/layers.cpp:652 +#: ../src/ui/dialog/layers.cpp:680 #, fuzzy msgid "Moved layer" msgstr "Bajar capa" -#: ../src/ui/dialog/layers.cpp:822 +#: ../src/ui/dialog/layers.cpp:842 #, fuzzy msgctxt "Layers" msgid "New" msgstr "Nuevo" -#: ../src/ui/dialog/layers.cpp:828 +#: ../src/ui/dialog/layers.cpp:847 #, fuzzy msgctxt "Layers" -msgid "Top" -msgstr "Superior" +msgid "Bot" +msgstr "Inferior" -#: ../src/ui/dialog/layers.cpp:834 +#: ../src/ui/dialog/layers.cpp:853 #, fuzzy msgctxt "Layers" -msgid "Up" -msgstr "Arriba" +msgid "Dn" +msgstr "Abajo" -#: ../src/ui/dialog/layers.cpp:840 +#: ../src/ui/dialog/layers.cpp:859 #, fuzzy msgctxt "Layers" -msgid "Dn" -msgstr "Abajo" +msgid "Up" +msgstr "Arriba" -#: ../src/ui/dialog/layers.cpp:846 +#: ../src/ui/dialog/layers.cpp:865 #, fuzzy msgctxt "Layers" -msgid "Bot" -msgstr "Inferior" +msgid "Top" +msgstr "Superior" -#: ../src/ui/dialog/layers.cpp:856 +#: ../src/ui/dialog/layers.cpp:875 msgid "X" msgstr "X" @@ -20526,8 +20248,8 @@ msgstr "_Ocultar" msgid "L_ock" msgstr "B_loquear" -#: ../src/ui/dialog/object-properties.cpp:63 ../src/verbs.cpp:2522 -#: ../src/verbs.cpp:2528 +#: ../src/ui/dialog/object-properties.cpp:63 ../src/verbs.cpp:2578 +#: ../src/verbs.cpp:2584 msgid "_Set" msgstr "_Aplicar" @@ -21981,8 +21703,8 @@ msgid "MetadataLicence|Other" msgstr "Otros" #: ../src/ui/widget/object-composite-settings.cpp:67 -#: ../src/ui/widget/selected-style.cpp:1063 -#: ../src/ui/widget/selected-style.cpp:1064 +#: ../src/ui/widget/selected-style.cpp:1065 +#: ../src/ui/widget/selected-style.cpp:1066 #, fuzzy msgid "Opacity (%)" msgstr "Opacidad, %" @@ -21992,8 +21714,8 @@ msgid "Change blur" msgstr "Cambiar desenfoque" #: ../src/ui/widget/object-composite-settings.cpp:220 -#: ../src/ui/widget/selected-style.cpp:895 -#: ../src/ui/widget/selected-style.cpp:1189 +#: ../src/ui/widget/selected-style.cpp:897 +#: ../src/ui/widget/selected-style.cpp:1191 msgid "Change opacity" msgstr "Cambiar opacidad" @@ -22245,323 +21967,341 @@ msgstr "" "mayor y no se puede escalar arbitrariamente sin pérdida de calidad, pero " "todos los gráficos serán renderizados idénticos a la pantalla." -#: ../src/ui/widget/selected-style.cpp:123 +#: ../src/ui/widget/selected-style.cpp:124 #: ../src/ui/widget/style-swatch.cpp:119 msgid "Fill:" msgstr "Relleno:" -#: ../src/ui/widget/selected-style.cpp:125 +#: ../src/ui/widget/selected-style.cpp:126 msgid "O:" msgstr "O:" -#: ../src/ui/widget/selected-style.cpp:165 +#: ../src/ui/widget/selected-style.cpp:166 msgid "N/A" msgstr "N/D" -#: ../src/ui/widget/selected-style.cpp:168 -#: ../src/ui/widget/selected-style.cpp:1056 -#: ../src/ui/widget/selected-style.cpp:1057 +#: ../src/ui/widget/selected-style.cpp:169 +#: ../src/ui/widget/selected-style.cpp:1058 +#: ../src/ui/widget/selected-style.cpp:1059 #: ../src/widgets/gradient-toolbar.cpp:176 msgid "Nothing selected" msgstr "Sin selección" -#: ../src/ui/widget/selected-style.cpp:170 +#: ../src/ui/widget/selected-style.cpp:171 #: ../src/ui/widget/style-swatch.cpp:300 #, fuzzy msgctxt "Fill and stroke" msgid "<i>None</i>" msgstr "<i>Ninguno</i>" -#: ../src/ui/widget/selected-style.cpp:173 +#: ../src/ui/widget/selected-style.cpp:174 #: ../src/ui/widget/style-swatch.cpp:302 #, fuzzy msgctxt "Fill and stroke" msgid "No fill" msgstr "Sin relleno" -#: ../src/ui/widget/selected-style.cpp:173 +#: ../src/ui/widget/selected-style.cpp:174 #: ../src/ui/widget/style-swatch.cpp:302 #, fuzzy msgctxt "Fill and stroke" msgid "No stroke" msgstr "Sin trazo" -#: ../src/ui/widget/selected-style.cpp:175 +#: ../src/ui/widget/selected-style.cpp:176 #: ../src/ui/widget/style-swatch.cpp:281 ../src/widgets/paint-selector.cpp:239 msgid "Pattern" msgstr "Patrón" -#: ../src/ui/widget/selected-style.cpp:178 +#: ../src/ui/widget/selected-style.cpp:179 #: ../src/ui/widget/style-swatch.cpp:283 msgid "Pattern fill" msgstr "Relleno de mosaico" -#: ../src/ui/widget/selected-style.cpp:178 +#: ../src/ui/widget/selected-style.cpp:179 #: ../src/ui/widget/style-swatch.cpp:283 msgid "Pattern stroke" msgstr "Trazo de mosaico" -#: ../src/ui/widget/selected-style.cpp:180 +#: ../src/ui/widget/selected-style.cpp:181 msgid "<b>L</b>" msgstr "<b>L</b>" -#: ../src/ui/widget/selected-style.cpp:183 +#: ../src/ui/widget/selected-style.cpp:184 #: ../src/ui/widget/style-swatch.cpp:275 msgid "Linear gradient fill" msgstr "Relleno con degradado lineal" -#: ../src/ui/widget/selected-style.cpp:183 +#: ../src/ui/widget/selected-style.cpp:184 #: ../src/ui/widget/style-swatch.cpp:275 msgid "Linear gradient stroke" msgstr "Trazo con degradado lineal" -#: ../src/ui/widget/selected-style.cpp:190 +#: ../src/ui/widget/selected-style.cpp:191 msgid "<b>R</b>" msgstr "<b>R</b>" -#: ../src/ui/widget/selected-style.cpp:193 +#: ../src/ui/widget/selected-style.cpp:194 #: ../src/ui/widget/style-swatch.cpp:279 msgid "Radial gradient fill" msgstr "Relleno con degradado radial" -#: ../src/ui/widget/selected-style.cpp:193 +#: ../src/ui/widget/selected-style.cpp:194 #: ../src/ui/widget/style-swatch.cpp:279 msgid "Radial gradient stroke" msgstr "Trazo con degradado radial" -#: ../src/ui/widget/selected-style.cpp:200 +#: ../src/ui/widget/selected-style.cpp:201 msgid "Different" msgstr "Diferente" -#: ../src/ui/widget/selected-style.cpp:203 +#: ../src/ui/widget/selected-style.cpp:204 msgid "Different fills" msgstr "Rellenos diferentes" -#: ../src/ui/widget/selected-style.cpp:203 +#: ../src/ui/widget/selected-style.cpp:204 msgid "Different strokes" msgstr "Trazos diferentes" -#: ../src/ui/widget/selected-style.cpp:205 +#: ../src/ui/widget/selected-style.cpp:206 #: ../src/ui/widget/style-swatch.cpp:305 msgid "<b>Unset</b>" msgstr "<b>No definir</b>" #. TRANSLATORS COMMENT: unset is a verb here -#: ../src/ui/widget/selected-style.cpp:208 -#: ../src/ui/widget/selected-style.cpp:266 -#: ../src/ui/widget/selected-style.cpp:527 +#: ../src/ui/widget/selected-style.cpp:209 +#: ../src/ui/widget/selected-style.cpp:267 +#: ../src/ui/widget/selected-style.cpp:529 #: ../src/ui/widget/style-swatch.cpp:307 ../src/widgets/fill-style.cpp:708 msgid "Unset fill" msgstr "No definir relleno" -#: ../src/ui/widget/selected-style.cpp:208 -#: ../src/ui/widget/selected-style.cpp:266 -#: ../src/ui/widget/selected-style.cpp:543 +#: ../src/ui/widget/selected-style.cpp:209 +#: ../src/ui/widget/selected-style.cpp:267 +#: ../src/ui/widget/selected-style.cpp:545 #: ../src/ui/widget/style-swatch.cpp:307 ../src/widgets/fill-style.cpp:708 msgid "Unset stroke" msgstr "No definir trazo" -#: ../src/ui/widget/selected-style.cpp:211 +#: ../src/ui/widget/selected-style.cpp:212 msgid "Flat color fill" msgstr "Relleno de color uniforme" -#: ../src/ui/widget/selected-style.cpp:211 +#: ../src/ui/widget/selected-style.cpp:212 msgid "Flat color stroke" msgstr "Trazo de color uniforme" #. TRANSLATOR COMMENT: A means "Averaged" -#: ../src/ui/widget/selected-style.cpp:214 +#: ../src/ui/widget/selected-style.cpp:215 msgid "<b>a</b>" msgstr "<b>a</b>" -#: ../src/ui/widget/selected-style.cpp:217 +#: ../src/ui/widget/selected-style.cpp:218 msgid "Fill is averaged over selected objects" msgstr "El relleno es la media de los objetos seleccionados" -#: ../src/ui/widget/selected-style.cpp:217 +#: ../src/ui/widget/selected-style.cpp:218 msgid "Stroke is averaged over selected objects" msgstr "El trazo es la media de los objetos seleccionados" #. TRANSLATOR COMMENT: M means "Multiple" -#: ../src/ui/widget/selected-style.cpp:220 +#: ../src/ui/widget/selected-style.cpp:221 msgid "<b>m</b>" msgstr "<b>m</b>" -#: ../src/ui/widget/selected-style.cpp:223 +#: ../src/ui/widget/selected-style.cpp:224 msgid "Multiple selected objects have the same fill" msgstr "Varios objetos seleccionados tienen el mismo relleno" -#: ../src/ui/widget/selected-style.cpp:223 +#: ../src/ui/widget/selected-style.cpp:224 msgid "Multiple selected objects have the same stroke" msgstr "Varios objetos seleccionados tienen el mismo trazo" -#: ../src/ui/widget/selected-style.cpp:225 +#: ../src/ui/widget/selected-style.cpp:226 msgid "Edit fill..." msgstr "Editar relleno..." -#: ../src/ui/widget/selected-style.cpp:225 +#: ../src/ui/widget/selected-style.cpp:226 msgid "Edit stroke..." msgstr "Editar trazo..." -#: ../src/ui/widget/selected-style.cpp:229 +#: ../src/ui/widget/selected-style.cpp:230 msgid "Last set color" msgstr "Último color usado" -#: ../src/ui/widget/selected-style.cpp:233 +#: ../src/ui/widget/selected-style.cpp:234 msgid "Last selected color" msgstr "Último color seleccionado" -#: ../src/ui/widget/selected-style.cpp:249 +#: ../src/ui/widget/selected-style.cpp:250 msgid "Copy color" msgstr "Copiar color" -#: ../src/ui/widget/selected-style.cpp:253 +#: ../src/ui/widget/selected-style.cpp:254 msgid "Paste color" msgstr "Pegar color" -#: ../src/ui/widget/selected-style.cpp:257 -#: ../src/ui/widget/selected-style.cpp:820 +#: ../src/ui/widget/selected-style.cpp:258 +#: ../src/ui/widget/selected-style.cpp:822 msgid "Swap fill and stroke" msgstr "Intercambiar relleno y trazo" -#: ../src/ui/widget/selected-style.cpp:261 -#: ../src/ui/widget/selected-style.cpp:552 -#: ../src/ui/widget/selected-style.cpp:561 +#: ../src/ui/widget/selected-style.cpp:262 +#: ../src/ui/widget/selected-style.cpp:554 +#: ../src/ui/widget/selected-style.cpp:563 msgid "Make fill opaque" msgstr "Hacer el relleno opaco" -#: ../src/ui/widget/selected-style.cpp:261 +#: ../src/ui/widget/selected-style.cpp:262 msgid "Make stroke opaque" msgstr "Hacer el trazo opaco" -#: ../src/ui/widget/selected-style.cpp:270 -#: ../src/ui/widget/selected-style.cpp:509 ../src/widgets/fill-style.cpp:506 +#: ../src/ui/widget/selected-style.cpp:271 +#: ../src/ui/widget/selected-style.cpp:511 ../src/widgets/fill-style.cpp:506 msgid "Remove fill" msgstr "Eliminar relleno" -#: ../src/ui/widget/selected-style.cpp:270 -#: ../src/ui/widget/selected-style.cpp:518 ../src/widgets/fill-style.cpp:506 +#: ../src/ui/widget/selected-style.cpp:271 +#: ../src/ui/widget/selected-style.cpp:520 ../src/widgets/fill-style.cpp:506 msgid "Remove stroke" msgstr "Eliminar trazo" -#: ../src/ui/widget/selected-style.cpp:573 +#: ../src/ui/widget/selected-style.cpp:575 msgid "Apply last set color to fill" msgstr "Aplicar el último color fijado al relleno" -#: ../src/ui/widget/selected-style.cpp:585 +#: ../src/ui/widget/selected-style.cpp:587 msgid "Apply last set color to stroke" msgstr "Aplicar el último color fijado al trazo" -#: ../src/ui/widget/selected-style.cpp:596 +#: ../src/ui/widget/selected-style.cpp:598 msgid "Apply last selected color to fill" msgstr "Aplicar el último color seleccionado al relleno" -#: ../src/ui/widget/selected-style.cpp:607 +#: ../src/ui/widget/selected-style.cpp:609 msgid "Apply last selected color to stroke" msgstr "Aplicar el último color seleccionado al trazo" -#: ../src/ui/widget/selected-style.cpp:633 +#: ../src/ui/widget/selected-style.cpp:635 msgid "Invert fill" msgstr "Invertir relleno" -#: ../src/ui/widget/selected-style.cpp:657 +#: ../src/ui/widget/selected-style.cpp:659 msgid "Invert stroke" msgstr "Invertir trazo" -#: ../src/ui/widget/selected-style.cpp:669 +#: ../src/ui/widget/selected-style.cpp:671 msgid "White fill" msgstr "Relleno blanco" -#: ../src/ui/widget/selected-style.cpp:681 +#: ../src/ui/widget/selected-style.cpp:683 msgid "White stroke" msgstr "Trazo blanco" -#: ../src/ui/widget/selected-style.cpp:693 +#: ../src/ui/widget/selected-style.cpp:695 msgid "Black fill" msgstr "Relleno negro" -#: ../src/ui/widget/selected-style.cpp:705 +#: ../src/ui/widget/selected-style.cpp:707 msgid "Black stroke" msgstr "Trazo negro" -#: ../src/ui/widget/selected-style.cpp:748 +#: ../src/ui/widget/selected-style.cpp:750 msgid "Paste fill" msgstr "Pegar relleno" -#: ../src/ui/widget/selected-style.cpp:766 +#: ../src/ui/widget/selected-style.cpp:768 msgid "Paste stroke" msgstr "Pegar trazo" -#: ../src/ui/widget/selected-style.cpp:922 +#: ../src/ui/widget/selected-style.cpp:924 msgid "Change stroke width" msgstr "Cambiar ancho de trazo" -#: ../src/ui/widget/selected-style.cpp:1017 +#: ../src/ui/widget/selected-style.cpp:1019 msgid ", drag to adjust" msgstr ", arrastrar para ajustar" -#: ../src/ui/widget/selected-style.cpp:1102 +#: ../src/ui/widget/selected-style.cpp:1104 #, c-format msgid "Stroke width: %.5g%s%s" msgstr "Ancho de trazo: %.5g%s%s" -#: ../src/ui/widget/selected-style.cpp:1106 +#: ../src/ui/widget/selected-style.cpp:1108 msgid " (averaged)" msgstr " (media)" -#: ../src/ui/widget/selected-style.cpp:1134 +#: ../src/ui/widget/selected-style.cpp:1136 msgid "0 (transparent)" msgstr "0 (transparente)" -#: ../src/ui/widget/selected-style.cpp:1158 +#: ../src/ui/widget/selected-style.cpp:1160 msgid "100% (opaque)" msgstr "100% (opaco)" -#: ../src/ui/widget/selected-style.cpp:1318 +#: ../src/ui/widget/selected-style.cpp:1327 +#, fuzzy +msgid "Adjust alpha" +msgstr "Ajustar matiz" + +#: ../src/ui/widget/selected-style.cpp:1329 +#, fuzzy, c-format +msgid "" +"Adjusting <b>alpha</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</" +"b> to adjust lightness, with <b>Shift</b> to adjust saturation, without " +"modifiers to adjust hue" +msgstr "" +"Ajustando <b>luminancia</b>: era %.3g, ahora <b>%.3g</b> (dif. %.3g); con " +"<b>Mayús</b> para ajustar saturación, sin modificadores para ajustar matiz" + +#: ../src/ui/widget/selected-style.cpp:1333 msgid "Adjust saturation" msgstr "Ajustar saturación" -#: ../src/ui/widget/selected-style.cpp:1320 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1335 +#, fuzzy, c-format msgid "" "Adjusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with " -"<b>Ctrl</b> to adjust lightness, without modifiers to adjust hue" +"<b>Ctrl</b> to adjust lightness, with <b>Alt</b> to adjust alpha, without " +"modifiers to adjust hue" msgstr "" "Ajustando <b>saturación</b>: era %.3g, ahora <b>%.3g</b> (dif. %.3g); con " "<b>Ctrl</b> para ajustar luminancia, sin modificadores para ajustar matiz" -#: ../src/ui/widget/selected-style.cpp:1324 +#: ../src/ui/widget/selected-style.cpp:1339 msgid "Adjust lightness" msgstr "Ajustar luminancia" -#: ../src/ui/widget/selected-style.cpp:1326 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1341 +#, fuzzy, c-format msgid "" "Adjusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with " -"<b>Shift</b> to adjust saturation, without modifiers to adjust hue" +"<b>Shift</b> to adjust saturation, with <b>Alt</b> to adjust alpha, without " +"modifiers to adjust hue" msgstr "" "Ajustando <b>luminancia</b>: era %.3g, ahora <b>%.3g</b> (dif. %.3g); con " "<b>Mayús</b> para ajustar saturación, sin modificadores para ajustar matiz" -#: ../src/ui/widget/selected-style.cpp:1330 +#: ../src/ui/widget/selected-style.cpp:1345 msgid "Adjust hue" msgstr "Ajustar matiz" -#: ../src/ui/widget/selected-style.cpp:1332 -#, c-format +#: ../src/ui/widget/selected-style.cpp:1347 +#, fuzzy, c-format msgid "" "Adjusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</" -"b> to adjust saturation, with <b>Ctrl</b> to adjust lightness" +"b> to adjust saturation, with <b>Alt</b> to adjust alpha, with <b>Ctrl</b> " +"to adjust lightness" msgstr "" "Ajustando <b>matiz</b>: era %.3g, ahora <b>%.3g</b> (dif. %.3g); con " "<b>Mayús</b> para ajustar saturación, con <b>Ctrl</b> para ajustar luminancia" -#: ../src/ui/widget/selected-style.cpp:1445 -#: ../src/ui/widget/selected-style.cpp:1459 +#: ../src/ui/widget/selected-style.cpp:1467 +#: ../src/ui/widget/selected-style.cpp:1481 msgid "Adjust stroke width" msgstr "Ajustar ancho de trazo" -#: ../src/ui/widget/selected-style.cpp:1446 +#: ../src/ui/widget/selected-style.cpp:1468 #, c-format msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)" msgstr "" @@ -22597,19 +22337,14 @@ msgstr "Trazo: %06x/%.3g" msgid "Stroke width: %.5g%s" msgstr "Ancho de trazo: %.5g%s" -#: ../src/ui/widget/style-swatch.cpp:344 +#: ../src/ui/widget/style-swatch.cpp:343 #, c-format -msgid "O:%.3g" -msgstr "O:%.3g" - -#: ../src/ui/widget/style-swatch.cpp:346 -#, c-format -msgid "O:.%d" -msgstr "O:.%d" +msgid "O: %2.0f" +msgstr "" -#: ../src/ui/widget/style-swatch.cpp:351 -#, c-format -msgid "Opacity: %.3g" +#: ../src/ui/widget/style-swatch.cpp:348 +#, fuzzy, c-format +msgid "Opacity: %2.1f %%" msgstr "Opacidad: %.3g" #: ../src/vanishing-point.cpp:132 @@ -22662,228 +22397,243 @@ msgstr[1] "" "compartido por <b>%d</b> cajas, arrastre con <b>Mayús</b> para separar la " "caja seleccionada" -#: ../src/verbs.cpp:1166 +#: ../src/verbs.cpp:1173 msgid "Switch to next layer" msgstr "Cambiar a la siguiente capa" -#: ../src/verbs.cpp:1167 +#: ../src/verbs.cpp:1174 msgid "Switched to next layer." msgstr "Cambiado a la siguiente capa." -#: ../src/verbs.cpp:1169 +#: ../src/verbs.cpp:1176 msgid "Cannot go past last layer." msgstr "No se puede ir más allá de la última capa." -#: ../src/verbs.cpp:1178 +#: ../src/verbs.cpp:1185 msgid "Switch to previous layer" msgstr "Cambiar a la capa anterior" -#: ../src/verbs.cpp:1179 +#: ../src/verbs.cpp:1186 msgid "Switched to previous layer." msgstr "Cambiado a la capa anterior" -#: ../src/verbs.cpp:1181 +#: ../src/verbs.cpp:1188 msgid "Cannot go before first layer." msgstr "No se puede ir más allá de la primera capa." -#: ../src/verbs.cpp:1202 ../src/verbs.cpp:1299 ../src/verbs.cpp:1331 -#: ../src/verbs.cpp:1337 ../src/verbs.cpp:1359 +#: ../src/verbs.cpp:1209 ../src/verbs.cpp:1306 ../src/verbs.cpp:1338 +#: ../src/verbs.cpp:1344 ../src/verbs.cpp:1368 ../src/verbs.cpp:1383 msgid "No current layer." msgstr "No hay capa actual." -#: ../src/verbs.cpp:1231 ../src/verbs.cpp:1235 +#: ../src/verbs.cpp:1238 ../src/verbs.cpp:1242 #, c-format msgid "Raised layer <b>%s</b>." msgstr "Capa elevada <b>%s</b>." -#: ../src/verbs.cpp:1232 +#: ../src/verbs.cpp:1239 msgid "Layer to top" msgstr "Capa al frente" -#: ../src/verbs.cpp:1236 +#: ../src/verbs.cpp:1243 msgid "Raise layer" msgstr "Elevar capa" -#: ../src/verbs.cpp:1239 ../src/verbs.cpp:1243 +#: ../src/verbs.cpp:1246 ../src/verbs.cpp:1250 #, c-format msgid "Lowered layer <b>%s</b>." msgstr "Capa enviada al fondo·<b>%s</b>." -#: ../src/verbs.cpp:1240 +#: ../src/verbs.cpp:1247 msgid "Layer to bottom" msgstr "Capa al fondo" -#: ../src/verbs.cpp:1244 +#: ../src/verbs.cpp:1251 msgid "Lower layer" msgstr "Bajar capa" -#: ../src/verbs.cpp:1253 +#: ../src/verbs.cpp:1260 msgid "Cannot move layer any further." msgstr "No se puede mover más la capa." -#: ../src/verbs.cpp:1267 ../src/verbs.cpp:1286 +#: ../src/verbs.cpp:1274 ../src/verbs.cpp:1293 #, c-format msgid "%s copy" msgstr "%s copia" -#: ../src/verbs.cpp:1294 +#: ../src/verbs.cpp:1301 msgid "Duplicate layer" msgstr "Duplicar capa" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1297 +#: ../src/verbs.cpp:1304 msgid "Duplicated layer." msgstr "Duplicar capa." -#: ../src/verbs.cpp:1326 +#: ../src/verbs.cpp:1333 msgid "Delete layer" msgstr "Borrar capa" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1329 +#: ../src/verbs.cpp:1336 msgid "Deleted layer." msgstr "Capa eliminada." -#: ../src/verbs.cpp:1340 +#: ../src/verbs.cpp:1347 msgid "Toggle layer solo" msgstr "Solo esta capa" -#: ../src/verbs.cpp:1346 +#: ../src/verbs.cpp:1353 #, fuzzy msgid "Show all layers" msgstr "Seleccionar en todas las capas" -#: ../src/verbs.cpp:1352 +#: ../src/verbs.cpp:1358 #, fuzzy msgid "Hide all layers" msgstr "Ocultar capa" -#: ../src/verbs.cpp:1427 +#: ../src/verbs.cpp:1363 +#, fuzzy +msgid "Lock all layers" +msgstr "Bloquear capa" + +#: ../src/verbs.cpp:1371 +#, fuzzy +msgid "Lock other layers" +msgstr "Bloquear capa" + +#: ../src/verbs.cpp:1377 +#, fuzzy +msgid "Unlock all layers" +msgstr "Desbloquear capa" + +#: ../src/verbs.cpp:1451 msgid "Flip horizontally" msgstr "Reflejo horizontal" -#: ../src/verbs.cpp:1432 +#: ../src/verbs.cpp:1456 msgid "Flip vertically" msgstr "Reflejo vertical" #. 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:2009 +#: ../src/verbs.cpp:2055 msgid "tutorial-basic.svg" msgstr "tutorial-basic.es.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2013 +#: ../src/verbs.cpp:2059 msgid "tutorial-shapes.svg" msgstr "tutorial-shapes.es.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2017 +#: ../src/verbs.cpp:2063 msgid "tutorial-advanced.svg" msgstr "tutorial-advanced.es.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2021 +#: ../src/verbs.cpp:2067 msgid "tutorial-tracing.svg" msgstr "tutorial-tracing.es.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2025 +#: ../src/verbs.cpp:2071 msgid "tutorial-calligraphy.svg" msgstr "tutorial-calligraphy.es.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2029 +#: ../src/verbs.cpp:2075 msgid "tutorial-interpolate.svg" msgstr "tutorial-interpolate.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2033 +#: ../src/verbs.cpp:2079 msgid "tutorial-elements.svg" msgstr "tutorial-elements.es.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2037 +#: ../src/verbs.cpp:2083 msgid "tutorial-tips.svg" msgstr "tutorial-tips.es.svg" -#: ../src/verbs.cpp:2225 ../src/verbs.cpp:2798 +#: ../src/verbs.cpp:2271 ../src/verbs.cpp:2862 msgid "Unlock all objects in the current layer" msgstr "Desbloquear todos los objetos de la capa actual" -#: ../src/verbs.cpp:2229 ../src/verbs.cpp:2800 +#: ../src/verbs.cpp:2275 ../src/verbs.cpp:2864 msgid "Unlock all objects in all layers" msgstr "Desbloquear todos los objetos en todas las capas" -#: ../src/verbs.cpp:2233 ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2279 ../src/verbs.cpp:2866 msgid "Unhide all objects in the current layer" msgstr "Mostrar todos los objetos en la capa actual" -#: ../src/verbs.cpp:2237 ../src/verbs.cpp:2804 +#: ../src/verbs.cpp:2283 ../src/verbs.cpp:2868 msgid "Unhide all objects in all layers" msgstr "Mostrar todos los objetos en todas las capas" -#: ../src/verbs.cpp:2252 +#: ../src/verbs.cpp:2298 msgid "Does nothing" msgstr "No hacer nada" -#: ../src/verbs.cpp:2255 +#: ../src/verbs.cpp:2301 msgid "Create new document from the default template" msgstr "Crear un documento nuevo de la plantilla predeterminada" -#: ../src/verbs.cpp:2257 +#: ../src/verbs.cpp:2303 msgid "_Open..." msgstr "_Abrir..." -#: ../src/verbs.cpp:2258 +#: ../src/verbs.cpp:2304 msgid "Open an existing document" msgstr "Abrir un documento existente" -#: ../src/verbs.cpp:2259 +#: ../src/verbs.cpp:2305 msgid "Re_vert" msgstr "Re_vertir" -#: ../src/verbs.cpp:2260 +#: ../src/verbs.cpp:2306 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "" "Revertir a la última versión guardada del documento (se perderán los cambios)" -#: ../src/verbs.cpp:2261 +#: ../src/verbs.cpp:2307 msgid "Save document" msgstr "Guardar documento" -#: ../src/verbs.cpp:2263 +#: ../src/verbs.cpp:2309 msgid "Save _As..." msgstr "G_uardar como..." -#: ../src/verbs.cpp:2264 +#: ../src/verbs.cpp:2310 msgid "Save document under a new name" msgstr "Guardar el documento con un nombre nuevo" -#: ../src/verbs.cpp:2265 +#: ../src/verbs.cpp:2311 msgid "Save a Cop_y..." msgstr "Guardar una cop_ia..." -#: ../src/verbs.cpp:2266 +#: ../src/verbs.cpp:2312 msgid "Save a copy of the document under a new name" msgstr "Guardar una copia del documento con un nombre nuevo" -#: ../src/verbs.cpp:2267 +#: ../src/verbs.cpp:2313 msgid "_Print..." msgstr "_Imprimir" -#: ../src/verbs.cpp:2267 +#: ../src/verbs.cpp:2313 msgid "Print document" msgstr "Imprimir documento" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2270 +#: ../src/verbs.cpp:2316 #, fuzzy msgid "Clean _up document" msgstr "No se ha podido configurar el documento" -#: ../src/verbs.cpp:2270 +#: ../src/verbs.cpp:2316 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" @@ -22891,143 +22641,143 @@ msgstr "" "Eliminar definiciones no utilizadas (como degradados y trazados de recorte) " "de los <defs> del documento" -#: ../src/verbs.cpp:2272 +#: ../src/verbs.cpp:2318 msgid "_Import..." msgstr "_Importar..." -#: ../src/verbs.cpp:2273 +#: ../src/verbs.cpp:2319 msgid "Import a bitmap or SVG image into this document" msgstr "Importar mapa de bits o imagen SVG al documento" -#: ../src/verbs.cpp:2274 +#: ../src/verbs.cpp:2320 msgid "_Export Bitmap..." msgstr "_Exportar mapa de bits..." -#: ../src/verbs.cpp:2275 +#: ../src/verbs.cpp:2321 msgid "Export this document or a selection as a bitmap image" msgstr "Exportar el documento o selección como imagen mapa de bits" -#: ../src/verbs.cpp:2276 +#: ../src/verbs.cpp:2322 #, fuzzy msgid "Import Clip Art..." msgstr "_Importar..." -#: ../src/verbs.cpp:2277 +#: ../src/verbs.cpp:2323 #, fuzzy msgid "Import clipart from Open Clip Art Library" msgstr "Importar desde 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:2279 +#: ../src/verbs.cpp:2325 msgid "N_ext Window" msgstr "Ventana sigui_ente" -#: ../src/verbs.cpp:2280 +#: ../src/verbs.cpp:2326 msgid "Switch to the next document window" msgstr "Cambiar a la ventana de documento siguiente" -#: ../src/verbs.cpp:2281 +#: ../src/verbs.cpp:2327 msgid "P_revious Window" msgstr "Ventana ante_rior" -#: ../src/verbs.cpp:2282 +#: ../src/verbs.cpp:2328 msgid "Switch to the previous document window" msgstr "Cambiar a la ventana de documento anterior" -#: ../src/verbs.cpp:2283 +#: ../src/verbs.cpp:2329 msgid "_Close" msgstr "_Cerrar" -#: ../src/verbs.cpp:2284 +#: ../src/verbs.cpp:2330 msgid "Close this document window" msgstr "Cerrar esta ventana de documento" -#: ../src/verbs.cpp:2285 +#: ../src/verbs.cpp:2331 msgid "_Quit" msgstr "_Salir" -#: ../src/verbs.cpp:2285 +#: ../src/verbs.cpp:2331 msgid "Quit Inkscape" msgstr "Salir de Inkscape" -#: ../src/verbs.cpp:2288 +#: ../src/verbs.cpp:2334 msgid "Undo last action" msgstr "Deshacer la última acción" -#: ../src/verbs.cpp:2291 +#: ../src/verbs.cpp:2337 msgid "Do again the last undone action" msgstr "Ejecutar nuevamente la acción deshecha" -#: ../src/verbs.cpp:2292 +#: ../src/verbs.cpp:2338 msgid "Cu_t" msgstr "Cor_tar" -#: ../src/verbs.cpp:2293 +#: ../src/verbs.cpp:2339 msgid "Cut selection to clipboard" msgstr "Cortar la selección al portapapeles" -#: ../src/verbs.cpp:2294 +#: ../src/verbs.cpp:2340 msgid "_Copy" msgstr "_Copiar" -#: ../src/verbs.cpp:2295 +#: ../src/verbs.cpp:2341 msgid "Copy selection to clipboard" msgstr "Copiar la selección al portapapeles" -#: ../src/verbs.cpp:2296 +#: ../src/verbs.cpp:2342 msgid "_Paste" msgstr "_Pegar" -#: ../src/verbs.cpp:2297 +#: ../src/verbs.cpp:2343 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "" "Pegar los objetos o el texto desde el portapapeles al puntero del ratón." -#: ../src/verbs.cpp:2298 +#: ../src/verbs.cpp:2344 msgid "Paste _Style" msgstr "Pegar e_stilo" -#: ../src/verbs.cpp:2299 +#: ../src/verbs.cpp:2345 msgid "Apply the style of the copied object to selection" msgstr "Aplicar el estilo del objeto copiado a la selección" -#: ../src/verbs.cpp:2301 +#: ../src/verbs.cpp:2347 msgid "Scale selection to match the size of the copied object" msgstr "Escalar la selección al tamaño del objeto copiado" -#: ../src/verbs.cpp:2302 +#: ../src/verbs.cpp:2348 msgid "Paste _Width" msgstr "Pegar _ancho" -#: ../src/verbs.cpp:2303 +#: ../src/verbs.cpp:2349 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" "Escalar la selección horizontalmente para igualar el ancho del objeto copiado" -#: ../src/verbs.cpp:2304 +#: ../src/verbs.cpp:2350 msgid "Paste _Height" msgstr "Pegar a_ltura" -#: ../src/verbs.cpp:2305 +#: ../src/verbs.cpp:2351 msgid "Scale selection vertically to match the height of the copied object" msgstr "" "Escalar la selección verticalmente para igualar la altura del objeto copiado" -#: ../src/verbs.cpp:2306 +#: ../src/verbs.cpp:2352 msgid "Paste Size Separately" msgstr "Pegar los tamaños por separado" -#: ../src/verbs.cpp:2307 +#: ../src/verbs.cpp:2353 msgid "Scale each selected object to match the size of the copied object" msgstr "" "Escalar cada uno de los objetos seleccionados para igualar el tamaño del " "objeto copiado" -#: ../src/verbs.cpp:2308 +#: ../src/verbs.cpp:2354 msgid "Paste Width Separately" msgstr "Pegar ancho por separado" -#: ../src/verbs.cpp:2309 +#: ../src/verbs.cpp:2355 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" @@ -23035,11 +22785,11 @@ msgstr "" "Escalar cada uno de los objetos seleccionados para igualar el ancho del " "objeto copiado" -#: ../src/verbs.cpp:2310 +#: ../src/verbs.cpp:2356 msgid "Paste Height Separately" msgstr "Pegar altura por separado" -#: ../src/verbs.cpp:2311 +#: ../src/verbs.cpp:2357 msgid "" "Scale each selected object vertically to match the height of the copied " "object" @@ -23047,69 +22797,69 @@ msgstr "" "Escalar cada uno de los objetos seleccionados para igualar la altura del " "objeto copiado" -#: ../src/verbs.cpp:2312 +#: ../src/verbs.cpp:2358 msgid "Paste _In Place" msgstr "Pegar en el s_itio" -#: ../src/verbs.cpp:2313 +#: ../src/verbs.cpp:2359 msgid "Paste objects from clipboard to the original location" msgstr "Pegar los objetos del portapapeles en el lugar original." -#: ../src/verbs.cpp:2314 +#: ../src/verbs.cpp:2360 msgid "Paste Path _Effect" msgstr "Pegar _efecto de trayecto" -#: ../src/verbs.cpp:2315 +#: ../src/verbs.cpp:2361 msgid "Apply the path effect of the copied object to selection" msgstr "Aplicar el efecto de trayecto del objeto copiado a la selección" -#: ../src/verbs.cpp:2316 +#: ../src/verbs.cpp:2362 msgid "Remove Path _Effect" msgstr "Eliminar _efecto de trayecto" -#: ../src/verbs.cpp:2317 +#: ../src/verbs.cpp:2363 msgid "Remove any path effects from selected objects" msgstr "Eliminar todos los efectos de los objetos seleccionados" -#: ../src/verbs.cpp:2318 +#: ../src/verbs.cpp:2364 #, fuzzy msgid "_Remove Filters" msgstr "Eliminar filtros" -#: ../src/verbs.cpp:2319 +#: ../src/verbs.cpp:2365 msgid "Remove any filters from selected objects" msgstr "Eliminar todos los filtros de los objetos seleccionados" -#: ../src/verbs.cpp:2320 +#: ../src/verbs.cpp:2366 msgid "_Delete" msgstr "_Eliminar" -#: ../src/verbs.cpp:2321 +#: ../src/verbs.cpp:2367 msgid "Delete selection" msgstr "Borrar selección" -#: ../src/verbs.cpp:2322 +#: ../src/verbs.cpp:2368 msgid "Duplic_ate" msgstr "Duplic_ar" -#: ../src/verbs.cpp:2323 +#: ../src/verbs.cpp:2369 msgid "Duplicate selected objects" msgstr "Duplicar los objetos seleccionados" -#: ../src/verbs.cpp:2324 +#: ../src/verbs.cpp:2370 msgid "Create Clo_ne" msgstr "Crear clo_n" -#: ../src/verbs.cpp:2325 +#: ../src/verbs.cpp:2371 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "" "Crear un clon del objeto seleccionado (una copia conectada al original)" -#: ../src/verbs.cpp:2326 +#: ../src/verbs.cpp:2372 msgid "Unlin_k Clone" msgstr "Des_conectar clon" -#: ../src/verbs.cpp:2327 +#: ../src/verbs.cpp:2373 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" @@ -23117,48 +22867,48 @@ msgstr "" "Cortar la conexión de los clones seleccionado a sus originales, " "convirtiéndolos en objetos independientes" -#: ../src/verbs.cpp:2328 +#: ../src/verbs.cpp:2374 msgid "Relink to Copied" msgstr "Reconectar a copiado" -#: ../src/verbs.cpp:2329 +#: ../src/verbs.cpp:2375 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "" "Reconecta los clones seleccionados al objeto que actualmenete está en el " "portapapeles" -#: ../src/verbs.cpp:2330 +#: ../src/verbs.cpp:2376 msgid "Select _Original" msgstr "Seleccionar _original" -#: ../src/verbs.cpp:2331 +#: ../src/verbs.cpp:2377 msgid "Select the object to which the selected clone is linked" msgstr "Seleccione el objeto al que está conectado el clon seleccionado." -#: ../src/verbs.cpp:2332 +#: ../src/verbs.cpp:2378 #, fuzzy msgid "Clone original path (LPE)" msgstr "Reemplazar texto" -#: ../src/verbs.cpp:2333 +#: ../src/verbs.cpp:2379 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" msgstr "" -#: ../src/verbs.cpp:2334 +#: ../src/verbs.cpp:2380 msgid "Objects to _Marker" msgstr "Objetos a _marcador" -#: ../src/verbs.cpp:2335 +#: ../src/verbs.cpp:2381 msgid "Convert selection to a line marker" msgstr "Convertir la selección en un marcador de líneas" -#: ../src/verbs.cpp:2336 +#: ../src/verbs.cpp:2382 msgid "Objects to Gu_ides" msgstr "Objetos a _guías" -#: ../src/verbs.cpp:2337 +#: ../src/verbs.cpp:2383 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" @@ -23166,88 +22916,105 @@ msgstr "" "Convierte los objetos seleccionados en una colección de guías alineadas con " "sus bordes" -#: ../src/verbs.cpp:2338 +#: ../src/verbs.cpp:2384 msgid "Objects to Patter_n" msgstr "Objetos a patró_n" -#: ../src/verbs.cpp:2339 +#: ../src/verbs.cpp:2385 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "Convertir la selección a un rectángulo con un relleno de mosaico" -#: ../src/verbs.cpp:2340 +#: ../src/verbs.cpp:2386 msgid "Pattern to _Objects" msgstr "Patrón a _objetos" -#: ../src/verbs.cpp:2341 +#: ../src/verbs.cpp:2387 msgid "Extract objects from a tiled pattern fill" msgstr "Extraer los objetos de un relleno de mosaico" -#: ../src/verbs.cpp:2342 +#: ../src/verbs.cpp:2388 +msgid "Group to Symbol" +msgstr "" + +#: ../src/verbs.cpp:2389 +#, fuzzy +msgid "Convert group to a symbol" +msgstr "Convertir pincelada en trayecto" + +#: ../src/verbs.cpp:2390 +msgid "Symbol to Group" +msgstr "" + +#: ../src/verbs.cpp:2391 +msgid "Extract group from a symbol" +msgstr "" + +#: ../src/verbs.cpp:2392 msgid "Clea_r All" msgstr "Limpia_r todo" -#: ../src/verbs.cpp:2343 +#: ../src/verbs.cpp:2393 msgid "Delete all objects from document" msgstr "Borrar todos los objetos del documento" -#: ../src/verbs.cpp:2344 +#: ../src/verbs.cpp:2394 msgid "Select Al_l" msgstr "Se_leccionar todo" -#: ../src/verbs.cpp:2345 +#: ../src/verbs.cpp:2395 msgid "Select all objects or all nodes" msgstr "Seleccionar todos los objetos o todos los nodos" -#: ../src/verbs.cpp:2346 +#: ../src/verbs.cpp:2396 msgid "Select All in All La_yers" msgstr "Seleccionar todo de todas las ca_pas" -#: ../src/verbs.cpp:2347 +#: ../src/verbs.cpp:2397 msgid "Select all objects in all visible and unlocked layers" msgstr "" "Seleccionar todos los objetos en todas las capas visibles y desbloqueadas" -#: ../src/verbs.cpp:2348 +#: ../src/verbs.cpp:2398 #, fuzzy msgid "Fill _and Stroke" msgstr "_Relleno y borde" -#: ../src/verbs.cpp:2349 +#: ../src/verbs.cpp:2399 #, fuzzy msgid "" "Select all objects with the same fill and stroke as the selected objects" msgstr "" "Seleccione un <b>objeto con relleno de mosaico</b> del que extraer objetos." -#: ../src/verbs.cpp:2350 +#: ../src/verbs.cpp:2400 #, fuzzy msgid "_Fill Color" msgstr "Aplicar color de relleno" -#: ../src/verbs.cpp:2351 +#: ../src/verbs.cpp:2401 #, fuzzy msgid "Select all objects with the same fill as the selected objects" msgstr "" "Seleccione un <b>objeto con relleno de mosaico</b> del que extraer objetos." -#: ../src/verbs.cpp:2352 +#: ../src/verbs.cpp:2402 #, fuzzy msgid "_Stroke Color" msgstr "Fijar color del trazo" -#: ../src/verbs.cpp:2353 +#: ../src/verbs.cpp:2403 #, fuzzy msgid "Select all objects with the same stroke as the selected objects" msgstr "" "Escalar cada uno de los objetos seleccionados para igualar el tamaño del " "objeto copiado" -#: ../src/verbs.cpp:2354 +#: ../src/verbs.cpp:2404 #, fuzzy msgid "Stroke St_yle" msgstr "Est_ilo de trazo" -#: ../src/verbs.cpp:2355 +#: ../src/verbs.cpp:2405 #, fuzzy msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " @@ -23256,12 +23023,12 @@ msgstr "" "Escalar cada uno de los objetos seleccionados para igualar el tamaño del " "objeto copiado" -#: ../src/verbs.cpp:2356 +#: ../src/verbs.cpp:2406 #, fuzzy msgid "_Object Type" msgstr "Tipo de objeto" -#: ../src/verbs.cpp:2357 +#: ../src/verbs.cpp:2407 #, fuzzy msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " @@ -23270,156 +23037,156 @@ msgstr "" "Escalar cada uno de los objetos seleccionados para igualar el tamaño del " "objeto copiado" -#: ../src/verbs.cpp:2358 +#: ../src/verbs.cpp:2408 msgid "In_vert Selection" msgstr "In_vertir selección" -#: ../src/verbs.cpp:2359 +#: ../src/verbs.cpp:2409 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "" "Invertir selección (deseleccionar lo que está seleccionado y seleccionar lo " "demás)" -#: ../src/verbs.cpp:2360 +#: ../src/verbs.cpp:2410 msgid "Invert in All Layers" msgstr "Invertir en todas las capas" -#: ../src/verbs.cpp:2361 +#: ../src/verbs.cpp:2411 msgid "Invert selection in all visible and unlocked layers" msgstr "Invertir la selección en todas las capas visibles y desbloqueadas" -#: ../src/verbs.cpp:2362 +#: ../src/verbs.cpp:2412 msgid "Select Next" msgstr "Seleccionar siguiente" -#: ../src/verbs.cpp:2363 +#: ../src/verbs.cpp:2413 msgid "Select next object or node" msgstr "Seleccionar el siguiente objeto o nodo" -#: ../src/verbs.cpp:2364 +#: ../src/verbs.cpp:2414 msgid "Select Previous" msgstr "Seleccionar anterior" -#: ../src/verbs.cpp:2365 +#: ../src/verbs.cpp:2415 msgid "Select previous object or node" msgstr "Seleccionar el anterior objeto o nodo" -#: ../src/verbs.cpp:2366 +#: ../src/verbs.cpp:2416 msgid "D_eselect" msgstr "D_eseleccionar" -#: ../src/verbs.cpp:2367 +#: ../src/verbs.cpp:2417 msgid "Deselect any selected objects or nodes" msgstr "Deseleccionar los objetos o nodos seleccionados." -#: ../src/verbs.cpp:2368 +#: ../src/verbs.cpp:2418 #, fuzzy msgid "Create _Guides Around the Page" msgstr "_Guías alrededor de página" -#: ../src/verbs.cpp:2369 ../src/verbs.cpp:2371 +#: ../src/verbs.cpp:2419 ../src/verbs.cpp:2421 msgid "Create four guides aligned with the page borders" msgstr "Crea cuatro guías alineadas con los bordes de la página" -#: ../src/verbs.cpp:2372 +#: ../src/verbs.cpp:2422 msgid "Next path effect parameter" msgstr "Siguiente parámetro de efecto de trayecto" -#: ../src/verbs.cpp:2373 +#: ../src/verbs.cpp:2423 msgid "Show next editable path effect parameter" msgstr "Mostrar el siguiente parámetro de efecto de trayecto editable" #. Selection -#: ../src/verbs.cpp:2376 +#: ../src/verbs.cpp:2426 msgid "Raise to _Top" msgstr "Traer al fren_te" -#: ../src/verbs.cpp:2377 +#: ../src/verbs.cpp:2427 msgid "Raise selection to top" msgstr "Elevar los objetos a primer plano" -#: ../src/verbs.cpp:2378 +#: ../src/verbs.cpp:2428 msgid "Lower to _Bottom" msgstr "_Bajar al fondo" -#: ../src/verbs.cpp:2379 +#: ../src/verbs.cpp:2429 msgid "Lower selection to bottom" msgstr "Bajar la selección al fondo" -#: ../src/verbs.cpp:2380 +#: ../src/verbs.cpp:2430 msgid "_Raise" msgstr "Eleva_r" -#: ../src/verbs.cpp:2381 +#: ../src/verbs.cpp:2431 msgid "Raise selection one step" msgstr "Elevar la selección un nivel" -#: ../src/verbs.cpp:2382 +#: ../src/verbs.cpp:2432 msgid "_Lower" msgstr "_Bajar" -#: ../src/verbs.cpp:2383 +#: ../src/verbs.cpp:2433 msgid "Lower selection one step" msgstr "Bajar la selección un nivel" -#: ../src/verbs.cpp:2385 +#: ../src/verbs.cpp:2435 msgid "Group selected objects" msgstr "Agrupar los objetos seleccionados" -#: ../src/verbs.cpp:2387 +#: ../src/verbs.cpp:2437 msgid "Ungroup selected groups" msgstr "Desagrupar grupos seleccionados" -#: ../src/verbs.cpp:2389 +#: ../src/verbs.cpp:2439 msgid "_Put on Path" msgstr "_Poner en trayecto" -#: ../src/verbs.cpp:2391 +#: ../src/verbs.cpp:2441 msgid "_Remove from Path" msgstr "_Retirar del trayecto" -#: ../src/verbs.cpp:2393 +#: ../src/verbs.cpp:2443 msgid "Remove Manual _Kerns" msgstr "Eliminar todos los _interletrajes manuales" #. 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:2396 +#: ../src/verbs.cpp:2446 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "" "Eliminar todos los interletrajes manuales y rotaciones de glifo de un objeto " "de texto" -#: ../src/verbs.cpp:2398 +#: ../src/verbs.cpp:2448 msgid "_Union" msgstr "_Unión" -#: ../src/verbs.cpp:2399 +#: ../src/verbs.cpp:2449 msgid "Create union of selected paths" msgstr "Crear la unión de los trayectos seleccionados" -#: ../src/verbs.cpp:2400 +#: ../src/verbs.cpp:2450 msgid "_Intersection" msgstr "_Intersección" -#: ../src/verbs.cpp:2401 +#: ../src/verbs.cpp:2451 msgid "Create intersection of selected paths" msgstr "Crear la intersección de los trayectos seleccionados" -#: ../src/verbs.cpp:2402 +#: ../src/verbs.cpp:2452 msgid "_Difference" msgstr "_Diferencia" -#: ../src/verbs.cpp:2403 +#: ../src/verbs.cpp:2453 msgid "Create difference of selected paths (bottom minus top)" msgstr "" "Crear la diferencia de los trayectos seleccionados (inferior menos superior)" -#: ../src/verbs.cpp:2404 +#: ../src/verbs.cpp:2454 msgid "E_xclusion" msgstr "E_xclusión" -#: ../src/verbs.cpp:2405 +#: ../src/verbs.cpp:2455 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" @@ -23427,21 +23194,21 @@ msgstr "" "Crear un OR exclusivo de los trayectos seleccionados (las partes que " "pertenecen a un solo trayecto)" -#: ../src/verbs.cpp:2406 +#: ../src/verbs.cpp:2456 msgid "Di_vision" msgstr "Di_visión" -#: ../src/verbs.cpp:2407 +#: ../src/verbs.cpp:2457 msgid "Cut the bottom path into pieces" msgstr "Cortar el trayecto inferior en pedazos" #. 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:2410 +#: ../src/verbs.cpp:2460 msgid "Cut _Path" msgstr "Cor_tar trayecto" -#: ../src/verbs.cpp:2411 +#: ../src/verbs.cpp:2461 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "" "Cortar las líneas del trayecto inferior en pedazos, eliminando el relleno" @@ -23449,332 +23216,362 @@ 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:2415 +#: ../src/verbs.cpp:2465 msgid "Outs_et" msgstr "A_mpliar" -#: ../src/verbs.cpp:2416 +#: ../src/verbs.cpp:2466 msgid "Outset selected paths" msgstr "Ampliar los trayectos seleccionados" -#: ../src/verbs.cpp:2418 +#: ../src/verbs.cpp:2468 msgid "O_utset Path by 1 px" msgstr "A_mpliar trayecto 1 px" -#: ../src/verbs.cpp:2419 +#: ../src/verbs.cpp:2469 msgid "Outset selected paths by 1 px" msgstr "Ampliar los trayectos seleccionados 1 px" -#: ../src/verbs.cpp:2421 +#: ../src/verbs.cpp:2471 msgid "O_utset Path by 10 px" msgstr "A_mpliar trayecto 10 px" -#: ../src/verbs.cpp:2422 +#: ../src/verbs.cpp:2472 msgid "Outset selected paths by 10 px" msgstr "Ampliar los trayectos seleccionados 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:2426 +#: ../src/verbs.cpp:2476 msgid "I_nset" msgstr "Re_ducir" -#: ../src/verbs.cpp:2427 +#: ../src/verbs.cpp:2477 msgid "Inset selected paths" msgstr "Reducir los trayectos seleccionados" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2479 msgid "I_nset Path by 1 px" msgstr "Re_ducir trayecto 1 px" -#: ../src/verbs.cpp:2430 +#: ../src/verbs.cpp:2480 msgid "Inset selected paths by 1 px" msgstr "Reducir los trayectos seleccionados 1 px" -#: ../src/verbs.cpp:2432 +#: ../src/verbs.cpp:2482 msgid "I_nset Path by 10 px" msgstr "Re_ducir trayecto 10 px" -#: ../src/verbs.cpp:2433 +#: ../src/verbs.cpp:2483 msgid "Inset selected paths by 10 px" msgstr "Reducir los trayectos seleccionados 10 px" -#: ../src/verbs.cpp:2435 +#: ../src/verbs.cpp:2485 msgid "D_ynamic Offset" msgstr "Desvío d_inámico" -#: ../src/verbs.cpp:2435 +#: ../src/verbs.cpp:2485 msgid "Create a dynamic offset object" msgstr "Crear un objeto de desvió dinámico" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2487 msgid "_Linked Offset" msgstr "Desvío en_lazado" -#: ../src/verbs.cpp:2438 +#: ../src/verbs.cpp:2488 msgid "Create a dynamic offset object linked to the original path" msgstr "Crear un objeto de desvío dinámico enlazado al trayecto original" -#: ../src/verbs.cpp:2440 +#: ../src/verbs.cpp:2490 msgid "_Stroke to Path" msgstr "_Borde a trayecto" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2491 msgid "Convert selected object's stroke to paths" msgstr "Convierte las líneas del objeto seleccionado en trayectos" -#: ../src/verbs.cpp:2442 +#: ../src/verbs.cpp:2492 msgid "Si_mplify" msgstr "Si_mplificar" -#: ../src/verbs.cpp:2443 +#: ../src/verbs.cpp:2493 msgid "Simplify selected paths (remove extra nodes)" msgstr "Simplifica el trayecto seleccionado (elimina nodos superfluos)" -#: ../src/verbs.cpp:2444 +#: ../src/verbs.cpp:2494 msgid "_Reverse" msgstr "_Revertir" -#: ../src/verbs.cpp:2445 +#: ../src/verbs.cpp:2495 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" "Invierte la dirección de los trayectos seleccionados (útil para girar " "marcadores)" -#: ../src/verbs.cpp:2448 +#: ../src/verbs.cpp:2498 msgid "Create one or more paths from a bitmap by tracing it" msgstr "Vectorizar un mapa de bits, creando uno o más trayectos" -#: ../src/verbs.cpp:2449 +#: ../src/verbs.cpp:2499 #, fuzzy msgid "Make a _Bitmap Copy" msgstr "Crear copia en _mapa de bits" -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2500 msgid "Export selection to a bitmap and insert it into document" msgstr "Exportar la selección a mapa de bits e insertarlo en el documento" -#: ../src/verbs.cpp:2451 +#: ../src/verbs.cpp:2501 msgid "_Combine" msgstr "_Combinar" -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2502 msgid "Combine several paths into one" msgstr "Combinar varios trayectos en uno" #. 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:2455 +#: ../src/verbs.cpp:2505 msgid "Break _Apart" msgstr "Descombin_ar" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2506 msgid "Break selected paths into subpaths" msgstr "Separar los trayectos seleccionados en subtrayectos" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2507 #, fuzzy msgid "Ro_ws and Columns..." msgstr "Filas y columnas..." -#: ../src/verbs.cpp:2458 +#: ../src/verbs.cpp:2508 msgid "Arrange selected objects in a table" msgstr "Ordenar los objetos seleccionados en una tabla" #. Layer -#: ../src/verbs.cpp:2460 +#: ../src/verbs.cpp:2510 msgid "_Add Layer..." msgstr "_Añadir capa..." -#: ../src/verbs.cpp:2461 +#: ../src/verbs.cpp:2511 msgid "Create a new layer" msgstr "Crear una capa nueva" -#: ../src/verbs.cpp:2462 +#: ../src/verbs.cpp:2512 msgid "Re_name Layer..." msgstr "Re_nombrar capa..." -#: ../src/verbs.cpp:2463 +#: ../src/verbs.cpp:2513 msgid "Rename the current layer" msgstr "Cambiar nombre a la capa actual" -#: ../src/verbs.cpp:2464 +#: ../src/verbs.cpp:2514 msgid "Switch to Layer Abov_e" msgstr "Ir a la capa sup_erior" -#: ../src/verbs.cpp:2465 +#: ../src/verbs.cpp:2515 msgid "Switch to the layer above the current" msgstr "Cambiar a la siguiente capa encima de la actual" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2516 msgid "Switch to Layer Belo_w" msgstr "Ir a la capa infe_rior" -#: ../src/verbs.cpp:2467 +#: ../src/verbs.cpp:2517 msgid "Switch to the layer below the current" msgstr "Cambiar a la siguiente capa debajo de la actual" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2518 msgid "Move Selection to Layer Abo_ve" msgstr "Mover la selección a la capa superior a la actual" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2519 msgid "Move selection to the layer above the current" msgstr "Mover la selección a la capa superior a la actual" -#: ../src/verbs.cpp:2470 +#: ../src/verbs.cpp:2520 msgid "Move Selection to Layer Bel_ow" msgstr "Mover la selección a la capa inferior a la actual" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2521 msgid "Move selection to the layer below the current" msgstr "Mover la selección a la capa inferior a la actual" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2522 #, fuzzy msgid "Move Selection to Layer..." msgstr "Mover la selección a la capa superior a la actual" -#: ../src/verbs.cpp:2474 +#: ../src/verbs.cpp:2524 msgid "Layer to _Top" msgstr "Traer la capa al fren_te" -#: ../src/verbs.cpp:2475 +#: ../src/verbs.cpp:2525 msgid "Raise the current layer to the top" msgstr "Elevar la capa actual a primer plano" -#: ../src/verbs.cpp:2476 +#: ../src/verbs.cpp:2526 msgid "Layer to _Bottom" msgstr "Bajar capa al _fondo" -#: ../src/verbs.cpp:2477 +#: ../src/verbs.cpp:2527 msgid "Lower the current layer to the bottom" msgstr "Bajar la capa actual al fondo" -#: ../src/verbs.cpp:2478 +#: ../src/verbs.cpp:2528 msgid "_Raise Layer" msgstr "Eleva_r capa" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2529 msgid "Raise the current layer" msgstr "Elevar la capa actual" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2530 msgid "_Lower Layer" msgstr "Ba_jar capa" -#: ../src/verbs.cpp:2481 +#: ../src/verbs.cpp:2531 msgid "Lower the current layer" msgstr "Enviar la capa actual hacia abajo" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2532 #, fuzzy msgid "D_uplicate Current Layer" msgstr "Duplicar la capa actual" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2533 msgid "Duplicate an existing layer" msgstr "Duplicar una capa existente" -#: ../src/verbs.cpp:2484 +#: ../src/verbs.cpp:2534 msgid "_Delete Current Layer" msgstr "_Borrar la capa actual" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2535 msgid "Delete the current layer" msgstr "Eliminar la capa actual" -#: ../src/verbs.cpp:2486 +#: ../src/verbs.cpp:2536 msgid "_Show/hide other layers" msgstr "_Mostrar/ocultar otras capas" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2537 msgid "Solo the current layer" msgstr "Ocultar todas las demás capas" -#: ../src/verbs.cpp:2488 +#: ../src/verbs.cpp:2538 #, fuzzy msgid "_Show all layers" msgstr "Seleccionar en todas las capas" -#: ../src/verbs.cpp:2489 +#: ../src/verbs.cpp:2539 #, fuzzy msgid "Show all the layers" msgstr "_Mostrar/ocultar otras capas" -#: ../src/verbs.cpp:2490 +#: ../src/verbs.cpp:2540 #, fuzzy msgid "_Hide all layers" msgstr "Ocultar capa" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2541 #, fuzzy msgid "Hide all the layers" msgstr "Ocultar capa" -#: ../src/verbs.cpp:2492 +#: ../src/verbs.cpp:2542 +#, fuzzy +msgid "_Lock all layers" +msgstr "Seleccionar en todas las capas" + +#: ../src/verbs.cpp:2543 +#, fuzzy +msgid "Lock all the layers" +msgstr "_Mostrar/ocultar otras capas" + +#: ../src/verbs.cpp:2544 +#, fuzzy +msgid "Lock/Unlock _other layers" +msgstr "Bloquear o desbloquear la capa actual" + +#: ../src/verbs.cpp:2545 +#, fuzzy +msgid "Lock all the other layers" +msgstr "_Mostrar/ocultar otras capas" + +#: ../src/verbs.cpp:2546 +#, fuzzy +msgid "_Unlock all layers" +msgstr "Desbloquear capa" + +#: ../src/verbs.cpp:2547 +#, fuzzy +msgid "Unlock all the layers" +msgstr "_Mostrar/ocultar otras capas" + +#: ../src/verbs.cpp:2548 #, fuzzy msgid "_Lock/Unlock Current Layer" msgstr "Bloquear o desbloquear la capa actual" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2549 #, fuzzy msgid "Toggle lock on current layer" msgstr "Ocultar todas las demás capas" -#: ../src/verbs.cpp:2494 +#: ../src/verbs.cpp:2550 #, fuzzy msgid "_Show/hide Current Layer" msgstr "_Mostrar/ocultar otras capas" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2551 #, fuzzy msgid "Toggle visibility of current layer" msgstr "Ocultar todas las demás capas" #. Object -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2554 msgid "Rotate _90° CW" msgstr "Rotar _90° a la derecha" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2557 msgid "Rotate selection 90° clockwise" msgstr "Rotar la selección 90º a la derecha" -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2558 msgid "Rotate 9_0° CCW" msgstr "Rotar 9_0° a la izquierda" #. This is shared between tooltips and statusbar, so they #. must use UTF-8, not HTML entities for special characters. -#: ../src/verbs.cpp:2505 +#: ../src/verbs.cpp:2561 msgid "Rotate selection 90° counter-clockwise" msgstr "Rotar la selección 90º a la izquierda" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2562 msgid "Remove _Transformations" msgstr "Deshacer _transformaciones" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2563 msgid "Remove transformations from object" msgstr "Eliminar transformaciones del objeto" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2564 msgid "_Object to Path" msgstr "_Objeto a trayecto" -#: ../src/verbs.cpp:2509 +#: ../src/verbs.cpp:2565 msgid "Convert selected object to path" msgstr "Convertir el objeto seleccionado en trayectos" -#: ../src/verbs.cpp:2510 +#: ../src/verbs.cpp:2566 msgid "_Flow into Frame" msgstr "_Fluir en el marco" -#: ../src/verbs.cpp:2511 +#: ../src/verbs.cpp:2567 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" @@ -23782,741 +23579,791 @@ msgstr "" "Encajar el texto en un marco (trayecto o forma), creando un texto fluido " "enlazado al objeto del marco" -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2568 msgid "_Unflow" msgstr "Deshacer fl_ujo" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2569 msgid "Remove text from frame (creates a single-line text object)" msgstr "" "Eliminar el texto del marco (crea un objeto de texto de una sola línea)" -#: ../src/verbs.cpp:2514 +#: ../src/verbs.cpp:2570 msgid "_Convert to Text" msgstr "_Convertir a texto" -#: ../src/verbs.cpp:2515 +#: ../src/verbs.cpp:2571 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "" "Convertir el texto fluido seleccionado a objetos de texto (mantiene el " "aspecto)" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2573 msgid "Flip _Horizontal" msgstr "Reflejo _horizontal" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2573 msgid "Flip selected objects horizontally" msgstr "Reflejar los objetos seleccionados horizontalmente" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2576 msgid "Flip _Vertical" msgstr "Reflejo _vertical" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2576 msgid "Flip selected objects vertically" msgstr "Reflejar los objetos seleccionados verticalmente" -#: ../src/verbs.cpp:2523 +#: ../src/verbs.cpp:2579 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "Aplicar máscara a selección (utiliza el objeto superior como máscara)" -#: ../src/verbs.cpp:2525 +#: ../src/verbs.cpp:2581 msgid "Edit mask" msgstr "Editar máscara" -#: ../src/verbs.cpp:2526 ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2582 ../src/verbs.cpp:2588 msgid "_Release" msgstr "Libe_rar" -#: ../src/verbs.cpp:2527 +#: ../src/verbs.cpp:2583 msgid "Remove mask from selection" msgstr "Elimina la máscara de la selección" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2585 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" msgstr "" "Aplicar trazado de recorte a selección (utiliza el objeto superior como " "trazo de recorte)" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2587 msgid "Edit clipping path" msgstr "Editar trayecto de recorte" -#: ../src/verbs.cpp:2533 +#: ../src/verbs.cpp:2589 msgid "Remove clipping path from selection" msgstr "Elimina el trazado de recorte de la selección" #. Tools -#: ../src/verbs.cpp:2536 +#: ../src/verbs.cpp:2592 #, fuzzy msgctxt "ContextVerb" msgid "Select" msgstr "Seleccionar" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2593 msgid "Select and transform objects" msgstr "Seleccionar y transformar objetos" -#: ../src/verbs.cpp:2538 +#: ../src/verbs.cpp:2594 #, fuzzy msgctxt "ContextVerb" msgid "Node Edit" msgstr "Edición de nodos" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2595 msgid "Edit paths by nodes" msgstr "Editar nodos de trayecto o tiradores de control" -#: ../src/verbs.cpp:2540 +#: ../src/verbs.cpp:2596 #, fuzzy msgctxt "ContextVerb" msgid "Tweak" msgstr "Retoques" -#: ../src/verbs.cpp:2541 +#: ../src/verbs.cpp:2597 msgid "Tweak objects by sculpting or painting" msgstr "Retocar objetos mediante la escultura o pintura" -#: ../src/verbs.cpp:2542 +#: ../src/verbs.cpp:2598 #, fuzzy msgctxt "ContextVerb" msgid "Spray" msgstr "Spray" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2599 msgid "Spray objects by sculpting or painting" msgstr "Esparcir objetos mediante escultura o pintura" -#: ../src/verbs.cpp:2544 +#: ../src/verbs.cpp:2600 #, fuzzy msgctxt "ContextVerb" msgid "Rectangle" msgstr "Rectángulo" -#: ../src/verbs.cpp:2545 +#: ../src/verbs.cpp:2601 msgid "Create rectangles and squares" msgstr "Crear rectángulos y cuadrados" -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2602 #, fuzzy msgctxt "ContextVerb" msgid "3D Box" msgstr "Caja 3D" -#: ../src/verbs.cpp:2547 +#: ../src/verbs.cpp:2603 msgid "Create 3D boxes" msgstr "Crear cajas 3D" -#: ../src/verbs.cpp:2548 +#: ../src/verbs.cpp:2604 #, fuzzy msgctxt "ContextVerb" msgid "Ellipse" msgstr "Elipse" -#: ../src/verbs.cpp:2549 +#: ../src/verbs.cpp:2605 msgid "Create circles, ellipses, and arcs" msgstr "Crear círculos, elipses y arcos" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2606 #, fuzzy msgctxt "ContextVerb" msgid "Star" msgstr "Estrella" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2607 msgid "Create stars and polygons" msgstr "Crear estrellas y polígonos" -#: ../src/verbs.cpp:2552 +#: ../src/verbs.cpp:2608 #, fuzzy msgctxt "ContextVerb" msgid "Spiral" msgstr "Espiral" -#: ../src/verbs.cpp:2553 +#: ../src/verbs.cpp:2609 msgid "Create spirals" msgstr "Crear espirales" -#: ../src/verbs.cpp:2554 +#: ../src/verbs.cpp:2610 #, fuzzy msgctxt "ContextVerb" msgid "Pencil" msgstr "Lápiz" -#: ../src/verbs.cpp:2555 +#: ../src/verbs.cpp:2611 msgid "Draw freehand lines" msgstr "Dibujar líneas a mano alzada" -#: ../src/verbs.cpp:2556 +#: ../src/verbs.cpp:2612 #, fuzzy msgctxt "ContextVerb" msgid "Pen" msgstr "Pluma" -#: ../src/verbs.cpp:2557 +#: ../src/verbs.cpp:2613 msgid "Draw Bezier curves and straight lines" msgstr "Dibujar curvas Bézier y líneas rectas" -#: ../src/verbs.cpp:2558 +#: ../src/verbs.cpp:2614 #, fuzzy msgctxt "ContextVerb" msgid "Calligraphy" msgstr "Caligrafía" -#: ../src/verbs.cpp:2559 +#: ../src/verbs.cpp:2615 msgid "Draw calligraphic or brush strokes" msgstr "Dibujar trazos caligráficos o pinceladas" -#: ../src/verbs.cpp:2561 +#: ../src/verbs.cpp:2617 msgid "Create and edit text objects" msgstr "Crear y editar objetos de texto" -#: ../src/verbs.cpp:2562 +#: ../src/verbs.cpp:2618 #, fuzzy msgctxt "ContextVerb" msgid "Gradient" msgstr "Degradado" -#: ../src/verbs.cpp:2563 +#: ../src/verbs.cpp:2619 msgid "Create and edit gradients" msgstr "Crear y editar degradados" -#: ../src/verbs.cpp:2564 +#: ../src/verbs.cpp:2620 msgctxt "ContextVerb" msgid "Mesh" msgstr "" -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2621 #, fuzzy msgid "Create and edit meshes" msgstr "Crear y editar degradados" -#: ../src/verbs.cpp:2566 +#: ../src/verbs.cpp:2622 #, fuzzy msgctxt "ContextVerb" msgid "Zoom" msgstr "Zoom" -#: ../src/verbs.cpp:2567 +#: ../src/verbs.cpp:2623 msgid "Zoom in or out" msgstr "Acercar o alejar" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2625 #, fuzzy msgid "Measurement tool" msgstr "Tipo de medida: " -#: ../src/verbs.cpp:2570 +#: ../src/verbs.cpp:2626 #, fuzzy msgctxt "ContextVerb" msgid "Dropper" msgstr "Cuentagotas" -#: ../src/verbs.cpp:2571 ../src/widgets/sp-color-notebook.cpp:389 +#: ../src/verbs.cpp:2627 ../src/widgets/sp-color-notebook.cpp:389 msgid "Pick colors from image" msgstr "Seleccionar colores de la imagen" -#: ../src/verbs.cpp:2572 +#: ../src/verbs.cpp:2628 #, fuzzy msgctxt "ContextVerb" msgid "Connector" msgstr "Conector" -#: ../src/verbs.cpp:2573 +#: ../src/verbs.cpp:2629 msgid "Create diagram connectors" msgstr "Crear conectores de diagrama" -#: ../src/verbs.cpp:2574 +#: ../src/verbs.cpp:2630 #, fuzzy msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "Cubo de pintura" -#: ../src/verbs.cpp:2575 +#: ../src/verbs.cpp:2631 msgid "Fill bounded areas" msgstr "Rellenar áreas delimitadas" -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2632 #, fuzzy msgctxt "ContextVerb" msgid "LPE Edit" msgstr "Editar LPE" -#: ../src/verbs.cpp:2577 +#: ../src/verbs.cpp:2633 msgid "Edit Path Effect parameters" msgstr "Editar los parámetros de los efectos de trazo" -#: ../src/verbs.cpp:2578 +#: ../src/verbs.cpp:2634 #, fuzzy msgctxt "ContextVerb" msgid "Eraser" msgstr "Goma de borrar" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2635 msgid "Erase existing paths" msgstr "Eliminar trayectos existentes" -#: ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2636 #, fuzzy msgctxt "ContextVerb" msgid "LPE Tool" msgstr "Herramienta LPE" -#: ../src/verbs.cpp:2581 +#: ../src/verbs.cpp:2637 msgid "Do geometric constructions" msgstr "Crear " #. Tool prefs -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2639 msgid "Selector Preferences" msgstr "Preferencias del selector" -#: ../src/verbs.cpp:2584 +#: ../src/verbs.cpp:2640 msgid "Open Preferences for the Selector tool" msgstr "Abrir las preferencias para la herramienta Selector" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2641 msgid "Node Tool Preferences" msgstr "Preferencias de la herramienta nodo" -#: ../src/verbs.cpp:2586 +#: ../src/verbs.cpp:2642 msgid "Open Preferences for the Node tool" msgstr "Abrir las preferencias para la herramienta Nodo" -#: ../src/verbs.cpp:2587 +#: ../src/verbs.cpp:2643 msgid "Tweak Tool Preferences" msgstr "Preferencias de la herramienta retoque" -#: ../src/verbs.cpp:2588 +#: ../src/verbs.cpp:2644 msgid "Open Preferences for the Tweak tool" msgstr "Abrir las preferencias para la herramienta de retoques" -#: ../src/verbs.cpp:2589 +#: ../src/verbs.cpp:2645 msgid "Spray Tool Preferences" msgstr "Preferencias de la herramienta Spray" -#: ../src/verbs.cpp:2590 +#: ../src/verbs.cpp:2646 msgid "Open Preferences for the Spray tool" msgstr "Abrir las preferencias para la herramienta Spray" -#: ../src/verbs.cpp:2591 +#: ../src/verbs.cpp:2647 msgid "Rectangle Preferences" msgstr "Preferencias de rectángulo" -#: ../src/verbs.cpp:2592 +#: ../src/verbs.cpp:2648 msgid "Open Preferences for the Rectangle tool" msgstr "Abrir las preferencias para la herramienta Rectángulo" -#: ../src/verbs.cpp:2593 +#: ../src/verbs.cpp:2649 msgid "3D Box Preferences" msgstr "Preferencias de caja 3D" -#: ../src/verbs.cpp:2594 +#: ../src/verbs.cpp:2650 msgid "Open Preferences for the 3D Box tool" msgstr "Abrir las preferencias para la herramienta caja 3D" -#: ../src/verbs.cpp:2595 +#: ../src/verbs.cpp:2651 msgid "Ellipse Preferences" msgstr "Preferencias de elipse" -#: ../src/verbs.cpp:2596 +#: ../src/verbs.cpp:2652 msgid "Open Preferences for the Ellipse tool" msgstr "Abrir las preferencias para la herramienta Elipse" -#: ../src/verbs.cpp:2597 +#: ../src/verbs.cpp:2653 msgid "Star Preferences" msgstr "Preferencias de estrella" -#: ../src/verbs.cpp:2598 +#: ../src/verbs.cpp:2654 msgid "Open Preferences for the Star tool" msgstr "Abrir las preferencias para la herramienta Estrella" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2655 msgid "Spiral Preferences" msgstr "Preferencias de espiral" -#: ../src/verbs.cpp:2600 +#: ../src/verbs.cpp:2656 msgid "Open Preferences for the Spiral tool" msgstr "Abrir las preferencias para la herramienta Espiral" -#: ../src/verbs.cpp:2601 +#: ../src/verbs.cpp:2657 msgid "Pencil Preferences" msgstr "Preferencias del lápiz" -#: ../src/verbs.cpp:2602 +#: ../src/verbs.cpp:2658 msgid "Open Preferences for the Pencil tool" msgstr "Abrir las preferencias para la herramienta Lápiz" -#: ../src/verbs.cpp:2603 +#: ../src/verbs.cpp:2659 msgid "Pen Preferences" msgstr "Preferencias de bolígrafo" -#: ../src/verbs.cpp:2604 +#: ../src/verbs.cpp:2660 msgid "Open Preferences for the Pen tool" msgstr "Abrir las preferencias para la herramienta Bolígrafo" -#: ../src/verbs.cpp:2605 +#: ../src/verbs.cpp:2661 msgid "Calligraphic Preferences" msgstr "Preferencias de línea caligráfica" -#: ../src/verbs.cpp:2606 +#: ../src/verbs.cpp:2662 msgid "Open Preferences for the Calligraphy tool" msgstr "Abrir las preferencias para la herramienta Caligrafía" -#: ../src/verbs.cpp:2607 +#: ../src/verbs.cpp:2663 msgid "Text Preferences" msgstr "Preferencias de texto" -#: ../src/verbs.cpp:2608 +#: ../src/verbs.cpp:2664 msgid "Open Preferences for the Text tool" msgstr "Abrir las preferencias para la herramienta Texto" -#: ../src/verbs.cpp:2609 +#: ../src/verbs.cpp:2665 msgid "Gradient Preferences" msgstr "Preferencias de degradado" -#: ../src/verbs.cpp:2610 +#: ../src/verbs.cpp:2666 msgid "Open Preferences for the Gradient tool" msgstr "Abrir las preferencias para la herramienta Degradado" -#: ../src/verbs.cpp:2611 +#: ../src/verbs.cpp:2667 #, fuzzy msgid "Mesh Preferences" msgstr "Preferencias de borrador" -#: ../src/verbs.cpp:2612 +#: ../src/verbs.cpp:2668 #, fuzzy msgid "Open Preferences for the Mesh tool" msgstr "Abrir las preferencias para la herramienta Borrador" -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2669 msgid "Zoom Preferences" msgstr "Preferencias de zoom" -#: ../src/verbs.cpp:2614 +#: ../src/verbs.cpp:2670 msgid "Open Preferences for the Zoom tool" msgstr "Abrir las preferencias para la herramienta Zoom" -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2671 #, fuzzy msgid "Measure Preferences" msgstr "Preferencias de borrador" -#: ../src/verbs.cpp:2616 +#: ../src/verbs.cpp:2672 #, fuzzy msgid "Open Preferences for the Measure tool" msgstr "Abrir las preferencias para la herramienta Borrador" -#: ../src/verbs.cpp:2617 +#: ../src/verbs.cpp:2673 msgid "Dropper Preferences" msgstr "Preferencias de gotero" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2674 msgid "Open Preferences for the Dropper tool" msgstr "Abrir las preferencias para la herramienta Gotero" -#: ../src/verbs.cpp:2619 +#: ../src/verbs.cpp:2675 msgid "Connector Preferences" msgstr "Preferencias del conector" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2676 msgid "Open Preferences for the Connector tool" msgstr "Abrir las preferencias para la herramienta Conector" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2677 msgid "Paint Bucket Preferences" msgstr "Preferencias del cubo de pintura" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2678 msgid "Open Preferences for the Paint Bucket tool" msgstr "Abrir las preferencias para la herramienta cubo de pintura" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2679 msgid "Eraser Preferences" msgstr "Preferencias de borrador" -#: ../src/verbs.cpp:2624 +#: ../src/verbs.cpp:2680 msgid "Open Preferences for the Eraser tool" msgstr "Abrir las preferencias para la herramienta Borrador" -#: ../src/verbs.cpp:2625 +#: ../src/verbs.cpp:2681 msgid "LPE Tool Preferences" msgstr "Preferencias de la herramienta LPE (Live Path Effects)" -#: ../src/verbs.cpp:2626 +#: ../src/verbs.cpp:2682 msgid "Open Preferences for the LPETool tool" msgstr "Abrir las preferencias para la herramienta LPE" #. Zoom/View -#: ../src/verbs.cpp:2628 +#: ../src/verbs.cpp:2684 msgid "Zoom In" msgstr "Acercar" -#: ../src/verbs.cpp:2628 +#: ../src/verbs.cpp:2684 msgid "Zoom in" msgstr "Acercar" -#: ../src/verbs.cpp:2629 +#: ../src/verbs.cpp:2685 msgid "Zoom Out" msgstr "Alejar" -#: ../src/verbs.cpp:2629 +#: ../src/verbs.cpp:2685 msgid "Zoom out" msgstr "Alejar" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2686 msgid "_Rulers" msgstr "_Reglas" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2686 msgid "Show or hide the canvas rulers" msgstr "Mostrar/ocultar las reglas del lienzo" -#: ../src/verbs.cpp:2631 +#: ../src/verbs.cpp:2687 msgid "Scroll_bars" msgstr "_Barras de desplazamiento" -#: ../src/verbs.cpp:2631 +#: ../src/verbs.cpp:2687 msgid "Show or hide the canvas scrollbars" msgstr "Mostrar/ocultar las barras de desplazamiento del lienzo" -#: ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2688 msgid "_Grid" msgstr "Re_jilla" -#: ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2688 msgid "Show or hide the grid" msgstr "Mostrar/ocultar la rejilla" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2689 msgid "G_uides" msgstr "G_uías" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2689 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" "Mostrar/ocultar las guías (arrastre desde una regla para crear una guía)" -#: ../src/verbs.cpp:2634 +#: ../src/verbs.cpp:2690 msgid "Enable snapping" msgstr "Activar ajuste" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2691 +#, fuzzy +msgid "_Commands Bar" +msgstr "Barra de comandos" + +#: ../src/verbs.cpp:2691 +msgid "Show or hide the Commands bar (under the menu)" +msgstr "Mostrar u ocultar la barra de comandos (bajo el menú)" + +#: ../src/verbs.cpp:2692 +#, fuzzy +msgid "Sn_ap Controls Bar" +msgstr "Barra de controles de ajuste" + +#: ../src/verbs.cpp:2692 +msgid "Show or hide the snapping controls" +msgstr "Mostrar u ocultar los controles de ajuste" + +#: ../src/verbs.cpp:2693 +#, fuzzy +msgid "T_ool Controls Bar" +msgstr "Barra de controles de herramienta" + +#: ../src/verbs.cpp:2693 +msgid "Show or hide the Tool Controls bar" +msgstr "Mostrar u ocultar la barra de controles de herramienta" + +#: ../src/verbs.cpp:2694 +msgid "_Toolbox" +msgstr "Caja de herramien_tas" + +#: ../src/verbs.cpp:2694 +msgid "Show or hide the main toolbox (on the left)" +msgstr "Mostrar u ocultar la caja de herramientas principal (a la izquierda)" + +#: ../src/verbs.cpp:2695 +msgid "_Palette" +msgstr "_Paleta" + +#: ../src/verbs.cpp:2695 +msgid "Show or hide the color palette" +msgstr "Mostrar u ocultar la paleta de color" + +#: ../src/verbs.cpp:2696 +msgid "_Statusbar" +msgstr "Barra de e_stado" + +#: ../src/verbs.cpp:2696 +msgid "Show or hide the statusbar (at the bottom of the window)" +msgstr "Mostrar u ocultar la barra de estado (abajo en la ventana)" + +#: ../src/verbs.cpp:2697 msgid "Nex_t Zoom" msgstr "Zoom siguien_te" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2697 msgid "Next zoom (from the history of zooms)" msgstr "Siguiente zoom (del historial de zooms)" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2699 msgid "Pre_vious Zoom" msgstr "Zoom a_nterior" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2699 msgid "Previous zoom (from the history of zooms)" msgstr "Zoom previo (del historial de zooms)" -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2701 msgid "Zoom 1:_1" msgstr "Zoom 1:_1" -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2701 msgid "Zoom to 1:1" msgstr "Zoom a 1:1" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2703 msgid "Zoom 1:_2" msgstr "Zoom 1:2" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2703 msgid "Zoom to 1:2" msgstr "Zoom a 1:2" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2705 msgid "_Zoom 2:1" msgstr "_Zoom 2:1" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2705 msgid "Zoom to 2:1" msgstr "_Zoom a 2:1" -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2708 msgid "_Fullscreen" msgstr "_Pantalla completa" -#: ../src/verbs.cpp:2646 ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2708 ../src/verbs.cpp:2710 msgid "Stretch this document window to full screen" msgstr "Ampliar esta ventana al tamaño de la pantalla" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2710 #, fuzzy msgid "Fullscreen & Focus Mode" msgstr "Conmutar modo _Foco" -#: ../src/verbs.cpp:2648 -#, fuzzy +#: ../src/verbs.cpp:2710 msgid " and " -msgstr "Dentro y fuera" +msgstr " y " -#: ../src/verbs.cpp:2648 ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2710 ../src/verbs.cpp:2713 msgid "Remove excess toolbars to focus on drawing" msgstr "" "Eliminar las barras de herramientas sobrantes para centrarse en el dibujo" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2713 msgid "Toggle _Focus Mode" msgstr "Conmutar modo _Foco" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2715 msgid "Duplic_ate Window" msgstr "Duplic_ar ventana" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2715 msgid "Open a new window with the same document" msgstr "Abre una nueva ventana con el mismo documento" -#: ../src/verbs.cpp:2655 +#: ../src/verbs.cpp:2717 msgid "_New View Preview" msgstr "_Nueva vista preliminar" -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2718 msgid "New View Preview" msgstr "Nueva vista preliminar" #. "view_new_preview" -#: ../src/verbs.cpp:2658 ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2720 ../src/verbs.cpp:2728 msgid "_Normal" msgstr "_Normal" -#: ../src/verbs.cpp:2659 +#: ../src/verbs.cpp:2721 msgid "Switch to normal display mode" msgstr "Cambiar al modo de visualización normal" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2722 msgid "No _Filters" msgstr "Sin _filtros" -#: ../src/verbs.cpp:2661 +#: ../src/verbs.cpp:2723 msgid "Switch to normal display without filters" msgstr "Cambiar al modo de visualización normal sin filtros" -#: ../src/verbs.cpp:2662 +#: ../src/verbs.cpp:2724 msgid "_Outline" msgstr "_Contorno" -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2725 msgid "Switch to outline (wireframe) display mode" msgstr "Cambiar al modo de visualización contorno (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:2664 ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2726 ../src/verbs.cpp:2734 msgid "_Toggle" msgstr "_Cambiar" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2727 msgid "Toggle between normal and outline display modes" msgstr "Cambiar entre los modos de visualización normal y de líneas" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2729 #, fuzzy msgid "Switch to normal color display mode" msgstr "Cambiar al modo de visualización normal" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2730 #, fuzzy msgid "_Grayscale" msgstr "Escala de grises" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2731 #, fuzzy msgid "Switch to grayscale display mode" msgstr "Cambiar al modo de visualización normal" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2735 #, fuzzy msgid "Toggle between normal and grayscale color display modes" msgstr "Cambiar entre los modos de visualización normal y de líneas" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2737 msgid "Color-managed view" msgstr "Vista de gestión de color" -#: ../src/verbs.cpp:2676 +#: ../src/verbs.cpp:2738 msgid "Toggle color-managed display for this document window" msgstr "Mostrar la pantalla de gestión de color para esta ventana de documento" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2740 msgid "Ico_n Preview..." msgstr "Vista de ico_no..." -#: ../src/verbs.cpp:2679 +#: ../src/verbs.cpp:2741 msgid "Open a window to preview objects at different icon resolutions" msgstr "" "Abrir una ventana para ver elementos en diferentes resoluciones de icono" -#: ../src/verbs.cpp:2680 +#: ../src/verbs.cpp:2742 msgid "_Page" msgstr "_Página" -#: ../src/verbs.cpp:2681 +#: ../src/verbs.cpp:2743 msgid "Zoom to fit page in window" msgstr "Ajustar la página a la ventana" -#: ../src/verbs.cpp:2682 +#: ../src/verbs.cpp:2744 msgid "Page _Width" msgstr "An_cho de página" -#: ../src/verbs.cpp:2683 +#: ../src/verbs.cpp:2745 msgid "Zoom to fit page width in window" msgstr "Ajustar la anchura de la página a la ventana" -#: ../src/verbs.cpp:2684 +#: ../src/verbs.cpp:2746 msgid "_Drawing" msgstr "_Dibujo" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2747 msgid "Zoom to fit drawing in window" msgstr "Ajustar el dibujo a la ventana" -#: ../src/verbs.cpp:2686 +#: ../src/verbs.cpp:2748 msgid "_Selection" msgstr "_Selección" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2749 msgid "Zoom to fit selection in window" msgstr "Ajustar la selección a la ventana" #. Dialogs -#: ../src/verbs.cpp:2690 +#: ../src/verbs.cpp:2752 #, fuzzy msgid "P_references..." msgstr "Preferencias de bolígrafo" -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2753 msgid "Edit global Inkscape preferences" msgstr "Editar las preferencias generales de Inkscape" -#: ../src/verbs.cpp:2692 +#: ../src/verbs.cpp:2754 msgid "_Document Properties..." msgstr "Propiedades del _documento..." -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2755 msgid "Edit properties of this document (to be saved with the document)" msgstr "Editar las propiedades guardadas con el documento" -#: ../src/verbs.cpp:2694 +#: ../src/verbs.cpp:2756 msgid "Document _Metadata..." msgstr "_Metadatos del documento..." -#: ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2757 msgid "Edit document metadata (to be saved with the document)" msgstr "Editar los metadatos guardados con el documento" -#: ../src/verbs.cpp:2697 +#: ../src/verbs.cpp:2759 #, fuzzy msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " @@ -24525,120 +24372,129 @@ msgstr "" "Editar objetos, colores, degradados, anchuras de trazo, puntas de flecha, " "patrones de línea..." -#: ../src/verbs.cpp:2698 +#: ../src/verbs.cpp:2760 #, fuzzy msgid "Gl_yphs..." msgstr "Glifos..." -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2761 msgid "Select characters from a glyphs palette" msgstr "Seleccione caracteres de una paleta de glifos" #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2763 msgid "S_watches..." msgstr "M_uestras..." -#: ../src/verbs.cpp:2702 +#: ../src/verbs.cpp:2764 msgid "Select colors from a swatches palette" msgstr "Elija los colores de una paleta de muestras" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2765 +msgid "S_ymbols..." +msgstr "" + +#: ../src/verbs.cpp:2766 +#, fuzzy +msgid "Select symbol from a symbols palette" +msgstr "Elija los colores de una paleta de muestras" + +#: ../src/verbs.cpp:2767 msgid "Transfor_m..." msgstr "Transfor_mar..." -#: ../src/verbs.cpp:2704 +#: ../src/verbs.cpp:2768 msgid "Precisely control objects' transformations" msgstr "Controle con precisión las transformaciones de los objetos" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2769 msgid "_Align and Distribute..." msgstr "_Alinear y distribuir..." -#: ../src/verbs.cpp:2706 +#: ../src/verbs.cpp:2770 msgid "Align and distribute objects" msgstr "Diálogo de alineación y distribución" -#: ../src/verbs.cpp:2707 +#: ../src/verbs.cpp:2771 msgid "_Spray options..." msgstr "Opciones de _spray..." -#: ../src/verbs.cpp:2708 +#: ../src/verbs.cpp:2772 msgid "Some options for the spray" msgstr "Algunas opciones para el spray" -#: ../src/verbs.cpp:2709 +#: ../src/verbs.cpp:2773 msgid "Undo _History..." msgstr "_Historia de deshacer..." -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2774 msgid "Undo History" msgstr "Historia de deshacer" -#: ../src/verbs.cpp:2712 +#: ../src/verbs.cpp:2776 msgid "View and select font family, font size and other text properties" msgstr "" "Ver y seleccionar familias tipográficas, su tamaño y otras propiedades del " "texto" -#: ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2777 msgid "_XML Editor..." msgstr "Editor _XML..." -#: ../src/verbs.cpp:2714 +#: ../src/verbs.cpp:2778 msgid "View and edit the XML tree of the document" msgstr "Ver y editar el árbol XML del documento" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2779 #, fuzzy msgid "_Find/Replace..." msgstr "Buscar y _reemplazar texto..." -#: ../src/verbs.cpp:2716 +#: ../src/verbs.cpp:2780 msgid "Find objects in document" msgstr "Buscar objetos en el documento" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2781 msgid "Find and _Replace Text..." msgstr "Buscar y _reemplazar texto..." -#: ../src/verbs.cpp:2718 +#: ../src/verbs.cpp:2782 msgid "Find and replace text in document" msgstr "Buscar y reemplazar texto en el documento" -#: ../src/verbs.cpp:2720 +#: ../src/verbs.cpp:2784 msgid "Check spelling of text in document" msgstr "Comprobar la ortografía del texto en el documento" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2785 msgid "_Messages..." msgstr "_Mensajes..." -#: ../src/verbs.cpp:2722 +#: ../src/verbs.cpp:2786 msgid "View debug messages" msgstr "Ver los mensajes de depuración" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2787 msgid "S_cripts..." msgstr "S_cripts..." -#: ../src/verbs.cpp:2724 +#: ../src/verbs.cpp:2788 msgid "Run scripts" msgstr "Ejecutar scripts" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2789 msgid "Show/Hide D_ialogs" msgstr "Mostrar/ocultar d_iálogos" -#: ../src/verbs.cpp:2726 +#: ../src/verbs.cpp:2790 msgid "Show or hide all open dialogs" msgstr "Mostrar/ocultar todos los diálogos abiertos" -#: ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2791 msgid "Create Tiled Clones..." msgstr "Crear clones en mosaico..." -#: ../src/verbs.cpp:2728 +#: ../src/verbs.cpp:2792 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" @@ -24646,17 +24502,17 @@ msgstr "" "Crear varios clones del objeto seleccionado y colocarlos en un mosaico o " "patrón" -#: ../src/verbs.cpp:2729 +#: ../src/verbs.cpp:2793 #, fuzzy msgid "_Object attributes..." msgstr "Propiedades del _objeto..." -#: ../src/verbs.cpp:2730 +#: ../src/verbs.cpp:2794 #, fuzzy msgid "Edit the object attributes..." msgstr "Definir atributo" -#: ../src/verbs.cpp:2732 +#: ../src/verbs.cpp:2796 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" "Editar el ID, estado de bloqueo, visibilidad y otras propiedades del objeto" @@ -24665,241 +24521,241 @@ msgstr "" #. new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient", #. N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL), #. #endif -#: ../src/verbs.cpp:2737 +#: ../src/verbs.cpp:2801 msgid "_Input Devices..." msgstr "Dispositivos de _entrada..." -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2802 msgid "Configure extended input devices, such as a graphics tablet" msgstr "" "Configurar dispositivos de entrada extendidos, por ejemplo una tableta " "gráfica" -#: ../src/verbs.cpp:2739 +#: ../src/verbs.cpp:2803 msgid "_Extensions..." msgstr "_Extensiones..." -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2804 msgid "Query information about extensions" msgstr "Obtenga información acerca de las extensiones" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2805 msgid "Layer_s..." msgstr "Capa_s..." -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2806 msgid "View Layers" msgstr "Ver capas" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2807 #, fuzzy msgid "Path E_ffects ..." msgstr "Editor de efectos de trayecto..." -#: ../src/verbs.cpp:2744 +#: ../src/verbs.cpp:2808 msgid "Manage, edit, and apply path effects" msgstr "Gestionar, editar y aplicar un efecto de trayecto" -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2809 #, fuzzy msgid "Filter _Editor..." msgstr "Editor de filtros..." -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2810 msgid "Manage, edit, and apply SVG filters" msgstr "Gestionar, editar y aplicar efectos de filtro SVG" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2811 msgid "SVG Font Editor..." msgstr "Editor de fuentes SVG ..." -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2812 msgid "Edit SVG fonts" msgstr "Editar fuentes SVG" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2813 msgid "Print Colors..." msgstr "Colores de impresión..." -#: ../src/verbs.cpp:2750 +#: ../src/verbs.cpp:2814 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" "Seleccione qué separaciones de color se mostrarán en el modo de vista previa " "de colores de impresión" -#: ../src/verbs.cpp:2751 +#: ../src/verbs.cpp:2815 #, fuzzy msgid "_Export PNG Image..." msgstr "Extraer imagen" -#: ../src/verbs.cpp:2752 +#: ../src/verbs.cpp:2816 #, fuzzy msgid "Export this document or a selection as a PNG image" msgstr "Exportar el documento o selección como imagen mapa de bits" #. Help -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2819 msgid "About E_xtensions" msgstr "Acerca de e_xtensiones" -#: ../src/verbs.cpp:2756 +#: ../src/verbs.cpp:2820 msgid "Information on Inkscape extensions" msgstr "Información acerca de las extensiones de Inkscape" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2821 msgid "About _Memory" msgstr "Acerca de _memoria" -#: ../src/verbs.cpp:2758 +#: ../src/verbs.cpp:2822 msgid "Memory usage information" msgstr "Información del uso de memoria" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2823 msgid "_About Inkscape" msgstr "_Acerca de Inkscape" -#: ../src/verbs.cpp:2760 +#: ../src/verbs.cpp:2824 msgid "Inkscape version, authors, license" msgstr "Versión, autores y licencia de Inkscape" #. new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"), #. N_("Distribution terms"), /*"show_license"*/"inkscape_options"), #. Tutorials -#: ../src/verbs.cpp:2765 +#: ../src/verbs.cpp:2829 msgid "Inkscape: _Basic" msgstr "Inkscape: _Básico" -#: ../src/verbs.cpp:2766 +#: ../src/verbs.cpp:2830 msgid "Getting started with Inkscape" msgstr "Introducción a Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2831 msgid "Inkscape: _Shapes" msgstr "Inkscape: _Formas" -#: ../src/verbs.cpp:2768 +#: ../src/verbs.cpp:2832 msgid "Using shape tools to create and edit shapes" msgstr "Cómo usar las herramientas de forma para crear y editar formas" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2833 msgid "Inkscape: _Advanced" msgstr "Inkscape: _Avanzado" -#: ../src/verbs.cpp:2770 +#: ../src/verbs.cpp:2834 msgid "Advanced Inkscape topics" msgstr "Temas avanzados de Inkscape" #. "tutorial_advanced" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2772 +#: ../src/verbs.cpp:2836 msgid "Inkscape: T_racing" msgstr "Inkscape: Vecto_rizar" -#: ../src/verbs.cpp:2773 +#: ../src/verbs.cpp:2837 msgid "Using bitmap tracing" msgstr "Usar trazado de mapa de bits" #. "tutorial_tracing" -#: ../src/verbs.cpp:2774 +#: ../src/verbs.cpp:2838 msgid "Inkscape: _Calligraphy" msgstr "Inkscape: _Caligrafía" -#: ../src/verbs.cpp:2775 +#: ../src/verbs.cpp:2839 msgid "Using the Calligraphy pen tool" msgstr "Cómo usar la herramienta de pluma caligráfica" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2840 msgid "Inkscape: _Interpolate" msgstr "Inkscape: _Interpolar" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2841 msgid "Using the interpolate extension" msgstr "Cómo usar la extensión Interpolar" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2842 msgid "_Elements of Design" msgstr "_Elementos de diseño" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2843 msgid "Principles of design in the tutorial form" msgstr "Principios de diseño en forma de tutorial" #. "tutorial_design" -#: ../src/verbs.cpp:2780 +#: ../src/verbs.cpp:2844 msgid "_Tips and Tricks" msgstr "_Trucos y consejos" -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2845 msgid "Miscellaneous tips and tricks" msgstr "Trucos y consejos varios" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2848 #, fuzzy msgid "Previous Exte_nsion" msgstr "Extensión anterior" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2849 msgid "Repeat the last extension with the same settings" msgstr "Repetir la última extensión con los mismos ajustes" -#: ../src/verbs.cpp:2786 +#: ../src/verbs.cpp:2850 #, fuzzy msgid "_Previous Extension Settings..." msgstr "Ajustes de la extensión anterior..." -#: ../src/verbs.cpp:2787 +#: ../src/verbs.cpp:2851 msgid "Repeat the last extension with new settings" msgstr "Repetir la última extensión con ajustes nuevos" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2855 msgid "Fit the page to the current selection" msgstr "Ajustar lá página a la selección actual" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2857 msgid "Fit the page to the drawing" msgstr "Ajustar el lienzo al tamaño del dibujo" -#: ../src/verbs.cpp:2795 +#: ../src/verbs.cpp:2859 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" "Ajusta el lienzo al tamaño de la selección o del dibujo si no hay selección" #. LockAndHide -#: ../src/verbs.cpp:2797 +#: ../src/verbs.cpp:2861 msgid "Unlock All" msgstr "Desbloquear todo" -#: ../src/verbs.cpp:2799 +#: ../src/verbs.cpp:2863 msgid "Unlock All in All Layers" msgstr "Desbloquear todo en todas las capas" -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2865 msgid "Unhide All" msgstr "Mostrar todo" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2867 msgid "Unhide All in All Layers" msgstr "Mostrar todo de todas las capas" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2871 msgid "Link an ICC color profile" msgstr "Conectar un perfil de color ICC" -#: ../src/verbs.cpp:2808 +#: ../src/verbs.cpp:2872 msgid "Remove Color Profile" msgstr "Eliminar perfil de color" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2873 msgid "Remove a linked ICC color profile" msgstr "Eliminar un perfil de color ICC conectado" -#: ../src/verbs.cpp:2832 ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2896 ../src/verbs.cpp:2897 #, fuzzy msgid "Center on horizontal and vertical axis" msgstr "Centrar en el eje horizontal" @@ -25446,21 +25302,21 @@ msgstr "Patrón de rayas" msgid "Pattern offset" msgstr "Desvío del patrón" -#: ../src/widgets/desktop-widget.cpp:436 +#: ../src/widgets/desktop-widget.cpp:466 msgid "Zoom drawing if window size changes" msgstr "Ajustar el dibujo a la ventana si cambia el tamaño de ésta" -#: ../src/widgets/desktop-widget.cpp:588 +#: ../src/widgets/desktop-widget.cpp:670 msgid "Cursor coordinates" msgstr "Coordenadas del cursor" -#: ../src/widgets/desktop-widget.cpp:603 +#: ../src/widgets/desktop-widget.cpp:696 msgid "Z:" msgstr "Z:" # display the initial welcome message in the statusbar #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:634 +#: ../src/widgets/desktop-widget.cpp:739 msgid "" "<b>Welcome to Inkscape!</b> Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." @@ -25469,45 +25325,45 @@ msgstr "" "alzada para crear objetos; utilice el selector (flecha) para moverlos o " "transformarlos." -#: ../src/widgets/desktop-widget.cpp:737 +#: ../src/widgets/desktop-widget.cpp:842 #, fuzzy, c-format msgid "%s%s: %d (outline%s) - Inkscape" msgstr "%s: %d (líneas) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:739 +#: ../src/widgets/desktop-widget.cpp:844 #, fuzzy, c-format msgid "%s%s: %d (no filters%s) - Inkscape" msgstr "%s: %d (sin filtros) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:741 +#: ../src/widgets/desktop-widget.cpp:846 #, fuzzy, c-format msgid "%s%s: %d %s- Inkscape" msgstr "%s: %d - Inkscape" -#: ../src/widgets/desktop-widget.cpp:745 +#: ../src/widgets/desktop-widget.cpp:850 #, fuzzy, c-format msgid "%s%s (outline%s) - Inkscape" msgstr "%s (líneas) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:747 +#: ../src/widgets/desktop-widget.cpp:852 #, fuzzy, c-format msgid "%s%s (no filters%s) - Inkscape" msgstr "%s (sin filtros) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:749 +#: ../src/widgets/desktop-widget.cpp:854 #, fuzzy, c-format msgid "%s%s %s- Inkscape" msgstr "%s - Inkscape" -#: ../src/widgets/desktop-widget.cpp:916 +#: ../src/widgets/desktop-widget.cpp:1021 msgid "Color-managed display is <b>enabled</b> in this window" msgstr "La pantalla con gestión de color está <b>activa</b> en esta ventana" -#: ../src/widgets/desktop-widget.cpp:918 +#: ../src/widgets/desktop-widget.cpp:1023 msgid "Color-managed display is <b>disabled</b> in this window" msgstr "La pantalla con gestión de color está <b>inactiva</b> en esta ventana" -#: ../src/widgets/desktop-widget.cpp:973 +#: ../src/widgets/desktop-widget.cpp:1078 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before " @@ -25520,12 +25376,12 @@ msgstr "" "\n" "Si cierra sin guardar se perderán los cambios realizados." -#: ../src/widgets/desktop-widget.cpp:983 -#: ../src/widgets/desktop-widget.cpp:1042 +#: ../src/widgets/desktop-widget.cpp:1088 +#: ../src/widgets/desktop-widget.cpp:1147 msgid "Close _without saving" msgstr "Cerrar _sin guardar" -#: ../src/widgets/desktop-widget.cpp:1032 +#: ../src/widgets/desktop-widget.cpp:1137 #, fuzzy, c-format msgid "" "<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a " @@ -25538,12 +25394,12 @@ msgstr "" "\n" "¿Desea guardar el archivo como SVG de Inkscape?" -#: ../src/widgets/desktop-widget.cpp:1044 +#: ../src/widgets/desktop-widget.cpp:1149 #, fuzzy msgid "_Save as Inkscape SVG" msgstr "Guardar como _SVG" -#: ../src/widgets/desktop-widget.cpp:1254 +#: ../src/widgets/desktop-widget.cpp:1359 msgid "Note:" msgstr "" @@ -25648,16 +25504,21 @@ msgstr "Estilo" msgid "Font size:" msgstr "Tamaño de tipografía:" -#: ../src/widgets/gradient-selector.cpp:203 +#: ../src/widgets/gradient-selector.cpp:204 #, fuzzy msgid "Create a duplicate gradient" msgstr "Crear y editar degradados" -#: ../src/widgets/gradient-selector.cpp:213 +#: ../src/widgets/gradient-selector.cpp:214 #, fuzzy msgid "Edit gradient" msgstr "Degradado radial" +#: ../src/widgets/gradient-selector.cpp:308 +#, fuzzy +msgid "Rename gradient" +msgstr "Degradado lineal" + #: ../src/widgets/gradient-toolbar.cpp:170 #: ../src/widgets/gradient-toolbar.cpp:183 #: ../src/widgets/gradient-toolbar.cpp:775 @@ -26853,62 +26714,53 @@ msgstr "CMS" #: ../src/widgets/sp-color-icc-selector.cpp:216 #: ../src/widgets/sp-color-scales.cpp:400 -#, fuzzy msgid "_R:" -msgstr "_R" +msgstr "_R:" #: ../src/widgets/sp-color-icc-selector.cpp:216 #: ../src/widgets/sp-color-icc-selector.cpp:217 #: ../src/widgets/sp-color-scales.cpp:403 -#, fuzzy msgid "_G:" -msgstr "_G" +msgstr "_G:" #: ../src/widgets/sp-color-icc-selector.cpp:216 #: ../src/widgets/sp-color-scales.cpp:406 -#, fuzzy msgid "_B:" -msgstr "_B" +msgstr "_B:" #: ../src/widgets/sp-color-icc-selector.cpp:218 #: ../src/widgets/sp-color-icc-selector.cpp:219 #: ../src/widgets/sp-color-scales.cpp:426 -#, fuzzy msgid "_H:" -msgstr "_H" +msgstr "_H:" #: ../src/widgets/sp-color-icc-selector.cpp:218 #: ../src/widgets/sp-color-icc-selector.cpp:219 #: ../src/widgets/sp-color-scales.cpp:429 -#, fuzzy msgid "_S:" -msgstr "_S" +msgstr "_S:" #: ../src/widgets/sp-color-icc-selector.cpp:219 #: ../src/widgets/sp-color-scales.cpp:432 -#, fuzzy msgid "_L:" -msgstr "_L" +msgstr "_L:" #: ../src/widgets/sp-color-icc-selector.cpp:220 #: ../src/widgets/sp-color-icc-selector.cpp:221 #: ../src/widgets/sp-color-scales.cpp:454 -#, fuzzy msgid "_C:" -msgstr "_C" +msgstr "_C:" #: ../src/widgets/sp-color-icc-selector.cpp:220 #: ../src/widgets/sp-color-icc-selector.cpp:221 #: ../src/widgets/sp-color-scales.cpp:457 -#, fuzzy msgid "_M:" -msgstr "_M" +msgstr "_M:" #: ../src/widgets/sp-color-icc-selector.cpp:220 #: ../src/widgets/sp-color-scales.cpp:463 -#, fuzzy msgid "_K:" -msgstr "_K" +msgstr "_K:" #: ../src/widgets/sp-color-icc-selector.cpp:231 msgid "Gray" @@ -26929,9 +26781,8 @@ msgstr "" #: ../src/widgets/sp-color-scales.cpp:435 #: ../src/widgets/sp-color-scales.cpp:466 #: ../src/widgets/sp-color-wheel-selector.cpp:170 -#, fuzzy msgid "_A:" -msgstr "_A" +msgstr "_A:" #: ../src/widgets/sp-color-icc-selector.cpp:399 #: ../src/widgets/sp-color-icc-selector.cpp:411 @@ -27170,7 +27021,6 @@ msgid "Stroke width" msgstr "Ancho de trazo" #: ../src/widgets/stroke-style.cpp:153 -#, fuzzy msgctxt "Stroke width" msgid "_Width:" msgstr "A_ncho:" @@ -27197,9 +27047,8 @@ msgid "Bevel join" msgstr "Unión biselada" #: ../src/widgets/stroke-style.cpp:236 -#, fuzzy msgid "Miter _limit:" -msgstr "Límite de inglete:" +msgstr "Límite de ing_lete:" #. Cap type #. TRANSLATORS: cap type specifies the shape for the ends of lines @@ -27232,9 +27081,8 @@ msgid "Dashes:" msgstr "Guiones:" #: ../src/widgets/stroke-style.cpp:295 -#, fuzzy msgid "_Start Markers:" -msgstr "Marcas de inicio:" +msgstr "Marca_s de inicio:" #: ../src/widgets/stroke-style.cpp:296 msgid "Start Markers are drawn on the first node of a path or shape" @@ -27242,9 +27090,8 @@ msgstr "" "Las marcas de inicio se dibujan en el primer nodo de un trayecto o forma" #: ../src/widgets/stroke-style.cpp:305 -#, fuzzy msgid "_Mid Markers:" -msgstr "Marcas medias:" +msgstr "_Marcas medias:" #: ../src/widgets/stroke-style.cpp:306 msgid "" @@ -27255,9 +27102,8 @@ msgstr "" "primero y el último" #: ../src/widgets/stroke-style.cpp:315 -#, fuzzy msgid "_End Markers:" -msgstr "Marcas finales:" +msgstr "Marcas final_es:" #: ../src/widgets/stroke-style.cpp:316 msgid "End Markers are drawn on the last node of a path or shape" @@ -27272,18 +27118,17 @@ msgid "Set stroke style" msgstr "Fijar estilo de trazo" #: ../src/widgets/stroke-style.cpp:1209 -#, fuzzy msgid "Set marker color" -msgstr "Fijar color del trazo" +msgstr "Fijar color de marca" #: ../src/widgets/swatch-selector.cpp:140 msgid "Change swatch color" msgstr "Cambiar el color de la muestra" #: ../src/widgets/text-toolbar.cpp:371 -#, fuzzy, c-format +#, c-format msgid "Failed to find font matching: %s\n" -msgstr "No se puede encontrar el ID de nodo: '%s'\n" +msgstr "No se puede encontrar tipo coincidente:'%s\n" #: ../src/widgets/text-toolbar.cpp:405 msgid "Text: Change font family" @@ -27351,14 +27196,12 @@ msgid "Font not found on system" msgstr "No se ha encontrado la tipografía en el sistema" #: ../src/widgets/text-toolbar.cpp:1517 -#, fuzzy msgid "Font Style" -msgstr "Tamaño" +msgstr "Estilo tipográfico" #: ../src/widgets/text-toolbar.cpp:1518 -#, fuzzy msgid "Font style" -msgstr "Tamaño de tipografía" +msgstr "Estilo tipográfico" #. Name #: ../src/widgets/text-toolbar.cpp:1534 @@ -27414,7 +27257,6 @@ msgstr "Espaciado inferior" #: ../src/widgets/text-toolbar.cpp:1661 ../src/widgets/text-toolbar.cpp:1692 #: ../src/widgets/text-toolbar.cpp:1723 -#, fuzzy msgctxt "Text tool" msgid "Normal" msgstr "Normal" @@ -27566,143 +27408,139 @@ msgstr "TBD" msgid "Style of Paint Bucket fill objects" msgstr "Estilo para el cubo de pintura" -#: ../src/widgets/toolbox.cpp:1710 +#: ../src/widgets/toolbox.cpp:1729 msgid "Bounding box" msgstr "Caja de contorno" -#: ../src/widgets/toolbox.cpp:1710 +#: ../src/widgets/toolbox.cpp:1729 #, fuzzy msgid "Snap bounding boxes" msgstr "Ajustar esquinas de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1719 +#: ../src/widgets/toolbox.cpp:1738 msgid "Bounding box edges" msgstr "Bordes de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1719 +#: ../src/widgets/toolbox.cpp:1738 msgid "Snap to edges of a bounding box" msgstr "Ajustar a bordes de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1728 +#: ../src/widgets/toolbox.cpp:1747 msgid "Bounding box corners" msgstr "Esquinas de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1728 +#: ../src/widgets/toolbox.cpp:1747 msgid "Snap bounding box corners" msgstr "Ajustar esquinas de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1737 +#: ../src/widgets/toolbox.cpp:1756 msgid "BBox Edge Midpoints" msgstr "Punto medio del borde de la caja de contorno" -#: ../src/widgets/toolbox.cpp:1737 +#: ../src/widgets/toolbox.cpp:1756 #, fuzzy msgid "Snap midpoints of bounding box edges" msgstr "Ajustar a los medios de los bordes de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1747 +#: ../src/widgets/toolbox.cpp:1766 msgid "BBox Centers" msgstr "Centros de cajas de contorno" -#: ../src/widgets/toolbox.cpp:1747 +#: ../src/widgets/toolbox.cpp:1766 #, fuzzy msgid "Snapping centers of bounding boxes" msgstr "Ajustar a y desde los centros de las cajas de contorno" -#: ../src/widgets/toolbox.cpp:1756 +#: ../src/widgets/toolbox.cpp:1775 #, fuzzy msgid "Snap nodes, paths, and handles" msgstr "Ajustar nodos o tiradores" -#: ../src/widgets/toolbox.cpp:1764 +#: ../src/widgets/toolbox.cpp:1783 msgid "Snap to paths" msgstr "Ajustar a trayectos" -#: ../src/widgets/toolbox.cpp:1773 +#: ../src/widgets/toolbox.cpp:1792 msgid "Path intersections" msgstr "Intersecciones de trayectos" -#: ../src/widgets/toolbox.cpp:1773 +#: ../src/widgets/toolbox.cpp:1792 msgid "Snap to path intersections" msgstr "Ajustar a las intersecciones de trayectos" -#: ../src/widgets/toolbox.cpp:1782 +#: ../src/widgets/toolbox.cpp:1801 msgid "To nodes" msgstr "A nodos" -#: ../src/widgets/toolbox.cpp:1782 +#: ../src/widgets/toolbox.cpp:1801 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "" -#: ../src/widgets/toolbox.cpp:1791 +#: ../src/widgets/toolbox.cpp:1810 msgid "Smooth nodes" msgstr "Nodos suaves" -#: ../src/widgets/toolbox.cpp:1791 +#: ../src/widgets/toolbox.cpp:1810 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "" -#: ../src/widgets/toolbox.cpp:1800 +#: ../src/widgets/toolbox.cpp:1819 msgid "Line Midpoints" msgstr "Puntos medios de línea" -#: ../src/widgets/toolbox.cpp:1800 +#: ../src/widgets/toolbox.cpp:1819 #, fuzzy msgid "Snap midpoints of line segments" msgstr "Ajustar a y desde puntos medios de segmentos de línea" -#: ../src/widgets/toolbox.cpp:1809 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1828 msgid "Others" -msgstr "Otro" +msgstr "Otros" -#: ../src/widgets/toolbox.cpp:1809 +#: ../src/widgets/toolbox.cpp:1828 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" -#: ../src/widgets/toolbox.cpp:1817 +#: ../src/widgets/toolbox.cpp:1836 msgid "Object Centers" msgstr "Centros de los objetos" -#: ../src/widgets/toolbox.cpp:1817 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1836 msgid "Snap centers of objects" -msgstr "Ajustar a y desde centros de objetos" +msgstr "Ajustar centros de objetos" -#: ../src/widgets/toolbox.cpp:1826 +#: ../src/widgets/toolbox.cpp:1845 msgid "Rotation Centers" msgstr "Centros de rotación" -#: ../src/widgets/toolbox.cpp:1826 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1845 msgid "Snap an item's rotation center" -msgstr "Ajustar a y desde el centro de rotación de un elemento" +msgstr "Ajustar el centro de rotación de un elemento" -#: ../src/widgets/toolbox.cpp:1835 +#: ../src/widgets/toolbox.cpp:1854 msgid "Text baseline" msgstr "Línea base de texto" -#: ../src/widgets/toolbox.cpp:1835 +#: ../src/widgets/toolbox.cpp:1854 #, fuzzy msgid "Snap text anchors and baselines" msgstr "Alinear líneas base de textos " -#: ../src/widgets/toolbox.cpp:1845 +#: ../src/widgets/toolbox.cpp:1864 msgid "Page border" msgstr "Borde del papel" -#: ../src/widgets/toolbox.cpp:1845 +#: ../src/widgets/toolbox.cpp:1864 msgid "Snap to the page border" msgstr "Ajustar al borde del papel" -#: ../src/widgets/toolbox.cpp:1854 +#: ../src/widgets/toolbox.cpp:1873 msgid "Snap to grids" msgstr "Ajustar a rejillas" -#: ../src/widgets/toolbox.cpp:1863 -#, fuzzy +#: ../src/widgets/toolbox.cpp:1882 msgid "Snap guides" -msgstr "Ajustar a guías" +msgstr "Guías de ajuste" #. Width #: ../src/widgets/tweak-toolbar.cpp:144 @@ -27970,9 +27808,8 @@ msgid "Semiperimeter (px): " msgstr "Semiperímetro/px: " #: ../share/extensions/draw_from_triangle.py:185 -#, fuzzy msgid "Area (px^2): " -msgstr "Área /px^2: " +msgstr "Área (px^2): " #: ../share/extensions/dxf_outlines.py:49 msgid "" @@ -28021,7 +27858,15 @@ msgstr "Imagen extraída a: %s" msgid "Unable to find image data." msgstr "No se han podido encontrar los datos de la imagen." -#: ../share/extensions/funcplot.py:294 +#: ../share/extensions/funcplot.py:47 +msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" +msgstr "" + +#: ../share/extensions/funcplot.py:59 +msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" +msgstr "" + +#: ../share/extensions/funcplot.py:300 #, fuzzy msgid "Please select a rectangle" msgstr "Duplicar los objetos seleccionados" @@ -28256,7 +28101,7 @@ msgstr "Esta extensión necesita dos trayectos seleccionados." msgid "The sliced bitmaps have been saved as:" msgstr "" -#: ../share/extensions/inkex.py:123 +#: ../share/extensions/inkex.py:133 #, fuzzy, python-format msgid "" "The fantastic lxml wrapper for libxml2 is required by inkex.py and therefore " @@ -28272,7 +28117,7 @@ msgstr "" "http://cheeseshop.python.org/pypi/lxml/ o mediante su gestor de paquetes con " "un comando similar a este: sudo apt-get install python-lxml" -#: ../share/extensions/inkex.py:267 +#: ../share/extensions/inkex.py:277 #, python-format msgid "No matching node for expression: %s" msgstr "No hay nodo coincidente para la expresión %s" @@ -28409,17 +28254,16 @@ msgid "{0}\tObject \"{1}\"" msgstr "" #: ../share/extensions/jessyInk_summary.py:179 -#, fuzzy msgid " will appear" -msgstr "Rellenar área cerrada" +msgstr " aparecerá" #: ../share/extensions/jessyInk_summary.py:181 msgid " will disappear" -msgstr "" +msgstr " desaparecerá" #: ../share/extensions/jessyInk_summary.py:184 msgid " using effect \"{0}\"" -msgstr "" +msgstr " usando efecto «{0}»" #: ../share/extensions/jessyInk_summary.py:187 msgid " in {0!s} s" @@ -29817,7 +29661,7 @@ msgid "Pressure angle (degrees):" msgstr "Ángulo de presión" #: ../share/extensions/gears.inx.h:7 -msgid "Unit of measure for both circular pitch and center diameter." +msgid "Unit of measurement for both circular pitch and center diameter." msgstr "" #: ../share/extensions/gcodetools_about.inx.h:1 @@ -33311,9 +33155,8 @@ msgid "Compressed Inkscape SVG with media export" msgstr "SVG de Inkscape comprimido con imágenes (*.zip)" #: ../share/extensions/svg_and_media_zip_output.inx.h:4 -#, fuzzy msgid "Image zip directory:" -msgstr "Dirección" +msgstr "Directorio de imágenes comprimidas:" #: ../share/extensions/svg_and_media_zip_output.inx.h:5 msgid "" @@ -33332,23 +33175,20 @@ msgid "Calendar" msgstr "Calendario" #: ../share/extensions/svgcalendar.inx.h:3 -#, fuzzy msgid "Char Encoding:" -msgstr "Codificación de caracteres" +msgstr "Codificación de caracteres:" #: ../share/extensions/svgcalendar.inx.h:4 msgid "Colors" msgstr "Colores" #: ../share/extensions/svgcalendar.inx.h:6 -#, fuzzy msgid "Day color:" -msgstr "Color de día" +msgstr "Color de día:" #: ../share/extensions/svgcalendar.inx.h:7 -#, fuzzy msgid "Day names:" -msgstr "Nombres de días" +msgstr "Nombres de días:" #: ../share/extensions/svgcalendar.inx.h:8 msgid "Fill empty day boxes with next month's days" @@ -33371,39 +33211,32 @@ msgid "Monday" msgstr "Lunes" #: ../share/extensions/svgcalendar.inx.h:13 -#, fuzzy msgid "Month (0 for all):" -msgstr "Mes (0 para todos)" +msgstr "Mes (0 para todos):" #: ../share/extensions/svgcalendar.inx.h:14 -#, fuzzy msgid "Month Margin:" -msgstr "Margen de meses" +msgstr "Margen de mes:" #: ../share/extensions/svgcalendar.inx.h:15 -#, fuzzy msgid "Month Width:" -msgstr "Ancho de mes" +msgstr "Ancho de mes:" #: ../share/extensions/svgcalendar.inx.h:16 -#, fuzzy msgid "Month color:" -msgstr "Color de meses" +msgstr "Color de mes:" #: ../share/extensions/svgcalendar.inx.h:17 -#, fuzzy msgid "Month names:" -msgstr "Nombre de meses" +msgstr "Nombres de meses:" #: ../share/extensions/svgcalendar.inx.h:18 -#, fuzzy msgid "Months per line:" -msgstr "Meses por línea" +msgstr "Meses por línea:" #: ../share/extensions/svgcalendar.inx.h:19 -#, fuzzy msgid "Next month day color:" -msgstr "Color del mes siguiente" +msgstr "Color del día del mes siguiente:" #: ../share/extensions/svgcalendar.inx.h:21 msgid "Saturday" @@ -33414,18 +33247,16 @@ msgid "Saturday and Sunday" msgstr "Sábado y Domingo" #: ../share/extensions/svgcalendar.inx.h:23 -#, fuzzy msgid "" "Select your system encoding. More information at http://docs.python.org/" "library/codecs.html#standard-encodings." msgstr "" -"(Seleccione la codificación de su sistema. Más información en http://docs." -"python.org/library/codecs.html#standard-encodings)" +"Seleccione la codificación de su sistema. Más información en http://docs." +"python.org/library/codecs.html#standard-encodings." #: ../share/extensions/svgcalendar.inx.h:24 -#, fuzzy msgid "Show week number" -msgstr "Número de diapositiva" +msgstr "Mostrar número de semana" #: ../share/extensions/svgcalendar.inx.h:25 msgid "Sun Mon Tue Wed Thu Fri Sat" @@ -33436,9 +33267,8 @@ msgid "Sunday" msgstr "Domingo" #: ../share/extensions/svgcalendar.inx.h:27 -#, fuzzy msgid "The day names list must start from Sunday." -msgstr "(La lista de nombres de días debe comenzar con Domingo)" +msgstr "La lista de nombres de días debe comenzar con Domingo." #: ../share/extensions/svgcalendar.inx.h:28 msgid "The options below have no influence when the above is checked." @@ -33446,47 +33276,40 @@ msgstr "" "Las siguientes opciones no tienen efecto si está marcada la opción anterior." #: ../share/extensions/svgcalendar.inx.h:29 -#, fuzzy msgid "Week number color:" -msgstr "Color de día de semana" +msgstr "Color de clumna de número de semana:" #: ../share/extensions/svgcalendar.inx.h:30 -#, fuzzy msgid "Week number column name:" -msgstr "Reducir número de columnas:" +msgstr "Nombre de columna de semana:" #: ../share/extensions/svgcalendar.inx.h:31 -#, fuzzy msgid "Week start day:" -msgstr "Día de inicio de semana" +msgstr "Día de inicio de semana:" #: ../share/extensions/svgcalendar.inx.h:32 -#, fuzzy msgid "Weekday name color:" -msgstr "Color de día de semana" +msgstr "Color de día de semana:" #: ../share/extensions/svgcalendar.inx.h:33 -#, fuzzy msgid "Weekend day color:" -msgstr "Color de fin de semana" +msgstr "Color de fin de semana:" #: ../share/extensions/svgcalendar.inx.h:34 -#, fuzzy msgid "Weekend:" -msgstr "Fin de semana" +msgstr "Fin de semana:" #: ../share/extensions/svgcalendar.inx.h:35 msgid "Wk" -msgstr "" +msgstr "Sem" #: ../share/extensions/svgcalendar.inx.h:36 msgid "Year (4 digits):" -msgstr "" +msgstr "Año (4 dígitos):" #: ../share/extensions/svgcalendar.inx.h:37 -#, fuzzy msgid "Year color:" -msgstr "Color del año" +msgstr "Color del año:" #: ../share/extensions/svgcalendar.inx.h:38 msgid "You may change the names for other languages:" @@ -33506,42 +33329,34 @@ msgid "Convert to Braille" msgstr "Convertir a Braille" #: ../share/extensions/text_extract.inx.h:2 -#, fuzzy msgid "Bottom to top" -msgstr "De abajo arriba (90)" +msgstr "De abajo arriba" #: ../share/extensions/text_extract.inx.h:3 -#, fuzzy msgid "Extract" -msgstr "Extraer imagen" +msgstr "Extraer" #: ../share/extensions/text_extract.inx.h:4 -#, fuzzy msgid "Horizontal point:" msgstr "Punto horizontal:" #: ../share/extensions/text_extract.inx.h:6 -#, fuzzy msgid "Left to right" -msgstr "De izquierda a derecha (0)" +msgstr "De izquierda a derecha" #: ../share/extensions/text_extract.inx.h:9 -#, fuzzy msgid "Right to left" -msgstr "De derecha a izquierda (180)" +msgstr "De derecha a izquierda" #: ../share/extensions/text_extract.inx.h:11 -#, fuzzy msgid "Text direction:" -msgstr "Dirección de marcas" +msgstr "Dirección de texto:" #: ../share/extensions/text_extract.inx.h:13 -#, fuzzy msgid "Top to bottom" -msgstr "Bajar al fondo" +msgstr "De arriba abajo" #: ../share/extensions/text_extract.inx.h:14 -#, fuzzy msgid "Vertical point:" msgstr "Punto vertical:" @@ -33551,9 +33366,8 @@ msgstr "Punto vertical:" #: ../share/extensions/text_sentencecase.inx.h:1 #: ../share/extensions/text_titlecase.inx.h:1 #: ../share/extensions/text_uppercase.inx.h:1 -#, fuzzy msgid "Change Case" -msgstr "Cambiar tirador" +msgstr "Cambiar caja de tipo" #: ../share/extensions/text_flipcase.inx.h:3 msgid "fLIP cASE" @@ -33580,19 +33394,16 @@ msgid "UPPERCASE" msgstr "MAYÚSCULAS" #: ../share/extensions/triangle.inx.h:1 -#, fuzzy msgid "Angle a (deg):" -msgstr "Ángulo a / grados" +msgstr "Ángulo a (grados):" #: ../share/extensions/triangle.inx.h:2 -#, fuzzy msgid "Angle b (deg):" -msgstr "Ángulo b / grados" +msgstr "Ángulo b (grados):" #: ../share/extensions/triangle.inx.h:3 -#, fuzzy msgid "Angle c (deg):" -msgstr "Ángulo c / grados" +msgstr "Ángulo c (grados):" #: ../share/extensions/triangle.inx.h:4 msgid "From Side a and Angles a, b" @@ -33615,19 +33426,16 @@ msgid "From Three Sides" msgstr "Desde tres lados" #: ../share/extensions/triangle.inx.h:11 -#, fuzzy msgid "Side Length a (px):" -msgstr "Longitud lateral a / px" +msgstr "Longitud lateral a (px):" #: ../share/extensions/triangle.inx.h:12 -#, fuzzy msgid "Side Length b (px):" -msgstr "Longitud lateral b / px" +msgstr "Longitud lateral b (px):" #: ../share/extensions/triangle.inx.h:13 -#, fuzzy msgid "Side Length c (px):" -msgstr "Longitud lateral c / px" +msgstr "Longitud lateral c (px):" #: ../share/extensions/triangle.inx.h:14 msgid "Triangle" @@ -33646,22 +33454,20 @@ msgid "Text Input" msgstr "Entrada de texto" #: ../share/extensions/voronoi2svg.inx.h:1 -#, fuzzy msgid "Automatic from selected objects" -msgstr "Agrupar los objetos seleccionados" +msgstr "Automáticamente de los objetos seleccionados" #: ../share/extensions/voronoi2svg.inx.h:2 -#, fuzzy msgid "Bounding box of the diagram:" -msgstr "Caja de contorno:" +msgstr "Caja de contorno del diagrama:" #: ../share/extensions/voronoi2svg.inx.h:3 msgid "Delaunay Triangulation" -msgstr "" +msgstr "Triangulación de Delauney" #: ../share/extensions/voronoi2svg.inx.h:7 msgid "Options for Voronoi diagram" -msgstr "" +msgstr "Opciones para el diagrama Voronoi" #: ../share/extensions/voronoi2svg.inx.h:9 msgid "" @@ -33670,23 +33476,20 @@ msgid "" msgstr "" #: ../share/extensions/voronoi2svg.inx.h:10 -#, fuzzy msgid "Show the bounding box" -msgstr "Mostrar la caja de contorno limitante" +msgstr "Mostrar la caja de contorno" #: ../share/extensions/voronoi2svg.inx.h:11 msgid "Type of diagram:" -msgstr "" +msgstr "Tipo de diagrama:" #: ../share/extensions/voronoi2svg.inx.h:12 -#, fuzzy msgid "Voronoi Diagram" -msgstr "Patrón Voronoi" +msgstr "Diagrama Voronoi" #: ../share/extensions/voronoi2svg.inx.h:13 -#, fuzzy msgid "Voronoi and Delaunay" -msgstr "Patrón Voronoi" +msgstr "Voronoi y Delaunay" #: ../share/extensions/webslicer_create_group.inx.h:1 #: ../share/extensions/webslicer_create_rect.inx.h:2 @@ -33894,9 +33697,8 @@ msgid "Create directory, if it does not exists" msgstr "Crear el directorio si no existe" #: ../share/extensions/webslicer_export.inx.h:3 -#, fuzzy msgid "Directory path to export:" -msgstr "Ruta del directorio de exportación" +msgstr "Ruta del directorio de exportación:" #: ../share/extensions/webslicer_export.inx.h:4 msgid "Export layout pieces and HTML+CSS code" @@ -33911,15 +33713,13 @@ msgid "All selected ones set an attribute in the last one" msgstr "Todos los seleccionados fijan un atributo en el último" #: ../share/extensions/web-set-att.inx.h:2 -#, fuzzy msgid "Attribute to set:" -msgstr "Atributo a fijar" +msgstr "Atributo a fijar:" #: ../share/extensions/web-set-att.inx.h:3 #: ../share/extensions/web-transmit-att.inx.h:3 -#, fuzzy msgid "Compatibility with previews code to this event:" -msgstr "Compatibilidad de este evento con el código de vistas previas" +msgstr "Compatibilidad de este evento con el código de vistas previas:" #: ../share/extensions/web-set-att.inx.h:5 msgid "" @@ -33944,9 +33744,8 @@ msgid "Set Attributes" msgstr "Definir atributos" #: ../share/extensions/web-set-att.inx.h:11 -#, fuzzy msgid "Source and destination of setting:" -msgstr "Origen y destino del ajuste" +msgstr "Origen y destino del ajuste:" #: ../share/extensions/web-set-att.inx.h:12 msgid "The first selected sets an attribute in all others" @@ -33981,14 +33780,12 @@ msgstr "" "cuando ocurra un evento definido en el primer elemento seleccionado." #: ../share/extensions/web-set-att.inx.h:17 -#, fuzzy msgid "Value to set:" -msgstr "Valor a fijar" +msgstr "Valor a fijar:" #: ../share/extensions/web-set-att.inx.h:19 -#, fuzzy msgid "When should the set be done:" -msgstr "¿Cuándo se debe fijar?" +msgstr "¿Cuándo se debe fijar?:" #: ../share/extensions/web-set-att.inx.h:20 #: ../share/extensions/web-transmit-att.inx.h:18 @@ -34045,9 +33842,8 @@ msgid "All selected ones transmit to the last one" msgstr "Todos los seleccionados transmiten al último" #: ../share/extensions/web-transmit-att.inx.h:2 -#, fuzzy msgid "Attribute to transmit:" -msgstr "Atributo a transmitir" +msgstr "Atributo a transmitir:" #: ../share/extensions/web-transmit-att.inx.h:5 msgid "" @@ -34058,9 +33854,8 @@ msgstr "" "y solo con un espacio." #: ../share/extensions/web-transmit-att.inx.h:10 -#, fuzzy msgid "Source and destination of transmitting:" -msgstr "Origen y destino de la transmisión" +msgstr "Origen y destino de la transmisión:" #: ../share/extensions/web-transmit-att.inx.h:11 msgid "The first selected transmits to all others" @@ -34079,14 +33874,12 @@ msgid "Transmit Attributes" msgstr "Transmitir atributos" #: ../share/extensions/web-transmit-att.inx.h:17 -#, fuzzy msgid "When to transmit:" -msgstr "Cuándo transmitir" +msgstr "Cuándo transmitir:" #: ../share/extensions/whirl.inx.h:1 -#, fuzzy msgid "Amount of whirl:" -msgstr "Cantidad de remolino" +msgstr "Cantidad de remolino:" #: ../share/extensions/whirl.inx.h:3 msgid "Rotation is clockwise" @@ -34101,19 +33894,16 @@ msgid "Hide lines behind the sphere" msgstr "Ocultar líneas detrás de la esfera" #: ../share/extensions/wireframe_sphere.inx.h:2 -#, fuzzy msgid "Lines of latitude:" -msgstr "Líneas de latitud" +msgstr "Líneas de latitud:" #: ../share/extensions/wireframe_sphere.inx.h:3 -#, fuzzy msgid "Lines of longitude:" -msgstr "Líneas de longitud" +msgstr "Líneas de longitud:" #: ../share/extensions/wireframe_sphere.inx.h:7 -#, fuzzy msgid "Tilt (deg):" -msgstr "Inclinación [grados]" +msgstr "Inclinación (grados):" #: ../share/extensions/wireframe_sphere.inx.h:8 msgid "Wireframe Sphere" @@ -34138,6 +33928,12 @@ msgstr "Entrada de metaarchivo de windows" msgid "XAML Input" msgstr "Entrada XAML" +#~ msgid "O:%.3g" +#~ msgstr "O:%.3g" + +#~ msgid "O:.%d" +#~ msgstr "O:.%d" + #, fuzzy #~ msgid "Dark mode" #~ msgstr "Repujado oscuro" @@ -35591,120 +35387,3 @@ msgstr "Entrada XAML" #~ msgid "PLACEHOLDER, do not translate" #~ msgstr "PLACEHOLDER, do not translate" - -# display the initial welcome message in the statusbar -#~ msgid "" -#~ "<b>Welcome to Inkscape!</b> Use shape or drawing tools to create objects; " -#~ "use selector (arrow) to move or transform them." -#~ msgstr "" -#~ "<b>Bienvenido a Inkscape.</b> Utilice las herramientas de forma o mano " -#~ "alzada para crear objetos; utilice el selector (flecha) para moverlos o " -#~ "transformarlos." - -#~ msgid "" -#~ "<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a " -#~ "format (%s) that may cause data loss!</span>\n" -#~ "\n" -#~ "Do you want to save this file as an Inkscape SVG?" -#~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">Se ha guardado el archivo «%s» con " -#~ "un formato (%s) que puede causar pérdida de datos.</span>\n" -#~ "\n" -#~ "¿Desea guardar el archivo como SVG de Inkscape?" - -#~ msgid "swatches|Size" -#~ msgstr "Tamaño" - -#~ msgid "small" -#~ msgstr "pequeño" - -#~ msgid "swatchesHeight|medium" -#~ msgstr "medio" - -#~ msgid "large" -#~ msgstr "grande" - -#~ msgid "huge" -#~ msgstr "enorme" - -#~ msgid "swatches|Width" -#~ msgstr "Anchura" - -#~ msgid "swatchesWidth|medium" -#~ msgstr "medio" - -#~ msgid "wide" -#~ msgstr "ancho" - -#~ msgid "wider" -#~ msgstr "más ancho" - -#~ msgid "swatches|Wrap" -#~ msgstr "Envolver" - -#~ msgid "sliders|Link" -#~ msgstr "Conectar" - -#~ msgid "Next Path Effect Parameter" -#~ msgstr "Siguiente parámetro de efecto de trayecto" - -#~ msgid "Show next Path Effect parameter for editing" -#~ msgstr "" -#~ "Mostrar el siguiente parámetro de efecto de trayecto para su edición" - -#~ msgid "Toggle snapping on or off" -#~ msgstr "Activar o desactivar el ajuste automático" - -#~ msgid "_Print Colors Preview" -#~ msgstr "Vista _preliminar de colores de impresión" - -#~ msgid "Switch to print colors preview mode" -#~ msgstr "Cambiar al modo de previsualización de colores de impresión" - -#~ msgid "fontselector|Style" -#~ msgstr "Estilo" - -#~ msgid "select toolbar|X position" -#~ msgstr "posición X" - -#~ msgid "select toolbar|X" -#~ msgstr "X" - -#~ msgid "select toolbar|Y position" -#~ msgstr "posición Y" - -#~ msgid "select toolbar|Y" -#~ msgstr "Y" - -#~ msgid "select toolbar|Width" -#~ msgstr "Anchura" - -#~ msgid "select toolbar|W" -#~ msgstr "W" - -#~ msgid "select toolbar|Height" -#~ msgstr "Altura" - -#~ msgid "select toolbar|H" -#~ msgstr "H" - -#~ msgid "_Y" -#~ msgstr "_Y" - -#~ msgid "StrokeWidth|Width:" -#~ msgstr "Ancho de trazo:" - -#~ msgid "Task" -#~ msgstr "Tarea" - -#~ msgid "Task:" -#~ msgstr "Tarea:" - -#~ msgid "Rows" -#~ msgstr "Filas" - -#~ msgid "Radius [px]" -#~ msgstr "Radio [px]" - -#~ msgid "Rotation [deg]" -#~ msgstr "Rotación [grados]" diff --git a/po/inkscape.pot b/po/inkscape.pot index 719b243ad..b208220ca 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: 2012-12-05 23:16+0100\n" +"POT-Creation-Date: 2012-12-27 20:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -945,8 +945,8 @@ msgstr "" msgid "Black Light" msgstr "" -#: ../share/filters/filters.svg.h:1 ../src/ui/dialog/clonetiler.cpp:826 -#: ../src/ui/dialog/clonetiler.cpp:965 +#: ../share/filters/filters.svg.h:1 ../src/ui/dialog/clonetiler.cpp:832 +#: ../src/ui/dialog/clonetiler.cpp:983 #: ../src/extension/internal/bitmap/colorize.cpp:52 #: ../src/extension/internal/filter/bumps.h:101 #: ../src/extension/internal/filter/bumps.h:324 @@ -3809,11 +3809,11 @@ msgstr "" msgid "1. Pick from the drawing:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:827 +#: ../src/ui/dialog/clonetiler.cpp:833 msgid "Pick the visible color and opacity" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:834 ../src/ui/dialog/clonetiler.cpp:975 +#: ../src/ui/dialog/clonetiler.cpp:840 ../src/ui/dialog/clonetiler.cpp:993 #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/transparency.h:279 #: ../src/widgets/tweak-toolbar.cpp:353 @@ -3821,168 +3821,168 @@ msgstr "" msgid "Opacity" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:835 +#: ../src/ui/dialog/clonetiler.cpp:841 msgid "Pick the total accumulated opacity" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:842 +#: ../src/ui/dialog/clonetiler.cpp:848 msgid "R" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:843 +#: ../src/ui/dialog/clonetiler.cpp:849 msgid "Pick the Red component of the color" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:850 +#: ../src/ui/dialog/clonetiler.cpp:856 msgid "G" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:851 +#: ../src/ui/dialog/clonetiler.cpp:857 msgid "Pick the Green component of the color" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:858 +#: ../src/ui/dialog/clonetiler.cpp:864 msgid "B" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:859 +#: ../src/ui/dialog/clonetiler.cpp:865 msgid "Pick the Blue component of the color" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:866 +#: ../src/ui/dialog/clonetiler.cpp:872 msgctxt "Clonetiler color hue" msgid "H" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:867 +#: ../src/ui/dialog/clonetiler.cpp:873 msgid "Pick the hue of the color" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:874 +#: ../src/ui/dialog/clonetiler.cpp:880 msgctxt "Clonetiler color saturation" msgid "S" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:875 +#: ../src/ui/dialog/clonetiler.cpp:881 msgid "Pick the saturation of the color" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:882 +#: ../src/ui/dialog/clonetiler.cpp:888 msgctxt "Clonetiler color lightness" msgid "L" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:883 +#: ../src/ui/dialog/clonetiler.cpp:889 msgid "Pick the lightness of the color" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:893 +#: ../src/ui/dialog/clonetiler.cpp:899 msgid "2. Tweak the picked value:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:903 +#: ../src/ui/dialog/clonetiler.cpp:916 msgid "Gamma-correct:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:907 +#: ../src/ui/dialog/clonetiler.cpp:920 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:914 +#: ../src/ui/dialog/clonetiler.cpp:927 msgid "Randomize:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:918 +#: ../src/ui/dialog/clonetiler.cpp:931 msgid "Randomize the picked value by this percentage" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:925 +#: ../src/ui/dialog/clonetiler.cpp:938 msgid "Invert:" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:929 +#: ../src/ui/dialog/clonetiler.cpp:942 msgid "Invert the picked value" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:935 +#: ../src/ui/dialog/clonetiler.cpp:948 msgid "3. Apply the value to the clones':" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:945 +#: ../src/ui/dialog/clonetiler.cpp:963 msgid "Presence" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:948 +#: ../src/ui/dialog/clonetiler.cpp:966 msgid "" "Each clone is created with the probability determined by the picked value in " "that point" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:955 +#: ../src/ui/dialog/clonetiler.cpp:973 msgid "Size" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:958 +#: ../src/ui/dialog/clonetiler.cpp:976 msgid "Each clone's size is determined by the picked value in that point" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:968 +#: ../src/ui/dialog/clonetiler.cpp:986 msgid "" "Each clone is painted by the picked color (the original must have unset fill " "or stroke)" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:978 +#: ../src/ui/dialog/clonetiler.cpp:996 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1019 +#: ../src/ui/dialog/clonetiler.cpp:1044 msgid "How many rows in the tiling" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1049 +#: ../src/ui/dialog/clonetiler.cpp:1074 msgid "How many columns in the tiling" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1093 +#: ../src/ui/dialog/clonetiler.cpp:1118 msgid "Width of the rectangle to be filled" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1127 +#: ../src/ui/dialog/clonetiler.cpp:1152 msgid "Height of the rectangle to be filled" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1144 +#: ../src/ui/dialog/clonetiler.cpp:1169 msgid "Rows, columns: " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1145 +#: ../src/ui/dialog/clonetiler.cpp:1170 msgid "Create the specified number of rows and columns" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1154 +#: ../src/ui/dialog/clonetiler.cpp:1179 msgid "Width, height: " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1155 +#: ../src/ui/dialog/clonetiler.cpp:1180 msgid "Fill the specified width and height with the tiling" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1176 +#: ../src/ui/dialog/clonetiler.cpp:1201 msgid "Use saved size and position of the tile" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1179 +#: ../src/ui/dialog/clonetiler.cpp:1204 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:1213 +#: ../src/ui/dialog/clonetiler.cpp:1238 msgid " <b>_Create</b> " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1215 +#: ../src/ui/dialog/clonetiler.cpp:1240 msgid "Create and tile the clones of the selection" msgstr "" @@ -3991,93 +3991,93 @@ 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:1235 +#: ../src/ui/dialog/clonetiler.cpp:1260 msgid " _Unclump " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1236 +#: ../src/ui/dialog/clonetiler.cpp:1261 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1242 +#: ../src/ui/dialog/clonetiler.cpp:1267 msgid " Re_move " msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1243 +#: ../src/ui/dialog/clonetiler.cpp:1268 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1259 +#: ../src/ui/dialog/clonetiler.cpp:1284 msgid " R_eset " msgstr "" #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1261 +#: ../src/ui/dialog/clonetiler.cpp:1286 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1334 +#: ../src/ui/dialog/clonetiler.cpp:1359 msgid "<small>Nothing selected.</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1340 +#: ../src/ui/dialog/clonetiler.cpp:1365 msgid "<small>More than one object selected.</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1347 +#: ../src/ui/dialog/clonetiler.cpp:1372 #, c-format msgid "<small>Object has <b>%d</b> tiled clones.</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:1352 +#: ../src/ui/dialog/clonetiler.cpp:1377 msgid "<small>Object has no tiled clones.</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2072 +#: ../src/ui/dialog/clonetiler.cpp:2097 msgid "Select <b>one object</b> whose tiled clones to unclump." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2094 +#: ../src/ui/dialog/clonetiler.cpp:2119 msgid "Unclump tiled clones" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2123 +#: ../src/ui/dialog/clonetiler.cpp:2148 msgid "Select <b>one object</b> whose tiled clones to remove." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2146 +#: ../src/ui/dialog/clonetiler.cpp:2171 msgid "Delete tiled clones" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2193 ../src/selection-chemistry.cpp:2469 +#: ../src/ui/dialog/clonetiler.cpp:2218 ../src/selection-chemistry.cpp:2469 msgid "Select an <b>object</b> to clone." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2199 +#: ../src/ui/dialog/clonetiler.cpp:2224 msgid "" "If you want to clone several objects, <b>group</b> them and <b>clone the " "group</b>." msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2208 +#: ../src/ui/dialog/clonetiler.cpp:2233 msgid "<small>Creating tiled clones...</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2613 +#: ../src/ui/dialog/clonetiler.cpp:2638 msgid "Create tiled clones" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2832 +#: ../src/ui/dialog/clonetiler.cpp:2871 msgid "<small>Per row:</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2850 +#: ../src/ui/dialog/clonetiler.cpp:2889 msgid "<small>Per column:</small>" msgstr "" -#: ../src/ui/dialog/clonetiler.cpp:2858 +#: ../src/ui/dialog/clonetiler.cpp:2897 msgid "<small>Randomize:</small>" msgstr "" @@ -4172,9 +4172,9 @@ msgid "_Height:" msgstr "" #: ../src/ui/dialog/export.cpp:260 -#: ../src/ui/dialog/inkscape-preferences.cpp:1382 -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "dpi" msgstr "" @@ -4570,144 +4570,144 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:94 ../src/widgets/text-toolbar.cpp:1565 -#: ../src/widgets/text-toolbar.cpp:1566 +#: ../src/ui/dialog/text-edit.cpp:94 ../src/widgets/text-toolbar.cpp:1568 +#: ../src/widgets/text-toolbar.cpp:1569 msgid "Align left" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:95 ../src/widgets/text-toolbar.cpp:1573 -#: ../src/widgets/text-toolbar.cpp:1574 +#: ../src/ui/dialog/text-edit.cpp:95 ../src/widgets/text-toolbar.cpp:1576 +#: ../src/widgets/text-toolbar.cpp:1577 msgid "Align center" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1581 -#: ../src/widgets/text-toolbar.cpp:1582 +#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1584 +#: ../src/widgets/text-toolbar.cpp:1585 msgid "Align right" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1590 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1593 msgid "Justify (only flowed text)" msgstr "" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:101 ../src/widgets/text-toolbar.cpp:1625 +#: ../src/ui/dialog/text-edit.cpp:106 ../src/widgets/text-toolbar.cpp:1628 msgid "Horizontal text" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:102 ../src/widgets/text-toolbar.cpp:1632 +#: ../src/ui/dialog/text-edit.cpp:107 ../src/widgets/text-toolbar.cpp:1635 msgid "Vertical text" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:117 ../src/ui/dialog/text-edit.cpp:118 +#: ../src/ui/dialog/text-edit.cpp:127 ../src/ui/dialog/text-edit.cpp:128 msgid "Spacing between lines (percent of font size)" msgstr "" -#: ../src/ui/dialog/text-edit.cpp:551 ../src/text-context.cpp:1519 +#: ../src/ui/dialog/text-edit.cpp:561 ../src/text-context.cpp:1519 msgid "Set text style" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:119 +#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:123 msgid "New element node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:125 +#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:129 msgid "New text node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:139 +#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:143 msgid "nodeAsInXMLdialogTooltip|Delete node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:131 -#: ../src/ui/dialog/xml-tree.cpp:970 +#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:135 +#: ../src/ui/dialog/xml-tree.cpp:974 msgid "Duplicate node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:184 -#: ../src/ui/dialog/xml-tree.cpp:1005 +#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:188 +#: ../src/ui/dialog/xml-tree.cpp:1009 msgid "Delete attribute" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:83 +#: ../src/ui/dialog/xml-tree.cpp:87 msgid "Set" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:114 +#: ../src/ui/dialog/xml-tree.cpp:118 msgid "Drag to reorder nodes" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:145 ../src/ui/dialog/xml-tree.cpp:146 -#: ../src/ui/dialog/xml-tree.cpp:1126 +#: ../src/ui/dialog/xml-tree.cpp:149 ../src/ui/dialog/xml-tree.cpp:150 +#: ../src/ui/dialog/xml-tree.cpp:1130 msgid "Unindent node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:150 ../src/ui/dialog/xml-tree.cpp:151 -#: ../src/ui/dialog/xml-tree.cpp:1104 +#: ../src/ui/dialog/xml-tree.cpp:154 ../src/ui/dialog/xml-tree.cpp:155 +#: ../src/ui/dialog/xml-tree.cpp:1108 msgid "Indent node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:155 ../src/ui/dialog/xml-tree.cpp:156 -#: ../src/ui/dialog/xml-tree.cpp:1055 +#: ../src/ui/dialog/xml-tree.cpp:159 ../src/ui/dialog/xml-tree.cpp:160 +#: ../src/ui/dialog/xml-tree.cpp:1059 msgid "Raise node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:160 ../src/ui/dialog/xml-tree.cpp:161 -#: ../src/ui/dialog/xml-tree.cpp:1073 +#: ../src/ui/dialog/xml-tree.cpp:164 ../src/ui/dialog/xml-tree.cpp:165 +#: ../src/ui/dialog/xml-tree.cpp:1077 msgid "Lower node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:201 +#: ../src/ui/dialog/xml-tree.cpp:205 msgid "Attribute name" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:216 +#: ../src/ui/dialog/xml-tree.cpp:220 msgid "Attribute value" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:304 +#: ../src/ui/dialog/xml-tree.cpp:308 msgid "<b>Click</b> to select nodes, <b>drag</b> to rearrange." msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:315 +#: ../src/ui/dialog/xml-tree.cpp:319 msgid "<b>Click</b> attribute to edit." msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:319 +#: ../src/ui/dialog/xml-tree.cpp:323 #, c-format msgid "" "Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to " "commit changes." msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:559 +#: ../src/ui/dialog/xml-tree.cpp:563 msgid "Drag XML subtree" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:861 +#: ../src/ui/dialog/xml-tree.cpp:865 msgid "New element node..." msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:899 +#: ../src/ui/dialog/xml-tree.cpp:903 msgid "Cancel" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:905 +#: ../src/ui/dialog/xml-tree.cpp:909 msgid "Create" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:936 +#: ../src/ui/dialog/xml-tree.cpp:940 msgid "Create new element node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:952 +#: ../src/ui/dialog/xml-tree.cpp:956 msgid "Create new text node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:986 +#: ../src/ui/dialog/xml-tree.cpp:990 msgid "nodeAsInXMLinHistoryDialog|Delete node" msgstr "" -#: ../src/ui/dialog/xml-tree.cpp:1029 +#: ../src/ui/dialog/xml-tree.cpp:1033 msgid "Change attribute" msgstr "" @@ -5173,8 +5173,8 @@ msgstr "" msgid "Draw eraser stroke" msgstr "" -#: ../src/event-context.cpp:678 -msgid "<b>Space+mouse drag</b> to pan canvas" +#: ../src/event-context.cpp:694 +msgid "<b>Space+mouse move</b> to pan canvas" msgstr "" #: ../src/event-log.cpp:37 @@ -5423,8 +5423,8 @@ msgstr "" #: ../src/extension/internal/filter/color.h:1502 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:241 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2467 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2472 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2551 #: ../src/ui/dialog/object-attributes.cpp:48 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5474,7 +5474,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:2524 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2529 msgid "Radius:" msgstr "" @@ -5784,7 +5784,7 @@ msgstr "" #: ../src/extension/internal/bitmap/opacity.cpp:40 #: ../src/extension/internal/filter/blurs.h:333 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2514 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2519 #: ../src/widgets/dropper-toolbar.cpp:112 msgid "Opacity:" msgstr "" @@ -6285,7 +6285,7 @@ msgstr "" #: ../src/extension/internal/filter/color.h:1511 #: ../src/extension/internal/filter/paint.h:704 #: ../src/extension/internal/filter/transparency.h:62 -#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:365 +#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:374 msgid "Screen" msgstr "" @@ -6779,47 +6779,47 @@ msgid "Extract Channel" msgstr "" #: ../src/extension/internal/filter/color.h:636 ../src/filter-enums.cpp:100 -#: ../src/flood-context.cpp:246 ../src/widgets/sp-color-icc-selector.cpp:230 -#: ../src/widgets/sp-color-scales.cpp:432 -#: ../src/widgets/sp-color-scales.cpp:433 +#: ../src/flood-context.cpp:252 ../src/widgets/sp-color-icc-selector.cpp:227 +#: ../src/widgets/sp-color-scales.cpp:429 +#: ../src/widgets/sp-color-scales.cpp:430 msgid "Red" msgstr "" #: ../src/extension/internal/filter/color.h:637 ../src/filter-enums.cpp:101 -#: ../src/flood-context.cpp:247 ../src/widgets/sp-color-icc-selector.cpp:230 -#: ../src/widgets/sp-color-scales.cpp:435 -#: ../src/widgets/sp-color-scales.cpp:436 +#: ../src/flood-context.cpp:253 ../src/widgets/sp-color-icc-selector.cpp:227 +#: ../src/widgets/sp-color-scales.cpp:432 +#: ../src/widgets/sp-color-scales.cpp:433 msgid "Green" msgstr "" #: ../src/extension/internal/filter/color.h:638 ../src/filter-enums.cpp:102 -#: ../src/flood-context.cpp:248 ../src/widgets/sp-color-icc-selector.cpp:230 -#: ../src/widgets/sp-color-scales.cpp:438 -#: ../src/widgets/sp-color-scales.cpp:439 +#: ../src/flood-context.cpp:254 ../src/widgets/sp-color-icc-selector.cpp:227 +#: ../src/widgets/sp-color-scales.cpp:435 +#: ../src/widgets/sp-color-scales.cpp:436 msgid "Blue" msgstr "" #: ../src/extension/internal/filter/color.h:639 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-icc-selector.cpp:235 -#: ../src/widgets/sp-color-scales.cpp:486 -#: ../src/widgets/sp-color-scales.cpp:487 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:232 +#: ../src/widgets/sp-color-scales.cpp:483 +#: ../src/widgets/sp-color-scales.cpp:484 msgid "Cyan" msgstr "" #: ../src/extension/internal/filter/color.h:640 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-icc-selector.cpp:235 -#: ../src/widgets/sp-color-scales.cpp:489 -#: ../src/widgets/sp-color-scales.cpp:490 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:232 +#: ../src/widgets/sp-color-scales.cpp:486 +#: ../src/widgets/sp-color-scales.cpp:487 msgid "Magenta" msgstr "" #: ../src/extension/internal/filter/color.h:641 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-icc-selector.cpp:235 -#: ../src/widgets/sp-color-scales.cpp:492 -#: ../src/widgets/sp-color-scales.cpp:493 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:232 +#: ../src/widgets/sp-color-scales.cpp:489 +#: ../src/widgets/sp-color-scales.cpp:490 msgid "Yellow" msgstr "" @@ -6852,9 +6852,9 @@ msgstr "" #: ../src/extension/internal/filter/color.h:743 #: ../src/ui/widget/selected-style.cpp:246 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-scales.cpp:495 -#: ../src/widgets/sp-color-scales.cpp:496 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-scales.cpp:492 +#: ../src/widgets/sp-color-scales.cpp:493 msgid "Black" msgstr "" @@ -6963,7 +6963,7 @@ msgstr "" #: ../src/extension/internal/filter/color.h:1206 #: ../src/ui/dialog/object-attributes.cpp:65 #: ../src/ui/dialog/object-attributes.cpp:73 ../src/ui/dialog/tile.cpp:615 -#: ../src/widgets/desktop-widget.cpp:671 ../src/widgets/node-toolbar.cpp:591 +#: ../src/widgets/desktop-widget.cpp:648 ../src/widgets/node-toolbar.cpp:591 msgid "X:" msgstr "" @@ -6972,7 +6972,7 @@ msgstr "" #: ../src/extension/internal/filter/color.h:1207 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:74 ../src/ui/dialog/tile.cpp:616 -#: ../src/widgets/desktop-widget.cpp:681 ../src/widgets/node-toolbar.cpp:609 +#: ../src/widgets/desktop-widget.cpp:658 ../src/widgets/node-toolbar.cpp:609 msgid "Y:" msgstr "" @@ -7286,7 +7286,7 @@ msgid "XOR" msgstr "" #: ../src/extension/internal/filter/morphology.h:179 -#: ../src/ui/dialog/layer-properties.cpp:168 +#: ../src/ui/dialog/layer-properties.cpp:185 msgid "Position:" msgstr "" @@ -7448,7 +7448,7 @@ msgstr "" #: ../src/extension/internal/filter/paint.h:332 #: ../src/ui/dialog/align-and-distribute.cpp:1048 -#: ../src/widgets/desktop-widget.cpp:1947 +#: ../src/widgets/desktop-widget.cpp:1903 msgid "Drawing" msgstr "" @@ -7738,7 +7738,7 @@ msgid "Source:" msgstr "" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2464 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2469 #: ../src/widgets/erasor-toolbar.cpp:129 ../src/widgets/pencil-toolbar.cpp:162 #: ../src/widgets/spray-toolbar.cpp:203 ../src/widgets/tweak-toolbar.cpp:273 #: ../share/extensions/extrude.inx.h:2 ../share/extensions/triangle.inx.h:8 @@ -7857,7 +7857,7 @@ msgstr "" #: ../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:37 ../share/extensions/gears.inx.h:11 +#: ../share/extensions/funcplot.inx.h:38 ../share/extensions/gears.inx.h:11 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 @@ -8143,11 +8143,11 @@ msgstr "" msgid "Vector graphics format used by Corel WordPerfect" msgstr "" -#: ../src/extension/prefdialog.cpp:249 +#: ../src/extension/prefdialog.cpp:254 msgid "Live preview" msgstr "" -#: ../src/extension/prefdialog.cpp:249 +#: ../src/extension/prefdialog.cpp:254 msgid "Is the effect previewed live on canvas?" msgstr "" @@ -8263,7 +8263,7 @@ msgstr "" msgid "Saving document..." msgstr "" -#: ../src/file.cpp:1219 ../src/ui/dialog/ocaldialogs.cpp:1207 +#: ../src/file.cpp:1219 ../src/ui/dialog/ocaldialogs.cpp:1225 msgid "Import" msgstr "" @@ -8383,12 +8383,12 @@ msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:490 #: ../src/ui/dialog/inkscape-preferences.cpp:331 #: ../src/ui/dialog/inkscape-preferences.cpp:622 -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 -#: ../src/ui/dialog/inkscape-preferences.cpp:1745 -#: ../src/ui/dialog/input.cpp:612 ../src/ui/dialog/input.cpp:613 -#: ../src/ui/dialog/input.cpp:1282 ../src/verbs.cpp:2300 -#: ../src/widgets/gradient-toolbar.cpp:1128 +#: ../src/ui/dialog/inkscape-preferences.cpp:1214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1752 +#: ../src/ui/dialog/input.cpp:693 ../src/ui/dialog/input.cpp:694 +#: ../src/ui/dialog/input.cpp:1485 ../src/ui/dialog/input.cpp:1539 +#: ../src/verbs.cpp:2300 ../src/widgets/gradient-toolbar.cpp:1128 #: ../src/widgets/pencil-toolbar.cpp:190 #: ../share/extensions/gcodetools_area.inx.h:48 #: ../share/extensions/gcodetools_dxf_points.inx.h:19 @@ -8402,7 +8402,7 @@ msgstr "" msgid "None" msgstr "" -#: ../src/filter-enums.cpp:103 ../src/flood-context.cpp:252 +#: ../src/filter-enums.cpp:103 ../src/flood-context.cpp:258 msgid "Alpha" msgstr "" @@ -8430,59 +8430,59 @@ msgstr "" msgid "Spot Light" msgstr "" -#: ../src/flood-context.cpp:245 +#: ../src/flood-context.cpp:251 msgid "Visible Colors" msgstr "" -#: ../src/flood-context.cpp:249 ../src/widgets/sp-color-icc-selector.cpp:232 -#: ../src/widgets/sp-color-icc-selector.cpp:233 -#: ../src/widgets/sp-color-scales.cpp:458 -#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:305 +#: ../src/flood-context.cpp:255 ../src/widgets/sp-color-icc-selector.cpp:229 +#: ../src/widgets/sp-color-icc-selector.cpp:230 +#: ../src/widgets/sp-color-scales.cpp:455 +#: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:305 #: ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "" -#: ../src/flood-context.cpp:250 ../src/ui/dialog/inkscape-preferences.cpp:902 -#: ../src/widgets/sp-color-icc-selector.cpp:232 -#: ../src/widgets/sp-color-icc-selector.cpp:233 -#: ../src/widgets/sp-color-scales.cpp:461 -#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:321 +#: ../src/flood-context.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/widgets/sp-color-icc-selector.cpp:229 +#: ../src/widgets/sp-color-icc-selector.cpp:230 +#: ../src/widgets/sp-color-scales.cpp:458 +#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:321 #: ../share/extensions/color_randomize.inx.h:4 msgid "Saturation" msgstr "" -#: ../src/flood-context.cpp:251 ../src/widgets/sp-color-icc-selector.cpp:233 -#: ../src/widgets/sp-color-scales.cpp:464 -#: ../src/widgets/sp-color-scales.cpp:465 ../src/widgets/tweak-toolbar.cpp:337 +#: ../src/flood-context.cpp:257 ../src/widgets/sp-color-icc-selector.cpp:230 +#: ../src/widgets/sp-color-scales.cpp:461 +#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:337 #: ../share/extensions/color_randomize.inx.h:5 msgid "Lightness" msgstr "" -#: ../src/flood-context.cpp:263 +#: ../src/flood-context.cpp:269 msgctxt "Flood autogap" msgid "None" msgstr "" -#: ../src/flood-context.cpp:264 +#: ../src/flood-context.cpp:270 msgctxt "Flood autogap" msgid "Small" msgstr "" -#: ../src/flood-context.cpp:265 +#: ../src/flood-context.cpp:271 msgctxt "Flood autogap" msgid "Medium" msgstr "" -#: ../src/flood-context.cpp:266 +#: ../src/flood-context.cpp:272 msgctxt "Flood autogap" msgid "Large" msgstr "" -#: ../src/flood-context.cpp:486 +#: ../src/flood-context.cpp:494 msgid "<b>Too much inset</b>, the result is empty." msgstr "" -#: ../src/flood-context.cpp:527 +#: ../src/flood-context.cpp:535 #, c-format msgid "" "Area filled, path with <b>%d</b> node created and unioned with selection." @@ -8491,32 +8491,32 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../src/flood-context.cpp:533 +#: ../src/flood-context.cpp:541 #, c-format msgid "Area filled, path with <b>%d</b> node created." msgid_plural "Area filled, path with <b>%d</b> nodes created." msgstr[0] "" msgstr[1] "" -#: ../src/flood-context.cpp:801 ../src/flood-context.cpp:1100 +#: ../src/flood-context.cpp:809 ../src/flood-context.cpp:1119 msgid "<b>Area is not bounded</b>, cannot fill." msgstr "" -#: ../src/flood-context.cpp:1105 +#: ../src/flood-context.cpp:1124 msgid "" "<b>Only the visible part of the bounded area was filled.</b> If you want to " "fill all of the area, undo, zoom out, and fill again." msgstr "" -#: ../src/flood-context.cpp:1123 ../src/flood-context.cpp:1282 +#: ../src/flood-context.cpp:1142 ../src/flood-context.cpp:1301 msgid "Fill bounded area" msgstr "" -#: ../src/flood-context.cpp:1142 +#: ../src/flood-context.cpp:1161 msgid "Set style on object" msgstr "" -#: ../src/flood-context.cpp:1201 +#: ../src/flood-context.cpp:1220 msgid "<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill" msgstr "" @@ -8702,15 +8702,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../src/gradient-drag.cpp:2358 +#: ../src/gradient-drag.cpp:2369 msgid "Move gradient handle(s)" msgstr "" -#: ../src/gradient-drag.cpp:2394 +#: ../src/gradient-drag.cpp:2405 msgid "Move gradient mid stop(s)" msgstr "" -#: ../src/gradient-drag.cpp:2683 +#: ../src/gradient-drag.cpp:2694 msgid "Delete gradient stop(s)" msgstr "" @@ -8776,7 +8776,7 @@ msgstr "" msgid "Percent" msgstr "" -#: ../src/helper/units.cpp:42 ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/helper/units.cpp:42 ../src/ui/dialog/inkscape-preferences.cpp:1224 msgid "%" msgstr "" @@ -9218,7 +9218,7 @@ msgid "Dockitem which 'owns' this grip" msgstr "" #. Name -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/text-toolbar.cpp:1637 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/text-toolbar.cpp:1640 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:1 msgid "Orientation" @@ -9350,7 +9350,7 @@ msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:1047 #: ../src/ui/dialog/document-properties.cpp:144 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1546 -#: ../src/widgets/desktop-widget.cpp:1943 +#: ../src/widgets/desktop-widget.cpp:1899 #: ../share/extensions/voronoi2svg.inx.h:9 msgid "Page" msgstr "" @@ -9360,7 +9360,7 @@ msgid "The index of the current page" msgstr "" #: ../src/libgdl/gdl-dock-object.c:125 -#: ../src/ui/dialog/inkscape-preferences.cpp:1429 +#: ../src/ui/dialog/inkscape-preferences.cpp:1431 #: ../src/ui/widget/page-sizer.cpp:260 #: ../src/widgets/gradient-selector.cpp:156 #: ../src/widgets/sp-xmlview-attr-list.cpp:54 @@ -9571,7 +9571,7 @@ msgstr "" msgid "Dock #%d" msgstr "" -#: ../src/libnrtype/FontFactory.cpp:910 +#: ../src/libnrtype/FontFactory.cpp:903 msgid "Ignoring font without family that will crash Pango" msgstr "" @@ -10207,7 +10207,7 @@ msgstr "" #. 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:186 +#: ../src/widgets/stroke-style.cpp:193 msgid "Join:" msgstr "" @@ -10220,7 +10220,7 @@ msgid "Miter limit:" msgstr "" #: ../src/live_effects/lpe-powerstroke.cpp:239 -#: ../src/widgets/stroke-style.cpp:234 +#: ../src/widgets/stroke-style.cpp:241 msgid "Maximum length of the miter (in units of stroke width)" msgstr "" @@ -10583,7 +10583,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2508 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2513 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "" @@ -10839,7 +10839,7 @@ msgid "The ID of the object to export" msgstr "" #: ../src/main.cpp:335 ../src/main.cpp:433 -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#: ../src/ui/dialog/inkscape-preferences.cpp:1434 msgid "ID" msgstr "" @@ -11525,7 +11525,7 @@ msgstr "" msgid "Unique URI to a related document" msgstr "" -#: ../src/rdf.cpp:264 ../src/ui/dialog/inkscape-preferences.cpp:1765 +#: ../src/rdf.cpp:264 ../src/ui/dialog/inkscape-preferences.cpp:1772 msgid "Language:" msgstr "" @@ -11854,7 +11854,7 @@ msgstr "" msgid "Rotate 90° CW" msgstr "" -#: ../src/selection-chemistry.cpp:1690 ../src/seltrans.cpp:479 +#: ../src/selection-chemistry.cpp:1690 ../src/seltrans.cpp:471 #: ../src/ui/dialog/transformation.cpp:800 msgid "Rotate" msgstr "" @@ -11863,7 +11863,7 @@ msgstr "" msgid "Rotate by pixels" msgstr "" -#: ../src/selection-chemistry.cpp:2099 ../src/seltrans.cpp:476 +#: ../src/selection-chemistry.cpp:2099 ../src/seltrans.cpp:468 #: ../src/ui/dialog/transformation.cpp:775 #: ../share/extensions/interp_att_g.inx.h:12 msgid "Scale" @@ -11882,7 +11882,7 @@ msgid "Move horizontally" msgstr "" #: ../src/selection-chemistry.cpp:2145 ../src/selection-chemistry.cpp:2171 -#: ../src/seltrans.cpp:473 ../src/ui/dialog/transformation.cpp:714 +#: ../src/seltrans.cpp:465 ../src/ui/dialog/transformation.cpp:714 msgid "Move" msgstr "" @@ -12269,77 +12269,77 @@ msgid_plural "; <i>%d filtered objects</i> " msgstr[0] "" msgstr[1] "" -#: ../src/seltrans.cpp:482 ../src/ui/dialog/transformation.cpp:858 +#: ../src/seltrans.cpp:474 ../src/ui/dialog/transformation.cpp:858 msgid "Skew" msgstr "" -#: ../src/seltrans.cpp:494 +#: ../src/seltrans.cpp:486 msgid "Set center" msgstr "" -#: ../src/seltrans.cpp:569 +#: ../src/seltrans.cpp:561 msgid "Stamp" msgstr "" -#: ../src/seltrans.cpp:598 +#: ../src/seltrans.cpp:590 msgid "" "<b>Squeeze or stretch</b> selection; with <b>Ctrl</b> to scale uniformly; " "with <b>Shift</b> to scale around rotation center" msgstr "" -#: ../src/seltrans.cpp:599 +#: ../src/seltrans.cpp:591 msgid "" "<b>Scale</b> selection; with <b>Ctrl</b> to scale uniformly; with <b>Shift</" "b> to scale around rotation center" msgstr "" -#: ../src/seltrans.cpp:603 +#: ../src/seltrans.cpp:595 msgid "" "<b>Skew</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> to " "skew around the opposite side" msgstr "" -#: ../src/seltrans.cpp:604 +#: ../src/seltrans.cpp:596 msgid "" "<b>Rotate</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> " "to rotate around the opposite corner" msgstr "" -#: ../src/seltrans.cpp:617 +#: ../src/seltrans.cpp:609 msgid "" "<b>Center</b> of rotation and skewing: drag to reposition; scaling with " "Shift also uses this center" msgstr "" -#: ../src/seltrans.cpp:767 +#: ../src/seltrans.cpp:759 msgid "Reset center" msgstr "" -#: ../src/seltrans.cpp:1004 ../src/seltrans.cpp:1101 +#: ../src/seltrans.cpp:996 ../src/seltrans.cpp:1093 #, c-format msgid "<b>Scale</b>: %0.2f%% x %0.2f%%; with <b>Ctrl</b> to lock ratio" msgstr "" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1215 +#: ../src/seltrans.cpp:1207 #, c-format msgid "<b>Skew</b>: %0.2f°; with <b>Ctrl</b> to snap angle" msgstr "" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1290 +#: ../src/seltrans.cpp:1282 #, c-format msgid "<b>Rotate</b>: %0.2f°; with <b>Ctrl</b> to snap angle" msgstr "" -#: ../src/seltrans.cpp:1325 +#: ../src/seltrans.cpp:1317 #, c-format msgid "Move <b>center</b> to %s, %s" msgstr "" -#: ../src/seltrans.cpp:1501 +#: ../src/seltrans.cpp:1493 #, c-format msgid "" "<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; " @@ -13612,7 +13612,7 @@ msgstr "" #: ../src/ui/dialog/align-and-distribute.cpp:1049 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1550 ../src/verbs.cpp:174 -#: ../src/widgets/desktop-widget.cpp:1951 +#: ../src/widgets/desktop-widget.cpp:1907 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "" @@ -13680,22 +13680,22 @@ msgstr "" msgid "Release log messages" msgstr "" -#: ../src/ui/dialog/document-metadata.cpp:71 +#: ../src/ui/dialog/document-metadata.cpp:88 #: ../src/ui/dialog/document-properties.cpp:150 msgid "Metadata" msgstr "" -#: ../src/ui/dialog/document-metadata.cpp:72 +#: ../src/ui/dialog/document-metadata.cpp:89 #: ../src/ui/dialog/document-properties.cpp:151 msgid "License" msgstr "" -#: ../src/ui/dialog/document-metadata.cpp:153 +#: ../src/ui/dialog/document-metadata.cpp:126 #: ../src/ui/dialog/document-properties.cpp:763 msgid "<b>Dublin Core Entities</b>" msgstr "" -#: ../src/ui/dialog/document-metadata.cpp:175 +#: ../src/ui/dialog/document-metadata.cpp:168 #: ../src/ui/dialog/document-properties.cpp:799 msgid "<b>License</b>" msgstr "" @@ -13731,7 +13731,8 @@ msgstr "" #: ../src/ui/dialog/document-properties.cpp:106 msgid "" -"Color and transparency of the page background (also used for bitmap export)" +"Color of the page background. Note: transparency setting ignored while " +"editing but used when exporting to bitmap." msgstr "" #: ../src/ui/dialog/document-properties.cpp:107 @@ -14470,43 +14471,43 @@ msgstr "" msgid "No filter selected" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2403 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2408 msgid "Effect parameters" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2404 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2409 msgid "Filter General Settings" msgstr "" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2460 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2465 msgid "Coordinates:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2460 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2465 msgid "X coordinate of the left corners of filter effects region" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2460 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2465 msgid "Y coordinate of the upper corners of filter effects region" msgstr "" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2461 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2466 msgid "Dimensions:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2461 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2466 msgid "Width of filter effects region" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2461 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2466 msgid "Height of filter effects region" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2467 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2472 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 " @@ -14514,78 +14515,78 @@ msgid "" "performed without specifying a complete matrix." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2468 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2473 msgid "Value(s):" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2483 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2523 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2488 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2528 msgid "Operator:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2484 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2489 msgid "K1:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2484 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2485 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2486 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2487 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2489 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2490 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2491 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2492 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:2485 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2490 msgid "K2:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2486 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2491 msgid "K3:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2487 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2492 msgid "K4:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2490 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2495 msgid "Size:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2490 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2495 msgid "width of the convolve matrix" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2490 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2495 msgid "height of the convolve matrix" msgstr "" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2491 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2496 #: ../src/ui/dialog/object-attributes.cpp:47 msgid "Target:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2491 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2496 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:2491 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2496 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:2493 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2498 msgid "Kernel:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2493 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2498 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 " @@ -14595,11 +14596,11 @@ msgid "" "would lead to a common blur effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2495 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2500 msgid "Divisor:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2495 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2500 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 " @@ -14607,189 +14608,189 @@ msgid "" "effect on the overall color intensity of the result." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2496 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 msgid "Bias:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2496 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 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:2497 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2502 msgid "Edge Mode:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2497 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2502 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:2498 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2503 msgid "Preserve Alpha" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2498 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2503 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2506 msgid "Diffuse Color:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2534 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2506 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2539 msgid "Defines the color of the light source" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2502 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2535 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2507 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2540 msgid "Surface Scale:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2502 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2535 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2507 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2540 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2503 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2536 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2508 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 msgid "Constant:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2503 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2536 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2508 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 msgid "This constant affects the Phong lighting model." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2504 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2538 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2509 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2543 msgid "Kernel Unit Length:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2508 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2513 msgid "This defines the intensity of the displacement effect." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2509 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2514 msgid "X displacement:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2509 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2514 msgid "Color component that controls the displacement in the X direction" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2510 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2515 msgid "Y displacement:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2510 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2515 msgid "Color component that controls the displacement in the Y direction" msgstr "" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2513 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2518 msgid "Flood Color:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2513 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2518 msgid "The whole filter region will be filled with this color." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2517 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2522 msgid "Standard Deviation:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2517 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2522 msgid "The standard deviation for the blur operation." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2523 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2528 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2527 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2532 msgid "Source of Image:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2530 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2535 msgid "Delta X:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2530 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2535 msgid "This is how far the input image gets shifted to the right" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2531 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2536 msgid "Delta Y:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2531 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2536 msgid "This is how far the input image gets shifted downwards" msgstr "" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2534 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2539 msgid "Specular Color:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2537 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2542 #: ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2537 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2542 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2551 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2547 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2552 msgid "Base Frequency:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2548 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2553 msgid "Octaves:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2549 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2554 msgid "Seed:" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2549 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2554 msgid "The starting number for the pseudo random number generator." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2561 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2566 msgid "Add filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2578 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2583 msgid "" "The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2582 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2587 msgid "" "The <b>feColorMatrix</b> 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:2586 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2591 msgid "" "The <b>feComponentTransfer</b> filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " @@ -14797,7 +14798,7 @@ msgid "" "adjustment, color balance, and thresholding." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2590 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2595 msgid "" "The <b>feComposite</b> filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -14805,7 +14806,7 @@ msgid "" "between the corresponding pixel values of the images." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2594 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2599 msgid "" "The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -14814,7 +14815,7 @@ msgid "" "is faster and resolution-independent." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2598 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2603 msgid "" "The <b>feDiffuseLighting</b> and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -14822,7 +14823,7 @@ msgid "" "opacity areas recede away from the viewer." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2602 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2607 msgid "" "The <b>feDisplacementMap</b> filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -14830,26 +14831,26 @@ msgid "" "effects." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2606 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2611 msgid "" "The <b>feFlood</b> 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:2610 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2615 msgid "" "The <b>feGaussianBlur</b> 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:2614 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2619 msgid "" "The <b>feImage</b> filter primitive fills the region with an external image " "or another part of the document." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2618 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2623 msgid "" "The <b>feMerge</b> filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -14857,21 +14858,21 @@ msgid "" "in 'normal' mode or several feComposite primitives in 'over' mode." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2622 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2627 msgid "" "The <b>feMorphology</b> 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:2626 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2631 msgid "" "The <b>feOffset</b> 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:2630 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2635 msgid "" "The feDiffuseLighting and <b>feSpecularLighting</b> filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -14879,23 +14880,23 @@ msgid "" "opacity areas recede away from the viewer." msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2634 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2639 msgid "" "The <b>feTile</b> filter primitive tiles a region with its input graphic" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2638 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2643 msgid "" "The <b>feTurbulence</b> 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:2657 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2662 msgid "Duplicate filter primitive" msgstr "" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2710 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2715 msgid "Set filter primitive attribute" msgstr "" @@ -15809,9 +15810,9 @@ msgstr "" msgid "_X:" msgstr "" -#: ../src/ui/dialog/guides.cpp:49 ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-icc-selector.cpp:221 -#: ../src/widgets/sp-color-scales.cpp:491 +#: ../src/ui/dialog/guides.cpp:49 ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-icc-selector.cpp:218 +#: ../src/widgets/sp-color-scales.cpp:488 msgid "_Y:" msgstr "" @@ -15835,12 +15836,12 @@ msgstr "" msgid "Guideline" msgstr "" -#: ../src/ui/dialog/guides.cpp:261 +#: ../src/ui/dialog/guides.cpp:317 #, c-format msgid "Guideline ID: %s" msgstr "" -#: ../src/ui/dialog/guides.cpp:267 +#: ../src/ui/dialog/guides.cpp:323 #, c-format msgid "Current: %s" msgstr "" @@ -16179,7 +16180,7 @@ msgstr "" #. Zoom #: ../src/ui/dialog/inkscape-preferences.cpp:375 -#: ../src/widgets/desktop-widget.cpp:636 +#: ../src/widgets/desktop-widget.cpp:613 msgid "Zoom" msgstr "" @@ -16217,7 +16218,7 @@ msgstr "" #. Pen #: ../src/ui/dialog/inkscape-preferences.cpp:423 -#: ../src/ui/dialog/input.cpp:1197 +#: ../src/ui/dialog/input.cpp:1399 msgid "Pen" msgstr "" @@ -17358,8 +17359,8 @@ msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:989 -#: ../src/widgets/sp-color-icc-selector.cpp:327 -#: ../src/widgets/sp-color-icc-selector.cpp:680 +#: ../src/widgets/sp-color-icc-selector.cpp:324 +#: ../src/widgets/sp-color-icc-selector.cpp:677 msgid "<none>" msgstr "" @@ -17476,7 +17477,7 @@ msgid "Color custom markers the same color as object" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1089 -#: ../src/ui/dialog/inkscape-preferences.cpp:1298 +#: ../src/ui/dialog/inkscape-preferences.cpp:1300 msgid "Update marker color when object color changes" msgstr "" @@ -17678,222 +17679,216 @@ msgid "" "autoscroll; positive is outside the canvas, negative is within the canvas" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 -msgid "Left mouse button pans when Space is pressed" -msgstr "" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1167 -msgid "" -"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 "" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1168 +#. +#. _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:1170 msgid "Mouse wheel zooms by default" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1170 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 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:1171 +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "Scrolling" msgstr "" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1174 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "Enable snap indicator" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1178 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1179 +#: ../src/ui/dialog/inkscape-preferences.cpp:1181 msgid "_Delay (in ms):" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1180 +#: ../src/ui/dialog/inkscape-preferences.cpp:1182 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:1182 +#: ../src/ui/dialog/inkscape-preferences.cpp:1184 msgid "Only snap the node closest to the pointer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "_Weight factor:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1188 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 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:1190 +#: ../src/ui/dialog/inkscape-preferences.cpp:1192 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1192 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 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:1194 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Snapping" msgstr "" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1201 msgid "_Arrow keys move by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1200 +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 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:1203 +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 msgid "> and < _scale by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1204 +#: ../src/ui/dialog/inkscape-preferences.cpp:1206 msgid "Pressing > or < scales selection up or down by this increment" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1206 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "_Inset/Outset by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1207 +#: ../src/ui/dialog/inkscape-preferences.cpp:1209 msgid "Inset and Outset commands displace the path by this distance" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "Compass-like display of angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1210 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 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:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "_Rotation snaps every:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1216 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "degrees" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1218 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Relative snapping of guideline angles" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/ui/dialog/inkscape-preferences.cpp:1224 msgid "_Zoom in/out by:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1223 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Steps" msgstr "" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1227 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Move in parallel" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1231 msgid "Stay unmoved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 msgid "Move according to transform" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 msgid "Are unlinked" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 msgid "Are deleted" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +#: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "Moving original: clones and linked offsets" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1242 msgid "Clones are translated by the same vector as their original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1242 +#: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "Clones preserve their positions when their original is moved" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1244 +#: ../src/ui/dialog/inkscape-preferences.cpp:1246 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:1245 +#: ../src/ui/dialog/inkscape-preferences.cpp:1247 msgid "Deleting original: clones" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1247 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 msgid "Orphaned clones are converted to regular objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "Orphaned clones are deleted along with their original" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 msgid "Duplicating original+clones/linked offset" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "Relink duplicated clones" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -17901,112 +17896,112 @@ msgid "" msgstr "" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1260 msgid "Clones" msgstr "" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1261 +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1263 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1264 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Remove clippath/mask object after applying" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1270 msgid "Before applying" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1270 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Do not group clipped/masked objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1271 +#: ../src/ui/dialog/inkscape-preferences.cpp:1273 msgid "Enclose every clipped/masked object in its own group" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1272 +#: ../src/ui/dialog/inkscape-preferences.cpp:1274 msgid "Put all clipped/masked objects into one group" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1275 +#: ../src/ui/dialog/inkscape-preferences.cpp:1277 msgid "Apply clippath/mask to every object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1278 +#: ../src/ui/dialog/inkscape-preferences.cpp:1280 msgid "Apply clippath/mask to groups containing single object" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1281 +#: ../src/ui/dialog/inkscape-preferences.cpp:1283 msgid "Apply clippath/mask to group containing all objects" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "After releasing" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1285 +#: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "Ungroup automatically created groups" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1287 +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Ungroup groups created when setting clip/mask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1289 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "Clippaths and masks" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1292 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "Stroke Style Markers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 #: ../src/ui/dialog/inkscape-preferences.cpp:1296 +#: ../src/ui/dialog/inkscape-preferences.cpp:1298 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1300 +#: ../src/ui/dialog/inkscape-preferences.cpp:1302 msgid "Markers" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1308 +#: ../src/ui/dialog/inkscape-preferences.cpp:1310 msgid "Number of _Threads:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1308 -#: ../src/ui/dialog/inkscape-preferences.cpp:1804 +#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1811 msgid "(requires restart)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1309 +#: ../src/ui/dialog/inkscape-preferences.cpp:1311 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgid "Rendering _cache size:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 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" @@ -18014,357 +18009,358 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1316 -#: ../src/ui/dialog/inkscape-preferences.cpp:1340 -msgid "Best quality (slowest)" -msgstr "" - #: ../src/ui/dialog/inkscape-preferences.cpp:1318 #: ../src/ui/dialog/inkscape-preferences.cpp:1342 -msgid "Better quality (slower)" +msgid "Best quality (slowest)" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1320 #: ../src/ui/dialog/inkscape-preferences.cpp:1344 -msgid "Average quality" +msgid "Better quality (slower)" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1322 #: ../src/ui/dialog/inkscape-preferences.cpp:1346 -msgid "Lower quality (faster)" +msgid "Average quality" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1324 #: ../src/ui/dialog/inkscape-preferences.cpp:1348 -msgid "Lowest quality (fastest)" +msgid "Lower quality (faster)" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1327 -msgid "Gaussian blur quality for display" +#: ../src/ui/dialog/inkscape-preferences.cpp:1326 +#: ../src/ui/dialog/inkscape-preferences.cpp:1350 +msgid "Lowest quality (fastest)" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1329 -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 -msgid "" -"Best quality, but display may be very slow at high zooms (bitmap export " -"always uses best quality)" +msgid "Gaussian blur quality for display" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1331 #: ../src/ui/dialog/inkscape-preferences.cpp:1355 -msgid "Better quality, but slower display" +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:1333 #: ../src/ui/dialog/inkscape-preferences.cpp:1357 -msgid "Average quality, acceptable display speed" +msgid "Better quality, but slower display" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1335 #: ../src/ui/dialog/inkscape-preferences.cpp:1359 -msgid "Lower quality (some artifacts), but display is faster" +msgid "Average quality, acceptable display speed" msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1337 #: ../src/ui/dialog/inkscape-preferences.cpp:1361 +msgid "Lower quality (some artifacts), but display is faster" +msgstr "" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1339 +#: ../src/ui/dialog/inkscape-preferences.cpp:1363 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1351 +#: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Filter effects quality for display" msgstr "" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1363 +#: ../src/ui/dialog/inkscape-preferences.cpp:1365 #: ../src/ui/dialog/print.cpp:224 msgid "Rendering" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "2x2" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "4x4" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "8x8" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1369 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "16x16" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1373 +#: ../src/ui/dialog/inkscape-preferences.cpp:1375 msgid "Oversample bitmaps:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1376 +#: ../src/ui/dialog/inkscape-preferences.cpp:1378 msgid "Automatically reload bitmaps" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1380 msgid "Automatically reload linked images when file is changed on disk" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1380 +#: ../src/ui/dialog/inkscape-preferences.cpp:1382 msgid "_Bitmap editor:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1382 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Default export _resolution:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 msgid "Resolution for Create Bitmap _Copy:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1386 +#: ../src/ui/dialog/inkscape-preferences.cpp:1388 msgid "Resolution used by the Create Bitmap Copy command" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Always embed" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Always link" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Ask" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1391 +#: ../src/ui/dialog/inkscape-preferences.cpp:1393 msgid "Bitmap import:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1394 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "Default _import resolution:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1395 +#: ../src/ui/dialog/inkscape-preferences.cpp:1397 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Override file resolution" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Use default bitmap resolution in favor of information from file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Bitmaps" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1412 +#: ../src/ui/dialog/inkscape-preferences.cpp:1414 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:1415 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 msgid "Shortcut file:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1418 +#: ../src/ui/dialog/inkscape-preferences.cpp:1420 msgid "Search:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1430 +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 msgid "Shortcut" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1431 +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 #: ../src/ui/widget/page-sizer.cpp:262 msgid "Description" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1467 +#: ../src/ui/dialog/inkscape-preferences.cpp:1474 #: ../src/ui/dialog/svg-fonts-dialog.cpp:693 #: ../src/ui/dialog/tracedialog.cpp:812 #: ../src/ui/widget/preferences-widget.cpp:648 msgid "Reset" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1467 +#: ../src/ui/dialog/inkscape-preferences.cpp:1474 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:1471 +#: ../src/ui/dialog/inkscape-preferences.cpp:1478 msgid "Import ..." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1471 +#: ../src/ui/dialog/inkscape-preferences.cpp:1478 msgid "Import custom keyboard shortcuts from a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1474 +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "Export ..." msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1474 +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 msgid "Export custom keyboard shortcuts to a file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1484 +#: ../src/ui/dialog/inkscape-preferences.cpp:1491 msgid "Keyboard Shortcuts" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1766 +#: ../src/ui/dialog/inkscape-preferences.cpp:1773 msgid "Set the main spell check language" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1769 +#: ../src/ui/dialog/inkscape-preferences.cpp:1776 msgid "Second language:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1770 +#: ../src/ui/dialog/inkscape-preferences.cpp:1777 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:1773 +#: ../src/ui/dialog/inkscape-preferences.cpp:1780 msgid "Third language:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1774 +#: ../src/ui/dialog/inkscape-preferences.cpp:1781 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:1776 +#: ../src/ui/dialog/inkscape-preferences.cpp:1783 msgid "Ignore words with digits" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1778 +#: ../src/ui/dialog/inkscape-preferences.cpp:1785 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1780 +#: ../src/ui/dialog/inkscape-preferences.cpp:1787 msgid "Ignore words in ALL CAPITALS" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1782 +#: ../src/ui/dialog/inkscape-preferences.cpp:1789 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1784 +#: ../src/ui/dialog/inkscape-preferences.cpp:1791 msgid "Spellcheck" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1804 +#: ../src/ui/dialog/inkscape-preferences.cpp:1811 msgid "Latency _skew:" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1805 +#: ../src/ui/dialog/inkscape-preferences.cpp:1812 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:1807 +#: ../src/ui/dialog/inkscape-preferences.cpp:1814 msgid "Pre-render named icons" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1809 +#: ../src/ui/dialog/inkscape-preferences.cpp:1816 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:1817 +#: ../src/ui/dialog/inkscape-preferences.cpp:1824 msgid "System info" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1821 +#: ../src/ui/dialog/inkscape-preferences.cpp:1828 msgid "User config: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1821 +#: ../src/ui/dialog/inkscape-preferences.cpp:1828 msgid "Location of users configuration" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1825 +#: ../src/ui/dialog/inkscape-preferences.cpp:1832 msgid "User preferences: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1825 +#: ../src/ui/dialog/inkscape-preferences.cpp:1832 msgid "Location of the users preferences file" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1829 +#: ../src/ui/dialog/inkscape-preferences.cpp:1836 msgid "User extensions: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1829 +#: ../src/ui/dialog/inkscape-preferences.cpp:1836 msgid "Location of the users extensions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1833 +#: ../src/ui/dialog/inkscape-preferences.cpp:1840 msgid "User cache: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1833 +#: ../src/ui/dialog/inkscape-preferences.cpp:1840 msgid "Location of users cache" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1841 +#: ../src/ui/dialog/inkscape-preferences.cpp:1848 msgid "Temporary files: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1841 +#: ../src/ui/dialog/inkscape-preferences.cpp:1848 msgid "Location of the temporary files used for autosave" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1845 +#: ../src/ui/dialog/inkscape-preferences.cpp:1852 msgid "Inkscape data: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1845 +#: ../src/ui/dialog/inkscape-preferences.cpp:1852 msgid "Location of Inkscape data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1849 +#: ../src/ui/dialog/inkscape-preferences.cpp:1856 msgid "Inkscape extensions: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1849 +#: ../src/ui/dialog/inkscape-preferences.cpp:1856 msgid "Location of the Inkscape extensions" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1858 +#: ../src/ui/dialog/inkscape-preferences.cpp:1865 msgid "System data: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1858 +#: ../src/ui/dialog/inkscape-preferences.cpp:1865 msgid "Locations of system data" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1882 +#: ../src/ui/dialog/inkscape-preferences.cpp:1889 msgid "Icon theme: " msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1882 +#: ../src/ui/dialog/inkscape-preferences.cpp:1889 msgid "Locations of icon themes" msgstr "" -#: ../src/ui/dialog/inkscape-preferences.cpp:1884 +#: ../src/ui/dialog/inkscape-preferences.cpp:1891 msgid "System" msgstr "" -#: ../src/ui/dialog/input.cpp:352 ../src/ui/dialog/input.cpp:364 +#: ../src/ui/dialog/input.cpp:352 ../src/ui/dialog/input.cpp:373 +#: ../src/ui/dialog/input.cpp:1555 msgid "Disabled" msgstr "" @@ -18373,124 +18369,164 @@ msgctxt "Input device" msgid "Screen" msgstr "" -#: ../src/ui/dialog/input.cpp:354 ../src/ui/dialog/input.cpp:366 +#: ../src/ui/dialog/input.cpp:354 ../src/ui/dialog/input.cpp:375 msgid "Window" msgstr "" -#: ../src/ui/dialog/input.cpp:533 +#: ../src/ui/dialog/input.cpp:599 msgid "Test Area" msgstr "" -#: ../src/ui/dialog/input.cpp:588 ../share/extensions/svgcalendar.inx.h:2 +#: ../src/ui/dialog/input.cpp:600 +msgid "Axis" +msgstr "" + +#: ../src/ui/dialog/input.cpp:664 ../share/extensions/svgcalendar.inx.h:2 msgid "Configuration" msgstr "" -#: ../src/ui/dialog/input.cpp:589 ../src/ui/dialog/input.cpp:785 +#: ../src/ui/dialog/input.cpp:665 msgid "Hardware" msgstr "" -#. Gtk::Label* lbl = Gtk::manage(new Gtk::Label(_("Name:"))); -#. devDetails.attach(*lbl, 0, 1, rowNum, rowNum+ 1, -#. ::Gtk::FILL, -#. ::Gtk::SHRINK); -#. devDetails.attach(devName, 1, 2, rowNum, rowNum + 1, -#. ::Gtk::SHRINK, -#. ::Gtk::SHRINK); -#. -#. rowNum++; -#: ../src/ui/dialog/input.cpp:607 +#: ../src/ui/dialog/input.cpp:688 msgid "Link:" msgstr "" -#: ../src/ui/dialog/input.cpp:622 +#: ../src/ui/dialog/input.cpp:704 msgid "Axes count:" msgstr "" -#: ../src/ui/dialog/input.cpp:645 +#: ../src/ui/dialog/input.cpp:728 msgid "axis:" msgstr "" -#: ../src/ui/dialog/input.cpp:657 +#: ../src/ui/dialog/input.cpp:742 msgid "Button count:" msgstr "" -#: ../src/ui/dialog/input.cpp:823 +#: ../src/ui/dialog/input.cpp:924 msgid "Tablet" msgstr "" -#: ../src/ui/dialog/input.cpp:852 ../src/ui/dialog/input.cpp:1605 +#: ../src/ui/dialog/input.cpp:953 ../src/ui/dialog/input.cpp:1845 msgid "pad" msgstr "" -#: ../src/ui/dialog/input.cpp:893 +#: ../src/ui/dialog/input.cpp:995 msgid "_Use pressure-sensitive tablet (requires restart)" msgstr "" -#: ../src/ui/dialog/input.cpp:894 ../src/verbs.cpp:2309 +#: ../src/ui/dialog/input.cpp:996 ../src/verbs.cpp:2309 msgid "_Save" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:50 +#: ../src/ui/dialog/input.cpp:1000 +msgid "Axes" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1001 +msgid "Keys" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1002 ../src/widgets/spray-toolbar.cpp:202 +#: ../src/widgets/tweak-toolbar.cpp:272 +msgid "Mode" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1084 +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:1530 ../src/ui/dialog/layers.cpp:912 +msgid "X" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1530 +msgid "Y" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1530 ../src/widgets/calligraphy-toolbar.cpp:601 +#: ../src/widgets/spray-toolbar.cpp:241 ../src/widgets/tweak-toolbar.cpp:391 +msgid "Pressure" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1530 +msgid "X tilt" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1530 +msgid "Y tilt" +msgstr "" + +#: ../src/ui/dialog/input.cpp:1530 +#: ../src/widgets/sp-color-wheel-selector.cpp:58 +msgid "Wheel" +msgstr "" + +#: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:119 +#: ../src/ui/dialog/layer-properties.cpp:136 msgid "Add layer" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:157 +#: ../src/ui/dialog/layer-properties.cpp:176 msgid "Above current" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:161 +#: ../src/ui/dialog/layer-properties.cpp:180 msgid "Below current" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:164 +#: ../src/ui/dialog/layer-properties.cpp:183 msgid "As sublayer of current" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:311 +#: ../src/ui/dialog/layer-properties.cpp:352 msgid "Rename Layer" msgstr "" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" -#: ../src/ui/dialog/layer-properties.cpp:313 -#: ../src/ui/dialog/layer-properties.cpp:369 ../src/verbs.cpp:193 +#: ../src/ui/dialog/layer-properties.cpp:354 +#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:193 #: ../src/verbs.cpp:2240 msgid "Layer" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:314 +#: ../src/ui/dialog/layer-properties.cpp:355 msgid "_Rename" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:327 ../src/ui/dialog/layers.cpp:746 +#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:746 msgid "Rename layer" msgstr "" #. TRANSLATORS: This means "The layer has been renamed" -#: ../src/ui/dialog/layer-properties.cpp:329 +#: ../src/ui/dialog/layer-properties.cpp:370 msgid "Renamed layer" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:333 +#: ../src/ui/dialog/layer-properties.cpp:374 msgid "Add Layer" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:339 +#: ../src/ui/dialog/layer-properties.cpp:380 msgid "_Add" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:363 +#: ../src/ui/dialog/layer-properties.cpp:404 msgid "New layer created." msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:367 +#: ../src/ui/dialog/layer-properties.cpp:408 msgid "Move to Layer" msgstr "" -#: ../src/ui/dialog/layer-properties.cpp:370 +#: ../src/ui/dialog/layer-properties.cpp:411 #: ../src/ui/dialog/transformation.cpp:109 msgid "_Move" msgstr "" @@ -18548,10 +18584,6 @@ msgctxt "Layers" msgid "Top" msgstr "" -#: ../src/ui/dialog/layers.cpp:912 -msgid "X" -msgstr "" - #: ../src/ui/dialog/livepatheffect-editor.cpp:111 msgid "Add path effect" msgstr "" @@ -18827,25 +18859,25 @@ msgstr "" msgid "Could not connect to the Open Clip Art Library" msgstr "" -#: ../src/ui/dialog/ocaldialogs.cpp:1124 +#: ../src/ui/dialog/ocaldialogs.cpp:1130 msgid "Could not parse search results" msgstr "" -#: ../src/ui/dialog/ocaldialogs.cpp:1158 +#: ../src/ui/dialog/ocaldialogs.cpp:1164 msgid "No clipart named <b>%1</b> was found." msgstr "" -#: ../src/ui/dialog/ocaldialogs.cpp:1160 +#: ../src/ui/dialog/ocaldialogs.cpp:1166 msgid "" "Please make sure all keywords are spelled correctly, or try again with " "different keywords." msgstr "" -#: ../src/ui/dialog/ocaldialogs.cpp:1200 +#: ../src/ui/dialog/ocaldialogs.cpp:1212 msgid "Search" msgstr "" -#: ../src/ui/dialog/ocaldialogs.cpp:1206 +#: ../src/ui/dialog/ocaldialogs.cpp:1224 msgid "Close" msgstr "" @@ -19059,34 +19091,34 @@ msgid "Preview Text:" msgstr "" #. ******************* Symbol Sets ************************ -#: ../src/ui/dialog/symbols.cpp:102 +#: ../src/ui/dialog/symbols.cpp:110 msgid "Symbol set: " msgstr "" #. Fill in later -#: ../src/ui/dialog/symbols.cpp:106 ../src/ui/dialog/symbols.cpp:107 +#: ../src/ui/dialog/symbols.cpp:114 ../src/ui/dialog/symbols.cpp:115 msgid "Current Document" msgstr "" #. ******************* Preview Scale ********************** -#: ../src/ui/dialog/symbols.cpp:143 +#: ../src/ui/dialog/symbols.cpp:151 msgid "Preview scale: " msgstr "" -#: ../src/ui/dialog/symbols.cpp:148 +#: ../src/ui/dialog/symbols.cpp:156 msgid "Fit" msgstr "" -#: ../src/ui/dialog/symbols.cpp:148 +#: ../src/ui/dialog/symbols.cpp:156 msgid "Fit to width" msgstr "" -#: ../src/ui/dialog/symbols.cpp:148 +#: ../src/ui/dialog/symbols.cpp:156 msgid "Fit to height" msgstr "" #. ******************* Preview Size *********************** -#: ../src/ui/dialog/symbols.cpp:162 +#: ../src/ui/dialog/symbols.cpp:170 msgid "Preview size: " msgstr "" @@ -20148,21 +20180,21 @@ msgstr "" msgid "Custom size" msgstr "" -#: ../src/ui/widget/page-sizer.cpp:352 +#: ../src/ui/widget/page-sizer.cpp:374 msgid "Resi_ze page to content..." msgstr "" -#: ../src/ui/widget/page-sizer.cpp:378 +#: ../src/ui/widget/page-sizer.cpp:426 msgid "_Resize page to drawing or selection" msgstr "" -#: ../src/ui/widget/page-sizer.cpp:379 +#: ../src/ui/widget/page-sizer.cpp:427 msgid "" "Resize the page to fit the current selection, or the entire drawing if there " "is no selection" msgstr "" -#: ../src/ui/widget/page-sizer.cpp:444 +#: ../src/ui/widget/page-sizer.cpp:492 msgid "Set page size" msgstr "" @@ -23328,11 +23360,6 @@ msgid "" "minimum width, black - maximum width)" msgstr "" -#: ../src/widgets/calligraphy-toolbar.cpp:601 -#: ../src/widgets/spray-toolbar.cpp:241 ../src/widgets/tweak-toolbar.cpp:391 -msgid "Pressure" -msgstr "" - #: ../src/widgets/calligraphy-toolbar.cpp:602 msgid "Use the pressure of the input device to alter the width of the pen" msgstr "" @@ -23469,88 +23496,88 @@ msgstr "" msgid "Pattern offset" msgstr "" -#: ../src/widgets/desktop-widget.cpp:466 +#: ../src/widgets/desktop-widget.cpp:446 msgid "Zoom drawing if window size changes" msgstr "" -#: ../src/widgets/desktop-widget.cpp:670 +#: ../src/widgets/desktop-widget.cpp:647 msgid "Cursor coordinates" msgstr "" -#: ../src/widgets/desktop-widget.cpp:696 +#: ../src/widgets/desktop-widget.cpp:673 msgid "Z:" msgstr "" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:739 +#: ../src/widgets/desktop-widget.cpp:716 msgid "" "<b>Welcome to Inkscape!</b> Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." msgstr "" -#: ../src/widgets/desktop-widget.cpp:820 +#: ../src/widgets/desktop-widget.cpp:797 msgid "grayscale" msgstr "" -#: ../src/widgets/desktop-widget.cpp:821 +#: ../src/widgets/desktop-widget.cpp:798 msgid ", grayscale" msgstr "" -#: ../src/widgets/desktop-widget.cpp:822 +#: ../src/widgets/desktop-widget.cpp:799 msgid "print colors preview" msgstr "" -#: ../src/widgets/desktop-widget.cpp:823 +#: ../src/widgets/desktop-widget.cpp:800 msgid ", print colors preview" msgstr "" -#: ../src/widgets/desktop-widget.cpp:824 +#: ../src/widgets/desktop-widget.cpp:801 msgid "outline" msgstr "" -#: ../src/widgets/desktop-widget.cpp:825 +#: ../src/widgets/desktop-widget.cpp:802 msgid "no filters" msgstr "" -#: ../src/widgets/desktop-widget.cpp:852 +#: ../src/widgets/desktop-widget.cpp:829 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:854 ../src/widgets/desktop-widget.cpp:858 +#: ../src/widgets/desktop-widget.cpp:831 ../src/widgets/desktop-widget.cpp:835 #, c-format msgid "%s%s: %d (%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:860 +#: ../src/widgets/desktop-widget.cpp:837 #, c-format msgid "%s%s: %d - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:866 +#: ../src/widgets/desktop-widget.cpp:843 #, c-format msgid "%s%s (%s%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:868 ../src/widgets/desktop-widget.cpp:872 +#: ../src/widgets/desktop-widget.cpp:845 ../src/widgets/desktop-widget.cpp:849 #, c-format msgid "%s%s (%s) - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:874 +#: ../src/widgets/desktop-widget.cpp:851 #, c-format msgid "%s%s - Inkscape" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1042 +#: ../src/widgets/desktop-widget.cpp:1019 msgid "Color-managed display is <b>enabled</b> in this window" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1044 +#: ../src/widgets/desktop-widget.cpp:1021 msgid "Color-managed display is <b>disabled</b> in this window" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1099 +#: ../src/widgets/desktop-widget.cpp:1076 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before " @@ -23559,12 +23586,12 @@ msgid "" "If you close without saving, your changes will be discarded." msgstr "" -#: ../src/widgets/desktop-widget.cpp:1109 -#: ../src/widgets/desktop-widget.cpp:1168 +#: ../src/widgets/desktop-widget.cpp:1086 +#: ../src/widgets/desktop-widget.cpp:1145 msgid "Close _without saving" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1158 +#: ../src/widgets/desktop-widget.cpp:1135 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a " @@ -23573,11 +23600,11 @@ msgid "" "Do you want to save this file as Inkscape SVG?" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1170 +#: ../src/widgets/desktop-widget.cpp:1147 msgid "_Save as Inkscape SVG" msgstr "" -#: ../src/widgets/desktop-widget.cpp:1380 +#: ../src/widgets/desktop-widget.cpp:1357 msgid "Note:" msgstr "" @@ -23660,8 +23687,8 @@ msgstr "" msgid "Set pattern on stroke" msgstr "" -#: ../src/widgets/font-selector.cpp:136 ../src/widgets/text-toolbar.cpp:1236 -#: ../src/widgets/text-toolbar.cpp:1495 +#: ../src/widgets/font-selector.cpp:136 ../src/widgets/text-toolbar.cpp:1239 +#: ../src/widgets/text-toolbar.cpp:1498 msgid "Font size" msgstr "" @@ -23956,7 +23983,7 @@ msgstr "" msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "" -#: ../src/widgets/measure-toolbar.cpp:103 ../src/widgets/text-toolbar.cpp:1498 +#: ../src/widgets/measure-toolbar.cpp:103 ../src/widgets/text-toolbar.cpp:1501 msgid "Font Size" msgstr "" @@ -24714,10 +24741,6 @@ msgstr "" msgid "Spray objects in a single path" msgstr "" -#: ../src/widgets/spray-toolbar.cpp:202 ../src/widgets/tweak-toolbar.cpp:272 -msgid "Mode" -msgstr "" - #. Population #: ../src/widgets/spray-toolbar.cpp:222 msgid "(low population)" @@ -24788,87 +24811,87 @@ msgstr "" msgid "CMS" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:216 -#: ../src/widgets/sp-color-scales.cpp:431 +#: ../src/widgets/sp-color-icc-selector.cpp:213 +#: ../src/widgets/sp-color-scales.cpp:428 msgid "_R:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:216 -#: ../src/widgets/sp-color-icc-selector.cpp:217 -#: ../src/widgets/sp-color-scales.cpp:434 +#: ../src/widgets/sp-color-icc-selector.cpp:213 +#: ../src/widgets/sp-color-icc-selector.cpp:214 +#: ../src/widgets/sp-color-scales.cpp:431 msgid "_G:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:216 -#: ../src/widgets/sp-color-scales.cpp:437 +#: ../src/widgets/sp-color-icc-selector.cpp:213 +#: ../src/widgets/sp-color-scales.cpp:434 msgid "_B:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:218 -#: ../src/widgets/sp-color-icc-selector.cpp:219 -#: ../src/widgets/sp-color-scales.cpp:457 +#: ../src/widgets/sp-color-icc-selector.cpp:215 +#: ../src/widgets/sp-color-icc-selector.cpp:216 +#: ../src/widgets/sp-color-scales.cpp:454 msgid "_H:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:218 -#: ../src/widgets/sp-color-icc-selector.cpp:219 -#: ../src/widgets/sp-color-scales.cpp:460 +#: ../src/widgets/sp-color-icc-selector.cpp:215 +#: ../src/widgets/sp-color-icc-selector.cpp:216 +#: ../src/widgets/sp-color-scales.cpp:457 msgid "_S:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:219 -#: ../src/widgets/sp-color-scales.cpp:463 +#: ../src/widgets/sp-color-icc-selector.cpp:216 +#: ../src/widgets/sp-color-scales.cpp:460 msgid "_L:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-icc-selector.cpp:221 -#: ../src/widgets/sp-color-scales.cpp:485 +#: ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-icc-selector.cpp:218 +#: ../src/widgets/sp-color-scales.cpp:482 msgid "_C:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-icc-selector.cpp:221 -#: ../src/widgets/sp-color-scales.cpp:488 +#: ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-icc-selector.cpp:218 +#: ../src/widgets/sp-color-scales.cpp:485 msgid "_M:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-scales.cpp:494 +#: ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-scales.cpp:491 msgid "_K:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:228 msgid "Gray" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:300 +#: ../src/widgets/sp-color-icc-selector.cpp:297 msgid "Fix" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:303 +#: ../src/widgets/sp-color-icc-selector.cpp:300 msgid "Fix RGB fallback to match icc-color() value." msgstr "" #. Label -#: ../src/widgets/sp-color-icc-selector.cpp:441 -#: ../src/widgets/sp-color-scales.cpp:440 -#: ../src/widgets/sp-color-scales.cpp:466 -#: ../src/widgets/sp-color-scales.cpp:497 -#: ../src/widgets/sp-color-wheel-selector.cpp:183 +#: ../src/widgets/sp-color-icc-selector.cpp:438 +#: ../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:180 msgid "_A:" msgstr "" -#: ../src/widgets/sp-color-icc-selector.cpp:460 -#: ../src/widgets/sp-color-icc-selector.cpp:482 -#: ../src/widgets/sp-color-scales.cpp:441 -#: ../src/widgets/sp-color-scales.cpp:442 -#: ../src/widgets/sp-color-scales.cpp:467 -#: ../src/widgets/sp-color-scales.cpp:468 -#: ../src/widgets/sp-color-scales.cpp:498 -#: ../src/widgets/sp-color-scales.cpp:499 -#: ../src/widgets/sp-color-wheel-selector.cpp:204 -#: ../src/widgets/sp-color-wheel-selector.cpp:228 +#: ../src/widgets/sp-color-icc-selector.cpp:457 +#: ../src/widgets/sp-color-icc-selector.cpp:479 +#: ../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:201 +#: ../src/widgets/sp-color-wheel-selector.cpp:225 msgid "Alpha (opacity)" msgstr "" @@ -24909,10 +24932,6 @@ msgstr "" msgid "Unnamed" msgstr "" -#: ../src/widgets/sp-color-wheel-selector.cpp:58 -msgid "Wheel" -msgstr "" - #: ../src/widgets/sp-xmlview-attr-list.cpp:64 msgid "Value" msgstr "" @@ -25091,11 +25110,11 @@ msgstr "" msgid "Scatter randomly the corners and angles" msgstr "" -#: ../src/widgets/stroke-style.cpp:151 +#: ../src/widgets/stroke-style.cpp:158 msgid "Stroke width" msgstr "" -#: ../src/widgets/stroke-style.cpp:153 +#: ../src/widgets/stroke-style.cpp:160 msgctxt "Stroke width" msgid "_Width:" msgstr "" @@ -25103,93 +25122,93 @@ 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:197 +#: ../src/widgets/stroke-style.cpp:204 msgid "Miter join" 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:204 +#: ../src/widgets/stroke-style.cpp:211 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:211 +#: ../src/widgets/stroke-style.cpp:218 msgid "Bevel join" msgstr "" -#: ../src/widgets/stroke-style.cpp:236 +#: ../src/widgets/stroke-style.cpp:243 msgid "Miter _limit:" 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:252 +#: ../src/widgets/stroke-style.cpp:259 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:260 +#: ../src/widgets/stroke-style.cpp:267 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:266 +#: ../src/widgets/stroke-style.cpp:273 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:272 +#: ../src/widgets/stroke-style.cpp:279 msgid "Square cap" msgstr "" #. Dash -#: ../src/widgets/stroke-style.cpp:277 +#: ../src/widgets/stroke-style.cpp:284 msgid "Dashes:" msgstr "" -#: ../src/widgets/stroke-style.cpp:295 +#: ../src/widgets/stroke-style.cpp:311 msgid "_Start Markers:" msgstr "" -#: ../src/widgets/stroke-style.cpp:296 +#: ../src/widgets/stroke-style.cpp:312 msgid "Start Markers are drawn on the first node of a path or shape" msgstr "" -#: ../src/widgets/stroke-style.cpp:305 +#: ../src/widgets/stroke-style.cpp:330 msgid "_Mid Markers:" msgstr "" -#: ../src/widgets/stroke-style.cpp:306 +#: ../src/widgets/stroke-style.cpp:331 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:315 +#: ../src/widgets/stroke-style.cpp:349 msgid "_End Markers:" msgstr "" -#: ../src/widgets/stroke-style.cpp:316 +#: ../src/widgets/stroke-style.cpp:350 msgid "End Markers are drawn on the last node of a path or shape" msgstr "" -#: ../src/widgets/stroke-style.cpp:438 +#: ../src/widgets/stroke-style.cpp:481 msgid "Set markers" msgstr "" -#: ../src/widgets/stroke-style.cpp:1027 ../src/widgets/stroke-style.cpp:1120 +#: ../src/widgets/stroke-style.cpp:1070 ../src/widgets/stroke-style.cpp:1163 msgid "Set stroke style" msgstr "" -#: ../src/widgets/stroke-style.cpp:1208 +#: ../src/widgets/stroke-style.cpp:1251 msgid "Set marker color" msgstr "" @@ -25197,64 +25216,64 @@ msgstr "" msgid "Change swatch color" msgstr "" -#: ../src/widgets/text-toolbar.cpp:371 +#: ../src/widgets/text-toolbar.cpp:374 #, c-format msgid "Failed to find font matching: %s\n" msgstr "" -#: ../src/widgets/text-toolbar.cpp:405 +#: ../src/widgets/text-toolbar.cpp:408 msgid "Text: Change font family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:473 +#: ../src/widgets/text-toolbar.cpp:476 msgid "Text: Change font size" msgstr "" -#: ../src/widgets/text-toolbar.cpp:565 +#: ../src/widgets/text-toolbar.cpp:568 msgid "Text: Change font style" msgstr "" -#: ../src/widgets/text-toolbar.cpp:645 +#: ../src/widgets/text-toolbar.cpp:648 msgid "Text: Change superscript or subscript" msgstr "" -#: ../src/widgets/text-toolbar.cpp:790 +#: ../src/widgets/text-toolbar.cpp:793 msgid "Text: Change alignment" msgstr "" -#: ../src/widgets/text-toolbar.cpp:833 +#: ../src/widgets/text-toolbar.cpp:836 msgid "Text: Change line-height" msgstr "" -#: ../src/widgets/text-toolbar.cpp:882 +#: ../src/widgets/text-toolbar.cpp:885 msgid "Text: Change word-spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:923 +#: ../src/widgets/text-toolbar.cpp:926 msgid "Text: Change letter-spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:963 +#: ../src/widgets/text-toolbar.cpp:966 msgid "Text: Change dx (kern)" msgstr "" -#: ../src/widgets/text-toolbar.cpp:997 +#: ../src/widgets/text-toolbar.cpp:1000 msgid "Text: Change dy" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1032 +#: ../src/widgets/text-toolbar.cpp:1035 msgid "Text: Change rotate" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1080 +#: ../src/widgets/text-toolbar.cpp:1083 msgid "Text: Change orientation" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1461 +#: ../src/widgets/text-toolbar.cpp:1464 msgid "Font Family" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1462 +#: ../src/widgets/text-toolbar.cpp:1465 msgid "Select Font Family (Alt-X to access)" msgstr "" @@ -25263,176 +25282,176 @@ msgstr "" #. Cell layout #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1470 +#: ../src/widgets/text-toolbar.cpp:1473 msgid "Font not found on system" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1517 +#: ../src/widgets/text-toolbar.cpp:1520 msgid "Font Style" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1518 +#: ../src/widgets/text-toolbar.cpp:1521 msgid "Font style" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1534 +#: ../src/widgets/text-toolbar.cpp:1537 msgid "Toggle Superscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1535 +#: ../src/widgets/text-toolbar.cpp:1538 msgid "Toggle superscript" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1547 +#: ../src/widgets/text-toolbar.cpp:1550 msgid "Toggle Subscript" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1548 +#: ../src/widgets/text-toolbar.cpp:1551 msgid "Toggle subscript" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1589 +#: ../src/widgets/text-toolbar.cpp:1592 msgid "Justify" msgstr "" #. Name -#: ../src/widgets/text-toolbar.cpp:1596 +#: ../src/widgets/text-toolbar.cpp:1599 msgid "Alignment" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1597 +#: ../src/widgets/text-toolbar.cpp:1600 msgid "Text alignment" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1624 +#: ../src/widgets/text-toolbar.cpp:1627 msgid "Horizontal" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1631 +#: ../src/widgets/text-toolbar.cpp:1634 msgid "Vertical" msgstr "" #. Label -#: ../src/widgets/text-toolbar.cpp:1638 +#: ../src/widgets/text-toolbar.cpp:1641 msgid "Text orientation" msgstr "" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1661 +#: ../src/widgets/text-toolbar.cpp:1664 msgid "Smaller spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1661 ../src/widgets/text-toolbar.cpp:1692 -#: ../src/widgets/text-toolbar.cpp:1723 +#: ../src/widgets/text-toolbar.cpp:1664 ../src/widgets/text-toolbar.cpp:1695 +#: ../src/widgets/text-toolbar.cpp:1726 msgctxt "Text tool" msgid "Normal" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1661 +#: ../src/widgets/text-toolbar.cpp:1664 msgid "Larger spacing" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1666 +#: ../src/widgets/text-toolbar.cpp:1669 msgid "Line Height" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1667 +#: ../src/widgets/text-toolbar.cpp:1670 msgid "Line:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1668 +#: ../src/widgets/text-toolbar.cpp:1671 msgid "Spacing between lines (times font size)" msgstr "" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1692 ../src/widgets/text-toolbar.cpp:1723 +#: ../src/widgets/text-toolbar.cpp:1695 ../src/widgets/text-toolbar.cpp:1726 msgid "Negative spacing" msgstr "" -#: ../src/widgets/text-toolbar.cpp:1692 ../src/widgets/text-toolbar.cpp:1723 +#: ../src/widgets/text-toolbar.cpp:1695 ../src/widgets/text-toolbar.cpp:1726 msgid "Positive spacing" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1697 +#: ../src/widgets/text-toolbar.cpp:1700 msgid "Word spacing" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1698 +#: ../src/widgets/text-toolbar.cpp:1701 msgid "Word:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1699 +#: ../src/widgets/text-toolbar.cpp:1702 msgid "Spacing between words (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1728 +#: ../src/widgets/text-toolbar.cpp:1731 msgid "Letter spacing" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1729 +#: ../src/widgets/text-toolbar.cpp:1732 msgid "Letter:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1730 +#: ../src/widgets/text-toolbar.cpp:1733 msgid "Spacing between letters (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1759 +#: ../src/widgets/text-toolbar.cpp:1762 msgid "Kerning" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1760 +#: ../src/widgets/text-toolbar.cpp:1763 msgid "Kern:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1761 +#: ../src/widgets/text-toolbar.cpp:1764 msgid "Horizontal kerning (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1790 +#: ../src/widgets/text-toolbar.cpp:1793 msgid "Vertical Shift" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1791 +#: ../src/widgets/text-toolbar.cpp:1794 msgid "Vert:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1792 +#: ../src/widgets/text-toolbar.cpp:1795 msgid "Vertical shift (px)" msgstr "" #. name -#: ../src/widgets/text-toolbar.cpp:1821 +#: ../src/widgets/text-toolbar.cpp:1824 msgid "Letter rotation" msgstr "" #. label -#: ../src/widgets/text-toolbar.cpp:1822 +#: ../src/widgets/text-toolbar.cpp:1825 msgid "Rot:" msgstr "" #. short label -#: ../src/widgets/text-toolbar.cpp:1823 +#: ../src/widgets/text-toolbar.cpp:1826 msgid "Character rotation (degrees)" msgstr "" @@ -25899,15 +25918,15 @@ msgstr "" msgid "Unable to find image data." msgstr "" -#: ../share/extensions/funcplot.py:47 +#: ../share/extensions/funcplot.py:48 msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" msgstr "" -#: ../share/extensions/funcplot.py:59 +#: ../share/extensions/funcplot.py:60 msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" msgstr "" -#: ../share/extensions/funcplot.py:300 +#: ../share/extensions/funcplot.py:315 msgid "Please select a rectangle" msgstr "" @@ -27474,16 +27493,20 @@ msgid "First derivative:" msgstr "" #: ../share/extensions/funcplot.inx.h:34 +msgid "Clip with rectangle" +msgstr "" + +#: ../share/extensions/funcplot.inx.h:35 #: ../share/extensions/param_curves.inx.h:28 msgid "Remove rectangle" msgstr "" -#: ../share/extensions/funcplot.inx.h:35 +#: ../share/extensions/funcplot.inx.h:36 #: ../share/extensions/param_curves.inx.h:29 msgid "Draw Axes" msgstr "" -#: ../share/extensions/funcplot.inx.h:36 +#: ../share/extensions/funcplot.inx.h:37 msgid "Add x-axis endpoints" msgstr "" @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2012-11-22 10:57+0200\n" -"PO-Revision-Date: 2012-11-22 20:35+0200\n" +"POT-Creation-Date: 2012-12-29 16:02+0200\n" +"PO-Revision-Date: 2012-12-29 19:17+0200\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" "Language: uk\n" @@ -252,7 +252,7 @@ msgstr "Імітувати малювання олійною фарбою" #. Pencil #: ../share/filters/filters.svg.h:1 -#: ../src/ui/dialog/inkscape-preferences.cpp:409 +#: ../src/ui/dialog/inkscape-preferences.cpp:414 msgid "Pencil" msgstr "Олівець" @@ -974,8 +974,8 @@ msgstr "Хутро тигра з переходами і фасками навк msgid "Black Light" msgstr "Чорне світло" -#: ../share/filters/filters.svg.h:1 ../src/ui/dialog/clonetiler.cpp:826 -#: ../src/ui/dialog/clonetiler.cpp:965 +#: ../share/filters/filters.svg.h:1 ../src/ui/dialog/clonetiler.cpp:832 +#: ../src/ui/dialog/clonetiler.cpp:983 #: ../src/extension/internal/bitmap/colorize.cpp:52 #: ../src/extension/internal/filter/bumps.h:101 #: ../src/extension/internal/filter/bumps.h:324 @@ -3656,7 +3656,7 @@ msgstr "Мас_штабувати" #: ../src/ui/dialog/clonetiler.cpp:339 msgid "<b>Scale X:</b>" -msgstr "<b>Масштаб X:</b>" +msgstr "<b>Масштаб за X:</b>" #: ../src/ui/dialog/clonetiler.cpp:347 #, no-c-format @@ -3675,7 +3675,7 @@ msgstr "" #: ../src/ui/dialog/clonetiler.cpp:369 msgid "<b>Scale Y:</b>" -msgstr "<b>Масштаб Y:</b>" +msgstr "<b>Масштаб за Y:</b>" #: ../src/ui/dialog/clonetiler.cpp:377 #, no-c-format @@ -3915,11 +3915,11 @@ msgstr "" msgid "1. Pick from the drawing:" msgstr "1. Взяти значення:" -#: ../src/ui/dialog/clonetiler.cpp:827 +#: ../src/ui/dialog/clonetiler.cpp:833 msgid "Pick the visible color and opacity" msgstr "Взяти видимий колір і прозорість" -#: ../src/ui/dialog/clonetiler.cpp:834 ../src/ui/dialog/clonetiler.cpp:975 +#: ../src/ui/dialog/clonetiler.cpp:840 ../src/ui/dialog/clonetiler.cpp:993 #: ../src/extension/internal/bitmap/opacity.cpp:38 #: ../src/extension/internal/filter/transparency.h:279 #: ../src/widgets/tweak-toolbar.cpp:353 @@ -3927,113 +3927,113 @@ msgstr "Взяти видимий колір і прозорість" msgid "Opacity" msgstr "Непрозорість" -#: ../src/ui/dialog/clonetiler.cpp:835 +#: ../src/ui/dialog/clonetiler.cpp:841 msgid "Pick the total accumulated opacity" msgstr "Взяти сумарну непрозорість у кожній точці" -#: ../src/ui/dialog/clonetiler.cpp:842 +#: ../src/ui/dialog/clonetiler.cpp:848 msgid "R" msgstr "R" -#: ../src/ui/dialog/clonetiler.cpp:843 +#: ../src/ui/dialog/clonetiler.cpp:849 msgid "Pick the Red component of the color" msgstr "Взяти червону компоненту кольору" -#: ../src/ui/dialog/clonetiler.cpp:850 +#: ../src/ui/dialog/clonetiler.cpp:856 msgid "G" msgstr "G" -#: ../src/ui/dialog/clonetiler.cpp:851 +#: ../src/ui/dialog/clonetiler.cpp:857 msgid "Pick the Green component of the color" msgstr "Взяти зелену компоненту кольору" -#: ../src/ui/dialog/clonetiler.cpp:858 +#: ../src/ui/dialog/clonetiler.cpp:864 msgid "B" msgstr "B" -#: ../src/ui/dialog/clonetiler.cpp:859 +#: ../src/ui/dialog/clonetiler.cpp:865 msgid "Pick the Blue component of the color" msgstr "Взяти блакитну компоненту кольору" -#: ../src/ui/dialog/clonetiler.cpp:866 +#: ../src/ui/dialog/clonetiler.cpp:872 msgctxt "Clonetiler color hue" msgid "H" msgstr "В" -#: ../src/ui/dialog/clonetiler.cpp:867 +#: ../src/ui/dialog/clonetiler.cpp:873 msgid "Pick the hue of the color" msgstr "Взяти відтінок кольору" -#: ../src/ui/dialog/clonetiler.cpp:874 +#: ../src/ui/dialog/clonetiler.cpp:880 msgctxt "Clonetiler color saturation" msgid "S" msgstr "Н" -#: ../src/ui/dialog/clonetiler.cpp:875 +#: ../src/ui/dialog/clonetiler.cpp:881 msgid "Pick the saturation of the color" msgstr "Взяти насиченість кольору" -#: ../src/ui/dialog/clonetiler.cpp:882 +#: ../src/ui/dialog/clonetiler.cpp:888 msgctxt "Clonetiler color lightness" msgid "L" msgstr "О" -#: ../src/ui/dialog/clonetiler.cpp:883 +#: ../src/ui/dialog/clonetiler.cpp:889 msgid "Pick the lightness of the color" msgstr "Взяти яскравість кольору" -#: ../src/ui/dialog/clonetiler.cpp:893 +#: ../src/ui/dialog/clonetiler.cpp:899 msgid "2. Tweak the picked value:" msgstr "2. Змінити взяте значення:" -#: ../src/ui/dialog/clonetiler.cpp:903 +#: ../src/ui/dialog/clonetiler.cpp:916 msgid "Gamma-correct:" msgstr "Гамма-корекція:" -#: ../src/ui/dialog/clonetiler.cpp:907 +#: ../src/ui/dialog/clonetiler.cpp:920 msgid "Shift the mid-range of the picked value upwards (>0) or downwards (<0)" msgstr "Зсунути середину діапазону взятих значень вгору (>0) чи вниз (<0)" -#: ../src/ui/dialog/clonetiler.cpp:914 +#: ../src/ui/dialog/clonetiler.cpp:927 msgid "Randomize:" msgstr "Випадково:" -#: ../src/ui/dialog/clonetiler.cpp:918 +#: ../src/ui/dialog/clonetiler.cpp:931 msgid "Randomize the picked value by this percentage" msgstr "Випадково міняти взяте значення, максимум на даний відсоток" -#: ../src/ui/dialog/clonetiler.cpp:925 +#: ../src/ui/dialog/clonetiler.cpp:938 msgid "Invert:" msgstr "Інвертувати:" -#: ../src/ui/dialog/clonetiler.cpp:929 +#: ../src/ui/dialog/clonetiler.cpp:942 msgid "Invert the picked value" msgstr "Інвертувати взяте значення" -#: ../src/ui/dialog/clonetiler.cpp:935 +#: ../src/ui/dialog/clonetiler.cpp:948 msgid "3. Apply the value to the clones':" msgstr "3. Застосувати це значення до клонів:" -#: ../src/ui/dialog/clonetiler.cpp:945 +#: ../src/ui/dialog/clonetiler.cpp:963 msgid "Presence" msgstr "Наявність" -#: ../src/ui/dialog/clonetiler.cpp:948 +#: ../src/ui/dialog/clonetiler.cpp:966 msgid "" "Each clone is created with the probability determined by the picked value in " "that point" msgstr "" "Ймовірність появи кожного клону визначається значенням, взятим у даній точці" -#: ../src/ui/dialog/clonetiler.cpp:955 +#: ../src/ui/dialog/clonetiler.cpp:973 msgid "Size" msgstr "Розмір" -#: ../src/ui/dialog/clonetiler.cpp:958 +#: ../src/ui/dialog/clonetiler.cpp:976 msgid "Each clone's size is determined by the picked value in that point" msgstr "Розмір кожного клону визначається значенням, взятим у даній точці" -#: ../src/ui/dialog/clonetiler.cpp:968 +#: ../src/ui/dialog/clonetiler.cpp:986 msgid "" "Each clone is painted by the picked color (the original must have unset fill " "or stroke)" @@ -4041,48 +4041,48 @@ msgstr "" "Кожен клон фарбується взятим у даній точці кольором (оригінал не повинен " "мати власний колір чи штрих)" -#: ../src/ui/dialog/clonetiler.cpp:978 +#: ../src/ui/dialog/clonetiler.cpp:996 msgid "Each clone's opacity is determined by the picked value in that point" msgstr "" "Прозорість кожного кольору визначається значенням, взятим у даній точці" -#: ../src/ui/dialog/clonetiler.cpp:1019 +#: ../src/ui/dialog/clonetiler.cpp:1044 msgid "How many rows in the tiling" msgstr "Кількість рядків у мозаїці" -#: ../src/ui/dialog/clonetiler.cpp:1049 +#: ../src/ui/dialog/clonetiler.cpp:1074 msgid "How many columns in the tiling" msgstr "Кількість стовпчиків у мозаїці" -#: ../src/ui/dialog/clonetiler.cpp:1093 +#: ../src/ui/dialog/clonetiler.cpp:1118 msgid "Width of the rectangle to be filled" msgstr "Ширина області, що заповнюється" -#: ../src/ui/dialog/clonetiler.cpp:1127 +#: ../src/ui/dialog/clonetiler.cpp:1152 msgid "Height of the rectangle to be filled" msgstr "Висота області, що заповнюється" -#: ../src/ui/dialog/clonetiler.cpp:1144 +#: ../src/ui/dialog/clonetiler.cpp:1169 msgid "Rows, columns: " msgstr "Рядків, стовпчиків: " -#: ../src/ui/dialog/clonetiler.cpp:1145 +#: ../src/ui/dialog/clonetiler.cpp:1170 msgid "Create the specified number of rows and columns" msgstr "Створити вказану кількість рядків та стовпчиків" -#: ../src/ui/dialog/clonetiler.cpp:1154 +#: ../src/ui/dialog/clonetiler.cpp:1179 msgid "Width, height: " msgstr "Ширина, висота: " -#: ../src/ui/dialog/clonetiler.cpp:1155 +#: ../src/ui/dialog/clonetiler.cpp:1180 msgid "Fill the specified width and height with the tiling" msgstr "Заповнити мозаїкою вказану область" -#: ../src/ui/dialog/clonetiler.cpp:1176 +#: ../src/ui/dialog/clonetiler.cpp:1201 msgid "Use saved size and position of the tile" msgstr "Використовувати збережені розмір та позицію плитки" -#: ../src/ui/dialog/clonetiler.cpp:1179 +#: ../src/ui/dialog/clonetiler.cpp:1204 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" @@ -4090,11 +4090,11 @@ msgstr "" "Сприяти, щоб розмір та позиція плиток були такі самі, як і останнього разу, " "коли ви їх розбивали на мозаїку, замість використання поточного розміру" -#: ../src/ui/dialog/clonetiler.cpp:1213 +#: ../src/ui/dialog/clonetiler.cpp:1238 msgid " <b>_Create</b> " msgstr "<b>_Створити</b> " -#: ../src/ui/dialog/clonetiler.cpp:1215 +#: ../src/ui/dialog/clonetiler.cpp:1240 msgid "Create and tile the clones of the selection" msgstr "Створити мозаїку з клонів позначеної ділянки" @@ -4103,31 +4103,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:1235 +#: ../src/ui/dialog/clonetiler.cpp:1260 msgid " _Unclump " msgstr "_Розгрупувати " -#: ../src/ui/dialog/clonetiler.cpp:1236 +#: ../src/ui/dialog/clonetiler.cpp:1261 msgid "Spread out clones to reduce clumping; can be applied repeatedly" msgstr "" "Розповсюдити клони для послаблення групування; може бути застосовано повторно" -#: ../src/ui/dialog/clonetiler.cpp:1242 +#: ../src/ui/dialog/clonetiler.cpp:1267 msgid " Re_move " msgstr " В_илучити " -#: ../src/ui/dialog/clonetiler.cpp:1243 +#: ../src/ui/dialog/clonetiler.cpp:1268 msgid "Remove existing tiled clones of the selected object (siblings only)" msgstr "" "Вилучити існуючі мозаїчні клони позначеного об'єкта (лише нащадків одного " "об'єкта)" -#: ../src/ui/dialog/clonetiler.cpp:1259 +#: ../src/ui/dialog/clonetiler.cpp:1284 msgid " R_eset " msgstr "С_кинути " #. TRANSLATORS: "change" is a noun here -#: ../src/ui/dialog/clonetiler.cpp:1261 +#: ../src/ui/dialog/clonetiler.cpp:1286 msgid "" "Reset all shifts, scales, rotates, opacity and color changes in the dialog " "to zero" @@ -4135,44 +4135,44 @@ msgstr "" "Скинути усі зсуви, масштабування, обертання та зміни прозорості й кольору на " "нуль" -#: ../src/ui/dialog/clonetiler.cpp:1334 +#: ../src/ui/dialog/clonetiler.cpp:1359 msgid "<small>Nothing selected.</small>" msgstr "<small>Нічого не позначено.</small>" -#: ../src/ui/dialog/clonetiler.cpp:1340 +#: ../src/ui/dialog/clonetiler.cpp:1365 msgid "<small>More than one object selected.</small>" msgstr "<small>позначено більше ніж один об'єкт.</small>" -#: ../src/ui/dialog/clonetiler.cpp:1347 +#: ../src/ui/dialog/clonetiler.cpp:1372 #, c-format msgid "<small>Object has <b>%d</b> tiled clones.</small>" msgstr "<small>Об'єкт має<b>%d</b> мозаїчних клонів.</small>" -#: ../src/ui/dialog/clonetiler.cpp:1352 +#: ../src/ui/dialog/clonetiler.cpp:1377 msgid "<small>Object has no tiled clones.</small>" msgstr "<small>Об'єкт не має мозаїчних клонів.</small>" -#: ../src/ui/dialog/clonetiler.cpp:2072 +#: ../src/ui/dialog/clonetiler.cpp:2097 msgid "Select <b>one object</b> whose tiled clones to unclump." msgstr "Позначте <b>один об'єкт</b>, клони якого слід розгрупувати." -#: ../src/ui/dialog/clonetiler.cpp:2094 +#: ../src/ui/dialog/clonetiler.cpp:2119 msgid "Unclump tiled clones" msgstr "Розгрупувати мозаїку з клонів" -#: ../src/ui/dialog/clonetiler.cpp:2123 +#: ../src/ui/dialog/clonetiler.cpp:2148 msgid "Select <b>one object</b> whose tiled clones to remove." msgstr "Позначте <b>один об'єкт</b>, клони якого слід вилучити." -#: ../src/ui/dialog/clonetiler.cpp:2146 +#: ../src/ui/dialog/clonetiler.cpp:2171 msgid "Delete tiled clones" msgstr "Вилучити мозаїку з клонів" -#: ../src/ui/dialog/clonetiler.cpp:2193 ../src/selection-chemistry.cpp:2469 +#: ../src/ui/dialog/clonetiler.cpp:2218 ../src/selection-chemistry.cpp:2469 msgid "Select an <b>object</b> to clone." msgstr "Позначте <b>об'єкт</b> для клонування." -#: ../src/ui/dialog/clonetiler.cpp:2199 +#: ../src/ui/dialog/clonetiler.cpp:2224 msgid "" "If you want to clone several objects, <b>group</b> them and <b>clone the " "group</b>." @@ -4180,23 +4180,23 @@ msgstr "" "Для клонування кількох об'єктів, <b>згрупуйте</b> їх та <b>клонуйте групу</" "b>." -#: ../src/ui/dialog/clonetiler.cpp:2208 +#: ../src/ui/dialog/clonetiler.cpp:2233 msgid "<small>Creating tiled clones...</small>" msgstr "<small>Створення мозаїчних клонів…</small>" -#: ../src/ui/dialog/clonetiler.cpp:2613 +#: ../src/ui/dialog/clonetiler.cpp:2638 msgid "Create tiled clones" msgstr "Створити мозаїку з клонів" -#: ../src/ui/dialog/clonetiler.cpp:2832 +#: ../src/ui/dialog/clonetiler.cpp:2871 msgid "<small>Per row:</small>" msgstr "<small>У рядку:</small>" -#: ../src/ui/dialog/clonetiler.cpp:2850 +#: ../src/ui/dialog/clonetiler.cpp:2889 msgid "<small>Per column:</small>" msgstr "<small>У стовпчику:</small>" -#: ../src/ui/dialog/clonetiler.cpp:2858 +#: ../src/ui/dialog/clonetiler.cpp:2897 msgid "<small>Randomize:</small>" msgstr "<small>Випадковість:</small>" @@ -4295,11 +4295,11 @@ msgid "_Height:" msgstr "_Висота:" #: ../src/ui/dialog/export.cpp:260 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 #: ../src/ui/dialog/inkscape-preferences.cpp:1387 -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 -#: ../src/ui/dialog/inkscape-preferences.cpp:1399 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "dpi" -msgstr "dpi" +msgstr "т/д" #: ../src/ui/dialog/export.cpp:268 msgid "<b>_Filename</b>" @@ -4468,7 +4468,7 @@ msgid "Search paths, lines, polylines" msgstr "Шукати серед контурів, ліній, поліліній" #: ../src/dialogs/find.cpp:647 ../src/ui/dialog/find.cpp:98 -#: ../src/widgets/toolbox.cpp:1783 +#: ../src/widgets/toolbox.cpp:1784 msgid "Paths" msgstr "Контури" @@ -4633,54 +4633,54 @@ msgstr "П_уск" msgid "Suggestions:" msgstr "Варіанти:" -#: ../src/ui/dialog/spellcheck.cpp:138 +#: ../src/ui/dialog/spellcheck.cpp:124 msgid "Accept the chosen suggestion" msgstr "Прийняти вибраний варіант" -#: ../src/ui/dialog/spellcheck.cpp:139 +#: ../src/ui/dialog/spellcheck.cpp:125 msgid "Ignore this word only once" msgstr "Ігнорувати це слово лише у цьому випадку" -#: ../src/ui/dialog/spellcheck.cpp:140 +#: ../src/ui/dialog/spellcheck.cpp:126 msgid "Ignore this word in this session" msgstr "Ігнорувати це слово протягом сеансу" -#: ../src/ui/dialog/spellcheck.cpp:141 +#: ../src/ui/dialog/spellcheck.cpp:127 msgid "Add this word to the chosen dictionary" msgstr "Додати це слово до вибраного словника" -#: ../src/ui/dialog/spellcheck.cpp:155 +#: ../src/ui/dialog/spellcheck.cpp:141 msgid "Stop the check" msgstr "Припинити перевірку" -#: ../src/ui/dialog/spellcheck.cpp:156 +#: ../src/ui/dialog/spellcheck.cpp:142 msgid "Start the check" msgstr "Почати перевірку" -#: ../src/ui/dialog/spellcheck.cpp:474 +#: ../src/ui/dialog/spellcheck.cpp:460 #, c-format msgid "<b>Finished</b>, <b>%d</b> words added to dictionary" msgstr "<b>Завершено</b>, до словника додано <b>%d</b> слів" -#: ../src/ui/dialog/spellcheck.cpp:476 +#: ../src/ui/dialog/spellcheck.cpp:462 #, c-format msgid "<b>Finished</b>, nothing suspicious found" msgstr "<b>Завершено</b>, видимих помилок не знайдено" -#: ../src/ui/dialog/spellcheck.cpp:592 +#: ../src/ui/dialog/spellcheck.cpp:578 #, c-format msgid "Not in dictionary (%s): <b>%s</b>" msgstr "Немає у словнику (%s): <b>%s</b>" -#: ../src/ui/dialog/spellcheck.cpp:739 +#: ../src/ui/dialog/spellcheck.cpp:725 msgid "<i>Checking...</i>" msgstr "<i>Перевірка…</i>" -#: ../src/ui/dialog/spellcheck.cpp:808 +#: ../src/ui/dialog/spellcheck.cpp:794 msgid "Fix spelling" msgstr "Виправити правопис" -#: ../src/ui/dialog/text-edit.cpp:67 ../src/ui/dialog/svg-fonts-dialog.cpp:910 +#: ../src/ui/dialog/text-edit.cpp:67 ../src/ui/dialog/svg-fonts-dialog.cpp:901 msgid "_Font" msgstr "_Шрифт" @@ -4698,111 +4698,111 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "АаБбВвЇїЄєҐґIiPpQq12369$€¢?.;/()" #. Align buttons -#: ../src/ui/dialog/text-edit.cpp:94 ../src/widgets/text-toolbar.cpp:1565 -#: ../src/widgets/text-toolbar.cpp:1566 +#: ../src/ui/dialog/text-edit.cpp:94 ../src/widgets/text-toolbar.cpp:1568 +#: ../src/widgets/text-toolbar.cpp:1569 msgid "Align left" msgstr "Вирівнювання ліворуч" -#: ../src/ui/dialog/text-edit.cpp:95 ../src/widgets/text-toolbar.cpp:1573 -#: ../src/widgets/text-toolbar.cpp:1574 +#: ../src/ui/dialog/text-edit.cpp:95 ../src/widgets/text-toolbar.cpp:1576 +#: ../src/widgets/text-toolbar.cpp:1577 msgid "Align center" msgstr "Посередині" -#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1581 -#: ../src/widgets/text-toolbar.cpp:1582 +#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1584 +#: ../src/widgets/text-toolbar.cpp:1585 msgid "Align right" msgstr "Вирівнювання праворуч" -#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1590 +#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1593 msgid "Justify (only flowed text)" msgstr "Вирівняти раз шириною (лише неконтурний текст)" #. Direction buttons -#: ../src/ui/dialog/text-edit.cpp:101 ../src/widgets/text-toolbar.cpp:1625 +#: ../src/ui/dialog/text-edit.cpp:106 ../src/widgets/text-toolbar.cpp:1628 msgid "Horizontal text" msgstr "Горизонтальний текст" -#: ../src/ui/dialog/text-edit.cpp:102 ../src/widgets/text-toolbar.cpp:1632 +#: ../src/ui/dialog/text-edit.cpp:107 ../src/widgets/text-toolbar.cpp:1635 msgid "Vertical text" msgstr "Вертикальний текст" -#: ../src/ui/dialog/text-edit.cpp:135 ../src/ui/dialog/text-edit.cpp:136 +#: ../src/ui/dialog/text-edit.cpp:127 ../src/ui/dialog/text-edit.cpp:128 msgid "Spacing between lines (percent of font size)" msgstr "Інтервал між рядками (у відсотках щодо розміру шрифту)" -#: ../src/ui/dialog/text-edit.cpp:578 ../src/text-context.cpp:1519 +#: ../src/ui/dialog/text-edit.cpp:561 ../src/text-context.cpp:1519 msgid "Set text style" msgstr "Встановити стиль тексту" -#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:119 +#: ../src/ui/dialog/xml-tree.cpp:70 ../src/ui/dialog/xml-tree.cpp:123 msgid "New element node" msgstr "Створити вузол елемента" -#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:125 +#: ../src/ui/dialog/xml-tree.cpp:71 ../src/ui/dialog/xml-tree.cpp:129 msgid "New text node" msgstr "Створити вузол з текстом" -#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:139 +#: ../src/ui/dialog/xml-tree.cpp:72 ../src/ui/dialog/xml-tree.cpp:143 msgid "nodeAsInXMLdialogTooltip|Delete node" msgstr "Вилучити вузол" -#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:131 -#: ../src/ui/dialog/xml-tree.cpp:970 +#: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:135 +#: ../src/ui/dialog/xml-tree.cpp:974 msgid "Duplicate node" msgstr "Дублювати вузол" -#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:184 -#: ../src/ui/dialog/xml-tree.cpp:1005 +#: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:188 +#: ../src/ui/dialog/xml-tree.cpp:1009 msgid "Delete attribute" msgstr "Вилучити атрибут" -#: ../src/ui/dialog/xml-tree.cpp:83 +#: ../src/ui/dialog/xml-tree.cpp:87 msgid "Set" msgstr "Встановити" -#: ../src/ui/dialog/xml-tree.cpp:114 +#: ../src/ui/dialog/xml-tree.cpp:118 msgid "Drag to reorder nodes" msgstr "Перевпорядкуйте вузли перетягуванням" -#: ../src/ui/dialog/xml-tree.cpp:145 ../src/ui/dialog/xml-tree.cpp:146 -#: ../src/ui/dialog/xml-tree.cpp:1126 +#: ../src/ui/dialog/xml-tree.cpp:149 ../src/ui/dialog/xml-tree.cpp:150 +#: ../src/ui/dialog/xml-tree.cpp:1130 msgid "Unindent node" msgstr "Перемістити до кореня" -#: ../src/ui/dialog/xml-tree.cpp:150 ../src/ui/dialog/xml-tree.cpp:151 -#: ../src/ui/dialog/xml-tree.cpp:1104 +#: ../src/ui/dialog/xml-tree.cpp:154 ../src/ui/dialog/xml-tree.cpp:155 +#: ../src/ui/dialog/xml-tree.cpp:1108 msgid "Indent node" msgstr "Перемістити від кореня" -#: ../src/ui/dialog/xml-tree.cpp:155 ../src/ui/dialog/xml-tree.cpp:156 -#: ../src/ui/dialog/xml-tree.cpp:1055 +#: ../src/ui/dialog/xml-tree.cpp:159 ../src/ui/dialog/xml-tree.cpp:160 +#: ../src/ui/dialog/xml-tree.cpp:1059 msgid "Raise node" msgstr "Підняти вузол" -#: ../src/ui/dialog/xml-tree.cpp:160 ../src/ui/dialog/xml-tree.cpp:161 -#: ../src/ui/dialog/xml-tree.cpp:1073 +#: ../src/ui/dialog/xml-tree.cpp:164 ../src/ui/dialog/xml-tree.cpp:165 +#: ../src/ui/dialog/xml-tree.cpp:1077 msgid "Lower node" msgstr "Опустити вузол" -#: ../src/ui/dialog/xml-tree.cpp:201 +#: ../src/ui/dialog/xml-tree.cpp:205 msgid "Attribute name" msgstr "Назва атрибута" -#: ../src/ui/dialog/xml-tree.cpp:216 +#: ../src/ui/dialog/xml-tree.cpp:220 msgid "Attribute value" msgstr "Значення атрибута" -#: ../src/ui/dialog/xml-tree.cpp:304 +#: ../src/ui/dialog/xml-tree.cpp:308 msgid "<b>Click</b> to select nodes, <b>drag</b> to rearrange." msgstr "" "<b>Клацніть</b>, щоб позначити вузли, <b>перетягуванням</b> можна змінити " "порядок." -#: ../src/ui/dialog/xml-tree.cpp:315 +#: ../src/ui/dialog/xml-tree.cpp:319 msgid "<b>Click</b> attribute to edit." msgstr "<b>Клацніть мишею</b> на атрибуті для редагування." -#: ../src/ui/dialog/xml-tree.cpp:319 +#: ../src/ui/dialog/xml-tree.cpp:323 #, c-format msgid "" "Attribute <b>%s</b> selected. Press <b>Ctrl+Enter</b> when done editing to " @@ -4811,35 +4811,35 @@ msgstr "" "позначено атрибут <b>%s</b>. Натисніть <b>Ctrl+Enter</b>, коли закінчите " "редагування." -#: ../src/ui/dialog/xml-tree.cpp:559 +#: ../src/ui/dialog/xml-tree.cpp:563 msgid "Drag XML subtree" msgstr "Перетягування піддерева XML" -#: ../src/ui/dialog/xml-tree.cpp:861 +#: ../src/ui/dialog/xml-tree.cpp:865 msgid "New element node..." msgstr "Створити новий вузол…" -#: ../src/ui/dialog/xml-tree.cpp:899 +#: ../src/ui/dialog/xml-tree.cpp:903 msgid "Cancel" msgstr "Скасувати" -#: ../src/ui/dialog/xml-tree.cpp:905 +#: ../src/ui/dialog/xml-tree.cpp:909 msgid "Create" msgstr "Створити" -#: ../src/ui/dialog/xml-tree.cpp:936 +#: ../src/ui/dialog/xml-tree.cpp:940 msgid "Create new element node" msgstr "Створити вузол елемента" -#: ../src/ui/dialog/xml-tree.cpp:952 +#: ../src/ui/dialog/xml-tree.cpp:956 msgid "Create new text node" msgstr "Створити вузол з текстом" -#: ../src/ui/dialog/xml-tree.cpp:986 +#: ../src/ui/dialog/xml-tree.cpp:990 msgid "nodeAsInXMLinHistoryDialog|Delete node" msgstr "Вилучити вузол" -#: ../src/ui/dialog/xml-tree.cpp:1029 +#: ../src/ui/dialog/xml-tree.cpp:1033 msgid "Change attribute" msgstr "Змінити атрибут" @@ -4849,11 +4849,11 @@ msgstr "О_диниці сітки:" #: ../src/display/canvas-axonomgrid.cpp:323 ../src/display/canvas-grid.cpp:696 msgid "_Origin X:" -msgstr "_Початок по X:" +msgstr "_Початок за X:" #: ../src/display/canvas-axonomgrid.cpp:323 ../src/display/canvas-grid.cpp:696 -#: ../src/ui/dialog/inkscape-preferences.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:727 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "X coordinate of grid origin" msgstr "Координата X початку сітки" @@ -4862,39 +4862,39 @@ msgid "O_rigin Y:" msgstr "П_очаток по Y:" #: ../src/display/canvas-axonomgrid.cpp:325 ../src/display/canvas-grid.cpp:698 -#: ../src/ui/dialog/inkscape-preferences.cpp:703 -#: ../src/ui/dialog/inkscape-preferences.cpp:728 +#: ../src/ui/dialog/inkscape-preferences.cpp:708 +#: ../src/ui/dialog/inkscape-preferences.cpp:733 msgid "Y coordinate of grid origin" msgstr "Координата Y початку сітки" #: ../src/display/canvas-axonomgrid.cpp:327 ../src/display/canvas-grid.cpp:702 msgid "Spacing _Y:" -msgstr "Інтервал по _Y:" +msgstr "Інтервал за _Y:" #: ../src/display/canvas-axonomgrid.cpp:327 -#: ../src/ui/dialog/inkscape-preferences.cpp:731 +#: ../src/ui/dialog/inkscape-preferences.cpp:736 msgid "Base length of z-axis" msgstr "Базова довжина вісі z" #: ../src/display/canvas-axonomgrid.cpp:329 -#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:739 #: ../src/widgets/box3d-toolbar.cpp:320 msgid "Angle X:" msgstr "Кут X:" #: ../src/display/canvas-axonomgrid.cpp:329 -#: ../src/ui/dialog/inkscape-preferences.cpp:734 +#: ../src/ui/dialog/inkscape-preferences.cpp:739 msgid "Angle of x-axis" msgstr "Кут вісі x" #: ../src/display/canvas-axonomgrid.cpp:331 -#: ../src/ui/dialog/inkscape-preferences.cpp:735 +#: ../src/ui/dialog/inkscape-preferences.cpp:740 #: ../src/widgets/box3d-toolbar.cpp:399 msgid "Angle Z:" msgstr "Кут Z:" #: ../src/display/canvas-axonomgrid.cpp:331 -#: ../src/ui/dialog/inkscape-preferences.cpp:735 +#: ../src/ui/dialog/inkscape-preferences.cpp:740 msgid "Angle of z-axis" msgstr "Кут вісі z" @@ -4903,7 +4903,7 @@ msgid "Minor grid line _color:" msgstr "Колір _другорядної лінії сітки:" #: ../src/display/canvas-axonomgrid.cpp:335 ../src/display/canvas-grid.cpp:706 -#: ../src/ui/dialog/inkscape-preferences.cpp:686 +#: ../src/ui/dialog/inkscape-preferences.cpp:691 msgid "Minor grid line color" msgstr "Колір другорядних ліній сітки" @@ -4916,7 +4916,7 @@ msgid "Ma_jor grid line color:" msgstr "Колір о_сновної лінії сітки:" #: ../src/display/canvas-axonomgrid.cpp:340 ../src/display/canvas-grid.cpp:711 -#: ../src/ui/dialog/inkscape-preferences.cpp:688 +#: ../src/ui/dialog/inkscape-preferences.cpp:693 msgid "Major grid line color" msgstr "Колір основних ліній сітки" @@ -4982,15 +4982,15 @@ msgstr "" #: ../src/display/canvas-grid.cpp:700 msgid "Spacing _X:" -msgstr "Інтервал по _X:" +msgstr "Інтервал за _X:" #: ../src/display/canvas-grid.cpp:700 -#: ../src/ui/dialog/inkscape-preferences.cpp:708 +#: ../src/ui/dialog/inkscape-preferences.cpp:713 msgid "Distance between vertical grid lines" msgstr "Відстань між вертикальними лініями сітки" #: ../src/display/canvas-grid.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:709 +#: ../src/ui/dialog/inkscape-preferences.cpp:714 msgid "Distance between horizontal grid lines" msgstr "Відстань між горизонтальними лініями сітки" @@ -5246,28 +5246,28 @@ msgstr "Створити одиночну точку" #. 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/dropper-context.cpp:282 +#: ../src/dropper-context.cpp:320 #, c-format msgid " alpha %.3g" msgstr " α %.3g" #. where the color is picked, to show in the statusbar -#: ../src/dropper-context.cpp:284 +#: ../src/dropper-context.cpp:322 #, c-format msgid ", averaged with radius %d" msgstr ", усереднений з радіусом %d" -#: ../src/dropper-context.cpp:284 +#: ../src/dropper-context.cpp:322 #, c-format msgid " under cursor" msgstr " під курсором" #. message, to show in the statusbar -#: ../src/dropper-context.cpp:286 +#: ../src/dropper-context.cpp:324 msgid "<b>Release mouse</b> to set color." msgstr "<b>Відпустіть кнопку</b> для встановлення кольору." -#: ../src/dropper-context.cpp:286 ../src/tools-switch.cpp:232 +#: ../src/dropper-context.cpp:324 ../src/tools-switch.cpp:232 msgid "" "<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to " "average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> " @@ -5278,7 +5278,7 @@ msgstr "" "разом з <b>Alt</b> береться інверсний колір; <b>Ctrl+C</b> копіює у буфер " "колір під курсором." -#: ../src/dropper-context.cpp:324 +#: ../src/dropper-context.cpp:372 msgid "Set picked color" msgstr "Встановити знятий піпеткою колір" @@ -5317,20 +5317,20 @@ msgstr "<b>Малювання</b> штриха гумки" msgid "Draw eraser stroke" msgstr "Намалювати штрих гумкою" -#: ../src/event-context.cpp:678 -msgid "<b>Space+mouse drag</b> to pan canvas" -msgstr "<b>Пробіл+перетягування мишею</b> для переміщення полотна" +#: ../src/event-context.cpp:694 +msgid "<b>Space+mouse move</b> to pan canvas" +msgstr "<b>Пробіл+пересування миші</b> для переміщення полотна" #: ../src/event-log.cpp:37 msgid "[Unchanged]" msgstr "(Не змінено)" #. Edit -#: ../src/event-log.cpp:264 ../src/event-log.cpp:267 ../src/verbs.cpp:2334 +#: ../src/event-log.cpp:264 ../src/event-log.cpp:267 ../src/verbs.cpp:2336 msgid "_Undo" msgstr "В_ернути" -#: ../src/event-log.cpp:274 ../src/event-log.cpp:278 ../src/verbs.cpp:2336 +#: ../src/event-log.cpp:274 ../src/event-log.cpp:278 ../src/verbs.cpp:2338 msgid "_Redo" msgstr "Повт_орити" @@ -5358,6 +5358,10 @@ msgstr " опис: " msgid " (No preferences)" msgstr " (Немає уподобань)" +#: ../src/extension/effect.h:70 ../src/verbs.cpp:2109 +msgid "Extensions" +msgstr "Додатки" + #. This is some filler text, needs to change before relase #: ../src/extension/error-file.cpp:53 msgid "" @@ -5368,8 +5372,8 @@ msgid "" "normally but those extensions will be unavailable. For details to " "troubleshoot this problem, please refer to the error log located at: " msgstr "" -"<span weight=\"bold\" size=\"larger\">Не вдається завантажити одне або " -"більше додатків.</span>\n" +"<span weight=\"bold\" size=\"larger\">Не вдається завантажити один або " +"декілька додатків.</span>\n" "\n" "Додатки, які викликали помилки було пропущено. Inkscape продовжить звичайний " "запуск, але ці додатки будуть недоступні. Подробиці щодо цієї проблеми можна " @@ -5500,7 +5504,7 @@ msgstr "Адаптивна постеризація" #: ../src/extension/internal/filter/morphology.h:65 #: ../src/ui/dialog/object-attributes.cpp:67 #: ../src/ui/dialog/object-attributes.cpp:75 -#: ../src/widgets/calligraphy-toolbar.cpp:410 +#: ../src/widgets/calligraphy-toolbar.cpp:453 #: ../src/widgets/erasor-toolbar.cpp:151 ../src/widgets/spray-toolbar.cpp:133 #: ../src/widgets/tweak-toolbar.cpp:147 #: ../share/extensions/foldablebox.inx.h:2 @@ -5581,8 +5585,8 @@ msgstr "Додати шум" #: ../src/extension/internal/filter/color.h:1502 #: ../src/extension/internal/filter/distort.h:69 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:241 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2386 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2465 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2522 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2601 #: ../src/ui/dialog/object-attributes.cpp:48 #: ../share/extensions/jessyInk_effects.inx.h:5 #: ../share/extensions/jessyInk_export.inx.h:3 @@ -5632,7 +5636,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:2443 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2579 msgid "Radius:" msgstr "Радіус:" @@ -5960,7 +5964,7 @@ msgstr "" #: ../src/extension/internal/bitmap/opacity.cpp:40 #: ../src/extension/internal/filter/blurs.h:333 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2433 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2569 #: ../src/widgets/dropper-toolbar.cpp:112 msgid "Opacity:" msgstr "Непрозорість:" @@ -6476,7 +6480,7 @@ msgstr "Темніше" #: ../src/extension/internal/filter/color.h:1511 #: ../src/extension/internal/filter/paint.h:704 #: ../src/extension/internal/filter/transparency.h:62 -#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:365 +#: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:374 msgid "Screen" msgstr "Ширма" @@ -6581,7 +6585,7 @@ msgstr "Тип змішування:" #: ../src/extension/internal/filter/paint.h:703 #: ../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:618 +#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:623 msgid "Normal" msgstr "Звичайний" @@ -6687,7 +6691,7 @@ msgid "Distant" msgstr "Віддалене" #: ../src/extension/internal/filter/bumps.h:106 ../src/helper/units.cpp:38 -#: ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Point" msgstr "Точка" @@ -6970,47 +6974,47 @@ msgid "Extract Channel" msgstr "Видобування каналу" #: ../src/extension/internal/filter/color.h:636 ../src/filter-enums.cpp:100 -#: ../src/flood-context.cpp:246 ../src/widgets/sp-color-icc-selector.cpp:230 -#: ../src/widgets/sp-color-scales.cpp:398 -#: ../src/widgets/sp-color-scales.cpp:399 +#: ../src/flood-context.cpp:252 ../src/widgets/sp-color-icc-selector.cpp:227 +#: ../src/widgets/sp-color-scales.cpp:429 +#: ../src/widgets/sp-color-scales.cpp:430 msgid "Red" msgstr "Червоний" #: ../src/extension/internal/filter/color.h:637 ../src/filter-enums.cpp:101 -#: ../src/flood-context.cpp:247 ../src/widgets/sp-color-icc-selector.cpp:230 -#: ../src/widgets/sp-color-scales.cpp:401 -#: ../src/widgets/sp-color-scales.cpp:402 +#: ../src/flood-context.cpp:253 ../src/widgets/sp-color-icc-selector.cpp:227 +#: ../src/widgets/sp-color-scales.cpp:432 +#: ../src/widgets/sp-color-scales.cpp:433 msgid "Green" msgstr "Зелений" #: ../src/extension/internal/filter/color.h:638 ../src/filter-enums.cpp:102 -#: ../src/flood-context.cpp:248 ../src/widgets/sp-color-icc-selector.cpp:230 -#: ../src/widgets/sp-color-scales.cpp:404 -#: ../src/widgets/sp-color-scales.cpp:405 +#: ../src/flood-context.cpp:254 ../src/widgets/sp-color-icc-selector.cpp:227 +#: ../src/widgets/sp-color-scales.cpp:435 +#: ../src/widgets/sp-color-scales.cpp:436 msgid "Blue" msgstr "Синій" #: ../src/extension/internal/filter/color.h:639 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-icc-selector.cpp:235 -#: ../src/widgets/sp-color-scales.cpp:452 -#: ../src/widgets/sp-color-scales.cpp:453 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:232 +#: ../src/widgets/sp-color-scales.cpp:483 +#: ../src/widgets/sp-color-scales.cpp:484 msgid "Cyan" msgstr "Бірюзовий" #: ../src/extension/internal/filter/color.h:640 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-icc-selector.cpp:235 -#: ../src/widgets/sp-color-scales.cpp:455 -#: ../src/widgets/sp-color-scales.cpp:456 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:232 +#: ../src/widgets/sp-color-scales.cpp:486 +#: ../src/widgets/sp-color-scales.cpp:487 msgid "Magenta" msgstr "Бузковий" #: ../src/extension/internal/filter/color.h:641 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-icc-selector.cpp:235 -#: ../src/widgets/sp-color-scales.cpp:458 -#: ../src/widgets/sp-color-scales.cpp:459 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:232 +#: ../src/widgets/sp-color-scales.cpp:489 +#: ../src/widgets/sp-color-scales.cpp:490 msgid "Yellow" msgstr "Жовтий" @@ -7043,9 +7047,9 @@ msgstr "Перетворення на:" #: ../src/extension/internal/filter/color.h:743 #: ../src/ui/widget/selected-style.cpp:246 -#: ../src/widgets/sp-color-icc-selector.cpp:234 -#: ../src/widgets/sp-color-scales.cpp:461 -#: ../src/widgets/sp-color-scales.cpp:462 +#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-scales.cpp:492 +#: ../src/widgets/sp-color-scales.cpp:493 msgid "Black" msgstr "Чорний" @@ -7154,7 +7158,7 @@ msgstr "Зміщення червоного" #: ../src/extension/internal/filter/color.h:1206 #: ../src/ui/dialog/object-attributes.cpp:65 #: ../src/ui/dialog/object-attributes.cpp:73 ../src/ui/dialog/tile.cpp:615 -#: ../src/widgets/desktop-widget.cpp:671 ../src/widgets/node-toolbar.cpp:591 +#: ../src/widgets/desktop-widget.cpp:648 ../src/widgets/node-toolbar.cpp:591 msgid "X:" msgstr "X:" @@ -7163,7 +7167,7 @@ msgstr "X:" #: ../src/extension/internal/filter/color.h:1207 #: ../src/ui/dialog/object-attributes.cpp:66 #: ../src/ui/dialog/object-attributes.cpp:74 ../src/ui/dialog/tile.cpp:616 -#: ../src/widgets/desktop-widget.cpp:681 ../src/widgets/node-toolbar.cpp:609 +#: ../src/widgets/desktop-widget.cpp:658 ../src/widgets/node-toolbar.cpp:609 msgid "Y:" msgstr "Y:" @@ -7181,7 +7185,7 @@ msgstr "Джерело змішування:" #: ../src/extension/internal/filter/color.h:1219 #: ../src/extension/internal/filter/transparency.h:56 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1593 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600 msgid "Background" msgstr "Тло" @@ -7481,7 +7485,7 @@ msgid "XOR" msgstr "Виключне АБО (XOR)" #: ../src/extension/internal/filter/morphology.h:179 -#: ../src/ui/dialog/layer-properties.cpp:168 +#: ../src/ui/dialog/layer-properties.cpp:185 msgid "Position:" msgstr "Розміщення:" @@ -7645,9 +7649,8 @@ msgstr "" "горизонтальних ліній" #: ../src/extension/internal/filter/paint.h:332 -#: ../src/ui/dialog/align-and-distribute.cpp:1049 -#: ../src/ui/dialog/align-and-distribute.cpp:1057 -#: ../src/widgets/desktop-widget.cpp:1926 +#: ../src/ui/dialog/align-and-distribute.cpp:1048 +#: ../src/widgets/desktop-widget.cpp:1903 msgid "Drawing" msgstr "Малюнок" @@ -7781,7 +7784,7 @@ msgstr "Малювання плакатів" #: ../src/extension/internal/filter/paint.h:857 msgid "Transfer type:" -msgstr "Тип передачі:" +msgstr "Тип передавання:" #: ../src/extension/internal/filter/paint.h:858 msgid "Poster" @@ -7938,7 +7941,7 @@ msgid "Source:" msgstr "Джерело:" #: ../src/extension/internal/filter/transparency.h:59 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2383 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2519 #: ../src/widgets/erasor-toolbar.cpp:129 ../src/widgets/pencil-toolbar.cpp:162 #: ../src/widgets/spray-toolbar.cpp:203 ../src/widgets/tweak-toolbar.cpp:273 #: ../share/extensions/extrude.inx.h:2 ../share/extensions/triangle.inx.h:8 @@ -8060,7 +8063,7 @@ msgstr "Вертикальний зсув:" #: ../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:37 ../share/extensions/gears.inx.h:11 +#: ../share/extensions/funcplot.inx.h:38 ../share/extensions/gears.inx.h:11 #: ../share/extensions/grid_cartesian.inx.h:23 #: ../share/extensions/grid_isometric.inx.h:11 #: ../share/extensions/grid_polar.inx.h:22 @@ -8084,8 +8087,8 @@ msgstr "Відтворення" #: ../src/extension/internal/grid.cpp:212 #: ../src/ui/dialog/document-properties.cpp:146 -#: ../src/ui/dialog/inkscape-preferences.cpp:743 -#: ../src/widgets/toolbox.cpp:1873 +#: ../src/ui/dialog/inkscape-preferences.cpp:748 +#: ../src/widgets/toolbox.cpp:1874 msgid "Grids" msgstr "Сітки" @@ -8170,15 +8173,15 @@ msgstr "з %i" msgid "Clip to:" msgstr "Обрізати за:" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:125 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:121 msgid "Page settings" msgstr "Параметри сторінки" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:126 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:122 msgid "Precision of approximating gradient meshes:" msgstr "Точність апроксимації градієнтних сіток:" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:127 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:123 msgid "" "<b>Note</b>: setting the precision too high may result in a large SVG file " "and slow performance." @@ -8186,78 +8189,77 @@ msgstr "" "<b>Зауваження</b>: зависока точність може призвести до створення дуже " "великого файла SVG і уповільнення програми" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:137 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:133 msgid "rough" msgstr "невисока" #. Text options -#: ../src/extension/internal/pdfinput/pdf-input.cpp:141 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:137 msgid "Text handling:" msgstr "Обробка тексту:" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:144 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:146 -#: ../src/extension/internal/pdfinput/pdf-input.cpp:148 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:139 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:140 msgid "Import text as text" msgstr "Імпортувати текст як текст" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:149 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:141 msgid "Replace PDF fonts by closest-named installed fonts" msgstr "Замінити шрифти у PDF найближчими аналогами серед встановлених" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:152 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:144 msgid "Embed images" msgstr "Вбудовувати зображення" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:154 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:146 msgid "Import settings" msgstr "Імпортувати налаштування" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:254 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:246 msgid "PDF Import Settings" msgstr "Параметри імпорту PDF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:399 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:391 msgctxt "PDF input precision" msgid "rough" msgstr "грубо" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:400 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:392 msgctxt "PDF input precision" msgid "medium" msgstr "середньо" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:401 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:393 msgctxt "PDF input precision" msgid "fine" msgstr "точно" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:402 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:394 msgctxt "PDF input precision" msgid "very fine" msgstr "дуже точно" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:761 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:753 msgid "PDF Input" msgstr "Імпорт PDF" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:766 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:758 msgid "Adobe PDF (*.pdf)" msgstr "Adobe PDF (*.pdf)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:767 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:759 msgid "Adobe Portable Document Format" msgstr "Формат портативних документів Adobe" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:774 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:766 msgid "AI Input" msgstr "Імпорт з AI" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:779 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:771 msgid "Adobe Illustrator 9.0 and above (*.ai)" msgstr "Файли Adobe Illustrator 9.0 і вище (*.ai)" -#: ../src/extension/internal/pdfinput/pdf-input.cpp:780 +#: ../src/extension/internal/pdfinput/pdf-input.cpp:772 msgid "Open files saved in Adobe Illustrator 9.0 and newer versions" msgstr "Відкриття файлів збережених у версіях Adobe Illustrator 9.0 і новіших" @@ -8349,11 +8351,11 @@ msgstr "Графічний файл WordPerfect (*.wpg)" msgid "Vector graphics format used by Corel WordPerfect" msgstr "Формат векторної графіки, що використовується Corel WordPerfect" -#: ../src/extension/prefdialog.cpp:249 +#: ../src/extension/prefdialog.cpp:254 msgid "Live preview" msgstr "Перегляд у дії" -#: ../src/extension/prefdialog.cpp:249 +#: ../src/extension/prefdialog.cpp:254 msgid "Is the effect previewed live on canvas?" msgstr "Контролює, чи буде показано параметри ефекту вживу на полотні" @@ -8476,7 +8478,7 @@ msgstr "Файл не було змінено. Збереження непотр msgid "Saving document..." msgstr "Збереження документа…" -#: ../src/file.cpp:1219 ../src/ui/dialog/ocaldialogs.cpp:1211 +#: ../src/file.cpp:1219 ../src/ui/dialog/ocaldialogs.cpp:1225 msgid "Import" msgstr "Імпорт" @@ -8574,7 +8576,7 @@ msgid "Luminance to Alpha" msgstr "Освітленість до прозорості" #. File -#: ../src/filter-enums.cpp:70 ../src/verbs.cpp:2301 +#: ../src/filter-enums.cpp:70 ../src/verbs.cpp:2303 #: ../share/extensions/jessyInk_mouseHandler.inx.h:3 #: ../share/extensions/jessyInk_transitions.inx.h:7 msgid "Default" @@ -8594,14 +8596,14 @@ msgstr "Обгортка" #: ../src/filter-enums.cpp:94 ../src/live_effects/lpe-ruler.cpp:32 #: ../src/ui/dialog/filter-effects-dialog.cpp:490 -#: ../src/ui/dialog/inkscape-preferences.cpp:326 -#: ../src/ui/dialog/inkscape-preferences.cpp:617 -#: ../src/ui/dialog/inkscape-preferences.cpp:1217 -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 -#: ../src/ui/dialog/inkscape-preferences.cpp:1440 -#: ../src/ui/dialog/input.cpp:613 ../src/ui/dialog/input.cpp:615 -#: ../src/ui/dialog/input.cpp:617 ../src/ui/dialog/input.cpp:1287 -#: ../src/ui/dialog/input.cpp:1290 ../src/verbs.cpp:2298 +#: ../src/ui/dialog/inkscape-preferences.cpp:331 +#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:1214 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1752 +#: ../src/ui/dialog/input.cpp:693 ../src/ui/dialog/input.cpp:694 +#: ../src/ui/dialog/input.cpp:1485 ../src/ui/dialog/input.cpp:1539 +#: ../src/verbs.cpp:2300 ../src/widgets/gradient-toolbar.cpp:1128 #: ../src/widgets/pencil-toolbar.cpp:190 #: ../share/extensions/gcodetools_area.inx.h:48 #: ../share/extensions/gcodetools_dxf_points.inx.h:19 @@ -8615,7 +8617,7 @@ msgstr "Обгортка" msgid "None" msgstr "немає" -#: ../src/filter-enums.cpp:103 ../src/flood-context.cpp:252 +#: ../src/filter-enums.cpp:103 ../src/flood-context.cpp:258 msgid "Alpha" msgstr "Альфа-канал" @@ -8643,59 +8645,59 @@ msgstr "Точкове джерело" msgid "Spot Light" msgstr "Прожектор" -#: ../src/flood-context.cpp:245 +#: ../src/flood-context.cpp:251 msgid "Visible Colors" msgstr "Видимі кольори" -#: ../src/flood-context.cpp:249 ../src/widgets/sp-color-icc-selector.cpp:232 -#: ../src/widgets/sp-color-icc-selector.cpp:233 -#: ../src/widgets/sp-color-scales.cpp:424 -#: ../src/widgets/sp-color-scales.cpp:425 ../src/widgets/tweak-toolbar.cpp:305 +#: ../src/flood-context.cpp:255 ../src/widgets/sp-color-icc-selector.cpp:229 +#: ../src/widgets/sp-color-icc-selector.cpp:230 +#: ../src/widgets/sp-color-scales.cpp:455 +#: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:305 #: ../share/extensions/color_randomize.inx.h:3 msgid "Hue" msgstr "Відтінок" -#: ../src/flood-context.cpp:250 ../src/ui/dialog/inkscape-preferences.cpp:895 -#: ../src/widgets/sp-color-icc-selector.cpp:232 -#: ../src/widgets/sp-color-icc-selector.cpp:233 -#: ../src/widgets/sp-color-scales.cpp:427 -#: ../src/widgets/sp-color-scales.cpp:428 ../src/widgets/tweak-toolbar.cpp:321 +#: ../src/flood-context.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:902 +#: ../src/widgets/sp-color-icc-selector.cpp:229 +#: ../src/widgets/sp-color-icc-selector.cpp:230 +#: ../src/widgets/sp-color-scales.cpp:458 +#: ../src/widgets/sp-color-scales.cpp:459 ../src/widgets/tweak-toolbar.cpp:321 #: ../share/extensions/color_randomize.inx.h:4 msgid "Saturation" msgstr "Насиченість" -#: ../src/flood-context.cpp:251 ../src/widgets/sp-color-icc-selector.cpp:233 -#: ../src/widgets/sp-color-scales.cpp:430 -#: ../src/widgets/sp-color-scales.cpp:431 ../src/widgets/tweak-toolbar.cpp:337 +#: ../src/flood-context.cpp:257 ../src/widgets/sp-color-icc-selector.cpp:230 +#: ../src/widgets/sp-color-scales.cpp:461 +#: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:337 #: ../share/extensions/color_randomize.inx.h:5 msgid "Lightness" msgstr "Яскравість" -#: ../src/flood-context.cpp:263 +#: ../src/flood-context.cpp:269 msgctxt "Flood autogap" msgid "None" msgstr "Немає" -#: ../src/flood-context.cpp:264 +#: ../src/flood-context.cpp:270 msgctxt "Flood autogap" msgid "Small" msgstr "Малий" -#: ../src/flood-context.cpp:265 +#: ../src/flood-context.cpp:271 msgctxt "Flood autogap" msgid "Medium" msgstr "Середній" -#: ../src/flood-context.cpp:266 +#: ../src/flood-context.cpp:272 msgctxt "Flood autogap" msgid "Large" msgstr "Великий" -#: ../src/flood-context.cpp:486 +#: ../src/flood-context.cpp:494 msgid "<b>Too much inset</b>, the result is empty." msgstr "<b>Надто багато втягувань</b>, результат порожній." -#: ../src/flood-context.cpp:527 +#: ../src/flood-context.cpp:535 #, c-format msgid "" "Area filled, path with <b>%d</b> node created and unioned with selection." @@ -8711,7 +8713,7 @@ msgstr[2] "" "Область заповнено, контур з <b>%d</b> вузлами створено та поєднано з " "позначеною областю." -#: ../src/flood-context.cpp:533 +#: ../src/flood-context.cpp:541 #, c-format msgid "Area filled, path with <b>%d</b> node created." msgid_plural "Area filled, path with <b>%d</b> nodes created." @@ -8719,11 +8721,11 @@ msgstr[0] "Область заповнено, створено контур з < msgstr[1] "Область заповнено, створено контур з <b>%d</b> вузлами." msgstr[2] "Область заповнено, створено контур з <b>%d</b> вузлами." -#: ../src/flood-context.cpp:801 ../src/flood-context.cpp:1100 +#: ../src/flood-context.cpp:809 ../src/flood-context.cpp:1119 msgid "<b>Area is not bounded</b>, cannot fill." msgstr "<b>Область не обмежена</b>, заповнення неможливе." -#: ../src/flood-context.cpp:1105 +#: ../src/flood-context.cpp:1124 msgid "" "<b>Only the visible part of the bounded area was filled.</b> If you want to " "fill all of the area, undo, zoom out, and fill again." @@ -8732,15 +8734,15 @@ msgstr "" "заповнити всю область, верніть зміни, зробіть меншим масштаб та заповніть " "знову." -#: ../src/flood-context.cpp:1123 ../src/flood-context.cpp:1282 +#: ../src/flood-context.cpp:1142 ../src/flood-context.cpp:1301 msgid "Fill bounded area" msgstr "Заповнення замкненої області" -#: ../src/flood-context.cpp:1142 +#: ../src/flood-context.cpp:1161 msgid "Set style on object" msgstr "Встановити стиль об'єкта" -#: ../src/flood-context.cpp:1201 +#: ../src/flood-context.cpp:1220 msgid "<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill" msgstr "" "<b>Малювати по</b> областям для додавання заповнення, при утриманні <b>Alt</" @@ -8840,7 +8842,7 @@ msgstr[1] "<b>Жодного</b> вуса градієнта з %d в %d виб msgstr[2] "<b>Жодного</b> вуса градієнта з %d в %d вибраних об'єктах" #: ../src/gradient-context.cpp:405 ../src/gradient-context.cpp:503 -#: ../src/ui/dialog/swatches.cpp:187 ../src/widgets/gradient-vector.cpp:815 +#: ../src/ui/dialog/swatches.cpp:202 ../src/widgets/gradient-vector.cpp:815 msgid "Add gradient stop" msgstr "Додавання опорної точки градієнта" @@ -8953,15 +8955,15 @@ msgstr[2] "" "Точка градієнта спільна для <b>%d</b> градієнтів; для відокремлення " "перетягуйте з <b>Shift</b>" -#: ../src/gradient-drag.cpp:2358 +#: ../src/gradient-drag.cpp:2369 msgid "Move gradient handle(s)" msgstr "Перемістити вус(а) градієнта" -#: ../src/gradient-drag.cpp:2394 +#: ../src/gradient-drag.cpp:2405 msgid "Move gradient mid stop(s)" msgstr "Перемістити опорні точки градієнта" -#: ../src/gradient-drag.cpp:2683 +#: ../src/gradient-drag.cpp:2694 msgid "Delete gradient stop(s)" msgstr "Вилучити опорні точки градієнта" @@ -8989,7 +8991,7 @@ msgstr "Пункти" msgid "Pt" msgstr "пт" -#: ../src/helper/units.cpp:39 ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/helper/units.cpp:39 ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Pica" msgstr "Піка" @@ -9005,7 +9007,7 @@ msgstr "Піки" msgid "Pc" msgstr "Пк" -#: ../src/helper/units.cpp:40 ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/helper/units.cpp:40 ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Pixel" msgstr "Точка" @@ -9027,7 +9029,7 @@ msgstr "точок" msgid "Percent" msgstr "Відсоток" -#: ../src/helper/units.cpp:42 ../src/ui/dialog/inkscape-preferences.cpp:1227 +#: ../src/helper/units.cpp:42 ../src/ui/dialog/inkscape-preferences.cpp:1224 msgid "%" msgstr "%" @@ -9035,7 +9037,7 @@ msgstr "%" msgid "Percents" msgstr "Відсотки" -#: ../src/helper/units.cpp:43 ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/helper/units.cpp:43 ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Millimeter" msgstr "Міліметр" @@ -9055,7 +9057,7 @@ msgstr "мм" msgid "Millimeters" msgstr "Міліметри" -#: ../src/helper/units.cpp:44 ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/helper/units.cpp:44 ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Centimeter" msgstr "Сантиметр" @@ -9080,7 +9082,7 @@ msgid "Meters" msgstr "Метри" #. no svg_unit -#: ../src/helper/units.cpp:46 ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/helper/units.cpp:46 ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Inch" msgstr "Дюйм" @@ -9114,7 +9116,7 @@ msgstr "Фути" #. Volatiles do not have default, so there are none here #. TRANSLATORS: for info, see http://www.w3.org/TR/REC-CSS2/syndata.html#length-units -#: ../src/helper/units.cpp:50 ../src/ui/dialog/inkscape-preferences.cpp:445 +#: ../src/helper/units.cpp:50 ../src/ui/dialog/inkscape-preferences.cpp:450 msgid "Em square" msgstr "Em квадрат" @@ -9142,14 +9144,14 @@ msgstr "Ex квадрати" #: ../src/inkscape.cpp:316 msgid "Autosave failed! Cannot create directory %1." msgstr "" -"Спроба автоматичного збереження зазнала невдачі! Не вдалося створити каталог %" -"1." +"Спроба автоматичного збереження зазнала невдачі! Не вдалося створити каталог " +"%1." #: ../src/inkscape.cpp:325 msgid "Autosave failed! Cannot open directory %1." msgstr "" -"Спроба автоматичного збереження зазнала невдачі! Не вдалося відкрити каталог %" -"1." +"Спроба автоматичного збереження зазнала невдачі! Не вдалося відкрити каталог " +"%1." #: ../src/inkscape.cpp:341 msgid "Autosaving documents..." @@ -9280,7 +9282,7 @@ msgid "Enter group #%1" msgstr "Увійти до групи №%1" #. Item dialog -#: ../src/interface.cpp:1818 ../src/verbs.cpp:2795 +#: ../src/interface.cpp:1818 ../src/verbs.cpp:2797 msgid "_Object Properties..." msgstr "В_ластивості об'єкта…" @@ -9348,7 +9350,7 @@ msgid "Release C_lip" msgstr "Зн_яти обрізання" #. Group -#: ../src/interface.cpp:1960 ../src/verbs.cpp:2434 +#: ../src/interface.cpp:1960 ../src/verbs.cpp:2436 msgid "_Group" msgstr "З_групувати" @@ -9357,7 +9359,7 @@ msgid "Create link" msgstr "Створити посилання" #. Ungroup -#: ../src/interface.cpp:2062 ../src/verbs.cpp:2436 +#: ../src/interface.cpp:2062 ../src/verbs.cpp:2438 msgid "_Ungroup" msgstr "Розгр_упувати" @@ -9392,7 +9394,7 @@ msgstr "Редагувати у зовнішній програмі…" #. Trace Bitmap #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/interface.cpp:2156 ../src/verbs.cpp:2497 +#: ../src/interface.cpp:2156 ../src/verbs.cpp:2499 msgid "_Trace Bitmap..." msgstr "_Векторизувати растр" @@ -9408,17 +9410,17 @@ msgstr "Видобути зображення…" #. Item dialog #. Fill and Stroke dialog -#: ../src/interface.cpp:2316 ../src/interface.cpp:2336 ../src/verbs.cpp:2758 +#: ../src/interface.cpp:2316 ../src/interface.cpp:2336 ../src/verbs.cpp:2760 msgid "_Fill and Stroke..." msgstr "_Заповнення та штрих" #. Edit Text dialog -#: ../src/interface.cpp:2342 ../src/verbs.cpp:2775 +#: ../src/interface.cpp:2342 ../src/verbs.cpp:2777 msgid "_Text and Font..." msgstr "_Текст та шрифт…" #. Spellcheck dialog -#: ../src/interface.cpp:2348 ../src/verbs.cpp:2783 +#: ../src/interface.cpp:2348 ../src/verbs.cpp:2785 msgid "Check Spellin_g..." msgstr "Перевірити п_равопис…" @@ -9483,7 +9485,7 @@ msgid "Dockitem which 'owns' this grip" msgstr "Елемент, що є «володарем» цього" #. Name -#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/text-toolbar.cpp:1637 +#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/text-toolbar.cpp:1640 #: ../share/extensions/gcodetools_graffiti.inx.h:9 #: ../share/extensions/gcodetools_orientation_points.inx.h:1 msgid "Orientation" @@ -9629,11 +9631,10 @@ msgstr "" "панелей можна називати контролерами." #: ../src/libgdl/gdl-dock-notebook.c:132 -#: ../src/ui/dialog/align-and-distribute.cpp:1048 -#: ../src/ui/dialog/align-and-distribute.cpp:1056 +#: ../src/ui/dialog/align-and-distribute.cpp:1047 #: ../src/ui/dialog/document-properties.cpp:144 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1539 -#: ../src/widgets/desktop-widget.cpp:1922 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1546 +#: ../src/widgets/desktop-widget.cpp:1899 #: ../share/extensions/voronoi2svg.inx.h:9 msgid "Page" msgstr "Сторінка" @@ -9642,8 +9643,10 @@ msgstr "Сторінка" msgid "The index of the current page" msgstr "Індекс поточної сторінки" -#: ../src/libgdl/gdl-dock-object.c:125 ../src/ui/widget/page-sizer.cpp:260 -#: ../src/widgets/gradient-selector.cpp:153 +#: ../src/libgdl/gdl-dock-object.c:125 +#: ../src/ui/dialog/inkscape-preferences.cpp:1431 +#: ../src/ui/widget/page-sizer.cpp:260 +#: ../src/widgets/gradient-selector.cpp:156 #: ../src/widgets/sp-xmlview-attr-list.cpp:54 msgid "Name" msgstr "Назва" @@ -9825,8 +9828,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "Елемент панелі, що «володіє» цією міткою вкладки" -#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:607 -#: ../src/ui/dialog/inkscape-preferences.cpp:641 +#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:612 +#: ../src/ui/dialog/inkscape-preferences.cpp:646 msgid "Floating" msgstr "Вільно переміщуються екраном" @@ -9867,7 +9870,7 @@ msgstr "Координата Y плаваючої панелі" msgid "Dock #%d" msgstr "Прикріпити #%d" -#: ../src/libnrtype/FontFactory.cpp:910 +#: ../src/libnrtype/FontFactory.cpp:903 msgid "Ignoring font without family that will crash Pango" msgstr "Шрифт без сімейства, який може привести до збою Pango, ігнорується" @@ -10535,7 +10538,7 @@ msgstr "Визначає форму початку контуру" #. 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:186 +#: ../src/widgets/stroke-style.cpp:193 msgid "Join:" msgstr "З'єднання:" @@ -10548,7 +10551,7 @@ msgid "Miter limit:" msgstr "Межа вістря:" #: ../src/live_effects/lpe-powerstroke.cpp:239 -#: ../src/widgets/stroke-style.cpp:234 +#: ../src/widgets/stroke-style.cpp:241 msgid "Maximum length of the miter (in units of stroke width)" msgstr "Найбільша довжина вістря (у одиницях товщини штриха)" @@ -10930,7 +10933,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "Кількість ліній побудови (дотичних) для малювання" #: ../src/live_effects/lpe-sketch.cpp:58 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2427 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2563 #: ../share/extensions/render_alphabetsoup.inx.h:3 msgid "Scale:" msgstr "Масштаб:" @@ -11152,7 +11155,7 @@ msgstr "" #: ../src/main.cpp:300 ../src/ui/widget/rendering-options.cpp:35 msgid "DPI" -msgstr "DPI" +msgstr "Роздільність" #: ../src/main.cpp:304 msgid "" @@ -11203,6 +11206,7 @@ msgid "The ID of the object to export" msgstr "Ідентифікатор об'єкта, що експортується" #: ../src/main.cpp:335 ../src/main.cpp:433 +#: ../src/ui/dialog/inkscape-preferences.cpp:1434 msgid "ID" msgstr "Ідентифікатор" @@ -11355,7 +11359,7 @@ msgstr "ІД-ОБ'ЄКТА" msgid "Start Inkscape in interactive shell mode." msgstr "Запустити Inkscape у режимі інтерактивної оболонки." -#: ../src/main.cpp:807 ../src/main.cpp:1159 +#: ../src/main.cpp:807 ../src/main.cpp:1164 msgid "" "[OPTIONS...] [FILE...]\n" "\n" @@ -11376,11 +11380,11 @@ msgstr "_Створити" #. " <verb verb-id=\"FileExportToOCAL\" />\n" #. " <verb verb-id=\"DialogMetadata\" />\n" -#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2580 ../src/verbs.cpp:2586 +#: ../src/menus-skeleton.h:43 ../src/verbs.cpp:2582 ../src/verbs.cpp:2588 msgid "_Edit" msgstr "_Зміни" -#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2346 +#: ../src/menus-skeleton.h:53 ../src/verbs.cpp:2348 msgid "Paste Si_ze" msgstr "Вставити за р_озміром" @@ -11569,10 +11573,10 @@ msgstr "" #: ../src/object-edit.cpp:1307 msgid "" "Roll/unroll the spiral from <b>outside</b>; with <b>Ctrl</b> to snap angle; " -"with <b>Shift</b> to scale/rotate" +"with <b>Shift</b> to scale/rotate; with <b>Alt</b> to lock radius" msgstr "" "Згорнути/розгорнути спіраль <b>зовні</b>. <b>Ctrl</b> — обмежує кут, " -"<b>Shift</b> — розтягує/обертає як ціле" +"<b>Shift</b> — розтягує/обертає як ціле. З <b>Alt</b> зі сталим радіусом." #: ../src/object-edit.cpp:1352 msgid "Adjust the <b>offset distance</b>" @@ -11944,7 +11948,7 @@ msgstr "Зв'язок:" msgid "Unique URI to a related document" msgstr "Унікальний URI пов'язаного документа" -#: ../src/rdf.cpp:264 ../src/ui/dialog/inkscape-preferences.cpp:1460 +#: ../src/rdf.cpp:264 ../src/ui/dialog/inkscape-preferences.cpp:1772 msgid "Language:" msgstr "Мова:" @@ -12130,8 +12134,8 @@ msgid "<b>Nothing</b> was deleted." msgstr "<b>Нічого</b> не було вилучено." #: ../src/selection-chemistry.cpp:374 ../src/text-context.cpp:1031 -#: ../src/ui/dialog/swatches.cpp:209 ../src/ui/dialog/swatches.cpp:275 -#: ../src/widgets/erasor-toolbar.cpp:116 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:55 +#: ../src/ui/dialog/swatches.cpp:277 ../src/widgets/erasor-toolbar.cpp:116 #: ../src/widgets/gradient-toolbar.cpp:1193 #: ../src/widgets/gradient-toolbar.cpp:1207 #: ../src/widgets/gradient-toolbar.cpp:1221 @@ -12241,7 +12245,7 @@ msgid "Select <b>object(s)</b> to remove filters from." msgstr "Виберіть <b>об'єкт(и)</b>, з яких слід вилучити фільтри." #: ../src/selection-chemistry.cpp:1207 -#: ../src/ui/dialog/filter-effects-dialog.cpp:1428 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1419 msgid "Remove filter" msgstr "Вилучити фільтр" @@ -12281,7 +12285,7 @@ msgstr "Немає нижчого шару." msgid "Select <b>object(s)</b> to move." msgstr "Позначте <b>об'єкти</b> для пересування." -#: ../src/selection-chemistry.cpp:1342 ../src/verbs.cpp:2523 +#: ../src/selection-chemistry.cpp:1342 ../src/verbs.cpp:2525 msgid "Move selection to layer" msgstr "Пересунути позначене до шару" @@ -12297,7 +12301,7 @@ msgstr "Обернути на 90° проти годинникової ст msgid "Rotate 90° CW" msgstr "Обернути на 90° за годинниковою стрілкою" -#: ../src/selection-chemistry.cpp:1690 ../src/seltrans.cpp:479 +#: ../src/selection-chemistry.cpp:1690 ../src/seltrans.cpp:471 #: ../src/ui/dialog/transformation.cpp:800 msgid "Rotate" msgstr "Обертати" @@ -12306,7 +12310,7 @@ msgstr "Обертати" msgid "Rotate by pixels" msgstr "Обертати поточково" -#: ../src/selection-chemistry.cpp:2099 ../src/seltrans.cpp:476 +#: ../src/selection-chemistry.cpp:2099 ../src/seltrans.cpp:468 #: ../src/ui/dialog/transformation.cpp:775 #: ../share/extensions/interp_att_g.inx.h:12 msgid "Scale" @@ -12325,7 +12329,7 @@ msgid "Move horizontally" msgstr "Перемістити горизонтально" #: ../src/selection-chemistry.cpp:2145 ../src/selection-chemistry.cpp:2171 -#: ../src/seltrans.cpp:473 ../src/ui/dialog/transformation.cpp:714 +#: ../src/seltrans.cpp:465 ../src/ui/dialog/transformation.cpp:714 msgid "Move" msgstr "Перемістити" @@ -12528,15 +12532,15 @@ msgid "Select <b>object(s)</b> to fit canvas to." msgstr "Оберіть <b>об'єкт(и)</b> для підбирання їхніх розмірів під полотно." #. Fit Page -#: ../src/selection-chemistry.cpp:3879 ../src/verbs.cpp:2854 +#: ../src/selection-chemistry.cpp:3879 ../src/verbs.cpp:2855 msgid "Fit Page to Selection" msgstr "Підігнати полотно до позначеної області" -#: ../src/selection-chemistry.cpp:3908 ../src/verbs.cpp:2856 +#: ../src/selection-chemistry.cpp:3908 ../src/verbs.cpp:2857 msgid "Fit Page to Drawing" msgstr "Підігнати полотно під намальоване" -#: ../src/selection-chemistry.cpp:3929 ../src/verbs.cpp:2858 +#: ../src/selection-chemistry.cpp:3929 ../src/verbs.cpp:2859 msgid "Fit Page to Selection or Drawing" msgstr "Підігнати полотно під позначену область чи область креслення" @@ -12552,7 +12556,7 @@ msgstr "Коло" #. Ellipse #: ../src/selection-describer.cpp:49 ../src/selection-describer.cpp:74 -#: ../src/ui/dialog/inkscape-preferences.cpp:397 +#: ../src/ui/dialog/inkscape-preferences.cpp:402 #: ../src/widgets/pencil-toolbar.cpp:193 msgid "Ellipse" msgstr "Еліпс" @@ -12579,13 +12583,13 @@ msgstr "Багатокутник" #. Rectangle #: ../src/selection-describer.cpp:65 -#: ../src/ui/dialog/inkscape-preferences.cpp:387 +#: ../src/ui/dialog/inkscape-preferences.cpp:392 msgid "Rectangle" msgstr "Прямокутник" #. 3D box #: ../src/selection-describer.cpp:67 -#: ../src/ui/dialog/inkscape-preferences.cpp:392 +#: ../src/ui/dialog/inkscape-preferences.cpp:397 msgid "3D Box" msgstr "Просторовий об'єкт" @@ -12607,14 +12611,14 @@ msgstr "Розтягнення контуру" #. Spiral #: ../src/selection-describer.cpp:78 -#: ../src/ui/dialog/inkscape-preferences.cpp:405 +#: ../src/ui/dialog/inkscape-preferences.cpp:410 #: ../share/extensions/gcodetools_area.inx.h:11 msgid "Spiral" msgstr "Спіраль" #. Star #: ../src/selection-describer.cpp:80 -#: ../src/ui/dialog/inkscape-preferences.cpp:401 +#: ../src/ui/dialog/inkscape-preferences.cpp:406 #: ../src/widgets/star-toolbar.cpp:482 msgid "Star" msgstr "Зірка" @@ -12734,19 +12738,19 @@ msgstr[0] "; <i>%d фільтрований об'єкт</i> " msgstr[1] "; <i>%d фільтровані об'єкти</i> " msgstr[2] "; <i>%d фільтрованих об'єктів</i> " -#: ../src/seltrans.cpp:482 ../src/ui/dialog/transformation.cpp:858 +#: ../src/seltrans.cpp:474 ../src/ui/dialog/transformation.cpp:858 msgid "Skew" msgstr "Нахил" -#: ../src/seltrans.cpp:494 +#: ../src/seltrans.cpp:486 msgid "Set center" msgstr "Встановлення центру" -#: ../src/seltrans.cpp:569 +#: ../src/seltrans.cpp:561 msgid "Stamp" msgstr "Штамп" -#: ../src/seltrans.cpp:598 +#: ../src/seltrans.cpp:590 msgid "" "<b>Squeeze or stretch</b> selection; with <b>Ctrl</b> to scale uniformly; " "with <b>Shift</b> to scale around rotation center" @@ -12754,7 +12758,7 @@ msgstr "" "<b>Стиснути чи розтягнути</b> позначені об'єкти; з <b>Ctrl</b> — зберігати " "пропорцію; з <b>Shift</b> — навколо центру обертання" -#: ../src/seltrans.cpp:599 +#: ../src/seltrans.cpp:591 msgid "" "<b>Scale</b> selection; with <b>Ctrl</b> to scale uniformly; with <b>Shift</" "b> to scale around rotation center" @@ -12762,7 +12766,7 @@ msgstr "" "<b>Змінювати розмір</b> позначених об'єктів; з <b>Ctrl</b> — зберігати " "пропорцію; з <b>Shift</b> — навколо центру обертання" -#: ../src/seltrans.cpp:603 +#: ../src/seltrans.cpp:595 msgid "" "<b>Skew</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> to " "skew around the opposite side" @@ -12770,7 +12774,7 @@ msgstr "" "<b>Нахилити</b> позначені об'єкти; з <b>Ctrl</b> — обмежувати кут; з " "<b>Shift</b> — навколо протилежного кута" -#: ../src/seltrans.cpp:604 +#: ../src/seltrans.cpp:596 msgid "" "<b>Rotate</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> " "to rotate around the opposite corner" @@ -12778,7 +12782,7 @@ msgstr "" "<b>Обертати</b> позначені об'єкти; з <b>Ctrl</b> — обмежувати кут; з " "<b>Shift</b> — навколо протилежного кута" -#: ../src/seltrans.cpp:617 +#: ../src/seltrans.cpp:609 msgid "" "<b>Center</b> of rotation and skewing: drag to reposition; scaling with " "Shift also uses this center" @@ -12786,11 +12790,11 @@ msgstr "" "<b>Центр</b> обертання та нахилу: його можна перетягнути; зміна розміру з " "Shift також відбувається навколо нього" -#: ../src/seltrans.cpp:767 +#: ../src/seltrans.cpp:759 msgid "Reset center" msgstr "Повернення до початкового центру" -#: ../src/seltrans.cpp:1004 ../src/seltrans.cpp:1101 +#: ../src/seltrans.cpp:996 ../src/seltrans.cpp:1093 #, c-format msgid "<b>Scale</b>: %0.2f%% x %0.2f%%; with <b>Ctrl</b> to lock ratio" msgstr "" @@ -12798,24 +12802,24 @@ msgstr "" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1215 +#: ../src/seltrans.cpp:1207 #, c-format msgid "<b>Skew</b>: %0.2f°; with <b>Ctrl</b> to snap angle" msgstr "<b>Нахил</b>: %0.2f°; з <b>Ctrl</b> — обмежити кут" #. TRANSLATORS: don't modify the first ";" #. (it will NOT be displayed as ";" - only the second one will be) -#: ../src/seltrans.cpp:1290 +#: ../src/seltrans.cpp:1282 #, c-format msgid "<b>Rotate</b>: %0.2f°; with <b>Ctrl</b> to snap angle" msgstr "<b>Обертання</b>: %0.2f°; з <b>Ctrl</b> — обмежити кут" -#: ../src/seltrans.cpp:1325 +#: ../src/seltrans.cpp:1317 #, c-format msgid "Move <b>center</b> to %s, %s" msgstr "Перемістити <b>центр</b> до %s, %s" -#: ../src/seltrans.cpp:1501 +#: ../src/seltrans.cpp:1493 #, c-format msgid "" "<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; " @@ -12868,7 +12872,7 @@ msgstr "Виключена область верстки" msgid "Create Guides Around the Page" msgstr "Створити напрямні навколо сторінки" -#: ../src/sp-guide.cpp:327 ../src/verbs.cpp:2420 +#: ../src/sp-guide.cpp:327 ../src/verbs.cpp:2422 msgid "Delete All Guides" msgstr "Вилучити всі напрямні" @@ -12923,7 +12927,7 @@ msgstr[0] "<b>Група</b> з <b>%d</b> об'єкта" msgstr[1] "<b>Група</b> з <b>%d</b> об'єктів" msgstr[2] "<b>Група</b> з <b>%d</b> об'єктів" -#: ../src/sp-item.cpp:973 +#: ../src/sp-item.cpp:973 ../src/verbs.cpp:212 msgid "Object" msgstr "Об'єкт" @@ -13226,26 +13230,31 @@ msgstr "<b>Нічого</b> не вибрано" #: ../src/spray-context.cpp:235 #, c-format msgid "" -"%s. Drag, click or scroll to spray <b>copies</b> of the initial selection." +"%s. Drag, click or click and scroll to spray <b>copies</b> of the initial " +"selection." msgstr "" -"%s. Перетягніть, клацніть або прокрутіть коліщатко миші, щоб розкидати " +"%s. Перетягніть, клацніть або натисніть і прокрутіть коліщатко миші, щоб " +"розкидати " "<b>копії</b> позначеної області." #: ../src/spray-context.cpp:238 #, c-format msgid "" -"%s. Drag, click or scroll to spray <b>clones</b> of the initial selection." +"%s. Drag, click or click and scroll to spray <b>clones</b> of the initial " +"selection." msgstr "" -"%s. Перетягніть, клацніть або прокрутіть коліщатко миші, щоб розкидати " +"%s. Перетягніть, клацніть або натисніть і прокрутіть коліщатко миші, щоб " +"розкидати " "<b>клони</b> позначеної області." #: ../src/spray-context.cpp:241 #, c-format msgid "" -"%s. Drag, click or scroll to spray in a <b>single path</b> of the initial " -"selection." +"%s. Drag, click or click and scroll to spray in a <b>single path</b> of the " +"initial selection." msgstr "" -"%s. Перетягніть, клацніть або прокрутіть коліщатко миші, щоб розкидати " +"%s. Перетягніть, клацніть або натисніть і прокрутіть коліщатко миші, щоб " +"розкидати " "<b>окремий контур</b> позначеної області." #: ../src/spray-context.cpp:707 @@ -13311,7 +13320,7 @@ msgstr "" "Щоб розташувати текст за контуром, контурний текст слід зробити <b>видимим</" "b>." -#: ../src/text-chemistry.cpp:195 ../src/verbs.cpp:2440 +#: ../src/text-chemistry.cpp:195 ../src/verbs.cpp:2442 msgid "Put text on path" msgstr "Розмістити текст вздовж контуру" @@ -13323,7 +13332,7 @@ msgstr "Позначте <b>текст вздовж контуру</b>, щоб msgid "<b>No texts-on-paths</b> in the selection." msgstr "У позначеному <b>немає тексту на контурі</b>." -#: ../src/text-chemistry.cpp:231 ../src/verbs.cpp:2442 +#: ../src/text-chemistry.cpp:231 ../src/verbs.cpp:2444 msgid "Remove text from path" msgstr "Зняти текст з контуру" @@ -13536,9 +13545,11 @@ msgstr "Щоб коригувати контур штовханням, позн #: ../src/tools-switch.cpp:147 msgid "" -"<b>Drag</b>, <b>click</b> or <b>scroll</b> to spray the selected objects." +"<b>Drag</b>, <b>click</b> or <b>click and scroll</b> to spray the selected " +"objects." msgstr "" -"<b>Перетягніть</b>, <b>клацніть</b> або <b>покрутіть коліщатко</b>, щоб " +"<b>Перетягніть</b>, <b>клацніть</b> або <b>клацніть і покрутіть коліщатко</b>" +", щоб " "розкидати позначені об'єкти." #: ../src/tools-switch.cpp:153 @@ -13998,7 +14009,7 @@ msgid "Rearrange" msgstr "Перевпорядкувати" #: ../src/ui/dialog/align-and-distribute.cpp:900 -#: ../src/widgets/toolbox.cpp:1775 +#: ../src/widgets/toolbox.cpp:1776 msgid "Nodes" msgstr "Вузли" @@ -14011,53 +14022,53 @@ msgid "_Treat selection as group: " msgstr "Вва_жати вибране групою: " #. Align -#: ../src/ui/dialog/align-and-distribute.cpp:921 ../src/verbs.cpp:2876 -#: ../src/verbs.cpp:2877 +#: ../src/ui/dialog/align-and-distribute.cpp:921 ../src/verbs.cpp:2877 +#: ../src/verbs.cpp:2878 msgid "Align right edges of objects to the left edge of the anchor" msgstr "Вирівняти праві краї об'єктів до лівого краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:924 ../src/verbs.cpp:2878 -#: ../src/verbs.cpp:2879 +#: ../src/ui/dialog/align-and-distribute.cpp:924 ../src/verbs.cpp:2879 +#: ../src/verbs.cpp:2880 msgid "Align left edges" msgstr "Вирівняти ліві сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:927 ../src/verbs.cpp:2880 -#: ../src/verbs.cpp:2881 +#: ../src/ui/dialog/align-and-distribute.cpp:927 ../src/verbs.cpp:2881 +#: ../src/verbs.cpp:2882 msgid "Center on vertical axis" msgstr "Центрувати за вертикальною віссю" -#: ../src/ui/dialog/align-and-distribute.cpp:930 ../src/verbs.cpp:2882 -#: ../src/verbs.cpp:2883 +#: ../src/ui/dialog/align-and-distribute.cpp:930 ../src/verbs.cpp:2883 +#: ../src/verbs.cpp:2884 msgid "Align right sides" msgstr "Вирівняти праві сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:933 ../src/verbs.cpp:2884 -#: ../src/verbs.cpp:2885 +#: ../src/ui/dialog/align-and-distribute.cpp:933 ../src/verbs.cpp:2885 +#: ../src/verbs.cpp:2886 msgid "Align left edges of objects to the right edge of the anchor" msgstr "Вирівняти ліві краї об'єктів до правого краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:936 ../src/verbs.cpp:2886 -#: ../src/verbs.cpp:2887 +#: ../src/ui/dialog/align-and-distribute.cpp:936 ../src/verbs.cpp:2887 +#: ../src/verbs.cpp:2888 msgid "Align bottom edges of objects to the top edge of the anchor" msgstr "Вирівняти нижні краї об'єктів до верхнього краю якоря" -#: ../src/ui/dialog/align-and-distribute.cpp:939 ../src/verbs.cpp:2888 -#: ../src/verbs.cpp:2889 +#: ../src/ui/dialog/align-and-distribute.cpp:939 ../src/verbs.cpp:2889 +#: ../src/verbs.cpp:2890 msgid "Align top edges" msgstr "Вирівняти верхні сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:942 ../src/verbs.cpp:2890 -#: ../src/verbs.cpp:2891 +#: ../src/ui/dialog/align-and-distribute.cpp:942 ../src/verbs.cpp:2891 +#: ../src/verbs.cpp:2892 msgid "Center on horizontal axis" msgstr "Центрувати на горизонтальній осі" -#: ../src/ui/dialog/align-and-distribute.cpp:945 ../src/verbs.cpp:2892 -#: ../src/verbs.cpp:2893 +#: ../src/ui/dialog/align-and-distribute.cpp:945 ../src/verbs.cpp:2893 +#: ../src/verbs.cpp:2894 msgid "Align bottom edges" msgstr "Вирівняти нижні сторони" -#: ../src/ui/dialog/align-and-distribute.cpp:948 ../src/verbs.cpp:2894 -#: ../src/verbs.cpp:2895 +#: ../src/ui/dialog/align-and-distribute.cpp:948 ../src/verbs.cpp:2895 +#: ../src/verbs.cpp:2896 msgid "Align top edges of objects to the bottom edge of the anchor" msgstr "Вирівняти верхні краї об'єктів до нижнього краю якоря" @@ -14160,42 +14171,47 @@ msgstr "Розподілити вибрані вузли по горизонта msgid "Distribute selected nodes vertically" msgstr "Розподілити вибрані вузли по вертикалі" -#: ../src/ui/dialog/align-and-distribute.cpp:1044 -#: ../src/ui/dialog/align-and-distribute.cpp:1052 +#. Rest of the widgetry +#: ../src/ui/dialog/align-and-distribute.cpp:1043 msgid "Last selected" msgstr "Останній позначений" -#: ../src/ui/dialog/align-and-distribute.cpp:1045 -#: ../src/ui/dialog/align-and-distribute.cpp:1053 +#: ../src/ui/dialog/align-and-distribute.cpp:1044 msgid "First selected" msgstr "Перший позначений" -#: ../src/ui/dialog/align-and-distribute.cpp:1046 -#: ../src/ui/dialog/align-and-distribute.cpp:1054 +#: ../src/ui/dialog/align-and-distribute.cpp:1045 msgid "Biggest object" msgstr "Найбільший об'єкт" -#: ../src/ui/dialog/align-and-distribute.cpp:1047 -#: ../src/ui/dialog/align-and-distribute.cpp:1055 +#: ../src/ui/dialog/align-and-distribute.cpp:1046 msgid "Smallest object" msgstr "Найменший об'єкт" -#: ../src/ui/dialog/align-and-distribute.cpp:1050 -#: ../src/ui/dialog/align-and-distribute.cpp:1058 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1543 -#: ../src/widgets/desktop-widget.cpp:1930 +#: ../src/ui/dialog/align-and-distribute.cpp:1049 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1550 ../src/verbs.cpp:174 +#: ../src/widgets/desktop-widget.cpp:1907 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "позначене" -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:39 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:33 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:118 +msgid "Edit profile" +msgstr "Змінити профіль" + +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:41 msgid "Profile name:" msgstr "Назва профілю:" -#: ../src/ui/dialog/calligraphic-profile-rename.cpp:53 +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:60 msgid "Save" msgstr "Зберегти" +#: ../src/ui/dialog/calligraphic-profile-rename.cpp:114 +msgid "Add profile" +msgstr "Додати профіль" + #: ../src/ui/dialog/color-item.cpp:122 #, c-format msgid "" @@ -14244,23 +14260,23 @@ msgstr "Перехоплювати повідомлення журналу" msgid "Release log messages" msgstr "Вимкнути повідомлення журналу" -#: ../src/ui/dialog/document-metadata.cpp:71 +#: ../src/ui/dialog/document-metadata.cpp:88 #: ../src/ui/dialog/document-properties.cpp:150 msgid "Metadata" msgstr "Метадані" -#: ../src/ui/dialog/document-metadata.cpp:72 +#: ../src/ui/dialog/document-metadata.cpp:89 #: ../src/ui/dialog/document-properties.cpp:151 msgid "License" msgstr "Ліцензія" -#: ../src/ui/dialog/document-metadata.cpp:153 -#: ../src/ui/dialog/document-properties.cpp:771 +#: ../src/ui/dialog/document-metadata.cpp:126 +#: ../src/ui/dialog/document-properties.cpp:763 msgid "<b>Dublin Core Entities</b>" msgstr "<b>Пункти Dublin Core</b>" -#: ../src/ui/dialog/document-metadata.cpp:175 -#: ../src/ui/dialog/document-properties.cpp:807 +#: ../src/ui/dialog/document-metadata.cpp:168 +#: ../src/ui/dialog/document-properties.cpp:799 msgid "<b>License</b>" msgstr "<b>Ліцензія</b>" @@ -14297,9 +14313,11 @@ msgstr "Ко_лір тла:" #: ../src/ui/dialog/document-properties.cpp:106 msgid "" -"Color and transparency of the page background (also used for bitmap export)" +"Color of the page background. Note: transparency setting ignored while " +"editing but used when exporting to bitmap." msgstr "" -"Колір та прозорість тла сторінки (враховується при експортуванні у растр)" +"Колір тла сторінки. Зауваження: параметр прозорості буде проігноровано під " +"час редагування, але враховано під час експортування до растра." #: ../src/ui/dialog/document-properties.cpp:107 msgid "Border _color:" @@ -14488,11 +14506,11 @@ msgid "Remove selected grid." msgstr "Вилучити вибрану сітку." #: ../src/ui/dialog/document-properties.cpp:145 -#: ../src/widgets/toolbox.cpp:1882 +#: ../src/widgets/toolbox.cpp:1883 msgid "Guides" msgstr "Напрямні" -#: ../src/ui/dialog/document-properties.cpp:147 ../src/verbs.cpp:2690 +#: ../src/ui/dialog/document-properties.cpp:147 ../src/verbs.cpp:2692 msgid "Snap" msgstr "Прилипання" @@ -14540,131 +14558,131 @@ msgstr "<b>Інше</b>" #. Inkscape::GC::release(defsRepr); #. inform the document, so we can undo #. Color Management -#: ../src/ui/dialog/document-properties.cpp:431 ../src/verbs.cpp:2870 +#: ../src/ui/dialog/document-properties.cpp:423 ../src/verbs.cpp:2871 msgid "Link Color Profile" msgstr "Пов'язати профіль кольорів" -#: ../src/ui/dialog/document-properties.cpp:532 +#: ../src/ui/dialog/document-properties.cpp:524 msgid "Remove linked color profile" msgstr "Вилучити пов'язаний профіль кольорів" -#: ../src/ui/dialog/document-properties.cpp:545 +#: ../src/ui/dialog/document-properties.cpp:537 msgid "<b>Linked Color Profiles:</b>" msgstr "<b>Пов'язані профілі кольорів:</b>" -#: ../src/ui/dialog/document-properties.cpp:547 +#: ../src/ui/dialog/document-properties.cpp:539 msgid "<b>Available Color Profiles:</b>" msgstr "<b>Доступні профілі кольорів:</b>" -#: ../src/ui/dialog/document-properties.cpp:549 +#: ../src/ui/dialog/document-properties.cpp:541 msgid "Link Profile" msgstr "Пов'язати з профілем" -#: ../src/ui/dialog/document-properties.cpp:552 +#: ../src/ui/dialog/document-properties.cpp:544 msgid "Unlink Profile" msgstr "Від'єднати від профілю" -#: ../src/ui/dialog/document-properties.cpp:581 +#: ../src/ui/dialog/document-properties.cpp:573 msgid "Profile Name" msgstr "Назва профілю" -#: ../src/ui/dialog/document-properties.cpp:617 +#: ../src/ui/dialog/document-properties.cpp:609 msgid "External scripts" msgstr "Зовнішні скрипти" -#: ../src/ui/dialog/document-properties.cpp:618 +#: ../src/ui/dialog/document-properties.cpp:610 msgid "Embedded scripts" msgstr "Вбудовані скрипти" -#: ../src/ui/dialog/document-properties.cpp:623 +#: ../src/ui/dialog/document-properties.cpp:615 msgid "<b>External script files:</b>" msgstr "<b>Файли зовнішніх скриптів:</b>" -#: ../src/ui/dialog/document-properties.cpp:625 +#: ../src/ui/dialog/document-properties.cpp:617 msgid "Add the current file name or browse for a file" msgstr "Додайте назву поточного файла або вкажіть якийсь файл" -#: ../src/ui/dialog/document-properties.cpp:628 -#: ../src/ui/dialog/document-properties.cpp:667 +#: ../src/ui/dialog/document-properties.cpp:620 +#: ../src/ui/dialog/document-properties.cpp:659 #: ../src/ui/widget/selected-style.cpp:326 msgid "Remove" msgstr "Вилучити" -#: ../src/ui/dialog/document-properties.cpp:654 +#: ../src/ui/dialog/document-properties.cpp:646 msgid "Filename" msgstr "Назва файла" -#: ../src/ui/dialog/document-properties.cpp:662 +#: ../src/ui/dialog/document-properties.cpp:654 msgid "<b>Embedded script files:</b>" msgstr "<b>Файли вбудованих скриптів:</b>" -#: ../src/ui/dialog/document-properties.cpp:664 +#: ../src/ui/dialog/document-properties.cpp:656 msgid "New" msgstr "Створити" -#: ../src/ui/dialog/document-properties.cpp:700 +#: ../src/ui/dialog/document-properties.cpp:692 msgid "Script id" msgstr "Ід. скрипту" -#: ../src/ui/dialog/document-properties.cpp:706 +#: ../src/ui/dialog/document-properties.cpp:698 msgid "<b>Content:</b>" msgstr "<b>Вміст:</b>" -#: ../src/ui/dialog/document-properties.cpp:789 +#: ../src/ui/dialog/document-properties.cpp:781 msgid "_Save as default" msgstr "З_берегти як типові" -#: ../src/ui/dialog/document-properties.cpp:790 +#: ../src/ui/dialog/document-properties.cpp:782 msgid "Save this metadata as the default metadata" msgstr "Зберегти ці метадані як типові метадані" -#: ../src/ui/dialog/document-properties.cpp:791 +#: ../src/ui/dialog/document-properties.cpp:783 msgid "Use _default" msgstr "Використовувати _типові" -#: ../src/ui/dialog/document-properties.cpp:792 +#: ../src/ui/dialog/document-properties.cpp:784 msgid "Use the previously saved default metadata here" msgstr "Скористатися тут раніше збереженими типовими метаданими" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:842 +#: ../src/ui/dialog/document-properties.cpp:834 msgid "Add external script..." msgstr "Додати зовнішній скрипт…" -#: ../src/ui/dialog/document-properties.cpp:881 +#: ../src/ui/dialog/document-properties.cpp:873 msgid "Select a script to load" msgstr "Виберіть скрипт для завантаження" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:909 +#: ../src/ui/dialog/document-properties.cpp:901 msgid "Add embedded script..." msgstr "Додати вбудований скрипт…" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:940 +#: ../src/ui/dialog/document-properties.cpp:932 msgid "Remove external script" msgstr "Вилучити зовнішній скрипт" #. inform the document, so we can undo -#: ../src/ui/dialog/document-properties.cpp:974 +#: ../src/ui/dialog/document-properties.cpp:966 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:1074 +#: ../src/ui/dialog/document-properties.cpp:1066 msgid "Edit embedded script" msgstr "Редагувати вбудований скрипт" -#: ../src/ui/dialog/document-properties.cpp:1157 +#: ../src/ui/dialog/document-properties.cpp:1149 msgid "<b>Creation</b>" msgstr "<b>Створення</b>" -#: ../src/ui/dialog/document-properties.cpp:1158 +#: ../src/ui/dialog/document-properties.cpp:1150 msgid "<b>Defined grids</b>" msgstr "<b>Визначені сітки</b>" -#: ../src/ui/dialog/document-properties.cpp:1390 +#: ../src/ui/dialog/document-properties.cpp:1378 msgid "Remove grid" msgstr "Вилучити сітку" @@ -14672,8 +14690,8 @@ msgstr "Вилучити сітку" msgid "Information" msgstr "Інформація" -#: ../src/ui/dialog/extension-editor.cpp:82 -#: ../share/extensions/color_custom.inx.h:7 +#: ../src/ui/dialog/extension-editor.cpp:82 ../src/verbs.cpp:289 +#: ../src/verbs.cpp:308 ../share/extensions/color_custom.inx.h:7 #: ../share/extensions/color_HSL_adjust.inx.h:11 #: ../share/extensions/color_randomize.inx.h:6 #: ../share/extensions/dots.inx.h:7 @@ -14744,84 +14762,84 @@ msgstr "Дозволити перегляд" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:774 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:790 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:283 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:414 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:284 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:415 msgid "All Files" msgstr "Усі файли" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:771 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:787 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:802 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:284 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:285 msgid "All Inkscape Files" msgstr "Усі файли Inkscape" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:778 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:794 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:808 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:285 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 msgid "All Images" msgstr "Усі зображення" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:781 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:797 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:811 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:286 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:287 msgid "All Vectors" msgstr "Всі векторні" #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:784 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:800 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:814 -#: ../src/ui/dialog/filedialogimpl-win32.cpp:287 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:288 msgid "All Bitmaps" msgstr "Всі растрові" #. ###### File options #. ###### Do we want the .xxx extension automatically added? #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1043 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1604 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1611 msgid "Append filename extension automatically" msgstr "Додавати розширення файла автоматично" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1210 -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1468 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1221 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1475 msgid "Guess from extension" msgstr "Визначити з розширення" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1489 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1496 msgid "Left edge of source" msgstr "Лівий край джерела" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1490 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 msgid "Top edge of source" msgstr "Верхній край джерела" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1491 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1498 msgid "Right edge of source" msgstr "Правий край джерела" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1492 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1499 msgid "Bottom edge of source" msgstr "Нижній край джерела" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1493 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1500 msgid "Source width" msgstr "Ширина джерела" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1494 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501 msgid "Source height" msgstr "Висота джерела" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1495 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1502 msgid "Destination width" msgstr "Ширина призначення" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1496 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1503 msgid "Destination height" msgstr "Висота призначення" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1504 msgid "Resolution (dots per inch)" msgstr "Роздільна здатність (у т./дюйм)" @@ -14829,52 +14847,52 @@ msgstr "Роздільна здатність (у т./дюйм)" #. ## EXTRA WIDGET -- SOURCE SIDE #. ######################################### #. ##### Export options buttons/spinners, etc -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1535 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1542 msgid "Document" msgstr "Документ" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1547 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1554 msgctxt "Export dialog" msgid "Custom" msgstr "Нетипове" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1567 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1574 msgid "Source" msgstr "Джерело" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1587 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1594 msgid "Cairo" msgstr "Cairo" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1590 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1597 msgid "Antialias" msgstr "Плавне змінювання" -#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1616 +#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1623 msgid "Destination" msgstr "Призначення" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:415 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:416 msgid "All Executable Files" msgstr "Усі виконувані файли" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:607 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:608 msgid "Show Preview" msgstr "Показати попередній перегляд" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:745 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:746 msgid "No file selected" msgstr "Не вибрано файла" -#: ../src/ui/dialog/fill-and-stroke.cpp:58 +#: ../src/ui/dialog/fill-and-stroke.cpp:59 msgid "_Fill" msgstr "_Заповнення" -#: ../src/ui/dialog/fill-and-stroke.cpp:59 +#: ../src/ui/dialog/fill-and-stroke.cpp:60 msgid "Stroke _paint" msgstr "_Колір штриха" -#: ../src/ui/dialog/fill-and-stroke.cpp:60 +#: ../src/ui/dialog/fill-and-stroke.cpp:61 msgid "Stroke st_yle" msgstr "С_тиль штриха" @@ -14994,107 +15012,107 @@ msgstr "" msgid "New light source" msgstr "Нове джерело світла" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1096 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1092 msgid "_Duplicate" msgstr "_Дублювати" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1130 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1126 msgid "_Filter" msgstr "_Фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1149 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1140 msgid "R_ename" msgstr "Пере_йменувати" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1278 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1269 msgid "Rename filter" msgstr "Перейменувати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1315 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1306 msgid "Apply filter" msgstr "Застосувати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1385 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1376 msgid "filter" msgstr "фільтрувати" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1392 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1383 msgid "Add filter" msgstr "Додати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1444 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1435 msgid "Duplicate filter" msgstr "Дублювати фільтр" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1507 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1534 msgid "_Effect" msgstr "_Ефект" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1515 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1543 msgid "Connections" msgstr "З'єднання" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1653 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1681 msgid "Remove filter primitive" msgstr "Вилучити примітив фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2110 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2241 msgid "Remove merge node" msgstr "Вилучити вузол об'єднання" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2230 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2361 msgid "Reorder filter primitive" msgstr "Зміна порядку примітивів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2282 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2413 msgid "Add Effect:" msgstr "Додати ефект:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2283 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2414 msgid "No effect selected" msgstr "Не вибрано жодного ефекту" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2284 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2415 msgid "No filter selected" msgstr "Не вибрано жодного фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2322 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2458 msgid "Effect parameters" msgstr "Параметри ефекту" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2323 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2459 msgid "Filter General Settings" msgstr "Загальні параметри фільтра" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2379 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2515 msgid "Coordinates:" msgstr "Координати:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2379 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2515 msgid "X coordinate of the left corners of filter effects region" msgstr "Координата X лівих кутів області дії ефектів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2379 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2515 msgid "Y coordinate of the upper corners of filter effects region" msgstr "Координата X верхніх кутів області дії ефектів фільтра" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2380 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2516 msgid "Dimensions:" msgstr "Розміри:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2380 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2516 msgid "Width of filter effects region" msgstr "Ширина області дії ефектів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2380 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2516 msgid "Height of filter effects region" msgstr "Висота області дії ефектів фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2386 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2522 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 " @@ -15105,23 +15123,23 @@ msgstr "" "матрицю значень розміром 5×4. Інші варіанти — це простий спосіб виконати " "найпростіші операції без визначення всієї матриці вручну." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2387 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2523 msgid "Value(s):" msgstr "Значення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2402 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2442 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2538 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2578 msgid "Operator:" msgstr "Оператор:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2403 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2539 msgid "K1:" msgstr "K1:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2403 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2404 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2405 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2406 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2539 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2540 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2542 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 " @@ -15131,38 +15149,38 @@ msgstr "" "за формулою k1*i1*i2 + k2*i1 + k3*i2 + k4, де i1 і i2 — значення пікселів " "першого і другого вхідних значень відповідно." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2404 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2540 msgid "K2:" msgstr "K2:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2405 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 msgid "K3:" msgstr "K3:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2406 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2542 msgid "K4:" msgstr "K4:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2409 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 msgid "Size:" msgstr "Розмір:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2409 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 msgid "width of the convolve matrix" msgstr "ширина матриці згортки" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2409 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 msgid "height of the convolve matrix" msgstr "висота матриці згортки" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2410 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 #: ../src/ui/dialog/object-attributes.cpp:47 msgid "Target:" msgstr "Target:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2410 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 msgid "" "X coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." @@ -15170,7 +15188,7 @@ msgstr "" "Координата X кінцевої точки матриці згортки. Згортка застосовується до " "пікселів навколо цієї точки." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2410 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 msgid "" "Y coordinate of the target point in the convolve matrix. The convolution is " "applied to pixels around this point." @@ -15179,11 +15197,11 @@ msgstr "" "пікселів навколо цієї точки." #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix) -#: ../src/ui/dialog/filter-effects-dialog.cpp:2412 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2548 msgid "Kernel:" msgstr "Ядро:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2412 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2548 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 " @@ -15198,11 +15216,11 @@ msgstr "" "у той час, як матриця, заповнена сталим ненульовим значенням дасть звичайний " "ефект розмивання." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2414 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2550 msgid "Divisor:" msgstr "Дільник:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2414 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2550 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 " @@ -15214,11 +15232,11 @@ msgstr "" "кольору. Дільник, що є сумою всіх значень матриці, приглушує загальну " "інтенсивність кольорів остаточного зображення." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2415 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2551 msgid "Bias:" msgstr "Зміщення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2415 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2551 msgid "" "This value is added to each component. This is useful to define a constant " "value as the zero response of the filter." @@ -15226,11 +15244,11 @@ msgstr "" "Це значення додається до кожного компонента. Корисно для задання сталої, як " "нульового відгуку фільтра." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2416 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2552 msgid "Edge Mode:" msgstr "Режим країв:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2416 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2552 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 " @@ -15240,31 +15258,31 @@ msgstr "" "щоб матричні операції могли працювати з ядром, розташованим на краю " "зображення або поблизу нього." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2417 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2553 msgid "Preserve Alpha" msgstr "Зберігати α-канал" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2417 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2553 msgid "If set, the alpha channel won't be altered by this filter primitive." msgstr "Якщо встановлено, α-канал не буде змінено цим примітивом фільтра." #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2420 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2556 msgid "Diffuse Color:" msgstr "Колір дифузії:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2420 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2453 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2556 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2589 msgid "Defines the color of the light source" msgstr "Визначає колір джерела світла" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2421 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2454 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2557 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2590 msgid "Surface Scale:" -msgstr "Масштаб поверхні?" +msgstr "Масштаб поверхні:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2421 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2454 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2557 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2590 msgid "" "This value amplifies the heights of the bump map defined by the input alpha " "channel" @@ -15272,59 +15290,59 @@ msgstr "" "Це значення визначає множник висоти карти рельєфу, що задається вхідним α-" "каналом" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2422 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2455 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2558 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2591 msgid "Constant:" msgstr "Константа:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2422 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2455 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2558 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2591 msgid "This constant affects the Phong lighting model." msgstr "Ця стала стосується моделі освітлення Фонга" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2423 -#: ../src/ui/dialog/filter-effects-dialog.cpp:2457 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2559 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2593 msgid "Kernel Unit Length:" msgstr "Одиниця довжини у ядрі:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2427 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2563 msgid "This defines the intensity of the displacement effect." msgstr "Ця величина визначає інтенсивність ефекту зміщення." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2428 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2564 msgid "X displacement:" msgstr "Зміщення за X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2428 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2564 msgid "Color component that controls the displacement in the X direction" msgstr "Компонент кольору, що керує зміщенням у напрямку осі X" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2429 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2565 msgid "Y displacement:" msgstr "Зміщення за Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2429 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2565 msgid "Color component that controls the displacement in the Y direction" msgstr "Компонент кольору, що керує зміщенням у напрямку осі Y" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2432 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2568 msgid "Flood Color:" msgstr "Колір заливки:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2432 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2568 msgid "The whole filter region will be filled with this color." msgstr "Всю область дії фільтра буде залито цим кольором." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2436 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2572 msgid "Standard Deviation:" msgstr "Стандартне відхилення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2436 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2572 msgid "The standard deviation for the blur operation." msgstr "Стандартне відхилення під час виконання операції розмивання" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2442 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2578 msgid "" "Erode: performs \"thinning\" of input image.\n" "Dilate: performs \"fattenning\" of input image." @@ -15332,41 +15350,41 @@ msgstr "" "Ерозія: виконує «витончення» вхідного зображення\n" "Розтягування: «потовщує» вхідне зображення" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2446 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2582 msgid "Source of Image:" msgstr "Джерело зображення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2449 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2585 msgid "Delta X:" msgstr "Крок за X:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2449 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2585 msgid "This is how far the input image gets shifted to the right" msgstr "Визначає як далеко вхідне зображення зміщується праворуч" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2450 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2586 msgid "Delta Y:" msgstr "Крок за Y:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2450 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2586 msgid "This is how far the input image gets shifted downwards" msgstr "Визначає як далеко вхідне зображення зміщується донизу" #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2453 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2589 msgid "Specular Color:" msgstr "Колір відбиття:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2456 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2592 #: ../share/extensions/interp.inx.h:2 msgid "Exponent:" msgstr "Експонента:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2456 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2592 msgid "Exponent for specular term, larger is more \"shiny\"." msgstr "Степінь відбиття: більше значення дає «яскравіше»." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2465 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2601 msgid "" "Indicates whether the filter primitive should perform a noise or turbulence " "function." @@ -15374,27 +15392,27 @@ msgstr "" "Позначає чи повинен примітив виконувати функцію створення турбулентності або " "шуму." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2466 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2602 msgid "Base Frequency:" msgstr "Опорна частота:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2467 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2603 msgid "Octaves:" msgstr "Октави:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2468 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2604 msgid "Seed:" msgstr "Випадкове значення:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2468 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2604 msgid "The starting number for the pseudo random number generator." msgstr "Початкове число для генератора псевдовипадкових чисел." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2480 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2616 msgid "Add filter primitive" msgstr "Додати примітив фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2497 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2633 msgid "" "The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, " "multiply, darken and lighten." @@ -15402,7 +15420,7 @@ msgstr "" "Примітив фільтра <b>feBlend</b> надає можливість використовувати 4 режими " "змішування: просвічування, множення, темнішання та світлішання." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2637 msgid "" "The <b>feColorMatrix</b> filter primitive applies a matrix transformation to " "color of each rendered pixel. This allows for effects like turning object to " @@ -15412,7 +15430,7 @@ msgstr "" "кольору до кожної відображеної точки. Все це включає до себе перетворення " "об'єкта до півтонів сірого, зміну насиченості кольору і зміну відтінку." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2505 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2641 msgid "" "The <b>feComponentTransfer</b> filter primitive manipulates the input's " "color components (red, green, blue, and alpha) according to particular " @@ -15424,7 +15442,7 @@ msgstr "" "з окремими функціями переходу, роблячи можливим операції на зразок " "регулювання яскравості і контрасту, баланс кольорів та постеризацію." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2509 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2645 msgid "" "The <b>feComposite</b> filter primitive composites two images using one of " "the Porter-Duff blending modes or the arithmetic mode described in SVG " @@ -15436,7 +15454,7 @@ msgstr "" "описаного у стандарті SVG. Режими змішування Портера-Даффа по суті є " "булівськими операціями між значеннями кольорів відповідних точок зображень." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2513 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2649 msgid "" "The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on " "the image. Common effects created using convolution matrices are blur, " @@ -15451,7 +15469,7 @@ msgstr "" "за допомогою цього примітиву фільтра, особливий примітив фільтра для " "Гаусового розмивання є швидшим та незалежним від роздільної здатності." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2517 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2653 msgid "" "The <b>feDiffuseLighting</b> and feSpecularLighting filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -15463,7 +15481,7 @@ msgstr "" "використовується для відтворення глибини: непрозоріші області наближаються " "до глядача, а прозоріші — віддаляються." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2521 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2657 msgid "" "The <b>feDisplacementMap</b> filter primitive displaces the pixels in the " "first input using the second input as a displacement map, that shows from " @@ -15475,7 +15493,7 @@ msgstr "" "у якому напрямку і на яку відстань слід змістити точку. Класичними " "прикладами фільтра є ефекти «вихор» і «затискання»." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2525 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2661 msgid "" "The <b>feFlood</b> 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 " @@ -15485,7 +15503,7 @@ msgstr "" "непрозорістю. Зазвичай, його використовують як початковий для інших " "фільтрів, з метою надати графіці кольору." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2529 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2665 msgid "" "The <b>feGaussianBlur</b> filter primitive uniformly blurs its input. It is " "commonly used together with feOffset to create a drop shadow effect." @@ -15494,7 +15512,7 @@ msgstr "" "його застосовано. Зазвичай, він використовується разом з feOffset для " "створення ефекту відкидання тіні." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2533 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2669 msgid "" "The <b>feImage</b> filter primitive fills the region with an external image " "or another part of the document." @@ -15502,7 +15520,7 @@ msgstr "" "Примітив фільтра <b>feImage</b> заливає область зовнішнім зображенням або " "іншою частиною документа." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2537 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2673 msgid "" "The <b>feMerge</b> filter primitive composites several temporary images " "inside the filter primitive to a single image. It uses normal alpha " @@ -15515,7 +15533,7 @@ msgstr "" "кратне застосування примітивів feBlend у 'звичайному' режимі або кратне " "застосування примітивів feComposite у 'над'-режимі." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2677 msgid "" "The <b>feMorphology</b> filter primitive provides erode and dilate effects. " "For single-color objects erode makes the object thinner and dilate makes it " @@ -15525,7 +15543,7 @@ msgstr "" "ерозії та розширення. Для однокольорових об'єктів ерозія робить об'єкт " "меншим, а розширення — більшим." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2545 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2681 msgid "" "The <b>feOffset</b> filter primitive offsets the image by an user-defined " "amount. For example, this is useful for drop shadows, where the shadow is in " @@ -15535,7 +15553,7 @@ msgstr "" "відстань. Це, наприклад, корисно для відображення тіней, коли тінь " "розташовано з невеликим зсувом відносно об'єкта, що її відкидає." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2549 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2685 msgid "" "The feDiffuseLighting and <b>feSpecularLighting</b> filter primitives create " "\"embossed\" shadings. The input's alpha channel is used to provide depth " @@ -15547,14 +15565,14 @@ msgstr "" "використовується для відтворення глибини: непрозоріші області наближаються " "до глядача, а прозоріші — віддаляються." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2553 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2689 msgid "" "The <b>feTile</b> filter primitive tiles a region with its input graphic" msgstr "" "Примітив фільтра <b>feTile</b> заповнює область мозаїкою у формі вхідного " "графічного зображення" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2557 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2693 msgid "" "The <b>feTurbulence</b> filter primitive renders Perlin noise. This kind of " "noise is useful in simulating several nature phenomena like clouds, fire and " @@ -15564,11 +15582,11 @@ msgstr "" "шумів корисний для імітації деяких природних явищ на зразок хмар, полум'я та " "диму, та під час створення складних текстур на зразок мармуру та граніту." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2576 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2712 msgid "Duplicate filter primitive" msgstr "Дублювати примітив фільтра" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2629 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2765 msgid "Set filter primitive attribute" msgstr "Встановити атрибут примітива фільтра" @@ -16462,15 +16480,15 @@ msgstr "спеціальні" msgid "Script: " msgstr "Писемність: " -#: ../src/ui/dialog/glyphs.cpp:389 +#: ../src/ui/dialog/glyphs.cpp:385 msgid "Range: " msgstr "Діапазон: " -#: ../src/ui/dialog/glyphs.cpp:457 +#: ../src/ui/dialog/glyphs.cpp:449 msgid "Append" msgstr "Додати" -#: ../src/ui/dialog/glyphs.cpp:571 +#: ../src/ui/dialog/glyphs.cpp:563 msgid "Append text" msgstr "Додати текст" @@ -16486,9 +16504,9 @@ msgstr "Пересунути і/або повернути напрямну ві msgid "_X:" msgstr "_X:" -#: ../src/ui/dialog/guides.cpp:49 ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-icc-selector.cpp:221 -#: ../src/widgets/sp-color-scales.cpp:457 +#: ../src/ui/dialog/guides.cpp:49 ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-icc-selector.cpp:218 +#: ../src/widgets/sp-color-scales.cpp:488 msgid "_Y:" msgstr "_Y:" @@ -16512,12 +16530,12 @@ msgstr "Властивості напрямної" msgid "Guideline" msgstr "Напрямна" -#: ../src/ui/dialog/guides.cpp:261 +#: ../src/ui/dialog/guides.cpp:317 #, c-format msgid "Guideline ID: %s" msgstr "Ід. напрямної: %s" -#: ../src/ui/dialog/guides.cpp:267 +#: ../src/ui/dialog/guides.cpp:323 #, c-format msgid "Current: %s" msgstr "Поточний: %s" @@ -16544,28 +16562,28 @@ msgstr "Позна_чення" msgid "Selection only or whole document" msgstr "Лише вибране або весь документ" -#: ../src/ui/dialog/inkscape-preferences.cpp:176 +#: ../src/ui/dialog/inkscape-preferences.cpp:181 msgid "Show selection cue" msgstr "Показувати підказку позначення" -#: ../src/ui/dialog/inkscape-preferences.cpp:177 +#: ../src/ui/dialog/inkscape-preferences.cpp:182 msgid "" "Whether selected objects display a selection cue (the same as in selector)" msgstr "Визначає, чи слід показувати підказку позначення (як і у селекторі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:183 +#: ../src/ui/dialog/inkscape-preferences.cpp:188 msgid "Enable gradient editing" msgstr "Увімкнути редагування градієнтів" -#: ../src/ui/dialog/inkscape-preferences.cpp:184 +#: ../src/ui/dialog/inkscape-preferences.cpp:189 msgid "Whether selected objects display gradient editing controls" msgstr "Визначає, чи буде показано засоби редагування градієнтів" -#: ../src/ui/dialog/inkscape-preferences.cpp:189 +#: ../src/ui/dialog/inkscape-preferences.cpp:194 msgid "Conversion to guides uses edges instead of bounding box" msgstr "Перетворення у напрямні використовуватиме краї об'єкта, а не рамку" -#: ../src/ui/dialog/inkscape-preferences.cpp:190 +#: ../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" @@ -16573,25 +16591,25 @@ msgstr "" "Перетворення об'єкта на напрямні, що розташовані уздовж справжніх країв " "об'єкта і відтворюють форму об'єкта, а не просто вздовж рамки об'єкта." -#: ../src/ui/dialog/inkscape-preferences.cpp:197 +#: ../src/ui/dialog/inkscape-preferences.cpp:202 msgid "Ctrl+click _dot size:" msgstr "Розмір _точки за Ctrl+клацанням:" -#: ../src/ui/dialog/inkscape-preferences.cpp:197 +#: ../src/ui/dialog/inkscape-preferences.cpp:202 msgid "times current stroke width" msgstr "товщин поточного штриха" -#: ../src/ui/dialog/inkscape-preferences.cpp:198 +#: ../src/ui/dialog/inkscape-preferences.cpp:203 msgid "Size of dots created with Ctrl+click (relative to current stroke width)" msgstr "" "Розмір точок, створених за допомогою Ctrl+клацання (у порівнянні з поточною " "товщиною штриха)" -#: ../src/ui/dialog/inkscape-preferences.cpp:213 +#: ../src/ui/dialog/inkscape-preferences.cpp:218 msgid "<b>No objects selected</b> to take the style from." msgstr "<b>Немає вибраних об'єктів</b>, звідки б можна було б узяти стиль." -#: ../src/ui/dialog/inkscape-preferences.cpp:222 +#: ../src/ui/dialog/inkscape-preferences.cpp:227 msgid "" "<b>More than one object selected.</b> Cannot take style from multiple " "objects." @@ -16599,23 +16617,23 @@ msgstr "" "<b>позначено більше ніж один об'єкт.</b> Не вдається взяти стиль від " "кількох об'єктів." -#: ../src/ui/dialog/inkscape-preferences.cpp:255 +#: ../src/ui/dialog/inkscape-preferences.cpp:260 msgid "Style of new objects" msgstr "Стиль нових об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:257 +#: ../src/ui/dialog/inkscape-preferences.cpp:262 msgid "Last used style" msgstr "Останнього використаного стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:259 +#: ../src/ui/dialog/inkscape-preferences.cpp:264 msgid "Apply the style you last set on an object" msgstr "Застосувати стиль, який ви застосовували останнім" -#: ../src/ui/dialog/inkscape-preferences.cpp:264 +#: ../src/ui/dialog/inkscape-preferences.cpp:269 msgid "This tool's own style:" msgstr "Власного стилю інструмента:" -#: ../src/ui/dialog/inkscape-preferences.cpp:268 +#: ../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." @@ -16624,62 +16642,62 @@ msgstr "" "об'єктів. Скористайтеся кнопкою внизу для встановлення цього стилю." #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:272 +#: ../src/ui/dialog/inkscape-preferences.cpp:277 msgid "Take from selection" msgstr "Взяти з позначеного" -#: ../src/ui/dialog/inkscape-preferences.cpp:277 +#: ../src/ui/dialog/inkscape-preferences.cpp:282 msgid "This tool's style of new objects" msgstr "Стиль цього інструмента нових об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:284 +#: ../src/ui/dialog/inkscape-preferences.cpp:289 msgid "Remember the style of the (first) selected object as this tool's style" msgstr "" "Запам'ятати стиль (першого) позначеного об'єкта як стиль даного інструмента" -#: ../src/ui/dialog/inkscape-preferences.cpp:289 +#: ../src/ui/dialog/inkscape-preferences.cpp:294 msgid "Tools" msgstr "Інструменти" -#: ../src/ui/dialog/inkscape-preferences.cpp:292 +#: ../src/ui/dialog/inkscape-preferences.cpp:297 msgid "Bounding box to use" msgstr "Рамка, що використовується" -#: ../src/ui/dialog/inkscape-preferences.cpp:293 +#: ../src/ui/dialog/inkscape-preferences.cpp:298 msgid "Visual bounding box" msgstr "Видима рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:295 +#: ../src/ui/dialog/inkscape-preferences.cpp:300 msgid "This bounding box includes stroke width, markers, filter margins, etc." msgstr "Ця рамка включає ширину пунктиру, маркери, поля фільтрування тощо." -#: ../src/ui/dialog/inkscape-preferences.cpp:296 +#: ../src/ui/dialog/inkscape-preferences.cpp:301 msgid "Geometric bounding box" msgstr "Геометрична рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 +#: ../src/ui/dialog/inkscape-preferences.cpp:303 msgid "This bounding box includes only the bare path" msgstr "Ця рамка включає лише простий контур" -#: ../src/ui/dialog/inkscape-preferences.cpp:300 +#: ../src/ui/dialog/inkscape-preferences.cpp:305 msgid "Conversion to guides" msgstr "Перетворення у напрямні" -#: ../src/ui/dialog/inkscape-preferences.cpp:301 +#: ../src/ui/dialog/inkscape-preferences.cpp:306 msgid "Keep objects after conversion to guides" msgstr "Зберегти об'єкти після перетворення у напрямні" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:308 msgid "" "When converting an object to guides, don't delete the object after the " "conversion" msgstr "Після перетворення об'єкта на напрямні не вилучати сам об'єкт." -#: ../src/ui/dialog/inkscape-preferences.cpp:304 +#: ../src/ui/dialog/inkscape-preferences.cpp:309 msgid "Treat groups as a single object" msgstr "Поводитися з групами як з окремим об'єктом" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 +#: ../src/ui/dialog/inkscape-preferences.cpp:311 msgid "" "Treat groups as a single object during conversion to guides rather than " "converting each child separately" @@ -16687,103 +16705,103 @@ msgstr "" "Вважати групи окремими об'єктів під час перетворення на напрямні, а не " "перетворювати кожен з елементів окремо." -#: ../src/ui/dialog/inkscape-preferences.cpp:308 +#: ../src/ui/dialog/inkscape-preferences.cpp:313 msgid "Average all sketches" msgstr "Осереднення всіх ескізів" -#: ../src/ui/dialog/inkscape-preferences.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:314 msgid "Width is in absolute units" msgstr "Ширина у абсолютних одиницях" -#: ../src/ui/dialog/inkscape-preferences.cpp:310 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Select new path" msgstr "Обрати новий контур" -#: ../src/ui/dialog/inkscape-preferences.cpp:311 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Don't attach connectors to text objects" msgstr "Не приєднувати лінії з'єднання до тексту" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:314 +#: ../src/ui/dialog/inkscape-preferences.cpp:319 msgid "Selector" msgstr "Селектор" -#: ../src/ui/dialog/inkscape-preferences.cpp:318 +#: ../src/ui/dialog/inkscape-preferences.cpp:323 msgid "When transforming, show" msgstr "При трансформації показувати" -#: ../src/ui/dialog/inkscape-preferences.cpp:319 +#: ../src/ui/dialog/inkscape-preferences.cpp:324 msgid "Objects" msgstr "Об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:321 +#: ../src/ui/dialog/inkscape-preferences.cpp:326 msgid "Show the actual objects when moving or transforming" msgstr "Показувати об'єкти повністю при переміщенні чи трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:322 +#: ../src/ui/dialog/inkscape-preferences.cpp:327 msgid "Box outline" msgstr "Рамку" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 +#: ../src/ui/dialog/inkscape-preferences.cpp:329 msgid "Show only a box outline of the objects when moving or transforming" msgstr "" "Показувати лише прямокутну рамку об'єктів при переміщенні чи трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:330 msgid "Per-object selection cue" msgstr "Окрема черга позначених об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:328 +#: ../src/ui/dialog/inkscape-preferences.cpp:333 msgid "No per-object selection indication" msgstr "позначені об'єкти ніяк не позначені" -#: ../src/ui/dialog/inkscape-preferences.cpp:329 +#: ../src/ui/dialog/inkscape-preferences.cpp:334 msgid "Mark" msgstr "Позначка" -#: ../src/ui/dialog/inkscape-preferences.cpp:331 +#: ../src/ui/dialog/inkscape-preferences.cpp:336 msgid "Each selected object has a diamond mark in the top left corner" msgstr "" "Кожен позначений об'єкт має позначку у формі ромба у лівому верхньому куті" -#: ../src/ui/dialog/inkscape-preferences.cpp:332 +#: ../src/ui/dialog/inkscape-preferences.cpp:337 msgid "Box" msgstr "Рамка" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 +#: ../src/ui/dialog/inkscape-preferences.cpp:339 msgid "Each selected object displays its bounding box" msgstr "Кожен позначений об'єкт позначений пунктирною рамкою" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:337 +#: ../src/ui/dialog/inkscape-preferences.cpp:342 msgid "Node" msgstr "Вузол" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:345 msgid "Path outline" msgstr "Обрис контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:341 +#: ../src/ui/dialog/inkscape-preferences.cpp:346 msgid "Path outline color" msgstr "Колір обрису контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:342 +#: ../src/ui/dialog/inkscape-preferences.cpp:347 msgid "Selects the color used for showing the path outline" msgstr "Обирає колір, що використовуватиметься для обрису контуру." -#: ../src/ui/dialog/inkscape-preferences.cpp:343 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Always show outline" msgstr "Завжди показувати обрис" -#: ../src/ui/dialog/inkscape-preferences.cpp:344 +#: ../src/ui/dialog/inkscape-preferences.cpp:349 msgid "Show outlines for all paths, not only invisible paths" msgstr "Показувати обриси для всіх ліній, а не лише для невидимих" -#: ../src/ui/dialog/inkscape-preferences.cpp:345 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgid "Update outline when dragging nodes" msgstr "Оновлювати обриси під час перетягування вузлів" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:351 msgid "" "Update the outline when dragging or transforming nodes; if this is off, the " "outline will only update when completing a drag" @@ -16792,11 +16810,11 @@ msgstr "" "цей пункт не буде позначено, вигляд обрису буде оновлено лише після " "завершення дії." -#: ../src/ui/dialog/inkscape-preferences.cpp:347 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "Update paths when dragging nodes" msgstr "Оновлювати контури під час перетягування вузлів" -#: ../src/ui/dialog/inkscape-preferences.cpp:348 +#: ../src/ui/dialog/inkscape-preferences.cpp:353 msgid "" "Update paths when dragging or transforming nodes; if this is off, paths will " "only be updated when completing a drag" @@ -16805,11 +16823,11 @@ msgstr "" "цей пункт не буде позначено, вигляд контуру буде оновлено лише після " "завершення дії." -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:354 msgid "Show path direction on outlines" msgstr "Показувати напрям контуру на обрисах" -#: ../src/ui/dialog/inkscape-preferences.cpp:350 +#: ../src/ui/dialog/inkscape-preferences.cpp:355 msgid "" "Visualize the direction of selected paths by drawing small arrows in the " "middle of each outline segment" @@ -16817,28 +16835,28 @@ msgstr "" "Показувати напрям позначених контурів малюванням невеличких стрілочок " "всередині кожного з сегментів обрису" -#: ../src/ui/dialog/inkscape-preferences.cpp:351 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "Show temporary path outline" msgstr "Показувати обрис тимчасового контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:352 +#: ../src/ui/dialog/inkscape-preferences.cpp:357 msgid "When hovering over a path, briefly flash its outline" msgstr "Після наведення вказівника на контур блимати його рамкою" -#: ../src/ui/dialog/inkscape-preferences.cpp:353 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "Show temporary outline for selected paths" msgstr "Показувати тимчасовий обрис для позначених контурів" -#: ../src/ui/dialog/inkscape-preferences.cpp:354 +#: ../src/ui/dialog/inkscape-preferences.cpp:359 msgid "Show temporary outline even when a path is selected for editing" msgstr "" "Показувати тимчасовий обрис, навіть якщо контур позначено для редагування" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:361 msgid "_Flash time:" msgstr "Час _блимання:" -#: ../src/ui/dialog/inkscape-preferences.cpp:356 +#: ../src/ui/dialog/inkscape-preferences.cpp:361 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 " @@ -16848,25 +16866,25 @@ msgstr "" "мілісекундах). Вкажіть 0, щоб рамку контуру було показано до того часу, доки " "вказівник не буде відведено від рамки." -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:362 msgid "Editing preferences" msgstr "Параметри редагування" -#: ../src/ui/dialog/inkscape-preferences.cpp:358 +#: ../src/ui/dialog/inkscape-preferences.cpp:363 msgid "Show transform handles for single nodes" msgstr "Показувати елементи керування перетворенням для окремих вузлів" -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Show transform handles even when only a single node is selected" msgstr "" "Показувати елементи керування перетворенням, навіть якщо позначено лише один " "вузол" -#: ../src/ui/dialog/inkscape-preferences.cpp:360 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Deleting nodes preserves shape" msgstr "Вилучення вузлів зберігає форму" -#: ../src/ui/dialog/inkscape-preferences.cpp:361 +#: ../src/ui/dialog/inkscape-preferences.cpp:366 msgid "" "Move handles next to deleted nodes to resemble original shape; hold Ctrl to " "get the other behavior" @@ -16875,31 +16893,31 @@ msgstr "" "Натисніть Ctrl, щоб скасувати таку поведінку" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:369 msgid "Tweak" msgstr "Корекція" -#: ../src/ui/dialog/inkscape-preferences.cpp:365 +#: ../src/ui/dialog/inkscape-preferences.cpp:370 msgid "Object paint style" msgstr "Стиль малювання об'єктів" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:370 -#: ../src/widgets/desktop-widget.cpp:636 +#: ../src/ui/dialog/inkscape-preferences.cpp:375 +#: ../src/widgets/desktop-widget.cpp:613 msgid "Zoom" msgstr "Масштаб" #. Measure -#: ../src/ui/dialog/inkscape-preferences.cpp:375 ../src/verbs.cpp:2624 +#: ../src/ui/dialog/inkscape-preferences.cpp:380 ../src/verbs.cpp:2626 msgctxt "ContextVerb" msgid "Measure" msgstr "Міра" -#: ../src/ui/dialog/inkscape-preferences.cpp:377 +#: ../src/ui/dialog/inkscape-preferences.cpp:382 msgid "Ignore first and last points" msgstr "Ігнорувати першу і останню точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:378 +#: ../src/ui/dialog/inkscape-preferences.cpp:383 msgid "" "The start and end of the measurement tool's control line will not be " "considered for calculating lengths. Only lengths between actual curve " @@ -16910,15 +16928,15 @@ msgstr "" "кривих." #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:381 +#: ../src/ui/dialog/inkscape-preferences.cpp:386 msgid "Shapes" msgstr "Фігури" -#: ../src/ui/dialog/inkscape-preferences.cpp:413 +#: ../src/ui/dialog/inkscape-preferences.cpp:418 msgid "Sketch mode" msgstr "Режим ескіза" -#: ../src/ui/dialog/inkscape-preferences.cpp:415 +#: ../src/ui/dialog/inkscape-preferences.cpp:420 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" @@ -16927,17 +16945,17 @@ msgstr "" "ескізів, замість осереднення старого результату з новим ескізом." #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:418 -#: ../src/ui/dialog/input.cpp:1201 +#: ../src/ui/dialog/inkscape-preferences.cpp:423 +#: ../src/ui/dialog/input.cpp:1399 msgid "Pen" msgstr "Перо" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:424 +#: ../src/ui/dialog/inkscape-preferences.cpp:429 msgid "Calligraphy" msgstr "Каліграфія" -#: ../src/ui/dialog/inkscape-preferences.cpp:428 +#: ../src/ui/dialog/inkscape-preferences.cpp:433 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" @@ -16946,7 +16964,7 @@ msgstr "" "від масштабу; інакше товщина лінії підбиратиметься так, щоб бути візуально " "однаковою за будь-якого масштабу" -#: ../src/ui/dialog/inkscape-preferences.cpp:430 +#: ../src/ui/dialog/inkscape-preferences.cpp:435 msgid "" "If on, each newly created object will be selected (deselecting previous " "selection)" @@ -16955,27 +16973,27 @@ msgstr "" "знімається попереднє позначення)" #. Text -#: ../src/ui/dialog/inkscape-preferences.cpp:433 ../src/verbs.cpp:2616 +#: ../src/ui/dialog/inkscape-preferences.cpp:438 ../src/verbs.cpp:2618 msgctxt "ContextVerb" msgid "Text" msgstr "Текст" -#: ../src/ui/dialog/inkscape-preferences.cpp:438 +#: ../src/ui/dialog/inkscape-preferences.cpp:443 msgid "Show font samples in the drop-down list" msgstr "Показувати зразки шрифтів у спадному списку" -#: ../src/ui/dialog/inkscape-preferences.cpp:439 +#: ../src/ui/dialog/inkscape-preferences.cpp:444 msgid "" "Show font samples alongside font names in the drop-down list in Text bar" msgstr "" "Показувати зразки шрифтів поряд з назвами шрифтів у спадному списку панелі " "тексту." -#: ../src/ui/dialog/inkscape-preferences.cpp:441 +#: ../src/ui/dialog/inkscape-preferences.cpp:446 msgid "Show font substitution warning dialog" msgstr "Показувати діалогове вікно попередження щодо заміни шрифтів" -#: ../src/ui/dialog/inkscape-preferences.cpp:442 +#: ../src/ui/dialog/inkscape-preferences.cpp:447 msgid "" "Show font substitution warning dialog when requested fonts are not available " "on the system" @@ -16985,25 +17003,25 @@ msgstr "" #. , _("Ex square"), _("Percent") #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT -#: ../src/ui/dialog/inkscape-preferences.cpp:448 +#: ../src/ui/dialog/inkscape-preferences.cpp:453 msgid "Text units" msgstr "Одиниці тексту" -#: ../src/ui/dialog/inkscape-preferences.cpp:450 +#: ../src/ui/dialog/inkscape-preferences.cpp:455 msgid "Text size unit type:" msgstr "Тип одиниць розміру символів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:451 +#: ../src/ui/dialog/inkscape-preferences.cpp:456 msgid "Set the type of unit used in the text toolbar and text dialogs" msgstr "" "Встановити тип одиниці на панелі інструментів тексту та у діалогових вікна " "параметрів тексту" -#: ../src/ui/dialog/inkscape-preferences.cpp:452 +#: ../src/ui/dialog/inkscape-preferences.cpp:457 msgid "Always output text size in pixels (px)" msgstr "Завжди виводити розмір символів у пікселях (пк)" -#: ../src/ui/dialog/inkscape-preferences.cpp:453 +#: ../src/ui/dialog/inkscape-preferences.cpp:458 msgid "" "Always convert the text size units above into pixels (px) before saving to " "file" @@ -17012,31 +17030,32 @@ msgstr "" "файла" #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:458 +#: ../src/ui/dialog/inkscape-preferences.cpp:463 msgid "Spray" msgstr "Розкидання" #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:463 +#: ../src/ui/dialog/inkscape-preferences.cpp:468 msgid "Eraser" msgstr "Гумка" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:467 +#: ../src/ui/dialog/inkscape-preferences.cpp:472 msgid "Paint Bucket" msgstr "Відро з фарбою" #. Gradient -#: ../src/ui/dialog/inkscape-preferences.cpp:472 -#: ../src/widgets/gradient-selector.cpp:147 +#: ../src/ui/dialog/inkscape-preferences.cpp:477 +#: ../src/widgets/gradient-selector.cpp:150 +#: ../src/widgets/gradient-selector.cpp:302 msgid "Gradient" msgstr "Градієнт" -#: ../src/ui/dialog/inkscape-preferences.cpp:474 +#: ../src/ui/dialog/inkscape-preferences.cpp:479 msgid "Prevent sharing of gradient definitions" msgstr "Не поділяти визначення градієнтів між об'єктами" -#: ../src/ui/dialog/inkscape-preferences.cpp:476 +#: ../src/ui/dialog/inkscape-preferences.cpp:481 msgid "" "When on, shared gradient definitions are automatically forked on change; " "uncheck to allow sharing of gradient definitions so that editing one object " @@ -17047,11 +17066,11 @@ msgstr "" "об'єктами так, що зміна градієнта для одного об'єкта може вплинути на інші " "об'єкти, що використовують той самий градієнт" -#: ../src/ui/dialog/inkscape-preferences.cpp:477 +#: ../src/ui/dialog/inkscape-preferences.cpp:482 msgid "Use legacy Gradient Editor" msgstr "Використовувати застарілий редактор градієнтів" -#: ../src/ui/dialog/inkscape-preferences.cpp:479 +#: ../src/ui/dialog/inkscape-preferences.cpp:484 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" @@ -17061,11 +17080,11 @@ msgstr "" "градієнтів. Якщо не буде позначено, використовуватиметься інструмент " "градієнтів нового зразка." -#: ../src/ui/dialog/inkscape-preferences.cpp:482 +#: ../src/ui/dialog/inkscape-preferences.cpp:487 msgid "Linear gradient _angle:" msgstr "_Кут лінійного градієнта:" -#: ../src/ui/dialog/inkscape-preferences.cpp:483 +#: ../src/ui/dialog/inkscape-preferences.cpp:488 msgid "" "Default angle of new linear gradients in degrees (clockwise from horizontal)" msgstr "" @@ -17073,347 +17092,347 @@ msgstr "" "від горизонталі)" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:487 +#: ../src/ui/dialog/inkscape-preferences.cpp:492 msgid "Dropper" msgstr "Піпетка" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:492 +#: ../src/ui/dialog/inkscape-preferences.cpp:497 msgid "Connector" msgstr "Лінія з'єднання" -#: ../src/ui/dialog/inkscape-preferences.cpp:495 +#: ../src/ui/dialog/inkscape-preferences.cpp:500 msgid "If on, connector attachment points will not be shown for text objects" msgstr "" "У разі вибрання кінці лінії з'єднання не буде показано для текстових об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:505 +#: ../src/ui/dialog/inkscape-preferences.cpp:510 msgid "Interface" msgstr "Інтерфейс" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "System default" msgstr "Типова системна" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Albanian (sq)" msgstr "Албанська (sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Amharic (am)" msgstr "Амхарська (am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Arabic (ar)" msgstr "Арабська (ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Armenian (hy)" msgstr "Вірменська (hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Azerbaijani (az)" msgstr "Азербайджанська (az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Basque (eu)" msgstr "Баскська (eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:508 +#: ../src/ui/dialog/inkscape-preferences.cpp:513 msgid "Belarusian (be)" msgstr "Білоруська (be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Bulgarian (bg)" msgstr "Болгарська (bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Bengali (bn)" msgstr "Бенгальська (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Bengali/Bangladesh (bn_BD)" msgstr "Бенгальська, Бангладеш (bn_BD)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Breton (br)" msgstr "Бретонська (br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Catalan (ca)" msgstr "Каталанська (ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Valencian Catalan (ca@valencia)" msgstr "Валенсійска каталанська (ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:509 +#: ../src/ui/dialog/inkscape-preferences.cpp:514 msgid "Chinese/China (zh_CN)" msgstr "Китайська/Китай (zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:510 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Chinese/Taiwan (zh_TW)" msgstr "Китайська/Тайвань (zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:510 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Croatian (hr)" msgstr "Хорватська (hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:510 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Czech (cs)" msgstr "Чеська (cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Danish (da)" msgstr "Данська (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Dutch (nl)" msgstr "Голландська (nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Dzongkha (dz)" msgstr "Джонка (dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "German (de)" msgstr "Німецька (de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Greek (el)" msgstr "Грецька (el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "English (en)" msgstr "Англійська (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "English/Australia (en_AU)" msgstr "Англійська/Австралія (en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:512 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "English/Canada (en_CA)" msgstr "Англійська/Канада (en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:512 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "English/Great Britain (en_GB)" msgstr "Англійська/Великобританія (en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:512 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Pig Latin (en_US@piglatin)" msgstr "Свиняча латина (en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:513 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Esperanto (eo)" msgstr "Есперанто (eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:513 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Estonian (et)" msgstr "Естонська (et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:513 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Farsi (fa)" msgstr "Фарсі (fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:513 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Finnish (fi)" msgstr "Фінська (fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "French (fr)" msgstr "Французька (fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Irish (ga)" msgstr "Ірландська (ga)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Galician (gl)" msgstr "Галісійська (gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Hebrew (he)" msgstr "Єврейська (he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Hungarian (hu)" msgstr "Угорська (hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Indonesian (id)" msgstr "Індонезійська (id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Italian (it)" msgstr "Італійська (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Japanese (ja)" msgstr "Японська (ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Khmer (km)" msgstr "Кхмерська (km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Kinyarwanda (rw)" msgstr "Руандійська (rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Korean (ko)" msgstr "Корейська (ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Lithuanian (lt)" msgstr "Литовська (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Latvian (lv)" msgstr "Латвійська (lv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Macedonian (mk)" msgstr "Македонська (mk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Mongolian (mn)" msgstr "Монгольська (mn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Nepali (ne)" msgstr "Непальська (ne)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Norwegian Bokmål (nb)" msgstr "Норвезька (букмол) (nb)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Norwegian Nynorsk (nn)" msgstr "Норвезька (нюноршк) (nn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Panjabi (pa)" msgstr "Пенджабі (pa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Polish (pl)" msgstr "Польська (pl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Portuguese (pt)" msgstr "Португальська (pt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Portuguese/Brazil (pt_BR)" msgstr "Португальська бразильська (pt_BR)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Romanian (ro)" msgstr "Румунська (ro)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Russian (ru)" msgstr "Російська (ru)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Serbian (sr)" msgstr "Сербська (sr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Serbian in Latin script (sr@latin)" msgstr "Сербська (латиниця) (sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Slovak (sk)" msgstr "Словацька (sk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Slovenian (sl)" msgstr "Словенська (sl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Spanish (es)" msgstr "Іспанська (es)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Spanish/Mexico (es_MX)" msgstr "Іспанська (Мексика) (es_MX)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Swedish (sv)" msgstr "Шведська (sv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Telugu (te_IN)" msgstr "Телугу (te_IN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Thai (th)" msgstr "Тайська (th)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Turkish (tr)" msgstr "Турецька (tr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Ukrainian (uk)" msgstr "Українська (uk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Vietnamese (vi)" msgstr "В'єтнамська (vi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:551 +#: ../src/ui/dialog/inkscape-preferences.cpp:556 msgid "Language (requires restart):" msgstr "Мова (потребує перезапуску):" -#: ../src/ui/dialog/inkscape-preferences.cpp:552 +#: ../src/ui/dialog/inkscape-preferences.cpp:557 msgid "Set the language for menus and number formats" msgstr "Встановити мову для пунктів меню і формату чисел" -#: ../src/ui/dialog/inkscape-preferences.cpp:555 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Large" msgstr "Великий" -#: ../src/ui/dialog/inkscape-preferences.cpp:555 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Small" msgstr "Малий" -#: ../src/ui/dialog/inkscape-preferences.cpp:555 +#: ../src/ui/dialog/inkscape-preferences.cpp:560 msgid "Smaller" msgstr "Менший" -#: ../src/ui/dialog/inkscape-preferences.cpp:559 +#: ../src/ui/dialog/inkscape-preferences.cpp:564 msgid "Toolbox icon size:" msgstr "Розмір піктограм інструментів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:560 +#: ../src/ui/dialog/inkscape-preferences.cpp:565 msgid "Set the size for the tool icons (requires restart)" msgstr "Встановити розмір основних інструментів (потрібен перезапуск)" -#: ../src/ui/dialog/inkscape-preferences.cpp:563 +#: ../src/ui/dialog/inkscape-preferences.cpp:568 msgid "Control bar icon size:" msgstr "Розмір піктограм панелі керування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:564 +#: ../src/ui/dialog/inkscape-preferences.cpp:569 msgid "" "Set the size for the icons in tools' control bars to use (requires restart)" msgstr "Вказати розмір піктограм панелі керування (потрібен перезапуск)" -#: ../src/ui/dialog/inkscape-preferences.cpp:567 +#: ../src/ui/dialog/inkscape-preferences.cpp:572 msgid "Secondary toolbar icon size:" msgstr "Розмір піктограм вторинної панелі інструментів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:568 +#: ../src/ui/dialog/inkscape-preferences.cpp:573 msgid "" "Set the size for the icons in secondary toolbars to use (requires restart)" msgstr "Вказати розмір вторинної панелі інструментів (потрібен перезапуск)" -#: ../src/ui/dialog/inkscape-preferences.cpp:571 +#: ../src/ui/dialog/inkscape-preferences.cpp:576 msgid "Work-around color sliders not drawing" msgstr "Вирішення для випадків, коли програма не малює кольорові повзунки" -#: ../src/ui/dialog/inkscape-preferences.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:578 msgid "" "When on, will attempt to work around bugs in certain GTK themes drawing " "color sliders" @@ -17421,15 +17440,15 @@ msgstr "" "Якщо позначити, програма намагатиметься уникнути вад у певних темах GTK, " "пов'язаних з малюванням кольорових повзунків." -#: ../src/ui/dialog/inkscape-preferences.cpp:578 +#: ../src/ui/dialog/inkscape-preferences.cpp:583 msgid "Clear list" msgstr "Спорожнити список" -#: ../src/ui/dialog/inkscape-preferences.cpp:581 +#: ../src/ui/dialog/inkscape-preferences.cpp:586 msgid "Maximum documents in Open _Recent:" msgstr "Максимальна кількість _недавніх документів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:582 +#: ../src/ui/dialog/inkscape-preferences.cpp:587 msgid "" "Set the maximum length of the Open Recent list in the File menu, or clear " "the list" @@ -17437,11 +17456,11 @@ msgstr "" "Максимальна довжина підменю недавніх документів у меню «Файл», за допомогою " "цього пункту можна спорожнити список" -#: ../src/ui/dialog/inkscape-preferences.cpp:585 +#: ../src/ui/dialog/inkscape-preferences.cpp:590 msgid "_Zoom correction factor (in %):" msgstr "Кое_фіцієнт виправлення масштабу (у %):" -#: ../src/ui/dialog/inkscape-preferences.cpp:586 +#: ../src/ui/dialog/inkscape-preferences.cpp:591 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 " @@ -17451,11 +17470,11 @@ msgstr "" "збігатиметься з її дійсною довжиною. Ці відомості буде використано під час " "масштабування 1:1, 1:2 тощо, щоб показувати об'єкти з істинними розмірами" -#: ../src/ui/dialog/inkscape-preferences.cpp:589 +#: ../src/ui/dialog/inkscape-preferences.cpp:594 msgid "Enable dynamic relayout for incomplete sections" msgstr "Увімкнути динамічне перекомпонування для незавершених частин" -#: ../src/ui/dialog/inkscape-preferences.cpp:591 +#: ../src/ui/dialog/inkscape-preferences.cpp:596 msgid "" "When on, will allow dynamic layout of components that are not completely " "finished being refactored" @@ -17464,11 +17483,11 @@ msgstr "" "які не було повністю завершено до зміни масштабів." #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:594 +#: ../src/ui/dialog/inkscape-preferences.cpp:599 msgid "Show filter primitives infobox" msgstr "Показувати довідку з примітивів фільтра" -#: ../src/ui/dialog/inkscape-preferences.cpp:596 +#: ../src/ui/dialog/inkscape-preferences.cpp:601 msgid "" "Show icons and descriptions for the filter primitives available at the " "filter effects dialog" @@ -17477,70 +17496,70 @@ msgstr "" "фільтра" #. Windows -#: ../src/ui/dialog/inkscape-preferences.cpp:599 +#: ../src/ui/dialog/inkscape-preferences.cpp:604 msgid "Save and restore window geometry for each document" msgstr "" "Запам'ятовувати і використовувати геометрію вікна для кожного документа" -#: ../src/ui/dialog/inkscape-preferences.cpp:600 +#: ../src/ui/dialog/inkscape-preferences.cpp:605 msgid "Remember and use last window's geometry" msgstr "Запам'ятати і використовувати останню геометрію вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:601 +#: ../src/ui/dialog/inkscape-preferences.cpp:606 msgid "Don't save window geometry" msgstr "Не зберігати геометрію вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:603 +#: ../src/ui/dialog/inkscape-preferences.cpp:608 msgid "Save and restore dialogs status" msgstr "Зберігати і відновлювати параметри діалогових вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:604 -#: ../src/ui/dialog/inkscape-preferences.cpp:631 +#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:636 msgid "Don't save dialogs status" msgstr "Не зберігати параметри діалогових вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 -#: ../src/ui/dialog/inkscape-preferences.cpp:639 +#: ../src/ui/dialog/inkscape-preferences.cpp:611 +#: ../src/ui/dialog/inkscape-preferences.cpp:644 msgid "Dockable" msgstr "Закріплюються до правого краю вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:610 +#: ../src/ui/dialog/inkscape-preferences.cpp:615 msgid "Native open/save dialogs" msgstr "Стандартні вікна відкриття і збереження" -#: ../src/ui/dialog/inkscape-preferences.cpp:611 +#: ../src/ui/dialog/inkscape-preferences.cpp:616 msgid "GTK open/save dialogs" msgstr "Вікна відкриття і збереження GTK" -#: ../src/ui/dialog/inkscape-preferences.cpp:613 +#: ../src/ui/dialog/inkscape-preferences.cpp:618 msgid "Dialogs are hidden in taskbar" msgstr "Не показувати діалоги на панелі задач" -#: ../src/ui/dialog/inkscape-preferences.cpp:614 +#: ../src/ui/dialog/inkscape-preferences.cpp:619 msgid "Save and restore documents viewport" msgstr "Зберігати і відновлювати поле зору у документах" -#: ../src/ui/dialog/inkscape-preferences.cpp:615 +#: ../src/ui/dialog/inkscape-preferences.cpp:620 msgid "Zoom when window is resized" msgstr "Масштабувати при зміні розмірів вікна" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:621 msgid "Show close button on dialogs" msgstr "Показувати кнопку закриття у діалогах" -#: ../src/ui/dialog/inkscape-preferences.cpp:619 +#: ../src/ui/dialog/inkscape-preferences.cpp:624 msgid "Aggressive" -msgstr "наполегливо" +msgstr "Примусово" -#: ../src/ui/dialog/inkscape-preferences.cpp:621 +#: ../src/ui/dialog/inkscape-preferences.cpp:626 msgid "Saving window geometry (size and position)" msgstr "Зберігати геометрію вікон (розмір і розташування)" -#: ../src/ui/dialog/inkscape-preferences.cpp:623 +#: ../src/ui/dialog/inkscape-preferences.cpp:628 msgid "Let the window manager determine placement of all windows" msgstr "Дозволити менеджеру вікон розташовувати всі вікна самостійно" -#: ../src/ui/dialog/inkscape-preferences.cpp:625 +#: ../src/ui/dialog/inkscape-preferences.cpp:630 msgid "" "Remember and use the last window's geometry (saves geometry to user " "preferences)" @@ -17548,7 +17567,7 @@ msgstr "" "Запам'ятовувати і використовувати геометрію останнього вікна (геометрія " "зберігається у налаштуваннях користувача)" -#: ../src/ui/dialog/inkscape-preferences.cpp:627 +#: ../src/ui/dialog/inkscape-preferences.cpp:632 msgid "" "Save and restore window geometry for each document (saves geometry in the " "document)" @@ -17556,11 +17575,11 @@ msgstr "" "Запам'ятовувати і відновлювати геометрію вікна для кожного документа " "(геометрія зберігається у документі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:629 +#: ../src/ui/dialog/inkscape-preferences.cpp:634 msgid "Saving dialogs status" msgstr "Збереження параметрів діалогових вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:633 +#: ../src/ui/dialog/inkscape-preferences.cpp:638 msgid "" "Save and restore dialogs status (the last open windows dialogs are saved " "when it closes)" @@ -17568,66 +17587,66 @@ msgstr "" "Зберігати і відновлювати параметри діалогових вікон (параметри останніх " "відкритих діалогових вікон зберігатимуться під час їхнього закриття)" -#: ../src/ui/dialog/inkscape-preferences.cpp:637 +#: ../src/ui/dialog/inkscape-preferences.cpp:642 msgid "Dialog behavior (requires restart)" msgstr "Поведінка діалогів (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:648 msgid "Desktop integration" msgstr "Інтеграція до стільниці" -#: ../src/ui/dialog/inkscape-preferences.cpp:645 +#: ../src/ui/dialog/inkscape-preferences.cpp:650 msgid "Use Windows like open and save dialogs" msgstr "" "Використовувати вікна подібні до вікон Windows для відкриття та збереження" -#: ../src/ui/dialog/inkscape-preferences.cpp:647 +#: ../src/ui/dialog/inkscape-preferences.cpp:652 msgid "Use GTK open and save dialogs " msgstr "Використовувати вікна GTK для відкриття та збереження " -#: ../src/ui/dialog/inkscape-preferences.cpp:651 +#: ../src/ui/dialog/inkscape-preferences.cpp:656 msgid "Dialogs on top:" -msgstr "Діалоги згори вікна:" +msgstr "Діалоги над вікном:" -#: ../src/ui/dialog/inkscape-preferences.cpp:654 +#: ../src/ui/dialog/inkscape-preferences.cpp:659 msgid "Dialogs are treated as regular windows" msgstr "Діалоги вважаються звичайними вікнами" -#: ../src/ui/dialog/inkscape-preferences.cpp:656 +#: ../src/ui/dialog/inkscape-preferences.cpp:661 msgid "Dialogs stay on top of document windows" msgstr "Діалоги залишаються над вікнами документів" -#: ../src/ui/dialog/inkscape-preferences.cpp:658 +#: ../src/ui/dialog/inkscape-preferences.cpp:663 msgid "Same as Normal but may work better with some window managers" msgstr "" "Те саме що і Звичайне, але може працювати краще з деякими віконними " "середовищами" -#: ../src/ui/dialog/inkscape-preferences.cpp:661 +#: ../src/ui/dialog/inkscape-preferences.cpp:666 msgid "Dialog Transparency" msgstr "Прозорість вікон" -#: ../src/ui/dialog/inkscape-preferences.cpp:663 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "_Opacity when focused:" msgstr "Неп_розорість при фокусуванні:" -#: ../src/ui/dialog/inkscape-preferences.cpp:665 +#: ../src/ui/dialog/inkscape-preferences.cpp:670 msgid "Opacity when _unfocused:" msgstr "Непро_зорість без фокусування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:667 +#: ../src/ui/dialog/inkscape-preferences.cpp:672 msgid "_Time of opacity change animation:" msgstr "_Час зміни непрозорості у анімації:" -#: ../src/ui/dialog/inkscape-preferences.cpp:670 +#: ../src/ui/dialog/inkscape-preferences.cpp:675 msgid "Miscellaneous" msgstr "Інше" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 +#: ../src/ui/dialog/inkscape-preferences.cpp:678 msgid "Whether dialog windows are to be hidden in the window manager taskbar" msgstr "Чи прибирати діалогові вікна з панелі завдань віконного менеджера" -#: ../src/ui/dialog/inkscape-preferences.cpp:676 +#: ../src/ui/dialog/inkscape-preferences.cpp:681 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 " @@ -17636,7 +17655,7 @@ msgstr "" "Масштабувати малюнок при зміні розмірів вікна, щоб зберегти видиму область " "(можна змінювати кнопкою над правою смугою гортання)" -#: ../src/ui/dialog/inkscape-preferences.cpp:678 +#: ../src/ui/dialog/inkscape-preferences.cpp:683 msgid "" "Save documents viewport (zoom and panning position). Useful to turn off when " "sharing version controlled files." @@ -17645,101 +17664,101 @@ msgstr "" "панорамування). Варто вимкнути, якщо файл зберігається у системі керування " "версіями." -#: ../src/ui/dialog/inkscape-preferences.cpp:680 +#: ../src/ui/dialog/inkscape-preferences.cpp:685 msgid "Whether dialog windows have a close button (requires restart)" msgstr "Чи матиме вікно діалогу кнопку закриття (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:681 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 msgid "Windows" msgstr "Вікна" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:684 +#: ../src/ui/dialog/inkscape-preferences.cpp:689 msgid "Line color when zooming out" msgstr "Колір ліній у разі зменшення масштабу" -#: ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/ui/dialog/inkscape-preferences.cpp:692 msgid "The gridlines will be shown in minor grid line color" msgstr "Лінії сітки буде показано кольором другорядних ліній сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:689 +#: ../src/ui/dialog/inkscape-preferences.cpp:694 msgid "The gridlines will be shown in major grid line color" msgstr "Лінії сітки буде показано кольором основних ліній сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:691 +#: ../src/ui/dialog/inkscape-preferences.cpp:696 msgid "Default grid settings" msgstr "Типові налаштування сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:697 -#: ../src/ui/dialog/inkscape-preferences.cpp:722 +#: ../src/ui/dialog/inkscape-preferences.cpp:702 +#: ../src/ui/dialog/inkscape-preferences.cpp:727 msgid "Grid units:" msgstr "Одиниці сітки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:702 -#: ../src/ui/dialog/inkscape-preferences.cpp:727 +#: ../src/ui/dialog/inkscape-preferences.cpp:707 +#: ../src/ui/dialog/inkscape-preferences.cpp:732 msgid "Origin X:" -msgstr "Початок по X:" +msgstr "Початок за X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:703 -#: ../src/ui/dialog/inkscape-preferences.cpp:728 +#: ../src/ui/dialog/inkscape-preferences.cpp:708 +#: ../src/ui/dialog/inkscape-preferences.cpp:733 msgid "Origin Y:" -msgstr "Початок по Y:" +msgstr "Початок за Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:708 +#: ../src/ui/dialog/inkscape-preferences.cpp:713 msgid "Spacing X:" -msgstr "Інтервал по X:" +msgstr "Інтервал за X:" -#: ../src/ui/dialog/inkscape-preferences.cpp:709 -#: ../src/ui/dialog/inkscape-preferences.cpp:731 +#: ../src/ui/dialog/inkscape-preferences.cpp:714 +#: ../src/ui/dialog/inkscape-preferences.cpp:736 msgid "Spacing Y:" -msgstr "Інтервал по Y:" +msgstr "Інтервал за Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:711 -#: ../src/ui/dialog/inkscape-preferences.cpp:712 -#: ../src/ui/dialog/inkscape-preferences.cpp:736 -#: ../src/ui/dialog/inkscape-preferences.cpp:737 +#: ../src/ui/dialog/inkscape-preferences.cpp:716 +#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:742 msgid "Minor grid line color:" msgstr "Колір другорядних ліній сітки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:712 -#: ../src/ui/dialog/inkscape-preferences.cpp:737 +#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:742 msgid "Color used for normal grid lines" msgstr "Колір, що використовуватиметься для звичайних ліній сітки." -#: ../src/ui/dialog/inkscape-preferences.cpp:713 -#: ../src/ui/dialog/inkscape-preferences.cpp:714 -#: ../src/ui/dialog/inkscape-preferences.cpp:738 -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:718 +#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/ui/dialog/inkscape-preferences.cpp:743 +#: ../src/ui/dialog/inkscape-preferences.cpp:744 msgid "Major grid line color:" msgstr "Колір основної лінії сітки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:714 -#: ../src/ui/dialog/inkscape-preferences.cpp:739 +#: ../src/ui/dialog/inkscape-preferences.cpp:719 +#: ../src/ui/dialog/inkscape-preferences.cpp:744 msgid "Color used for major (highlighted) grid lines" msgstr "Колір основних (підсвічених) ліній сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:716 -#: ../src/ui/dialog/inkscape-preferences.cpp:741 +#: ../src/ui/dialog/inkscape-preferences.cpp:721 +#: ../src/ui/dialog/inkscape-preferences.cpp:746 msgid "Major grid line every:" msgstr "Основна лінія через кожні:" -#: ../src/ui/dialog/inkscape-preferences.cpp:717 +#: ../src/ui/dialog/inkscape-preferences.cpp:722 msgid "Show dots instead of lines" msgstr "Показувати точки замість ліній" -#: ../src/ui/dialog/inkscape-preferences.cpp:718 +#: ../src/ui/dialog/inkscape-preferences.cpp:723 msgid "If set, display dots at gridpoints instead of gridlines" msgstr "Якщо позначено, замість ліній сітки показуються точки сітки" -#: ../src/ui/dialog/inkscape-preferences.cpp:790 +#: ../src/ui/dialog/inkscape-preferences.cpp:797 msgid "Input/Output" msgstr "Вхідні/Вихідні дані" -#: ../src/ui/dialog/inkscape-preferences.cpp:793 +#: ../src/ui/dialog/inkscape-preferences.cpp:800 msgid "Use current directory for \"Save As ...\"" msgstr "Використовувати для «Зберегти як…» поточний каталог" -#: ../src/ui/dialog/inkscape-preferences.cpp:795 +#: ../src/ui/dialog/inkscape-preferences.cpp:802 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 " @@ -17751,11 +17770,11 @@ msgstr "" "відкрито у каталозі, куди було збережено файл під час попереднього " "використання цього діалогового вікна." -#: ../src/ui/dialog/inkscape-preferences.cpp:797 +#: ../src/ui/dialog/inkscape-preferences.cpp:804 msgid "Add label comments to printing output" msgstr "Додати коментар до виводу друку" -#: ../src/ui/dialog/inkscape-preferences.cpp:799 +#: ../src/ui/dialog/inkscape-preferences.cpp:806 msgid "" "When on, a comment will be added to the raw print output, marking the " "rendered output for an object with its label" @@ -17763,11 +17782,11 @@ msgstr "" "Якщо увімкнено, до необробленого виводу друку буде додано коментар, що " "позначає вивід об'єкта з його позначкою" -#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:808 msgid "Add default metadata to new documents" msgstr "Додавати до нових документів типові метадані" -#: ../src/ui/dialog/inkscape-preferences.cpp:803 +#: ../src/ui/dialog/inkscape-preferences.cpp:810 msgid "" "Add default metadata to new documents. Default metadata can be set from " "Document Properties->Metadata." @@ -17775,19 +17794,19 @@ msgstr "" "Додавати до нових документів типові метадані. Змінити типові метадані можна " "за допомогою пункту меню «Властивості документа -> Mетадані»." -#: ../src/ui/dialog/inkscape-preferences.cpp:807 +#: ../src/ui/dialog/inkscape-preferences.cpp:814 msgid "_Grab sensitivity:" msgstr "Раді_ус захоплення:" -#: ../src/ui/dialog/inkscape-preferences.cpp:807 -#: ../src/ui/dialog/inkscape-preferences.cpp:810 -#: ../src/ui/dialog/inkscape-preferences.cpp:1154 -#: ../src/ui/dialog/inkscape-preferences.cpp:1158 -#: ../src/ui/dialog/inkscape-preferences.cpp:1168 +#: ../src/ui/dialog/inkscape-preferences.cpp:814 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:1149 +#: ../src/ui/dialog/inkscape-preferences.cpp:1153 +#: ../src/ui/dialog/inkscape-preferences.cpp:1163 msgid "pixels" msgstr "точок" -#: ../src/ui/dialog/inkscape-preferences.cpp:808 +#: ../src/ui/dialog/inkscape-preferences.cpp:815 msgid "" "How close on the screen you need to be to an object to be able to grab it " "with mouse (in screen pixels)" @@ -17795,32 +17814,32 @@ msgstr "" "Як близько (у точках) потрібно підвести курсор миші до об'єкта, щоб захопити " "його" -#: ../src/ui/dialog/inkscape-preferences.cpp:810 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "_Click/drag threshold:" msgstr "Вва_жати клацанням перетягування на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:811 +#: ../src/ui/dialog/inkscape-preferences.cpp:818 msgid "" "Maximum mouse drag (in screen pixels) which is considered a click, not a drag" msgstr "" "Максимальна кількість точок, перетягування на яку сприймається як клацання, " "а не перетягування" -#: ../src/ui/dialog/inkscape-preferences.cpp:814 +#: ../src/ui/dialog/inkscape-preferences.cpp:821 msgid "_Handle size:" msgstr "Розмір в_уса:" -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:822 msgid "Set the relative size of node handles" msgstr "Встановити відносний розмір вусів вузла" -#: ../src/ui/dialog/inkscape-preferences.cpp:817 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "" "Використовувати графічний планшет чи інший пристрій (потребує " "перезавантаження)" -#: ../src/ui/dialog/inkscape-preferences.cpp:819 +#: ../src/ui/dialog/inkscape-preferences.cpp:826 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 " @@ -17830,26 +17849,26 @@ msgstr "" "пристрою. Вимикайте це, лише якщо виникають проблеми з графічним планшетом " "(залишається можливість використовувати мишу) ." -#: ../src/ui/dialog/inkscape-preferences.cpp:821 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Switch tool based on tablet device (requires restart)" msgstr "Перемикати інструмент за пристроєм планшета (потребує перезапуску):" -#: ../src/ui/dialog/inkscape-preferences.cpp:823 +#: ../src/ui/dialog/inkscape-preferences.cpp:830 msgid "" "Change tool as different devices are used on the tablet (pen, eraser, mouse)" msgstr "" "Змінювати інструмент зі зміною пристроїв на планшеті (перо, гумка, мишка)" -#: ../src/ui/dialog/inkscape-preferences.cpp:824 +#: ../src/ui/dialog/inkscape-preferences.cpp:831 msgid "Input devices" msgstr "Пристрої введення" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:827 +#: ../src/ui/dialog/inkscape-preferences.cpp:834 msgid "Use named colors" msgstr "Використовувати кольори з назвами" -#: ../src/ui/dialog/inkscape-preferences.cpp:828 +#: ../src/ui/dialog/inkscape-preferences.cpp:835 msgid "" "If set, write the CSS name of the color when available (e.g. 'red' or " "'magenta') instead of the numeric value" @@ -17857,23 +17876,23 @@ msgstr "" "Якщо позначено, записувати CSS-назву кольору, якщо вона доступна (наприклад, " "«red» або «magenta») замість числового значення" -#: ../src/ui/dialog/inkscape-preferences.cpp:830 +#: ../src/ui/dialog/inkscape-preferences.cpp:837 msgid "XML formatting" msgstr "XML-форматування" -#: ../src/ui/dialog/inkscape-preferences.cpp:832 +#: ../src/ui/dialog/inkscape-preferences.cpp:839 msgid "Inline attributes" msgstr "Вбудовані атрибути" -#: ../src/ui/dialog/inkscape-preferences.cpp:833 +#: ../src/ui/dialog/inkscape-preferences.cpp:840 msgid "Put attributes on the same line as the element tag" msgstr "Вказувати атрибути у тому ж рядку, що і теґ елемента" -#: ../src/ui/dialog/inkscape-preferences.cpp:836 +#: ../src/ui/dialog/inkscape-preferences.cpp:843 msgid "_Indent, spaces:" msgstr "Ві_дступ, у пробілах:" -#: ../src/ui/dialog/inkscape-preferences.cpp:836 +#: ../src/ui/dialog/inkscape-preferences.cpp:843 msgid "" "The number of spaces to use for indenting nested elements; set to 0 for no " "indentation" @@ -17881,24 +17900,24 @@ msgstr "" "Кількість пробілів, які буде використано для створення відступів елементів, " "встановіть значення 0, щоб усунути відступи" -#: ../src/ui/dialog/inkscape-preferences.cpp:838 +#: ../src/ui/dialog/inkscape-preferences.cpp:845 msgid "Path data" msgstr "Дані контуру" -#: ../src/ui/dialog/inkscape-preferences.cpp:840 +#: ../src/ui/dialog/inkscape-preferences.cpp:847 msgid "Allow relative coordinates" msgstr "Дозволити відносні координати" -#: ../src/ui/dialog/inkscape-preferences.cpp:841 +#: ../src/ui/dialog/inkscape-preferences.cpp:848 msgid "If set, relative coordinates may be used in path data" msgstr "" "Якщо позначено, у даних контурів можна використовувати відносні координати" -#: ../src/ui/dialog/inkscape-preferences.cpp:843 +#: ../src/ui/dialog/inkscape-preferences.cpp:850 msgid "Force repeat commands" msgstr "Примусове повторення команд" -#: ../src/ui/dialog/inkscape-preferences.cpp:844 +#: ../src/ui/dialog/inkscape-preferences.cpp:851 msgid "" "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead " "of 'L 1,2 3,4')" @@ -17906,23 +17925,23 @@ msgstr "" "Примусове повторення тої самої команди контуру (наприклад, 'L 1,2 L 3,4' " "замість 'L 1,2 3,4')" -#: ../src/ui/dialog/inkscape-preferences.cpp:846 +#: ../src/ui/dialog/inkscape-preferences.cpp:853 msgid "Numbers" msgstr "Числа" -#: ../src/ui/dialog/inkscape-preferences.cpp:849 +#: ../src/ui/dialog/inkscape-preferences.cpp:856 msgid "_Numeric precision:" msgstr "_Числова точність:" -#: ../src/ui/dialog/inkscape-preferences.cpp:849 +#: ../src/ui/dialog/inkscape-preferences.cpp:856 msgid "Significant figures of the values written to the SVG file" msgstr "Значущі частини значень, які буде записано до файла SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:852 +#: ../src/ui/dialog/inkscape-preferences.cpp:859 msgid "Minimum _exponent:" msgstr "Мінімальний по_казник:" -#: ../src/ui/dialog/inkscape-preferences.cpp:852 +#: ../src/ui/dialog/inkscape-preferences.cpp:859 msgid "" "The smallest number written to SVG is 10 to the power of this exponent; " "anything smaller is written as zero" @@ -17932,17 +17951,17 @@ msgstr "" #. Code to add controls for attribute checking options #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:857 +#: ../src/ui/dialog/inkscape-preferences.cpp:864 msgid "Improper Attributes Actions" msgstr "Дії з неналежними атрибутами" -#: ../src/ui/dialog/inkscape-preferences.cpp:859 -#: ../src/ui/dialog/inkscape-preferences.cpp:867 -#: ../src/ui/dialog/inkscape-preferences.cpp:875 +#: ../src/ui/dialog/inkscape-preferences.cpp:866 +#: ../src/ui/dialog/inkscape-preferences.cpp:874 +#: ../src/ui/dialog/inkscape-preferences.cpp:882 msgid "Print warnings" msgstr "Повідомляти про помилки" -#: ../src/ui/dialog/inkscape-preferences.cpp:860 +#: ../src/ui/dialog/inkscape-preferences.cpp:867 msgid "" "Print warning if invalid or non-useful attributes found. Database files " "located in inkscape_data_dir/attributes." @@ -17951,20 +17970,20 @@ msgstr "" "атрибут. Файли бази даних зберігаються у теці каталог_даних_inkscape/" "attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:861 +#: ../src/ui/dialog/inkscape-preferences.cpp:868 msgid "Remove attributes" msgstr "Вилучати атрибути" -#: ../src/ui/dialog/inkscape-preferences.cpp:862 +#: ../src/ui/dialog/inkscape-preferences.cpp:869 msgid "Delete invalid or non-useful attributes from element tag" msgstr "Вилучати некоректні та непотрібні атрибути з теґів елемента" #. Add incorrect style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:865 +#: ../src/ui/dialog/inkscape-preferences.cpp:872 msgid "Inappropriate Style Properties Actions" msgstr "Дії з неналежними властивостями стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:868 +#: ../src/ui/dialog/inkscape-preferences.cpp:875 msgid "" "Print warning if inappropriate style properties found (i.e. 'font-family' " "set on a <rect>). Database files located in inkscape_data_dir/attributes." @@ -17973,21 +17992,21 @@ msgstr "" "(наприклад, «font-family» у <rect>). Файли бази даних зберігаються у теці " "каталог_даних_inkscape/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:869 -#: ../src/ui/dialog/inkscape-preferences.cpp:877 +#: ../src/ui/dialog/inkscape-preferences.cpp:876 +#: ../src/ui/dialog/inkscape-preferences.cpp:884 msgid "Remove style properties" msgstr "Вилучати властивості стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:870 +#: ../src/ui/dialog/inkscape-preferences.cpp:877 msgid "Delete inappropriate style properties" msgstr "Вилучати невідповідні властивості стилю" #. Add default or inherited style properties options -#: ../src/ui/dialog/inkscape-preferences.cpp:873 +#: ../src/ui/dialog/inkscape-preferences.cpp:880 msgid "Non-useful Style Properties Actions" msgstr "Дії з непотрібними властивостями стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:876 +#: ../src/ui/dialog/inkscape-preferences.cpp:883 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 " @@ -17999,19 +18018,19 @@ msgstr "" "самим, яке було успадковано). Файли бази даних зберігаються у теці " "каталог_даних_inkscape/attributes." -#: ../src/ui/dialog/inkscape-preferences.cpp:878 +#: ../src/ui/dialog/inkscape-preferences.cpp:885 msgid "Delete redundant style properties" msgstr "Вилучати зайві властивості стилю" -#: ../src/ui/dialog/inkscape-preferences.cpp:880 +#: ../src/ui/dialog/inkscape-preferences.cpp:887 msgid "Check Attributes and Style Properties on" msgstr "Перевіряти атрибути і властивості стилів під час" -#: ../src/ui/dialog/inkscape-preferences.cpp:882 +#: ../src/ui/dialog/inkscape-preferences.cpp:889 msgid "Reading" msgstr "читання" -#: ../src/ui/dialog/inkscape-preferences.cpp:883 +#: ../src/ui/dialog/inkscape-preferences.cpp:890 msgid "" "Check attributes and style properties on reading in SVG files (including " "those internal to Inkscape which will slow down startup)" @@ -18019,11 +18038,11 @@ msgstr "" "Перевіряти атрибути і властивості стилів під час читання файлів SVG (зокрема " "перевіряти вбудовані файли Inkscape, що може уповільнити запуск програми)" -#: ../src/ui/dialog/inkscape-preferences.cpp:884 +#: ../src/ui/dialog/inkscape-preferences.cpp:891 msgid "Editing" msgstr "Редагування" -#: ../src/ui/dialog/inkscape-preferences.cpp:885 +#: ../src/ui/dialog/inkscape-preferences.cpp:892 msgid "" "Check attributes and style properties while editing SVG files (may slow down " "Inkscape, mostly useful for debugging)" @@ -18031,42 +18050,42 @@ msgstr "" "Перевіряти атрибути і властивості стилів під час редагування файлів SVG " "(може уповільнити Inkscape, корисне для діагностики негараздів)" -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:893 msgid "Writing" msgstr "запису" -#: ../src/ui/dialog/inkscape-preferences.cpp:887 +#: ../src/ui/dialog/inkscape-preferences.cpp:894 msgid "Check attributes and style properties on writing out SVG files" msgstr "" "Перевіряти атрибути і властивості стилів під час запису даних до файлів SVG" -#: ../src/ui/dialog/inkscape-preferences.cpp:889 +#: ../src/ui/dialog/inkscape-preferences.cpp:896 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:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:902 msgid "Perceptual" msgstr "Придатна для сприйняття" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:902 msgid "Relative Colorimetric" msgstr "Відносна колориметрична" -#: ../src/ui/dialog/inkscape-preferences.cpp:895 +#: ../src/ui/dialog/inkscape-preferences.cpp:902 msgid "Absolute Colorimetric" msgstr "Абсолютна колориметрична" -#: ../src/ui/dialog/inkscape-preferences.cpp:899 +#: ../src/ui/dialog/inkscape-preferences.cpp:906 msgid "(Note: Color management has been disabled in this build)" msgstr "" "(Зауваження: під час збирання цієї програми керування кольором було вимкнено)" -#: ../src/ui/dialog/inkscape-preferences.cpp:903 +#: ../src/ui/dialog/inkscape-preferences.cpp:910 msgid "Display adjustment" msgstr "Налаштування показу" -#: ../src/ui/dialog/inkscape-preferences.cpp:913 +#: ../src/ui/dialog/inkscape-preferences.cpp:920 #, c-format msgid "" "The ICC profile to use to calibrate display output.\n" @@ -18075,117 +18094,118 @@ msgstr "" "Профіль ICC, який буде використано для калібрування показу на екрані.\n" "Каталоги для пошуку:%s" -#: ../src/ui/dialog/inkscape-preferences.cpp:914 +#: ../src/ui/dialog/inkscape-preferences.cpp:921 msgid "Display profile:" msgstr "Профіль дисплея:" -#: ../src/ui/dialog/inkscape-preferences.cpp:919 +#: ../src/ui/dialog/inkscape-preferences.cpp:926 msgid "Retrieve profile from display" msgstr "Отримати профіль з дисплея" -#: ../src/ui/dialog/inkscape-preferences.cpp:922 +#: ../src/ui/dialog/inkscape-preferences.cpp:929 msgid "Retrieve profiles from those attached to displays via XICC" msgstr "Отримати профілі з тих, що прив'язані до дисплеїв через XICC" -#: ../src/ui/dialog/inkscape-preferences.cpp:924 +#: ../src/ui/dialog/inkscape-preferences.cpp:931 msgid "Retrieve profiles from those attached to displays" msgstr "Отримати профілі з тих, що прив'язано до дисплеїв" -#: ../src/ui/dialog/inkscape-preferences.cpp:929 +#: ../src/ui/dialog/inkscape-preferences.cpp:936 msgid "Display rendering intent:" -msgstr "Ціль передачі кольорів для дисплея:" +msgstr "Ціль відтворення кольорів на дисплеї:" -#: ../src/ui/dialog/inkscape-preferences.cpp:930 +#: ../src/ui/dialog/inkscape-preferences.cpp:937 msgid "The rendering intent to use to calibrate display output" msgstr "" -"Ціль відображення, що використовуватиметься для калібрування виводу на " +"Режим відтворення кольорів, що використовуватиметься для калібрування виводу " +"на " "дисплей" -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:939 msgid "Proofing" msgstr "Проба кольорів" -#: ../src/ui/dialog/inkscape-preferences.cpp:934 +#: ../src/ui/dialog/inkscape-preferences.cpp:941 msgid "Simulate output on screen" msgstr "Імітувати пристрій виводу" -#: ../src/ui/dialog/inkscape-preferences.cpp:936 +#: ../src/ui/dialog/inkscape-preferences.cpp:943 msgid "Simulates output of target device" msgstr "Імітувати вивід на цільовий пристрій" -#: ../src/ui/dialog/inkscape-preferences.cpp:938 +#: ../src/ui/dialog/inkscape-preferences.cpp:945 msgid "Mark out of gamut colors" msgstr "Позначати кольори поза гамою" -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:947 msgid "Highlights colors that are out of gamut for the target device" msgstr "Підсвічує кольори, що лежать поза гамою цільового пристрою" -#: ../src/ui/dialog/inkscape-preferences.cpp:945 +#: ../src/ui/dialog/inkscape-preferences.cpp:952 msgid "Out of gamut warning color:" msgstr "Колір для попередження про гаму:" -#: ../src/ui/dialog/inkscape-preferences.cpp:946 +#: ../src/ui/dialog/inkscape-preferences.cpp:953 msgid "Selects the color used for out of gamut warning" msgstr "" "Обирає колір, що використовуватиметься для попередження про відсутність у " "гамі" -#: ../src/ui/dialog/inkscape-preferences.cpp:948 +#: ../src/ui/dialog/inkscape-preferences.cpp:955 msgid "Device profile:" msgstr "Профіль пристрою виводу:" -#: ../src/ui/dialog/inkscape-preferences.cpp:949 +#: ../src/ui/dialog/inkscape-preferences.cpp:956 msgid "The ICC profile to use to simulate device output" msgstr "Профіль ICC, що використовуватиметься для імітації пристрою виведення" -#: ../src/ui/dialog/inkscape-preferences.cpp:952 +#: ../src/ui/dialog/inkscape-preferences.cpp:959 msgid "Device rendering intent:" -msgstr "Ціль передачі кольору:" +msgstr "Ціль відтворення кольорів:" -#: ../src/ui/dialog/inkscape-preferences.cpp:953 +#: ../src/ui/dialog/inkscape-preferences.cpp:960 msgid "The rendering intent to use to calibrate device output" msgstr "" -"Ціль відображення, що використовуватиметься для калібрування виведення на " +"Ціль відтворення кольорів, що використовуватиметься для калібрування " +"виведення на " "пристрій" -#: ../src/ui/dialog/inkscape-preferences.cpp:955 +#: ../src/ui/dialog/inkscape-preferences.cpp:962 msgid "Black point compensation" msgstr "Компенсація чорної точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:957 +#: ../src/ui/dialog/inkscape-preferences.cpp:964 msgid "Enables black point compensation" msgstr "Вмикає компенсацію чорної точки" -#: ../src/ui/dialog/inkscape-preferences.cpp:959 +#: ../src/ui/dialog/inkscape-preferences.cpp:966 msgid "Preserve black" msgstr "Зберігати чорний" -#: ../src/ui/dialog/inkscape-preferences.cpp:966 +#: ../src/ui/dialog/inkscape-preferences.cpp:973 msgid "(LittleCMS 1.15 or later required)" msgstr "(потрібна бібліотека LittleCMS версії 1.15 або новіша)" -#: ../src/ui/dialog/inkscape-preferences.cpp:968 +#: ../src/ui/dialog/inkscape-preferences.cpp:975 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "Зберігати канал K під час перетворень CMYK → CMYK" -#: ../src/ui/dialog/inkscape-preferences.cpp:983 -#: ../src/ui/dialog/inkscape-preferences.cpp:985 -#: ../src/widgets/sp-color-icc-selector.cpp:314 -#: ../src/widgets/sp-color-icc-selector.cpp:598 +#: ../src/ui/dialog/inkscape-preferences.cpp:989 +#: ../src/widgets/sp-color-icc-selector.cpp:324 +#: ../src/widgets/sp-color-icc-selector.cpp:677 msgid "<none>" msgstr "<немає>" -#: ../src/ui/dialog/inkscape-preferences.cpp:1039 +#: ../src/ui/dialog/inkscape-preferences.cpp:1034 msgid "Color management" msgstr "Керування кольором" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1042 +#: ../src/ui/dialog/inkscape-preferences.cpp:1037 msgid "Enable autosave (requires restart)" msgstr "Увімкнути автозбереження (потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1043 +#: ../src/ui/dialog/inkscape-preferences.cpp:1038 msgid "" "Automatically save the current document(s) at a given interval, thus " "minimizing loss in case of a crash" @@ -18193,33 +18213,33 @@ msgstr "" "Автоматично зберігати поточні документи через вказані проміжки часу, таким " "чином зменшуючи втрати у випадку аварійного завершення програми" -#: ../src/ui/dialog/inkscape-preferences.cpp:1049 +#: ../src/ui/dialog/inkscape-preferences.cpp:1044 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "Каталог _автозбереження:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1049 +#: ../src/ui/dialog/inkscape-preferences.cpp:1044 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 або літери диска, " -"наприклад C:, у Windows). " +"вказати абсолютну адресу (адресу, що починається з / у UNIX або літери " +"диска, наприклад C:, у Windows). " -#: ../src/ui/dialog/inkscape-preferences.cpp:1051 +#: ../src/ui/dialog/inkscape-preferences.cpp:1046 msgid "_Interval (in minutes):" msgstr "_Інтервал (у хвилинах):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1051 +#: ../src/ui/dialog/inkscape-preferences.cpp:1046 msgid "Interval (in minutes) at which document will be autosaved" msgstr "Інтервал (у хвилинах) між автоматичними зберіганнями копій" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1048 msgid "_Maximum number of autosaves:" msgstr "Макс_имальна кількість копій автозбереження:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1053 +#: ../src/ui/dialog/inkscape-preferences.cpp:1048 msgid "" "Maximum number of autosaved files; use this to limit the storage space used" msgstr "" @@ -18238,15 +18258,15 @@ msgstr "" #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE ); #. #. ----------- -#: ../src/ui/dialog/inkscape-preferences.cpp:1068 +#: ../src/ui/dialog/inkscape-preferences.cpp:1063 msgid "Autosave" msgstr "Автозбереження" -#: ../src/ui/dialog/inkscape-preferences.cpp:1072 +#: ../src/ui/dialog/inkscape-preferences.cpp:1067 msgid "Open Clip Art Library _Server Name:" msgstr "_Назва сервера бібліотеки Open Clip Art:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1073 +#: ../src/ui/dialog/inkscape-preferences.cpp:1068 msgid "" "The server name of the Open Clip Art Library webdav server; it's used by the " "Import and Export to OCAL function" @@ -18254,35 +18274,35 @@ msgstr "" "Назва сервера webdav бібліотеки Open Clip Art. Його буде використано " "функціями імпорту з та експорту до OCAL." -#: ../src/ui/dialog/inkscape-preferences.cpp:1075 +#: ../src/ui/dialog/inkscape-preferences.cpp:1070 msgid "Open Clip Art Library _Username:" msgstr "Ім'_я користувача бібліотеки Open Clip Art:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1076 +#: ../src/ui/dialog/inkscape-preferences.cpp:1071 msgid "The username used to log into Open Clip Art Library" msgstr "Ім'я користувача для авторизації у системі бібліотеки Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1078 +#: ../src/ui/dialog/inkscape-preferences.cpp:1073 msgid "Open Clip Art Library _Password:" msgstr "Паро_ль до бібліотеки Open Clip Art:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1079 +#: ../src/ui/dialog/inkscape-preferences.cpp:1074 msgid "The password used to log into Open Clip Art Library" msgstr "Пароль для авторизації у системі бібліотеки Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1080 +#: ../src/ui/dialog/inkscape-preferences.cpp:1075 msgid "Open Clip Art" msgstr "Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1085 +#: ../src/ui/dialog/inkscape-preferences.cpp:1080 msgid "Behavior" msgstr "Поведінка" -#: ../src/ui/dialog/inkscape-preferences.cpp:1089 +#: ../src/ui/dialog/inkscape-preferences.cpp:1084 msgid "_Simplification threshold:" msgstr "Поріг спро_щення:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1090 +#: ../src/ui/dialog/inkscape-preferences.cpp:1085 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 " @@ -18293,63 +18313,63 @@ msgstr "" "більш агресивно; щоб повернутися до типового значення, зробіть паузу перед " "черговим викликом команди." -#: ../src/ui/dialog/inkscape-preferences.cpp:1092 +#: ../src/ui/dialog/inkscape-preferences.cpp:1087 msgid "Color stock markers the same color as object" msgstr "Колір опорних маркерів збігається з кольором об’єкта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1093 +#: ../src/ui/dialog/inkscape-preferences.cpp:1088 msgid "Color custom markers the same color as object" msgstr "Колір нетипових маркерів збігається з кольором об’єкта" -#: ../src/ui/dialog/inkscape-preferences.cpp:1094 -#: ../src/ui/dialog/inkscape-preferences.cpp:1303 +#: ../src/ui/dialog/inkscape-preferences.cpp:1089 +#: ../src/ui/dialog/inkscape-preferences.cpp:1300 msgid "Update marker color when object color changes" msgstr "Оновлювати колір маркера у разі зміни кольора об’єкта" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1097 +#: ../src/ui/dialog/inkscape-preferences.cpp:1092 msgid "Select in all layers" msgstr "Позначити все в усіх шарах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1098 +#: ../src/ui/dialog/inkscape-preferences.cpp:1093 msgid "Select only within current layer" msgstr "Позначити лише у поточному шарі" -#: ../src/ui/dialog/inkscape-preferences.cpp:1099 +#: ../src/ui/dialog/inkscape-preferences.cpp:1094 msgid "Select in current layer and sublayers" msgstr "Позначити у поточному шарі та підшарах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1100 +#: ../src/ui/dialog/inkscape-preferences.cpp:1095 msgid "Ignore hidden objects and layers" msgstr "Ігнорувати приховані об'єкти і шари" -#: ../src/ui/dialog/inkscape-preferences.cpp:1101 +#: ../src/ui/dialog/inkscape-preferences.cpp:1096 msgid "Ignore locked objects and layers" msgstr "Ігнорувати заблоковані об'єкти і шари" -#: ../src/ui/dialog/inkscape-preferences.cpp:1102 +#: ../src/ui/dialog/inkscape-preferences.cpp:1097 msgid "Deselect upon layer change" msgstr "Зняти позначення після зміни шару" -#: ../src/ui/dialog/inkscape-preferences.cpp:1104 +#: ../src/ui/dialog/inkscape-preferences.cpp:1099 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Ctrl+A, Tab, Shift+Tab" -#: ../src/ui/dialog/inkscape-preferences.cpp:1106 +#: ../src/ui/dialog/inkscape-preferences.cpp:1101 msgid "Make keyboard selection commands work on objects in all layers" msgstr "Позначати з клавіатури об'єкти в усіх шарах одночасно" -#: ../src/ui/dialog/inkscape-preferences.cpp:1108 +#: ../src/ui/dialog/inkscape-preferences.cpp:1103 msgid "Make keyboard selection commands work on objects in current layer only" msgstr "Позначати з клавіатури об'єкти тільки у поточному шарі" -#: ../src/ui/dialog/inkscape-preferences.cpp:1110 +#: ../src/ui/dialog/inkscape-preferences.cpp:1105 msgid "" "Make keyboard selection commands work on objects in current layer and all " "its sublayers" msgstr "Позначати з клавіатури об'єкти в поточному шарі та усіх його підшарах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1112 +#: ../src/ui/dialog/inkscape-preferences.cpp:1107 msgid "" "Uncheck this to be able to select objects that are hidden (either by " "themselves or by being in a hidden layer)" @@ -18357,7 +18377,7 @@ msgstr "" "Вимкніть цей параметр, якщо бажаєте позначити приховані (невидимі) об'єкти " "(окремо або у прихованому шарі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1114 +#: ../src/ui/dialog/inkscape-preferences.cpp:1109 msgid "" "Uncheck this to be able to select objects that are locked (either by " "themselves or by being in a locked layer)" @@ -18365,7 +18385,7 @@ msgstr "" "Вимкніть це параметр, якщо бажаєте позначити заблоковані об'єкти (окремо або " "у заблокованому шарі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1117 +#: ../src/ui/dialog/inkscape-preferences.cpp:1112 msgid "" "Uncheck this to be able to keep the current objects selected when the " "current layer changes" @@ -18373,76 +18393,76 @@ msgstr "" "Вимкніть це параметр, якщо бажаєте зберегти позначення після зміни поточного " "шару" -#: ../src/ui/dialog/inkscape-preferences.cpp:1120 +#: ../src/ui/dialog/inkscape-preferences.cpp:1115 msgid "Wrap when cycling objects in z-order" msgstr "Циклічний перехід між об'єктами у напрямку z" -#: ../src/ui/dialog/inkscape-preferences.cpp:1122 +#: ../src/ui/dialog/inkscape-preferences.cpp:1117 msgid "Alt+Scroll Wheel" msgstr "Alt+Коліщатко гортання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1124 +#: ../src/ui/dialog/inkscape-preferences.cpp:1119 msgid "Wrap around at start and end when cycling objects in z-order" msgstr "Замкнути циклічний перехід між об'єктами у напрямку вісі z." -#: ../src/ui/dialog/inkscape-preferences.cpp:1126 +#: ../src/ui/dialog/inkscape-preferences.cpp:1121 msgid "Selecting" msgstr "Позначення" #. Transforms options -#: ../src/ui/dialog/inkscape-preferences.cpp:1129 +#: ../src/ui/dialog/inkscape-preferences.cpp:1124 #: ../src/widgets/select-toolbar.cpp:572 msgid "Scale stroke width" msgstr "Змінювати ширину штриха" -#: ../src/ui/dialog/inkscape-preferences.cpp:1130 +#: ../src/ui/dialog/inkscape-preferences.cpp:1125 msgid "Scale rounded corners in rectangles" msgstr "Змінювати радіус округлених кутів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1131 +#: ../src/ui/dialog/inkscape-preferences.cpp:1126 msgid "Transform gradients" msgstr "Трансформувати градієнти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1132 +#: ../src/ui/dialog/inkscape-preferences.cpp:1127 msgid "Transform patterns" msgstr "Трансформувати візерунки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1133 +#: ../src/ui/dialog/inkscape-preferences.cpp:1128 msgid "Optimized" msgstr "З оптимізацією" -#: ../src/ui/dialog/inkscape-preferences.cpp:1134 +#: ../src/ui/dialog/inkscape-preferences.cpp:1129 msgid "Preserved" msgstr "Без оптимізації" -#: ../src/ui/dialog/inkscape-preferences.cpp:1137 +#: ../src/ui/dialog/inkscape-preferences.cpp:1132 #: ../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:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1134 #: ../src/widgets/select-toolbar.cpp:584 msgid "When scaling rectangles, scale the radii of rounded corners" msgstr "" "При зміні розміру прямокутників міняти радіус округлених кутів у тій самій " "пропорції" -#: ../src/ui/dialog/inkscape-preferences.cpp:1141 +#: ../src/ui/dialog/inkscape-preferences.cpp:1136 #: ../src/widgets/select-toolbar.cpp:595 msgid "Move gradients (in fill or stroke) along with the objects" msgstr "Трансформувати градієнти (у заповненні чи штрихах) разом з об'єктом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1143 +#: ../src/ui/dialog/inkscape-preferences.cpp:1138 #: ../src/widgets/select-toolbar.cpp:606 msgid "Move patterns (in fill or stroke) along with the objects" msgstr "Трансформувати візерунки (у заповненнях чи штрихах) разом з об'єктом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1144 +#: ../src/ui/dialog/inkscape-preferences.cpp:1139 msgid "Store transformation" msgstr "Збереження трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:1146 +#: ../src/ui/dialog/inkscape-preferences.cpp:1141 msgid "" "If possible, apply transformation to objects without adding a transform= " "attribute" @@ -18450,19 +18470,19 @@ msgstr "" "При можливості застосовувати до об'єктів трансформацію без додавання " "атрибуту transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1148 +#: ../src/ui/dialog/inkscape-preferences.cpp:1143 msgid "Always store transformation as a transform= attribute on objects" msgstr "Завжди зберігати трансформацію у вигляді атрибута transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1150 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgid "Transforms" msgstr "Трансформації" -#: ../src/ui/dialog/inkscape-preferences.cpp:1154 +#: ../src/ui/dialog/inkscape-preferences.cpp:1149 msgid "Mouse _wheel scrolls by:" msgstr "Ко_лесо миші гортає на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1155 +#: ../src/ui/dialog/inkscape-preferences.cpp:1150 msgid "" "One mouse wheel notch scrolls by this distance in screen pixels " "(horizontally with Shift)" @@ -18470,24 +18490,24 @@ msgstr "" "На цю відстань у точках зсувається зображення одним клацанням колеса миші (з " "натиснутою клавішею Shift — по горизонталі)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1151 msgid "Ctrl+arrows" msgstr "Ctrl+стрілки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1158 +#: ../src/ui/dialog/inkscape-preferences.cpp:1153 msgid "Sc_roll by:" msgstr "К_рок гортання:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1159 +#: ../src/ui/dialog/inkscape-preferences.cpp:1154 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)" msgstr "" "На цю відстань у точках зсувається зображення при натисканні Ctrl+стрілки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1161 +#: ../src/ui/dialog/inkscape-preferences.cpp:1156 msgid "_Acceleration:" msgstr "_Прискорення:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1162 +#: ../src/ui/dialog/inkscape-preferences.cpp:1157 msgid "" "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no " "acceleration)" @@ -18495,15 +18515,15 @@ msgstr "" "Якщо утримувати натиснутими Ctrl+стрілку, швидкість гортання буде зростати " "(0 скасовує прискорення)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1163 +#: ../src/ui/dialog/inkscape-preferences.cpp:1158 msgid "Autoscrolling" msgstr "Автогортання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1165 +#: ../src/ui/dialog/inkscape-preferences.cpp:1160 msgid "_Speed:" msgstr "_Швидкість:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1166 +#: ../src/ui/dialog/inkscape-preferences.cpp:1161 msgid "" "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn " "autoscroll off)" @@ -18511,12 +18531,12 @@ msgstr "" "Як швидко буде відбуватись гортання при перетягуванні об'єкта за межі вікна " "(0 скасовує автогортання)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1168 +#: ../src/ui/dialog/inkscape-preferences.cpp:1163 #: ../src/ui/dialog/tracedialog.cpp:521 ../src/ui/dialog/tracedialog.cpp:720 msgid "_Threshold:" msgstr "_Поріг:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1169 +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 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" @@ -18524,25 +18544,16 @@ msgstr "" "Як далеко (у точках) від краю вікна потрібно бути, щоб увімкнулась " "автогортання; додатні значення — за межами вікна, від'ємні — всередині вікна" +#. +#. _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:1170 -msgid "Left mouse button pans when Space is pressed" -msgstr "Ліва кнопка миші переміщує область видимості, коли натиснуто пробіл" - -#: ../src/ui/dialog/inkscape-preferences.cpp:1172 -msgid "" -"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 "" -"Якщо увімкнути, натискання та утримання пробілу разом з перетягуванням лівою " -"кнопкою миші дозволить перетягувати полотно (як у Adobe Illustrator). Якщо " -"вимкнути, пробіл перемикатиме на інструмент вибору (типово)." - -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "Mouse wheel zooms by default" msgstr "Колесо миші типово змінює масштаб" -#: ../src/ui/dialog/inkscape-preferences.cpp:1175 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "" "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when " "off, it zooms with Ctrl and scrolls without Ctrl" @@ -18551,24 +18562,24 @@ msgstr "" "гортання з Ctrl; якщо зняти позначку, воно змінюватиме масштаб з Ctrl і " "гортатиме без Ctrl." -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1173 msgid "Scrolling" msgstr "Гортання" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1179 +#: ../src/ui/dialog/inkscape-preferences.cpp:1176 msgid "Enable snap indicator" msgstr "Увімкнути індикатор прилипання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 +#: ../src/ui/dialog/inkscape-preferences.cpp:1178 msgid "After snapping, a symbol is drawn at the point that has snapped" msgstr "Після прилипання у точні прилипання буде намальовано цей символ" -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1181 msgid "_Delay (in ms):" msgstr "З_атримка (у мс):" -#: ../src/ui/dialog/inkscape-preferences.cpp:1185 +#: ../src/ui/dialog/inkscape-preferences.cpp:1182 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. " @@ -18579,20 +18590,20 @@ msgstr "" "встановити нульове або близьке до нульового значення, прилипання буде " "миттєвим." -#: ../src/ui/dialog/inkscape-preferences.cpp:1187 +#: ../src/ui/dialog/inkscape-preferences.cpp:1184 msgid "Only snap the node closest to the pointer" msgstr "Прилипання лише до вузла, найближчого до вказівника" -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1186 msgid "" "Only try to snap the node that is initially closest to the mouse pointer" msgstr "Виконувати прилипання лише до вузла, найближчого до вказівника миші" -#: ../src/ui/dialog/inkscape-preferences.cpp:1192 +#: ../src/ui/dialog/inkscape-preferences.cpp:1189 msgid "_Weight factor:" msgstr "_Ваговий коефіцієнт:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1193 +#: ../src/ui/dialog/inkscape-preferences.cpp:1190 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 " @@ -18602,11 +18613,11 @@ msgstr "" "найближче перетворення (якщо встановлено 0), або вибрати вузол, який " "спочатку був найближчим до вказівника миші (якщо встановлено 1)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1195 +#: ../src/ui/dialog/inkscape-preferences.cpp:1192 msgid "Snap the mouse pointer when dragging a constrained knot" msgstr "Прилипання до вказівника миші під час перетягування обмеженого вузла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1197 +#: ../src/ui/dialog/inkscape-preferences.cpp:1194 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 " @@ -18615,16 +18626,16 @@ msgstr "" "Під час перетягування вузла вздовж лінії обмеження виконувати прилипання до " "позиції вказівника миші, а не до проекції вузла на лінію обмеження" -#: ../src/ui/dialog/inkscape-preferences.cpp:1199 +#: ../src/ui/dialog/inkscape-preferences.cpp:1196 msgid "Snapping" msgstr "Прилипання" #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1204 +#: ../src/ui/dialog/inkscape-preferences.cpp:1201 msgid "_Arrow keys move by:" msgstr "С_трілки переміщують на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1205 +#: ../src/ui/dialog/inkscape-preferences.cpp:1202 msgid "" "Pressing an arrow key moves selected object(s) or node(s) by this distance" msgstr "" @@ -18632,28 +18643,28 @@ msgstr "" "клавіші зі стрілкою" #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here -#: ../src/ui/dialog/inkscape-preferences.cpp:1208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1205 msgid "> and < _scale by:" msgstr "Кр_ок зміни масштабу при > та <:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1209 +#: ../src/ui/dialog/inkscape-preferences.cpp:1206 msgid "Pressing > or < scales selection up or down by this increment" msgstr "" "На цю величину змінюється розмір позначеного при натисканні клавіш > чи <" -#: ../src/ui/dialog/inkscape-preferences.cpp:1211 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "_Inset/Outset by:" msgstr "В_тягнути/розтягнути на:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1212 +#: ../src/ui/dialog/inkscape-preferences.cpp:1209 msgid "Inset and Outset commands displace the path by this distance" msgstr "На цю відстань переміщують контур команди втягування та розтягування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1213 +#: ../src/ui/dialog/inkscape-preferences.cpp:1210 msgid "Compass-like display of angles" msgstr "Подібне до компасу відображення кутів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1215 +#: ../src/ui/dialog/inkscape-preferences.cpp:1212 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 " @@ -18664,15 +18675,15 @@ msgstr "" "випадку 0 вказує на схід, діапазон значень знаходиться між -180 та 180, " "приріст кута відбувається проти годинникової стрілки." -#: ../src/ui/dialog/inkscape-preferences.cpp:1221 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "_Rotation snaps every:" msgstr "О_бмеження обертання:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1221 +#: ../src/ui/dialog/inkscape-preferences.cpp:1218 msgid "degrees" msgstr "градусів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1222 +#: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "" "Rotating with Ctrl pressed snaps every that much degrees; also, pressing " "[ or ] rotates by this amount" @@ -18680,11 +18691,11 @@ msgstr "" "Обертання з натиснутою Ctrl обмежує кут значеннями, кратними вибраному; " "натискання «[» чи «]» повертає на вибраний кут" -#: ../src/ui/dialog/inkscape-preferences.cpp:1223 +#: ../src/ui/dialog/inkscape-preferences.cpp:1220 msgid "Relative snapping of guideline angles" msgstr "Відносне прилипання кутів нахилу напрямних" -#: ../src/ui/dialog/inkscape-preferences.cpp:1225 +#: ../src/ui/dialog/inkscape-preferences.cpp:1222 msgid "" "When on, the snap angles when rotating a guideline will be relative to the " "original angle" @@ -18692,11 +18703,11 @@ msgstr "" "Якщо позначено, кути прилипання під час обертання напрямної будуть " "обчислюватися відносно початкового кута" -#: ../src/ui/dialog/inkscape-preferences.cpp:1227 +#: ../src/ui/dialog/inkscape-preferences.cpp:1224 msgid "_Zoom in/out by:" msgstr "Крок _масштабування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1228 +#: ../src/ui/dialog/inkscape-preferences.cpp:1225 msgid "" "Zoom tool click, +/- keys, and middle click zoom in and out by this " "multiplier" @@ -18704,44 +18715,44 @@ msgstr "" "Крок при клацанні інструментом масштабу, натисканні клавіш +/- та клацанні " "середньою кнопкою миші" -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1226 msgid "Steps" msgstr "Кроки" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1232 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Move in parallel" msgstr "Переміщуються паралельно" -#: ../src/ui/dialog/inkscape-preferences.cpp:1234 +#: ../src/ui/dialog/inkscape-preferences.cpp:1231 msgid "Stay unmoved" msgstr "Залишаються нерухомими" -#: ../src/ui/dialog/inkscape-preferences.cpp:1236 +#: ../src/ui/dialog/inkscape-preferences.cpp:1233 msgid "Move according to transform" msgstr "Рухаються у відповідності до transform=" -#: ../src/ui/dialog/inkscape-preferences.cpp:1238 +#: ../src/ui/dialog/inkscape-preferences.cpp:1235 msgid "Are unlinked" msgstr "Від'єднуються" -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 msgid "Are deleted" -msgstr "Вилучено" +msgstr "Вилучаються" -#: ../src/ui/dialog/inkscape-preferences.cpp:1243 +#: ../src/ui/dialog/inkscape-preferences.cpp:1240 msgid "Moving original: clones and linked offsets" msgstr "Пересування оригіналу: клони та прив'язані розтяжки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1245 +#: ../src/ui/dialog/inkscape-preferences.cpp:1242 msgid "Clones are translated by the same vector as their original" msgstr "Кожен клон зсувається на той самий вектор, що й оригінал" -#: ../src/ui/dialog/inkscape-preferences.cpp:1247 +#: ../src/ui/dialog/inkscape-preferences.cpp:1244 msgid "Clones preserve their positions when their original is moved" msgstr "Клони залишаються на місці, коли рухаються їхні оригінали" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1246 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" @@ -18750,27 +18761,27 @@ msgstr "" "Наприклад, повернутий клон буде переміщуватись у іншому напрямку, ніж його " "оригінал." -#: ../src/ui/dialog/inkscape-preferences.cpp:1250 +#: ../src/ui/dialog/inkscape-preferences.cpp:1247 msgid "Deleting original: clones" msgstr "Вилучення оригіналу: клони" -#: ../src/ui/dialog/inkscape-preferences.cpp:1252 +#: ../src/ui/dialog/inkscape-preferences.cpp:1249 msgid "Orphaned clones are converted to regular objects" msgstr "Осиротілі клони перетворюються у звичайні об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1254 +#: ../src/ui/dialog/inkscape-preferences.cpp:1251 msgid "Orphaned clones are deleted along with their original" msgstr "Осиротілі клони вилучаються разом з оригіналом" -#: ../src/ui/dialog/inkscape-preferences.cpp:1256 +#: ../src/ui/dialog/inkscape-preferences.cpp:1253 msgid "Duplicating original+clones/linked offset" msgstr "Дублювання оригінал+клони/прив'язані розтяжки" -#: ../src/ui/dialog/inkscape-preferences.cpp:1258 +#: ../src/ui/dialog/inkscape-preferences.cpp:1255 msgid "Relink duplicated clones" msgstr "Повторно пов'язувати дубльовані клони" -#: ../src/ui/dialog/inkscape-preferences.cpp:1260 +#: ../src/ui/dialog/inkscape-preferences.cpp:1257 msgid "" "When duplicating a selection containing both a clone and its original " "(possibly in groups), relink the duplicated clone to the duplicated original " @@ -18781,28 +18792,28 @@ msgstr "" "старим оригіналом" #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page -#: ../src/ui/dialog/inkscape-preferences.cpp:1263 +#: ../src/ui/dialog/inkscape-preferences.cpp:1260 msgid "Clones" msgstr "Клони" #. Clip paths and masks options -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1263 msgid "When applying, use the topmost selected object as clippath/mask" msgstr "" "При застосуванні найвищий позначений об'єкт є контуром вирізання або маскою" -#: ../src/ui/dialog/inkscape-preferences.cpp:1268 +#: ../src/ui/dialog/inkscape-preferences.cpp:1265 msgid "" "Uncheck this to use the bottom selected object as the clipping path or mask" msgstr "" "Зніміть позначку щоб використовувати нижній позначений об'єкт як контур " "вирізання або маску" -#: ../src/ui/dialog/inkscape-preferences.cpp:1269 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Remove clippath/mask object after applying" msgstr "Вилучати контур вирізання або маску після застосування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1271 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "" "After applying, remove the object used as the clipping path or mask from the " "drawing" @@ -18810,57 +18821,57 @@ msgstr "" "Після застосування вилучається об'єкт, що використовувався як контур " "вирізання чи маска з малюнку" -#: ../src/ui/dialog/inkscape-preferences.cpp:1273 +#: ../src/ui/dialog/inkscape-preferences.cpp:1270 msgid "Before applying" msgstr "До застосування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1275 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Do not group clipped/masked objects" msgstr "Не групувати обрізані/замасковані об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1276 +#: ../src/ui/dialog/inkscape-preferences.cpp:1273 msgid "Enclose every clipped/masked object in its own group" msgstr "Створювати для кожного обрізаного/замаскованого об'єкта власну групу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1277 +#: ../src/ui/dialog/inkscape-preferences.cpp:1274 msgid "Put all clipped/masked objects into one group" msgstr "Зібрати всі обрізані/замасковані об'єкти у одну групу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 +#: ../src/ui/dialog/inkscape-preferences.cpp:1277 msgid "Apply clippath/mask to every object" msgstr "Застосувати контур обрізання/маскування до всіх об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1280 msgid "Apply clippath/mask to groups containing single object" msgstr "" "Застосувати контур обрізання/маскування до груп, що містять окремі об'єкти" -#: ../src/ui/dialog/inkscape-preferences.cpp:1286 +#: ../src/ui/dialog/inkscape-preferences.cpp:1283 msgid "Apply clippath/mask to group containing all objects" msgstr "Застосувати контур обрізання/маскування до групи всіх об'єктів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1288 +#: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "After releasing" msgstr "Після відпускання" -#: ../src/ui/dialog/inkscape-preferences.cpp:1290 +#: ../src/ui/dialog/inkscape-preferences.cpp:1287 msgid "Ungroup automatically created groups" msgstr "Розгрупувати автоматично створені групи" -#: ../src/ui/dialog/inkscape-preferences.cpp:1292 +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Ungroup groups created when setting clip/mask" msgstr "Розгрупувати групи, створені застосування обрізання/маскування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "Clippaths and masks" msgstr "Вирізання та маскування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1297 +#: ../src/ui/dialog/inkscape-preferences.cpp:1294 msgid "Stroke Style Markers" msgstr "Маркери стилю штриха" -#: ../src/ui/dialog/inkscape-preferences.cpp:1299 -#: ../src/ui/dialog/inkscape-preferences.cpp:1301 +#: ../src/ui/dialog/inkscape-preferences.cpp:1296 +#: ../src/ui/dialog/inkscape-preferences.cpp:1298 msgid "" "Stroke color same as object, fill color either object fill color or marker " "fill color" @@ -18868,35 +18879,35 @@ msgstr "" "Колір штриха збігається з кольором об’єкта, колір заповнення є або кольором " "об’єкта або кольором заповнення маркера" -#: ../src/ui/dialog/inkscape-preferences.cpp:1305 +#: ../src/ui/dialog/inkscape-preferences.cpp:1302 msgid "Markers" msgstr "Маркери" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 +#: ../src/ui/dialog/inkscape-preferences.cpp:1310 msgid "Number of _Threads:" msgstr "Кількість _потоків:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1313 -#: ../src/ui/dialog/inkscape-preferences.cpp:1499 +#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1811 msgid "(requires restart)" msgstr "(потребує перезапуску)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1314 +#: ../src/ui/dialog/inkscape-preferences.cpp:1311 msgid "Configure number of processors/threads to use when rendering filters" msgstr "" "Налаштувати кількість процесорів/потоків, які слід використовувати для " "обробки фільтрування" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgid "Rendering _cache size:" msgstr "Розмір _кешу обробки:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "МіБ" -#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1315 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" @@ -18907,37 +18918,37 @@ msgstr "" #. blur quality #. filter quality -#: ../src/ui/dialog/inkscape-preferences.cpp:1321 -#: ../src/ui/dialog/inkscape-preferences.cpp:1345 +#: ../src/ui/dialog/inkscape-preferences.cpp:1318 +#: ../src/ui/dialog/inkscape-preferences.cpp:1342 msgid "Best quality (slowest)" msgstr "Найвища якість (найповільніше)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1323 -#: ../src/ui/dialog/inkscape-preferences.cpp:1347 +#: ../src/ui/dialog/inkscape-preferences.cpp:1320 +#: ../src/ui/dialog/inkscape-preferences.cpp:1344 msgid "Better quality (slower)" msgstr "Добра якість (повільно)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1325 -#: ../src/ui/dialog/inkscape-preferences.cpp:1349 +#: ../src/ui/dialog/inkscape-preferences.cpp:1322 +#: ../src/ui/dialog/inkscape-preferences.cpp:1346 msgid "Average quality" msgstr "Посередня якість" -#: ../src/ui/dialog/inkscape-preferences.cpp:1327 -#: ../src/ui/dialog/inkscape-preferences.cpp:1351 +#: ../src/ui/dialog/inkscape-preferences.cpp:1324 +#: ../src/ui/dialog/inkscape-preferences.cpp:1348 msgid "Lower quality (faster)" msgstr "Низька якість (швидко)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1326 +#: ../src/ui/dialog/inkscape-preferences.cpp:1350 msgid "Lowest quality (fastest)" msgstr "Найнижча якість (найшвидше)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1332 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "Gaussian blur quality for display" msgstr "Якість гаусового розмивання для показу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1334 -#: ../src/ui/dialog/inkscape-preferences.cpp:1358 +#: ../src/ui/dialog/inkscape-preferences.cpp:1331 +#: ../src/ui/dialog/inkscape-preferences.cpp:1355 msgid "" "Best quality, but display may be very slow at high zooms (bitmap export " "always uses best quality)" @@ -18945,133 +18956,193 @@ msgstr "" "Найкраща якість, але відображення може бути дуже повільним за великого " "збільшення (експорт растрових зображень завжди використовує найвищу якість)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1336 -#: ../src/ui/dialog/inkscape-preferences.cpp:1360 +#: ../src/ui/dialog/inkscape-preferences.cpp:1333 +#: ../src/ui/dialog/inkscape-preferences.cpp:1357 msgid "Better quality, but slower display" msgstr "Краща якість, але повільніше відображення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1338 -#: ../src/ui/dialog/inkscape-preferences.cpp:1362 +#: ../src/ui/dialog/inkscape-preferences.cpp:1335 +#: ../src/ui/dialog/inkscape-preferences.cpp:1359 msgid "Average quality, acceptable display speed" msgstr "Посередня якість, прийнятна швидкість відображення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1340 -#: ../src/ui/dialog/inkscape-preferences.cpp:1364 +#: ../src/ui/dialog/inkscape-preferences.cpp:1337 +#: ../src/ui/dialog/inkscape-preferences.cpp:1361 msgid "Lower quality (some artifacts), but display is faster" msgstr "Нижча якість (певні похибки), але відображення швидше" -#: ../src/ui/dialog/inkscape-preferences.cpp:1342 -#: ../src/ui/dialog/inkscape-preferences.cpp:1366 +#: ../src/ui/dialog/inkscape-preferences.cpp:1339 +#: ../src/ui/dialog/inkscape-preferences.cpp:1363 msgid "Lowest quality (considerable artifacts), but display is fastest" msgstr "Найнижча якість (значні похибки), але відображення найшвидше" -#: ../src/ui/dialog/inkscape-preferences.cpp:1356 +#: ../src/ui/dialog/inkscape-preferences.cpp:1353 msgid "Filter effects quality for display" msgstr "Якість ефектів фільтрування для показу" #. build custom preferences tab -#: ../src/ui/dialog/inkscape-preferences.cpp:1368 +#: ../src/ui/dialog/inkscape-preferences.cpp:1365 #: ../src/ui/dialog/print.cpp:224 msgid "Rendering" msgstr "Тип друку" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "2x2" msgstr "2x2" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "4x4" msgstr "4x4" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "8x8" msgstr "8x8" -#: ../src/ui/dialog/inkscape-preferences.cpp:1374 +#: ../src/ui/dialog/inkscape-preferences.cpp:1371 msgid "16x16" msgstr "16x16" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1375 msgid "Oversample bitmaps:" msgstr "Усереднювати растр по точках:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1381 +#: ../src/ui/dialog/inkscape-preferences.cpp:1378 msgid "Automatically reload bitmaps" msgstr "Автоматично перезавантажувати растр" -#: ../src/ui/dialog/inkscape-preferences.cpp:1383 +#: ../src/ui/dialog/inkscape-preferences.cpp:1380 msgid "Automatically reload linked images when file is changed on disk" msgstr "" "Автоматично перезавантажувати пов'язані зображення після зміни файла на диску" -#: ../src/ui/dialog/inkscape-preferences.cpp:1385 +#: ../src/ui/dialog/inkscape-preferences.cpp:1382 msgid "_Bitmap editor:" msgstr "_Растровий редактор:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1384 msgid "Default export _resolution:" msgstr "Типова роз_дільна здатність для експорту:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 +#: ../src/ui/dialog/inkscape-preferences.cpp:1385 msgid "Default bitmap resolution (in dots per inch) in the Export dialog" msgstr "Типова роздільна здатність (у точках на дюйм) у вікні експорту" -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 +#: ../src/ui/dialog/inkscape-preferences.cpp:1387 msgid "Resolution for Create Bitmap _Copy:" msgstr "Роздільна здатність для створення растрової копі_ї:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1391 +#: ../src/ui/dialog/inkscape-preferences.cpp:1388 msgid "Resolution used by the Create Bitmap Copy command" msgstr "" "Роздільна здатність, яку буде використано у команді створення растрової копії" -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Always embed" msgstr "Завжди вбудовувати" -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Always link" msgstr "Завжди пов'язувати" -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "Ask" msgstr "Питати" -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 +#: ../src/ui/dialog/inkscape-preferences.cpp:1393 msgid "Bitmap import:" msgstr "Імпортування растра:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1399 +#: ../src/ui/dialog/inkscape-preferences.cpp:1396 msgid "Default _import resolution:" msgstr "Типова роздільна здатність для _імпортування:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1400 +#: ../src/ui/dialog/inkscape-preferences.cpp:1397 msgid "Default bitmap resolution (in dots per inch) for bitmap import" msgstr "" "Типова роздільна здатність (у точках на дюйм) для імпортованих растрових " "зображень" -#: ../src/ui/dialog/inkscape-preferences.cpp:1401 +#: ../src/ui/dialog/inkscape-preferences.cpp:1398 msgid "Override file resolution" msgstr "Перевизначити роздільну здатність з файла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1403 +#: ../src/ui/dialog/inkscape-preferences.cpp:1400 msgid "Use default bitmap resolution in favor of information from file" msgstr "Надавати перевагу типові роздільній здатності перед даними з файла" -#: ../src/ui/dialog/inkscape-preferences.cpp:1405 +#: ../src/ui/dialog/inkscape-preferences.cpp:1402 msgid "Bitmaps" msgstr "Растрові зображення" -#: ../src/ui/dialog/inkscape-preferences.cpp:1461 +#: ../src/ui/dialog/inkscape-preferences.cpp:1414 +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:1417 +msgid "Shortcut file:" +msgstr "Файл скорочень:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1420 +msgid "Search:" +msgstr "Шукати:" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +msgid "Shortcut" +msgstr "Скорочення" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1433 +#: ../src/ui/widget/page-sizer.cpp:262 +msgid "Description" +msgstr "Опис" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1474 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:693 +#: ../src/ui/dialog/tracedialog.cpp:812 +#: ../src/ui/widget/preferences-widget.cpp:662 +msgid "Reset" +msgstr "Скинути" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1474 +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:1478 +msgid "Import ..." +msgstr "Імпорт…" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1478 +msgid "Import custom keyboard shortcuts from a file" +msgstr "Імпортувати нетипові клавіатурні скорочення з файла" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +msgid "Export ..." +msgstr "Експортувати…" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +msgid "Export custom keyboard shortcuts to a file" +msgstr "Експортувати нетипові клавіатурні скорочення до файла" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1491 +msgid "Keyboard Shortcuts" +msgstr "Клавіатурні скорочення" + +#: ../src/ui/dialog/inkscape-preferences.cpp:1773 msgid "Set the main spell check language" msgstr "Встановити основну мову перевірки правопису" -#: ../src/ui/dialog/inkscape-preferences.cpp:1464 +#: ../src/ui/dialog/inkscape-preferences.cpp:1776 msgid "Second language:" msgstr "Друга мова:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1465 +#: ../src/ui/dialog/inkscape-preferences.cpp:1777 msgid "" "Set the second spell check language; checking will only stop on words " "unknown in ALL chosen languages" @@ -19079,11 +19150,11 @@ msgstr "" "Встановіть другу мову для перевірки правопису: перевірка зупинятиметься лише " "на словах, яких немає у ВСІХ вказаних мовах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1468 +#: ../src/ui/dialog/inkscape-preferences.cpp:1780 msgid "Third language:" msgstr "Третя мова:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1469 +#: ../src/ui/dialog/inkscape-preferences.cpp:1781 msgid "" "Set the third spell check language; checking will only stop on words unknown " "in ALL chosen languages" @@ -19091,31 +19162,31 @@ msgstr "" "Встановіть третю мову для перевірки правопису: перевірка зупинятиметься лише " "на словах, яких немає у ВСІХ вказаних мовах" -#: ../src/ui/dialog/inkscape-preferences.cpp:1471 +#: ../src/ui/dialog/inkscape-preferences.cpp:1783 msgid "Ignore words with digits" msgstr "Ігнорувати слова з цифрами" -#: ../src/ui/dialog/inkscape-preferences.cpp:1473 +#: ../src/ui/dialog/inkscape-preferences.cpp:1785 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "Ігнорувати слова, що містять цифри, наприклад, «R2D2»" -#: ../src/ui/dialog/inkscape-preferences.cpp:1475 +#: ../src/ui/dialog/inkscape-preferences.cpp:1787 msgid "Ignore words in ALL CAPITALS" msgstr "Ігнорувати слова ПРОПИСНИМИ" -#: ../src/ui/dialog/inkscape-preferences.cpp:1477 +#: ../src/ui/dialog/inkscape-preferences.cpp:1789 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "Ігнорувати слова, написані прописними літерами, наприклад, «IUPAC»" -#: ../src/ui/dialog/inkscape-preferences.cpp:1479 +#: ../src/ui/dialog/inkscape-preferences.cpp:1791 msgid "Spellcheck" msgstr "Перевірка правопису" -#: ../src/ui/dialog/inkscape-preferences.cpp:1499 +#: ../src/ui/dialog/inkscape-preferences.cpp:1811 msgid "Latency _skew:" msgstr "Від_хилення латентності:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1500 +#: ../src/ui/dialog/inkscape-preferences.cpp:1812 msgid "" "Factor by which the event clock is skewed from the actual time (0.9766 on " "some systems)" @@ -19123,11 +19194,11 @@ msgstr "" "Коефіцієнт, на який годинник подій відхилятиметься від справжнього часу " "(0,9766 на деяких системах)." -#: ../src/ui/dialog/inkscape-preferences.cpp:1502 +#: ../src/ui/dialog/inkscape-preferences.cpp:1814 msgid "Pre-render named icons" msgstr "Іменовані піктограми, що залежать від показу" -#: ../src/ui/dialog/inkscape-preferences.cpp:1504 +#: ../src/ui/dialog/inkscape-preferences.cpp:1816 msgid "" "When on, named icons will be rendered before displaying the ui. This is for " "working around bugs in GTK+ named icon notification" @@ -19136,90 +19207,90 @@ msgstr "" "користувача. Це зроблено для обходу вад у сповіщенні іменованою піктограмою " "у GTK+" -#: ../src/ui/dialog/inkscape-preferences.cpp:1512 +#: ../src/ui/dialog/inkscape-preferences.cpp:1824 msgid "System info" msgstr "Відомості щодо системи" -#: ../src/ui/dialog/inkscape-preferences.cpp:1516 +#: ../src/ui/dialog/inkscape-preferences.cpp:1828 msgid "User config: " msgstr "Налаштування користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1516 +#: ../src/ui/dialog/inkscape-preferences.cpp:1828 msgid "Location of users configuration" msgstr "Розташування налаштувань користувача" -#: ../src/ui/dialog/inkscape-preferences.cpp:1520 +#: ../src/ui/dialog/inkscape-preferences.cpp:1832 msgid "User preferences: " msgstr "Параметри користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1520 +#: ../src/ui/dialog/inkscape-preferences.cpp:1832 msgid "Location of the users preferences file" msgstr "Розташування файлів з параметрами користувачів" -#: ../src/ui/dialog/inkscape-preferences.cpp:1524 +#: ../src/ui/dialog/inkscape-preferences.cpp:1836 msgid "User extensions: " msgstr "Додатки користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1524 +#: ../src/ui/dialog/inkscape-preferences.cpp:1836 msgid "Location of the users extensions" msgstr "Розташування додатків користувача" -#: ../src/ui/dialog/inkscape-preferences.cpp:1528 +#: ../src/ui/dialog/inkscape-preferences.cpp:1840 msgid "User cache: " msgstr "Кеш користувача: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1528 +#: ../src/ui/dialog/inkscape-preferences.cpp:1840 msgid "Location of users cache" msgstr "Розташування кешу даних користувача" -#: ../src/ui/dialog/inkscape-preferences.cpp:1536 +#: ../src/ui/dialog/inkscape-preferences.cpp:1848 msgid "Temporary files: " msgstr "Тимчасові файли: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1536 +#: ../src/ui/dialog/inkscape-preferences.cpp:1848 msgid "Location of the temporary files used for autosave" msgstr "" "Розташування тимчасових файлів, які використовуватимуться для створення " "автоматичних копій" -#: ../src/ui/dialog/inkscape-preferences.cpp:1540 +#: ../src/ui/dialog/inkscape-preferences.cpp:1852 msgid "Inkscape data: " msgstr "Дані Inkscape: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1540 +#: ../src/ui/dialog/inkscape-preferences.cpp:1852 msgid "Location of Inkscape data" msgstr "Розташування даних Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1544 +#: ../src/ui/dialog/inkscape-preferences.cpp:1856 msgid "Inkscape extensions: " msgstr "Додатки Inkscape: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1544 +#: ../src/ui/dialog/inkscape-preferences.cpp:1856 msgid "Location of the Inkscape extensions" msgstr "Розташування додатків Inkscape" -#: ../src/ui/dialog/inkscape-preferences.cpp:1553 +#: ../src/ui/dialog/inkscape-preferences.cpp:1865 msgid "System data: " msgstr "Системна дата: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1553 +#: ../src/ui/dialog/inkscape-preferences.cpp:1865 msgid "Locations of system data" msgstr "Розташування загальносистемних даних" -#: ../src/ui/dialog/inkscape-preferences.cpp:1577 +#: ../src/ui/dialog/inkscape-preferences.cpp:1889 msgid "Icon theme: " msgstr "Тема піктограм: " -#: ../src/ui/dialog/inkscape-preferences.cpp:1577 +#: ../src/ui/dialog/inkscape-preferences.cpp:1889 msgid "Locations of icon themes" msgstr "Розташування тем піктограм" -#: ../src/ui/dialog/inkscape-preferences.cpp:1579 -#: ../src/widgets/sp-color-gtkselector.cpp:50 +#: ../src/ui/dialog/inkscape-preferences.cpp:1891 msgid "System" msgstr "Система" -#: ../src/ui/dialog/input.cpp:352 ../src/ui/dialog/input.cpp:364 +#: ../src/ui/dialog/input.cpp:352 ../src/ui/dialog/input.cpp:373 +#: ../src/ui/dialog/input.cpp:1555 msgid "Disabled" msgstr "Вимкнено" @@ -19228,125 +19299,168 @@ msgctxt "Input device" msgid "Screen" msgstr "Екран" -#: ../src/ui/dialog/input.cpp:354 ../src/ui/dialog/input.cpp:366 +#: ../src/ui/dialog/input.cpp:354 ../src/ui/dialog/input.cpp:375 msgid "Window" msgstr "Вікно" -#: ../src/ui/dialog/input.cpp:533 +#: ../src/ui/dialog/input.cpp:599 msgid "Test Area" msgstr "Область перевірки" -#: ../src/ui/dialog/input.cpp:588 ../share/extensions/svgcalendar.inx.h:2 +#: ../src/ui/dialog/input.cpp:600 +msgid "Axis" +msgstr "Вісь" + +#: ../src/ui/dialog/input.cpp:664 ../share/extensions/svgcalendar.inx.h:2 msgid "Configuration" msgstr "Налаштування" -#: ../src/ui/dialog/input.cpp:589 ../src/ui/dialog/input.cpp:789 +#: ../src/ui/dialog/input.cpp:665 msgid "Hardware" msgstr "Обладнання" -#. Gtk::Label* lbl = Gtk::manage(new Gtk::Label(_("Name:"))); -#. devDetails.attach(*lbl, 0, 1, rowNum, rowNum+ 1, -#. ::Gtk::FILL, -#. ::Gtk::SHRINK); -#. devDetails.attach(devName, 1, 2, rowNum, rowNum + 1, -#. ::Gtk::SHRINK, -#. ::Gtk::SHRINK); -#. -#. rowNum++; -#: ../src/ui/dialog/input.cpp:607 +#: ../src/ui/dialog/input.cpp:688 msgid "Link:" msgstr "Посилання:" -#: ../src/ui/dialog/input.cpp:626 +#: ../src/ui/dialog/input.cpp:704 msgid "Axes count:" msgstr "Кількість осей:" -#: ../src/ui/dialog/input.cpp:649 +#: ../src/ui/dialog/input.cpp:728 msgid "axis:" msgstr "вісь:" -#: ../src/ui/dialog/input.cpp:661 +#: ../src/ui/dialog/input.cpp:742 msgid "Button count:" msgstr "Кількість кнопок:" -#: ../src/ui/dialog/input.cpp:827 +#: ../src/ui/dialog/input.cpp:924 msgid "Tablet" msgstr "Планшет" -#: ../src/ui/dialog/input.cpp:856 ../src/ui/dialog/input.cpp:1626 +#: ../src/ui/dialog/input.cpp:953 ../src/ui/dialog/input.cpp:1845 msgid "pad" msgstr "панель" -#: ../src/ui/dialog/input.cpp:897 +#: ../src/ui/dialog/input.cpp:995 msgid "_Use pressure-sensitive tablet (requires restart)" msgstr "" "Ви_користовувати графічний планшет чи інший пристрій (потребує " "перезавантаження)" -#: ../src/ui/dialog/input.cpp:898 ../src/verbs.cpp:2307 +#: ../src/ui/dialog/input.cpp:996 ../src/verbs.cpp:2309 msgid "_Save" msgstr "З_берегти" -#: ../src/ui/dialog/layer-properties.cpp:50 +#: ../src/ui/dialog/input.cpp:1000 +msgid "Axes" +msgstr "Вісі" + +#: ../src/ui/dialog/input.cpp:1001 +msgid "Keys" +msgstr "Клавіші" + +#: ../src/ui/dialog/input.cpp:1002 ../src/widgets/spray-toolbar.cpp:202 +#: ../src/widgets/tweak-toolbar.cpp:272 +msgid "Mode" +msgstr "Режим" + +#: ../src/ui/dialog/input.cpp:1084 +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:1530 ../src/ui/dialog/layers.cpp:912 +msgid "X" +msgstr "X" + +#: ../src/ui/dialog/input.cpp:1530 +msgid "Y" +msgstr "Y" + +#: ../src/ui/dialog/input.cpp:1530 ../src/widgets/calligraphy-toolbar.cpp:601 +#: ../src/widgets/spray-toolbar.cpp:241 ../src/widgets/tweak-toolbar.cpp:391 +msgid "Pressure" +msgstr "Тиск" + +#: ../src/ui/dialog/input.cpp:1530 +msgid "X tilt" +msgstr "Нахил за X" + +#: ../src/ui/dialog/input.cpp:1530 +msgid "Y tilt" +msgstr "Нахил за Y" + +#: ../src/ui/dialog/input.cpp:1530 +#: ../src/widgets/sp-color-wheel-selector.cpp:58 +msgid "Wheel" +msgstr "Колесо" + +#: ../src/ui/dialog/layer-properties.cpp:55 msgid "Layer name:" msgstr "Назва шару:" -#: ../src/ui/dialog/layer-properties.cpp:119 +#: ../src/ui/dialog/layer-properties.cpp:136 msgid "Add layer" msgstr "Додавання шару" -#: ../src/ui/dialog/layer-properties.cpp:157 +#: ../src/ui/dialog/layer-properties.cpp:176 msgid "Above current" msgstr "Над поточним" -#: ../src/ui/dialog/layer-properties.cpp:161 +#: ../src/ui/dialog/layer-properties.cpp:180 msgid "Below current" msgstr "Під поточним" -#: ../src/ui/dialog/layer-properties.cpp:164 +#: ../src/ui/dialog/layer-properties.cpp:183 msgid "As sublayer of current" msgstr "Як підшар поточного" -#: ../src/ui/dialog/layer-properties.cpp:311 +#: ../src/ui/dialog/layer-properties.cpp:352 msgid "Rename Layer" msgstr "Перейменування шару" #. TODO: find an unused layer number, forming name from _("Layer ") + "%d" -#: ../src/ui/dialog/layer-properties.cpp:313 -#: ../src/ui/dialog/layer-properties.cpp:369 +#: ../src/ui/dialog/layer-properties.cpp:354 +#: ../src/ui/dialog/layer-properties.cpp:410 ../src/verbs.cpp:193 +#: ../src/verbs.cpp:2240 msgid "Layer" msgstr "Шар" -#: ../src/ui/dialog/layer-properties.cpp:314 +#: ../src/ui/dialog/layer-properties.cpp:355 msgid "_Rename" msgstr "Пере_йменувати" -#: ../src/ui/dialog/layer-properties.cpp:327 +#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:746 msgid "Rename layer" msgstr "Перейменувати шар" #. TRANSLATORS: This means "The layer has been renamed" -#: ../src/ui/dialog/layer-properties.cpp:329 ../src/ui/dialog/layers.cpp:746 +#: ../src/ui/dialog/layer-properties.cpp:370 msgid "Renamed layer" msgstr "Шар перейменовано" -#: ../src/ui/dialog/layer-properties.cpp:333 +#: ../src/ui/dialog/layer-properties.cpp:374 msgid "Add Layer" msgstr "Додавання шару" -#: ../src/ui/dialog/layer-properties.cpp:339 +#: ../src/ui/dialog/layer-properties.cpp:380 msgid "_Add" msgstr "_Додати" -#: ../src/ui/dialog/layer-properties.cpp:363 +#: ../src/ui/dialog/layer-properties.cpp:404 msgid "New layer created." msgstr "Новий шар створено." -#: ../src/ui/dialog/layer-properties.cpp:367 +#: ../src/ui/dialog/layer-properties.cpp:408 msgid "Move to Layer" msgstr "Пересунути до шару" -#: ../src/ui/dialog/layer-properties.cpp:370 +#: ../src/ui/dialog/layer-properties.cpp:411 #: ../src/ui/dialog/transformation.cpp:109 msgid "_Move" msgstr "_Переміщення" @@ -19367,11 +19481,11 @@ msgstr "Заблокувати шар" msgid "Unlock layer" msgstr "Розблокувати шар" -#: ../src/ui/dialog/layers.cpp:620 ../src/verbs.cpp:1347 +#: ../src/ui/dialog/layers.cpp:620 ../src/verbs.cpp:1348 msgid "Toggle layer solo" msgstr "Увімкнути або вимкнути соло шару" -#: ../src/ui/dialog/layers.cpp:623 ../src/verbs.cpp:1371 +#: ../src/ui/dialog/layers.cpp:623 ../src/verbs.cpp:1372 msgid "Lock other layers" msgstr "Заблокувати інші шари" @@ -19404,10 +19518,6 @@ msgctxt "Layers" msgid "Top" msgstr "Верх" -#: ../src/ui/dialog/layers.cpp:912 -msgid "X" -msgstr "X" - #: ../src/ui/dialog/livepatheffect-editor.cpp:111 msgid "Add path effect" msgstr "Додати ефект контуру" @@ -19575,8 +19685,8 @@ msgstr "С_ховати" msgid "L_ock" msgstr "За_мкнути" -#: ../src/ui/dialog/object-properties.cpp:63 ../src/verbs.cpp:2578 -#: ../src/verbs.cpp:2584 +#: ../src/ui/dialog/object-properties.cpp:63 ../src/verbs.cpp:2580 +#: ../src/verbs.cpp:2586 msgid "_Set" msgstr "_Встановити" @@ -19672,27 +19782,27 @@ msgstr "Шаблон успішно отримано" msgid "Could not download thumbnail file" msgstr "Не вдалося отримати файл мініатюри" -#: ../src/ui/dialog/ocaldialogs.cpp:1000 +#: ../src/ui/dialog/ocaldialogs.cpp:996 msgid "No description" msgstr "Немає опису" -#: ../src/ui/dialog/ocaldialogs.cpp:1068 +#: ../src/ui/dialog/ocaldialogs.cpp:1064 msgid "Searching clipart..." msgstr "Пошук шаблонів…" -#: ../src/ui/dialog/ocaldialogs.cpp:1088 ../src/ui/dialog/ocaldialogs.cpp:1109 +#: ../src/ui/dialog/ocaldialogs.cpp:1084 ../src/ui/dialog/ocaldialogs.cpp:1105 msgid "Could not connect to the Open Clip Art Library" msgstr "Не вдалося встановити зв'язок з бібліотекою Open Clip Art" -#: ../src/ui/dialog/ocaldialogs.cpp:1128 +#: ../src/ui/dialog/ocaldialogs.cpp:1130 msgid "Could not parse search results" msgstr "Не вдалося обробити результати пошуку" -#: ../src/ui/dialog/ocaldialogs.cpp:1162 +#: ../src/ui/dialog/ocaldialogs.cpp:1164 msgid "No clipart named <b>%1</b> was found." msgstr "Не виявлено шаблонів з назвою <b>%1</b>." -#: ../src/ui/dialog/ocaldialogs.cpp:1164 +#: ../src/ui/dialog/ocaldialogs.cpp:1166 msgid "" "Please make sure all keywords are spelled correctly, or try again with " "different keywords." @@ -19700,11 +19810,11 @@ msgstr "" "Будь ласка, переконайтеся, що всі вказані ключові слова написано правильно " "або повторіть спробу пошуку, вказавши інші ключові слова." -#: ../src/ui/dialog/ocaldialogs.cpp:1204 +#: ../src/ui/dialog/ocaldialogs.cpp:1212 msgid "Search" msgstr "Пошук" -#: ../src/ui/dialog/ocaldialogs.cpp:1210 +#: ../src/ui/dialog/ocaldialogs.cpp:1224 msgid "Close" msgstr "Закрити" @@ -19730,7 +19840,7 @@ msgid "Print" msgstr "Друкувати" #. ## Add a menu for clear() -#: ../src/ui/dialog/scriptdialog.cpp:178 +#: ../src/ui/dialog/scriptdialog.cpp:178 ../src/verbs.cpp:136 msgid "File" msgstr "Файл" @@ -19762,186 +19872,212 @@ msgstr "Помилки" msgid "Set SVG Font attribute" msgstr "Встановити атрибут шрифту SVG" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:204 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:195 msgid "Adjust kerning value" msgstr "Корекція значення апрошу" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:394 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:385 msgid "Family Name:" msgstr "Назва гарнітури:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:404 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:395 msgid "Set width:" msgstr "Встановити товщину:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:463 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:454 msgid "glyph" msgstr "гліф" #. SPGlyph* glyph = -#: ../src/ui/dialog/svg-fonts-dialog.cpp:495 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:486 msgid "Add glyph" msgstr "Додати гліф" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:529 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:569 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:520 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:560 msgid "Select a <b>path</b> to define the curves of a glyph" msgstr "Позначте <b>контур</b>, щоб визначити криві гліфу" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:537 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:577 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:528 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:568 msgid "The selected object does not have a <b>path</b> description." msgstr "Вибраний об'єкт не має опису <b>контуру</b>." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:544 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:535 msgid "No glyph selected in the SVGFonts dialog." msgstr "У діалоговому вікні SVGFonts не вибрано гліфів." -#: ../src/ui/dialog/svg-fonts-dialog.cpp:553 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:590 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:544 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:581 msgid "Set glyph curves" msgstr "Визначити криві гліфу" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:610 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:601 msgid "Reset missing-glyph" msgstr "Скинути стан відсутності гліфів" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:626 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:617 msgid "Edit glyph name" msgstr "Змінити назву гліфу" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:640 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:631 msgid "Set glyph unicode" msgstr "Встановити unicode-кодування гліфу" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:652 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:643 msgid "Remove font" msgstr "Вилучити шрифт" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:669 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:660 msgid "Remove glyph" msgstr "Вилучити гліф" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:686 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:677 msgid "Remove kerning pair" msgstr "Вилучити апрош пари" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:696 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:687 msgid "Missing Glyph:" msgstr "Відсутній гліф:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:700 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:691 msgid "From selection..." msgstr "З позначеного…" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:702 -#: ../src/ui/dialog/tracedialog.cpp:812 -#: ../src/ui/widget/preferences-widget.cpp:661 -msgid "Reset" -msgstr "Скинути" - -#: ../src/ui/dialog/svg-fonts-dialog.cpp:713 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:704 msgid "Glyph name" msgstr "Назва гліфу" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:714 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:705 msgid "Matching string" msgstr "Рядок пошуку" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:717 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:708 msgid "Add Glyph" msgstr "Додати гліф" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:724 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:715 msgid "Get curves from selection..." msgstr "Створити криві з вибраного…" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:773 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:764 msgid "Add kerning pair" msgstr "Додавання апрошу пари" #. Kerning Setup: -#: ../src/ui/dialog/svg-fonts-dialog.cpp:781 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:772 msgid "Kerning Setup" msgstr "Налаштування апрошів" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:783 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:774 msgid "1st Glyph:" msgstr "Перший гліф:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:785 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:776 msgid "2nd Glyph:" msgstr "Другий гліф:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:788 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:779 msgid "Add pair" msgstr "Додати пару" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:800 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:791 msgid "First Unicode range" msgstr "Перший діапазон Unicode" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:801 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:792 msgid "Second Unicode range" msgstr "Другий діапазон Unicode" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:808 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:799 msgid "Kerning value:" msgstr "Значення апрошу:" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:866 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:857 msgid "Set font family" msgstr "Вказати гарнітуру шрифту" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:875 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:866 msgid "font" msgstr "шрифт" #. select_font(font); -#: ../src/ui/dialog/svg-fonts-dialog.cpp:890 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:881 msgid "Add font" msgstr "Додати шрифт" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:918 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:909 msgid "_Global Settings" msgstr "_Загальні параметри" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:919 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:910 msgid "_Glyphs" msgstr "_Гліфи" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:920 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:911 msgid "_Kerning" msgstr "_Апроші" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:927 -#: ../src/ui/dialog/svg-fonts-dialog.cpp:928 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:918 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:919 msgid "Sample Text" msgstr "Текст зразка" -#: ../src/ui/dialog/svg-fonts-dialog.cpp:932 +#: ../src/ui/dialog/svg-fonts-dialog.cpp:923 msgid "Preview Text:" msgstr "Перегляд тексту:" +#. ******************* Symbol Sets ************************ +#: ../src/ui/dialog/symbols.cpp:110 +msgid "Symbol set: " +msgstr "Набір символів: " + +#. Fill in later +#: ../src/ui/dialog/symbols.cpp:114 ../src/ui/dialog/symbols.cpp:115 +msgid "Current Document" +msgstr "Поточний документ" + +#. ******************* Preview Scale ********************** +#: ../src/ui/dialog/symbols.cpp:151 +msgid "Preview scale: " +msgstr "Масштаб перегляду: " + +#: ../src/ui/dialog/symbols.cpp:156 +msgid "Fit" +msgstr "Вмістити" + +#: ../src/ui/dialog/symbols.cpp:156 +msgid "Fit to width" +msgstr "За шириною" + +#: ../src/ui/dialog/symbols.cpp:156 +msgid "Fit to height" +msgstr "За висотою" + +#. ******************* Preview Size *********************** +#: ../src/ui/dialog/symbols.cpp:170 +msgid "Preview size: " +msgstr "Розмір попереднього перегляду: " + #. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:255 +#: ../src/ui/dialog/swatches.cpp:257 msgid "Set fill" msgstr "Встановлення заливання" #. TRANSLATORS: An item in context menu on a colour in the swatches -#: ../src/ui/dialog/swatches.cpp:263 +#: ../src/ui/dialog/swatches.cpp:265 msgid "Set stroke" msgstr "Встановлення штриха" -#: ../src/ui/dialog/swatches.cpp:284 +#: ../src/ui/dialog/swatches.cpp:286 msgid "Edit..." msgstr "Редагування…" -#: ../src/ui/dialog/swatches.cpp:296 +#: ../src/ui/dialog/swatches.cpp:298 msgid "Convert" msgstr "Перетворити" -#: ../src/ui/dialog/swatches.cpp:540 +#: ../src/ui/dialog/swatches.cpp:542 #, c-format msgid "Palettes directory (%s) is unavailable." msgstr "Каталог з палітрами (%s) недоступний." @@ -21040,10 +21176,6 @@ msgstr "Ни_жнє:" msgid "Bottom margin" msgstr "Нижнє поле" -#: ../src/ui/widget/page-sizer.cpp:262 -msgid "Description" -msgstr "Опис" - #: ../src/ui/widget/page-sizer.cpp:303 msgid "Orientation:" msgstr "Орієнтація:" @@ -21061,15 +21193,15 @@ msgstr "Кни_жкова" msgid "Custom size" msgstr "Особливий розмір" -#: ../src/ui/widget/page-sizer.cpp:352 +#: ../src/ui/widget/page-sizer.cpp:374 msgid "Resi_ze page to content..." msgstr "_Розмір сторінки за вмістом…" -#: ../src/ui/widget/page-sizer.cpp:378 +#: ../src/ui/widget/page-sizer.cpp:426 msgid "_Resize page to drawing or selection" msgstr "_Підігнати розмір за малюнком або позначеною областю" -#: ../src/ui/widget/page-sizer.cpp:379 +#: ../src/ui/widget/page-sizer.cpp:427 msgid "" "Resize the page to fit the current selection, or the entire drawing if there " "is no selection" @@ -21077,7 +21209,7 @@ msgstr "" "Змінити масштаб сторінки для відповідності поточному фрагменту або всьому " "рисунку, якщо фрагмент не позначений" -#: ../src/ui/widget/page-sizer.cpp:444 +#: ../src/ui/widget/page-sizer.cpp:492 msgid "Set page size" msgstr "Встановлення розміру сторінки" @@ -21171,11 +21303,11 @@ msgctxt "Swatches" msgid "Wrap" msgstr "З перенесенням" -#: ../src/ui/widget/preferences-widget.cpp:714 +#: ../src/ui/widget/preferences-widget.cpp:715 msgid "_Browse..." msgstr "Ви_брати…" -#: ../src/ui/widget/preferences-widget.cpp:800 +#: ../src/ui/widget/preferences-widget.cpp:801 msgid "Select a bitmap editor" msgstr "Виберіть редактор растрової графіки" @@ -21507,9 +21639,9 @@ msgid "" "b> to adjust lightness, with <b>Shift</b> to adjust saturation, without " "modifiers to adjust hue" msgstr "" -"Коригування <b>каналу прозорості</b>: було %.3g, стало <b>%.3g</b> (різн %" -".3g); скористайтеся <b>Ctrl</b> для зміни освітленості;" -"<b>Shift</b> — для зміни насиченості, без модифікаторів — виправлення відтінку" +"Коригування <b>каналу прозорості</b>: було %.3g, стало <b>%.3g</b> (різн " +"%.3g); скористайтеся <b>Ctrl</b> для зміни освітленості;<b>Shift</b> — для " +"зміни насиченості, без модифікаторів — виправлення відтінку" #: ../src/ui/widget/selected-style.cpp:1333 msgid "Adjust saturation" @@ -21524,8 +21656,7 @@ msgid "" msgstr "" "Корекція <b>насиченості</b>: було %.3g, стало <b>%.3g</b> (різн %.3g); " "скористайтеся <b>Ctrl</b> для корекції освітленості, <b>Alt</b> — для зміни " -"прозорості, без модифікаторів – " -"корекція відтінку" +"прозорості, без модифікаторів – корекція відтінку" #: ../src/ui/widget/selected-style.cpp:1339 msgid "Adjust lightness" @@ -21540,8 +21671,7 @@ msgid "" msgstr "" "Корекція <b>освітленості</b>: було %.3g, стало <b>%.3g</b> (різн %.3g); " "скористайтеся <b>Shift</b> для зміни насиченості, <b>Alt</b> — для зміни " -"прозорості, без модифікаторів — " -"виправлення відтінку" +"прозорості, без модифікаторів — виправлення відтінку" #: ../src/ui/widget/selected-style.cpp:1345 msgid "Adjust hue" @@ -21556,8 +21686,7 @@ msgid "" msgstr "" "Корекція <b>відтінку</b>: було %.3g, стало <b>%.3g</b> (різн %.3g); " "скористайтеся <b>Shift</b> для зміни насиченості, <b>Alt</b> — для зміни " -"прозорості, а <b>Ctrl</b> для зміни " -"освітленості" +"прозорості, а <b>Ctrl</b> для зміни освітленості" #: ../src/ui/widget/selected-style.cpp:1467 #: ../src/ui/widget/selected-style.cpp:1481 @@ -21660,228 +21789,259 @@ msgstr[2] "" "міститься у <b>%d</b> об'єктах; перетягніть, утримуючи <b>Shift</b>, щоб " "відокремити вибрані об'єкти" -#: ../src/verbs.cpp:1173 +#: ../src/verbs.cpp:155 ../src/widgets/calligraphy-toolbar.cpp:649 +msgid "Edit" +msgstr "Змінити" + +#: ../src/verbs.cpp:231 +msgid "Context" +msgstr "Контекст" + +#: ../src/verbs.cpp:250 ../src/verbs.cpp:2174 +#: ../share/extensions/jessyInk_view.inx.h:1 +#: ../share/extensions/polyhedron_3d.inx.h:26 +msgid "View" +msgstr "Перегляд" + +#: ../src/verbs.cpp:270 +msgid "Dialog" +msgstr "Діалогове вікно" + +#: ../src/verbs.cpp:327 ../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_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 "Текст" + +#: ../src/verbs.cpp:1174 msgid "Switch to next layer" msgstr "Перемкнутися на наступний шар" -#: ../src/verbs.cpp:1174 +#: ../src/verbs.cpp:1175 msgid "Switched to next layer." msgstr "Перемикання на наступний шар." -#: ../src/verbs.cpp:1176 +#: ../src/verbs.cpp:1177 msgid "Cannot go past last layer." msgstr "Неможливо переміститися вище за останній шар." -#: ../src/verbs.cpp:1185 +#: ../src/verbs.cpp:1186 msgid "Switch to previous layer" msgstr "Перемкнутися на попередній шар" -#: ../src/verbs.cpp:1186 +#: ../src/verbs.cpp:1187 msgid "Switched to previous layer." msgstr "Перемикання на попередній шар." -#: ../src/verbs.cpp:1188 +#: ../src/verbs.cpp:1189 msgid "Cannot go before first layer." msgstr "Неможливо переміститися нижче за перший шар." -#: ../src/verbs.cpp:1209 ../src/verbs.cpp:1306 ../src/verbs.cpp:1338 -#: ../src/verbs.cpp:1344 ../src/verbs.cpp:1368 ../src/verbs.cpp:1383 +#: ../src/verbs.cpp:1210 ../src/verbs.cpp:1307 ../src/verbs.cpp:1339 +#: ../src/verbs.cpp:1345 ../src/verbs.cpp:1369 ../src/verbs.cpp:1384 msgid "No current layer." msgstr "Немає поточного шару." -#: ../src/verbs.cpp:1238 ../src/verbs.cpp:1242 +#: ../src/verbs.cpp:1239 ../src/verbs.cpp:1243 #, c-format msgid "Raised layer <b>%s</b>." msgstr "Шар <b>%s</b> піднято." -#: ../src/verbs.cpp:1239 +#: ../src/verbs.cpp:1240 msgid "Layer to top" msgstr "Підняти шар нагору" -#: ../src/verbs.cpp:1243 +#: ../src/verbs.cpp:1244 msgid "Raise layer" msgstr "Підняти шар" -#: ../src/verbs.cpp:1246 ../src/verbs.cpp:1250 +#: ../src/verbs.cpp:1247 ../src/verbs.cpp:1251 #, c-format msgid "Lowered layer <b>%s</b>." msgstr "Шар <b>%s</b> опущено." -#: ../src/verbs.cpp:1247 +#: ../src/verbs.cpp:1248 msgid "Layer to bottom" msgstr "Опустити шар додолу" -#: ../src/verbs.cpp:1251 +#: ../src/verbs.cpp:1252 msgid "Lower layer" msgstr "Опустити шар" -#: ../src/verbs.cpp:1260 +#: ../src/verbs.cpp:1261 msgid "Cannot move layer any further." msgstr "Неможливо перемістити шар далі." -#: ../src/verbs.cpp:1274 ../src/verbs.cpp:1293 +#: ../src/verbs.cpp:1275 ../src/verbs.cpp:1294 #, c-format msgid "%s copy" msgstr "Копія %s" -#: ../src/verbs.cpp:1301 +#: ../src/verbs.cpp:1302 msgid "Duplicate layer" msgstr "Дублювати шар" #. TRANSLATORS: this means "The layer has been duplicated." -#: ../src/verbs.cpp:1304 +#: ../src/verbs.cpp:1305 msgid "Duplicated layer." msgstr "Дубльований шар." -#: ../src/verbs.cpp:1333 +#: ../src/verbs.cpp:1334 msgid "Delete layer" msgstr "Вилучити шар" #. TRANSLATORS: this means "The layer has been deleted." -#: ../src/verbs.cpp:1336 +#: ../src/verbs.cpp:1337 msgid "Deleted layer." msgstr "Шар вилучено." -#: ../src/verbs.cpp:1353 +#: ../src/verbs.cpp:1354 msgid "Show all layers" msgstr "Показати всі шари" -#: ../src/verbs.cpp:1358 +#: ../src/verbs.cpp:1359 msgid "Hide all layers" msgstr "Приховати всі шари" -#: ../src/verbs.cpp:1363 +#: ../src/verbs.cpp:1364 msgid "Lock all layers" msgstr "Заблокувати всі шари" -#: ../src/verbs.cpp:1377 +#: ../src/verbs.cpp:1378 msgid "Unlock all layers" msgstr "Розблокувати всі шари" -#: ../src/verbs.cpp:1451 +#: ../src/verbs.cpp:1452 msgid "Flip horizontally" msgstr "Віддзеркалити горизонтально" -#: ../src/verbs.cpp:1456 +#: ../src/verbs.cpp:1457 msgid "Flip vertically" 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:2055 +#: ../src/verbs.cpp:2057 msgid "tutorial-basic.svg" msgstr "tutorial-basic.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2059 +#: ../src/verbs.cpp:2061 msgid "tutorial-shapes.svg" msgstr "tutorial-shapes.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2063 +#: ../src/verbs.cpp:2065 msgid "tutorial-advanced.svg" msgstr "tutorial-advanced.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2067 +#: ../src/verbs.cpp:2069 msgid "tutorial-tracing.svg" msgstr "tutorial-tracing.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2071 +#: ../src/verbs.cpp:2073 msgid "tutorial-calligraphy.svg" msgstr "tutorial-calligraphy.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2075 +#: ../src/verbs.cpp:2077 msgid "tutorial-interpolate.svg" msgstr "tutorial-interpolate.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2079 +#: ../src/verbs.cpp:2081 msgid "tutorial-elements.svg" msgstr "tutorial-elements.svg" #. TRANSLATORS: See "tutorial-basic.svg" comment. -#: ../src/verbs.cpp:2083 +#: ../src/verbs.cpp:2085 msgid "tutorial-tips.svg" msgstr "tutorial-tips.svg" -#: ../src/verbs.cpp:2271 ../src/verbs.cpp:2862 +#: ../src/verbs.cpp:2273 ../src/verbs.cpp:2863 msgid "Unlock all objects in the current layer" msgstr "Розблокувати усі об'єкти у поточному шарі" -#: ../src/verbs.cpp:2275 ../src/verbs.cpp:2864 +#: ../src/verbs.cpp:2277 ../src/verbs.cpp:2865 msgid "Unlock all objects in all layers" msgstr "Розблокувати усі об'єкти в усіх шарах" -#: ../src/verbs.cpp:2279 ../src/verbs.cpp:2866 +#: ../src/verbs.cpp:2281 ../src/verbs.cpp:2867 msgid "Unhide all objects in the current layer" msgstr "Розблокувати усі об'єкти у поточному шарі" -#: ../src/verbs.cpp:2283 ../src/verbs.cpp:2868 +#: ../src/verbs.cpp:2285 ../src/verbs.cpp:2869 msgid "Unhide all objects in all layers" msgstr "Показати усі об'єкти в усіх шарах" -#: ../src/verbs.cpp:2298 +#: ../src/verbs.cpp:2300 msgid "Does nothing" msgstr "Немає дій" -#: ../src/verbs.cpp:2301 +#: ../src/verbs.cpp:2303 msgid "Create new document from the default template" msgstr "Створити новий документ зі стандартного шаблону" -#: ../src/verbs.cpp:2303 +#: ../src/verbs.cpp:2305 msgid "_Open..." msgstr "_Відкрити…" -#: ../src/verbs.cpp:2304 +#: ../src/verbs.cpp:2306 msgid "Open an existing document" msgstr "Відкрити існуючий документ" -#: ../src/verbs.cpp:2305 +#: ../src/verbs.cpp:2307 msgid "Re_vert" msgstr "Від_новити" -#: ../src/verbs.cpp:2306 +#: ../src/verbs.cpp:2308 msgid "Revert to the last saved version of document (changes will be lost)" msgstr "Відновити останню збережену версію документа (зміни будуть втрачені)" -#: ../src/verbs.cpp:2307 +#: ../src/verbs.cpp:2309 msgid "Save document" msgstr "Зберегти документ" -#: ../src/verbs.cpp:2309 +#: ../src/verbs.cpp:2311 msgid "Save _As..." msgstr "Зберегти _як…" -#: ../src/verbs.cpp:2310 +#: ../src/verbs.cpp:2312 msgid "Save document under a new name" msgstr "Зберегти документ під іншою назвою" -#: ../src/verbs.cpp:2311 +#: ../src/verbs.cpp:2313 msgid "Save a Cop_y..." msgstr "Зберегти _копію…" -#: ../src/verbs.cpp:2312 +#: ../src/verbs.cpp:2314 msgid "Save a copy of the document under a new name" msgstr "Зберегти копію документа під іншою назвою" -#: ../src/verbs.cpp:2313 +#: ../src/verbs.cpp:2315 msgid "_Print..." msgstr "Над_рукувати…" -#: ../src/verbs.cpp:2313 +#: ../src/verbs.cpp:2315 msgid "Print document" msgstr "Надрукувати документ" #. TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions) -#: ../src/verbs.cpp:2316 +#: ../src/verbs.cpp:2318 msgid "Clean _up document" msgstr "О_чистити документ" -#: ../src/verbs.cpp:2316 +#: ../src/verbs.cpp:2318 msgid "" "Remove unused definitions (such as gradients or clipping paths) from the <" "defs> of the document" @@ -21889,144 +22049,144 @@ msgstr "" "Прибрати непотрібні визначення (наприклад, градієнти чи вирізання) з <" "defs> документа" -#: ../src/verbs.cpp:2318 +#: ../src/verbs.cpp:2320 msgid "_Import..." msgstr "_Імпортувати…" -#: ../src/verbs.cpp:2319 +#: ../src/verbs.cpp:2321 msgid "Import a bitmap or SVG image into this document" msgstr "Імпортувати зображення (растрове чи SVG) до документа" -#: ../src/verbs.cpp:2320 +#: ../src/verbs.cpp:2322 msgid "_Export Bitmap..." msgstr "_Експортувати растр…" -#: ../src/verbs.cpp:2321 +#: ../src/verbs.cpp:2323 msgid "Export this document or a selection as a bitmap image" msgstr "Експортувати документ чи позначену частину у растрове зображення" -#: ../src/verbs.cpp:2322 +#: ../src/verbs.cpp:2324 msgid "Import Clip Art..." msgstr "_Імпортувати шаблон…" -#: ../src/verbs.cpp:2323 +#: ../src/verbs.cpp:2325 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:2325 +#: ../src/verbs.cpp:2327 msgid "N_ext Window" msgstr "_Наступне вікно" -#: ../src/verbs.cpp:2326 +#: ../src/verbs.cpp:2328 msgid "Switch to the next document window" msgstr "Перейти до наступного вікна документа" -#: ../src/verbs.cpp:2327 +#: ../src/verbs.cpp:2329 msgid "P_revious Window" msgstr "_Попереднє вікно" -#: ../src/verbs.cpp:2328 +#: ../src/verbs.cpp:2330 msgid "Switch to the previous document window" msgstr "Перейти до попереднього вікна документа" -#: ../src/verbs.cpp:2329 +#: ../src/verbs.cpp:2331 msgid "_Close" msgstr "_Закрити" -#: ../src/verbs.cpp:2330 +#: ../src/verbs.cpp:2332 msgid "Close this document window" msgstr "Закрити це вікно документа" -#: ../src/verbs.cpp:2331 +#: ../src/verbs.cpp:2333 msgid "_Quit" msgstr "Ви_йти" -#: ../src/verbs.cpp:2331 +#: ../src/verbs.cpp:2333 msgid "Quit Inkscape" msgstr "Вийти з Inkscape" -#: ../src/verbs.cpp:2334 +#: ../src/verbs.cpp:2336 msgid "Undo last action" msgstr "Скасувати останню операцію" -#: ../src/verbs.cpp:2337 +#: ../src/verbs.cpp:2339 msgid "Do again the last undone action" msgstr "Повторити останню скасовану дію" -#: ../src/verbs.cpp:2338 +#: ../src/verbs.cpp:2340 msgid "Cu_t" msgstr "_Вирізати" -#: ../src/verbs.cpp:2339 +#: ../src/verbs.cpp:2341 msgid "Cut selection to clipboard" msgstr "Вирізати позначені об'єкти у буфер обміну" -#: ../src/verbs.cpp:2340 +#: ../src/verbs.cpp:2342 msgid "_Copy" msgstr "_Копіювати" -#: ../src/verbs.cpp:2341 +#: ../src/verbs.cpp:2343 msgid "Copy selection to clipboard" msgstr "Скопіювати позначені об'єкти у буфер обміну" -#: ../src/verbs.cpp:2342 +#: ../src/verbs.cpp:2344 msgid "_Paste" msgstr "Вст_авити" -#: ../src/verbs.cpp:2343 +#: ../src/verbs.cpp:2345 msgid "Paste objects from clipboard to mouse point, or paste text" msgstr "Вставити об'єкти з буферу обміну або текст у позицію курсора миші" -#: ../src/verbs.cpp:2344 +#: ../src/verbs.cpp:2346 msgid "Paste _Style" msgstr "Вставити _стиль" -#: ../src/verbs.cpp:2345 +#: ../src/verbs.cpp:2347 msgid "Apply the style of the copied object to selection" msgstr "Застосувати стиль скопійованого об'єкта до позначених об'єктів" -#: ../src/verbs.cpp:2347 +#: ../src/verbs.cpp:2349 msgid "Scale selection to match the size of the copied object" msgstr "" "Зміна масштабу позначених об'єктів з метою задовольнити розміру копійованого " "об'єкта" -#: ../src/verbs.cpp:2348 +#: ../src/verbs.cpp:2350 msgid "Paste _Width" msgstr "Вставити _ширину" -#: ../src/verbs.cpp:2349 +#: ../src/verbs.cpp:2351 msgid "Scale selection horizontally to match the width of the copied object" msgstr "" "Змінити масштаб позначених об'єктів за горизонтальним розміром з метою " "відповідності ширині копійованого об'єкта" -#: ../src/verbs.cpp:2350 +#: ../src/verbs.cpp:2352 msgid "Paste _Height" msgstr "Вставити _висоту" -#: ../src/verbs.cpp:2351 +#: ../src/verbs.cpp:2353 msgid "Scale selection vertically to match the height of the copied object" msgstr "" "Змінити масштаб позначених об'єктів за вертикальним розміром з метою " "відповідності висоті копійованого об'єкта" -#: ../src/verbs.cpp:2352 +#: ../src/verbs.cpp:2354 msgid "Paste Size Separately" msgstr "Вставити розмір окремо" -#: ../src/verbs.cpp:2353 +#: ../src/verbs.cpp:2355 msgid "Scale each selected object to match the size of the copied object" msgstr "" "Змінити кожного позначеного об'єкта з метою відповідності розміру " "копійованого об'єкта" -#: ../src/verbs.cpp:2354 +#: ../src/verbs.cpp:2356 msgid "Paste Width Separately" msgstr "Вставити ширину окремо" -#: ../src/verbs.cpp:2355 +#: ../src/verbs.cpp:2357 msgid "" "Scale each selected object horizontally to match the width of the copied " "object" @@ -22034,11 +22194,11 @@ msgstr "" "Змінити масштаб кожного позначеного об'єкта за горизонтальним розміром з " "метою відповідності ширині копійованого об'єкта" -#: ../src/verbs.cpp:2356 +#: ../src/verbs.cpp:2358 msgid "Paste Height Separately" msgstr "Вставити висоту окремо" -#: ../src/verbs.cpp:2357 +#: ../src/verbs.cpp:2359 msgid "" "Scale each selected object vertically to match the height of the copied " "object" @@ -22046,67 +22206,67 @@ msgstr "" "Змінити масштаб кожного позначеного об'єкта за вертикальним розміром з метою " "відповідності висоті копійованого об'єкта" -#: ../src/verbs.cpp:2358 +#: ../src/verbs.cpp:2360 msgid "Paste _In Place" msgstr "Вставити на _місце" -#: ../src/verbs.cpp:2359 +#: ../src/verbs.cpp:2361 msgid "Paste objects from clipboard to the original location" msgstr "Вставити об'єкти з буфера у місце, де вони були раніше" -#: ../src/verbs.cpp:2360 +#: ../src/verbs.cpp:2362 msgid "Paste Path _Effect" msgstr "Вставити _ефект контуру" -#: ../src/verbs.cpp:2361 +#: ../src/verbs.cpp:2363 msgid "Apply the path effect of the copied object to selection" msgstr "Застосувати ефект контуру скопійованого об'єкта до позначених об'єктів" -#: ../src/verbs.cpp:2362 +#: ../src/verbs.cpp:2364 msgid "Remove Path _Effect" msgstr "Вилучити _ефект контуру" -#: ../src/verbs.cpp:2363 +#: ../src/verbs.cpp:2365 msgid "Remove any path effects from selected objects" msgstr "Вилучити всі ефекти контурів з позначених об'єктів" -#: ../src/verbs.cpp:2364 +#: ../src/verbs.cpp:2366 msgid "_Remove Filters" msgstr "В_илучити фільтри" -#: ../src/verbs.cpp:2365 +#: ../src/verbs.cpp:2367 msgid "Remove any filters from selected objects" msgstr "Вилучити всі наслідки застосування фільтрів з позначених об'єктів" -#: ../src/verbs.cpp:2366 +#: ../src/verbs.cpp:2368 msgid "_Delete" msgstr "В_илучити" -#: ../src/verbs.cpp:2367 +#: ../src/verbs.cpp:2369 msgid "Delete selection" msgstr "Вилучити позначені об'єкти" -#: ../src/verbs.cpp:2368 +#: ../src/verbs.cpp:2370 msgid "Duplic_ate" msgstr "_Дублювати" -#: ../src/verbs.cpp:2369 +#: ../src/verbs.cpp:2371 msgid "Duplicate selected objects" msgstr "Дублювати позначені об'єкти" -#: ../src/verbs.cpp:2370 +#: ../src/verbs.cpp:2372 msgid "Create Clo_ne" msgstr "Створити к_лон" -#: ../src/verbs.cpp:2371 +#: ../src/verbs.cpp:2373 msgid "Create a clone (a copy linked to the original) of selected object" msgstr "Створити клон (копію, пов'язану з оригіналом) позначеного об'єкта" -#: ../src/verbs.cpp:2372 +#: ../src/verbs.cpp:2374 msgid "Unlin_k Clone" msgstr "В_ід'єднати клон" -#: ../src/verbs.cpp:2373 +#: ../src/verbs.cpp:2375 msgid "" "Cut the selected clones' links to the originals, turning them into " "standalone objects" @@ -22114,29 +22274,29 @@ msgstr "" "Вирізати вибрані посилання клонів на оригінали з перетворенням їх на окремі " "об'єкти" -#: ../src/verbs.cpp:2374 +#: ../src/verbs.cpp:2376 msgid "Relink to Copied" msgstr "Перез'єднати з копійованим" -#: ../src/verbs.cpp:2375 +#: ../src/verbs.cpp:2377 msgid "Relink the selected clones to the object currently on the clipboard" msgstr "" "Перез'єднати вибрані клони з об'єктом, який зараз перебуває у буфері обміну " "даними" -#: ../src/verbs.cpp:2376 +#: ../src/verbs.cpp:2378 msgid "Select _Original" msgstr "Позначити о_ригінал" -#: ../src/verbs.cpp:2377 +#: ../src/verbs.cpp:2379 msgid "Select the object to which the selected clone is linked" msgstr "Позначити об'єкт, з яким пов'язаний вибраний клон" -#: ../src/verbs.cpp:2378 +#: ../src/verbs.cpp:2380 msgid "Clone original path (LPE)" msgstr "Клонувати початковий контур (геометрично)" -#: ../src/verbs.cpp:2379 +#: ../src/verbs.cpp:2381 msgid "" "Creates a new path, applies the Clone original LPE, and refers it to the " "selected path" @@ -22144,19 +22304,19 @@ msgstr "" "Створює новий контур, застосовує геометричне перетворення клонування " "початкового контуру і пов'язує його з вибраним контуром" -#: ../src/verbs.cpp:2380 +#: ../src/verbs.cpp:2382 msgid "Objects to _Marker" msgstr "Об'єкти у _маркер" -#: ../src/verbs.cpp:2381 +#: ../src/verbs.cpp:2383 msgid "Convert selection to a line marker" msgstr "Перетворити вибране на маркер лінії" -#: ../src/verbs.cpp:2382 +#: ../src/verbs.cpp:2384 msgid "Objects to Gu_ides" msgstr "Об'єкти у на_прямні" -#: ../src/verbs.cpp:2383 +#: ../src/verbs.cpp:2385 msgid "" "Convert selected objects to a collection of guidelines aligned with their " "edges" @@ -22164,92 +22324,92 @@ msgstr "" "Перетворити вибрані об'єкти на декілька напрямних, вирівняних за краями " "об'єктів" -#: ../src/verbs.cpp:2384 +#: ../src/verbs.cpp:2386 msgid "Objects to Patter_n" msgstr "О_б'єкти у візерунок" -#: ../src/verbs.cpp:2385 +#: ../src/verbs.cpp:2387 msgid "Convert selection to a rectangle with tiled pattern fill" msgstr "Перетворити позначені об'єкти у прямокутник, заповнений візерунком" -#: ../src/verbs.cpp:2386 +#: ../src/verbs.cpp:2388 msgid "Pattern to _Objects" msgstr "_Візерунок у об'єкти" -#: ../src/verbs.cpp:2387 +#: ../src/verbs.cpp:2389 msgid "Extract objects from a tiled pattern fill" msgstr "Витягнути об'єкти з текстурного заповнення" -#: ../src/verbs.cpp:2388 +#: ../src/verbs.cpp:2390 msgid "Group to Symbol" msgstr "Групу на символ" -#: ../src/verbs.cpp:2389 +#: ../src/verbs.cpp:2391 msgid "Convert group to a symbol" msgstr "Перетворити групу на символ" -#: ../src/verbs.cpp:2390 +#: ../src/verbs.cpp:2392 msgid "Symbol to Group" msgstr "Символ у групу" -#: ../src/verbs.cpp:2391 +#: ../src/verbs.cpp:2393 msgid "Extract group from a symbol" msgstr "Видобути групу з символу" -#: ../src/verbs.cpp:2392 +#: ../src/verbs.cpp:2394 msgid "Clea_r All" msgstr "О_чистити все" -#: ../src/verbs.cpp:2393 +#: ../src/verbs.cpp:2395 msgid "Delete all objects from document" msgstr "Вилучити усі об'єкти з документа" -#: ../src/verbs.cpp:2394 +#: ../src/verbs.cpp:2396 msgid "Select Al_l" msgstr "Поз_начити все" -#: ../src/verbs.cpp:2395 +#: ../src/verbs.cpp:2397 msgid "Select all objects or all nodes" msgstr "Позначити всі об'єкти чи всі вузли" -#: ../src/verbs.cpp:2396 +#: ../src/verbs.cpp:2398 msgid "Select All in All La_yers" msgstr "Позначити все в усіх _шарах" -#: ../src/verbs.cpp:2397 +#: ../src/verbs.cpp:2399 msgid "Select all objects in all visible and unlocked layers" msgstr "Позначити усі об'єкти в усіх видимих та розблокованих шарах" -#: ../src/verbs.cpp:2398 +#: ../src/verbs.cpp:2400 msgid "Fill _and Stroke" msgstr "Заповнення _та штрих" -#: ../src/verbs.cpp:2399 +#: ../src/verbs.cpp:2401 msgid "" "Select all objects with the same fill and stroke as the selected objects" msgstr "Позначити всі об'єкти з тим самим заповненням та штрихом" -#: ../src/verbs.cpp:2400 +#: ../src/verbs.cpp:2402 msgid "_Fill Color" msgstr "За_повнити кольором" -#: ../src/verbs.cpp:2401 +#: ../src/verbs.cpp:2403 msgid "Select all objects with the same fill as the selected objects" msgstr "Позначити всі об'єкти з тим самим заповненням" -#: ../src/verbs.cpp:2402 +#: ../src/verbs.cpp:2404 msgid "_Stroke Color" msgstr "Колір _штриха" -#: ../src/verbs.cpp:2403 +#: ../src/verbs.cpp:2405 msgid "Select all objects with the same stroke as the selected objects" msgstr "Позначити всі об'єкти з тим самим штрихом" -#: ../src/verbs.cpp:2404 +#: ../src/verbs.cpp:2406 msgid "Stroke St_yle" msgstr "С_тиль штриха" -#: ../src/verbs.cpp:2405 +#: ../src/verbs.cpp:2407 msgid "" "Select all objects with the same stroke style (width, dash, markers) as the " "selected objects" @@ -22257,11 +22417,11 @@ msgstr "" "Позначити всі об'єкти з тим самим типом штриха (товщиною, рисками, " "позначками)" -#: ../src/verbs.cpp:2406 +#: ../src/verbs.cpp:2408 msgid "_Object Type" msgstr "Тип _об'єкта" -#: ../src/verbs.cpp:2407 +#: ../src/verbs.cpp:2409 msgid "" "Select all objects with the same object type (rect, arc, text, path, bitmap " "etc) as the selected objects" @@ -22269,152 +22429,152 @@ msgstr "" "Позначити всі об'єкти з тим самим типом об'єкта (прямокутник, дуга, текст, " "контур, растрове зображення тощо), що і позначені об'єкти" -#: ../src/verbs.cpp:2408 +#: ../src/verbs.cpp:2410 msgid "In_vert Selection" msgstr "_Інвертувати позначення" -#: ../src/verbs.cpp:2409 +#: ../src/verbs.cpp:2411 msgid "Invert selection (unselect what is selected and select everything else)" msgstr "" "Інвертувати позначення (зняти позначення з позначеного та позначити решту)" -#: ../src/verbs.cpp:2410 +#: ../src/verbs.cpp:2412 msgid "Invert in All Layers" msgstr "Інвертувати в усіх шарах" -#: ../src/verbs.cpp:2411 +#: ../src/verbs.cpp:2413 msgid "Invert selection in all visible and unlocked layers" msgstr "Інвертувати позначення в усіх видимих та незаблокованих шарах" -#: ../src/verbs.cpp:2412 +#: ../src/verbs.cpp:2414 msgid "Select Next" msgstr "Обрати наступний" -#: ../src/verbs.cpp:2413 +#: ../src/verbs.cpp:2415 msgid "Select next object or node" msgstr "Обрати наступний об'єкт або вузол" -#: ../src/verbs.cpp:2414 +#: ../src/verbs.cpp:2416 msgid "Select Previous" msgstr "Обрати попереднє" -#: ../src/verbs.cpp:2415 +#: ../src/verbs.cpp:2417 msgid "Select previous object or node" msgstr "Обрати попередній об'єкт чи вузол" -#: ../src/verbs.cpp:2416 +#: ../src/verbs.cpp:2418 msgid "D_eselect" msgstr "Зн_яти позначення" -#: ../src/verbs.cpp:2417 +#: ../src/verbs.cpp:2419 msgid "Deselect any selected objects or nodes" msgstr "Зняти позначення з усіх об'єктів чи вузлів" -#: ../src/verbs.cpp:2418 +#: ../src/verbs.cpp:2420 msgid "Create _Guides Around the Page" msgstr "Створити _напрямні навколо сторінки" -#: ../src/verbs.cpp:2419 ../src/verbs.cpp:2421 +#: ../src/verbs.cpp:2421 ../src/verbs.cpp:2423 msgid "Create four guides aligned with the page borders" msgstr "Створити чотири напрямні за краями сторінки" -#: ../src/verbs.cpp:2422 +#: ../src/verbs.cpp:2424 msgid "Next path effect parameter" msgstr "Наступний параметр ефекту контуру" -#: ../src/verbs.cpp:2423 +#: ../src/verbs.cpp:2425 msgid "Show next editable path effect parameter" msgstr "Показати наступний придатний до редагування параметр ефекту контуру" #. Selection -#: ../src/verbs.cpp:2426 +#: ../src/verbs.cpp:2428 msgid "Raise to _Top" msgstr "Підняти на п_ередній план" -#: ../src/verbs.cpp:2427 +#: ../src/verbs.cpp:2429 msgid "Raise selection to top" msgstr "Підняти позначені об'єкти на передній план" -#: ../src/verbs.cpp:2428 +#: ../src/verbs.cpp:2430 msgid "Lower to _Bottom" msgstr "Опустити на з_адній план" -#: ../src/verbs.cpp:2429 +#: ../src/verbs.cpp:2431 msgid "Lower selection to bottom" msgstr "Опустити позначені об'єкти на задній план" -#: ../src/verbs.cpp:2430 +#: ../src/verbs.cpp:2432 msgid "_Raise" msgstr "_Підняти" -#: ../src/verbs.cpp:2431 +#: ../src/verbs.cpp:2433 msgid "Raise selection one step" msgstr "Підняти позначені об'єкти на один рівень" -#: ../src/verbs.cpp:2432 +#: ../src/verbs.cpp:2434 msgid "_Lower" msgstr "_Опустити" -#: ../src/verbs.cpp:2433 +#: ../src/verbs.cpp:2435 msgid "Lower selection one step" msgstr "Опустити позначені об'єкти на один рівень" -#: ../src/verbs.cpp:2435 +#: ../src/verbs.cpp:2437 msgid "Group selected objects" msgstr "Згрупувати позначені об'єкти" -#: ../src/verbs.cpp:2437 +#: ../src/verbs.cpp:2439 msgid "Ungroup selected groups" msgstr "Розгрупувати позначені групи" -#: ../src/verbs.cpp:2439 +#: ../src/verbs.cpp:2441 msgid "_Put on Path" msgstr "_Розмістити по контуру" -#: ../src/verbs.cpp:2441 +#: ../src/verbs.cpp:2443 msgid "_Remove from Path" msgstr "Відокрем_ити від контуру" -#: ../src/verbs.cpp:2443 +#: ../src/verbs.cpp:2445 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:2446 +#: ../src/verbs.cpp:2448 msgid "Remove all manual kerns and glyph rotations from a text object" msgstr "" "Вилучити з текстового об'єкта усі додані вручну повороти кернів та гліфів" -#: ../src/verbs.cpp:2448 +#: ../src/verbs.cpp:2450 msgid "_Union" msgstr "С_ума" -#: ../src/verbs.cpp:2449 +#: ../src/verbs.cpp:2451 msgid "Create union of selected paths" msgstr "Створення об'єднання позначених контурів" -#: ../src/verbs.cpp:2450 +#: ../src/verbs.cpp:2452 msgid "_Intersection" msgstr "_Перетин" -#: ../src/verbs.cpp:2451 +#: ../src/verbs.cpp:2453 msgid "Create intersection of selected paths" msgstr "Створення перетину позначених контурів" -#: ../src/verbs.cpp:2452 +#: ../src/verbs.cpp:2454 msgid "_Difference" msgstr "Р_ізниця" -#: ../src/verbs.cpp:2453 +#: ../src/verbs.cpp:2455 msgid "Create difference of selected paths (bottom minus top)" msgstr "Створення різниці позначених контурів (низ мінус верх)" -#: ../src/verbs.cpp:2454 +#: ../src/verbs.cpp:2456 msgid "E_xclusion" msgstr "Виключне _АБО" -#: ../src/verbs.cpp:2455 +#: ../src/verbs.cpp:2457 msgid "" "Create exclusive OR of selected paths (those parts that belong to only one " "path)" @@ -22422,21 +22582,21 @@ msgstr "" "Створити контур шляхом виключного АБО з позначених контурів (ті частини, що " "належать тільки одному з контурів)" -#: ../src/verbs.cpp:2456 +#: ../src/verbs.cpp:2458 msgid "Di_vision" msgstr "_Ділення" -#: ../src/verbs.cpp:2457 +#: ../src/verbs.cpp:2459 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:2460 +#: ../src/verbs.cpp:2462 msgid "Cut _Path" msgstr "Розрізати _контур" -#: ../src/verbs.cpp:2461 +#: ../src/verbs.cpp:2463 msgid "Cut the bottom path's stroke into pieces, removing fill" msgstr "" "Розрізати штрих нижнього контуру верхнім на частини, з вилученням заповнення" @@ -22444,347 +22604,347 @@ 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:2465 +#: ../src/verbs.cpp:2467 msgid "Outs_et" msgstr "Ро_зтягнути" -#: ../src/verbs.cpp:2466 +#: ../src/verbs.cpp:2468 msgid "Outset selected paths" msgstr "Розтягнути позначені контури" -#: ../src/verbs.cpp:2468 +#: ../src/verbs.cpp:2470 msgid "O_utset Path by 1 px" msgstr "Р_озтягнути на 1 точку" -#: ../src/verbs.cpp:2469 +#: ../src/verbs.cpp:2471 msgid "Outset selected paths by 1 px" msgstr "Розтягнути позначені контури на 1 точку" -#: ../src/verbs.cpp:2471 +#: ../src/verbs.cpp:2473 msgid "O_utset Path by 10 px" msgstr "Р_озтягнути на 10 точок" -#: ../src/verbs.cpp:2472 +#: ../src/verbs.cpp:2474 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:2476 +#: ../src/verbs.cpp:2478 msgid "I_nset" msgstr "В_тягнути" -#: ../src/verbs.cpp:2477 +#: ../src/verbs.cpp:2479 msgid "Inset selected paths" msgstr "Втягнути позначені контури" -#: ../src/verbs.cpp:2479 +#: ../src/verbs.cpp:2481 msgid "I_nset Path by 1 px" msgstr "Вт_ягнути контур на 1 точку" -#: ../src/verbs.cpp:2480 +#: ../src/verbs.cpp:2482 msgid "Inset selected paths by 1 px" msgstr "Втягнути позначені контури на 1 точку" -#: ../src/verbs.cpp:2482 +#: ../src/verbs.cpp:2484 msgid "I_nset Path by 10 px" msgstr "Вт_ягнути контур на 10 точок" -#: ../src/verbs.cpp:2483 +#: ../src/verbs.cpp:2485 msgid "Inset selected paths by 10 px" msgstr "Втягнути позначені контури на 10 точок" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2487 msgid "D_ynamic Offset" msgstr "Д_инамічний відступ" -#: ../src/verbs.cpp:2485 +#: ../src/verbs.cpp:2487 msgid "Create a dynamic offset object" msgstr "" "Створити об'єкт, втягування/розтягування якого можна змінювати динамічно" -#: ../src/verbs.cpp:2487 +#: ../src/verbs.cpp:2489 msgid "_Linked Offset" msgstr "Зв'_язане втягування" -#: ../src/verbs.cpp:2488 +#: ../src/verbs.cpp:2490 msgid "Create a dynamic offset object linked to the original path" msgstr "" "Створити втягування/розтягування, динамічно пов'язане з початковим контуром" -#: ../src/verbs.cpp:2490 +#: ../src/verbs.cpp:2492 msgid "_Stroke to Path" msgstr "_Штрих у контур" -#: ../src/verbs.cpp:2491 +#: ../src/verbs.cpp:2493 msgid "Convert selected object's stroke to paths" msgstr "Перетворити штрих позначеного об'єкта на контури" -#: ../src/verbs.cpp:2492 +#: ../src/verbs.cpp:2494 msgid "Si_mplify" msgstr "_Спростити" -#: ../src/verbs.cpp:2493 +#: ../src/verbs.cpp:2495 msgid "Simplify selected paths (remove extra nodes)" msgstr "Спростити позначені контури вилученням зайвих вузлів" -#: ../src/verbs.cpp:2494 +#: ../src/verbs.cpp:2496 msgid "_Reverse" msgstr "Роз_вернути" -#: ../src/verbs.cpp:2495 +#: ../src/verbs.cpp:2497 msgid "Reverse the direction of selected paths (useful for flipping markers)" msgstr "" "Змінити напрямок позначених контурів на протилежний (корисно для " "віддзеркалення маркерів)" -#: ../src/verbs.cpp:2498 +#: ../src/verbs.cpp:2500 msgid "Create one or more paths from a bitmap by tracing it" msgstr "" "Створення одного або більше контурів з растрового файла шляхом трасування" -#: ../src/verbs.cpp:2499 +#: ../src/verbs.cpp:2501 msgid "Make a _Bitmap Copy" msgstr "З_робити растрову копію" -#: ../src/verbs.cpp:2500 +#: ../src/verbs.cpp:2502 msgid "Export selection to a bitmap and insert it into document" msgstr "Експортувати позначені об'єкти у растр та вставити його у документ" -#: ../src/verbs.cpp:2501 +#: ../src/verbs.cpp:2503 msgid "_Combine" msgstr "Об'_єднати" -#: ../src/verbs.cpp:2502 +#: ../src/verbs.cpp:2504 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:2505 +#: ../src/verbs.cpp:2507 msgid "Break _Apart" msgstr "_Розділити" -#: ../src/verbs.cpp:2506 +#: ../src/verbs.cpp:2508 msgid "Break selected paths into subpaths" msgstr "Розділити позначені контури на частини" -#: ../src/verbs.cpp:2507 +#: ../src/verbs.cpp:2509 msgid "Ro_ws and Columns..." msgstr "Р_ядки і стовпчики…" -#: ../src/verbs.cpp:2508 +#: ../src/verbs.cpp:2510 msgid "Arrange selected objects in a table" msgstr "Компонувати позначені об'єкти у формі таблиці" #. Layer -#: ../src/verbs.cpp:2510 +#: ../src/verbs.cpp:2512 msgid "_Add Layer..." msgstr "_Додати шар…" -#: ../src/verbs.cpp:2511 +#: ../src/verbs.cpp:2513 msgid "Create a new layer" msgstr "Створити новий шар" -#: ../src/verbs.cpp:2512 +#: ../src/verbs.cpp:2514 msgid "Re_name Layer..." msgstr "Пере_йменувати шар…" -#: ../src/verbs.cpp:2513 +#: ../src/verbs.cpp:2515 msgid "Rename the current layer" msgstr "Перейменувати поточний шар" -#: ../src/verbs.cpp:2514 +#: ../src/verbs.cpp:2516 msgid "Switch to Layer Abov_e" msgstr "Перейти на шар _вище" -#: ../src/verbs.cpp:2515 +#: ../src/verbs.cpp:2517 msgid "Switch to the layer above the current" msgstr "Перейти на шар, що знаходиться вище від поточного" -#: ../src/verbs.cpp:2516 +#: ../src/verbs.cpp:2518 msgid "Switch to Layer Belo_w" msgstr "Перейти на шар _нижче" -#: ../src/verbs.cpp:2517 +#: ../src/verbs.cpp:2519 msgid "Switch to the layer below the current" msgstr "Перейти на шар, що знаходиться нижче від поточного" -#: ../src/verbs.cpp:2518 +#: ../src/verbs.cpp:2520 msgid "Move Selection to Layer Abo_ve" msgstr "Перемістити позначені об'єкти на шар ви_ще" -#: ../src/verbs.cpp:2519 +#: ../src/verbs.cpp:2521 msgid "Move selection to the layer above the current" msgstr "Перемістити на шар, що знаходиться над поточним" -#: ../src/verbs.cpp:2520 +#: ../src/verbs.cpp:2522 msgid "Move Selection to Layer Bel_ow" msgstr "Перемістити на шар ни_жче" -#: ../src/verbs.cpp:2521 +#: ../src/verbs.cpp:2523 msgid "Move selection to the layer below the current" msgstr "Перемістити на шар, що знаходиться під поточним" -#: ../src/verbs.cpp:2522 +#: ../src/verbs.cpp:2524 msgid "Move Selection to Layer..." msgstr "Пересунути позначене до шару…" -#: ../src/verbs.cpp:2524 +#: ../src/verbs.cpp:2526 msgid "Layer to _Top" msgstr "Підняти шар до_гори" -#: ../src/verbs.cpp:2525 +#: ../src/verbs.cpp:2527 msgid "Raise the current layer to the top" msgstr "Підняти поточний шар догори" -#: ../src/verbs.cpp:2526 +#: ../src/verbs.cpp:2528 msgid "Layer to _Bottom" msgstr "Опустити шар в _основу" -#: ../src/verbs.cpp:2527 +#: ../src/verbs.cpp:2529 msgid "Lower the current layer to the bottom" msgstr "Опустити поточний шар на найнижчий рівень" -#: ../src/verbs.cpp:2528 +#: ../src/verbs.cpp:2530 msgid "_Raise Layer" msgstr "_Підняти шар" -#: ../src/verbs.cpp:2529 +#: ../src/verbs.cpp:2531 msgid "Raise the current layer" msgstr "Підняти поточний шар" -#: ../src/verbs.cpp:2530 +#: ../src/verbs.cpp:2532 msgid "_Lower Layer" msgstr "_Опустити шар" -#: ../src/verbs.cpp:2531 +#: ../src/verbs.cpp:2533 msgid "Lower the current layer" msgstr "Опустити поточний шар" -#: ../src/verbs.cpp:2532 +#: ../src/verbs.cpp:2534 msgid "D_uplicate Current Layer" msgstr "Д_ублювати поточний шар" -#: ../src/verbs.cpp:2533 +#: ../src/verbs.cpp:2535 msgid "Duplicate an existing layer" msgstr "Дублювати поточний шар" -#: ../src/verbs.cpp:2534 +#: ../src/verbs.cpp:2536 msgid "_Delete Current Layer" msgstr "В_илучити поточний шар" -#: ../src/verbs.cpp:2535 +#: ../src/verbs.cpp:2537 msgid "Delete the current layer" msgstr "Вилучити поточний шар" -#: ../src/verbs.cpp:2536 +#: ../src/verbs.cpp:2538 msgid "_Show/hide other layers" msgstr "_Показати або сховати інші шари" -#: ../src/verbs.cpp:2537 +#: ../src/verbs.cpp:2539 msgid "Solo the current layer" msgstr "Виокремити поточний шар" -#: ../src/verbs.cpp:2538 +#: ../src/verbs.cpp:2540 msgid "_Show all layers" msgstr "По_казати всі шари" -#: ../src/verbs.cpp:2539 +#: ../src/verbs.cpp:2541 msgid "Show all the layers" msgstr "Показати всі шари" -#: ../src/verbs.cpp:2540 +#: ../src/verbs.cpp:2542 msgid "_Hide all layers" msgstr "При_ховати всі шари" -#: ../src/verbs.cpp:2541 +#: ../src/verbs.cpp:2543 msgid "Hide all the layers" msgstr "Приховати всі шари" -#: ../src/verbs.cpp:2542 +#: ../src/verbs.cpp:2544 msgid "_Lock all layers" msgstr "За_блокувати всі шари" -#: ../src/verbs.cpp:2543 +#: ../src/verbs.cpp:2545 msgid "Lock all the layers" msgstr "Заблокувати всі шари" -#: ../src/verbs.cpp:2544 +#: ../src/verbs.cpp:2546 msgid "Lock/Unlock _other layers" msgstr "Заблокувати чи розблокувати ін_ші шари" -#: ../src/verbs.cpp:2545 +#: ../src/verbs.cpp:2547 msgid "Lock all the other layers" msgstr "Заблокувати всі інші шари" -#: ../src/verbs.cpp:2546 +#: ../src/verbs.cpp:2548 msgid "_Unlock all layers" msgstr "_Розблокувати всі шари" -#: ../src/verbs.cpp:2547 +#: ../src/verbs.cpp:2549 msgid "Unlock all the layers" msgstr "Розблокувати всі шари" -#: ../src/verbs.cpp:2548 +#: ../src/verbs.cpp:2550 msgid "_Lock/Unlock Current Layer" msgstr "За_блокувати чи розблокувати поточний шар" -#: ../src/verbs.cpp:2549 +#: ../src/verbs.cpp:2551 msgid "Toggle lock on current layer" msgstr "Заблокувати або розблокувати поточний шар" -#: ../src/verbs.cpp:2550 +#: ../src/verbs.cpp:2552 msgid "_Show/hide Current Layer" msgstr "_Показати або сховати поточний шар" -#: ../src/verbs.cpp:2551 +#: ../src/verbs.cpp:2553 msgid "Toggle visibility of current layer" msgstr "Увімкнути/Вимкнути видимість поточного шару" #. Object -#: ../src/verbs.cpp:2554 +#: ../src/verbs.cpp:2556 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:2557 +#: ../src/verbs.cpp:2559 msgid "Rotate selection 90° clockwise" msgstr "Обернути позначені об'єкти на 90° за годинниковою стрілкою" -#: ../src/verbs.cpp:2558 +#: ../src/verbs.cpp:2560 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:2561 +#: ../src/verbs.cpp:2563 msgid "Rotate selection 90° counter-clockwise" msgstr "Обернути позначені об'єкти на 90° проти годинникової стрілки" -#: ../src/verbs.cpp:2562 +#: ../src/verbs.cpp:2564 msgid "Remove _Transformations" msgstr "Прибрати _трансформацію" -#: ../src/verbs.cpp:2563 +#: ../src/verbs.cpp:2565 msgid "Remove transformations from object" msgstr "Прибрати трансформації з об'єкта" -#: ../src/verbs.cpp:2564 +#: ../src/verbs.cpp:2566 msgid "_Object to Path" msgstr "_Об'єкт у контур" -#: ../src/verbs.cpp:2565 +#: ../src/verbs.cpp:2567 msgid "Convert selected object to path" msgstr "Перетворити позначений об'єкт на контур" -#: ../src/verbs.cpp:2566 +#: ../src/verbs.cpp:2568 msgid "_Flow into Frame" msgstr "_Огорнути в рамку" -#: ../src/verbs.cpp:2567 +#: ../src/verbs.cpp:2569 msgid "" "Put text into a frame (path or shape), creating a flowed text linked to the " "frame object" @@ -22792,758 +22952,754 @@ msgstr "" "Вкласти текст у рамку (контур чи форму), створивши контурний текст " "прив'язаний до об'єкта рамки" -#: ../src/verbs.cpp:2568 +#: ../src/verbs.cpp:2570 msgid "_Unflow" msgstr "_Вийняти з рамки" -#: ../src/verbs.cpp:2569 +#: ../src/verbs.cpp:2571 msgid "Remove text from frame (creates a single-line text object)" msgstr "Вийняти тест з рамки, створивши звичайний тестовий об'єкт в один рядок" -#: ../src/verbs.cpp:2570 +#: ../src/verbs.cpp:2572 msgid "_Convert to Text" msgstr "_Перетворити у текст" -#: ../src/verbs.cpp:2571 +#: ../src/verbs.cpp:2573 msgid "Convert flowed text to regular text object (preserves appearance)" msgstr "Перетворити контурний текст у звичайний текст (із збереженням вигляду)" -#: ../src/verbs.cpp:2573 +#: ../src/verbs.cpp:2575 msgid "Flip _Horizontal" msgstr "Віддзеркалити гор_изонтально" -#: ../src/verbs.cpp:2573 +#: ../src/verbs.cpp:2575 msgid "Flip selected objects horizontally" msgstr "Віддзеркалити позначені об'єкти горизонтально" -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2578 msgid "Flip _Vertical" msgstr "Віддзеркалити _вертикально" -#: ../src/verbs.cpp:2576 +#: ../src/verbs.cpp:2578 msgid "Flip selected objects vertically" msgstr "Віддзеркалити позначені об'єкти вертикально" -#: ../src/verbs.cpp:2579 +#: ../src/verbs.cpp:2581 msgid "Apply mask to selection (using the topmost object as mask)" msgstr "" "Застосувати маску до позначених об'єктів (використовуючи найвищий об'єкт як " "маску)" -#: ../src/verbs.cpp:2581 +#: ../src/verbs.cpp:2583 msgid "Edit mask" msgstr "Змінити маску" -#: ../src/verbs.cpp:2582 ../src/verbs.cpp:2588 +#: ../src/verbs.cpp:2584 ../src/verbs.cpp:2590 msgid "_Release" msgstr "_Скинути" -#: ../src/verbs.cpp:2583 +#: ../src/verbs.cpp:2585 msgid "Remove mask from selection" msgstr "Вилучити маску з позначеного" -#: ../src/verbs.cpp:2585 +#: ../src/verbs.cpp:2587 msgid "" "Apply clipping path to selection (using the topmost object as clipping path)" msgstr "" "Застосувати контур-обгортку до позначених об'єктів (використовуючи найвищий " "об'єкт як контур-обгортку)" -#: ../src/verbs.cpp:2587 +#: ../src/verbs.cpp:2589 msgid "Edit clipping path" msgstr "Змінити контур вирізання" -#: ../src/verbs.cpp:2589 +#: ../src/verbs.cpp:2591 msgid "Remove clipping path from selection" msgstr "Вилучити контур-обгортку з позначених об'єктів'" #. Tools -#: ../src/verbs.cpp:2592 +#: ../src/verbs.cpp:2594 msgctxt "ContextVerb" msgid "Select" msgstr "Позначення" -#: ../src/verbs.cpp:2593 +#: ../src/verbs.cpp:2595 msgid "Select and transform objects" msgstr "Позначення та трансформація об'єктів" -#: ../src/verbs.cpp:2594 +#: ../src/verbs.cpp:2596 msgctxt "ContextVerb" msgid "Node Edit" msgstr "Редактор вузлів" -#: ../src/verbs.cpp:2595 +#: ../src/verbs.cpp:2597 msgid "Edit paths by nodes" msgstr "Редагування контурів за вузлами" -#: ../src/verbs.cpp:2596 +#: ../src/verbs.cpp:2598 msgctxt "ContextVerb" msgid "Tweak" msgstr "Корекція" -#: ../src/verbs.cpp:2597 +#: ../src/verbs.cpp:2599 msgid "Tweak objects by sculpting or painting" msgstr "Коригувати об'єкти за допомогою профілювання або розфарбовування" -#: ../src/verbs.cpp:2598 +#: ../src/verbs.cpp:2600 msgctxt "ContextVerb" msgid "Spray" msgstr "Розкидання" -#: ../src/verbs.cpp:2599 +#: ../src/verbs.cpp:2601 msgid "Spray objects by sculpting or painting" msgstr "Розкидати об'єкти за допомогою профілювання або розфарбовування" -#: ../src/verbs.cpp:2600 +#: ../src/verbs.cpp:2602 msgctxt "ContextVerb" msgid "Rectangle" msgstr "Прямокутник" -#: ../src/verbs.cpp:2601 +#: ../src/verbs.cpp:2603 msgid "Create rectangles and squares" msgstr "Створення прямокутників та квадратів" -#: ../src/verbs.cpp:2602 +#: ../src/verbs.cpp:2604 msgctxt "ContextVerb" msgid "3D Box" msgstr "Просторовий об'єкт" -#: ../src/verbs.cpp:2603 +#: ../src/verbs.cpp:2605 msgid "Create 3D boxes" msgstr "Створити тривимірні об'єкти" -#: ../src/verbs.cpp:2604 +#: ../src/verbs.cpp:2606 msgctxt "ContextVerb" msgid "Ellipse" msgstr "Еліпс" -#: ../src/verbs.cpp:2605 +#: ../src/verbs.cpp:2607 msgid "Create circles, ellipses, and arcs" msgstr "Створення кіл, еліпсів та дуг" -#: ../src/verbs.cpp:2606 +#: ../src/verbs.cpp:2608 msgctxt "ContextVerb" msgid "Star" msgstr "Зірка" -#: ../src/verbs.cpp:2607 +#: ../src/verbs.cpp:2609 msgid "Create stars and polygons" msgstr "Створення зірок та багатокутників" -#: ../src/verbs.cpp:2608 +#: ../src/verbs.cpp:2610 msgctxt "ContextVerb" msgid "Spiral" msgstr "Спіраль" -#: ../src/verbs.cpp:2609 +#: ../src/verbs.cpp:2611 msgid "Create spirals" msgstr "Створення спіралей" -#: ../src/verbs.cpp:2610 +#: ../src/verbs.cpp:2612 msgctxt "ContextVerb" msgid "Pencil" msgstr "Олівець" -#: ../src/verbs.cpp:2611 +#: ../src/verbs.cpp:2613 msgid "Draw freehand lines" msgstr "Малювання довільних контурів" -#: ../src/verbs.cpp:2612 +#: ../src/verbs.cpp:2614 msgctxt "ContextVerb" msgid "Pen" msgstr "Перо" -#: ../src/verbs.cpp:2613 +#: ../src/verbs.cpp:2615 msgid "Draw Bezier curves and straight lines" msgstr "Малювання кривих Безьє чи прямих ліній" -#: ../src/verbs.cpp:2614 +#: ../src/verbs.cpp:2616 msgctxt "ContextVerb" msgid "Calligraphy" msgstr "Каліграфія" -#: ../src/verbs.cpp:2615 +#: ../src/verbs.cpp:2617 msgid "Draw calligraphic or brush strokes" msgstr "Малювати каліграфічним пером або пензлем" -#: ../src/verbs.cpp:2617 +#: ../src/verbs.cpp:2619 msgid "Create and edit text objects" msgstr "Створення та зміна текстових об'єктів" -#: ../src/verbs.cpp:2618 +#: ../src/verbs.cpp:2620 msgctxt "ContextVerb" msgid "Gradient" msgstr "Градієнт" -#: ../src/verbs.cpp:2619 +#: ../src/verbs.cpp:2621 msgid "Create and edit gradients" msgstr "Створення та зміна градієнтів" -#: ../src/verbs.cpp:2620 +#: ../src/verbs.cpp:2622 msgctxt "ContextVerb" msgid "Mesh" msgstr "Сітка" -#: ../src/verbs.cpp:2621 +#: ../src/verbs.cpp:2623 msgid "Create and edit meshes" msgstr "Створення та зміна сіток" -#: ../src/verbs.cpp:2622 +#: ../src/verbs.cpp:2624 msgctxt "ContextVerb" msgid "Zoom" msgstr "Масштаб" -#: ../src/verbs.cpp:2623 +#: ../src/verbs.cpp:2625 msgid "Zoom in or out" msgstr "Змінити масштаб" -#: ../src/verbs.cpp:2625 +#: ../src/verbs.cpp:2627 msgid "Measurement tool" msgstr "Інструмент вимірювання" -#: ../src/verbs.cpp:2626 +#: ../src/verbs.cpp:2628 msgctxt "ContextVerb" msgid "Dropper" msgstr "Піпетка" -#: ../src/verbs.cpp:2627 ../src/widgets/sp-color-notebook.cpp:389 +#: ../src/verbs.cpp:2629 ../src/widgets/sp-color-notebook.cpp:413 msgid "Pick colors from image" msgstr "Взяти кольори з зображення" -#: ../src/verbs.cpp:2628 +#: ../src/verbs.cpp:2630 msgctxt "ContextVerb" msgid "Connector" msgstr "Лінія з'єднання" -#: ../src/verbs.cpp:2629 +#: ../src/verbs.cpp:2631 msgid "Create diagram connectors" msgstr "Створити лінії з'єднання на діаграмі" -#: ../src/verbs.cpp:2630 +#: ../src/verbs.cpp:2632 msgctxt "ContextVerb" msgid "Paint Bucket" msgstr "Відро з фарбою" -#: ../src/verbs.cpp:2631 +#: ../src/verbs.cpp:2633 msgid "Fill bounded areas" msgstr "Заповнити замкнені області" -#: ../src/verbs.cpp:2632 +#: ../src/verbs.cpp:2634 msgctxt "ContextVerb" msgid "LPE Edit" msgstr "Редагування геометричних побудов" -#: ../src/verbs.cpp:2633 +#: ../src/verbs.cpp:2635 msgid "Edit Path Effect parameters" msgstr "Змінити параметри ефекту контуру" -#: ../src/verbs.cpp:2634 +#: ../src/verbs.cpp:2636 msgctxt "ContextVerb" msgid "Eraser" msgstr "Гумка" -#: ../src/verbs.cpp:2635 +#: ../src/verbs.cpp:2637 msgid "Erase existing paths" msgstr "Витерти існуючі контури" -#: ../src/verbs.cpp:2636 +#: ../src/verbs.cpp:2638 msgctxt "ContextVerb" msgid "LPE Tool" msgstr "Інструмент геометричної побудови" -#: ../src/verbs.cpp:2637 +#: ../src/verbs.cpp:2639 msgid "Do geometric constructions" msgstr "Виконати геометричну побудову" #. Tool prefs -#: ../src/verbs.cpp:2639 +#: ../src/verbs.cpp:2641 msgid "Selector Preferences" msgstr "Параметри селектора" -#: ../src/verbs.cpp:2640 +#: ../src/verbs.cpp:2642 msgid "Open Preferences for the Selector tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента позначення" -#: ../src/verbs.cpp:2641 +#: ../src/verbs.cpp:2643 msgid "Node Tool Preferences" msgstr "Параметри редактора вузлів" -#: ../src/verbs.cpp:2642 +#: ../src/verbs.cpp:2644 msgid "Open Preferences for the Node tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Редактор вузлів»" -#: ../src/verbs.cpp:2643 +#: ../src/verbs.cpp:2645 msgid "Tweak Tool Preferences" msgstr "Параметри інструмента «Корекція»" -#: ../src/verbs.cpp:2644 +#: ../src/verbs.cpp:2646 msgid "Open Preferences for the Tweak tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Корекція»" -#: ../src/verbs.cpp:2645 +#: ../src/verbs.cpp:2647 msgid "Spray Tool Preferences" msgstr "Параметри інструмента «Розкидання»" -#: ../src/verbs.cpp:2646 +#: ../src/verbs.cpp:2648 msgid "Open Preferences for the Spray tool" msgstr "Відкрити вікно параметрів для інструмента «Розкидання»" -#: ../src/verbs.cpp:2647 +#: ../src/verbs.cpp:2649 msgid "Rectangle Preferences" msgstr "Параметри прямокутника" -#: ../src/verbs.cpp:2648 +#: ../src/verbs.cpp:2650 msgid "Open Preferences for the Rectangle tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Прямокутник»" -#: ../src/verbs.cpp:2649 +#: ../src/verbs.cpp:2651 msgid "3D Box Preferences" msgstr "Параметри просторового об'єкта" -#: ../src/verbs.cpp:2650 +#: ../src/verbs.cpp:2652 msgid "Open Preferences for the 3D Box tool" msgstr "" "Відкрити вікно параметрів Inkscape для інструмента «Просторовий об'єкт»" -#: ../src/verbs.cpp:2651 +#: ../src/verbs.cpp:2653 msgid "Ellipse Preferences" msgstr "Параметри еліпса" -#: ../src/verbs.cpp:2652 +#: ../src/verbs.cpp:2654 msgid "Open Preferences for the Ellipse tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Еліпс»" -#: ../src/verbs.cpp:2653 +#: ../src/verbs.cpp:2655 msgid "Star Preferences" msgstr "Властивості зірки" -#: ../src/verbs.cpp:2654 +#: ../src/verbs.cpp:2656 msgid "Open Preferences for the Star tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Зірка»" -#: ../src/verbs.cpp:2655 +#: ../src/verbs.cpp:2657 msgid "Spiral Preferences" msgstr "Властивості спіралі" -#: ../src/verbs.cpp:2656 +#: ../src/verbs.cpp:2658 msgid "Open Preferences for the Spiral tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Спіраль»" -#: ../src/verbs.cpp:2657 +#: ../src/verbs.cpp:2659 msgid "Pencil Preferences" msgstr "Параметри олівця" -#: ../src/verbs.cpp:2658 +#: ../src/verbs.cpp:2660 msgid "Open Preferences for the Pencil tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Олівець»" -#: ../src/verbs.cpp:2659 +#: ../src/verbs.cpp:2661 msgid "Pen Preferences" msgstr "Параметри пера" -#: ../src/verbs.cpp:2660 +#: ../src/verbs.cpp:2662 msgid "Open Preferences for the Pen tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Перо»" -#: ../src/verbs.cpp:2661 +#: ../src/verbs.cpp:2663 msgid "Calligraphic Preferences" msgstr "Параметри каліграфічного пера" -#: ../src/verbs.cpp:2662 +#: ../src/verbs.cpp:2664 msgid "Open Preferences for the Calligraphy tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Каліграфічне перо»" -#: ../src/verbs.cpp:2663 +#: ../src/verbs.cpp:2665 msgid "Text Preferences" msgstr "Параметри тексту" -#: ../src/verbs.cpp:2664 +#: ../src/verbs.cpp:2666 msgid "Open Preferences for the Text tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Текст»" -#: ../src/verbs.cpp:2665 +#: ../src/verbs.cpp:2667 msgid "Gradient Preferences" msgstr "Параметри градієнта" -#: ../src/verbs.cpp:2666 +#: ../src/verbs.cpp:2668 msgid "Open Preferences for the Gradient tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Градієнт»" -#: ../src/verbs.cpp:2667 +#: ../src/verbs.cpp:2669 msgid "Mesh Preferences" msgstr "Параметри сітки" -#: ../src/verbs.cpp:2668 +#: ../src/verbs.cpp:2670 msgid "Open Preferences for the Mesh tool" msgstr "Відкрити вікно параметрів для інструмента «Сітка»" -#: ../src/verbs.cpp:2669 +#: ../src/verbs.cpp:2671 msgid "Zoom Preferences" msgstr "Параметри масштабу" -#: ../src/verbs.cpp:2670 +#: ../src/verbs.cpp:2672 msgid "Open Preferences for the Zoom tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Масштаб»" -#: ../src/verbs.cpp:2671 +#: ../src/verbs.cpp:2673 msgid "Measure Preferences" msgstr "Властивості вимірювання" -#: ../src/verbs.cpp:2672 +#: ../src/verbs.cpp:2674 msgid "Open Preferences for the Measure tool" msgstr "Відкрити вікно параметрів для інструмента «Вимірювання»" -#: ../src/verbs.cpp:2673 +#: ../src/verbs.cpp:2675 msgid "Dropper Preferences" msgstr "Параметри піпетки" -#: ../src/verbs.cpp:2674 +#: ../src/verbs.cpp:2676 msgid "Open Preferences for the Dropper tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Піпетка»" -#: ../src/verbs.cpp:2675 +#: ../src/verbs.cpp:2677 msgid "Connector Preferences" msgstr "Параметри лінії з'єднання" -#: ../src/verbs.cpp:2676 +#: ../src/verbs.cpp:2678 msgid "Open Preferences for the Connector tool" msgstr "Відкрити вікно параметрів Inkscape для інструмента «Лінії з'єднання»" -#: ../src/verbs.cpp:2677 +#: ../src/verbs.cpp:2679 msgid "Paint Bucket Preferences" msgstr "Параметри відра з фарбою" -#: ../src/verbs.cpp:2678 +#: ../src/verbs.cpp:2680 msgid "Open Preferences for the Paint Bucket tool" msgstr "Відкрити параметри для інструмента «Відро з фарбою»" -#: ../src/verbs.cpp:2679 +#: ../src/verbs.cpp:2681 msgid "Eraser Preferences" msgstr "Властивості гумки" -#: ../src/verbs.cpp:2680 +#: ../src/verbs.cpp:2682 msgid "Open Preferences for the Eraser tool" msgstr "Відкрити вікно параметрів для інструмента «Гумка»" -#: ../src/verbs.cpp:2681 +#: ../src/verbs.cpp:2683 msgid "LPE Tool Preferences" msgstr "Параметри інструмента «Геометричні побудови»" -#: ../src/verbs.cpp:2682 +#: ../src/verbs.cpp:2684 msgid "Open Preferences for the LPETool tool" msgstr "Відкрити вікно параметрів для інструмента «Геометричні побудови»" #. Zoom/View -#: ../src/verbs.cpp:2684 +#: ../src/verbs.cpp:2686 msgid "Zoom In" msgstr "Збільшити" -#: ../src/verbs.cpp:2684 +#: ../src/verbs.cpp:2686 msgid "Zoom in" msgstr "Збільшити" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2687 msgid "Zoom Out" msgstr "Зменшити" -#: ../src/verbs.cpp:2685 +#: ../src/verbs.cpp:2687 msgid "Zoom out" msgstr "Зменшити" -#: ../src/verbs.cpp:2686 +#: ../src/verbs.cpp:2688 msgid "_Rulers" msgstr "_Лінійки" -#: ../src/verbs.cpp:2686 +#: ../src/verbs.cpp:2688 msgid "Show or hide the canvas rulers" msgstr "Показати або сховати лінійки полотна" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2689 msgid "Scroll_bars" msgstr "_Смуги гортання" -#: ../src/verbs.cpp:2687 +#: ../src/verbs.cpp:2689 msgid "Show or hide the canvas scrollbars" msgstr "Показати/Сховати смуги гортання полотна" -#: ../src/verbs.cpp:2688 +#: ../src/verbs.cpp:2690 msgid "_Grid" msgstr "С_ітка" -#: ../src/verbs.cpp:2688 +#: ../src/verbs.cpp:2690 msgid "Show or hide the grid" msgstr "Показати або сховати сітку" -#: ../src/verbs.cpp:2689 +#: ../src/verbs.cpp:2691 msgid "G_uides" msgstr "Нап_рямні" -#: ../src/verbs.cpp:2689 +#: ../src/verbs.cpp:2691 msgid "Show or hide guides (drag from a ruler to create a guide)" msgstr "" "Показати чи сховати напрямні (потягніть від лінійки для створення напрямної)" -#: ../src/verbs.cpp:2690 +#: ../src/verbs.cpp:2692 msgid "Enable snapping" msgstr "Дозволити прилипання" -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2693 msgid "_Commands Bar" msgstr "Панель ко_манд" -#: ../src/verbs.cpp:2691 +#: ../src/verbs.cpp:2693 msgid "Show or hide the Commands bar (under the menu)" msgstr "Показати/сховати панель команд (під меню)" -#: ../src/verbs.cpp:2692 +#: ../src/verbs.cpp:2694 msgid "Sn_ap Controls Bar" msgstr "Панель керування при_липанням" -#: ../src/verbs.cpp:2692 +#: ../src/verbs.cpp:2694 msgid "Show or hide the snapping controls" msgstr "Показати або сховати інструменти керування прилипанням" -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2695 msgid "T_ool Controls Bar" msgstr "Па_нель параметрів інструментів" -#: ../src/verbs.cpp:2693 +#: ../src/verbs.cpp:2695 msgid "Show or hide the Tool Controls bar" msgstr "Показати або сховати панель з параметрами інструментів" -#: ../src/verbs.cpp:2694 +#: ../src/verbs.cpp:2696 msgid "_Toolbox" msgstr "Панель _інструментів" -#: ../src/verbs.cpp:2694 +#: ../src/verbs.cpp:2696 msgid "Show or hide the main toolbox (on the left)" msgstr "Показати або сховати головну панель інструментів (зліва)" -#: ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2697 msgid "_Palette" msgstr "_Палітру" -#: ../src/verbs.cpp:2695 +#: ../src/verbs.cpp:2697 msgid "Show or hide the color palette" msgstr "Показати або сховати панель з палітрою кольорів" -#: ../src/verbs.cpp:2696 +#: ../src/verbs.cpp:2698 msgid "_Statusbar" msgstr "_Рядок стану" -#: ../src/verbs.cpp:2696 +#: ../src/verbs.cpp:2698 msgid "Show or hide the statusbar (at the bottom of the window)" msgstr "Показати або сховати рядок стану (внизу вікна)" -#: ../src/verbs.cpp:2697 +#: ../src/verbs.cpp:2699 msgid "Nex_t Zoom" msgstr "Н_аступний масштаб" -#: ../src/verbs.cpp:2697 +#: ../src/verbs.cpp:2699 msgid "Next zoom (from the history of zooms)" msgstr "Наступний масштаб (з історії зміни масштабу)" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2701 msgid "Pre_vious Zoom" msgstr "П_опередній масштаб" -#: ../src/verbs.cpp:2699 +#: ../src/verbs.cpp:2701 msgid "Previous zoom (from the history of zooms)" msgstr "Попередній масштаб (з історії зміни масштабу)" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2703 msgid "Zoom 1:_1" msgstr "Масштаб 1:_1" -#: ../src/verbs.cpp:2701 +#: ../src/verbs.cpp:2703 msgid "Zoom to 1:1" msgstr "Масштаб 1:1" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2705 msgid "Zoom 1:_2" msgstr "Масштаб 1:_2" -#: ../src/verbs.cpp:2703 +#: ../src/verbs.cpp:2705 msgid "Zoom to 1:2" msgstr "Масштаб 1:2" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2707 msgid "_Zoom 2:1" msgstr "Мас_штаб 2:1" -#: ../src/verbs.cpp:2705 +#: ../src/verbs.cpp:2707 msgid "Zoom to 2:1" msgstr "Масштаб 2:1" -#: ../src/verbs.cpp:2708 +#: ../src/verbs.cpp:2710 msgid "_Fullscreen" msgstr "На весь _екран" -#: ../src/verbs.cpp:2708 ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2710 ../src/verbs.cpp:2712 msgid "Stretch this document window to full screen" msgstr "Розтягнути вікно документа на весь екран" -#: ../src/verbs.cpp:2710 +#: ../src/verbs.cpp:2712 msgid "Fullscreen & Focus Mode" msgstr "Повноекранний режим та режим фокусування" -#: ../src/verbs.cpp:2710 -msgid " and " -msgstr " і " - -#: ../src/verbs.cpp:2710 ../src/verbs.cpp:2713 -msgid "Remove excess toolbars to focus on drawing" -msgstr "Вилучити зайві панелі інструментів для фокусування на малюванні" - -#: ../src/verbs.cpp:2713 +#: ../src/verbs.cpp:2715 msgid "Toggle _Focus Mode" msgstr "Перемкнути режим _фокусування" #: ../src/verbs.cpp:2715 +msgid "Remove excess toolbars to focus on drawing" +msgstr "Вилучити зайві панелі інструментів для фокусування на малюванні" + +#: ../src/verbs.cpp:2717 msgid "Duplic_ate Window" msgstr "_Дублювати вікно" -#: ../src/verbs.cpp:2715 +#: ../src/verbs.cpp:2717 msgid "Open a new window with the same document" msgstr "Відкрити нове вікно з цим самим документом" -#: ../src/verbs.cpp:2717 +#: ../src/verbs.cpp:2719 msgid "_New View Preview" msgstr "_Створити попередній перегляд" -#: ../src/verbs.cpp:2718 +#: ../src/verbs.cpp:2720 msgid "New View Preview" msgstr "Створити нове вікно попереднього перегляду" #. "view_new_preview" -#: ../src/verbs.cpp:2720 ../src/verbs.cpp:2728 +#: ../src/verbs.cpp:2722 ../src/verbs.cpp:2730 msgid "_Normal" msgstr "_Звичайний" -#: ../src/verbs.cpp:2721 +#: ../src/verbs.cpp:2723 msgid "Switch to normal display mode" msgstr "Перемикання на звичайний режим відображення" -#: ../src/verbs.cpp:2722 +#: ../src/verbs.cpp:2724 msgid "No _Filters" msgstr "Без _фільтрів" -#: ../src/verbs.cpp:2723 +#: ../src/verbs.cpp:2725 msgid "Switch to normal display without filters" msgstr "Перемикання на звичайний режим без фільтрів" -#: ../src/verbs.cpp:2724 +#: ../src/verbs.cpp:2726 msgid "_Outline" msgstr "_Обрис" -#: ../src/verbs.cpp:2725 +#: ../src/verbs.cpp:2727 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:2726 ../src/verbs.cpp:2734 +#: ../src/verbs.cpp:2728 ../src/verbs.cpp:2736 msgid "_Toggle" msgstr "_Перемкнутися" -#: ../src/verbs.cpp:2727 +#: ../src/verbs.cpp:2729 msgid "Toggle between normal and outline display modes" msgstr "Перемикач між нормальним та каркасним режимами відображення" -#: ../src/verbs.cpp:2729 +#: ../src/verbs.cpp:2731 msgid "Switch to normal color display mode" msgstr "Перемикання на звичайний режим показу кольорів" -#: ../src/verbs.cpp:2730 +#: ../src/verbs.cpp:2732 msgid "_Grayscale" msgstr "Сі_рі півтони" -#: ../src/verbs.cpp:2731 +#: ../src/verbs.cpp:2733 msgid "Switch to grayscale display mode" msgstr "Перемикання на режим показу тонів сірого" -#: ../src/verbs.cpp:2735 +#: ../src/verbs.cpp:2737 msgid "Toggle between normal and grayscale color display modes" msgstr "" "Перемикач між нормальним режимом показу та режимом показу у відтінках сірого" -#: ../src/verbs.cpp:2737 +#: ../src/verbs.cpp:2739 msgid "Color-managed view" msgstr "Перегляд керування кольором" -#: ../src/verbs.cpp:2738 +#: ../src/verbs.cpp:2740 msgid "Toggle color-managed display for this document window" msgstr "" "Перемикач узгодження відображення кольорів дисплеєм для цього вікна документа" -#: ../src/verbs.cpp:2740 +#: ../src/verbs.cpp:2742 msgid "Ico_n Preview..." msgstr "Переглянути як п_іктограму…" -#: ../src/verbs.cpp:2741 +#: ../src/verbs.cpp:2743 msgid "Open a window to preview objects at different icon resolutions" msgstr "Переглянути позначений елемент у формі піктограми різних розмірів" -#: ../src/verbs.cpp:2742 +#: ../src/verbs.cpp:2744 msgid "_Page" msgstr "_Сторінка" -#: ../src/verbs.cpp:2743 +#: ../src/verbs.cpp:2745 msgid "Zoom to fit page in window" msgstr "Змінити масштаб, щоб розмістити сторінку цілком" -#: ../src/verbs.cpp:2744 +#: ../src/verbs.cpp:2746 msgid "Page _Width" msgstr "Ш_ирина сторінки" -#: ../src/verbs.cpp:2745 +#: ../src/verbs.cpp:2747 msgid "Zoom to fit page width in window" msgstr "Змінити масштаб, щоб розмістити сторінку по ширині" -#: ../src/verbs.cpp:2746 +#: ../src/verbs.cpp:2748 msgid "_Drawing" msgstr "_Малюнок" -#: ../src/verbs.cpp:2747 +#: ../src/verbs.cpp:2749 msgid "Zoom to fit drawing in window" msgstr "Змінити масштаб, щоб розмістити малюнок цілком" -#: ../src/verbs.cpp:2748 +#: ../src/verbs.cpp:2750 msgid "_Selection" msgstr "Поз_начене" -#: ../src/verbs.cpp:2749 +#: ../src/verbs.cpp:2751 msgid "Zoom to fit selection in window" msgstr "Змінити масштаб, щоб розмістити позначену область" #. Dialogs -#: ../src/verbs.cpp:2752 +#: ../src/verbs.cpp:2754 msgid "P_references..." msgstr "На_лаштування…" -#: ../src/verbs.cpp:2753 +#: ../src/verbs.cpp:2755 msgid "Edit global Inkscape preferences" msgstr "Редагування загальних параметрів Inkscape" -#: ../src/verbs.cpp:2754 +#: ../src/verbs.cpp:2756 msgid "_Document Properties..." msgstr "Параметри д_окумента…" -#: ../src/verbs.cpp:2755 +#: ../src/verbs.cpp:2757 msgid "Edit properties of this document (to be saved with the document)" msgstr "" "Редагування властивостей поточного документа (вони будуть збережені разом з " "ним)" -#: ../src/verbs.cpp:2756 +#: ../src/verbs.cpp:2758 msgid "Document _Metadata..." msgstr "_Метадані документа" -#: ../src/verbs.cpp:2757 +#: ../src/verbs.cpp:2759 msgid "Edit document metadata (to be saved with the document)" msgstr "Редагування метаданих документа (вони будуть збережені разом з ним)" -#: ../src/verbs.cpp:2759 +#: ../src/verbs.cpp:2761 msgid "" "Edit objects' colors, gradients, arrowheads, and other fill and stroke " "properties..." @@ -23551,125 +23707,125 @@ msgstr "" "Редагування кольорів об'єкта, градієнтів, форми стрілок та інші параметри " "заповнення та штриха…" -#: ../src/verbs.cpp:2760 +#: ../src/verbs.cpp:2762 msgid "Gl_yphs..." msgstr "Г_ліфи…" -#: ../src/verbs.cpp:2761 +#: ../src/verbs.cpp:2763 msgid "Select characters from a glyphs palette" msgstr "Виберіть символи з палітри гліфів" #. TRANSLATORS: "Swatches" means: color samples -#: ../src/verbs.cpp:2763 +#: ../src/verbs.cpp:2765 msgid "S_watches..." msgstr "Зразки _кольорів…" -#: ../src/verbs.cpp:2764 +#: ../src/verbs.cpp:2766 msgid "Select colors from a swatches palette" msgstr "Виберіть колір з палітри зразків" -#: ../src/verbs.cpp:2765 +#: ../src/verbs.cpp:2767 msgid "S_ymbols..." msgstr "С_имволи…" -#: ../src/verbs.cpp:2766 +#: ../src/verbs.cpp:2768 msgid "Select symbol from a symbols palette" msgstr "Виберіть символ з палітри символів" -#: ../src/verbs.cpp:2767 +#: ../src/verbs.cpp:2769 msgid "Transfor_m..." msgstr "_Трансформувати…" -#: ../src/verbs.cpp:2768 +#: ../src/verbs.cpp:2770 msgid "Precisely control objects' transformations" msgstr "Контролювати точність перетворень об'єктів" -#: ../src/verbs.cpp:2769 +#: ../src/verbs.cpp:2771 msgid "_Align and Distribute..." msgstr "Вирів_няти та розподілити…" -#: ../src/verbs.cpp:2770 +#: ../src/verbs.cpp:2772 msgid "Align and distribute objects" msgstr "Вирівняти та розподілити об'єкти" -#: ../src/verbs.cpp:2771 +#: ../src/verbs.cpp:2773 msgid "_Spray options..." msgstr "Параметри _розкидання…" -#: ../src/verbs.cpp:2772 +#: ../src/verbs.cpp:2774 msgid "Some options for the spray" msgstr "Параметри розкидання" -#: ../src/verbs.cpp:2773 +#: ../src/verbs.cpp:2775 msgid "Undo _History..." msgstr "Істо_рія змін…" -#: ../src/verbs.cpp:2774 +#: ../src/verbs.cpp:2776 msgid "Undo History" msgstr "Історія для скасування змін" -#: ../src/verbs.cpp:2776 +#: ../src/verbs.cpp:2778 msgid "View and select font family, font size and other text properties" msgstr "" "Перегляд та вибір назви шрифту, його розміру та інших властивостей тексту" -#: ../src/verbs.cpp:2777 +#: ../src/verbs.cpp:2779 msgid "_XML Editor..." msgstr "Редактор _XML…" -#: ../src/verbs.cpp:2778 +#: ../src/verbs.cpp:2780 msgid "View and edit the XML tree of the document" msgstr "Перегляд та редагування дерева XML поточного документа" -#: ../src/verbs.cpp:2779 +#: ../src/verbs.cpp:2781 msgid "_Find/Replace..." msgstr "Знайти і з_амінити…" -#: ../src/verbs.cpp:2780 +#: ../src/verbs.cpp:2782 msgid "Find objects in document" msgstr "Знайти об'єкти у документі" -#: ../src/verbs.cpp:2781 +#: ../src/verbs.cpp:2783 msgid "Find and _Replace Text..." msgstr "Знайти і з_амінити текст…" -#: ../src/verbs.cpp:2782 +#: ../src/verbs.cpp:2784 msgid "Find and replace text in document" msgstr "Знайти і замінити текст у документі" -#: ../src/verbs.cpp:2784 +#: ../src/verbs.cpp:2786 msgid "Check spelling of text in document" msgstr "Перевірити правопис тексту у документі" -#: ../src/verbs.cpp:2785 +#: ../src/verbs.cpp:2787 msgid "_Messages..." msgstr "По_відомлення…" -#: ../src/verbs.cpp:2786 +#: ../src/verbs.cpp:2788 msgid "View debug messages" msgstr "Переглянути діагностичні повідомлення" -#: ../src/verbs.cpp:2787 +#: ../src/verbs.cpp:2789 msgid "S_cripts..." msgstr "С_ценарії…" -#: ../src/verbs.cpp:2788 +#: ../src/verbs.cpp:2790 msgid "Run scripts" msgstr "Запустити сценарії" -#: ../src/verbs.cpp:2789 +#: ../src/verbs.cpp:2791 msgid "Show/Hide D_ialogs" msgstr "Показати/сховати діало_ги" -#: ../src/verbs.cpp:2790 +#: ../src/verbs.cpp:2792 msgid "Show or hide all open dialogs" msgstr "Показати чи сховати всі активні діалогові вікна" -#: ../src/verbs.cpp:2791 +#: ../src/verbs.cpp:2793 msgid "Create Tiled Clones..." msgstr "Створити мозаїку з клонів…" -#: ../src/verbs.cpp:2792 +#: ../src/verbs.cpp:2794 msgid "" "Create multiple clones of selected object, arranging them into a pattern or " "scattering" @@ -23677,15 +23833,15 @@ msgstr "" "Створити множину клонів позначеного об'єкта, з розташуванням їх у формі " "візерунку або покриття" -#: ../src/verbs.cpp:2793 +#: ../src/verbs.cpp:2795 msgid "_Object attributes..." msgstr "_Атрибути об'єкта…" -#: ../src/verbs.cpp:2794 +#: ../src/verbs.cpp:2796 msgid "Edit the object attributes..." msgstr "Змінити атрибути об'єкта…" -#: ../src/verbs.cpp:2796 +#: ../src/verbs.cpp:2798 msgid "Edit the ID, locked and visible status, and other object properties" msgstr "" "Редагування ідентифікатора, стану заблокованості та видимості та інших " @@ -23695,199 +23851,199 @@ msgstr "" #. new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient", #. N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL), #. #endif -#: ../src/verbs.cpp:2801 +#: ../src/verbs.cpp:2803 msgid "_Input Devices..." msgstr "_Пристрої введення…" -#: ../src/verbs.cpp:2802 +#: ../src/verbs.cpp:2804 msgid "Configure extended input devices, such as a graphics tablet" msgstr "Налаштовування розширених пристроїв введення" -#: ../src/verbs.cpp:2803 +#: ../src/verbs.cpp:2805 msgid "_Extensions..." msgstr "_Про додатки…" -#: ../src/verbs.cpp:2804 +#: ../src/verbs.cpp:2806 msgid "Query information about extensions" msgstr "Зібрати інформацію про додатки" -#: ../src/verbs.cpp:2805 +#: ../src/verbs.cpp:2807 msgid "Layer_s..." msgstr "_Шари…" -#: ../src/verbs.cpp:2806 +#: ../src/verbs.cpp:2808 msgid "View Layers" msgstr "Переглянути шари" -#: ../src/verbs.cpp:2807 +#: ../src/verbs.cpp:2809 msgid "Path E_ffects ..." msgstr "Е_фекти контурів…" -#: ../src/verbs.cpp:2808 +#: ../src/verbs.cpp:2810 msgid "Manage, edit, and apply path effects" msgstr "Керування, редагування і застосування ефектів контурів" -#: ../src/verbs.cpp:2809 +#: ../src/verbs.cpp:2811 msgid "Filter _Editor..." msgstr "Р_едактор фільтрів…" -#: ../src/verbs.cpp:2810 +#: ../src/verbs.cpp:2812 msgid "Manage, edit, and apply SVG filters" msgstr "Керування, редагування і застосування фільтрів SVG" -#: ../src/verbs.cpp:2811 +#: ../src/verbs.cpp:2813 msgid "SVG Font Editor..." msgstr "Редактор шрифтів SVG…" -#: ../src/verbs.cpp:2812 +#: ../src/verbs.cpp:2814 msgid "Edit SVG fonts" msgstr "Редагувати шрифти SVG" -#: ../src/verbs.cpp:2813 +#: ../src/verbs.cpp:2815 msgid "Print Colors..." msgstr "Друкувати кольори…" -#: ../src/verbs.cpp:2814 +#: ../src/verbs.cpp:2816 msgid "" "Select which color separations to render in Print Colors Preview rendermode" msgstr "" "Вкажіть ділянки кольорів, які слід обробляти у режимі обробки попереднього " "перегляду кольорів друку." -#: ../src/verbs.cpp:2815 +#: ../src/verbs.cpp:2817 msgid "_Export PNG Image..." msgstr "_Експортувати як зображення PNG…" -#: ../src/verbs.cpp:2816 +#: ../src/verbs.cpp:2818 msgid "Export this document or a selection as a PNG image" msgstr "Експортувати документ чи позначену частину як зображення PNG" #. Help -#: ../src/verbs.cpp:2819 +#: ../src/verbs.cpp:2820 msgid "About E_xtensions" msgstr "Про _додатки" -#: ../src/verbs.cpp:2820 +#: ../src/verbs.cpp:2821 msgid "Information on Inkscape extensions" msgstr "Інформація про додатки Inkscape" -#: ../src/verbs.cpp:2821 +#: ../src/verbs.cpp:2822 msgid "About _Memory" msgstr "Про п_ам'ять" -#: ../src/verbs.cpp:2822 +#: ../src/verbs.cpp:2823 msgid "Memory usage information" msgstr "Інформація про використання пам'яті" -#: ../src/verbs.cpp:2823 +#: ../src/verbs.cpp:2824 msgid "_About Inkscape" msgstr "_Про програму Inkscape" -#: ../src/verbs.cpp:2824 +#: ../src/verbs.cpp:2825 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:2829 +#: ../src/verbs.cpp:2830 msgid "Inkscape: _Basic" msgstr "Inkscape: _Початковий рівень" -#: ../src/verbs.cpp:2830 +#: ../src/verbs.cpp:2831 msgid "Getting started with Inkscape" msgstr "Починаємо роботу з Inkscape" #. "tutorial_basic" -#: ../src/verbs.cpp:2831 +#: ../src/verbs.cpp:2832 msgid "Inkscape: _Shapes" msgstr "Inkscape: _Фігури" -#: ../src/verbs.cpp:2832 +#: ../src/verbs.cpp:2833 msgid "Using shape tools to create and edit shapes" msgstr "Використання інструментів малювання та редагування фігур" -#: ../src/verbs.cpp:2833 +#: ../src/verbs.cpp:2834 msgid "Inkscape: _Advanced" msgstr "Inkscape: _Другий рівень" -#: ../src/verbs.cpp:2834 +#: ../src/verbs.cpp:2835 msgid "Advanced Inkscape topics" msgstr "Додаткові теми з Inkscape" #. "tutorial_advanced" #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize) -#: ../src/verbs.cpp:2836 +#: ../src/verbs.cpp:2837 msgid "Inkscape: T_racing" msgstr "Inkscape: _Векторизація" -#: ../src/verbs.cpp:2837 +#: ../src/verbs.cpp:2838 msgid "Using bitmap tracing" msgstr "Використання векторизації растру" #. "tutorial_tracing" -#: ../src/verbs.cpp:2838 +#: ../src/verbs.cpp:2839 msgid "Inkscape: _Calligraphy" msgstr "Inkscape: _Каліграфія" -#: ../src/verbs.cpp:2839 +#: ../src/verbs.cpp:2840 msgid "Using the Calligraphy pen tool" msgstr "Використання каліграфічного пера" -#: ../src/verbs.cpp:2840 +#: ../src/verbs.cpp:2841 msgid "Inkscape: _Interpolate" msgstr "Inkscape: _Інтерполяція" -#: ../src/verbs.cpp:2841 +#: ../src/verbs.cpp:2842 msgid "Using the interpolate extension" msgstr "Використання додатка інтерполяції" #. "tutorial_interpolate" -#: ../src/verbs.cpp:2842 +#: ../src/verbs.cpp:2843 msgid "_Elements of Design" msgstr "_Елементи дизайну" -#: ../src/verbs.cpp:2843 +#: ../src/verbs.cpp:2844 msgid "Principles of design in the tutorial form" msgstr "Підручник з принципів дизайну" #. "tutorial_design" -#: ../src/verbs.cpp:2844 +#: ../src/verbs.cpp:2845 msgid "_Tips and Tricks" msgstr "_Поради та прийоми" -#: ../src/verbs.cpp:2845 +#: ../src/verbs.cpp:2846 msgid "Miscellaneous tips and tricks" msgstr "Різноманітні поради та прийоми" #. "tutorial_tips" #. Effect -- renamed Extension -#: ../src/verbs.cpp:2848 +#: ../src/verbs.cpp:2849 msgid "Previous Exte_nsion" msgstr "Попередній _додаток" -#: ../src/verbs.cpp:2849 +#: ../src/verbs.cpp:2850 msgid "Repeat the last extension with the same settings" msgstr "" "Повторити ефекти використання попереднього додатка з тими самими параметрами" -#: ../src/verbs.cpp:2850 +#: ../src/verbs.cpp:2851 msgid "_Previous Extension Settings..." msgstr "П_араметри попереднього додатка…" -#: ../src/verbs.cpp:2851 +#: ../src/verbs.cpp:2852 msgid "Repeat the last extension with new settings" msgstr "Повторити останній ефект з новими параметрами" -#: ../src/verbs.cpp:2855 +#: ../src/verbs.cpp:2856 msgid "Fit the page to the current selection" msgstr "Підігнати полотно до поточного позначеної області" -#: ../src/verbs.cpp:2857 +#: ../src/verbs.cpp:2858 msgid "Fit the page to the drawing" msgstr "Підганяє полотно під вже намальоване" -#: ../src/verbs.cpp:2859 +#: ../src/verbs.cpp:2860 msgid "" "Fit the page to the current selection or the drawing if there is no selection" msgstr "" @@ -23895,35 +24051,35 @@ msgstr "" "креслення, якщо нічого не позначено" #. LockAndHide -#: ../src/verbs.cpp:2861 +#: ../src/verbs.cpp:2862 msgid "Unlock All" msgstr "Розблокувати все" -#: ../src/verbs.cpp:2863 +#: ../src/verbs.cpp:2864 msgid "Unlock All in All Layers" msgstr "Розблокувати все в усіх шарах" -#: ../src/verbs.cpp:2865 +#: ../src/verbs.cpp:2866 msgid "Unhide All" msgstr "Показати все" -#: ../src/verbs.cpp:2867 +#: ../src/verbs.cpp:2868 msgid "Unhide All in All Layers" msgstr "Показати все в усіх шарах" -#: ../src/verbs.cpp:2871 +#: ../src/verbs.cpp:2872 msgid "Link an ICC color profile" msgstr "Посилання на профіль кольорів ICC" -#: ../src/verbs.cpp:2872 +#: ../src/verbs.cpp:2873 msgid "Remove Color Profile" msgstr "Вилучити профіль кольорів" -#: ../src/verbs.cpp:2873 +#: ../src/verbs.cpp:2874 msgid "Remove a linked ICC color profile" msgstr "Вилучити пов'язаний профіль кольорів ICC" -#: ../src/verbs.cpp:2896 ../src/verbs.cpp:2897 +#: ../src/verbs.cpp:2897 ../src/verbs.cpp:2898 msgid "Center on horizontal and vertical axis" msgstr "Центрувати на горизонтальній і вертикальній осі" @@ -24061,16 +24217,15 @@ msgstr "" "Перемикач ТС у напрямку осі Z між значеннями 'скінченна' і " "'нескінченна' (=паралельність)" -#: ../src/widgets/calligraphy-toolbar.cpp:231 +#. gint preset_index = ege_select_one_action_get_active( sel ); +#: ../src/widgets/calligraphy-toolbar.cpp:241 +#: ../src/widgets/calligraphy-toolbar.cpp:285 +#: ../src/widgets/calligraphy-toolbar.cpp:290 msgid "No preset" msgstr "Без шаблону" -#: ../src/widgets/calligraphy-toolbar.cpp:249 -msgid "Save..." -msgstr "Зберегти…" - #. Width -#: ../src/widgets/calligraphy-toolbar.cpp:407 +#: ../src/widgets/calligraphy-toolbar.cpp:450 #: ../src/widgets/erasor-toolbar.cpp:148 msgid "(hairline)" msgstr "(мотузка)" @@ -24078,8 +24233,8 @@ msgstr "(мотузка)" #. Mean #. Rotation #. Scale -#: ../src/widgets/calligraphy-toolbar.cpp:407 -#: ../src/widgets/calligraphy-toolbar.cpp:440 +#: ../src/widgets/calligraphy-toolbar.cpp:450 +#: ../src/widgets/calligraphy-toolbar.cpp:483 #: ../src/widgets/erasor-toolbar.cpp:148 ../src/widgets/pencil-toolbar.cpp:304 #: ../src/widgets/spray-toolbar.cpp:130 ../src/widgets/spray-toolbar.cpp:146 #: ../src/widgets/spray-toolbar.cpp:162 ../src/widgets/spray-toolbar.cpp:222 @@ -24089,50 +24244,50 @@ msgstr "(мотузка)" msgid "(default)" msgstr "(типова)" -#: ../src/widgets/calligraphy-toolbar.cpp:407 +#: ../src/widgets/calligraphy-toolbar.cpp:450 #: ../src/widgets/erasor-toolbar.cpp:148 msgid "(broad stroke)" msgstr "(широкий штрих)" -#: ../src/widgets/calligraphy-toolbar.cpp:410 +#: ../src/widgets/calligraphy-toolbar.cpp:453 #: ../src/widgets/erasor-toolbar.cpp:151 msgid "Pen Width" msgstr "Ширина пера" -#: ../src/widgets/calligraphy-toolbar.cpp:411 +#: ../src/widgets/calligraphy-toolbar.cpp:454 msgid "The width of the calligraphic pen (relative to the visible canvas area)" msgstr "Ширина каліграфічного пера (відносно видимої області полотна)" #. Thinning -#: ../src/widgets/calligraphy-toolbar.cpp:424 +#: ../src/widgets/calligraphy-toolbar.cpp:467 msgid "(speed blows up stroke)" msgstr "(швидкість збільшення штриху)" -#: ../src/widgets/calligraphy-toolbar.cpp:424 +#: ../src/widgets/calligraphy-toolbar.cpp:467 msgid "(slight widening)" msgstr "(невелике розширення)" -#: ../src/widgets/calligraphy-toolbar.cpp:424 +#: ../src/widgets/calligraphy-toolbar.cpp:467 msgid "(constant width)" msgstr "(постійна ширина)" -#: ../src/widgets/calligraphy-toolbar.cpp:424 +#: ../src/widgets/calligraphy-toolbar.cpp:467 msgid "(slight thinning, default)" msgstr "(невелике зменшення товщини, типово)" -#: ../src/widgets/calligraphy-toolbar.cpp:424 +#: ../src/widgets/calligraphy-toolbar.cpp:467 msgid "(speed deflates stroke)" msgstr "(швидкість зменшення штриху)" -#: ../src/widgets/calligraphy-toolbar.cpp:427 +#: ../src/widgets/calligraphy-toolbar.cpp:470 msgid "Stroke Thinning" msgstr "Звуження штриха" -#: ../src/widgets/calligraphy-toolbar.cpp:427 +#: ../src/widgets/calligraphy-toolbar.cpp:470 msgid "Thinning:" msgstr "Звуження:" -#: ../src/widgets/calligraphy-toolbar.cpp:428 +#: ../src/widgets/calligraphy-toolbar.cpp:471 msgid "" "How much velocity thins the stroke (> 0 makes fast strokes thinner, < 0 " "makes them broader, 0 makes width independent of velocity)" @@ -24141,28 +24296,28 @@ msgstr "" "штрихи ширше, 0 — ширина штриха не залежить від швидкості)" #. Angle -#: ../src/widgets/calligraphy-toolbar.cpp:440 +#: ../src/widgets/calligraphy-toolbar.cpp:483 msgid "(left edge up)" msgstr "(піднімати лівий край)" -#: ../src/widgets/calligraphy-toolbar.cpp:440 +#: ../src/widgets/calligraphy-toolbar.cpp:483 msgid "(horizontal)" msgstr "(горизонтально)" -#: ../src/widgets/calligraphy-toolbar.cpp:440 +#: ../src/widgets/calligraphy-toolbar.cpp:483 msgid "(right edge up)" msgstr "(піднімати правий край)" -#: ../src/widgets/calligraphy-toolbar.cpp:443 +#: ../src/widgets/calligraphy-toolbar.cpp:486 msgid "Pen Angle" msgstr "Кут пера" -#: ../src/widgets/calligraphy-toolbar.cpp:443 +#: ../src/widgets/calligraphy-toolbar.cpp:486 #: ../share/extensions/motion.inx.h:3 ../share/extensions/restack.inx.h:10 msgid "Angle:" msgstr "Кут:" -#: ../src/widgets/calligraphy-toolbar.cpp:444 +#: ../src/widgets/calligraphy-toolbar.cpp:487 msgid "" "The angle of the pen's nib (in degrees; 0 = horizontal; has no effect if " "fixation = 0)" @@ -24171,27 +24326,27 @@ msgstr "" "ефекту)" #. Fixation -#: ../src/widgets/calligraphy-toolbar.cpp:458 +#: ../src/widgets/calligraphy-toolbar.cpp:501 msgid "(perpendicular to stroke, \"brush\")" msgstr "(перпендикулярно штриху, «щітка»)" -#: ../src/widgets/calligraphy-toolbar.cpp:458 +#: ../src/widgets/calligraphy-toolbar.cpp:501 msgid "(almost fixed, default)" msgstr "(майже постійна, типово)" -#: ../src/widgets/calligraphy-toolbar.cpp:458 +#: ../src/widgets/calligraphy-toolbar.cpp:501 msgid "(fixed by Angle, \"pen\")" msgstr "(з постійним кутом, «перо»)" -#: ../src/widgets/calligraphy-toolbar.cpp:461 +#: ../src/widgets/calligraphy-toolbar.cpp:504 msgid "Fixation" msgstr "Фіксація" -#: ../src/widgets/calligraphy-toolbar.cpp:461 +#: ../src/widgets/calligraphy-toolbar.cpp:504 msgid "Fixation:" msgstr "Фіксація:" -#: ../src/widgets/calligraphy-toolbar.cpp:462 +#: ../src/widgets/calligraphy-toolbar.cpp:505 msgid "" "Angle behavior (0 = nib always perpendicular to stroke direction, 100 = " "fixed angle)" @@ -24200,31 +24355,31 @@ msgstr "" "= фіксований кут)" #. Cap Rounding -#: ../src/widgets/calligraphy-toolbar.cpp:474 +#: ../src/widgets/calligraphy-toolbar.cpp:517 msgid "(blunt caps, default)" msgstr "(тупі кінці, типово)" -#: ../src/widgets/calligraphy-toolbar.cpp:474 +#: ../src/widgets/calligraphy-toolbar.cpp:517 msgid "(slightly bulging)" msgstr "(невелика випуклість)" -#: ../src/widgets/calligraphy-toolbar.cpp:474 +#: ../src/widgets/calligraphy-toolbar.cpp:517 msgid "(approximately round)" msgstr "(приблизно коло)" -#: ../src/widgets/calligraphy-toolbar.cpp:474 +#: ../src/widgets/calligraphy-toolbar.cpp:517 msgid "(long protruding caps)" msgstr "(довгі виступаючі кінці)" -#: ../src/widgets/calligraphy-toolbar.cpp:478 +#: ../src/widgets/calligraphy-toolbar.cpp:521 msgid "Cap rounding" msgstr "Заокруглення вершини" -#: ../src/widgets/calligraphy-toolbar.cpp:478 +#: ../src/widgets/calligraphy-toolbar.cpp:521 msgid "Caps:" msgstr "Кінці:" -#: ../src/widgets/calligraphy-toolbar.cpp:479 +#: ../src/widgets/calligraphy-toolbar.cpp:522 msgid "" "Increase to make caps at the ends of strokes protrude more (0 = no caps, 1 = " "round caps)" @@ -24233,94 +24388,94 @@ msgstr "" "кінець)" #. Tremor -#: ../src/widgets/calligraphy-toolbar.cpp:491 +#: ../src/widgets/calligraphy-toolbar.cpp:534 msgid "(smooth line)" msgstr "(гладка лінія)" -#: ../src/widgets/calligraphy-toolbar.cpp:491 +#: ../src/widgets/calligraphy-toolbar.cpp:534 msgid "(slight tremor)" msgstr "(невелика дрижання)" -#: ../src/widgets/calligraphy-toolbar.cpp:491 +#: ../src/widgets/calligraphy-toolbar.cpp:534 msgid "(noticeable tremor)" msgstr "(помітне дрижання)" -#: ../src/widgets/calligraphy-toolbar.cpp:491 +#: ../src/widgets/calligraphy-toolbar.cpp:534 msgid "(maximum tremor)" msgstr "(максимальне дрижання)" -#: ../src/widgets/calligraphy-toolbar.cpp:494 +#: ../src/widgets/calligraphy-toolbar.cpp:537 msgid "Stroke Tremor" msgstr "Дрижання штриха" -#: ../src/widgets/calligraphy-toolbar.cpp:494 +#: ../src/widgets/calligraphy-toolbar.cpp:537 msgid "Tremor:" msgstr "Дрижання:" -#: ../src/widgets/calligraphy-toolbar.cpp:495 +#: ../src/widgets/calligraphy-toolbar.cpp:538 msgid "Increase to make strokes rugged and trembling" msgstr "Збільшіть, щоб штрихи стали грубими та звивистими" #. Wiggle -#: ../src/widgets/calligraphy-toolbar.cpp:509 +#: ../src/widgets/calligraphy-toolbar.cpp:552 msgid "(no wiggle)" msgstr "(без погойдування)" -#: ../src/widgets/calligraphy-toolbar.cpp:509 +#: ../src/widgets/calligraphy-toolbar.cpp:552 msgid "(slight deviation)" msgstr "(невеликий відхилення)" -#: ../src/widgets/calligraphy-toolbar.cpp:509 +#: ../src/widgets/calligraphy-toolbar.cpp:552 msgid "(wild waves and curls)" msgstr "(великі хвилі та завитки)" -#: ../src/widgets/calligraphy-toolbar.cpp:512 +#: ../src/widgets/calligraphy-toolbar.cpp:555 msgid "Pen Wiggle" msgstr "Погойдування пера" -#: ../src/widgets/calligraphy-toolbar.cpp:512 +#: ../src/widgets/calligraphy-toolbar.cpp:555 msgid "Wiggle:" msgstr "Погойдування:" -#: ../src/widgets/calligraphy-toolbar.cpp:513 +#: ../src/widgets/calligraphy-toolbar.cpp:556 msgid "Increase to make the pen waver and wiggle" msgstr "Збільшення параметру збільшує хвилеподібність ліній" #. Mass -#: ../src/widgets/calligraphy-toolbar.cpp:526 +#: ../src/widgets/calligraphy-toolbar.cpp:569 msgid "(no inertia)" msgstr "(без інерції)" -#: ../src/widgets/calligraphy-toolbar.cpp:526 +#: ../src/widgets/calligraphy-toolbar.cpp:569 msgid "(slight smoothing, default)" msgstr "(невелике згладжування, типово)" -#: ../src/widgets/calligraphy-toolbar.cpp:526 +#: ../src/widgets/calligraphy-toolbar.cpp:569 msgid "(noticeable lagging)" msgstr "(помітне запізнення)" -#: ../src/widgets/calligraphy-toolbar.cpp:526 +#: ../src/widgets/calligraphy-toolbar.cpp:569 msgid "(maximum inertia)" msgstr "(максимальна інерція)" -#: ../src/widgets/calligraphy-toolbar.cpp:529 +#: ../src/widgets/calligraphy-toolbar.cpp:572 msgid "Pen Mass" msgstr "Маса пера" -#: ../src/widgets/calligraphy-toolbar.cpp:529 +#: ../src/widgets/calligraphy-toolbar.cpp:572 msgid "Mass:" msgstr "Маса:" -#: ../src/widgets/calligraphy-toolbar.cpp:530 +#: ../src/widgets/calligraphy-toolbar.cpp:573 msgid "Increase to make the pen drag behind, as if slowed by inertia" msgstr "" "Збільшення веде до відставання пензля так, неначе його сповільнює інерція" -#: ../src/widgets/calligraphy-toolbar.cpp:545 +#: ../src/widgets/calligraphy-toolbar.cpp:588 msgid "Trace Background" msgstr "Слід на тлі" -#: ../src/widgets/calligraphy-toolbar.cpp:546 +#: ../src/widgets/calligraphy-toolbar.cpp:589 msgid "" "Trace the lightness of the background by the width of the pen (white - " "minimum width, black - maximum width)" @@ -24328,27 +24483,30 @@ msgstr "" "Залишати слід освітлення на тлі залежно від ширини пера (білий — мінімальна " "ширина, чорний — максимальна ширина)" -#: ../src/widgets/calligraphy-toolbar.cpp:558 -#: ../src/widgets/spray-toolbar.cpp:241 ../src/widgets/tweak-toolbar.cpp:391 -msgid "Pressure" -msgstr "Тиск" - -#: ../src/widgets/calligraphy-toolbar.cpp:559 +#: ../src/widgets/calligraphy-toolbar.cpp:602 msgid "Use the pressure of the input device to alter the width of the pen" msgstr "Використовувати силу натиску пристроєм введення для зміни ширини лінії" -#: ../src/widgets/calligraphy-toolbar.cpp:571 +#: ../src/widgets/calligraphy-toolbar.cpp:614 msgid "Tilt" msgstr "Нахил" -#: ../src/widgets/calligraphy-toolbar.cpp:572 +#: ../src/widgets/calligraphy-toolbar.cpp:615 msgid "Use the tilt of the input device to alter the angle of the pen's nib" msgstr "Використовувати нахил пристрою введення для зміни кута" -#: ../src/widgets/calligraphy-toolbar.cpp:587 +#: ../src/widgets/calligraphy-toolbar.cpp:630 msgid "Choose a preset" msgstr "Обрати набір" +#: ../src/widgets/calligraphy-toolbar.cpp:645 +msgid "Add/Edit Profile" +msgstr "Додати/Змінити профіль" + +#: ../src/widgets/calligraphy-toolbar.cpp:646 +msgid "Add or edit calligraphic profile" +msgstr "Додати або змінити профіль каліграфії" + #: ../src/widgets/connector-toolbar.cpp:143 msgid "Set connector type: orthogonal" msgstr "Встановити тип з'єднання: під прямим кутом" @@ -24464,20 +24622,20 @@ msgstr "Пунктир" msgid "Pattern offset" msgstr "Зміщення пунктиру" -#: ../src/widgets/desktop-widget.cpp:466 +#: ../src/widgets/desktop-widget.cpp:446 msgid "Zoom drawing if window size changes" msgstr "Змінювати масштаб при зміні розмірів вікна" -#: ../src/widgets/desktop-widget.cpp:670 +#: ../src/widgets/desktop-widget.cpp:647 msgid "Cursor coordinates" msgstr "Координати курсора" -#: ../src/widgets/desktop-widget.cpp:696 +#: ../src/widgets/desktop-widget.cpp:673 msgid "Z:" msgstr "Z:" #. display the initial welcome message in the statusbar -#: ../src/widgets/desktop-widget.cpp:739 +#: ../src/widgets/desktop-widget.cpp:716 msgid "" "<b>Welcome to Inkscape!</b> Use shape or freehand tools to create objects; " "use selector (arrow) to move or transform them." @@ -24486,45 +24644,69 @@ msgstr "" "малювання для створення об'єктів; для їх переміщення чи трансформації " "використовуйте селектор (стрілку)." -#: ../src/widgets/desktop-widget.cpp:842 +#: ../src/widgets/desktop-widget.cpp:797 +msgid "grayscale" +msgstr "сірі півтони" + +#: ../src/widgets/desktop-widget.cpp:798 +msgid ", grayscale" +msgstr ", сірі півтони" + +#: ../src/widgets/desktop-widget.cpp:799 +msgid "print colors preview" +msgstr "друк попереднього перегляду кольорів" + +#: ../src/widgets/desktop-widget.cpp:800 +msgid ", print colors preview" +msgstr ", друк попереднього перегляду кольорів" + +#: ../src/widgets/desktop-widget.cpp:801 +msgid "outline" +msgstr "обрис" + +#: ../src/widgets/desktop-widget.cpp:802 +msgid "no filters" +msgstr "без фільтрування" + +#: ../src/widgets/desktop-widget.cpp:829 #, c-format -msgid "%s%s: %d (outline%s) - Inkscape" -msgstr "%s%s: %d (каркас%s) — Inkscape" +msgid "%s%s: %d (%s%s) - Inkscape" +msgstr "%s%s: %d (%s%s) – Inkscape" -#: ../src/widgets/desktop-widget.cpp:844 +#: ../src/widgets/desktop-widget.cpp:831 ../src/widgets/desktop-widget.cpp:835 #, c-format -msgid "%s%s: %d (no filters%s) - Inkscape" -msgstr "%s%s: %d (без фільтрів%s) — Inkscape" +msgid "%s%s: %d (%s) - Inkscape" +msgstr "%s%s: %d (%s) — Inkscape" -#: ../src/widgets/desktop-widget.cpp:846 +#: ../src/widgets/desktop-widget.cpp:837 #, c-format -msgid "%s%s: %d %s- Inkscape" -msgstr "%s%s: %d %s— Inkscape" +msgid "%s%s: %d - Inkscape" +msgstr "%s%s: %d — Inkscape" -#: ../src/widgets/desktop-widget.cpp:850 +#: ../src/widgets/desktop-widget.cpp:843 #, c-format -msgid "%s%s (outline%s) - Inkscape" -msgstr "%s%s (каркас%s) — Inkscape" +msgid "%s%s (%s%s) - Inkscape" +msgstr "%s%s (%s%s) — Inkscape" -#: ../src/widgets/desktop-widget.cpp:852 +#: ../src/widgets/desktop-widget.cpp:845 ../src/widgets/desktop-widget.cpp:849 #, c-format -msgid "%s%s (no filters%s) - Inkscape" -msgstr "%s%s (без фільтрів%s) — Inkscape" +msgid "%s%s (%s) - Inkscape" +msgstr "%s%s (%s) — Inkscape" -#: ../src/widgets/desktop-widget.cpp:854 +#: ../src/widgets/desktop-widget.cpp:851 #, c-format -msgid "%s%s %s- Inkscape" -msgstr "%s%s %s— Inkscape" +msgid "%s%s - Inkscape" +msgstr "%s%s — Inkscape" -#: ../src/widgets/desktop-widget.cpp:1021 +#: ../src/widgets/desktop-widget.cpp:1019 msgid "Color-managed display is <b>enabled</b> in this window" msgstr "Показ з керуванням кольорами у цьому вікні <b>увімкнено</b>" -#: ../src/widgets/desktop-widget.cpp:1023 +#: ../src/widgets/desktop-widget.cpp:1021 msgid "Color-managed display is <b>disabled</b> in this window" msgstr "Показ з керуванням кольорами у цьому вікні <b>вимкнено</b>" -#: ../src/widgets/desktop-widget.cpp:1078 +#: ../src/widgets/desktop-widget.cpp:1076 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before " @@ -24537,12 +24719,12 @@ msgstr "" "\n" "Якщо ви закриєте документ без збереження, усі зміни будуть втрачені." -#: ../src/widgets/desktop-widget.cpp:1088 -#: ../src/widgets/desktop-widget.cpp:1147 +#: ../src/widgets/desktop-widget.cpp:1086 +#: ../src/widgets/desktop-widget.cpp:1145 msgid "Close _without saving" msgstr "_Не зберігати" -#: ../src/widgets/desktop-widget.cpp:1137 +#: ../src/widgets/desktop-widget.cpp:1135 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a " @@ -24555,11 +24737,11 @@ msgstr "" "\n" "Зберегти документ у форматі SVG Inkscape?" -#: ../src/widgets/desktop-widget.cpp:1149 +#: ../src/widgets/desktop-widget.cpp:1147 msgid "_Save as Inkscape SVG" msgstr "_Зберегти як SVG Inkscape" -#: ../src/widgets/desktop-widget.cpp:1359 +#: ../src/widgets/desktop-widget.cpp:1357 msgid "Note:" msgstr "Примітка:" @@ -24594,7 +24776,6 @@ msgid "Assign" msgstr "Призначити" #: ../src/widgets/ege-paint-def.cpp:67 ../src/widgets/ege-paint-def.cpp:91 -#: ../src/widgets/gradient-toolbar.cpp:1128 msgid "none" msgstr "немає" @@ -24646,6 +24827,11 @@ msgstr "Встановлення візерунку для заповнення" msgid "Set pattern on stroke" msgstr "Додати візерунок до штриха" +#: ../src/widgets/font-selector.cpp:136 ../src/widgets/text-toolbar.cpp:1239 +#: ../src/widgets/text-toolbar.cpp:1498 +msgid "Font size" +msgstr "Розмір шрифту" + #. Family frame #: ../src/widgets/font-selector.cpp:147 msgid "Font family" @@ -24657,19 +24843,28 @@ msgctxt "Font selector" msgid "Style" msgstr "Стиль" -#: ../src/widgets/font-selector.cpp:237 ../share/extensions/dots.inx.h:3 +#: ../src/widgets/font-selector.cpp:228 ../share/extensions/dots.inx.h:3 msgid "Font size:" msgstr "Розмір шрифту:" -#: ../src/widgets/gradient-selector.cpp:204 +#: ../src/widgets/gradient-selector.cpp:207 msgid "Create a duplicate gradient" msgstr "Створення дублікат градієнта" -#: ../src/widgets/gradient-selector.cpp:214 +#: ../src/widgets/gradient-selector.cpp:217 msgid "Edit gradient" msgstr "Змінити градієнт" -#: ../src/widgets/gradient-selector.cpp:305 +#: ../src/widgets/gradient-selector.cpp:227 +msgid "Delete swatch" +msgstr "Вилучити зразок" + +#: ../src/widgets/gradient-selector.cpp:288 +#: ../src/widgets/paint-selector.cpp:241 +msgid "Swatch" +msgstr "Зразок" + +#: ../src/widgets/gradient-selector.cpp:338 msgid "Rename gradient" msgstr "Перейменувати градієнт" @@ -24751,17 +24946,21 @@ msgstr "на:" msgid "Select" msgstr "Селектор" +#: ../src/widgets/gradient-toolbar.cpp:1112 +msgid "Choose a gradient" +msgstr "Вибрати градієнт" + #: ../src/widgets/gradient-toolbar.cpp:1113 msgid "Select:" msgstr "Позначення:" #: ../src/widgets/gradient-toolbar.cpp:1131 -msgid "reflected" -msgstr "відбитий" +msgid "Reflected" +msgstr "Відбитий" #: ../src/widgets/gradient-toolbar.cpp:1134 -msgid "direct" -msgstr "повтор" +msgid "Direct" +msgstr "Прямий" #: ../src/widgets/gradient-toolbar.cpp:1136 msgid "Repeat" @@ -24792,8 +24991,8 @@ msgid "Select a stop for the current gradient" msgstr "Позначте опорну точку поточного градієнта" #: ../src/widgets/gradient-toolbar.cpp:1160 -msgid "Edit:" -msgstr "Зміна:" +msgid "Stops:" +msgstr "Опорні точки:" #: ../src/widgets/gradient-toolbar.cpp:1172 msgid "Offset of selected stop" @@ -24932,7 +25131,7 @@ msgstr "" "Відкрити діалогове вікно геометричних побудов (для числового налаштування " "параметрів)" -#: ../src/widgets/measure-toolbar.cpp:103 ../src/widgets/text-toolbar.cpp:1498 +#: ../src/widgets/measure-toolbar.cpp:103 ../src/widgets/text-toolbar.cpp:1501 msgid "Font Size" msgstr "Розмір шрифту" @@ -25226,10 +25425,6 @@ msgstr "Лінійний градієнт" msgid "Radial gradient" msgstr "Радіальний градієнт" -#: ../src/widgets/paint-selector.cpp:241 -msgid "Swatch" -msgstr "Зразок" - #: ../src/widgets/paint-selector.cpp:243 msgid "Unset paint (make it undefined so it can be inherited)" msgstr "" @@ -25742,10 +25937,6 @@ msgstr "Розкидати окремий контур" msgid "Spray objects in a single path" msgstr "Розкидати об'єкти за окремим контуром" -#: ../src/widgets/spray-toolbar.cpp:202 ../src/widgets/tweak-toolbar.cpp:272 -msgid "Mode" -msgstr "Режим" - #. Population #: ../src/widgets/spray-toolbar.cpp:222 msgid "(low population)" @@ -25823,108 +26014,108 @@ msgstr "Встановити атрибут" msgid "CMS" msgstr "CMS" -#: ../src/widgets/sp-color-icc-selector.cpp:216 -#: ../src/widgets/sp-color-scales.cpp:397 +#: ../src/widgets/sp-color-icc-selector.cpp:213 +#: ../src/widgets/sp-color-scales.cpp:428 msgid "_R:" msgstr "_R:" -#: ../src/widgets/sp-color-icc-selector.cpp:216 -#: ../src/widgets/sp-color-icc-selector.cpp:217 -#: ../src/widgets/sp-color-scales.cpp:400 +#: ../src/widgets/sp-color-icc-selector.cpp:213 +#: ../src/widgets/sp-color-icc-selector.cpp:214 +#: ../src/widgets/sp-color-scales.cpp:431 msgid "_G:" msgstr "_G:" -#: ../src/widgets/sp-color-icc-selector.cpp:216 -#: ../src/widgets/sp-color-scales.cpp:403 +#: ../src/widgets/sp-color-icc-selector.cpp:213 +#: ../src/widgets/sp-color-scales.cpp:434 msgid "_B:" msgstr "_B:" -#: ../src/widgets/sp-color-icc-selector.cpp:218 -#: ../src/widgets/sp-color-icc-selector.cpp:219 -#: ../src/widgets/sp-color-scales.cpp:423 +#: ../src/widgets/sp-color-icc-selector.cpp:215 +#: ../src/widgets/sp-color-icc-selector.cpp:216 +#: ../src/widgets/sp-color-scales.cpp:454 msgid "_H:" msgstr "_H:" -#: ../src/widgets/sp-color-icc-selector.cpp:218 -#: ../src/widgets/sp-color-icc-selector.cpp:219 -#: ../src/widgets/sp-color-scales.cpp:426 +#: ../src/widgets/sp-color-icc-selector.cpp:215 +#: ../src/widgets/sp-color-icc-selector.cpp:216 +#: ../src/widgets/sp-color-scales.cpp:457 msgid "_S:" msgstr "_S:" -#: ../src/widgets/sp-color-icc-selector.cpp:219 -#: ../src/widgets/sp-color-scales.cpp:429 +#: ../src/widgets/sp-color-icc-selector.cpp:216 +#: ../src/widgets/sp-color-scales.cpp:460 msgid "_L:" msgstr "_L:" -#: ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-icc-selector.cpp:221 -#: ../src/widgets/sp-color-scales.cpp:451 +#: ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-icc-selector.cpp:218 +#: ../src/widgets/sp-color-scales.cpp:482 msgid "_C:" msgstr "_C:" -#: ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-icc-selector.cpp:221 -#: ../src/widgets/sp-color-scales.cpp:454 +#: ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-icc-selector.cpp:218 +#: ../src/widgets/sp-color-scales.cpp:485 msgid "_M:" msgstr "_M:" -#: ../src/widgets/sp-color-icc-selector.cpp:220 -#: ../src/widgets/sp-color-scales.cpp:460 +#: ../src/widgets/sp-color-icc-selector.cpp:217 +#: ../src/widgets/sp-color-scales.cpp:491 msgid "_K:" msgstr "_K:" -#: ../src/widgets/sp-color-icc-selector.cpp:231 +#: ../src/widgets/sp-color-icc-selector.cpp:228 msgid "Gray" msgstr "Сірий" -#: ../src/widgets/sp-color-icc-selector.cpp:296 +#: ../src/widgets/sp-color-icc-selector.cpp:297 msgid "Fix" msgstr "Виправити" -#: ../src/widgets/sp-color-icc-selector.cpp:299 +#: ../src/widgets/sp-color-icc-selector.cpp:300 msgid "Fix RGB fallback to match icc-color() value." msgstr "Виправити колір до RGB на основі значення icc-color()" #. Label -#: ../src/widgets/sp-color-icc-selector.cpp:389 -#: ../src/widgets/sp-color-scales.cpp:406 -#: ../src/widgets/sp-color-scales.cpp:432 +#: ../src/widgets/sp-color-icc-selector.cpp:438 +#: ../src/widgets/sp-color-scales.cpp:437 #: ../src/widgets/sp-color-scales.cpp:463 -#: ../src/widgets/sp-color-wheel-selector.cpp:170 +#: ../src/widgets/sp-color-scales.cpp:494 +#: ../src/widgets/sp-color-wheel-selector.cpp:180 msgid "_A:" msgstr "_A:" -#: ../src/widgets/sp-color-icc-selector.cpp:399 -#: ../src/widgets/sp-color-icc-selector.cpp:411 -#: ../src/widgets/sp-color-scales.cpp:407 -#: ../src/widgets/sp-color-scales.cpp:408 -#: ../src/widgets/sp-color-scales.cpp:433 -#: ../src/widgets/sp-color-scales.cpp:434 +#: ../src/widgets/sp-color-icc-selector.cpp:457 +#: ../src/widgets/sp-color-icc-selector.cpp:479 +#: ../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-wheel-selector.cpp:180 -#: ../src/widgets/sp-color-wheel-selector.cpp:192 +#: ../src/widgets/sp-color-scales.cpp:495 +#: ../src/widgets/sp-color-scales.cpp:496 +#: ../src/widgets/sp-color-wheel-selector.cpp:201 +#: ../src/widgets/sp-color-wheel-selector.cpp:225 msgid "Alpha (opacity)" msgstr "Альфа-канал (прозорість)" -#: ../src/widgets/sp-color-notebook.cpp:362 +#: ../src/widgets/sp-color-notebook.cpp:387 msgid "Color Managed" msgstr "Керування кольорами" -#: ../src/widgets/sp-color-notebook.cpp:369 +#: ../src/widgets/sp-color-notebook.cpp:394 msgid "Out of gamut!" msgstr "Поза гамою!" -#: ../src/widgets/sp-color-notebook.cpp:376 +#: ../src/widgets/sp-color-notebook.cpp:401 msgid "Too much ink!" msgstr "Забагато чорнила!" #. Create RGBA entry and color preview -#: ../src/widgets/sp-color-notebook.cpp:394 +#: ../src/widgets/sp-color-notebook.cpp:418 msgid "RGBA_:" msgstr "RGBA_:" -#: ../src/widgets/sp-color-notebook.cpp:402 +#: ../src/widgets/sp-color-notebook.cpp:426 msgid "Hexadecimal RGBA value of the color" msgstr "Шістнадцяткове значення кольору RGBA" @@ -25944,10 +26135,6 @@ msgstr "CMYK" msgid "Unnamed" msgstr "Без назви" -#: ../src/widgets/sp-color-wheel-selector.cpp:58 -msgid "Wheel" -msgstr "Колесо" - #: ../src/widgets/sp-xmlview-attr-list.cpp:64 msgid "Value" msgstr "Значення" @@ -26126,11 +26313,11 @@ msgstr "Викривлено:" msgid "Scatter randomly the corners and angles" msgstr "Випадковим чином перемістити кути та повернути радіуси" -#: ../src/widgets/stroke-style.cpp:151 +#: ../src/widgets/stroke-style.cpp:158 msgid "Stroke width" msgstr "Товщина штриха" -#: ../src/widgets/stroke-style.cpp:153 +#: ../src/widgets/stroke-style.cpp:160 msgctxt "Stroke width" msgid "_Width:" msgstr "_Ширина:" @@ -26138,71 +26325,71 @@ 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:197 +#: ../src/widgets/stroke-style.cpp:204 msgid "Miter join" 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:204 +#: ../src/widgets/stroke-style.cpp:211 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:211 +#: ../src/widgets/stroke-style.cpp:218 msgid "Bevel join" msgstr "Фасочне" -#: ../src/widgets/stroke-style.cpp:236 +#: ../src/widgets/stroke-style.cpp:243 msgid "Miter _limit:" 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:252 +#: ../src/widgets/stroke-style.cpp:259 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:260 +#: ../src/widgets/stroke-style.cpp:267 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:266 +#: ../src/widgets/stroke-style.cpp:273 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:272 +#: ../src/widgets/stroke-style.cpp:279 msgid "Square cap" msgstr "Квадратні" #. Dash -#: ../src/widgets/stroke-style.cpp:277 +#: ../src/widgets/stroke-style.cpp:284 msgid "Dashes:" msgstr "Пунктир:" -#: ../src/widgets/stroke-style.cpp:295 +#: ../src/widgets/stroke-style.cpp:311 msgid "_Start Markers:" msgstr "_Початкові маркери:" -#: ../src/widgets/stroke-style.cpp:296 +#: ../src/widgets/stroke-style.cpp:312 msgid "Start Markers are drawn on the first node of a path or shape" msgstr "Початкові маркери малюються на першому вузлі контуру або форми" -#: ../src/widgets/stroke-style.cpp:305 +#: ../src/widgets/stroke-style.cpp:330 msgid "_Mid Markers:" msgstr "_Серединні маркери:" -#: ../src/widgets/stroke-style.cpp:306 +#: ../src/widgets/stroke-style.cpp:331 msgid "" "Mid Markers are drawn on every node of a path or shape except the first and " "last nodes" @@ -26210,23 +26397,23 @@ msgstr "" "Серединні маркери малюються на кожному вузлі контуру або форми окрім першого " "і останнього вузлів" -#: ../src/widgets/stroke-style.cpp:315 +#: ../src/widgets/stroke-style.cpp:349 msgid "_End Markers:" msgstr "_Кінцеві маркери:" -#: ../src/widgets/stroke-style.cpp:316 +#: ../src/widgets/stroke-style.cpp:350 msgid "End Markers are drawn on the last node of a path or shape" msgstr "Кінцеві маркери малюються на останньому вузлі контуру або форми" -#: ../src/widgets/stroke-style.cpp:438 +#: ../src/widgets/stroke-style.cpp:481 msgid "Set markers" msgstr "Встановити маркери" -#: ../src/widgets/stroke-style.cpp:1027 ../src/widgets/stroke-style.cpp:1120 +#: ../src/widgets/stroke-style.cpp:1070 ../src/widgets/stroke-style.cpp:1163 msgid "Set stroke style" msgstr "Встановлення стилю штриха" -#: ../src/widgets/stroke-style.cpp:1208 +#: ../src/widgets/stroke-style.cpp:1251 msgid "Set marker color" msgstr "Встановити колір маркера" @@ -26234,64 +26421,64 @@ msgstr "Встановити колір маркера" msgid "Change swatch color" msgstr "Змінити колір зразка" -#: ../src/widgets/text-toolbar.cpp:371 +#: ../src/widgets/text-toolbar.cpp:374 #, c-format msgid "Failed to find font matching: %s\n" msgstr "Не вдається знайти відповідник шрифту: %s\n" -#: ../src/widgets/text-toolbar.cpp:405 +#: ../src/widgets/text-toolbar.cpp:408 msgid "Text: Change font family" msgstr "Текст: Зміна сімейства шрифту" -#: ../src/widgets/text-toolbar.cpp:473 +#: ../src/widgets/text-toolbar.cpp:476 msgid "Text: Change font size" msgstr "Текст: Зміна розміру шрифту" -#: ../src/widgets/text-toolbar.cpp:565 +#: ../src/widgets/text-toolbar.cpp:568 msgid "Text: Change font style" msgstr "Текст: Зміна нарису шрифту" -#: ../src/widgets/text-toolbar.cpp:645 +#: ../src/widgets/text-toolbar.cpp:648 msgid "Text: Change superscript or subscript" msgstr "Текст: змінити на верхній або нижній індекс" -#: ../src/widgets/text-toolbar.cpp:790 +#: ../src/widgets/text-toolbar.cpp:793 msgid "Text: Change alignment" msgstr "Текст: Зміна вирівнювання" -#: ../src/widgets/text-toolbar.cpp:833 +#: ../src/widgets/text-toolbar.cpp:836 msgid "Text: Change line-height" msgstr "Текст: Зміна висоти рядків" -#: ../src/widgets/text-toolbar.cpp:882 +#: ../src/widgets/text-toolbar.cpp:885 msgid "Text: Change word-spacing" msgstr "Текст: Зміна інтервалів між словами" -#: ../src/widgets/text-toolbar.cpp:923 +#: ../src/widgets/text-toolbar.cpp:926 msgid "Text: Change letter-spacing" msgstr "Текст: Зміна інтервалів між літерами" -#: ../src/widgets/text-toolbar.cpp:963 +#: ../src/widgets/text-toolbar.cpp:966 msgid "Text: Change dx (kern)" msgstr "Текст: Зміна приросту за x (керна)" -#: ../src/widgets/text-toolbar.cpp:997 +#: ../src/widgets/text-toolbar.cpp:1000 msgid "Text: Change dy" msgstr "Текст: Зміна приросту за y" -#: ../src/widgets/text-toolbar.cpp:1032 +#: ../src/widgets/text-toolbar.cpp:1035 msgid "Text: Change rotate" msgstr "Текст: Зміна кута обертання" -#: ../src/widgets/text-toolbar.cpp:1080 +#: ../src/widgets/text-toolbar.cpp:1083 msgid "Text: Change orientation" msgstr "Текст: Зміна орієнтації" -#: ../src/widgets/text-toolbar.cpp:1461 +#: ../src/widgets/text-toolbar.cpp:1464 msgid "Font Family" msgstr "Гарнітура шрифту" -#: ../src/widgets/text-toolbar.cpp:1462 +#: ../src/widgets/text-toolbar.cpp:1465 msgid "Select Font Family (Alt-X to access)" msgstr "Виберіть гарнітуру шрифту (Alt-X для доступу)" @@ -26300,176 +26487,176 @@ msgstr "Виберіть гарнітуру шрифту (Alt-X для дост #. Cell layout #. Focus widget #. Enable entry completion -#: ../src/widgets/text-toolbar.cpp:1470 +#: ../src/widgets/text-toolbar.cpp:1473 msgid "Font not found on system" msgstr "Шрифту у системі не виявлено" -#: ../src/widgets/text-toolbar.cpp:1517 +#: ../src/widgets/text-toolbar.cpp:1520 msgid "Font Style" msgstr "Стиль шрифту" -#: ../src/widgets/text-toolbar.cpp:1518 +#: ../src/widgets/text-toolbar.cpp:1521 msgid "Font style" msgstr "Стиль шрифту" #. Name -#: ../src/widgets/text-toolbar.cpp:1534 +#: ../src/widgets/text-toolbar.cpp:1537 msgid "Toggle Superscript" msgstr "Увімкнути/Вимкнути режим верхнього індексу" #. Label -#: ../src/widgets/text-toolbar.cpp:1535 +#: ../src/widgets/text-toolbar.cpp:1538 msgid "Toggle superscript" msgstr "Увімкнути/Вимкнути режим верхнього індексу" #. Name -#: ../src/widgets/text-toolbar.cpp:1547 +#: ../src/widgets/text-toolbar.cpp:1550 msgid "Toggle Subscript" msgstr "Увімкнути/Вимкнути режим нижнього індексу" #. Label -#: ../src/widgets/text-toolbar.cpp:1548 +#: ../src/widgets/text-toolbar.cpp:1551 msgid "Toggle subscript" msgstr "Увімкнути/Вимкнути режим нижнього індексу" -#: ../src/widgets/text-toolbar.cpp:1589 +#: ../src/widgets/text-toolbar.cpp:1592 msgid "Justify" msgstr "Вирівняти з заповненням" #. Name -#: ../src/widgets/text-toolbar.cpp:1596 +#: ../src/widgets/text-toolbar.cpp:1599 msgid "Alignment" msgstr "Вирівнювання" #. Label -#: ../src/widgets/text-toolbar.cpp:1597 +#: ../src/widgets/text-toolbar.cpp:1600 msgid "Text alignment" msgstr "Вирівнювання тексту" -#: ../src/widgets/text-toolbar.cpp:1624 +#: ../src/widgets/text-toolbar.cpp:1627 msgid "Horizontal" msgstr "Горизонтально" -#: ../src/widgets/text-toolbar.cpp:1631 +#: ../src/widgets/text-toolbar.cpp:1634 msgid "Vertical" msgstr "Вертикально" #. Label -#: ../src/widgets/text-toolbar.cpp:1638 +#: ../src/widgets/text-toolbar.cpp:1641 msgid "Text orientation" msgstr "Орієнтація тексту" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1661 +#: ../src/widgets/text-toolbar.cpp:1664 msgid "Smaller spacing" msgstr "Менший інтервал" -#: ../src/widgets/text-toolbar.cpp:1661 ../src/widgets/text-toolbar.cpp:1692 -#: ../src/widgets/text-toolbar.cpp:1723 +#: ../src/widgets/text-toolbar.cpp:1664 ../src/widgets/text-toolbar.cpp:1695 +#: ../src/widgets/text-toolbar.cpp:1726 msgctxt "Text tool" msgid "Normal" msgstr "Звичайний" -#: ../src/widgets/text-toolbar.cpp:1661 +#: ../src/widgets/text-toolbar.cpp:1664 msgid "Larger spacing" msgstr "Більший інтервал" #. name -#: ../src/widgets/text-toolbar.cpp:1666 +#: ../src/widgets/text-toolbar.cpp:1669 msgid "Line Height" msgstr "Висота рядка" #. label -#: ../src/widgets/text-toolbar.cpp:1667 +#: ../src/widgets/text-toolbar.cpp:1670 msgid "Line:" msgstr "Рядок:" #. short label -#: ../src/widgets/text-toolbar.cpp:1668 +#: ../src/widgets/text-toolbar.cpp:1671 msgid "Spacing between lines (times font size)" msgstr "Інтервал між рядками (у одиницях розміру шрифту)" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1692 ../src/widgets/text-toolbar.cpp:1723 +#: ../src/widgets/text-toolbar.cpp:1695 ../src/widgets/text-toolbar.cpp:1726 msgid "Negative spacing" msgstr "Від'ємний інтервал" -#: ../src/widgets/text-toolbar.cpp:1692 ../src/widgets/text-toolbar.cpp:1723 +#: ../src/widgets/text-toolbar.cpp:1695 ../src/widgets/text-toolbar.cpp:1726 msgid "Positive spacing" msgstr "Додатний інтервал" #. name -#: ../src/widgets/text-toolbar.cpp:1697 +#: ../src/widgets/text-toolbar.cpp:1700 msgid "Word spacing" msgstr "Інтервал між словами" #. label -#: ../src/widgets/text-toolbar.cpp:1698 +#: ../src/widgets/text-toolbar.cpp:1701 msgid "Word:" msgstr "Слово:" #. short label -#: ../src/widgets/text-toolbar.cpp:1699 +#: ../src/widgets/text-toolbar.cpp:1702 msgid "Spacing between words (px)" msgstr "Інтервал між словами (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1728 +#: ../src/widgets/text-toolbar.cpp:1731 msgid "Letter spacing" msgstr "Інтервал між літерами" #. label -#: ../src/widgets/text-toolbar.cpp:1729 +#: ../src/widgets/text-toolbar.cpp:1732 msgid "Letter:" msgstr "Літера:" #. short label -#: ../src/widgets/text-toolbar.cpp:1730 +#: ../src/widgets/text-toolbar.cpp:1733 msgid "Spacing between letters (px)" msgstr "Інтервал між літерами (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1759 +#: ../src/widgets/text-toolbar.cpp:1762 msgid "Kerning" msgstr "Кернінґ" #. label -#: ../src/widgets/text-toolbar.cpp:1760 +#: ../src/widgets/text-toolbar.cpp:1763 msgid "Kern:" msgstr "Керн:" #. short label -#: ../src/widgets/text-toolbar.cpp:1761 +#: ../src/widgets/text-toolbar.cpp:1764 msgid "Horizontal kerning (px)" msgstr "Горизонтальний кернінґ (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1790 +#: ../src/widgets/text-toolbar.cpp:1793 msgid "Vertical Shift" msgstr "Вертикальний зсув" #. label -#: ../src/widgets/text-toolbar.cpp:1791 +#: ../src/widgets/text-toolbar.cpp:1794 msgid "Vert:" msgstr "Верт.:" #. short label -#: ../src/widgets/text-toolbar.cpp:1792 +#: ../src/widgets/text-toolbar.cpp:1795 msgid "Vertical shift (px)" msgstr "Вертикальний зсув (у пікселях)" #. name -#: ../src/widgets/text-toolbar.cpp:1821 +#: ../src/widgets/text-toolbar.cpp:1824 msgid "Letter rotation" msgstr "Обертання літер" #. label -#: ../src/widgets/text-toolbar.cpp:1822 +#: ../src/widgets/text-toolbar.cpp:1825 msgid "Rot:" msgstr "Обер.:" #. short label -#: ../src/widgets/text-toolbar.cpp:1823 +#: ../src/widgets/text-toolbar.cpp:1826 msgid "Character rotation (degrees)" msgstr "Обертання символів (у градусах)" @@ -26517,133 +26704,133 @@ msgstr "Ще не визначено" msgid "Style of Paint Bucket fill objects" msgstr "Стиль нових об'єктів, що створені інструментом заповнення" -#: ../src/widgets/toolbox.cpp:1729 +#: ../src/widgets/toolbox.cpp:1730 msgid "Bounding box" msgstr "Рамка-обгортка" -#: ../src/widgets/toolbox.cpp:1729 +#: ../src/widgets/toolbox.cpp:1730 msgid "Snap bounding boxes" msgstr "Прилипання до рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1738 +#: ../src/widgets/toolbox.cpp:1739 msgid "Bounding box edges" msgstr "Краї рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1738 +#: ../src/widgets/toolbox.cpp:1739 msgid "Snap to edges of a bounding box" msgstr "Прилипання до країв рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1747 +#: ../src/widgets/toolbox.cpp:1748 msgid "Bounding box corners" msgstr "Кути рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1747 +#: ../src/widgets/toolbox.cpp:1748 msgid "Snap bounding box corners" msgstr "Прилипання до кутів рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1756 +#: ../src/widgets/toolbox.cpp:1757 msgid "BBox Edge Midpoints" msgstr "Середні точки країв рамки-обгортки" -#: ../src/widgets/toolbox.cpp:1756 +#: ../src/widgets/toolbox.cpp:1757 msgid "Snap midpoints of bounding box edges" msgstr "Прилипання до середніх точок країв рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1766 +#: ../src/widgets/toolbox.cpp:1767 msgid "BBox Centers" msgstr "Центри рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1766 +#: ../src/widgets/toolbox.cpp:1767 msgid "Snapping centers of bounding boxes" msgstr "Прилипання до центрів рамок-обгорток" -#: ../src/widgets/toolbox.cpp:1775 +#: ../src/widgets/toolbox.cpp:1776 msgid "Snap nodes, paths, and handles" msgstr "Прилипання до вузлів, контурів та вусів" -#: ../src/widgets/toolbox.cpp:1783 +#: ../src/widgets/toolbox.cpp:1784 msgid "Snap to paths" msgstr "Прилипання до контурів" -#: ../src/widgets/toolbox.cpp:1792 +#: ../src/widgets/toolbox.cpp:1793 msgid "Path intersections" msgstr "Перетин контурів" -#: ../src/widgets/toolbox.cpp:1792 +#: ../src/widgets/toolbox.cpp:1793 msgid "Snap to path intersections" msgstr "Прилипання до перетинів контурів" -#: ../src/widgets/toolbox.cpp:1801 +#: ../src/widgets/toolbox.cpp:1802 msgid "To nodes" msgstr "До вузлів" -#: ../src/widgets/toolbox.cpp:1801 +#: ../src/widgets/toolbox.cpp:1802 msgid "Snap cusp nodes, incl. rectangle corners" msgstr "Прилипання до вузлів-вершин, зокрема кутів прямокутників" -#: ../src/widgets/toolbox.cpp:1810 +#: ../src/widgets/toolbox.cpp:1811 msgid "Smooth nodes" msgstr "Гладкі вузли" -#: ../src/widgets/toolbox.cpp:1810 +#: ../src/widgets/toolbox.cpp:1811 msgid "Snap smooth nodes, incl. quadrant points of ellipses" msgstr "Прилипання до гладких вузлів, зокрема вершин еліпсів" -#: ../src/widgets/toolbox.cpp:1819 +#: ../src/widgets/toolbox.cpp:1820 msgid "Line Midpoints" msgstr "Середні точки лінії" -#: ../src/widgets/toolbox.cpp:1819 +#: ../src/widgets/toolbox.cpp:1820 msgid "Snap midpoints of line segments" msgstr "Прилипання до середніх точок сегментів лінії" -#: ../src/widgets/toolbox.cpp:1828 +#: ../src/widgets/toolbox.cpp:1829 msgid "Others" msgstr "Інші" -#: ../src/widgets/toolbox.cpp:1828 +#: ../src/widgets/toolbox.cpp:1829 msgid "Snap other points (centers, guide origins, gradient handles, etc.)" msgstr "" "Прилипання до інших точок (центрів, початків напрямних, опорних точок " "градієнтів тощо)" -#: ../src/widgets/toolbox.cpp:1836 +#: ../src/widgets/toolbox.cpp:1837 msgid "Object Centers" msgstr "Центри об'єктів" -#: ../src/widgets/toolbox.cpp:1836 +#: ../src/widgets/toolbox.cpp:1837 msgid "Snap centers of objects" msgstr "Прилипання до центрів об'єктів" -#: ../src/widgets/toolbox.cpp:1845 +#: ../src/widgets/toolbox.cpp:1846 msgid "Rotation Centers" msgstr "Центри обертання" -#: ../src/widgets/toolbox.cpp:1845 +#: ../src/widgets/toolbox.cpp:1846 msgid "Snap an item's rotation center" msgstr "Прилипання до центру обертання елемента" -#: ../src/widgets/toolbox.cpp:1854 +#: ../src/widgets/toolbox.cpp:1855 msgid "Text baseline" msgstr "Базова лінія тексту" -#: ../src/widgets/toolbox.cpp:1854 +#: ../src/widgets/toolbox.cpp:1855 msgid "Snap text anchors and baselines" msgstr "Прилипання до прив'язок тексту та центрів об'єктів" -#: ../src/widgets/toolbox.cpp:1864 +#: ../src/widgets/toolbox.cpp:1865 msgid "Page border" msgstr "Межа сторінки" -#: ../src/widgets/toolbox.cpp:1864 +#: ../src/widgets/toolbox.cpp:1865 msgid "Snap to the page border" msgstr "Прилипання до межі сторінки" -#: ../src/widgets/toolbox.cpp:1873 +#: ../src/widgets/toolbox.cpp:1874 msgid "Snap to grids" msgstr "Прилипання до сітки" -#: ../src/widgets/toolbox.cpp:1882 +#: ../src/widgets/toolbox.cpp:1883 msgid "Snap guides" msgstr "Прилипання до напрямних" @@ -26953,19 +27140,19 @@ msgstr "Зображення видобуто до: %s" msgid "Unable to find image data." msgstr "Не вдалося знайти дані зображення." -#: ../share/extensions/funcplot.py:47 +#: ../share/extensions/funcplot.py:48 msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'" msgstr "" "Інтервал за x не може бути нульовим. Будь ласка, змініть значення «Початкове " "значення за X» або «Кінцеве значення за X»" -#: ../share/extensions/funcplot.py:59 +#: ../share/extensions/funcplot.py:60 msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'" msgstr "" -"Інтервал за y не може бути нульовим. Будь ласка, змініть значення «Верх за Y» " -"або «Низ за Y»" +"Інтервал за y не може бути нульовим. Будь ласка, змініть значення «Верх за " +"Y» або «Низ за Y»" -#: ../share/extensions/funcplot.py:300 +#: ../share/extensions/funcplot.py:315 msgid "Please select a rectangle" msgstr "Будь ласка, позначте прямокутник" @@ -28772,16 +28959,20 @@ msgid "First derivative:" msgstr "Перша похідна:" #: ../share/extensions/funcplot.inx.h:34 +msgid "Clip with rectangle" +msgstr "Обрізання за прямокутником" + +#: ../share/extensions/funcplot.inx.h:35 #: ../share/extensions/param_curves.inx.h:28 msgid "Remove rectangle" msgstr "Вилучити прямокутник" -#: ../share/extensions/funcplot.inx.h:35 +#: ../share/extensions/funcplot.inx.h:36 #: ../share/extensions/param_curves.inx.h:29 msgid "Draw Axes" msgstr "Малювати вісі" -#: ../share/extensions/funcplot.inx.h:36 +#: ../share/extensions/funcplot.inx.h:37 msgid "Add x-axis endpoints" msgstr "Додати кінцеві точки за віссю x" @@ -30605,11 +30796,6 @@ msgstr "" "слайд (шар). Відео буде вбудовано у презентацію JessyInk. Докладніше про це " "можна дізнатися за адресою code.google.com/p/jessyink." -#: ../share/extensions/jessyInk_view.inx.h:1 -#: ../share/extensions/polyhedron_3d.inx.h:26 -msgid "View" -msgstr "Перегляд" - #: ../share/extensions/jessyInk_view.inx.h:5 msgid "Remove view" msgstr "Вилучити область" @@ -30873,19 +31059,6 @@ msgstr "" "до блоку, якщо ні — до нового об'єкта тексту вздовж контуру, розміром у " "сторінку, у новому шарі." -#: ../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_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 "Текст" - #: ../share/extensions/markers_strokepaint.inx.h:1 msgid "Color Markers" msgstr "Маркери кольорів" @@ -32988,6 +33161,46 @@ msgstr "Популярний графічний формат для кліпар msgid "XAML Input" msgstr "Імпорт з XAML" +#~ msgid "" +#~ "Color and transparency of the page background (also used for bitmap " +#~ "export)" +#~ msgstr "" +#~ "Колір та прозорість тла сторінки (враховується при експортуванні у растр)" + +#~ msgid "Left mouse button pans when Space is pressed" +#~ msgstr "Ліва кнопка миші переміщує область видимості, коли натиснуто пробіл" + +#~ msgid "" +#~ "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 "" +#~ "Якщо увімкнути, натискання та утримання пробілу разом з перетягуванням " +#~ "лівою кнопкою миші дозволить перетягувати полотно (як у Adobe " +#~ "Illustrator). Якщо вимкнути, пробіл перемикатиме на інструмент вибору " +#~ "(типово)." + +#~ msgid " and " +#~ msgstr " і " + +#~ msgid "Save..." +#~ msgstr "Зберегти…" + +#~ msgid "%s%s: %d (outline%s) - Inkscape" +#~ msgstr "%s%s: %d (каркас%s) — Inkscape" + +#~ msgid "%s%s: %d (no filters%s) - Inkscape" +#~ msgstr "%s%s: %d (без фільтрів%s) — Inkscape" + +#~ msgid "%s%s (outline%s) - Inkscape" +#~ msgstr "%s%s (каркас%s) — Inkscape" + +#~ msgid "%s%s (no filters%s) - Inkscape" +#~ msgstr "%s%s (без фільтрів%s) — Inkscape" + +#~ msgid "Edit:" +#~ msgstr "Зміна:" + #~ msgid "Specifies the shape of the path's corners" #~ msgstr "Визначає форму кутових точок на кривій" diff --git a/share/extensions/funcplot.inx b/share/extensions/funcplot.inx index 8eaf33f01..58cf158ca 100644 --- a/share/extensions/funcplot.inx +++ b/share/extensions/funcplot.inx @@ -41,6 +41,7 @@ The constants pi and e are also available.</_param> <param name="fofx" type="string" _gui-text="Function:">exp(-x*x)</param> <param name="fponum" type="boolean" _gui-text="Calculate first derivative numerically">true</param> <param name="fpofx" type="string" _gui-text="First derivative:">x</param> + <param name="clip" type="boolean" _gui-text="Clip with rectangle">false</param> <param name="remove" type="boolean" _gui-text="Remove rectangle">true</param> <param name="drawaxis" type="boolean" _gui-text="Draw Axes">false</param> <param name="endpts" type="boolean" _gui-text="Add x-axis endpoints">false</param> diff --git a/share/extensions/funcplot.py b/share/extensions/funcplot.py index 08ac15dbb..7f8fdafe1 100755 --- a/share/extensions/funcplot.py +++ b/share/extensions/funcplot.py @@ -28,6 +28,7 @@ Changes: # standard library from math import * from random import * +from copy import deepcopy # local library import inkex import simplepath @@ -217,6 +218,10 @@ class FuncPlot(inkex.Effect): action="store", type="string", dest="fpofx", default="cos(x)", help="f'(x) for plotting") + self.OptionParser.add_option("--clip", + action="store", type="inkbool", + dest="clip", default=False, + help="If True, clip with copy of source rectangle") self.OptionParser.add_option("--remove", action="store", type="inkbool", dest="remove", default=True, @@ -293,6 +298,16 @@ class FuncPlot(inkex.Effect): # add path into SVG structure node.getparent().append(newpath) + # option whether to clip the path with rect or not. + if self.options.clip: + defs = self.xpathSingle('/svg:svg//svg:defs') + if defs == None: + defs = inkex.etree.SubElement(self.document.getroot(),inkex.addNS('defs','svg')) + clip = inkex.etree.SubElement(defs,inkex.addNS('clipPath','svg')) + clip.append(deepcopy(node)) + clipId = self.uniqueId('clipPath') + clip.set('id', clipId) + newpath.set('clip-path', 'url(#'+clipId+')') # option wether to remove the rectangle or not. if self.options.remove: node.getparent().remove(node) diff --git a/share/extensions/text_braille.py b/share/extensions/text_braille.py index 09300f891..ba2e3d81b 100755 --- a/share/extensions/text_braille.py +++ b/share/extensions/text_braille.py @@ -1,5 +1,6 @@ #!/usr/bin/env python -#encoding: utf-8 +# -*- coding: utf-8 -*- + import chardataeffect, inkex, string convert_table = {\ diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 9675df8e3..c35e0041f 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -86,10 +86,10 @@ GType sp_arc_context_get_type() static void sp_arc_context_class_init(SPArcContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*) g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_arc_context_dispose; @@ -127,8 +127,8 @@ static void sp_arc_context_finish(SPEventContext *ec) sp_arc_finish(ac); ac->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); } } @@ -174,8 +174,8 @@ static void sp_arc_context_setup(SPEventContext *ec) SPArcContext *ac = SP_ARC_CONTEXT(ec); Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } ec->shape_editor = new ShapeEditor(ec->desktop); @@ -219,8 +219,8 @@ static gint sp_arc_context_item_handler(SPEventContext *event_context, SPItem *i break; } - if (((SPEventContextClass *) parent_class)->item_handler) { - ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); } return ret; @@ -401,8 +401,8 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } diff --git a/src/attributes.cpp b/src/attributes.cpp index 7d6f8614d..30cf30f30 100644 --- a/src/attributes.cpp +++ b/src/attributes.cpp @@ -258,9 +258,6 @@ static SPStyleProp const props[] = { {SP_ATTR_POINTSATY, "pointsAtY"}, {SP_ATTR_POINTSATZ, "pointsAtZ"}, {SP_ATTR_LIMITINGCONEANGLE, "limitingConeAngle"}, - /*feFlood*/ - {SP_ATTR_FLOODCOLOR, "flood-color"}, - {SP_ATTR_FLOODOPACITY, "flood-opacity"}, /* SPGaussianBlur */ {SP_ATTR_STDDEVIATION, "stdDeviation"}, /*feImage*/ diff --git a/src/attributes.h b/src/attributes.h index d8eb087b2..87cd9ed45 100644 --- a/src/attributes.h +++ b/src/attributes.h @@ -258,9 +258,6 @@ enum SPAttributeEnum { SP_ATTR_POINTSATY, SP_ATTR_POINTSATZ, SP_ATTR_LIMITINGCONEANGLE, - /*feFlood*/ - SP_ATTR_FLOODCOLOR, - SP_ATTR_FLOODOPACITY, /* SPGaussianBlur */ SP_ATTR_STDDEVIATION, /*feImage*/ diff --git a/src/connector-context.cpp b/src/connector-context.cpp index 5f87ab712..db2e049c7 100644 --- a/src/connector-context.cpp +++ b/src/connector-context.cpp @@ -287,13 +287,10 @@ sp_connector_context_get_type(void) static void sp_connector_context_class_init(SPConnectorContextClass *klass) { - GObjectClass *object_class; - SPEventContextClass *event_context_class; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - object_class = (GObjectClass *) klass; - event_context_class = (SPEventContextClass *) klass; - - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_connector_context_dispose; @@ -405,8 +402,8 @@ sp_connector_context_setup(SPEventContext *ec) SPConnectorContext *cc = SP_CONNECTOR_CONTEXT(ec); SPDesktop *dt = ec->desktop; - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } cc->selection = sp_desktop_selection(dt); @@ -514,8 +511,8 @@ sp_connector_context_finish(SPEventContext *ec) spcc_connector_finish(cc); cc->state = SP_CONNECTOR_CONTEXT_IDLE; - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); } if (cc->selection) { @@ -735,7 +732,7 @@ sp_connector_context_root_handler(SPEventContext *ec, GdkEvent *event) if (!ret) { gint (*const parent_root_handler)(SPEventContext *, GdkEvent *) - = ((SPEventContextClass *) parent_class)->root_handler; + = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler; if (parent_root_handler) { ret = parent_root_handler(ec, event); } @@ -1939,12 +1936,12 @@ void cc_selection_set_avoid(bool const set_avoid) Inkscape::Selection *selection = sp_desktop_selection(desktop); - GSList *l = (GSList *) selection->itemList(); + GSList *l = const_cast<GSList *>(selection->itemList()); int changes = 0; while (l) { - SPItem *item = (SPItem *) l->data; + SPItem *item = SP_ITEM(l->data); char const *value = (set_avoid) ? "true" : NULL; diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp index 49fcfd3a4..1fb823bf0 100644 --- a/src/dialogs/dialog-events.cpp +++ b/src/dialogs/dialog-events.cpp @@ -47,7 +47,7 @@ sp_dialog_defocus (GtkWindow *win) { GtkWindow *w; //find out the document window we're transient for - w = gtk_window_get_transient_for ((GtkWindow *) win); + w = gtk_window_get_transient_for(GTK_WINDOW(win)); //switch to it if (w) { @@ -65,10 +65,9 @@ void sp_dialog_defocus_callback_cpp(Gtk::Entry *e) } void -sp_dialog_defocus_callback (GtkWindow */*win*/, gpointer data) +sp_dialog_defocus_callback (GtkWindow * /*win*/, gpointer data) { - sp_dialog_defocus ((GtkWindow *) - gtk_widget_get_toplevel ((GtkWidget *) data)); + sp_dialog_defocus( GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(data))) ); } @@ -93,7 +92,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data) { // if the focus is inside the Text and Font textview, do nothing - GObject *dlg = (GObject *) data; + GObject *dlg = G_OBJECT(data); if (g_object_get_data (dlg, "eatkeys")) { return FALSE; } @@ -121,12 +120,12 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data) * its position. */ GdkEventAny event; - GtkWidget *widget = (GtkWidget *) win; + GtkWidget *widget = GTK_WIDGET(win); event.type = GDK_DELETE; event.window = gtk_widget_get_window (widget); event.send_event = TRUE; g_object_ref (G_OBJECT (event.window)); - gtk_main_do_event ((GdkEvent*)&event); + gtk_main_do_event(reinterpret_cast<GdkEvent*>(&event)); g_object_unref (G_OBJECT (event.window)); ret = TRUE; @@ -218,7 +217,7 @@ void on_dialog_unhide (GtkWidget *w) gboolean sp_dialog_hide(GObject * /*object*/, gpointer data) { - GtkWidget *dlg = (GtkWidget *) data; + GtkWidget *dlg = GTK_WIDGET(data); if (dlg) gtk_widget_hide (dlg); @@ -231,7 +230,7 @@ sp_dialog_hide(GObject * /*object*/, gpointer data) gboolean sp_dialog_unhide(GObject * /*object*/, gpointer data) { - GtkWidget *dlg = (GtkWidget *) data; + GtkWidget *dlg = GTK_WIDGET(data); if (dlg) gtk_widget_show (dlg); diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp index 8acc96596..2810f065c 100644 --- a/src/dialogs/find.cpp +++ b/src/dialogs/find.cpp @@ -111,7 +111,7 @@ sp_find_squeeze_window() #else gtk_widget_size_request(dlg, &r); #endif - gtk_window_resize ((GtkWindow *) dlg, r.width, r.height); + gtk_window_resize (GTK_WINDOW(dlg), r.width, r.height); } static bool @@ -156,7 +156,7 @@ item_text_match (SPItem *item, const gchar *text, bool exact) //FIXME: strcasestr ret = ((bool) (strstr(item_text, text) != NULL)); } - g_free ((void*) item_text); + g_free(static_cast<void*>(g_strdup(item_text))); return ret; } return false; @@ -327,8 +327,8 @@ all_selection_items (Inkscape::Selection *s, GSList *l, SPObject *ancestor, bool { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - for (GSList *i = (GSList *) s->itemList(); i != NULL; i = i->next) { - if ( SP_IS_ITEM(i->data) && !reinterpret_cast<SPObject*>(i->data)->cloned && !desktop->isLayer(SP_ITEM(i->data))) { + for (GSList *i = const_cast<GSList *>(s->itemList()); i != NULL; i = i->next) { + if ( SP_IS_ITEM(i->data) && !SP_OBJECT(i->data)->cloned && !desktop->isLayer(SP_ITEM(i->data))) { SPItem * item = SP_ITEM(i->data); if (!ancestor || ancestor->isAncestorOf(item)) { if ((hidden || !desktop->itemIsHidden(item)) && (locked || !item->isLocked())) { @@ -511,7 +511,7 @@ sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active, { GtkWidget *b = gtk_check_button_new_with_label (label); gtk_widget_show (b); - gtk_toggle_button_set_active ((GtkToggleButton *) b, active); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b), active); g_object_set_data (G_OBJECT (w), data, b); gtk_widget_set_tooltip_text (b, tip); if (toggled) @@ -709,9 +709,9 @@ sp_find_dialog_old (void) // if (y<0) y=0; if (w && h) - gtk_window_resize ((GtkWindow *) dlg, w, h); + gtk_window_resize(GTK_WINDOW(dlg), w, h); if (x >= 0 && y >= 0 && (x < (gdk_screen_width()-MIN_ONSCREEN_DISTANCE)) && (y < (gdk_screen_height()-MIN_ONSCREEN_DISTANCE))) { - gtk_window_move ((GtkWindow *) dlg, x, y); + gtk_window_move(GTK_WINDOW(dlg), x, y); } else { gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER); } @@ -764,7 +764,7 @@ sp_find_dialog_old (void) { GtkWidget *b = gtk_check_button_new_with_mnemonic (_("Search in s_election")); gtk_widget_show (b); - gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b), FALSE); g_object_set_data (G_OBJECT (dlg), "inselection", b); gtk_widget_set_tooltip_text (b, _("Limit search to the current selection")); gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); @@ -773,7 +773,7 @@ sp_find_dialog_old (void) { GtkWidget *b = gtk_check_button_new_with_mnemonic (_("Search in current _layer")); gtk_widget_show (b); - gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b), FALSE); g_object_set_data (G_OBJECT (dlg), "inlayer", b); gtk_widget_set_tooltip_text (b, _("Limit search to the current layer")); gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); @@ -782,7 +782,7 @@ sp_find_dialog_old (void) { GtkWidget *b = gtk_check_button_new_with_mnemonic (_("Include _hidden")); gtk_widget_show (b); - gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b), FALSE); g_object_set_data (G_OBJECT (dlg), "includehidden", b); gtk_widget_set_tooltip_text (b, _("Include hidden objects in search")); gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); @@ -791,7 +791,7 @@ sp_find_dialog_old (void) { GtkWidget *b = gtk_check_button_new_with_mnemonic (_("Include l_ocked")); gtk_widget_show (b); - gtk_toggle_button_set_active ((GtkToggleButton *) b, FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b), FALSE); g_object_set_data (G_OBJECT (dlg), "includelocked", b); gtk_widget_set_tooltip_text (b, _("Include locked objects in search")); gtk_box_pack_start (GTK_BOX (vb), b, FALSE, FALSE, 0); @@ -814,8 +814,8 @@ sp_find_dialog_old (void) } } - gtk_widget_show((GtkWidget *) dlg); - gtk_window_present ((GtkWindow *) dlg); + gtk_widget_show(GTK_WIDGET(dlg)); + gtk_window_present(GTK_WINDOW(dlg)); sp_find_dialog_reset (NULL, G_OBJECT (dlg)); return dlg; diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp index 2e2eb42dd..692e31837 100644 --- a/src/display/cairo-utils.cpp +++ b/src/display/cairo-utils.cpp @@ -24,6 +24,7 @@ #include <2geom/transforms.h> #include <2geom/sbasis-to-bezier.h> #include "color.h" +#include "style.h" #include "helper/geom-curves.h" namespace Inkscape { @@ -276,6 +277,43 @@ feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv) } } +SPColorInterpolation +get_cairo_surface_ci(cairo_surface_t *surface) { + void* data = cairo_surface_get_user_data( surface, &ci_key ); + if( data != NULL ) { + return (SPColorInterpolation)GPOINTER_TO_INT( data ); + } else { + return SP_CSS_COLOR_INTERPOLATION_AUTO; + } +} + +/** Set the color_interpolation_value for a Cairo surface. + * Transform the surface between sRGB and linearRGB if necessary. */ +void +set_cairo_surface_ci(cairo_surface_t *surface, SPColorInterpolation ci) { + + if( cairo_surface_get_content( surface ) != CAIRO_CONTENT_ALPHA ) { + + SPColorInterpolation ci_in = get_cairo_surface_ci( surface ); + + if( ci_in == SP_CSS_COLOR_INTERPOLATION_SRGB && + ci == SP_CSS_COLOR_INTERPOLATION_LINEARRGB ) { + ink_cairo_surface_srgb_to_linear( surface ); + } + if( ci_in == SP_CSS_COLOR_INTERPOLATION_LINEARRGB && + ci == SP_CSS_COLOR_INTERPOLATION_SRGB ) { + ink_cairo_surface_linear_to_srgb( surface ); + } + + cairo_surface_set_user_data(surface, &ci_key, GINT_TO_POINTER (ci), NULL); + } +} + +void +copy_cairo_surface_ci(cairo_surface_t *in, cairo_surface_t *out) { + cairo_surface_set_user_data(out, &ci_key, cairo_surface_get_user_data(in, &ci_key), NULL); +} + void ink_cairo_set_source_rgba32(cairo_t *ct, guint32 rgba) { @@ -395,6 +433,7 @@ cairo_surface_t * ink_cairo_surface_create_identical(cairo_surface_t *s) { cairo_surface_t *ns = ink_cairo_surface_create_same_size(s, cairo_surface_get_content(s)); + cairo_surface_set_user_data(ns, &ci_key, cairo_surface_get_user_data(s, &ci_key), NULL); return ns; } @@ -547,6 +586,92 @@ void ink_cairo_surface_average_color_premul(cairo_surface_t *surface, double &r, a = CLAMP(a, 0.0, 1.0); } +void srgb_to_linear( guint32* c, guint32 a ) { + + *c = unpremul_alpha( *c, a ); + + double cc = *c/255.0; + + if( cc < 0.04045 ) { + cc /= 12.92; + } else { + cc = pow( (cc+0.055)/1.055, 2.4 ); + } + cc *= 255.0; + + *c = (int)cc; + + *c = premul_alpha( *c, a ); +} + +void linear_to_srgb( guint32* c, guint32 a ) { + + *c = unpremul_alpha( *c, a ); + + double cc = *c/255.0; + + if( cc < 0.0031308 ) { + cc *= 12.92; + } else { + cc = pow( cc, 1.0/2.4 )*1.055-0.055; + } + cc *= 255.0; + + *c = (int)cc; + + *c = premul_alpha( *c, a ); +} + +int ink_cairo_surface_srgb_to_linear(cairo_surface_t *surface) +{ + cairo_surface_flush(surface); + int width = cairo_image_surface_get_width(surface); + int height = cairo_image_surface_get_height(surface); + int stride = cairo_image_surface_get_stride(surface); + unsigned char *data = cairo_image_surface_get_data(surface); + + /* TODO convert this to OpenMP somehow */ + for (int y = 0; y < height; ++y, data += stride) { + for (int x = 0; x < width; ++x) { + guint32 px = *reinterpret_cast<guint32*>(data + 4*x); + EXTRACT_ARGB32(px, a,r,g,b) ; // Unneeded semi-colon for indenting + if( a != 0 ) { + srgb_to_linear( &r, a ); + srgb_to_linear( &g, a ); + srgb_to_linear( &b, a ); + } + ASSEMBLE_ARGB32(px2, a,r,g,b); + *reinterpret_cast<guint32*>(data + 4*x) = px2; + } + } + return width * height; +} + +int ink_cairo_surface_linear_to_srgb(cairo_surface_t *surface) +{ + cairo_surface_flush(surface); + int width = cairo_image_surface_get_width(surface); + int height = cairo_image_surface_get_height(surface); + int stride = cairo_image_surface_get_stride(surface); + unsigned char *data = cairo_image_surface_get_data(surface); + + /* TODO convert this to OpenMP somehow */ + for (int y = 0; y < height; ++y, data += stride) { + for (int x = 0; x < width; ++x) { + guint32 px = *reinterpret_cast<guint32*>(data + 4*x); + EXTRACT_ARGB32(px, a,r,g,b) ; // Unneeded semi-colon for indenting + if( a != 0 ) { + linear_to_srgb( &r, a ); + linear_to_srgb( &g, a ); + linear_to_srgb( &b, a ); + } + ASSEMBLE_ARGB32(px2, a,r,g,b); + *reinterpret_cast<guint32*>(data + 4*x) = px2; + } + } + return width * height; +} + cairo_pattern_t * ink_cairo_pattern_create_checkerboard() { diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h index e67872891..d240545eb 100644 --- a/src/display/cairo-utils.h +++ b/src/display/cairo-utils.h @@ -15,6 +15,7 @@ #include <glib.h> #include <cairomm/cairomm.h> #include <2geom/forward.h> +#include "style.h" struct SPColor; struct _GdkPixbuf; @@ -81,6 +82,17 @@ public: } // namespace Inkscape +/** + * Key for cairo_surface_t to keep track of current color interpolation value + * Only the address of the structure is used, it is never initialized. See: + * http://www.cairographics.org/manual/cairo-Types.html#cairo-user-data-key-t + */ +static cairo_user_data_key_t ci_key; +SPColorInterpolation get_cairo_surface_ci(cairo_surface_t *surface); +void set_cairo_surface_ci(cairo_surface_t *surface, SPColorInterpolation cif); +void copy_cairo_surface_ci(cairo_surface_t *in, cairo_surface_t *out); +void convert_cairo_surface_ci(cairo_surface_t *surface, SPColorInterpolation cif); + void ink_cairo_set_source_color(cairo_t *ct, SPColor const &color, double opacity); void ink_cairo_set_source_rgba32(cairo_t *ct, guint32 rgba); void ink_cairo_transform(cairo_t *ct, Geom::Affine const &m); @@ -102,6 +114,9 @@ guint32 ink_cairo_surface_average_color(cairo_surface_t *surface); void ink_cairo_surface_average_color(cairo_surface_t *surface, double &r, double &g, double &b, double &a); void ink_cairo_surface_average_color_premul(cairo_surface_t *surface, double &r, double &g, double &b, double &a); +int ink_cairo_surface_srgb_to_linear(cairo_surface_t *surface); +int ink_cairo_surface_linear_to_srgb(cairo_surface_t *surface); + cairo_pattern_t *ink_cairo_pattern_create_checkerboard(); void convert_pixels_pixbuf_to_argb32(guchar *data, int w, int h, int rs); diff --git a/src/display/drawing.cpp b/src/display/drawing.cpp index 77f24caf3..171cc014f 100644 --- a/src/display/drawing.cpp +++ b/src/display/drawing.cpp @@ -4,8 +4,9 @@ *//* * Authors: * Krzysztof Kosiński <tweenk.pl@gmail.com> + * Johan Engelen <j.b.c.engelen@alumnus.utwente.nl> * - * Copyright (C) 2011 Authors + * Copyright (C) 2011-2012 Authors * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -14,6 +15,12 @@ #include "nr-filter-gaussian.h" #include "nr-filter-types.h" +//grayscale colormode: +#include "nr-filter-colormatrix.h" +#include "cairo-templates.h" +#include "drawing-context.h" + + namespace Inkscape { Drawing::Drawing(SPCanvasArena *arena) @@ -145,12 +152,37 @@ Drawing::update(Geom::IntRect const &area, UpdateContext const &ctx, unsigned fl _pickItemsForCaching(); } +// hardcoded grayscale color matrix values. could be turned into preference settings in future. +static const gdouble grayscale_value_matrix[] = { + 0.21, 0.72, 0.072, 0, 0, + 0.21, 0.72, 0.072, 0, 0, + 0.21, 0.72, 0.072, 0, 0, + 0 , 0 , 0 , 1, 0 +}; +static Filters::FilterColorMatrix::ColorMatrixMatrix grayscale_colormatrix( + std::vector<gdouble> (grayscale_value_matrix, grayscale_value_matrix + sizeof(grayscale_value_matrix) / sizeof(grayscale_value_matrix[0]) ) +); + void Drawing::render(DrawingContext &ct, Geom::IntRect const &area, unsigned flags) { if (_root) { _root->render(ct, area, flags); } + + if (colorMode() == COLORMODE_GRAYSCALE) { + // apply grayscale filter on top of everything + cairo_surface_t *input = ct.rawTarget(); + cairo_surface_t *out = ink_cairo_surface_create_identical(input); + ink_cairo_surface_filter(input, out, grayscale_colormatrix); + Geom::Point origin = ct.targetLogicalBounds().min(); + ct.setSource(out, origin[Geom::X], origin[Geom::Y]); + ct.setOperator(CAIRO_OPERATOR_SOURCE); + ct.paint(); + ct.setOperator(CAIRO_OPERATOR_OVER); + + cairo_surface_destroy(out); + } } DrawingItem * diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp index 267883b4b..a08191f67 100644 --- a/src/display/nr-filter-blend.cpp +++ b/src/display/nr-filter-blend.cpp @@ -146,13 +146,23 @@ void FilterBlend::render_cairo(FilterSlot &slot) cairo_surface_t *input1 = slot.getcairo(_input); cairo_surface_t *input2 = slot.getcairo(_input2); - cairo_content_t ct1 = cairo_surface_get_content(input1); - cairo_content_t ct2 = cairo_surface_get_content(input2); + // We may need to transform input surface to correct color interpolation space. The input surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the input before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci( input1, ci_fp ); + set_cairo_surface_ci( input2, ci_fp ); // input2 is the "background" image // out should be ARGB32 if any of the inputs is ARGB32 cairo_surface_t *out = ink_cairo_surface_create_output(input1, input2); + set_cairo_surface_ci( out, ci_fp ); + cairo_content_t ct1 = cairo_surface_get_content(input1); + cairo_content_t ct2 = cairo_surface_get_content(input2); if ((ct1 == CAIRO_CONTENT_ALPHA && ct2 == CAIRO_CONTENT_ALPHA) || _blend_mode == BLEND_NORMAL) { diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp index 33718ed68..77873d523 100644 --- a/src/display/nr-filter-colormatrix.cpp +++ b/src/display/nr-filter-colormatrix.cpp @@ -32,50 +32,47 @@ FilterPrimitive * FilterColorMatrix::create() { FilterColorMatrix::~FilterColorMatrix() {} -struct ColorMatrixMatrix { - ColorMatrixMatrix(std::vector<double> const &values) { - unsigned limit = std::min(static_cast<size_t>(20), values.size()); - for (unsigned i = 0; i < limit; ++i) { - if (i % 5 == 4) { - _v[i] = round(values[i]*255*255); - } else { - _v[i] = round(values[i]*255); - } - } - for (unsigned i = limit; i < 20; ++i) { - _v[i] = 0; +FilterColorMatrix::ColorMatrixMatrix::ColorMatrixMatrix(std::vector<double> const &values) { + unsigned limit = std::min(static_cast<size_t>(20), values.size()); + for (unsigned i = 0; i < limit; ++i) { + if (i % 5 == 4) { + _v[i] = round(values[i]*255*255); + } else { + _v[i] = round(values[i]*255); } } + for (unsigned i = limit; i < 20; ++i) { + _v[i] = 0; + } +} - guint32 operator()(guint32 in) { - EXTRACT_ARGB32(in, a, r, g, b) - // we need to un-premultiply alpha values for this type of matrix - // TODO: unpremul can be ignored if there is an identity mapping on the alpha channel - if (a != 0) { - r = unpremul_alpha(r, a); - g = unpremul_alpha(g, a); - b = unpremul_alpha(b, a); - } - - gint32 ro = r*_v[0] + g*_v[1] + b*_v[2] + a*_v[3] + _v[4]; - gint32 go = r*_v[5] + g*_v[6] + b*_v[7] + a*_v[8] + _v[9]; - gint32 bo = r*_v[10] + g*_v[11] + b*_v[12] + a*_v[13] + _v[14]; - gint32 ao = r*_v[15] + g*_v[16] + b*_v[17] + a*_v[18] + _v[19]; - ro = (pxclamp(ro, 0, 255*255) + 127) / 255; - go = (pxclamp(go, 0, 255*255) + 127) / 255; - bo = (pxclamp(bo, 0, 255*255) + 127) / 255; - ao = (pxclamp(ao, 0, 255*255) + 127) / 255; +guint32 FilterColorMatrix::ColorMatrixMatrix::operator()(guint32 in) { + EXTRACT_ARGB32(in, a, r, g, b) + // we need to un-premultiply alpha values for this type of matrix + // TODO: unpremul can be ignored if there is an identity mapping on the alpha channel + if (a != 0) { + r = unpremul_alpha(r, a); + g = unpremul_alpha(g, a); + b = unpremul_alpha(b, a); + } - ro = premul_alpha(ro, ao); - go = premul_alpha(go, ao); - bo = premul_alpha(bo, ao); + gint32 ro = r*_v[0] + g*_v[1] + b*_v[2] + a*_v[3] + _v[4]; + gint32 go = r*_v[5] + g*_v[6] + b*_v[7] + a*_v[8] + _v[9]; + gint32 bo = r*_v[10] + g*_v[11] + b*_v[12] + a*_v[13] + _v[14]; + gint32 ao = r*_v[15] + g*_v[16] + b*_v[17] + a*_v[18] + _v[19]; + ro = (pxclamp(ro, 0, 255*255) + 127) / 255; + go = (pxclamp(go, 0, 255*255) + 127) / 255; + bo = (pxclamp(bo, 0, 255*255) + 127) / 255; + ao = (pxclamp(ao, 0, 255*255) + 127) / 255; + + ro = premul_alpha(ro, ao); + go = premul_alpha(go, ao); + bo = premul_alpha(bo, ao); + + ASSEMBLE_ARGB32(pxout, ao, ro, go, bo) + return pxout; +} - ASSEMBLE_ARGB32(pxout, ao, ro, go, bo) - return pxout; - } -private: - gint32 _v[20]; -}; struct ColorMatrixSaturate { ColorMatrixSaturate(double v_in) { @@ -155,15 +152,27 @@ void FilterColorMatrix::render_cairo(FilterSlot &slot) { cairo_surface_t *input = slot.getcairo(_input); cairo_surface_t *out = NULL; + + // We may need to transform input surface to correct color interpolation space. The input surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the input before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci( input, ci_fp ); + if (type == COLORMATRIX_LUMINANCETOALPHA) { out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_ALPHA); } else { out = ink_cairo_surface_create_identical(input); + // Set ci to that used for computation + set_cairo_surface_ci(out, ci_fp); } switch (type) { case COLORMATRIX_MATRIX: - ink_cairo_surface_filter(input, out, ColorMatrixMatrix(values)); + ink_cairo_surface_filter(input, out, FilterColorMatrix::ColorMatrixMatrix(values)); break; case COLORMATRIX_SATURATE: ink_cairo_surface_filter(input, out, ColorMatrixSaturate(value)); diff --git a/src/display/nr-filter-colormatrix.h b/src/display/nr-filter-colormatrix.h index 5f21a4210..c7e5e91d9 100644 --- a/src/display/nr-filter-colormatrix.h +++ b/src/display/nr-filter-colormatrix.h @@ -42,6 +42,15 @@ public: virtual void set_type(FilterColorMatrixType type); virtual void set_value(gdouble value); virtual void set_values(std::vector<gdouble> const &values); + +public: + struct ColorMatrixMatrix { + ColorMatrixMatrix(std::vector<double> const &values); + guint32 operator()(guint32 in); + private: + gint32 _v[20]; + }; + private: std::vector<gdouble> values; gdouble value; diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp index 226a73cef..3bc00d2d7 100644 --- a/src/display/nr-filter-component-transfer.cpp +++ b/src/display/nr-filter-component-transfer.cpp @@ -238,6 +238,17 @@ void FilterComponentTransfer::render_cairo(FilterSlot &slot) { cairo_surface_t *input = slot.getcairo(_input); cairo_surface_t *out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_COLOR_ALPHA); + + // We may need to transform input surface to correct color interpolation space. The input surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the input before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + set_cairo_surface_ci(out, ci_fp ); + } + set_cairo_surface_ci( input, ci_fp ); + //cairo_surface_t *outtemp = ink_cairo_surface_create_identical(out); ink_cairo_surface_blit(input, out); diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp index 040424cb3..f6decad0d 100644 --- a/src/display/nr-filter-composite.cpp +++ b/src/display/nr-filter-composite.cpp @@ -66,7 +66,18 @@ void FilterComposite::render_cairo(FilterSlot &slot) cairo_surface_t *input1 = slot.getcairo(_input); cairo_surface_t *input2 = slot.getcairo(_input2); + // We may need to transform input surface to correct color interpolation space. The input surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the input before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci( input1, ci_fp ); + set_cairo_surface_ci( input2, ci_fp ); + cairo_surface_t *out = ink_cairo_surface_create_output(input1, input2); + set_cairo_surface_ci(out, ci_fp ); if (op == COMPOSITE_ARITHMETIC) { ink_cairo_surface_blend(input1, input2, out, ComposeArithmetic(k1, k2, k3, k4)); diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp index 5469aff88..2aad528a6 100644 --- a/src/display/nr-filter-convolve-matrix.cpp +++ b/src/display/nr-filter-convolve-matrix.cpp @@ -104,8 +104,6 @@ void FilterConvolveMatrix::render_cairo(FilterSlot &slot) static bool bias_warning = false; static bool edge_warning = false; - cairo_surface_t *input = slot.getcairo(_input); - if (orderX<=0 || orderY<=0) { g_warning("Empty kernel!"); return; @@ -119,8 +117,19 @@ void FilterConvolveMatrix::render_cairo(FilterSlot &slot) return; } + cairo_surface_t *input = slot.getcairo(_input); cairo_surface_t *out = ink_cairo_surface_create_identical(input); + // We may need to transform input surface to correct color interpolation space. The input surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the input before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + set_cairo_surface_ci(out, ci_fp); + } + set_cairo_surface_ci( input, ci_fp ); + if (bias!=0 && !bias_warning) { g_warning("It is unknown whether Inkscape's implementation of bias in feConvolveMatrix " "is correct!"); diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp index fcc986189..faf56a4ca 100644 --- a/src/display/nr-filter-diffuselighting.cpp +++ b/src/display/nr-filter-diffuselighting.cpp @@ -126,6 +126,13 @@ void FilterDiffuseLighting::render_cairo(FilterSlot &slot) cairo_surface_t *input = slot.getcairo(_input); cairo_surface_t *out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_COLOR_ALPHA); + // Only alpha channel of input is used, no need to check input color_interpolation_filter value. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci(out, ci_fp ); + Geom::Rect slot_area = slot.get_slot_area(); Geom::Point p = slot_area.min(); Geom::Affine trans = slot.get_units().get_matrix_primitiveunits2pb(); diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp index 9b44c2302..1b979fa6c 100644 --- a/src/display/nr-filter-displacement-map.cpp +++ b/src/display/nr-filter-displacement-map.cpp @@ -74,6 +74,17 @@ void FilterDisplacementMap::render_cairo(FilterSlot &slot) cairo_surface_t *texture = slot.getcairo(_input); cairo_surface_t *map = slot.getcairo(_input2); cairo_surface_t *out = ink_cairo_surface_create_identical(texture); + // color_interpolation_filters for out same as texture. See spec. + copy_cairo_surface_ci( texture, out ); + + // We may need to transform map surface to correct color interpolation space. The map surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the map before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci( map, ci_fp ); Geom::Affine trans = slot.get_units().get_matrix_primitiveunits2pb(); double scalex = scale * trans.expansionX(); diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp index 56a27ecd7..7117e0343 100644 --- a/src/display/nr-filter-flood.cpp +++ b/src/display/nr-filter-flood.cpp @@ -45,6 +45,8 @@ void FilterFlood::render_cairo(FilterSlot &slot) #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) + // DOES THIS REALLY BELONG HERE? SHOULDN'T ICC BE APPLIED AFTER ALL COMPOSITING? + // What if color_interpolation_filter is set to linear RGB? if (icc) { guchar ru, gu, bu; icc_color_to_sRGB(icc, &ru, &gu, &bu); @@ -55,6 +57,10 @@ void FilterFlood::render_cairo(FilterSlot &slot) #endif cairo_surface_t *out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_COLOR_ALPHA); + // color_interpolation_filter is determined by CSS value (see spec. Turbulence). + if( _style ) { + set_cairo_surface_ci(out, (SPColorInterpolation)_style->color_interpolation_filters.computed ); + } // Get filter primitive area in user units Geom::Rect fp = filter_primitive_area( slot.get_units() ); diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index 6ef321992..9d7c32585 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -553,6 +553,15 @@ void FilterGaussian::render_cairo(FilterSlot &slot) cairo_surface_t *in = slot.getcairo(_input); if (!in) return; + // We may need to transform input surface to correct color interpolation space. The input surface + // might be used as input to another primitive but it is likely that all the primitives in a given + // filter use the same color interpolation space so we don't copy the input before converting. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci( in, ci_fp ); + // zero deviation = no change in output if (_deviation_x <= 0 && _deviation_y <= 0) { cairo_surface_t *cp = ink_cairo_surface_copy(in); @@ -660,10 +669,14 @@ void FilterGaussian::render_cairo(FilterSlot &slot) cairo_paint(ct); cairo_destroy(ct); + set_cairo_surface_ci( upsampled, ci_fp ); + slot.set(_output, upsampled); cairo_surface_destroy(upsampled); cairo_surface_destroy(downsampled); } else { + set_cairo_surface_ci( downsampled, ci_fp ); + slot.set(_output, downsampled); cairo_surface_destroy(downsampled); } diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp index bc18cbcc6..fca8fdba3 100644 --- a/src/display/nr-filter-image.cpp +++ b/src/display/nr-filter-image.cpp @@ -120,6 +120,9 @@ void FilterImage::render_cairo(FilterSlot &slot) drawing.render(ct, render_rect); SVGElem->invoke_hide(key); + // For the moment, we'll assume that any image is in sRGB color space + set_cairo_surface_ci(out, SP_CSS_COLOR_INTERPOLATION_SRGB); + slot.set(_output, out); cairo_surface_destroy(out); return; @@ -185,6 +188,9 @@ void FilterImage::render_cairo(FilterSlot &slot) cairo_surface_t *out = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, sa.width(), sa.height()); + // For the moment, we'll assume that any image is in sRGB color space + set_cairo_surface_ci(out, SP_CSS_COLOR_INTERPOLATION_SRGB); + cairo_t *ct = cairo_create(out); cairo_translate(ct, -sa.min()[Geom::X], -sa.min()[Geom::Y]); diff --git a/src/display/nr-filter-merge.cpp b/src/display/nr-filter-merge.cpp index 759d7d6d1..2b9a24f25 100644 --- a/src/display/nr-filter-merge.cpp +++ b/src/display/nr-filter-merge.cpp @@ -33,6 +33,11 @@ void FilterMerge::render_cairo(FilterSlot &slot) { if (_input_image.empty()) return; + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + // output is RGBA if at least one input is RGBA bool rgba32 = false; cairo_surface_t *out = NULL; @@ -40,6 +45,7 @@ void FilterMerge::render_cairo(FilterSlot &slot) cairo_surface_t *in = slot.getcairo(*i); if (cairo_surface_get_content(in) == CAIRO_CONTENT_COLOR_ALPHA) { out = ink_cairo_surface_create_identical(in); + set_cairo_surface_ci( out, ci_fp ); rgba32 = true; break; } @@ -52,6 +58,8 @@ void FilterMerge::render_cairo(FilterSlot &slot) for (std::vector<int>::iterator i = _input_image.begin(); i != _input_image.end(); ++i) { cairo_surface_t *in = slot.getcairo(*i); + + set_cairo_surface_ci( in, ci_fp ); cairo_set_source_surface(out_ct, in, 0, 0); cairo_paint(out_ct); } diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp index 18f99cdcd..b058307cf 100644 --- a/src/display/nr-filter-morphology.cpp +++ b/src/display/nr-filter-morphology.cpp @@ -164,6 +164,7 @@ void FilterMorphology::render_cairo(FilterSlot &slot) if (xradius == 0.0 || yradius == 0.0) { // output is transparent black cairo_surface_t *out = ink_cairo_surface_create_identical(input); + copy_cairo_surface_ci(input, out); slot.set(_output, out); cairo_surface_destroy(out); return; @@ -192,6 +193,9 @@ void FilterMorphology::render_cairo(FilterSlot &slot) cairo_surface_t *out = ink_cairo_surface_create_identical(interm); + // color_interpolation_filters for out same as input. See spec (DisplacementMap). + copy_cairo_surface_ci(input, out); + if (Operator == MORPHOLOGY_OPERATOR_DILATE) { if (bpp == 1) { morphologicalFilter1D< std::greater<unsigned char>, Geom::Y, 1 >(interm, out, yr); diff --git a/src/display/nr-filter-offset.cpp b/src/display/nr-filter-offset.cpp index 833f6ecc9..01d6ffe56 100644 --- a/src/display/nr-filter-offset.cpp +++ b/src/display/nr-filter-offset.cpp @@ -35,6 +35,9 @@ void FilterOffset::render_cairo(FilterSlot &slot) { cairo_surface_t *in = slot.getcairo(_input); cairo_surface_t *out = ink_cairo_surface_create_identical(in); + // color_interpolation_filters for out same as in. See spec (DisplacementMap). + copy_cairo_surface_ci(in, out); + cairo_t *ct = cairo_create(out); Geom::Affine trans = slot.get_units().get_matrix_primitiveunits2pb(); diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp index ce562668a..fca82c810 100644 --- a/src/display/nr-filter-primitive.cpp +++ b/src/display/nr-filter-primitive.cpp @@ -20,6 +20,7 @@ #include "desktop-handles.h" #include "document.h" #include "sp-root.h" +#include "style.h" namespace Inkscape { namespace Filters { @@ -45,11 +46,14 @@ FilterPrimitive::FilterPrimitive() _subregion_y.unset(SVGLength::PERCENT, 0, 0); _subregion_width.unset(SVGLength::PERCENT, 1, 0); _subregion_height.unset(SVGLength::PERCENT, 1, 0); + + _style = NULL; } FilterPrimitive::~FilterPrimitive() { - // Nothing to do here + if(_style) + sp_style_unref(_style); } void FilterPrimitive::render_cairo(FilterSlot &slot) @@ -179,6 +183,14 @@ Geom::Rect FilterPrimitive::filter_primitive_area(FilterUnits const &units) return area; } +void FilterPrimitive::setStyle(SPStyle *style) +{ + if (style) sp_style_ref(style); + if (_style) sp_style_unref(_style); + _style = style; +} + + } /* namespace Filters */ } /* namespace Inkscape */ diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h index da2097156..214b2cfc5 100644 --- a/src/display/nr-filter-primitive.h +++ b/src/display/nr-filter-primitive.h @@ -16,6 +16,8 @@ #include "display/nr-filter-types.h" #include "svg/svg-length.h" +class SPStyle; + namespace Inkscape { namespace Filters { @@ -113,6 +115,11 @@ public: */ virtual bool can_handle_affine(Geom::Affine const &) { return false; } + /** + * Sets style for access to properties used by filter primitives. + */ + void setStyle(SPStyle *style); + protected: int _input; int _output; @@ -122,6 +129,8 @@ protected: SVGLength _subregion_y; SVGLength _subregion_width; SVGLength _subregion_height; + + SPStyle *_style; }; diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp index 4f7a8849e..fe67972d6 100644 --- a/src/display/nr-filter-slot.cpp +++ b/src/display/nr-filter-slot.cpp @@ -129,6 +129,9 @@ cairo_surface_t *FilterSlot::_get_transformed_source_graphic() if (trans.isTranslation()) { cairo_surface_reference(_source_graphic); + + // Assume all source graphics are sRGB + set_cairo_surface_ci( _source_graphic, SP_CSS_COLOR_INTERPOLATION_SRGB ); return _source_graphic; } @@ -145,6 +148,8 @@ cairo_surface_t *FilterSlot::_get_transformed_source_graphic() cairo_paint(tsg_ct); cairo_destroy(tsg_ct); + // Assume all source graphics are sRGB + set_cairo_surface_ci( tsg, SP_CSS_COLOR_INTERPOLATION_SRGB ); return tsg; } @@ -172,6 +177,9 @@ cairo_surface_t *FilterSlot::_get_transformed_background() tbg = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, _slot_w, _slot_h); } + // Assume all source graphics are sRGB + set_cairo_surface_ci( tbg, SP_CSS_COLOR_INTERPOLATION_SRGB ); + return tbg; } diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp index 0242754eb..50f1b48c5 100644 --- a/src/display/nr-filter-specularlighting.cpp +++ b/src/display/nr-filter-specularlighting.cpp @@ -139,6 +139,13 @@ void FilterSpecularLighting::render_cairo(FilterSlot &slot) cairo_surface_t *input = slot.getcairo(_input); cairo_surface_t *out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_COLOR_ALPHA); + // Only alpha channel of input is used, no need to check input color_interpolation_filter value. + SPColorInterpolation ci_fp = SP_CSS_COLOR_INTERPOLATION_AUTO; + if( _style ) { + ci_fp = (SPColorInterpolation)_style->color_interpolation_filters.computed; + } + set_cairo_surface_ci(out, ci_fp ); + Geom::Affine trans = slot.get_units().get_matrix_primitiveunits2pb(); Geom::Point p = slot.get_slot_area().min(); double x0 = p[Geom::X]; diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp index bce532f21..76b877fbc 100644 --- a/src/display/nr-filter-turbulence.cpp +++ b/src/display/nr-filter-turbulence.cpp @@ -375,6 +375,11 @@ void FilterTurbulence::render_cairo(FilterSlot &slot) cairo_surface_t *input = slot.getcairo(_input); cairo_surface_t *out = ink_cairo_surface_create_same_size(input, CAIRO_CONTENT_COLOR_ALPHA); + // color_interpolation_filter is determined by CSS value (see spec. Turbulence). + if( _style ) { + set_cairo_surface_ci(out, (SPColorInterpolation)_style->color_interpolation_filters.computed ); + } + if (!gen->ready()) { Geom::Point ta(fTileX, fTileY); Geom::Point tb(fTileX + fTileWidth, fTileY + fTileHeight); diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp index f580a5044..eeba94d7c 100644 --- a/src/display/nr-filter.cpp +++ b/src/display/nr-filter.cpp @@ -38,6 +38,7 @@ #include "display/nr-filter-tile.h" #include "display/nr-filter-turbulence.h" +#include "display/cairo-utils.h" #include "display/drawing.h" #include "display/drawing-item.h" #include "display/drawing-context.h" @@ -159,6 +160,10 @@ int Filter::render(Inkscape::DrawingItem const *item, DrawingContext &graphic, D Geom::Point origin = graphic.targetLogicalBounds().min(); cairo_surface_t *result = slot.get_result(_output_slot); + + // Assume for the moment that we paint the filter in sRGB + set_cairo_surface_ci( result, SP_CSS_COLOR_INTERPOLATION_SRGB ); + graphic.setSource(result, origin[Geom::X], origin[Geom::Y]); graphic.setOperator(CAIRO_OPERATOR_SOURCE); graphic.paint(); diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp index d0c6d2d56..0d1b56d54 100644 --- a/src/display/nr-svgfonts.cpp +++ b/src/display/nr-svgfonts.cpp @@ -16,7 +16,7 @@ #include <2geom/transforms.h> #include <cairo.h> #include <vector> -#include "style.h" +#include "sp-object.h" #include "svg/svg.h" #include "display/cairo-utils.h" #include "display/nr-svgfonts.h" diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 536c54609..eb51860ab 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -291,7 +291,7 @@ public: #if GTK_CHECK_VERSION(3,0,0) static gboolean handleDraw(GtkWidget *widget, cairo_t *cr); #else - static gint handleExpose(GtkWidget *widget, GdkEventExpose *event); + static gboolean handleExpose(GtkWidget *widget, GdkEventExpose *event); #endif /** @@ -2178,23 +2178,24 @@ void SPCanvas::endForcedFullRedraws() } #if GTK_CHECK_VERSION(3,0,0) - -//TODO: This could probably be done much more efficiently gboolean SPCanvasImpl::handleDraw(GtkWidget *widget, cairo_t *cr) { SPCanvas *canvas = SP_CANVAS(widget); - gint width = gtk_widget_get_allocated_width(widget); - gint height = gtk_widget_get_allocated_height(widget); - Geom::IntRect r = Geom::IntRect::from_xywh( - canvas->x0, canvas->y0, - width, height); + 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]; + + 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()); + } return FALSE; } #else -gint SPCanvasImpl::handleExpose(GtkWidget *widget, GdkEventExpose *event) +gboolean SPCanvasImpl::handleExpose(GtkWidget *widget, GdkEventExpose *event) { SPCanvas *canvas = SP_CANVAS(widget); @@ -2203,43 +2204,23 @@ gint SPCanvasImpl::handleExpose(GtkWidget *widget, GdkEventExpose *event) return FALSE; } -#if GTK_CHECK_VERSION(3,0,0) - int n_rects = cairo_region_num_rectangles(event->region); -#else int n_rects = 0; GdkRectangle *rects = NULL; gdk_region_get_rectangles(event->region, &rects, &n_rects); if(rects == NULL) - return FALSE; -#endif - - if (n_rects == 0) - { return FALSE; - } - else - { - for (int i = 0; i < n_rects; i++) { -#if GTK_CHECK_VERSION(3,0,0) - cairo_rectangle_int_t rectangle; - cairo_region_get_rectangle(event->region, i, &rectangle); -#else - GdkRectangle rectangle = rects[i]; -#endif - - Geom::IntRect r = Geom::IntRect::from_xywh( - rectangle.x + canvas->x0, rectangle.y + canvas->y0, - rectangle.width, rectangle.height); + + 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, + rectangle.width, rectangle.height); - canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); - } - -#if !GTK_CHECK_VERSION(3,0,0) - g_free (rects); -#endif - return FALSE; + canvas->requestRedraw(r.left(), r.top(), r.right(), r.bottom()); } + + return FALSE; } #endif diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 8b293a9d9..38b981444 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -84,9 +84,9 @@ GType sp_dropper_context_get_type() static void sp_dropper_context_class_init(SPDropperContextClass *klass) { - SPEventContextClass *ec_class = (SPEventContextClass *) klass; + SPEventContextClass *ec_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); ec_class->setup = sp_dropper_context_setup; ec_class->finish = sp_dropper_context_finish; @@ -109,8 +109,8 @@ static void sp_dropper_context_setup(SPEventContext *ec) { SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } /* TODO: have a look at sp_dyna_draw_context_setup where the same is done.. generalize? at least make it an arcto! */ @@ -206,7 +206,7 @@ guint32 sp_dropper_context_get_color(SPEventContext *ec) static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEvent *event) { - SPDropperContext *dc = (SPDropperContext *) event_context; + SPDropperContext *dc = SP_DROPPER_CONTEXT(event_context); int ret = FALSE; SPDesktop *desktop = event_context->desktop; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -423,8 +423,8 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 3f488eca4..b30950f5a 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -128,10 +128,10 @@ GType sp_dyna_draw_context_get_type(void) static void sp_dyna_draw_context_class_init(SPDynaDrawContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - dd_parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + dd_parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_dyna_draw_context_dispose; @@ -195,8 +195,8 @@ sp_dyna_draw_context_setup(SPEventContext *ec) { SPDynaDrawContext *ddc = SP_DYNA_DRAW_CONTEXT(ec); - if (((SPEventContextClass *) dd_parent_class)->setup) - ((SPEventContextClass *) dd_parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(dd_parent_class))->setup) + (SP_EVENT_CONTEXT_CLASS(dd_parent_class))->setup(ec); ddc->accumulated = new SPCurve(); ddc->currentcurve = new SPCurve(); @@ -974,8 +974,8 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } if (!ret) { - if (((SPEventContextClass *) dd_parent_class)->root_handler) { - ret = ((SPEventContextClass *) dd_parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(dd_parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(dd_parent_class))->root_handler(event_context, event); } } diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp index 76ea5c252..c4560d462 100644 --- a/src/eraser-context.cpp +++ b/src/eraser-context.cpp @@ -131,10 +131,10 @@ GType sp_eraser_context_get_type(void) static void sp_eraser_context_class_init(SPEraserContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - eraser_parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + eraser_parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_eraser_context_dispose; @@ -165,8 +165,8 @@ sp_eraser_context_setup(SPEventContext *ec) SPEraserContext *erc = SP_ERASER_CONTEXT(ec); SPDesktop *desktop = ec->desktop; - if (((SPEventContextClass *) eraser_parent_class)->setup) - ((SPEventContextClass *) eraser_parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(eraser_parent_class))->setup) + (SP_EVENT_CONTEXT_CLASS(eraser_parent_class))->setup(ec); erc->accumulated = new SPCurve(); erc->currentcurve = new SPCurve(); @@ -689,8 +689,8 @@ sp_eraser_context_root_handler(SPEventContext *event_context, } if (!ret) { - if (((SPEventContextClass *) eraser_parent_class)->root_handler) { - ret = ((SPEventContextClass *) eraser_parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(eraser_parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(eraser_parent_class))->root_handler(event_context, event); } } diff --git a/src/event-context.cpp b/src/event-context.cpp index e9d0aa935..71d4a5fb9 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -106,11 +106,9 @@ GType sp_event_context_get_type(void) { * Callback to set up the SPEventContext vtable. */ static void sp_event_context_class_init(SPEventContextClass *klass) { - GObjectClass *object_class; + GObjectClass *object_class = G_OBJECT_CLASS(klass); - object_class = (GObjectClass *) klass; - - parent_class = (GObjectClass*) g_type_class_peek_parent(klass); + parent_class = G_OBJECT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_event_context_dispose; @@ -464,10 +462,23 @@ static gint sp_event_context_private_root_handler( break; case GDK_MOTION_NOTIFY: if (panning) { + if (panning == 4 && !xp && !yp ) { + // <Space> + mouse panning started, save location and grab canvas + xp = event->motion.x; + yp = event->motion.y; + button_w = Geom::Point(event->motion.x, event->motion.y); + + sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), + GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK + | GDK_POINTER_MOTION_MASK + | GDK_POINTER_MOTION_HINT_MASK, NULL, + event->motion.time - 1); + + + } if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK)) - || (panning == 1 && !(event->motion.state - & GDK_BUTTON1_MASK)) || (panning == 3 - && !(event->motion.state & GDK_BUTTON3_MASK))) { + || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK)) + || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) { /* Gdk seems to lose button release for us sometimes :-( */ panning = 0; sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), @@ -570,6 +581,7 @@ static gint sp_event_context_private_root_handler( } ret = TRUE; } + break; case GDK_KEY_PRESS: { double const acceleration = prefs->getDoubleLimited( @@ -672,15 +684,13 @@ static gint sp_event_context_private_root_handler( } break; case GDK_KEY_space: - if (prefs->getBool("/options/spacepans/value")) { - event_context->space_panning = true; - event_context->_message_context->set(Inkscape::INFORMATION_MESSAGE, - _("<b>Space+mouse drag</b> to pan canvas")); - ret = TRUE; - } else { - sp_toggle_selector(desktop); - ret = TRUE; - } + xp = yp = 0; + within_tolerance = true; + panning = 4; + event_context->space_panning = true; + event_context->_message_context->set(Inkscape::INFORMATION_MESSAGE, + _("<b>Space+mouse move</b> to pan canvas")); + ret = TRUE; break; case GDK_KEY_z: case GDK_KEY_Z: @@ -695,18 +705,32 @@ static gint sp_event_context_private_root_handler( } break; case GDK_KEY_RELEASE: + + // Stop panning on any key release + if (event_context->space_panning) { + event_context->space_panning = false; + event_context->_message_context->clear(); + } + + if (panning) { + panning = 0; + xp = yp = 0; + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), + event->key.time); + desktop->updateNow(); + } + + if (panning_cursor == 1) { + panning_cursor = 0; + GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(event_context->desktop)); + gdk_window_set_cursor(gtk_widget_get_window (w), event_context->cursor); + } + switch (get_group0_keyval(&event->key)) { case GDK_KEY_space: - if (event_context->space_panning) { - event_context->space_panning = false; - event_context->_message_context->clear(); - - if (panning == 1) { - panning = 0; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), - event->key.time); - desktop->updateNow(); - } + if (within_tolerance == true) { + // Space was pressed, but not panned + sp_toggle_selector(desktop); ret = TRUE; } break; @@ -1377,17 +1401,16 @@ gboolean sp_event_context_snap_watchdog_callback(gpointer data) { sp_event_context_virtual_root_handler(ec, dse->getEvent()); break; case DelayedSnapEvent::EVENTCONTEXT_ITEM_HANDLER: { - SPItem* item = NULL; - item = SP_ITEM(dse->getItem()); + gpointer item = dse->getItem(); if (item && SP_IS_ITEM(item)) { - sp_event_context_virtual_item_handler(ec, item, dse->getEvent()); + sp_event_context_virtual_item_handler(ec, SP_ITEM(item), dse->getEvent()); } } break; case DelayedSnapEvent::KNOT_HANDLER: { - SPKnot* knot = SP_KNOT(dse->getItem2()); + gpointer knot = dse->getItem2(); if (knot && SP_IS_KNOT(knot)) { - sp_knot_handler_request_position(dse->getEvent(), knot); + sp_knot_handler_request_position(dse->getEvent(), SP_KNOT(knot)); } } break; diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index 53fcc0fbf..a17a2bb30 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -27,27 +27,30 @@ namespace Extension { namespace Internal { ImageResolution::ImageResolution(char const *fn) { - ok_ = false; - - readpng(fn); - if (!ok_) - readexif(fn); - if (!ok_) - readexiv(fn); - if (!ok_) - readjfif(fn); + ok_ = false; + + readpng(fn); + if (!ok_) { + readexiv(fn); + } + if (!ok_) { + readjfif(fn); + } + if (!ok_) { + readexif(fn); + } } bool ImageResolution::ok() const { - return ok_; + return ok_; } double ImageResolution::x() const { - return x_; + return x_; } double ImageResolution::y() const { - return y_; + return y_; } @@ -57,60 +60,62 @@ double ImageResolution::y() const { #include <png.h> static bool haspngheader(FILE *fp) { - unsigned char header[8]; - if (fread(header, 1, 8, fp)!=8) - return false; + unsigned char header[8]; + if ( fread(header, 1, 8, fp) != 8 ) { + return false; + } - fseek(fp, 0, SEEK_SET); - - if (png_sig_cmp(header, 0, 8)) - return false; + fseek(fp, 0, SEEK_SET); + + if (png_sig_cmp(header, 0, 8)) { + return false; + } - return true; + return true; } // Implementation using libpng void ImageResolution::readpng(char const *fn) { - FILE *fp = fopen(fn, "rb"); - if (!fp) - return; + FILE *fp = fopen(fn, "rb"); + if (!fp) + return; - if (!haspngheader(fp)) { - fclose(fp); - return; - } + if (!haspngheader(fp)) { + fclose(fp); + return; + } - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); - if (!png_ptr) - return; - - png_infop info_ptr = png_create_info_struct(png_ptr); - if (!png_ptr) { - png_destroy_read_struct(&png_ptr, 0, 0); - return; - } - - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - fclose(fp); - return; - } + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); + if (!png_ptr) + return; + + png_infop info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) { + png_destroy_read_struct(&png_ptr, 0, 0); + return; + } + + if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + fclose(fp); + return; + } - png_init_io(png_ptr, fp); - png_read_info(png_ptr, info_ptr); + png_init_io(png_ptr, fp); + png_read_info(png_ptr, info_ptr); - png_uint_32 res_x, res_y; - int unit_type; - png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); + png_uint_32 res_x, res_y; + int unit_type; + png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); - png_destroy_read_struct(&png_ptr, &info_ptr, 0); - fclose(fp); + 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; - } + if (unit_type == PNG_RESOLUTION_METER) { + ok_ = true; + x_ = res_x * 2.54 / 100; + y_ = res_y * 2.54 / 100; + } } #else @@ -126,63 +131,71 @@ void ImageResolution::readpng(char const *) { #include <libexif/exif-data.h> static double exifDouble(ExifEntry *entry, ExifByteOrder byte_order) { - switch (entry->format) { - case EXIF_FORMAT_BYTE: - return double(entry->data[0]); - case EXIF_FORMAT_SHORT: - return double(exif_get_short(entry->data, byte_order)); - case EXIF_FORMAT_LONG: - return double(exif_get_long(entry->data, byte_order)); - case EXIF_FORMAT_RATIONAL: { - ExifRational r = exif_get_rational(entry->data, byte_order); - return double(r.numerator)/double(r.denominator); - } - case EXIF_FORMAT_SBYTE: - return double(*(signed char *)entry->data); - case EXIF_FORMAT_SSHORT: - return double(exif_get_sshort(entry->data, byte_order)); - case EXIF_FORMAT_SLONG: - return double(exif_get_slong(entry->data, byte_order)); - case EXIF_FORMAT_SRATIONAL: { - ExifSRational r = exif_get_srational(entry->data, byte_order); - return double(r.numerator)/double(r.denominator); - } - case EXIF_FORMAT_FLOAT: - return double(((float *)entry->data)[0]); - case EXIF_FORMAT_DOUBLE: - return ((double *)entry->data)[0]; - default: - return nan(0); - } + switch (entry->format) { + case EXIF_FORMAT_BYTE: { + return double(entry->data[0]); + } + case EXIF_FORMAT_SHORT: { + return double(exif_get_short(entry->data, byte_order)); + } + case EXIF_FORMAT_LONG: { + return double(exif_get_long(entry->data, byte_order)); + } + case EXIF_FORMAT_RATIONAL: { + ExifRational r = exif_get_rational(entry->data, byte_order); + return double(r.numerator) / double(r.denominator); + } + case EXIF_FORMAT_SBYTE: { + return double(*(signed char *)entry->data); + } + case EXIF_FORMAT_SSHORT: { + return double(exif_get_sshort(entry->data, byte_order)); + } + case EXIF_FORMAT_SLONG: { + return double(exif_get_slong(entry->data, byte_order)); + } + case EXIF_FORMAT_SRATIONAL: { + ExifSRational r = exif_get_srational(entry->data, byte_order); + return double(r.numerator) / double(r.denominator); + } + case EXIF_FORMAT_FLOAT: { + return double(((float *)entry->data)[0]); + } + case EXIF_FORMAT_DOUBLE: { + return ((double *)entry->data)[0]; + } + default: { + return nan(0); + } + } } // Implementation using libexif void ImageResolution::readexif(char const *fn) { - ExifData *ed; - ed = exif_data_new_from_file(fn); - if (!ed) - return; - ExifByteOrder byte_order = exif_data_get_byte_order(ed); - - ExifEntry *xres = exif_content_get_entry(ed->ifd[EXIF_IFD_0], - EXIF_TAG_X_RESOLUTION); - ExifEntry *yres = exif_content_get_entry(ed->ifd[EXIF_IFD_0], - EXIF_TAG_Y_RESOLUTION); - ExifEntry *unit = exif_content_get_entry(ed->ifd[EXIF_IFD_0], - EXIF_TAG_RESOLUTION_UNIT); - if (xres && yres) { - x_ = exifDouble(xres, byte_order); - y_ = exifDouble(yres, byte_order); - if (unit) { - double u = exifDouble(unit, byte_order); - if (u==3) { - x_ *= 2.54; - y_ *= 2.54; - } + ExifData *ed; + ed = exif_data_new_from_file(fn); + if (!ed) + return; + + ExifByteOrder byte_order = exif_data_get_byte_order(ed); + + ExifEntry *xres = exif_content_get_entry(ed->ifd[EXIF_IFD_0], EXIF_TAG_X_RESOLUTION); + ExifEntry *yres = exif_content_get_entry(ed->ifd[EXIF_IFD_0], EXIF_TAG_Y_RESOLUTION); + ExifEntry *unit = exif_content_get_entry(ed->ifd[EXIF_IFD_0], EXIF_TAG_RESOLUTION_UNIT); + + if ( xres && yres ) { + x_ = exifDouble(xres, byte_order); + y_ = exifDouble(yres, byte_order); + if (unit) { + double u = exifDouble(unit, byte_order); + if ( u == 3 ) { + x_ *= 2.54; + y_ *= 2.54; + } + } + ok_ = true; } - ok_ = true; - } - exif_data_free(ed); + exif_data_free(ed); } #else @@ -196,43 +209,43 @@ void ImageResolution::readexif(char const *) { #if IR_TRY_EXIV void ImageResolution::readexiv(char const *fn) { - Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fn); - if (!image.get()) - return; - - image->readMetadata(); - Exiv2::ExifData &exifData = image->exifData(); - if (exifData.empty()) - return; - - Exiv2::ExifData::const_iterator end = exifData.end(); - bool havex = false; - bool havey = false; - bool haveunit = false; - int unit; - for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { - if (ok_) - break; - if (i->tag()==0x011a) { - // X Resolution - x_ = i->toFloat(); - havex = true; - } else if (i->tag()==0x011b) { - // Y Resolution - y_ = i->toFloat(); - havey = true; - } else if (i->tag()==0x0128) { - unit = i->toLong(); + Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fn); + if (!image.get()) + return; + + image->readMetadata(); + Exiv2::ExifData &exifData = image->exifData(); + if (exifData.empty()) + return; + + Exiv2::ExifData::const_iterator end = exifData.end(); + bool havex = false; + bool havey = false; + bool haveunit = false; + int unit; + for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) { + if (ok_) + break; + if ( i->tag() == 0x011a ) { + // X Resolution + x_ = i->toFloat(); + havex = true; + } else if ( i->tag() == 0x011b ) { + // Y Resolution + y_ = i->toFloat(); + havey = true; + } else if ( i->tag() == 0x0128 ) { + unit = i->toLong(); + } + ok_ = havex && havey && haveunit; } - ok_ = havex && havey && haveunit; - } - if (haveunit) { - if (unit==3) { - x_ *= 2.54; - y_ *= 2.54; + if (haveunit) { + if ( unit == 3 ) { + x_ *= 2.54; + y_ *= 2.54; + } } - } - ok_ = havex && havey; + ok_ = havex && havey; } #else @@ -249,7 +262,7 @@ void ImageResolution::readexiv(char const *) { #include <setjmp.h> static void irjfif_error_exit(j_common_ptr cinfo) { - longjmp(*(jmp_buf*)cinfo->client_data, 1); + longjmp(*(jmp_buf*)cinfo->client_data, 1); } static void irjfif_emit_message(j_common_ptr, int) { @@ -265,44 +278,52 @@ static void irjfif_reset(j_common_ptr) { } void ImageResolution::readjfif(char const *fn) { - FILE *ifd = fopen(fn, "rb"); - if (!ifd) - return; - - struct jpeg_decompress_struct cinfo; - jmp_buf jbuf; - struct jpeg_error_mgr jerr; - bool constr = false; + FILE *ifd = fopen(fn, "rb"); + if (!ifd) { + return; + } - if (setjmp(jbuf)) { + struct jpeg_decompress_struct cinfo; + jmp_buf jbuf; + struct jpeg_error_mgr jerr; + bool constr = false; + + if (setjmp(jbuf)) { + fclose(ifd); + if (constr) { + jpeg_destroy_decompress(&cinfo); + } + return; + } + + cinfo.err = jpeg_std_error(&jerr); + jpeg_create_decompress(&cinfo); + jerr.error_exit = &irjfif_error_exit; + jerr.emit_message = &irjfif_emit_message; + jerr.output_message = &irjfif_output_message; + jerr.format_message = &irjfif_format_message; + jerr.reset_error_mgr = &irjfif_reset; + cinfo.client_data = (void*)&jbuf; + + constr = true; + + jpeg_stdio_src(&cinfo, ifd); + jpeg_read_header(&cinfo, TRUE); + + if (cinfo.saw_JFIF_marker) { // JFIF APP0 marker was seen + if ( cinfo.density_unit == 1 ) { // dots/inch + x_ = cinfo.X_density; + y_ = cinfo.Y_density; + ok_ = true; + } else if ( cinfo.density_unit == 2 ) { // dots/cm + x_ = cinfo.X_density * 2.54; + y_ = cinfo.Y_density * 2.54; + ok_ = true; + } + } + constr = false; + jpeg_destroy_decompress(&cinfo); fclose(ifd); - if (constr) - jpeg_destroy_decompress(&cinfo); - return; - } - - cinfo.err = jpeg_std_error(&jerr); - jpeg_create_decompress(&cinfo); - jerr.error_exit = &irjfif_error_exit; - jerr.emit_message = &irjfif_emit_message; - jerr.output_message = &irjfif_output_message; - jerr.format_message = &irjfif_format_message; - jerr.reset_error_mgr = &irjfif_reset; - cinfo.client_data = (void*)&jbuf; - constr = true; - - jpeg_stdio_src(&cinfo, ifd); - jpeg_read_header(&cinfo, TRUE); - - if (cinfo.density_unit==1) { - x_ = cinfo.X_density; - y_ = cinfo.Y_density; - ok_ = true; - } - - constr = false; - jpeg_destroy_decompress(&cinfo); - fclose(ifd); } #else @@ -312,7 +333,7 @@ void ImageResolution::readjfif(char const *) { } #endif - + } } } diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp index 03b7c0a90..0a9dd8399 100644 --- a/src/extension/internal/pdf-input-cairo.cpp +++ b/src/extension/internal/pdf-input-cairo.cpp @@ -229,7 +229,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc) this->get_vbox()->pack_start(*hbox1); this->set_title(_("PDF Import Settings")); this->set_modal(true); - sp_transientize((GtkWidget *)this->gobj()); //Make transient + 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); @@ -416,7 +416,7 @@ static void copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, cairo_height = gdk_pixbuf_get_height (pixbuf); for (y = 0; y < cairo_height; y++) { - src = (unsigned int *) (cairo_data + y * cairo_rowstride); + src = reinterpret_cast<unsigned int *>(cairo_data + y * cairo_rowstride); dst = pixbuf_data + y * pixbuf_rowstride; for (x = 0; x < cairo_width; x++) { @@ -622,8 +622,8 @@ PdfInputCairo::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri) { static cairo_status_t _write_ustring_cb(void *closure, const unsigned char *data, unsigned int length) { - Glib::ustring* stream = (Glib::ustring*)closure; - stream->append((const char*)data, length); + Glib::ustring* stream = static_cast<Glib::ustring*>(closure); + stream->append(reinterpret_cast<const char*>(data), length); return CAIRO_STATUS_SUCCESS; } diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 688e3f612..90d53c6b0 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -245,7 +245,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) this->get_vbox()->pack_start(*hbox1); this->set_title(_("PDF Import Settings")); this->set_modal(true); - sp_transientize((GtkWidget *)this->gobj()); //Make transient + 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); @@ -446,7 +446,7 @@ static void copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, cairo_height = gdk_pixbuf_get_height (pixbuf); for (y = 0; y < cairo_height; y++) { - src = (unsigned int *) (cairo_data + y * cairo_rowstride); + src = reinterpret_cast<unsigned int *>(cairo_data + y * cairo_rowstride); dst = pixbuf_data + y * pixbuf_rowstride; for (x = 0; x < cairo_width; x++) { @@ -603,7 +603,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { PDFDoc *pdf_doc = new PDFDoc(filename_goo, NULL, NULL, NULL); // TODO: Could ask for password //delete filename_goo; #else - wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (uri, -1, NULL, NULL, NULL); + wchar_t *wfilename = reinterpret_cast<wchar_t*>(g_utf8_to_utf16 (uri, -1, NULL, NULL, NULL)); if (wfilename == NULL) { return NULL; diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 6d71ce72a..187318417 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -142,7 +142,7 @@ VsdImportDialog::VsdImportDialog(const std::vector<WPXString> &vec) this->get_vbox()->pack_start(*vbox2); this->set_title(_("Page Selector")); this->set_modal(true); - sp_transientize((GtkWidget *)this->gobj()); //Make transient + 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); @@ -261,6 +261,7 @@ SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u void VsdInput::init(void) { + /* VSD */ Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("VSD Input") "</name>\n" @@ -272,6 +273,48 @@ void VsdInput::init(void) "<filetypetooltip>" N_("File format used by Microsoft Visio 6 and later") "</filetypetooltip>\n" "</input>\n" "</inkscape-extension>", new VsdInput()); + + /* VDX */ + Inkscape::Extension::build_from_mem( + "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" + "<name>" N_("VDX Input") "</name>\n" + "<id>org.inkscape.input.vdx</id>\n" + "<input>\n" + "<extension>.vdx</extension>\n" + "<mimetype>application/vnd.visio</mimetype>\n" + "<filetypename>" N_("Microsoft Visio XML Diagram (*.vdx)") "</filetypename>\n" + "<filetypetooltip>" N_("File format used by Microsoft Visio 2010 and later") "</filetypetooltip>\n" + "</input>\n" + "</inkscape-extension>", new VsdInput()); + + /* VSDM */ + Inkscape::Extension::build_from_mem( + "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" + "<name>" N_("VSDM Input") "</name>\n" + "<id>org.inkscape.input.vsdm</id>\n" + "<input>\n" + "<extension>.vsdm</extension>\n" + "<mimetype>application/vnd.visio</mimetype>\n" + "<filetypename>" N_("Microsoft Visio 2013 drawing (*.vsdm)") "</filetypename>\n" + "<filetypetooltip>" N_("File format used by Microsoft Visio 2013 and later") "</filetypetooltip>\n" + "</input>\n" + "</inkscape-extension>", new VsdInput()); + + /* VSDX */ + Inkscape::Extension::build_from_mem( + "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" + "<name>" N_("VSDX Input") "</name>\n" + "<id>org.inkscape.input.vsdx</id>\n" + "<input>\n" + "<extension>.vsdx</extension>\n" + "<mimetype>application/vnd.visio</mimetype>\n" + "<filetypename>" N_("Microsoft Visio 2013 drawing (*.vsdx)") "</filetypename>\n" + "<filetypetooltip>" N_("File format used by Microsoft Visio 2013 and later") "</filetypetooltip>\n" + "</input>\n" + "</inkscape-extension>", new VsdInput()); + + return; + } // init } } } /* namespace Inkscape, Extension, Implementation */ diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp index b4d4cbd16..85cb5d04c 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/notebook.cpp @@ -206,14 +206,16 @@ Gtk::Widget * ParamNotebookPage::get_widget(SPDocument * doc, Inkscape::XML::Nod for (GSList * list = parameters; list != NULL; list = g_slist_next(list)) { Parameter * param = reinterpret_cast<Parameter *>(list->data); Gtk::Widget * widg = param->get_widget(doc, node, changeSignal); - gchar const * tip = param->get_tooltip(); -// printf("Tip: '%s'\n", tip); - vbox->pack_start(*widg, false, false, 2); - if (tip) { - widg->set_tooltip_text(tip); - } else { - widg->set_tooltip_text(""); - widg->set_has_tooltip(false); + if (widg) { + gchar const * tip = param->get_tooltip(); + // printf("Tip: '%s'\n", tip); + vbox->pack_start(*widg, false, false, 2); + if (tip) { + widg->set_tooltip_text(tip); + } else { + widg->set_tooltip_text(""); + widg->set_has_tooltip(false); + } } } diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp index 2d2604c7f..649dc398a 100644 --- a/src/extension/prefdialog.cpp +++ b/src/extension/prefdialog.cpp @@ -88,7 +88,12 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co _param_preview = Parameter::make(doc->root(), _effect); } +#if WITH_GTKMM_3_0 + Gtk::Separator * sep = Gtk::manage(new Gtk::Separator()); +#else Gtk::HSeparator * sep = Gtk::manage(new Gtk::HSeparator()); +#endif + sep->show(); this->get_vbox()->pack_start(*sep, true, true, 4); diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp index fc74ee8a2..14bd00057 100644 --- a/src/filter-chemistry.cpp +++ b/src/filter-chemistry.cpp @@ -98,7 +98,10 @@ SPFilter *new_filter(SPDocument *document) Inkscape::XML::Node *repr; repr = xml_doc->createElement("svg:filter"); - // Inkscape only supports sRGB. See note in sp-filter.cpp. + // Inkscape now supports both sRGB and linear color-interpolation-filters. + // But, for the moment, keep sRGB as default value for new filters + // (historically set to sRGB and doesn't require conversion between + // filter cairo surfaces and other types of cairo surfaces). SPCSSAttr *css = sp_repr_css_attr_new(); sp_repr_css_set_property(css, "color-interpolation-filters", "sRGB"); sp_repr_css_change(repr, css, "style"); diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index 964ca9d67..bb2254a1b 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -84,7 +84,7 @@ static void sp_unit_selector_class_init(SPUnitSelectorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - unit_selector_parent_class = (GtkHBoxClass*)g_type_class_peek_parent(klass); + unit_selector_parent_class = GTK_HBOX_CLASS(g_type_class_peek_parent(klass)); signals[SET_UNIT] = g_signal_new("set_unit", G_TYPE_FROM_CLASS(klass), @@ -148,17 +148,17 @@ sp_unit_selector_finalize(GObject *object) GtkWidget * sp_unit_selector_new(guint bases) { - SPUnitSelector *us = (SPUnitSelector*)g_object_new(SP_TYPE_UNIT_SELECTOR, NULL); + SPUnitSelector *us = SP_UNIT_SELECTOR(g_object_new(SP_TYPE_UNIT_SELECTOR, NULL)); sp_unit_selector_set_bases(us, bases); - return (GtkWidget *) us; + return GTK_WIDGET(us); } void sp_unit_selector_setsize(GtkWidget *us, guint w, guint h) { - gtk_widget_set_size_request(((SPUnitSelector *) us)->combo_box, w, h); + gtk_widget_set_size_request((SP_UNIT_SELECTOR(us))->combo_box, w, h); } SPUnit const * @@ -180,7 +180,7 @@ on_combo_box_changed (GtkComboBox *widget, SPUnitSelector *us) } SPUnit const *unit = NULL; - gtk_tree_model_get ((GtkTreeModel *)us->store, &iter, COMBO_COL_UNIT, &unit, -1); + gtk_tree_model_get (GTK_TREE_MODEL(us->store), &iter, COMBO_COL_UNIT, &unit, -1); g_return_if_fail(unit != NULL); @@ -242,7 +242,7 @@ spus_rebuild_menu(SPUnitSelector *us) gint pos = 0; gint p = 0; for (GSList *l = us->units; l != NULL; l = l->next) { - SPUnit const *u = (SPUnit*)l->data; + SPUnit const *u = static_cast<SPUnit const*>(l->data); // use only abbreviations in the menu // i = gtk_menu_item_new_with_label((us->abbr) ? (us->plural) ? u->abbr_plural : u->abbr : (us->plural) ? u->plural : u->name); @@ -272,7 +272,7 @@ sp_unit_selector_set_bases(SPUnitSelector *us, guint bases) g_return_if_fail(units != NULL); sp_unit_free_list(us->units); us->units = units; - us->unit = (SPUnit*)units->data; + us->unit = static_cast<SPUnit *>(units->data); spus_rebuild_menu(us); } diff --git a/src/select-context.cpp b/src/select-context.cpp index bc096d528..5934d615c 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -97,10 +97,10 @@ sp_select_context_get_type(void) static void sp_select_context_class_init(SPSelectContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_select_context_dispose; @@ -188,8 +188,8 @@ sp_select_context_setup(SPEventContext *ec) { SPSelectContext *select_context = SP_SELECT_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } SPDesktop *desktop = ec->desktop; @@ -432,8 +432,8 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE } if (!ret) { - if (((SPEventContextClass *) parent_class)->item_handler) - ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); } return ret; @@ -1150,8 +1150,8 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } return ret; diff --git a/src/sp-ellipse.cpp b/src/sp-ellipse.cpp index d74eaa6fb..6fe3a599b 100644 --- a/src/sp-ellipse.cpp +++ b/src/sp-ellipse.cpp @@ -369,6 +369,7 @@ static Inkscape::XML::Node *sp_genericellipse_write(SPObject *object, Inkscape:: sp_arc_set_elliptical_path_attribute(SP_ARC(object), object->getRepr()); } } + sp_genericellipse_set_shape ((SPShape *) ellipse); // evaluate SPCurve if (((SPObjectClass *) ge_parent_class)->write) { ((SPObjectClass *) ge_parent_class)->write(object, xml_doc, repr, flags); diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp index b63a05b4b..7ddf3b065 100644 --- a/src/sp-filter-primitive.cpp +++ b/src/sp-filter-primitive.cpp @@ -20,6 +20,7 @@ #include <string.h> #include "attributes.h" +#include "style.h" #include "sp-filter-primitive.h" #include "xml/repr.h" #include "sp-filter.h" @@ -100,16 +101,17 @@ static void sp_filter_primitive_init(SPFilterPrimitive *filter_primitive) static void sp_filter_primitive_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if ((static_cast<SPObjectClass *>(filter_primitive_parent_class))->build) { - (static_cast<SPObjectClass *>(filter_primitive_parent_class))->build(object, document, repr); - } - + object->readAttr( "style" ); // struct not derived from SPItem, we need to do this ourselves. object->readAttr( "in" ); object->readAttr( "result" ); object->readAttr( "x" ); object->readAttr( "y" ); object->readAttr( "width" ); object->readAttr( "height" ); + + if ((static_cast<SPObjectClass *>(filter_primitive_parent_class))->build) { + (static_cast<SPObjectClass *>(filter_primitive_parent_class))->build(object, document, repr); + } } /** @@ -188,7 +190,9 @@ sp_filter_primitive_update(SPObject *object, SPCtx *ctx, guint flags) { //SPFilterPrimitive *filter_primitive = SP_FILTER_PRIMITIVE(object); + // Is this required? if (flags & SP_OBJECT_MODIFIED_FLAG) { + object->readAttr( "style" ); object->readAttr( "in" ); object->readAttr( "result" ); object->readAttr( "x" ); @@ -311,6 +315,9 @@ void sp_filter_primitive_renderer_common(SPFilterPrimitive *sp_prim, Inkscape::F /* TODO: place here code to handle input images, filter area etc. */ nr_prim->set_subregion( sp_prim->x, sp_prim->y, sp_prim->width, sp_prim->height ); + + // Give renderer access to filter properties + nr_prim->setStyle( sp_prim->style ); } diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp index a20856f53..c7dce3850 100644 --- a/src/sp-filter.cpp +++ b/src/sp-filter.cpp @@ -130,11 +130,8 @@ sp_filter_init(SPFilter *filter) static void sp_filter_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { - if (((SPObjectClass *) filter_parent_class)->build) { - ((SPObjectClass *) filter_parent_class)->build(object, document, repr); - } - //Read values of key attributes from XML nodes into object. + object->readAttr( "style" ); // struct not derived from SPItem, we need to do this ourselves. object->readAttr( "filterUnits" ); object->readAttr( "primitiveUnits" ); object->readAttr( "x" ); @@ -144,6 +141,10 @@ sp_filter_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *rep object->readAttr( "filterRes" ); object->readAttr( "xlink:href" ); + if (((SPObjectClass *) filter_parent_class)->build) { + ((SPObjectClass *) filter_parent_class)->build(object, document, repr); + } + //is this necessary? document->addResource("filter", object); } @@ -366,25 +367,6 @@ sp_filter_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::N g_free(uri_string); } - // TODO: This is evil, correctly implement support for color-interpolation-filters!!! - // The color-interpolation-filters attribute is initially set to linearRGB according to the SVG standard. - // However, Inkscape completely ignores it and implicitly assumes that it is sRGB (like color-interpolation). - // This results in a discrepancy between Inkscape and other renderers in how they render filters. - // To mitigate this problem I've (Jasper van de Gronde,th.v.d.gronde@hccnet.nl) added this to ensure that at least - // any filters written by Inkscape will henceforth be rendered the same in other renderers. - // In the future Inkscape should have proper support for the color-interpolation properties and this should be changed. - - // repr->setAttribute("color-interpolation-filters", "sRGB"); - - // Actually, the above line is not correct as the attribute is only allowed on filter - // primitives and not <filter> objects. However, it is allowed as a property in a style - // attribute. Note, this property must also be set in sp-filter-chemistry, filter_new() as the - // code here is not necessarily called when a new filter is created. 29 Aug 2011 Tav. - SPCSSAttr *css = sp_repr_css_attr_new(); - sp_repr_css_set_property(css, "color-interpolation-filters", "sRGB"); - sp_repr_css_change(repr, css, "style"); - sp_repr_css_attr_unref(css); - if (((SPObjectClass *) filter_parent_class)->write) { ((SPObjectClass *) filter_parent_class)->write(object, doc, repr, flags); } diff --git a/src/sp-item.cpp b/src/sp-item.cpp index 363aa8c17..a8e525bd5 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -552,6 +552,7 @@ void SPItem::sp_item_set(SPObject *object, unsigned key, gchar const *value) void SPItem::clip_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item) { + item->bbox_valid = FALSE; // force a re-evaluation if (old_clip) { SPItemView *v; /* Hide clippath */ diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp index 22a403345..f33d234ee 100644 --- a/src/sp-rect.cpp +++ b/src/sp-rect.cpp @@ -207,6 +207,8 @@ sp_rect_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML: sp_repr_set_svg_double(repr, "x", rect->x.computed); sp_repr_set_svg_double(repr, "y", rect->y.computed); + sp_rect_set_shape ((SPShape *) rect); // evaluate SPCurve + if (((SPObjectClass *) parent_class)->write) ((SPObjectClass *) parent_class)->write(object, xml_doc, repr, flags); diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp index 052c9e853..404b0ec1c 100644 --- a/src/spiral-context.cpp +++ b/src/spiral-context.cpp @@ -84,10 +84,10 @@ sp_spiral_context_get_type() static void sp_spiral_context_class_init(SPSpiralContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_spiral_context_dispose; @@ -123,15 +123,15 @@ sp_spiral_context_init(SPSpiralContext *spiral_context) static void sp_spiral_context_finish(SPEventContext *ec) { SPSpiralContext *sc = SP_SPIRAL_CONTEXT(ec); - SPDesktop *desktop = ec->desktop; + SPDesktop *desktop = ec->desktop; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); - sp_spiral_finish(sc); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); + sp_spiral_finish(sc); sc->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); - } + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); + } } static void @@ -177,8 +177,8 @@ sp_spiral_context_setup(SPEventContext *ec) { SPSpiralContext *sc = SP_SPIRAL_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); sp_event_context_read(ec, "expansion"); sp_event_context_read(ec, "revolution"); @@ -398,8 +398,8 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event) } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } return ret; @@ -426,7 +426,7 @@ static void sp_spiral_drag(SPSpiralContext *sc, Geom::Point const &p, guint stat // Set style sp_desktop_apply_style_tool(desktop, repr, "/tools/shapes/spiral", false); - sc->item = (SPItem *) desktop->currentLayer()->appendChildRepr(repr); + sc->item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr)); Inkscape::GC::release(repr); sc->item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); sc->item->updateRepr(); diff --git a/src/spray-context.cpp b/src/spray-context.cpp index 07539a080..8d74477c3 100644 --- a/src/spray-context.cpp +++ b/src/spray-context.cpp @@ -121,10 +121,10 @@ GType sp_spray_context_get_type(void) static void sp_spray_context_class_init(SPSprayContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_spray_context_dispose; @@ -223,7 +223,7 @@ static void sp_spray_update_cursor(SPSprayContext *tc, bool /*with_shift*/) guint num = 0; gchar *sel_message = NULL; if (!desktop->selection->isEmpty()) { - num = g_slist_length((GSList *) desktop->selection->itemList()); + num = g_slist_length(const_cast<GSList *>(desktop->selection->itemList())); sel_message = g_strdup_printf(ngettext("<b>%i</b> object selected","<b>%i</b> objects selected",num), num); } else { sel_message = g_strdup_printf(_("<b>Nothing</b> selected")); @@ -251,8 +251,8 @@ static void sp_spray_context_setup(SPEventContext *ec) { SPSprayContext *tc = SP_SPRAY_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } { @@ -460,7 +460,7 @@ static bool sp_spray_recursive(SPDesktop *desktop, parent->appendChild(copy); SPObject *new_obj = doc->getObjectByRepr(copy); - item_copied = (SPItem *) new_obj; //convertion object->item + item_copied = SP_ITEM(new_obj); //convertion object->item Geom::Point center=item->getCenter(); sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(_scale,_scale)); sp_spray_scale_rel(center,desktop, item_copied, Geom::Scale(scale,scale)); @@ -480,11 +480,11 @@ static bool sp_spray_recursive(SPDesktop *desktop, SPItem *son = NULL; //father copy int i=1; - for (GSList *items = g_slist_copy((GSList *) selection->itemList()); + for (GSList *items = g_slist_copy(const_cast<GSList *>(selection->itemList())); items != NULL; items = items->next) { - SPItem *item1 = (SPItem *) items->data; + SPItem *item1 = SP_ITEM(items->data); if (i == 1) { father = item1; } @@ -504,7 +504,7 @@ static bool sp_spray_recursive(SPDesktop *desktop, Inkscape::XML::Node *copy1 = old_repr->duplicate(xml_doc); parent->appendChild(copy1); SPObject *new_obj1 = doc->getObjectByRepr(copy1); - son = (SPItem *) new_obj1; // conversion object->item + son = SP_ITEM(new_obj1); // conversion object->item unionResult = son; Inkscape::GC::release(copy1); } @@ -514,7 +514,7 @@ static bool sp_spray_recursive(SPDesktop *desktop, Inkscape::XML::Node *copy2 = old_repr->duplicate(xml_doc); parent->appendChild(copy2); SPObject *new_obj2 = doc->getObjectByRepr(copy2); - item_copied = (SPItem *) new_obj2; + item_copied = SP_ITEM(new_obj2); // Move around the cursor Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint()); @@ -554,7 +554,7 @@ static bool sp_spray_recursive(SPDesktop *desktop, SPObject *clone_object = doc->getObjectByRepr(clone); // conversion object->item - item_copied = (SPItem *) clone_object; + item_copied = SP_ITEM(clone_object); Geom::Point center = item->getCenter(); sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(_scale, _scale)); sp_spray_scale_rel(center, desktop, item_copied, Geom::Scale(scale, scale)); @@ -599,11 +599,11 @@ static bool sp_spray_dilate(SPSprayContext *tc, Geom::Point /*event_p*/, Geom::P double move_mean = get_move_mean(tc); double move_standard_deviation = get_move_standard_deviation(tc); - for (GSList *items = g_slist_copy((GSList *) selection->itemList()); + for (GSList *items = g_slist_copy(const_cast<GSList *>(selection->itemList())); items != NULL; items = items->next) { - SPItem *item = (SPItem *) items->data; + SPItem *item = SP_ITEM(items->data); if (is_transform_modes(tc->mode)) { if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, move_force, tc->population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib)) @@ -701,7 +701,7 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even guint num = 0; if (!desktop->selection->isEmpty()) { - num = g_slist_length((GSList *) desktop->selection->itemList()); + num = g_slist_length(const_cast<GSList *>(desktop->selection->itemList())); } if (num == 0) { tc->_message_context->flash(Inkscape::ERROR_MESSAGE, _("<b>Nothing selected!</b> Select objects to spray.")); @@ -926,8 +926,8 @@ gint sp_spray_context_root_handler(SPEventContext *event_context, GdkEvent *even } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } diff --git a/src/star-context.cpp b/src/star-context.cpp index 66e6b3116..ae12e8c35 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -88,10 +88,10 @@ sp_star_context_get_type (void) static void sp_star_context_class_init (SPStarContextClass * klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent (klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent (klass)); object_class->dispose = sp_star_context_dispose; @@ -128,15 +128,15 @@ sp_star_context_init (SPStarContext * star_context) static void sp_star_context_finish(SPEventContext *ec) { SPStarContext *sc = SP_STAR_CONTEXT(ec); - SPDesktop *desktop = ec->desktop; + SPDesktop *desktop = ec->desktop; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); - sp_star_finish(sc); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); + sp_star_finish(sc); sc->sel_changed_connection.disconnect(); - if (((SPEventContextClass *) parent_class)->finish) { - ((SPEventContextClass *) parent_class)->finish(ec); - } + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->finish) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->finish(ec); + } } @@ -187,8 +187,8 @@ sp_star_context_setup (SPEventContext *ec) { SPStarContext *sc = SP_STAR_CONTEXT (ec); - if (((SPEventContextClass *) parent_class)->setup) - ((SPEventContextClass *) parent_class)->setup (ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup (ec); sp_event_context_read (ec, "magnitude"); sp_event_context_read (ec, "proportion"); @@ -413,8 +413,8 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) - ret = ((SPEventContextClass *) parent_class)->root_handler (event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler (event_context, event); } return ret; diff --git a/src/style.cpp b/src/style.cpp index 3e58a0404..650b08aea 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -677,9 +677,9 @@ sp_style_read(SPStyle *style, SPObject *object, Inkscape::XML::Node *repr) } } /* color interpolation */ - SPS_READ_PENUM_IF_UNSET(&style->color_interpolation, repr, "color_interpolation", enum_color_interpolation, true); + SPS_READ_PENUM_IF_UNSET(&style->color_interpolation, repr, "color-interpolation", enum_color_interpolation, true); /* color interpolation filters*/ - SPS_READ_PENUM_IF_UNSET(&style->color_interpolation_filters, repr, "color_interpolation_filters", enum_color_interpolation, true); + SPS_READ_PENUM_IF_UNSET(&style->color_interpolation_filters, repr, "color-interpolation-filters", enum_color_interpolation, true); /* fill */ if (!style->fill.set) { val = repr->attribute("fill"); @@ -1234,11 +1234,7 @@ sp_style_merge_property(SPStyle *style, gint id, gchar const *val) } break; case SP_PROP_COLOR_INTERPOLATION_FILTERS: - // We read it but issue warning SPS_READ_IENUM_IF_UNSET(&style->color_interpolation_filters, val, enum_color_interpolation, true); - if( style->color_interpolation_filters.value != SP_CSS_COLOR_INTERPOLATION_SRGB ) { - g_warning("Inkscape currently only supports color-interpolation-filters = sRGB"); - } break; case SP_PROP_COLOR_PROFILE: g_warning("Unimplemented style property SP_PROP_COLOR_PROFILE: value: %s", val); diff --git a/src/text-context.cpp b/src/text-context.cpp index d4b53f6a4..90715b805 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -104,10 +104,10 @@ GType sp_text_context_get_type() static void sp_text_context_class_init(SPTextContextClass *klass) { - GObjectClass *object_class=(GObjectClass *)klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class=G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_text_context_dispose; @@ -236,8 +236,8 @@ static void sp_text_context_setup(SPEventContext *ec) } } - if (((SPEventContextClass *) parent_class)->setup) - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); ec->shape_editor = new ShapeEditor(ec->desktop); @@ -455,8 +455,8 @@ static gint sp_text_context_item_handler(SPEventContext *event_context, SPItem * } if (!ret) { - if (((SPEventContextClass *) parent_class)->item_handler) - ret = ((SPEventContextClass *) parent_class)->item_handler(event_context, item, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler) + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->item_handler(event_context, item, event); } return ret; @@ -1324,8 +1324,8 @@ static gint sp_text_context_root_handler(SPEventContext *const event_context, Gd } // if nobody consumed it so far - if (((SPEventContextClass *) parent_class)->root_handler) { // and there's a handler in parent context, - return ((SPEventContextClass *) parent_class)->root_handler(event_context, event); // send event to parent + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { // and there's a handler in parent context, + return (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); // send event to parent } else { return FALSE; // return "I did nothing" value so that global shortcuts can be activated } @@ -1428,7 +1428,7 @@ SPCSSAttr *sp_text_get_style_at_cursor(SPEventContext const *ec) SPObject const *obj = sp_te_object_at_position(tc->text, tc->text_sel_end); if (obj) - return take_style_from_item((SPItem *) obj); + return take_style_from_item(SP_ITEM(obj)); return NULL; } diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp index 33dab447c..870b9cce1 100644 --- a/src/tweak-context.cpp +++ b/src/tweak-context.cpp @@ -114,10 +114,10 @@ sp_tweak_context_get_type(void) static void sp_tweak_context_class_init(SPTweakContextClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - SPEventContextClass *event_context_class = (SPEventContextClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass); + parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_tweak_context_dispose; @@ -200,7 +200,7 @@ sp_tweak_update_cursor (SPTweakContext *tc, bool with_shift) guint num = 0; gchar *sel_message = NULL; if (!desktop->selection->isEmpty()) { - num = g_slist_length((GSList *) desktop->selection->itemList()); + num = g_slist_length(const_cast<GSList *>(desktop->selection->itemList())); sel_message = g_strdup_printf(ngettext("<b>%i</b> object selected","<b>%i</b> objects selected",num), num); } else { sel_message = g_strdup_printf(_("<b>Nothing</b> selected")); @@ -277,7 +277,7 @@ sp_tweak_context_style_set(SPCSSAttr const *css, SPTweakContext *tc) { if (tc->mode == TWEAK_MODE_COLORPAINT) { // intercept color setting only in this mode // we cannot store properties with uris - css = sp_css_attr_unset_uris ((SPCSSAttr *) css); + css = sp_css_attr_unset_uris (const_cast<SPCSSAttr *>(css)); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setStyle("/tools/tweak/style", const_cast<SPCSSAttr*>(css)); return true; @@ -290,8 +290,8 @@ sp_tweak_context_setup(SPEventContext *ec) { SPTweakContext *tc = SP_TWEAK_CONTEXT(ec); - if (((SPEventContextClass *) parent_class)->setup) { - ((SPEventContextClass *) parent_class)->setup(ec); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->setup) { + (SP_EVENT_CONTEXT_CLASS(parent_class))->setup(ec); } { @@ -419,9 +419,9 @@ sp_tweak_dilate_recursive (Inkscape::Selection *selection, SPItem *item, Geom::P SPDocument *doc = item->document; sp_item_list_to_curves (items, &selected, &to_select); g_slist_free (items); - SPObject* newObj = doc->getObjectByRepr((Inkscape::XML::Node *) to_select->data); + SPObject* newObj = doc->getObjectByRepr(static_cast<Inkscape::XML::Node *>(to_select->data)); g_slist_free (to_select); - item = (SPItem *) newObj; + item = SP_ITEM(newObj); selection->add(item); } @@ -1110,11 +1110,11 @@ sp_tweak_dilate (SPTweakContext *tc, Geom::Point event_p, Geom::Point p, Geom::P double move_force = get_move_force(tc); double color_force = MIN(sqrt(path_force)/20.0, 1); - for (GSList *items = g_slist_copy((GSList *) selection->itemList()); + for (GSList *items = g_slist_copy(const_cast<GSList *>(selection->itemList())); items != NULL; items = items->next) { - SPItem *item = (SPItem *) items->data; + SPItem *item = SP_ITEM(items->data); if (is_color_mode (tc->mode)) { if (do_fill || do_stroke || do_opacity) { @@ -1227,7 +1227,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context, guint num = 0; if (!desktop->selection->isEmpty()) { - num = g_slist_length((GSList *) desktop->selection->itemList()); + num = g_slist_length(const_cast<GSList *>(desktop->selection->itemList())); } if (num == 0) { tc->_message_context->flash(Inkscape::ERROR_MESSAGE, _("<b>Nothing selected!</b> Select objects to tweak.")); @@ -1535,8 +1535,8 @@ sp_tweak_context_root_handler(SPEventContext *event_context, } if (!ret) { - if (((SPEventContextClass *) parent_class)->root_handler) { - ret = ((SPEventContextClass *) parent_class)->root_handler(event_context, event); + if ((SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler) { + ret = (SP_EVENT_CONTEXT_CLASS(parent_class))->root_handler(event_context, event); } } diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index da38e2dde..429ed57bf 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -126,7 +126,7 @@ void DebugDialogImpl::show() { //call super() Gtk::Dialog::show(); - //sp_transientize((GtkWidget *)gobj()); //Make transient + //sp_transientize(GTK_WIDGET(gobj())); //Make transient raise(); Gtk::Dialog::present(); } diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index ab1e8fbd8..460e223a3 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -103,7 +103,7 @@ DocumentProperties::DocumentProperties() _rcb_canb(_("Show page _border"), _("If set, rectangular page border is shown"), "showborder", _wr, false), _rcb_bord(_("Border on _top of drawing"), _("If set, border is always on top of the drawing"), "borderlayer", _wr, false), _rcb_shad(_("_Show border shadow"), _("If set, page border shows a shadow on its right and lower side"), "inkscape:showpageshadow", _wr, false), - _rcp_bg(_("Back_ground color:"), _("Background color"), _("Color and transparency of the page background (also used for bitmap export)"), "pagecolor", "inkscape:pageopacity", _wr), + _rcp_bg(_("Back_ground color:"), _("Background color"), _("Color of the page background. Note: transparency setting ignored while editing but used when exporting to bitmap."), "pagecolor", "inkscape:pageopacity", _wr), _rcp_bord(_("Border _color:"), _("Page border color"), _("Color of the page border"), "bordercolor", "borderopacity", _wr), _rum_deflt(_("Default _units:"), "inkscape:document-units", _wr), _page_sizer(_wr), diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 553acac84..75f80ed4a 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -100,9 +100,9 @@ findEntryWidgets(Gtk::Container *parent, Gtk::Widget *child = children[i]; GtkWidget *wid = child->gobj(); if (GTK_IS_ENTRY(wid)) - result.push_back((Gtk::Entry *)child); + result.push_back(dynamic_cast<Gtk::Entry *>(child)); else if (GTK_IS_CONTAINER(wid)) - findEntryWidgets((Gtk::Container *)child, result); + findEntryWidgets(dynamic_cast<Gtk::Container *>(child), result); } } @@ -119,9 +119,9 @@ findExpanderWidgets(Gtk::Container *parent, Gtk::Widget *child = children[i]; GtkWidget *wid = child->gobj(); if (GTK_IS_EXPANDER(wid)) - result.push_back((Gtk::Expander *)child); + result.push_back(dynamic_cast<Gtk::Expander *>(child)); else if (GTK_IS_CONTAINER(wid)) - findExpanderWidgets((Gtk::Container *)child, result); + findExpanderWidgets(dynamic_cast<Gtk::Container *>(child), result); } } @@ -522,7 +522,7 @@ bool SVGPreview::set(Glib::ustring &fileName, int dialogType) if (Glib::file_test(fileName, Glib::FILE_TEST_IS_REGULAR)) { Glib::ustring fileNameUtf8 = Glib::filename_to_utf8(fileName); - gchar *fName = (gchar *)fileNameUtf8.c_str(); + gchar *fName = const_cast<gchar *>(fileNameUtf8.c_str()); struct stat info; if (g_stat(fName, &info)) { @@ -898,7 +898,7 @@ bool FileOpenDialogImplGtk::show() { set_modal (TRUE); //Window - sp_transientize((GtkWidget *)gobj()); //Make transient + sp_transientize(GTK_WIDGET(gobj())); //Make transient gint b = run(); //Dialog svgPreview.showNoPreview(); hide(); @@ -1241,7 +1241,7 @@ FileSaveDialogImplGtk::show() { change_path(myFilename); set_modal (TRUE); //Window - sp_transientize((GtkWidget *)gobj()); //Make transient + sp_transientize(GTK_WIDGET(gobj())); //Make transient gint b = run(); //Dialog svgPreview.showNoPreview(); set_preview_widget_active(false); @@ -1688,7 +1688,7 @@ FileExportDialogImpl::show() s = getcwd (NULL, 0); set_current_folder(Glib::filename_from_utf8(s)); //hack to force initial dir listing set_modal (TRUE); //Window - sp_transientize((GtkWidget *)gobj()); //Make transient + sp_transientize(GTK_WIDGET(gobj())); //Make transient gint b = run(); //Dialog svgPreview.showNoPreview(); hide(); diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index ddafcd481..7574b9266 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1454,6 +1454,41 @@ Glib::PropertyProxy<void*> FilterEffectsDialog::CellRendererConnection::property return _primitive.get_proxy(); } +#if WITH_GTKMM_3_0 +void FilterEffectsDialog::CellRendererConnection::get_preferred_width_vfunc(Gtk::Widget& widget, + int& minimum_width, + int& natural_width) const +{ + PrimitiveList& primlist = dynamic_cast<PrimitiveList&>(widget); + minimum_width = natural_width = size * primlist.primitive_count() + primlist.get_input_type_width() * 6; +} + +void FilterEffectsDialog::CellRendererConnection::get_preferred_width_for_height_vfunc(Gtk::Widget& widget, + int /* height */, + int& minimum_width, + int& natural_width) const +{ + get_preferred_width(widget, minimum_width, natural_width); +} + +void FilterEffectsDialog::CellRendererConnection::get_preferred_height_vfunc(Gtk::Widget& widget, + int& minimum_height, + int& natural_height) const +{ + // Scale the height depending on the number of inputs, unless it's + // the first primitive, in which case there are no connections + SPFilterPrimitive* prim = SP_FILTER_PRIMITIVE(_primitive.get_value()); + minimum_height = natural_height = size * input_count(prim); +} + +void FilterEffectsDialog::CellRendererConnection::get_preferred_height_for_width_vfunc(Gtk::Widget& widget, + int /* width */, + int& minimum_height, + int& natural_height) const +{ + get_preferred_height(widget, minimum_height, natural_height); +} +#else void FilterEffectsDialog::CellRendererConnection::get_size_vfunc( Gtk::Widget& widget, const Gdk::Rectangle* /*cell_area*/, int* x_offset, int* y_offset, int* width, int* height) const @@ -1473,6 +1508,7 @@ void FilterEffectsDialog::CellRendererConnection::get_size_vfunc( (*height) = size * input_count(prim); } } +#endif /*** PrimitiveList ***/ FilterEffectsDialog::PrimitiveList::PrimitiveList(FilterEffectsDialog& d) @@ -1481,8 +1517,8 @@ FilterEffectsDialog::PrimitiveList::PrimitiveList(FilterEffectsDialog& d) _observer(new Inkscape::XML::SignalObserver) { #if WITH_GTKMM_3_0 - d.signal_draw().connect(sigc::mem_fun(*this, &PrimitiveList::on_draw)); - signal_draw().connect(sigc::mem_fun(*this, &PrimitiveList::on_draw)); + d.signal_draw().connect(sigc::mem_fun(*this, &PrimitiveList::on_draw_signal)); + signal_draw().connect(sigc::mem_fun(*this, &PrimitiveList::on_draw_signal)); #else d.signal_expose_event().connect(sigc::mem_fun(*this, &PrimitiveList::on_expose_signal)); signal_expose_event().connect(sigc::mem_fun(*this, &PrimitiveList::on_expose_signal)); @@ -1496,6 +1532,7 @@ FilterEffectsDialog::PrimitiveList::PrimitiveList(FilterEffectsDialog& d) set_model(_model); append_column(_("_Effect"), _columns.type); + set_headers_visible(); _observer->signal_changed().connect(signal_primitive_changed().make_slot()); get_selection()->signal_changed().connect(sigc::mem_fun(*this, &PrimitiveList::on_primitive_selection_changed)); @@ -1648,19 +1685,32 @@ void FilterEffectsDialog::PrimitiveList::remove_selected() } #if !WITH_GTKMM_3_0 -bool FilterEffectsDialog::PrimitiveList::on_expose_signal(GdkEventExpose* /*e*/) +bool FilterEffectsDialog::PrimitiveList::on_expose_signal(GdkEventExpose *e) { - Glib::RefPtr<Gdk::Window> win = get_bin_window(); - Cairo::RefPtr<Cairo::Context> cr = win->create_cairo_context(); - return on_draw(cr); + bool result = false; + + if (get_is_drawable()) + { + Cairo::RefPtr<Cairo::Context> cr = get_bin_window()->create_cairo_context(); + result = on_draw_signal(cr); + } + + return result; } #endif -bool FilterEffectsDialog::PrimitiveList::on_draw(const Cairo::RefPtr<Cairo::Context> &cr) +bool FilterEffectsDialog::PrimitiveList::on_draw_signal(const Cairo::RefPtr<Cairo::Context> & cr) { cr->set_line_width(1.0); #if GTK_CHECK_VERSION(3,0,0) + // In GTK+ 3, the draw function receives the widget window, not the + // bin_window (i.e., just the area under the column headers). We + // therefore translate the origin of our coordinate system to account for this + int x_origin, y_origin; + convert_bin_window_to_widget_coords(0,0,x_origin,y_origin); + cr->translate(x_origin, y_origin); + GtkStyleContext *sc = gtk_widget_get_style_context(GTK_WIDGET(gobj())); GdkRGBA bg_color, fg_color; gtk_style_context_get_background_color(sc, GTK_STATE_FLAG_NORMAL, &bg_color); @@ -2380,7 +2430,12 @@ FilterEffectsDialog::FilterEffectsDialog() _add_primitive_type.remove_row(NR_FILTER_COMPONENTTRANSFER); // Initialize widget hierarchy +#if WITH_GTKMM_3_0 + Gtk::Paned* hpaned = Gtk::manage(new Gtk::Paned); +#else Gtk::HPaned* hpaned = Gtk::manage(new Gtk::HPaned); +#endif + Gtk::ScrolledWindow* sw_prims = 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); diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 1652a314f..355a8b1b2 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -151,8 +151,28 @@ private: static const int size = 24; protected: +#if WITH_GTKMM_3_0 + virtual void get_preferred_width_vfunc(Gtk::Widget& widget, + int& minimum_width, + int& natural_width) const; + + virtual void get_preferred_width_for_height_vfunc(Gtk::Widget& widget, + int height, + int& minimum_width, + int& natural_width) const; + + virtual void get_preferred_height_vfunc(Gtk::Widget& widget, + int& minimum_height, + int& natural_height) const; + + virtual void get_preferred_height_for_width_vfunc(Gtk::Widget& widget, + int width, + int& minimum_height, + int& natural_height) const; +#else virtual void get_size_vfunc(Gtk::Widget& widget, const Gdk::Rectangle* cell_area, int* x_offset, int* y_offset, int* width, int* height) const; +#endif private: // void* should be SPFilterPrimitive*, some weirdness with properties prevents this Glib::Property<void*> _primitive; @@ -177,7 +197,7 @@ private: int get_input_type_width() const; protected: - bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr); + bool on_draw_signal(const Cairo::RefPtr<Cairo::Context> &cr); #if !WITH_GTKMM_3_0 bool on_expose_signal(GdkEventExpose*); diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index 64fb4cc3d..77a6c9d02 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -12,6 +12,10 @@ #ifndef INKSCAPE_UI_DIALOG_FIND_H #define INKSCAPE_UI_DIALOG_FIND_H +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "ui/widget/panel.h" #include "ui/widget/button.h" #include "ui/widget/entry.h" @@ -280,7 +284,13 @@ private: Gtk::Label status; UI::Widget::Button button_find; UI::Widget::Button button_replace; + +#if WITH_GTKMM_3_0 + Gtk::ButtonBox box_buttons; +#else Gtk::HButtonBox box_buttons; +#endif + Gtk::HBox hboxbutton_row; /** diff --git a/src/ui/dialog/icon-preview.h b/src/ui/dialog/icon-preview.h index 42f9176b0..8a6e19a25 100644 --- a/src/ui/dialog/icon-preview.h +++ b/src/ui/dialog/icon-preview.h @@ -66,7 +66,12 @@ private: gdouble minDelay; Gtk::VBox iconBox; + +#if WITH_GTKMM_3_0 + Gtk::Paned splitter; +#else Gtk::HPaned splitter; +#endif Glib::ustring targetId; int hot; diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 291059999..20e5d3ca6 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1162,9 +1162,11 @@ void InkscapePreferences::initPageBehavior() _scroll_auto_thres.init ( "/options/autoscrolldistance/value", -600.0, 600.0, 1.0, 1.0, -10.0, true, false); _page_scrolling.add_line( true, _("_Threshold:"), _scroll_auto_thres, _("pixels"), _("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"), false); +/* _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)")); +*/ _wheel_zoom.init ( _("Mouse wheel zooms by default"), "/options/wheelzooms/value", false); _page_scrolling.add_line( false, "", _wheel_zoom, "", _("When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when off, it zooms with Ctrl and scrolls without Ctrl")); @@ -1459,7 +1461,12 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui _page_keyshortcuts.attach(*scroller, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL); row++; +#if WITH_GTKMM_3_0 + Gtk::ButtonBox *box_buttons = manage(new Gtk::ButtonBox); +#else Gtk::HButtonBox *box_buttons = manage (new Gtk::HButtonBox); +#endif + box_buttons->set_layout(Gtk::BUTTONBOX_END); box_buttons->set_spacing(4); _page_keyshortcuts.attach(*box_buttons, 0, 3, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK); diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp index 4c567a6e3..6aff67f69 100644 --- a/src/ui/dialog/input.cpp +++ b/src/ui/dialog/input.cpp @@ -424,7 +424,12 @@ private: Gtk::CheckButton useExt; Gtk::Button save; +#if WITH_GTKMM_3_0 + Gtk::Paned pane; +#else Gtk::HPaned pane; +#endif + Gtk::VBox detailsBox; Gtk::HBox titleFrame; Gtk::Label titleLabel; @@ -485,8 +490,15 @@ private: Inkscape::UI::Widget::Frame axisFrame; Gtk::ScrolledWindow treeScroller; Gtk::ScrolledWindow detailScroller; + +#if WITH_GTKMM_3_0 + Gtk::Paned splitter; + Gtk::Paned split2; +#else Gtk::HPaned splitter; Gtk::VPaned split2; +#endif + Gtk::Label devName; Gtk::Label devKeyCount; Gtk::Label devAxesCount; @@ -589,7 +601,11 @@ InputDialogImpl::InputDialogImpl() : treeScroller(), detailScroller(), splitter(), +#if WITH_GTKMM_3_0 + split2(Gtk::ORIENTATION_VERTICAL), +#else split2(), +#endif axisTable(11, 2), linkCombo(), topHolder(), @@ -1048,7 +1064,12 @@ InputDialogImpl::ConfPanel::ConfPanel() : useExt.set_active(Preferences::get()->getBool("/options/useextinput/value")); useExt.signal_toggled().connect(sigc::mem_fun(*this, &InputDialogImpl::ConfPanel::useExtToggled)); +#if WITH_GTKMM_3_0 + Gtk::ButtonBox *buttonBox = manage(new Gtk::ButtonBox); +#else Gtk::HButtonBox *buttonBox = manage (new Gtk::HButtonBox); +#endif + buttonBox->set_layout (Gtk::BUTTONBOX_END); //Gtk::Alignment *align = new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_START, 0, 0); buttonBox->add(save); diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp index 12ee2f762..f0801734a 100644 --- a/src/ui/dialog/object-properties.cpp +++ b/src/ui/dialog/object-properties.cpp @@ -69,15 +69,15 @@ ObjectProperties::ObjectProperties (void) : subselChangedConn() { //initialize labels for the table at the bottom of the dialog - int_labels.push_back("onclick:"); - int_labels.push_back("onmouseover:"); - int_labels.push_back("onmouseout:"); - int_labels.push_back("onmousedown:"); - int_labels.push_back("onmouseup:"); - int_labels.push_back("onmousemove:"); - int_labels.push_back("onfocusin:"); - int_labels.push_back("onfocusout:"); - int_labels.push_back("onload:"); + int_labels.push_back("onclick"); + int_labels.push_back("onmouseover"); + int_labels.push_back("onmouseout"); + int_labels.push_back("onmousedown"); + int_labels.push_back("onmouseup"); + int_labels.push_back("onmousemove"); + int_labels.push_back("onfocusin"); + int_labels.push_back("onfocusout"); + int_labels.push_back("onload"); desktopChangeConn = deskTrack.connectDesktopChanged( sigc::mem_fun(*this, &ObjectProperties::setTargetDesktop) ); deskTrack.connect(GTK_WIDGET(gobj())); diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp index c7bff185c..82bc85099 100644 --- a/src/ui/dialog/ocaldialogs.cpp +++ b/src/ui/dialog/ocaldialogs.cpp @@ -139,7 +139,7 @@ bool ExportDialog::show() { set_modal (TRUE); //Window - sp_transientize((GtkWidget *)gobj()); //Make transient + sp_transientize(GTK_WIDGET(gobj())); //Make transient gint b = run(); //Dialog hide(); @@ -244,7 +244,7 @@ bool ExportPasswordDialog::show() { set_modal (TRUE); //Window - sp_transientize((GtkWidget *)gobj()); //Make transient + sp_transientize(GTK_WIDGET(gobj())); //Make transient gint b = run(); //Dialog hide(); @@ -957,40 +957,40 @@ void SearchResultList::populate_from_xml(xmlNode * a_node) for (xmlNode *cur_node = a_node; cur_node; cur_node = cur_node->next) { // Get items information - if (strcmp((const char*)cur_node->name, "rss")) // Avoid the root + if (strcmp(reinterpret_cast<const char*>(cur_node->name), "rss")) // Avoid the root if (cur_node->type == XML_ELEMENT_NODE && - (cur_node->parent->name && !strcmp((const char*)cur_node->parent->name, "item"))) + (cur_node->parent->name && !strcmp(reinterpret_cast<const char*>(cur_node->parent->name), "item"))) { - if (!strcmp((const char*)cur_node->name, "title")) + if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "title")) { row_num = append(""); xmlChar *xml_title = xmlNodeGetContent(cur_node); - char* title = (char*) xml_title; + char* title = reinterpret_cast<char*>(xml_title); set_text(row_num, RESULTS_COLUMN_TITLE, title); xmlFree(title); } - else if (!strcmp((const char*)cur_node->name, "pubDate")) + else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "pubDate")) { xmlChar *xml_date = xmlNodeGetContent(cur_node); - char* date = (char*) xml_date; + char* date = reinterpret_cast<char*>(xml_date); set_text(row_num, RESULTS_COLUMN_DATE, date); xmlFree(xml_date); } - else if (!strcmp((const char*)cur_node->name, "creator")) + else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "creator")) { xmlChar *xml_creator = xmlNodeGetContent(cur_node); - char* creator = (char*) xml_creator; + char* creator = reinterpret_cast<char*>(xml_creator); set_text(row_num, RESULTS_COLUMN_CREATOR, creator); xmlFree(xml_creator); } - else if (!strcmp((const char*)cur_node->name, "description")) + else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "description")) { xmlChar *xml_description = xmlNodeGetContent(cur_node); //char* final_description; - char* stripped_description = g_strstrip((char*) xml_description); + char* stripped_description = g_strstrip(reinterpret_cast<char*>(xml_description)); if (!strcmp(stripped_description, "")) { stripped_description = _("No description"); @@ -1002,30 +1002,30 @@ void SearchResultList::populate_from_xml(xmlNode * a_node) set_text(row_num, RESULTS_COLUMN_DESCRIPTION, stripped_description); xmlFree(xml_description); } - else if (!strcmp((const char*)cur_node->name, "enclosure")) + else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "enclosure")) { - xmlChar *xml_url = xmlGetProp(cur_node, (xmlChar*) "url"); - char* url = (char*) xml_url; + xmlChar *xml_url = xmlGetProp(cur_node, reinterpret_cast<xmlChar*>(g_strdup("url"))); + char* url = reinterpret_cast<char*>(xml_url); char* filename = g_path_get_basename(url); set_text(row_num, RESULTS_COLUMN_URL, url); set_text(row_num, RESULTS_COLUMN_FILENAME, filename); xmlFree(xml_url); } - else if (!strcmp((const char*)cur_node->name, "thumbnail")) + else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "thumbnail")) { - xmlChar *xml_thumbnail_url = xmlGetProp(cur_node, (xmlChar*) "url"); - char* thumbnail_url = (char*) xml_thumbnail_url; + xmlChar *xml_thumbnail_url = xmlGetProp(cur_node, reinterpret_cast<xmlChar*>(g_strdup("url"))); + char* thumbnail_url = reinterpret_cast<char*>(xml_thumbnail_url); char* thumbnail_filename = g_path_get_basename(thumbnail_url); set_text(row_num, RESULTS_COLUMN_THUMBNAIL_URL, thumbnail_url); set_text(row_num, RESULTS_COLUMN_THUMBNAIL_FILENAME, thumbnail_filename); xmlFree(xml_thumbnail_url); } - else if (!strcmp((const char*)cur_node->name, "guid")) + else if (!strcmp(reinterpret_cast<const char*>(cur_node->name), "guid")) { xmlChar *xml_guid = xmlNodeGetContent(cur_node); - char* guid_url = (char*) xml_guid; + char* guid_url = reinterpret_cast<char*>(xml_guid); char* guid = g_path_get_basename(guid_url); set_text(row_num, RESULTS_COLUMN_GUID, guid); @@ -1196,7 +1196,13 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types // Creation Gtk::VBox *vbox = new Gtk::VBox(false, 0); + +#if WITH_GTKMM_3_0 + Gtk::ButtonBox *hbuttonbox_bottom = new Gtk::ButtonBox(); +#else Gtk::HButtonBox *hbuttonbox_bottom = new Gtk::HButtonBox(); +#endif + Gtk::HBox *hbox_bottom = new Gtk::HBox(false, 12); BaseBox *basebox_logo = new BaseBox(); BaseBox *basebox_no_search_results = new BaseBox(); @@ -1204,7 +1210,13 @@ ImportDialog::ImportDialog(Gtk::Window& parent_window, FileDialogType file_types label_description = new Gtk::Label(); entry_search = new SearchEntry(); button_search = new Gtk::Button(_("Search")); + +#if WITH_GTKMM_3_0 + Gtk::ButtonBox* hbuttonbox_search = new Gtk::ButtonBox(); +#else Gtk::HButtonBox* hbuttonbox_search = new Gtk::HButtonBox(); +#endif + Gtk::ScrolledWindow* scrolledwindow_preview = new Gtk::ScrolledWindow(); preview_files = new PreviewWidget(); /// Add the buttons in the bottom of the dialog diff --git a/src/ui/dialog/spellcheck.h b/src/ui/dialog/spellcheck.h index 8eb240097..ab75809f3 100644 --- a/src/ui/dialog/spellcheck.h +++ b/src/ui/dialog/spellcheck.h @@ -240,10 +240,20 @@ private: GtkWidget * dictionary_combo; Gtk::HBox dictionary_hbox; +#if WITH_GTKMM_3_0 + Gtk::Separator action_sep; +#else Gtk::HSeparator action_sep; +#endif + Gtk::Button stop_button; Gtk::Button start_button; + +#if WITH_GTKMM_3_0 + Gtk::ButtonBox actionbutton_hbox; +#else Gtk::HButtonBox actionbutton_hbox; +#endif SPDesktop * desktop; DesktopTracker deskTrack; diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 9d4ab5d8a..3188f1681 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -14,6 +14,9 @@ #include <iostream> #include <algorithm> +#include <locale> +#include <functional> +#include <sstream> #include <glibmm/i18n.h> @@ -43,6 +46,11 @@ #include "sp-use.h" #include "sp-symbol.h" +#ifdef WITH_LIBVISIO +#include <libvisio/libvisio.h> +#include <libwpd-stream/libwpd-stream.h> +#endif + #include "verbs.h" #include "xml/repr.h" @@ -289,6 +297,78 @@ void SymbolsDialog::iconChanged() { } } +#ifdef WITH_LIBVISIO +// Read Visio stencil files +SPDocument* read_vss( gchar* fullname, gchar* filename ) { + + WPXFileStream input(fullname); + + if (!libvisio::VisioDocument::isSupported(&input)) { + return NULL; + } + + libvisio::VSDStringVector output; + if (!libvisio::VisioDocument::generateSVGStencils(&input, output)) { + return NULL; + } + + if (output.empty()) { + return NULL; + } + + Glib::ustring tmpSVGOutput; + tmpSVGOutput += "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"; + tmpSVGOutput += "<svg\n"; + tmpSVGOutput += " xmlns=\"http://www.w3.org/2000/svg\"\n"; + tmpSVGOutput += " xmlns:svg=\"http://www.w3.org/2000/svg\"\n"; + tmpSVGOutput += " xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"; + tmpSVGOutput += " version=\"1.1\"\n"; + tmpSVGOutput += " style=\"fill:none;stroke:#000000;stroke-width:2\">\n"; + tmpSVGOutput += " <title>"; + tmpSVGOutput += filename; + tmpSVGOutput += "</title>\n"; + tmpSVGOutput += " <defs>\n"; + + // Create a string we can use for the symbol id (libvisio doesn't give us a name) + std::string sanitized( filename ); + sanitized.erase( sanitized.find_last_of(".vss")-3 ); + sanitized.erase( std::remove_if( sanitized.begin(), sanitized.end(), ispunct ), sanitized.end() ); + std::replace( sanitized.begin(), sanitized.end(), ' ', '_' ); + // std::cout << filename << " |" << sanitized << "|" << std::endl; + + // Each "symbol" is in it's own SVG file, we wrap with <symbol> and merge into one file. + for (unsigned i=0; i<output.size(); ++i) { + + std::stringstream ss; + ss << i; + + tmpSVGOutput += " <symbol id=\""; + tmpSVGOutput += sanitized; + tmpSVGOutput += "_"; + tmpSVGOutput += ss.str(); + tmpSVGOutput += "\">\n"; + + std::istringstream iss( output[i].cstr() ); + std::string line; + while( std::getline( iss, line ) ) { + // std::cout << line << std::endl; + if( line.find( "svg:svg" ) == std::string::npos ) { + tmpSVGOutput += line; + tmpSVGOutput += "\n"; + } + } + + tmpSVGOutput += " </symbol>\n"; + } + + tmpSVGOutput += " </defs>\n"; + tmpSVGOutput += "</svg>\n"; + + return SPDocument::createNewDocFromMem( tmpSVGOutput.c_str(), strlen( tmpSVGOutput.c_str()), 0 ); + +} +#endif + /* Hunts preference directories for symbol files */ void SymbolsDialog::get_symbols() { @@ -317,11 +397,31 @@ void SymbolsDialog::get_symbols() { if ( !Inkscape::IO::file_test( fullname, G_FILE_TEST_IS_DIR ) ) { - SPDocument* symbol_doc = SPDocument::createNewDoc( fullname, FALSE ); - if( symbol_doc ) { - symbolSets[Glib::ustring(filename)]= symbol_doc; - symbolSet->append(filename); + Glib::ustring fn( filename ); + Glib::ustring tag = fn.substr( fn.find_last_of(".") + 1 ); + + SPDocument* symbol_doc = NULL; + +#ifdef WITH_LIBVISIO + if( tag.compare( "vss" ) == 0 ) { + + symbol_doc = read_vss( fullname, filename ); + if( symbol_doc ) { + symbolSets[Glib::ustring(filename)]= symbol_doc; + symbolSet->append(filename); + } } +#endif + // Try to read all remaining files as SVG + if( !symbol_doc ) { + + symbol_doc = SPDocument::createNewDoc( fullname, FALSE ); + if( symbol_doc ) { + symbolSets[Glib::ustring(filename)]= symbol_doc; + symbolSet->append(filename); + } + } + } g_free( fullname ); } diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 6696db083..97cd28cdd 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -95,11 +95,21 @@ TextEdit::TextEdit() styleButton(&align_center, _("Align center"), GTK_STOCK_JUSTIFY_CENTER, &align_left); styleButton(&align_right, _("Align right"), GTK_STOCK_JUSTIFY_RIGHT, &align_left); styleButton(&align_justify, _("Justify (only flowed text)"), GTK_STOCK_JUSTIFY_FILL, &align_left); + +#if WITH_GTKMM_3_0 + align_sep.set_orientation(Gtk::ORIENTATION_VERTICAL); +#endif + layout_hbox.pack_start(align_sep, false, false, 10); /* Direction buttons */ styleButton(&text_horizontal, _("Horizontal text"), INKSCAPE_ICON("format-text-direction-horizontal"), NULL); styleButton(&text_vertical, _("Vertical text"), INKSCAPE_ICON("format-text-direction-vertical"), &text_horizontal); + +#if WITH_GTKMM_3_0 + text_sep.set_orientation(Gtk::ORIENTATION_VERTICAL); +#endif + layout_hbox.pack_start(text_sep, false, false, 10); /* Line Spacing */ diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index 9fd9baa30..bca6cee90 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -172,10 +172,22 @@ private: Gtk::RadioButton align_center; Gtk::RadioButton align_right; Gtk::RadioButton align_justify; + +#if WITH_GTKMM_3_0 + Gtk::Separator align_sep; +#else Gtk::VSeparator align_sep; +#endif + Gtk::RadioButton text_vertical; Gtk::RadioButton text_horizontal; + +#if WITH_GTKMM_3_0 + Gtk::Separator text_sep; +#else Gtk::VSeparator text_sep; +#endif + GtkWidget *spacing_combo; Gtk::Label preview_label; diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp index 1ce78a278..410cdbda9 100644 --- a/src/ui/dialog/tile.cpp +++ b/src/ui/dialog/tile.cpp @@ -194,7 +194,7 @@ void TileDialog::Grid_Arrange () g_return_if_fail(selection); const GSList *items2 = selection->itemList(); - GSList *rev = g_slist_copy((GSList *) items2); + GSList *rev = g_slist_copy(const_cast<GSList *>(items2)); GSList *sorted = NULL; rev = g_slist_sort(rev, (GCompareFunc) sp_compare_y_position); sorted = g_slist_sort(rev, (GCompareFunc) sp_compare_x_position); @@ -667,7 +667,7 @@ TileDialog::TileDialog() NoOfRowsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_col_spinbutton_changed)); NoOfRowsSpinner.set_tooltip_text(_("Number of rows")); NoOfRowsBox.pack_start(NoOfRowsSpinner, false, false, MARGIN); - gtk_size_group_add_widget(_col1, (GtkWidget *) NoOfRowsBox.gobj()); + gtk_size_group_add_widget(_col1, GTK_WIDGET(NoOfRowsBox.gobj())); RowHeightButton.set_label(_("Equal _height")); RowHeightButton.set_use_underline(true); @@ -724,7 +724,7 @@ TileDialog::TileDialog() XByYLabel.set_markup(" × "); XByYLabelVBox.pack_start(XByYLabel, false, false, MARGIN); SpinsHBox.pack_start(XByYLabelVBox, false, false, MARGIN); - gtk_size_group_add_widget(_col2, (GtkWidget *) XByYLabelVBox.gobj()); + gtk_size_group_add_widget(_col2, GTK_WIDGET(XByYLabelVBox.gobj())); /*#### Number of columns ####*/ @@ -739,7 +739,7 @@ TileDialog::TileDialog() NoOfColsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_row_spinbutton_changed)); NoOfColsSpinner.set_tooltip_text(_("Number of columns")); NoOfColsBox.pack_start(NoOfColsSpinner, false, false, MARGIN); - gtk_size_group_add_widget(_col3, (GtkWidget *) NoOfColsBox.gobj()); + gtk_size_group_add_widget(_col3, GTK_WIDGET(NoOfColsBox.gobj())); ColumnWidthButton.set_label(_("Equal _width")); ColumnWidthButton.set_use_underline(true); diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index b21932f99..29dbc4b93 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -79,7 +79,11 @@ XmlTree::XmlTree (void) : xml_attribute_delete_button (_("Delete attribute")), text_container (), attr_container (), - attr_subpaned_container (), +#if WITH_GTKMM_3_0 + attr_subpaned_container(Gtk::ORIENTATION_VERTICAL), +#else + attr_subpaned_container(), +#endif set_attr (_("Set")), new_window(NULL) { diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h index ee1dadc14..9d2fac71f 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -13,6 +13,10 @@ #ifndef SEEN_DIALOGS_XML_TREE_H #define SEEN_DIALOGS_XML_TREE_H +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include "ui/widget/panel.h" #include <gtkmm/entry.h> #include <gtkmm/textview.h> @@ -215,7 +219,12 @@ private: Gtk::Button *create_button; Gtk::Entry *name_entry; +#if WITH_GTKMM_3_0 + Gtk::Paned paned; +#else Gtk::HPaned paned; +#endif + Gtk::VBox left_box; Gtk::VBox right_box; Gtk::HBox status_box; @@ -239,7 +248,13 @@ private: Gtk::ScrolledWindow text_container; Gtk::HBox attr_hbox; Gtk::VBox attr_container; + +#if WITH_GTKMM_3_0 + Gtk::Paned attr_subpaned_container; +#else Gtk::VPaned attr_subpaned_container; +#endif + Gtk::Button set_attr; GtkWidget *new_window; diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp index 3ebb282ec..4b4a7b738 100644 --- a/src/ui/widget/color-preview.cpp +++ b/src/ui/widget/color-preview.cpp @@ -26,13 +26,6 @@ ColorPreview::ColorPreview (guint32 rgba) } void -ColorPreview::on_size_request (Gtk::Requisition *req) -{ - req->width = SPCP_DEFAULT_WIDTH; - req->height = SPCP_DEFAULT_HEIGHT; -} - -void ColorPreview::on_size_allocate (Gtk::Allocation &all) { set_allocation (all); @@ -40,14 +33,55 @@ ColorPreview::on_size_allocate (Gtk::Allocation &all) queue_draw(); } +#if WITH_GTKMM_3_0 +void +ColorPreview::get_preferred_height_vfunc(int& minimum_height, int& natural_height) const +{ + minimum_height = natural_height = SPCP_DEFAULT_HEIGHT; +} + +void +ColorPreview::get_preferred_height_for_width_vfunc(int /* width */, int& minimum_height, int& natural_height) const +{ + minimum_height = natural_height = SPCP_DEFAULT_HEIGHT; +} + +void +ColorPreview::get_preferred_width_vfunc(int& minimum_width, int& natural_width) const +{ + minimum_width = natural_width = SPCP_DEFAULT_WIDTH; +} + +void +ColorPreview::get_preferred_width_for_height_vfunc(int /* height */, int& minimum_width, int& natural_width) const +{ + minimum_width = natural_width = SPCP_DEFAULT_WIDTH; +} +#else +void +ColorPreview::on_size_request (Gtk::Requisition *req) +{ + req->width = SPCP_DEFAULT_WIDTH; + req->height = SPCP_DEFAULT_HEIGHT; +} + bool ColorPreview::on_expose_event (GdkEventExpose *event) { + bool result = true; + if (get_is_drawable()) - paint (&event->area); + { + Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context(); + cr->rectangle(event->area.x, event->area.y, + event->area.width, event->area.height); + cr->clip(); + result = on_draw(cr); + } - return true; + return result; } +#endif void ColorPreview::setRgba32 (guint32 rgba) @@ -58,11 +92,10 @@ ColorPreview::setRgba32 (guint32 rgba) queue_draw(); } -void -ColorPreview::paint (GdkRectangle *area) +bool +ColorPreview::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) { GdkRectangle warea, carea; - GdkRectangle wpaint, cpaint; gint w2; const Gtk::Allocation& allocation = get_allocation(); @@ -71,12 +104,6 @@ ColorPreview::paint (GdkRectangle *area) warea.width = allocation.get_width(); warea.height = allocation.get_height(); - if (!gdk_rectangle_intersect (area, &warea, &wpaint)) - return; - - GtkWidget *widget = GTK_WIDGET(this->gobj()); - cairo_t *ct = gdk_cairo_create(gtk_widget_get_window(widget)); - /* Transparent area */ w2 = warea.width / 2; @@ -86,17 +113,15 @@ ColorPreview::paint (GdkRectangle *area) carea.width = w2; carea.height = warea.height; - if (gdk_rectangle_intersect (area, &carea, &cpaint)) { - cairo_pattern_t *checkers = ink_cairo_pattern_create_checkerboard(); + cairo_pattern_t *checkers = ink_cairo_pattern_create_checkerboard(); - cairo_rectangle(ct, carea.x, carea.y, carea.width, carea.height); - cairo_set_source(ct, checkers); - cairo_fill_preserve(ct); - ink_cairo_set_source_rgba32(ct, _rgba); - cairo_fill(ct); + cr->rectangle(carea.x, carea.y, carea.width, carea.height); + cairo_set_source(cr->cobj(), checkers); + cr->fill_preserve(); + ink_cairo_set_source_rgba32(cr->cobj(), _rgba); + cr->fill(); - cairo_pattern_destroy(checkers); - } + cairo_pattern_destroy(checkers); /* Solid area */ @@ -105,13 +130,11 @@ ColorPreview::paint (GdkRectangle *area) carea.width = warea.width - w2; carea.height = warea.height; - if (gdk_rectangle_intersect (area, &carea, &cpaint)) { - cairo_rectangle(ct, carea.x, carea.y, carea.width, carea.height); - ink_cairo_set_source_rgba32(ct, _rgba | 0xff); - cairo_fill(ct); - } + cr->rectangle(carea.x, carea.y, carea.width, carea.height); + ink_cairo_set_source_rgba32(cr->cobj(), _rgba | 0xff); + cr->fill(); - cairo_destroy(ct); + return true; } GdkPixbuf* @@ -173,3 +196,4 @@ ColorPreview::toPixbuf (int width, int height) fill-column:99 End: */ +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : diff --git a/src/ui/widget/color-preview.h b/src/ui/widget/color-preview.h index d6d3da01c..caddfb9a2 100644 --- a/src/ui/widget/color-preview.h +++ b/src/ui/widget/color-preview.h @@ -11,6 +11,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <gtkmm/widget.h> namespace Inkscape { @@ -27,10 +31,19 @@ public: GdkPixbuf* toPixbuf (int width, int height); protected: - virtual void on_size_request (Gtk::Requisition *req); virtual void on_size_allocate (Gtk::Allocation &all); - virtual bool on_expose_event (GdkEventExpose *event); - void paint (GdkRectangle *area); + +#if WITH_GTKMM_3_0 + virtual void get_preferred_height_vfunc(int& minimum_height, int& natural_height) const; + virtual void get_preferred_height_for_width_vfunc(int width, int& minimum_height, int& natural_height) const; + virtual void get_preferred_width_vfunc(int& minimum_width, int& natural_width) const; + virtual void get_preferred_width_for_height_vfunc(int height, int& minimum_width, int& natural_width) const; +#else + virtual void on_size_request (Gtk::Requisition *req); + virtual bool on_expose_event(GdkEventExpose *event); +#endif + + virtual bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr); guint32 _rgba; }; diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp index 567608ef8..1c36dc36e 100644 --- a/src/ui/widget/imageicon.cpp +++ b/src/ui/widget/imageicon.cpp @@ -117,7 +117,7 @@ bool ImageIcon::showSvgDocument(const SPDocument *docArg) viewerGtkmm->show(); pack_start(*viewerGtkmm, TRUE, TRUE, 0); - //GtkWidget *vbox = (GtkWidget *)gobj(); + //GtkWidget *vbox = GTK_WIDGET(gobj()); //gtk_box_pack_start(GTK_BOX(vbox), viewerGtk, TRUE, TRUE, 0); return true; @@ -306,7 +306,7 @@ void ImageIcon::showBrokenImage(const Glib::ustring &errorMessage) "</svg>"; //Fill in the template - char *cErrorMessage = (char *)errorMessage.c_str(); + char *cErrorMessage = const_cast<char *>(errorMessage.c_str()); gchar *xmlBuffer = g_strdup_printf(xformat, cErrorMessage); //g_message("%s\n", xmlBuffer); @@ -375,7 +375,7 @@ bool ImageIcon::show(const Glib::ustring &fileName) if (!Glib::file_test(fileName, Glib::FILE_TEST_EXISTS)) return false; - gchar *fName = (gchar *)fileName.c_str(); + gchar *fName = const_cast<gchar *>(fileName.c_str()); //g_message("fname:%s\n", fName); diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 2789676ea..537db0fdd 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -89,8 +89,8 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co /* SizeGroup keeps the blur and opacity labels aligned in Fill & Stroke dlg */ /* GtkSizeGroup *labels = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - gtk_size_group_add_widget(labels, (GtkWidget *) _opacity_label.gobj()); - gtk_size_group_add_widget(labels, (GtkWidget *) _fe_cb.get_blur_label()->gobj()); + gtk_size_group_add_widget(labels, GTK_WIDGET(_opacity_label.gobj())); + gtk_size_group_add_widget(labels, GTK_WIDGET(_fe_cb.get_blur_label()->gobj())); */ show_all_children(); diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 2ab72d6c7..fa3f8e3a1 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -330,14 +330,36 @@ PageSizer::PageSizer(Registry & _wr) pack_start (_customFrame, false, false, 0); _customFrame.add(_customDimTable); - _customDimTable.resize(3, 2); _customDimTable.set_border_width(4); + +#if WITH_GTKMM_3_0 + _customDimTable.set_row_spacing(4); + _customDimTable.set_column_spacing(4); + + _dimensionWidth.set_hexpand(); + _dimensionWidth.set_vexpand(); + _customDimTable.attach(_dimensionWidth, 0, 0, 1, 1); + + _dimensionUnits.set_hexpand(); + _dimensionUnits.set_vexpand(); + _customDimTable.attach(_dimensionUnits, 1, 0, 1, 1); + + _dimensionHeight.set_hexpand(); + _dimensionHeight.set_vexpand(); + _customDimTable.attach(_dimensionHeight, 0, 1, 1, 1); + + _fitPageMarginExpander.set_hexpand(); + _fitPageMarginExpander.set_vexpand(); + _customDimTable.attach(_fitPageMarginExpander, 0, 2, 2, 1); +#else + _customDimTable.resize(3, 2); _customDimTable.set_row_spacings(4); _customDimTable.set_col_spacings(4); _customDimTable.attach(_dimensionWidth, 0,1, 0,1); _customDimTable.attach(_dimensionUnits, 1,2, 0,1); _customDimTable.attach(_dimensionHeight, 0,1, 1,2); _customDimTable.attach(_fitPageMarginExpander, 0,2, 2,3); +#endif _dimTabOrderGList = NULL; _dimTabOrderGList = g_list_append(_dimTabOrderGList, _dimensionWidth.gobj()); @@ -353,7 +375,32 @@ PageSizer::PageSizer(Registry & _wr) _fitPageMarginExpander.add(_marginTable); //## Set up margin settings - _marginTable.resize(4, 2); + _marginTable.set_border_width(4); + +#if WITH_GTKMM_3_0 + _marginTable.set_row_spacing(4); + _marginTable.set_column_spacing(4); + + _marginTopAlign.set_hexpand(); + _marginTopAlign.set_vexpand(); + _marginTable.attach(_marginTopAlign, 0, 0, 2, 1); + + _marginLeftAlign.set_hexpand(); + _marginLeftAlign.set_vexpand(); + _marginTable.attach(_marginLeftAlign, 0, 1, 1, 1); + + _marginRightAlign.set_hexpand(); + _marginRightAlign.set_vexpand(); + _marginTable.attach(_marginRightAlign, 1, 1, 1, 1); + + _marginBottomAlign.set_hexpand(); + _marginBottomAlign.set_vexpand(); + _marginTable.attach(_marginBottomAlign, 0, 2, 2, 1); + + _fitPageButtonAlign.set_hexpand(); + _fitPageButtonAlign.set_vexpand(); + _marginTable.attach(_fitPageButtonAlign, 0, 3, 2, 1); +#else _marginTable.set_border_width(4); _marginTable.set_row_spacings(4); _marginTable.set_col_spacings(4); @@ -362,6 +409,7 @@ PageSizer::PageSizer(Registry & _wr) _marginTable.attach(_marginRightAlign, 1,2, 1,2); _marginTable.attach(_marginBottomAlign, 0,2, 2,3); _marginTable.attach(_fitPageButtonAlign, 0,2, 3,4); +#endif _marginTopAlign.set(0.5, 0.5, 0.0, 1.0); _marginTopAlign.add(_marginTop); diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h index 17fd7b1ea..d1fbb56e0 100644 --- a/src/ui/widget/page-sizer.h +++ b/src/ui/widget/page-sizer.h @@ -10,6 +10,10 @@ #ifndef INKSCAPE_UI_WIDGET_PAGE_SIZER_H #define INKSCAPE_UI_WIDGET_PAGE_SIZER_H +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <stddef.h> #include "ui/widget/registered-widget.h" #include <sigc++/sigc++.h> @@ -21,7 +25,13 @@ #include <gtkmm/frame.h> #include <gtkmm/liststore.h> #include <gtkmm/scrolledwindow.h> -#include <gtkmm/table.h> + +#if WITH_GTKMM_3_0 +# include <gtkmm/grid.h> +#else +# include <gtkmm/table.h> +#endif + #include <gtkmm/radiobutton.h> namespace Inkscape { @@ -207,7 +217,13 @@ protected: //### Custom size frame Gtk::Frame _customFrame; + +#if WITH_GTKMM_3_0 + Gtk::Grid _customDimTable; +#else Gtk::Table _customDimTable; +#endif + RegisteredUnitMenu _dimensionUnits; RegisteredScalarUnit _dimensionWidth; RegisteredScalarUnit _dimensionHeight; @@ -215,7 +231,13 @@ protected: //### Fit Page options Gtk::Expander _fitPageMarginExpander; + +#if WITH_GTKMM_3_0 + Gtk::Grid _marginTable; +#else Gtk::Table _marginTable; +#endif + Gtk::Alignment _marginTopAlign; Gtk::Alignment _marginLeftAlign; Gtk::Alignment _marginRightAlign; diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index dcf5956bf..48749fda2 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -591,7 +591,13 @@ void Panel::_addResponseButton(Gtk::Button *button, int response_id, bool pack_s { // Create a button box for the response buttons if it's the first button to be added if (!_action_area) { +#if WITH_GTKMM_3_0 + _action_area = new Gtk::ButtonBox(); + _action_area->set_layout(Gtk::BUTTONBOX_END); + _action_area->set_spacing(6); +#else _action_area = new Gtk::HButtonBox(Gtk::BUTTONBOX_END, 6); +#endif _action_area->set_border_width(4); pack_end(*_action_area, Gtk::PACK_SHRINK, 0); } diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h index b4cc04809..5bb054577 100644 --- a/src/ui/widget/panel.h +++ b/src/ui/widget/panel.h @@ -13,6 +13,10 @@ #ifndef SEEN_INKSCAPE_UI_WIDGET_PANEL_H #define SEEN_INKSCAPE_UI_WIDGET_PANEL_H +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <gtkmm/box.h> #include <gtkmm/arrow.h> #include <gtkmm/button.h> @@ -27,7 +31,13 @@ class SPDocument; namespace Gtk { class CheckMenuItem; + +#if WITH_GTKMM_3_0 + class ButtonBox; +#else class HButtonBox; +#endif + class MenuItem; } @@ -157,7 +167,13 @@ private: Gtk::EventBox _menu_popper; Gtk::Button _close_button; Gtk::Menu *_menu; + +#if WITH_GTKMM_3_0 + Gtk::ButtonBox *_action_area; //< stores response buttons +#else Gtk::HButtonBox *_action_area; //< stores response buttons +#endif + std::vector<Gtk::Widget *> _non_horizontal; std::vector<Gtk::Widget *> _non_vertical; PreviewFillable *_fillable; diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index e7e317d11..e5b062ec9 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -373,10 +373,27 @@ ZoomCorrRuler::draw_marks(Cairo::RefPtr<Cairo::Context> cr, double dist, int maj } } -void -ZoomCorrRuler::redraw() { +#if !WITH_GTKMM_3_0 +bool +ZoomCorrRuler::on_expose_event(GdkEventExpose *event) { + bool result = false; + + if(get_is_drawable()) + { + Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context(); + cr->rectangle(event->area.x, event->area.y, + event->area.width, event->area.height); + cr->clip(); + result = on_draw(cr); + } + + return result; +} +#endif + +bool +ZoomCorrRuler::on_draw(const Cairo::RefPtr<Cairo::Context>& cr) { Glib::RefPtr<Gdk::Window> window = get_window(); - Cairo::RefPtr<Cairo::Context> cr = window->create_cairo_context(); int w = window->get_width(); _drawing_width = w - _border * 2; @@ -415,14 +432,11 @@ ZoomCorrRuler::redraw() { draw_marks(cr, 1, 1); } cr->stroke(); -} -bool -ZoomCorrRuler::on_expose_event(GdkEventExpose */*event*/) { - this->redraw(); return true; } + void ZoomCorrRulerSlider::on_slider_value_changed() { @@ -432,7 +446,7 @@ ZoomCorrRulerSlider::on_slider_value_changed() Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setDouble("/options/zoomcorrection/value", _slider.get_value() / 100.0); _sb.set_value(_slider.get_value()); - _ruler.redraw(); + _ruler.queue_draw(); freeze = false; } } @@ -446,7 +460,7 @@ ZoomCorrRulerSlider::on_spinbutton_value_changed() Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setDouble("/options/zoomcorrection/value", _sb.get_value() / 100.0); _slider.set_value(_sb.get_value()); - _ruler.redraw(); + _ruler.queue_draw(); freeze = false; } } @@ -463,7 +477,7 @@ ZoomCorrRulerSlider::on_unit_changed() { double conv = _unit.getConversion(_unit.getUnitAbbr(), "px"); _ruler.set_unit_conversion(conv); if (_ruler.get_visible()) { - _ruler.redraw(); + _ruler.queue_draw(); } } diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index bfe0deaba..646a8b2fa 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -101,8 +101,6 @@ public: ZoomCorrRuler(int width = 100, int height = 20); void set_size(int x, int y); void set_unit_conversion(double conv) { _unitconv = conv; } - void set_cairo_context(Cairo::RefPtr<Cairo::Context> cr); - void redraw(); int width() { return _min_width + _border*2; } @@ -110,7 +108,12 @@ public: static const double textpadding; private: +#if !WITH_GTKMM_3_0 bool on_expose_event(GdkEventExpose *event); +#endif + + bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr); + void draw_marks(Cairo::RefPtr<Cairo::Context> cr, double dist, int major_interval); double _unitconv; diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 1ac083276..d7be6c9f0 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -76,11 +76,11 @@ GType sp_button_get_type(void) static void sp_button_class_init (SPButtonClass *klass) { - GObjectClass *object_class=(GObjectClass *)klass; - GtkWidgetClass *widget_class=(GtkWidgetClass *)klass; - GtkButtonClass *button_class=(GtkButtonClass *)klass; + GObjectClass *object_class=G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class=GTK_WIDGET_CLASS(klass); + GtkButtonClass *button_class=GTK_BUTTON_CLASS(klass); - parent_class = (GtkToggleButtonClass *)g_type_class_peek_parent (klass); + parent_class = GTK_TOGGLE_BUTTON_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = sp_button_dispose; #if GTK_CHECK_VERSION(3,0,0) @@ -123,7 +123,7 @@ static void sp_button_dispose(GObject *object) button->c_set_active.~connection(); button->c_set_sensitive.~connection(); - ((GObjectClass *) (parent_class))->dispose(object); + (G_OBJECT_CLASS(parent_class))->dispose(object); } @@ -185,7 +185,7 @@ sp_button_clicked (GtkButton *button) SPButton *sp_button=SP_BUTTON (button); if (sp_button->type == SP_BUTTON_TYPE_TOGGLE) { - ((GtkButtonClass *) (parent_class))->clicked (button); + (GTK_BUTTON_CLASS(parent_class))->clicked (button); } } @@ -230,7 +230,7 @@ sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPA // The Inkscape style is no-relief buttons gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); - return (GtkWidget *) button; + return GTK_WIDGET(button); } void @@ -287,7 +287,7 @@ sp_button_set_action (SPButton *button, SPAction *action) } } - sp_button_set_composed_tooltip ((GtkWidget *) button, action); + sp_button_set_composed_tooltip(GTK_WIDGET(button), action); } static void diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 3791ec73c..a7432c32a 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -303,8 +303,8 @@ sp_desktop_widget_class_init (SPDesktopWidgetClass *klass) { dtw_parent_class = SP_VIEW_WIDGET_CLASS(g_type_class_peek_parent(klass)); - GObjectClass *object_class = (GObjectClass *) klass; - GtkWidgetClass *widget_class = (GtkWidgetClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); object_class->dispose = sp_desktop_widget_dispose; @@ -321,8 +321,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) new (&dtw->modified_connection) sigc::connection(); - GtkWidget *widget = GTK_WIDGET (dtw); - dtw->window = 0; dtw->desktop = NULL; dtw->_interaction_disabled_counter = 0; @@ -330,7 +328,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) /* Main table */ #if GTK_CHECK_VERSION(3,0,0) dtw->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_set_homogeneous(GTK_BOX(dtw->vbox), FALSE); #else dtw->vbox = gtk_vbox_new (FALSE, 0); #endif @@ -338,7 +335,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) dtw->statusbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_set_homogeneous(GTK_BOX(dtw->statusbar), FALSE); #else dtw->statusbar = gtk_hbox_new (FALSE, 0); #endif @@ -355,7 +351,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) dtw->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_set_homogeneous(GTK_BOX(dtw->hbox), FALSE); #else dtw->hbox = gtk_hbox_new(FALSE, 0); #endif @@ -381,11 +376,9 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) GtkWidget *eventbox = gtk_event_box_new (); dtw->hruler = sp_ruler_new(GTK_ORIENTATION_HORIZONTAL); dtw->hruler_box = eventbox; - sp_ruler_set_metric(SP_RULER(dtw->hruler), SP_PT); + sp_ruler_set_unit(SP_RULER(dtw->hruler), SP_PT); gtk_widget_set_tooltip_text (dtw->hruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT)))); gtk_container_add (GTK_CONTAINER (eventbox), dtw->hruler); - guint xthickness = gtk_widget_get_style(widget)->xthickness; - guint ythickness = gtk_widget_get_style(widget)->ythickness; g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_hruler_event), dtw); g_signal_connect (G_OBJECT (eventbox), "button_release_event", G_CALLBACK (sp_dt_hruler_event), dtw); g_signal_connect (G_OBJECT (eventbox), "motion_notify_event", G_CALLBACK (sp_dt_hruler_event), dtw); @@ -394,21 +387,16 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) GtkWidget *tbl = gtk_grid_new(); GtkWidget *canvas_tbl = gtk_grid_new(); - gtk_widget_set_margin_left(eventbox, xthickness); - gtk_widget_set_margin_right(eventbox, xthickness); - - gtk_widget_set_halign(eventbox, GTK_ALIGN_FILL); - gtk_widget_set_hexpand(eventbox, TRUE); - gtk_widget_set_valign(eventbox, GTK_ALIGN_START); - gtk_grid_attach(GTK_GRID(canvas_tbl), eventbox, 1, 0, 1, 1); #else GtkWidget *tbl = gtk_table_new(2, 3, FALSE); GtkWidget *canvas_tbl = gtk_table_new(3, 3, FALSE); - gtk_table_attach(GTK_TABLE (canvas_tbl), eventbox, 1, 2, 0, 1, - GTK_FILL, GTK_FILL, - xthickness, 0); + gtk_table_attach(GTK_TABLE(canvas_tbl), + eventbox, + 1, 2, 0, 1, + GTK_FILL, GTK_FILL, + 0, 0); #endif gtk_box_pack_start( GTK_BOX(dtw->hbox), tbl, TRUE, TRUE, 1 ); @@ -417,23 +405,18 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) eventbox = gtk_event_box_new (); dtw->vruler = sp_ruler_new(GTK_ORIENTATION_VERTICAL); dtw->vruler_box = eventbox; - sp_ruler_set_metric (SP_RULER (dtw->vruler), SP_PT); + sp_ruler_set_unit (SP_RULER (dtw->vruler), SP_PT); gtk_widget_set_tooltip_text (dtw->vruler_box, gettext(sp_unit_get_plural (&sp_unit_get_by_id(SP_UNIT_PT)))); gtk_container_add (GTK_CONTAINER (eventbox), GTK_WIDGET (dtw->vruler)); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_margin_top(eventbox, ythickness); - gtk_widget_set_margin_bottom(eventbox, ythickness); - - gtk_widget_set_halign(eventbox, GTK_ALIGN_START); - gtk_widget_set_valign(eventbox, GTK_ALIGN_FILL); - gtk_widget_set_vexpand(eventbox, TRUE); - gtk_grid_attach(GTK_GRID(canvas_tbl), eventbox, 0, 1, 1, 1); #else - gtk_table_attach(GTK_TABLE (canvas_tbl), eventbox, 0, 1, 1, 2, - GTK_FILL, GTK_FILL, - 0, ythickness); + gtk_table_attach(GTK_TABLE (canvas_tbl), + eventbox, + 0, 1, 1, 2, + GTK_FILL, GTK_FILL, + 0, 0); #endif g_signal_connect (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (sp_dt_vruler_event), dtw); @@ -441,15 +424,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect (G_OBJECT (eventbox), "motion_notify_event", G_CALLBACK (sp_dt_vruler_event), dtw); // Horizontal scrollbar - dtw->hadj = (GtkAdjustment *) gtk_adjustment_new (0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0); + 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_halign(dtw->hscrollbar, GTK_ALIGN_FILL); - gtk_widget_set_hexpand(dtw->hscrollbar, TRUE); gtk_grid_attach(GTK_GRID(canvas_tbl), dtw->hscrollbar, 1, 2, 1, 1); dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_set_homogeneous(GTK_BOX(dtw->vscrollbar_box), FALSE); #else dtw->hscrollbar = gtk_hscrollbar_new (GTK_ADJUSTMENT (dtw->hadj)); gtk_table_attach(GTK_TABLE (canvas_tbl), dtw->hscrollbar, 1, 2, 2, 3, @@ -469,7 +449,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect (G_OBJECT (dtw->sticky_zoom), "toggled", G_CALLBACK (sp_dtw_sticky_zoom_toggled), dtw); // Vertical scrollbar - dtw->vadj = (GtkAdjustment *) gtk_adjustment_new (0.0, -4000.0, 4000.0, 10.0, 100.0, 4.0); + dtw->vadj = 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->vscrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT(dtw->vadj)); @@ -480,8 +460,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->vscrollbar, TRUE, TRUE, 0); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_valign(dtw->vscrollbar, GTK_ALIGN_FILL); - gtk_widget_set_vexpand(dtw->vscrollbar, TRUE); gtk_grid_attach(GTK_GRID(canvas_tbl), dtw->vscrollbar_box, 2, 0, 1, 2); #else gtk_table_attach(GTK_TABLE(canvas_tbl), dtw->vscrollbar_box, 2, 3, 0, 2, @@ -561,8 +539,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) g_signal_connect (G_OBJECT (dtw->canvas), "event", G_CALLBACK (sp_desktop_widget_event), dtw); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_halign(GTK_WIDGET(dtw->canvas), GTK_ALIGN_FILL); - gtk_widget_set_valign(GTK_WIDGET(dtw->canvas), GTK_ALIGN_FILL); gtk_widget_set_hexpand(GTK_WIDGET(dtw->canvas), TRUE); gtk_widget_set_vexpand(GTK_WIDGET(dtw->canvas), TRUE); gtk_grid_attach(GTK_GRID(canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 1, 1, 1); @@ -578,7 +554,12 @@ 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(); +#else Gtk::HPaned *paned = new Gtk::HPaned(); +#endif + paned->pack1(*Glib::wrap(canvas_tbl)); paned->pack2(dtw->dock->getWidget(), Gtk::FILL); @@ -591,8 +572,6 @@ 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_widget_set_halign(GTK_WIDGET(paned->gobj()), GTK_ALIGN_FILL); - gtk_widget_set_valign(GTK_WIDGET(paned->gobj()), GTK_ALIGN_FILL); gtk_grid_attach(GTK_GRID(tbl), 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), @@ -603,8 +582,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) #if GTK_CHECK_VERSION(3,0,0) gtk_widget_set_hexpand(GTK_WIDGET(canvas_tbl), TRUE); gtk_widget_set_vexpand(GTK_WIDGET(canvas_tbl), TRUE); - gtk_widget_set_halign(GTK_WIDGET(canvas_tbl), GTK_ALIGN_FILL); - gtk_widget_set_valign(GTK_WIDGET(canvas_tbl), GTK_ALIGN_FILL); gtk_grid_attach(GTK_GRID(tbl), GTK_WIDGET (canvas_tbl), 1, 1, 1, 1); #else gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), @@ -811,7 +788,7 @@ static void sp_desktop_widget_dispose(GObject *object) void SPDesktopWidget::updateTitle(gchar const* uri) { - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); if (window) { gchar const *fname = uri; @@ -1121,7 +1098,7 @@ SPDesktopWidget::shutdown() switch (response) { case GTK_RESPONSE_YES: { - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); doc->doRef(); sp_namedview_document_from_window(desktop); @@ -1185,7 +1162,7 @@ SPDesktopWidget::shutdown() { doc->doRef(); - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); if (sp_file_save_dialog(*window, doc, Inkscape::Extension::FILE_SAVE_METHOD_INKSCAPE_SVG)) { doc->doUnref(); @@ -1297,7 +1274,7 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h) gboolean vis = gtk_widget_get_visible (GTK_WIDGET(this)); (void)vis; // TODO figure out why it is here but not used. - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); if (window) { @@ -1309,7 +1286,7 @@ SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h) void SPDesktopWidget::setWindowPosition (Geom::Point p) { - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); if (window) { @@ -1320,7 +1297,7 @@ SPDesktopWidget::setWindowPosition (Geom::Point p) void SPDesktopWidget::setWindowSize (gint w, gint h) { - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); if (window) { @@ -1338,10 +1315,10 @@ SPDesktopWidget::setWindowSize (gint w, gint h) void SPDesktopWidget::setWindowTransient (void *p, int transient_policy) { - Gtk::Window *window = (Gtk::Window*)g_object_get_data(G_OBJECT(this), "window"); + Gtk::Window *window = static_cast<Gtk::Window*>(g_object_get_data(G_OBJECT(this), "window")); if (window) { - GtkWindow *w = (GtkWindow *) window->gobj(); + GtkWindow *w = GTK_WINDOW(window->gobj()); gtk_window_set_transient_for (GTK_WINDOW(p), w); /* @@ -1586,7 +1563,7 @@ SPDesktopWidget::setToolboxSelectOneValue (gchar const *id, int value) { gpointer hb = sp_search_by_data_recursive(aux_toolbox, (gpointer) id); if (hb) { - ege_select_one_action_set_active((EgeSelectOneAction*) hb, value); + ege_select_one_action_set_active(EGE_SELECT_ONE_ACTION(hb), value); } } @@ -1712,55 +1689,28 @@ void SPDesktopWidget::viewSetPosition (Geom::Point p) { Geom::Point const origin = ( p - ruler_origin ); - gdouble hlower, hupper, hmax_range; - gdouble vlower, vupper, vmax_range; - sp_ruler_get_range(SP_RULER(hruler), &hlower, &hupper, NULL, &hmax_range); - sp_ruler_set_range(SP_RULER(hruler), hlower, hupper, origin[Geom::X], hmax_range); - sp_ruler_get_range(SP_RULER(vruler), &vlower, &vupper, NULL, &vmax_range); - sp_ruler_set_range(SP_RULER(vruler), vlower, vupper, origin[Geom::Y], vmax_range); + sp_ruler_set_position(SP_RULER(hruler), origin[Geom::X]); + sp_ruler_set_position(SP_RULER(vruler), origin[Geom::Y]); } void sp_desktop_widget_update_rulers (SPDesktopWidget *dtw) { - sp_desktop_widget_update_hruler(dtw); - sp_desktop_widget_update_vruler(dtw); -} - -void -sp_desktop_widget_update_hruler (SPDesktopWidget *dtw) -{ - /* The viewbox (in integers) must exactly match the size of SPCanvasbuf's pixel buffer. - * This is important because the former is being used for drawing the ruler, whereas - * the latter is used for drawing e.g. the grids and guides. Only when the viewbox - * coincides with the pixel buffer, everything will line up nicely. - */ - Geom::IntRect viewbox = dtw->canvas->getViewboxIntegers(); - gdouble position; + Geom::Rect viewbox = dtw->desktop->get_display_area(); - double const scale = dtw->desktop->current_zoom(); - double s = viewbox.min()[Geom::X] / scale - dtw->ruler_origin[Geom::X]; - double e = viewbox.max()[Geom::X] / scale - dtw->ruler_origin[Geom::X]; - sp_ruler_get_range(SP_RULER(dtw->hruler), NULL, NULL, &position, NULL); - sp_ruler_set_range(SP_RULER(dtw->hruler), s, e, position, (e - s)); -} - -void -sp_desktop_widget_update_vruler (SPDesktopWidget *dtw) -{ - /* The viewbox (in integers) must exactly match the size of SPCanvasbuf's pixel buffer. - * This is important because the former is being used for drawing the ruler, whereas - * the latter is used for drawing e.g. the grids and guides. Only when the viewbox - * coincides with the pixel buffer, everything will line up nicely. - */ - Geom::IntRect viewbox = dtw->canvas->getViewboxIntegers(); - gdouble position; + double lower_x = dtw->dt2r * (viewbox.left() - dtw->ruler_origin[Geom::X]); + double upper_x = dtw->dt2r * (viewbox.right() - dtw->ruler_origin[Geom::X]); + sp_ruler_set_range(SP_RULER(dtw->hruler), + lower_x, + upper_x, + (upper_x - lower_x)); - double const scale = dtw->desktop->current_zoom(); - double s = viewbox.min()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y]; - double e = viewbox.max()[Geom::Y] / -scale - dtw->ruler_origin[Geom::Y]; - sp_ruler_get_range(SP_RULER(dtw->vruler), NULL, NULL, &position, NULL); - sp_ruler_set_range(SP_RULER(dtw->vruler), s, e, position, (e - s)); + double lower_y = dtw->dt2r * (viewbox.bottom() - dtw->ruler_origin[Geom::Y]); + double upper_y = dtw->dt2r * (viewbox.top() - dtw->ruler_origin[Geom::Y]); + sp_ruler_set_range(SP_RULER(dtw->vruler), + lower_y, + upper_y, + (upper_y - lower_y)); } @@ -1772,8 +1722,8 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags) this->dt2r = 1.0 / nv->doc_units->unittobase; this->ruler_origin = Geom::Point(0,0); //nv->gridorigin; Why was the grid origin used here? - sp_ruler_set_metric(SP_RULER (this->vruler), nv->getDefaultMetric()); - sp_ruler_set_metric(SP_RULER (this->hruler), nv->getDefaultMetric()); + sp_ruler_set_unit(SP_RULER (this->vruler), nv->getDefaultMetric()); + sp_ruler_set_unit(SP_RULER (this->hruler), nv->getDefaultMetric()); /* This loops through all the grandchildren of aux toolbox, * and for each that it finds, it performs an sp_search_by_data_recursive(), diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index dde511612..b17dcf470 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -113,7 +113,7 @@ GType sp_font_selector_get_type() static void sp_font_selector_class_init(SPFontSelectorClass *c) { - GObjectClass *object_class = (GObjectClass *) c; + GObjectClass *object_class = G_OBJECT_CLASS(c); fs_parent_class = (GtkHBoxClass* )g_type_class_peek_parent (c); @@ -285,7 +285,7 @@ static void sp_font_selector_family_select_row(GtkTreeSelection *selection, for ( ; list ; list = list->next ) { gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, (char*)list->data, -1); + gtk_list_store_set (store, &iter, 0, static_cast<char*>(list->data), -1); } gtk_tree_view_set_model (GTK_TREE_VIEW (fsel->style_treeview), GTK_TREE_MODEL (store)); @@ -433,7 +433,7 @@ GtkWidget *sp_font_selector_new() { SPFontSelector *fsel = SP_FONT_SELECTOR(g_object_new(SP_TYPE_FONT_SELECTOR, NULL)); - return (GtkWidget *) fsel; + return GTK_WIDGET(fsel); } /* @@ -453,7 +453,7 @@ unsigned int sp_font_selector_get_best_style (font_instance *font, GList *list) char *incomingFontString = pango_font_description_to_string(incomingFont); - tempFont = (font_factory::Default())->FaceFromUIStrings(family.c_str(), (char*)list->data); + tempFont = (font_factory::Default())->FaceFromUIStrings(family.c_str(), static_cast<char*>(list->data)); PangoFontDescription *bestMatchForFont = NULL; if (tempFont) { @@ -469,7 +469,7 @@ unsigned int sp_font_selector_get_best_style (font_instance *font, GList *list) while (list) { currentStyleNumber++; - tempFont = font_factory::Default()->FaceFromUIStrings(family.c_str(), (char*)list->data); + tempFont = font_factory::Default()->FaceFromUIStrings(family.c_str(), static_cast<char*>(list->data)); PangoFontDescription *currentMatchForFont = NULL; if (tempFont) { diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp index 359a41167..2d58355db 100644 --- a/src/widgets/gradient-image.cpp +++ b/src/widgets/gradient-image.cpp @@ -69,8 +69,8 @@ GType sp_gradient_image_get_type(void) static void sp_gradient_image_class_init(SPGradientImageClass *klass) { - GtkWidgetClass *widget_class = (GtkWidgetClass *) klass; - parent_class = (GtkWidgetClass*)g_type_class_peek_parent (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); + parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent (klass)); #if GTK_CHECK_VERSION(3,0,0) // GObjectClass *object_class = G_OBJECT_CLASS(klass); @@ -80,7 +80,7 @@ static void sp_gradient_image_class_init(SPGradientImageClass *klass) widget_class->draw = sp_gradient_image_draw; widget_class->destroy = sp_gradient_image_destroy; #else - GtkObjectClass *object_class = (GtkObjectClass *) klass; + GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass); object_class->destroy = sp_gradient_image_destroy; widget_class->size_request = sp_gradient_image_size_request; @@ -120,8 +120,8 @@ static void sp_gradient_image_destroy(GtkObject *object) if (parent_class->destroy) (* (parent_class)->destroy) (object); #else - if (((GtkObjectClass *) (parent_class))->destroy) - (* ((GtkObjectClass *) (parent_class))->destroy) (object); + if ((GTK_OBJECT_CLASS(parent_class))->destroy) + (* (GTK_OBJECT_CLASS(parent_class))->destroy) (object); #endif } @@ -196,7 +196,7 @@ sp_gradient_image_new (SPGradient *gradient) sp_gradient_image_set_gradient (image, gradient); - return (GtkWidget *) image; + return GTK_WIDGET(image); } GdkPixbuf* diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 89a891284..2c6774fe9 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -86,9 +86,9 @@ GType sp_gradient_selector_get_type(void) static void sp_gradient_selector_class_init(SPGradientSelectorClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); - parent_class = (GtkVBoxClass*)g_type_class_peek_parent (klass); + parent_class = GTK_VBOX_CLASS(g_type_class_peek_parent (klass)); signals[GRABBED] = g_signal_new ("grabbed", G_TYPE_FROM_CLASS(object_class), @@ -196,7 +196,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel) gtk_box_pack_start( GTK_BOX(sel), hb, FALSE, FALSE, 0 ); sel->add = gtk_button_new (); - gtk_button_set_image((GtkButton*)sel->add , gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) ); + gtk_button_set_image(GTK_BUTTON(sel->add), gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR ) ); sel->nonsolid.push_back(sel->add); gtk_box_pack_start (GTK_BOX (hb), sel->add, FALSE, FALSE, 0); @@ -207,7 +207,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel) gtk_widget_set_tooltip_text( sel->add, _("Create a duplicate gradient")); sel->edit = gtk_button_new (); - gtk_button_set_image((GtkButton*)sel->edit , gtk_image_new_from_stock ( GTK_STOCK_EDIT, GTK_ICON_SIZE_SMALL_TOOLBAR ) ); + gtk_button_set_image(GTK_BUTTON(sel->edit), gtk_image_new_from_stock ( GTK_STOCK_EDIT, GTK_ICON_SIZE_SMALL_TOOLBAR ) ); sel->nonsolid.push_back(sel->edit); gtk_box_pack_start (GTK_BOX (hb), sel->edit, FALSE, FALSE, 0); @@ -217,7 +217,7 @@ static void sp_gradient_selector_init(SPGradientSelector *sel) gtk_widget_set_tooltip_text( sel->edit, _("Edit gradient")); sel->del = gtk_button_new (); - gtk_button_set_image((GtkButton*)sel->del , gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) ); + gtk_button_set_image(GTK_BUTTON(sel->del), gtk_image_new_from_stock ( GTK_STOCK_REMOVE, GTK_ICON_SIZE_SMALL_TOOLBAR ) ); sel->swatch_widgets.push_back(sel->del); gtk_box_pack_start (GTK_BOX (hb), sel->del, FALSE, FALSE, 0); @@ -251,8 +251,8 @@ static void sp_gradient_selector_dispose(GObject *object) sel->text_renderer = NULL; } - if (((GObjectClass *) (parent_class))->dispose) { - (* ((GObjectClass *) (parent_class))->dispose) (object); + if ((G_OBJECT_CLASS(parent_class))->dispose) { + (* (G_OBJECT_CLASS(parent_class))->dispose) (object); } } @@ -267,7 +267,7 @@ GtkWidget *sp_gradient_selector_new() { SPGradientSelector *sel = SP_GRADIENT_SELECTOR(g_object_new (SP_TYPE_GRADIENT_SELECTOR, NULL)); - return (GtkWidget *) sel; + return GTK_WIDGET(sel); } void SPGradientSelector::setMode(SelectorMode mode) diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index 51013a2cd..3a95b552a 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -609,7 +609,7 @@ static void update_stop_list( GtkWidget *vb, SPGradient *gradient, SPStop *new_s if (!combo_box) { return; } - GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (GTK_COMBO_BOX(combo_box)); + GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box))); if (!store) { return; } @@ -720,7 +720,7 @@ static SPStop *get_selected_stop( GtkWidget *vb) if (combo_box) { GtkTreeIter iter; if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo_box), &iter)) { - GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (GTK_COMBO_BOX(combo_box)); + GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box))); gtk_tree_model_get (GTK_TREE_MODEL(store), &iter, 2, &stop, -1); } } @@ -931,7 +931,7 @@ static GtkWidget * sp_gradient_vector_widget_new(SPGradient *gradient, SPStop *s /* Adjustment */ GtkAdjustment *Offset_adj = NULL; - Offset_adj= (GtkAdjustment *) gtk_adjustment_new(0.0, 0.0, 1.0, 0.01, 0.01, 0.0); + Offset_adj= GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 1.0, 0.01, 0.01, 0.0)); g_object_set_data(G_OBJECT(vb), "offset", Offset_adj); SPStop *stop = get_selected_stop(vb); @@ -1197,10 +1197,10 @@ static void sp_gradient_vector_widget_destroy(GtkWidget *object, gpointer /*data static void sp_gradient_vector_widget_destroy(GtkObject *object, gpointer /*data*/) #endif { - SPObject *gradient = reinterpret_cast<SPObject*>(g_object_get_data(G_OBJECT(object), "gradient")); + SPObject *gradient = SP_OBJECT(g_object_get_data(G_OBJECT(object), "gradient")); - sigc::connection *release_connection = (sigc::connection *)g_object_get_data(G_OBJECT(object), "gradient_release_connection"); - sigc::connection *modified_connection = (sigc::connection *)g_object_get_data(G_OBJECT(object), "gradient_modified_connection"); + sigc::connection *release_connection = static_cast<sigc::connection *>(g_object_get_data(G_OBJECT(object), "gradient_release_connection")); + sigc::connection *modified_connection = static_cast<sigc::connection *>(g_object_get_data(G_OBJECT(object), "gradient_modified_connection")); if (gradient) { g_assert( release_connection != NULL ); @@ -1316,7 +1316,7 @@ static void sp_gradient_vector_color_changed(SPColorSelector *csel, GObject *obj if (combo_box) { GtkTreeIter iter; if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX(combo_box), &iter)) { - GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (GTK_COMBO_BOX(combo_box)); + GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combo_box))); Inkscape::UI::Widget::ColorPreview *cp = Gtk::manage(new Inkscape::UI::Widget::ColorPreview(sp_stop_get_rgba32(stop))); GdkPixbuf *pb = cp->toPixbuf(64, 16); diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index d3b7e2dbb..ff443504d 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -164,13 +164,10 @@ GType SPIcon::getType() void IconImpl::classInit(SPIconClass *klass) { - GObjectClass *object_class; - GtkWidgetClass *widget_class; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); - object_class = (GObjectClass *) klass; - widget_class = (GtkWidgetClass *) klass; - - parent_class = (GtkWidgetClass*)g_type_class_peek_parent(klass); + parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(klass)); object_class->dispose = IconImpl::dispose; @@ -205,7 +202,7 @@ void IconImpl::dispose(GObject *object) icon->name = 0; } - ((GObjectClass *) (parent_class))->dispose(object); + (G_OBJECT_CLASS(parent_class))->dispose(object); } void IconImpl::reset( SPIcon *icon ) @@ -865,7 +862,7 @@ GtkWidget *IconImpl::newFull( Inkscape::IconSize lsize, gchar const *name ) if ( dump ) { g_message( "skipped gtk '%s' %d (not GTK_IMAGE_STOCK)", name, lsize ); } - //g_object_unref( (GObject *)img ); + //g_object_unref(G_OBJECT(img)); img = 0; } } @@ -1022,7 +1019,7 @@ int IconImpl::getPhysSize(int size) "inkscape-decoration" }; - GtkWidget *icon = (GtkWidget *)g_object_new(SP_TYPE_ICON, NULL); + 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; @@ -1075,7 +1072,7 @@ int IconImpl::getPhysSize(int size) GdkPixbuf *IconImpl::loadPixmap(gchar const *name, unsigned /*lsize*/, unsigned psize) { - gchar *path = (gchar *) g_strdup_printf("%s/%s.png", INKSCAPE_PIXMAPDIR, name); + gchar *path = g_strdup_printf("%s/%s.png", INKSCAPE_PIXMAPDIR, name); // TODO: bulia, please look over gsize bytesRead = 0; gsize bytesWritten = 0; @@ -1089,7 +1086,7 @@ GdkPixbuf *IconImpl::loadPixmap(gchar const *name, unsigned /*lsize*/, unsigned g_free(localFilename); g_free(path); if (!pb) { - path = (gchar *) g_strdup_printf("%s/%s.xpm", INKSCAPE_PIXMAPDIR, name); + path = g_strdup_printf("%s/%s.xpm", INKSCAPE_PIXMAPDIR, name); // TODO: bulia, please look over gsize bytesRead = 0; gsize bytesWritten = 0; diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 5a6e774f5..b0738b6a6 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -157,9 +157,9 @@ GType sp_paint_selector_get_type(void) static void sp_paint_selector_class_init(SPPaintSelectorClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS(klass); - parent_class = (GtkVBoxClass*)g_type_class_peek_parent(klass); + parent_class = GTK_VBOX_CLASS(g_type_class_peek_parent(klass)); psel_signals[MODE_CHANGED] = g_signal_new("mode_changed", G_TYPE_FROM_CLASS(object_class), @@ -311,8 +311,8 @@ static void sp_paint_selector_dispose(GObject *object) // clean up our long-living pattern menu g_object_set_data(G_OBJECT(psel),"patternmenu",NULL); - if (((GObjectClass *) parent_class)->dispose) - (* ((GObjectClass *) parent_class)->dispose)(object); + if ((G_OBJECT_CLASS(parent_class))->dispose) + (* (G_OBJECT_CLASS(parent_class))->dispose)(object); } static GtkWidget *sp_paint_selector_style_button_add(SPPaintSelector *psel, @@ -655,7 +655,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec if ((psel->mode == SPPaintSelector::MODE_COLOR_RGB) || (psel->mode == SPPaintSelector::MODE_COLOR_CMYK)) { /* Already have color selector */ - csel = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "color-selector"); + csel = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "color-selector")); } else { sp_paint_selector_clear_frame(psel); @@ -732,7 +732,7 @@ static void sp_paint_selector_set_mode_gradient(SPPaintSelector *psel, SPPaintSe if ((psel->mode == SPPaintSelector::MODE_GRADIENT_LINEAR) || (psel->mode == SPPaintSelector::MODE_GRADIENT_RADIAL)) { /* Already have gradient selector */ - gsel = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "gradient-selector"); + gsel = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "gradient-selector")); } else { sp_paint_selector_clear_frame(psel); /* Create new gradient selector */ @@ -799,7 +799,7 @@ ink_pattern_list_get (SPDocument *source) GSList *pl = NULL; GSList const *patterns = source->getResourceList("pattern"); - for (GSList *l = (GSList *) patterns; l != NULL; l = l->next) { + for (GSList *l = const_cast<GSList *>(patterns); l != NULL; l = l->next) { if (SP_PATTERN(l->data) == pattern_getroot(SP_PATTERN(l->data))) { // only if this is a root pattern pl = g_slist_prepend(pl, l->data); } @@ -995,7 +995,7 @@ static void sp_paint_selector_set_mode_pattern(SPPaintSelector *psel, SPPaintSel if (psel->mode == SPPaintSelector::MODE_PATTERN) { /* Already have pattern menu */ - tbl = (GtkWidget*)g_object_get_data(G_OBJECT(psel->selector), "pattern-selector"); + tbl = GTK_WIDGET(g_object_get_data(G_OBJECT(psel->selector), "pattern-selector")); } else { sp_paint_selector_clear_frame(psel); @@ -1081,7 +1081,7 @@ SPPattern *SPPaintSelector::getPattern() SPPattern *pat = 0; g_return_val_if_fail((mode == MODE_PATTERN) , NULL); - GtkWidget *combo = (GtkWidget *) g_object_get_data(G_OBJECT(this), "patternmenu"); + GtkWidget *combo = GTK_WIDGET(g_object_get_data(G_OBJECT(this), "patternmenu")); /* no pattern menu if we were just selected */ if ( combo == NULL ) { diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index d0e71d2b0..87942f141 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -242,7 +242,7 @@ static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GObject *obj) // fixme: make settable gdouble tolerance = 4; - adj = (GtkAdjustment*)g_object_get_data(obj, "tolerance"); + adj = GTK_ADJUSTMENT(g_object_get_data(obj, "tolerance")); gtk_adjustment_set_value(adj, tolerance); gtk_adjustment_value_changed(adj); @@ -282,7 +282,7 @@ public: } g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) ); - GtkAdjustment * adj = (GtkAdjustment*)g_object_get_data(tbl, "tolerance"); + GtkAdjustment * adj = GTK_ADJUSTMENT(g_object_get_data(tbl, "tolerance")); double v = val.getDouble(adj->value); gtk_adjustment_set_value(adj, v); diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 5104d5a9d..c1f9be2a5 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -1,5 +1,18 @@ /* - * Customized ruler class for inkscape + * Customized ruler class for inkscape. Note that this is a fork of + * the GimpRuler widget from GIMP: libgimpwidgets/gimpruler.c. + * The GIMP code is released under the GPL 3. The GIMP code itself + * is a fork of the now-obsolete GtkRuler widget from GTK+ 2. + * + * Major differences between implementations in Inkscape and GIMP are + * as follows: + * - We use a 1,2,4,8... scale for inches and 1,2,5,10... for everything + * else. GIMP uses 1,2,5,10... for everything. + * + * - We use a default font size of PANGO_SCALE_X_SMALL for labels, + * GIMP uses PANGO_SCALE_SMALL (i.e., a bit larger than ours). + * + * - We abbreviate large numbers in tick-labels (e.g., 10000 -> 10k) * * Authors: * Lauris Kaplinski <lauris@kaplinski.com> @@ -7,6 +20,7 @@ * bulia byak <buliabyak@users.sf.net> * Diederik van Lierop <mail@diedenrezi.nl> * Jon A. Cruz <jon@joncruz.org> + * Alex Valavanis <valavanisalex@gmail.com> * * Copyright (C) 1999-2011 authors * @@ -18,143 +32,178 @@ #include <cstdio> #include "widget-sizes.h" -#include "desktop-widget.h" #include "ruler.h" #include "unit-constants.h" #include "round.h" #include <glibmm/i18n.h> -#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB - -#define MINIMUM_INCR 5 -#define MAXIMUM_SUBDIVIDE 5 -#define MAXIMUM_SCALES 10 - #define ROUND(x) ((int) ((x) + 0.5)) -struct _SPRulerPrivate -{ - GtkOrientation orientation; - SPRulerMetric *metric; +#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 -#if GTK_CHECK_VERSION(3,0,0) - cairo_surface_t *backing_store; -#else - GdkPixmap *backing_store; -#endif - - gint slider_size; - gint xsrc; - gint ysrc; - - gdouble lower; /* The upper limit of the ruler (in points) */ - gdouble upper; /* The lower limit of the ruler */ - gdouble position; /* The position of the mark on the ruler */ - gdouble max_size; /* The maximum size of the ruler */ -}; enum { PROP_0, PROP_ORIENTATION, + PROP_UNIT, PROP_LOWER, PROP_UPPER, PROP_POSITION, - PROP_MAX_SIZE, - PROP_METRIC + PROP_MAX_SIZE }; -static void sp_ruler_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void sp_ruler_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void sp_ruler_realize (GtkWidget *widget); -static void sp_ruler_unrealize (GtkWidget *widget); -static void sp_ruler_size_request (GtkWidget *widget, - GtkRequisition *requisition); -#if GTK_CHECK_VERSION(3,0,0) -static void sp_ruler_get_preferred_width (GtkWidget *widget, - gint *minimal_width, - gint *natural_width); +/* All distances below are in 1/72nd's of an inch. (According to + * Adobe, that's a point, but points are really 1/72.27 in.) + */ +typedef struct +{ + GtkOrientation orientation; + SPMetric unit; + gdouble lower; + gdouble upper; + gdouble position; + gdouble max_size; + + GdkWindow *input_window; + cairo_surface_t *backing_store; + PangoLayout *layout; + gdouble font_scale; + + gint xsrc; + gint ysrc; -static void sp_ruler_get_preferred_height (GtkWidget *widget, - gint *minimal_height, - gint *natural_height); -#endif + GList *track_widgets; +} SPRulerPrivate; + +#define SP_RULER_GET_PRIVATE(ruler) \ + G_TYPE_INSTANCE_GET_PRIVATE (ruler, SP_TYPE_RULER, SPRulerPrivate) + + +struct SPRulerMetric +{ + gdouble ruler_scale[16]; + gint subdivide[5]; +}; + +// Ruler metric for general use. +static SPRulerMetric const ruler_metric_general = { + { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 25000, 50000, 100000 }, + { 1, 5, 10, 50, 100 } +}; + +// Ruler metric for inch scales. +static SPRulerMetric const ruler_metric_inches = { + { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768 }, + { 1, 2, 4, 8, 16 } +}; + +static void sp_ruler_dispose (GObject *object); +static void sp_ruler_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void sp_ruler_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); + +static void sp_ruler_realize (GtkWidget *widget); +static void sp_ruler_unrealize (GtkWidget *widget); +static void sp_ruler_map (GtkWidget *widget); +static void sp_ruler_unmap (GtkWidget *widget); +static void sp_ruler_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); -static void sp_ruler_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static gboolean sp_ruler_motion_notify (GtkWidget *widget, - GdkEventMotion *event); #if GTK_CHECK_VERSION(3,0,0) -static gboolean sp_ruler_draw (GtkWidget *widget, - cairo_t *cr); +static void sp_ruler_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width); + +static void sp_ruler_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height); +static void sp_ruler_style_updated (GtkWidget *widget); #else -static gboolean sp_ruler_expose (GtkWidget *widget, - GdkEventExpose *event); +static void sp_ruler_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void sp_ruler_style_set (GtkWidget *widget, + GtkStyle *prev_style); #endif -static void sp_ruler_make_pixmap (SPRuler *ruler); -static void sp_ruler_draw_ticks (SPRuler *ruler); -static void sp_ruler_real_draw_ticks (SPRuler *ruler, - cairo_t *cr); -static void sp_ruler_real_draw_pos (SPRuler *ruler, - cairo_t *cr); - -#define SP_RULER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), SP_TYPE_RULER, SPRulerPrivate)) - -// Note: const casts are due to SPRuler being const-broken and not scheduled for any more fixes. -/// Ruler metrics. -static SPRulerMetric const sp_ruler_metrics[] = { - // NOTE: the order of records in this struct must correspond to the SPMetric enum. - {const_cast<gchar*>("NONE"), const_cast<gchar*>(""), 1, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("millimeters"), const_cast<gchar*>("mm"), PX_PER_MM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("centimeters"), const_cast<gchar*>("cm"), PX_PER_CM, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("inches"), const_cast<gchar*>("in"), PX_PER_IN, { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512 }, { 1, 2, 4, 8, 16 }}, - {const_cast<gchar*>("feet"), const_cast<gchar*>("ft"), PX_PER_FT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("points"), const_cast<gchar*>("pt"), PX_PER_PT, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("picas"), const_cast<gchar*>("pc"), PX_PER_PC, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("pixels"), const_cast<gchar*>("px"), PX_PER_PX, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, - {const_cast<gchar*>("meters"), const_cast<gchar*>("m"), PX_PER_M, { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000 }, { 1, 5, 10, 50, 100 }}, -}; -G_DEFINE_TYPE_WITH_CODE (SPRuler, sp_ruler, GTK_TYPE_WIDGET, - G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, - NULL)) +static gboolean sp_ruler_motion_notify (GtkWidget *widget, + GdkEventMotion *event); +static gboolean sp_ruler_draw (GtkWidget *widget, + 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 void sp_ruler_draw_pos (SPRuler *ruler); +static void sp_ruler_make_pixmap (SPRuler *ruler); + +static PangoLayout * sp_ruler_get_layout (GtkWidget *widget, + const gchar *text); + + +G_DEFINE_TYPE (SPRuler, sp_ruler, GTK_TYPE_WIDGET) + +#define parent_class sp_ruler_parent_class + static void sp_ruler_class_init (SPRulerClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gobject_class->set_property = sp_ruler_set_property; - gobject_class->get_property = sp_ruler_get_property; + object_class->dispose = sp_ruler_dispose; + object_class->set_property = sp_ruler_set_property; + object_class->get_property = sp_ruler_get_property; - widget_class->realize = sp_ruler_realize; - widget_class->unrealize = sp_ruler_unrealize; + widget_class->realize = sp_ruler_realize; + widget_class->unrealize = sp_ruler_unrealize; + widget_class->map = sp_ruler_map; + widget_class->unmap = sp_ruler_unmap; + widget_class->size_allocate = sp_ruler_size_allocate; #if GTK_CHECK_VERSION(3,0,0) - widget_class->get_preferred_width = sp_ruler_get_preferred_width; + widget_class->get_preferred_width = sp_ruler_get_preferred_width; widget_class->get_preferred_height = sp_ruler_get_preferred_height; - widget_class->draw = sp_ruler_draw; + widget_class->style_updated = sp_ruler_style_updated; + widget_class->draw = sp_ruler_draw; #else - widget_class->size_request = sp_ruler_size_request; - widget_class->expose_event = sp_ruler_expose; + widget_class->size_request = sp_ruler_size_request; + widget_class->style_set = sp_ruler_style_set; + widget_class->expose_event = sp_ruler_expose; #endif - widget_class->size_allocate = sp_ruler_size_allocate; widget_class->motion_notify_event = sp_ruler_motion_notify; - klass->draw_ticks = sp_ruler_real_draw_ticks; - klass->draw_pos = sp_ruler_real_draw_pos; - - g_object_class_override_property (gobject_class, - PROP_ORIENTATION, - "orientation"); - - g_object_class_install_property (gobject_class, + g_type_class_add_private (object_class, sizeof (SPRulerPrivate)); + + g_object_class_install_property (object_class, + PROP_ORIENTATION, + g_param_spec_enum ("orientation", + _("Orientation"), + _("The orientation of the ruler"), + GTK_TYPE_ORIENTATION, + GTK_ORIENTATION_HORIZONTAL, + static_cast<GParamFlags>(GTK_PARAM_READWRITE))); + + /* FIXME: Should probably use g_param_spec_enum */ + g_object_class_install_property (object_class, + PROP_UNIT, + g_param_spec_uint ("unit", + _("Unit"), + _("Unit of the ruler"), + 0, 8, + SP_PX, + static_cast<GParamFlags>(GTK_PARAM_READWRITE))); + + g_object_class_install_property (object_class, PROP_LOWER, g_param_spec_double ("lower", _("Lower"), @@ -164,7 +213,7 @@ sp_ruler_class_init (SPRulerClass *klass) 0.0, static_cast<GParamFlags>(GTK_PARAM_READWRITE))); - g_object_class_install_property (gobject_class, + g_object_class_install_property (object_class, PROP_UPPER, g_param_spec_double ("upper", _("Upper"), @@ -174,7 +223,7 @@ sp_ruler_class_init (SPRulerClass *klass) 0.0, static_cast<GParamFlags>(GTK_PARAM_READWRITE))); - g_object_class_install_property (gobject_class, + g_object_class_install_property (object_class, PROP_POSITION, g_param_spec_double ("position", _("Position"), @@ -184,7 +233,7 @@ sp_ruler_class_init (SPRulerClass *klass) 0.0, static_cast<GParamFlags>(GTK_PARAM_READWRITE))); - g_object_class_install_property (gobject_class, + g_object_class_install_property (object_class, PROP_MAX_SIZE, g_param_spec_double ("max-size", _("Max Size"), @@ -193,75 +242,65 @@ sp_ruler_class_init (SPRulerClass *klass) G_MAXDOUBLE, 0.0, static_cast<GParamFlags>(GTK_PARAM_READWRITE))); - /** - * SPRuler:metric: - * - * The metric used for the ruler. - * - * TODO: This should probably use g_param_spec_enum - */ - g_object_class_install_property (gobject_class, - PROP_METRIC, - g_param_spec_uint("metric", - _("Metric"), - _("The metric used for the ruler"), - 0, 8, - SP_PX, - static_cast<GParamFlags>(GTK_PARAM_READWRITE))); - g_type_class_add_private (gobject_class, sizeof (SPRulerPrivate)); + gtk_widget_class_install_style_property (widget_class, + g_param_spec_double ("font-scale", + NULL, NULL, + 0.0, + G_MAXDOUBLE, + DEFAULT_RULER_FONT_SCALE, + G_PARAM_READABLE)); } static void sp_ruler_init (SPRuler *ruler) { - ruler->priv = G_TYPE_INSTANCE_GET_PRIVATE(ruler, - SP_TYPE_RULER, - SPRulerPrivate); - - SPRulerPrivate *priv = ruler->priv; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - priv->orientation = GTK_ORIENTATION_HORIZONTAL; + gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE); + priv->orientation = GTK_ORIENTATION_HORIZONTAL; + priv->unit = SP_PX; + priv->lower = 0; + priv->upper = 0; + priv->position = 0; + priv->max_size = 0; priv->backing_store = NULL; - priv->xsrc = 0; - priv->ysrc = 0; - priv->slider_size = 0; - priv->lower = 0; - priv->upper = 0; - priv->position = 0; - priv->max_size = 0; + priv->font_scale = DEFAULT_RULER_FONT_SCALE; - sp_ruler_set_metric(ruler, SP_PX); +#if GTK_CHECK_VERSION(3,0,0) + const gchar *str = + "SPRuler {\n" + " background-color: @bg_color;\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 } - -/** - * sp_ruler_invalidate_ticks: - * @ruler: the ruler to invalidate - * - * For performance reasons, #SPRuler keeps a backbuffer containing the - * prerendered contents of the ticks. To cause a repaint of this buffer, - * call this function instead of gtk_widget_queue_draw(). - **/ -static void sp_ruler_invalidate_ticks(SPRuler *ruler) +static void +sp_ruler_dispose (GObject *object) { - g_return_if_fail(SP_IS_RULER(ruler)); + SPRuler *ruler = SP_RULER (object); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - if(ruler->priv->backing_store == NULL) - return; + while (priv->track_widgets) + sp_ruler_remove_track_widget (ruler, GTK_WIDGET(priv->track_widgets->data)); - sp_ruler_draw_ticks(ruler); - gtk_widget_queue_draw(GTK_WIDGET(ruler)); + G_OBJECT_CLASS (parent_class)->dispose (object); } /** * sp_ruler_set_range: - * @ruler: the gtkdeprecatedruler + * @ruler: the SPRuler * @lower: the lower limit of the ruler * @upper: the upper limit of the ruler - * @position: the mark on the ruler * @max_size: the maximum size of the ruler used when calculating the space to * leave for the text * @@ -269,14 +308,15 @@ static void sp_ruler_invalidate_ticks(SPRuler *ruler) */ void sp_ruler_set_range (SPRuler *ruler, - gdouble lower, - gdouble upper, - gdouble position, - gdouble max_size) + gdouble lower, + gdouble upper, + gdouble max_size) { + SPRulerPrivate *priv; + g_return_if_fail (SP_IS_RULER (ruler)); - SPRulerPrivate *priv = ruler->priv; + priv = SP_RULER_GET_PRIVATE (ruler); g_object_freeze_notify (G_OBJECT (ruler)); if (priv->lower != lower) @@ -289,11 +329,6 @@ sp_ruler_set_range (SPRuler *ruler, priv->upper = upper; g_object_notify (G_OBJECT (ruler), "upper"); } - if (priv->position != position) - { - priv->position = position; - g_object_notify (G_OBJECT (ruler), "position"); - } if (priv->max_size != max_size) { priv->max_size = max_size; @@ -301,7 +336,7 @@ sp_ruler_set_range (SPRuler *ruler, } g_object_thaw_notify (G_OBJECT (ruler)); - sp_ruler_invalidate_ticks(ruler); + gtk_widget_queue_draw (GTK_WIDGET (ruler)); } /** @@ -309,7 +344,6 @@ sp_ruler_set_range (SPRuler *ruler, * @ruler: a #SPRuler * @lower: (allow-none): location to store lower limit of the ruler, or %NULL * @upper: (allow-none): location to store upper limit of the ruler, or %NULL - * @position: (allow-none): location to store the current position of the mark on the ruler, or %NULL * @max_size: location to store the maximum size of the ruler used when calculating * the space to leave for the text, or %NULL. * @@ -320,19 +354,18 @@ void sp_ruler_get_range (SPRuler *ruler, gdouble *lower, gdouble *upper, - gdouble *position, gdouble *max_size) { + SPRulerPrivate *priv; + g_return_if_fail (SP_IS_RULER (ruler)); - SPRulerPrivate *priv = ruler->priv; + priv = SP_RULER_GET_PRIVATE (ruler); if (lower) *lower = priv->lower; if (upper) *upper = priv->upper; - if (position) - *position = priv->position; if (max_size) *max_size = priv->max_size; } @@ -344,7 +377,7 @@ sp_ruler_set_property (GObject *object, GParamSpec *pspec) { SPRuler *ruler = SP_RULER (object); - SPRulerPrivate *priv = ruler->priv; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); switch (prop_id) { @@ -352,25 +385,35 @@ sp_ruler_set_property (GObject *object, priv->orientation = static_cast<GtkOrientation>(g_value_get_enum (value)); gtk_widget_queue_resize (GTK_WIDGET (ruler)); break; + + case PROP_UNIT: + sp_ruler_set_unit (ruler, static_cast<SPMetric>(g_value_get_int (value))); + break; + case PROP_LOWER: - sp_ruler_set_range (ruler, g_value_get_double (value), priv->upper, - priv->position, priv->max_size); + sp_ruler_set_range (ruler, + g_value_get_double (value), + priv->upper, + priv->max_size); break; case PROP_UPPER: - sp_ruler_set_range (ruler, priv->lower, g_value_get_double (value), - priv->position, priv->max_size); + sp_ruler_set_range (ruler, + priv->lower, + g_value_get_double (value), + priv->max_size); break; + case PROP_POSITION: - sp_ruler_set_range (ruler, priv->lower, priv->upper, - g_value_get_double (value), priv->max_size); + sp_ruler_set_position (ruler, g_value_get_double (value)); break; + case PROP_MAX_SIZE: - sp_ruler_set_range (ruler, priv->lower, priv->upper, - priv->position, g_value_get_double (value)); - break; - case PROP_METRIC: - sp_ruler_set_metric(ruler, static_cast<SPMetric>(g_value_get_enum (value))); + sp_ruler_set_range (ruler, + priv->lower, + priv->upper, + g_value_get_double (value)); break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -384,13 +427,17 @@ sp_ruler_get_property (GObject *object, GParamSpec *pspec) { SPRuler *ruler = SP_RULER (object); - SPRulerPrivate *priv = ruler->priv; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); switch (prop_id) { case PROP_ORIENTATION: g_value_set_enum (value, priv->orientation); break; + + case PROP_UNIT: + g_value_set_int (value, priv->unit); + break; case PROP_LOWER: g_value_set_double (value, priv->lower); break; @@ -403,262 +450,326 @@ sp_ruler_get_property (GObject *object, case PROP_MAX_SIZE: g_value_set_double (value, priv->max_size); break; - case PROP_METRIC: - g_value_set_enum(value, sp_ruler_get_metric(ruler)); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } - -/** - * sp_ruler_get_metric: - * @ruler: a #SPRuler - * - * Gets the units used for a #SPRuler. See sp_ruler_set_metric(). - * - * Return value: the units currently used for @ruler - **/ -SPMetric sp_ruler_get_metric(SPRuler *ruler) +static void +sp_ruler_realize (GtkWidget *widget) { - g_return_val_if_fail(SP_IS_RULER(ruler), static_cast<SPMetric>(0)); - SPRulerPrivate *priv = ruler->priv; - - for (size_t i = 0; i < G_N_ELEMENTS(sp_ruler_metrics); i++) { - if (priv->metric == &sp_ruler_metrics[i]) { - return static_cast<SPMetric>(i); - } - } - - g_assert_not_reached (); - - return static_cast<SPMetric>(0); -} - + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation allocation; + GdkWindowAttr attributes; + gint attributes_mask; -static void sp_ruler_draw_ticks(SPRuler *ruler) -{ - g_return_if_fail(SP_IS_RULER(ruler)); - SPRulerPrivate *priv = ruler->priv; + GTK_WIDGET_CLASS (sp_ruler_parent_class)->realize (widget); + + gtk_widget_get_allocation (widget, &allocation); + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; + attributes.wclass = GDK_INPUT_ONLY; #if GTK_CHECK_VERSION(3,0,0) - cairo_t *cr = cairo_create(priv->backing_store); + attributes.event_mask = (gtk_widget_get_events (widget) | + GDK_EXPOSURE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK); #else - cairo_t *cr = gdk_cairo_create(priv->backing_store); + attributes.event_mask = (gtk_widget_get_events (widget) | + GDK_EXPOSURE_MASK | + GDK_POINTER_MOTION_MASK); #endif - if (SP_RULER_GET_CLASS(ruler)->draw_ticks) - SP_RULER_GET_CLASS(ruler)->draw_ticks(ruler, cr); + attributes_mask = GDK_WA_X | GDK_WA_Y; - cairo_destroy(cr); -} + priv->input_window = gdk_window_new (gtk_widget_get_parent_window (widget), + &attributes, attributes_mask); + gdk_window_set_user_data (priv->input_window, ruler); + sp_ruler_make_pixmap (ruler); +} -static void sp_ruler_realize(GtkWidget *widget) +static void +sp_ruler_unrealize(GtkWidget *widget) { - GtkAllocation allocation; - SPRuler *ruler; - GdkWindow *window; - GdkWindowAttr attributes; - gint attributes_mask; + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); - ruler = SP_RULER (widget); + if (priv->backing_store) + { + cairo_surface_destroy (priv->backing_store); + priv->backing_store = NULL; + } + + if (priv->layout) + { + g_object_unref (priv->layout); + priv->layout = NULL; + } - gtk_widget_set_realized (widget, TRUE); + if (priv->input_window) + { + gdk_window_destroy (priv->input_window); + priv->input_window = NULL; + } - gtk_widget_get_allocation(widget, &allocation); + GTK_WIDGET_CLASS (sp_ruler_parent_class)->unrealize (widget); +} - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = allocation.x; - attributes.y = allocation.y; - attributes.width = allocation.width; - attributes.height = allocation.height; - attributes.wclass = GDK_INPUT_OUTPUT; - attributes.visual = gtk_widget_get_visual (widget); - attributes.event_mask = gtk_widget_get_events (widget); - attributes.event_mask |= (GDK_EXPOSURE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_POINTER_MOTION_HINT_MASK); - - attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; - - window = gdk_window_new(gtk_widget_get_parent_window (widget), - &attributes, attributes_mask); - gtk_widget_set_window(widget, window); - gdk_window_set_user_data(window, ruler); +static void +sp_ruler_map (GtkWidget *widget) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); -#if GTK_CHECK_VERSION(3,0,0) - gtk_style_context_set_background(gtk_widget_get_style_context(widget), - window); -#else - gtk_widget_style_attach(widget); - gtk_style_set_background(gtk_widget_get_style(widget), - window, GTK_STATE_ACTIVE); -#endif + GTK_WIDGET_CLASS (sp_ruler_parent_class)->map (widget); - sp_ruler_make_pixmap (ruler); + if (priv->input_window) + gdk_window_show (priv->input_window); } -static void sp_ruler_unrealize(GtkWidget *widget) +static void +sp_ruler_unmap (GtkWidget *widget) { - SPRuler *ruler = SP_RULER (widget); - SPRulerPrivate *priv = ruler->priv; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); - if (priv->backing_store) + if (priv->input_window) + gdk_window_hide (priv->input_window); + + GTK_WIDGET_CLASS (sp_ruler_parent_class)->unmap (widget); +} + +static void +sp_ruler_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + SPRuler *ruler = SP_RULER(widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation widget_allocation; + gboolean resized; + + gtk_widget_get_allocation (widget, &widget_allocation); + + resized = (widget_allocation.width != allocation->width || + widget_allocation.height != allocation->height); + + gtk_widget_set_allocation(widget, allocation); + + if (gtk_widget_get_realized (widget)) { -#if GTK_CHECK_VERSION(3,0,0) - cairo_surface_destroy(priv->backing_store); -#else - g_object_unref(priv->backing_store); -#endif - priv->backing_store = NULL; + gdk_window_move_resize (priv->input_window, + allocation->x, allocation->y, + allocation->width, allocation->height); + + if (resized) + sp_ruler_make_pixmap (ruler); } - - GTK_WIDGET_CLASS (sp_ruler_parent_class)->unrealize (widget); } -static void sp_ruler_size_request(GtkWidget *widget, - GtkRequisition *requisition) +static void +sp_ruler_size_request (GtkWidget *widget, + GtkRequisition *requisition) { - SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); - GtkStyle *style = gtk_widget_get_style(widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + PangoLayout *layout; + PangoRectangle ink_rect; + gint size; + + layout = sp_ruler_get_layout (widget, "0123456789"); + pango_layout_get_pixel_extents (layout, &ink_rect, NULL); + + size = 2 + ink_rect.height * 1.7; + +#if GTK_CHECK_VERSION(3,0,0) + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkBorder border; + + gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border); + + requisition->width = border.left + border.right; + requisition->height = border.top + border.bottom; +#else + GtkStyle *style = gtk_widget_get_style(widget); +#endif if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { +#if GTK_CHECK_VERSION(3,0,0) + requisition->width += 1; + requisition->height += size; +#else requisition->width = style->xthickness * 2 + 1; - requisition->height = style->ythickness * 2 + RULER_WIDTH; + requisition->height = style->ythickness * 2 + size; +#endif } else { - requisition->width = style->xthickness * 2 + RULER_WIDTH; +#if GTK_CHECK_VERSION(3,0,0) + requisition->width += size; + requisition->height += 1; +#else + requisition->width = style->xthickness * 2 + size; requisition->height = style->ythickness * 2 + 1; +#endif } } +static void #if GTK_CHECK_VERSION(3,0,0) -static void sp_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) +sp_ruler_style_updated (GtkWidget *widget) +#else +sp_ruler_style_set (GtkWidget *widget, + GtkStyle *prev_style) +#endif { - GtkRequisition requisition; - sp_ruler_size_request(widget, &requisition); - *minimal_width = *natural_width = requisition.width; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + +#if GTK_CHECK_VERSION(3,0,0) + GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_updated (widget); +#else + GTK_WIDGET_CLASS (sp_ruler_parent_class)->style_set (widget, prev_style); +#endif + + gtk_widget_style_get (widget, + "font-scale", &priv->font_scale, + NULL); + + if (priv->layout) + { + g_object_unref (priv->layout); + priv->layout = NULL; + } } -static void sp_ruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) +#if GTK_CHECK_VERSION(3,0,0) +static void +sp_ruler_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { - GtkRequisition requisition; - sp_ruler_size_request(widget, &requisition); - *minimal_height = *natural_height = requisition.height; + GtkRequisition requisition; + + sp_ruler_size_request (widget, &requisition); + + *minimum_width = *natural_width = requisition.width; } -#endif -static void sp_ruler_size_allocate(GtkWidget *widget, GtkAllocation *allocation) +static void +sp_ruler_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height) { - SPRuler *ruler = SP_RULER(widget); - GtkAllocation old_allocation; - gtk_widget_get_allocation(widget, &old_allocation); + GtkRequisition requisition; + + sp_ruler_size_request(widget, &requisition); + + *minimum_height = *natural_height = requisition.height; +} +#else +static gboolean +sp_ruler_expose (GtkWidget *widget, + GdkEventExpose *event) +{ + cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); + GtkAllocation allocation; + + gdk_cairo_region (cr, event->region); + cairo_clip (cr); - gboolean resized = (old_allocation.width != allocation->width || - old_allocation.height != allocation->height); + gtk_widget_get_allocation (widget, &allocation); + cairo_translate (cr, allocation.x, allocation.y); - gtk_widget_set_allocation(widget, allocation); + gboolean result = sp_ruler_draw (widget, cr); - if (gtk_widget_get_realized (widget)) - { - gdk_window_move_resize(gtk_widget_get_window(widget), - allocation->x, allocation->y, - allocation->width, allocation->height); + cairo_destroy (cr); - if(resized) - sp_ruler_make_pixmap (ruler); - } + return result; } - -#if GTK_CHECK_VERSION(3,0,0) -static gboolean sp_ruler_draw(GtkWidget *widget, - cairo_t *cr) -#else -static gboolean sp_ruler_expose(GtkWidget *widget, - GdkEventExpose *event) #endif + +static gboolean +sp_ruler_draw (GtkWidget *widget, + cairo_t *cr) { - SPRuler *ruler = SP_RULER (widget); - SPRulerPrivate *priv = ruler->priv; + SPRuler *ruler = SP_RULER (widget); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + + sp_ruler_draw_ticks (ruler); -#if GTK_CHECK_VERSION(3,0,0) cairo_set_source_surface(cr, priv->backing_store, 0, 0); cairo_paint(cr); -#else - cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget)); - gdk_cairo_set_source_pixmap(cr, priv->backing_store, 0, 0); - gdk_cairo_region(cr, event->region); - cairo_fill(cr); -#endif - - if (SP_RULER_GET_CLASS(ruler)->draw_pos) - SP_RULER_GET_CLASS(ruler)->draw_pos(ruler, cr); -#if !GTK_CHECK_VERSION(3,0,0) - cairo_destroy (cr); -#endif + sp_ruler_draw_pos (ruler); return FALSE; } -static void sp_ruler_make_pixmap(SPRuler *ruler) +static void +sp_ruler_make_pixmap (SPRuler *ruler) { - SPRulerPrivate *priv = ruler->priv; - GtkWidget *widget = GTK_WIDGET(ruler); + GtkWidget *widget = GTK_WIDGET (ruler); + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation allocation; - GtkAllocation allocation; gtk_widget_get_allocation(widget, &allocation); if (priv->backing_store) -#if GTK_CHECK_VERSION(3,0,0) - cairo_surface_destroy(priv->backing_store); - - priv->backing_store = gdk_window_create_similar_surface(gtk_widget_get_window(widget), - CAIRO_CONTENT_COLOR, - allocation.width, - allocation.height); -#else - g_object_unref(priv->backing_store); - - priv->backing_store = gdk_pixmap_new(gtk_widget_get_window(widget), - allocation.width, - allocation.height, - -1); -#endif - - priv->xsrc = 0; - priv->ysrc = 0; + cairo_surface_destroy (priv->backing_store); - sp_ruler_draw_ticks(ruler); + priv->backing_store = + gdk_window_create_similar_surface (gtk_widget_get_window (widget), + CAIRO_CONTENT_COLOR, + allocation.width, + allocation.height); } - -static void sp_ruler_real_draw_pos(SPRuler *ruler, - cairo_t *cr) +static void +sp_ruler_draw_pos (SPRuler *ruler) { - GtkAllocation allocation; - GtkWidget *widget = GTK_WIDGET (ruler); - SPRulerPrivate *priv = ruler->priv; - gint x, y; - gint bs_width, bs_height; - gdouble increment; + GtkWidget *widget = GTK_WIDGET (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; + + if (! gtk_widget_is_drawable (widget)) + return; - GtkStyle *style = gtk_widget_get_style(widget); gtk_widget_get_allocation(widget, &allocation); - gint xthickness = style->xthickness; - gint ythickness = style->ythickness; - gint width = allocation.width; - gint height = allocation.height; +#if GTK_CHECK_VERSION(3,0,0) + gtk_style_context_get_border (context, static_cast<GtkStateFlags>(0), &border); +#else + xthickness = style->xthickness; + ythickness = style->ythickness; +#endif if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - height -= ythickness * 2; + 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 */ @@ -666,7 +777,12 @@ static void sp_ruler_real_draw_pos(SPRuler *ruler, } else { - width -= xthickness * 2; +#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 */ @@ -675,28 +791,62 @@ static void sp_ruler_real_draw_pos(SPRuler *ruler, if ((bs_width > 0) && (bs_height > 0)) { + cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget)); + gdouble lower; + gdouble upper; + gdouble position; + gdouble increment; + + 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); + } + + position = sp_ruler_get_position (ruler); + + sp_ruler_get_range (ruler, &lower, &upper, NULL); + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) { - increment = (gdouble) width / (priv->upper - priv->lower); + increment = (gdouble) width / (upper - lower); - x = ROUND ((priv->position - priv->lower) * increment) + (xthickness - bs_width) / 2 - 1; +#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 / (priv->upper - priv->lower); + 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 ((priv->position - priv->lower) * increment) + (ythickness - bs_height) / 2 - 1; + y = ROUND ((position - lower) * increment) + (ythickness - bs_height) / 2 - 1; +#endif } #if GTK_CHECK_VERSION(3,0,0) - GtkStyleContext *sc = gtk_widget_get_style_context(widget); - GdkRGBA color; - gtk_style_context_get_color(sc, gtk_widget_get_state_flags(widget), &color); - gdk_cairo_set_source_rgba(cr, &color); + gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget), + &color); + gdk_cairo_set_source_rgba (cr, &color); #else - gdk_cairo_set_source_color(cr, &style->fg[gtk_widget_get_state(widget)]); + gdk_cairo_set_source_color (cr, &style->fg[state]); #endif cairo_move_to (cr, x, y); @@ -714,246 +864,636 @@ static void sp_ruler_real_draw_pos(SPRuler *ruler, cairo_fill (cr); + cairo_destroy (cr); + priv->xsrc = x; priv->ysrc = y; } } +/** + * sp_ruler_new: + * @orientation: the ruler's orientation + * + * Creates a new ruler. + * + * Return value: a new #SPRuler widget. + */ +GtkWidget * +sp_ruler_new (GtkOrientation orientation) +{ + return GTK_WIDGET (g_object_new (SP_TYPE_RULER, + "orientation", orientation, + NULL)); +} -#define UNUSED_PIXELS 2 // There appear to be two pixels that are not being used at each end of the ruler +static void +sp_ruler_update_position (SPRuler *ruler, + gdouble x, + gdouble y) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + GtkAllocation allocation; + gdouble lower; + gdouble upper; + + gtk_widget_get_allocation (GTK_WIDGET (ruler), &allocation); + sp_ruler_get_range (ruler, &lower, &upper, NULL); -GtkWidget* sp_ruler_new(GtkOrientation orientation) + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + sp_ruler_set_position (ruler, + lower + + (upper - lower) * x / allocation.width); + } + else + { + sp_ruler_set_position (ruler, + lower + + (upper - lower) * y / allocation.height); + } +} + +/* Returns TRUE if a translation should be done */ +static gboolean +gtk_widget_get_translation_to_window (GtkWidget *widget, + GdkWindow *window, + int *x, + int *y) { - return GTK_WIDGET(g_object_new(SP_TYPE_RULER, - "orientation", orientation, - NULL)); + GdkWindow *w, *widget_window; + + if (! gtk_widget_get_has_window (widget)) + { + GtkAllocation allocation; + + gtk_widget_get_allocation (widget, &allocation); + + *x = -allocation.x; + *y = -allocation.y; + } + else + { + *x = 0; + *y = 0; + } + + widget_window = gtk_widget_get_window (widget); + + for (w = window; + w && w != widget_window; + w = gdk_window_get_effective_parent (w)) + { + gdouble px, py; + + gdk_window_coords_to_parent (w, *x, *y, &px, &py); + + *x += px; + *y += px; + } + + if (w == NULL) + { + *x = 0; + *y = 0; + return FALSE; + } + + return TRUE; } -static gboolean sp_ruler_motion_notify(GtkWidget *widget, - GdkEventMotion *event) +static void +sp_ruler_event_to_widget_coords (GtkWidget *widget, + GdkWindow *window, + gdouble event_x, + gdouble event_y, + gint *widget_x, + gint *widget_y) { - GtkAllocation allocation; - SPRuler *ruler = SP_RULER(widget); - SPRulerPrivate *priv = ruler->priv; - - gdk_event_request_motions(event); - gint x = event->x; - gint y = event->y; - - gtk_widget_get_allocation(widget, &allocation); + gint tx, ty; + + if (gtk_widget_get_translation_to_window (widget, window, &tx, &ty)) + { + event_x += tx; + event_y += ty; + } + + *widget_x = event_x; + *widget_y = event_y; +} + +static gboolean +sp_ruler_track_widget_motion_notify (GtkWidget *widget, + GdkEventMotion *mevent, + SPRuler *ruler) +{ + gint widget_x; + gint widget_y; + gint ruler_x; + gint ruler_y; + + widget = gtk_get_event_widget (reinterpret_cast<GdkEvent *>(mevent)); + + sp_ruler_event_to_widget_coords (widget, mevent->window, + mevent->x, mevent->y, + &widget_x, &widget_y); + + if (gtk_widget_translate_coordinates (widget, GTK_WIDGET (ruler), + widget_x, widget_y, + &ruler_x, &ruler_y)) + { + sp_ruler_update_position (ruler, ruler_x, ruler_y); + } + + return FALSE; +} + +void +sp_ruler_add_track_widget (SPRuler *ruler, + GtkWidget *widget) +{ + SPRulerPrivate *priv; + + g_return_if_fail (SP_IS_RULER (ruler)); + g_return_if_fail (GTK_IS_WIDGET (ruler)); + + priv = SP_RULER_GET_PRIVATE (ruler); - if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) - priv->position = priv->lower + (priv->upper - priv->lower) * (x + UNUSED_PIXELS) / (allocation.width + 2*UNUSED_PIXELS); - else - priv->position = priv->lower + (priv->upper - priv->lower) * (y + UNUSED_PIXELS) / (allocation.height + 2*UNUSED_PIXELS); + g_return_if_fail (g_list_find (priv->track_widgets, widget) == NULL); - g_object_notify(G_OBJECT(ruler), "position"); + priv->track_widgets = g_list_prepend (priv->track_widgets, widget); - gtk_widget_queue_draw(widget); + g_signal_connect (widget, "motion-notify-event", + G_CALLBACK (sp_ruler_track_widget_motion_notify), + ruler); + g_signal_connect (widget, "destroy", + G_CALLBACK (sp_ruler_remove_track_widget), + ruler); +} - return FALSE; +/** + * sp_ruler_remove_track_widget: + * @ruler: an #SPRuler + * @widget: the track widget to remove + * + * Removes a previously added track widget from the ruler. See + * sp_ruler_add_track_widget(). + */ +void +sp_ruler_remove_track_widget (SPRuler *ruler, + GtkWidget *widget) +{ + SPRulerPrivate *priv; + + g_return_if_fail (SP_IS_RULER (ruler)); + g_return_if_fail (GTK_IS_WIDGET (ruler)); + + priv = SP_RULER_GET_PRIVATE (ruler); + + g_return_if_fail (g_list_find (priv->track_widgets, widget) != NULL); + + priv->track_widgets = g_list_remove (priv->track_widgets, widget); + + g_signal_handlers_disconnect_by_func (widget, + (gpointer) G_CALLBACK (sp_ruler_track_widget_motion_notify), + ruler); + g_signal_handlers_disconnect_by_func (widget, + (gpointer) G_CALLBACK (sp_ruler_remove_track_widget), + ruler); } -static void sp_ruler_real_draw_ticks(SPRuler *ruler, cairo_t *cr) +/** + * sp_ruler_set_unit: + * @ruler: a #SPRuler + * @unit: the #SPMetric to set the ruler to + * + * This sets the unit of the ruler. + */ +void +sp_ruler_set_unit (SPRuler *ruler, + SPMetric unit) { - SPRulerPrivate *priv = ruler->priv; - gint width = 0; - gint height = 0; - gchar unit_str[32]; - gchar digit_str[2] = { '\0', '\0' }; - GtkOrientation orientation; - GtkAllocation allocation; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (ruler); + + g_return_if_fail (SP_IS_RULER (ruler)); - g_return_if_fail (ruler != NULL); + if (priv->unit != unit) + { + priv->unit = unit; + g_object_notify(G_OBJECT(ruler), "unit"); - g_object_get(G_OBJECT(ruler), "orientation", &orientation, NULL); - GtkWidget *widget = GTK_WIDGET (ruler); + gtk_widget_queue_draw (GTK_WIDGET (ruler)); + } +} - PangoContext *pango_context = gtk_widget_get_pango_context (widget); - PangoLayout *pango_layout = pango_layout_new (pango_context); - PangoFontDescription *fs = pango_font_description_new (); - pango_font_description_set_size (fs, RULER_FONT_SIZE); - pango_layout_set_font_description (pango_layout, fs); - pango_font_description_free (fs); +/** + * sp_ruler_get_unit: + * @ruler: a #SPRuler + * + * Return value: the unit currently used in the @ruler widget. + **/ +SPMetric +sp_ruler_get_unit (SPRuler *ruler) +{ + g_return_val_if_fail(SP_IS_RULER(ruler), static_cast<SPMetric>(0)); + + return SP_RULER_GET_PRIVATE (ruler)->unit; +} + +/** + * sp_ruler_set_position: + * @ruler: a #SPRuler + * @position: the position to set the ruler to + * + * This sets the position of the ruler. + */ +void +sp_ruler_set_position (SPRuler *ruler, + gdouble position) +{ + SPRulerPrivate *priv; - gint digit_height = (int) floor (RULER_FONT_SIZE * RULER_FONT_VERTICAL_SPACING / PANGO_SCALE + 0.5); + g_return_if_fail (SP_IS_RULER (ruler)); + priv = SP_RULER_GET_PRIVATE (ruler); + + if (priv->position != position) + { + priv->position = position; + g_object_notify (G_OBJECT (ruler), "position"); + + sp_ruler_draw_pos (ruler); + } +} + +/** + * sp_ruler_get_position: + * @ruler: a #SPRuler + * + * Return value: the current position of the @ruler widget. + */ +gdouble +sp_ruler_get_position (SPRuler *ruler) +{ + g_return_val_if_fail (SP_IS_RULER (ruler), 0.0); + + return SP_RULER_GET_PRIVATE (ruler)->position; +} + +static gboolean +sp_ruler_motion_notify (GtkWidget *widget, + GdkEventMotion *event) +{ + SPRuler *ruler = SP_RULER(widget); + + sp_ruler_update_position (ruler, event->x, event->y); + + return FALSE; +} + +static void +sp_ruler_draw_ticks (SPRuler *ruler) +{ + GtkWidget *widget = GTK_WIDGET (ruler); + #if GTK_CHECK_VERSION(3,0,0) - GtkStyleContext *context = gtk_widget_get_style_context(widget); - GtkStateFlags state = gtk_widget_get_state_flags(widget); - GtkBorder padding; - gtk_style_context_get_padding(context, state, &padding); - gint xthickness = padding.left; - gint ythickness = padding.top; + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GtkBorder border; + GdkRGBA color; #else - GtkStyle *style = gtk_widget_get_style(widget); - gint xthickness = style->xthickness; - gint ythickness = style->ythickness; + 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; + cairo_t *cr; + gint i; + gint width, height; + gint length, ideal_length; + gdouble lower, upper; /* Upper and lower limits, in ruler units */ + gdouble increment; /* Number of pixels per unit */ + guint scale; /* Number of units per major unit */ + gdouble start, end, cur; + gchar unit_str[32]; + gint digit_height; + gint digit_offset; + gchar digit_str[2] = { '\0', '\0' }; + gint text_size; + gint pos; + gdouble max_size; + SPMetric unit; + SPRulerMetric ruler_metric = ruler_metric_general; /* The metric to use for this unit system */ + PangoLayout *layout; + PangoRectangle logical_rect, ink_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<GtkStateFlags>(0), &border); +#else + xthickness = style->xthickness; + ythickness = style->ythickness; +#endif + + layout = sp_ruler_get_layout (widget, "0123456789"); + pango_layout_get_extents (layout, &ink_rect, &logical_rect); - if (orientation == GTK_ORIENTATION_HORIZONTAL) { - width = allocation.width; // in pixels; is apparently 2 pixels shorter than the canvas at each end - height = allocation.height; - } else { - width = allocation.height; - height = allocation.width; - } + digit_height = PANGO_PIXELS (ink_rect.height) + 2; + digit_offset = ink_rect.y; + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + width = allocation.width; #if GTK_CHECK_VERSION(3,0,0) - gtk_render_frame(context, - cr, - 0, 0, - allocation.width, allocation.height); - - gtk_render_background(context, - cr, - 0, 0, - allocation.width, allocation.height); + height = allocation.height - (border.top + border.bottom); #else - gtk_paint_box(style, priv->backing_store, - GTK_STATE_NORMAL, GTK_SHADOW_NONE, NULL, widget, - orientation == GTK_ORIENTATION_HORIZONTAL ? "hruler" : "vruler", - 0, 0, - allocation.width, allocation.height); + height = allocation.height - ythickness * 2; #endif - - cairo_set_line_width(cr, 1.0); + } + else + { + width = allocation.height; +#if GTK_CHECK_VERSION(3,0,0) + height = allocation.width - (border.top + border.bottom); +#else + height = allocation.width - ythickness * 2; +#endif + } + cr = cairo_create (priv->backing_store); + #if GTK_CHECK_VERSION(3,0,0) - GdkRGBA color; - gtk_style_context_get_color(context, - gtk_widget_get_state_flags(widget), - &color); - gdk_cairo_set_source_rgba(cr, &color); + gtk_render_background (context, cr, 0, 0, allocation.width, allocation.height); + gtk_render_frame (context, cr, 0, 0, allocation.width, allocation.height); + + gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget), + &color); + gdk_cairo_set_source_rgba (cr, &color); + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + cairo_rectangle (cr, + border.left, + height + border.top, + allocation.width - (border.left + border.right), + 1); + } + else + { + cairo_rectangle (cr, + height + border.left, + border.top, + 1, + allocation.height - (border.top + border.bottom)); + } #else - gdk_cairo_set_source_color(cr, &style->fg[gtk_widget_get_state(widget)]); + gdk_cairo_set_source_color (cr, &style->bg[state]); + + cairo_paint (cr); + + gdk_cairo_set_source_color(cr, &style->fg[state]); + + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + cairo_rectangle (cr, + xthickness, + height + ythickness, + allocation.width - 2 * xthickness, + 1); + } + else + { + cairo_rectangle (cr, + height + xthickness, + ythickness, + 1, + allocation.height - 2 * ythickness); + } #endif - gdouble upper = priv->upper / priv->metric->pixels_per_unit; // upper and lower are expressed in ruler units - gdouble lower = priv->lower / priv->metric->pixels_per_unit; - /* "pixels_per_unit" should be "points_per_unit". This is the size of the unit - * in 1/72nd's of an inch and has nothing to do with screen pixels */ + sp_ruler_get_range (ruler, &lower, &upper, &max_size); if ((upper - lower) == 0) - return; + goto out; - double increment = (double) (width + 2*UNUSED_PIXELS) / (upper - lower); // screen pixels per ruler unit + increment = (gdouble) width / (upper - lower); /* determine the scale - * For vruler, use the maximum extents of the ruler to determine the largest - * possible number to be displayed. Calculate the height in pixels - * of this displayed text. Use this height to find a scale which - * leaves sufficient room for drawing the ruler. - * For hruler, we calculate the text size as for the vruler instead of using - * text_width = gdk_string_width(font, unit_str), so that the result - * for the scale looks consistent with an accompanying vruler + * Use the maximum extents of the ruler to determine the largest + * possible number to be displayed. Calculate the height in pixels + * of this displayed text. Use this height to find a scale which + * leaves sufficient room for drawing the ruler. + * + * We calculate the text size as for the vruler instead of + * actually measuring the text width, so that the result for the + * scale looks consistent with an accompanying vruler */ - gint scale = (int)(ceil(priv->max_size / priv->metric->pixels_per_unit)); + scale = ceil (priv->max_size); sprintf (unit_str, "%d", scale); - gint text_dimension = strlen (unit_str) * digit_height + 1; + text_size = strlen (unit_str) * digit_height + 1; + + /* Inkscape change to ruler: Use a 1,2,4,8... scale for inches + * or a 1,2,5,10... scale for everything else */ + if (sp_ruler_get_unit (ruler) == SP_IN) + ruler_metric = ruler_metric_inches; - for (scale = 0; scale < MAXIMUM_SCALES; scale++) - if (priv->metric->ruler_scale[scale] * fabs(increment) > 2 * text_dimension) + for (scale = 0; scale < G_N_ELEMENTS (ruler_metric.ruler_scale); scale++) + if (ruler_metric.ruler_scale[scale] * fabs (increment) > 2 * text_size) break; - if (scale == MAXIMUM_SCALES) - scale = MAXIMUM_SCALES - 1; + if (scale == G_N_ELEMENTS (ruler_metric.ruler_scale)) + scale = G_N_ELEMENTS (ruler_metric.ruler_scale) - 1; + + unit = sp_ruler_get_unit (ruler); /* drawing starts here */ - gint length = 0; - for (gint i = MAXIMUM_SUBDIVIDE - 1; i >= 0; i--) { - double subd_incr = priv->metric->ruler_scale[scale] / - priv->metric->subdivide[i]; - if (subd_incr * fabs(increment) <= MINIMUM_INCR) + length = 0; + for (i = G_N_ELEMENTS (ruler_metric.subdivide) - 1; i >= 0; i--) + { + gdouble subd_incr; + + /* hack to get proper subdivisions at full pixels */ + if (unit == SP_PX && scale == 1 && i == 1) + subd_incr = 1.0; + else + subd_incr = ((gdouble) ruler_metric.ruler_scale[scale] / + (gdouble) ruler_metric.subdivide[i]); + + if (subd_incr * fabs (increment) <= MINIMUM_INCR) continue; /* Calculate the length of the tickmarks. Make sure that * this length increases for each set of ticks */ - gint ideal_length = height / (i + 1) - 1; + ideal_length = height / (i + 1) - 1; if (ideal_length > ++length) length = ideal_length; - gdouble start = 0; - gdouble end = 0; - if (lower < upper) { + if (lower < upper) + { start = floor (lower / subd_incr) * subd_incr; end = ceil (upper / subd_incr) * subd_incr; - } else { + } + else + { start = floor (upper / subd_incr) * subd_incr; end = ceil (lower / subd_incr) * subd_incr; - } + } gint tick_index = 0; - gdouble cur = start; // location (in ruler units) of the first invisible tick at the left side of the canvas - while (cur <= end) { + for (cur = start; cur <= end; cur += subd_incr) + { // due to the typical values for cur, lower and increment, pos will often end up to // be e.g. 641.50000000000; rounding behaviour is not defined in such a case (see round.h) // and jitter will be apparent (upon redrawing some of the lines on the ruler might jump a // by a pixel, and jump back on the next redraw). This is suppressed by adding 1e-9 (that's only one nanopixel ;-)) - gint pos = int(Inkscape::round((cur - lower) * increment + 1e-12)) - UNUSED_PIXELS; + pos = gint(Inkscape::round((cur - lower) * increment + 1e-12)); - if (orientation == GTK_ORIENTATION_HORIZONTAL) { - cairo_move_to(cr, pos+0.5, height + ythickness); - cairo_line_to(cr, pos+0.5, height - length + ythickness); - } else { - cairo_move_to(cr, height + xthickness - length, pos+0.5); - cairo_line_to(cr, height + xthickness, pos+0.5); - } +#if GTK_CHECK_VERSION(3,0,0) + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + cairo_rectangle (cr, + pos, height + border.top - length, + 1, length); + } + else + { + cairo_rectangle (cr, + height + border.left - length, pos, + length, 1); + } +#else + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + cairo_rectangle (cr, + pos, height + ythickness - length, + 1, length); + } + else + { + cairo_rectangle (cr, + height + xthickness - length, pos, + length, 1); + } +#endif /* draw label */ - double label_spacing_px = fabs((increment*(double)priv->metric->ruler_scale[scale])/priv->metric->subdivide[i]); + double label_spacing_px = fabs(increment*(double)ruler_metric.ruler_scale[scale]/ruler_metric.subdivide[i]); if (i == 0 && (label_spacing_px > 6*digit_height || tick_index%2 == 0 || cur == 0) && (label_spacing_px > 3*digit_height || tick_index%4 == 0 || cur == 0)) - { + { if (fabs((int)cur) >= 2000 && (((int) cur)/1000)*1000 == ((int) cur)) sprintf (unit_str, "%dk", ((int) cur)/1000); else sprintf (unit_str, "%d", (int) cur); - if (orientation == GTK_ORIENTATION_HORIZONTAL) { - pango_layout_set_text (pango_layout, unit_str, -1); - cairo_move_to(cr, pos+2, 0); - pango_cairo_show_layout(cr, pango_layout); - } else { - for (gint j = 0; j < (int) strlen (unit_str); j++) { + if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) + { + pango_layout_set_text (layout, unit_str, -1); + pango_layout_get_extents (layout, &logical_rect, NULL); + +#if GTK_CHECK_VERSION(3,0,0) + cairo_move_to (cr, + pos + 2, + border.top + PANGO_PIXELS (logical_rect.y - digit_offset)); +#else + cairo_move_to (cr, + pos + 2, + ythickness + PANGO_PIXELS (logical_rect.y - digit_offset)); +#endif + + pango_cairo_show_layout(cr, layout); + } + else + { + gint j; + + for (j = 0; j < (int) strlen (unit_str); j++) + { digit_str[0] = unit_str[j]; - pango_layout_set_text (pango_layout, digit_str, 1); - cairo_move_to(cr, xthickness + 1, pos + digit_height * (j) + 1); - pango_cairo_show_layout(cr, pango_layout); - } - } - - } - /* Calculate cur from start rather than incrementing by subd_incr - * in each iteration. This is to avoid propagation of floating point - * errors in subd_incr. - */ + pango_layout_set_text (layout, digit_str, 1); + pango_layout_get_extents (layout, NULL, &logical_rect); + +#if GTK_CHECK_VERSION(3,0,0) + cairo_move_to (cr, + border.left + 1, + pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset)); +#else + 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); + } + } + } + ++tick_index; - cur = start + tick_index * subd_incr; - cairo_stroke(cr); - } - } -} + } + } + cairo_fill (cr); -void sp_ruler_set_metric(SPRuler *ruler, SPMetric metric) +out: + cairo_destroy (cr); +} + +static PangoLayout* +sp_ruler_create_layout (GtkWidget *widget, + const gchar *text) { - g_return_if_fail(ruler != NULL); - g_return_if_fail(SP_IS_RULER (ruler)); - g_return_if_fail((unsigned) metric < G_N_ELEMENTS(sp_ruler_metrics)); - SPRulerPrivate *priv = ruler->priv; + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + PangoLayout *layout; + PangoAttrList *attrs; + PangoAttribute *attr; - if (metric == 0) - return; + layout = gtk_widget_create_pango_layout (widget, text); - priv->metric = const_cast<SPRulerMetric *>(&sp_ruler_metrics[metric]); + attrs = pango_attr_list_new (); - g_object_notify(G_OBJECT(ruler), "metric"); + attr = pango_attr_scale_new (priv->font_scale); + attr->start_index = 0; + attr->end_index = -1; + pango_attr_list_insert (attrs, attr); - sp_ruler_invalidate_ticks(ruler); + pango_layout_set_attributes (layout, attrs); + pango_attr_list_unref (attrs); + + return layout; +} + +static PangoLayout * +sp_ruler_get_layout (GtkWidget *widget, + const gchar *text) +{ + SPRulerPrivate *priv = SP_RULER_GET_PRIVATE (widget); + + if (priv->layout) + { + pango_layout_set_text (priv->layout, text, -1); + return priv->layout; + } + + priv->layout = sp_ruler_create_layout (widget, text); + + return priv->layout; } + +/* + 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/ruler.h b/src/widgets/ruler.h index d4e21b300..f0d866fff 100644 --- a/src/widgets/ruler.h +++ b/src/widgets/ruler.h @@ -18,6 +18,8 @@ #include <iostream> #include <glib.h> +G_BEGIN_DECLS + #define SP_TYPE_RULER (sp_ruler_get_type ()) #define SP_RULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_RULER, SPRuler)) #define SP_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_RULER, SPRulerClass)) @@ -25,59 +27,45 @@ #define SP_IS_RULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_RULER)) #define SP_RULER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SP_TYPE_RULER, SPRulerClass)) - typedef struct _SPRuler SPRuler; -typedef struct _SPRulerPrivate SPRulerPrivate; typedef struct _SPRulerClass SPRulerClass; -typedef struct _SPRulerMetric SPRulerMetric; -/* All distances below are in 1/72nd's of an inch. (According to - * Adobe that's a point, but points are really 1/72.27 in.) - */ struct _SPRuler { - GtkWidget widget; - - /*< private >*/ - SPRulerPrivate *priv; + GtkWidget parent_instance; }; struct _SPRulerClass { GtkWidgetClass parent_class; - - void (* draw_ticks) (SPRuler *ruler, - cairo_t *cr); - void (* draw_pos) (SPRuler *ruler, - cairo_t *cr); }; -struct _SPRulerMetric -{ - gchar const *metric_name; - gchar const *abbrev; - /* This should be points_per_unit. This is the size of the unit - * in 1/72nd's of an inch and has nothing to do with screen pixels */ - gdouble pixels_per_unit; - gdouble ruler_scale[10]; - gint subdivide[5]; /* five possible modes of subdivision */ -}; +GType sp_ruler_get_type (void) G_GNUC_CONST; + +GtkWidget* sp_ruler_new (GtkOrientation orientation); + +void sp_ruler_add_track_widget (SPRuler *ruler, + GtkWidget *widget); +void sp_ruler_remove_track_widget (SPRuler *ruler, + GtkWidget *widget); + +void sp_ruler_set_unit (SPRuler *ruler, + SPMetric unit); +SPMetric sp_ruler_get_unit (SPRuler *ruler); +void sp_ruler_set_position (SPRuler *ruler, + gdouble set_position); +gdouble sp_ruler_get_position (SPRuler *ruler); +void sp_ruler_set_range (SPRuler *ruler, + gdouble lower, + gdouble upper, + gdouble max_size); +void sp_ruler_get_range (SPRuler *ruler, + gdouble *lower, + gdouble *upper, + gdouble *max_size); -GType sp_ruler_get_type (void) G_GNUC_CONST; -GtkWidget* sp_ruler_new (GtkOrientation orientation); -void sp_ruler_set_range (SPRuler *ruler, - gdouble lower, - gdouble upper, - gdouble position, - gdouble max_size); -void sp_ruler_get_range (SPRuler *ruler, - gdouble *lower, - gdouble *upper, - gdouble *position, - gdouble *max_size); -void sp_ruler_set_metric(SPRuler *ruler, SPMetric metric); -SPMetric sp_ruler_get_metric(SPRuler *ruler); +G_END_DECLS #endif /* __SP_RULER_H__ */ diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index 3ccfa9cf9..549581610 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -88,13 +88,13 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel) if (unit.base == SP_UNIT_DIMENSIONLESS) { double const val = 1. / unit.unittobase; for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) { - GtkAdjustment *a = (GtkAdjustment *) g_object_get_data(G_OBJECT(spw), keyval[i].key); + GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key)); gtk_adjustment_set_value(a, val); tracker->setFullVal( a, keyval[i].val ); } } else { for (unsigned i = 0; i < G_N_ELEMENTS(keyval); ++i) { - GtkAdjustment *a = (GtkAdjustment *) g_object_get_data(G_OBJECT(spw), keyval[i].key); + GtkAdjustment *a = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(spw), keyval[i].key)); gtk_adjustment_set_value(a, sp_pixels_get_units(keyval[i].val, unit)); } } diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp index 80974c2e4..d89d35e9c 100644 --- a/src/widgets/sp-color-icc-selector.cpp +++ b/src/widgets/sp-color-icc-selector.cpp @@ -104,12 +104,9 @@ sp_color_icc_selector_get_type (void) static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass) { static const gchar* nameset[] = {N_("CMS"), 0}; - GObjectClass *object_class = (GObjectClass *) klass; - GtkWidgetClass *widget_class; - SPColorSelectorClass *selector_class; - - widget_class = (GtkWidgetClass *) klass; - selector_class = SP_COLOR_SELECTOR_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); + SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass); parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass)); @@ -453,7 +450,7 @@ void ColorICCSelector::init() #endif /* Adjustment */ - _adj = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 10.0, 10.0); + _adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 255.0, 1.0, 10.0, 10.0)); /* Slider */ _slider = sp_color_slider_new (_adj); @@ -510,8 +507,8 @@ void ColorICCSelector::init() static void sp_color_icc_selector_dispose(GObject *object) { - if (((GObjectClass *) (parent_class))->dispose) - (* ((GObjectClass *) (parent_class))->dispose)(object); + if ((G_OBJECT_CLASS(parent_class))->dispose) + (* (G_OBJECT_CLASS(parent_class))->dispose)(object); } static void @@ -672,7 +669,7 @@ void ColorICCSelector::_profilesChanged( std::string const & name ) g_signal_handler_block( G_OBJECT(_profileSel), _profChangedID ); - GtkListStore *store = (GtkListStore *)gtk_combo_box_get_model (combo); + GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(combo)); gtk_list_store_clear(store); GtkTreeIter iter; @@ -1008,7 +1005,7 @@ void ColorICCSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorICC void ColorICCSelector::_sliderGrabbed( SPColorSlider */*slider*/, SPColorICCSelector */*cs*/ ) { -// ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base); +// ColorICCSelector* iccSelector = dynamic_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base); // if (!iccSelector->_dragging) { // iccSelector->_dragging = TRUE; // iccSelector->_grabbed(); @@ -1018,7 +1015,7 @@ void ColorICCSelector::_sliderGrabbed( SPColorSlider */*slider*/, SPColorICCSele void ColorICCSelector::_sliderReleased( SPColorSlider */*slider*/, SPColorICCSelector */*cs*/ ) { -// ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base); +// ColorICCSelector* iccSelector = dynamic_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base); // if (iccSelector->_dragging) { // iccSelector->_dragging = FALSE; // iccSelector->_released(); @@ -1035,7 +1032,7 @@ void ColorICCSelector::_sliderChanged( SPColorSlider */*slider*/, SPColorICCSele #ifdef DEBUG_LCMS g_message("Changed %p and %p", slider, cs ); #endif // DEBUG_LCMS -// ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base); +// ColorICCSelector* iccSelector = dynamic_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base); // iccSelector->_updateInternals( iccSelector->_color, ColorScales::getScaled( iccSelector->_adj ), iccSelector->_dragging ); } diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp index 95c6d341d..c3f9d511c 100644 --- a/src/widgets/sp-color-scales.cpp +++ b/src/widgets/sp-color-scales.cpp @@ -78,12 +78,9 @@ static void sp_color_scales_class_init (SPColorScalesClass *klass) { static const gchar* nameset[] = {N_("RGB"), N_("HSL"), N_("CMYK"), 0}; - GObjectClass *object_class = (GObjectClass *) klass; - GtkWidgetClass *widget_class; - SPColorSelectorClass *selector_class; - - widget_class = (GtkWidgetClass *) klass; - selector_class = SP_COLOR_SELECTOR_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); + SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass); parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass)); @@ -164,7 +161,7 @@ void ColorScales::init() #endif /* Adjustment */ - _a[i] = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, _rangeLimit, 1.0, 10.0, 10.0); + _a[i] = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, _rangeLimit, 1.0, 10.0, 10.0)); /* Slider */ _s[i] = sp_color_slider_new (_a[i]); gtk_widget_show (_s[i]); @@ -217,8 +214,8 @@ void ColorScales::init() static void sp_color_scales_dispose(GObject *object) { - if (((GObjectClass *) (parent_class))->dispose) - (* ((GObjectClass *) (parent_class))->dispose) (object); + if ((G_OBJECT_CLASS(parent_class))->dispose) + (* (G_OBJECT_CLASS(parent_class))->dispose) (object); } static void @@ -466,7 +463,7 @@ void ColorScales::setMode(SPColorScalesMode mode) gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:")); gtk_widget_set_tooltip_text (_s[3], _("Alpha (opacity)")); gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)")); - sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar*)sp_color_scales_hue_map ()); + sp_color_slider_set_map (SP_COLOR_SLIDER (_s[0]), (guchar *)(sp_color_scales_hue_map())); gtk_widget_hide (_l[4]); gtk_widget_hide (_s[4]); gtk_widget_hide (_b[4]); diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp index 3ba748f2b..37cccda9f 100644 --- a/src/widgets/sp-color-slider.cpp +++ b/src/widgets/sp-color-slider.cpp @@ -86,12 +86,10 @@ sp_color_slider_get_type (void) static void sp_color_slider_class_init(SPColorSliderClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; - GtkWidgetClass *widget_class; + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); - widget_class = (GtkWidgetClass *) klass; - - parent_class = (GtkWidgetClass*)g_type_class_peek_parent (klass); + parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent(klass)); slider_signals[GRABBED] = g_signal_new ("grabbed", G_TYPE_FROM_CLASS(object_class), @@ -185,8 +183,8 @@ static void sp_color_slider_dispose(GObject *object) slider->adjustment = NULL; } - if (((GObjectClass *) (parent_class))->dispose) - (* ((GObjectClass *) (parent_class))->dispose) (object); + if ((G_OBJECT_CLASS(parent_class))->dispose) + (* (G_OBJECT_CLASS(parent_class))->dispose) (object); } static void @@ -311,17 +309,16 @@ sp_color_slider_button_press (GtkWidget *widget, GdkEventButton *event) g_signal_emit (G_OBJECT (slider), slider_signals[DRAGGED], 0); #if GTK_CHECK_VERSION(3,0,0) - gdk_device_grab(gdk_event_get_device((GdkEvent*)event), + gdk_device_grab(gdk_event_get_device(reinterpret_cast<GdkEvent *>(event)), gtk_widget_get_window(widget), GDK_OWNERSHIP_NONE, FALSE, - (GdkEventMask)(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK), + static_cast<GdkEventMask>(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK), NULL, event->time); #else gdk_pointer_grab(gtk_widget_get_window(widget), FALSE, - (GdkEventMask)(GDK_POINTER_MOTION_MASK | - GDK_BUTTON_RELEASE_MASK), + static_cast<GdkEventMask>(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK), NULL, NULL, event->time); #endif } @@ -339,8 +336,8 @@ sp_color_slider_button_release (GtkWidget *widget, GdkEventButton *event) if (event->button == 1) { #if GTK_CHECK_VERSION(3,0,0) - gdk_device_ungrab(gdk_event_get_device((GdkEvent *)event), - gdk_event_get_time((GdkEvent *)event)); + gdk_device_ungrab(gdk_event_get_device(reinterpret_cast<GdkEvent *>(event)), + gdk_event_get_time(reinterpret_cast<GdkEvent *>(event))); #else gdk_pointer_ungrab (event->time); #endif @@ -388,7 +385,7 @@ void sp_color_slider_set_adjustment(SPColorSlider *slider, GtkAdjustment *adjust g_return_if_fail (SP_IS_COLOR_SLIDER (slider)); if (!adjustment) { - adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0); + adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 1.0, 0.01, 0.0, 0.0)); } else { gtk_adjustment_set_page_increment(adjustment, 0.0); gtk_adjustment_set_page_size(adjustment, 0.0); @@ -448,7 +445,7 @@ sp_color_slider_set_map (SPColorSlider *slider, const guchar *map) g_return_if_fail (slider != NULL); g_return_if_fail (SP_IS_COLOR_SLIDER (slider)); - slider->map = (guchar *) map; + slider->map = const_cast<guchar *>(map); gtk_widget_queue_draw (GTK_WIDGET (slider)); } diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp index a979a168a..3e91274d2 100644 --- a/src/widgets/sp-color-wheel-selector.cpp +++ b/src/widgets/sp-color-wheel-selector.cpp @@ -56,12 +56,9 @@ sp_color_wheel_selector_get_type (void) static void sp_color_wheel_selector_class_init(SPColorWheelSelectorClass *klass) { static const gchar* nameset[] = {N_("Wheel"), 0}; - GObjectClass *object_class = (GObjectClass *) klass; - GtkWidgetClass *widget_class; - SPColorSelectorClass *selector_class; - - widget_class = (GtkWidgetClass *) klass; - selector_class = SP_COLOR_SELECTOR_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass); + SPColorSelectorClass *selector_class = SP_COLOR_SELECTOR_CLASS (klass); parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass)); @@ -197,7 +194,7 @@ void ColorWheelSelector::init() #endif /* Adjustment */ - _adj = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 10.0, 10.0); + _adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 255.0, 1.0, 10.0, 10.0)); /* Slider */ _slider = sp_color_slider_new (_adj); @@ -266,8 +263,8 @@ void ColorWheelSelector::init() static void sp_color_wheel_selector_dispose(GObject *object) { - if (((GObjectClass *) (parent_class))->dispose) - (* ((GObjectClass *) (parent_class))->dispose) (object); + if ((G_OBJECT_CLASS(parent_class))->dispose) + (* (G_OBJECT_CLASS(parent_class))->dispose) (object); } static void diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp index 8d840da25..7876f0454 100644 --- a/src/widgets/sp-widget.cpp +++ b/src/widgets/sp-widget.cpp @@ -306,7 +306,7 @@ GtkWidget *SPWidgetImpl::constructGlobal(SPWidget *spw, Inkscape::Application *i g_signal_emit(spw, signals[CONSTRUCT], 0); - return (GtkWidget *) spw; + return GTK_WIDGET(spw); } void SPWidgetImpl::modifySelectionCB(Application *inkscape, Selection *selection, guint flags, SPWidget *spw) diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp index 1fd120d17..47b0ebb9d 100644 --- a/src/widgets/sp-xmlview-attr-list.cpp +++ b/src/widgets/sp-xmlview-attr-list.cpp @@ -68,7 +68,7 @@ GtkWidget *sp_xmlview_attr_list_new (Inkscape::XML::Node * repr) sp_xmlview_attr_list_set_repr (attr_list, repr); - return (GtkWidget *) attr_list; + return GTK_WIDGET(attr_list); } void @@ -114,14 +114,14 @@ GType sp_xmlview_attr_list_get_type(void) void sp_xmlview_attr_list_class_init (SPXMLViewAttrListClass * klass) { #if GTK_CHECK_VERSION(3,0,0) - GtkWidgetClass * widget_class = (GtkWidgetClass *) klass; + GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass); widget_class->destroy = sp_xmlview_attr_list_destroy; #else - GtkObjectClass * object_class = (GtkObjectClass *) klass; + GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass); object_class->destroy = sp_xmlview_attr_list_destroy; #endif - parent_class = (GtkTreeViewClass*)g_type_class_peek_parent (klass); + parent_class = GTK_TREE_VIEW_CLASS(g_type_class_peek_parent (klass)); g_signal_new("row-value-changed", G_TYPE_FROM_CLASS(klass), diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp index d31e031c2..ac64dabdb 100644 --- a/src/widgets/sp-xmlview-content.cpp +++ b/src/widgets/sp-xmlview-content.cpp @@ -59,7 +59,7 @@ GtkWidget *sp_xmlview_content_new(Inkscape::XML::Node * repr) sp_xmlview_content_set_repr (text, repr); - return (GtkWidget *) text; + return GTK_WIDGET(text); } void @@ -107,14 +107,14 @@ GType sp_xmlview_content_get_type(void) void sp_xmlview_content_class_init(SPXMLViewContentClass * klass) { #if GTK_CHECK_VERSION(3,0,0) - GtkWidgetClass * widget_class = (GtkWidgetClass *) klass; + GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass); widget_class->destroy = sp_xmlview_content_destroy; #else - GtkObjectClass * object_class = (GtkObjectClass *) klass; + GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass); object_class->destroy = sp_xmlview_content_destroy; #endif - parent_class = (GtkTextViewClass*)g_type_class_peek_parent (klass); + parent_class = GTK_TEXT_VIEW_CLASS(g_type_class_peek_parent (klass)); } void diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp index 258cea0b4..bc6031c1e 100644 --- a/src/widgets/sp-xmlview-tree.cpp +++ b/src/widgets/sp-xmlview-tree.cpp @@ -122,7 +122,7 @@ GtkWidget *sp_xmlview_tree_new(Inkscape::XML::Node * repr, void * /*factory*/, v g_signal_connect(GTK_TREE_VIEW(tree), "drag_data_received", G_CALLBACK(on_drag_data_received), tree); g_signal_connect(GTK_TREE_VIEW(tree), "drag-motion", G_CALLBACK(do_drag_motion), tree); - return (GtkWidget *) tree; + return GTK_WIDGET(tree); } GType @@ -151,14 +151,14 @@ sp_xmlview_tree_get_type (void) void sp_xmlview_tree_class_init(SPXMLViewTreeClass * klass) { #if GTK_CHECK_VERSION(3,0,0) - GtkWidgetClass * widget_class = (GtkWidgetClass *) klass; + GtkWidgetClass * widget_class = GTK_WIDGET_CLASS(klass); widget_class->destroy = sp_xmlview_tree_destroy; #else - GtkObjectClass * object_class = (GtkObjectClass *) klass; + GtkObjectClass * object_class = GTK_OBJECT_CLASS(klass); object_class->destroy = sp_xmlview_tree_destroy; #endif - parent_class = (GtkTreeViewClass *) g_type_class_peek_parent (klass); + parent_class = GTK_TREE_VIEW_CLASS(g_type_class_peek_parent (klass)); // Signal for when a tree drag and drop has completed g_signal_new ( "tree_move", @@ -441,7 +441,7 @@ void on_row_changed(GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *it return; } - GtkTreeRowReference *old_parent_ref = (GtkTreeRowReference *)g_object_get_data (G_OBJECT (tree), "drag-src-path"); + GtkTreeRowReference *old_parent_ref = static_cast<GtkTreeRowReference *>(g_object_get_data (G_OBJECT (tree), "drag-src-path")); if (!old_parent_ref) { //No drag source location g_signal_emit_by_name(G_OBJECT (tree), "tree_move", GUINT_TO_POINTER(0) ); diff --git a/src/widgets/spinbutton-events.cpp b/src/widgets/spinbutton-events.cpp index 1d44b9190..96d746468 100644 --- a/src/widgets/spinbutton-events.cpp +++ b/src/widgets/spinbutton-events.cpp @@ -23,11 +23,9 @@ #include "spinbutton-events.h" gboolean -spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/) +spinbutton_focus_in (GtkWidget *w, GdkEventKey * /*event*/, gpointer /*data*/) { - gdouble *ini; - - ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini"); + gdouble *ini = static_cast<gdouble *>(g_object_get_data(G_OBJECT(w), "ini")); if (ini) g_free (ini); // free the old value if any // retrieve the value @@ -43,7 +41,7 @@ spinbutton_focus_in (GtkWidget *w, GdkEventKey */*event*/, gpointer /*data*/) void spinbutton_undo (GtkWidget *w) { - gdouble *ini = (gdouble *) g_object_get_data(G_OBJECT (w), "ini"); + gdouble *ini = static_cast<gdouble *>(g_object_get_data(G_OBJECT (w), "ini")); if (ini) { gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), *ini); } @@ -57,7 +55,7 @@ spinbutton_defocus (GtkWidget *container) if (stay) { g_object_set_data (G_OBJECT (container), "stay", GINT_TO_POINTER (FALSE)); } else { - GtkWidget *canvas = (GtkWidget *) g_object_get_data(G_OBJECT (container), "dtw"); + GtkWidget *canvas = GTK_WIDGET(g_object_get_data(G_OBJECT (container), "dtw")); if (canvas) { gtk_widget_grab_focus (GTK_WIDGET(canvas)); } diff --git a/src/widgets/spiral-toolbar.cpp b/src/widgets/spiral-toolbar.cpp index c51c8b6cf..b493ca5bf 100644 --- a/src/widgets/spiral-toolbar.cpp +++ b/src/widgets/spiral-toolbar.cpp @@ -147,15 +147,15 @@ static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GObject *obj) gdouble exp = 1.0; gdouble t0 = 0.0; - adj = (GtkAdjustment*)g_object_get_data(obj, "revolution"); + adj = GTK_ADJUSTMENT(g_object_get_data(obj, "revolution")); gtk_adjustment_set_value(adj, rev); gtk_adjustment_value_changed(adj); - adj = (GtkAdjustment*)g_object_get_data(obj, "expansion"); + adj = GTK_ADJUSTMENT(g_object_get_data(obj, "expansion")); gtk_adjustment_set_value(adj, exp); gtk_adjustment_value_changed(adj); - adj = (GtkAdjustment*)g_object_get_data(obj, "t0"); + adj = GTK_ADJUSTMENT(g_object_get_data(obj, "t0")); gtk_adjustment_set_value(adj, t0); gtk_adjustment_value_changed(adj); @@ -181,17 +181,17 @@ static void spiral_tb_event_attr_changed(Inkscape::XML::Node *repr, g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); GtkAdjustment *adj; - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "revolution"); + adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "revolution")); double revolution = 3.0; sp_repr_get_double(repr, "sodipodi:revolution", &revolution); gtk_adjustment_set_value(adj, revolution); - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "expansion"); + adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "expansion")); double expansion = 1.0; sp_repr_get_double(repr, "sodipodi:expansion", &expansion); gtk_adjustment_set_value(adj, expansion); - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "t0"); + adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "t0")); double t0 = 0.0; sp_repr_get_double(repr, "sodipodi:t0", &t0); gtk_adjustment_set_value(adj, t0); diff --git a/src/widgets/star-toolbar.cpp b/src/widgets/star-toolbar.cpp index d783e3336..f8c5714cb 100644 --- a/src/widgets/star-toolbar.cpp +++ b/src/widgets/star-toolbar.cpp @@ -337,7 +337,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n gtk_action_set_sensitive( prop_action, FALSE ); } } else if ((!strcmp(name, "sodipodi:r1") || !strcmp(name, "sodipodi:r2")) && (!isFlatSided) ) { - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "proportion"); + adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "proportion")); gdouble r1 = 1.0; gdouble r2 = 1.0; sp_repr_get_double(repr, "sodipodi:r1", &r1); @@ -348,7 +348,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n gtk_adjustment_set_value(adj, r1/r2); } } else if (!strcmp(name, "sodipodi:sides")) { - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(tbl), "magnitude"); + adj = GTK_ADJUSTMENT(g_object_get_data(G_OBJECT(tbl), "magnitude")); int sides = 0; sp_repr_get_int(repr, "sodipodi:sides", &sides); gtk_adjustment_set_value(adj, sides); diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 9e0977d51..6c22c81e3 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -174,6 +174,9 @@ static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL) Ink_ComboBoxEntry_Action* act = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) ); GtkTreeModel *model = ink_comboboxentry_action_get_model( act ); gchar *current_font = ink_comboboxentry_action_get_active_text( act ); + if (!current_font) { + return; + } // Get an iter to the selected font from the model data // We cant get it from the combo, cause it might not have been created yet @@ -183,11 +186,11 @@ static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL) while ( valid ) { // Get text from list entry - gchar* text = 0; + gchar* text = NULL; gtk_tree_model_get( model, &iter, 0, &text, -1 ); // Column 0 // Check for match - if( strcmp( current_font, text ) == 0 ){ + if ( text && (strcmp( current_font, text ) == 0) ) { found = true; break; } @@ -199,7 +202,7 @@ static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL) } // Get the list of styles from the selected font - GList *list=0; + GList *list = NULL; gtk_tree_model_get (model, &iter, 1, &list, -1); Ink_ComboBoxEntry_Action* fontStyleAction = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction" ) ); diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h index fe89d4574..87c7ca2e0 100644 --- a/src/widgets/widget-sizes.h +++ b/src/widgets/widget-sizes.h @@ -35,11 +35,6 @@ #define STATUS_LAYER_FONT_SIZE 7700 -#define RULER_WIDTH 12 -#define RULER_HEIGHT 12 -#define RULER_FONT_SIZE 6500 -#define RULER_FONT_VERTICAL_SPACING 1.2 - /* Local Variables: mode:c++ |